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

Francois Gouget : hlink: Add a missing prototype and update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 7a94a171a56179a07268152a49236053c96cafd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a94a171a56179a07268152a4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:51:45 2007 +0200 hlink: Add a missing prototype and update win32.api to fix the winapi_check warnings. --- include/hlink.idl | 1 + tools/winapi/win32.api | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/include/hlink.idl b/include/hlink.idl index 884c4be..9642956 100644 --- a/include/hlink.idl +++ b/include/hlink.idl @@ -26,6 +26,7 @@ interface IHlinkBrowseContext; cpp_quote("HRESULT WINAPI HlinkCreateFromMoniker(IMoniker*, LPCWSTR, LPCWSTR, IHlinkSite*, DWORD, IUnknown*, REFIID, void**);") cpp_quote("HRESULT WINAPI HlinkCreateFromString(LPCWSTR, LPCWSTR, LPCWSTR, IHlinkSite*, DWORD, IUnknown*, REFIID, void**);") cpp_quote("HRESULT WINAPI HlinkCreateFromData(IDataObject*, IHlinkSite*, DWORD dwSiteData, IUnknown*, REFIID, void**);") +cpp_quote("HRESULT WINAPI HlinkCreateExtensionServices(LPCWSTR, HWND, LPCWSTR, LPCWSTR, IUnknown*, REFIID, void**);") cpp_quote("HRESULT WINAPI HlinkQueryCreateFromData(IDataObject*);") cpp_quote("HRESULT WINAPI HlinkClone(IHlink*, REFIID, IHlinkSite*, DWORD, void **);") cpp_quote("HRESULT WINAPI HlinkCreateBrowseContext(IUnknown*, REFIID, void **);") diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 5382646..f9f191a 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1549,6 +1549,34 @@ LPGUID void +%%hlink.dll + +%long + +DWORD +HRESULT +HWND + +%ptr + +IBindStatusCallback * +IDataObject * +IHlink * +IHlinkBrowseContext * +IHlinkFrame * +IHlinkSite * +IMoniker * +IUnknown * +LPBC +LPWSTR * +REFIID +ULONG * +void ** + +%wstr + +LPCWSTR + %%iccvid.dll %long

1 0

Francois Gouget : wintrust: Fix the CryptCATAdminReleaseCatalogContext() prototype and better match the PSDK types.
by Alexandre Julliard 08 Aug '07

08 Aug '07

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 : urlmon: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 08 Aug '07

08 Aug '07

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 : ntdll: Fix the RtlQueryInformationActivationContext() . spec prototype to match its implementation.
by Alexandre Julliard 08 Aug '07

08 Aug '07

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 : winapi_check: Fix a couple of dll names.
by Alexandre Julliard 08 Aug '07

08 Aug '07

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 : dnsapi: Better match the PSDK types, especially with regards to constness.
by Alexandre Julliard 08 Aug '07

08 Aug '07

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 : netapi32: Add some missing prototypes in the lmaccess.h, lmshare.h and lmwksta.h headers.
by Alexandre Julliard 08 Aug '07

08 Aug '07

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 : crypt32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 08 Aug '07

08 Aug '07

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 : winreg.h: Add RRF_RT_ANY.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: bb22543125182b1f56a50fadab3a768a814f26e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb22543125182b1f56a50fada… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 8 10:40:35 2007 +0200 winreg.h: Add RRF_RT_ANY. --- include/winreg.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winreg.h b/include/winreg.h index 4e04956..9d246c2 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -77,6 +77,7 @@ typedef ACCESS_MASK REGSAM; #define RRF_RT_REG_QWORD (1 << 6) #define RRF_RT_DWORD (RRF_RT_REG_BINARY | RRF_RT_REG_DWORD) #define RRF_RT_QWORD (RRF_RT_REG_BINARY | RRF_RT_REG_QWORD) +#define RRF_RT_ANY 0xffff #define RRF_NOEXPAND (1 << 28) #define RRF_ZEROONFAILURE (1 << 29)

1 0

Evan Stade : gdiplus: Updated brush cloner/deleter.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: ec3049168cb94d587487fa53b1ff14a8a7677f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3049168cb94d587487fa53b… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 7 18:42:56 2007 -0700 gdiplus: Updated brush cloner/deleter. --- dlls/gdiplus/brush.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index b855031..dca3a41 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -70,6 +70,14 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) break; } + case BrushTypeLinearGradient: + *clone = GdipAlloc(sizeof(GpLineGradient)); + if(!*clone) return OutOfMemory; + + memcpy(*clone, brush, sizeof(GpLineGradient)); + + (*clone)->gdibrush = CreateSolidBrush((*clone)->lb.lbColor); + break; default: return NotImplemented; } @@ -237,6 +245,7 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) GdipFree(((GpPathGradient*) brush)->pathdata.Types); break; case BrushTypeSolidColor: + case BrushTypeLinearGradient: default: break; }

1 0