February 2011 - Wine-Commits

Ken Thomases : user32: Rename GetKeyboardLayout param; it's a thread ID, not a layout.
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: 9cb4c21f1a864e8002f868956fa18a8fb5a63f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb4c21f1a864e8002f868956… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 9 22:41:34 2011 -0600 user32: Rename GetKeyboardLayout param; it's a thread ID, not a layout. --- dlls/user32/driver.c | 6 +++--- dlls/user32/input.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index f2f9892..5d49882 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -176,7 +176,7 @@ static INT CDECL nulldrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) return 0; } -static HKL CDECL nulldrv_GetKeyboardLayout( DWORD layout ) +static HKL CDECL nulldrv_GetKeyboardLayout( DWORD thread_id ) { return 0; } @@ -529,9 +529,9 @@ static INT CDECL loaderdrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size return load_driver()->pGetKeyNameText( lparam, buffer, size ); } -static HKL CDECL loaderdrv_GetKeyboardLayout( DWORD layout ) +static HKL CDECL loaderdrv_GetKeyboardLayout( DWORD thread_id ) { - return load_driver()->pGetKeyboardLayout( layout ); + return load_driver()->pGetKeyboardLayout( thread_id ); } static BOOL CDECL loaderdrv_GetKeyboardLayoutName( LPWSTR name ) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 6e1e459..48430e9 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -688,9 +688,9 @@ UINT WINAPI GetKBCodePage(void) * the language id. This is the way Windows default works. * - the thread identifier (dwLayout) is also ignored. */ -HKL WINAPI GetKeyboardLayout(DWORD dwLayout) +HKL WINAPI GetKeyboardLayout(DWORD thread_id) { - return USER_Driver->pGetKeyboardLayout(dwLayout); + return USER_Driver->pGetKeyboardLayout(thread_id); } /****************************************************************************

1 0

Hans Leidekker : msi: Get rid of msi_component_set_state and msi_feature_set_state.
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: ba9f1f770a57a4e0cd9947ce7102c270b2318052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba9f1f770a57a4e0cd9947ce7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 10 15:56:15 2011 +0100 msi: Get rid of msi_component_set_state and msi_feature_set_state. --- dlls/msi/action.c | 229 ++++++++++++++++++---------------------------- dlls/msi/dialog.c | 2 +- dlls/msi/files.c | 38 ++++---- dlls/msi/helpers.c | 30 +++++-- dlls/msi/install.c | 2 +- dlls/msi/msipriv.h | 2 - dlls/msi/tests/package.c | 4 +- 7 files changed, 133 insertions(+), 174 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba9f1f770a57a4e0cd994…

1 0

Austin English : gdiplus/tests: Remove redundant assignments (LLVM/Clang).
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: 2ebcaf1a5108d713553db2d7ac37315192e3bf84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ebcaf1a5108d713553db2d7a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:54 2011 -0800 gdiplus/tests: Remove redundant assignments (LLVM/Clang). --- dlls/gdiplus/tests/graphics.c | 176 ++++++++++++++++++++-------------------- 1 files changed, 88 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ebcaf1a5108d713553db…

1 0

Austin English : gdiplus/tests: Make sure to use return values (LLVM/Clang) .
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: e77d27a2eb0c413d516d0f505d60f95ac97cc557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e77d27a2eb0c413d516d0f505… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:51 2011 -0800 gdiplus/tests: Make sure to use return values (LLVM/Clang). --- dlls/gdiplus/tests/graphics.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 940dbef..e07b889 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -593,6 +593,7 @@ static void test_BeginContainer2(void) GdipSetClipRect(graphics, 2, 4, 6, 8, CombineModeReplace); status = GdipEndContainer(graphics, cont2); + expect(Ok, status); GdipGetClipBounds(graphics, &clip); ok(fabs(defClip[0] - clip.X) < 0.0001 && @@ -604,6 +605,7 @@ static void test_BeginContainer2(void) clip.X, clip.Y, clip.Width, clip.Height); status = GdipEndContainer(graphics, cont1); + expect(Ok, status); /* nesting */ status = GdipBeginContainer2(graphics, &cont1); @@ -1757,6 +1759,7 @@ static void test_get_set_clip(void) rect.Height = rect.Width = 100.0; status = GdipCreateRegionRect(&rect, &clip); + expect(Ok, status); /* NULL arguments */ status = GdipGetClip(NULL, NULL); @@ -1878,6 +1881,7 @@ static void test_textcontrast(void) status = GdipGetTextContrast(graphics, NULL); expect(InvalidParameter, status); status = GdipGetTextContrast(graphics, &contrast); + expect(Ok, status); expect(4, contrast); GdipDeleteGraphics(graphics);

1 0

Austin English : secur32/tests: Don't check return values inside of if(0) ( LLVM/Clang).
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: 7868edd86e1f3bfc19c48d17003b1cfd97bb92c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7868edd86e1f3bfc19c48d170… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:43:47 2011 -0800 secur32/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/secur32/tests/secur32.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 0ad6f0f..6a46e9b 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -118,7 +118,7 @@ static void testGetUserNameExA(void) } if (0) /* Crashes on Windows */ - rc = pGetUserNameExA(NameSamCompatible, NULL, NULL); + pGetUserNameExA(NameSamCompatible, NULL, NULL); size = 0; rc = pGetUserNameExA(NameSamCompatible, NULL, &size); @@ -128,7 +128,7 @@ static void testGetUserNameExA(void) if (0) /* Crashes on Windows with big enough size */ { /* Returned size is already big enough */ - rc = pGetUserNameExA(NameSamCompatible, NULL, &size); + pGetUserNameExA(NameSamCompatible, NULL, &size); } size = 0; @@ -165,7 +165,7 @@ static void testGetUserNameExW(void) } if (0) /* Crashes on Windows */ - rc = pGetUserNameExW(NameSamCompatible, NULL, NULL); + pGetUserNameExW(NameSamCompatible, NULL, NULL); size = 0; rc = pGetUserNameExW(NameSamCompatible, NULL, &size); @@ -175,7 +175,7 @@ static void testGetUserNameExW(void) if (0) /* Crashes on Windows with big enough size */ { /* Returned size is already big enough */ - rc = pGetUserNameExW(NameSamCompatible, NULL, &size); + pGetUserNameExW(NameSamCompatible, NULL, &size); } size = 0;

1 0

Austin English : mshtml/tests: Make sure return value is used (LLVM/Clang).
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: 0161db5e87a233454342710e38978351797a22a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0161db5e87a233454342710e3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:43:51 2011 -0800 mshtml/tests: Make sure return value is used (LLVM/Clang). --- dlls/mshtml/tests/events.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 07476bc..b883f8b 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -984,6 +984,7 @@ static HRESULT WINAPI iframe_onreadystatechange(IDispatchEx *iface, DISPID id, L ok(hres == S_OK, "get_document failed: %08x\n", hres); hres = IHTMLDocument2_get_readyState(iframe_doc, &str2); + ok(hres == S_OK, "get_document failed: %08x\n", hres); ok(!lstrcmpW(str, str2), "unexpected document readyState %s\n", wine_dbgstr_w(str2)); SysFreeString(str2);

1 0

Austin English : ntdll/tests: Make sure return value is used (LLVM/Clang).
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: c549e34255819330862cb8d716b97418e7ddcafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c549e34255819330862cb8d71… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:43:54 2011 -0800 ntdll/tests: Make sure return value is used (LLVM/Clang). --- dlls/ntdll/tests/reg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 1cad29e..8f44a1d 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -637,6 +637,7 @@ static void test_NtDeleteKey(void) InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); status = pNtOpenKey(&hkey, am, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); status = pNtDeleteKey(hkey); ok(status == STATUS_SUCCESS, "NtDeleteKey Failed: 0x%08x\n", status);

1 0

Austin English : ole32/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: f0ca65a287277143964fc34f5d05df05f4988d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ca65a287277143964fc34f5… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:25 2011 -0800 ole32/tests: Make sure to use return values (LLVM/Clang). --- dlls/ole32/tests/marshal.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 25253d3..86a8f0f 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1767,12 +1767,8 @@ static void test_proxybuffer(REFIID riid) refs = IUnknown_Release(&pUnkOuter->IUnknown_iface); ok(refs == 1, "Ref count of outer unknown should have been 1 instead of %d\n", refs); - refs = IPSFactoryBuffer_Release(psfb); - if (0) - { - /* not reliable on native. maybe it leaks references! */ - ok(refs == 0, "Ref-count leak of %d on IPSFactoryBuffer\n", refs); - } + /* Not checking return, unreliable on native. Maybe it leaks references? */ + IPSFactoryBuffer_Release(psfb); refs = IUnknown_Release((IUnknown *)lpvtbl); ok(refs == 0, "Ref-count leak of %d on IRpcProxyBuffer\n", refs); @@ -1800,12 +1796,8 @@ static void test_stubbuffer(REFIID riid) hr = IPSFactoryBuffer_CreateStub(psfb, riid, (IUnknown*)&Test_ClassFactory, &stub); ok_ole_success(hr, IPSFactoryBuffer_CreateStub); - refs = IPSFactoryBuffer_Release(psfb); - if (0) - { - /* not reliable on native. maybe it leaks references */ - ok(refs == 0, "Ref-count leak of %d on IPSFactoryBuffer\n", refs); - } + /* Not checking return, unreliable on native. Maybe it leaks references? */ + IPSFactoryBuffer_Release(psfb); ok_more_than_one_lock(); @@ -1916,6 +1908,7 @@ static LRESULT CALLBACK window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM l * WM_QUIT message doesn't stop the call from succeeding */ PostMessage(hwnd, WM_QUIT, 0, 0); hr = IClassFactory_CreateInstance(proxy, NULL, &IID_IUnknown, (void **)&object); + ok(hr == S_FALSE, "IClassFactory_CreateInstance returned 0x%08x, expected S_FALSE\n", hr); IClassFactory_Release(proxy);

1 0

Austin English : crypt32/tests: Make sure to use return values (LLVM/Clang) .
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: f900a8b0353253d22f8ecd1b349feecb3153a74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f900a8b0353253d22f8ecd1b3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:04 2011 -0800 crypt32/tests: Make sure to use return values (LLVM/Clang). --- dlls/crypt32/tests/cert.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 9ee53fe..b1a993d 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -487,6 +487,8 @@ static void testCertProperties(void) size = sizeof(hashProperty); ret = CertGetCertificateContextProperty(context, CERT_HASH_PROP_ID, hashProperty, &size); + ok(ret, "CertGetCertificateContextProperty failed: %08x\n", + GetLastError()); ok(!memcmp(hashProperty, hash, sizeof(hash)), "Unexpected hash\n"); /* Delete the (bogus) hash, and get the real one */ ret = CertSetCertificateContextProperty(context, CERT_HASH_PROP_ID, 0, @@ -1520,6 +1522,7 @@ static void testGetIssuerCert(void) /* Adding an issuer allows one (and only one) issuer to be found */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain10_1, sizeof(chain10_1), CERT_STORE_ADD_ALWAYS, &cert1); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == cert1, "Expected cert1 to be the issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); @@ -1530,6 +1533,7 @@ static void testGetIssuerCert(void) */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain10_0, sizeof(chain10_0), CERT_STORE_ADD_ALWAYS, &cert2); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == cert2, "Expected cert2 to be the first issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); @@ -1549,11 +1553,13 @@ static void testGetIssuerCert(void) /* With only the child certificate, no issuer will be found */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain7_1, sizeof(chain7_1), CERT_STORE_ADD_ALWAYS, &child); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == NULL, "Expected no issuer\n"); /* Adding an issuer allows one (and only one) issuer to be found */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain10_0, sizeof(chain10_0), CERT_STORE_ADD_ALWAYS, &cert1); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == cert1, "Expected cert1 to be the issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); @@ -1564,6 +1570,7 @@ static void testGetIssuerCert(void) */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain10_1, sizeof(chain10_1), CERT_STORE_ADD_ALWAYS, &cert2); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == cert2, "Expected cert2 to be the first issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); @@ -2015,6 +2022,8 @@ static void testCreateSelfSignCert(void) CryptReleaseContext(csp, 0); ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); + /* do the same test with AT_KEYEXCHANGE and key info*/ memset(&info,0,sizeof(info)); @@ -2083,7 +2092,7 @@ static void testIntendedKeyUsage(void) if (0) { /* Crash */ - ret = CertGetIntendedKeyUsage(0, NULL, NULL, 0); + CertGetIntendedKeyUsage(0, NULL, NULL, 0); } ret = CertGetIntendedKeyUsage(0, &info, NULL, 0); ok(!ret, "expected failure\n"); @@ -2093,6 +2102,7 @@ static void testIntendedKeyUsage(void) ok(!ret, "expected failure\n"); ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, usage_bytes, sizeof(usage_bytes)); + ok(!ret, "expected failure\n"); info.cExtension = 1; info.rgExtension = &ext; ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, NULL, 0); @@ -2251,6 +2261,8 @@ static void testKeyUsage(void) SetLastError(0xbaadcafe); size = sizeof(buf); ret = CertGetEnhancedKeyUsage(context, 0, pUsage, &size); + ok(ret || broken(!ret && GetLastError() == CRYPT_E_NOT_FOUND /* NT4 */), + "CertGetEnhancedKeyUsage failed: %08x\n", GetLastError()); ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); @@ -2656,9 +2668,8 @@ static void testIsRDNAttrsInCertificateName(void) if (0) { /* Crash */ - ret = CertIsRDNAttrsInCertificateName(0, 0, NULL, NULL); - ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, - NULL); + CertIsRDNAttrsInCertificateName(0, 0, NULL, NULL); + CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, NULL); } SetLastError(0xdeadbeef); ret = CertIsRDNAttrsInCertificateName(0, 0, &name, NULL); @@ -2932,7 +2943,7 @@ static void testHashToBeSigned(void) /* Crash */ if (0) { - ret = CryptHashToBeSigned(0, 0, NULL, 0, NULL, NULL); + CryptHashToBeSigned(0, 0, NULL, 0, NULL, NULL); } SetLastError(0xdeadbeef); ret = CryptHashToBeSigned(0, 0, NULL, 0, NULL, &size); @@ -2973,6 +2984,9 @@ static void testHashToBeSigned(void) ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, md5SignedEmptyCert, sizeof(md5SignedEmptyCert), hash, &size); + ok(ret || broken(!ret && GetLastError() == NTE_BAD_ALGID) /* NT4 */, + "CryptHashToBeSigned failed: %08x\n", GetLastError()); + ok(!memcmp(hash, md5SignedEmptyCertHash, size), "unexpected value\n"); } @@ -2981,9 +2995,9 @@ static void testCompareCert(void) CERT_INFO info1 = { 0 }, info2 = { 0 }; BOOL ret; - /* Crashes - ret = CertCompareCertificate(X509_ASN_ENCODING, NULL, NULL); - */ + /* Crashes */ + if (0) + CertCompareCertificate(X509_ASN_ENCODING, NULL, NULL); /* Certs with the same issuer and serial number are equal, even if they * differ in other respects (like subject).

1 0

Austin English : dsound/tests: Make sure to use a return value (LLVM/Clang) .
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: f6fb95230c17438712ceb8ed30ac2eb42e66f912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6fb95230c17438712ceb8ed3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:22 2011 -0800 dsound/tests: Make sure to use a return value (LLVM/Clang). --- dlls/dsound/tests/duplex.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index 11fb2a7..0f8d6d1 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -93,8 +93,9 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo, ok(rc==DS_OK,"IDirectSoundFullDuplex_QueryInterface(IID_IDirectSoundFullDuplex) " "failed: %08x\n",rc); if (rc==DS_OK) { - ok (dsfdo==dsfd, "different interfaces\n"); + ok(dsfdo==dsfd, "different interfaces\n"); ref=IDirectSound8_Release(dsfd); + ok(ref==1, "IDirectSoundFullDuplex_Release() has %d references, should have 1\n", ref); } ref=IDirectSoundFullDuplex_Release(dsfdo);

1 0