February 2011 - Wine-Commits

Huw Davies : oleaut32: Implement proxy / stub for ITypeInfo_GetDllEntry.
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: 7cdc8bb418b5213e9ecb5786479de49cb051febd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdc8bb418b5213e9ecb57864… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 11 10:08:43 2011 +0000 oleaut32: Implement proxy / stub for ITypeInfo_GetDllEntry. --- dlls/oleaut32/usrmarshal.c | 56 +++++++++++++++++++++++++++++--------------- 1 files changed, 37 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index f83b908..d6e4bdd 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1696,29 +1696,47 @@ HRESULT __RPC_STUB ITypeInfo_GetDocumentation_Stub(ITypeInfo *This, MEMBERID mem return ITypeInfo_GetDocumentation(This, memid, name, doc_string, help_context, help_file); } -HRESULT CALLBACK ITypeInfo_GetDllEntry_Proxy( - ITypeInfo* This, - MEMBERID memid, - INVOKEKIND invKind, - BSTR* pBstrDllName, - BSTR* pBstrName, - WORD* pwOrdinal) +HRESULT CALLBACK ITypeInfo_GetDllEntry_Proxy(ITypeInfo *This, MEMBERID memid, + INVOKEKIND invkind, BSTR *dll_name, + BSTR* name, WORD *ordinal) { - FIXME("not implemented\n"); - return E_FAIL; + DWORD flags = 0; + BSTR dummy_dll_name, dummy_name; + WORD dummy_ordinal; + HRESULT hr; + TRACE("(%p, %08x, %x, %p, %p, %p)\n", This, memid, invkind, dll_name, name, ordinal); + + if(!dll_name) dll_name = &dummy_dll_name; + else flags = 1; + + if(!name) name = &dummy_name; + else flags |= 2; + + if(!ordinal) ordinal = &dummy_ordinal; + else flags |= 4; + + hr = ITypeInfo_RemoteGetDllEntry_Proxy(This, memid, invkind, flags, dll_name, name, ordinal); + + /* We don't need to free the dummy BSTRs since the stub ensures that these will be NULLs. */ + + return hr; } -HRESULT __RPC_STUB ITypeInfo_GetDllEntry_Stub( - ITypeInfo* This, - MEMBERID memid, - INVOKEKIND invKind, - DWORD refPtrFlags, - BSTR* pBstrDllName, - BSTR* pBstrName, - WORD* pwOrdinal) +HRESULT __RPC_STUB ITypeInfo_GetDllEntry_Stub(ITypeInfo *This, MEMBERID memid, + INVOKEKIND invkind, DWORD flags, + BSTR *dll_name, BSTR *name, + WORD *ordinal) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %08x, %x, %p, %p, %p)\n", This, memid, invkind, dll_name, name, ordinal); + + *dll_name = *name = NULL; + *ordinal = 0; + + if(!(flags & 1)) dll_name = NULL; + if(!(flags & 2)) name = NULL; + if(!(flags & 4)) ordinal = NULL; + + return ITypeInfo_GetDllEntry(This, memid, invkind, dll_name, name, ordinal); } HRESULT CALLBACK ITypeInfo_AddressOfMember_Proxy(

1 0

Huw Davies : oleaut32: Implement proxy / stub for ITypeLib_GetDocumentation .
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: afeaaf3787647a416a9412d230bab5467e6616b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afeaaf3787647a416a9412d23… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 11 10:24:51 2011 +0000 oleaut32: Implement proxy / stub for ITypeLib_GetDocumentation. --- dlls/oleaut32/usrmarshal.c | 58 +++++++++++++++++++++++++++++-------------- 1 files changed, 39 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 2e64395..8f9e00c 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1974,29 +1974,49 @@ HRESULT __RPC_STUB ITypeLib_GetLibAttr_Stub( return hr; } -HRESULT CALLBACK ITypeLib_GetDocumentation_Proxy( - ITypeLib* This, - INT index, - BSTR* pBstrName, - BSTR* pBstrDocString, - DWORD* pdwHelpContext, - BSTR* pBstrHelpFile) +HRESULT CALLBACK ITypeLib_GetDocumentation_Proxy(ITypeLib *This, INT index, BSTR *name, + BSTR *doc_string, DWORD *help_context, + BSTR *help_file) { - FIXME("not implemented\n"); - return E_FAIL; + DWORD dummy_help_context, flags = 0; + BSTR dummy_name, dummy_doc_string, dummy_help_file; + HRESULT hr; + TRACE("(%p, %d, %p, %p, %p, %p)\n", This, index, name, doc_string, help_context, help_file); + + if(!name) name = &dummy_name; + else flags = 1; + + if(!doc_string) doc_string = &dummy_doc_string; + else flags |= 2; + + if(!help_context) help_context = &dummy_help_context; + else flags |= 4; + + if(!help_file) help_file = &dummy_help_file; + else flags |= 8; + + hr = ITypeLib_RemoteGetDocumentation_Proxy(This, index, flags, name, doc_string, help_context, help_file); + + /* We don't need to free the dummy BSTRs since the stub ensures that these will be NULLs. */ + + return hr; } -HRESULT __RPC_STUB ITypeLib_GetDocumentation_Stub( - ITypeLib* This, - INT index, - DWORD refPtrFlags, - BSTR* pBstrName, - BSTR* pBstrDocString, - DWORD* pdwHelpContext, - BSTR* pBstrHelpFile) +HRESULT __RPC_STUB ITypeLib_GetDocumentation_Stub(ITypeLib *This, INT index, DWORD flags, + BSTR *name, BSTR *doc_string, + DWORD *help_context, BSTR *help_file) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %d, %08x, %p, %p, %p, %p)\n", This, index, flags, name, doc_string, help_context, help_file); + + *name = *doc_string = *help_file = NULL; + *help_context = 0; + + if(!(flags & 1)) name = NULL; + if(!(flags & 2)) doc_string = NULL; + if(!(flags & 4)) help_context = NULL; + if(!(flags & 8)) help_file = NULL; + + return ITypeLib_GetDocumentation(This, index, name, doc_string, help_context, help_file); } HRESULT CALLBACK ITypeLib_IsName_Proxy(

1 0

Austin English : shlwapi/tests: Remove useless assignments (LLVM/Clang).
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: 92f48ef6ec1ddd049d93a329fede88d5c1b03f5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=92f48ef6ec1ddd049d93a329f… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:33:05 2011 -0800 shlwapi/tests: Remove useless assignments (LLVM/Clang). --- dlls/shlwapi/tests/clist.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index 0c1704d..65d3178 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -371,26 +371,22 @@ static void test_CList(void) inserted = (LPSHLWAPI_CLIST)buff; inserted->ulSize = sizeof(SHLWAPI_CLIST) -1; inserted->ulId = 33; - hRet = pSHLWAPI_20(&list, inserted); + /* The call succeeds but the item is not inserted, except on some early * versions which return failure. Wine behaves like later versions. */ - if (0) - { - ok(hRet == S_OK, "failed bad element size\n"); - } + pSHLWAPI_20(&list, inserted); + inserted = pSHLWAPI_22(list, 33); ok(inserted == NULL, "inserted bad element size\n"); inserted = (LPSHLWAPI_CLIST)buff; inserted->ulSize = 44; inserted->ulId = ~0U; - hRet = pSHLWAPI_20(&list, inserted); + /* See comment above, some early versions fail this call */ - if (0) - { - ok(hRet == S_OK, "failed adding a container\n"); - } + pSHLWAPI_20(&list, inserted); + item = SHLWAPI_CLIST_items; /* Look for nonexistent item in populated list */

1 0

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

Feb. 11, 2011

Module: wine Branch: master Commit: 39ef0b9d1271f0cd1bca0efb9f8a418ae7afe04e URL: http://source.winehq.org/git/wine.git/?a=commit;h=39ef0b9d1271f0cd1bca0efb9… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:48 2011 -0800 ntdll/tests: Make sure a return value is used (LLVM/Clang). --- dlls/ntdll/tests/env.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 8289841..6bd1530 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -244,6 +244,7 @@ static void testExpand(void) us_dst.Buffer = NULL; nts = pRtlExpandEnvironmentStrings_U(small_env, &us_src, &us_dst, &ul); + ok(nts == STATUS_BUFFER_TOO_SMALL, "Call failed (%u)\n", nts); ok(ul == strlen(test->dst) * sizeof(WCHAR) + sizeof(WCHAR), "Wrong returned length for %s: %u\n", test->src, ul );

1 0

André Hentschel : winemaker: Ignore whitespaces before defines.
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: 8662db7117b50594aa4ddbfef3e79188bf5a3c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8662db7117b50594aa4ddbfef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Feb 10 22:04:16 2011 +0100 winemaker: Ignore whitespaces before defines. --- tools/winemaker | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index a0d525b..f49c81f 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -938,7 +938,7 @@ sub source_scan_project_file($$$) } if ($vc_compiler_tool->getName eq "PreprocessorDefinitions") { $configt=$vc_compiler_tool->getValue; - $configt=~s/;/ -D/g; + $configt=~s/;\s*/ -D/g; $prj_target_defines.="-D".$configt." "; } if ($vc_compiler_tool->getName eq "AdditionalIncludeDirectories") {

1 0

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

Feb. 11, 2011

Module: wine Branch: master Commit: 641d74845d88a5781e7754e9de9c4fa8c845d802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=641d74845d88a5781e7754e9d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:16 2011 -0800 crypt32/tests: Make sure to use a return value (LLVM/Clang). --- dlls/crypt32/tests/oid.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 030a548..b661407 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -451,6 +451,7 @@ static void test_registerDefaultOIDFunction(void) /* Repeat a few tests on the normal encoding type */ ret = CryptRegisterDefaultOIDFunction(X509_ASN_ENCODING, "CertDllOpenStoreProv", 0, bogusDll); + ok(ret, "CryptRegisterDefaultOIDFunction failed\n"); ret = CryptUnregisterDefaultOIDFunction(X509_ASN_ENCODING, "CertDllOpenStoreProv", bogusDll); ok(ret, "CryptUnregisterDefaultOIDFunction failed\n");

1 0

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

Feb. 11, 2011

Module: wine Branch: master Commit: 27dd864f6326e642ae36c266e3b093eb2d68c9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27dd864f6326e642ae36c266e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:44 2011 -0800 msi/tests: Make sure to use a return value (LLVM/Clang). --- dlls/msi/tests/db.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 21eb2a1..de2b9f5 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8702,6 +8702,7 @@ static void test_columnorder(void) query = "SELECT * FROM `T`"; r = do_query(hdb, query, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); sz = MAX_PATH; lstrcpyA(buf, "kiwi");

1 0

Austin English : secur32/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: 1c659a5509585c162e69b084a8bd072c58711033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c659a5509585c162e69b084a… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:28:45 2011 -0800 secur32/tests: Make sure return values are used (LLVM/Clang). --- dlls/secur32/tests/schannel.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 7eac489..1b6fdf8 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -253,7 +253,7 @@ static void testAcquireSecurityContext(void) ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n", st); /* Crashes */ - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, NULL, NULL); } st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, @@ -299,7 +299,7 @@ static void testAcquireSecurityContext(void) { /* Crashes with bad paCred pointer */ schanCred.cCreds = 1; - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, NULL, NULL); } @@ -343,6 +343,7 @@ static void testAcquireSecurityContext(void) ret = pCertSetCertificateContextProperty(certs[1], CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); schanCred.dwVersion = SCH_CRED_V3; + ok(ret, "CertSetCertificateContextProperty failed: %08x\n", GetLastError()); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */, @@ -369,7 +370,7 @@ static void testAcquireSecurityContext(void) if (0) { /* Crashes */ - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, + pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, NULL, NULL); /* Crashes on WinNT */

1 0

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

Feb. 11, 2011

Module: wine Branch: master Commit: 4d5293bd81a9790f49ffe99f628bab9a64bc4173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d5293bd81a9790f49ffe99f6… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:03 2011 -0800 crypt32/tests: Make sure to use return values (LLVM/Clang). --- dlls/crypt32/tests/crl.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 214d612..fb7b6e4 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -102,7 +102,6 @@ static void testCreateCRL(void) ok(!context && (GLE == CRYPT_E_ASN1_EOD || GLE == OSS_MORE_INPUT), "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08x\n", GLE); context = CertCreateCRLContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); - GLE = GetLastError(); ok(!context, "Expected failure\n"); context = CertCreateCRLContext(X509_ASN_ENCODING, signedCRL, sizeof(signedCRL) - 1); @@ -205,6 +204,7 @@ static void testAddCRL(void) /* Normal cases: a "signed" CRL is okay.. */ ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), CERT_STORE_ADD_ALWAYS, NULL); + ok(ret, "CertAddEncodedCRLToStore failed: %08x\n", GetLastError()); /* and an unsigned one is too. */ ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, CRL, sizeof(CRL), CERT_STORE_ADD_ALWAYS, NULL); @@ -477,9 +477,9 @@ static void testFindCRL(void) if (0) { /* Crash or return NULL/STATUS_ACCESS_VIOLATION */ - context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, NULL, + pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, NULL, NULL); - context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, + pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, &issuedForPara, NULL); } /* Test whether the cert matches the CRL in the store */ @@ -906,6 +906,7 @@ static void testCRLProperties(void) size = sizeof(hashProperty); ret = CertGetCRLContextProperty(context, CERT_HASH_PROP_ID, hashProperty, &size); + ok(ret, "CertSetCRLContextProperty failed: %08x\n", GetLastError()); ok(!memcmp(hashProperty, hash, sizeof(hash)), "Unexpected hash\n"); /* Delete the (bogus) hash, and get the real one */ ret = CertSetCRLContextProperty(context, CERT_HASH_PROP_ID, 0, NULL);

1 0

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

Feb. 11, 2011

Module: wine Branch: master Commit: f6364bf9703adefea326276bb652966b5438738a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6364bf9703adefea326276bb… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:06 2011 -0800 crypt32/tests: Make sure to use a return value (LLVM/Clang). --- dlls/crypt32/tests/ctl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index 8ee2652..978ccda 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -213,6 +213,7 @@ static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID, memset(hashProperty, 0, sizeof(hashProperty)); size = sizeof(hash); ret = CryptHashCertificate(0, algID, 0, data, dataLen, hash, &size); + ok(ret, "CryptHashCertificate failed: %08x\n", GetLastError()); ret = CertGetCTLContextProperty(context, propID, hashProperty, &size); ok(ret, "CertGetCTLContextProperty failed: %08x\n", GetLastError()); if (ret)

1 0