From: Magnus Olsen Date: Sun, 1 May 2005 17:32:09 +0000 (+0000) Subject: Remove some hardcode strings X-Git-Tag: backups/new_headers@15539~18^2~152 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=62bf02deb76ebe775b12a60f156c615438e30a55 Remove some hardcode strings to En.rc svn path=/trunk/; revision=14917 --- diff --git a/reactos/subsys/ntvdm/En.rc b/reactos/subsys/ntvdm/En.rc new file mode 100644 index 00000000000..14a9116bccc --- /dev/null +++ b/reactos/subsys/ntvdm/En.rc @@ -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 to run, s to shutdown or q to quit now." +} diff --git a/reactos/subsys/ntvdm/ntvdm.c b/reactos/subsys/ntvdm/ntvdm.c index 11f7845bd87..44f7a1a2876 100644 --- a/reactos/subsys/ntvdm/ntvdm.c +++ b/reactos/subsys/ntvdm/ntvdm.c @@ -15,6 +15,7 @@ #include #include #include +#include "resource.h" #define NDEBUG #include @@ -205,6 +206,7 @@ CreateVDM(PVDM_CONTROL_BLOCK vdm) 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 @@ CreateVDM(PVDM_CONTROL_BLOCK vdm) //SetLastError(); return FALSE; } + } GetSystemInfo(&inf); @@ -273,10 +276,13 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho ULONG i; BOOL vdmStarted = FALSE; - WCHAR WelcomeMsg[] = L"ReactOS Virtual DOS Machine support.\n"; - WCHAR PromptMsg[] = L"Type r to run, s to shutdown or q 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"); diff --git a/reactos/subsys/ntvdm/ntvdm.rc b/reactos/subsys/ntvdm/ntvdm.rc index 4363aab2436..afba36cb357 100644 --- a/reactos/subsys/ntvdm/ntvdm.rc +++ b/reactos/subsys/ntvdm/ntvdm.rc @@ -1,6 +1,10 @@ /* $Id$ */ +#include #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 + +#include "En.rc" + diff --git a/reactos/subsys/ntvdm/resource.h b/reactos/subsys/ntvdm/resource.h new file mode 100644 index 00000000000..0600fe4030d --- /dev/null +++ b/reactos/subsys/ntvdm/resource.h @@ -0,0 +1,6 @@ +#define RC_STRING_MAX_SIZE 2048 +#define STRING_WelcomeMsg 100 +#define STRING_PromptMsg 101 + + +/* EOF */