Skip to content

W
wine-winehq
Commit c583b685 authored by François Gouget's avatar François Gouget Committed by Alexandre Julliard
Browse files
Options

We must cast the return value of GetProcAddress.

parent 9a36a2f2
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
dlls/winmm/driver.c
View file @ c583b685
...@@ -341,7 +341,7 @@ LPWINE_DRIVER DRIVER_TryOpenDriver32(LPCSTR fn, LPARAM lParam2) ...@@ -341,7 +341,7 @@ LPWINE_DRIVER DRIVER_TryOpenDriver32(LPCSTR fn, LPARAM lParam2)
if ((hModule = LoadLibraryA(fn)) == 0) {cause = "Not a 32 bit lib"; goto exit;} if ((hModule = LoadLibraryA(fn)) == 0) {cause = "Not a 32 bit lib"; goto exit;}
lpDrv->d.d32.lpDrvProc = GetProcAddress(hModule, "DriverProc"); lpDrv->d.d32.lpDrvProc = (DRIVERPROC)GetProcAddress(hModule, "DriverProc");
if (lpDrv->d.d32.lpDrvProc == NULL) {cause = "no DriverProc"; goto exit;} if (lpDrv->d.d32.lpDrvProc == NULL) {cause = "no DriverProc"; goto exit;}
lpDrv->dwFlags = 0; lpDrv->dwFlags = 0;
......
msdos/vga.c
View file @ c583b685
...@@ -23,7 +23,8 @@ static DDSURFACEDESC sdesc; ...@@ -23,7 +23,8 @@ static DDSURFACEDESC sdesc;
static LONG vga_polling,vga_refresh; static LONG vga_polling,vga_refresh;
static HANDLE poll_timer; static HANDLE poll_timer;
static HRESULT WINAPI (*pDirectDrawCreate)(LPGUID,LPDIRECTDRAW *,LPUNKNOWN); typedef HRESULT WINAPI (*DirectDrawCreateProc)(LPGUID,LPDIRECTDRAW *,LPUNKNOWN);
static DirectDrawCreateProc pDirectDrawCreate;
static void VGA_DeinstallTimer(void) static void VGA_DeinstallTimer(void)
{ {
...@@ -61,7 +62,7 @@ int VGA_SetMode(unsigned Xres,unsigned Yres,unsigned Depth) ...@@ -61,7 +62,7 @@ int VGA_SetMode(unsigned Xres,unsigned Yres,unsigned Depth)
if (!pDirectDrawCreate) if (!pDirectDrawCreate)
{ {
HMODULE hmod = LoadLibraryA( "ddraw.dll" ); HMODULE hmod = LoadLibraryA( "ddraw.dll" );
if (hmod) pDirectDrawCreate = GetProcAddress( hmod, "DirectDrawCreate" ); if (hmod) pDirectDrawCreate = (DirectDrawCreateProc)GetProcAddress( hmod, "DirectDrawCreate" );
} }
if (pDirectDrawCreate) pDirectDrawCreate(NULL,&lpddraw,NULL); if (pDirectDrawCreate) pDirectDrawCreate(NULL,&lpddraw,NULL);
if (!lpddraw) { if (!lpddraw) {
......
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