December 2009 - Wine-Commits

Huw Davies : gdiplus: Fix a couple of memory leaks.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 55bf97bba7e8eaff93e736342a268cf6fbbf86fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=55bf97bba7e8eaff93e736342… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Dec 6 11:11:44 2009 +0000 gdiplus: Fix a couple of memory leaks. Found by Valgrind. --- dlls/gdiplus/region.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 197b68a..eab9b8f 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -249,6 +249,7 @@ GpStatus WINGDIPAPI GdipCombineRegionPath(GpRegion *region, GpPath *path, Combin if(mode == CombineModeReplace){ delete_element(&region->node); memcpy(region, path_region, sizeof(GpRegion)); + GdipFree(path_region); return Ok; } @@ -295,6 +296,7 @@ GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, if(mode == CombineModeReplace){ delete_element(&region->node); memcpy(region, rect_region, sizeof(GpRegion)); + GdipFree(rect_region); return Ok; }

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 Dec. 7, 2009

Dec. 7, 2009

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

Francois Gouget : mshtml/tests: Fix the get_event_src() macro declaration.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 6fced4d1c7ef39ad9883e48844190ff456663b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fced4d1c7ef39ad9883e4884… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 13:43:25 2009 +0100 mshtml/tests: Fix the get_event_src() macro declaration. --- dlls/mshtml/tests/events.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 46bbd4f..eac72a6 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -342,7 +342,7 @@ static void _test_attached_event_args(unsigned line, DISPID id, WORD wFlags, DIS IHTMLEventObj_Release(event); } -#define get_event_src(t) _get_event_src(__LINE__) +#define get_event_src() _get_event_src(__LINE__) static IHTMLElement *_get_event_src(unsigned line) { IHTMLEventObj *event = _get_event_obj(line);

1 0

Juan Lang : rsaenh/tests: Fix memory leaks.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

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

Francois Gouget : winhttp: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 0b9a4ae3418549e56697979e701e1401d3c72a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b9a4ae3418549e56697979e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 13:41:47 2009 +0100 winhttp: Fix compilation on systems that don't support nameless unions. --- dlls/winhttp/net.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index ea1afd3..10176d9 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -42,6 +42,8 @@ #undef DSA #endif +#define NONAMELESSUNION + #include "wine/debug.h" #include "wine/library.h" @@ -293,7 +295,7 @@ static BOOL netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, SSL_EXTRA_CERT_CHAIN_POLICY_PARA sslExtraPolicyPara; CERT_CHAIN_POLICY_STATUS policyStatus; - sslExtraPolicyPara.cbSize = sizeof(sslExtraPolicyPara); + sslExtraPolicyPara.u.cbSize = sizeof(sslExtraPolicyPara); sslExtraPolicyPara.dwAuthType = AUTHTYPE_SERVER; sslExtraPolicyPara.pwszServerName = server; policyPara.cbSize = sizeof(policyPara);

1 0

Francois Gouget : wined3d: Don't define nameless structs or unions.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 060934c5570eb41097c712b0192c2d6a94be13f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=060934c5570eb41097c712b01… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 13:45:30 2009 +0100 wined3d: Don't define nameless structs or unions. Fixes compilation on systems that don't support nameless unions or structs. --- dlls/wined3d/arb_program_shader.c | 86 ++++++++++++++++++------------------ 1 files changed, 43 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=060934c5570eb41097c71…

1 0

Juan Lang : rsaenh: Fix memory leak in CPSignHash.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 035c323054c23c83203b7ac9b8d9bc7a050336ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=035c323054c23c83203b7ac9b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 5 16:05:26 2009 -0800 rsaenh: Fix memory leak in CPSignHash. --- dlls/rsaenh/rsaenh.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 8234688..0228696 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -4162,11 +4162,12 @@ BOOL WINAPI RSAENH_CPSignHash(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwKeySpe LPCWSTR sDescription, DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen) { - HCRYPTKEY hCryptKey; + HCRYPTKEY hCryptKey = (HCRYPTKEY)INVALID_HANDLE_VALUE; CRYPTKEY *pCryptKey; DWORD dwHashLen; BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; ALG_ID aiAlgid; + BOOL ret = FALSE; TRACE("(hProv=%08lx, hHash=%08lx, dwKeySpec=%08x, sDescription=%s, dwFlags=%08x, " "pbSignature=%p, pdwSigLen=%p)\n", hProv, hHash, dwKeySpec, debugstr_w(sDescription), @@ -4183,18 +4184,19 @@ BOOL WINAPI RSAENH_CPSignHash(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwKeySpe (OBJECTHDR**)&pCryptKey)) { SetLastError(NTE_NO_KEY); - return FALSE; + goto out; } if (!pbSignature) { *pdwSigLen = pCryptKey->dwKeyLen; - return TRUE; + ret = TRUE; + goto out; } if (pCryptKey->dwKeyLen > *pdwSigLen) { SetLastError(ERROR_MORE_DATA); *pdwSigLen = pCryptKey->dwKeyLen; - return FALSE; + goto out; } *pdwSigLen = pCryptKey->dwKeyLen; @@ -4202,22 +4204,25 @@ BOOL WINAPI RSAENH_CPSignHash(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwKeySpe if (!RSAENH_CPHashData(hProv, hHash, (CONST BYTE*)sDescription, (DWORD)lstrlenW(sDescription)*sizeof(WCHAR), 0)) { - return FALSE; + goto out; } } dwHashLen = sizeof(DWORD); - if (!RSAENH_CPGetHashParam(hProv, hHash, HP_ALGID, (BYTE*)&aiAlgid, &dwHashLen, 0)) return FALSE; + if (!RSAENH_CPGetHashParam(hProv, hHash, HP_ALGID, (BYTE*)&aiAlgid, &dwHashLen, 0)) goto out; dwHashLen = RSAENH_MAX_HASH_SIZE; - if (!RSAENH_CPGetHashParam(hProv, hHash, HP_HASHVAL, abHashValue, &dwHashLen, 0)) return FALSE; + if (!RSAENH_CPGetHashParam(hProv, hHash, HP_HASHVAL, abHashValue, &dwHashLen, 0)) goto out; if (!build_hash_signature(pbSignature, *pdwSigLen, aiAlgid, abHashValue, dwHashLen, dwFlags)) { - return FALSE; + goto out; } - return encrypt_block_impl(pCryptKey->aiAlgid, PK_PRIVATE, &pCryptKey->context, pbSignature, pbSignature, RSAENH_ENCRYPT); + ret = encrypt_block_impl(pCryptKey->aiAlgid, PK_PRIVATE, &pCryptKey->context, pbSignature, pbSignature, RSAENH_ENCRYPT); +out: + RSAENH_CPDestroyKey(hProv, hCryptKey); + return ret; } /******************************************************************************

1 0

James Hawkins : msi: Verify that the first parameter to Installer. OpenPackage is a VT_BSTR.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 1ff6c0862186df16c108a2403345f03da507e534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff6c0862186df16c108a2403… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 4 17:17:03 2009 -0800 msi: Verify that the first parameter to Installer.OpenPackage is a VT_BSTR. It seems ugly to open up the parameters in pDispParams, but DispGetParam will happily convert a VT_EMPTY to a VT_BSTR and not return an error. --- dlls/msi/automation.c | 2 ++ dlls/msi/tests/automation.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 0d02c46..baf406d 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1587,6 +1587,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( { if (pDispParams->cArgs == 0) return DISP_E_TYPEMISMATCH; + if (V_VT(&pDispParams->rgvarg[pDispParams->cArgs - 1]) != VT_BSTR) + return DISP_E_TYPEMISMATCH; hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index c7db3e4..90a8ebf 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -649,14 +649,14 @@ static void test_dispatch(void) dispparams.cArgs = 1; VariantInit(&vararg[0]); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - todo_wine ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); /* Try two empty parameters */ dispparams.cArgs = 2; VariantInit(&vararg[0]); VariantInit(&vararg[1]); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - todo_wine ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); /* Try one parameter, the required BSTR. Second parameter is optional. * NOTE: The specified package does not exist, which is why the call fails.

1 0

James Hawkins : msi: It' s possible to send in more than two parameters to Installer.OpenPackage, but sending in zero parameters should return DISP_E_TYPEMISMATCH.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 46876043568d560d88750cd459205e7853671bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46876043568d560d88750cd45… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 4 17:16:16 2009 -0800 msi: It's possible to send in more than two parameters to Installer.OpenPackage, but sending in zero parameters should return DISP_E_TYPEMISMATCH. --- dlls/msi/automation.c | 2 ++ dlls/msi/tests/automation.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 3b6dd2d..0d02c46 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1585,6 +1585,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( case DISPID_INSTALLER_OPENPACKAGE: if (wFlags & DISPATCH_METHOD) { + if (pDispParams->cArgs == 0) + return DISP_E_TYPEMISMATCH; hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 6c6c303..c7db3e4 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -642,7 +642,7 @@ static void test_dispatch(void) /* Try with NULL params */ hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - todo_wine ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); /* Try one empty parameter */ dispparams.rgvarg = vararg;

1 0

James Hawkins : msi: Add more tests for the Installer.OpenPackage method.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: b61405289562191d12017e6adfbf1de0b80bac0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b61405289562191d12017e6ad… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 4 17:16:07 2009 -0800 msi: Add more tests for the Installer.OpenPackage method. The following series fixes a few leaks reported by valgrind. We were leaking exception info caused by Installer.OpenPackage failing when we didn't expected it. --- dlls/msi/tests/automation.c | 172 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 158 insertions(+), 14 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index b792fa7..6c6c303 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -271,6 +271,27 @@ static void create_database(const CHAR *name, const msi_table *tables, int num_t MsiCloseHandle(db); } +static BOOL create_package(LPWSTR path) +{ + DWORD len; + + /* Prepare package */ + create_database(msifile, tables, + sizeof(tables) / sizeof(msi_table), summary_info, + sizeof(summary_info) / sizeof(msi_summary_info)); + + len = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, + CURR_DIR, -1, path, MAX_PATH); + ok(len, "MultiByteToWideChar returned error %d\n", GetLastError()); + if (!len) + return FALSE; + + /* lstrcatW does not work on win95 */ + path[len - 1] = '\\'; + memcpy(&path[len], szMsifile, sizeof(szMsifile)); + return TRUE; +} + /* * Installation helpers */ @@ -592,7 +613,8 @@ static void test_dispatch(void) DISPID dispid; OLECHAR *name; VARIANT varresult; - VARIANTARG vararg[2]; + VARIANTARG vararg[3]; + WCHAR path[MAX_PATH]; DISPPARAMS dispparams = {NULL, NULL, 0, 0}; /* Test getting ID of a function name that does not exist */ @@ -629,15 +651,148 @@ static void test_dispatch(void) hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); todo_wine ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); - /* Try one parameter, function requires two */ + /* Try two empty parameters */ + dispparams.cArgs = 2; + VariantInit(&vararg[0]); + VariantInit(&vararg[1]); + hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + todo_wine ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); + + /* Try one parameter, the required BSTR. Second parameter is optional. + * NOTE: The specified package does not exist, which is why the call fails. + */ + dispparams.cArgs = 1; VariantInit(&vararg[0]); V_VT(&vararg[0]) = VT_BSTR; V_BSTR(&vararg[0]) = SysAllocString(szMsifile); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr); + ok_exception(hr, szOpenPackageException); VariantClear(&vararg[0]); + /* Provide the required BSTR and an empty second parameter. + * NOTE: The specified package does not exist, which is why the call fails. + */ + dispparams.cArgs = 2; + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(szMsifile); + VariantInit(&vararg[0]); + hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr); + ok_exception(hr, szOpenPackageException); + VariantClear(&vararg[1]); + + /* Provide the required BSTR and two empty parameters. + * NOTE: The specified package does not exist, which is why the call fails. + */ + dispparams.cArgs = 3; + VariantInit(&vararg[2]); + V_VT(&vararg[2]) = VT_BSTR; + V_BSTR(&vararg[2]) = SysAllocString(szMsifile); + VariantInit(&vararg[1]); + VariantInit(&vararg[0]); + hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr); + ok_exception(hr, szOpenPackageException); + VariantClear(&vararg[2]); + + /* Provide the required BSTR and a second parameter with the wrong type. */ + dispparams.cArgs = 2; + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(szMsifile); + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_BSTR; + V_BSTR(&vararg[0]) = SysAllocString(szMsifile); + hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); + VariantClear(&vararg[0]); + VariantClear(&vararg[1]); + + /* Create a proper installer package. */ + create_package(path); + + /* Try one parameter, the required BSTR. Second parameter is optional. + * Proper installer package exists. Path to the package is relative. + */ + dispparams.cArgs = 1; + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_BSTR; + V_BSTR(&vararg[0]) = SysAllocString(szMsifile); + hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr); ok_exception(hr, szOpenPackageException); + VariantClear(&vararg[0]); + + /* Try one parameter, the required BSTR. Second parameter is optional. + * Proper installer package exists. Path to the package is absolute. + */ + dispparams.cArgs = 1; + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_BSTR; + V_BSTR(&vararg[0]) = SysAllocString(path); + hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + todo_wine ok(hr == S_OK, "IDispatch::Invoke returned 0x%08x\n", hr); + VariantClear(&vararg[0]); + VariantClear(&varresult); + + /* Provide the required BSTR and an empty second parameter. Proper + * installation package exists. + */ + dispparams.cArgs = 2; + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(path); + VariantInit(&vararg[0]); + hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok(hr == S_OK, "IDispatch::Invoke returned 0x%08x\n", hr); + VariantClear(&vararg[1]); + VariantClear(&varresult); + + /* Provide the required BSTR and two empty parameters. Proper + * installation package exists. + */ + dispparams.cArgs = 3; + VariantInit(&vararg[2]); + V_VT(&vararg[2]) = VT_BSTR; + V_BSTR(&vararg[2]) = SysAllocString(path); + VariantInit(&vararg[1]); + VariantInit(&vararg[0]); + hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok(hr == S_OK, "IDispatch::Invoke returned 0x%08x\n", hr); + VariantClear(&vararg[2]); + VariantClear(&varresult); + + /* Provide the required BSTR and a second parameter with the wrong type. */ + dispparams.cArgs = 2; + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(path); + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_BSTR; + V_BSTR(&vararg[0]) = SysAllocString(path); + hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); + VariantClear(&vararg[0]); + VariantClear(&vararg[1]); + + /* Provide the required BSTR and a second parameter that can be coerced to + * VT_I4. + */ + dispparams.cArgs = 2; + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(path); + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_I2; + V_BSTR(&vararg[0]) = 0; + hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok(hr == S_OK, "IDispatch::Invoke returned 0x%08x\n", hr); + VariantClear(&vararg[1]); + VariantClear(&varresult); + + DeleteFileW(path); /* Test invoking a method as a DISPATCH_PROPERTYGET or DISPATCH_PROPERTYPUT */ VariantInit(&vararg[0]); @@ -2353,7 +2508,6 @@ static void test_Installer(void) static WCHAR szIntegerDataException[] = { 'I','n','t','e','g','e','r','D','a','t','a',',','F','i','e','l','d',0 }; WCHAR szPath[MAX_PATH]; HRESULT hr; - UINT len; IDispatch *pSession = NULL, *pDatabase = NULL, *pRecord = NULL, *pStringList = NULL; int iValue, iCount; @@ -2404,17 +2558,7 @@ static void test_Installer(void) IDispatch_Release(pRecord); } - /* Prepare package */ - create_database(msifile, tables, sizeof(tables) / sizeof(msi_table), - summary_info, sizeof(summary_info) / sizeof(msi_summary_info)); - - len = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, CURR_DIR, -1, szPath, MAX_PATH); - ok(len, "MultiByteToWideChar returned error %d\n", GetLastError()); - if (!len) return; - - /* lstrcatW does not work on win95 */ - szPath[len - 1] = '\\'; - memcpy(&szPath[len], szMsifile, sizeof(szMsifile)); + create_package(szPath); /* Installer::OpenPackage */ hr = Installer_OpenPackage(szPath, 0, &pSession);

1 0