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

ddraw: Better match the PSDK types and fix the winapi_check warnings.

This commit is contained in:
Francois Gouget 2007-08-08 10:39:04 +02:00 committed by Alexandre Julliard
parent 427723cc37
commit 5b375aec71
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ddraw/ddraw.c
View File

@ -3112,7 +3112,7 @@ IDirectDrawImpl_AttachD3DDevice(IDirectDrawImpl *This,
*****************************************************************************/ *****************************************************************************/
HRESULT WINAPI HRESULT WINAPI
DirectDrawCreateClipper(DWORD Flags, DirectDrawCreateClipper(DWORD Flags,
IDirectDrawClipper **Clipper, LPDIRECTDRAWCLIPPER *Clipper,
IUnknown *UnkOuter) IUnknown *UnkOuter)
{ {
IDirectDrawClipperImpl* object; IDirectDrawClipperImpl* object;

10
dlls/ddraw/main.c
View File

@ -345,7 +345,7 @@ err_out:
***********************************************************************/ ***********************************************************************/
HRESULT WINAPI HRESULT WINAPI
DirectDrawCreate(GUID *GUID, DirectDrawCreate(GUID *GUID,
IDirectDraw **DD, LPDIRECTDRAW *DD,
IUnknown *UnkOuter) IUnknown *UnkOuter)
{ {
HRESULT hr; HRESULT hr;
@ -368,7 +368,7 @@ DirectDrawCreate(GUID *GUID,
***********************************************************************/ ***********************************************************************/
HRESULT WINAPI HRESULT WINAPI
DirectDrawCreateEx(GUID *GUID, DirectDrawCreateEx(GUID *GUID,
void **DD, LPVOID *DD,
REFIID iid, REFIID iid,
IUnknown *UnkOuter) IUnknown *UnkOuter)
{ {
@ -406,7 +406,7 @@ DirectDrawCreateEx(GUID *GUID,
***********************************************************************/ ***********************************************************************/
HRESULT WINAPI HRESULT WINAPI
DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback, DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback,
void *Context) LPVOID Context)
{ {
BOOL stop = FALSE; BOOL stop = FALSE;
@ -440,7 +440,7 @@ DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback,
***********************************************************************/ ***********************************************************************/
HRESULT WINAPI HRESULT WINAPI
DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback, DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback,
void *Context, LPVOID Context,
DWORD Flags) DWORD Flags)
{ {
BOOL stop = FALSE; BOOL stop = FALSE;
@ -834,7 +834,7 @@ static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, c
BOOL WINAPI BOOL WINAPI
DllMain(HINSTANCE hInstDLL, DllMain(HINSTANCE hInstDLL,
DWORD Reason, DWORD Reason,
void *lpv) LPVOID lpv)
{ {
TRACE("(%p,%x,%p)\n", hInstDLL, Reason, lpv); TRACE("(%p,%x,%p)\n", hInstDLL, Reason, lpv);
if (Reason == DLL_PROCESS_ATTACH) if (Reason == DLL_PROCESS_ATTACH)

13
include/ddraw.h
View File

@ -1065,6 +1065,10 @@ typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONI
typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR); typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX) DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX)
HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID);
HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID);
#define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate)
HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags); HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags); HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
#define DirectDrawEnumerateEx WINELIB_NAME_AW(DirectDrawEnumerateEx) #define DirectDrawEnumerateEx WINELIB_NAME_AW(DirectDrawEnumerateEx)
@ -2663,12 +2667,9 @@ DECLARE_INTERFACE_(IDirectDrawGammaControl,IUnknown)
#endif #endif
HRESULT WINAPI DirectDrawCreate(LPGUID,LPDIRECTDRAW*,LPUNKNOWN); HRESULT WINAPI DirectDrawCreate(GUID*,LPDIRECTDRAW*,IUnknown*);
HRESULT WINAPI DirectDrawCreateEx(LPGUID,LPVOID*,REFIID,LPUNKNOWN); HRESULT WINAPI DirectDrawCreateEx(GUID*,LPVOID*,REFIID,IUnknown*);
HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID); HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,IUnknown*);
HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID);
#define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate)
HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,LPUNKNOWN);
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

6
tools/winapi/win32.api
View File

@ -1008,14 +1008,12 @@ HRESULT
%ptr %ptr
GUID *
IUnknown *
LPDDENUMCALLBACKA LPDDENUMCALLBACKA
LPDDENUMCALLBACKEXA LPDDENUMCALLBACKEXA
LPDDENUMCALLBACKEXW
LPDDENUMCALLBACKW
LPDIRECTDRAW * LPDIRECTDRAW *
LPDIRECTDRAWCLIPPER * LPDIRECTDRAWCLIPPER *
LPGUID
LPUNKNOWN
LPVOID LPVOID
LPVOID * LPVOID *
REFCLSID REFCLSID