Henri Verbeet : ddraw: Make sure pWineDirect3DCreate and pWineDirect3DCreateClipper match the header .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 99a50b5396a5369b94aa730116d18a5893c0b7ee
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=99a50b5396a5369b94aa730116...

Author: Henri Verbeet 
Date:   Thu Oct 23 16:37:10 2008 +0200

ddraw: Make sure pWineDirect3DCreate and pWineDirect3DCreateClipper match the header.

---

dlls/ddraw/ddraw_private.h |    3 +--
 dlls/ddraw/main.c          |    8 +++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index 7ff3c5c..cd1ce15 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -414,8 +414,7 @@ struct IDirectDrawClipperImpl

const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl;

-typedef IWineD3DClipper* (WINAPI *fnWineDirect3DCreateClipper)(IUnknown *);
-fnWineDirect3DCreateClipper pWineDirect3DCreateClipper;
+typeof(WineDirect3DCreateClipper) *pWineDirect3DCreateClipper;

/*****************************************************************************
  * IDirectDrawPalette implementation structure
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index 9d882c6..07c1708 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -47,9 +47,7 @@

#include "ddraw_private.h"

-typedef IWineD3D* (WINAPI *fnWineDirect3DCreate)(UINT, UINT, IUnknown *);
-
-static fnWineDirect3DCreate pWineDirect3DCreate;
+static typeof(WineDirect3DCreate) *pWineDirect3DCreate;

WINE_DEFAULT_DEBUG_CHANNEL(ddraw);

@@ -88,8 +86,8 @@ BOOL LoadWineD3D(void)
         hWineD3D = LoadLibraryA("wined3d");
         if (hWineD3D)
         {
-            pWineDirect3DCreate = (fnWineDirect3DCreate) GetProcAddress(hWineD3D, "WineDirect3DCreate");
-            pWineDirect3DCreateClipper = (fnWineDirect3DCreateClipper) GetProcAddress(hWineD3D, "WineDirect3DCreateClipper");
+            pWineDirect3DCreate = (typeof(WineDirect3DCreate) *)GetProcAddress(hWineD3D, "WineDirect3DCreate");
+            pWineDirect3DCreateClipper = (typeof(WineDirect3DCreateClipper) *) GetProcAddress(hWineD3D, "WineDirect3DCreateClipper");
             return TRUE;
         }
     }