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

Andrew Talbot : dmloader: Constify some variables.
by Alexandre Julliard April 25, 2007

April 25, 2007

Module: wine Branch: master Commit: b19be8870c74907e09dc4c4d6953801ff531f488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b19be8870c74907e09dc4c4d6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Apr 24 20:51:37 2007 +0100 dmloader: Constify some variables. --- dlls/dmloader/debug.c | 4 ++-- dlls/dmloader/debug.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 7dba67d..fd13c42 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -56,7 +56,7 @@ const char *debugstr_fourcc (DWORD fourcc) { } /* DMUS_VERSION struct to string conversion for debug messages */ -const char *debugstr_dmversion (LPDMUS_VERSION version) { +const char *debugstr_dmversion (const DMUS_VERSION *version) { if (!version) return "'null'"; return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", HIWORD(version->dwVersionMS),LOWORD(version->dwVersionMS), @@ -83,7 +83,7 @@ static const char *debugstr_month (DWORD dwMonth) { } /* FILETIME struct to string conversion for debug messages */ -const char *debugstr_filetime (LPFILETIME time) { +const char *debugstr_filetime (const FILETIME *time) { SYSTEMTIME sysTime; if (!time) return "'null'"; diff --git a/dlls/dmloader/debug.h b/dlls/dmloader/debug.h index 8d28cea..5a2daf4 100644 --- a/dlls/dmloader/debug.h +++ b/dlls/dmloader/debug.h @@ -50,9 +50,9 @@ extern const char *resolve_STREAM_SEEK (DWORD flag); /* FOURCC to string conversion for debug messages */ extern const char *debugstr_fourcc (DWORD fourcc); /* DMUS_VERSION struct to string conversion for debug messages */ -extern const char *debugstr_dmversion (LPDMUS_VERSION version); +extern const char *debugstr_dmversion (const DMUS_VERSION *version); /* FILETIME struct to string conversion for debug messages */ -extern const char *debugstr_filetime (LPFILETIME time); +extern const char *debugstr_filetime (const FILETIME *time); /* returns name of given GUID */ extern const char *debugstr_dmguid (const GUID *id); /* returns name of given error code */

1 0

Aric Stewart : usp10: Do not crash in ScriptPlace if pABC is null.
by Alexandre Julliard April 25, 2007

April 25, 2007

Module: wine Branch: master Commit: 73bec11865270731f9d896fd5f1fda2d2e2c16b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73bec11865270731f9d896fd5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 24 13:03:22 2007 -0500 usp10: Do not crash in ScriptPlace if pABC is null. --- dlls/usp10/usp10.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index b2b4b3f..3e1258d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1309,8 +1309,8 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, * to get the correct ABC widths. */ if (!(lpABC = usp_zero_alloc(sizeof(ABC) * cGlyphs))) return E_OUTOFMEMORY; - - memset(pABC, 0, sizeof(ABC)); + if (pABC) + memset(pABC, 0, sizeof(ABC)); /* FIXME: set pGoffset to more reasonable values */ if (!GetCharABCWidthsI(get_cache_hdc(psc), 0, cGlyphs, (WORD *) pwGlyphs, lpABC )) @@ -1330,15 +1330,19 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, lpABC[wcnt].abcA, lpABC[wcnt].abcB, lpABC[wcnt].abcC, wcnt); - pABC->abcA += lpABC[wcnt].abcA; - pABC->abcB += lpABC[wcnt].abcB; - pABC->abcC += lpABC[wcnt].abcC; + if (pABC) + { + pABC->abcA += lpABC[wcnt].abcA; + pABC->abcB += lpABC[wcnt].abcB; + pABC->abcC += lpABC[wcnt].abcC; + } piAdvance[wcnt] = lpABC[wcnt].abcA + lpABC[wcnt].abcB + lpABC[wcnt].abcC; pGoffset[wcnt].du = 0; pGoffset[wcnt].dv = 0; } } - TRACE("Total for run: abcA=%d, abcB=%d, abcC=%d\n", pABC->abcA, pABC->abcB, pABC->abcC); + if (pABC) + TRACE("Total for run: abcA=%d, abcB=%d, abcC=%d\n", pABC->abcA, pABC->abcB, pABC->abcC); usp_free(lpABC); return S_OK;

1 0

Rob Shearman : msi: Fix an off-by-one error when calculating the path and filename for the action data in the SelfRegModules action .
by Alexandre Julliard April 25, 2007

April 25, 2007

Module: wine Branch: master Commit: 220f93db6115ff29ab066551ae0d1ffb1eccd483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=220f93db6115ff29ab066551a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 24 12:33:56 2007 +0100 msi: Fix an off-by-one error when calculating the path and filename for the action data in the SelfRegModules action. The backslash is in p[0], not p[1]. --- dlls/msi/action.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index dbf48f4..7ee0518 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3498,8 +3498,8 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param) uipath = strdupW( file->TargetPath ); p = strrchrW(uipath,'\\'); if (p) - p[1]=0; - MSI_RecordSetStringW( uirow, 1, &p[2] ); + p[0]=0; + MSI_RecordSetStringW( uirow, 1, &p[1] ); MSI_RecordSetStringW( uirow, 2, uipath); ui_actiondata( package, szSelfRegModules, uirow); msiobj_release( &uirow->hdr );

1 0

Rob Shearman : msi: Set rec to NULL after calling msiobj_release on it in msi_create_table so that we don 't call msiobj_release on it again.
by Alexandre Julliard April 25, 2007

April 25, 2007

Module: wine Branch: master Commit: 3323303e091555d49028ede48d8ad4c186e2e3f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3323303e091555d49028ede48… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 24 12:31:31 2007 +0100 msi: Set rec to NULL after calling msiobj_release on it in msi_create_table so that we don't call msiobj_release on it again. --- dlls/msi/table.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index ea1314e..974b3f1 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -681,6 +681,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, tv = NULL; msiobj_release( &rec->hdr ); + rec = NULL; if( persistent ) {

1 0

Rob Shearman : kernel32: Add the directory the executable was loaded from to the module search path if the module file name doesn 't contain a path.
by Alexandre Julliard April 25, 2007

April 25, 2007

Module: wine Branch: master Commit: 27412837b993fd7807088d07007f3fc4d6c267d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27412837b993fd7807088d070… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 24 12:34:35 2007 +0100 kernel32: Add the directory the executable was loaded from to the module search path if the module file name doesn't contain a path. --- dlls/kernel32/module.c | 33 ++++++++++++++++++++++++++------- 1 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 9447fd6..daf2714 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -678,6 +678,24 @@ static const WCHAR *get_dll_system_path(void) return cached_path; } +/****************************************************************** + * get_module_path_end + * + * Returns the end of the directory component of the module path. + */ +static inline const WCHAR *get_module_path_end(const WCHAR *module) +{ + const WCHAR *p; + const WCHAR *mod_end = module; + if (!module) return mod_end; + + if ((p = strrchrW( mod_end, '\\' ))) mod_end = p; + if ((p = strrchrW( mod_end, '/' ))) mod_end = p; + if (mod_end == module + 2 && module[1] == ':') mod_end++; + if (mod_end == module && module[0] && module[1] == ':') mod_end += 2; + + return mod_end; +} /****************************************************************** * MODULE_get_dll_load_path @@ -697,16 +715,17 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) /* adjust length for module name */ - if (!module) module = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; if (module) + mod_end = get_module_path_end( module ); + /* if module is NULL or doesn't contain a path, fall back to directory + * process was loaded from */ + if (module == mod_end) { - mod_end = module; - if ((p = strrchrW( mod_end, '\\' ))) mod_end = p; - if ((p = strrchrW( mod_end, '/' ))) mod_end = p; - if (mod_end == module + 2 && module[1] == ':') mod_end++; - if (mod_end == module && module[0] && module[1] == ':') mod_end += 2; - len += (mod_end - module) + 1; + module = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + mod_end = get_module_path_end( module ); } + len += (mod_end - module) + 1; + len += strlenW( system_path ) + 2; /* get the PATH variable */

1 0

Tom Spear : winecfg: Change WINE_ERR to WINE_TRACE since there is no real error.
by Alexandre Julliard April 25, 2007

April 25, 2007

Module: wine Branch: master Commit: 621eceb633835d84496553eb1a0070e08b70c5a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=621eceb633835d84496553eb1… Author: Tom Spear <speeddymon(a)gmail.com> Date: Tue Apr 24 11:12:23 2007 -0500 winecfg: Change WINE_ERR to WINE_TRACE since there is no real error. --- programs/winecfg/driveui.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index b412c78..2267764 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -352,7 +352,7 @@ static void on_remove_click(HWND dialog) drive = (struct drive *) item.lParam; - WINE_ERR("unixpath: %s\n", drive->unixpath); + WINE_TRACE("unixpath: %s\n", drive->unixpath); if (drive->letter == 'C') {

1 0

Rob Shearman : msi: Create the _Property table as a temporary table so that the properties aren 't saved to the .msi file.
by Alexandre Julliard April 25, 2007

April 25, 2007

Module: wine Branch: master Commit: 22cd120d5d036475f77ab0de251b3260e7b21c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=22cd120d5d036475f77ab0de2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 24 12:32:22 2007 +0100 msi: Create the _Property table as a temporary table so that the properties aren't saved to the .msi file. --- dlls/msi/package.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 767ebcf..e04e19c 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -66,9 +66,11 @@ static UINT clone_properties(MSIPACKAGE *package) 'C','R','E','A','T','E',' ','T','A','B','L','E',' ','`','_','P','r','o', 'p','e','r','t','y','`',' ','(',' ','`','_','P','r','o','p','e','r','t', 'y','`',' ','C','H','A','R','(','5','6',')',' ','N','O','T',' ','N','U', - 'L','L',',',' ','`','V','a','l','u','e','`',' ','C','H','A','R','(','9', - '8',')',' ','N','O','T',' ','N','U','L','L',' ','P','R','I','M','A','R', - 'Y',' ','K','E','Y',' ','`','_','P','r','o','p','e','r','t','y','`',')',0}; + 'L','L',' ','T','E','M','P','O','R','A','R','Y',',',' ','`','V','a','l', + 'u','e','`',' ','C','H','A','R','(','9','8',')',' ','N','O','T',' ','N', + 'U','L','L',' ','T','E','M','P','O','R','A','R','Y',' ','P','R','I','M', + 'A','R','Y',' ','K','E','Y',' ','`','_','P','r','o','p','e','r','t','y', + '`',')',0}; static const WCHAR Query[] = { 'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ','`','P','r','o','p','e','r','t','y','`',0};

1 0

appdb/ ./objectManager.php help/maintainer_gui ...
by WineHQ April 24, 2007

April 24, 2007

ChangeSet ID: 31106 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/24 18:48:15 Modified files: . : objectManager.php help : maintainer_guidelines.help include : application.php sidebar.php sidebar_admin.php sidebar_login.php version.php unit_test : test_om_objects.php Added files: include : application_queue.php Removed files: . : appsubmit.php admin : adminAppQueue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use objectManager to submit and process applications. Remove now unused appsubmit.php admin/adminAppQueue.php Patch: http://cvs.winehq.org/patch.py?id=31106 Old revision New revision Changes Path 1.8 1.9 +1 -1 appdb/objectManager.php 1.68 Removed +0 -0 appdb/appsubmit.php 1.77 Removed +0 -0 appdb/admin/adminAppQueue.php 1.6 1.7 +3 -4 appdb/help/maintainer_guidelines.help 1.106 1.107 +72 -19 appdb/include/application.php 1.30 1.31 +2 -1 appdb/include/sidebar.php 1.41 1.42 +3 -3 appdb/include/sidebar_admin.php 1.27 1.28 +1 -1 appdb/include/sidebar_login.php 1.123 1.124 +6 -3 appdb/include/version.php Added 1.1 +0 -0 appdb/include/application_queue.php 1.10 1.11 +2 -0 appdb/unit_test/test_om_objects.php

1 0

appdb/include version.php
by WineHQ April 24, 2007

April 24, 2007

ChangeSet ID: 31105 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/24 18:41:22 Modified files: include : version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix empty mail upon version acceptance. version::unQueue() was passing the wrong argument to mailSubmitter() Patch: http://cvs.winehq.org/patch.py?id=31105 Old revision New revision Changes Path 1.122 1.123 +1 -1 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.122 appdb/include/version.php:1.123 --- appdb/include/version.php:1.122 24 Apr 2007 23:41:22 -0000 +++ appdb/include/version.php 24 Apr 2007 23:41:22 -0000 @@ -383,7 +383,7 @@ class Version { { $this->sQueued = 'false'; // we send an e-mail to interested people - $this->mailSubmitter("unQueue"); + $this->mailSubmitter("add"); $this->SendNotificationMail(); /* Unqueue matching maintainer request */

1 0

appdb/include objectManager.php
by WineHQ April 24, 2007

April 24, 2007

ChangeSet ID: 31104 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/24 18:40:12 Modified files: include : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Display add item help text after fetching input values. This allows the help text functions to output help depending on the state of the edited object Patch: http://cvs.winehq.org/patch.py?id=31104 Old revision New revision Changes Path 1.17 1.18 +5 -4 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.17 appdb/include/objectManager.php:1.18 --- appdb/include/objectManager.php:1.17 24 Apr 2007 23:40:12 -0000 +++ appdb/include/objectManager.php 24 Apr 2007 23:40:12 -0000 @@ -258,16 +258,17 @@ class ObjectManager $oObject = new $this->sClass(); - /* Display help if it is exists */ - if(method_exists(new $this->sClass, "objectDisplayAddItemHelp")) - $oObject->objectDisplayAddItemHelp(); - /* Display errors, if any, and fetch form data */ if($this->displayErrors($sErrors)) { global $aClean; $oObject->getOutputEditorValues($aClean); } + + /* Display help if it is exists */ + if(method_exists(new $this->sClass, "objectDisplayAddItemHelp")) + $oObject->objectDisplayAddItemHelp(); + echo "<form method=\"post\">\n"; $oObject->outputEditor();

1 0