June 2007 - Wine-commits - list.winehq.org

Michael Stefaniuc : wingdi.h: Multi-character character constants are implementation specific according to the C standard . Use a hex number instead.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 30f67b1534075adc81421f36d698df0af79d8cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f67b1534075adc81421f36d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 4 23:09:26 2007 +0200 wingdi.h: Multi-character character constants are implementation specific according to the C standard. Use a hex number instead. --- include/wingdi.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index 77ad737..0215922 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1851,8 +1851,8 @@ typedef struct { DWORD bV5Reserved; } BITMAPV5HEADER, *LPBITMAPV5HEADER, *PBITMAPV5HEADER; -#define PROFILE_LINKED 'LINK' -#define PROFILE_EMBEDDED 'MBED' +#define PROFILE_LINKED 0x4c494e4b /* 'LINK' */ +#define PROFILE_EMBEDDED 0x4d424544 /* 'MBED' */ /* biCompression */

1 0

Michael Stefaniuc : capi2032: Fix non-ANSI function declaration. Found by sparse.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 51cc433cc8fd6e39c16424945aff33b23d60248e URL: http://source.winehq.org/git/wine.git/?a=commit;h=51cc433cc8fd6e39c16424945… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 5 00:18:07 2007 +0200 capi2032: Fix non-ANSI function declaration. Found by sparse. --- dlls/capi2032/cap20wxx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/capi2032/cap20wxx.c b/dlls/capi2032/cap20wxx.c index c8e6507..4f2352f 100644 --- a/dlls/capi2032/cap20wxx.c +++ b/dlls/capi2032/cap20wxx.c @@ -60,7 +60,7 @@ static unsigned char *(*pcapi20_get_manufacturer)(unsigned, unsigned char *) = N static unsigned char *(*pcapi20_get_serial_number)(unsigned, unsigned char *) = NULL; static unsigned char *(*pcapi20_get_version)(unsigned, unsigned char *) = NULL; -static void load_functions() { +static void load_functions(void) { void *capi_handle = NULL; if (pcapi20_register) /* loaded already */

1 0

Michael Stefaniuc : gphoto2.ds: Fix non-ANSI function declaration. Found by sparse.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: a211a64eca102b8d862f45ef97aa6901274db66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a211a64eca102b8d862f45ef9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 5 00:18:16 2007 +0200 gphoto2.ds: Fix non-ANSI function declaration. Found by sparse. --- dlls/gphoto2.ds/gphoto2_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index 83e2eea..f4f4546 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -509,7 +509,7 @@ static CameraList *detected_cameras; static CameraAbilitiesList *abilities_list; static TW_UINT16 -gphoto2_auto_detect() { +gphoto2_auto_detect(void) { int result, count; if (detected_cameras && (gp_list_count (detected_cameras) == 0)) {

1 0

Misha Koshelev : msi: automation: Implement SummaryInfo::PropertyCount.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: b7233ba33f22ecfebb1069ccac5d733463509e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7233ba33f22ecfebb1069cca… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jun 4 09:26:51 2007 -0500 msi: automation: Implement SummaryInfo::PropertyCount. --- dlls/msi/automation.c | 14 ++++++++++++++ dlls/msi/msiserver.idl | 2 ++ dlls/msi/msiserver_dispids.h | 1 + dlls/msi/tests/automation.c | 18 ++++++------------ 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 9997fbe..97084fc 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -858,6 +858,20 @@ static HRESULT WINAPI SummaryInfoImpl_Invoke( else return DISP_E_MEMBERNOTFOUND; break; + case DISPID_SUMMARYINFO_PROPERTYCOUNT: + if (wFlags & DISPATCH_PROPERTYGET) { + UINT count; + if ((ret = MsiSummaryInfoGetPropertyCount(This->msiHandle, &count)) != ERROR_SUCCESS) + ERR("MsiSummaryInfoGetPropertyCount returned %d\n", ret); + else + { + V_VT(pVarResult) = VT_I4; + V_I4(pVarResult) = count; + } + } + else return DISP_E_MEMBERNOTFOUND; + break; + default: return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index e1be538..d0db26e 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -161,6 +161,8 @@ library WindowsInstaller void Property( [in] long Pid, [in] VARIANT rhs); + [id(DISPID_SUMMARYINFO_PROPERTYCOUNT), propget] + long PropertyCount(); } typedef enum { diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index 1b04e81..8d673dd 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -54,3 +54,4 @@ #define DISPID_SESSION_SETINSTALLLEVEL 19 #define DISPID_SUMMARYINFO_PROPERTY 1 +#define DISPID_SUMMARYINFO_PROPERTYCOUNT 2 diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 8e531de..7308671 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1322,12 +1322,9 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in int j; /* SummaryInfo::PropertyCount */ - todo_wine - { - hr = SummaryInfo_PropertyCountGet(pSummaryInfo, &j); - ok(hr == S_OK, "SummaryInfo_PropertyCount failed, hresult 0x%08x\n", hr); - ok(j == num_info, "SummaryInfo_PropertyCount returned %d, expected %d\n", j, num_info); - } + hr = SummaryInfo_PropertyCountGet(pSummaryInfo, &j); + ok(hr == S_OK, "SummaryInfo_PropertyCount failed, hresult 0x%08x\n", hr); + ok(j == num_info, "SummaryInfo_PropertyCount returned %d, expected %d\n", j, num_info); /* SummaryInfo::Property, get for properties we have set */ for (j = 0; j < num_info; j++) @@ -1451,12 +1448,9 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in VariantClear(&var); /* SummaryInfo::PropertyCount */ - todo_wine - { - hr = SummaryInfo_PropertyCountGet(pSummaryInfo, &j); - ok(hr == S_OK, "SummaryInfo_PropertyCount failed, hresult 0x%08x\n", hr); - ok(j == num_info+4, "SummaryInfo_PropertyCount returned %d, expected %d\n", j, num_info); - } + hr = SummaryInfo_PropertyCountGet(pSummaryInfo, &j); + ok(hr == S_OK, "SummaryInfo_PropertyCount failed, hresult 0x%08x\n", hr); + ok(j == num_info+4, "SummaryInfo_PropertyCount returned %d, expected %d\n", j, num_info); } }

1 0

Stefan Leichter : qcap: Replace DeleteEntireSubKey with RegDeleteTreeW.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 163815180a79949de42f03f9d231a008e1da4610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=163815180a79949de42f03f9d… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jun 4 22:30:02 2007 +0200 qcap: Replace DeleteEntireSubKey with RegDeleteTreeW. --- dlls/qcap/dllsetup.c | 33 +-------------------------------- 1 files changed, 1 insertions(+), 32 deletions(-) diff --git a/dlls/qcap/dllsetup.c b/dlls/qcap/dllsetup.c index 8de99ec..ad3d84c 100644 --- a/dlls/qcap/dllsetup.c +++ b/dlls/qcap/dllsetup.c @@ -55,37 +55,6 @@ static WCHAR const tmodel_both[] = {'B','o','t','h',0}; /* - * Delete a key and all its subkeys - */ -static HRESULT DeleteEntireSubKey(HKEY hkey, LPWSTR strSubKey) -{ - WCHAR buffer[MAX_KEY_LEN]; - DWORD dw = MAX_KEY_LEN; - FILETIME ft; - HKEY hk; - LONG ret = RegOpenKeyExW(hkey, strSubKey, 0, MAXIMUM_ALLOWED, &hk); - - if (ERROR_SUCCESS == ret) - { - /* Keep on enumerating the first key and deleting that */ - for( ; ; ) - { - dw = MAX_KEY_LEN; - - ret = RegEnumKeyExW(hk, 0, buffer, &dw, NULL, NULL, NULL, &ft); - - if (ERROR_SUCCESS == ret) - DeleteEntireSubKey(hk, buffer); - else - break; - } - RegCloseKey(hk); - RegDeleteKeyW(hkey, strSubKey); - } - return NOERROR; -} - -/* * SetupRegisterClass() */ static HRESULT SetupRegisterClass(HKEY clsid, LPCWSTR szCLSID, @@ -252,7 +221,7 @@ static HRESULT SetupRegisterAllClasses(const CFactoryTemplate * pList, int num, pList->m_Name, szFileName, ips32_keyname, tmodel_both); else - hr = DeleteEntireSubKey(hkey, szCLSID); + hr = RegDeleteTreeW(hkey, szCLSID); } } RegCloseKey(hkey);

1 0

Misha Koshelev : msi/tests: automation: Add tests for SummaryInfo:: PropertyCount.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 61f4fff42b26958e47e04252b4a460edfd19fecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f4fff42b26958e47e04252b… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jun 4 09:26:48 2007 -0500 msi/tests: automation: Add tests for SummaryInfo::PropertyCount. --- dlls/msi/tests/automation.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index ba2fe6c..8e531de 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1296,6 +1296,18 @@ static HRESULT SummaryInfo_PropertyPut(IDispatch *pSummaryInfo, int pid, VARIANT return invoke(pSummaryInfo, "Property", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_EMPTY); } +static HRESULT SummaryInfo_PropertyCountGet(IDispatch *pSummaryInfo, int *pCount) +{ + VARIANT varresult; + DISPPARAMS dispparams = {NULL, NULL, 0, 0}; + HRESULT hr; + + hr = invoke(pSummaryInfo, "PropertyCount", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_I4); + *pCount = V_I4(&varresult); + VariantClear(&varresult); + return hr; +} + /* Test the various objects */ #define TEST_SUMMARYINFO_PROPERTIES_MODIFIED 4 @@ -1309,6 +1321,14 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in HRESULT hr; int j; + /* SummaryInfo::PropertyCount */ + todo_wine + { + hr = SummaryInfo_PropertyCountGet(pSummaryInfo, &j); + ok(hr == S_OK, "SummaryInfo_PropertyCount failed, hresult 0x%08x\n", hr); + ok(j == num_info, "SummaryInfo_PropertyCount returned %d, expected %d\n", j, num_info); + } + /* SummaryInfo::Property, get for properties we have set */ for (j = 0; j < num_info; j++) { @@ -1429,6 +1449,14 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in ok(V_I4(&var) == V_I4(&varresult), "SummaryInfo_PropertyGet expected %d, but returned %d\n", V_I4(&var), V_I4(&varresult)); VariantClear(&varresult); VariantClear(&var); + + /* SummaryInfo::PropertyCount */ + todo_wine + { + hr = SummaryInfo_PropertyCountGet(pSummaryInfo, &j); + ok(hr == S_OK, "SummaryInfo_PropertyCount failed, hresult 0x%08x\n", hr); + ok(j == num_info+4, "SummaryInfo_PropertyCount returned %d, expected %d\n", j, num_info); + } } }

1 0

Misha Koshelev : msi: automation: Implement SummaryInfo::Property, put.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: dcbd8e93d581eb6d343961b72b986b14b4a56bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcbd8e93d581eb6d343961b72… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jun 4 09:26:45 2007 -0500 msi: automation: Implement SummaryInfo::Property, put. --- dlls/msi/automation.c | 56 +++++++++++++++++++++++++++++++++++++----- dlls/msi/msiserver.idl | 4 +++ dlls/msi/tests/automation.c | 19 ++++++-------- 3 files changed, 61 insertions(+), 18 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 09f35b2..9997fbe 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -742,10 +742,13 @@ static HRESULT WINAPI SummaryInfoImpl_Invoke( UINT* puArgErr) { UINT ret; - VARIANTARG varg0; + VARIANTARG varg0, varg1; + FILETIME ft, ftlocal; + SYSTEMTIME st; HRESULT hr; VariantInit(&varg0); + VariantInit(&varg1); switch (dispIdMember) { @@ -755,8 +758,6 @@ static HRESULT WINAPI SummaryInfoImpl_Invoke( UINT type; INT value; DWORD size = 0; - FILETIME ft, ftlocal; - SYSTEMTIME st; DATE date; LPWSTR str; @@ -779,10 +780,6 @@ static HRESULT WINAPI SummaryInfoImpl_Invoke( break; case VT_I2: - V_VT(pVarResult) = VT_I2; - V_I2(pVarResult) = value; - break; - case VT_I4: V_VT(pVarResult) = VT_I4; V_I4(pVarResult) = value; @@ -815,6 +812,49 @@ static HRESULT WINAPI SummaryInfoImpl_Invoke( ERR("Unhandled variant type %d\n", type); } } + else if (wFlags & DISPATCH_PROPERTYPUT) + { + UINT posValue = DISPID_PROPERTYPUT; + + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) return hr; + hr = DispGetParam_CopyOnly(pDispParams, &posValue, &varg1); + if (FAILED(hr)) + { + *puArgErr = posValue; + return hr; + } + + switch (V_VT(&varg1)) + { + case VT_I2: + case VT_I4: + ret = MsiSummaryInfoSetPropertyW(This->msiHandle, V_I4(&varg0), V_VT(&varg1), V_I4(&varg1), NULL, NULL); + break; + + case VT_DATE: + VariantTimeToSystemTime(V_DATE(&varg1), &st); + SystemTimeToFileTime(&st, &ftlocal); + LocalFileTimeToFileTime(&ftlocal, &ft); + ret = MsiSummaryInfoSetPropertyW(This->msiHandle, V_I4(&varg0), VT_FILETIME, 0, &ft, NULL); + break; + + case VT_BSTR: + ret = MsiSummaryInfoSetPropertyW(This->msiHandle, V_I4(&varg0), VT_LPSTR, 0, NULL, V_BSTR(&varg1)); + break; + + default: + FIXME("Unhandled variant type %d\n", V_VT(&varg1)); + VariantClear(&varg1); + return DISP_E_EXCEPTION; + } + + if (ret != ERROR_SUCCESS) + { + ERR("MsiSummaryInfoSetPropertyW returned %d\n", ret); + return DISP_E_EXCEPTION; + } + } else return DISP_E_MEMBERNOTFOUND; break; @@ -822,7 +862,9 @@ static HRESULT WINAPI SummaryInfoImpl_Invoke( return DISP_E_MEMBERNOTFOUND; } + VariantClear(&varg1); VariantClear(&varg0); + return S_OK; } diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 4a5a3bd..e1be538 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -157,6 +157,10 @@ library WindowsInstaller methods: [id(DISPID_SUMMARYINFO_PROPERTY), propget] VARIANT Property([in] long Pid); + [id(DISPID_SUMMARYINFO_PROPERTY), propput] + void Property( + [in] long Pid, + [in] VARIANT rhs); } typedef enum { diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index ad96503..ba2fe6c 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1379,18 +1379,16 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in { /* SummaryInfo::Property, put; one for each type */ - _invoke_todo_vtResult = 1; - /* VT_I2 */ VariantInit(&var); V_VT(&var) = VT_I2; V_I2(&var) = 1; hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_CODEPAGE, &var); - todo_wine ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_CODEPAGE, &varresult, VT_I4 /* NOT VT_I2 */); ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); - todo_wine ok(V_I2(&var) == V_I2(&varresult), "SummaryInfo_PropertyGet expected %d, but returned %d\n", V_I2(&var), V_I2(&varresult)); + ok(V_I2(&var) == V_I2(&varresult), "SummaryInfo_PropertyGet expected %d, but returned %d\n", V_I2(&var), V_I2(&varresult)); VariantClear(&varresult); VariantClear(&var); @@ -1398,11 +1396,11 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(szTitle); hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_TITLE, &var); - todo_wine ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_TITLE, &varresult, V_VT(&var)); ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); - todo_wine ok_w2("SummaryInfo_PropertyGet expected %s, but returned %s\n", V_BSTR(&var), V_BSTR(&varresult)); + ok_w2("SummaryInfo_PropertyGet expected %s, but returned %s\n", V_BSTR(&var), V_BSTR(&varresult)); VariantClear(&varresult); VariantClear(&var); @@ -1411,10 +1409,11 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in FileTimeToSystemTime(&systemtime, &st); SystemTimeToVariantTime(&st, &V_DATE(&var)); hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_LASTSAVE_DTM, &var); - todo_wine ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_LASTSAVE_DTM, &varresult, V_VT(&var)); ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + /* FIXME: Off by one second */ todo_wine ok(V_DATE(&var) == V_DATE(&varresult), "SummaryInfo_PropertyGet expected %lf, but returned %lf\n", V_DATE(&var), V_DATE(&varresult)); VariantClear(&varresult); VariantClear(&var); @@ -1423,15 +1422,13 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in V_VT(&var) = VT_I4; V_I4(&var) = 1000; hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_CHARCOUNT, &var); - todo_wine ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_CHARCOUNT, &varresult, V_VT(&var)); ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); - todo_wine ok(V_I4(&var) == V_I4(&varresult), "SummaryInfo_PropertyGet expected %d, but returned %d\n", V_I4(&var), V_I4(&varresult)); + ok(V_I4(&var) == V_I4(&varresult), "SummaryInfo_PropertyGet expected %d, but returned %d\n", V_I4(&var), V_I4(&varresult)); VariantClear(&varresult); VariantClear(&var); - - _invoke_todo_vtResult = 0; } }

1 0

Misha Koshelev : msi/tests: automation: Add test for Installer:: OpenDatabase.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 3fd518a50530062948631c27ce14b12a3352345d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd518a50530062948631c27c… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jun 4 09:26:33 2007 -0500 msi/tests: automation: Add test for Installer::OpenDatabase. --- dlls/msi/msiserver_dispids.h | 2 +- dlls/msi/tests/automation.c | 42 +++++++++++++++++++++++++++++++++++------- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index c01adbe..1b04e81 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -18,7 +18,7 @@ #define DISPID_INSTALLER_CREATERECORD 1 #define DISPID_INSTALLER_OPENPACKAGE 2 -#define DISPID_INSTALLER_OPENDATABASE 3 +#define DISPID_INSTALLER_OPENDATABASE 4 #define DISPID_INSTALLER_INSTALLPRODUCT 8 #define DISPID_INSTALLER_REGISTRYVALUE 11 #define DISPID_INSTALLER_PRODUCTSTATE 17 diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 5f6f667..2c29c6d 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -458,9 +458,9 @@ static void test_dispid(void) { ok( get_dispid( pInstaller, "CreateRecord" ) == 1, "dispid wrong\n"); ok( get_dispid( pInstaller, "OpenPackage" ) == 2, "dispid wrong\n"); - todo_wine { - ok( get_dispid( pInstaller, "OpenProduct" ) == 3, "dispid wrong\n"); + todo_wine ok( get_dispid( pInstaller, "OpenProduct" ) == 3, "dispid wrong\n"); ok( get_dispid( pInstaller, "OpenDatabase" ) == 4, "dispid wrong\n"); + todo_wine { ok( get_dispid( pInstaller, "SummaryInformation" ) == 5, "dispid wrong\n"); ok( get_dispid( pInstaller, "UILevel" ) == 6, "dispid wrong\n"); ok( get_dispid( pInstaller, "EnableLog" ) == 7, "dispid wrong\n"); @@ -765,6 +765,25 @@ static HRESULT Installer_OpenPackage(LPCWSTR szPackagePath, int options, IDispat return hr; } +static HRESULT Installer_OpenDatabase(LPCWSTR szDatabasePath, int openmode, IDispatch **pDatabase) +{ + VARIANT varresult; + VARIANTARG vararg[2]; + DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0}; + HRESULT hr; + + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(szDatabasePath); + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = openmode; + + hr = invoke(pInstaller, "OpenDatabase", DISPATCH_METHOD, &dispparams, &varresult, VT_DISPATCH); + *pDatabase = V_DISPATCH(&varresult); + return hr; +} + static HRESULT Installer_InstallProduct(LPCWSTR szPackagePath, LPCWSTR szPropertyValues) { VARIANT varresult; @@ -1263,7 +1282,7 @@ static HRESULT SummaryInfo_PropertyGet(IDispatch *pSummaryInfo, int pid, VARIANT /* Test the various objects */ -static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *info, int num_info) +static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *info, int num_info, BOOL readonly) { static const WCHAR szPropertyException[] = { 'P','r','o','p','e','r','t','y',',','P','i','d',0 }; VARIANT varresult; @@ -1340,7 +1359,7 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); } -static void test_Database(IDispatch *pDatabase) +static void test_Database(IDispatch *pDatabase, BOOL readonly) { static WCHAR szSql[] = { 'S','E','L','E','C','T',' ','`','F','e','a','t','u','r','e','`',' ','F','R','O','M',' ','`','F','e','a','t','u','r','e','`',' ','W','H','E','R','E',' ','`','F','e','a','t','u','r','e','_','P','a','r','e','n','t','`','=','\'','O','n','e','\'',0 }; static WCHAR szThree[] = { 'T','h','r','e','e',0 }; @@ -1450,7 +1469,7 @@ static void test_Database(IDispatch *pDatabase) ok(pSummaryInfo != NULL, "Database_SummaryInformation should not have returned NULL record\n"); if (pSummaryInfo) { - test_SummaryInfo(pSummaryInfo, summary_info, sizeof(summary_info)/sizeof(msi_summary_info)); + test_SummaryInfo(pSummaryInfo, summary_info, sizeof(summary_info)/sizeof(msi_summary_info), readonly); IDispatch_Release(pSummaryInfo); } } @@ -1538,7 +1557,7 @@ static void test_Session(IDispatch *pSession) ok(hr == S_OK, "Session_Database failed, hresult 0x%08x\n", hr); if (hr == S_OK) { - test_Database(pDatabase); + test_Database(pDatabase, TRUE); IDispatch_Release(pDatabase); } @@ -2136,7 +2155,7 @@ static void test_Installer(void) WCHAR szPath[MAX_PATH]; HRESULT hr; UINT len; - IDispatch *pSession = NULL, *pRecord = NULL, *pStringList = NULL; + IDispatch *pSession = NULL, *pDatabase = NULL, *pRecord = NULL, *pStringList = NULL; int iValue, iCount; if (!pInstaller) return; @@ -2206,6 +2225,15 @@ static void test_Installer(void) IDispatch_Release(pSession); } + /* Installer::OpenDatabase */ + hr = Installer_OpenDatabase(szPath, (int)MSIDBOPEN_TRANSACT, &pDatabase); + ok(hr == S_OK, "Installer_OpenDatabase failed, hresult 0x%08x\n", hr); + if (hr == S_OK) + { + test_Database(pDatabase, FALSE); + IDispatch_Release(pDatabase); + } + /* Installer::RegistryValue */ test_Installer_RegistryValue();

1 0

Misha Koshelev : msi: automation: Add MsiOpenDatabaseMode enum.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 41ca1f7106cd4b54729a90c0b6d5ca80267b86f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ca1f7106cd4b54729a90c0b… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jun 4 09:26:37 2007 -0500 msi: automation: Add MsiOpenDatabaseMode enum. --- dlls/msi/msiserver.idl | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index fd268e1..4a5a3bd 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -55,6 +55,15 @@ library WindowsInstaller msiInstallStateDefault = 5 } MsiInstallState; + typedef enum { + msiOpenDatabaseModeReadOnly = 0, + msiOpenDatabaseModeTransact = 1, + msiOpenDatabaseModeDirect = 2, + msiOpenDatabaseModeCreate = 3, + msiOpenDatabaseModeCreateDirect = 4, + msiOpenDatabaseModePatchFile = 32 + } MsiOpenDatabaseMode; + [ uuid(000C1090-0000-0000-C000-000000000046) ] dispinterface Installer {

1 0

Misha Koshelev : msi/tests: automation: Add tests for SummaryInfo::Property , put.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: aaa7fd9e113b14ecd161ed220449c53852bd76ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa7fd9e113b14ecd161ed220… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jun 4 09:26:42 2007 -0500 msi/tests: automation: Add tests for SummaryInfo::Property, put. --- dlls/msi/tests/automation.c | 88 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 2c29c6d..ad96503 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1280,12 +1280,32 @@ static HRESULT SummaryInfo_PropertyGet(IDispatch *pSummaryInfo, int pid, VARIANT return invoke(pSummaryInfo, "Property", DISPATCH_PROPERTYGET, &dispparams, pVarResult, vtExpect); } +static HRESULT SummaryInfo_PropertyPut(IDispatch *pSummaryInfo, int pid, VARIANT *pVariant) +{ + VARIANT varresult; + VARIANTARG vararg[2]; + DISPID dispid = DISPID_PROPERTYPUT; + DISPPARAMS dispparams = {vararg, &dispid, sizeof(vararg)/sizeof(VARIANTARG), 1}; + + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_I4; + V_I4(&vararg[1]) = pid; + VariantInit(&vararg[0]); + VariantCopyInd(vararg, pVariant); + + return invoke(pSummaryInfo, "Property", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_EMPTY); +} + /* Test the various objects */ +#define TEST_SUMMARYINFO_PROPERTIES_MODIFIED 4 + static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *info, int num_info, BOOL readonly) { static const WCHAR szPropertyException[] = { 'P','r','o','p','e','r','t','y',',','P','i','d',0 }; - VARIANT varresult; + static const WCHAR szTitle[] = { 'T','i','t','l','e',0 }; + VARIANT varresult, var; + SYSTEMTIME st; HRESULT hr; int j; @@ -1297,20 +1317,17 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in int vt = entry->datatype; if (vt == VT_LPSTR) vt = VT_BSTR; else if (vt == VT_FILETIME) vt = VT_DATE; + else if (vt == VT_I2) vt = VT_I4; hr = SummaryInfo_PropertyGet(pSummaryInfo, entry->property, &varresult, vt); ok(hr == S_OK, "SummaryInfo_Property (pid %d) failed, hresult 0x%08x\n", entry->property, hr); if (V_VT(&varresult) != vt) skip("Skipping property tests due to type mismatch\n"); - else if (vt == VT_I2) - ok(V_I2(&varresult) == entry->iValue, "SummaryInfo_Property (pid %d) I2 result expected to be %d, but was %d\n", - entry->property, entry->iValue, V_I2(&varresult)); else if (vt == VT_I4) ok(V_I4(&varresult) == entry->iValue, "SummaryInfo_Property (pid %d) I4 result expected to be %d, but was %d\n", entry->property, entry->iValue, V_I4(&varresult)); else if (vt == VT_DATE) { - SYSTEMTIME st; FILETIME ft; DATE d; @@ -1357,6 +1374,65 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_CHARCOUNT, &varresult, VT_EMPTY); ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + + if (!readonly) + { + /* SummaryInfo::Property, put; one for each type */ + + _invoke_todo_vtResult = 1; + + /* VT_I2 */ + VariantInit(&var); + V_VT(&var) = VT_I2; + V_I2(&var) = 1; + hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_CODEPAGE, &var); + todo_wine ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); + + hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_CODEPAGE, &varresult, VT_I4 /* NOT VT_I2 */); + ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + todo_wine ok(V_I2(&var) == V_I2(&varresult), "SummaryInfo_PropertyGet expected %d, but returned %d\n", V_I2(&var), V_I2(&varresult)); + VariantClear(&varresult); + VariantClear(&var); + + /* VT_BSTR */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(szTitle); + hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_TITLE, &var); + todo_wine ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); + + hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_TITLE, &varresult, V_VT(&var)); + ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + todo_wine ok_w2("SummaryInfo_PropertyGet expected %s, but returned %s\n", V_BSTR(&var), V_BSTR(&varresult)); + VariantClear(&varresult); + VariantClear(&var); + + /* VT_DATE */ + V_VT(&var) = VT_DATE; + FileTimeToSystemTime(&systemtime, &st); + SystemTimeToVariantTime(&st, &V_DATE(&var)); + hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_LASTSAVE_DTM, &var); + todo_wine ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); + + hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_LASTSAVE_DTM, &varresult, V_VT(&var)); + ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + todo_wine ok(V_DATE(&var) == V_DATE(&varresult), "SummaryInfo_PropertyGet expected %lf, but returned %lf\n", V_DATE(&var), V_DATE(&varresult)); + VariantClear(&varresult); + VariantClear(&var); + + /* VT_I4 */ + V_VT(&var) = VT_I4; + V_I4(&var) = 1000; + hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_CHARCOUNT, &var); + todo_wine ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); + + hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_CHARCOUNT, &varresult, V_VT(&var)); + ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + todo_wine ok(V_I4(&var) == V_I4(&varresult), "SummaryInfo_PropertyGet expected %d, but returned %d\n", V_I4(&var), V_I4(&varresult)); + VariantClear(&varresult); + VariantClear(&var); + + _invoke_todo_vtResult = 0; + } } static void test_Database(IDispatch *pDatabase, BOOL readonly) @@ -1464,7 +1540,7 @@ static void test_Database(IDispatch *pDatabase, BOOL readonly) } /* Database::SummaryInformation */ - hr = Database_SummaryInformation(pDatabase, 0, &pSummaryInfo); + hr = Database_SummaryInformation(pDatabase, TEST_SUMMARYINFO_PROPERTIES_MODIFIED, &pSummaryInfo); ok(hr == S_OK, "Database_SummaryInformation failed, hresult 0x%08x\n", hr); ok(pSummaryInfo != NULL, "Database_SummaryInformation should not have returned NULL record\n"); if (pSummaryInfo)

1 0