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

appdb/. preferences.php
by WineHQ June 21, 2006

June 21, 2006

ChangeSet ID: 25917 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/21 00:37:48 Modified files: . : preferences.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix preferences page. It is $_REQUEST and $_POST, not $REQUEST and $POST Patch: http://cvs.winehq.org/patch.py?id=25917 Old revision New revision Changes Path 1.22 1.23 +9 -9 appdb/preferences.php Index: appdb/preferences.php diff -u -p appdb/preferences.php:1.22 appdb/preferences.php:1.23 --- appdb/preferences.php:1.22 21 Jun 2006 5:37:48 -0000 +++ appdb/preferences.php 21 Jun 2006 5:37:48 -0000 @@ -11,15 +11,15 @@ include(BASE."include/"."incl.php"); $aClean = array(); //array of filtered user input -$aClean['userId'] = makeSafe($REQUEST['userId']); -$aClean['iLimit'] = makeSafe($REQUEST['iLimit']); -$aClean['sOrderBy'] = makeSafe($REQUEST['sOrderBy']); -$aClean['ext_password'] = makeSafe($REQUEST['ext_password']); -$aClean['ext_password2'] = makeSafe($REQUEST['ext_password2']); -$aClean['ext_email'] = makeSafe($REQUEST['ext_email']); -$aClean['ext_realname'] = makeSafe($REQUEST['ext_realname']); -$aClean['CVSrelease'] = makeSafe($REQUEST['CVSrelease']); -$aClean['ext_hasadmin'] = makeSafe($POST['ext_hasadmin']); +$aClean['userId'] = makeSafe($_REQUEST['userId']); +$aClean['iLimit'] = makeSafe($_REQUEST['iLimit']); +$aClean['sOrderBy'] = makeSafe($_REQUEST['sOrderBy']); +$aClean['ext_password'] = makeSafe($_REQUEST['ext_password']); +$aClean['ext_password2'] = makeSafe($_REQUEST['ext_password2']); +$aClean['ext_email'] = makeSafe($_REQUEST['ext_email']); +$aClean['ext_realname'] = makeSafe($_REQUEST['ext_realname']); +$aClean['CVSrelease'] = makeSafe($_REQUEST['CVSrelease']); +$aClean['ext_hasadmin'] = makeSafe($_POST['ext_hasadmin']); /* filter all of the preferences */ while(list($key, $value) = each($_REQUEST))

1 0

appdb/ ./addcomment.php ./appview.php ./index. ...
by WineHQ June 20, 2006

June 20, 2006

ChangeSet ID: 25916 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/20 20:04:13 Modified files: . : addcomment.php appview.php index.php preferences.php votestats.php admin : adminCommentView.php adminMaintainerQueue.php editAppFamily.php editAppVersion.php editBundle.php include : comment.php distributions.php incl.php maintainer.php tableve.php user.php util.php vendor.php vote.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Make code more consistent by making it follow the appdb coding standards. Fix some spaces vs. tabs odd indenting. Patch: http://cvs.winehq.org/patch.py?id=25916 Old revision New revision Changes Path 1.21 1.22 +7 -7 appdb/addcomment.php 1.80 1.81 +6 -4 appdb/appview.php 1.32 1.33 +4 -4 appdb/index.php 1.21 1.22 +2 -2 appdb/preferences.php 1.19 1.20 +7 -7 appdb/votestats.php 1.10 1.11 +3 -3 appdb/admin/adminCommentView.php 1.22 1.23 +29 -29 appdb/admin/adminMaintainerQueue.php 1.35 1.36 +8 -8 appdb/admin/editAppFamily.php 1.33 1.34 +8 -8 appdb/admin/editAppVersion.php 1.6 1.7 +40 -41 appdb/admin/editBundle.php 1.17 1.18 +43 -43 appdb/include/comment.php 1.3 1.4 +8 -8 appdb/include/distributions.php 1.26 1.27 +4 -4 appdb/include/incl.php 1.8 1.9 +12 -12 appdb/include/maintainer.php 1.10 1.11 +288 -301 appdb/include/tableve.php 1.66 1.67 +25 -25 appdb/include/user.php 1.54 1.55 +48 -48 appdb/include/util.php 1.5 1.6 +2 -2 appdb/include/vendor.php 1.13 1.14 +10 -10 appdb/include/vote.php

1 0

appdb/admin adminAppQueue.php
by WineHQ June 20, 2006

June 20, 2006

ChangeSet ID: 25915 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/20 18:00:02 Modified files: admin : adminAppQueue.php Log message: "EA Durbin" <ead1234(a)hotmail.com> Eliminate the use of the undefined testResult() class and correcting spelling of testData. Patch: http://cvs.winehq.org/patch.py?id=25915 Old revision New revision Changes Path 1.55 1.56 +2 -2 appdb/admin/adminAppQueue.php Index: appdb/admin/adminAppQueue.php diff -u -p appdb/admin/adminAppQueue.php:1.55 appdb/admin/adminAppQueue.php:1.56 --- appdb/admin/adminAppQueue.php:1.55 20 Jun 2006 23: 0: 2 -0000 +++ appdb/admin/adminAppQueue.php 20 Jun 2006 23: 0: 2 -0000 @@ -180,11 +180,11 @@ if ($aClean['sub']) if($hResult) { $oRow = mysql_fetch_object($hResult); - $oTest = new testdata($oRow->testingId); + $oTest = new testData($oRow->testingId); } else { - $oTest = new testResult(); + $oTest = new testData(); } if($aClean['sub'] == 'add')

1 0

appdb/include version.php
by WineHQ June 20, 2006

June 20, 2006

ChangeSet ID: 25914 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/20 17:58:58 Modified files: include : version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix case of $aClean['appId']. Fixes the bug of orphaning newly submitted versions Patch: http://cvs.winehq.org/patch.py?id=25914 Old revision New revision Changes Path 1.53 1.54 +1 -2 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.53 appdb/include/version.php:1.54 --- appdb/include/version.php:1.53 20 Jun 2006 22:58:58 -0000 +++ appdb/include/version.php 20 Jun 2006 22:58:58 -0000 @@ -607,7 +607,7 @@ class Version { function GetOutputEditorValues() { $aClean = array(); //array of filtered user input - $aClean['appid'] = makeSafe($_REQUEST['appId']); + $aClean['appId'] = makeSafe($_REQUEST['appId']); $aClean['versionId'] = makeSafe($_REQUEST['versionId']); $aClean['versionName'] = makeSafe($_REQUEST['versionName']); $aClean['versionDescription'] = makeSafe($_REQUEST['versionDescription']); @@ -628,7 +628,6 @@ class Version { $this->iVersionId = $aClean['versionId']; $this->sName = $aClean['versionName']; $this->sDescription = $aClean['versionDescription']; - $this->sTestedRating = $aClean['maintainer_rating']; $this->sTestedRelease = $aClean['maintainer_release']; }

1 0

Dmitry Timoshkov : ntdll: Compile VIRTUAL_Dump only when somebody really needs it.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: 0042ad4fc7e27c240ff64f35c2cb73ad1ea63f03 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0042ad4fc7e27c240ff64f3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 21 01:53:45 2006 +0900 ntdll: Compile VIRTUAL_Dump only when somebody really needs it. --- dlls/ntdll/virtual.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 6a94e68..5e7a15d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -196,7 +196,8 @@ static void VIRTUAL_DumpView( FILE_VIEW /*********************************************************************** * VIRTUAL_Dump */ -void VIRTUAL_Dump(void) +#if WINE_VM_DEBUG +static void VIRTUAL_Dump(void) { struct file_view *view; @@ -208,6 +209,7 @@ void VIRTUAL_Dump(void) } RtlLeaveCriticalSection(&csVirtual); } +#endif /***********************************************************************

1 0

Vitaly Lipatov : winecfg: Russian translation.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: 63fd30ee5faffe53f50bcb24ac4bcc95b894b7cd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=63fd30ee5faffe53f50bcb2… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Tue Jun 20 21:33:03 2006 +0400 winecfg: Russian translation. --- programs/winecfg/Ru.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index bfeb572..5a54d40 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -174,7 +174,7 @@ IDD_DESKTOP_INTEGRATION DIALOG DISCARDAB STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + GROUPBOX " �� ",IDC_STATIC,8,4,244,106 LTEXT "��:",IDC_STATIC,15,16,230,8 COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "�� ...",IDC_THEME_INSTALL,152,38,93,14 @@ -182,12 +182,12 @@ BEGIN COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "��:",IDC_THEME_SIZETEXT,15,80,230,8 COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + GROUPBOX " �� ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 - CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + CONTROL "�� :",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED - PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED + PUSHBUTTON "��",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -196,7 +196,7 @@ BEGIN IDS_TAB_APPLICATIONS "��" IDS_TAB_DLLS "��" IDS_TAB_DRIVES "��" - IDS_CHOOSE_PATH "Select the target unix folder, please." + IDS_CHOOSE_PATH "�� ." IDS_HIDE_ADVANCED "�� " IDS_SHOW_ADVANCED "�� " IDS_NOTHEME "(�� )" @@ -205,9 +205,9 @@ BEGIN IDS_TAB_AUDIO "��" IDS_TAB_ABOUT "� ��" IDS_WINECFG_TITLE "�� Wine" - IDS_WINECFG_TITLE_APP "Wine configuration for %s" + IDS_WINECFG_TITLE_APP "�� Wine �� %s" IDS_THEMEFILE "�� " IDS_THEMEFILE_SELECT "�� " - IDS_SHELL_FOLDER "Shell Folder" - IDS_LINKS_TO "Links to" + IDS_SHELL_FOLDER "�� " + IDS_LINKS_TO "�� " END

1 0

Jacek Caban : mshtml: Move IOleCommandTarget implementation to separate file.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: a2f715e5369d90b3c06ec72162b25dd1ab161892 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a2f715e5369d90b3c06ec72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 20 19:02:48 2006 +0200 mshtml: Move IOleCommandTarget implementation to separate file. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmldoc.c | 1 dlls/mshtml/mshtml_private.h | 1 dlls/mshtml/olecmd.c | 395 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/oleobj.c | 353 -------------------------------------- 5 files changed, 398 insertions(+), 353 deletions(-) create mode 100644 dlls/mshtml/olecmd.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a2f715e5369d90b3c06…

1 0

Jacek Caban : urlmon: Call Binding_CloseCacheDownload after Binding_FinishedDownload.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: 0a109b38c396bffe063d8acb52389da243a58f53 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0a109b38c396bffe063d8ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 20 19:04:55 2006 +0200 urlmon: Call Binding_CloseCacheDownload after Binding_FinishedDownload. --- dlls/urlmon/umon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index cdd6ab7..88304ca 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -734,8 +734,8 @@ static HRESULT URLMonikerImpl_BindToStor InternetCloseHandle(bind->hinternet); } while(0); - Binding_CloseCacheDownload(bind); Binding_FinishedDownload(bind, hres); + Binding_CloseCacheDownload(bind); HeapFree(GetProcessHeap(), 0, user); HeapFree(GetProcessHeap(), 0, pass);

1 0

Jacek Caban : shdocvw: Return S_OK in IPersistStreamInit::InitNew.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: ac4abb75368dca16de4a33b7f5eec7d15f7a843a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac4abb75368dca16de4a33b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 20 19:04:07 2006 +0200 shdocvw: Return S_OK in IPersistStreamInit::InitNew. --- dlls/shdocvw/persist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/persist.c b/dlls/shdocvw/persist.c index 59d70b0..3a08447 100644 --- a/dlls/shdocvw/persist.c +++ b/dlls/shdocvw/persist.c @@ -171,7 +171,7 @@ static HRESULT WINAPI PersistStreamInit_ { WebBrowser *This = PERSTRINIT_THIS(iface); FIXME("(%p)\n", This); - return E_NOTIMPL; + return S_OK; } #undef PERSTRINIT_THIS

1 0

Jacek Caban : mshtml: Don't crash in GetSecurityInfo if channel is NULL.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: 5ad79df0f85b8dcd3a0b082f14dc52b6446ebc24 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ad79df0f85b8dcd3a0b082… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 20 18:59:09 2006 +0200 mshtml: Don't crash in GetSecurityInfo if channel is NULL. --- dlls/mshtml/nsio.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 2a922a3..c3269fc 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -456,8 +456,14 @@ static nsresult NSAPI nsChannel_SetNotif static nsresult NSAPI nsChannel_GetSecurityInfo(nsIHttpChannel *iface, nsISupports **aSecurityInfo) { nsChannel *This = NSCHANNEL_THIS(iface); + TRACE("(%p)->(%p)\n", This, aSecurityInfo); - return nsIChannel_GetSecurityInfo(This->channel, aSecurityInfo); + + if(This->channel) + return nsIChannel_GetSecurityInfo(This->channel, aSecurityInfo); + + FIXME("default action not implemented\n"); + return NS_ERROR_NOT_IMPLEMENTED; } static nsresult NSAPI nsChannel_GetContentType(nsIHttpChannel *iface, nsACString *aContentType)

1 0