ddraw: Better match the PSDK types and fix the winapi_check warnings.

[Francois Gouget]

---
 dlls/ddraw/ddraw.c     |    2 +-
 dlls/ddraw/main.c      |   10 +++++-----
 include/ddraw.h        |   13 +++++++------
 tools/winapi/win32.api |    6 ++----
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index dbab8db..696552d 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -3112,7 +3112,7 @@ IDirectDrawImpl_AttachD3DDevice(IDirectDrawImpl *This,
  *****************************************************************************/
 HRESULT WINAPI
 DirectDrawCreateClipper(DWORD Flags,
-                        IDirectDrawClipper **Clipper,
+                        LPDIRECTDRAWCLIPPER *Clipper,
                         IUnknown *UnkOuter)
 {
     IDirectDrawClipperImpl* object;
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index 54b35dc..4e77d4f 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -345,7 +345,7 @@ err_out:
  ***********************************************************************/
 HRESULT WINAPI
 DirectDrawCreate(GUID *GUID,
-                 IDirectDraw **DD,
+                 LPDIRECTDRAW *DD,
                  IUnknown *UnkOuter)
 {
     HRESULT hr;
@@ -368,7 +368,7 @@ DirectDrawCreate(GUID *GUID,
  ***********************************************************************/
 HRESULT WINAPI
 DirectDrawCreateEx(GUID *GUID,
-                   void **DD,
+                   LPVOID *DD,
                    REFIID iid,
                    IUnknown *UnkOuter)
 {
@@ -406,7 +406,7 @@ DirectDrawCreateEx(GUID *GUID,
  ***********************************************************************/
 HRESULT WINAPI
 DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback,
-                     void *Context)
+                     LPVOID Context)
 {
     BOOL stop = FALSE;
 
@@ -440,7 +440,7 @@ DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback,
  ***********************************************************************/
 HRESULT WINAPI
 DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback,
-                       void *Context,
+                       LPVOID Context,
                        DWORD Flags)
 {
     BOOL stop = FALSE;
@@ -834,7 +834,7 @@ static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, c
 BOOL WINAPI
 DllMain(HINSTANCE hInstDLL,
         DWORD Reason,
-        void *lpv)
+        LPVOID lpv)
 {
     TRACE("(%p,%x,%p)\n", hInstDLL, Reason, lpv);
     if (Reason == DLL_PROCESS_ATTACH)
diff --git a/include/ddraw.h b/include/ddraw.h
index 938a19a..0f7a6c1 100644
--- a/include/ddraw.h
+++ b/include/ddraw.h
@@ -1065,6 +1065,10 @@ typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONI
 typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
 DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX)
 
+HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID);
+HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID);
+#define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate)
+
 HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
 HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
 #define DirectDrawEnumerateEx WINELIB_NAME_AW(DirectDrawEnumerateEx)
@@ -2663,12 +2667,9 @@ DECLARE_INTERFACE_(IDirectDrawGammaControl,IUnknown)
 #endif
 
 
-HRESULT WINAPI DirectDrawCreate(LPGUID,LPDIRECTDRAW*,LPUNKNOWN);
-HRESULT WINAPI DirectDrawCreateEx(LPGUID,LPVOID*,REFIID,LPUNKNOWN);
-HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID);
-HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID);
-#define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate)
-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" */
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 2636c29..e28cfd1 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -1008,14 +1008,12 @@ HRESULT
 
 %ptr
 
+GUID *
+IUnknown *
 LPDDENUMCALLBACKA
 LPDDENUMCALLBACKEXA
-LPDDENUMCALLBACKEXW
-LPDDENUMCALLBACKW
 LPDIRECTDRAW *
 LPDIRECTDRAWCLIPPER *
-LPGUID
-LPUNKNOWN
 LPVOID
 LPVOID *
 REFCLSID
-- 
1.5.2.4