December 2007 - Wine-Commits

James Hawkins : msi: Check the user component key for the clients.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: fced2fee2f153ce1e7f7ec4cff343870829e4f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fced2fee2f153ce1e7f7ec4cf… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 16 20:28:09 2007 -0600 msi: Check the user component key for the clients. --- dlls/msi/registry.c | 6 +++--- dlls/msi/tests/msi.c | 50 ++++++++++++++++++-------------------------------- 2 files changed, 21 insertions(+), 35 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index daa01e3..d81fb4e 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1317,9 +1317,9 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct) if (!szComponent || !*szComponent || !szProduct) return ERROR_INVALID_PARAMETER; - r = MSIREG_OpenComponentsKey(szComponent,&hkeyComp,FALSE); - if( r != ERROR_SUCCESS ) - return ERROR_NO_MORE_ITEMS; + r = MSIREG_OpenUserDataComponentKey(szComponent, &hkeyComp, FALSE); + if (r != ERROR_SUCCESS) + return ERROR_UNKNOWN_COMPONENT; sz = SQUISH_GUID_SIZE; r = RegEnumValueW(hkeyComp, index, szValName, &sz, NULL, NULL, NULL, NULL); diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 61c7ddf..3cd7c29 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1628,10 +1628,7 @@ static void test_MsiEnumClients(void) /* all params correct, component missing */ product[0] = '\0'; r = MsiEnumClientsA(component, 0, product); - todo_wine - { - ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); - } + ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\"); @@ -1666,20 +1663,14 @@ static void test_MsiEnumClients(void) /* product value exists */ r = MsiEnumClientsA(component, 0, product); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product); /* try index 0 again */ product[0] = '\0'; r = MsiEnumClientsA(component, 0, product); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product); /* try index 1, second product value does not exist */ product[0] = '\0'; @@ -1696,27 +1687,22 @@ static void test_MsiEnumClients(void) todo_wine { ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); } - ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); /* start the enumeration over */ product[0] = '\0'; r = MsiEnumClientsA(component, 0, product); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2), - "Expected %s or %s, got %s\n", prodcode, prodcode2, product); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2), + "Expected %s or %s, got %s\n", prodcode, prodcode2, product); + /* correctly query second product */ product[0] = '\0'; r = MsiEnumClientsA(component, 1, product); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2), - "Expected %s or %s, got %s\n", prodcode, prodcode2, product); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2), + "Expected %s or %s, got %s\n", prodcode, prodcode2, product); RegDeleteValueA(compkey, prod_squashed); RegDeleteValueA(compkey, prod2_squashed); @@ -1733,10 +1719,7 @@ static void test_MsiEnumClients(void) /* user local component key exists */ product[0] = '\0'; r = MsiEnumClientsA(component, 0, product); - todo_wine - { - ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); - } + ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); /* index > 0, no products exist */ @@ -1772,7 +1755,10 @@ static void test_MsiEnumClients(void) /* try index 1, second product value does not exist */ product[0] = '\0'; r = MsiEnumClientsA(component, 1, product); - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + todo_wine + { + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + } ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); res = RegSetValueExA(compkey, prod2_squashed, 0, REG_SZ, (const BYTE *)"C:\\another", 10);

1 0

James Hawkins : msi: Add tests for MsiEnumClients.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 64c75d1e02929fae877e8b8e9209405f41e127e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c75d1e02929fae877e8b8e9… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 16 20:26:42 2007 -0600 msi: Add tests for MsiEnumClients. --- dlls/msi/registry.c | 3 + dlls/msi/tests/msi.c | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 235 insertions(+), 0 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 834eda0..1bee58d 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1311,6 +1311,9 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct) TRACE("%s %d %p\n", debugstr_w(szComponent), index, szProduct); + if (!szComponent || !szProduct) + return ERROR_INVALID_PARAMETER; + r = MSIREG_OpenComponentsKey(szComponent,&hkeyComp,FALSE); if( r != ERROR_SUCCESS ) return ERROR_NO_MORE_ITEMS; diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index a6eaa21..e987884 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1588,6 +1588,237 @@ static void test_MsiGetProductCode(void) RegCloseKey(compkey); } +static void test_MsiEnumClients(void) +{ + HKEY compkey; + CHAR prodcode[MAX_PATH]; + CHAR prod_squashed[MAX_PATH]; + CHAR prodcode2[MAX_PATH]; + CHAR prod2_squashed[MAX_PATH]; + CHAR component[MAX_PATH]; + CHAR comp_base85[MAX_PATH]; + CHAR comp_squashed[MAX_PATH]; + CHAR product[MAX_PATH]; + CHAR keypath[MAX_PATH]; + LPSTR usersid; + LONG res; + UINT r; + + create_test_guid(prodcode, prod_squashed); + create_test_guid(prodcode2, prod2_squashed); + compose_base85_guid(component, comp_base85, comp_squashed); + get_user_sid(&usersid); + + /* NULL szComponent */ + product[0] = '\0'; + r = MsiEnumClientsA(NULL, 0, product); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); + + /* empty szComponent */ + product[0] = '\0'; + r = MsiEnumClientsA("", 0, product); + todo_wine + { + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + } + ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); + + /* NULL lpProductBuf */ + r = MsiEnumClientsA(component, 0, NULL); + todo_wine + { + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + } + + /* all params correct, component missing */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 0, product); + todo_wine + { + ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); + } + ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); + + lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\"); + lstrcatA(keypath, "Installer\\UserData\\"); + lstrcatA(keypath, usersid); + lstrcatA(keypath, "\\Components\\"); + lstrcatA(keypath, comp_squashed); + + res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &compkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* user unmanaged component key exists */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 0, product); + todo_wine + { + ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); + } + ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); + + /* index > 0, no products exist */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 1, product); + todo_wine + { + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + } + ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); + + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"C:\\imapath", 10); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* product value exists */ + r = MsiEnumClientsA(component, 0, product); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product); + } + + /* try index 0 again */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 0, product); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product); + } + + /* try index 1, second product value does not exist */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 1, product); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); + + res = RegSetValueExA(compkey, prod2_squashed, 0, REG_SZ, (const BYTE *)"C:\\another", 10); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* try index 1, second product value does exist */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 1, product); + todo_wine + { + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + } + ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); + + /* start the enumeration over */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 0, product); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2), + "Expected %s or %s, got %s\n", prodcode, prodcode2, product); + } + /* correctly query second product */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 1, product); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2), + "Expected %s or %s, got %s\n", prodcode, prodcode2, product); + } + + RegDeleteValueA(compkey, prod_squashed); + RegDeleteValueA(compkey, prod2_squashed); + RegDeleteKeyA(compkey, ""); + RegCloseKey(compkey); + + lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\"); + lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Components\\"); + lstrcatA(keypath, comp_squashed); + + res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &compkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* user local component key exists */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 0, product); + todo_wine + { + ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); + } + ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); + + /* index > 0, no products exist */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 1, product); + todo_wine + { + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + } + ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); + + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"C:\\imapath", 10); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* product value exists */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 0, product); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product); + } + + /* try index 0 again */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 0, product); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product); + } + + /* try index 1, second product value does not exist */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 1, product); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); + + res = RegSetValueExA(compkey, prod2_squashed, 0, REG_SZ, (const BYTE *)"C:\\another", 10); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* try index 1, second product value does exist */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 1, product); + todo_wine + { + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + } + ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); + + /* start the enumeration over */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 0, product); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2), + "Expected %s or %s, got %s\n", prodcode, prodcode2, product); + } + + /* correctly query second product */ + product[0] = '\0'; + r = MsiEnumClientsA(component, 1, product); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2), + "Expected %s or %s, got %s\n", prodcode, prodcode2, product); + } + + RegDeleteValueA(compkey, prod_squashed); + RegDeleteValueA(compkey, prod2_squashed); + RegDeleteKeyA(compkey, ""); + RegCloseKey(compkey); +} + START_TEST(msi) { init_functionpointers(); @@ -1601,4 +1832,5 @@ START_TEST(msi) test_MsiQueryComponentState(); test_MsiGetComponentPath(); test_MsiGetProductCode(); + test_MsiEnumClients(); }

1 0

James Hawkins : msi: Simplify ExpandAnyPath.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 4777a3a33bc3f84148da0ae9fdff43c0a5173783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4777a3a33bc3f84148da0ae9f… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 16 20:25:49 2007 -0600 msi: Simplify ExpandAnyPath. --- dlls/msi/appsearch.c | 49 +++++++++++++------------------------------------ 1 files changed, 13 insertions(+), 36 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 5f5bba8..a1e6045 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -466,8 +466,7 @@ static UINT ACTION_AppSearchIni(MSIPACKAGE *package, LPWSTR *appValue, static void ACTION_ExpandAnyPath(MSIPACKAGE *package, WCHAR *src, WCHAR *dst, size_t len) { - WCHAR *ptr; - size_t copied = 0; + WCHAR *ptr, *deformatted; if (!src || !dst || !len) { @@ -475,46 +474,24 @@ static void ACTION_ExpandAnyPath(MSIPACKAGE *package, WCHAR *src, WCHAR *dst, return; } - /* Ignore the short portion of the path, don't think we can use it anyway */ + dst[0] = '\0'; + + /* Ignore the short portion of the path */ if ((ptr = strchrW(src, '|'))) ptr++; else ptr = src; - while (*ptr && copied < len - 1) - { - WCHAR *prop = strchrW(ptr, '['); - - if (prop) - { - WCHAR *propEnd = strchrW(prop + 1, ']'); - - if (!propEnd) - { - WARN("Unterminated property name in AnyPath: %s\n", - debugstr_w(prop)); - break; - } - else - { - DWORD propLen; - *propEnd = 0; - propLen = len - copied - 1; - MSI_GetPropertyW(package, prop + 1, dst + copied, &propLen); - ptr = propEnd + 1; - copied += propLen; - } - } - else - { - size_t toCopy = min(strlenW(ptr) + 1, len - copied - 1); - - memcpy(dst + copied, ptr, toCopy * sizeof(WCHAR)); - ptr += toCopy; - copied += toCopy; - } + deformat_string(package, ptr, &deformatted); + if (!deformatted || lstrlenW(deformatted) > len - 1) + { + msi_free(deformatted); + return; } - *(dst + copied) = '\0'; + + lstrcpyW(dst, deformatted); + dst[lstrlenW(deformatted)] = '\0'; + msi_free(deformatted); } /* Sets *matches to whether the file (whose path is filePath) matches the

1 0

James Hawkins : msi: Verify that the PID_PAGECOUNT and PID_REVNUMBER summary info properties exist .
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: ce6e84c07180a746543b33754ca0085ddacf3391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6e84c07180a746543b33754… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 16 20:24:52 2007 -0600 msi: Verify that the PID_PAGECOUNT and PID_REVNUMBER summary info properties exist. --- dlls/msi/package.c | 68 +++++++++++++++++++++++++++++---------------- dlls/msi/tests/package.c | 33 +++++----------------- 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index cb6e25d..a678470 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -637,7 +637,7 @@ static UINT msi_load_summary_properties( MSIPACKAGE *package ) UINT rc; MSIHANDLE suminfo; MSIHANDLE hdb = alloc_msihandle( &package->db->hdr ); - INT word_count; + INT count; DWORD len; LPWSTR package_code; static const WCHAR szPackageCode[] = { @@ -645,8 +645,9 @@ static UINT msi_load_summary_properties( MSIPACKAGE *package ) if (!hdb) { ERR("Unable to allocate handle\n"); - return 0; + return ERROR_OUTOFMEMORY; } + rc = MsiGetSummaryInformationW( hdb, NULL, 0, &suminfo ); MsiCloseHandle(hdb); if (rc != ERROR_SUCCESS) @@ -655,35 +656,47 @@ static UINT msi_load_summary_properties( MSIPACKAGE *package ) return rc; } - /* load package attributes */ - rc = MsiSummaryInfoGetPropertyW( suminfo, PID_WORDCOUNT, NULL, - &word_count, NULL, NULL, NULL ); - if (rc == ERROR_SUCCESS) - package->WordCount = word_count; - else - WARN("Unable to query word count\n"); + rc = MsiSummaryInfoGetPropertyW( suminfo, PID_PAGECOUNT, NULL, + &count, NULL, NULL, NULL ); + if (rc != ERROR_SUCCESS) + { + WARN("Unable to query page count: %d", rc); + goto done; + } /* load package code property */ len = 0; rc = MsiSummaryInfoGetPropertyW( suminfo, PID_REVNUMBER, NULL, NULL, NULL, NULL, &len ); - if (rc == ERROR_MORE_DATA) + if (rc != ERROR_MORE_DATA) { - len++; - package_code = msi_alloc( len * sizeof(WCHAR) ); - rc = MsiSummaryInfoGetPropertyW( suminfo, PID_REVNUMBER, NULL, - NULL, NULL, package_code, &len ); - if (rc == ERROR_SUCCESS) - MSI_SetPropertyW( package, szPackageCode, package_code ); - else - WARN("Unable to query rev number, %d\n", rc); - msi_free( package_code ); + WARN("Unable to query revision number: %d\n", rc); + rc = ERROR_FUNCTION_FAILED; + goto done; + } + + len++; + package_code = msi_alloc( len * sizeof(WCHAR) ); + rc = MsiSummaryInfoGetPropertyW( suminfo, PID_REVNUMBER, NULL, + NULL, NULL, package_code, &len ); + if (rc != ERROR_SUCCESS) + { + WARN("Unable to query rev number: %d\n", rc); + goto done; } - else - WARN("Unable to query rev number, %d\n", rc); + MSI_SetPropertyW( package, szPackageCode, package_code ); + msi_free( package_code ); + + /* load package attributes */ + count = 0; + MsiSummaryInfoGetPropertyW( suminfo, PID_WORDCOUNT, NULL, + &count, NULL, NULL, NULL ); + package->WordCount = count; + +done: MsiCloseHandle(suminfo); - return ERROR_SUCCESS; + return rc; } static MSIPACKAGE *msi_alloc_package( void ) @@ -746,6 +759,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) 'P','r','o','d','u','c','t','C','o','d','e',0}; MSIPACKAGE *package; WCHAR uilevel[10]; + UINT r; TRACE("%p\n", db); @@ -767,7 +781,12 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) package->ProductCode = msi_dup_property( package, szProductCode ); set_installed_prop( package ); - msi_load_summary_properties( package ); + r = msi_load_summary_properties( package ); + if (r != ERROR_SUCCESS) + { + msiobj_release( &package->hdr ); + return NULL; + } if (package->WordCount & MSIWORDCOUNT_ADMINISTRATIVE) msi_load_admin_properties( package ); @@ -906,7 +925,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) { if (file != szPackage) DeleteFileW( file ); - return ERROR_FUNCTION_FAILED; + + return ERROR_INSTALL_PACKAGE_INVALID; } if( file != szPackage ) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 8d6125d..dc0e31e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2045,7 +2045,8 @@ static void test_msipackage(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); } - MsiCloseHandle(hpack); + if (r == ERROR_SUCCESS) + MsiCloseHandle(hpack); /* nonexistent szPackagePath */ r = MsiOpenPackage("nonexistent", &hpack); @@ -2066,14 +2067,8 @@ static void test_msipackage(void) /* database exists, but is emtpy */ sprintf(name, "#%ld", hdb); r = MsiOpenPackage(name, &hpack); - todo_wine - { - ok(r == ERROR_INSTALL_PACKAGE_INVALID, - "Expected ERROR_INSTALL_PACKAGE_INVALID, got %d\n", r); - } - - if (r == ERROR_SUCCESS) - MsiCloseHandle(hpack); + ok(r == ERROR_INSTALL_PACKAGE_INVALID, + "Expected ERROR_INSTALL_PACKAGE_INVALID, got %d\n", r); query = "CREATE TABLE `Property` ( " "`Property` CHAR(72), `Value` CHAR(0) " @@ -2090,14 +2085,8 @@ static void test_msipackage(void) /* a few key tables exist */ sprintf(name, "#%ld", hdb); r = MsiOpenPackage(name, &hpack); - todo_wine - { - ok(r == ERROR_INSTALL_PACKAGE_INVALID, - "Expected ERROR_INSTALL_PACKAGE_INVALID, got %d\n", r); - } - - if (r == ERROR_SUCCESS) - MsiCloseHandle(hpack); + ok(r == ERROR_INSTALL_PACKAGE_INVALID, + "Expected ERROR_INSTALL_PACKAGE_INVALID, got %d\n", r); MsiCloseHandle(hdb); DeleteFile(msifile); @@ -2115,14 +2104,8 @@ static void test_msipackage(void) set_summary_dword(hdb, PID_PAGECOUNT, 100); r = MsiOpenPackage(name, &hpack); - todo_wine - { - ok(r == ERROR_INSTALL_PACKAGE_INVALID, - "Expected ERROR_INSTALL_PACKAGE_INVALID, got %d\n", r); - } - - if (r == ERROR_SUCCESS) - MsiCloseHandle(hpack); + ok(r == ERROR_INSTALL_PACKAGE_INVALID, + "Expected ERROR_INSTALL_PACKAGE_INVALID, got %d\n", r); set_summary_str(hdb, PID_REVNUMBER, "{004757CD-5092-49c2-AD20-28E1CE0DF5F2}"); r = MsiOpenPackage(name, &hpack);

1 0

James Hawkins : msi: Validate the parameters of MsiOpenPackage.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: f933dd8b4f4905910512be58f811c6632fa0d675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f933dd8b4f4905910512be58f… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 16 20:23:27 2007 -0600 msi: Validate the parameters of MsiOpenPackage. --- dlls/msi/package.c | 8 +++++++- dlls/msi/tests/package.c | 5 +---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 5c42cd8..58861d3 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -932,9 +932,15 @@ UINT WINAPI MsiOpenPackageExW(LPCWSTR szPackage, DWORD dwOptions, MSIHANDLE *phP TRACE("%s %08x %p\n", debugstr_w(szPackage), dwOptions, phPackage ); - if( szPackage == NULL ) + if( !szPackage || !phPackage ) return ERROR_INVALID_PARAMETER; + if ( !*szPackage ) + { + FIXME("Should create an empty database and package."); + return ERROR_FUNCTION_FAILED; + } + if( dwOptions ) FIXME("dwOptions %08x not supported\n", dwOptions); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f4b0a4d..af9b786 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2056,10 +2056,7 @@ static void test_msipackage(void) /* NULL hProduct */ r = MsiOpenPackage(msifile, NULL); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); name[0]='#'; name[1]=0;

1 0

James Hawkins : msi: Add more tests for MsiOpenPackage.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 8fab39cc6083fdfc4ae932164a2028e2a41fdb29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fab39cc6083fdfc4ae932164… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 16 20:14:46 2007 -0600 msi: Add more tests for MsiOpenPackage. --- dlls/msi/package.c | 2 - dlls/msi/tests/package.c | 131 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 110 insertions(+), 23 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 1286641..5c42cd8 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -889,8 +889,6 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY, &db ); if( r != ERROR_SUCCESS ) { - if (GetLastError() == ERROR_FILE_NOT_FOUND) - msi_ui_error( 4, MB_OK | MB_ICONWARNING ); if (file != szPackage) DeleteFileW( file ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index b52aab8..f4b0a4d 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <windows.h> +#include <msidefs.h> #include <msi.h> #include <msiquery.h> @@ -1992,6 +1993,40 @@ static UINT try_query( MSIHANDLE hdb, LPCSTR szQuery ) return try_query_param( hdb, szQuery, 0 ); } +static void set_summary_str(MSIHANDLE hdb, DWORD pid, LPCSTR value) +{ + MSIHANDLE summary; + UINT r; + + r = MsiGetSummaryInformationA(hdb, NULL, 1, &summary); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiSummaryInfoSetPropertyA(summary, pid, VT_LPSTR, 0, NULL, value); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiSummaryInfoPersist(summary); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + MsiCloseHandle(summary); +} + +static void set_summary_dword(MSIHANDLE hdb, DWORD pid, DWORD value) +{ + MSIHANDLE summary; + UINT r; + + r = MsiGetSummaryInformationA(hdb, NULL, 1, &summary); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiSummaryInfoSetPropertyA(summary, pid, VT_I4, value, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiSummaryInfoPersist(summary); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + MsiCloseHandle(summary); +} + static void test_msipackage(void) { MSIHANDLE hdb = 0, hpack = 100; @@ -1999,34 +2034,53 @@ static void test_msipackage(void) const char *query; char name[10]; - DeleteFile(msifile); + /* NULL szPackagePath */ + r = MsiOpenPackage(NULL, &hpack); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - todo_wine { - name[0] = 0; - r = MsiOpenPackage(name, &hpack); - ok(r == ERROR_SUCCESS, "failed to open package with no name\n"); - r = MsiCloseHandle(hpack); - ok(r == ERROR_SUCCESS, "failed to close package\n"); + /* empty szPackagePath */ + r = MsiOpenPackage("", &hpack); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); } - /* just MsiOpenDatabase should not create a file */ - r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); - ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + MsiCloseHandle(hpack); + + /* nonexistent szPackagePath */ + r = MsiOpenPackage("nonexistent", &hpack); + todo_wine + { + ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); + } + + /* NULL hProduct */ + r = MsiOpenPackage(msifile, NULL); + todo_wine + { + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + } name[0]='#'; name[1]=0; r = MsiOpenPackage(name, &hpack); - ok(r == ERROR_INVALID_HANDLE, "MsiOpenPackage returned wrong code\n"); + ok(r == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", r); - todo_wine { - /* now try again with our empty database */ + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* database exists, but is emtpy */ sprintf(name, "#%ld", hdb); r = MsiOpenPackage(name, &hpack); - ok(r == ERROR_INSTALL_PACKAGE_INVALID, "MsiOpenPackage returned wrong code\n"); - if (!r) MsiCloseHandle(hpack); + todo_wine + { + ok(r == ERROR_INSTALL_PACKAGE_INVALID, + "Expected ERROR_INSTALL_PACKAGE_INVALID, got %d\n", r); } - /* create a table */ + if (r == ERROR_SUCCESS) + MsiCloseHandle(hpack); + query = "CREATE TABLE `Property` ( " "`Property` CHAR(72), `Value` CHAR(0) " "PRIMARY KEY `Property`)"; @@ -2039,15 +2093,50 @@ static void test_msipackage(void) r = try_query(hdb, query); ok(r == ERROR_SUCCESS, "failed to create InstallExecuteSequence table\n"); - todo_wine { + /* a few key tables exist */ + sprintf(name, "#%ld", hdb); + r = MsiOpenPackage(name, &hpack); + todo_wine + { + ok(r == ERROR_INSTALL_PACKAGE_INVALID, + "Expected ERROR_INSTALL_PACKAGE_INVALID, got %d\n", r); + } + + if (r == ERROR_SUCCESS) + MsiCloseHandle(hpack); + + MsiCloseHandle(hdb); + DeleteFile(msifile); + + /* start with a clean database to show what constitutes a valid package */ + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + sprintf(name, "#%ld", hdb); + + /* The following summary information props must exist: + * - PID_REVNUMBER + * - PID_PAGECOUNT + */ + + set_summary_dword(hdb, PID_PAGECOUNT, 100); r = MsiOpenPackage(name, &hpack); - ok(r == ERROR_INSTALL_PACKAGE_INVALID, "MsiOpenPackage returned wrong code\n"); - if (!r) MsiCloseHandle(hpack); + todo_wine + { + ok(r == ERROR_INSTALL_PACKAGE_INVALID, + "Expected ERROR_INSTALL_PACKAGE_INVALID, got %d\n", r); } - r = MsiCloseHandle(hdb); - ok(r == ERROR_SUCCESS, "MsiCloseHandle(database) failed\n"); + if (r == ERROR_SUCCESS) + MsiCloseHandle(hpack); + + set_summary_str(hdb, PID_REVNUMBER, "{004757CD-5092-49c2-AD20-28E1CE0DF5F2}"); + r = MsiOpenPackage(name, &hpack); + ok(r == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hpack); + MsiCloseHandle(hdb); DeleteFile(msifile); }

1 0

James Hawkins : msi: If the package doesn't exist, return ERROR_FILE_NOT_FOUND.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 620862e3854e64c1d3b4b3d066e6debdc7af3591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620862e3854e64c1d3b4b3d06… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 16 20:24:11 2007 -0600 msi: If the package doesn't exist, return ERROR_FILE_NOT_FOUND. --- dlls/msi/package.c | 3 +++ dlls/msi/tests/package.c | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 58861d3..cb6e25d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -892,6 +892,9 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) if (file != szPackage) DeleteFileW( file ); + if (GetFileAttributesW(szPackage) == INVALID_FILE_ATTRIBUTES) + return ERROR_FILE_NOT_FOUND; + return r; } } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index af9b786..8d6125d 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2049,10 +2049,7 @@ static void test_msipackage(void) /* nonexistent szPackagePath */ r = MsiOpenPackage("nonexistent", &hpack); - todo_wine - { - ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); - } + ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); /* NULL hProduct */ r = MsiOpenPackage(msifile, NULL);

1 0

James Hawkins : msi: Release the record when loading the hash data.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 1277e1b55a87f90ffc2921b3e8f827b5c101d793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1277e1b55a87f90ffc2921b3e… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 14 15:18:05 2007 -0600 msi: Release the record when loading the hash data. --- dlls/msi/action.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2da9f13..4d71822 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1401,7 +1401,7 @@ static UINT load_file_hash(MSIPACKAGE *package, MSIFILE *file) '`','M','s','i','F','i','l','e','H','a','s','h','`',' ', 'W','H','E','R','E',' ','`','F','i','l','e','_','`',' ','=',' ','\'','%','s','\'',0}; MSIQUERY *view = NULL; - MSIRECORD *row; + MSIRECORD *row = NULL; UINT r; TRACE("%s\n", debugstr_w(file->File)); @@ -1426,6 +1426,7 @@ static UINT load_file_hash(MSIPACKAGE *package, MSIFILE *file) done: if (view) msiobj_release(&view->hdr); + if (row) msiobj_release(&row->hdr); return r; }

1 0

Maarten Lankhorst : riched20: Implement ECO/EM SELECTIONBAR.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: b81335501f32fb11b3634faf7a5c484c458dabc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81335501f32fb11b3634faf7… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Fri Dec 14 21:29:37 2007 +0100 riched20: Implement ECO/EM SELECTIONBAR. --- dlls/riched20/caret.c | 98 ++++++++++++++++++++++++++++++++--------- dlls/riched20/editor.c | 33 ++++++++++++-- dlls/riched20/editstr.h | 1 + dlls/riched20/ocr_reverse.cur | Bin 0 -> 326 bytes dlls/riched20/res.h | 21 +++++++++ dlls/riched20/version.rc | 4 ++ dlls/riched20/wrap.c | 8 ++-- 7 files changed, 136 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b81335501f32fb11b3634…

1 0

Marcus Meissner : msi: Fixed buffer overflow in number parsing.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 964a0303c129d59ea227fcce68f647d2e76ddc56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=964a0303c129d59ea227fcce6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 14 15:20:04 2007 +0100 msi: Fixed buffer overflow in number parsing. --- dlls/msi/dialog.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index fae8fcf..078ceda 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2464,7 +2464,7 @@ static void msi_dialog_vcl_add_columns( msi_dialog *dialog, msi_control *control { LPCWSTR text = MSI_RecordGetString( rec, 10 ); LPCWSTR begin = text, end; - WCHAR num[10]; + WCHAR *num; LVCOLUMNW lvc; DWORD count = 0; @@ -2478,6 +2478,10 @@ static void msi_dialog_vcl_add_columns( msi_dialog *dialog, msi_control *control if (!(end = strchrW( begin, '}' ))) return; + num = msi_alloc( (end-begin+1)*sizeof(WCHAR) ); + if (!num) + return; + lstrcpynW( num, begin + 1, end - begin ); begin += end - begin + 1; @@ -2485,14 +2489,17 @@ static void msi_dialog_vcl_add_columns( msi_dialog *dialog, msi_control *control if ( !num[0] || !lstrcmpW( num, zero ) ) { count++; + msi_free( num ); continue; } /* the width must be a positive number * if a width is invalid, all remaining columns are hidden */ - if ( !strncmpW( num, negative, 1 ) || !str_is_number( num ) ) + if ( !strncmpW( num, negative, 1 ) || !str_is_number( num ) ) { + msi_free( num ); return; + } ZeroMemory( &lvc, sizeof(lvc) ); lvc.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; @@ -2501,6 +2508,7 @@ static void msi_dialog_vcl_add_columns( msi_dialog *dialog, msi_control *control SendMessageW( control->hwnd, LVM_INSERTCOLUMNW, count++, (LPARAM)&lvc ); msi_free( lvc.pszText ); + msi_free( num ); } }

1 0