ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corrected bug in enumeration function.

This commit is contained in:
Lionel Ulmer 1999-03-16 09:53:48 +00:00 committed by Alexandre Julliard
parent 598993f41f
commit 88ca57d219
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
graphics/ddraw.c
View File

@ -181,7 +181,7 @@ HRESULT WINAPI DirectDrawEnumerateExA(
* DirectDrawEnumerateExW (DDRAW.*) * DirectDrawEnumerateExW (DDRAW.*)
*/ */
static BOOL DirectDrawEnumerateExProcW( static BOOL CALLBACK DirectDrawEnumerateExProcW(
GUID *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, GUID *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName,
LPVOID lpContext, HMONITOR hm) LPVOID lpContext, HMONITOR hm)
{ {
@ -210,7 +210,7 @@ HRESULT WINAPI DirectDrawEnumerateExW(
epd.lpCallback = lpCallback; epd.lpCallback = lpCallback;
epd.lpContext = lpContext; epd.lpContext = lpContext;
return DirectDrawEnumerateExA(&DirectDrawEnumerateExProcW, return DirectDrawEnumerateExA(DirectDrawEnumerateExProcW,
(LPVOID) &epd, 0); (LPVOID) &epd, 0);
} }
@ -218,14 +218,14 @@ HRESULT WINAPI DirectDrawEnumerateExW(
* DirectDrawEnumerateA (DDRAW.*) * DirectDrawEnumerateA (DDRAW.*)
*/ */
static BOOL DirectDrawEnumerateProcA( static BOOL CALLBACK DirectDrawEnumerateProcA(
GUID *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, GUID *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName,
LPVOID lpContext, HMONITOR hm) LPVOID lpContext, HMONITOR hm)
{ {
DirectDrawEnumerateProcData *pEPD = DirectDrawEnumerateProcData *pEPD =
(DirectDrawEnumerateProcData *) lpContext; (DirectDrawEnumerateProcData *) lpContext;
return (*(LPDDENUMCALLBACKA *) pEPD->lpCallback)( return ((LPDDENUMCALLBACKA) pEPD->lpCallback)(
lpGUID, lpDriverDescription, lpDriverName, pEPD->lpContext); lpGUID, lpDriverDescription, lpDriverName, pEPD->lpContext);
} }
@ -238,7 +238,7 @@ HRESULT WINAPI DirectDrawEnumerateA(
epd.lpCallback = lpCallback; epd.lpCallback = lpCallback;
epd.lpContext = lpContext; epd.lpContext = lpContext;
return DirectDrawEnumerateExA(&DirectDrawEnumerateProcA, return DirectDrawEnumerateExA(DirectDrawEnumerateProcA,
(LPVOID) &epd, 0); (LPVOID) &epd, 0);
} }
@ -253,7 +253,7 @@ static BOOL DirectDrawEnumerateProcW(
DirectDrawEnumerateProcData *pEPD = DirectDrawEnumerateProcData *pEPD =
(DirectDrawEnumerateProcData *) lpContext; (DirectDrawEnumerateProcData *) lpContext;
return (*(LPDDENUMCALLBACKW *) pEPD->lpCallback)( return ((LPDDENUMCALLBACKW) pEPD->lpCallback)(
lpGUID, lpDriverDescription, lpDriverName, lpGUID, lpDriverDescription, lpDriverName,
pEPD->lpContext); pEPD->lpContext);
} }
@ -267,7 +267,7 @@ HRESULT WINAPI DirectDrawEnumerateW(
epd.lpCallback = lpCallback; epd.lpCallback = lpCallback;
epd.lpContext = lpContext; epd.lpContext = lpContext;
return DirectDrawEnumerateExW(&DirectDrawEnumerateProcW, return DirectDrawEnumerateExW(DirectDrawEnumerateProcW,
(LPVOID) &epd, 0); (LPVOID) &epd, 0);
} }
@ -4210,7 +4210,7 @@ HRESULT WINAPI Xlib_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter)
HRESULT WINAPI DirectDrawCreate( LPGUID lpGUID, LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter ) { HRESULT WINAPI DirectDrawCreate( LPGUID lpGUID, LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter ) {
char xclsid[50]; char xclsid[50];
WNDCLASSA wc; WNDCLASSA wc;
WND* pParentWindow; /* WND* pParentWindow; */
HRESULT ret; HRESULT ret;
if (HIWORD(lpGUID)) if (HIWORD(lpGUID))