d3d9: Avoid LPVOID.

This commit is contained in:
Henri Verbeet 2013-09-13 10:18:13 +02:00 committed by Alexandre Julliard
parent e55e24a731
commit 674b1e922d
3 changed files with 8 additions and 8 deletions

View File

@ -93,12 +93,10 @@ void* WINAPI Direct3DShaderValidatorCreate9(void)
/******************************************************************* /*******************************************************************
* DllMain * DllMain
*/ */
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
{ {
/* At process attach */ if (reason == DLL_PROCESS_ATTACH)
TRACE("fdwReason=%d\n", fdwReason); DisableThreadLibraryCalls(inst);
if (fdwReason == DLL_PROCESS_ATTACH)
DisableThreadLibraryCalls(hInstDLL);
return TRUE; return TRUE;
} }

View File

@ -30,8 +30,10 @@
static HMODULE d3d9_handle = 0; static HMODULE d3d9_handle = 0;
static BOOL (WINAPI *pEnumDisplaySettingsExA)(LPCSTR, DWORD, DEVMODEA *, DWORD); static BOOL (WINAPI *pEnumDisplaySettingsExA)(const char *device_name,
static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODE, HWND, DWORD, LPVOID); DWORD mode_idx, DEVMODEA *mode, DWORD flags);
static LONG (WINAPI *pChangeDisplaySettingsExA)(const char *device_name,
DEVMODEA *mode, HWND window, DWORD flags, void *param);
static IDirect3D9 * (WINAPI *pDirect3DCreate9)(UINT SDKVersion); static IDirect3D9 * (WINAPI *pDirect3DCreate9)(UINT SDKVersion);
static HRESULT (WINAPI *pDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **d3d9ex); static HRESULT (WINAPI *pDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **d3d9ex);

View File

@ -7268,7 +7268,7 @@ static void shademode_test(IDirect3DDevice9 *device)
DWORD color0_gouraud = 0, color1_gouraud = 0; DWORD color0_gouraud = 0, color1_gouraud = 0;
DWORD shademode = D3DSHADE_FLAT; DWORD shademode = D3DSHADE_FLAT;
DWORD primtype = D3DPT_TRIANGLESTRIP; DWORD primtype = D3DPT_TRIANGLESTRIP;
LPVOID data = NULL; void *data = NULL;
UINT i, j; UINT i, j;
struct vertex quad_strip[] = struct vertex quad_strip[] =
{ {