December 2009 - Wine-commits

Piotr Caban : msxml3: Fix VARIANT_from_xmlChar implementation.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 9ede36aa2bbd84caebcecb20277b7b3041d2b192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ede36aa2bbd84caebcecb202… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Dec 6 01:07:57 2009 +0100 msxml3: Fix VARIANT_from_xmlChar implementation. --- dlls/msxml3/node.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index ed6c8c6..82f4c56 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1118,7 +1118,8 @@ static inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) if(!V_BSTR(&src)) return E_OUTOFMEMORY; - hres = VariantChangeType(v, &src, 0, V_VT(v)); + hres = VariantChangeTypeEx(v, &src, MAKELCID(MAKELANGID( + LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT),0, V_VT(v)); VariantClear(&src); return hres; }

1 0

Nikolay Sivov : kernel32/tests: Fix test failures on NT4.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 59d250c4a4e1200206329ee8ad557a7f60245449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59d250c4a4e1200206329ee8a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 5 13:08:12 2009 +0300 kernel32/tests: Fix test failures on NT4. --- dlls/kernel32/tests/locale.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 48ab350..a462a14 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -469,6 +469,7 @@ static void test_GetDateFormatA(void) LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); LCID lcid_ru = MAKELCID(MAKELANGID(LANG_RUSSIAN, SUBLANG_NEUTRAL), SORT_DEFAULT); char buffer[BUFFER_SIZE], input[BUFFER_SIZE], Expected[BUFFER_SIZE]; + char Broken[BUFFER_SIZE]; char short_day[10], month[10], genitive_month[10]; memset(&curtime, 2, sizeof(SYSTEMTIME)); /* Invalid time */ @@ -584,15 +585,21 @@ static void test_GetDateFormatA(void) STRINGSA("MMMMdd", ""); sprintf(Expected, "%s04", genitive_month); + sprintf(Broken, "%s04", month); ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || + broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, + "Expected '%s', got '%s'\n", Expected, buffer); STRINGSA("MMMMdd ddd", ""); sprintf(Expected, "%s04 %s", genitive_month, short_day); + sprintf(Broken, "%s04 %s", month, short_day); ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || + broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, + "Expected '%s', got '%s'\n", Expected, buffer); STRINGSA("dd dddMMMM", ""); sprintf(Expected, "04 %s%s", short_day, month); @@ -602,16 +609,22 @@ static void test_GetDateFormatA(void) STRINGSA("dd dddMMMM ddd MMMMdd", ""); sprintf(Expected, "04 %s%s %s %s04", short_day, month, short_day, genitive_month); + sprintf(Broken, "04 %s%s %s %s04", short_day, month, short_day, month); ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || + broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, + "Expected '%s', got '%s'\n", Expected, buffer); /* with literal part */ STRINGSA("ddd',' MMMM dd", ""); sprintf(Expected, "%s, %s 04", short_day, genitive_month); + sprintf(Broken, "%s, %s 04", short_day, month); ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || + broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, + "Expected '%s', got '%s'\n", Expected, buffer); } static void test_GetDateFormatW(void)

1 0

Nikolay Sivov : comctl32/treeview: Free items pointer array and root item on control destruction.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 6d989feff9c908453eea6863f82d409b8035c3ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d989feff9c908453eea6863f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 5 20:39:03 2009 +0300 comctl32/treeview: Free items pointer array and root item on control destruction. Two issues here: item pointers array wasn't freed, root item data wasn't freed. Found by Valgrind. --- dlls/comctl32/treeview.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index d762a79..7cabef6 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5064,7 +5064,11 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) { TRACE("\n"); + /* free item data */ TREEVIEW_RemoveTree(infoPtr); + /* root isn't freed with other items */ + TREEVIEW_FreeItem(infoPtr, infoPtr->root); + DPA_Destroy(infoPtr->items); /* tool tip is automatically destroyed: we are its owner */

1 0

Nikolay Sivov : comctl32/tests: Free imagelist after use.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 0f003ef48d28335ce30017019ca607c3cc5fe689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f003ef48d28335ce30017019… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 5 20:49:12 2009 +0300 comctl32/tests: Free imagelist after use. --- dlls/comctl32/tests/rebar.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 6f26388..45b3c06 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -503,6 +503,7 @@ static void layout_test(void) check_sizes(); DestroyWindow(hRebar); + ImageList_Destroy(himl); } #if 0 /* use this to generate more tests */

1 0

Nikolay Sivov : comctl32/tests: Don't forget to free array after tests.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: bd8fc9c474d0aba1725f72d57a17374b0821e94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd8fc9c474d0aba1725f72d57… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 5 21:21:04 2009 +0300 comctl32/tests: Don't forget to free array after tests. --- dlls/comctl32/tests/dpa.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index c9e91c2..5fb11e3 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -347,6 +347,8 @@ static void test_dpa(void) pDPA_DeleteAllPtrs(dpa2); rc=CheckDPA(dpa2, 0, &dw2); ok(rc, "dw2=0x%x\n", dw2); + + pDPA_Destroy(dpa); pDPA_Destroy(dpa2); pDPA_Destroy(dpa3); } @@ -623,8 +625,10 @@ static void test_DPA_LoadStream(void) hRes = IStream_Seek(pStm, li, STREAM_SEEK_SET, NULL); expect(S_OK, hRes); + dpa = NULL; hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, NULL); expect(S_OK, hRes); + DPA_Destroy(dpa); /* try with altered dwData2 field */ header.dwSize = sizeof(header);

1 0

Nikolay Sivov : comctl32/datetime: Free internal data completely on control destruction.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 7d6412c82d11df6e4bbc8d9b99556374f9e151e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d6412c82d11df6e4bbc8d9b9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 5 21:42:19 2009 +0300 comctl32/datetime: Free internal data completely on control destruction. --- dlls/comctl32/datetime.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index a7b433d..c240d4f 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1360,6 +1360,9 @@ DATETIME_Destroy (DATETIME_INFO *infoPtr) if (infoPtr->hMonthCal) DestroyWindow(infoPtr->hMonthCal); SetWindowLongPtrW( infoPtr->hwndSelf, 0, 0 ); /* clear infoPtr */ + Free (infoPtr->buflen); + Free (infoPtr->fieldRect); + Free (infoPtr->fieldspec); Free (infoPtr); return 0; }

1 0

Nikolay Sivov : gdiplus/tests: Free brush pointer after test.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: db5e3f4a0589ba12cd48ba2209753482a345e973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db5e3f4a0589ba12cd48ba220… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 5 21:50:50 2009 +0300 gdiplus/tests: Free brush pointer after test. --- dlls/gdiplus/tests/brush.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index cf94611..0ee4dd4 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -641,6 +641,9 @@ static void test_linelinearblend(void) expectf(0.0, res_positions[0]); expectf(0.8, res_factors[1]); expectf(1.0, res_positions[1]); + + status = GdipDeleteBrush((GpBrush*)brush); + expect(Ok, status); } START_TEST(brush)

1 0

Juan Lang : crypt32/tests: Fix memory leak in test.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: bab1c652ae87b2c1a1c59dbe0cc549e0d6a7bb60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab1c652ae87b2c1a1c59dbe0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 5 16:21:21 2009 -0800 crypt32/tests: Fix memory leak in test. --- dlls/crypt32/tests/protectdata.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index 91bad8e..afe74ca 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -237,6 +237,8 @@ static void test_simpleroundtrip(const char *plaintext) ok(res != 0, "can't unprotect; last error %u\n", GetLastError()); ok(output.cbData == strlen(plaintext), "output wrong length %d for input '%s', wanted %d\n", output.cbData, plaintext, strlen(plaintext)); ok(!memcmp(plaintext, (char *)output.pbData, output.cbData), "output wrong contents for input '%s'\n", plaintext); + LocalFree(output.pbData); + LocalFree(encrypted.pbData); } START_TEST(protectdata)

1 0

Juan Lang : rsaenh/tests: Fix memory leaks.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: d69b00d630200ce013a3a8a97eea987e1165e89a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d69b00d630200ce013a3a8a97… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 5 16:28:21 2009 -0800 rsaenh/tests: Fix memory leaks. --- dlls/rsaenh/tests/rsaenh.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index b56f4d4..2c7ca0e 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2093,6 +2093,7 @@ static void test_rsa_round_trip(void) ok(dataLen == sizeof(test_string), "unexpected size %d\n", dataLen); ok(!memcmp(data, test_string, sizeof(test_string)), "unexpected value\n"); } + CryptDestroyKey(keyExchangeKey); CryptReleaseContext(prov, 0); CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, @@ -2334,6 +2335,7 @@ static void test_null_provider(void) ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); result = CryptGenKey(prov, CALG_RSA_SIGN, 0, &key); ok(result, "CryptGenKey with CALG_RSA_SIGN failed with error %08x\n", GetLastError()); + CryptDestroyKey(key); result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(!result, "expected CryptGetUserKey to fail\n"); result = CryptGetUserKey(prov, AT_SIGNATURE, &key); @@ -2350,6 +2352,7 @@ static void test_null_provider(void) ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); result = CryptGenKey(prov, CALG_RSA_KEYX, 0, &key); ok(result, "CryptGenKey with CALG_RSA_KEYX failed with error %08x\n", GetLastError()); + CryptDestroyKey(key); result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(result, "CryptGetUserKey with AT_KEYEXCHANGE failed: %08x\n", GetLastError()); result = CryptGetUserKey(prov, AT_SIGNATURE, &key);

1 0

Juan Lang : wintrust: Fail to load a certificate from a PE file if the certificate entry isn' t a known type.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 497b67dbf623e8aacb2eaaaa326a5782eb3c06d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=497b67dbf623e8aacb2eaaaa3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 5 19:17:25 2009 -0800 wintrust: Fail to load a certificate from a PE file if the certificate entry isn't a known type. --- dlls/wintrust/crypt.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index d9fa563..c41a56b 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -1028,7 +1028,18 @@ static BOOL WINTRUST_GetSignedMsgFromPEFile(SIP_SUBJECTINFO *pSubjectInfo, /* app hasn't passed buffer, just get the length */ ret = ImageGetCertificateHeader(pSubjectInfo->hFile, dwIndex, &cert); if (ret) - *pcbSignedDataMsg = cert.dwLength; + { + switch (cert.wCertificateType) + { + case WIN_CERT_TYPE_X509: + case WIN_CERT_TYPE_PKCS_SIGNED_DATA: + *pcbSignedDataMsg = cert.dwLength; + break; + default: + WARN("unknown certificate type %d\n", cert.wCertificateType); + ret = FALSE; + } + } } else { @@ -1065,9 +1076,10 @@ static BOOL WINTRUST_GetSignedMsgFromPEFile(SIP_SUBJECTINFO *pSubjectInfo, *pdwEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; break; default: - FIXME("don't know what to do for encoding type %d\n", + WARN("don't know what to do for encoding type %d\n", pCert->wCertificateType); *pdwEncodingType = 0; + ret = FALSE; } } }

1 0