December 2009 - Wine-commits

Huw Davies : gdiplus: Fix a couple of memory leaks.
by Alexandre Julliard 07 Dec '09

07 Dec '09

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

Huw Davies : inetcomm: Fix memory leak.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: bf93519a395172c967c78467e2bf2437d35b59d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf93519a395172c967c78467e… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Dec 6 11:38:32 2009 +0000 inetcomm: Fix memory leak. Found by Valgrind. --- dlls/inetcomm/mimeole.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 871ffa5..992949a 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1610,6 +1610,7 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc } while(1); end: + HeapFree(GetProcessHeap(), 0, nl_boundary); HeapFree(GetProcessHeap(), 0, buf); return hr; }

1 0

Huw Davies : oleaut32: Fix a couple of memory leaks in the tests.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 6f4ad21b9d3e2b231859660fca3252013d480935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4ad21b9d3e2b231859660fc… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Dec 6 12:05:37 2009 +0000 oleaut32: Fix a couple of memory leaks in the tests. Found by Valgrind. --- dlls/oleaut32/tests/safearray.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index d539056..439325d 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1658,9 +1658,11 @@ static void test_SafeArrayChangeTypeEx(void) MKARRAY(0,1,VT_UI1); hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_NULL); ok(hres == DISP_E_TYPEMISMATCH, "CTE VT_ARRAY|VT_UI1 returned %x\n", hres); + VariantClear(&v); MKARRAY(0,1,VT_UI1); hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_EMPTY); ok(hres == DISP_E_TYPEMISMATCH, "CTE VT_ARRAY|VT_UI1 returned %x\n", hres); + VariantClear(&v); }

1 0

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

07 Dec '09

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 : mshtml/tests: Fix the get_event_src() macro declaration.
by Alexandre Julliard 07 Dec '09

07 Dec '09

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

Francois Gouget : wined3d: Don't define nameless structs or unions.
by Alexandre Julliard 07 Dec '09

07 Dec '09

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

James Hawkins : msi: Add more tests for the Installer.OpenPackage method.
by Alexandre Julliard 07 Dec '09

07 Dec '09

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

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 07 Dec '09

07 Dec '09

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: Verify that the first parameter to Installer. OpenPackage is a VT_BSTR.
by Alexandre Julliard 07 Dec '09

07 Dec '09

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: The second parameter to Installer. OpenPackage is optional, so set a default value of 0 if the parameter is not provided.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 25ab6930089940f2b88d92b5755c8fa46033484e URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ab6930089940f2b88d92b57… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 4 17:17:12 2009 -0800 msi: The second parameter to Installer.OpenPackage is optional, so set a default value of 0 if the parameter is not provided. --- dlls/msi/automation.c | 17 +++++++++++++---- dlls/msi/tests/automation.c | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index baf406d..3b3aa8f 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1591,11 +1591,20 @@ static HRESULT WINAPI InstallerImpl_Invoke( 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); - if (FAILED(hr)) + if (pDispParams->cArgs == 2) { - VariantClear(&varg0); - return hr; + hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); + if (FAILED(hr)) + { + VariantClear(&varg0); + return hr; + } + } + else + { + VariantInit(&varg1); + V_VT(&varg1) = VT_I4; + V_I4(&varg1) = 0; } V_VT(pVarResult) = VT_DISPATCH; if ((ret = MsiOpenPackageExW(V_BSTR(&varg0), V_I4(&varg1), &msiHandle)) == ERROR_SUCCESS) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 90a8ebf..6c24908 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -721,7 +721,7 @@ static void test_dispatch(void) 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); + todo_wine ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr); ok_exception(hr, szOpenPackageException); VariantClear(&vararg[0]); @@ -733,7 +733,7 @@ static void test_dispatch(void) 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); + ok(hr == S_OK, "IDispatch::Invoke returned 0x%08x\n", hr); VariantClear(&vararg[0]); VariantClear(&varresult);

1 0