Ros-diffs

ros-diffs@reactos.org

81390 discussions

[amunger] 22338: Remove packet size assert. Recent qemu slirp changes cause us to hit this assert. I could not find any evidence of the qemu changes causing linux or windows problems, so I removed the assert. Testing has yielded no issues with the assert removed. I'm leaving it in trunk for now, until it can be looked at closer.
by amunger＠svn.reactos.org 13 Jun '06

13 Jun '06

Author: amunger Date: Tue Jun 13 07:46:22 2006 New Revision: 22338 URL: http://svn.reactos.ru/svn/reactos?rev=22338&view=rev Log: Remove packet size assert. Recent qemu slirp changes cause us to hit this assert. I could not find any evidence of the qemu changes causing linux or windows problems, so I removed the assert. Testing has yielded no issues with the assert removed. I'm leaving it in trunk for now, until it can be looked at closer. Modified: branches/ros-branch-0_3_0/reactos/drivers/network/tcpip/datalink/lan.c Modified: branches/ros-branch-0_3_0/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/drivers… ============================================================================== --- branches/ros-branch-0_3_0/reactos/drivers/network/tcpip/datalink/lan.c (original) +++ branches/ros-branch-0_3_0/reactos/drivers/network/tcpip/datalink/lan.c Tue Jun 13 07:46:22 2006 @@ -487,8 +487,6 @@ { if (NdisStatus == NDIS_STATUS_SUCCESS) { - ASSERT(PacketSize <= Adapter->MTU); - NdisTransferData(&NdisStatus, Adapter->NdisHandle, MacReceiveContext, 0, PacketSize, NdisPacket, &BytesTransferred);

1 0

[amunger] 22337: Merge 21896, per hpoussin.
by amunger＠svn.reactos.org 13 Jun '06

13 Jun '06

Author: amunger Date: Tue Jun 13 07:42:03 2006 New Revision: 22337 URL: http://svn.reactos.ru/svn/reactos?rev=22337&view=rev Log: Merge 21896, per hpoussin. Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/boot/bo… ============================================================================== --- branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf (original) +++ branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf Tue Jun 13 07:42:03 2006 @@ -36,6 +36,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB","CurrentConfig",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB\Hardware Profiles\0000","FriendlyName",0x00000000,"New Hardware Profile" +; The following line is only here to prevent the "New hardware wizard" to display a window for "Unknown device". +; This device comes from Root plug and play bus (ntoskrnl/io/pnproot.c) and this one should never appear +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\LEGACY_UNKNOWN\0000","ConfigFlags",0x00010001,0x00000040 ; Keyboard Layouts HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout File",0x00000000,"kbdda.dll" @@ -352,6 +355,7 @@ ; Service groups HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \ "Boot Bus Extender", \ + "System Bus Extender", \ "SCSI Port", \ "SCSI Miniport", \ "Primary Disk", \ @@ -379,6 +383,7 @@ ; Group order, the first DWORD is the count of entries, ; the following dwords are the tag entries for the load order. HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","Boot Bus Extender", 0x00000001, \ + 0x02, 0x00, 0x00, 0x00, \ 0x01, 0x00, 0x00, 0x00, \ 0x02, 0x00, 0x00, 0x00 HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","SCSI Miniport", 0x00000001, \ @@ -468,6 +473,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","ImagePath",0x00020000,"system32\drivers\acpi.sys" HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","Tag",0x00010001,0x00000001 ; Beep device driver HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ErrorControl",0x00010001,0x00000000 @@ -554,13 +560,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ImagePath",0x00020000,"system32\drivers\fs_rec.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008 - -; IDE driver (deprecated) -;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Group",0x00000000,"Primary Disk" -;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","ImagePath",0x00020000,"system32\drivers\ide.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Start",0x00010001,0x00000004 -;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Type",0x00010001,0x00000001 ; i8042 port driver HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x00010001,0x00000000 @@ -642,6 +641,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\PCI","ImagePath",0x00020000,"system32\drivers\pci.sys" HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Tag",0x00010001,0x00000002 ; ACPI bus HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0C08\0000","HardwareID",0x00010000,"*PNP0C08"

1 0

[amunger] 22336: Remove 21861, it causes a weird crash under qemu.
by amunger＠svn.reactos.org 13 Jun '06

13 Jun '06

Author: amunger Date: Tue Jun 13 07:40:47 2006 New Revision: 22336 URL: http://svn.reactos.ru/svn/reactos?rev=22336&view=rev Log: Remove 21861, it causes a weird crash under qemu. Modified: branches/ros-branch-0_3_0/reactos/dll/win32/shell32/shellpath.c Modified: branches/ros-branch-0_3_0/reactos/dll/win32/shell32/shellpath.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/shell32/shellpath.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/shell32/shellpath.c Tue Jun 13 07:40:47 2006 @@ -804,7 +804,6 @@ static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; -static const WCHAR szSHSetupFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\0'}; /* This defaults to L"Documents and Settings" on Windows 2000/XP, but we're * acting more Windows 9x-like for now. */ @@ -1769,8 +1768,6 @@ path); else if (CSIDL_Data[folders[i]].type == CSIDL_Type_AllUsers) _SHGetAllUsersProfilePath(SHGFP_TYPE_DEFAULT, folders[i], path); - else if (CSIDL_Data[folders[i]].type == CSIDL_Type_CurrVer) - _SHGetDefaultValue(folders[i], path); else hr = E_FAIL; if (*path) @@ -1881,21 +1878,6 @@ return hr; } -static HRESULT _SHRegisterSetupShellFolders(void) -{ - static const UINT folders[] = { - CSIDL_PROGRAM_FILES_COMMON, - CSIDL_PROGRAM_FILES, - }; - HRESULT hr; - - TRACE("\n"); - hr = _SHRegisterFolders(HKEY_LOCAL_MACHINE, NULL, szSHSetupFolders, - szSHSetupFolders, folders, sizeof(folders) / sizeof(folders[0])); - TRACE("returning 0x%08lx\n", hr); - return hr; -} - /* Register the default values in the registry, as some apps seem to depend * on their presence. The set registered was taken from Windows XP. */ @@ -1907,8 +1889,6 @@ hr = _SHRegisterUserShellFolders(FALSE); if (SUCCEEDED(hr)) hr = _SHRegisterCommonShellFolders(); - if (SUCCEEDED(hr)) - hr = _SHRegisterSetupShellFolders(); return hr; }

1 0

[amunger] 22335: Merge 22283 to 0.3.0
by amunger＠svn.reactos.org 13 Jun '06

13 Jun '06

Author: amunger Date: Tue Jun 13 07:35:48 2006 New Revision: 22335 URL: http://svn.reactos.ru/svn/reactos?rev=22335&view=rev Log: Merge 22283 to 0.3.0 Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/subsyst… ============================================================================== --- branches/ros-branch-0_3_0/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ branches/ros-branch-0_3_0/reactos/subsystems/win32/csrss/win32csr/conio.c Tue Jun 13 07:35:48 2006 @@ -613,13 +613,14 @@ i -= 2; /* if we already have something to return, just back it up by 2 */ } else - { /* otherwise, return STATUS_NOTIFY_CLEANUP to tell client to back up its buffer */ + { + /* otherwise, we will treat the backspace just like any other char and let the client decide what to do */ Console->WaitingChars--; ConioUnlockConsole(Console); HeapFree(Win32CsrApiHeap, 0, Input); - Request->Data.ReadConsoleRequest.NrCharactersRead = 0; - Request->Status = STATUS_NOTIFY_CLEANUP; - return STATUS_NOTIFY_CLEANUP; + Request->Data.ReadConsoleRequest.NrCharactersRead++; + Buffer[i] = Input->InputEvent.Event.KeyEvent.uChar.AsciiChar; + return Request->Status; } Request->Data.ReadConsoleRequest.nCharsCanBeDeleted--; Input->Echoed = TRUE; /* mark as echoed so we don't echo it below */

1 0

[turner] 22334: * When comparing two strings, you do not need to check what comes after them. * You do not need to look for the next space in the "command" to run on if success, that will be handled later on, and causes it to skip over to much if it done in both spots
by turner＠svn.reactos.org 13 Jun '06

13 Jun '06

Author: turner Date: Tue Jun 13 04:26:08 2006 New Revision: 22334 URL: http://svn.reactos.ru/svn/reactos?rev=22334&view=rev Log: * When comparing two strings, you do not need to check what comes after them. * You do not need to look for the next space in the "command" to run on if success, that will be handled later on, and causes it to skip over to much if it done in both spots Modified: trunk/reactos/base/shell/cmd/if.c Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=223… ============================================================================== --- trunk/reactos/base/shell/cmd/if.c (original) +++ trunk/reactos/base/shell/cmd/if.c Tue Jun 13 04:26:08 2006 @@ -177,15 +177,13 @@ while (_istspace (*pp)) /* Skip subsequent spaces */ pp++; - /* are the two sides equal, and does the second end in the same place? */ - if ( !_tcsncmp(param,pp,p1len) && _tcschr(_T(" ("),pp[p1len]) ) + /* are the two sides equal*/ + if ( !_tcsncmp(param,pp,p1len)) x_flag ^= X_EXEC; pp += p1len; if ( x_flag ) { - while (*pp && !_istspace (*pp)) /* Find first space, */ - pp++; x_flag |= X_EMPTY; } }

1 0

[jimtabor] 22333: Wine patch by Thomas Kho: Fix behavior when selecting disabled menu items.
by jimtabor＠svn.reactos.org 12 Jun '06

12 Jun '06

Author: jimtabor Date: Tue Jun 13 03:23:50 2006 New Revision: 22333 URL: http://svn.reactos.ru/svn/reactos?rev=22333&view=rev Log: Wine patch by Thomas Kho: Fix behavior when selecting disabled menu items. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/me… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Tue Jun 13 03:23:50 2006 @@ -2252,7 +2252,7 @@ * * Execute a menu item (for instance when user pressed Enter). * Return the wID of the executed item. Otherwise, -1 indicating - * that no menu item was executed; + * that no menu item was executed, -2 if a popup is shown; * Have to receive the flags for the TrackPopupMenu options to avoid * sending unwanted message. * @@ -2306,6 +2306,7 @@ else { Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, MenuInfo, TRUE, Flags); + return -2; } return -1; @@ -2406,8 +2407,9 @@ { if (0 == (ItemInfo.fType & MF_POPUP)) { + INT ExecutedMenuId = MenuExecFocusedItem(Mt, &MenuInfo, Flags); MenuCleanupRosMenuItemInfo(&ItemInfo); - return MenuExecFocusedItem(Mt, &MenuInfo, Flags); + return (ExecutedMenuId < 0) ? -1 : ExecutedMenuId; } MenuCleanupRosMenuItemInfo(&ItemInfo); @@ -3355,6 +3357,7 @@ break; /* WM_SYSKEYDOWN */ case WM_CHAR: + case WM_SYSCHAR: { UINT Pos; @@ -3365,7 +3368,7 @@ if (L'\r' == Msg.wParam || L' ' == Msg.wParam) { ExecutedMenuId = MenuExecFocusedItem(&Mt, &MenuInfo, Flags); - fEndMenu = (ExecutedMenuId != -1); + fEndMenu = (ExecutedMenuId != -2); break; } @@ -3390,7 +3393,7 @@ { MenuSelectItem(Mt.OwnerWnd, &MenuInfo, Pos, TRUE, 0); ExecutedMenuId = MenuExecFocusedItem(&Mt, &MenuInfo, Flags); - fEndMenu = (-1 != ExecutedMenuId); + fEndMenu = (-2 != ExecutedMenuId); } } break; @@ -3453,7 +3456,9 @@ } /* The return value is only used by TrackPopupMenu */ - return (-1 != ExecutedMenuId) ? ExecutedMenuId : 0; + if (!(Flags & TPM_RETURNCMD)) return TRUE; + if (ExecutedMenuId < 0) ExecutedMenuId = 0; + return ExecutedMenuId; } /***********************************************************************

1 0

[hpoussin] 22332: Add a script to download some Wine dlls and create the associated .rbuild file That is a first version and things won't probably won't work as expected.
by hpoussin＠svn.reactos.org 12 Jun '06

12 Jun '06

Author: hpoussin Date: Tue Jun 13 02:42:57 2006 New Revision: 22332 URL: http://svn.reactos.ru/svn/reactos?rev=22332&view=rev Log: Add a script to download some Wine dlls and create the associated .rbuild file That is a first version and things won't probably won't work as expected. Added: trunk/tools/wineimport.cmd (with props) Added: trunk/tools/wineimport.cmd URL: http://svn.reactos.ru/svn/reactos/trunk/tools/wineimport.cmd?rev=22332&view… ============================================================================== --- trunk/tools/wineimport.cmd (added) +++ trunk/tools/wineimport.cmd Tue Jun 13 02:42:57 2006 @@ -1,0 +1,105 @@ +@ECHO OFF + +REM Copyright (C) 2006 Hervé Poussineau (hpoussin(a)reactos.org) + +SET WINE_TMPFILE1=tmpfile1.wine +SET WINE_TMPFILE2=tmpfile2.wine +IF "%WINE_RESULTFILE%" == "" SET WINE_RESULTFILE=con + +IF "%1" == "" GOTO help +IF "%1" == "download" GOTO download +IF "%1" == "process" GOTO process +IF "%1" == "internal_analyseline" GOTO internal_analyseline + +:help +ECHO Syntax: +ECHO %0 download {wine_lib} [{wine_lib} ...] +ECHO %0 process {wine_lib} [{wine_lib} ...] +GOTO :eof + +:download +IF "%2" == "" GOTO help +SET CVSROOT=:pserver:cvs@cvs.winehq.org:/home/wine +ECHO *** Password is "cvs" *** +cvs.exe login +:startdownload +ECHO Downloading %2 ... +>NUL 2>NUL cvs.exe -z 3 checkout wine/dlls/%2 +SHIFT +IF NOT "%2" == "" GOTO startdownload +>NUL 2>NUL cvs.exe logout +GOTO :eof + +:process +SET WINE_BATCH=%0 +IF "%2" == "" GOTO help +:startprocess +IF NOT EXIST wine\dlls\%2\makefile.in ( + ECHO WARNING: Did you forget "%WINE_BATCH% download %2"? + GOTO :processnext +) +>NUL COPY /Y wine\dlls\%2\makefile.in %WINE_TMPFILE1% + +>%WINE_RESULTFILE% ECHO ^<module name="%2" type="win32dll" baseaddress="${BASEADDRESS_%2}" installbase="system32" installname="%2.dll" allowwarnings="true"^> +>>%WINE_RESULTFILE% ECHO ^<importlibrary definition="%2.spec.def" /^> +>>%WINE_RESULTFILE% ECHO ^<include base="%2"^>.^</include^> +>>%WINE_RESULTFILE% ECHO ^<include base="ReactOS"^>include/reactos/wine^</include^> +>>%WINE_RESULTFILE% ECHO ^<define name="__REACTOS__" /^> +>>%WINE_RESULTFILE% ECHO ^<define name="__USE_W32API" /^> +>>%WINE_RESULTFILE% ECHO ^<define name="_WIN32_IE"^>0x600^</define^> +>>%WINE_RESULTFILE% ECHO ^<define name="_WIN32_WINNT"^>0x501^</define^> +>>%WINE_RESULTFILE% ECHO ^<define name="WINVER"^>0x501^</define^> +>>%WINE_RESULTFILE% ECHO ^<library^>wine^</library^> +SET WINE_FULL_LINE= +SET WINE_END_PREC_LINE= +SET WINE_VARTYPE=0 +FOR /F "eol=# delims=" %%l IN (%WINE_TMPFILE1%) DO ( + CALL %WINE_BATCH% internal_analyseline %%l +) +>>%WINE_RESULTFILE% ECHO ^<file^>%2.spec^</file^> +>>%WINE_RESULTFILE% ECHO ^</module^> + +:processnext +SHIFT +IF NOT "%2" == "" GOTO startprocess +DEL %WINE_TMPFILE1% %WINE_TMPFILE2% +GOTO :eof + +:internal_analyseline +SET WINE_LINE=%* +SET WINE_LINE=%WINE_LINE:~21% +SET WINE_LINE=%WINE_LINE:-luuid=% +SET WINE_START_LINE1=%WINE_LINE:~0,1% +SET WINE_START_LINE2=%WINE_LINE:~0,2% +SET WINE_END_LINE=%WINE_LINE:~-1% +IF NOT "%WINE_END_PREC_LINE%" == "\" ( + IF NOT "%WINE_VARTYPE%" == "0" ( + FOR /F "tokens=2* delims= " %%h IN ("%WINE_FULL_LINE%") DO ( + FOR %%j IN (%%i) DO ( + IF "%WINE_VARTYPE%" == "1" ( + >>%WINE_RESULTFILE% ECHO ^<file^>%%j^</file^> + ) ELSE ( + >>%WINE_RESULTFILE% ECHO ^<library^>%%j^</library^> + ) + ) + ) + ) + SET WINE_FULL_LINE= + IF "%2" == "C_SRCS" ( + SET WINE_VARTYPE=1 + ) ELSE IF "%2" == "RC_SRCS" ( + SET WINE_VARTYPE=1 + ) ELSE IF "%2" == "IMPORTS" ( + SET WINE_VARTYPE=2 + ) ELSE ( + SET WINE_VARTYPE=0 + ) +) +IF "%WINE_END_LINE%" == "\" ( + >%WINE_TMPFILE2% ECHO %WINE_FULL_LINE%%WINE_LINE:~0,-1% + <%WINE_TMPFILE2% SET /P WINE_FULL_LINE= +) ELSE ( + >%WINE_TMPFILE2% ECHO %WINE_FULL_LINE%%WINE_LINE% + <%WINE_TMPFILE2% SET /P WINE_FULL_LINE= +) +SET WINE_END_PREC_LINE=%WINE_END_LINE% Propchange: trunk/tools/wineimport.cmd ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gedmurphy] 22331: missed this little blighter ....
by gedmurphy＠svn.reactos.org 12 Jun '06

12 Jun '06

Author: gedmurphy Date: Tue Jun 13 02:40:56 2006 New Revision: 22331 URL: http://svn.reactos.ru/svn/reactos?rev=22331&view=rev Log: missed this little blighter .... Added: trunk/reactos/dll/win32/comctl32/comctl_Eo.rc Added: trunk/reactos/dll/win32/comctl32/comctl_Eo.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_E… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Eo.rc (added) +++ trunk/reactos/dll/win32/comctl32/comctl_Eo.rc Tue Jun 13 02:40:56 2006 @@ -1,0 +1,87 @@ +/* Esperanto Language Support + * Copyright 2006 Antonio Codazzi + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Ecoj laý " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Bone", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Rezigni", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Apliku", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Helpo", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Langeto", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Estrita Proceduro" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Retro", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Antaýen >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Konkludi", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Rezigni", IDCANCEL,178,138,50,14 + PUSHBUTTON "Helpo", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Langeto", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Agordu stangon de la iloj" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Fermu", IDCANCEL,308,6,44,14 + PUSHBUTTON "R&ee agordu", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Helpo", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "&Supre forþovu", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Su&be forþovu", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "&Disponeblaj butonoj:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Aldonu ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Forigu", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "Butonoj por stango de la &iloj", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Fermu" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Hodiaý:" + IDM_GOTODAY "Iru a la hodiaý" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Dividilo" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Neniu" +}

1 0

[gedmurphy] 22330: add missing file
by gedmurphy＠svn.reactos.org 12 Jun '06

12 Jun '06

Author: gedmurphy Date: Tue Jun 13 02:40:05 2006 New Revision: 22330 URL: http://svn.reactos.ru/svn/reactos?rev=22330&view=rev Log: add missing file Added: vendor/wine/dlls/comctl32/current/comctl_Eo.rc Added: vendor/wine/dlls/comctl32/current/comctl_Eo.rc URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/comctl32/current/comctl_… ============================================================================== --- vendor/wine/dlls/comctl32/current/comctl_Eo.rc (added) +++ vendor/wine/dlls/comctl32/current/comctl_Eo.rc Tue Jun 13 02:40:05 2006 @@ -1,0 +1,87 @@ +/* Esperanto Language Support + * Copyright 2006 Antonio Codazzi + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Ecoj laý " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Bone", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Rezigni", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Apliku", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Helpo", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Langeto", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Estrita Proceduro" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Retro", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Antaýen >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Konkludi", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Rezigni", IDCANCEL,178,138,50,14 + PUSHBUTTON "Helpo", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Langeto", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Agordu stangon de la iloj" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Fermu", IDCANCEL,308,6,44,14 + PUSHBUTTON "R&ee agordu", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Helpo", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "&Supre forþovu", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Su&be forþovu", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "&Disponeblaj butonoj:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Aldonu ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Forigu", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "Butonoj por stango de la &iloj", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Fermu" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Hodiaý:" + IDM_GOTODAY "Iru a la hodiaý" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Dividilo" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Neniu" +}

1 0

[gedmurphy] 22328: enable all tests
by gedmurphy＠svn.reactos.org 12 Jun '06

12 Jun '06

Author: gedmurphy Date: Tue Jun 13 00:26:30 2006 New Revision: 22328 URL: http://svn.reactos.ru/svn/reactos?rev=22328&view=rev Log: enable all tests Modified: trunk/reactos/regtests/winetests/comctl32/testlist.c Modified: trunk/reactos/regtests/winetests/comctl32/testlist.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/testlist.c (original) +++ trunk/reactos/regtests/winetests/comctl32/testlist.c Tue Jun 13 00:26:30 2006 @@ -23,19 +23,19 @@ const struct test winetest_testlist[] = { -// { "comboex", func_comboex }, + { "comboex", func_comboex }, { "dpa", func_dpa }, -// { "header", func_header }, -// { "imagelist", func_imagelist }, -// { "monthcal", func_monthcal }, + { "header", func_header }, + { "imagelist", func_imagelist }, + { "monthcal", func_monthcal }, { "mru", func_mru }, -// { "progress", func_progress }, -// { "propsheet", func_propsheet }, + { "progress", func_progress }, + { "propsheet", func_propsheet }, { "subclass", func_subclass }, { "tab", func_tab }, -// { "toolbar", func_toolbar }, -// { "tooltips", func_tooltips }, -// { "treeview", func_treeview }, -// { "updown", func_updown }, + { "toolbar", func_toolbar }, + { "tooltips", func_tooltips }, + { "treeview", func_treeview }, + { "updown", func_updown }, { 0, 0 } };

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs