ddraw: Make sure pWineDirect3DCreate and pWineDirect3DCreateClipper match the header.

This commit is contained in:
Henri Verbeet 2008-10-23 16:37:10 +02:00 committed by Alexandre Julliard
parent 0f0f2a626b
commit 99a50b5396
2 changed files with 4 additions and 7 deletions

View File

@ -414,8 +414,7 @@ struct IDirectDrawClipperImpl
const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl; const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl;
typedef IWineD3DClipper* (WINAPI *fnWineDirect3DCreateClipper)(IUnknown *); typeof(WineDirect3DCreateClipper) *pWineDirect3DCreateClipper;
fnWineDirect3DCreateClipper pWineDirect3DCreateClipper;
/***************************************************************************** /*****************************************************************************
* IDirectDrawPalette implementation structure * IDirectDrawPalette implementation structure

View File

@ -47,9 +47,7 @@
#include "ddraw_private.h" #include "ddraw_private.h"
typedef IWineD3D* (WINAPI *fnWineDirect3DCreate)(UINT, UINT, IUnknown *); static typeof(WineDirect3DCreate) *pWineDirect3DCreate;
static fnWineDirect3DCreate pWineDirect3DCreate;
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
@ -88,8 +86,8 @@ BOOL LoadWineD3D(void)
hWineD3D = LoadLibraryA("wined3d"); hWineD3D = LoadLibraryA("wined3d");
if (hWineD3D) if (hWineD3D)
{ {
pWineDirect3DCreate = (fnWineDirect3DCreate) GetProcAddress(hWineD3D, "WineDirect3DCreate"); pWineDirect3DCreate = (typeof(WineDirect3DCreate) *)GetProcAddress(hWineD3D, "WineDirect3DCreate");
pWineDirect3DCreateClipper = (fnWineDirect3DCreateClipper) GetProcAddress(hWineD3D, "WineDirect3DCreateClipper"); pWineDirect3DCreateClipper = (typeof(WineDirect3DCreateClipper) *) GetProcAddress(hWineD3D, "WineDirect3DCreateClipper");
return TRUE; return TRUE;
} }
} }