2009-04-05 Ozkan Sezer <sezeroz@gmail.com>
* ddraw.h: Better match the PSDK types, re order a few things (wine git
5b375aec71419a5a5bb57a42293ef348d6dc96a8).
git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@721 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/direct-x/ChangeLog b/mingw-w64-headers/direct-x/ChangeLog
index 117eaf0..67f1426 100644
--- a/mingw-w64-headers/direct-x/ChangeLog
+++ b/mingw-w64-headers/direct-x/ChangeLog
@@ -2,6 +2,8 @@
* d3d8types.h, d3d9types.h: Remove misspelled constants as they exist
correctly spelled (wine git d476313a49c1b46eeef390c79cadd72cd3eb217d).
+ * ddraw.h: Better match the PSDK types, re order a few things (wine git
+ 5b375aec71419a5a5bb57a42293ef348d6dc96a8).
2009-04-04 Ozkan Sezer <sezeroz@gmail.com>
diff --git a/mingw-w64-headers/direct-x/include/ddraw.h b/mingw-w64-headers/direct-x/include/ddraw.h
index 2b112f7..0158406 100644
--- a/mingw-w64-headers/direct-x/include/ddraw.h
+++ b/mingw-w64-headers/direct-x/include/ddraw.h
@@ -1086,6 +1086,14 @@
typedef LPDDENUMCALLBACKEXA LPDDENUMCALLBACKEX;
#endif
+HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID);
+HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID);
+#ifdef UNICODE
+#define DirectDrawEnumerate DirectDrawEnumerateW
+#else
+#define DirectDrawEnumerate DirectDrawEnumerateA
+#endif
+
HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
#ifdef UNICODE
@@ -2591,17 +2599,9 @@
#endif
-HRESULT WINAPI DirectDrawCreate(LPGUID,LPDIRECTDRAW*,LPUNKNOWN);
-HRESULT WINAPI DirectDrawCreateEx(LPGUID,LPVOID*,REFIID,LPUNKNOWN);
-HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID);
-HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID);
-#ifdef UNICODE
-#define DirectDrawEnumerate DirectDrawEnumerateW
-#else
-#define DirectDrawEnumerate DirectDrawEnumerateA
-#endif
-
-HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,LPUNKNOWN);
+HRESULT WINAPI DirectDrawCreate(GUID*,LPDIRECTDRAW*,IUnknown*);
+HRESULT WINAPI DirectDrawCreateEx(GUID*,LPVOID*,REFIID,IUnknown*);
+HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,IUnknown*);
#ifdef __cplusplus
} /* extern "C" */
