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

Juan Lang : crypt32: Implement getting signer info from a decoded signed message.
by Alexandre Julliard 31 Jul '07

31 Jul '07

Module: wine Branch: master Commit: 555e85a2b243afa81579c790bb2d0116e0563822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=555e85a2b243afa81579c790b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 30 12:05:15 2007 -0700 crypt32: Implement getting signer info from a decoded signed message. --- dlls/crypt32/msg.c | 179 ++++++++++++++++++++++++++++++++++++++++++---- dlls/crypt32/tests/msg.c | 1 - 2 files changed, 164 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=555e85a2b243afa81579c…

1 0

appdb/include sidebar_admin.php
by WineHQ 31 Jul '07

31 Jul '07

ChangeSet ID: 31298 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/30 22:46:16 Modified files: include : sidebar_admin.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> No need to have 'View' in front of each of our links, it should be pretty obvious to admins that clicking on the link will let them interact with the particular queue/list. Patch: http://cvs.winehq.org/patch.py?id=31298 Old revision New revision Changes Path 1.44 1.45 +11 -11 appdb/include/sidebar_admin.php Index: appdb/include/sidebar_admin.php diff -u -p appdb/include/sidebar_admin.php:1.44 appdb/include/sidebar_admin.php:1.45 --- appdb/include/sidebar_admin.php:1.44 31 Jul 2007 3:46:16 -0000 +++ appdb/include/sidebar_admin.php 31 Jul 2007 3:46:16 -0000 @@ -9,30 +9,30 @@ function global_admin_menu() { $g = new htmlmenu("Global Admin"); - $g->add("View App Queue (".application::objectGetEntriesCount(true, false).")", + $g->add("App Queue (".application::objectGetEntriesCount(true, false).")", BASE."objectManager.php?sClass=application_queue&bIsQueue=true&sTitle=". "Application%20Queue"); - $g->add("View Version Queue (".version::objectGetEntriesCount(true, false).")", + $g->add("Version Queue (".version::objectGetEntriesCount(true, false).")", BASE."objectManager.php?sClass=version_queue&bIsQueue=true&sTitle=". "Version%20Queue"); - $g->add("View Screenshot Queue (".appData::objectGetEntriesCount("true", + $g->add("Screenshot Queue (".appData::objectGetEntriesCount("true", false, "screenshot").")", BASE."objectManager.php?sClass=screenshot&bIsQueue=true&sTitle=". "Screenshot%20Queue"); - $g->add("View Maintainer Queue (".Maintainer::objectGetEntriesCount(true, false).")", + $g->add("Maintainer Queue (".Maintainer::objectGetEntriesCount(true, false).")", BASE."objectManager.php?sClass=maintainer&bIsQueue=true&sTitle=". "Maintainer%20Queue"); - $g->add("View Test Results Queue (".testData::objectGetEntriesCount(true, false).")", + $g->add("Test Results Queue (".testData::objectGetEntriesCount(true, false).")", BASE."objectManager.php?sClass=testData_queue&bIsQueue=true&sTitle=". "Test%20Results%20Queue"); $g->addmisc(" "); - $g->add("View Maintainer Entries (".Maintainer::getMaintainerCount().")", + $g->add("Maintainer Entries (".Maintainer::getMaintainerCount().")", BASE."admin/adminMaintainers.php"); - $g->add("View Bug Links (".getNumberOfQueuedBugLinks()."/".getNumberOfBugLinks().")", + $g->add("Bug Links (".getNumberOfQueuedBugLinks()."/".getNumberOfBugLinks().")", BASE."admin/adminBugs.php"); - $g->add("View Test Results (".testData::objectGetEntriesCount(false, false).")", + $g->add("Test Results (".testData::objectGetEntriesCount(false, false).")", BASE."objectManager.php?sClass=testData&bIsQueue=false&sTitle=". "View%20Test%20Results"); $g->add("Users Management", BASE."admin/adminUsers.php"); @@ -41,14 +41,14 @@ function global_admin_menu() { $g->addmisc(" "); - $g->add("View Rejected Applications (".application::objectGetEntriesCount(true, + $g->add("Rejected Applications (".application::objectGetEntriesCount(true, true).")", BASE."objectManager.php?sClass=application_queue&bIsQueue=true&bIsRejected=". "true&sTitle=Rejected%20Applications"); - $g->add("View Rejected Versions (".version::objectGetEntriesCount(true, true).")", + $g->add("Rejected Versions (".version::objectGetEntriesCount(true, true).")", BASE."objectManager.php?sClass=version_queue&bIsQueue=true&". "bIsRejected=true&sTitle=Rejected%20Versions"); - $g->add("View Rejected Test Results (".testData::objectGetEntriesCount(true, + $g->add("Rejected Test Results (".testData::objectGetEntriesCount(true, true).")", BASE."objectManager.php?sClass=testData_queue&bIsQueue=true". "&bIsRejected=true&sTitle=Rejected%20Test%20Results");

1 0

appdb/include distribution.php
by WineHQ 31 Jul '07

31 Jul '07

ChangeSet ID: 31297 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/30 22:31:07 Modified files: include : distribution.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> distribution::delete() should return false upon failure Patch: http://cvs.winehq.org/patch.py?id=31297 Old revision New revision Changes Path 1.39 1.40 +2 -1 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.39 appdb/include/distribution.php:1.40 --- appdb/include/distribution.php:1.39 31 Jul 2007 3:31: 7 -0000 +++ appdb/include/distribution.php 31 Jul 2007 3:31: 7 -0000 @@ -147,7 +147,7 @@ class distribution { deleted along with the last testData associated with it */ if(!($this->canEdit() || (!sizeof($this->aTestingIds) && $this->sQueued != "false"))) - return; + return false; /* Check for associated test results */ if(sizeof($this->aTestingIds)) @@ -163,6 +163,7 @@ class distribution { if(!($hResult = query_parameters($sQuery, $this->iDistributionId))) { addmsg("Error removing the Distribution!", "red"); + return false; } if(!$bSilent)

1 0

appdb/include vendor.php
by WineHQ 31 Jul '07

31 Jul '07

ChangeSet ID: 31296 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/30 22:09:42 Modified files: include : vendor.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> vendor::delete() should always return a value, in this case if we fall through we've failed Patch: http://cvs.winehq.org/patch.py?id=31296 Old revision New revision Changes Path 1.35 1.36 +2 -0 appdb/include/vendor.php Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.35 appdb/include/vendor.php:1.36 --- appdb/include/vendor.php:1.35 31 Jul 2007 3: 9:42 -0000 +++ appdb/include/vendor.php 31 Jul 2007 3: 9:42 -0000 @@ -167,6 +167,8 @@ class Vendor { return FALSE; } + + return false; } function outputEditor()

1 0

appdb/include testData.php
by WineHQ 31 Jul '07

31 Jul '07

ChangeSet ID: 31295 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/30 22:07:39 Modified files: include : testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Clean up return values of testData::delete(), return false upon failure. Patch: http://cvs.winehq.org/patch.py?id=31295 Old revision New revision Changes Path 1.74 1.75 +4 -2 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.74 appdb/include/testData.php:1.75 --- appdb/include/testData.php:1.74 31 Jul 2007 3: 7:39 -0000 +++ appdb/include/testData.php 31 Jul 2007 3: 7:39 -0000 @@ -214,8 +214,9 @@ class testData{ !$_SESSION['current']->hasAppVersionModifyPermission($oVersion) && !(($_SESSION['current']->iUserId == $this->iSubmitterId) && !($this->sQueued == 'false'))) { - return; + return false; } + // now delete the test data $sQuery = "DELETE FROM testResults WHERE testingId = '?' @@ -223,6 +224,7 @@ class testData{ if(!($hResult = query_parameters($sQuery, $this->iTestingId))) { addmsg("Error removing the deleted test data!", "red"); + return false; } if(!$bSilent) @@ -231,7 +233,7 @@ class testData{ if($this->iSubmitterId && ($this->iSubmitterId != $_SESSION['current']->iUserId)) $this->mailSubmitter("delete"); - return TRUE; + return true; }

1 0

appdb/include appData.php application.php brow ...
by WineHQ 31 Jul '07

31 Jul '07

ChangeSet ID: 31294 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/30 20:51:41 Modified files: include : appData.php application.php browse_newest_apps.php distribution.php maintainer.php objectManager.php table.php testData.php vendor.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> objectGetHeader() should return a TableRow instance as this is closer to what the information represents and is a much more useful form. Patch: http://cvs.winehq.org/patch.py?id=31294 Old revision New revision Changes Path 1.30 1.31 +6 -7 appdb/include/appData.php 1.121 1.122 +6 -7 appdb/include/application.php 1.2 1.3 +11 -5 appdb/include/browse_newest_apps.php 1.38 1.39 +10 -5 appdb/include/distribution.php 1.50 1.51 +7 -8 appdb/include/maintainer.php 1.41 1.42 +7 -3 appdb/include/objectManager.php 1.3 1.4 +1 -1 appdb/include/table.php 1.73 1.74 +9 -9 appdb/include/testData.php 1.34 1.35 +10 -5 appdb/include/vendor.php 1.142 1.143 +7 -7 appdb/include/version.php

1 0

appdb/. contact.php
by WineHQ 30 Jul '07

30 Jul '07

ChangeSet ID: 31293 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/30 18:17:16 Modified files: . : contact.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Preserve subject when replying to contact form mails Patch: http://cvs.winehq.org/patch.py?id=31293 Old revision New revision Changes Path 1.4 1.5 +12 -3 appdb/contact.php Index: appdb/contact.php diff -u -p appdb/contact.php:1.4 appdb/contact.php:1.5 --- appdb/contact.php:1.4 30 Jul 2007 23:17:16 -0000 +++ appdb/contact.php 30 Jul 2007 23:17:16 -0000 @@ -57,7 +57,8 @@ if(!$aClean['sSubmit']) $oTableRow = new TableRow(); $oTableRow->SetClass("color4"); $oTableRow->AddTextCell("Subject"); - $oTableCell = new TableCell("<input type=\"text\" name=\"sSubject\" size=\"71\" />"); + $oTableCell = new TableCell("<input type=\"text\" name=\"sSubject\" size=\"71\"". + " value=\"".$aClean['sSubject']."\" />"); $oTableRow->AddCell($oTableCell); $oTable->AddRow($oTableRow); @@ -66,7 +67,8 @@ if(!$aClean['sSubmit']) $oTableCell = new TableCell("Message"); $oTableCell->SetValign("top"); $oTableRow->AddCell($oTableCell); - $oTableCell = new TableCell("<textarea name=\"sMessage\" rows=\"15\" cols=\"60\"></textarea>"); + $oTableCell = new TableCell("<textarea name=\"sMessage\" rows=\"15\" cols=\"60\">" + .$aClean['sMessage']."</textarea>"); $oTableRow->AddCell($oTableCell); $oTable->AddRow($oTableRow); @@ -87,9 +89,16 @@ if(!$aClean['sSubmit']) } else if ($aClean['sSubject'] && $aClean['sMessage']) { + $sSubjectRe = $aClean['sSubject']; + if(substr($sSubjectRe, 0, 4) != "Re: ") + $sSubjectRe = "Re: $sSubjectRe"; + + $sSubjectRe = urlencode($sSubjectRe); + $sMsg = "The following message was sent to you from $oUser->sRealname "; $sMsg .= "through the Wine AppDB contact form.\nTo Reply, visit "; - $sMsg .= APPDB_ROOT."contact.php?iRecipientId=$oUser->iUserId\n\n"; + $sMsg .= APPDB_ROOT."contact.php?iRecipientId=$oUser->iUserId&sSubject="; + $sMsg .= $sSubjectRe."\n\n"; $sMsg .= $aClean['sMessage']; mail_appdb($oRecipient->sEmail, $aClean['sSubject'], $sMsg);

1 0

appdb/. contact.php
by WineHQ 30 Jul '07

30 Jul '07

ChangeSet ID: 31292 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/30 18:16:10 Modified files: . : contact.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Display login url in contact form when not logged in Patch: http://cvs.winehq.org/patch.py?id=31292 Old revision New revision Changes Path 1.3 1.4 +2 -1 appdb/contact.php Index: appdb/contact.php diff -u -p appdb/contact.php:1.3 appdb/contact.php:1.4 --- appdb/contact.php:1.3 30 Jul 2007 23:16:10 -0000 +++ appdb/contact.php 30 Jul 2007 23:16:10 -0000 @@ -12,7 +12,8 @@ $oUser = new User($_SESSION['current']-> /* Restrict error to logged-in users */ if(!$oUser->isLoggedIn()) - util_show_error_page_and_exit("You need to be logged in."); + util_show_error_page_and_exit("You need to be <a href=\"".login_url(). + "\">logged in</a>."); $oRecipient = new User($aClean['iRecipientId']);

1 0

appdb/tables bugzilla_tables.sql
by WineHQ 30 Jul '07

30 Jul '07

ChangeSet ID: 31291 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/30 18:13:14 Modified files: tables : bugzilla_tables.sql Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Default user needs permissions to access the bugs database, add a grant line to the bugzilla database and table creation Patch: http://cvs.winehq.org/patch.py?id=31291 Old revision New revision Changes Path 1.1 1.2 +3 -0 appdb/tables/bugzilla_tables.sql Index: appdb/tables/bugzilla_tables.sql diff -u -p appdb/tables/bugzilla_tables.sql:1.1 appdb/tables/bugzilla_tables.sql:1.2 --- appdb/tables/bugzilla_tables.sql:1.1 30 Jul 2007 23:13:14 -0000 +++ appdb/tables/bugzilla_tables.sql 30 Jul 2007 23:13:14 -0000 @@ -2,6 +2,9 @@ create database if not exists bugs; use bugs; +/* make sure the wineowner user has access to the bugs database */ +grant all on bugs.* to wineowner; + drop table if exists versions;

1 0

Paul Vriens : msi/registry: Use the return value of squash_guid.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 5e7b31b51da7bcbf9d1672887ac12348b7339195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e7b31b51da7bcbf9d1672887… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jul 30 20:13:04 2007 +0200 msi/registry: Use the return value of squash_guid. --- dlls/msi/registry.c | 53 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 36 insertions(+), 17 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index b9c0af4..013d152 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -233,6 +233,8 @@ BOOL squash_guid(LPCWSTR in, LPWSTR out) DWORD i,n=1; GUID guid; + out[0] = 0; + if (FAILED(CLSIDFromString((LPOLESTR)in, &guid))) return FALSE; @@ -474,7 +476,8 @@ UINT MSIREG_OpenUserProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szProduct)); - squash_guid(szProduct,squished_pc); + if (!squash_guid(szProduct,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szUserProduct_fmt,squished_pc); @@ -493,7 +496,8 @@ UINT MSIREG_DeleteUserProductKey(LPCWSTR szProduct) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szProduct)); - squash_guid(szProduct,squished_pc); + if (!squash_guid(szProduct,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szUserProduct_fmt,squished_pc); @@ -508,7 +512,8 @@ UINT MSIREG_OpenUserPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szPatch)); - squash_guid(szPatch,squished_pc); + if (!squash_guid(szPatch,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szUserPatch_fmt,squished_pc); @@ -528,7 +533,8 @@ UINT MSIREG_OpenUserFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szProduct)); - squash_guid(szProduct,squished_pc); + if (!squash_guid(szProduct,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szUserFeatures_fmt,squished_pc); @@ -553,7 +559,8 @@ UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szProduct)); - squash_guid(szProduct,squished_pc); + if (!squash_guid(szProduct,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szInstaller_Features_fmt,squished_pc); @@ -574,7 +581,8 @@ UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, HKEY *key, BOOL create) LPWSTR usersid; TRACE("%s\n", debugstr_w(szProduct)); - squash_guid(szProduct, squished_pc); + if (!squash_guid(szProduct, squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); rc = get_user_sid(&usersid); @@ -607,7 +615,8 @@ UINT MSIREG_OpenComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szComponent)); - squash_guid(szComponent,squished_cc); + if (!squash_guid(szComponent,squished_cc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_cc)); sprintfW(keypath,szInstaller_Components_fmt,squished_cc); @@ -627,7 +636,8 @@ UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szComponent)); - squash_guid(szComponent,squished_cc); + if (!squash_guid(szComponent,squished_cc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_cc)); sprintfW(keypath,szUser_Components_fmt,squished_cc); @@ -648,7 +658,8 @@ UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create LPWSTR usersid; TRACE("%s\n", debugstr_w(szComponent)); - squash_guid(szComponent, comp); + if (!squash_guid(szComponent, comp)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(comp)); rc = get_user_sid(&usersid); @@ -677,7 +688,8 @@ UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, HKEY *key, BOOL create) LPWSTR usersid; TRACE("%s\n", debugstr_w(szProduct)); - squash_guid(szProduct, squished_pc); + if (!squash_guid(szProduct, squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); rc = get_user_sid(&usersid); @@ -706,7 +718,8 @@ UINT MSIREG_OpenInstallPropertiesKey(LPCWSTR szProduct, HKEY *key, BOOL create) LPWSTR usersid; TRACE("%s\n", debugstr_w(szProduct)); - squash_guid(szProduct, squished_pc); + if (!squash_guid(szProduct, squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); rc = get_user_sid(&usersid); @@ -735,7 +748,8 @@ UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) LPWSTR usersid; TRACE("%s\n", debugstr_w(szProduct)); - squash_guid(szProduct, squished_pc); + if (!squash_guid(szProduct, squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); rc = get_user_sid(&usersid); @@ -763,7 +777,8 @@ UINT MSIREG_OpenProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szProduct)); - squash_guid(szProduct,squished_pc); + if (!squash_guid(szProduct,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szInstaller_Products_fmt,squished_pc); @@ -782,7 +797,8 @@ UINT MSIREG_DeleteProductKey(LPCWSTR szProduct) WCHAR keypath[0x200]; TRACE("%s\n", debugstr_w(szProduct)); - squash_guid(szProduct, squished_pc); + if (!squash_guid(szProduct, squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath, szInstaller_Products_fmt, squished_pc); @@ -797,7 +813,8 @@ UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szPatch)); - squash_guid(szPatch,squished_pc); + if (!squash_guid(szPatch,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szInstaller_Patches_fmt,squished_pc); @@ -817,7 +834,8 @@ UINT MSIREG_OpenUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szUpgradeCode)); - squash_guid(szUpgradeCode,squished_pc); + if (!squash_guid(szUpgradeCode,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szInstaller_UpgradeCodes_fmt,squished_pc); @@ -837,7 +855,8 @@ UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL creat WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szUpgradeCode)); - squash_guid(szUpgradeCode,squished_pc); + if (!squash_guid(szUpgradeCode,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szInstaller_UserUpgradeCodes_fmt,squished_pc);

1 0