wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

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

10 Feb '11

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

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

10 Feb '11

Module: wine Branch: master Commit: 273065cebee039ab61aa22835810fb0003c08f1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=273065cebee039ab61aa22835… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:18 2011 -0800 gdiplus/tests: Make sure to use return values (LLVM/Clang). --- dlls/gdiplus/tests/image.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 989e0bb..6e62178 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -937,6 +937,7 @@ static void test_fromhicon(void) expect(Ok, stat); expect(ImageTypeBitmap, type); stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); + expect(Ok, stat); expect(PixelFormat32bppARGB, format); /* raw format */ expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, FALSE); @@ -973,6 +974,7 @@ static void test_fromhicon(void) expect(Ok, stat); expect(ImageTypeBitmap, type); stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); + expect(Ok, stat); expect(PixelFormat32bppARGB, format); /* raw format */ expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, FALSE);

1 0

Austin English : gdi32/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard 10 Feb '11

10 Feb '11

Module: wine Branch: master Commit: a13e596c78afbc40308621b34075910fd3aaf6e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a13e596c78afbc40308621b34… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:13 2011 -0800 gdi32/tests: Make sure to use return values (LLVM/Clang). --- dlls/gdi32/tests/metafile.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index d036065..a4630f1 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -520,8 +520,10 @@ static void test_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 0,"Expecting ViewportOrg x of 0, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 120,"Expecting ViewportExt cx of 120, got %i\n",size.cx); ret = SaveDC(hdcMetafile); ok(ret == 1, "ret = %d\n", ret); @@ -535,8 +537,10 @@ static void test_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 10,"Expecting ViewportOrg x of 10, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 200,"Expecting ViewportExt cx of 200, got %i\n",size.cx); ret = SaveDC(hdcMetafile); ok(ret == 2, "ret = %d\n", ret); @@ -552,8 +556,10 @@ static void test_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 20,"Expecting ViewportOrg x of 20, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 300,"Expecting ViewportExt cx of 300, got %i\n",size.cx); ret = SaveDC(hdcMetafile); ok(ret == 3, "ret = %d\n", ret); @@ -572,15 +578,19 @@ static void test_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 30,"Expecting ViewportOrg x of 30, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 400,"Expecting ViewportExt cx of 400, got %i\n",size.cx); ret = RestoreDC(hdcMetafile, -1); ok(ret, "ret = %d\n", ret); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 20,"Expecting ViewportOrg x of 20, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 300,"Expecting ViewportExt cx of 300, got %i\n",size.cx); ok( GetPolyFillMode( hdcMetafile ) == ALTERNATE, "PolyFillMode not restored\n" ); ok( GetBkColor( hdcMetafile ) == 0, "Background color not restored\n" ); @@ -588,14 +598,18 @@ static void test_SaveDC(void) ok(ret == 3, "ret = %d\n", ret); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 20,"Expecting ViewportOrg x of 20, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 300,"Expecting ViewportExt cx of 300, got %i\n",size.cx); ret = RestoreDC(hdcMetafile, 1); ok(ret, "ret = %d\n", ret); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 0,"Expecting ViewportOrg x of 0, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 120,"Expecting ViewportExt cx of 120, got %i\n",size.cx); SetWindowOrgEx(hdcMetafile, -4, -4, NULL); @@ -607,15 +621,19 @@ static void test_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 40,"Expecting ViewportOrg x of 40, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 50,"Expecting ViewportExt cx of 50, got %i\n",size.cx); ret = SaveDC(hdcMetafile); ok(ret == 1, "ret = %d\n", ret); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 40,"Expecting ViewportOrg x of 40, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 50,"Expecting ViewportExt cx of 50, got %i\n",size.cx); ret = SaveDC(hdcMetafile); ok(ret == 2, "ret = %d\n", ret); @@ -643,8 +661,10 @@ static void test_SaveDC(void) ret = RestoreDC(hdcMetafile, 1); ok(ret, "ret = %d\n", ret); ret = GetViewportOrgEx(hdcMetafile, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); ok(pt.x == 40,"Expecting ViewportOrg x of 40, got %i\n",pt.x); ret = GetViewportExtEx(hdcMetafile, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); ok(size.cx == 50,"Expecting ViewportExt cx of 50, got %i\n",size.cx); hFontCheck = SelectObject(hdcMetafile, hFontOld); @@ -1996,6 +2016,7 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, ok(ret == sizeof(rgn2.data.rdh) + sizeof(RECT), "expected sizeof(rgn), got %u\n", ret); ret = GetRegionData(hrgn, sizeof(rgn2), &rgn2.data); + ok(ret == sizeof(rgn2), "expected sizeof(rgn2), got %u\n", ret); trace("size %u, type %u, count %u, rgn size %u, bound (%d,%d-%d,%d)\n", rgn2.data.rdh.dwSize, rgn2.data.rdh.iType,

1 0

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

10 Feb '11

Module: wine Branch: master Commit: ab4dba3e75f6e9c098317bad9160f2cde531deec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4dba3e75f6e9c098317bad9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:09 2011 -0800 kernel32/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/kernel32/tests/format_msg.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 1c4dd76..ea2ed43 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -143,7 +143,7 @@ static void test_message_from_string_wide(void) { SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, + FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, out, sizeof(out)/sizeof(WCHAR), NULL); } @@ -283,6 +283,7 @@ static void test_message_from_string_wide(void) r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14d, 0, 0, out, sizeof(out)/sizeof(WCHAR), 1); ok(!lstrcmpW(s_14d, out), "failed out=%s\n", wine_dbgstr_w(out)); + ok(r==4,"failed: r=%d\n", r); /* a single digit, left justified */ r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1_4d, 0, @@ -466,7 +467,7 @@ static void test_message_from_string(void) { SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, NULL, 0, + FormatMessageA(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, out, sizeof(out)/sizeof(CHAR), NULL); } @@ -1119,10 +1120,7 @@ static void test_message_null_buffer(void) if (0) /* crashes on Windows */ { SetLastError(0xdeadbeef); - ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 256, NULL); - error = GetLastError(); - ok(!ret, "FormatMessageA returned %u\n", ret); - trace("last error %u\n", error); + FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 256, NULL); } SetLastError(0xdeadbeef); @@ -1296,7 +1294,7 @@ static void test_message_allocate_buffer_wide(void) if (0) /* crashes on Windows */ { buf = (WCHAR *)0xdeadbeef; - ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, (WCHAR *)&buf, 0, NULL); }

1 0

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

10 Feb '11

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 : msvcrt/tests: Remove useless assignment (LLVM/Clang).
by Alexandre Julliard 10 Feb '11

10 Feb '11

Module: wine Branch: master Commit: a3c1d4550c24d25065b7797806a91db2191fd6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c1d4550c24d25065b779780… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:43:34 2011 -0800 msvcrt/tests: Remove useless assignment (LLVM/Clang). --- dlls/msvcrt/tests/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b003f5a..c532fce 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1176,7 +1176,7 @@ static void test__strtod(void) ok(almost_equal(d, 0.1e-4736L), "d = %lf\n", d); errno = 0xdeadbeef; - d = strtod(overflow, &end); + strtod(overflow, &end); ok(errno == ERANGE, "errno = %x\n", errno); ok(end == overflow+21, "incorrect end (%d)\n", (int)(end-overflow));

1 0

Austin English : msi/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard 10 Feb '11

10 Feb '11

Module: wine Branch: master Commit: a85adf3152082eb2403a75f38bdc24d1f0af1d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85adf3152082eb2403a75f38… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:43:30 2011 -0800 msi/tests: Make sure to use return values (LLVM/Clang). --- dlls/msi/tests/package.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index cc7be1e..80a573c 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -753,6 +753,7 @@ static MSIHANDLE create_package_db(void) ok( res == ERROR_SUCCESS , "Failed to commit database\n" ); res = set_summary_info(hdb); + ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", res); res = run_query( hdb, "CREATE TABLE `Directory` ( " @@ -2446,9 +2447,12 @@ static void test_formatrecord2(void) buffer[0] = 0; sz = sizeof buffer; r = MsiFormatRecord( hpkg, hrec, buffer, &sz ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); r = MsiRecordSetString(hrec, 0, "[foo][1]"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); r = MsiRecordSetString(hrec, 1, "hoo"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); sz = sizeof buffer; r = MsiFormatRecord(hpkg, hrec, buffer, &sz); ok( sz == 3, "size wrong\n"); @@ -2456,6 +2460,7 @@ static void test_formatrecord2(void) ok( r == ERROR_SUCCESS, "format failed\n"); r = MsiRecordSetString(hrec, 0, "x[~]x"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); sz = sizeof buffer; r = MsiFormatRecord(hpkg, hrec, buffer, &sz); ok( sz == 3, "size wrong\n"); @@ -2463,7 +2468,9 @@ static void test_formatrecord2(void) ok( r == ERROR_SUCCESS, "format failed\n"); r = MsiRecordSetString(hrec, 0, "[foo.$%}][1]"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); r = MsiRecordSetString(hrec, 1, "hoo"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); sz = sizeof buffer; r = MsiFormatRecord(hpkg, hrec, buffer, &sz); ok( sz == 3, "size wrong\n"); @@ -2471,6 +2478,7 @@ static void test_formatrecord2(void) ok( r == ERROR_SUCCESS, "format failed\n"); r = MsiRecordSetString(hrec, 0, "[\\[]"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); sz = sizeof buffer; r = MsiFormatRecord(hpkg, hrec, buffer, &sz); ok( sz == 1, "size wrong\n"); @@ -2479,6 +2487,7 @@ static void test_formatrecord2(void) SetEnvironmentVariable("FOO", "BAR"); r = MsiRecordSetString(hrec, 0, "[%FOO]"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); sz = sizeof buffer; r = MsiFormatRecord(hpkg, hrec, buffer, &sz); ok( sz == 3, "size wrong\n"); @@ -2486,7 +2495,9 @@ static void test_formatrecord2(void) ok( r == ERROR_SUCCESS, "format failed\n"); r = MsiRecordSetString(hrec, 0, "[[1]]"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); r = MsiRecordSetString(hrec, 1, "%FOO"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); sz = sizeof buffer; r = MsiFormatRecord(hpkg, hrec, buffer, &sz); ok( sz == 3, "size wrong\n"); @@ -8416,11 +8427,13 @@ static void test_appsearch_reglocator(void) sprintf(path, "\"%s\\FileName1\" -option", CURR_DIR); res = RegSetValueExA(hklm, "value16", 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1); + ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", res); space = (strchr(CURR_DIR, ' ')) ? TRUE : FALSE; sprintf(path, "%s\\FileName1 -option", CURR_DIR); res = RegSetValueExA(hklm, "value17", 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1); + ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", res); hdb = create_package_db(); ok(hdb, "Expected a valid database handle\n"); @@ -9637,6 +9650,7 @@ static void test_featureparents(void) /* msidbFeatureAttributesFavorLocal:msidbComponentAttributesOptional */ r = add_component_entry( hdb, "'lepus', '', 'TARGETDIR', 2, '', 'lepus_file'" ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); r = add_feature_components_entry( hdb, "'zodiac', 'leo'" ); ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); @@ -10095,11 +10109,13 @@ static void test_installprops(void) res = GetSystemMetrics(SM_CXSCREEN); size = MAX_PATH; r = MsiGetProperty(hpkg, "ScreenX", buf, &size); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); res = GetSystemMetrics(SM_CYSCREEN); size = MAX_PATH; r = MsiGetProperty(hpkg, "ScreenY", buf, &size); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); if (pGetSystemInfo && pSHGetFolderPathA)

1 0

Austin English : d3dx9_36: Make sure return values are used (LLVM/Clang).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 517f6aa5264c369da2fbcc78245156e8a196e337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=517f6aa5264c369da2fbcc782… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 09:59:46 2011 -0800 d3dx9_36: Make sure return values are used (LLVM/Clang). --- dlls/d3dx9_36/tests/texture.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 1f31d81..c575346 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -421,6 +421,8 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) if (texture) { hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); + ok(desc.Format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_A8R8G8B8); ok(desc.Width == 256, "Returned width %d, expected %d\n", desc.Width, 256); ok(desc.Height == 256, "Returned height %d, expected %d\n", desc.Height, 256); @@ -435,6 +437,8 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) if (texture) { hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); + ok(desc.Format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_A8R8G8B8); ok(desc.Width == 1, "Returned width %d, expected %d\n", desc.Width, 1); ok(desc.Height == 1, "Returned height %d, expected %d\n", desc.Height, 1); @@ -456,6 +460,8 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) if (texture) { hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); + ok(desc.Format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_A8R8G8B8); /* Conditional NPOT may create a texture with different dimensions, so allow those situations instead of returning a fail */ @@ -542,6 +548,7 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) if (texture) { hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); ok(desc.Format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_A8R8G8B8); IDirect3DTexture9_Release(texture); @@ -554,6 +561,7 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) if (texture) { hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); ok(desc.Format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_A8R8G8B8); IDirect3DTexture9_Release(texture);

1 0

Peter Urbanec : gdi32/tests: Use virtual screen size instead of primary monitor screen size.
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: b8e1a19a1dc2ac7de3d93f439c8050315396a68c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e1a19a1dc2ac7de3d93f439… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Wed Feb 9 13:08:50 2011 +1100 gdi32/tests: Use virtual screen size instead of primary monitor screen size. --- dlls/gdi32/tests/clipping.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index f6cf9b6..3019d67 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -413,8 +413,12 @@ static void test_window_dc_clipping(void) RECT rc; int ret, screen_width, screen_height; - screen_width = GetSystemMetrics(SM_CXSCREEN); - screen_height = GetSystemMetrics(SM_CYSCREEN); + /* Windows versions earlier than Win2k do not support the virtual screen metrics, + * so we fall back to the primary screen metrics. */ + screen_width = GetSystemMetrics(SM_CXVIRTUALSCREEN); + if(!screen_width) screen_width = GetSystemMetrics(SM_CXSCREEN); + screen_height = GetSystemMetrics(SM_CYVIRTUALSCREEN); + if(!screen_height) screen_height = GetSystemMetrics(SM_CYSCREEN); trace("screen resolution %d x %d\n", screen_width, screen_height);

1 0

André Hentschel : oleaut32: Remove an unneeded error.
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: ba6bdf9fd6303361a9e121547db4b41ff58e24e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba6bdf9fd6303361a9e121547… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 9 18:51:49 2011 +0100 oleaut32: Remove an unneeded error. --- dlls/oleaut32/safearray.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index dd00cfd..ced885c 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -1356,10 +1356,7 @@ HRESULT WINAPI SafeArrayCopy(SAFEARRAY *psa, SAFEARRAY **ppsaOut) return S_OK; /* Handles copying of NULL arrays */ if (!psa->cbElements) - { - ERR("not copying an array of 0 elements\n"); return E_INVALIDARG; - } if (psa->fFeatures & (FADF_RECORD|FADF_HAVEIID|FADF_HAVEVARTYPE)) {

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2011