November 2007 - Wine-Commits

Juan Lang : crypt32: Get rid of an unneeded variable.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: 9c672fea4188f9a9424296bb0a7b72b46de4ac4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c672fea4188f9a9424296bb0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 07:48:50 2007 -0700 crypt32: Get rid of an unneeded variable. --- dlls/crypt32/decode.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 6297251..db2a3b3 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -617,15 +617,12 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, for (ptr = pbEncoded + 1 + lenBytes; ret && !doneDecoding; ) { - DWORD itemLenBytes; - - itemLenBytes = GET_LEN_BYTES(ptr[1]); if (dataLen == CMSG_INDEFINITE_LENGTH) { if (ptr[0] == 0) { doneDecoding = TRUE; - if (itemLenBytes != 1 || ptr[1] != 0) + if (ptr[1] != 0) { SetLastError(CRYPT_E_ASN1_CORRUPT); ret = FALSE; @@ -649,7 +646,8 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, if (itemDataLen == CMSG_INDEFINITE_LENGTH) itemEncoded = cbEncoded - (ptr - pbEncoded); else - itemEncoded = 1 + itemLenBytes + itemDataLen; + itemEncoded = 1 + GET_LEN_BYTES(ptr[1]) + + itemDataLen; } if (ret) ret = arrayDesc->decodeFunc(ptr, itemEncoded,

1 0

Juan Lang : crypt32: Fix a leak during chain creation.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: fc14728efcc631838956ddb9c4e5014065eccc91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc14728efcc631838956ddb9c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 09:30:26 2007 -0700 crypt32: Fix a leak during chain creation. --- dlls/crypt32/chain.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 068e039..53588f8 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -913,6 +913,10 @@ static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, if (issuer) { ret = CRYPT_AddCertToSimpleChain(engine, chain, issuer, infoStatus); + /* CRYPT_AddCertToSimpleChain add-ref's the issuer, so free it to + * close the enumeration that found it + */ + CertFreeCertificateContext(issuer); cert = issuer; } else

1 0

Juan Lang : crypt32: Set size when calling CryptDecodeObjectEx without CRYPT_DECODE_ALLOC_FLAG set .
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: 4690a9c800e95e389e81d3a0ee2b3fc187257c1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4690a9c800e95e389e81d3a0e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 07:57:09 2007 -0700 crypt32: Set size when calling CryptDecodeObjectEx without CRYPT_DECODE_ALLOC_FLAG set. --- dlls/crypt32/cert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 844b054..5b45358 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -251,7 +251,7 @@ static BOOL WINAPI CertContext_GetProperty(void *context, DWORD dwPropId, if (ext) { CRYPT_DATA_BLOB value; - DWORD size; + DWORD size = sizeof(value); ret = CryptDecodeObjectEx(X509_ASN_ENCODING, szOID_SUBJECT_KEY_IDENTIFIER, ext->Value.pbData,

1 0

Juan Lang : crypt32: Fix another leak in the tests.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: 373e9f626ae79ee4cb6c2013a58198b8941eddbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=373e9f626ae79ee4cb6c2013a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 07:42:12 2007 -0700 crypt32: Fix another leak in the tests. --- dlls/crypt32/tests/chain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 9d6950d..0257c3e 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1833,6 +1833,7 @@ static void testVerifyCertChainPolicy(void) "Expected both indexes 0, got %d, %d\n", policyStatus.lChainIndex, policyStatus.lElementIndex); CertFreeCertificateChain(chain); + CertFreeCertificateContext(cert); for (i = 0; i < sizeof(basePolicyCheck) / sizeof(basePolicyCheck[0]); i++)

1 0

Juan Lang : crypt32: Fix a leak in the tests.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: 9429504c70f9b5bfbe88270575d30f0428303054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9429504c70f9b5bfbe8827057… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 07:33:56 2007 -0700 crypt32: Fix a leak in the tests. --- dlls/crypt32/tests/cert.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 14549eb..8e4bc5d 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2786,6 +2786,7 @@ static void testAcquireCertPrivateKey(void) &keyContext, &size); ok(ret, "CertGetCertificateContextProperty failed: %08x\n", GetLastError()); + CryptReleaseContext(certCSP, 0); CryptDestroyKey(key); }

1 0

Gerald Pfeifer : comctl32: Make parameters of expect_band_content() match the corresponding types of REBARBANDINFO and fix one format string.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: aac8194c74f31883d77ef995a527e01eaf3165bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac8194c74f31883d77ef995a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 1 15:52:21 2007 +0100 comctl32: Make parameters of expect_band_content() match the corresponding types of REBARBANDINFO and fix one format string. --- dlls/comctl32/tests/rebar.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 3d8bd70..79da16e 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -693,11 +693,11 @@ static void resize_test(void) } } -static void expect_band_content(UINT uBand, UINT fStyle, COLORREF clrFore, +static void expect_band_content(UINT uBand, INT fStyle, COLORREF clrFore, COLORREF clrBack, LPCSTR lpText, int iImage, HWND hwndChild, - UINT cxMinChild, UINT cyMinChild, UINT cx, HBITMAP hbmBack, UINT wID, - UINT cyChild, UINT cyMaxChild, UINT cyIntegral, UINT cxIdeal, LPARAM lParam, - UINT cxHeader) + INT cxMinChild, INT cyMinChild, INT cx, HBITMAP hbmBack, INT wID, + INT cyChild, INT cyMaxChild, INT cyIntegral, INT cxIdeal, LPARAM lParam, + INT cxHeader) { CHAR buf[MAX_PATH] = "abc"; REBARBANDINFO rb; @@ -712,7 +712,7 @@ static void expect_band_content(UINT uBand, UINT fStyle, COLORREF clrFore, ok(SendMessageA(hRebar, RB_GETBANDINFOA, uBand, (LPARAM)&rb), "RB_GETBANDINFO failed\n"); expect_eq(rb.fStyle, fStyle, int, "%x"); todo_wine expect_eq(rb.clrFore, clrFore, COLORREF, "%x"); - todo_wine expect_eq(rb.clrBack, clrBack, int, "%x"); + todo_wine expect_eq(rb.clrBack, clrBack, unsigned, "%x"); expect_eq(strcmp(rb.lpText, lpText), 0, int, "%d"); expect_eq(rb.iImage, iImage, int, "%x"); expect_eq(rb.hwndChild, hwndChild, HWND, "%p");

1 0

Gerald Pfeifer : oleaut32: Use -0.0 directly in test_VarBstrFromR4().
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: 16f021a22e162ddd3f044e70bce435e491666783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f021a22e162ddd3f044e70b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 1 15:02:08 2007 +0100 oleaut32: Use -0.0 directly in test_VarBstrFromR4(). --- dlls/oleaut32/tests/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 4558d82..b0335aa 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4747,7 +4747,7 @@ static void test_VarBstrFromR4(void) } } - f = -1e-400; /* deliberately cause underflow */ + f = -0.0; hres = pVarBstrFromR4(f, lcid, 0, &bstr); ok(hres == S_OK, "got hres 0x%08x\n", hres); if (bstr)

1 0

Gerald Pfeifer : shell32: Remove useless comparison >= 0 for unsigned variables.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: ff307d96c1cadefb62857ffdb400abee186a424d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff307d96c1cadefb62857ffdb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 1 15:30:55 2007 +0100 shell32: Remove useless comparison >= 0 for unsigned variables. --- dlls/shell32/tests/shelllink.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 091522b..7983aa0 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -527,7 +527,7 @@ static void test_load_save(void) check_lnk(lnkfile, &desc, 0x0); r=GetModuleFileName(NULL, mypath, sizeof(mypath)); - ok(r>=0 && r<sizeof(mypath), "GetModuleFileName failed (%d)\n", r); + ok(r<sizeof(mypath), "GetModuleFileName failed (%d)\n", r); strcpy(mydir, mypath); p=strrchr(mydir, '\\'); if (p) @@ -564,9 +564,9 @@ static void test_load_save(void) /* Create a temporary non-executable file */ r=GetTempPath(sizeof(mypath), mypath); - ok(r>=0 && r<sizeof(mypath), "GetTempPath failed (%d), err %d\n", r, GetLastError()); + ok(r<sizeof(mypath), "GetTempPath failed (%d), err %d\n", r, GetLastError()); r=pGetLongPathNameA(mypath, mydir, sizeof(mydir)); - ok(r>=0 && r<sizeof(mydir), "GetLongPathName failed (%d), err %d\n", r, GetLastError()); + ok(r<sizeof(mydir), "GetLongPathName failed (%d), err %d\n", r, GetLastError()); p=strrchr(mydir, '\\'); if (p) *p='\0';

1 0

Rob Shearman : ole32: Remove an incorrect comment.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: d792a522c3f7265cb7377a3bec83ce3811537041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d792a522c3f7265cb7377a3be… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 1 16:22:15 2007 +0000 ole32: Remove an incorrect comment. --- dlls/ole32/compobj_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index c12150a..f99a89f 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -141,7 +141,6 @@ struct proxy_manager void *dest_context_data; /* reserved context value (LOCK) */ }; -/* this needs to become a COM object that implements IRemUnknown */ struct apartment { struct list entry;

1 0

Rob Shearman : ole32: Add tests for CoGetObjectContext.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: 1d0993341cd5194cd903cbb9b11ce41361e24901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0993341cd5194cd903cbb9b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 1 13:26:56 2007 +0000 ole32: Add tests for CoGetObjectContext. --- dlls/ole32/tests/compobj.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 12fe4f6..d7a88f7 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -33,6 +33,7 @@ /* functions that are not present on all versions of Windows */ HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); +HRESULT (WINAPI * pCoGetObjectContext)(REFIID riid, LPVOID *ppv); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) @@ -938,10 +939,65 @@ static void test_CoFreeUnusedLibraries(void) CoUninitialize(); } +static void test_CoGetObjectContext(void) +{ + HRESULT hr; + ULONG refs; + IComThreadingInfo *pComThreadingInfo; + APTTYPE apttype; + THDTYPE thdtype; + + if (!pCoGetObjectContext) + { + skip("CoGetObjectContext not present\n"); + return; + } + + hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); + ok(hr == CO_E_NOTINITIALIZED, "CoGetObjectContext should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); + ok(pComThreadingInfo == NULL, "pComThreadingInfo should have been set to NULL\n"); + + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); + ok_ole_success(hr, "CoGetObjectContext"); + + hr = IComThreadingInfo_GetCurrentApartmentType(pComThreadingInfo, &apttype); + ok_ole_success(hr, "IComThreadingInfo_GetCurrentApartmentType"); + ok(apttype == APTTYPE_MAINSTA, "apartment type should be APTTYPE_MAINSTA instead of %d\n", apttype); + + hr = IComThreadingInfo_GetCurrentThreadType(pComThreadingInfo, &thdtype); + ok_ole_success(hr, "IComThreadingInfo_GetCurrentThreadType"); + ok(thdtype == THDTYPE_PROCESSMESSAGES, "thread type should be THDTYPE_PROCESSMESSAGES instead of %d\n", thdtype); + + refs = IComThreadingInfo_Release(pComThreadingInfo); + ok(refs == 0, "pComThreadingInfo should have 0 refs instead of %d refs\n", refs); + + CoUninitialize(); + + pCoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); + ok_ole_success(hr, "CoGetObjectContext"); + + hr = IComThreadingInfo_GetCurrentApartmentType(pComThreadingInfo, &apttype); + ok_ole_success(hr, "IComThreadingInfo_GetCurrentApartmentType"); + ok(apttype == APTTYPE_MTA, "apartment type should be APTTYPE_MTA instead of %d\n", apttype); + + hr = IComThreadingInfo_GetCurrentThreadType(pComThreadingInfo, &thdtype); + ok_ole_success(hr, "IComThreadingInfo_GetCurrentThreadType"); + ok(thdtype == THDTYPE_BLOCKMESSAGES, "thread type should be THDTYPE_BLOCKMESSAGES instead of %d\n", thdtype); + + refs = IComThreadingInfo_Release(pComThreadingInfo); + ok(refs == 0, "pComThreadingInfo should have 0 refs instead of %d refs\n", refs); + + CoUninitialize(); +} START_TEST(compobj) { HMODULE hOle32 = GetModuleHandle("ole32"); + pCoGetObjectContext = (void*)GetProcAddress(hOle32, "CoGetObjectContext"); if (!(pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"))) { trace("You need DCOM95 installed to run this test\n"); @@ -964,4 +1020,5 @@ START_TEST(compobj) test_CoRegisterClassObject(); test_registered_object_thread_affinity(); test_CoFreeUnusedLibraries(); + test_CoGetObjectContext(); }

1 0