Module: wine Branch: master Commit: 674b1e922d4d3050850a6e76e6a28ad24dbb8b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=674b1e922d4d3050850a6e76e6...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Sep 13 10:18:13 2013 +0200
d3d9: Avoid LPVOID.
---
dlls/d3d9/d3d9_main.c | 8 +++----- dlls/d3d9/tests/d3d9ex.c | 6 ++++-- dlls/d3d9/tests/visual.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 2059b98..d8c5e23 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -93,12 +93,10 @@ void* WINAPI Direct3DShaderValidatorCreate9(void) /******************************************************************* * DllMain */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - /* At process attach */ - TRACE("fdwReason=%d\n", fdwReason); - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hInstDLL); + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls(inst);
return TRUE; } diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 470e8a4..f4f3327 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -30,8 +30,10 @@
static HMODULE d3d9_handle = 0;
-static BOOL (WINAPI *pEnumDisplaySettingsExA)(LPCSTR, DWORD, DEVMODEA *, DWORD); -static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODE, HWND, DWORD, LPVOID); +static BOOL (WINAPI *pEnumDisplaySettingsExA)(const char *device_name, + 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 HRESULT (WINAPI *pDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **d3d9ex); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f047cd7..471c0d6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7268,7 +7268,7 @@ static void shademode_test(IDirect3DDevice9 *device) DWORD color0_gouraud = 0, color1_gouraud = 0; DWORD shademode = D3DSHADE_FLAT; DWORD primtype = D3DPT_TRIANGLESTRIP; - LPVOID data = NULL; + void *data = NULL; UINT i, j; struct vertex quad_strip[] = {