Commit 674b1e92 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

d3d9: Avoid LPVOID.

parent e55e24a7
......@@ -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;
}
......
......@@ -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);
......
......@@ -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[] =
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment