November 2005 - Wine-Commits

wine/programs/regedit Nl.rc
by Alexandre Julliard Nov. 12, 2005

Nov. 12, 2005

ChangeSet ID: 21230 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/12 13:10:07 Modified files: programs/regedit: Nl.rc Log message: Rein Klazes <wijn(a)wanadoo.nl> Update Dutch resources. Patch: http://cvs.winehq.org/patch.py?id=21230 Old revision New revision Changes Path 1.9 1.10 +126 -2 wine/programs/regedit/Nl.rc Index: wine/programs/regedit/Nl.rc diff -u -p wine/programs/regedit/Nl.rc:1.9 wine/programs/regedit/Nl.rc:1.10 --- wine/programs/regedit/Nl.rc:1.9 12 Nov 2005 19:10: 7 -0000 +++ wine/programs/regedit/Nl.rc 12 Nov 2005 19:10: 7 -0000 @@ -92,13 +92,43 @@ BEGIN END END +IDR_POPUP_MENUS MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Wijzigen", ID_EDIT_MODIFY + MENUITEM "&Binaire data wijzigen", ID_EDIT_MODIFY_BIN + MENUITEM SEPARATOR + MENUITEM "&Verwijderen\tDel", ID_EDIT_DELETE + MENUITEM "&Naam wijzigen", ID_EDIT_RENAME + END + POPUP "" + BEGIN + POPUP "&Nieuw" + BEGIN + MENUITEM "&Sleutel", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Tekenreekswaarde", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Binaire waarde", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD waarde", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM SEPARATOR + MENUITEM "&Verwijderen\tDel", ID_EDIT_DELETE + MENUITEM "&Naam wijzigen\tF2", ID_EDIT_RENAME + MENUITEM SEPARATOR + MENUITEM "&Sleutelnaam kopiëren", ID_EDIT_COPYKEYNAME + MENUITEM SEPARATOR + MENUITEM "&Zoeken\tCtrl+F", ID_EDIT_FIND, GRAYED + END +END + /* * Dialog */ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 230, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Info" FONT 8, "MS Shell Dlg" BEGIN @@ -109,6 +139,86 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP END +IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Zoeken" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Zoek:",IDC_STATIC,5,7,119,8 + EDITTEXT IDC_VALUE_NAME,40,5,125,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "In:",IDC_STATIC,5, 22, 119, 8 + CHECKBOX "Sleutels", IDC_FIND_KEYS, 5, 34, 90, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "Waarden", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + CHECKBOX "Gegevens", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + CHECKBOX "Hele tekenreeks", IDC_FIND_WHOLE, 5, 70, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + DEFPUSHBUTTON "Zoeken",IDOK,175,5,30,11,WS_GROUP + PUSHBUTTON "Sluiten",IDCANCEL,175,22,30,11, WS_GROUP +END + +IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Toevoegen aan favorieten" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Naam:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,120,40,40,11,WS_GROUP + PUSHBUTTON "Annuleren",IDCANCEL,165,40,40,11, WS_GROUP +END + +IDD_DELFAVORITE DIALOG DISCARDABLE 22, 17, 210, 90 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Favorieten verwijderen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Favorieten:",IDC_STATIC,5,5,119,8 + LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,120,73,40,11,WS_GROUP + PUSHBUTTON "Annuleren",IDCANCEL,165,73,40,11, WS_GROUP +END + +IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Tekenreeks bewerken" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Waardenaam:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + LTEXT "Waardegegevens:",IDC_STATIC,5,30,119,8 + EDITTEXT IDC_VALUE_DATA,5,40,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,120,60,40,11,WS_GROUP + PUSHBUTTON "Annuleren",IDCANCEL,165,60,40,11,WS_GROUP +END + +IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "DWORD waarde bewerken" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Waardenaam:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + LTEXT "Waardegegevens:",IDC_STATIC,5,30,90,8 + EDITTEXT IDC_VALUE_DATA,5,40,90,12, WS_BORDER | WS_TABSTOP + GROUPBOX "Grondtal", IDC_DWORD_BASE, 120, 30, 85, 37, BS_GROUPBOX + AUTORADIOBUTTON "Hexadecimaal", IDC_DWORD_HEX, 130, 40, 60, 10, WS_TABSTOP + AUTORADIOBUTTON "Decimaal", IDC_DWORD_DEC, 130, 52, 60, 10, WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,120,80,40,11,WS_GROUP + PUSHBUTTON "Annuleren",IDCANCEL,165,80,40,11,WS_GROUP +END + +IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 210, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Binaire waarde bewerken" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Waardenaam:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + LTEXT "Waardegegevens:",IDC_STATIC,5,30,90,8 + CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,4,40,160,40 + DEFPUSHBUTTON "OK",IDOK,120,80,40,11,WS_GROUP + PUSHBUTTON "Annuleren",IDCANCEL,165,80,40,11,WS_GROUP +END + /* * String Table */ @@ -152,7 +262,7 @@ BEGIN ID_REGISTRY_DISCONNECTNETWORKREGISTRY "De verbinding met het register van een externe computer verbreken" ID_REGISTRY_PRINT "Het register of een gedeelte ervan afdrukken" -/* ID_HELP_HELPTOPICS "Help voor de Register-editor openen" */ + ID_HELP_HELPTOPICS "Help voor de Register-editor openen" ID_HELP_ABOUT "Programmagegevens, versienummer en copyrightgegevens weergeven" END @@ -171,6 +281,20 @@ BEGIN ID_EDIT_FINDNEXT "De opgegeven tekst nogmaals zoeken" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_ERROR "Fout" + IDS_BAD_KEY "Kan sleutel '%s' niet opvragen" + IDS_BAD_VALUE "Kan waarde '%s' niet opvragen" + IDS_UNSUPPORTED_TYPE "Kan dit type sleutel (%ld) niet bewerken" + IDS_TOO_BIG_VALUE "Waarde te groot (%ld)" + IDS_DELETE_BOX_TITLE "Waarde verwijderen bevestigen" + IDS_DELETE_BOX_TEXT "Weet u zeker dat u de waarde '%s' wilt verwijderen?" + IDS_NEWKEY "Nieuwe sleutel #%d" + IDS_NEWVALUE "Nieuwe waarde #%d" + IDS_NOTFOUND "Tekenreeks '%s' niet gevonden" +END + /*****************************************************************/

1 0

wine/dlls/shdocvw webbrowser.c shdocvw.h Makef ...
by Alexandre Julliard Nov. 12, 2005

Nov. 12, 2005

ChangeSet ID: 21229 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/12 13:09:46 Modified files: dlls/shdocvw : webbrowser.c shdocvw.h Makefile.in Added files: dlls/shdocvw : view.c Log message: Jacek Caban <jack(a)itma.pwr.wroc.pl> Added IViewObject2 stub implementation. Patch: http://cvs.winehq.org/patch.py?id=21229 Old revision New revision Changes Path 1.20 1.21 +12 -5 wine/dlls/shdocvw/webbrowser.c 1.24 1.25 +4 -0 wine/dlls/shdocvw/shdocvw.h 1.17 1.18 +1 -0 wine/dlls/shdocvw/Makefile.in Added 1.1 +0 -0 wine/dlls/shdocvw/view.c

1 0

wine/dlls/version/tests Makefile.in .cvsignore ...
by Alexandre Julliard Nov. 12, 2005

Nov. 12, 2005

ChangeSet ID: 21228 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/12 13:09:18 Modified files: dlls/version/tests: Makefile.in .cvsignore Added files: dlls/version/tests: install.c Log message: Stefan Leichter <Stefan.Leichter(a)camLine.com> Added some tests for VerFindFileA. Patch: http://cvs.winehq.org/patch.py?id=21228 Old revision New revision Changes Path 1.3 1.4 +2 -1 wine/dlls/version/tests/Makefile.in 1.2 1.3 +1 -0 wine/dlls/version/tests/.cvsignore Added 1.1 +0 -0 wine/dlls/version/tests/install.c Index: wine/dlls/version/tests/Makefile.in diff -u -p wine/dlls/version/tests/Makefile.in:1.3 wine/dlls/version/tests/Makefile.in:1.4 --- wine/dlls/version/tests/Makefile.in:1.3 12 Nov 2005 19: 9:18 -0000 +++ wine/dlls/version/tests/Makefile.in 12 Nov 2005 19: 9:18 -0000 @@ -6,7 +6,8 @@ TESTDLL = version.dll IMPORTS = version kernel32 CTESTS = \ - info.c + info.c \ + install.c RC_SRCS = version.rc Index: wine/dlls/version/tests/.cvsignore diff -u -p wine/dlls/version/tests/.cvsignore:1.2 wine/dlls/version/tests/.cvsignore:1.3 --- wine/dlls/version/tests/.cvsignore:1.2 12 Nov 2005 19: 9:19 -0000 +++ wine/dlls/version/tests/.cvsignore 12 Nov 2005 19: 9:19 -0000 @@ -1,4 +1,5 @@ Makefile info.ok +install.ok testlist.c version.res Index: wine/dlls/version/tests/install.c diff -u -p /dev/null wine/dlls/version/tests/install.c:1.1 --- /dev/null 12 Nov 2005 19: 9:19 -0000 +++ wine/dlls/version/tests/install.c 12 Nov 2005 19: 9:19 -0000 @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2005 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "wine/test.h" +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winver.h" + +static void test_find_file(void) +{ + DWORD ret; + UINT dwCur, dwOut ; + char appdir[MAX_PATH]; + char curdir[MAX_PATH]; + char filename[MAX_PATH]; + char outBuf[MAX_PATH]; + char windir[MAX_PATH]; + + memset(appdir, 0, MAX_PATH); + memset(windir, 0, MAX_PATH); + + dwCur=MAX_PATH; + dwOut=MAX_PATH; + memset(curdir, 0, MAX_PATH); + memset(outBuf, 0, MAX_PATH); + ret = VerFindFileA(0, "regedit", "", "", curdir, &dwCur, outBuf, &dwOut); + ok(!ret, "VerFindFileA should fail for a known program without extension\n"); + ok(dwCur == 1, "expected length 1 got %d\n", dwCur); + ok(dwOut == 1, "expected length 1 got %d\n", dwOut); + + if(!GetWindowsDirectoryA(windir, MAX_PATH)) + trace("GetWindowsDirectoryA failed\n"); + else { + sprintf(appdir, "%s\\regedit.exe", windir); + if(INVALID_FILE_ATTRIBUTES == GetFileAttributesA(appdir)) + trace("GetFileAttributesA(%s) failed\n", appdir); + else { + dwCur=MAX_PATH; + dwOut=MAX_PATH; + memset(curdir, 0, MAX_PATH); + memset(outBuf, 0, MAX_PATH); + ret = VerFindFileA(0, "regedit.exe", "", "", curdir, &dwCur, outBuf, &dwOut); + todo_wine ok(VFF_CURNEDEST == ret, "Wrong return value got %lx expected VFF_CURNEDEST\n", ret); + todo_wine ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: " + "got %d(%s) expected %d\n", dwCur, curdir, strlen(windir)+1); + ok(dwOut == 1, "Wrong length of buffer for the recommended installation location" + "got %d(%s) expected 1\n", dwOut, outBuf); + + dwCur=MAX_PATH; + dwOut=MAX_PATH; + memset(curdir, 0, MAX_PATH); + memset(outBuf, 0, MAX_PATH); + ret = VerFindFileA(0, "regedit.exe", NULL, NULL, curdir, &dwCur, outBuf, &dwOut); + todo_wine ok(VFF_CURNEDEST == ret, "Wrong return value got %lx expected VFF_CURNEDEST\n", ret); + todo_wine ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: " + "got %d(%s) expected %d\n", dwCur, curdir, strlen(windir)+1); + ok(dwOut == 1, "Wrong length of buffer for the recommended installation location" + "got %d(%s) expected 1\n", dwOut, outBuf); + } + } + if(!GetModuleFileNameA(NULL, filename, MAX_PATH) || + !GetSystemDirectoryA(windir, MAX_PATH) || + !GetTempPathA(MAX_PATH, appdir)) + trace("GetModuleFileNameA, GetSystemDirectoryA or GetTempPathA failed\n"); + else { + char *p = strrchr(filename, '\\'); + if(p++) memmove(filename, p, 1 + strlen(p)); + + dwCur=MAX_PATH; + dwOut=MAX_PATH; + memset(outBuf, 0, MAX_PATH); + memset(curdir, 0, MAX_PATH); + ret = VerFindFileA(0, filename, NULL, NULL, curdir, &dwCur, outBuf, &dwOut); + todo_wine ok(VFF_CURNEDEST == ret, "Wrong return value got %lx expected VFF_CURNEDEST\n", ret); + ok(dwOut == 1, "Wrong length of buffer for the recommended installation location" + "got %d(%s) expected 1\n", dwOut, outBuf); + + dwCur=MAX_PATH; + dwOut=MAX_PATH; + memset(outBuf, 0, MAX_PATH); + memset(curdir, 0, MAX_PATH); + ret = VerFindFileA(VFFF_ISSHAREDFILE, filename, NULL, appdir, curdir, &dwCur, outBuf, &dwOut); + todo_wine ok(VFF_CURNEDEST == ret, "Wrong return value got %lx expected VFF_CURNEDEST\n", ret); + ok(dwOut == 1 + strlen(windir), "Wrong length of buffer for current location: " + "got %d(%s) expected %d\n", dwOut, outBuf, strlen(windir)+1); + + dwCur=MAX_PATH; + dwOut=MAX_PATH; + memset(outBuf, 0, MAX_PATH); + memset(curdir, 0, MAX_PATH); + ret = VerFindFileA(0, filename, NULL, appdir, curdir, &dwCur, outBuf, &dwOut); + todo_wine ok(VFF_CURNEDEST == ret, "Wrong return value got %lx expected VFF_CURNEDEST\n", ret); + ok(dwOut == 1 + strlen(appdir), "Wrong length of buffer for current location: " + "got %d(%s) expected %d\n", dwOut, outBuf, strlen(appdir)+1); + } +} + +START_TEST(install) +{ + test_find_file(); +}

1 0

wine/dlls/kernel tests/path.c path.c
by Alexandre Julliard Nov. 12, 2005

Nov. 12, 2005

ChangeSet ID: 21227 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/12 13:09:06 Modified files: dlls/kernel/tests: path.c dlls/kernel : path.c Log message: Phil Lodwick <Phil.Lodwick(a)EFI.COM> prefix can be NULL for GetTempFileNameW. Patch: http://cvs.winehq.org/patch.py?id=21227 Old revision New revision Changes Path 1.31 1.32 +10 -1 wine/dlls/kernel/tests/path.c 1.26 1.27 +3 -2 wine/dlls/kernel/path.c Index: wine/dlls/kernel/tests/path.c diff -u -p wine/dlls/kernel/tests/path.c:1.31 wine/dlls/kernel/tests/path.c:1.32 --- wine/dlls/kernel/tests/path.c:1.31 12 Nov 2005 19: 9: 6 -0000 +++ wine/dlls/kernel/tests/path.c 12 Nov 2005 19: 9: 6 -0000 @@ -335,9 +335,18 @@ static void test_InitPathA(CHAR *newdir, sprintf(tmpstr1,"pat%x.tmp",id & 0xffff); ok(lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr)==0 || lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr1)==0, - "GetTempPath returned '%s' which doesn't match '%s' or '%s'. id=%x\n", + "GetTempFileNameA returned '%s' which doesn't match '%s' or '%s'. id=%x\n", newdir,tmpstr,tmpstr1,id); + ok((id=GetTempFileNameA(tmppath,NULL,0,newdir)),"GetTempFileNameA failed\n"); + sprintf(tmpstr,"%.4x.tmp",id & 0xffff); + sprintf(tmpstr1,"%x.tmp",id & 0xffff); + ok(lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr)==0 || + lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr1)==0, + "GetTempFileNameA returned '%s' which doesn't match '%s' or '%s'. id=%x\n", + newdir,tmpstr,tmpstr1,id); + + /* Find first valid drive letter that is neither newdir[0] nor curDrive */ drives = GetLogicalDrives() & ~(1<<(newdir[0]-'A')); if( *curDrive != NOT_A_VALID_DRIVE) Index: wine/dlls/kernel/path.c diff -u -p wine/dlls/kernel/path.c:1.26 wine/dlls/kernel/path.c:1.27 --- wine/dlls/kernel/path.c:1.26 12 Nov 2005 19: 9: 6 -0000 +++ wine/dlls/kernel/path.c 12 Nov 2005 19: 9: 6 -0000 @@ -651,7 +651,7 @@ UINT WINAPI GetTempFileNameW( LPCWSTR pa int i; LPWSTR p; - if ( !path || !prefix || !buffer ) + if ( !path || !buffer ) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; @@ -663,7 +663,8 @@ UINT WINAPI GetTempFileNameW( LPCWSTR pa /* add a \, if there isn't one */ if ((p == buffer) || (p[-1] != '\\')) *p++ = '\\'; - for (i = 3; (i > 0) && (*prefix); i--) *p++ = *prefix++; + if (prefix) + for (i = 3; (i > 0) && (*prefix); i--) *p++ = *prefix++; unique &= 0xffff;

1 0

appdb/ ./appsubmit.php include/testResults.php
by WineHQ Nov. 11, 2005

Nov. 11, 2005

ChangeSet ID: 21226 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2005/11/11 22:37:48 Modified files: . : appsubmit.php include : testResults.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix two bugs found after upgrading to php5 Patch: http://cvs.winehq.org/patch.py?id=21226 Old revision New revision Changes Path 1.34 1.35 +1 -1 appdb/appsubmit.php 1.5 1.6 +0 -1 appdb/include/testResults.php Index: appdb/appsubmit.php diff -u -p appdb/appsubmit.php:1.34 appdb/appsubmit.php:1.35 --- appdb/appsubmit.php:1.34 12 Nov 2005 4:37:48 -0000 +++ appdb/appsubmit.php 12 Nov 2005 4:37:48 -0000 @@ -261,7 +261,7 @@ if ($_REQUEST['sub']) echo "</td></tr></table></div>\n\n"; } else { - newSubmition(); + newSubmition(''); } // vendor/alt vendor fields // if user selected a predefined vendorId: Index: appdb/include/testResults.php diff -u -p appdb/include/testResults.php:1.5 appdb/include/testResults.php:1.6 --- appdb/include/testResults.php:1.5 12 Nov 2005 4:37:48 -0000 +++ appdb/include/testResults.php 12 Nov 2005 4:37:48 -0000 @@ -15,7 +15,6 @@ class testData{ var $sTestedRelease; var $iDistributionId; var $sTestedDate; - var $sTestedRelease; var $sInstalls; var $sRuns; var $sTestedRating;

1 0

appdb/admin adminAppQueue.php
by WineHQ Nov. 11, 2005

Nov. 11, 2005

ChangeSet ID: 21225 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2005/11/11 21:06:55 Modified files: admin : adminAppQueue.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix merging of versions into existing applications Patch: http://cvs.winehq.org/patch.py?id=21225 Old revision New revision Changes Path 1.48 1.49 +4 -3 appdb/admin/adminAppQueue.php Index: appdb/admin/adminAppQueue.php diff -u -p appdb/admin/adminAppQueue.php:1.48 appdb/admin/adminAppQueue.php:1.49 --- appdb/admin/adminAppQueue.php:1.48 12 Nov 2005 3: 6:55 -0000 +++ appdb/admin/adminAppQueue.php 12 Nov 2005 3: 6:55 -0000 @@ -46,7 +46,7 @@ function outputSearchTableForDuplicateFl //display row echo "<tr class=$bgcolor>\n"; /* map the merging of the current app to the app we are displaying in the table */ - echo " <td>".html_ahref($ob->appName,"adminAppQueue.php?sub=duplicate&appId=".$currentAppId."&appIdMergeTo=".$ob->appId)."</td>\n"; + echo " <td>".html_ahref($ob->appName,"adminAppQueue.php?sub=duplicate&apptype=application&appId=".$currentAppId."&appIdMergeTo=".$ob->appId)."</td>\n"; echo " <td>$y->versions versions  </td>\n"; echo "</tr>\n\n"; @@ -172,9 +172,10 @@ if ($_REQUEST['sub']) /* move this version submission under the existing app */ $oVersion->iAppId = $_REQUEST['appIdMergeTo']; $oVersion->update(); - + /* delete the appId that is the duplicate */ - $oApp->delete(); + $oAppDelete = new Application($oApp->iAppId); + $oAppDelete->delete(); } /* redirect back to the main page */

1 0

wine/dlls wininet/rsrc.rc shlwapi/shlwapi.rc s ...
by Alexandre Julliard Nov. 11, 2005

Nov. 11, 2005

ChangeSet ID: 21224 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/11 04:55:09 Modified files: dlls/wininet : rsrc.rc dlls/shlwapi : shlwapi.rc dlls/setupapi : setupapi.rc dlls/oleaut32 : oleaut32.rc dlls/msrle32 : rsrc.rc dlls/msacm : msacm.rc dlls/hhctrl.ocx: hhctrl.rc Added files: dlls/wininet : wininet_Ko.rc dlls/shlwapi : shlwapi_Ko.rc dlls/setupapi : Ko.rc dlls/oleaut32 : oleaut32_Ko.rc dlls/msrle32 : msrle_Ko.rc dlls/msacm : msacm_Ko.rc dlls/hhctrl.ocx: Ko.rc Log message: YunSong Hwang <hys545(a)dreamwiz.com> Add Korean translations. Patch: http://cvs.winehq.org/patch.py?id=21224 Old revision New revision Changes Path 1.16 1.17 +1 -0 wine/dlls/wininet/rsrc.rc Added 1.1 +0 -0 wine/dlls/wininet/wininet_Ko.rc 1.9 1.10 +1 -0 wine/dlls/shlwapi/shlwapi.rc Added 1.1 +0 -0 wine/dlls/shlwapi/shlwapi_Ko.rc 1.19 1.20 +1 -0 wine/dlls/setupapi/setupapi.rc Added 1.1 +0 -0 wine/dlls/setupapi/Ko.rc 1.7 1.8 +1 -0 wine/dlls/oleaut32/oleaut32.rc Added 1.1 +0 -0 wine/dlls/oleaut32/oleaut32_Ko.rc 1.5 1.6 +1 -0 wine/dlls/msrle32/rsrc.rc Added 1.1 +0 -0 wine/dlls/msrle32/msrle_Ko.rc 1.13 1.14 +1 -0 wine/dlls/msacm/msacm.rc Added 1.1 +0 -0 wine/dlls/msacm/msacm_Ko.rc 1.6 1.7 +1 -0 wine/dlls/hhctrl.ocx/hhctrl.rc Added 1.1 +0 -0 wine/dlls/hhctrl.ocx/Ko.rc

1 0

wine/dlls/urlmon urlmon.spec
by Alexandre Julliard Nov. 11, 2005

Nov. 11, 2005

ChangeSet ID: 21223 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/11 04:54:26 Modified files: dlls/urlmon : urlmon.spec Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Correct argument count for URLDownloadToCacheFile{A,W}. Patch: http://cvs.winehq.org/patch.py?id=21223 Old revision New revision Changes Path 1.40 1.41 +2 -2 wine/dlls/urlmon/urlmon.spec Index: wine/dlls/urlmon/urlmon.spec diff -u -p wine/dlls/urlmon/urlmon.spec:1.40 wine/dlls/urlmon/urlmon.spec:1.41 --- wine/dlls/urlmon/urlmon.spec:1.40 11 Nov 2005 10:54:26 -0000 +++ wine/dlls/urlmon/urlmon.spec 11 Nov 2005 10:54:26 -0000 @@ -64,8 +64,8 @@ @ stdcall RevokeFormatEnumerator(ptr ptr) @ stub SetSoftwareUpdateAdvertisementState @ stub URLDownloadA -@ stdcall URLDownloadToCacheFileA(ptr str str long ptr) -@ stdcall URLDownloadToCacheFileW(ptr wstr wstr long ptr) +@ stdcall URLDownloadToCacheFileA(ptr str str long long ptr) +@ stdcall URLDownloadToCacheFileW(ptr wstr wstr long long ptr) @ stdcall URLDownloadToFileA(ptr str str long ptr) @ stdcall URLDownloadToFileW(ptr wstr wstr long ptr) @ stub URLDownloadW

1 0

wine/dlls/shell32 shlexec.c shell32_main.h shell.c
by Alexandre Julliard Nov. 11, 2005

Nov. 11, 2005

ChangeSet ID: 21222 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/11 04:54:08 Modified files: dlls/shell32 : shlexec.c shell32_main.h shell.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Unconditionally fall back to ANSI DDE APIs in ShellExecute if current emulated Windows version is Win9x, Excel refuses to communicate with a unicode client in win9x mode. Patch: http://cvs.winehq.org/patch.py?id=21222 Old revision New revision Changes Path 1.75 1.76 +10 -11 wine/dlls/shell32/shlexec.c 1.107 1.108 +1 -1 wine/dlls/shell32/shell32_main.h 1.68 1.69 +1 -1 wine/dlls/shell32/shell.c Index: wine/dlls/shell32/shlexec.c diff -u -p wine/dlls/shell32/shlexec.c:1.75 wine/dlls/shell32/shlexec.c:1.76 --- wine/dlls/shell32/shlexec.c:1.75 11 Nov 2005 10:54: 8 -0000 +++ wine/dlls/shell32/shlexec.c 11 Nov 2005 10:54: 8 -0000 @@ -708,8 +708,7 @@ static HDDEDATA CALLBACK dde_cb(UINT uTy static unsigned dde_connect(WCHAR* key, WCHAR* start, WCHAR* ddeexec, const WCHAR* lpFile, WCHAR *env, LPCWSTR szCommandline, LPITEMIDLIST pidl, SHELL_ExecuteW32 execfunc, - LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, - BOOL unicode) + LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) { static const WCHAR wApplication[] = {'\\','a','p','p','l','i','c','a','t','i','o','n',0}; static const WCHAR wTopic[] = {'\\','t','o','p','i','c',0}; @@ -723,6 +722,7 @@ static unsigned dde_connect(WCHAR* key, HCONV hConv; HDDEDATA hDdeData; unsigned ret = 31; + BOOL unicode = !(GetVersion() & 0x80000000); strcpyW(endkey, wApplication); applen = sizeof(app); @@ -819,8 +819,7 @@ static unsigned dde_connect(WCHAR* key, */ static UINT_PTR execute_from_key(LPWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWSTR szCommandline, SHELL_ExecuteW32 execfunc, - LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, - BOOL unicode) + LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) { WCHAR cmd[1024]; LONG cmdlen = sizeof(cmd); @@ -848,7 +847,7 @@ static UINT_PTR execute_from_key(LPWSTR if (RegQueryValueW(HKEY_CLASSES_ROOT, key, param, &paramlen) == ERROR_SUCCESS) { TRACE("Got ddeexec %s => %s\n", debugstr_w(key), debugstr_w(param)); - retval = dde_connect(key, cmd, param, lpFile, env, szCommandline, psei->lpIDList, execfunc, psei, psei_out, unicode); + retval = dde_connect(key, cmd, param, lpFile, env, szCommandline, psei->lpIDList, execfunc, psei, psei_out); } else { @@ -1178,7 +1177,7 @@ static LONG ShellExecute_FromContextMenu /************************************************************************* * SHELL_execute [Internal] */ -BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc, BOOL unicode ) +BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) { static const WCHAR wQuote[] = {'"',0}; static const WCHAR wSpace[] = {' ',0}; @@ -1438,7 +1437,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW } TRACE("%s/%s => %s/%s\n", debugstr_w(wszApplicationName), debugstr_w(sei_tmp.lpVerb), debugstr_w(wszQuotedCmd), debugstr_w(lpstrProtocol)); if (*lpstrProtocol) - retval = execute_from_key(lpstrProtocol, wszApplicationName, env, sei_tmp.lpParameters, execfunc, &sei_tmp, sei, unicode); + retval = execute_from_key(lpstrProtocol, wszApplicationName, env, sei_tmp.lpParameters, execfunc, &sei_tmp, sei); else retval = execfunc(wszQuotedCmd, env, FALSE, &sei_tmp, sei); HeapFree( GetProcessHeap(), 0, env ); @@ -1471,7 +1470,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW lpFile += iSize; while (*lpFile == ':') lpFile++; } - retval = execute_from_key(lpstrProtocol, lpFile, NULL, sei_tmp.lpParameters, execfunc, &sei_tmp, sei, unicode); + retval = execute_from_key(lpstrProtocol, lpFile, NULL, sei_tmp.lpParameters, execfunc, &sei_tmp, sei); } /* Check if file specified is in the form www.??????.*** */ else if (!strncmpiW(lpFile, wWww, 3)) @@ -1556,7 +1555,7 @@ BOOL WINAPI ShellExecuteExA (LPSHELLEXEC else seiW.lpClass = NULL; - ret = SHELL_execute( &seiW, SHELL_ExecuteW, FALSE ); + ret = SHELL_execute( &seiW, SHELL_ExecuteW ); sei->hInstApp = seiW.hInstApp; @@ -1578,7 +1577,7 @@ BOOL WINAPI ShellExecuteExA (LPSHELLEXEC */ BOOL WINAPI ShellExecuteExW (LPSHELLEXECUTEINFOW sei) { - return SHELL_execute( sei, SHELL_ExecuteW, TRUE ); + return SHELL_execute( sei, SHELL_ExecuteW ); } /************************************************************************* @@ -1607,6 +1606,6 @@ HINSTANCE WINAPI ShellExecuteW(HWND hwnd sei.dwHotKey = 0; sei.hProcess = 0; - SHELL_execute( &sei, SHELL_ExecuteW, TRUE ); + SHELL_execute( &sei, SHELL_ExecuteW ); return sei.hInstApp; } Index: wine/dlls/shell32/shell32_main.h diff -u -p wine/dlls/shell32/shell32_main.h:1.107 wine/dlls/shell32/shell32_main.h:1.108 --- wine/dlls/shell32/shell32_main.h:1.107 11 Nov 2005 10:54: 8 -0000 +++ wine/dlls/shell32/shell32_main.h 11 Nov 2005 10:54: 8 -0000 @@ -217,7 +217,7 @@ inline static WCHAR * __SHCloneStrAtoW(W typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, LPSHELLEXECUTEINFOW sei, LPSHELLEXECUTEINFOW sei_out); -BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc, BOOL unicode); +BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc); UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation, LPWSTR lpResult, int resultLen, LPWSTR key, WCHAR **env, LPITEMIDLIST pidl, LPCWSTR args); Index: wine/dlls/shell32/shell.c diff -u -p wine/dlls/shell32/shell.c:1.68 wine/dlls/shell32/shell.c:1.69 --- wine/dlls/shell32/shell.c:1.68 11 Nov 2005 10:54: 8 -0000 +++ wine/dlls/shell32/shell.c 11 Nov 2005 10:54: 8 -0000 @@ -626,7 +626,7 @@ HINSTANCE16 WINAPI ShellExecute16( HWND1 seiW.dwHotKey = 0; seiW.hProcess = hProcess; - SHELL_execute( &seiW, SHELL_Execute16, FALSE ); + SHELL_execute( &seiW, SHELL_Execute16 ); if (wVerb) SHFree(wVerb); if (wFile) SHFree(wFile);

1 0

wine/dlls/user dde_client.c
by Alexandre Julliard Nov. 11, 2005

Nov. 11, 2005

ChangeSet ID: 21221 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/11 04:53:44 Modified files: dlls/user : dde_client.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Convert some ERRs to WARNs in the DDE client code when appropriate. Patch: http://cvs.winehq.org/patch.py?id=21221 Old revision New revision Changes Path 1.4 1.5 +3 -3 wine/dlls/user/dde_client.c Index: wine/dlls/user/dde_client.c diff -u -p wine/dlls/user/dde_client.c:1.4 wine/dlls/user/dde_client.c:1.5 --- wine/dlls/user/dde_client.c:1.4 11 Nov 2005 10:53:44 -0000 +++ wine/dlls/user/dde_client.c 11 Nov 2005 10:53:44 -0000 @@ -198,7 +198,7 @@ HCONV WINAPI DdeConnect(DWORD idInst, HS pConv = WDML_GetConvFromWnd(hwndClient); if (pConv == NULL || pConv->hwndServer == 0) { - ERR("Done with INITIATE, but no Server window available\n"); + WARN("Done with INITIATE, but no Server window available\n"); pConv = NULL; goto theEnd; } @@ -1118,7 +1118,7 @@ HDDEDATA WINAPI DdeClientTransaction(LPB if (hConv == 0) { - ERR("Invalid conversation handle\n"); + WARN("Invalid conversation handle NULL\n"); return 0; } @@ -1376,7 +1376,7 @@ BOOL WINAPI DdeDisconnect(HCONV hConv) if (hConv == 0) { - ERR("DdeDisconnect(): hConv = 0\n"); + WARN("DdeDisconnect(): hConv = 0\n"); return FALSE; }

1 0