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

Francois Gouget : winapi_check: ULONG_PTR is a 'long --pointer', not a ' long'.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: 8b35421bf98952e2f81c9ea864b8c55a9e66ae0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b35421bf98952e2f81c9ea86… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 15 19:00:10 2007 +0200 winapi_check: ULONG_PTR is a 'long --pointer', not a 'long'. --- tools/winapi/win32.api | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 74c8324..2102951 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -629,6 +629,9 @@ BOOL HWND LONG LPARAM + +%long --pointer + ULONG_PTR %ptr

1 0

Francois Gouget : shlwapi: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: 56c841ced0639cf94547163fd072ee24a4da5a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c841ced0639cf94547163fd… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 15 19:00:02 2007 +0200 shlwapi: Update win32.api to fix the winapi_check warnings. --- dlls/shlwapi/ordinal.c | 2 +- tools/winapi/win32.api | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index bad167c..e8738f3 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4393,7 +4393,7 @@ typedef struct SHELL_USER_PERMISSION { /* ...and this should be in shlwapi.h */ * NOTES * Call should free returned descriptor with LocalFree */ -SECURITY_DESCRIPTOR * WINAPI GetShellSecurityDescriptor(PSHELL_USER_PERMISSION *apUserPerm, int cUserPerm) +PSECURITY_DESCRIPTOR WINAPI GetShellSecurityDescriptor(PSHELL_USER_PERMISSION *apUserPerm, int cUserPerm) { PSID *sidlist; PSID cur_user = NULL; diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 2102951..9ce60f7 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -4193,7 +4193,6 @@ HRESULT HUSKEY HWND INT -LANGID LONG LPARAM LRESULT @@ -4214,6 +4213,7 @@ int %long --pointer INT_PTR +DWORD_PTR %longlong @@ -4224,9 +4224,11 @@ LONGLONG BOOL * BSTR * CLSID * +DISPPARAMS * DLGPROC DLLVERSIONINFO * DWORD * +DWORD_PTR * FDSA_info * HICON * HKEY * @@ -4240,7 +4242,6 @@ IDropTarget * IEnumIDList ** IFACE_INDEX_TBL * IID * -INT * IPropertyBag * IShellFolder * IStream * @@ -4285,12 +4286,11 @@ PARSEDURLA * PARSEDURLW * PHKEY PHUSKEY -PLONG PPOINTL PSECURITY_DESCRIPTOR +PSHELL_USER_PERMISSION * PVOID PVOID * -RECT * REFCLSID REFGUID REFIID @@ -4299,7 +4299,9 @@ STRRET * UINT * ULARGE_INTEGER * VARIANT * +VARIANTARG * VOID * +WAITORTIMERCALLBACK WNDCLASSA * WNDCLASSW * int *

1 0

James Hawkins : msi: Forward MsiApplyPatchA to MsiApplyPatchW.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: 974e76fe79b54ba98196e637d6d4372f56e50aea URL: http://source.winehq.org/git/wine.git/?a=commit;h=974e76fe79b54ba98196e637d… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jun 15 14:04:04 2007 -0700 msi: Forward MsiApplyPatchA to MsiApplyPatchW. --- dlls/msi/msi.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index a09984e..ad9c5b4 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -226,9 +226,31 @@ UINT WINAPI MsiReinstallProductW(LPCWSTR szProduct, DWORD dwReinstallMode) UINT WINAPI MsiApplyPatchA(LPCSTR szPatchPackage, LPCSTR szInstallPackage, INSTALLTYPE eInstallType, LPCSTR szCommandLine) { - FIXME("%s %s %d %s\n", debugstr_a(szPatchPackage), debugstr_a(szInstallPackage), + LPWSTR patch_package = NULL; + LPWSTR install_package = NULL; + LPWSTR command_line = NULL; + UINT r = ERROR_OUTOFMEMORY; + + TRACE("%s %s %d %s\n", debugstr_a(szPatchPackage), debugstr_a(szInstallPackage), eInstallType, debugstr_a(szCommandLine)); - return ERROR_CALL_NOT_IMPLEMENTED; + + if (szPatchPackage && !(patch_package = strdupAtoW(szPatchPackage))) + goto done; + + if (szInstallPackage && !(install_package = strdupAtoW(szInstallPackage))) + goto done; + + if (szCommandLine && !(command_line = strdupAtoW(szCommandLine))) + goto done; + + r = MsiApplyPatchW(patch_package, install_package, eInstallType, command_line); + +done: + msi_free(patch_package); + msi_free(install_package); + msi_free(command_line); + + return r; } UINT WINAPI MsiApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szInstallPackage,

1 0

Paul Vriens : crypt32/tests: Don't crash on Vista.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: 5fb284721d3a4b80f66f2f6840d15ac2eac6e568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb284721d3a4b80f66f2f684… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 15 16:55:21 2007 +0200 crypt32/tests: Don't crash on Vista. --- dlls/crypt32/tests/main.c | 72 ++++++++++++++++++++++++++------------------ 1 files changed, 42 insertions(+), 30 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 73ead4a..e55d2d3 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -44,16 +44,20 @@ static void test_findAttribute(void) ok(ret == NULL, "Expected failure\n"); ok(GetLastError() == 0xdeadbeef, "Last error was set to %08x\n", GetLastError()); - /* crashes - SetLastError(0xdeadbeef); - ret = CertFindAttribute(NULL, 1, NULL); - */ - /* returns NULL, last error is ERROR_INVALID_PARAMETER */ - SetLastError(0xdeadbeef); - ret = CertFindAttribute(NULL, 1, &attr); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(), - GetLastError()); + if (0) + { + /* crashes */ + SetLastError(0xdeadbeef); + ret = CertFindAttribute(NULL, 1, NULL); + /* returns NULL, last error is ERROR_INVALID_PARAMETER + * crashes on Vista + */ + SetLastError(0xdeadbeef); + ret = CertFindAttribute(NULL, 1, &attr); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(), + GetLastError()); + } /* returns NULL, last error not set */ SetLastError(0xdeadbeef); ret = CertFindAttribute("bogus", 1, &attr); @@ -85,16 +89,20 @@ static void test_findExtension(void) ok(ret == NULL, "Expected failure\n"); ok(GetLastError() == 0xdeadbeef, "Last error was set to %08x\n", GetLastError()); - /* crashes - SetLastError(0xdeadbeef); - ret = CertFindExtension(NULL, 1, NULL); - */ - /* returns NULL, last error is ERROR_INVALID_PARAMETER */ - SetLastError(0xdeadbeef); - ret = CertFindExtension(NULL, 1, &ext); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(), - GetLastError()); + if (0) + { + /* crashes */ + SetLastError(0xdeadbeef); + ret = CertFindExtension(NULL, 1, NULL); + /* returns NULL, last error is ERROR_INVALID_PARAMETER + * crashes on Vista + */ + SetLastError(0xdeadbeef); + ret = CertFindExtension(NULL, 1, &ext); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(), + GetLastError()); + } /* returns NULL, last error not set */ SetLastError(0xdeadbeef); ret = CertFindExtension("bogus", 1, &ext); @@ -126,16 +134,20 @@ static void test_findRDNAttr(void) }; CERT_NAME_INFO nameInfo = { sizeof(rdns) / sizeof(rdns[0]), rdns }; - /* crashes - SetLastError(0xdeadbeef); - ret = CertFindRDNAttr(NULL, NULL); - */ - /* returns NULL, last error is ERROR_INVALID_PARAMETER */ - SetLastError(0xdeadbeef); - ret = CertFindRDNAttr(NULL, &nameInfo); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(), - GetLastError()); + if (0) + { + /* crashes */ + SetLastError(0xdeadbeef); + ret = CertFindRDNAttr(NULL, NULL); + /* returns NULL, last error is ERROR_INVALID_PARAMETER + * crashes on Vista + */ + SetLastError(0xdeadbeef); + ret = CertFindRDNAttr(NULL, &nameInfo); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(), + GetLastError()); + } /* returns NULL, last error not set */ SetLastError(0xdeadbeef); ret = CertFindRDNAttr("bogus", &nameInfo);

1 0

appdb/include util.php
by WineHQ June 17, 2007

June 17, 2007

ChangeSet ID: 31219 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/17 17:44:47 Modified files: include : util.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Cleanup make_bugzilla_version_list(). Use standard naming convention, add some documentation. Add a work around so a selected version, if not present, is added to the list and selected. This fixes the issue where editing an older test result leaves us in an unattainable position, we can't select the version since it was pruned from the list and we don't want to pick the wrong version for the results. Patch: http://cvs.winehq.org/patch.py?id=31219 Old revision New revision Changes Path 1.94 1.95 +25 -8 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.94 appdb/include/util.php:1.95 --- appdb/include/util.php:1.94 17 Jun 2007 22:44:47 -0000 +++ appdb/include/util.php 17 Jun 2007 22:44:47 -0000 @@ -154,11 +154,14 @@ function get_xml_tag ($file, $mode = nul } /* bugzilla functions */ -function make_bugzilla_version_list($varname, $cvalue) -{ - $table = BUGZILLA_DB.".versions"; - $where = "WHERE product_id=".BUGZILLA_PRODUCT_ID; - $sQuery = "SELECT value FROM $table $where"; +// $sVarname - name of the selection array that this function will output +// this is the name to use to retrieve the selection on the form postback +// $sSelectedValue - the currently selected entry +function make_bugzilla_version_list($sVarname, $sSelectedValue) +{ + $sTable = BUGZILLA_DB.".versions"; + $sWhere = "WHERE product_id=".BUGZILLA_PRODUCT_ID; + $sQuery = "SELECT value FROM $sTable $sWhere"; $hResult = query_bugzilladb($sQuery); if(!$hResult) return; @@ -195,15 +198,29 @@ function make_bugzilla_version_list($var // build the selection array - echo "<select name='$varname'>\n"; + echo "<select name='$sVarname'>\n"; echo "<option value=\"\">Choose ...</option>\n"; + $bFoundSelectedValue = false; foreach($aVersions as $sKey => $sValue) { - if($sValue == $cvalue) + if($sValue == $sSelectedValue) + { echo "<option value=$sValue selected>$sValue\n"; - else + $bFoundSelectedValue = true; + } else + { echo "<option value=$sValue>$sValue\n"; + } } + + // if we didn't find the selected value and the selected value isn't empty + // then we should add the selected value to the list because we could have pruned + // the version that is to be selected + if(!$bFoundSelectedValue && $sSelectedValue) + { + echo "<option value=$sSelectedValue selected>$sSelectedValue\n"; + } + echo "</select>\n"; }

1 0

appdb/include sidebar.php
by WineHQ June 17, 2007

June 17, 2007

ChangeSet ID: 31218 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/17 17:10:30 Modified files: include : sidebar.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Remove duplicate 'Appdb home' entry. Shorten the names of a few other entries Patch: http://cvs.winehq.org/patch.py?id=31218 Old revision New revision Changes Path 1.31 1.32 +3 -4 appdb/include/sidebar.php Index: appdb/include/sidebar.php diff -u -p appdb/include/sidebar.php:1.31 appdb/include/sidebar.php:1.32 --- appdb/include/sidebar.php:1.31 17 Jun 2007 22:10:30 -0000 +++ appdb/include/sidebar.php 17 Jun 2007 22:10:30 -0000 @@ -18,7 +18,6 @@ function global_sidebar_menu() $g->done(); $g = new htmlmenu("AppDB"); - $g->add("AppDB Home", BASE); $g->add("Screenshots", BASE."viewScreenshots.php"); $g->add("Browse Apps", BASE."appbrowse.php"); $g->add("Browse Newest Apps", BASE."browse_newest_apps.php"); @@ -28,9 +27,9 @@ function global_sidebar_menu() $g->add("Submit Application", BASE."objectManager.php?sClass=application_queue&". "sTitle=Submit+Application&sAction=add"); $g->add("Help & Documentation", BASE."help/"); - $g->add("AppDB Stats", BASE."appdbStats.php"); - $g->add("View Distributions (".distribution::objectGetEntriesCount(false, false).")", BASE."objectManager.php?sClass=distribution&bIsQueue=false&sTitle=View%20Distributions"); - $g->add("View Vendors (".vendor::objectGetEntriesCount(false, false).")", BASE."objectManager.php?sClass=vendor&bIsQueue=false&sTitle=View%20Vendors"); + $g->add("Statistics", BASE."appdbStats.php"); + $g->add("Distributions (".distribution::objectGetEntriesCount(false, false).")", BASE."objectManager.php?sClass=distribution&bIsQueue=false&sTitle=View%20Distributions"); + $g->add("Vendors (".vendor::objectGetEntriesCount(false, false).")", BASE."objectManager.php?sClass=vendor&bIsQueue=false&sTitle=View%20Vendors"); $g->add("Email your suggestions for improving the AppDB", "mailto:appdb(a)winehq.org"); $g->done();

1 0

appdb/ ./account.php include/util.php
by WineHQ June 17, 2007

June 17, 2007

ChangeSet ID: 31217 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/17 11:59:42 Modified files: . : account.php include : util.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Encode the sReturnTo argument to the login page, otherwise we may have problems with some urls Patch: http://cvs.winehq.org/patch.py?id=31217 Old revision New revision Changes Path 1.36 1.37 +1 -1 appdb/account.php 1.93 1.94 +1 -1 appdb/include/util.php Index: appdb/account.php diff -u -p appdb/account.php:1.36 appdb/account.php:1.37 --- appdb/account.php:1.36 17 Jun 2007 16:59:42 -0000 +++ appdb/account.php 17 Jun 2007 16:59:42 -0000 @@ -209,7 +209,7 @@ function cmd_do_login() if($iResult == SUCCESS) { - $sReturnUrl = $aClean['sReturnTo']; + $sReturnUrl = urldecode($aClean['sReturnTo']); if(!$sReturnUrl) $sReturnUrl = apidb_fullurl("index.php"); addmsg("You are successfully logged in as '$oUser->sRealname'.", "green"); Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.93 appdb/include/util.php:1.94 --- appdb/include/util.php:1.93 17 Jun 2007 16:59:42 -0000 +++ appdb/include/util.php 17 Jun 2007 16:59:42 -0000 @@ -907,7 +907,7 @@ function util_trim_description($sDescrip to the current page once he has logged in */ function login_url() { - $sCurrentUrl = $_SERVER['REQUEST_URI']; + $sCurrentUrl = urlencode($_SERVER['REQUEST_URI']); $sLoginUrl = BASE."account.php?sCmd=login"; /* If we are on the login page that means the URL already contains an sReturnTo value,

1 0

appdb/. apidb.css
by WineHQ June 17, 2007

June 17, 2007

ChangeSet ID: 31216 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/17 11:58:52 Modified files: . : apidb.css Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Increase menu text size. Should make it easier for people to notice the menu options. Increase font size from 10px to 11px. Patch: http://cvs.winehq.org/patch.py?id=31216 Old revision New revision Changes Path 1.18 1.19 +4 -4 appdb/apidb.css Index: appdb/apidb.css diff -u -p appdb/apidb.css:1.18 appdb/apidb.css:1.19 --- appdb/apidb.css:1.18 17 Jun 2007 16:58:52 -0000 +++ appdb/apidb.css 17 Jun 2007 16:58:52 -0000 @@ -63,10 +63,10 @@ p.indent { padding-left: 1em; .menuTitle { font-size: 12px; color: #ffffff; font-weight: bold; text-decoration: none; } .menuTitle:visited { font-size: 12px; color: #ffffff; font-weight: bold; text-decoration: none; } .menuTitle:hover { font-size: 12px; color: #ffffff; font-weight: bold; text-decoration: none; } -.menuLink { font-size: 10px; color: #ffffff; font-weight: bold; } -.menuItem { font-size: 10px; color: #000000; } -.menuItem:visited { font-size: 10px; color: #000000; } -.menuItem:hover { font-size: 10px; color: #A50D0D; } +.menuLink { font-size: 11px; color: #ffffff; font-weight: bold; } +.menuItem { font-size: 11px; color: #000000; } +.menuItem:visited { font-size: 11px; color: #000000; } +.menuItem:hover { font-size: 11px; color: #A50D0D; } .topMenu { background-color: #601919; } .sideMenu { background-color: #FFFFFF; }

1 0

appdb/. screenshots.php
by WineHQ June 16, 2007

June 16, 2007

ChangeSet ID: 31215 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/16 16:16:12 Modified files: . : screenshots.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Properly close all of the html frames we opened with html_frame_start(). Fixes a bug where the back link appears inside of a frame and the page rendering time appears in an odd red bar at the bottom of the page Patch: http://cvs.winehq.org/patch.py?id=31215 Old revision New revision Changes Path 1.45 1.46 +6 -2 appdb/screenshots.php Index: appdb/screenshots.php diff -u -p appdb/screenshots.php:1.45 appdb/screenshots.php:1.46 --- appdb/screenshots.php:1.45 16 Jun 2007 21:16:12 -0000 +++ appdb/screenshots.php 16 Jun 2007 21:16:12 -0000 @@ -69,6 +69,9 @@ if($hResult && mysql_num_rows($hResult)) echo "<div align=center><table><tr>\n"; while($oRow = mysql_fetch_object($hResult)) { + // if the current version changed then update the current version + // and close the previous html frame if this isn't the + // first frame if(!$aClean['iVersionId'] && $oRow->versionId != $currentVersionId) { if($currentVersionId) @@ -77,7 +80,7 @@ if($hResult && mysql_num_rows($hResult)) echo html_frame_end(); $c=1; } - $currentVersionId=$oRow->versionId; + $currentVersionId = $oRow->versionId; echo html_frame_start("Version ".Version::lookup_name($currentVersionId)); echo "<div align=center><table><tr>\n"; } @@ -104,7 +107,8 @@ if($hResult && mysql_num_rows($hResult)) } echo "</tr></table></div><br />\n"; - echo html_frame_end("Click thumbnail to view image in new window."); + echo html_frame_end(); // close the current version we are displaying + echo html_frame_end(); // close the "Screenshot Gallary..." html frame } else { echo "<p align=\"center\">There are currently no screenshots for the selected version of this application."; echo "<br />Please consider submitting a screenshot for the selected version yourself.</p>";

1 0

appdb/cron cleanup.php
by WineHQ June 16, 2007

June 16, 2007

ChangeSet ID: 31214 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/16 12:04:56 Modified files: cron : cleanup.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix cron maintenance email subject for database error log emails. Forgot to flag $sEmailSubject as global Patch: http://cvs.winehq.org/patch.py?id=31214 Old revision New revision Changes Path 1.43 1.44 +1 -0 appdb/cron/cleanup.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.43 appdb/cron/cleanup.php:1.44 --- appdb/cron/cleanup.php:1.43 16 Jun 2007 17: 4:56 -0000 +++ appdb/cron/cleanup.php 16 Jun 2007 17: 4:56 -0000 @@ -254,6 +254,7 @@ function orphanSessionListCheck() // report the database error log entries to the mailing list function reportErrorLogEntries() { + global $sEmailSubject; error_log::mail_admins_error_log($sEmailSubject); error_log::flush(); }

1 0