August 2007 - Wine-Commits - list.winehq.org

Rob Shearman : urlmon: Implement stubs for URLOpenBlockingStreamA/ W and URLOpenStreamA/W.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 9105b64a777daa410dbf55e97d1c53a38841a973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9105b64a777daa410dbf55e97… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Aug 3 22:09:48 2007 +0100 urlmon: Implement stubs for URLOpenBlockingStreamA/W and URLOpenStreamA/W. --- dlls/urlmon/umstream.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 8 ++++---- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index cd5e153..ec2b306 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -378,3 +378,49 @@ static const IStreamVtbl stvt = IStream_fnClone }; + +/*********************************************************************** + * URLOpenBlockingStreamA (URLMON.@) + */ +HRESULT WINAPI URLOpenBlockingStreamA(LPUNKNOWN pCaller, LPCSTR szURL, + LPSTREAM *ppStream, DWORD dwReserved, + LPBINDSTATUSCALLBACK lpfnCB) +{ + FIXME("(%p, %s, %p, 0x%x, %p): stub\n", pCaller, szURL, ppStream, dwReserved, lpfnCB); + *ppStream = NULL; + return E_NOTIMPL; +} + +/*********************************************************************** + * URLOpenBlockingStreamW (URLMON.@) + */ +HRESULT WINAPI URLOpenBlockingStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, + LPSTREAM *ppStream, DWORD dwReserved, + LPBINDSTATUSCALLBACK lpfnCB) +{ + FIXME("(%p, %s, %p, 0x%x, %p): stub\n", pCaller, debugstr_w(szURL), ppStream, + dwReserved, lpfnCB); + *ppStream = NULL; + return E_NOTIMPL; +} + +/*********************************************************************** +* URLOpenStreamA (URLMON.@) +*/ +HRESULT WINAPI URLOpenStreamA(LPUNKNOWN pCaller, LPCSTR szURL, DWORD dwReserved, + LPBINDSTATUSCALLBACK lpfnCB) +{ + FIXME("(%p, %s, 0x%x, %p): stub\n", pCaller, szURL, dwReserved, lpfnCB); + return E_NOTIMPL; +} + +/*********************************************************************** +* URLOpenStreamW (URLMON.@) +*/ +HRESULT WINAPI URLOpenStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, DWORD dwReserved, + LPBINDSTATUSCALLBACK lpfnCB) +{ + FIXME("(%p, %s, 0x%x, %p): stub\n", pCaller, debugstr_w(szURL), dwReserved, + lpfnCB); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index c72c0eb..1da697d 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -70,12 +70,12 @@ @ stdcall URLDownloadToFileA(ptr str str long ptr) @ stdcall URLDownloadToFileW(ptr wstr wstr long ptr) @ stub URLDownloadW -@ stub URLOpenBlockingStreamA -@ stub URLOpenBlockingStreamW +@ stdcall URLOpenBlockingStreamA(ptr str ptr long ptr) +@ stdcall URLOpenBlockingStreamW(ptr wstr ptr long ptr) @ stub URLOpenPullStreamA @ stub URLOpenPullStreamW -@ stub URLOpenStreamA -@ stub URLOpenStreamW +@ stdcall URLOpenStreamA(ptr str long ptr) +@ stdcall URLOpenStreamW(ptr wstr long ptr) @ stub UrlMkBuildVersion @ stdcall UrlMkGetSessionOption(long ptr long ptr long) @ stdcall UrlMkSetSessionOption(long ptr long long)

1 0

Francois Gouget : crypt32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: f045243542068e1206336894419b07d5e5b883d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f045243542068e12063368944… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:48:04 2007 +0200 crypt32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/crypt32/tests/encode.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9b63455..50c458d 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1532,8 +1532,8 @@ static void test_decodeAltName(DWORD dwEncoding) ok(info->rgAltEntry[0].dwAltNameChoice == CERT_ALT_NAME_REGISTERED_ID, "Expected CERT_ALT_NAME_REGISTERED_ID, got %d\n", info->rgAltEntry[0].dwAltNameChoice); - ok(!strcmp(info->rgAltEntry[0].pszRegisteredID, "1.2.3"), - "Expected OID 1.2.3, got %s\n", info->rgAltEntry[0].pszRegisteredID); + ok(!strcmp(U(info->rgAltEntry[0]).pszRegisteredID, "1.2.3"), + "Expected OID 1.2.3, got %s\n", U(info->rgAltEntry[0]).pszRegisteredID); LocalFree(buf); } ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME,

1 0

Francois Gouget : netapi32: Add some missing prototypes in the lmaccess.h, lmshare.h and lmwksta.h headers.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 9fae03b39b80c4b0fd03155e179e94ddb4dd2368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fae03b39b80c4b0fd03155e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:41:51 2007 +0200 netapi32: Add some missing prototypes in the lmaccess.h, lmshare.h and lmwksta.h headers. Replace LPWC?STR with LMC?STR to better match the PSDK. --- dlls/netapi32/netapi32.c | 12 ++++++------ dlls/netapi32/share.c | 6 +++--- dlls/netapi32/wksta.c | 28 ++++++++++++++-------------- include/lmaccess.h | 3 ++- include/lmserver.h | 4 ++-- include/lmshare.h | 19 ++++++++++++------- include/lmwksta.h | 42 +++++++++++++++++++++++------------------- 7 files changed, 62 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9fae03b39b80c4b0fd031…

1 0

Francois Gouget : dnsapi: Better match the PSDK types, especially with regards to constness.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: ca3a2418892ceb930ce2b288aa8fcfd75935df84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3a2418892ceb930ce2b288a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:47:03 2007 +0200 dnsapi: Better match the PSDK types, especially with regards to constness. Add some missing A/W prototype macros. Update win32.api to fix the winapi_check warnings. --- dlls/dnsapi/main.c | 16 ++++---- dlls/dnsapi/name.c | 20 +++++----- dlls/dnsapi/query.c | 4 +- dlls/dnsapi/record.c | 2 +- include/windns.h | 86 +++++++++++++++++++++++++---------------------- tools/winapi/win32.api | 14 +++----- 6 files changed, 72 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca3a2418892ceb930ce2b…

1 0

Francois Gouget : winapi_check: Fix a couple of dll names.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 92f297485c06616f2c7da01e7e4fa515517e3ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92f297485c06616f2c7da01e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:47:29 2007 +0200 winapi_check: Fix a couple of dll names. --- tools/winapi/win32.api | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 5133b7a..76c0be9 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -2107,7 +2107,7 @@ UINT DWORD_PTR -%%mciwave.drv +%%mciwave.dll %long @@ -2242,7 +2242,7 @@ VOID LPCWSTR LPWSTR -%%msacm.drv +%%msacm32.drv %long

1 0

Francois Gouget : ntdll: Fix the RtlQueryInformationActivationContext() . spec prototype to match its implementation.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: c605afa31ecc72f21f15e0754667f50e659a03ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c605afa31ecc72f21f15e0754… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:47:50 2007 +0200 ntdll: Fix the RtlQueryInformationActivationContext() .spec prototype to match its implementation. --- dlls/ntdll/ntdll.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9af0d13..07abf1c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -767,7 +767,7 @@ @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) @ stub RtlQueryHeapInformation @ stdcall RtlQueryInformationAcl(ptr ptr long long) -@ stdcall RtlQueryInformationActivationContext(long long ptr ptr long ptr long ptr) +@ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) @ stub RtlQueryInformationActiveActivationContext @ stub RtlQueryInterfaceMemoryStream @ stub RtlQueryProcessBackTraceInformation

1 0

Francois Gouget : urlmon: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 988be5dd8f75957e783d2d3b54bcf61302453331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=988be5dd8f75957e783d2d3b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:48:45 2007 +0200 urlmon: Fix compilation on systems that don't support nameless unions. --- dlls/urlmon/http.c | 3 ++- dlls/urlmon/tests/protocol.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 8dc3432..08d6419 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -25,6 +25,7 @@ #include <stdarg.h> #define COBJMACROS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" @@ -516,7 +517,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl WARN("Expected This->bind_info.stgmedData.tymed to be TYMED_HGLOBAL, not %d\n", This->bind_info.stgmedData.tymed); else - optional = (LPWSTR)This->bind_info.stgmedData.hGlobal; + optional = (LPWSTR)This->bind_info.stgmedData.u.hGlobal; } if (!HttpSendRequestW(This->request, This->full_header, lstrlenW(This->full_header), optional, diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 72cb2fc..13b0f15 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -547,14 +547,14 @@ static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfB { /* Must be GMEM_FIXED, GMEM_MOVABLE does not work properly * with urlmon on native (Win98 and WinXP) */ - pbindinfo->stgmedData.hGlobal = GlobalAlloc(GPTR, sizeof(szPostData)); - if (!pbindinfo->stgmedData.hGlobal) + U(pbindinfo->stgmedData).hGlobal = GlobalAlloc(GPTR, sizeof(szPostData)); + if (!U(pbindinfo->stgmedData).hGlobal) { http_post_test = FALSE; skip("Out of memory\n"); return E_OUTOFMEMORY; } - lstrcpy((LPSTR)pbindinfo->stgmedData.hGlobal, szPostData); + lstrcpy((LPSTR)U(pbindinfo->stgmedData).hGlobal, szPostData); pbindinfo->cbstgmedData = sizeof(szPostData)-1; pbindinfo->dwBindVerb = BINDVERB_POST; pbindinfo->stgmedData.tymed = TYMED_HGLOBAL;

1 0

Francois Gouget : wintrust: Fix the CryptCATAdminReleaseCatalogContext() prototype and better match the PSDK types.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: c9b98267867f168c84d39f55a20f89499155fb8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b98267867f168c84d39f55a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:49:27 2007 +0200 wintrust: Fix the CryptCATAdminReleaseCatalogContext() prototype and better match the PSDK types. Add some missing prototypes to mscat.h. Update win32.api to fix the winapi_check warnings. --- dlls/wintrust/crypt.c | 6 +++--- include/mscat.h | 3 +++ tools/winapi/win32.api | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 9a1ecdb..bb473f1 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -57,8 +57,8 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN* catAdmin, /*********************************************************************** * CryptCATAdminAddCatalog (WINTRUST.@) */ -BOOL WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, WCHAR *catalogFile, - WCHAR *selectBaseName, DWORD flags) +BOOL WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile, + PWSTR selectBaseName, DWORD flags) { FIXME("%p %s %s %d\n", catAdmin, debugstr_w(catalogFile), debugstr_w(selectBaseName), flags); @@ -106,7 +106,7 @@ HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, * */ BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN hCatAdmin, - HCATADMIN hCatInfo, + HCATINFO hCatInfo, DWORD dwFlags) { FIXME("%p %p %x\n", hCatAdmin, hCatInfo, dwFlags); diff --git a/include/mscat.h b/include/mscat.h index f7a739a..f5e9f0f 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -49,9 +49,12 @@ typedef struct CRYPTCATMEMBER_ { BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD); +BOOL WINAPI CryptCATAdminAddCatalog(HCATADMIN,PWSTR,PWSTR,DWORD); BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD); HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*); +BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN,HCATINFO,DWORD); BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD); +BOOL WINAPI CryptCATAdminRemoveCatalog(HCATADMIN,LPCWSTR,DWORD); BOOL WINAPI CryptCATClose(HANDLE); CRYPTCATMEMBER* WINAPI CryptCATEnumerateMember(HANDLE,CRYPTCATMEMBER*); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 76c0be9..e86199c 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5849,7 +5849,9 @@ LPSTR %wstr +LPCWSTR LPWSTR +PWSTR %void

1 0

Francois Gouget : pdh/tests: Add missing '\n' to ok() calls.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: e50f16e579780eef1ae80a272a6054103080be7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50f16e579780eef1ae80a272… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:40:47 2007 +0200 pdh/tests: Add missing '\n' to ok() calls. --- dlls/pdh/tests/pdh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 220f35a..104589e 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -374,14 +374,14 @@ static void test_PdhGetRawCounterValue( void ) ret = PdhGetRawCounterValue( counter, NULL, &value ); ok(ret == ERROR_SUCCESS, "PdhGetRawCounterValue failed 0x%08x\n", ret); - ok(value.CStatus == ERROR_SUCCESS, "expected ERROR_SUCCESS got %x", value.CStatus); + ok(value.CStatus == ERROR_SUCCESS, "expected ERROR_SUCCESS got %x\n", value.CStatus); ret = PdhCollectQueryData( query ); ok(ret == ERROR_SUCCESS, "PdhCollectQueryData failed 0x%08x\n", ret); ret = PdhGetRawCounterValue( counter, NULL, &value ); ok(ret == ERROR_SUCCESS, "PdhGetRawCounterValue failed 0x%08x\n", ret); - ok(value.CStatus == ERROR_SUCCESS, "expected ERROR_SUCCESS got %x", value.CStatus); + ok(value.CStatus == ERROR_SUCCESS, "expected ERROR_SUCCESS got %x\n", value.CStatus); ret = PdhCloseQuery( query ); ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret);

1 0

Francois Gouget : ddraw: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 5b375aec71419a5a5bb57a42293ef348d6dc96a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b375aec71419a5a5bb57a422… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:39:04 2007 +0200 ddraw: Better match the PSDK types and fix the winapi_check warnings. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/main.c | 10 +++++----- include/ddraw.h | 13 +++++++------ tools/winapi/win32.api | 6 ++---- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index dbab8db..696552d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3112,7 +3112,7 @@ IDirectDrawImpl_AttachD3DDevice(IDirectDrawImpl *This, *****************************************************************************/ HRESULT WINAPI DirectDrawCreateClipper(DWORD Flags, - IDirectDrawClipper **Clipper, + LPDIRECTDRAWCLIPPER *Clipper, IUnknown *UnkOuter) { IDirectDrawClipperImpl* object; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 54b35dc..4e77d4f 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -345,7 +345,7 @@ err_out: ***********************************************************************/ HRESULT WINAPI DirectDrawCreate(GUID *GUID, - IDirectDraw **DD, + LPDIRECTDRAW *DD, IUnknown *UnkOuter) { HRESULT hr; @@ -368,7 +368,7 @@ DirectDrawCreate(GUID *GUID, ***********************************************************************/ HRESULT WINAPI DirectDrawCreateEx(GUID *GUID, - void **DD, + LPVOID *DD, REFIID iid, IUnknown *UnkOuter) { @@ -406,7 +406,7 @@ DirectDrawCreateEx(GUID *GUID, ***********************************************************************/ HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback, - void *Context) + LPVOID Context) { BOOL stop = FALSE; @@ -440,7 +440,7 @@ DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback, ***********************************************************************/ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback, - void *Context, + LPVOID Context, DWORD Flags) { BOOL stop = FALSE; @@ -834,7 +834,7 @@ static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, c BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD Reason, - void *lpv) + LPVOID lpv) { TRACE("(%p,%x,%p)\n", hInstDLL, Reason, lpv); if (Reason == DLL_PROCESS_ATTACH) diff --git a/include/ddraw.h b/include/ddraw.h index 938a19a..0f7a6c1 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1065,6 +1065,10 @@ typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONI typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR); 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 DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags); #define DirectDrawEnumerateEx WINELIB_NAME_AW(DirectDrawEnumerateEx) @@ -2663,12 +2667,9 @@ DECLARE_INTERFACE_(IDirectDrawGammaControl,IUnknown) #endif -HRESULT WINAPI DirectDrawCreate(LPGUID,LPDIRECTDRAW*,LPUNKNOWN); -HRESULT WINAPI DirectDrawCreateEx(LPGUID,LPVOID*,REFIID,LPUNKNOWN); -HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID); -HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID); -#define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate) -HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,LPUNKNOWN); +HRESULT WINAPI DirectDrawCreate(GUID*,LPDIRECTDRAW*,IUnknown*); +HRESULT WINAPI DirectDrawCreateEx(GUID*,LPVOID*,REFIID,IUnknown*); +HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,IUnknown*); #ifdef __cplusplus } /* extern "C" */ diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 2636c29..e28cfd1 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1008,14 +1008,12 @@ HRESULT %ptr +GUID * +IUnknown * LPDDENUMCALLBACKA LPDDENUMCALLBACKEXA -LPDDENUMCALLBACKEXW -LPDDENUMCALLBACKW LPDIRECTDRAW * LPDIRECTDRAWCLIPPER * -LPGUID -LPUNKNOWN LPVOID LPVOID * REFCLSID

1 0