* Improve the GUIDs situation.
* Improve the main header.
CORE-7716
svn path=/trunk/; revision=61714
util.c
volume.c
xfile.c
+ guid.c
${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36.def)
#include <config.h>
#include <wine/port.h>
+#include <stdarg.h>
+
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
-#include <stdarg.h>
-
-#include <initguid.h>
-
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
-#include <winnls.h>
#include <winuser.h>
#include <d3dx9.h>
--- /dev/null
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <initguid.h>
+#include <d3dx9.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
#include "d3dx9_36_private.h"
#include <ole2.h>
+
+#include <initguid.h>
#include <wincodec.h>
/* Wine-specific WIC GUIDs */