March 2009 - Wine-commits - list.winehq.org

James Hawkins : msi: Test and handle the case where the SourceList key does not exist and the PackageName value does not exist in MsiGetProductInfo .
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: cb958cd7736f6c0e3a3c3c68bc74ea5531205e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb958cd7736f6c0e3a3c3c68b… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 22 14:30:56 2009 -0700 msi: Test and handle the case where the SourceList key does not exist and the PackageName value does not exist in MsiGetProductInfo. --- dlls/msi/msi.c | 11 +++++++++-- dlls/msi/tests/msi.c | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index cb05b64..93220eb 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -791,8 +791,15 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, if (!lstrcmpW(szAttribute, INSTALLPROPERTY_PACKAGENAMEW)) { res = RegOpenKeyW(prodkey, sourcelist, &source); - if (res == ERROR_SUCCESS) - val = msi_reg_get_value(source, szAttribute, &type); + if (res != ERROR_SUCCESS) + { + r = ERROR_UNKNOWN_PRODUCT; + goto done; + } + + val = msi_reg_get_value(source, szAttribute, &type); + if (!val) + val = empty; RegCloseKey(source); } diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 2b38ea2..6fe6656 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -3649,12 +3649,31 @@ static void test_MsiGetProductInfo(void) ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf); ok(sz == 2, "Expected 2, got %d\n", sz); + /* SourceList key does not exist */ + sz = MAX_PATH; + lstrcpyA(buf, "apple"); + r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAME, buf, &sz); + ok(r == ERROR_UNKNOWN_PRODUCT, + "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); + ok(!lstrcmpA(buf, "apple"), + "Expected buf to be unchanged, got \"%s\"\n", buf); + ok(sz == MAX_PATH, "Expected sz to be unchanged, got %d\n", sz); + res = RegCreateKeyA(prodkey, "SourceList", &source); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + /* SourceList key exists, but PackageName val does not exist */ + sz = MAX_PATH; + lstrcpyA(buf, "apple"); + r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAME, buf, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(sz == 0, "Expected 0, got %d\n", sz); + res = RegSetValueExA(source, "PackageName", 0, REG_SZ, (LPBYTE)"packname", 9); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + /* PackageName val exists */ sz = MAX_PATH; lstrcpyA(buf, "apple"); r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAME, buf, &sz);

1 0

James Hawkins : msi: MsiCollectUserInfo cannot be called from a custom action (Coverity 565, 566).
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: baf86bd5bbe16f29c5746db1618b16ed0943aa49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf86bd5bbe16f29c5746db16… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 22 14:31:13 2009 -0700 msi: MsiCollectUserInfo cannot be called from a custom action (Coverity 565, 566). --- dlls/msi/msi.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 93220eb..7cca153 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2927,7 +2927,11 @@ UINT WINAPI MsiCollectUserInfoW(LPCWSTR szProduct) if (rc != ERROR_SUCCESS) return ERROR_INVALID_PARAMETER; + /* MsiCollectUserInfo cannot be called from a custom action. */ package = msihandle2msiinfo(handle, MSIHANDLETYPE_PACKAGE); + if (!package) + return ERROR_CALL_NOT_IMPLEMENTED; + rc = ACTION_PerformUIAction(package, szFirstRun, -1); msiobj_release( &package->hdr ); @@ -2949,7 +2953,11 @@ UINT WINAPI MsiCollectUserInfoA(LPCSTR szProduct) if (rc != ERROR_SUCCESS) return ERROR_INVALID_PARAMETER; + /* MsiCollectUserInfo cannot be called from a custom action. */ package = msihandle2msiinfo(handle, MSIHANDLETYPE_PACKAGE); + if (!package) + return ERROR_CALL_NOT_IMPLEMENTED; + rc = ACTION_PerformUIAction(package, szFirstRun, -1); msiobj_release( &package->hdr );

1 0

James Hawkins : msi: Don't try to release a NULL record, with tests ( Coverity 536).
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: fb8db0ac13ad86f7354a7df6e707ffc5b239e511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb8db0ac13ad86f7354a7df6e… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 22 14:31:24 2009 -0700 msi: Don't try to release a NULL record, with tests (Coverity 536). --- dlls/msi/package.c | 3 +- dlls/msi/tests/package.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7172ff4..378ad76 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1345,7 +1345,8 @@ UINT MSI_SetPropertyW( MSIPACKAGE *package, LPCWSTR szName, LPCWSTR szValue) msiobj_release(&view->hdr); } - msiobj_release(&row->hdr); + if (row) + msiobj_release(&row->hdr); if (rc == ERROR_SUCCESS && (!lstrcmpW(szName, cszSourceDir))) msi_reset_folders(package, TRUE); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 2696dc2..c5c3b67 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -11374,6 +11374,115 @@ static void test_MsiGetProductProperty(void) DeleteFileA(msifile); } +static void test_MsiSetProperty(void) +{ + MSIHANDLE hpkg, hdb, hrec; + CHAR buf[MAX_PATH]; + LPCSTR query; + DWORD size; + UINT r; + + hpkg = package_from_db(create_package_db()); + ok(hpkg != 0, "Expected a valid package\n"); + + /* invalid hInstall */ + r = MsiSetPropertyA(0, "Prop", "Val"); + ok(r == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", r); + + /* invalid hInstall */ + r = MsiSetPropertyA(0xdeadbeef, "Prop", "Val"); + ok(r == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", r); + + /* szName is NULL */ + r = MsiSetPropertyA(hpkg, NULL, "Val"); + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + + /* both szName and szValue are NULL */ + r = MsiSetPropertyA(hpkg, NULL, NULL); + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + + /* szName is empty */ + r = MsiSetPropertyA(hpkg, "", "Val"); + ok(r == ERROR_FUNCTION_FAILED, + "Expected ERROR_FUNCTION_FAILED, got %d\n", r); + + /* szName is empty and szValue is NULL */ + r = MsiSetPropertyA(hpkg, "", NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* set a property */ + r = MsiSetPropertyA(hpkg, "Prop", "Val"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* get the property */ + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "Prop", buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "Val"), "Expected \"Val\", got \"%s\"\n", buf); + ok(size == 3, "Expected 3, got %d\n", size); + + /* update the property */ + r = MsiSetPropertyA(hpkg, "Prop", "Nuvo"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* get the property */ + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "Prop", buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "Nuvo"), "Expected \"Nuvo\", got \"%s\"\n", buf); + ok(size == 4, "Expected 4, got %d\n", size); + + hdb = MsiGetActiveDatabase(hpkg); + ok(hdb != 0, "Expected a valid database handle\n"); + + /* set prop is not in the _Property table */ + query = "SELECT * FROM `_Property` WHERE `Property` = 'Prop'"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_BAD_QUERY_SYNTAX, + "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + /* set prop is not in the Property table */ + query = "SELECT * FROM `Property` WHERE `Property` = 'Prop'"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_BAD_QUERY_SYNTAX, + "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + MsiCloseHandle(hdb); + + /* szValue is an empty string */ + r = MsiSetPropertyA(hpkg, "Prop", ""); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* try to get the property */ + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "Prop", buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(size == 0, "Expected 0, got %d\n", size); + + /* reset the property */ + r = MsiSetPropertyA(hpkg, "Prop", "BlueTap"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* delete the property */ + r = MsiSetPropertyA(hpkg, "Prop", NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* try to get the property */ + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "Prop", buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(size == 0, "Expected 0, got %d\n", size); + + MsiCloseHandle(hpkg); + DeleteFileA(msifile); +} + START_TEST(package) { GetCurrentDirectoryA(MAX_PATH, CURR_DIR); @@ -11406,4 +11515,5 @@ START_TEST(package) test_access(); test_emptypackage(); test_MsiGetProductProperty(); + test_MsiSetProperty(); }

1 0

James Hawkins : msi: Handle a NULL and empty szPackagePath in MsiInstallProduct (Coverity 181).
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 5e62686a0f9417248b9002a65699867a63358bfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e62686a0f9417248b9002a65… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 22 14:31:35 2009 -0700 msi: Handle a NULL and empty szPackagePath in MsiInstallProduct (Coverity 181). --- dlls/msi/msi.c | 6 ++++++ dlls/msi/tests/install.c | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7cca153..be1eafd 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -231,6 +231,12 @@ UINT WINAPI MsiInstallProductW(LPCWSTR szPackagePath, LPCWSTR szCommandLine) TRACE("%s %s\n",debugstr_w(szPackagePath), debugstr_w(szCommandLine)); + if (!szPackagePath) + return ERROR_INVALID_PARAMETER; + + if (!*szPackagePath) + return ERROR_PATH_NOT_FOUND; + r = MSI_OpenPackageW( szPackagePath, &package ); if (r == ERROR_SUCCESS) { diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index f0ee296..a844395 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1721,6 +1721,21 @@ static void test_MsiInstallProduct(void) return; } + /* szPackagePath is NULL */ + r = MsiInstallProductA(NULL, "INSTALL=ALL"); + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + + /* both szPackagePath and szCommandLine are NULL */ + r = MsiInstallProductA(NULL, NULL); + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + + /* szPackagePath is empty */ + r = MsiInstallProductA("", "INSTALL=ALL"); + ok(r == ERROR_PATH_NOT_FOUND, + "Expected ERROR_PATH_NOT_FOUND, got %d\n", r); + create_test_files(); create_database(msifile, tables, sizeof(tables) / sizeof(msi_table));

1 0

Huw Davies : ole32: Remove unused static variable.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: e6eeb3aa17c8a90d62090822c7996747103c88ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6eeb3aa17c8a90d62090822c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 17 11:55:09 2009 +0000 ole32: Remove unused static variable. --- dlls/ole32/clipboard.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index b33cb52..5bdd80a 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -163,8 +163,7 @@ typedef struct PresentationDataHeader /* * The one and only OLEClipbrd object which is created by OLEClipbrd_Initialize() */ -static HGLOBAL hTheOleClipboard = 0; -static OLEClipbrd* theOleClipboard = NULL; +static OLEClipbrd* theOleClipboard; /* @@ -682,7 +681,6 @@ static OLEClipbrd* OLEClipbrd_Construct(void) * The Ole clipboard is a singleton - save the global handle and pointer */ theOleClipboard = newObject; - hTheOleClipboard = hNewObject; return theOleClipboard; } @@ -711,7 +709,6 @@ static void OLEClipbrd_Destroy(OLEClipbrd* ptrToDestroy) * The Ole clipboard is a singleton (ptrToDestroy == theOleClipboard) */ theOleClipboard = NULL; - hTheOleClipboard = 0; }

1 0

Michael Stefaniuc : msi: Convert the German translation to UTF8 encoding.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: b4cb8562aed5029325b4417fffcfc7bda5c51e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4cb8562aed5029325b4417ff… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 20 23:44:49 2009 +0100 msi: Convert the German translation to UTF8 encoding. --- dlls/msi/msi_De.rc | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi_De.rc b/dlls/msi/msi_De.rc index d8cd72b..6d61de6 100644 --- a/dlls/msi/msi_De.rc +++ b/dlls/msi/msi_De.rc @@ -20,15 +20,19 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +#pragma code_page(65001) + STRINGTABLE DISCARDABLE { 4 "The specified installation package could not be opened. Please check the file path and try again." 5 "Der Pfad %s wurde nicht gefunden." 9 "Bitte Disk %s einlegen." 10 "schlechte Parameter" - 11 "Geben Sie das Verzeichnis ein, dass %s enth�lt." - 12 "Die Installationsquelle f�r das Feature fehlt." - 13 "Das Netzwerklaufwerk f�r das Feature fehlt." + 11 "Geben Sie das Verzeichnis ein, dass %s enthält." + 12 "Die Installationsquelle für das Feature fehlt." + 13 "Das Netzwerklaufwerk für das Feature fehlt." 14 "Feature von:" - 15 "W�hlen Sie das Verzeichnis aus, dass %s enth�lt." + 15 "Wählen Sie das Verzeichnis aus, dass %s enthält." } + +#pragma code_page(default)

1 0

Michael Stefaniuc : msi: Update the German translation.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: fccdccc3782f22c6c3a94406d72ce6933d7e911a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fccdccc3782f22c6c3a94406d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 20 23:45:22 2009 +0100 msi: Update the German translation. --- dlls/msi/msi_De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi_De.rc b/dlls/msi/msi_De.rc index 6d61de6..00649b6 100644 --- a/dlls/msi/msi_De.rc +++ b/dlls/msi/msi_De.rc @@ -24,10 +24,10 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." + 4 "Das angegebene Installationspaket konnte nicht geöffnet werden. Bitte überprüfen Sie den Pfadnamen und versuchen Sie es noch einmal." 5 "Der Pfad %s wurde nicht gefunden." 9 "Bitte Disk %s einlegen." - 10 "schlechte Parameter" + 10 "Falsche Parameter" 11 "Geben Sie das Verzeichnis ein, dass %s enthält." 12 "Die Installationsquelle für das Feature fehlt." 13 "Das Netzwerklaufwerk für das Feature fehlt."

1 0

James Hawkins : msi: Fix a typo (Coverity 910).
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 3956bb5b0e8af0e2fb91991ff270c5656fd6dd3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3956bb5b0e8af0e2fb91991ff… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 22 14:29:51 2009 -0700 msi: Fix a typo (Coverity 910). --- dlls/msi/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 73a36eb..57d30d7 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -804,7 +804,7 @@ UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, MSIINSTALLCONTEXT dwContex if (dwContext == MSIINSTALLCONTEXT_MACHINE) sprintfW(keypath, szUserDataProd_fmt, szLocalSid, squished_pc); else if (szUserSid) - sprintfW(keypath, szUserDataProd_fmt, usersid, squished_pc); + sprintfW(keypath, szUserDataProd_fmt, szUserSid, squished_pc); else { rc = get_user_sid(&usersid);

1 0

James Hawkins : msi: Enumerate the current user' s patches if szUserSid is NULL.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: f7c615b188d5a9839746b709e8558d3334bf6f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c615b188d5a9839746b709e… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 22 14:30:03 2009 -0700 msi: Enumerate the current user's patches if szUserSid is NULL. --- dlls/msi/registry.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 57d30d7..ff0eee1 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1883,8 +1883,15 @@ static UINT msi_enum_patches(LPCWSTR szProductCode, LPCWSTR szUserSid, MSIINSTALLCONTEXT *pdwTargetProductContext, LPWSTR szTargetUserSid, LPDWORD pcchTargetUserSid, LPWSTR *szTransforms) { + LPWSTR usersid = NULL; UINT r = ERROR_INVALID_PARAMETER; + if (!szUserSid) + { + get_user_sid(&usersid); + szUserSid = usersid; + } + if (dwContext & MSIINSTALLCONTEXT_USERMANAGED) { r = msi_check_product_patches(szProductCode, szUserSid, @@ -1922,6 +1929,7 @@ static UINT msi_enum_patches(LPCWSTR szProductCode, LPCWSTR szUserSid, } done: + LocalFree(usersid); return r; }

1 0

James Hawkins : msi: Allow the enumeration of other users' patches.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: c965d839f96be9d7e907dd365cecc46b39d10af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c965d839f96be9d7e907dd365… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 22 14:30:16 2009 -0700 msi: Allow the enumeration of other users' patches. --- dlls/msi/action.c | 2 +- dlls/msi/msi.c | 54 +++++++++++++++++++++++++++++--------------------- dlls/msi/msipriv.h | 4 +- dlls/msi/registry.c | 43 ++++++++++++++++++++++++---------------- dlls/msi/source.c | 16 +++++++++----- dlls/msi/upgrade.c | 4 +- 6 files changed, 72 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c965d839f96be9d7e907d…

1 0