November 2014 - Wine-Commits

Sebastian Lackner : kernel32: Set proper error codes if FindFirstFileExW doesn' t support specific search_ops / levels.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 3e3b03a13eba14ddb2f9d5ce331d51ed7e7834c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3b03a13eba14ddb2f9d5ce3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 3 20:01:19 2014 +0200 kernel32: Set proper error codes if FindFirstFileExW doesn't support specific search_ops / levels. --- dlls/kernel32/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 512b63e..4a6fc13 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1872,11 +1872,13 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, if (search_op != FindExSearchNameMatch && search_op != FindExSearchLimitToDirectories) { FIXME("search_op not implemented 0x%08x\n", search_op); + SetLastError( ERROR_INVALID_PARAMETER ); return INVALID_HANDLE_VALUE; } if (level != FindExInfoStandard) { FIXME("info level %d not implemented\n", level ); + SetLastError( ERROR_INVALID_PARAMETER ); return INVALID_HANDLE_VALUE; }

1 0

Sebastian Lackner : iphlpapi: Add stub for CancelMibChangeNotify2.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 2eded57ffe511029e5423a9a588fc2d418cd91bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eded57ffe511029e5423a9a5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 27 02:29:21 2014 +0100 iphlpapi: Add stub for CancelMibChangeNotify2. Based on a patch by Yann Leretaille. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 9eb5a32..ccfa6c8 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -8,7 +8,7 @@ @ stdcall AllocateAndGetTcpTableFromStack( ptr long long long ) @ stdcall AllocateAndGetUdpTableFromStack( ptr long long long ) @ stdcall CancelIPChangeNotify( ptr ) -#@ stub CancelMibChangeNotify2 +@ stdcall CancelMibChangeNotify2( ptr ) #@ stub ConvertGuidToStringA #@ stub ConvertGuidToStringW #@ stub ConvertInterfaceAliasToLuid diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4d66810..967fb06 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -198,6 +198,15 @@ BOOL WINAPI CancelIPChangeNotify(LPOVERLAPPED overlapped) } +/****************************************************************** + * CancelMibChangeNotify2 (IPHLPAPI.@) + */ +DWORD WINAPI CancelMibChangeNotify2(HANDLE handle) +{ + FIXME("(handle %p): stub\n", handle); + return NO_ERROR; +} + /****************************************************************** * CreateIpForwardEntry (IPHLPAPI.@)

1 0

Amine Khaldi : gdi32/tests: Add basic tests for the handling of dwCount parameter in ExtCreateRegion.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: b9f18b343150aac717f1aa9f6bf02bd98183003b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f18b343150aac717f1aa9f6… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sun Nov 2 23:40:42 2014 +0100 gdi32/tests: Add basic tests for the handling of dwCount parameter in ExtCreateRegion. --- dlls/gdi32/tests/clipping.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index e90f2f4..64f2a1d 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -184,11 +184,12 @@ static void test_ExtCreateRegion(void) { static const RECT empty_rect; static const RECT rc = { 111, 222, 333, 444 }; + static const RECT arc[2] = { {0, 0, 10, 10}, {10, 10, 20, 20}}; static const RECT rc_xformed = { 76, 151, 187, 262 }; union { RGNDATA data; - char buf[sizeof(RGNDATAHEADER) + sizeof(RECT)]; + char buf[sizeof(RGNDATAHEADER) + 2 * sizeof(RECT)]; } rgn; HRGN hrgn; XFORM xform; @@ -224,6 +225,20 @@ static void test_ExtCreateRegion(void) rgn.data.rdh.iType = RDH_RECTANGLES; rgn.data.rdh.dwSize = sizeof(rgn.data.rdh); + /* sizeof(RGNDATAHEADER) is large enough */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER), &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); + verify_region(hrgn, &empty_rect); + DeleteObject(hrgn); + + /* Cannot be smaller than sizeof(RGNDATAHEADER) */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) - 1, &rgn.data); + todo_wine + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == 0xdeadbeef, "0xdeadbeef, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); @@ -234,6 +249,13 @@ static void test_ExtCreateRegion(void) SetRectEmpty(&rgn.data.rdh.rcBound); memcpy(rgn.data.Buffer, &rc, sizeof(rc)); + /* With a single rect this seems to work... */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) + sizeof(RECT) - 1, &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); + verify_region(hrgn, &rc); + DeleteObject(hrgn); + SetLastError(0xdeadbeef); hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); @@ -267,6 +289,18 @@ static void test_ExtCreateRegion(void) ok(hrgn != 0, "ExtCreateRegion error %u/%x\n", GetLastError(), GetLastError()); verify_region(hrgn, &rc_xformed); DeleteObject(hrgn); + + rgn.data.rdh.nCount = 2; + SetRectEmpty(&rgn.data.rdh.rcBound); + memcpy(rgn.data.Buffer, arc, sizeof(arc)); + + /* Buffer cannot be smaller than sizeof(RGNDATAHEADER) + 2 * sizeof(RECT) */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) + 2 * sizeof(RECT) - 1, &rgn.data); + todo_wine + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == 0xdeadbeef, "0xdeadbeef, got %u\n", GetLastError()); + } static void test_GetClipRgn(void)

1 0

Bruno Jesus : crypt32: Remove dead assignments in cert.c (Cppcheck).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 9df1f2fa8741df0d3c1d96a4a6c5b42abe0b6544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df1f2fa8741df0d3c1d96a4a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 23:44:29 2014 -0200 crypt32: Remove dead assignments in cert.c (Cppcheck). --- dlls/crypt32/cert.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c35f504..0cda2c4 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -984,7 +984,7 @@ static BOOL container_matches_cert(PCCERT_CONTEXT pCert, LPCSTR container, { CRYPT_KEY_PROV_INFO copy; WCHAR containerW[MAX_PATH]; - BOOL matches = FALSE; + BOOL matches; MultiByteToWideChar(CP_ACP, 0, container, -1, containerW, sizeof(containerW) / sizeof(containerW[0])); @@ -1142,7 +1142,7 @@ static BOOL cert_prov_info_matches_cert(PCCERT_CONTEXT pCert) BOOL WINAPI CryptFindCertificateKeyProvInfo(PCCERT_CONTEXT pCert, DWORD dwFlags, void *pvReserved) { - BOOL matches = FALSE; + BOOL matches; TRACE("(%p, %08x, %p)\n", pCert, dwFlags, pvReserved); @@ -2887,7 +2887,7 @@ static void CRYPT_SetBitInField(struct BitField *field, DWORD bit) static BOOL CRYPT_IsBitInFieldSet(const struct BitField *field, DWORD bit) { - BOOL set = FALSE; + BOOL set; DWORD indexIndex = bit / BITS_PER_DWORD; assert(field->cIndexes); @@ -3099,7 +3099,6 @@ static void CertContext_SetKeyProvInfo(PCCERT_CONTEXT context, CryptMemFree(szProvider); } } - size = sizeof(info.dwKeySpec); /* in case no CRYPT_KEY_PROV_INFO given, * we always use AT_SIGNATURE key spec */

1 0

Henri Verbeet : d2d1: Implement d2d_gradient_GetGradientStopCount().
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 5279ad5b9f8d4d6aab9d7e57bfc0490201008be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5279ad5b9f8d4d6aab9d7e57b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 3 08:59:37 2014 +0100 d2d1: Implement d2d_gradient_GetGradientStopCount(). --- dlls/d2d1/brush.c | 8 ++++++-- dlls/d2d1/d2d1_private.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 6e46036..4d7a5ad 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -80,9 +80,11 @@ static void STDMETHODCALLTYPE d2d_gradient_GetFactory(ID2D1GradientStopCollectio static UINT32 STDMETHODCALLTYPE d2d_gradient_GetGradientStopCount(ID2D1GradientStopCollection *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_gradient *gradient = impl_from_ID2D1GradientStopCollection(iface); - return 0; + TRACE("iface %p.\n", iface); + + return gradient->stop_count; } static void STDMETHODCALLTYPE d2d_gradient_GetGradientStops(ID2D1GradientStopCollection *iface, @@ -124,6 +126,8 @@ void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_ gradient->ID2D1GradientStopCollection_iface.lpVtbl = &d2d_gradient_vtbl; gradient->refcount = 1; + + gradient->stop_count = stop_count; } static void d2d_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 2d1fea2..3fd3cdd 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -85,6 +85,8 @@ struct d2d_gradient { ID2D1GradientStopCollection ID2D1GradientStopCollection_iface; LONG refcount; + + UINT32 stop_count; }; void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target,

1 0

Henri Verbeet : d3d10core/tests: Add a test for ID3D10Device_ClearState().
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: cab0d8ca31b75c0b949410b51107f9fe82773faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab0d8ca31b75c0b949410b51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 3 08:59:35 2014 +0100 d3d10core/tests: Add a test for ID3D10Device_ClearState(). --- dlls/d3d10core/tests/device.c | 868 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 868 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cab0d8ca31b75c0b94941…

1 0

Sebastian Lackner : iphlpapi: Add stub for NotifyIpInterfaceChange.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 7796661b4ce8d25049839dbe20f96b258d9e42e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7796661b4ce8d25049839dbe2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 27 02:50:05 2014 +0100 iphlpapi: Add stub for NotifyIpInterfaceChange. Based on a patch by Yann Leretaille. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index ccfa6c8..c51b58b 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -233,7 +233,7 @@ @ stub NhpAllocateAndGetInterfaceInfoFromStack @ stub NhpGetInterfaceIndexFromStack @ stdcall NotifyAddrChange( ptr ptr ) -#@ stub NotifyIpInterfaceChange +@ stdcall NotifyIpInterfaceChange( long ptr ptr long ptr ) @ stdcall NotifyRouteChange( ptr ptr ) #@ stub NotifyRouteChange2 @ stub NotifyRouteChangeEx diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 967fb06..c06b69f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2293,6 +2293,19 @@ DWORD WINAPI NotifyAddrChange(PHANDLE Handle, LPOVERLAPPED overlapped) /****************************************************************** + * NotifyIpInterfaceChange (IPHLPAPI.@) + */ +DWORD WINAPI NotifyIpInterfaceChange(ULONG family, PVOID callback, PVOID context, + BOOLEAN init_notify, PHANDLE handle) +{ + FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", + family, callback, context, init_notify, handle); + if (handle) *handle = NULL; + return ERROR_NOT_SUPPORTED; +} + + +/****************************************************************** * NotifyRouteChange (IPHLPAPI.@) * * Notify caller whenever the ip routing table is changed.

1 0

Austin English : msi: Add stubs for MsiRemovePatches(A/W).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: d2bc004264a9e140005758165a770f4b32165fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2bc004264a9e140005758165… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Nov 2 20:28:02 2014 -0600 msi: Add stubs for MsiRemovePatches(A/W). --- dlls/msi/msi.c | 18 ++++++++++++++++++ dlls/msi/msi.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 433776d..6589ca9 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4244,3 +4244,21 @@ UINT WINAPI Migrate10CachedPackagesW(void* a, void* b, void* c, DWORD d) FIXME("%p,%p,%p,%08x\n", a, b, c, d); return ERROR_SUCCESS; } + +/*********************************************************************** + * MsiRemovePatchesA [MSI.@] + */ +UINT WINAPI MsiRemovePatchesA(LPCSTR patchlist, LPCSTR product, INSTALLTYPE type, LPCSTR propertylist) +{ + FIXME("(%s %s %d %s\n", debugstr_a(patchlist), debugstr_a(product), type, debugstr_a(propertylist)); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * MsiRemovePatchesW [MSI.@] + */ +UINT WINAPI MsiRemovePatchesW(LPCWSTR patchlist, LPCWSTR product, INSTALLTYPE type, LPCWSTR propertylist) +{ + FIXME("(%s %s %d %s\n", debugstr_w(patchlist), debugstr_w(product), type, debugstr_w(propertylist)); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index a2b1007..2d065b1 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -230,8 +230,8 @@ 234 stub MsiDeleteUserDataW 235 stub Migrate10CachedPackagesA 236 stdcall Migrate10CachedPackagesW(ptr ptr ptr long) -237 stub MsiRemovePatchesA -238 stub MsiRemovePatchesW +237 stdcall MsiRemovePatchesA(str str long str) +238 stdcall MsiRemovePatchesW(wstr wstr long wstr) 239 stdcall MsiApplyMultiplePatchesA(str str str) 240 stdcall MsiApplyMultiplePatchesW(wstr wstr wstr) 241 stub MsiExtractPatchXMLDataA

1 0

Michael Stefaniuc : crypt32/tests: Avoid an always true ok() condition ( PVS-Studio).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 25b4a92813f8ec44d5c0c6112c135f0b903c8e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b4a92813f8ec44d5c0c6112… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 22:28:15 2014 +0100 crypt32/tests: Avoid an always true ok() condition (PVS-Studio). --- dlls/crypt32/tests/ctl.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index 55bbc6e..79a60f8 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -390,20 +390,8 @@ static void testAddCTLToStore(void) signedCTLWithCTLInnerContentAndBadSig, sizeof(signedCTLWithCTLInnerContentAndBadSig), CERT_STORE_ADD_NEW, NULL); - if (ret) - { - /* win9x */ - ok(GetLastError() == CRYPT_E_NOT_FOUND || - GetLastError() == OSS_DATA_ERROR /* some win98 */, - "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); - } - else - { - ok(!ret && (GetLastError() == CRYPT_E_EXISTS || - GetLastError() == OSS_DATA_ERROR), - "expected CRYPT_E_EXISTS or OSS_DATA_ERROR, got %d %08x\n", ret, - GetLastError()); - } + ok(!ret && (GetLastError() == CRYPT_E_EXISTS || GetLastError() == OSS_DATA_ERROR), + "expected CRYPT_E_EXISTS or OSS_DATA_ERROR, got %d %08x\n", ret, GetLastError()); CertCloseStore(store, 0); store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,

1 0

Bruno Jesus : compobj.dll16: Remove dead assignments in compobj.c ( Cppcheck).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 00a6a1ac2fdbbf76c1d0458864f9c1cc14cc90c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a6a1ac2fdbbf76c1d045886… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 23:44:39 2014 -0200 compobj.dll16: Remove dead assignments in compobj.c (Cppcheck). --- dlls/compobj.dll16/compobj.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index ed36564..6261c13 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -668,18 +668,17 @@ HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid) { char *buf,buf2[80]; LONG buf2len; - HRESULT err; HKEY xhkey; buf = HeapAlloc(GetProcessHeap(),0,strlen(progid)+8); sprintf(buf,"%s\\CLSID",progid); - if ((err=RegOpenKeyA(HKEY_CLASSES_ROOT,buf,&xhkey))) { + if (RegOpenKeyA(HKEY_CLASSES_ROOT,buf,&xhkey)) { HeapFree(GetProcessHeap(),0,buf); return CO_E_CLASSSTRING; } HeapFree(GetProcessHeap(),0,buf); buf2len = sizeof(buf2); - if ((err=RegQueryValueA(xhkey,NULL,buf2,&buf2len))) { + if (RegQueryValueA(xhkey,NULL,buf2,&buf2len)) { RegCloseKey(xhkey); return CO_E_CLASSSTRING; }

1 0