Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[greatlrd] 14918: Fix so it can compile agein
by greatlrd＠svn.reactos.com 01 May '05

01 May '05

Fix so it can compile agein Modified: trunk/reactos/subsys/ntvdm/ntvdm.c _____ Modified: trunk/reactos/subsys/ntvdm/ntvdm.c --- trunk/reactos/subsys/ntvdm/ntvdm.c 2005-05-01 17:32:09 UTC (rev 14917) +++ trunk/reactos/subsys/ntvdm/ntvdm.c 2005-05-01 18:23:08 UTC (rev 14918) @@ -276,12 +276,12 @@ ULONG i; BOOL vdmStarted = FALSE; - TCHAR WelcomeMsg[RC_STRING_MAX_SIZE]; - TCHAR PromptMsg[RC_STRING_MAX_SIZE]; + WCHAR WelcomeMsg[RC_STRING_MAX_SIZE]; + WCHAR PromptMsg[RC_STRING_MAX_SIZE]; CHAR InputBuffer[255]; - LoadString( GetModuleHandle(NULL), STRING_WelcomeMsg, WelcomeMsg,sizeof(WelcomeMsg)); - LoadString( GetModuleHandle(NULL), STRING_PromptMsg, PromptMsg ,sizeof(PromptMsg)); + LoadString( GetModuleHandle(NULL), STRING_WelcomeMsg, (LPTSTR) WelcomeMsg,sizeof(WelcomeMsg)); + LoadString( GetModuleHandle(NULL), STRING_PromptMsg, (LPTSTR) PromptMsg ,sizeof(PromptMsg)); AllocConsole(); SetConsoleTitleW(L"ntvdm");

1 0

[greatlrd] 14917: Remove some hardcode strings
by greatlrd＠svn.reactos.com 01 May '05

01 May '05

Remove some hardcode strings to En.rc Added: trunk/reactos/subsys/ntvdm/En.rc Modified: trunk/reactos/subsys/ntvdm/ntvdm.c Modified: trunk/reactos/subsys/ntvdm/ntvdm.rc Added: trunk/reactos/subsys/ntvdm/resource.h _____ Added: trunk/reactos/subsys/ntvdm/En.rc --- trunk/reactos/subsys/ntvdm/En.rc 2005-05-01 15:18:45 UTC (rev 14916) +++ trunk/reactos/subsys/ntvdm/En.rc 2005-05-01 17:32:09 UTC (rev 14917) @@ -0,0 +1,13 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +STRING_WelcomeMsg, "ReactOS Virtual DOS Machine support.\n" +STRING_PromptMsg, "Type r<cr> to run, s<cr> to shutdown or q<cr> to quit now." +} _____ Modified: trunk/reactos/subsys/ntvdm/ntvdm.c --- trunk/reactos/subsys/ntvdm/ntvdm.c 2005-05-01 15:18:45 UTC (rev 14916) +++ trunk/reactos/subsys/ntvdm/ntvdm.c 2005-05-01 17:32:09 UTC (rev 14917) @@ -15,6 +15,7 @@ #include <windows.h> #include <stdio.h> #include <wchar.h> +#include "resource.h" #define NDEBUG #include <debug.h> @@ -205,6 +206,7 @@ SYSTEM_INFO inf; MEMORYSTATUS stat; + GlobalMemoryStatus(&stat); if (stat.dwLength != sizeof(MEMORYSTATUS)) { printf("WARNING: GlobalMemoryStatus() returned unknown structure version, size %ld, expected %d.\n", stat.dwLength, sizeof(stat)); @@ -223,6 +225,7 @@ //SetLastError(); return FALSE; } + } GetSystemInfo(&inf); @@ -273,10 +276,13 @@ ULONG i; BOOL vdmStarted = FALSE; - WCHAR WelcomeMsg[] = L"ReactOS Virtual DOS Machine support.\n"; - WCHAR PromptMsg[] = L"Type r<cr> to run, s<cr> to shutdown or q<cr> to quit now."; + TCHAR WelcomeMsg[RC_STRING_MAX_SIZE]; + TCHAR PromptMsg[RC_STRING_MAX_SIZE]; CHAR InputBuffer[255]; - + + LoadString( GetModuleHandle(NULL), STRING_WelcomeMsg, WelcomeMsg,sizeof(WelcomeMsg)); + LoadString( GetModuleHandle(NULL), STRING_PromptMsg, PromptMsg ,sizeof(PromptMsg)); + AllocConsole(); SetConsoleTitleW(L"ntvdm"); _____ Modified: trunk/reactos/subsys/ntvdm/ntvdm.rc --- trunk/reactos/subsys/ntvdm/ntvdm.rc 2005-05-01 15:18:45 UTC (rev 14916) +++ trunk/reactos/subsys/ntvdm/ntvdm.rc 2005-05-01 17:32:09 UTC (rev 14917) @@ -1,6 +1,10 @@ /* $Id$ */ +#include <windows.h> #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Virtual DOS Machine\0" #define REACTOS_STR_INTERNAL_NAME "ntvdm\0" #define REACTOS_STR_ORIGINAL_FILENAME "ntvdm.exe\0" #include <reactos/version.rc> + +#include "En.rc" + _____ Added: trunk/reactos/subsys/ntvdm/resource.h --- trunk/reactos/subsys/ntvdm/resource.h 2005-05-01 15:18:45 UTC (rev 14916) +++ trunk/reactos/subsys/ntvdm/resource.h 2005-05-01 17:32:09 UTC (rev 14917) @@ -0,0 +1,6 @@ +#define RC_STRING_MAX_SIZE 2048 +#define STRING_WelcomeMsg 100 +#define STRING_PromptMsg 101 + + +/* EOF */

1 0

[greatlrd] 14916: Move english langues to own .rc file (En.rc) so it be more easy to maintain all langues
by greatlrd＠svn.reactos.com 01 May '05

01 May '05

Move english langues to own .rc file (En.rc) so it be more easy to maintain all langues Added: trunk/reactos/lib/cpl/main/En.rc Modified: trunk/reactos/lib/cpl/main/main.rc _____ Added: trunk/reactos/lib/cpl/main/En.rc --- trunk/reactos/lib/cpl/main/En.rc 2005-05-01 14:53:57 UTC (rev 14915) +++ trunk/reactos/lib/cpl/main/En.rc 2005-05-01 15:18:45 UTC (rev 14916) @@ -0,0 +1,33 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Property Page 1" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 1",-1,73,74,90,8 +END + +IDD_PROPPAGE2 DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Property Page 2" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 2",-1,73,74,90,8 +END + +IDD_PROPPAGE3 DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Property Page 3" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 3",-1,73,74,90,8 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "Mouse" + IDS_CPLDESCRIPTION_1 "Changes mouse settings." + IDS_CPLNAME_2 "Keyboard" + IDS_CPLDESCRIPTION_2 "Changes keyboard settings." +END _____ Modified: trunk/reactos/lib/cpl/main/main.rc --- trunk/reactos/lib/cpl/main/main.rc 2005-05-01 14:53:57 UTC (rev 14915) +++ trunk/reactos/lib/cpl/main/main.rc 2005-05-01 15:18:45 UTC (rev 14916) @@ -13,37 +13,5 @@ IDC_CPLICON_1 ICON "resources/mouse.ico" IDC_CPLICON_2 ICON "resources/keyboard.ico" +#include "En.rc" -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 1" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 -END - -IDD_PROPPAGE2 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 2" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 -END - -IDD_PROPPAGE3 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 3" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 -END - -STRINGTABLE -BEGIN - IDS_CPLNAME_1 "Mouse" - IDS_CPLDESCRIPTION_1 "Changes mouse settings." - IDS_CPLNAME_2 "Keyboard" - IDS_CPLDESCRIPTION_2 "Changes keyboard settings." -END

1 0

[greatlrd] 14915: Move english langues to own .rc file (En.rc) so it be more easy to maintain all langues
by greatlrd＠svn.reactos.com 01 May '05

01 May '05

Move english langues to own .rc file (En.rc) so it be more easy to maintain all langues Added: trunk/reactos/lib/cpl/access/En.rc Modified: trunk/reactos/lib/cpl/access/access.rc _____ Added: trunk/reactos/lib/cpl/access/En.rc --- trunk/reactos/lib/cpl/access/En.rc 2005-05-01 14:42:04 UTC (rev 14914) +++ trunk/reactos/lib/cpl/access/En.rc 2005-05-01 14:53:57 UTC (rev 14915) @@ -0,0 +1,109 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDI_CPLACCESS ICON "resources/applet.ico" + + +IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Keyboard" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "StickyKeys",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Use StickyKeys if you want to use Shift, Ctrl, or Alt key by pressing one key at at time.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*P ROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "Use StickyKeys",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPS HEETPADDING),14 + PUSHBUTTON "&Settings",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(5)+2,(15*PROPSHEETPADDING),14 + GROUPBOX "FilterKeys",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSH EETPADDING),LABELLINE(7)+2 + LTEXT "Use FilterKeys if you want Reactos to ignore brief or repeated keystrokes, or slow the repeat rate.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "Use FilterKeys",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROP SHEETPADDING),14 + PUSHBUTTON "&Settings",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(13)+2,(15*PROPSHEETPADDING),14 + GROUPBOX "ToggleKeys",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPS HEETPADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Use ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "Use ToggleKeys",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEE TWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + PUSHBUTTON "&Settings",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(20)+2,(15*PROPSHEETPADDING),14 +// CHECKBOX "Show extra keyboard help in programs",IDC_KEYBOARD_EXTRA +END + + +IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Sound" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "SoundSentry",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHE ETPADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Use SoundSentry if you want Reactos to generate visual warnings when your system makes a sound.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6* PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "Use &SoundSentry",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PRO PSHEETPADDING),14 + PUSHBUTTON "&Settings",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(5)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "ShowSounds",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSH EETPADDING),LABELLINE(7)+2 + LTEXT "Use ShowSounds to tell your programs to display captions for the speech and sounds they make.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "Use S&howSounds",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEE TWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) +END + + +IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Display" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "High Contrast",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPA DDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Use this option if you want Reactos to use colors and fonts designed for easy reading.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "&Use High Contrast",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPS HEETPADDING),14 + PUSHBUTTON "&Settings",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LAB ELLINE(5)+2,(15*PROPSHEETPADDING),14 +END + + + +IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Mouse" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "MouseKeys",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEET PADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Use this option if you want to control the pointer with the numeric keypad on your keyboard.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "Use &MouseKeys",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSH EETPADDING),14 + PUSHBUTTON "&Settings",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELL INE(5)+2,(15*PROPSHEETPADDING),14 +END + + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDI NG),LABELLINE(5) + CHECKBOX "&Turn off accessibility features after idle for:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + + //POPUP IDC_RESET_POPUP, GRAYED + //{ + // MENUITEM "5 Minutes", IDC_RESET_5 + // MENUITEM "10 Minutes", IDC_RESET_10 + // MENUITEM "15 Minutes", IDC_RESET_15 + // MENUITEM "20 Minutes", IDC_RESET_20 + // MENUITEM "25 Minutes", IDC_RESET_25 + // MENUITEM "30 Minutes", IDC_RESET_30 + //} + + GROUPBOX "Notification",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2*PROP SHEETPADDING),LABELLINE(5) + CHECKBOX "Give warning message when turning a feature on",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLINE(8)-2,PROPSHE ETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "Make a sound when turning a feature on or off",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10)-2,PROPSHE ETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) + + + GROUPBOX "SerialKey Devices",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PROPSHEET PADDING),LABELLINE(5) + LTEXT "SerialKey devices allow alternative access to keyboard and mouse features.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "Support &SerialKey devices",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)-4,PR OPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) + + PUSHBUTTON "S&ettings",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + + GROUPBOX "Administrative options",-1,PROPSHEETPADDING,LABELLINE(19)-4,PROPSHEETWIDTH-(2*PROPSHEET PADDING),LABELLINE(5) + + CHECKBOX "Apply all settings to l&ogon desktop",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROPSH EETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "Apply all settings to &defaults for new users",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22)-4,PROPSHEE TWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Accessibility" + IDS_CPLSYSTEMDESCRIPTION "Customizes accessibility features for your computer." +END + _____ Modified: trunk/reactos/lib/cpl/access/access.rc --- trunk/reactos/lib/cpl/access/access.rc 2005-05-01 14:42:04 UTC (rev 14914) +++ trunk/reactos/lib/cpl/access/access.rc 2005-05-01 14:53:57 UTC (rev 14915) @@ -6,111 +6,4 @@ #define REACTOS_STR_INTERNAL_NAME "access\0" #define REACTOS_STR_ORIGINAL_FILENAME "access.cpl\0" #include <reactos/version.rc> - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -IDI_CPLACCESS ICON "resources/applet.ico" - - -IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Keyboard" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "StickyKeys",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(6)+PROPSHEETPADDING - LTEXT "Use StickyKeys if you want to use Shift, Ctrl, or Alt key by pressing one key at at time.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*P ROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - CHECKBOX "Use StickyKeys",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPS HEETPADDING),14 - PUSHBUTTON "&Settings",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(5)+2,(15*PROPSHEETPADDING),14 - GROUPBOX "FilterKeys",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSH EETPADDING),LABELLINE(7)+2 - LTEXT "Use FilterKeys if you want Reactos to ignore brief or repeated keystrokes, or slow the repeat rate.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - CHECKBOX "Use FilterKeys",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROP SHEETPADDING),14 - PUSHBUTTON "&Settings",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(13)+2,(15*PROPSHEETPADDING),14 - GROUPBOX "ToggleKeys",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPS HEETPADDING),LABELLINE(6)+PROPSHEETPADDING - LTEXT "Use ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) - CHECKBOX "Use ToggleKeys",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEE TWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) - PUSHBUTTON "&Settings",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(20)+2,(15*PROPSHEETPADDING),14 -// CHECKBOX "Show extra keyboard help in programs",IDC_KEYBOARD_EXTRA -END - - -IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Sound" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "SoundSentry",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHE ETPADDING),LABELLINE(6)+PROPSHEETPADDING - LTEXT "Use SoundSentry if you want Reactos to generate visual warnings when your system makes a sound.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6* PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - CHECKBOX "Use &SoundSentry",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PRO PSHEETPADDING),14 - PUSHBUTTON "&Settings",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(5)+2,(15*PROPSHEETPADDING),14 - - GROUPBOX "ShowSounds",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSH EETPADDING),LABELLINE(7)+2 - LTEXT "Use ShowSounds to tell your programs to display captions for the speech and sounds they make.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - CHECKBOX "Use S&howSounds",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEE TWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) -END - - -IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Display" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "High Contrast",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPA DDING),LABELLINE(6)+PROPSHEETPADDING - LTEXT "Use this option if you want Reactos to use colors and fonts designed for easy reading.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - CHECKBOX "&Use High Contrast",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPS HEETPADDING),14 - PUSHBUTTON "&Settings",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LAB ELLINE(5)+2,(15*PROPSHEETPADDING),14 -END - - -IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Mouse" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "MouseKeys",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEET PADDING),LABELLINE(6)+PROPSHEETPADDING - LTEXT "Use this option if you want to control the pointer with the numeric keypad on your keyboard.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - CHECKBOX "Use &MouseKeys",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSH EETPADDING),14 - PUSHBUTTON "&Settings",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELL INE(5)+2,(15*PROPSHEETPADDING),14 -END - - -IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDI NG),LABELLINE(5) - CHECKBOX "&Turn off accessibility features after idle for:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) - - //POPUP IDC_RESET_POPUP, GRAYED - //{ - // MENUITEM "5 Minutes", IDC_RESET_5 - // MENUITEM "10 Minutes", IDC_RESET_10 - // MENUITEM "15 Minutes", IDC_RESET_15 - // MENUITEM "20 Minutes", IDC_RESET_20 - // MENUITEM "25 Minutes", IDC_RESET_25 - // MENUITEM "30 Minutes", IDC_RESET_30 - //} - - GROUPBOX "Notification",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2*PROP SHEETPADDING),LABELLINE(5) - CHECKBOX "Give warning message when turning a feature on",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLINE(8)-2,PROPSHE ETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) - CHECKBOX "Make a sound when turning a feature on or off",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10)-2,PROPSHE ETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) - - - GROUPBOX "SerialKey Devices",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PROPSHEET PADDING),LABELLINE(5) - LTEXT "SerialKey devices allow alternative access to keyboard and mouse features.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) - CHECKBOX "Support &SerialKey devices",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)-4,PR OPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) - - PUSHBUTTON "S&ettings",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) - - GROUPBOX "Administrative options",-1,PROPSHEETPADDING,LABELLINE(19)-4,PROPSHEETWIDTH-(2*PROPSHEET PADDING),LABELLINE(5) - - CHECKBOX "Apply all settings to l&ogon desktop",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROPSH EETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) - CHECKBOX "Apply all settings to &defaults for new users",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22)-4,PROPSHEE TWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) -END - - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "Accessibility" - IDS_CPLSYSTEMDESCRIPTION "Customizes accessibility features for your computer." -END +#include "En.rc"

1 0

[greatlrd] 14914: Andreas Bjerkeholt: Swedish translation, proofread by David Nordenberg
by greatlrd＠svn.reactos.com 01 May '05

01 May '05

Andreas Bjerkeholt: Swedish translation, proofread by David Nordenberg Added: trunk/reactos/lib/cpl/control/Sv.rc Modified: trunk/reactos/lib/cpl/control/control.rc _____ Added: trunk/reactos/lib/cpl/control/Sv.rc --- trunk/reactos/lib/cpl/control/Sv.rc 2005-05-01 14:39:01 UTC (rev 14913) +++ trunk/reactos/lib/cpl/control/Sv.rc 2005-05-01 14:42:04 UTC (rev 14914) @@ -0,0 +1,28 @@ +// Swedish resources by Andreas Bjerkeholt 2005-04-28 + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Arkiv" + BEGIN + MENUITEM "&Stõng", IDM_CLOSE + END + POPUP "&Visa" + BEGIN + MENUITEM "Stora ikoner", IDM_LARGEICONS + MENUITEM "SmÕ ikoner", IDM_SMALLICONS + MENUITEM "Lista", IDM_LIST + MENUITEM "Detaljerad lista", IDM_DETAILS + END + POPUP "Hjõlp" + BEGIN + MENUITEM "Om", IDM_ABOUT + END +END + _____ Modified: trunk/reactos/lib/cpl/control/control.rc --- trunk/reactos/lib/cpl/control/control.rc 2005-05-01 14:39:01 UTC (rev 14913) +++ trunk/reactos/lib/cpl/control/control.rc 2005-05-01 14:42:04 UTC (rev 14914) @@ -40,3 +40,4 @@ #include "De.rc" #include "Dk.rc" #include "Ru.rc" +#include "Sv.rc"

1 0

[ros-diffs] [greatlrd] 14913: David Nordenberg: Swedish translation, proofread by Andreas Bjerkeholt
by greatlrd＠svn.reactos.com 01 May '05

01 May '05

David Nordenberg: Swedish translation, proofread by Andreas Bjerkeholt Added: trunk/reactos/lib/userenv/Sv.rc Modified: trunk/reactos/lib/userenv/userenv.rc _____ Added: trunk/reactos/lib/userenv/Sv.rc --- trunk/reactos/lib/userenv/Sv.rc 2005-05-01 13:58:30 UTC (rev 14912) +++ trunk/reactos/lib/userenv/Sv.rc 2005-05-01 14:39:01 UTC (rev 14913) @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2005 David Nordenberg + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" + IDS_APPDATA "Application Data" + IDS_DESKTOP "Skrivbord" + IDS_FAVORITES "Favoriter" + IDS_STARTMENU "Start-meny" + IDS_PROGRAMS "Start-meny\\Program" + IDS_ADMINTOOLS "Start-meny\\Program\\Administrativa verktyg" + IDS_STARTUP "Start-meny\\Program\\Autostart" + IDS_MYDOCUMENTS "Mina dokument" + IDS_MYPICTURES "Mina dokument\\Mina bilder" + IDS_MYMUSIC "Mina dokument\\Min musik" + IDS_MYVIDEOS "Mina dokument\\Mina videoklipp" + IDS_TEMPLATES "Mallar" + IDS_RECENT "Tidigare" + IDS_SENDTO "SendTo" + IDS_PRINTHOOD "Skrivare" + IDS_NETHOOD "Nõtverket" + IDS_LOCALSETTINGS "Lokala instõllningar" + IDS_LOCALAPPDATA "Lokala instõllningar\\Application Data" + IDS_TEMP "Lokala instõllningar\\Temp" + IDS_CACHE "Lokala instõllningar\\Temporary Internet Files" + IDS_HISTORY "Lokala instõllningar\\Tidigare" + IDS_COOKIES "Cookies" + IDS_PROGRAMFILES "%SystemDrive%\\Program files" +END _____ Modified: trunk/reactos/lib/userenv/userenv.rc --- trunk/reactos/lib/userenv/userenv.rc 2005-05-01 13:58:30 UTC (rev 14912) +++ trunk/reactos/lib/userenv/userenv.rc 2005-05-01 14:39:01 UTC (rev 14913) @@ -38,3 +38,4 @@ #include "En.rc" #include "De.rc" +#include "Sv.rc"

1 0

[ekohl] 14912: - Use fixed message buffer size.
by ekohl＠svn.reactos.com 01 May '05

01 May '05

- Use fixed message buffer size. - Don't translate command options. - Only use _one_ message buffer per function. - Fix indentation mess. Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/alias.c Modified: trunk/reactos/subsys/system/cmd/attrib.c Modified: trunk/reactos/subsys/system/cmd/batch.c Modified: trunk/reactos/subsys/system/cmd/beep.c Modified: trunk/reactos/subsys/system/cmd/call.c Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/choice.c Modified: trunk/reactos/subsys/system/cmd/cls.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/cmd.rc Modified: trunk/reactos/subsys/system/cmd/cmdinput.c Modified: trunk/reactos/subsys/system/cmd/color.c Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/date.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/delay.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/dirstack.c Modified: trunk/reactos/subsys/system/cmd/echo.c Modified: trunk/reactos/subsys/system/cmd/error.c Modified: trunk/reactos/subsys/system/cmd/for.c Modified: trunk/reactos/subsys/system/cmd/free.c Modified: trunk/reactos/subsys/system/cmd/goto.c Modified: trunk/reactos/subsys/system/cmd/history.c Modified: trunk/reactos/subsys/system/cmd/if.c Modified: trunk/reactos/subsys/system/cmd/internal.c Modified: trunk/reactos/subsys/system/cmd/label.c Modified: trunk/reactos/subsys/system/cmd/locale.c Modified: trunk/reactos/subsys/system/cmd/memory.c Modified: trunk/reactos/subsys/system/cmd/misc.c Modified: trunk/reactos/subsys/system/cmd/move.c Modified: trunk/reactos/subsys/system/cmd/msgbox.c Modified: trunk/reactos/subsys/system/cmd/path.c Modified: trunk/reactos/subsys/system/cmd/pause.c Modified: trunk/reactos/subsys/system/cmd/prompt.c Modified: trunk/reactos/subsys/system/cmd/ren.c Modified: trunk/reactos/subsys/system/cmd/resource.h Modified: trunk/reactos/subsys/system/cmd/screen.c Modified: trunk/reactos/subsys/system/cmd/set.c Modified: trunk/reactos/subsys/system/cmd/shift.c Modified: trunk/reactos/subsys/system/cmd/start.c Modified: trunk/reactos/subsys/system/cmd/strtoclr.c Modified: trunk/reactos/subsys/system/cmd/time.c Modified: trunk/reactos/subsys/system/cmd/timer.c Modified: trunk/reactos/subsys/system/cmd/title.c Modified: trunk/reactos/subsys/system/cmd/type.c Modified: trunk/reactos/subsys/system/cmd/ver.c Modified: trunk/reactos/subsys/system/cmd/verify.c Modified: trunk/reactos/subsys/system/cmd/vol.c Modified: trunk/reactos/subsys/system/cmd/where.c Modified: trunk/reactos/subsys/system/cmd/window.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-05-01 12:56:25 UTC (rev 14911) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-05-01 13:58:30 UTC (rev 14912) @@ -1,5 +1,6 @@ #include "resource.h" -/* Start move all hard code string to En.rc +/* + * Moved all hardcoded strings to En.rc. * By Magnus Olsen 2005 */ @@ -7,60 +8,60 @@ STRINGTABLE DISCARDABLE { -STRING_ATTRIB_HELP, "Displays or changes file attributes.\n\n \ -ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n \ - [/S [/D]]\n\n \ - + Sets an attribute\n \ - - Clears an attribute\n \ - R Read-only file attribute\n \ - A Archive file attribute\n \ - S System file attribute\n \ - H Hidden file attribute\n \ - /S Processes matching files in the current directory\n \ - and all subdirectories\n \ - /D Processes direcories as well\n\n \ +STRING_ATTRIB_HELP, "Displays or changes file attributes.\n\n\ +ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ + [/S [/D]]\n\n\ + + Sets an attribute\n\ + - Clears an attribute\n\ + R Read-only file attribute\n\ + A Archive file attribute\n\ + S System file attribute\n\ + H Hidden file attribute\n\ + /S Processes matching files in the current directory\n\ + and all subdirectories\n\ + /D Processes direcories as well\n\n\ Type ATTRIB without a parameter to display the attributes of all files." -STRING_ALIAS_HELP, "Sets, removes or shows aliases.\n\n \ -ALIAS [alias=[command]]\n\n \ - alias Name for an alias.\n \ - command Text to be substituted for an alias.\n\n \ -To list all aliases:\n \ - ALIAS\n\n \ -To set a new or replace an existing alias:\n \ - ALIAS da=dir a:\n\n \ -To remove an alias from the alias list:\n \ +STRING_ALIAS_HELP, "Sets, removes or shows aliases.\n\n\ +ALIAS [alias=[command]]\n\n\ + alias Name for an alias.\n\ + command Text to be substituted for an alias.\n\n\ +To list all aliases:\n\ + ALIAS\n\n\ +To set a new or replace an existing alias:\n\ + ALIAS da=dir a:\n\n\ +To remove an alias from the alias list:\n\ ALIAS da=" STRING_BEEP_HELP, "Beep the speaker.\n\nBEEP" -STRING_CALL_HELP, "Calls one batch program from another.\n\n \ -CALL [drive:][path]filename [batch-parameter]\n\n \ - batch-parameter Specifies any command-line information required by the\n \ +STRING_CALL_HELP, "Calls one batch program from another.\n\n\ +CALL [drive:][path]filename [batch-parameter]\n\n\ + batch-parameter Specifies any command-line information required by the\n\ batch program." -STRING_CD_HELP, "Changes the current directory or displays it's name\n\n \ -CHDIR [drive:][path]\n \ -CHDIR[..|-]\n \ -CD [drive:][path]\n \ -CD[..|-]\n\n \ - .. parent directory\n \ - - previous directory\n\n \ -Type CD drive: to display the current directory on the specified drive.\n \ -Type CD without a parameter to display the current drive and directory. " +STRING_CD_HELP, "Changes the current directory or displays it's name\n\n\ +CHDIR [drive:][path]\n\ +CHDIR[..|-]\n\ +CD [drive:][path]\n\ +CD[..|-]\n\n\ + .. parent directory\n\ + - previous directory\n\n\ +Type CD drive: to display the current directory on the specified drive.\n\ +Type CD without a parameter to display the current drive and directory." -STRING_CHCP_HELP, "Displays or sets the active code page number.\n\n \ -CHCP [nnn]\n\n \ - nnn Specifies the active code page number.\n\n \ +STRING_CHCP_HELP, "Displays or sets the active code page number.\n\n\ +CHCP [nnn]\n\n\ + nnn Specifies the active code page number.\n\n\ Type CHCP without a parameter to display the active code page number." -STRING_CHOICE_HELP, "Waits for the user to choose one of a set of choices.\n\n \ -CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n \ - /C[:]choices Specifies allowable keys. Default is YN.\n \ - /N Do not display choices and ? at the end of the prompt string.\n \ - /S Treat choice keys as case sensitive.\n \ - /T[:]c,nn Default choice to c after nn seconds.\n \ - text Prompt string to display.\n\n \ +STRING_CHOICE_HELP, "Waits for the user to choose one of a set of choices.\n\n\ +CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\ + /C[:]choices Specifies allowable keys. Default is YN.\n\ + /N Do not display choices and ? at the end of the prompt string.\n\ + /S Treat choice keys as case sensitive.\n\ + /T[:]c,nn Default choice to c after nn seconds.\n\ + text Prompt string to display.\n\n\ ERRORLEVEL is set to offset of key user presses in choices." STRING_CLS_HELP, "Clears the screen.\n\nCLS" @@ -79,48 +80,48 @@ STRING_CMD_HELP7," [redirections and piping]" -STRING_CMD_HELP8, "Starts a new instance of the ReactOS command line interpreter.\n\n \ -CMD [/[C|K] command][/P][/Q][/T:bf]\n\n \ - /C command Runs the specified command and terminates.\n \ - /K command Runs the specified command and remains.\n \ - /P CMD becomes permanent and runs autoexec.bat\n \ - (cannot be terminated).\n \ +STRING_CMD_HELP8, "Starts a new instance of the ReactOS command line interpreter.\n\n\ +CMD [/[C|K] command][/P][/Q][/T:bf]\n\n\ + /C command Runs the specified command and terminates.\n\ + /K command Runs the specified command and remains.\n\ + /P CMD becomes permanent and runs autoexec.bat\n\ + (cannot be terminated).\n\ /T:bf Sets the background/foreground color (see COLOR command)." -STRING_COLOR_HELP1, "Sets the default foreground and background colors.\n\n \ -COLOR [attr [/F]] \n\n \ - attr Specifies color attribute of console output\n \ - /F fill the console with color attribute\n\n \ -There are three ways to specify the colors:\n \ -1) [bright] name on [bright] name (only the first three letters are required)\n \ -2) decimal on decimal\n \ -3) two hex digits\n\n \ -Colors are:\n \ -dec hex name dec hex name\n \ -0 0 Black 8 8 Gray(Bright black)\n \ -1 1 Blue 9 9 Bright Blue\n \ -2 2 Green 10 A Bright Green\n \ -3 3 Cyan 11 B Bright Cyan\n \ -4 4 Red 12 C Bright Red\n \ -5 5 Magenta 13 D Bright Magenta\n \ -6 6 Yellow 14 E Bright Yellow\n \ +STRING_COLOR_HELP1, "Sets the default foreground and background colors.\n\n\ +COLOR [attr [/F]] \n\n\ + attr Specifies color attribute of console output\n\ + /F fill the console with color attribute\n\n\ +There are three ways to specify the colors:\n\ +1) [bright] name on [bright] name (only the first three letters are required)\n\ +2) decimal on decimal\n\ +3) two hex digits\n\n\ +Colors are:\n\ +dec hex name dec hex name\n\ +0 0 Black 8 8 Gray(Bright black)\n\ +1 1 Blue 9 9 Bright Blue\n\ +2 2 Green 10 A Bright Green\n\ +3 3 Cyan 11 B Bright Cyan\n\ +4 4 Red 12 C Bright Red\n\ +5 5 Magenta 13 D Bright Magenta\n\ +6 6 Yellow 14 E Bright Yellow\n\ 7 7 White 15 F Bright White" STRING_COPY_HELP1, "Overwrite %s (Yes/No/All)? " -STRING_COPY_HELP2, "Copies one or more files to another location.\n\n \ -COPY [/V][/Y|/-Y][/A|/B] source [/A|/B]\n \ - [+ source [/A|/B] [+ ...]] [destination [/A|/B]]\n\n \ - source Specifies the file or files to be copied.\n \ - /A Indicates an ASCII text file.\n \ - /B Indicates a binary file.\n \ - destination Specifies the directory and/or filename for the new file(s).\n \ - /V Verifies that new files are written correctly.\n \ - /Y Suppresses prompting to confirm you want to overwrite an\n \ - existing destination file.\n \ - /-Y Causes prompting to confirm you want to overwrite an\n \ - existing destination file.\n\n \ -The switch /Y may be present in the COPYCMD environment variable.\n \ +STRING_COPY_HELP2, "Copies one or more files to another location.\n\n\ +COPY [/V][/Y|/-Y][/A|/B] source [/A|/B]\n\ + [+ source [/A|/B] [+ ...]] [destination [/A|/B]]\n\n\ + source Specifies the file or files to be copied.\n\ + /A Indicates an ASCII text file.\n\ + /B Indicates a binary file.\n\ + destination Specifies the directory and/or filename for the new file(s).\n\ + /V Verifies that new files are written correctly.\n\ + /Y Suppresses prompting to confirm you want to overwrite an\n\ + existing destination file.\n\ + /-Y Causes prompting to confirm you want to overwrite an\n\ + existing destination file.\n\n\ +The switch /Y may be present in the COPYCMD environment variable.\n\ ..." STRING_DATE_HELP1, "\nEnter new date (mm%cdd%cyyyy): " @@ -129,67 +130,67 @@ STRING_DATE_HELP3, "\nEnter new date (yyyy%cmm%cdd): " -STRING_DATE_HELP4, "Displays or sets the date.\n\n \ -DATE [/T][date]\n\n \ - /T display only\n\n \ -Type DATE without parameters to display the current date setting and\n \ +STRING_DATE_HELP4, "Displays or sets the date.\n\n\ +DATE [/T][date]\n\n\ + /T display only\n\n\ +Type DATE without parameters to display the current date setting and\n\ a prompt for a new one. Press ENTER to keep the same date." -STRING_DEL_HELP1, "Deletes one or more files.\n\n \ -DEL [/%c /%c /%c /%c /%c /%c /%c] file ...\n \ -DELETE [/%c /%c /%c /%c /%c /%c /%c] file ...\n \ -ERASE [/%c /%c /%c /%c /%c /%c /%c] file ...\n\n \ - file Specifies the file(s) to delete.\n\n \ - /%c Nothing.\n \ - /%c Prompt. Ask before deleting each file.\n \ - /%c Total. Display total number of deleted files and freed disk space.\n \ - /%c Quiet.\n \ - /%c Wipe. Overwrite the file with random numbers before deleting it.\n \ - /%c Yes. Kill even *.* without asking.\n \ - /%c Zap. Delete hidden, read-only and system files).\n" +STRING_DEL_HELP1, "Deletes one or more files.\n\n\ +DEL [/N /P /T /Q /W /Y /Z] file ...\n\ +DELETE [/N /P /T /Q /W /Y /Z] file ...\n\ +ERASE [/N /P /T /Q /W /Y /Z] file ...\n\n\ + file Specifies the file(s) to delete.\n\n\ + /N Nothing.\n\ + /P Prompt. Ask before deleting each file.\n\ + /T Total. Display total number of deleted files and freed disk space.\n\ + /Q Quiet.\n\ + /W Wipe. Overwrite the file with random numbers before deleting it.\n\ + /Y Yes. Kill even *.* without asking.\n\ + /Z Zap. Delete hidden, read-only and system files.\n" STRING_DEL_HELP2, "All files in the directory will be deleted!\nAre you sure (Y/N)?" STRING_DEL_HELP3, " %lu file deleted\n" STRING_DEL_HELP4, " %lu files deleted\n" -STRING_DELAY_HELP, "pause for n seconds or milliseconds\n \ -DELAY [/m]n\n\n \ - /m specifiy than n are milliseconds\n \ +STRING_DELAY_HELP, "pause for n seconds or milliseconds\n\ +DELAY [/m]n\n\n\ + /m specifiy than n are milliseconds\n\ otherwise n are seconds" -STRING_DIR_HELP1, "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n \ - [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n \ - [drive:][path][filename]\n \ - Specifies drive, directory, and/or files to list.\n\n \ - /A Displays files with specified attributes.\n \ - attributes D Directories R Read-only files\n \ - H Hidden files A Files ready for archiving\n \ - S System files - Prefix meaning not\n \ - /B Uses bare format (no heading information or summary).\n \ - /C Display the thousand separator in file sizes. This is the\n \ - default. Use /-C to disable display of separator.\n \ - /D Same as wide but files are list sorted by column.\n \ - /L Uses lowercase.\n \ - /N New long list format where filenames are on the far right.\n \ - /O List by files in sorted order.\n \ - sortorder N By name (alphabetic) S By size (smallest first)\n \ - E By extension (alphabetic) D By date/time (oldest first)\n \ - G Group directories first - Prefix to reverse order\n \ - /P Pauses after each screenful of information.\n \ - /Q Display the owner of the file.\n \ - /S Displays files in specified directory and all subdirectories.\n \ - /T Controls which time field displayed or used for sorting\n \ - timefield C Creation\n \ - A Last Access\n \ - W Last Written\n \ - /W Uses wide list format.\n \ - /X This displays the short names generated for non-8dot3 file\n \ - names. The format is that of /N with the short name inserted\n \ - before the long name. If no short name is present, blanks are\n \ - displayed in its place.\n \ - /4 Displays four-digit years\n\n \ -Switches may be preset in the DIRCMD environment variable. Override\n \ -preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n " +STRING_DIR_HELP1, "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ + [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ + [drive:][path][filename]\n\ + Specifies drive, directory, and/or files to list.\n\n\ + /A Displays files with specified attributes.\n\ + attributes D Directories R Read-only files\n\ + H Hidden files A Files ready for archiving\n\ + S System files - Prefix meaning not\n\ + /B Uses bare format (no heading information or summary).\n\ + /C Display the thousand separator in file sizes. This is the\n\ + default. Use /-C to disable display of separator.\n\ + /D Same as wide but files are list sorted by column.\n\ + /L Uses lowercase.\n\ + /N New long list format where filenames are on the far right.\n\ + /O List by files in sorted order.\n\ + sortorder N By name (alphabetic) S By size (smallest first)\n\ + E By extension (alphabetic) D By date/time (oldest first)\n\ + G Group directories first - Prefix to reverse order\n\ + /P Pauses after each screenful of information.\n\ + /Q Display the owner of the file.\n\ + /S Displays files in specified directory and all subdirectories.\n\ + /T Controls which time field displayed or used for sorting\n\ + timefield C Creation\n\ + A Last Access\n\ + W Last Written\n\ + /W Uses wide list format.\n\ + /X This displays the short names generated for non-8dot3 file\n\ + names. The format is that of /N with the short name inserted\n\ + before the long name. If no short name is present, blanks are\n\ + displayed in its place.\n\ + /4 Displays four-digit years\n\n\ +Switches may be preset in the DIRCMD environment variable. Override\n\ +preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n" STRING_DIR_HELP2, " Volume in drive %c is %s" STRING_DIR_HELP3, " Volume in drive %c has no label" @@ -199,9 +200,9 @@ STRING_DIR_HELP7, "\n Directory of %s\n\n" STRING_DIR_HELP8, "%16i Dir(s)% 14s bytes\n" -STRING_DIRSTACK_HELP1, "Stores the current directory for use by the POPD command, then\n \ -changes to the specified directory.\n\n \ -PUSHD [path | ..]\n\n \ +STRING_DIRSTACK_HELP1, "Stores the current directory for use by the POPD command, then\n\ +changes to the specified directory.\n\n\ +PUSHD [path | ..]\n\n\ path Specifies the directory to make the current directory" STRING_DIRSTACK_HELP2, "Changes to the directory stored by the PUSHD command.\n\nPOPD" @@ -210,61 +211,61 @@ STRING_DIRSTACK_HELP4, "Directory stack empty" -STRING_ECHO_HELP1, "Display a messages without trailing carridge return and line feed.\n\n \ +STRING_ECHO_HELP1, "Display a messages without trailing carridge return and line feed.\n\n\ ECHOS message" -STRING_ECHO_HELP2, "Displays a message to the standard error.\n\n \ - ECHOERR message\n \ +STRING_ECHO_HELP2, "Displays a message to the standard error.\n\n\ + ECHOERR message\n\ ECHOERR. prints an empty line" -STRING_ECHO_HELP3, "Prints a messages to standard error output without trailing carridge return and line feed.\n\n \ +STRING_ECHO_HELP3, "Prints a messages to standard error output without trailing carridge return and line feed.\n\n\ ECHOSERR message" -STRING_ECHO_HELP4, "Displays a message or switches command echoing on or off.\n\n \ - ECHO [ON | OFF]\n \ - ECHO [message]\n \ - ECHO. prints an empty line\n\n \ +STRING_ECHO_HELP4, "Displays a message or switches command echoing on or off.\n\n\ + ECHO [ON | OFF]\n\ + ECHO [message]\n\ + ECHO. prints an empty line\n\n\ Type ECHO without a parameter to display the current ECHO setting." STRING_ECHO_HELP5, "ECHO is %s\n" STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT" -STRING_FOR_HELP1, "Runs a specified command for each file in a set of files\n\n \ -FOR %variable IN (set) DO command [parameters]\n\n \ - %variable Specifies a replaceable parameter.\n \ - (set) Specifies a set of one or more files. Wildcards may be used.\n \ - command Specifies the command to carry out for each file.\n \ - parameters Specifies parameters or switches for the specified command.\n\n \ -To user the FOR comamnd in a batch program, specify %%variable instead of\n \ +STRING_FOR_HELP1, "Runs a specified command for each file in a set of files\n\n\ +FOR %variable IN (set) DO command [parameters]\n\n\ + %variable Specifies a replaceable parameter.\n\ + (set) Specifies a set of one or more files. Wildcards may be used.\n\ + command Specifies the command to carry out for each file.\n\ + parameters Specifies parameters or switches for the specified command.\n\n\ +To user the FOR comamnd in a batch program, specify %%variable instead of\n\ %variable." -STRING_FREE_HELP1, "\n Volume in drive %s is %-11s Serial number is %s\n \ - %16s bytes total disk space\n \ - %16s bytes used\n \ +STRING_FREE_HELP1, "\n Volume in drive %s is %-11s Serial number is %s\n\ + %16s bytes total disk space\n\ + %16s bytes used\n\ %16s bytes free\n" STRING_FREE_HELP2, "Displays drive information.\n\nFREE [drive: ...]" -STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n \ - IF [NOT] ERRORLEVEL number command\n \ - IF [NOT] string1==string2 command\n \ - IF [NOT] EXIST filename command\n \ - IF [NOT] DEFINED variable command\n\n \ -NOT Specifies that CMD should carry out the command only if\n \ - the condition is false\n \ -ERRORLEVEL number Specifies a true condition if the last program run returned\n \ - an exit code equal or greater than the number specified.\n \ -command Specifies the command to carry out if the condition is met.\n \ -string1==string2 Specifies a true condition if the specified text strings\n \ - match.\n \ -EXIST filename Specifies a true condition if the specified filename exists.\n \ -DEFINED variable Specifies a true condition if the specified variable is\n \ +STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ + IF [NOT] ERRORLEVEL number command\n\ + IF [NOT] string1==string2 command\n\ + IF [NOT] EXIST filename command\n\ + IF [NOT] DEFINED variable command\n\n\ +NOT Specifies that CMD should carry out the command only if\n\ + the condition is false\n\ +ERRORLEVEL number Specifies a true condition if the last program run returned\n\ + an exit code equal or greater than the number specified.\n\ +command Specifies the command to carry out if the condition is met.\n\ +string1==string2 Specifies a true condition if the specified text strings\n\ + match.\n\ +EXIST filename Specifies a true condition if the specified filename exists.\n\ +DEFINED variable Specifies a true condition if the specified variable is\n\ defined." - -STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch script.\n\n \ -GOTO label\n\n \ - label Specifies a text string used in a batch script as a label.\n\n \ + +STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch script.\n\n\ +GOTO label\n\n\ + label Specifies a text string used in a batch script as a label.\n\n\ You type a label on a line by itself, beginning with a colon." STRING_LABEL_HELP1, "Displays or changes drive label.\n\nLABEL [drive:][label]" @@ -276,74 +277,74 @@ STRING_LOCALE_HELP1, "Current time is" -STRING_MKDIR_HELP, "Creates a directory.\n\n \ +STRING_MKDIR_HELP, "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" STRING_MEMMORY_HELP1, "Displays the amount of system memory.\n\nMEMORY" -STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n \ - %13s bytes total physical RAM.\n \ - %13s bytes available physical RAM.\n\n \ - %13s bytes total page file.\n \ - %13s bytes available page file.\n\n \ - %13s bytes total virtual memory.\n \ +STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n\ + %13s bytes total physical RAM.\n\ + %13s bytes available physical RAM.\n\n\ + %13s bytes total page file.\n\ + %13s bytes available page file.\n\n\ + %13s bytes total virtual memory.\n\ %13s bytes available virtual memory.\n" STRING_MISC_HELP1, "Press a key to continue...\n" STRING_MOVE_HELP1, "Overwrite %s (Yes/No/All)? " -STRING_MOVE_HELP2, "Moves files and renames files and directories.\n\n \ -To move one or more files:\n \ -MOVE [/N][drive:][path]filename1[,...] destination\n\n \ -To rename a directory:\n \ -MOVE [/N][drive:][path]dirname1 dirname2\n\n \ - [drive:][path]filename1 Specifies the location and name of the file\n \ - or files you want to move.\n \ - /N Nothing. Don everthing but move files or direcories.\n\n \ -Current limitations:\n \ +STRING_MOVE_HELP2, "Moves files and renames files and directories.\n\n\ +To move one or more files:\n\ +MOVE [/N][drive:][path]filename1[,...] destination\n\n\ +To rename a directory:\n\ +MOVE [/N][drive:][path]dirname1 dirname2\n\n\ + [drive:][path]filename1 Specifies the location and name of the file\n\ + or files you want to move.\n\ + /N Nothing. Do everything but move files or direcories.\n\n\ +Current limitations:\n\ - You can't move a file or directory from one drive to another.\n" -STRING_MSGBOX_HELP, "display a message box and return user responce\n\n \ -MSGBOX type ['title'] prompt\n\n \ -type button displayed\n \ - possible values are: OK, OKCANCEL,\n \ - YESNO, YESNOCANCEL\n \ -title title of message box\n \ -prompt text displayed by the message box\n\n\n \ -ERRORLEVEL is set according the button pressed:\n\n \ -YES : 10 | NO : 11\n \ +STRING_MSGBOX_HELP, "display a message box and return user responce\n\n\ +MSGBOX type ['title'] prompt\n\n\ +type button displayed\n\ + possible values are: OK, OKCANCEL,\n\ + YESNO, YESNOCANCEL\n\ +title title of message box\n\ +prompt text displayed by the message box\n\n\n\ +ERRORLEVEL is set according the button pressed:\n\n\ +YES : 10 | NO : 11\n\ OK : 10 | CANCEL : 12\n" -STRING_PATH_HELP1, "Displays or sets a search path for executable files.\n\n \ -PATH [[drive:]path[;...]]\nPATH ;\n\n \ -Type PATH ; to clear all search-path settings and direct the command shell\n \ -to search only in the current directory.\n \ +STRING_PATH_HELP1, "Displays or sets a search path for executable files.\n\n\ +PATH [[drive:]path[;...]]\nPATH ;\n\n\ +Type PATH ; to clear all search-path settings and direct the command shell\n\ +to search only in the current directory.\n\ Type PATH without parameters to display the current path.\n" -STRING_PROMPT_HELP1, "Changes the command prompt.\n\n \ -PROMPT [text]\n\n \ - text Specifies a new command prompt.\n\n \ -Prompt can be made up of normal characters and the following special codes:\n\n \ - $A & (Ampersand)\n \ - $B | (pipe)\n \ - $C ( (Left parenthesis)\n \ - $D Current date\n \ - $E Escape code (ASCII code 27)\n \ - $F ) (Right parenthesis)\n \ - $G > (greater-than sign)\n \ - $H Backspace (erases previous character)\n \ - $L < (less-than sign)\n \ - $N Current drive\n \ - $P Current drive and path\n \ - $Q = (equal sign)\n \ - $T Current time\n \ - $V OS version number\n \ - $_ Carriage return and linefeed\n \ +STRING_PROMPT_HELP1, "Changes the command prompt.\n\n\ +PROMPT [text]\n\n\ + text Specifies a new command prompt.\n\n\ +Prompt can be made up of normal characters and the following special codes:\n\n\ + $A & (Ampersand)\n\ + $B | (pipe)\n\ + $C ( (Left parenthesis)\n\ + $D Current date\n\ + $E Escape code (ASCII code 27)\n\ + $F ) (Right parenthesis)\n\ + $G > (greater-than sign)\n\ + $H Backspace (erases previous character)\n\ + $L < (less-than sign)\n\ + $N Current drive\n\ + $P Current drive and path\n\ + $Q = (equal sign)\n\ + $T Current time\n\ + $V OS version number\n\ + $_ Carriage return and linefeed\n\ $$ $ (dollar sign)" -STRING_PAUSE_HELP1, "Stops the execution of a batch file and shows the following message:\n \ -'Press any key to continue...' or a user defined message.\n\n \ +STRING_PAUSE_HELP1, "Stops the execution of a batch file and shows the following message:\n\ +'Press any key to continue...' or a user defined message.\n\n\ PAUSE [message]" STRING_PROMPT_HELP2, " $+ Displays the current depth of the directory stack" @@ -352,53 +353,53 @@ STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]" -STRING_RMDIR_HELP, "Removes a directory.\n\n \ -RMDIR [drive:]path\nRD [drive:]path" +STRING_RMDIR_HELP, "Removes a directory.\n\n\ +RMDIR [drive:]path\nRD [drive:]path" -STRING_REN_HELP1, "Renames a file/directory or files/directories.\n\n \ -RENAME [/E /N /P /Q /S /T] old_name ... new_name\n \ -REN [/E /N /P /Q /S /T] old_name ... new_name\n\n \ - /E No eror messages.\n \ - /N Nothing.\n \ - /P Prompts for confirmation before renaming each file.\n \ - (Not implemented yet!)\n \ - /Q Quiet.\n \ - /S Rename subdirectories.\n \ - /T Display total number of renamed files.\n\n \ -Note that you cannot specify a new drive or path for your destination. Use\n \ +STRING_REN_HELP1, "Renames a file/directory or files/directories.\n\n\ +RENAME [/E /N /P /Q /S /T] old_name ... new_name\n\ +REN [/E /N /P /Q /S /T] old_name ... new_name\n\n\ + /E No eror messages.\n\ + /N Nothing.\n\ + /P Prompts for confirmation before renaming each file.\n\ + (Not implemented yet!)\n\ + /Q Quiet.\n\ + /S Rename subdirectories.\n\ + /T Display total number of renamed files.\n\n\ +Note that you cannot specify a new drive or path for your destination. Use\n\ the MOVE command for that purpose." STRING_REN_HELP2, " %lu file renamed\n" STRING_REN_HELP3, " %lu files renamed\n" -STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a batch file.\n\n \ +STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a batch file.\n\n\ SHIFT [DOWN]" -STRING_SCREEN_HELP, "move cursor and optionally print text\n\n \ -SCREEN row col [text]\n\n \ - row row to wich move the cursor\n \ +STRING_SCREEN_HELP, "move cursor and optionally print text\n\n\ +SCREEN row col [text]\n\n\ + row row to wich move the cursor\n\ col column to wich move the cursor" -STRING_SET_HELP, "Displays, sets, or removes environment variables.\n\n \ -SET [variable[=][string]]\n\n \ - variable Specifies the environment-variable name.\n \ - string Specifies a series of characters to assign to the variable.\n\n \ +STRING_SET_HELP, "Displays, sets, or removes environment variables.\n\n\ +SET [variable[=][string]]\n\n\ + variable Specifies the environment-variable name.\n\ + string Specifies a series of characters to assign to the variable.\n\n\ Type SET without parameters to display the current environment variables.\n" -STRING_START_HELP1, "Starts a command.\n\n \ -START command \n\n \ - command Specifies the command to run.\n\n \ +STRING_START_HELP1, "Starts a command.\n\n\ +START command\n\n\ + command Specifies the command to run.\n\n\ At the moment all commands are started asynchronously.\n" -STRING_TITLE_HELP, "Sets the window title for the command prompt window.\n\n \ -TITLE [string]\n\n \ +STRING_TITLE_HELP, "Sets the window title for the command prompt window.\n\n\ +TITLE [string]\n\n\ string Specifies the title for the command prompt window." -STRING_TIME_HELP1, "Displays or sets the system time.\n\n \ -TIME [/T][time]\n\n \ - /T display only\n\n \ -Type TIME with no parameters to display the current time setting and a prompt\n \ +STRING_TIME_HELP1, "Displays or sets the system time.\n\n\ +TIME [/T][time]\n\n\ + /T display only\n\n\ +Type TIME with no parameters to display the current time setting and a prompt\n\ for a new one. Press ENTER to keep the same time." STRING_TIME_HELP2, "Enter new time: " @@ -407,88 +408,88 @@ STRING_TIMER_HELP2, "Elapsed %02d%c%02d%c%02d%c%02d\n" -STRING_TIMER_HELP3, "allow the use of ten stopwaches.\n\n \ -TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n \ - ON set stopwach ON\n \ - OFF set stopwach OFF\n \ - /S Split time. Return stopwach split\n \ - time without changing its value\n \ - /n Specifiy the stopwach number.\n \ - Stopwaches avaliable are 0 to 10\n \ - If it is not specified default is 1\n \ - /Fn Format for output\n \ - n can be:\n \ - 0 milliseconds\n \ - 1 hh%cmm%css%cdd\n\n \ -if none of ON, OFF or /S is specified the command\n \ +STRING_TIMER_HELP3, "allow the use of ten stopwaches.\n\n\ +TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ + ON set stopwach ON\n\ + OFF set stopwach OFF\n\ + /S Split time. Return stopwach split\n\ + time without changing its value\n\ + /n Specifiy the stopwach number.\n\ + Stopwaches avaliable are 0 to 10\n\ + If it is not specified default is 1\n\ + /Fn Format for output\n\ + n can be:\n\ + 0 milliseconds\n\ + 1 hh%cmm%css%cdd\n\n\ +if none of ON, OFF or /S is specified the command\n\ will toggle stopwach state\n\n" - + STRING_TYPE_HELP1, "Displays the contents of text files.\n\nTYPE [drive:][path]filename" -STRING_VERIFY_HELP1, "This command is just a dummy!!\n \ -Sets whether to verify that your files are written correctly to a\n \ -disk.\n\n \ -VERIFY [ON | OFF]\n\n \ +STRING_VERIFY_HELP1, "This command is just a dummy!!\n\ +Sets whether to verify that your files are written correctly to a\n\ +disk.\n\n\ +VERIFY [ON | OFF]\n\n\ Type VERIFY without a parameter to display the current VERIFY setting." STRING_VERIFY_HELP2, "VERIFY is %s.\n" STRING_VERIFY_HELP3, "Must specify ON or OFF." -STRING_VERSION_HELP1, "Displays shell version information\n\n \ -VER [/C][/R][/W]\n\n \ - /C Displays credits.\n \ - /R Displays redistribution information.\n \ +STRING_VERSION_HELP1, "Displays shell version information\n\n\ +VER [/C][/R][/W]\n\n\ + /C Displays credits.\n\ + /R Displays redistribution information.\n\ /W Displays warranty information." -STRING_VERSION_HELP2, " comes with ABSOLUTELY NO WARRANTY; for details\n \ -type: `ver /w'. This is free software, and you are welcome to redistribute\n \ -it under certain conditions; type `ver /r' for details. Type `ver /c' for a\n \ +STRING_VERSION_HELP2, " comes with ABSOLUTELY NO WARRANTY; for details\n\ +type: `ver /w'. This is free software, and you are welcome to redistribute\n\ +it under certain conditions; type `ver /r' for details. Type `ver /c' for a\n\ listing of credits." -STRING_VERSION_HELP3, "\n This program is distributed in the hope that it will be useful,\n \ - but WITHOUT ANY WARRANTY; without even the implied warranty of\n \ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n \ +STRING_VERSION_HELP3, "\n This program is distributed in the hope that it will be useful,\n\ + but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ GNU General Public License for more details." - STRING_VERSION_HELP4, "\n This program is free software; you can redistribute it and/or modify\n \ - it under the terms of the GNU General Public License as published by\n \ - the Free Software Foundation; either version 2 of the License, or\n \ +STRING_VERSION_HELP4, "\n This program is free software; you can redistribute it and/or modify\n\ + it under the terms of the GNU General Public License as published by\n\ + the Free Software Foundation; either version 2 of the License, or\n\ (at your option) any later version." -STRING_VERSION_HELP5, "\nSend bug reports to <ros-dev(a)reactos.com>.\n \ +STRING_VERSION_HELP5, "\nSend bug reports to <ros-dev(a)reactos.com>.\n\ Updates are available at: http://www.reactos.com" -STRING_VERSION_HELP6, "FreeDOS version written by:\n%s\nReactOS version written by:\n%s\n" +STRING_VERSION_HELP6, "\nFreeDOS version written by:\n" +STRING_VERSION_HELP7, "\nReactOS version written by:\n" + STRING_VOL_HELP1, " Volume in drive %c: is %s" STRING_VOL_HELP2, " Volume in drive %c: has no label" STRING_VOL_HELP3, " Volume Serial Number is %04X-%04X\n" STRING_VOL_HELP4, "Displays the disk volume label and serial number, if they exist.\n\nVOL [drive:]" -STRING_WINDOW_HELP1, "change console window aspect\n\n \ -WINDOW [/POS[=]left,top,width,heigth]\n \ - [MIN|MAX|RESTORE] ['title']\n\n \ -/POS specify window placement and dimensions\n \ -MIN minimize the window\n \ -MAX maximize the window\n \ +STRING_WINDOW_HELP1, "change console window aspect\n\n\ +WINDOW [/POS[=]left,top,width,heigth]\n\ + [MIN|MAX|RESTORE] ['title']\n\n\ +/POS specify window placement and dimensions\n\ +MIN minimize the window\n\ +MAX maximize the window\n\ RESTORE restore the window" -STRING_WINDOW_HELP2, "change console window aspect\n\n \ -ACTIAVTE 'window' [/POS[=]left,top,width,heigth]\n \ - [MIN|MAX|RESTORE] ['title']\n\n \ -window tile of window on wich perform actions\n \ -/POS specify window placement and dimensions\n \ -MIN minimize the window\n \ -MAX maximize the window\n \ -RESTORE restore the window\n \ -title new title" +STRING_WINDOW_HELP2, "change console window aspect\n\n\ +ACTIAVTE 'window' [/POS[=]left,top,width,heigth]\n\ + [MIN|MAX|RESTORE] ['title']\n\n\ +window tile of window on wich perform actions\n\ +/POS specify window placement and dimensions\n\ +MIN minimize the window\n\ +MAX maximize the window\n\ +RESTORE restore the window\n\ +title new title" - STRING_CHOICE_OPTION, "YN" STRING_COPY_OPTION, "YNA" -STRING_DEL_OPTION, "AENPQSTWXYZ" STRING_ALIAS_ERROR, "Command line too long after alias expansion!\n" @@ -515,20 +516,15 @@ STRING_COPY_ERROR3, "Error writing destination!\n" STRING_COPY_ERROR4, "Error: Not implemented yet!\n" STRING_DATE_ERROR, "Invalid date." -STRING_DEL_ERROR1, "Wildcards!\n\n" -STRING_DEL_ERROR2, "Full path: %s\n" -STRING_DEL_ERROR3, "File part: %s\n" -STRING_DEL_ERROR4, "Full filename: %s\n" STRING_DEL_ERROR5, "The file %s will be deleted! " STRING_DEL_ERROR6, "Are you sure (Y/N)?" STRING_DEL_ERROR7, "Deleting: %s\n" -STRING_DEL_ERROR8, "No Wildcards!\n" STRING_ERROR_ERROR1, "Unknown error! Error code: 0x%lx\n" STRING_ERROR_ERROR2, "Syntax error" STRING_FOR_ERROR1, "'in' missing in for statement." STRING_FOR_ERROR2, "no brackets found." STRING_FOR_ERROR3, "'do' missing." -STRING_FOR_ERROR4, "no command after 'do'." +STRING_FOR_ERROR4, "no command after 'do'." STRING_FREE_ERROR1, "Invalid drive" STRING_FREE_ERROR2, "unlabeled" STRING_GOTO_ERROR1, "No label specified for GOTO" @@ -552,18 +548,17 @@ STRING_WINDOW_ERROR1, "window not found" -STRING_ERROR_PARAMETERF_ERROR, "Parameter format not correct - %c\n" +STRING_ERROR_PARAMETERF_ERROR, "Parameter format not correct - %c\n" STRING_ERROR_INVALID_SWITCH, "Invalid switch - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS, "Too many parameters - %s\n" -STRING_ERROR_PATH_NOT_FOUND, "Path not found\n" -STRING_ERROR_FILE_NOT_FOUND, "File not found\n" -STRING_ERROR_REQ_PARAM_MISSING, "Required parameter missing\n" -STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n" +STRING_ERROR_PATH_NOT_FOUND, "Path not found\n" +STRING_ERROR_FILE_NOT_FOUND, "File not found\n" +STRING_ERROR_REQ_PARAM_MISSING, "Required parameter missing\n" +STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Invalid parameter format - %s\n" -STRING_ERROR_BADCOMMAND, "Bad command or filename\n" -STRING_ERROR_OUT_OF_MEMORY, "Out of memory error.\n" -STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary file!\n" -STRING_ERROR_D_PAUSEMSG, "Press any key to continue . . ." -STRING_ERROR_DRIVER_NOT_READY "Drive not ready" - +STRING_ERROR_BADCOMMAND, "Bad command or filename\n" +STRING_ERROR_OUT_OF_MEMORY, "Out of memory error.\n" +STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary file!\n" +STRING_ERROR_D_PAUSEMSG, "Press any key to continue . . ." +STRING_ERROR_DRIVER_NOT_READY "Drive not ready" } _____ Modified: trunk/reactos/subsys/system/cmd/alias.c --- trunk/reactos/subsys/system/cmd/alias.c 2005-05-01 12:56:25 UTC (rev 14911) +++ trunk/reactos/subsys/system/cmd/alias.c 2005-05-01 13:58:30 UTC (rev 14912) @@ -281,8 +281,9 @@ m = _tcslen (ptr->lpSubst); if ((int)(_tcslen (cmd) - len + m - n) > maxlen) { - LoadString( GetModuleHandle(NULL), STRING_ALIAS_ERROR, szMsg,sizeof(szMsg)/sizeof(TCHAR)); - ConErrPrintf (szMsg); + LoadString(GetModuleHandle(NULL), STRING_ALIAS_ERROR, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg); + /* the parser won't cause any problems with an empty line */ cmd[0] = _T('\0'); } @@ -305,13 +306,13 @@ INT CommandAlias (LPTSTR cmd, LPTSTR param) { + TCHAR szMsg[RC_STRING_MAX_SIZE]; LPTSTR ptr; - TCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp (param, _T("/?"), 2)) { - LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR)); - ConOutPuts (szMsg); + LoadString(GetModuleHandle(NULL), STRING_ALIAS_HELP, szMsg, RC_STRING_MAX_SIZE); + ConOutPuts(szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/attrib.c --- trunk/reactos/subsys/system/cmd/attrib.c 2005-05-01 12:56:25 UTC (rev 14911) +++ trunk/reactos/subsys/system/cmd/attrib.c 2005-05-01 13:58:30 UTC (rev 14912) @@ -44,7 +44,7 @@ WIN32_FIND_DATA findData; HANDLE hFind; TCHAR szFullName[MAX_PATH]; - LPTSTR pszFileName; + LPTSTR pszFileName; /* prepare full file name buffer */ _tcscpy (szFullName, pszPath); @@ -112,7 +112,7 @@ static VOID ChangeAttribute (LPTSTR pszPath, LPTSTR pszFile, DWORD dwMask, - DWORD dwAttrib, BOOL bRecurse, BOOL bDirectories) + DWORD dwAttrib, BOOL bRecurse, BOOL bDirectories) { WIN32_FIND_DATA findData; HANDLE hFind; @@ -143,7 +143,7 @@ if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { if (!_tcscmp (findData.cFileName, _T(".")) || - !_tcscmp (findData.cFileName, _T(".."))) + !_tcscmp (findData.cFileName, _T(".."))) continue; _tcscpy (pszFileName, findData.cFileName); @@ -189,6 +189,7 @@ INT CommandAttrib (LPTSTR cmd, LPTSTR param) { + TCHAR szMsg[RC_STRING_MAX_SIZE]; LPTSTR *arg; INT argc, i; TCHAR szPath[MAX_PATH]; @@ -197,7 +198,6 @@ BOOL bDirectories = FALSE; DWORD dwAttrib = 0; DWORD dwMask = 0; - TCHAR szMsg[RC_STRING_MAX_SIZE]; /* initialize strings */ szPath[0] = _T('\0'); @@ -206,8 +206,8 @@ /* print help */ if (!_tcsncmp (param, _T("/?"), 2)) { - LoadString( GetModuleHandle(NULL), STRING_ATTRIB_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR)); - ConOutPuts (szMsg); + LoadString(GetModuleHandle(NULL), STRING_ATTRIB_HELP, szMsg, RC_STRING_MAX_SIZE); + ConOutPuts(szMsg); return 0; } @@ -321,7 +321,7 @@ /* get full file name */ for (i = 0; i < argc; i++) { - if ((*arg[i] != _T('+')) && (*arg[i] != _T('-')) && (*arg[i] != _T('/'))) + if ((*arg[i] != _T('+')) && (*arg[i] != _T('-')) && (*arg[i] != _T('/'))) { LPTSTR p; GetFullPathName (arg[i], MAX_PATH, szPath, NULL); @@ -333,7 +333,7 @@ PrintAttribute (szPath, szFileName, bRecurse); else ChangeAttribute (szPath, szFileName, dwMask, - dwAttrib, bRecurse, bDirectories); + dwAttrib, bRecurse, bDirectories); } } _____ Modified: trunk/reactos/subsys/system/cmd/batch.c --- trunk/reactos/subsys/system/cmd/batch.c 2005-05-01 12:56:25 UTC (rev 14911) +++ trunk/reactos/subsys/system/cmd/batch.c 2005-05-01 13:58:30 UTC (rev 14912) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * BATCH.C - batch file processor for CMD.EXE. * * @@ -218,12 +217,12 @@ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param) { - HANDLE hFile; TCHAR szMsg[RC_STRING_MAX_SIZE]; + HANDLE hFile; hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | - FILE_FLAG_SEQUENTIAL_SCAN, NULL); + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | + FILE_FLAG_SEQUENTIAL_SCAN, NULL); #ifdef _DEBUG DebugPrintf (_T("Batch: (\'%s\', \'%s\', \'%s\') hFile = %x\n"), @@ -232,8 +231,8 @@ if (hFile == INVALID_HANDLE_VALUE) { - LoadString( GetModuleHandle(NULL), STRING_BATCH_ERROR, szMsg,sizeof(szMsg)/sizeof(TCHAR)); - ConErrPrintf (szMsg); + LoadString(GetModuleHandle(NULL), STRING_BATCH_ERROR, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg); return FALSE; } _____ Modified: trunk/reactos/subsys/system/cmd/beep.c --- trunk/reactos/subsys/system/cmd/beep.c 2005-05-01 12:56:25 UTC (rev 14911) +++ trunk/reactos/subsys/system/cmd/beep.c 2005-05-01 13:58:30 UTC (rev 14912) @@ -36,8 +36,8 @@ if (_tcsncmp (param, _T("/?"), 2) == 0) { - LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR)); - ConOutPuts ((LPTSTR)szMsg); + LoadString(GetModuleHandle(NULL), STRING_ALIAS_HELP, szMsg, RC_STRING_MAX_SIZE); + ConOutPuts(szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/call.c --- trunk/reactos/subsys/system/cmd/call.c 2005-05-01 12:56:25 UTC (rev 14911) +++ trunk/reactos/subsys/system/cmd/call.c 2005-05-01 13:58:30 UTC (rev 14912) @@ -1,5 +1,4 @@ -/* $Id$ [truncated at 1000 lines; 5579 more skipped]

1 0

[mf] 14911: restore the IDS_TERMINATE strings trashed by the commit in rev. 14769
by mf＠svn.reactos.com 01 May '05

01 May '05

restore the IDS_TERMINATE strings trashed by the commit in rev. 14769 Could please someone with a swedish environment check if the character encoding in codepage 1252 is correct? Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-05-01 11:24:07 UTC (rev 14910) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-05-01 12:56:25 UTC (rev 14911) @@ -142,6 +142,24 @@ STRINGTABLE DISCARDABLE BEGIN + IDS_STARTMENU "Startmenu" + IDS_MINIMIZE_ALL "mimimize all windows" + IDS_DESKTOP_NUM "Desktop %d" + IDS_VOLUME "Volume" + IDS_ITEMS_CUR "current items" + IDS_ITEMS_CONFIGURED "configuration" + IDS_ITEMS_VISIBLE "visible" + IDS_ITEMS_HIDDEN "hidden" + IDS_NOTIFY_SHOW "show" + IDS_NOTIFY_HIDE "hide" + IDS_NOTIFY_AUTOHIDE "autohide" + IDS_SHOW_HIDDEN_ICONS "Show hidden icons" + IDS_HIDE_ICONS "Hide icons" + IDS_TERMINATE "?nchide sesiunea" +END + +STRINGTABLE DISCARDABLE +BEGIN IDS_NETWORK "Re?ea" IDS_CONNECTIONS "Conec?ii" IDS_DRIVES "Discuri" @@ -161,23 +179,6 @@ IDS_TASKBAR "Taskbar" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "mimimize all windows" - IDS_DESKTOP_NUM "Desktop %d" - IDS_VOLUME "Volume" - IDS_ITEMS_CUR "current items" - IDS_ITEMS_CONFIGURED "configuration" - IDS_ITEMS_VISIBLE "visible" - IDS_ITEMS_HIDDEN "hidden" - IDS_NOTIFY_SHOW "show" - IDS_NOTIFY_HIDE "hide" - IDS_NOTIFY_AUTOHIDE "autohide" - IDS_SHOW_HIDDEN_ICONS "Show hidden icons" - IDS_HIDE_ICONS "Hide icons" -END - #endif // Romanian resources //////////////////////////////////////////////////////////////////////// ///// @@ -348,7 +349,7 @@ MENUITEM "&Suchen...\tF1", ID_HELP MENUITEM "Hilfe &verwenden\tF1", ID_HELP_USING MENUITEM SEPARATOR - MENUITEM "&Info about ReactOS Explorer...", ID_ABOUT_WINEFILE + MENUITEM "&Info about ReactOS Explorer...", ID_ABOUT_WINEFILE END END @@ -386,8 +387,8 @@ POPUP "&Hilfe" BEGIN MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&?ber ReactOS Explorer...", ID_ABOUT_EXPLORER - MENUITEM "?ber React&OS...", ID_ABOUT_WINDOWS + MENUITEM "&?ber ReactOS Explorer...", ID_ABOUT_EXPLORER + MENUITEM "?ber React&OS...", ID_ABOUT_WINDOWS END END @@ -474,26 +475,7 @@ IDB_ICON_ALIGN_9 BITMAP DISCARDABLE "res/icoalig9.bmp" IDB_ICON_ALIGN_10 BITMAP DISCARDABLE "res/icoali10.bmp" -/////////////////////////////////////////////////////////////////////// ////// -// -// DESIGNINFO -// - #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_ABOUT_EXPLORER, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 192 - TOPMARGIN, 7 - BOTTOMMARGIN, 102 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED //////////////////////////////////////////////////////////////////////// ///// // // TEXTINCLUDE @@ -599,6 +581,24 @@ STRINGTABLE DISCARDABLE BEGIN + IDS_STARTMENU "Startmen³" + IDS_MINIMIZE_ALL "alle Fenster minimieren" + IDS_DESKTOP_NUM "Desktop %d" + IDS_VOLUME "Lautstõrke" + IDS_ITEMS_CUR "aktuelle Icons" + IDS_ITEMS_CONFIGURED "Konfiguratrion" + IDS_ITEMS_VISIBLE "sichtbar" + IDS_ITEMS_HIDDEN "unsichtbar" + IDS_NOTIFY_SHOW "sichtbar" + IDS_NOTIFY_HIDE "versteckt" + IDS_NOTIFY_AUTOHIDE "automatisch" + IDS_SHOW_HIDDEN_ICONS "Zeige versteckte Icons" + IDS_HIDE_ICONS "Verstecke Icons" + IDS_TERMINATE "ROS Explorer beenden" +END + +STRINGTABLE DISCARDABLE +BEGIN IDS_NETWORK "Netzwerk" IDS_CONNECTIONS "Netzwerk-Verbindungen" IDS_DRIVES "Verzeichnisse" @@ -618,23 +618,6 @@ IDS_TASKBAR "Taskbar" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Startmen³" - IDS_MINIMIZE_ALL "alle Fenster minimieren" - IDS_DESKTOP_NUM "Desktop %d" - IDS_VOLUME "Lautstõrke" - IDS_ITEMS_CUR "aktuelle Icons" - IDS_ITEMS_CONFIGURED "Konfiguratrion" - IDS_ITEMS_VISIBLE "sichtbar" - IDS_ITEMS_HIDDEN "unsichtbar" - IDS_NOTIFY_SHOW "sichtbar" - IDS_NOTIFY_HIDE "versteckt" - IDS_NOTIFY_AUTOHIDE "automatisch" - IDS_SHOW_HIDDEN_ICONS "Zeige versteckte Icons" - IDS_HIDE_ICONS "Verstecke Icons" -END - #endif // German (Germany) resources //////////////////////////////////////////////////////////////////////// ///// @@ -773,8 +756,8 @@ MENUITEM "&Status Bar", ID_VIEW_STATUSBAR, CHECKED MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM SEPARATOR - MENUITEM "&Symbol after Running", 65535 - MENUITEM "&Save Changes on Exit", 511 + MENUITEM "&Symbol after Running", 65535 + MENUITEM "&Save Changes on Exit", 511 END POPUP "&Security" BEGIN @@ -960,7 +943,7 @@ WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "Configure Notification Icons" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 @@ -1008,65 +991,6 @@ //////////////////////////////////////////////////////////////////////// ///// // -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_SEARCH_PROGRAM, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 193 - TOPMARGIN, 7 - BOTTOMMARGIN, 58 - END - - IDD_DESKBAR_DESKTOP, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 205 - TOPMARGIN, 7 - BOTTOMMARGIN, 187 - END - - IDD_DESKBAR_TASKBAR, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 203 - TOPMARGIN, 7 - BOTTOMMARGIN, 187 - END - - IDD_DESKBAR_STARTMENU, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 203 - TOPMARGIN, 7 - BOTTOMMARGIN, 187 - END - - IDD_NOTIFYAREA, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 201 - TOPMARGIN, 7 - BOTTOMMARGIN, 167 - END - - IDD_MDI_SDI, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 181 - TOPMARGIN, 7 - BOTTOMMARGIN, 119 - END -END -#endif // APSTUDIO_INVOKED - - -/////////////////////////////////////////////////////////////////////// ////// -// // String Table // @@ -1091,6 +1015,24 @@ STRINGTABLE DISCARDABLE BEGIN + IDS_STARTMENU "Startmenu" + IDS_MINIMIZE_ALL "mimimize all windows" + IDS_DESKTOP_NUM "Desktop %d" + IDS_VOLUME "Volume" + IDS_ITEMS_CUR "current items" + IDS_ITEMS_CONFIGURED "configuration" + IDS_ITEMS_VISIBLE "visible" + IDS_ITEMS_HIDDEN "hidden" + IDS_NOTIFY_SHOW "show" + IDS_NOTIFY_HIDE "hide" + IDS_NOTIFY_AUTOHIDE "autohide" + IDS_SHOW_HIDDEN_ICONS "Show hidden icons" + IDS_HIDE_ICONS "Hide icons" + IDS_TERMINATE "Terminate ROS Explorer" +END + +STRINGTABLE DISCARDABLE +BEGIN IDS_NETWORK "Network" IDS_CONNECTIONS "Network Connections" IDS_DRIVES "Drives" @@ -1110,23 +1052,6 @@ IDS_TASKBAR "Taskbar" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "mimimize all windows" - IDS_DESKTOP_NUM "Desktop %d" - IDS_VOLUME "Volume" - IDS_ITEMS_CUR "current items" - IDS_ITEMS_CONFIGURED "configuration" - IDS_ITEMS_VISIBLE "visible" - IDS_ITEMS_HIDDEN "hidden" - IDS_NOTIFY_SHOW "show" - IDS_NOTIFY_HIDE "hide" - IDS_NOTIFY_AUTOHIDE "autohide" - IDS_SHOW_HIDDEN_ICONS "Show hidden icons" - IDS_HIDE_ICONS "Hide icons" -END - #endif // English (U.S.) resources //////////////////////////////////////////////////////////////////////// ///// @@ -1449,7 +1374,7 @@ WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "Configure Notification Icons" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 @@ -1479,57 +1404,6 @@ //////////////////////////////////////////////////////////////////////// ///// // -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_SEARCH_PROGRAM, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 193 - TOPMARGIN, 7 - BOTTOMMARGIN, 58 - END - - IDD_DESKBAR_DESKTOP, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 205 - TOPMARGIN, 7 - BOTTOMMARGIN, 187 - END - - IDD_DESKBAR_TASKBAR, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 203 - TOPMARGIN, 7 - BOTTOMMARGIN, 187 - END - - IDD_DESKBAR_STARTMENU, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 203 - TOPMARGIN, 7 - BOTTOMMARGIN, 187 - END - - IDD_NOTIFYAREA, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 201 - TOPMARGIN, 7 - BOTTOMMARGIN, 167 - END -END -#endif // APSTUDIO_INVOKED - - -/////////////////////////////////////////////////////////////////////// ////// -// // String Table // @@ -1554,6 +1428,24 @@ STRINGTABLE DISCARDABLE BEGIN + IDS_STARTMENU "Menu Inicio" + IDS_MINIMIZE_ALL "mimimizar todas las ventanas" + IDS_DESKTOP_NUM "Escritorio %d" + IDS_VOLUME "Volumen" + IDS_ITEMS_CUR "Objetos Actuales" + IDS_ITEMS_CONFIGURED "configuracion" + IDS_ITEMS_VISIBLE "visible" + IDS_ITEMS_HIDDEN "oculto" + IDS_NOTIFY_SHOW "mostrar" + IDS_NOTIFY_HIDE "ocultar" + IDS_NOTIFY_AUTOHIDE "autoocultar" + IDS_SHOW_HIDDEN_ICONS "Show hidden icons" + IDS_HIDE_ICONS "Hide icons" + IDS_TERMINATE "Salir" +END + +STRINGTABLE DISCARDABLE +BEGIN IDS_NETWORK "Res" IDS_CONNECTIONS "Conexiones de Red" IDS_DRIVES "Unidades" @@ -1573,23 +1465,6 @@ IDS_TASKBAR "Barra de Tareas" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Menu Inicio" - IDS_MINIMIZE_ALL "mimimizar todas las ventanas" - IDS_DESKTOP_NUM "Escritorio %d" - IDS_VOLUME "Volumen" - IDS_ITEMS_CUR "Objetos Actuales" - IDS_ITEMS_CONFIGURED "configuracion" - IDS_ITEMS_VISIBLE "visible" - IDS_ITEMS_HIDDEN "oculto" - IDS_NOTIFY_SHOW "mostrar" - IDS_NOTIFY_HIDE "ocultar" - IDS_NOTIFY_AUTOHIDE "autoocultar" - IDS_SHOW_HIDDEN_ICONS "Show hidden icons" - IDS_HIDE_ICONS "Hide icons" -END - #endif // Spanish (Castilian) resources //////////////////////////////////////////////////////////////////////// ///// @@ -1724,27 +1599,6 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_NETWORK "RÚseaux" - IDS_CONNECTIONS "Connexions rÚseaux" - IDS_DRIVES "Disques" - IDS_SEARCH_COMPUTER "Recherche Ordinateurs..." - IDS_SETTINGS_MENU "Barre des tÔches et menu dÚmarrer" - IDS_CONTROL_PANEL "Panneau de configuration" - IDS_PRINTERS "Imprimantes" - IDS_BROWSE "Parcourir" - IDS_SEARCH_PRG "Recherche Programme..." - IDS_ALL_USERS "Tous les utilisateurs\\" - IDS_SEARCH "Rechercher" - IDS_ABOUT_EXPLORER "A propos de l'explorateur..." - IDS_LAUNCH_MANY_PROGRAMS - "You have selected more than one program.\nAre you sure you want to launch all of them?" - IDS_DESKTOPBAR_SETTINGS "Bureau" - IDS_DESKTOP "Bureau" - IDS_TASKBAR "Taskbar" -END - -STRINGTABLE DISCARDABLE -BEGIN IDS_STARTMENU "Startmenu" IDS_MINIMIZE_ALL "mimimize all windows" IDS_DESKTOP_NUM "Bureau %d" @@ -1758,230 +1612,40 @@ IDS_NOTIFY_AUTOHIDE "autohide" IDS_SHOW_HIDDEN_ICONS "Show hidden icons" IDS_HIDE_ICONS "Hide icons" + IDS_TERMINATE "DÚconnexion" END -#endif // French (France) resources -/////////////////////////////////////////////////////////////////////// ////// - - -/////////////////////////////////////////////////////////////////////// ////// -// Portuguese (Portugal) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PTG) -#ifdef _WIN32 -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -#pragma code_page(1252) -#endif //_WIN32 - -/////////////////////////////////////////////////////////////////////// ////// -// -// Menu -// - -IDM_WINEFILE MENU FIXED IMPURE -BEGIN - POPUP "&Ficheiro" - BEGIN - MENUITEM "&Abrir\tEnter", 101 - MENUITEM "&Mover...\tF7", 106 - MENUITEM "&Copiar...\tF8", 107 - MENUITEM "&Na Clipboard\tF9", 118 - MENUITEM "&Apagar\tDel", 108 - MENUITEM "Re&nomear...", 109 - MENUITEM "Propriedades\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "Comprimir", 119 - MENUITEM "Descomprimir", 120 - MENUITEM SEPARATOR - MENUITEM "Executar...", ID_EXECUTE - MENUITEM "Imprimir", 102 - MENUITEM "Associar", 103 - MENUITEM SEPARATOR - MENUITEM "Criar Direct¾rio...", ID_EXECUTE - MENUITEM "Procurar...", 104 - MENUITEM "Seleccionar Ficheiros...", 116 - MENUITEM SEPARATOR - MENUITEM "Sair\tAlt+X", ID_FILE_EXIT - END - POPUP "&Disco" - BEGIN - MENUITEM "Copiar Disco...", 201 - MENUITEM "Rotular Disco...", 202 - MENUITEM SEPARATOR - MENUITEM "Formatar Disco...", 203 - MENUITEM SEPARATOR - MENUITEM "Conectar Drive de Rede", 252 - MENUITEM "Disconectar Drive de Rede", 253 - MENUITEM SEPARATOR - MENUITEM "Partilhar como...", 254 - MENUITEM "Remover Partilha...", 255 - MENUITEM SEPARATOR - MENUITEM "Seleccionar Drive...", 251 - END - POPUP "&Directories" - BEGIN - MENUITEM "Pr¾ximo NÝvel\t+", 301 - MENUITEM "Expandir Arvore\t*", 302 - MENUITEM "Expandir Tudo\tStrg+*", 303 - MENUITEM "Fechar ?rvore\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Mark Childs", 505 - END - POPUP "&View" - BEGIN - MENUITEM "?rvore e Direct¾rio", 413 - MENUITEM "S¾ ?rvores", 411 - MENUITEM "S¾ Direct¾rio", 412 - MENUITEM SEPARATOR - MENUITEM "Partir", 414 - MENUITEM SEPARATOR - MENUITEM "Nome", ID_VIEW_NAME - MENUITEM "&All File Details", ID_VIEW_ALL_ATTRIBUTES - , CHECKED - MENUITEM "&Partial Details...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "Ordenar por Nome", 404 - MENUITEM "Ordenar por Tipo", 405 - MENUITEM "Ordenar por Tamanho", 406 - MENUITEM "Ordenar por Data", 407 - MENUITEM SEPARATOR - MENUITEM "Ordenar por &...", 409 - END - POPUP "&Opþ§es" - BEGIN - MENUITEM "&ConfirmaþÒo", 65535 - MENUITEM "&Fonte", 65535 - MENUITEM "Customizar Barra de Ferramentas", 65535 - MENUITEM SEPARATOR - MENUITEM "Barra de Ferramentas", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "Barra de Drives", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Side Bar", ID_VIEW_SIDE_BAR - MENUITEM "Barra de Estado", ID_VIEW_STATUSBAR, CHECKED - MENUITEM "EcrÒ Cheio\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM SEPARATOR - MENUITEM "&Symbol nach Programmstart", 65535 - MENUITEM "&Einstellungen beim Beenden speichern", 511 - END - POPUP "&Seguranþa" - BEGIN - MENUITEM "&Acesso", 605 - MENUITEM "&Entrar", 606 - MENUITEM "&Dono", 607 - END - POPUP "&Janela" - BEGIN - MENUITEM "Nova Janela", ID_WINDOW_NEW - MENUITEM "Cascata\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Mosaico &Horizontal", ID_WINDOW_TILE_HORZ - MENUITEM "Mosaico &Vertical\tCtrl+F4", ID_WINDOW_TILE_VERT - MENUITEM "Arranjar Automaticamente", ID_WINDOW_AUTOSORT - MENUITEM "Arranjar SÝmbolos", ID_WINDOW_ARRANGE - MENUITEM "&Actualizar\tF5", ID_REFRESH - END - POPUP "&?" - BEGIN - MENUITEM "T¾picos da Ajuda\tF1", ID_HELP - MENUITEM "Procurar Ajuda...\tF1", ID_HELP - MENUITEM "Usar Ajuda\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "Info sobre &Winefile...", ID_ABOUT_WINEFILE - END -END - - -/////////////////////////////////////////////////////////////////////// ////// -// -// Dialog -// - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Executar" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 - CONTROL "Co&mando:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, - 18,60,10 - EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "Como &SÝmbolo",214,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,3,45,71,12 - DEFPUSHBUTTON "&OK",1,158,6,47,14 - PUSHBUTTON "&Cancelar",2,158,23,47,14 - PUSHBUTTON "&Ajuda",254,158,43,47,14 -END - - -/////////////////////////////////////////////////////////////////////// ////// -// -// String Table -// - STRINGTABLE DISCARDABLE BEGIN - IDS_TITLE "Explorador do Reactos" - IDS_START "Iniciar" - IDS_LOGOFF "Terminar sessÒo..." - IDS_SHUTDOWN "Desligar..." - IDS_LAUNCH "Executar..." - IDS_START_HELP "Ajuda" - IDS_SEARCH_FILES "Procurar..." - IDS_DOCUMENTS "Documentos" - IDS_FAVORITES "Favoritos" - IDS_PROGRAMS "Programas" - IDS_SETTINGS "Definiþ§es" - IDS_EXPLORE "Explorar" - IDS_EMPTY "(Vazio)" - IDS_RECENT "Documentos recentes" - IDS_ADMIN "Administrar" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NETWORK "Rede" - IDS_CONNECTIONS "Conecþ§es da rede" - IDS_DRIVES "Drives" - IDS_SEARCH_COMPUTER "Procurar computador..." - IDS_SETTINGS_MENU "Menu das definiþ§es" - IDS_CONTROL_PANEL "Painel de controle" - IDS_PRINTERS "Impressora" - IDS_BROWSE "Vasculhar Ficheiros" - IDS_SEARCH_PRG "Procurar programa..." - IDS_ALL_USERS "Todos utilizadores\\" - IDS_SEARCH "Procurar" - IDS_ABOUT_EXPLORER "Sobre o Explorador..." + IDS_NETWORK "RÚseaux" + IDS_CONNECTIONS "Connexions rÚseaux" + IDS_DRIVES "Disques" + IDS_SEARCH_COMPUTER "Recherche Ordinateurs..." + IDS_SETTINGS_MENU "Barre des tÔches et menu dÚmarrer" + IDS_CONTROL_PANEL "Panneau de configuration" + IDS_PRINTERS "Imprimantes" + IDS_BROWSE "Parcourir" + IDS_SEARCH_PRG "Recherche Programme..." + IDS_ALL_USERS "Tous les utilisateurs\\" + IDS_SEARCH "Rechercher" + IDS_ABOUT_EXPLORER "A propos de l'explorateur..." IDS_LAUNCH_MANY_PROGRAMS "You have selected more than one program.\nAre you sure you want to launch all of them?" - IDS_DESKTOPBAR_SETTINGS "Desktop Settings" - IDS_DESKTOP "Desktop" + IDS_DESKTOPBAR_SETTINGS "Bureau" + IDS_DESKTOP "Bureau" IDS_TASKBAR "Taskbar" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "mimimize all windows" - IDS_DESKTOP_NUM "Desktop %d" - IDS_VOLUME "Volume" - IDS_ITEMS_CUR "current items" - IDS_ITEMS_CONFIGURED "configuration" - IDS_ITEMS_VISIBLE "visible" - IDS_ITEMS_HIDDEN "hidden" - IDS_NOTIFY_SHOW "show" - IDS_NOTIFY_HIDE "hide" - IDS_NOTIFY_AUTOHIDE "autohide" - IDS_SHOW_HIDDEN_ICONS "Show hidden icons" - IDS_HIDE_ICONS "Hide icons" -END - -#endif // Portuguese (Portugal) resources +#endif // French (France) resources //////////////////////////////////////////////////////////////////////// ///// + //////////////////////////////////////////////////////////////////////// ///// -// Swedish (SE) resources +// Swedish resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SWE) +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE) #ifdef _WIN32 -LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT #pragma code_page(1252) #endif //_WIN32 @@ -1994,38 +1658,38 @@ BEGIN POPUP "&Arkiv" BEGIN - MENUITEM "&Avsluta", ID_FILE_EXIT + MENUITEM "&Avsluta", ID_FILE_EXIT END POPUP "&Visa" BEGIN - MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR - MENUITEM "&Extrafõlt", ID_VIEW_EXTRA_BAR - MENUITEM "E&nhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "S&idfõlt", ID_VIEW_SIDE_BAR - MENUITEM "&Statusfõlt", ID_VIEW_STATUSBAR + MENUITEM "&Verktygsf§lt", ID_VIEW_TOOL_BAR + MENUITEM "&Extraf§lt", ID_VIEW_EXTRA_BAR + MENUITEM "E&nhetsf§lt", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "S&idf§lt", ID_VIEW_SIDE_BAR + MENUITEM "&Statusf§lt", ID_VIEW_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Uppdatera\tF5", ID_REFRESH - MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&Uppdatera\tF5", ID_REFRESH + MENUITEM "F&ullsk§rm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM "SDI", ID_VIEW_SDI END - POPUP "&F÷nster" + POPUP "&F¸nster" BEGIN - MENUITEM "Nytt &f÷nster", ID_WINDOW_NEW - MENUITEM "Íverlappande\tShift+F5", ID_WINDOW_CASCADE - MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ + MENUITEM "Nytt &f¸nster", ID_WINDOW_NEW + MENUITEM "?verlappande\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ MENUITEM "Ordna &vertikalt\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT - MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE + MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT + MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE END POPUP "&Verktyg" BEGIN - MENUITEM "&Alternativ", ID_TOOLS_OPTIONS + MENUITEM "&Alternativ", ID_TOOLS_OPTIONS END - POPUP "&Hjõlp" + POPUP "&Hj§lp" BEGIN MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "Om &Explorer...", ID_ABOUT_EXPLORER - MENUITEM "Om &OS...", ID_ABOUT_WINDOWS + MENUITEM "Om &Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Om &OS...", ID_ABOUT_WINDOWS END END @@ -2033,109 +1697,109 @@ BEGIN POPUP "&Arkiv" BEGIN - MENUITEM "&Íppna\tEnter", 101 - MENUITEM "&Flytta...\tF7", 106 - MENUITEM "&Kopiera...\tF8", 107 - MENUITEM "&I urklipp...\tF9", 118 - MENUITEM "&Ta bort\tDel", 108 - MENUITEM "&Byt namn...", 109 + MENUITEM "&?ppna\tEnter", 101 + MENUITEM "&Flytta...\tF7", 106 + MENUITEM "&Kopiera...\tF8", 107 + MENUITEM "&I urklipp...\tF9", 118 + MENUITEM "&Ta bort\tDel", 108 + MENUITEM "&Byt namn...", 109 MENUITEM "&Egenskaper...\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM SEPARATOR - MENUITEM "&Komprimera...", 119 - MENUITEM "Packa &upp...", 120 + MENUITEM "&Komprimera...", 119 + MENUITEM "Packa &upp...", 120 MENUITEM SEPARATOR - MENUITEM "&K÷r...", ID_EXECUTE - MENUITEM "&Skriv ut...", 102 + MENUITEM "&K¸r...", ID_EXECUTE + MENUITEM "&Skriv ut...", 102 MENUITEM "Associera...", 103 MENUITEM SEPARATOR - MENUITEM "Skapa mapp...", ID_EXECUTE - MENUITEM "&S÷k...", 104 - MENUITEM "&Võlj filer...", 116 + MENUITEM "Skapa mapp...", ID_EXECUTE + MENUITEM "&S¸k...", 104 + MENUITEM "&V§lj filer...", 116 MENUITEM SEPARATOR - MENUITEM "&Avsluta\tAlt+X", ID_FILE_EXIT + MENUITEM "&Avsluta\tAlt+X", ID_FILE_EXIT END POPUP "&Disk" BEGIN - MENUITEM "&Kopiera disk...", 201 - MENUITEM "&Namnge disk...", 202 + MENUITEM "&Kopiera disk...", 201 + MENUITEM "&Namnge disk...", 202 MENUITEM SEPARATOR - MENUITEM "&Formatera disk...", 203 + MENUITEM "&Formatera disk...", 203 MENUITEM SEPARATOR - MENUITEM "Anslut &Nõtverksenhet", 252 - MENUITEM "&Koppla ifrÕn Nõtverksenhet", 253 + MENUITEM "Anslut &N§tverksenhet", 252 + MENUITEM "&Koppla ifrin N§tverksenhet", 253 MENUITEM SEPARATOR - MENUITEM "Dela ut...", 254 - MENUITEM "&Ta bort utdelning...", 255 + MENUITEM "Dela ut...", 254 + MENUITEM "&Ta bort utdelning...", 255 MENUITEM SEPARATOR - MENUITEM "&Võlj enhet...", 251 + MENUITEM "&V§lj enhet...", 251 END POPUP "&Mappar" BEGIN - MENUITEM "&Nõsta nivÕ\t+", 301 - MENUITEM "Ut÷ka &trõd\t*", 302 - MENUITEM "Ut÷ka &alla\tCtrl+*", 303 - MENUITEM "Kollapsa &trõd\t-", 304 + MENUITEM "&N§sta nivi\t+", 301 + MENUITEM "Ut¸ka &tr§d\t*", 302 + MENUITEM "Ut¸ka &alla\tCtrl+*", 303 + MENUITEM "Kollapsa &tr§d\t-", 304 MENUITEM SEPARATOR - MENUITEM "&Markera undermappar", 505 + MENUITEM "&Markera undermappar", 505 END POPUP "&Visa" BEGIN - MENUITEM "&Trõd och mapp", 413 - MENUITEM "Bara tr&õd", 411 - MENUITEM "Bara &mapp", 412 + MENUITEM "&Tr§d och mapp", 413 + MENUITEM "Bara tr&§d", 411 + MENUITEM "Bara &mapp", 412 MENUITEM SEPARATOR - MENUITEM "De&la", 414 + MENUITEM "De&la", 414 MENUITEM SEPARATOR MENUITEM "&Namn", ID_VIEW_NAME MENUITEM "&Alla Fildetaljer", ID_VIEW_ALL_ATTRIBUTES , CHECKED - MENUITEM "&Vissa detaljer...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM "&Vissa detaljer...", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "&Sortera efter namn", 404 - MENUITEM "Sortera efter t&yp", 405 - MENUITEM "Sortera efter st&orlek", 406 - MENUITEM "Sortera efter &datum", 407 + MENUITEM "&Sortera efter namn", 404 + MENUITEM "Sortera efter t&yp", 405 + MENUITEM "Sortera efter st&orlek", 406 + MENUITEM "Sortera efter &datum", 407 MENUITEM SEPARATOR - MENUITEM "Sortera efter &...", 409 + MENUITEM "Sortera efter &...", 409 END - POPUP "&Instõllningar" + POPUP "&Inst§llningar" BEGIN - MENUITEM "&Bekrõftelse...", 65535 - MENUITEM "&Teckensnitt...", 65535 - MENUITEM "&Konfigurera verktygsfõlt...", 65535 + MENUITEM "&Bekr§ftelse...", 65535 + MENUITEM "&Teckensnitt...", 65535 + MENUITEM "&Konfigurera verktygsf§lt...", 65535 MENUITEM SEPARATOR - MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Enhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Sidfõlt", ID_VIEW_SIDE_BAR - MENUITEM "St&atusfõlt", ID_VIEW_STATUSBAR, CHECKED - MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&Verktygsf§lt", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Enhetsf§lt", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Sidf§lt", ID_VIEW_SIDE_BAR + MENUITEM "St&atusf§lt", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "F&ullsk§rm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM SEPARATOR - MENUITEM "&Symbol efter k÷rning", 65535 - MENUITEM "&Spara õndringar vid stõngning", 511 + MENUITEM "&Symbol efter k¸rning", 65535 + MENUITEM "&Spara §ndringar vid st§ngning", 511 END - POPUP "&Sõkerhet" + POPUP "&S§kerhet" BEGIN - MENUITEM "&?tkomst...", 605 - MENUITEM "&Loggning...", 606 - MENUITEM "&?gare...", 607 + MENUITEM "&+tkomst...", 605 + MENUITEM "&Loggning...", 606 + MENUITEM "&-gare...", 607 END - POPUP "&F÷nster" + POPUP "&F¸nster" BEGIN - MENUITEM "Nytt &f÷nster", ID_WINDOW_NEW - MENUITEM "Íverlappande\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ + MENUITEM "Nytt &f¸nster", ID_WINDOW_NEW + MENUITEM "?verlappande\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ MENUITEM "Ordna &vertikalt\tCtrl+F4", ID_WINDOW_TILE_VERT - MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT - MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE - MENUITEM "&Uppdatera\tF5", ID_REFRESH + MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT + MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE + MENUITEM "&Uppdatera\tF5", ID_REFRESH END POPUP "&?" BEGIN - MENUITEM "&Hjõlpavsnitt\tF1", ID_HELP - MENUITEM "Hjõlp &s÷k...\tF1", ID_HELP - MENUITEM "&Anvõnda hjõlpen\tF1", ID_HELP_USING + MENUITEM "&Hj§lpavsnitt\tF1", ID_HELP + MENUITEM "Hj§lp &s¸k...\tF1", ID_HELP + MENUITEM "&Anv§nda hj§lpen\tF1", ID_HELP_USING MENUITEM SEPARATOR - MENUITEM "Information om &Winefile...", ID_ABOUT_WINEFILE + MENUITEM "Information om &Winefile...", ID_ABOUT_WINEFILE END END @@ -2143,10 +1807,10 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Instõllningar...", ID_DESKTOPBAR_SETTINGS - MENUITEM "&Aktivitetshanteraren...", ID_TASKMGR + MENUITEM "&Inst§llningar...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Aktivitetshanteraren...", ID_TASKMGR MENUITEM SEPARATOR - MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER END END @@ -2154,8 +1818,8 @@ BEGIN POPUP "" BEGIN - MENUITEM "Íppna volymkontroll", ID_TRAY_VOLUME - MENUITEM "Justera ljudinstõllningar", ID_VOLUME_PROPERTIES + MENUITEM "?ppna volymkontroll", ID_TRAY_VOLUME + MENUITEM "Justera ljudinst§llningar", ID_VOLUME_PROPERTIES END END @@ -2164,11 +1828,11 @@ POPUP "" BEGIN MENUITEM "&Visa dolda ikoner", ID_SHOW_HIDDEN_ICONS - MENUITEM "Visa &ikonknapp", ID_SHOW_ICON_BUTTON + MENUITEM "Visa &ikonknapp", ID_SHOW_ICON_BUTTON MENUITEM "&Konfigurera meddelanden...", ID_CONFIG_NOTIFYAREA - MENUITEM "Justera &datum och &tid...", ID_CONFIG_TIME + MENUITEM "Justera &datum och &tid...", ID_CONFIG_TIME MENUITEM SEPARATOR - MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER END END @@ -2176,27 +1840,27 @@ BEGIN POPUP "&Arkiv" BEGIN - MENUITEM "&Avsluta", ID_FILE_EXIT + MENUITEM "&Avsluta", ID_FILE_EXIT END POPUP "&Visa" BEGIN - MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR - MENUITEM "&Sidfõlt", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "&Statusfõlt", ID_VIEW_STATUSBAR + MENUITEM "&Verktygsf§lt", ID_VIEW_TOOL_BAR + MENUITEM "&Sidf§lt", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Statusf§lt", ID_VIEW_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Uppdatera\tF5", ID_REFRESH - MENUITEM "&Fullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&Uppdatera\tF5", ID_REFRESH + MENUITEM "&Fullsk§rm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM "&MDI", ID_VIEW_MDI END POPUP "&Verktyg" BEGIN - MENUITEM "&Alternativ", ID_TOOLS_OPTIONS + MENUITEM "&Alternativ", ID_TOOLS_OPTIONS END - POPUP "&Hjõlp" + POPUP "&Hj§lp" BEGIN MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER - MENUITEM "Om &OS...", ID_ABOUT_WINDOWS + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Om &OS...", ID_ABOUT_WINDOWS END END @@ -2208,25 +1872,25 @@ IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "K÷r" +CAPTION "K¸r" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 CONTROL "&Kommando:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, 18,60,10 EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "&Som symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, [truncated at 1000 lines; 508 more skipped]

1 0

[arty] 14910: Added HOST=mingw32-linux64 setting.
by arty＠svn.reactos.com 01 May '05

01 May '05

Added HOST=mingw32-linux64 setting. Fixed various small breakage for linux64 host. Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h Modified: trunk/reactos/drivers/lib/oskittcp/makefile Modified: trunk/reactos/lib/shell32/Makefile.ros-template Modified: trunk/reactos/rules.mak Modified: trunk/reactos/tools/Makefile Modified: trunk/reactos/tools/bin2res/Makefile Modified: trunk/reactos/tools/buildno/Makefile Modified: trunk/reactos/tools/cabman/cabinet.cxx Modified: trunk/reactos/tools/cabman/makefile Modified: trunk/reactos/tools/cdmake/Makefile Modified: trunk/reactos/tools/helper.mk Modified: trunk/reactos/tools/mkhive/Makefile Modified: trunk/reactos/tools/rgenstat/Makefile Modified: trunk/reactos/tools/tools-check.mak Modified: trunk/reactos/tools/widl/Makefile Modified: trunk/reactos/tools/wine2ros/Makefile Modified: trunk/reactos/tools/winebuild/Makefile Modified: trunk/reactos/tools/winebuild/import.c Modified: trunk/reactos/tools/wmc/makefile Modified: trunk/reactos/tools/wpp/Makefile Modified: trunk/reactos/tools/wrc/Makefile _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h 2005-05-01 11:24:07 UTC (rev 14910) @@ -129,7 +129,7 @@ int __cdecl vprintf(const char *, va_list); #define log bsd_log -static inline int bsd_log ( int blah, const char* fmt, ... ) +static int bsd_log ( int blah, const char* fmt, ... ) { va_list arg; int i; _____ Modified: trunk/reactos/drivers/lib/oskittcp/makefile --- trunk/reactos/drivers/lib/oskittcp/makefile 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/drivers/lib/oskittcp/makefile 2005-05-01 11:24:07 UTC (rev 14910) @@ -11,11 +11,8 @@ TARGET_NAME = oskittcp #-DMEMTRACK -TARGET_CFLAGS = -g -D__REACTOS__=1 -D__NTDRIVER__ -DKERNEL -Iinclude/freebsd -Iinclude/freebsd/sys/include -Iinclude/freebsd/src/sys -Iinclude/freebsd/dev/include -Iinclude/freebsd/net/include -Iinclude -I$(PATH_TO_TOP)/w32api/include -I$(PATH_TO_TOP)/include # require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS - TARGET_ASFLAGS = -I $(PATH_TO_TOP)/include TARGET_LFLAGS = -Wl,--file-alignment,0x1000 \ @@ -71,6 +68,8 @@ include $(TOOLS_PATH)/depend.mk +TARGET_CFLAGS += -D__REACTOS__=1 -D__NTDRIVER__ -DKERNEL -Iinclude/freebsd -Iinclude/freebsd/sys/include -Iinclude/freebsd/src/sys -Iinclude/freebsd/dev/include -Iinclude/freebsd/net/include -Iinclude + %/TAGS: etags -o $(@D)/TAGS $((a)D)/\*.c _____ Modified: trunk/reactos/lib/shell32/Makefile.ros-template --- trunk/reactos/lib/shell32/Makefile.ros-template 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/lib/shell32/Makefile.ros-template 2005-05-01 11:24:07 UTC (rev 14910) @@ -19,7 +19,7 @@ default: all authors.c: -ifeq ($(HOST),mingw32-linux) +ifeq ($(HOST_TYPE),unix) echo 'const char * const SHELL_Authors[] = { "Copyright 1993-2005 WINE team", "Copyright 1998-2005 ReactOS team", 0 };' > authors.c else echo const char * const SHELL_Authors[] = { "Copyright 1993-2005 WINE team", "Copyright 1998-2005 ReactOS team", 0 }; > authors.c _____ Modified: trunk/reactos/rules.mak --- trunk/reactos/rules.mak 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/rules.mak 2005-05-01 11:24:07 UTC (rev 14910) @@ -72,7 +72,27 @@ # # Choose various options # +ifeq ($(HOST),mingw32-linux64) +export HOST_TYPE = unix +export NASM_FORMAT = win32 +export PREFIX = mingw32- +export EXE_POSTFIX := +export EXE_PREFIX := ./ +export DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as +# +# Do not change NASM_CMD to NASM because older versions of +# nasm doesn't like an environment variable NASM +# +export NASM_CMD = nasm +export DOSCLI = +export FLOPPY_DIR = /mnt/floppy +export SEP := / +export PIPE := +export HOST_ARCH := -m32 +endif + ifeq ($(HOST),mingw32-linux) +export HOST_TYPE = unix export NASM_FORMAT = win32 export PREFIX = mingw32- export EXE_POSTFIX := @@ -132,8 +152,8 @@ export CC = $(Q)$(PREFIX)gcc export CXX = $(Q)$(PREFIX)g++ -export HOST_CC = $(Q)gcc -export HOST_CXX = $(Q)g++ +export HOST_CC = $(Q)gcc $(HOST_ARCH) +export HOST_CXX = $(Q)g++ $(HOST_ARCH) export HOST_AR = $(Q)ar export HOST_NM = $(Q)nm export LD = $(Q)$(PREFIX)ld @@ -169,7 +189,9 @@ export WRC = $(Q)$(TOOLS_PATH)/wrc/wrc export WIDL = $(Q)$(TOOLS_PATH)/widl/widl +export HOST_STD_CFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -pipe -D_M_IX86 $(HOSTARCH) export STD_CFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -pipe -march=$(OARCH) -D_M_IX86 +export HOST_STD_CPPFLAGS = $(HOST_STD_CFLAGS) export STD_CPPFLAGS = $(STD_CFLAGS) # Check for 3GB ifeq ($(3GB), 1) _____ Modified: trunk/reactos/tools/Makefile --- trunk/reactos/tools/Makefile 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/Makefile 2005-05-01 11:24:07 UTC (rev 14910) @@ -3,11 +3,10 @@ include $(PATH_TO_TOP)/rules.mak CFLAGS += -Wall -Werror -ifeq ($(HOST),mingw32-linux) +ifeq ($(HOST_TYPE),unix) CFLAGS += -DUNIX_PATHS rm := @rm -endif -ifeq ($(HOST),mingw32-windows) +else CFLAGS += -DDOS_PATHS rm := -@del endif @@ -152,11 +151,10 @@ $(MAKE) --silent -C ../lib/zlib -f Makefile.host clean $(MAKE) -C wpp clean $(MAKE) -C unicode clean -ifeq ($(HOST),mingw32-linux) +ifeq ($(HOST_TYPE),unix) @rm mkconfig @rm $(TOOLS) -endif -ifeq ($(HOST),mingw32-windows) +else $(MAKE) --silent -C pipetools clean $(rm) *$(EXE_POSTFIX) endif _____ Modified: trunk/reactos/tools/bin2res/Makefile --- trunk/reactos/tools/bin2res/Makefile 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/bin2res/Makefile 2005-05-01 11:24:07 UTC (rev 14910) @@ -19,11 +19,10 @@ bin2res$(EXE_POSTFIX): $(OBJECTS) $(HOST_CC) -g $(OBJECTS) -o $(TARGET) -ifeq ($(HOST),mingw32-linux) +ifeq ($(HOST_TYPE),unix) clean: rm -f *.o $(TARGET) -endif -ifneq ($(HOST),mingw32-linux) +else clean: del *.o $(TARGET) endif _____ Modified: trunk/reactos/tools/buildno/Makefile --- trunk/reactos/tools/buildno/Makefile 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/buildno/Makefile 2005-05-01 11:24:07 UTC (rev 14910) @@ -26,12 +26,11 @@ $(HOST_CXX) -g $(OBJECTS) -o $(TARGET) @$(EXE_PREFIX)buildno$(EXE_POSTFIX) -ifeq ($(HOST),mingw32-linux) +ifeq ($(HOST_TYPE),unix) clean: -rm -f *.o $(TARGET) -rm $(PATH_TO_TOP)/include/reactos/buildno.h -endif -ifneq ($(HOST),mingw32-linux) +else clean: -del *.o $(TARGET) -del ..\..\include\reactos\buildno.h _____ Modified: trunk/reactos/tools/cabman/cabinet.cxx --- trunk/reactos/tools/cabman/cabinet.cxx 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/cabman/cabinet.cxx 2005-05-01 11:24:07 UTC (rev 14910) @@ -2473,7 +2473,7 @@ /* FIXME: Doesn't seem to be correct. EXTRACT.EXE won't accept checksums computed by this routine */ - DPRINT(MIN_TRACE, ("Checksumming buffer (0x%X) Size (%d)\n", (unsigned int)Buffer, Size)); + DPRINT(MIN_TRACE, ("Checksumming buffer (0x%p) Size (%d)\n", Buffer, Size)); UlongCount = Size / 4; // Number of ULONGs Checksum = Seed; // Init checksum _____ Modified: trunk/reactos/tools/cabman/makefile --- trunk/reactos/tools/cabman/makefile 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/cabman/makefile 2005-05-01 11:24:07 UTC (rev 14910) @@ -33,12 +33,11 @@ cabman$(EXE_POSTFIX): $(OBJECTS) $(HOST_CXX) $(OBJECTS) $(HOST_LFLAGS) -o cabman$(EXE_POSTFIX) -ifeq ($(HOST),mingw32-linux) +ifeq ($(HOST_TYPE),unix) clean: rm -f *.o rm -f cabman$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) +else clean: -del *.o -del cabman$(EXE_POSTFIX) _____ Modified: trunk/reactos/tools/cdmake/Makefile --- trunk/reactos/tools/cdmake/Makefile 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/cdmake/Makefile 2005-05-01 11:24:07 UTC (rev 14910) @@ -22,12 +22,11 @@ cdmake$(EXE_POSTFIX): $(OBJECTS) $(HOST_CC) $(OBJECTS) -o cdmake$(EXE_POSTFIX) -ifeq ($(HOST),mingw32-linux) +ifeq ($(HOST_TYPE),unix) clean: rm -f *.o rm -f cdmake$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) +else clean: -del *.o -del cdmake$(EXE_POSTFIX) _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/helper.mk 2005-05-01 11:24:07 UTC (rev 14910) @@ -230,6 +230,7 @@ MK_DEFEXT := .a MK_CFLAGS := MK_CPPFLAGS := + MK_HOST_CFLAGS := yes MK_LIBPATH := . MK_IMPLIB := no MK_IMPLIBONLY := no @@ -513,6 +514,7 @@ MK_SDKLIBS := MK_CFLAGS := -D__USE_W32API -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 -DWINVER=0x501 -D_STDDEF_H -I$(PATH_TO_TOP)/include/wine MK_CPPFLAGS := -D__USE_W32API -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 -DWINVER=0x501 -D__need_offsetof -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/include/wine + MK_HOST_CFLAGS := yes MK_PREPROC_FOR_RC_FLAGS := -xc -E -DRC_INVOKED -D__USE_W32API -I$(PATH_TO_TOP)/include/wine -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/w32api/include MK_IMPLIB := yes MK_IMPLIBONLY := no @@ -547,6 +549,7 @@ MK_SDKLIBS := MK_CFLAGS := -D__USE_W32API -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 -DWINVER=0x501 -D__need_offsetof -I$(PATH_TO_TOP)/include/wine MK_CPPFLAGS := -D__USE_W32API -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 -DWINVER=0x501 -D__need_offsetof -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/include/wine + MK_HOST_CFLAGS := yes MK_RCFLAGS := --define __USE_W32API --include-dir $(PATH_TO_TOP)/include/wine MK_IMPLIB := yes MK_IMPLIBONLY := no @@ -641,6 +644,13 @@ endif endif +ifeq ($(MK_HOST_CFLAGS),yes) + MK_CFLAGS += $(HOST_STD_CFLAGS) + MK_CPPFLAGS += $(HOST_STD_CPPFLAGS) +else + MK_CFLAGS += $(STD_CFLAGS) + MK_CPPFLAGS += $(STD_CPPFLAGS) +endif ifeq ($(MK_MODE),kernel) MK_DEFBASE := 0x10000 @@ -709,9 +719,9 @@ include $(PATH_TO_TOP)/config -TARGET_CFLAGS += $(MK_CFLAGS) $(STD_CFLAGS) -g +TARGET_CFLAGS += $(MK_CFLAGS) -g -TARGET_CPPFLAGS += $(MK_CPPFLAGS) $(STD_CPPFLAGS) -g +TARGET_CPPFLAGS += $(MK_CPPFLAGS) -g TARGET_RCFLAGS += $(MK_RCFLAGS) $(STD_RCFLAGS) @@ -767,7 +777,7 @@ ifeq ($(TARGET_WINETESTS),yes) all: - $(MAKE) -C winetests - MK_REGTESTS_CLEAN := clean_winetests + MK_REGTESTS_CLEAN := clean_winetests endif ifeq ($(TARGET_INSTALL),) _____ Modified: trunk/reactos/tools/mkhive/Makefile --- trunk/reactos/tools/mkhive/Makefile 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/mkhive/Makefile 2005-05-01 11:24:07 UTC (rev 14910) @@ -36,6 +36,11 @@ rm -f *.o rm -f mkhive$(EXE_POSTFIX) endif +ifeq ($(HOST),mingw32-linux64) +clean: + rm -f *.o + rm -f mkhive$(EXE_POSTFIX) +endif ifeq ($(HOST),mingw32-windows) clean: -del *.o _____ Modified: trunk/reactos/tools/rgenstat/Makefile --- trunk/reactos/tools/rgenstat/Makefile 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/rgenstat/Makefile 2005-05-01 11:24:07 UTC (rev 14910) @@ -19,12 +19,11 @@ rgenstat$(EXE_POSTFIX): $(OBJECTS) $(HOST_CC) $(OBJECTS) -o rgenstat$(EXE_POSTFIX) -ifeq ($(HOST),mingw32-linux) +ifeq ($(HOST_TYPE),unix) clean: rm -f *.o rm -f rgenstat$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) +else clean: -del *.o -del rgenstat$(EXE_POSTFIX) _____ Modified: trunk/reactos/tools/tools-check.mak --- trunk/reactos/tools/tools-check.mak 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/tools-check.mak 2005-05-01 11:24:07 UTC (rev 14910) @@ -12,10 +12,9 @@ BINUTILS_VERSION_DATE=$(word 5,$(shell $(PREFIX)ld -v)) all: -ifeq ($(HOST),mingw32-linux) +ifeq ($(HOST_TYPE),unix) @echo "#define BINUTILS_VERSION_DATE $(BINUTILS_VERSION_DATE)" > tools-check.h -endif -ifeq ($(HOST),mingw32-windows) +else @echo #define BINUTILS_VERSION_DATE $(BINUTILS_VERSION_DATE) > tools-check.h endif $(HOST_CC) -c tools-check.c -o tools-check.temp _____ Modified: trunk/reactos/tools/widl/Makefile --- trunk/reactos/tools/widl/Makefile 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/widl/Makefile 2005-05-01 11:24:07 UTC (rev 14910) @@ -34,7 +34,7 @@ CLEAN_FILES = *.o $(TARGET) -HOST_CFLAGS = -DYYDEBUG=1 -DINT16=SHORT -D__USE_W32API \ +HOST_CFLAGS = $(HOSTARCH) -DYYDEBUG=1 -DINT16=SHORT -D__USE_W32API \ -I$(LIB_WPP_DIR) -I$(PATH_TO_TOP)/include/wine \ -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/w32api/include \ -Werror -Wall @@ -43,13 +43,12 @@ $(HOST_CC) $(HOST_CFLAGS) -c $< -o $@ $(TARGET): $(OBJECTS) $(LIBS) - $(HOST_CC) -o $(TARGET) $(OBJECTS) $(LIBS) + $(HOST_CC) $(HOSTARCH) -o $(TARGET) $(OBJECTS) $(LIBS) -ifeq ($(HOST),mingw32-linux) +ifeq ($(HOST_TYPE),unix) clean: -rm -f $(OBJECTS) $(TARGET) -endif -ifneq ($(HOST),mingw32-linux) +else clean: -del $(TARGET) -del *.o _____ Modified: trunk/reactos/tools/wine2ros/Makefile --- trunk/reactos/tools/wine2ros/Makefile 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/wine2ros/Makefile 2005-05-01 11:24:07 UTC (rev 14910) @@ -16,11 +16,10 @@ wine2ros$(EXE_POSTFIX): $(OBJECTS) $(HOST_CC) -g $(OBJECTS) -o $(TARGET) -ifeq ($(HOST),mingw32-linux) +ifeq ($(HOST_TYPE),unix) clean: rm -f *.o $(TARGET) -endif -ifneq ($(HOST),mingw32-linux) +else clean: del *.o $(TARGET) endif _____ Modified: trunk/reactos/tools/winebuild/Makefile --- trunk/reactos/tools/winebuild/Makefile 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/winebuild/Makefile 2005-05-01 11:24:07 UTC (rev 14910) @@ -22,20 +22,24 @@ CLEAN_FILES = *.o $(TARGET) -HOST_CFLAGS = -D__USE_W32API -I$(PATH_TO_TOP)/include/wine +HOST_CFLAGS = $(HOSTARCH) -D__USE_W32API -I$(PATH_TO_TOP)/include/wine %.o: %.c $(HOST_CC) $(HOST_CFLAGS) -c $< -o $@ $(TARGET): $(OBJECTS) - $(HOST_CC) $(OBJECTS) -o $(TARGET) + $(HOST_CC) $(HOSTARCH) $(OBJECTS) -o $(TARGET) ifeq ($(HOST),mingw32-linux) clean: rm -f $(CLEAN_FILES) endif -ifneq ($(HOST),mingw32-linux) +ifeq ($(HOST),mingw32-linux64) clean: + rm -f $(CLEAN_FILES) +endif +ifeq ($(HOST),mingw32-windows) +clean: del $(CLEAN_FILES) endif _____ Modified: trunk/reactos/tools/winebuild/import.c --- trunk/reactos/tools/winebuild/import.c 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/winebuild/import.c 2005-05-01 11:24:07 UTC (rev 14910) @@ -703,6 +703,7 @@ fprintf( outfile, " \"\\t.globl " __ASM_NAME("%s") "\\n\"\n", name ); fprintf( outfile, " \"" __ASM_NAME("%s") ":\\n\\t", name); +#ifndef __REACTOS__ #if defined(__i386__) if (strstr( name, "__wine_call_from_16" )) fprintf( outfile, ".byte 0x2e\\n\\tjmp *(imports+%d)\\n\\tnop\\n", pos ); @@ -754,6 +755,7 @@ #else #error You need to define import thunks for your architecture! #endif +#endif /*__REACTOS__*/ fprintf( outfile, "\"\n" ); output_function_size( outfile, name ); } _____ Modified: trunk/reactos/tools/wmc/makefile --- trunk/reactos/tools/wmc/makefile 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/wmc/makefile 2005-05-01 11:24:07 UTC (rev 14910) @@ -40,12 +40,11 @@ y_tab.o: y_tab.c $(HOST_CC) $(HOST_CFLAGS) -g -c y_tab.c -o y_tab.o -ifeq ($(HOST),mingw32-linux) +ifeq ($(HOST_TYPE),unix) clean: rm -f *.o rm -f wmc$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) +else clean: -del *.o -del wmc$(EXE_POSTFIX) _____ Modified: trunk/reactos/tools/wpp/Makefile --- trunk/reactos/tools/wpp/Makefile 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/wpp/Makefile 2005-05-01 11:24:07 UTC (rev 14910) @@ -6,7 +6,7 @@ TARGET_NAME = wpp -TARGET_CFLAGS = -D__USE_W32API -I$(PATH_TO_TOP)/include/wine +TARGET_CFLAGS = $(HOSTARCH) -D__USE_W32API -I$(PATH_TO_TOP)/include/wine TARGET_OBJECTS = preproc.o wpp.o wpp.tab.o lex.yy.o _____ Modified: trunk/reactos/tools/wrc/Makefile --- trunk/reactos/tools/wrc/Makefile 2005-05-01 11:15:11 UTC (rev 14909) +++ trunk/reactos/tools/wrc/Makefile 2005-05-01 11:24:07 UTC (rev 14910) @@ -33,7 +33,7 @@ CLEAN_FILES = *.o $(TARGET) -HOST_CFLAGS = -D__USE_W32API -DWINE_UNICODE_API= \ +HOST_CFLAGS = $(HOSTARCH) -D__USE_W32API -DWINE_UNICODE_API= \ -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ -I$(LIB_UNICODE_DIR) -I$(LIB_WPP_DIR) -I$(PATH_TO_TOP)/include/wine \ -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/w32api/include @@ -42,13 +42,12 @@ $(HOST_CC) $(HOST_CFLAGS) -c $< -o $@ $(TARGET): $(OBJECTS) $(LIBS) - $(HOST_CC) -o $(TARGET) $(OBJECTS) $(LIBS) + $(HOST_CC) $(HOSTARCH) -o $(TARGET) $(OBJECTS) $(LIBS) -ifeq ($(HOST),mingw32-linux) +ifeq ($(HOST_TYPE),unix) clean: -rm -f $(OBJECTS) $(TARGET) -endif -ifneq ($(HOST),mingw32-linux) +else clean: -del $(TARGET) -del *.o

1 0

[navaraf] 14909: tinus <o112w8r02@sneakemail.com>
by navaraf＠svn.reactos.com 01 May '05

01 May '05

tinus <o112w8r02(a)sneakemail.com> Call the shell hook on showing/hiding window. Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-05-01 10:28:58 UTC (rev 14908) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-05-01 11:15:11 UTC (rev 14909) @@ -1283,6 +1283,10 @@ * FIXME: Need to check the window wasn't destroyed during the * window procedure. */ + if (!(Window->Parent)) + { + IntShellHookNotify(HSHELL_WINDOWCREATED, (LPARAM)Wnd); + } } /* We can't activate a child window */ @@ -1314,6 +1318,11 @@ { NtUserSetFocus(Window->Parent); } + + if (!(Window->Parent)) + { + IntShellHookNotify(HSHELL_WINDOWDESTROYED, (LPARAM)Wnd); + } } /* FIXME: Check for window destruction. */

1 0

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 May 2005