-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
Changelog:
- declare d3d9 guid on libs/uuid (as done for d3d8)
- little fix for d3d9types.h
Regards,
Raphael
PS: we can't use the dx8guid.c for this as the d3d9 and d3d8 headers aren't
compatible
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)
iD8DBQE+/MLFp7NA3AmQTU4RAgnAAJ9sdzkWw4+Nvm/Xz2ZI4nuQwpW/wACfSGVf
YenGTu88NnTmPERHDwx4j1o=
=w+b1
-----END PGP SIGNATURE-----
? dx9guid.c
Index: Makefile.in
===================================================================
RCS file: /home/wine/wine/libs/uuid/Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 Makefile.in
--- Makefile.in 22 Mar 2003 20:40:48 -0000 1.2
+++ Makefile.in 27 Jun 2003 22:12:14 -0000
@@ -7,6 +7,7 @@
C_SRCS = \
dx8guid.c \
+ dx9guid.c \
dxguid.c \
uuid.c
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
+++ libs/uuid/dx9guid.c 2003-06-27 21:28:33.000000000 +0200
@@ -0,0 +1,33 @@
+/*
+ * DirectX 9 GUID definitions
+ *
+ * Copyright 2000 Alexandre Julliard
+ * Copyright 2000 Francois Gouget
+ * Copyright 2003 Raphael Junqueira
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#define COM_NO_WINDOWS_H
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+
+#include "objbase.h"
+#include "olectl.h"
+#include "initguid.h"
+
+#include "d3d9.h"
Index: include/d3d9types.h
===================================================================
RCS file: /home/wine/wine/include/d3d9types.h,v
retrieving revision 1.2
diff -u -r1.2 d3d9types.h
--- include/d3d9types.h 24 Jun 2003 19:26:51 -0000 1.2
+++ include/d3d9types.h 27 Jun 2003 22:14:40 -0000
@@ -200,7 +200,7 @@
#define MAXD3DDECLUSAGE D3DDECLUSAGE_SAMPLE
#define MAXD3DDECLUSAGEINDEX 15
-#define MAXD3DDECLLENGTH 64 /* does not include "end" marker vertex element */
+#define MAXD3DDECLLENGTH 64
typedef enum _D3DDECLMETHOD {
D3DDECLMETHOD_DEFAULT = 0,
@@ -1131,8 +1131,10 @@
typedef struct _D3DADAPTER_IDENTIFIER9 {
char Driver[MAX_DEVICE_IDENTIFIER_STRING];
char Description[MAX_DEVICE_IDENTIFIER_STRING];
- char DeviceName[32]; /* Device name for GDI (ex. \\.\DISPLAY1) */
- LARGE_INTEGER DriverVersion;
+ char DeviceName[32];
+ DWORD DriverVersionLowPart;
+ DWORD DriverVersionHighPart;
+
DWORD VendorId;
DWORD DeviceId;
DWORD SubSysId;
@@ -1352,5 +1354,5 @@
D3DQUERYTYPE_OCCLUSION = 9
} D3DQUERYTYPE;
-
#endif /* __WINE_D3D9TYPES_H */
+
