Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[greatlrd] 27767: fixed so metafile works bit better, do not crash on alloc memory but we still does not implement it to 100%, it contain allot of bugs
by greatlrd＠svn.reactos.org 21 Jul '07

21 Jul '07

Author: greatlrd Date: Sat Jul 21 21:28:26 2007 New Revision: 27767 URL: http://svn.reactos.org/svn/reactos?rev=27767&view=rev Log: fixed so metafile works bit better, do not crash on alloc memory but we still does not implement it to 100%, it contain allot of bugs Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Sat Jul 21 21:28:26 2007 @@ -81,8 +81,9 @@ {GDI_OBJECT_TYPE_DIRECTDRAW, sizeof(DD_DIRECTDRAW), DD_Cleanup}, {GDI_OBJECT_TYPE_DD_SURFACE, sizeof(DD_SURFACE), DDSURF_Cleanup}, {GDI_OBJECT_TYPE_EXTPEN, sizeof(GDIBRUSHOBJ), EXTPEN_Cleanup}, - {GDI_OBJECT_TYPE_METADC, 0, GDI_CleanupDummy}, - {GDI_OBJECT_TYPE_METAFILE, 0, GDI_CleanupDummy}, + /* FIXME do not use normal DC struct for this */ + {GDI_OBJECT_TYPE_METADC, sizeof(DC), GDI_CleanupDummy}, + {GDI_OBJECT_TYPE_METAFILE, sizeof(DC), GDI_CleanupDummy}, {GDI_OBJECT_TYPE_ENHMETAFILE, 0, GDI_CleanupDummy}, {GDI_OBJECT_TYPE_ENHMETADC, 0, GDI_CleanupDummy}, {GDI_OBJECT_TYPE_MEMDC, 0, GDI_CleanupDummy},

1 0

[cfinck] 27766: Simple change with much effect By adding one line to the "RosBE.cmd", we can get rid of the global ROSBEBASEDIR environment variable. This also allows us to remove the complete environment variable handling from the Setup Scripts.
by cfinck＠svn.reactos.org 21 Jul '07

21 Jul '07

Author: cfinck Date: Sat Jul 21 17:07:54 2007 New Revision: 27766 URL: http://svn.reactos.org/svn/reactos?rev=27766&view=rev Log: Simple change with much effect By adding one line to the "RosBE.cmd", we can get rid of the global ROSBEBASEDIR environment variable. This also allows us to remove the complete environment variable handling from the Setup Scripts. Removed: trunk/tools/RosBE-Windows/WriteEnvStr.nsh Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Sat Jul 21 17:07:54 2007 @@ -11,6 +11,7 @@ @echo off set _VER=0.3.7 +set ROSBEBASEDIR=%~dp0 title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Sat Jul 21 17:07:54 2007 @@ -33,7 +33,6 @@ !include "MUI.nsh" !include "RosSourceDir.nsh" -!include "WriteEnvStr.nsh" !include "LogicLib.nsh" ;; MUI begin. @@ -140,12 +139,6 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\reactos.ico" -SectionEnd - -Section -AddEnvironmentVariable SEC06 - Push "ROSBEBASEDIR" - Push "$INSTDIR" - Call WriteEnvStr SectionEnd Section -Post SEC07 @@ -206,12 +199,6 @@ Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" ;; - ;; Remove the evironment variable. - ;; - Push "ROSBEBASEDIR" - Call un.DeleteEnvStr - - ;; ;; Clean up the registry. ;; DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" Removed: trunk/tools/RosBE-Windows/WriteEnvStr.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/WriteEnvStr.ns… ============================================================================== --- trunk/tools/RosBE-Windows/WriteEnvStr.nsh (original) +++ trunk/tools/RosBE-Windows/WriteEnvStr.nsh (removed) @@ -1,151 +1,0 @@ -!ifndef _WriteEnvStr_nsh -!define _WriteEnvStr_nsh - -!include "WinMessages.nsh" -!include "LogicLib.nsh" - -!ifndef WriteEnvStr_RegKey - !define WriteEnvStr_RegKey 'HKCU "Environment"' -!endif - -# -# WriteEnvStr - Writes an environment variable -# Note: Win9x systems requires reboot -# -# Example: -# Push "HOMEDIR" # name -# Push "C:\New Home Dir\" # value -# Call WriteEnvStr -# -Function WriteEnvStr - Exch $1 ; $1 has environment variable value - Exch - Exch $0 ; $0 has environment variable name - Push $2 - - Call IsNT - Pop $2 - ${if} $2 == "1" - WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $1 - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \ - 0 "STR:Environment" /TIMEOUT=5000 - Pop $2 - Pop $0 - Pop $1 - Return - ${endif} - ; Not on NT - StrCpy $2 $WINDIR 2 ; Copy drive of windows (c:) - FileOpen $2 "$2\autoexec.bat" a - FileSeek $2 0 END - FileWrite $2 "$\r$\nSET $0=$1$\r$\n" - FileClose $2 - SetRebootFlag true - Pop $2 - Pop $0 - Pop $1 -FunctionEnd - -# -# un.DeleteEnvStr - Removes an environment variable -# Note: Win9x systems requires reboot -# -# Example: -# Push "HOMEDIR" # name -# Call un.DeleteEnvStr -# -Function un.DeleteEnvStr - Exch $0 ; $0 now has the name of the variable - Push $1 - Push $2 - Push $3 - Push $4 - Push $5 - - Call un.IsNT - Pop $1 - ${if} $1 == "1" - DeleteRegValue ${WriteEnvStr_RegKey} $0 - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \ - 0 "STR:Environment" /TIMEOUT=5000 - Pop $5 - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Pop $0 - Return - ${endif} - ; Not on NT - StrCpy $1 $WINDIR 2 - FileOpen $1 "$1\autoexec.bat" r - GetTempFileName $4 - FileOpen $2 $4 w - StrCpy $0 "SET $0=" - SetRebootFlag true - - DeleteEnvStr_dosLoop: - FileRead $1 $3 - StrLen $5 $0 - StrCpy $5 $3 $5 - ${if} $5 == "$0" - goto DeleteEnvStr_dosLoop - ${endif} - ${if} $5 == "" - goto DeleteEnvStr_dosLoopEnd - ${endif} - FileWrite $2 $3 - Goto DeleteEnvStr_dosLoop - - DeleteEnvStr_dosLoopEnd: - FileClose $2 - FileClose $1 - StrCpy $1 $WINDIR 2 - Delete "$1\autoexec.bat" - CopyFiles /SILENT $4 "$1\autoexec.bat" - Delete $4 - Pop $5 - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Pop $0 -FunctionEnd - -!ifndef IsNT_KiCHiK -!define IsNT_KiCHiK - -# -# [un.]IsNT - Pushes 1 if running on NT, 0 if not -# -# Example: -# Call IsNT -# Pop $0 -# StrCmp $0 1 +3 -# MessageBox MB_OK "Not running on NT!" -# Goto +2 -# MessageBox MB_OK "Running on NT!" -# -!macro IsNT UN -Function ${UN}IsNT - Push $0 - ReadRegStr $0 HKLM \ - "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion - StrCmp $0 "" 0 IsNT_yes - ; we are not NT. - Pop $0 - Push 0 - Return - - IsNT_yes: - ; NT!!! - Pop $0 - Push 1 -FunctionEnd -!macroend -!insertmacro IsNT "" -!insertmacro IsNT "un." - -!endif ; IsNT_KiCHiK - -!endif ; _WriteEnvStr_nsh

1 0

[weiden] 27765: Patch by Frode Lillerud <frode@enkelt.no> - Updated Norwegian keyboard layout See issue #2419 for more details.
by weiden＠svn.reactos.org 21 Jul '07

21 Jul '07

Author: weiden Date: Sat Jul 21 14:51:05 2007 New Revision: 27765 URL: http://svn.reactos.org/svn/reactos?rev=27765&view=rev Log: Patch by Frode Lillerud <frode(a)enkelt.no> - Updated Norwegian keyboard layout See issue #2419 for more details. Modified: trunk/reactos/dll/keyboard/kbdno/kbdno.c Modified: trunk/reactos/dll/keyboard/kbdno/kbdno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdno/kbdno.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdno/kbdno.c (original) +++ trunk/reactos/dll/keyboard/kbdno/kbdno.c Sat Jul 21 14:51:05 2007 @@ -169,15 +169,15 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { /* Normal vs Shifted */ /* The numbers */ - { VK_OEM_5, NOCAPS, {0xbd, 0xa7} }, + { VK_OEM_5, NOCAPS, {'|', 0xa7} }, /* Button to the left of 1. 0xa7=§ */ { '1', NOCAPS, {'1', '!'} }, /* Ctrl-2 generates NUL */ { VK_OEM_PLUS, NOCAPS, {'+', '?'} }, { VK_OEM_6, CAPS, {0xe5, 0xc5} }, /* Å */ /* Specials */ - { VK_OEM_7, CAPS, {0xf8, 0xd8} }, /* Ø */ - { VK_OEM_3, CAPS, {0xe6, 0xc6} }, /* Æ */ + { VK_OEM_3, CAPS, {0xf8, 0xd8} }, /* Ø */ + { VK_OEM_7, CAPS, {0xe6, 0xc6} }, /* Æ */ { VK_OEM_COMMA, CAPS, {',', ';'} }, { VK_OEM_PERIOD, CAPS, {'.', ':'} }, @@ -245,7 +245,7 @@ { '8', NOCAPS, {'8', '(', WCH_NONE, '['} }, { '9', NOCAPS, {'9', ')', WCH_NONE, ']'} }, { '0', NOCAPS, {'0', '=', WCH_NONE, '}'} }, - { VK_OEM_4, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_DEAD, '|'} }, + { VK_OEM_4, NOCAPS, {'\\', 0x60, WCH_NONE, 0xb4} }, //VK_OEM_4 is between +? and backspace { VK_EMPTY , NOCAPS, {0xb4, '`', '|', WCH_NONE} }, { 'E', CAPS, {'e', 'E', 0x05, 0x20ac} }, @@ -297,10 +297,10 @@ { 0x1c, L"ENTER" }, { 0x1d, L"CTRL" }, { 0x2a, L"SHIFT" }, - { 0x36, L"H\x00D8JRE SHIFT" }, + { 0x36, L"H\x00D8YRE SHIFT" }, { 0x37, L"NUM * (Numerisk del)" }, { 0x38, L"ALT" }, - { 0x39, L"MELLOMRUM" }, + { 0x39, L"MELLOMROM" }, { 0x3a, L"CAPS LOCK" }, { 0x3b, L"F1" }, { 0x3c, L"F2" }, @@ -347,10 +347,10 @@ ROSDATA VSC_LPWSTR extended_key_names[] = { { 0x1c, L"ENTER (Numerisk del)" }, - { 0x1d, L"H\x00D8JRE CTRL" }, + { 0x1d, L"H\x00D8YRE CTRL" }, { 0x35, L"DIVISION (Numerisk del)" }, { 0x37, L"PRINT SCREEN" }, - { 0x38, L"H\x00D8JRE ALT" }, + { 0x38, L"H\x00D8YRE ALT" }, { 0x45, L"NUM LOCK" }, { 0x46, L"BREAK" }, { 0x47, L"HOME" }, @@ -358,7 +358,7 @@ { 0x49, L"PAGE UP" }, { 0x4b, L"VENSTRE PIL" }, //{ 0x4c, L"Center" }, - { 0x4d, L"H\x00D8JRE PIL" }, + { 0x4d, L"H\x00D8YRE PIL" }, { 0x4f, L"END" }, { 0x50, L"PIL NED" }, { 0x51, L"PAGE DOWN" }, @@ -367,7 +367,7 @@ { 0x54, L"<ReactOS>" }, { 0x56, L"HJELP" }, { 0x5b, L"VENSTRE <ReactOS>" }, - { 0x5c, L"H\x00D8JRE <ReactOS>" }, + { 0x5c, L"H\x00D8YRE <ReactOS>" }, { 0x5d, L"Program" }, { 0, NULL } };

1 0

[spetreolle] 27764: fix 2 mistyped \n
by spetreolle＠svn.reactos.org 20 Jul '07

20 Jul '07

Author: spetreolle Date: Sat Jul 21 03:17:42 2007 New Revision: 27764 URL: http://svn.reactos.org/svn/reactos?rev=27764&view=rev Log: fix 2 mistyped \n Modified: trunk/reactos/base/shell/cmd/lang/nb-NO.rc Modified: trunk/reactos/base/shell/cmd/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/nb-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/nb-NO.rc (original) +++ trunk/reactos/base/shell/cmd/lang/nb-NO.rc Sat Jul 21 03:17:42 2007 @@ -64,7 +64,7 @@ STRING_CLS_HELP, "Tømmer skjermen.\n\nCLS\n" -STRING_CMD_HELP1, "\Interne kommandoer tilgjengelig:\n" +STRING_CMD_HELP1, "\nInterne kommandoer tilgjengelig:\n" STRING_CMD_HELP2, "\nFunksjoner tilgjengelig:" @@ -155,7 +155,7 @@ H Skjulte filer\n\ - prefiks som betyr IKKE. (f.eks -R)\n" -STRING_DEL_HELP2, "Alle filer i mappen vil bli slettet!\Er du sikker (J/N)?" +STRING_DEL_HELP2, "Alle filer i mappen vil bli slettet!\nEr du sikker (J/N)?" STRING_DEL_HELP3, " %lu fil slettet\n" STRING_DEL_HELP4, " %lu filer slettet\n"

1 0

[tkreuzer] 27763: recommit part of previous patch: validate parent on moving windows. Fixes redraw problem when moving the slider of regedit etc.
by tkreuzer＠svn.reactos.org 20 Jul '07

20 Jul '07

Author: tkreuzer Date: Sat Jul 21 02:59:21 2007 New Revision: 27763 URL: http://svn.reactos.org/svn/reactos?rev=27763&view=rev Log: recommit part of previous patch: validate parent on moving windows. Fixes redraw problem when moving the slider of regedit etc. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Sat Jul 21 02:59:21 2007 @@ -1203,6 +1203,7 @@ CopyRect.left + (OldWindowRect.left - NewWindowRect.left), CopyRect.top + (OldWindowRect.top - NewWindowRect.top), SRCCOPY, 0, 0); UserReleaseDC(Window, Dc, FALSE); + IntValidateParent(Window, CopyRgn, FALSE); NtGdiOffsetRgn(CopyRgn, -NewWindowRect.left, -NewWindowRect.top); } else if(VisRgn)

1 0

[janderwald] 27762: - added slovak translation by Mario Kacmar
by janderwald＠svn.reactos.org 20 Jul '07

20 Jul '07

Author: janderwald Date: Sat Jul 21 00:26:19 2007 New Revision: 27762 URL: http://svn.reactos.org/svn/reactos?rev=27762&view=rev Log: - added slovak translation by Mario Kacmar Added: trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc (with props) Modified: trunk/reactos/base/shell/explorer-new/explorer.rc Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rc (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rc Sat Jul 21 00:26:19 2007 @@ -19,3 +19,5 @@ #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" + Added: trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc (added) +++ trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc Sat Jul 21 00:26:19 2007 @@ -1,0 +1,59 @@ +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDM_TRAYWND MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Za&mknúť panel úloh", ID_LOCKTASKBAR + MENUITEM "&Vlastnosti", ID_SHELL_CMD_PROPERTIES + END +END + +IDM_STARTMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Progra&my", IDM_PROGRAMS + BEGIN + MENUITEM "(Prázdne)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "O&bľúbené poloky", IDM_FAVORITES + BEGIN + MENUITEM "(Prázdne)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "Do&kumenty", IDM_DOCUMENTS + BEGIN + MENUITEM "(Prázdne)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "Nastav&enia", IDM_SETTINGS + BEGIN + MENUITEM "&Ovládaci panel", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + MENUITEM SEPARATOR + MENUITEM "&Zabezpečenie systému ReactOS...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "Sieťové pripoje&nia", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "&Tlačiarne a faxy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "P&anel úloh a ponuka tart", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + END + POPUP "&Hľadať", IDM_SEARCH + BEGIN + MENUITEM SEPARATOR + END + MENUITEM "&Pomoc a technická podpora", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "Sp&ustiť...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "&Synchronizovať", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "O&dhlásiť pouívateľa %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "&Odpojiť...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "Vybr&ať počítač z doku", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "&Vypnúť...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_START "tart" + IDS_PROPERTIES "Vl&astnosti" + IDS_OPEN_ALL_USERS "&Otvoriť profil All Users" + IDS_EXPLORE_ALL_USERS "&Preskúmať profil All Users" +END Propchange: trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 27761: Updated italian translation for ImageSoft by Carlo Bramini (carlo DOT bramix AT libero DOT it) See issue #2227 for more details.
by cfinck＠svn.reactos.org 20 Jul '07

20 Jul '07

Author: cfinck Date: Fri Jul 20 23:51:02 2007 New Revision: 27761 URL: http://svn.reactos.org/svn/reactos?rev=27761&view=rev Log: Updated italian translation for ImageSoft by Carlo Bramini (carlo DOT bramix AT libero DOT it) See issue #2227 for more details. Modified: trunk/rosapps/imagesoft/lang/it-IT.rc Modified: trunk/rosapps/imagesoft/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/lang/it-IT.rc?re… ============================================================================== --- trunk/rosapps/imagesoft/lang/it-IT.rc (original) +++ trunk/rosapps/imagesoft/lang/it-IT.rc Fri Jul 20 23:51:02 2007 @@ -17,7 +17,7 @@ MENUITEM "C&hiudi tutto", ID_CLOSEALL,GRAYED MENUITEM SEPARATOR MENUITEM "&Salva", ID_SAVE, GRAYED - MENUITEM "Salva Co&me...", ID_SAVEAS, GRAYED + MENUITEM "Salva co&n nome...", ID_SAVEAS, GRAYED MENUITEM SEPARATOR MENUITEM "Ant&eprima di stampa", ID_PRINTPRE,GRAYED MENUITEM "S&tampa...", ID_PRINT, GRAYED @@ -28,8 +28,8 @@ END POPUP "&Modifica" BEGIN - MENUITEM "&Undo", ID_UNDO, GRAYED - MENUITEM "&Redo", ID_REDO, GRAYED + MENUITEM "&Annulla", ID_UNDO, GRAYED + MENUITEM "&Ripeti", ID_REDO, GRAYED MENUITEM SEPARATOR MENUITEM "&Taglia", ID_CUT, GRAYED MENUITEM "&Copia", ID_COPY, GRAYED @@ -38,22 +38,22 @@ MENUITEM SEPARATOR MENUITEM "&Seleziona tutto", ID_SELALL, GRAYED END - POPUP "&View" + POPUP "&Visualizza" BEGIN MENUITEM "&Strumenti", ID_TOOLS MENUITEM "&Colori", ID_COLOR MENUITEM "&Azioni", ID_HISTORY MENUITEM "&Barra di stato", ID_STATUSBAR END - POPUP "&Adjust" - BEGIN - MENUITEM "Luminosità...", ID_BRIGHTNESS + POPUP "Co&rreggi" + BEGIN + MENUITEM "Luminosità...", ID_BRIGHTNESS MENUITEM "Contrasto...", ID_CONTRAST - MENUITEM "Hue/Saturatione...", -1, GRAYED + MENUITEM "Tonalità/Saturazione...", -1, GRAYED POPUP "Colore" BEGIN - MENUITEM "Bianco e nero" ID_BLACKANDWHITE - MENUITEM "Inveri i colori" ID_INVERTCOLORS + MENUITEM "Bianco e nero", ID_BLACKANDWHITE + MENUITEM "Inverti i colori", ID_INVERTCOLORS END MENUITEM SEPARATOR MENUITEM "Soffuso", ID_BLUR @@ -74,7 +74,7 @@ POPUP "&Finestre" BEGIN MENUITEM "&Sovrapponi", ID_WINDOW_CASCADE - MENUITEM "Affianca &Orizontalmente", ID_WINDOW_TILE_HORZ + MENUITEM "Affianca &Orizzontalmente", ID_WINDOW_TILE_HORZ MENUITEM "Affianca &Verticalmente", ID_WINDOW_TILE_VERT MENUITEM "&Disponi Icone", ID_WINDOW_ARRANGE MENUITEM SEPARATOR @@ -195,8 +195,8 @@ IDS_TOOLTIP_CUT "Taglia" IDS_TOOLTIP_COPY "Copia" IDS_TOOLTIP_PASTE "Incolla" - IDS_TOOLTIP_UNDO "Undo" - IDS_TOOLTIP_REDO "Redo" + IDS_TOOLTIP_UNDO "Annulla" + IDS_TOOLTIP_REDO "Ripeti" END @@ -206,7 +206,7 @@ IDS_HINT_BLANK " " IDS_HINT_NEW " Crea un nuovo documento." IDS_HINT_OPEN " Apre un documento esistente." - IDS_HINT_CLOSE " Chide questa finestra." + IDS_HINT_CLOSE " Chiude questa finestra." IDS_HINT_CLOSEALL " Chiude tutte le finestre." IDS_HINT_SAVE " Salva il documento attivo." IDS_HINT_SAVEAS " Salva il documento attivo con un nuovo nome." @@ -221,14 +221,14 @@ IDS_HINT_STATUS " Mostra o nasconde la barra di stato." IDS_HINT_CASCADE " Dispone le finestre in modo che siano sovrapposte." - IDS_HINT_TILE_HORZ " Dispone le finestre in modo che non siano sovrapposte." - IDS_HINT_TILE_VERT " Dispone le finestre in modo che non siano sovrapposte." + IDS_HINT_TILE_HORZ " Dispone le finestre in modo che non siano sovrapposte." + IDS_HINT_TILE_VERT " Dispone le finestre in modo che non siano sovrapposte." IDS_HINT_ARRANGE " Dispone le icone in basso nella finestra." IDS_HINT_NEXT " Attiva la finestra successiva." IDS_HINT_SYS_RESTORE " Ripristina la dimensione normale della finestra." - IDS_HINT_SYS_MOVE " Muova la finestra." + IDS_HINT_SYS_MOVE " Sposta la finestra." IDS_HINT_SYS_SIZE " Modifica la dimensione della finestra." - IDS_HINT_SYS_MINIMIZE " Riduce la finestra a una icona." + IDS_HINT_SYS_MINIMIZE " Riduce la finestra ad una icona." IDS_HINT_SYS_MAXIMIZE " Espande la finestra fino a riempire lo schermo." END

1 0

[cfinck] 27760: - Fix the WineMine Icon in the Main window and About window (parts of the patch in bug #2397 by Mario Kacmar (kario AT szm DOT sk) applied) - Make the dialogs of all languages consistent See issue #2397 for more details.
by cfinck＠svn.reactos.org 20 Jul '07

20 Jul '07

Author: cfinck Date: Fri Jul 20 23:18:35 2007 New Revision: 27760 URL: http://svn.reactos.org/svn/reactos?rev=27760&view=rev Log: - Fix the WineMine Icon in the Main window and About window (parts of the patch in bug #2397 by Mario Kacmar (kario AT szm DOT sk) applied) - Make the dialogs of all languages consistent See issue #2397 for more details. Modified: trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc trunk/reactos/base/applications/games/winemine/lang/de-DE.rc trunk/reactos/base/applications/games/winemine/lang/el-GR.rc trunk/reactos/base/applications/games/winemine/lang/en-US.rc trunk/reactos/base/applications/games/winemine/lang/es-ES.rc trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc trunk/reactos/base/applications/games/winemine/lang/id-ID.rc trunk/reactos/base/applications/games/winemine/lang/it-IT.rc trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc trunk/reactos/base/applications/games/winemine/lang/th-TH.rc trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc trunk/reactos/base/applications/games/winemine/main.c Modified: trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc Fri Jul 20 23:18:35 2007 @@ -76,8 +76,8 @@ FONT 8, "MS Shell Dlg" { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "Äîáðå", IDOK, 50, 60, 55, 15 } Modified: trunk/reactos/base/applications/games/winemine/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/de-DE.rc Fri Jul 20 23:18:35 2007 @@ -75,8 +75,8 @@ FONT 8, "MS Shell Dlg" { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 LTEXT "Unter der Wine Lizenz", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 } Modified: trunk/reactos/base/applications/games/winemine/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/el-GR.rc Fri Jul 20 23:18:35 2007 @@ -76,8 +76,8 @@ FONT 8, "MS Shell Dlg" { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 } Modified: trunk/reactos/base/applications/games/winemine/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/en-US.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/en-US.rc Fri Jul 20 23:18:35 2007 @@ -76,8 +76,8 @@ FONT 8, "MS Shell Dlg" { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 } Modified: trunk/reactos/base/applications/games/winemine/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/es-ES.rc Fri Jul 20 23:18:35 2007 @@ -76,8 +76,8 @@ FONT 8, "MS Shell Dlg" { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "Aceptar", IDOK, 50, 60, 55, 15 } Modified: trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc Fri Jul 20 23:18:35 2007 @@ -76,15 +76,15 @@ PUSHBUTTON "Annuler", IDCANCEL, 40, 50, 50, 15 } -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 +DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "À propos" FONT 8, "MS Shell Dlg" { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 LTEXT "Sous licence Wine", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 } Modified: trunk/reactos/base/applications/games/winemine/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/id-ID.rc Fri Jul 20 23:18:35 2007 @@ -75,8 +75,8 @@ FONT 8, "MS Shell Dlg" { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Hak Cipta 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "Hak Cipta 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 LTEXT "di bawah lisensi Wine", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 } Modified: trunk/reactos/base/applications/games/winemine/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/it-IT.rc Fri Jul 20 23:18:35 2007 @@ -3,7 +3,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE { - IDS_APPNAME, "Prato fiorito" + IDS_APPNAME, "Campo minato" } @@ -23,7 +23,7 @@ } POPUP "&Info" { MENUITEM "&Tempi migliori", IDM_TIMES - MENUITEM "&Informazioni su prato fiorito", IDM_ABOUT + MENUITEM "&Informazioni su Campo minato", IDM_ABOUT } } @@ -62,7 +62,7 @@ { LTEXT "Righe", IDNONE, 5, 5, 30, 10 LTEXT "Colonne", IDNONE, 5, 35, 30, 10 - LTEXT "Fiori", IDNONE, 5, 65, 30, 10 + LTEXT "Mine", IDNONE, 5, 65, 30, 10 EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER @@ -72,12 +72,12 @@ DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "Informazioni su Prato fiorito" +CAPTION "Informazioni su Campo minato" FONT 8, "MS Shell Dlg" { - LTEXT "Campo fiorito", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 - LTEXT "Sotto licenza Wine", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 + LTEXT "Campo minato", IDNONE, 10, 10, 55, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 + LTEXT "Sotto licenza Wine", IDNONE, 35, 35, 100, 10 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 } Modified: trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc Fri Jul 20 23:18:35 2007 @@ -27,10 +27,10 @@ } } -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Beste tider" +FONT 8, "MS Shell Dlg" { GROUPBOX "Beste tider", IDNONE, 10, 10, 140, 45 LTEXT "Nybegynner", IDNONE, 20, 20, 40, 8 @@ -45,20 +45,20 @@ DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 } -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "gratulerer!" +FONT 8, "MS Shell Dlg" { LTEXT "Skriv inn navnet ditt", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Egendefinert spill" +FONT 8, "MS Shell Dlg" { LTEXT "Høyde", IDNONE, 5, 5, 30, 10 LTEXT "Bredde", IDNONE, 5, 35, 30, 10 @@ -70,14 +70,14 @@ PUSHBUTTON "Avbryt", IDCANCEL, 40, 50, 50, 15 } -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Om" +FONT 8, "MS Shell Dlg" { LTEXT "Minesveiper", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 LTEXT "under Wine lisensen", IDNONE, 35, 35, 100, 10 - ICON "Minesveiper", IDNONE, 10, 25, 20, 20 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 } Modified: trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc Fri Jul 20 23:18:35 2007 @@ -76,8 +76,8 @@ FONT 8, "MS Shell Dlg" { LTEXT "WineMine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 LTEXT "onder de Wine licentie", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 } Modified: trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc Fri Jul 20 23:18:35 2007 @@ -34,10 +34,10 @@ } } -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Najlepsze czasy" +FONT 8, "MS Shell Dlg" { GROUPBOX "Najlepsze czasy", IDNONE, 10, 10, 140, 45 LTEXT "Pocz¹tkuj¹cy", IDNONE, 20, 20, 40, 8 @@ -52,20 +52,20 @@ DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 } -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Gratulacje!" +FONT 8, "MS Shell Dlg" { LTEXT "Wpisz swoje imiê", IDNONE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Ustawienia gry" +FONT 8, "MS Shell Dlg" { LTEXT "Iloæ rzêdów", IDNONE, 5, 5, 30, 10 LTEXT "Iloæ kolumn", IDNONE, 5, 35, 30, 10 @@ -77,14 +77,14 @@ PUSHBUTTON "Wycofaj", IDCANCEL, 40, 50, 50, 15 } -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Winemine - informacje" +FONT 8, "MS Shell Dlg" { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 LTEXT "Na licencji Wine", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 } Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc Fri Jul 20 23:18:35 2007 @@ -78,8 +78,8 @@ FONT 8, "MS Shell Dlg" { LTEXT "Ñàïåð", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 LTEXT "ïîä ëèöåíçèåé Wine", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 } Modified: trunk/reactos/base/applications/games/winemine/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/th-TH.rc Fri Jul 20 23:18:35 2007 @@ -76,8 +76,8 @@ FONT 8, "MS Shell Dlg" { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 LTEXT "ÀÒÂãµéÅÔ¢ÊÔ·¸Ôì¢Í§ WINE", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "µ¡Å§", IDOK, 50, 60, 55, 15 } Modified: trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc Fri Jul 20 23:18:35 2007 @@ -84,8 +84,8 @@ FONT 8, "MS Shell Dlg" { LTEXT "Ñàïåð", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 LTEXT "ïî ë³öåíç³¿ Wine", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 } Modified: trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc Fri Jul 20 23:18:35 2007 @@ -48,9 +48,9 @@ } } -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -FONT 9, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" CAPTION "É¨À×Ó¢ÐÛ°ñ" { GROUPBOX "×î¸ß¼ÍÂ¼", IDNONE, 10, 10, 140, 45 @@ -66,10 +66,9 @@ DEFPUSHBUTTON "È·¶¨", IDOK, 55, 60, 50, 15 } -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -FONT 9, "MS Shell Dlg" +DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +FONT 8, "MS Shell Dlg" CAPTION "Ë¢ÐÂ¼ÍÂ¼!" { LTEXT "ÒÑÆÆ¼ÍÂ¼,ÇëÊäÈëÄãµÄÃû×Ö", IDIGNORE, 10, 10, 150, 10 @@ -77,10 +76,9 @@ DEFPUSHBUTTON "È·¶¨", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -FONT 9, "MS Shell Dlg" +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +FONT 8, "MS Shell Dlg" CAPTION "×Ô¶¨ÒåÀ×Çø" { LTEXT "¸ß¶È", IDNONE, 5, 5, 30, 10 @@ -93,16 +91,14 @@ PUSHBUTTON "È¡Ïû", IDCANCEL, 40, 50, 50, 15 } -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -FONT 9, "MS Shell Dlg" +DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +FONT 8, "MS Shell Dlg" CAPTION "¹ØÓÚÉ¨À×" { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "°æÈ¨ 2000, Joshua Thielen", IDNONE, 35, 20, 100, 10 - LTEXT "under the Wine license", IDNONE, 35, 30, 100, 10 - //LTEXT "ÖÐÎÄ·Òë:ÕÅ±ù\n(ezb@mail.gywb.cn)", IDNONE, 35, 39, 100, 25 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + LTEXT "°æÈ¨ 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 + LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "È·¶¨", IDOK, 50, 60, 55, 15 } Modified: trunk/reactos/base/applications/games/winemine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/main.c (original) +++ trunk/reactos/base/applications/games/winemine/main.c Fri Jul 20 23:18:35 2007 @@ -56,7 +56,7 @@ wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = hInst; - wc.hIcon = LoadIcon( hInst, appname ); + wc.hIcon = LoadIcon( hInst, MAKEINTRESOURCE(IDI_WINEMINE) ); wc.hCursor = LoadCursor( NULL_HANDLE, (LPCTSTR)IDI_APPLICATION ); wc.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH ); wc.lpszMenuName = "MENU_WINEMINE";

1 0

[janderwald] 27759: - make sysreg work again under Windows
by janderwald＠svn.reactos.org 20 Jul '07

20 Jul '07

Author: janderwald Date: Fri Jul 20 22:55:03 2007 New Revision: 27759 URL: http://svn.reactos.org/svn/reactos?rev=27759&view=rev Log: - make sysreg work again under Windows Modified: trunk/reactos/tools/sysreg/conf_parser.cpp trunk/reactos/tools/sysreg/conf_parser.h trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/txtmode.cfg Modified: trunk/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.c… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.cpp (original) +++ trunk/reactos/tools/sysreg/conf_parser.cpp Fri Jul 20 22:55:03 2007 @@ -59,12 +59,15 @@ if (ws_pos != string::npos && ws_pos > 0 && ws_pos < s_buffer.size()) { string name = s_buffer.substr (0, ws_pos); - string value = s_buffer.substr (ws_pos + 1); + string value = s_buffer.substr (ws_pos + 1, s_buffer.size() - ws_pos - 2); +/* if (value[value.length () -1] == 0xA) { // remove newline char value[value.length ()-1] = _T('\0'); } +*/ +// cerr << "name: "<< name << "value: "<< value << "|" << endl; m_Map[name] = value; ret = true; } @@ -88,6 +91,31 @@ ConfValue = it->second; return true; } +//---------------------------------------------------------------------------------------- + bool ConfigParser::getDoubleValue(string ConfVariable, double & ConfValue) + { + ConfigMap::iterator it = m_Map.find (ConfVariable); + if (it == m_Map.end ()) + { + cerr << "ConfigParser::getValue failed to find " << ConfVariable << endl; + return false; + } + ConfValue = _tcstod(it->second.c_str(), NULL); + return true; + } +//----------------------------------------------------------------------------------------- + bool ConfigParser::getIntValue(string ConfVariable, long int & ConfValue) + { + ConfigMap::iterator it = m_Map.find (ConfVariable); + if (it == m_Map.end ()) + { + cerr << "ConfigParser::getValue failed to find " << ConfVariable << endl; + return false; + } + + ConfValue = _tcstol(it->second.c_str(), NULL, 10); + return true; + } } // end of namespace Sysreg_ Modified: trunk/reactos/tools/sysreg/conf_parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.h… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.h (original) +++ trunk/reactos/tools/sysreg/conf_parser.h Fri Jul 20 22:55:03 2007 @@ -77,6 +77,9 @@ bool getStringValue(string & ConfVariable, string & ConfValue); + bool getDoubleValue(string ConfVariable, double & value); + bool getIntValue(string ConfVariable, long int & value); + protected: ConfigMap m_Map; @@ -84,6 +87,6 @@ } // end of namspace Sysreg_ - + #endif /* end of CONF_PARSER_H__ */ Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Fri Jul 20 22:55:03 2007 @@ -41,7 +41,7 @@ return false; } - h_Pipe = CreateFile(PipeCmd.c_str(), + h_Pipe = CreateFile("\\\\.\\pipe\\qemu", //PipeCmd.c_str(), GENERIC_WRITE | GENERIC_READ, 0, NULL, @@ -51,7 +51,7 @@ NULL); if(INVALID_HANDLE_VALUE == h_Pipe) { - cerr << "NamedPipeReader::openPipe> failed to open pipe " << PipeCmd << GetLastError() << endl; + cerr << "NamedPipeReader::openPipe> failed to open pipe " << PipeCmd << " Error:" << GetLastError() << endl; h_Pipe = NULLVAL; return false; } @@ -70,7 +70,7 @@ bool NamedPipeReader::closeSource() { - if (!h_Pipe) + if (h_Pipe == INVALID_HANDLE_VALUE) { cerr << "NamedPipeReader::closePipe> pipe is not open" << endl; return false; Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Fri Jul 20 22:55:03 2007 @@ -16,7 +16,7 @@ #include "file_reader.h" #include "os_support.h" -#include <iostream> +#include <iostream> #include <vector> #include <fstream> #include <time.h> @@ -25,6 +25,7 @@ #include <stdlib.h> #include <assert.h> #include <math.h> +#include <signal.h> namespace Sysreg_ @@ -43,20 +44,23 @@ using std::ofstream; #endif - string RosBootTest::VARIABLE_NAME = _T("ROSBOOT_CMD"); - string RosBootTest::CLASS_NAME = _T("rosboot"); - string RosBootTest::DEBUG_PORT = _T("ROSBOOT_DEBUG_PORT"); - string RosBootTest::DEBUG_FILE = _T("ROSBOOT_DEBUG_FILE"); - string RosBootTest::TIME_OUT = _T("ROSBOOT_TIME_OUT"); - string RosBootTest::PID_FILE= _T("ROSBOOT_PID_FILE"); - string RosBootTest::DELAY_READ = _T("ROSBOOT_DELAY_READ"); - string RosBootTest::CHECK_POINT = _T("ROSBOOT_CHECK_POINT"); - string RosBootTest::SYSREG_CHECKPOINT = _T("SYSREG_CHECKPOINT:"); - string RosBootTest::CRITICAL_APP = _T("ROSBOOT_CRITICAL_APP"); - string RosBootTest::TERMINATE_EMULATOR = _T("ROSBOOT_TERMINATE_EMULATOR"); - -//--------------------------------------------------------------------------------------- - RosBootTest::RosBootTest() : m_Timeout(60.0), m_Delayread(0) + string RosBootTest::ROS_EMU_TYPE= _T("ROS_EMU_TYPE"); + string RosBootTest::EMU_TYPE_QEMU = _T("qemu"); + string RosBootTest::EMU_TYPE_VMWARE = _T("vmware"); + string RosBootTest::ROS_EMU_PATH = _T("ROS_EMU_PATH"); + string RosBootTest::ROS_HDD_IMAGE= _T("ROS_HDD_IMAGE"); + string RosBootTest::ROS_CD_IMAGE = _T("ROS_CD_IMAGE"); + string RosBootTest::ROS_MAX_TIME = _T("ROS_MAX_TIME"); + string RosBootTest::ROS_LOG_FILE = _T("ROS_LOG_FILE"); + string RosBootTest::ROS_SYM_DIR = _T("ROS_SYM_DIR"); + string RosBootTest::ROS_DELAY_READ = _T("ROS_DELAY_READ"); + string RosBootTest::ROS_SYSREG_CHECKPOINT = _T("SYSREG_CHECKPOINT:"); + string RosBootTest::ROS_CRITICAL_IMAGE = _T("ROS_CRITICAL_IMAGE"); + string RosBootTest::ROS_EMU_KILL = _T("ROS_EMU_KILL"); + string RosBootTest::ROS_EMU_MEM = _T("ROS_EMU_MEM"); + +//--------------------------------------------------------------------------------------- + RosBootTest::RosBootTest() : m_MaxTime(0.0), m_DelayRead(0) { } @@ -81,196 +85,183 @@ //--------------------------------------------------------------------------------------- void RosBootTest::delayRead() { - if (m_Delayread) + if (m_DelayRead) { /// /// delay reading until emulator is ready /// - OsSupport::sleep(m_Delayread * CLOCKS_PER_SEC ); + OsSupport::sleep(m_DelayRead); } } - -//--------------------------------------------------------------------------------------- - bool RosBootTest::configurePipe() +//---------------------------------------------------------------------------------------- + bool RosBootTest::configureQemu() { - if (!_tcscmp(m_DebugPort.c_str(), _T("qemupipe"))) - { - string::size_type pipe_pos = m_BootCmd.find(_T("-serial pipe:")); - if (pipe_pos != string::npos) + string qemupath; + string::size_type pos; + + bool bootfromcd = false; + + if (m_CDImage != _T("") ) + { + bootfromcd = true; + } + +#ifdef __LINUX__ + pos = m_EmuPath.find_last_of(_T("/")); +#else + pos = m_EmuPath.find_last_of(_T("\\")); +#endif + if (pos == string::npos) + { + cerr << "Error: ROS_EMU_PATH is invalid!!!" << endl; + return false; + } + qemupath = m_EmuPath.substr(0, pos); + + + if (m_HDDImage == _T("")) + { + if(!bootfromcd) { - pipe_pos += 12; - string::size_type pipe_pos_end = m_BootCmd.find (_T(" "), pipe_pos); - if (pipe_pos != string::npos && pipe_pos_end != string::npos) - { - m_Pipe = _T("\\\\.\\pipe\\") + m_BootCmd.substr (pipe_pos, pipe_pos_end - pipe_pos); + cerr << "Error: ROS_CD_IMAGE and ROS_HDD_IMAGE is not set!!!" << endl; + return false; + } + string qemuimgdir = qemupath; +#ifdef __LINUX___ + qemuimgdir += _T("qemu-img"); +#else + qemuimgdir += _T("qemu-img.exe"); +#endif + /// + /// FIXME + /// call qemu-img to create the tool + /// + cerr << "Creating HDD Image ..." << endl; + } + + if (m_MaxMem == "") + { + // default to 64M + m_MaxMem = "64"; + } + if (bootfromcd) + { + m_BootCmd = m_EmuPath + _T(" -serial pipe:qemu -L ") + qemupath + _T(" -m ") + m_MaxMem + _T(" -hda ") + m_HDDImage + _T(" -boot d -cdrom ") + m_CDImage; + } + else + { + m_BootCmd = m_EmuPath + _T(" -L ") + qemupath + _T(" -m ") + m_MaxMem + _T(" -boot c -serial pipe:sysreg"); + } + + if (m_KillEmulator == _T("yes")) + { #ifdef __LINUX__ - m_DataSource = new PipeReader(); + m_BootCmd += _T(" -pidfile pid.txt"); +#endif + } + else + { + m_BootCmd += _T(" -no-reboot "); + } + + cerr << "Opening Data Source:" << m_BootCmd << endl; + + +#ifdef __LINUX__ + m_DataSource = new PipeReader(); + m_Src = m_BootCmd; #else - m_DataSource = new NamedPipeReader(); + m_DataSource = new NamedPipeReader(); + m_Src = _T("\\\\.\\pipe\\qemu"); + + if (!executeBootCmd()) + { + cerr << "Error: failed to launch emulator with: " << m_BootCmd << endl; + return false; + } #endif - return true; - } - } - } - else if (!_tcscmp(m_DebugPort.c_str(), _T("vmwarepipe"))) - { - cerr << "VmWare debug pipe is currently fixed to \\\\.\\pipe\\vmwaredebug" << endl; - m_Pipe = _T("\\\\.\\pipe\\vmwaredebug"); -#ifdef __LINUX__ - m_DataSource = new PipeReader(); -#else - m_DataSource = new NamedPipeReader(); -#endif - - return true; - } - - // - // FIXME - // support other emulators + return true; + } + +//--------------------------------------------------------------------------------------- + bool RosBootTest::configureVmWare() + { + cerr << "VmWare is currently not yet supported" << endl; return false; } //--------------------------------------------------------------------------------------- - bool RosBootTest::configureFile() - { - if (!_tcscmp(m_DebugPort.c_str(), _T("qemufile"))) - { - string::size_type file_pos = m_BootCmd.find(_T("-serial file:")); - if (file_pos != string::npos) - { - file_pos += 12; - string::size_type file_pos_end = m_BootCmd.find (_T(" "), file_pos); - if (file_pos != string::npos && file_pos_end != string::npos) - { - m_File = m_BootCmd.substr (file_pos, file_pos_end - file_pos); - m_DataSource = new FileReader(); - return true; - } - cerr << "Error: missing space at end of option" << endl; - } - } - else if (!_tcscmp(m_DebugPort.c_str(), _T("vmwarefile"))) - { - cerr << "VmWare debug file is currently fixed to debug.log" << endl; - m_File = "debug.log"; - m_DataSource = new FileReader(); - return true; - } - - // - // FIXME - // support other emulators - - return false; - } -//--------------------------------------------------------------------------------------- bool RosBootTest::readConfigurationValues(ConfigParser &conf_parser) { - /// - /// read required configuration arguments - /// - - - - if (!conf_parser.getStringValue (RosBootTest::DEBUG_PORT, m_DebugPort)) - { - cerr << "Error: ROSBOOT_DEBUG_TYPE is not set in configuration file" << endl; - return false; - } - if (!conf_parser.getStringValue(RosBootTest::VARIABLE_NAME, m_BootCmd)) - { - cerr << "Error: ROSBOOT_CMD is not set in configuration file" << endl; - return false; - } - - string timeout; - if (conf_parser.getStringValue(RosBootTest::TIME_OUT, timeout)) - { - TCHAR * stop; - m_Timeout = _tcstod(timeout.c_str (), &stop); - - if (isnan(m_Timeout) || m_Timeout == 0.0) - { - cerr << "Warning: overriding timeout with default of 60 sec" << endl; - m_Timeout = 60.0; - } - } - - string delayread; - if (conf_parser.getStringValue(RosBootTest::DELAY_READ, delayread)) - { - TCHAR * stop; - m_Delayread = _tcstoul(delayread.c_str (), &stop, 10); - if (m_Delayread > 60 || m_Delayread < 0) - { - cerr << "Warning: disabling delay read" << endl; - m_Delayread = 0; - } - } - - /// - /// read optional arguments - /// - - conf_parser.getStringValue (RosBootTest::CHECK_POINT, m_Checkpoint); - conf_parser.getStringValue (RosBootTest::CRITICAL_APP, m_CriticalApp); - conf_parser.getStringValue (RosBootTest::DEBUG_FILE, m_DebugFile); - conf_parser.getStringValue (RosBootTest::TERMINATE_EMULATOR, m_KillEmulator); + if (!conf_parser.getStringValue(RosBootTest::ROS_EMU_TYPE, m_EmuType)) + { + cerr << "Error: ROS_EMU_TYPE is not set" << endl; + return false; + } + + if (!conf_parser.getStringValue(RosBootTest::ROS_EMU_PATH, m_EmuPath)) + { + cerr << "Error: ROS_EMU_PATH is not set" << endl; + return false; + } + + conf_parser.getStringValue (RosBootTest::ROS_HDD_IMAGE, m_HDDImage); + conf_parser.getStringValue (RosBootTest::ROS_CD_IMAGE, m_CDImage); + conf_parser.getDoubleValue (RosBootTest::ROS_MAX_TIME, m_MaxTime); + conf_parser.getStringValue (RosBootTest::ROS_LOG_FILE, m_DebugFile); + conf_parser.getStringValue (RosBootTest::ROS_SYM_DIR, m_SymDir); + conf_parser.getIntValue (RosBootTest::ROS_DELAY_READ, m_DelayRead); + conf_parser.getStringValue (RosBootTest::ROS_SYSREG_CHECKPOINT, m_Checkpoint); + conf_parser.getStringValue (RosBootTest::ROS_CRITICAL_IMAGE, m_CriticalImage); + conf_parser.getStringValue (RosBootTest::ROS_EMU_KILL, m_KillEmulator); + conf_parser.getStringValue (RosBootTest::ROS_EMU_MEM, m_MaxMem); return true; } //--------------------------------------------------------------------------------------- bool RosBootTest::execute(ConfigParser &conf_parser) { - if (!readConfigurationValues(conf_parser)) { return false; } - - string src; - - if (m_DebugPort.find(_T("pipe")) != string::npos) - { - if (!configurePipe()) + + if (m_EmuType == EMU_TYPE_QEMU) + { + if (!configureQemu()) { - cerr << "Error: failed to configure pipe" << endl; + cerr << "Error: failed to configure qemu" << endl; return false; } - -#ifndef __LINUX__ - if (!executeBootCmd()) + } + else if (m_EmuType == EMU_TYPE_VMWARE) + { + if (!configureVmWare()) { - cerr << "Error: failed to launch emulator" << endl; + cerr << "Error: failed to configure vmware" << endl; return false; } -#endif - src = m_Pipe; - } - else if (m_DebugPort.find(_T("file")) != string::npos) - { - if (!configureFile()) - { - cerr << "Error: failed to configure pipe" << endl; - return false; - } - if (!executeBootCmd()) - { - cerr << "Error: failed to launch emulator" << endl; - return false; - } - - src = m_File; - } - - if (!m_DataSource->openSource(src)) - { - cerr << "Error: failed to open data source with " << src << endl; - return false; - } + } + else + { + /// + /// unsupported emulator + + cerr << "Error: ROS_EMU_TYPE value is not supported:" << m_EmuType << "=" << EMU_TYPE_QEMU << endl; + return false; + } + + OsSupport::sleep(500); + + if (!m_DataSource->openSource(m_Src)) + { + cerr << "Error: failed to open data source with " << m_Src << endl; + return false; + } + + OsSupport::sleep(3000); bool ret = analyzeDebugData(); @@ -314,10 +305,10 @@ cout << line << endl; - if (line.find (RosBootTest::SYSREG_CHECKPOINT) != string::npos) - { - line.erase (0, line.find (RosBootTest::SYSREG_CHECKPOINT) + - RosBootTest::SYSREG_CHECKPOINT.length ()); + if (line.find (RosBootTest::ROS_SYSREG_CHECKPOINT) != string::npos) + { + line.erase (0, line.find (RosBootTest::ROS_SYSREG_CHECKPOINT) + + RosBootTest::ROS_SYSREG_CHECKPOINT.length ()); if (!_tcsncmp(line.c_str (), m_Checkpoint.c_str (), m_Checkpoint.length ())) { state = DebugStateCPReached; @@ -357,7 +348,7 @@ } else if (line.find (_T("Unhandled exception")) != string::npos) { - if (m_CriticalApp == _T("IGNORE")) + if (m_CriticalImage == _T("IGNORE")) { /// /// ignoring all user-mode exceptions @@ -403,7 +394,7 @@ } string appname = modulename.substr (pos + 1, modulename.length () - pos); - if (m_CriticalApp.find (appname) == string::npos && m_CriticalApp.length () > 1) + if (m_CriticalImage.find (appname) == string::npos && m_CriticalImage.length () > 1) { /// the application is not in the list of /// critical apps. Therefore we ignore the user-mode @@ -453,6 +444,11 @@ //--------------------------------------------------------------------------------------- bool RosBootTest::isTimeout(double max_timeout) { + if (max_timeout == 0) + { + // no timeout specified + return false; + } static time_t start = 0; if (!start) @@ -493,7 +489,7 @@ write_log = file.is_open (); while(1) { - if (isTimeout(m_Timeout)) + if (isTimeout(m_MaxTime)) { break; } Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Fri Jul 20 22:55:03 2007 @@ -11,6 +11,8 @@ */ #include "data_source.h" #include "conf_parser.h" +#include "os_support.h" +#include "user_types.h" #include <vector> #include <unistd.h> @@ -19,6 +21,8 @@ { using std::vector; using System_::DataSource; + using System_::OsSupport; + //--------------------------------------------------------------------------------------- /// @@ -30,17 +34,22 @@ class RosBootTest { public: - static string VARIABLE_NAME; - static string CLASS_NAME; - static string DEBUG_PORT; - static string DEBUG_FILE; - static string TIME_OUT; - static string PID_FILE; - static string CHECK_POINT; - static string SYSREG_CHECKPOINT; - static string DELAY_READ; - static string CRITICAL_APP; - static string TERMINATE_EMULATOR; + + static string ROS_EMU_TYPE; + static string EMU_TYPE_QEMU; + static string EMU_TYPE_VMWARE; + static string ROS_EMU_PATH; + static string ROS_HDD_IMAGE; + static string ROS_CD_IMAGE; + static string ROS_MAX_TIME; + static string ROS_LOG_FILE; + static string ROS_SYM_DIR; + static string ROS_DELAY_READ; + static string ROS_SYSREG_CHECKPOINT; + static string ROS_CRITICAL_IMAGE; + static string ROS_EMU_KILL; + static string ROS_EMU_MEM; + //--------------------------------------------------------------------------------------- /// @@ -81,7 +90,8 @@ bool configureFile(); bool analyzeDebugData(); bool readConfigurationValues(ConfigParser & conf_parser); - + bool configureQemu(); + bool configureVmWare(); //--------------------------------------------------------------------------------------- /// @@ -122,22 +132,26 @@ protected: - double m_Timeout; - string m_Checkpoint; - string m_CriticalApp; - string m_DebugFile; - string m_BootCmd; - string m_DebugPort; - string m_Pipe; - string m_File; - string m_KillEmulator; - DataSource * m_DataSource; - vector <string> m_Checkpoints; - unsigned long m_Delayread; - long m_Pid; - long m_DelayRead; + string m_EmuType; + string m_EmuPath; + string m_HDDImage; + string m_CDImage; + double m_MaxTime; + string m_DebugFile; + string m_SymDir; + long int m_DelayRead; + string m_Checkpoint; + string m_CriticalImage; + string m_KillEmulator; + string m_MaxMem; + string m_BootCmd; + string m_Src; - }; // end of class RosBootTest + DataSource * m_DataSource; + OsSupport::ProcessID m_Pid; + std::vector<string> m_Checkpoints; + + }; // end of class RosBootTest } // end of namespace Sysreg_ Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg Fri Jul 20 22:55:03 2007 @@ -14,13 +14,13 @@ ROS_EMU_PATH=E:\reactos\qemu\qemu.exe -; ROS_HD_IMAGE +; ROS_HDD_IMAGE ; ; The hdd image to use for running the emulator. If this variable is not ; set, SysReg will create a HDD with name "ros.img" using the qemu-img tool. It will search ; this tool in the directory of emulator and abort if the tool cannot be found -ROS_HD_IMAGE=E:\reactos\qemu\RosVMDK.img +ROS_HDD_IMAGE=E:\reactos\qemu\ReactOS.hd ; ROS_CD_IMAGE ; @@ -29,7 +29,7 @@ ; from harddisk. ; -ROS_CD_IMAGE=E:\reactos\qemu\Reactos-RegTest.iso +ROS_CD_IMAGE=E:\reactos\qemu\Reactos.iso ;------------------------------------------------------------------------------------------- ; Additional Options @@ -62,7 +62,7 @@ ; ; Note: set this value if you have problems with timeouts or cutoff debugging data ; -; ROS_DELAY_READ=4 +ROS_DELAY_READ=4000 ; ROS_CHECK_POINT ; @@ -77,3 +77,19 @@ ; that the test has failed and quit debugging immediately ; ;ROS_CRITICAL_IMAGE=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe + +; ROS_EMU_KILL +; +; Set this variable to true if you want SysReg to kill the emulator process when it has decided to exit. +; +; Note: Qemu>=0.9.0 has the option to shutdown on reboot (-no--reboot) +; +; ROS_EMU_KILL=yes + +; ROS_EMU_MEM +; +; Controls how much memory the emulator use for ReactOS +; +; ROS_EMU_MEM=64 + +

1 0

[greatlrd] 27758: reform the code. less warings and errors in vc
by greatlrd＠svn.reactos.org 20 Jul '07

20 Jul '07

Author: greatlrd Date: Fri Jul 20 20:59:44 2007 New Revision: 27758 URL: http://svn.reactos.org/svn/reactos?rev=27758&view=rev Log: reform the code. less warings and errors in vc Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/metafile.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/metafile.c Fri Jul 20 20:59:44 2007 @@ -293,27 +293,28 @@ LPCWSTR Description) { PDC Dc; - HDC ret = NULL; + HDC ret = NULL; DWORD length = 0; HDC tempHDC; DWORD MemSize; + DWORD dwDesiredAccess; tempHDC = hDCRef; if (hDCRef == NULL) { - /* FIXME ?? - * Shall we create hdc NtGdiHdcCompatible hdc ?? - */ - UNICODE_STRING DriverName; - RtlInitUnicodeString(&DriverName, L"DISPLAY"); - //IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); + /* FIXME ?? + * Shall we create hdc NtGdiHdcCompatible hdc ?? + */ + UNICODE_STRING DriverName; + RtlInitUnicodeString(&DriverName, L"DISPLAY"); + //IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); tempHDC = NtGdiOpenDCW( &DriverName, NULL, NULL, 0, // DCW 0 and ICW 1. NULL, (PVOID) NULL, - (PVOID) NULL ); + (PVOID) NULL ); } GDIOBJ_SetOwnership(GdiHandleTable, tempHDC, PsGetCurrentProcess()); @@ -407,45 +408,44 @@ DPRINT1("Trying Create EnhMetaFile\n"); /* disk based metafile */ - DWORD dwDesiredAccess = GENERIC_WRITE | GENERIC_READ | SYNCHRONIZE | FILE_READ_ATTRIBUTES; + dwDesiredAccess = GENERIC_WRITE | GENERIC_READ | SYNCHRONIZE | FILE_READ_ATTRIBUTES; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - IO_STATUS_BLOCK Iosb; + IO_STATUS_BLOCK Iosb; UNICODE_STRING NtPathU; - NTSTATUS Status; + NTSTATUS Status; ULONG FileAttributes = (FILE_ATTRIBUTE_VALID_FLAGS & ~FILE_ATTRIBUTE_DIRECTORY); - - if (!RtlDosPathNameToNtPathName_U (File, &NtPathU, NULL, NULL)) - { + + if (!RtlDosPathNameToNtPathName_U (File, &NtPathU, NULL, NULL)) + { DC_UnlockDc(Dc); if (hDCRef == NULL) { - NtGdiDeleteObjectApp(tempHDC); - } + NtGdiDeleteObjectApp(tempHDC); + } DPRINT1("Can not Create EnhMetaFile\n"); SetLastWin32Error(ERROR_PATH_NOT_FOUND); return NULL; } - - - InitializeObjectAttributes(&ObjectAttributes, &NtPathU, 0, NULL, NULL); + + InitializeObjectAttributes(&ObjectAttributes, &NtPathU, 0, NULL, NULL); Status = NtCreateFile (&Dc->hFile, dwDesiredAccess, &ObjectAttributes, &IoStatusBlock, - NULL, FileAttributes, 0, FILE_OVERWRITE_IF, FILE_NON_DIRECTORY_FILE, - NULL, 0); + NULL, FileAttributes, 0, FILE_OVERWRITE_IF, FILE_NON_DIRECTORY_FILE, + NULL, 0); RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathU.Buffer); if (!NT_SUCCESS(Status)) - { - Dc->hFile = NULL; - DC_UnlockDc(Dc); + { + Dc->hFile = NULL; + DC_UnlockDc(Dc); if (hDCRef == NULL) { - NtGdiDeleteObjectApp(tempHDC); + NtGdiDeleteObjectApp(tempHDC); } - DPRINT1("Create EnhMetaFile fail\n"); - SetLastWin32Error(ERROR_INVALID_HANDLE); + DPRINT1("Create EnhMetaFile fail\n"); + SetLastWin32Error(ERROR_INVALID_HANDLE); return NULL; } @@ -462,20 +462,20 @@ } if (NT_SUCCESS(Status)) - { - ret = tempHDC; - DC_UnlockDc(Dc); + { + ret = tempHDC; + DC_UnlockDc(Dc); } else { Dc->hFile = NULL; - DPRINT1("Write to EnhMetaFile fail\n"); - SetLastWin32Error(ERROR_CAN_NOT_COMPLETE); - ret = NULL; - DC_UnlockDc(Dc); + DPRINT1("Write to EnhMetaFile fail\n"); + SetLastWin32Error(ERROR_CAN_NOT_COMPLETE); + ret = NULL; + DC_UnlockDc(Dc); if (hDCRef == NULL) { - NtGdiDeleteObjectApp(tempHDC); + NtGdiDeleteObjectApp(tempHDC); } } } @@ -483,8 +483,8 @@ { DC_UnlockDc(Dc); } - - return ret; + + return ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c Fri Jul 20 20:59:44 2007 @@ -212,9 +212,7 @@ { INT ret = -1; GdiPath *pPath; - - DPRINT("Enter NtGdiGetPath\n"); - + DC *dc = DC_LockDc(hDC); if(!dc) { Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Fri Jul 20 20:59:44 2007 @@ -2502,6 +2502,8 @@ INT adv, lsb, bbx; /* These three hold to widths of the unrotated chars */ OUTLINETEXTMETRICW *potm; PVOID pvBuf = NULL; + int n = 0; + FT_CharMap found = 0, charmap; DPRINT("%p, %d, %08x, %p, %08lx, %p, %p\n", hdc, wch, iFormat, pgm, cjBuf, UnsafeBuf, pmat2); @@ -2544,8 +2546,8 @@ { DPRINT("WARNING: No charmap selected!\n"); DPRINT("This font face has %d charmaps\n", ft_face->num_charmaps); - int n; - FT_CharMap found = 0, charmap; + + for (n = 0; n < ft_face->num_charmaps; n++) { @@ -4159,13 +4161,15 @@ { /* Ulta-Ugly Hax! */ INT Ret = 0x80000000; - DPRINT("TextCharacterExtra %d", CharExtra); + PDC dc = DC_LockDc ( hDC ); if (!dc) - { + { + DPRINT("TextCharacterExtra %d", CharExtra); SetLastWin32Error(ERROR_INVALID_HANDLE); return Ret; - } + } + DPRINT("TextCharacterExtra %d", CharExtra); Ret = dc->w.charExtra; if( Set ) dc->w.charExtra = CharExtra; DC_UnlockDc(dc);

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007