Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

by chorns＠svn.reactos.com

Generate map files Modified: branches/xmlbuildsystem/reactos/Makefile _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-04-02 21:45:16 UTC (rev 14461) +++ branches/xmlbuildsystem/reactos/Makefile 2005-04-02 21:45:38 UTC (rev 14462) @@ -21,6 +21,13 @@ # a path separator at the end. The variable defaults to the current # directory. # +# ROS_BUILDMAP +# This variable controls if map files are to be generated for executable +# output files. Map files have the extension .map. The value can be either +# full (to build map files with assembly code), yes (to build map files +# without source code) or no (to not build any map files). The variable +# defaults to no. +# .PHONY: all .PHONY: clean @@ -66,6 +73,8 @@ ECHO_BIN2RES =@echo [BIN2RES] $< ECHO_DLLTOOL =@echo [DLLTOOL] $@ ECHO_LD =@echo [LD] $@ + ECHO_NM =@echo [NM] $@ + ECHO_OBJDUMP =@echo [OBJDUMP] $@ ECHO_RBUILD =@echo [RBUILD] $@ ECHO_RSYM =@echo [RSYM] $@ ECHO_WMC =@echo [WMC] $@ @@ -88,6 +97,8 @@ ECHO_BIN2RES = ECHO_DLLTOOL = ECHO_LD = + ECHO_NM = + ECHO_OBJDUMP = ECHO_RBUILD = ECHO_RSYM = ECHO_WMC = @@ -112,6 +123,8 @@ gcc = $(Q)mingw32-gcc gpp = $(Q)mingw32-g++ ld = $(Q)mingw32-ld + nm = $(Q)mingw32-nm + objdump = $(Q)mingw32-objdump ar = $(Q)mingw32-ar objcopy = $(Q)mingw32-objcopy dlltool = $(Q)mingw32-dlltool @@ -128,6 +141,8 @@ gcc = $(Q)gcc gpp = $(Q)g++ ld = $(Q)ld + nm = $(Q)nm + objdump = $(Q)objdump ar = $(Q)ar objcopy = $(Q)objcopy dlltool = $(Q)dlltool @@ -147,7 +162,7 @@ ifneq ($(ROS_OUTPUT),) OUTPUT := $(ROS_OUTPUT) else - OUTPUT := obj-i386 + OUTPUT := output-i386 endif OUTPUT_ := $(OUTPUT)$(SEP)

19 years, 7 months

[chorns] 14461: Generate map files

by chorns＠svn.reactos.com

Generate map files Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-02 21:06:44 UTC (rev 14460) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-02 21:45:16 UTC (rev 14461) @@ -938,6 +938,41 @@ } void +MingwModuleHandler::GenerateBuildMapCode () +{ + fprintf ( fMakefile, + "ifeq ($(ROS_BUILDMAP),full)\n" ); + + string mapFilename = PassThruCacheDirectory ( + GetBasename ( module.GetPath () ) + ".map", + true ); + CLEAN_FILE ( mapFilename ); + + fprintf ( fMakefile, + "\t$(ECHO_OBJDUMP)\n" ); + fprintf ( fMakefile, + "\t$(Q)${objdump} -d -S $@ > %s\n", + mapFilename.c_str () ); + + fprintf ( fMakefile, + "else\n" ); + fprintf ( fMakefile, + "ifeq ($(ROS_BUILDMAP),yes)\n" ); + + fprintf ( fMakefile, + "\t$(ECHO_NM)\n" ); + fprintf ( fMakefile, + "\t$(Q)${nm} --numeric-sort $@ > %s\n", + mapFilename.c_str () ); + + fprintf ( fMakefile, + "endif\n" ); + + fprintf ( fMakefile, + "endif\n" ); +} + +void MingwModuleHandler::GenerateLinkerCommand ( const string& dependencies, const string& linker, @@ -1018,8 +1053,11 @@ GetLinkerMacro ().c_str () ); } - fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" ); + GenerateBuildMapCode (); + fprintf ( fMakefile, + "\t$(ECHO_RSYM)\n" ); + fprintf ( fMakefile, "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" ); } @@ -1242,7 +1280,7 @@ fprintf ( fMakefile, - "%s += $(PROJECT_CFLAGS)\n", + "%s += $(PROJECT_CFLAGS) -g\n", cflagsMacro.c_str () ); fprintf ( @@ -1252,7 +1290,7 @@ fprintf ( fMakefile, - "%s_LFLAGS += $(PROJECT_LFLAGS)\n", + "%s_LFLAGS += $(PROJECT_LFLAGS) -g\n", module.name.c_str () ); fprintf ( _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-04-02 21:06:44 UTC (rev 14460) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-04-02 21:45:16 UTC (rev 14461) @@ -147,6 +147,7 @@ bool IsWineModule () const; std::string GetDefinitionFilename () const; static std::string RemoveVariables ( std::string path); + void GenerateBuildMapCode (); public: const Module& module; string_list clean_files; _____ Modified: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak --- branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak 2005-04-02 21:06:44 UTC (rev 14460) +++ branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak 2005-04-02 21:45:16 UTC (rev 14461) @@ -12,7 +12,7 @@ ifneq ($(INTERMEDIATE),$(OUTPUT)) $(WINEBUILD_OUT): $(TOOLS_OUT) $(ECHO_MKDIR) - @{mkdir} $@ + ${mkdir} $@ endif WINEBUILD_TARGET = \

19 years, 7 months

[greatlrd] 14460: Remove more hardcode string to En.rc

by greatlrd＠svn.reactos.com

Remove more hardcode string to En.rc Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/alias.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/cls.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-02 21:02:31 UTC (rev 14459) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-02 21:06:44 UTC (rev 14460) @@ -20,6 +20,24 @@ /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 \ + 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 \ + batch program." + STRING_CD_HELP, "Changes the current directory or displays it's name\n\n \ CHDIR [drive:][path]\n \ CHDIR[..|-]\n \ @@ -39,6 +57,8 @@ 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" + STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT" STRING_MKDIR_HELP, "Creates a directory.\n\n \ @@ -51,6 +71,11 @@ + + + + + STRING_CHOICE_OPTION "YN" @@ -60,4 +85,10 @@ STRING_CHOICE_ERROR_OPTION, "Illegal Option: %s" STRING_PARAM_ERROR, "Required parameter missing\n" + +STRING_ALIAS_ERROR, "Command line too long after alias expansion!\n" + +STRING_BATCH_ERROR, "Error opening batch file\n" + + } _____ Modified: trunk/reactos/subsys/system/cmd/alias.c --- trunk/reactos/subsys/system/cmd/alias.c 2005-04-02 21:02:31 UTC (rev 14459) +++ trunk/reactos/subsys/system/cmd/alias.c 2005-04-02 21:06:44 UTC (rev 14460) @@ -24,10 +24,14 @@ * * 24-Jan-1998 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Redirection safe! + * + * 02-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef FEATURE_ALIASES @@ -233,6 +237,7 @@ /* specified routines */ VOID ExpandAlias (LPTSTR cmd, INT maxlen) { + WCHAR szMsg[RC_STRING_MAX_SIZE]; unsigned n = 0, m, i, @@ -276,7 +281,8 @@ m = _tcslen (ptr->lpSubst); if ((int)(_tcslen (cmd) - len + m - n) > maxlen) { - ConErrPrintf (_T("Command line too long after alias expansion!\n")); + LoadString( GetModuleHandle(NULL), STRING_ALIAS_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg)); /* the parser won't cause any problems with an empty line */ cmd[0] = _T('\0'); } @@ -300,25 +306,12 @@ INT CommandAlias (LPTSTR cmd, LPTSTR param) { LPTSTR ptr; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("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" -// "For example:\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=" -// "Type ALIAS without a parameter to display the alias list.\n" - )); + LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/batch.c --- trunk/reactos/subsys/system/cmd/batch.c 2005-04-02 21:02:31 UTC (rev 14459) +++ trunk/reactos/subsys/system/cmd/batch.c 2005-04-02 21:06:44 UTC (rev 14460) @@ -54,9 +54,13 @@ * * 23-Feb-2001 (Carl Nettelblad <cnettel(a)hem.passagen.es>) * Fixes made to get "for" working. + * + * 02-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" /* The stack of current batch contexts. @@ -215,6 +219,7 @@ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param) { HANDLE hFile; + WCHAR szMsg[RC_STRING_MAX_SIZE]; hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | @@ -227,7 +232,8 @@ if (hFile == INVALID_HANDLE_VALUE) { - ConErrPrintf (_T("Error opening batch file\n")); + LoadString( GetModuleHandle(NULL), STRING_BATCH_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg)); return FALSE; } _____ Modified: trunk/reactos/subsys/system/cmd/beep.c --- trunk/reactos/subsys/system/cmd/beep.c 2005-04-02 21:02:31 UTC (rev 14459) +++ trunk/reactos/subsys/system/cmd/beep.c 2005-04-02 21:06:44 UTC (rev 14460) @@ -19,18 +19,25 @@ * * 20-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Redirection ready! + * + * 02-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_BEEP INT cmd_beep (LPTSTR cmd, LPTSTR param) { + WCHAR szMsg[RC_STRING_MAX_SIZE]; + if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutPuts (_T("Beep the speaker.\n\nBEEP")); + LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/call.c --- trunk/reactos/subsys/system/cmd/call.c 2005-04-02 21:02:31 UTC (rev 14459) +++ trunk/reactos/subsys/system/cmd/call.c 2005-04-02 21:06:44 UTC (rev 14460) @@ -24,9 +24,13 @@ * * 20-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Unicode and redirection safe! + * + * 02-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" /* @@ -41,16 +45,16 @@ INT cmd_call (LPTSTR cmd, LPTSTR param) { LPBATCH_CONTEXT n = NULL; + WCHAR szMsg[RC_STRING_MAX_SIZE]; #ifdef _DEBUG DebugPrintf (_T("cmd_call: (\'%s\',\'%s\')\n"), cmd, param); #endif if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("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.")); + LoadString( GetModuleHandle(NULL), STRING_CALL_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); + return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/cls.c --- trunk/reactos/subsys/system/cmd/cls.c 2005-04-02 21:02:31 UTC (rev 14459) +++ trunk/reactos/subsys/system/cmd/cls.c 2005-04-02 21:06:44 UTC (rev 14460) @@ -21,9 +21,13 @@ * * 20-Jan-1998 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Redirection ready! + * + * 02-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_CLS @@ -32,10 +36,12 @@ DWORD dwWritten; CONSOLE_SCREEN_BUFFER_INFO csbi; COORD coPos; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Clears the screen.\n\nCLS")); + LoadString( GetModuleHandle(NULL), STRING_CLS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-02 21:02:31 UTC (rev 14459) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-02 21:06:44 UTC (rev 14460) @@ -2,21 +2,30 @@ #define STRING_CHOICE_OPTION 200 -#define STRING_PARAM_ERROR 300 -#define STRING_CHOICE_ERROR 301 -#define STRING_CHOICE_ERROR_TXT 302 -#define STRING_CHOICE_ERROR_OPTION 303 +#define STRING_ALIAS_ERROR 300 +#define STRING_BATCH_ERROR 301 +#define STRING_CHOICE_ERROR 302 +#define STRING_CHOICE_ERROR_TXT 303 +#define STRING_CHOICE_ERROR_OPTION 304 +#define STRING_PARAM_ERROR 305 - #define STRING_ATTRIB_HELP 400 -#define STRING_CD_HELP 401 -#define STRING_CHOICE_HELP 402 -#define STRING_EXIT_HELP 403 -#define STRING_MKDIR_HELP 404 -#define STRING_RMDIR_HELP 405 -#define STRING_REM_HELP 406 +#define STRING_ALIAS_HELP 401 +#define STRING_BEEP_HELP 402 +#define STRING_CALL_HELP 403 +#define STRING_CD_HELP 404 +#define STRING_CHOICE_HELP 405 +#define STRING_CLS_HELP 406 +#define STRING_EXIT_HELP 407 +#define STRING_MKDIR_HELP 408 +#define STRING_RMDIR_HELP 409 +#define STRING_REM_HELP 410 + + + +

19 years, 7 months

[sedwards] 14459: another one bytes the dust. messages.h is gone

by sedwards＠svn.reactos.com

another one bytes the dust. messages.h is gone Deleted: trunk/reactos/include/messages.h Modified: trunk/reactos/include/windows.h Modified: trunk/reactos/lib/user32/user32.rc Modified: trunk/reactos/lib/user32/windows/messagebox.c _____ Deleted: trunk/reactos/include/messages.h --- trunk/reactos/include/messages.h 2005-04-02 20:27:41 UTC (rev 14458) +++ trunk/reactos/include/messages.h 2005-04-02 21:02:31 UTC (rev 14459) @@ -1,1144 +0,0 @@ -/* - Messages.h - - Windows32 API message definitions - - Copyright (C) 1996 Free Software Foundation, Inc. - - Author: Scott Christley <scottc(a)net-community.com> - - This file is part of the Windows32 API Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - If you are interested in a warranty or support for this source code, - contact Scott Christley <scottc(a)net-community.com> for more information. - - You should have received a copy of the GNU Library General Public - License along with this library; see the file COPYING.LIB. - If not, write to the Free Software Foundation, - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ -/* WARNING: This file is automatically generated. */ - -#ifndef _GNU_H_WINDOWS32_MESSAGES -#define _GNU_H_WINDOWS32_MESSAGES - -#ifdef __USE_W32API - -#include <winuser.h> - -#else /* __USE_W32API */ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -/* Application bar */ - -/* Application bar notifications */ - -/* Animation Control */ -#define ACM_OPENW (1127) -#define ACM_OPENA (1124) -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define ACM_OPEN ACM_OPENW -#else -#define ACM_OPEN ACM_OPENA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ -#define ACM_PLAY (1125) -#define ACM_STOP (1126) -#define ACN_START (1) -#define ACN_STOP (2) - -/* Buttons */ -#define BM_CLICK (245) -#define BM_GETCHECK (240) -#define BM_GETIMAGE (246) -#define BM_GETSTATE (242) -#define BM_SETCHECK (241) -#define BM_SETIMAGE (247) -#define BM_SETSTATE (243) -#define BM_SETSTYLE (244) -#define BN_CLICKED (0) -#define BN_DBLCLK (5) -#define BN_DISABLE (4) -#define BN_DOUBLECLICKED (5) -#define BN_HILITE (2) -#define BN_KILLFOCUS (7) -#define BN_PAINT (1) -#define BN_PUSHED (2) -#define BN_SETFOCUS (6) -#define BN_UNHILITE (3) -#define BN_UNPUSHED (3) - -/* Combo Box */ -#define CB_ADDSTRING (323) -#define CB_DELETESTRING (324) -#define CB_DIR (325) -#define CB_FINDSTRING (332) -#define CB_FINDSTRINGEXACT (344) -#define CB_GETCOUNT (326) -#define CB_GETCURSEL (327) -#define CB_GETDROPPEDCONTROLRECT (338) -#define CB_GETDROPPEDSTATE (343) -#define CB_GETDROPPEDWIDTH (351) -#define CB_GETEDITSEL (320) -#define CB_GETEXTENDEDUI (342) -#define CB_GETHORIZONTALEXTENT (349) -#define CB_GETITEMDATA (336) -#define CB_GETITEMHEIGHT (340) -#define CB_GETLBTEXT (328) -#define CB_GETLBTEXTLEN (329) -#define CB_GETLOCALE (346) -#define CB_GETTOPINDEX (347) -#define CB_INITSTORAGE (353) -#define CB_INSERTSTRING (330) -#define CB_LIMITTEXT (321) -#define CB_RESETCONTENT (331) -#define CB_SELECTSTRING (333) -#define CB_SETCURSEL (334) -#define CB_SETDROPPEDWIDTH (352) -#define CB_SETEDITSEL (322) -#define CB_SETEXTENDEDUI (341) -#define CB_SETHORIZONTALEXTENT (350) -#define CB_SETITEMDATA (337) -#define CB_SETITEMHEIGHT (339) -#define CB_SETLOCALE (345) -#define CB_SETTOPINDEX (348) -#define CB_SHOWDROPDOWN (335) - -/* Combo Box notifications */ -#define CBN_CLOSEUP (8) -#define CBN_DBLCLK (2) -#define CBN_DROPDOWN (7) -#define CBN_EDITCHANGE (5) -#define CBN_EDITUPDATE (6) -#define CBN_ERRSPACE (-1) -#define CBN_KILLFOCUS (4) -#define CBN_SELCHANGE (1) -#define CBN_SELENDCANCEL (10) -#define CBN_SELENDOK (9) -#define CBN_SETFOCUS (3) - -/* Control Panel */ - -/* Device messages */ - -/* Drag list box */ -#define DL_BEGINDRAG (1157) -#define DL_CANCELDRAG (1160) -#define DL_DRAGGING (1158) -#define DL_DROPPED (1159) - -/* Default push button */ -#define DM_GETDEFID (1024) -#define DM_REPOSITION (1026) -#define DM_SETDEFID (1025) - -/* RTF control */ -#define EM_CANPASTE (1074) -#define EM_CANUNDO (198) -#define EM_CHARFROMPOS (215) -#define EM_DISPLAYBAND (1075) -#define EM_EMPTYUNDOBUFFER (205) -#define EM_EXGETSEL (1076) -#define EM_EXLIMITTEXT (1077) -#define EM_EXLINEFROMCHAR (1078) -#define EM_EXSETSEL (1079) -#define EM_FINDTEXT (1080) -#define EM_FINDTEXTEX (1103) -#define EM_FINDWORDBREAK (1100) -#define EM_FMTLINES (200) -#define EM_FORMATRANGE (1081) -#define EM_GETCHARFORMAT (1082) -#define EM_GETEVENTMASK (1083) -#define EM_GETFIRSTVISIBLELINE (206) -#define EM_GETHANDLE (189) -#define EM_GETLIMITTEXT (213) -#define EM_GETLINE (196) -#define EM_GETLINECOUNT (186) -#define EM_GETMARGINS (212) -#define EM_GETMODIFY (184) -#define EM_GETIMECOLOR (1129) -#define EM_GETIMEOPTIONS (1131) -#define EM_GETOPTIONS (1102) -#define EM_GETOLEINTERFACE (1084) -#define EM_GETPARAFORMAT (1085) -#define EM_GETPASSWORDCHAR (210) -#define EM_GETPUNCTUATION (1125) -#define EM_GETRECT (178) -#define EM_GETSEL (176) -#define EM_GETSELTEXT (1086) -#define EM_GETTEXTRANGE (1099) -#define EM_GETTHUMB (190) -#define EM_GETWORDBREAKPROC (209) -#define EM_GETWORDBREAKPROCEX (1104) -#define EM_GETWORDWRAPMODE (1127) -#define EM_HIDESELECTION (1087) -#define EM_LIMITTEXT (197) -#define EM_LINEFROMCHAR (201) -#define EM_LINEINDEX (187) -#define EM_LINELENGTH (193) -#define EM_LINESCROLL (182) -#define EM_PASTESPECIAL (1088) -#define EM_POSFROMCHAR (214) -#define EM_REPLACESEL (194) -#define EM_REQUESTRESIZE (1089) -#define EM_SCROLL (181) -#define EM_SCROLLCARET (183) -#define EM_SELECTIONTYPE (1090) -#define EM_SETBKGNDCOLOR (1091) -#define EM_SETCHARFORMAT (1092) -#define EM_SETEVENTMASK (1093) -#define EM_SETHANDLE (188) -#define EM_SETIMECOLOR (1128) -#define EM_SETIMEOPTIONS (1130) -#define EM_SETLIMITTEXT (197) -#define EM_SETMARGINS (211) -#define EM_SETMODIFY (185) -#define EM_SETOLECALLBACK (1094) -#define EM_SETOPTIONS (1101) -#define EM_SETPARAFORMAT (1095) -#define EM_SETPASSWORDCHAR (204) -#define EM_SETPUNCTUATION (1124) -#define EM_SETREADONLY (207) -#define EM_SETRECT (179) -#define EM_SETRECTNP (180) -#define EM_SETSEL (177) -#define EM_SETTABSTOPS (203) -#define EM_SETTARGETDEVICE (1096) -#define EM_SETWORDBREAKPROC (208) -#define EM_SETWORDBREAKPROCEX (1105) -#define EM_SETWORDWRAPMODE (1126) -#define EM_STREAMIN (1097) -#define EM_STREAMOUT (1098) -#define EM_UNDO (199) - -/* Edit control */ -#define EN_CHANGE (768) -#define EN_CORRECTTEXT (1797) -#define EN_DROPFILES (1795) -#define EN_ERRSPACE (1280) -#define EN_HSCROLL (1537) -#define EN_IMECHANGE (1799) -#define EN_KILLFOCUS (512) -#define EN_MAXTEXT (1281) -#define EN_MSGFILTER (1792) -#define EN_OLEOPFAILED (1801) -#define EN_PROTECTED (1796) -#define EN_REQUESTRESIZE (1793) -#define EN_SAVECLIPBOARD (1800) -#define EN_SELCHANGE (1794) -#define EN_SETFOCUS (256) -#define EN_STOPNOUNDO (1798) -#define EN_UPDATE (1024) -#define EN_VSCROLL (1538) - -/* File Manager extensions */ - -/* File Manager extensions DLL events */ - -/* Header control */ -#define HDM_DELETEITEM (4610) -#define HDM_GETITEMW (4619) -#define HDM_INSERTITEMW (4618) -#define HDM_SETITEMW (4620) -#define HDM_GETITEMA (4611) -#define HDM_INSERTITEMA (4609) -#define HDM_SETITEMA (4612) -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define HDM_GETITEM HDM_GETITEMW -#define HDM_INSERTITEM HDM_INSERTITEMW -#define HDM_SETITEM HDM_SETITEMW -#else -#define HDM_GETITEM HDM_GETITEMA -#define HDM_INSERTITEM HDM_INSERTITEMA -#define HDM_SETITEM HDM_SETITEMA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ -#define HDM_GETITEMCOUNT (4608) -#define HDM_HITTEST (4614) -#define HDM_LAYOUT (4613) - -/* Header control notifications */ -#define HDN_BEGINTRACKW (-326) -#define HDN_DIVIDERDBLCLICKW (-325) -#define HDN_ENDTRACKW (-327) -#define HDN_ITEMCHANGEDW (-321) -#define HDN_ITEMCHANGINGW (-320) -#define HDN_ITEMCLICKW (-322) -#define HDN_ITEMDBLCLICKW (-323) -#define HDN_TRACKW (-328) -#define HDN_BEGINTRACKA (-306) -#define HDN_DIVIDERDBLCLICKA (-305) -#define HDN_ENDTRACKA (-307) -#define HDN_ITEMCHANGEDA (-301) -#define HDN_ITEMCHANGINGA (-300) -#define HDN_ITEMCLICKA (-302) -#define HDN_ITEMDBLCLICKA (-303) -#define HDN_TRACKA (-308) -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define HDN_BEGINTRACK HDN_BEGINTRACKW -#define HDN_DIVIDERDBLCLICK HDN_DIVIDERDBLCLICKW -#define HDN_ENDTRACK HDN_ENDTRACKW -#define HDN_ITEMCHANGED HDN_ITEMCHANGEDW -#define HDN_ITEMCHANGING HDN_ITEMCHANGINGW -#define HDN_ITEMCLICK HDN_ITEMCLICKW -#define HDN_ITEMDBLCLICK HDN_ITEMDBLCLICKW -#define HDN_TRACK HDN_TRACKW -#else -#define HDN_BEGINTRACK HDN_BEGINTRACKA -#define HDN_DIVIDERDBLCLICK HDN_DIVIDERDBLCLICKA -#define HDN_ENDTRACK HDN_ENDTRACKA -#define HDN_ITEMCHANGED HDN_ITEMCHANGEDA -#define HDN_ITEMCHANGING HDN_ITEMCHANGINGA -#define HDN_ITEMCLICK HDN_ITEMCLICKA -#define HDN_ITEMDBLCLICK HDN_ITEMDBLCLICKA -#define HDN_TRACK HDN_TRACKA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -/* Hot key control */ -#define HKM_GETHOTKEY (1026) -#define HKM_SETHOTKEY (1025) -#define HKM_SETRULES (1027) - -/* List box */ -#define LB_ADDFILE (406) -#define LB_ADDSTRING (384) -#define LB_DELETESTRING (386) -#define LB_DIR (397) -#define LB_FINDSTRING (399) -#define LB_FINDSTRINGEXACT (418) -#define LB_GETANCHORINDEX (413) -#define LB_GETCARETINDEX (415) -#define LB_GETCOUNT (395) -#define LB_GETCURSEL (392) -#define LB_GETHORIZONTALEXTENT (403) -#define LB_GETITEMDATA (409) -#define LB_GETITEMHEIGHT (417) -#define LB_GETITEMRECT (408) -#define LB_GETLOCALE (422) -#define LB_GETSEL (391) -#define LB_GETSELCOUNT (400) -#define LB_GETSELITEMS (401) -#define LB_GETTEXT (393) -#define LB_GETTEXTLEN (394) -#define LB_GETTOPINDEX (398) -#define LB_INITSTORAGE (424) -#define LB_INSERTSTRING (385) -#define LB_ITEMFROMPOINT (425) -#define LB_RESETCONTENT (388) -#define LB_SELECTSTRING (396) -#define LB_SELITEMRANGE (411) -#define LB_SELITEMRANGEEX (387) -#define LB_SETANCHORINDEX (412) -#define LB_SETCARETINDEX (414) -#define LB_SETCOLUMNWIDTH (405) -#define LB_SETCOUNT (423) -#define LB_SETCURSEL (390) -#define LB_SETHORIZONTALEXTENT (404) -#define LB_SETITEMDATA (410) -#define LB_SETITEMHEIGHT (416) -#define LB_SETLOCALE (421) -#define LB_SETSEL (389) -#define LB_SETTABSTOPS (402) -#define LB_SETTOPINDEX (407) - -/* List box notifications */ -#define LBN_DBLCLK (2) -#define LBN_ERRSPACE (-2) -#define LBN_KILLFOCUS (5) -#define LBN_SELCANCEL (3) -#define LBN_SELCHANGE (1) -#define LBN_SETFOCUS (4) - -/* List view control */ -#define LVM_ARRANGE (4118) -#define LVM_CREATEDRAGIMAGE (4129) -#define LVM_DELETEALLITEMS (4105) -#define LVM_DELETECOLUMN (4124) -#define LVM_DELETEITEM (4104) -#define LVM_ENSUREVISIBLE (4115) -#define LVM_GETBKCOLOR (4096) -#define LVM_GETCALLBACKMASK (4106) -#define LVM_GETCOLUMNWIDTH (4125) -#define LVM_GETCOUNTPERPAGE (4136) -#define LVM_GETEDITCONTROL (4120) -#define LVM_GETIMAGELIST (4098) -#define LVM_EDITLABELW (4214) -#define LVM_FINDITEMW (4179) -#define LVM_GETCOLUMNW (4191) -#define LVM_GETISEARCHSTRINGW (4213) -#define LVM_GETITEMW (4171) -#define LVM_GETITEMTEXTW (4211) -#define LVM_GETSTRINGWIDTHW (4183) -#define LVM_INSERTCOLUMNW (4193) -#define LVM_INSERTITEMW (4173) -#define LVM_SETCOLUMNW (4192) -#define LVM_SETITEMW (4172) -#define LVM_SETITEMTEXTW (4212) -#define LVM_EDITLABELA (4119) -#define LVM_FINDITEMA (4109) -#define LVM_GETCOLUMNA (4121) -#define LVM_GETISEARCHSTRINGA (4148) -#define LVM_GETITEMA (4101) -#define LVM_GETITEMTEXTA (4141) -#define LVM_GETSTRINGWIDTHA (4113) -#define LVM_INSERTCOLUMNA (4123) -#define LVM_INSERTITEMA (4103) -#define LVM_SETCOLUMNA (4122) -#define LVM_SETITEMA (4102) -#define LVM_SETITEMTEXTA (4142) -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define LVM_EDITLABEL LVM_EDITLABELW -#define LVM_FINDITEM LVM_FINDITEMW -#define LVM_GETCOLUMN LVM_GETCOLUMNW -#define LVM_GETISEARCHSTRING LVM_GETISEARCHSTRINGW -#define LVM_GETITEM LVM_GETITEMW -#define LVM_GETITEMTEXT LVM_GETITEMTEXTW -#define LVM_GETSTRINGWIDTH LVM_GETSTRINGWIDTHW -#define LVM_INSERTCOLUMN LVM_INSERTCOLUMNW -#define LVM_INSERTITEM LVM_INSERTITEMW -#define LVM_SETCOLUMN LVM_SETCOLUMNW -#define LVM_SETITEM LVM_SETITEMW -#define LVM_SETITEMTEXT LVM_SETITEMTEXTW -#else -#define LVM_EDITLABEL LVM_EDITLABELA -#define LVM_FINDITEM LVM_FINDITEMA -#define LVM_GETCOLUMN LVM_GETCOLUMNA -#define LVM_GETISEARCHSTRING LVM_GETISEARCHSTRINGA -#define LVM_GETITEM LVM_GETITEMA -#define LVM_GETITEMTEXT LVM_GETITEMTEXTA -#define LVM_GETSTRINGWIDTH LVM_GETSTRINGWIDTHA -#define LVM_INSERTCOLUMN LVM_INSERTCOLUMNA -#define LVM_INSERTITEM LVM_INSERTITEMA -#define LVM_SETCOLUMN LVM_SETCOLUMNA -#define LVM_SETITEM LVM_SETITEMA -#define LVM_SETITEMTEXT LVM_SETITEMTEXTA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ -#define LVM_GETITEMCOUNT (4100) -#define LVM_GETITEMPOSITION (4112) -#define LVM_GETITEMRECT (4110) -#define LVM_GETITEMSPACING (4147) -#define LVM_GETITEMSTATE (4140) -#define LVM_GETNEXTITEM (4108) -#define LVM_GETORIGIN (4137) -#define LVM_GETSELECTEDCOUNT (4146) -#define LVM_GETTEXTBKCOLOR (4133) -#define LVM_GETTEXTCOLOR (4131) -#define LVM_GETTOPINDEX (4135) -#define LVM_GETVIEWRECT (4130) -#define LVM_HITTEST (4114) -#define LVM_REDRAWITEMS (4117) -#define LVM_SCROLL (4116) -#define LVM_SETBKCOLOR (4097) -#define LVM_SETCALLBACKMASK (4107) -#define LVM_SETCOLUMNWIDTH (4126) -#define LVM_SETIMAGELIST (4099) -#define LVM_SETITEMCOUNT (4143) -#define LVM_SETITEMPOSITION (4111) -#define LVM_SETITEMPOSITION32 (4145) -#define LVM_SETITEMSTATE (4139) -#define LVM_SETTEXTBKCOLOR (4134) -#define LVM_SETTEXTCOLOR (4132) -#define LVM_SORTITEMS (4144) -#define LVM_UPDATE (4138) - -/* List view control notifications */ -#define LVN_BEGINDRAG (-109) -#define LVN_BEGINRDRAG (-111) -#define LVN_COLUMNCLICK (-108) -#define LVN_DELETEALLITEMS (-104) -#define LVN_DELETEITEM (-103) -#define LVN_BEGINLABELEDITW (-175) -#define LVN_ENDLABELEDITW (-176) -#define LVN_GETDISPINFOW (-177) -#define LVN_SETDISPINFOW (-178) -#define LVN_BEGINLABELEDITA (-105) -#define LVN_ENDLABELEDITA (-106) -#define LVN_GETDISPINFOA (-150) -#define LVN_SETDISPINFOA (-151) -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define LVN_BEGINLABELEDIT LVN_BEGINLABELEDITW -#define LVN_ENDLABELEDIT LVN_ENDLABELEDITW -#define LVN_GETDISPINFO LVN_GETDISPINFOW -#define LVN_SETDISPINFO LVN_SETDISPINFOW -#else -#define LVN_BEGINLABELEDIT LVN_BEGINLABELEDITA -#define LVN_ENDLABELEDIT LVN_ENDLABELEDITA -#define LVN_GETDISPINFO LVN_GETDISPINFOA -#define LVN_SETDISPINFO LVN_SETDISPINFOA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ -#define LVN_INSERTITEM (-102) -#define LVN_ITEMCHANGED (-101) -#define LVN_ITEMCHANGING (-100) -#define LVN_KEYDOWN (-155) - -/* Control notification */ -#define NM_CLICK (-2) -#define NM_DBLCLK (-3) -#define NM_KILLFOCUS (-8) -#define NM_OUTOFMEMORY (-1) -#define NM_RCLICK (-5) -#define NM_RDBLCLK (-6) -#define NM_RETURN (-4) -#define NM_SETFOCUS (-7) - -/* Power status */ - -/* Progress bar control */ -#define PBM_DELTAPOS (1027) -#define PBM_SETPOS (1026) -#define PBM_SETRANGE (1025) -#define PBM_SETSTEP (1028) -#define PBM_STEPIT (1029) - -/* Property sheets */ -#define PSM_ADDPAGE (1127) -#define PSM_APPLY (1134) -#define PSM_CANCELTOCLOSE (1131) -#define PSM_CHANGED (1128) -#define PSM_GETTABCONTROL (1140) -#define PSM_GETCURRENTPAGEHWND (1142) -#define PSM_ISDIALOGMESSAGE (1141) -#define PSM_PRESSBUTTON (1137) -#define PSM_QUERYSIBLINGS (1132) -#define PSM_REBOOTSYSTEM (1130) -#define PSM_REMOVEPAGE (1126) -#define PSM_RESTARTWINDOWS (1129) -#define PSM_SETCURSEL (1125) -#define PSM_SETCURSELID (1138) -#define PSM_SETFINISHTEXTW (1145) -#define PSM_SETTITLEW (1144) -#define PSM_SETFINISHTEXTA (1139) -#define PSM_SETTITLEA (1135) -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define PSM_SETFINISHTEXT PSM_SETFINISHTEXTW -#define PSM_SETTITLE PSM_SETTITLEW -#else -#define PSM_SETFINISHTEXT PSM_SETFINISHTEXTA -#define PSM_SETTITLE PSM_SETTITLEA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ -#define PSM_SETWIZBUTTONS (1136) -#define PSM_UNCHANGED (1133) - -/* Property sheet notifications */ -#define PSN_APPLY (-202) -#define PSN_HELP (-205) -#define PSN_KILLACTIVE (-201) -#define PSN_QUERYCANCEL (-209) -#define PSN_RESET (-203) -#define PSN_SETACTIVE (-200) -#define PSN_WIZBACK (-206) -#define PSN_WIZFINISH (-208) -#define PSN_WIZNEXT (-207) - -/* Status window */ -#define SB_GETBORDERS (1031) -#define SB_GETPARTS (1030) -#define SB_GETRECT (1034) -#define SB_GETTEXTW (1037) -#define SB_GETTEXTLENGTHW (1036) -#define SB_SETTEXTW (1035) -#define SB_GETTEXTA (1026) -#define SB_GETTEXTLENGTHA (1027) -#define SB_SETTEXTA (1025) -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define SB_GETTEXT SB_GETTEXTW -#define SB_GETTEXTLENGTH SB_GETTEXTLENGTHW -#define SB_SETTEXT SB_SETTEXTW -#else -#define SB_GETTEXT SB_GETTEXTA -#define SB_GETTEXTLENGTH SB_GETTEXTLENGTHA -#define SB_SETTEXT SB_SETTEXTA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ -#define SB_SETMINHEIGHT (1032) -#define SB_SETPARTS (1028) -#define SB_SIMPLE (1033) - -/* Scroll bar control */ -#define SBM_ENABLE_ARROWS (228) -#define SBM_GETPOS (225) -#define SBM_GETRANGE (227) -#define SBM_GETSCROLLINFO (234) -#define SBM_SETPOS (224) -#define SBM_SETRANGE (226) -#define SBM_SETRANGEREDRAW (230) -#define SBM_SETSCROLLINFO (233) - -/* Static control */ -#define STM_GETICON (369) -#define STM_GETIMAGE (371) -#define STM_SETICON (368) -#define STM_SETIMAGE (370) - -/* Static control notifications */ -#define STN_CLICKED (0) -#define STN_DBLCLK (1) -#define STN_DISABLE (3) -#define STN_ENABLE (2) - -/* Toolbar control */ -#define TB_ADDBITMAP (1043) -#define TB_ADDBUTTONS (1044) -#define TB_AUTOSIZE (1057) -#define TB_BUTTONCOUNT (1048) -#define TB_BUTTONSTRUCTSIZE (1054) -#define TB_CHANGEBITMAP (1067) -#define TB_CHECKBUTTON (1026) -#define TB_COMMANDTOINDEX (1049) -#define TB_CUSTOMIZE (1051) -#define TB_DELETEBUTTON (1046) -#define TB_ENABLEBUTTON (1025) -#define TB_GETBITMAP (1068) -#define TB_GETBITMAPFLAGS (1065) -#define TB_GETBUTTON (1047) -#define TB_ADDSTRINGW (1101) -#define TB_GETBUTTONTEXTW (1099) -#define TB_SAVERESTOREW (1100) -#define TB_ADDSTRINGA (1052) -#define TB_GETBUTTONTEXTA (1069) -#define TB_SAVERESTOREA (1050) -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define TB_ADDSTRING TB_ADDSTRINGW -#define TB_GETBUTTONTEXT TB_GETBUTTONTEXTW -#define TB_SAVERESTORE TB_SAVERESTOREW -#else -#define TB_ADDSTRING TB_ADDSTRINGA -#define TB_GETBUTTONTEXT TB_GETBUTTONTEXTA -#define TB_SAVERESTORE TB_SAVERESTOREA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ -#define TB_GETITEMRECT (1053) -#define TB_GETROWS (1064) -#define TB_GETSTATE (1042) -#define TB_GETTOOLTIPS (1059) -#define TB_HIDEBUTTON (1028) -#define TB_INDETERMINATE (1029) -#define TB_INSERTBUTTON (1045) -#define TB_ISBUTTONCHECKED (1034) -#define TB_ISBUTTONENABLED (1033) -#define TB_ISBUTTONHIDDEN (1036) -#define TB_ISBUTTONINDETERMINATE (1037) -#define TB_ISBUTTONPRESSED (1035) -#define TB_PRESSBUTTON (1027) -#define TB_SETBITMAPSIZE (1056) -#define TB_SETBUTTONSIZE (1055) -#define TB_SETCMDID (1066) -#define TB_SETPARENT (1061) -#define TB_SETROWS (1063) -#define TB_SETSTATE (1041) -#define TB_SETTOOLTIPS (1060) - -/* Track bar control */ -#define TBM_CLEARSEL (1043) -#define TBM_CLEARTICS (1033) -#define TBM_GETCHANNELRECT (1050) -#define TBM_GETLINESIZE (1048) -#define TBM_GETNUMTICS (1040) -#define TBM_GETPAGESIZE (1046) -#define TBM_GETPOS (1024) -#define TBM_GETPTICS (1038) -#define TBM_GETRANGEMAX (1026) -#define TBM_GETRANGEMIN (1025) -#define TBM_GETSELEND (1042) -#define TBM_GETSELSTART (1041) -#define TBM_GETTHUMBLENGTH (1052) -#define TBM_GETTHUMBRECT (1049) -#define TBM_GETTIC (1027) -#define TBM_GETTICPOS (1039) -#define TBM_SETLINESIZE (1047) -#define TBM_SETPAGESIZE (1045) -#define TBM_SETPOS (1029) -#define TBM_SETRANGE (1030) -#define TBM_SETRANGEMAX (1032) -#define TBM_SETRANGEMIN (1031) -#define TBM_SETSEL (1034) -#define TBM_SETSELEND (1036) -#define TBM_SETSELSTART (1035) -#define TBM_SETTHUMBLENGTH (1051) -#define TBM_SETTIC (1028) -#define TBM_SETTICFREQ (1044) - -/* Tool bar control notifications */ -#define TBN_BEGINADJUST (-703) -#define TBN_BEGINDRAG (-701) -#define TBN_CUSTHELP (-709) -#define TBN_ENDADJUST (-704) -#define TBN_ENDDRAG (-702) -#define TBN_GETBUTTONINFOW (-720) -#define TBN_GETBUTTONINFOA (-700) -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define TBN_GETBUTTONINFO TBN_GETBUTTONINFOW -#else -#define TBN_GETBUTTONINFO TBN_GETBUTTONINFOA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ -#define TBN_QUERYDELETE (-707) -#define TBN_QUERYINSERT (-706) -#define TBN_RESET (-705) -#define TBN_TOOLBARCHANGE (-708) - -/* Tab control */ -#define TCM_ADJUSTRECT (4904) -#define TCM_DELETEALLITEMS (4873) -#define TCM_DELETEITEM (4872) -#define TCM_GETCURFOCUS (4911) -#define TCM_GETCURSEL (4875) -#define TCM_GETIMAGELIST (4866) -#define TCM_GETITEMW (4924) -#define TCM_INSERTITEMW (4926) -#define TCM_SETITEMW (4925) -#define TCM_GETITEMA (4869) -#define TCM_INSERTITEMA (4871) -#define TCM_SETITEMA (4870) -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define TCM_GETITEM TCM_GETITEM -#define TCM_INSERTITEM TCM_INSERTITEMW -#define TCM_SETITEM TCM_SETITEMW -#else -#define TCM_GETITEM TCM_GETITEMA -#define TCM_INSERTITEM TCM_INSERTITEMA -#define TCM_SETITEM TCM_SETITEMA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ -#define TCM_GETITEMCOUNT (4868) -#define TCM_GETITEMRECT (4874) -#define TCM_GETROWCOUNT (4908) -#define TCM_GETTOOLTIPS (4909) -#define TCM_HITTEST (4877) -#define TCM_REMOVEIMAGE (4906) -#define TCM_SETCURFOCUS (4912) -#define TCM_SETCURSEL (4876) -#define TCM_SETIMAGELIST (4867) -#define TCM_SETITEMEXTRA (4878) -#define TCM_SETITEMSIZE (4905) -#define TCM_SETPADDING (4907) -#define TCM_SETTOOLTIPS (4910) - -/* Tab control notifications */ -#define TCN_KEYDOWN (-550) -#define TCN_SELCHANGE (-551) -#define TCN_SELCHANGING (-552) - -/* Tool tip control */ -#define TTM_ACTIVATE (1025) -#define TTM_ADDTOOLW (1074) -#define TTM_DELTOOLW (1075) -#define TTM_ENUMTOOLSW (1082) -#define TTM_GETCURRENTTOOLW (1083) -#define TTM_GETTEXTW (1080) -#define TTM_GETTOOLINFOW (1077) -#define TTM_HITTESTW (1079) -#define TTM_NEWTOOLRECTW (1076) -#define TTM_SETTOOLINFOW (1078) -#define TTM_UPDATETIPTEXTW (1081) -#define TTM_ADDTOOLA (1028) -#define TTM_DELTOOLA (1029) -#define TTM_ENUMTOOLSA (1038) -#define TTM_GETCURRENTTOOLA (1039) -#define TTM_GETTEXTA (1035) -#define TTM_GETTOOLINFOA (1032) -#define TTM_HITTESTA (1034) -#define TTM_NEWTOOLRECTA (1030) -#define TTM_SETTOOLINFOA (1033) -#define TTM_UPDATETIPTEXTA (1036) -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define TTM_ADDTOOL TTM_ADDTOOLW -#define TTM_DELTOOL TTM_DELTOOLW -#define TTM_ENUMTOOLS TTM_ENUMTOOLSW -#define TTM_GETCURRENTTOOL TTM_GETCURRENTTOOLW -#define TTM_GETTEXT TTM_GETTEXTW -#define TTM_GETTOOLINFO TTM_GETTOOLINFOW -#define TTM_HITTEST TTM_HITTESTW -#define TTM_NEWTOOLRECT TTM_NEWTOOLRECTW -#define TTM_SETTOOLINFO TTM_SETTOOLINFOW -#define TTM_UPDATETIPTEXT TTM_UPDATETIPTEXTW -#else -#define TTM_ADDTOOL TTM_ADDTOOLA -#define TTM_DELTOOL TTM_DELTOOLA -#define TTM_ENUMTOOLS TTM_ENUMTOOLSA -#define TTM_GETCURRENTTOOL TTM_GETCURRENTTOOLA -#define TTM_GETTEXT TTM_GETTEXTA -#define TTM_GETTOOLINFO TTM_GETTOOLINFOA -#define TTM_HITTEST TTM_HITTESTA -#define TTM_NEWTOOLRECT TTM_NEWTOOLRECTA -#define TTM_SETTOOLINFO TTM_SETTOOLINFOA -#define TTM_UPDATETIPTEXT TTM_UPDATETIPTEXTA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ -#define TTM_GETTOOLCOUNT (1037) -#define TTM_RELAYEVENT (1031) -#define TTM_SETDELAYTIME (1027) -#define TTM_WINDOWFROMPOINT (1040) - -/* Tool tip control notification */ -#define TTN_NEEDTEXTW (-530) -#define TTN_NEEDTEXTA (-520) -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define TTN_NEEDTEXT TTN_NEEDTEXTW -#else -#define TTN_NEEDTEXT TTN_NEEDTEXTA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ -#define TTN_POP (-522) -#define TTN_SHOW (-521) - -/* Tree view control */ -#define TVM_CREATEDRAGIMAGE (4370) -#define TVM_DELETEITEM (4353) -#define TVM_ENDEDITLABELNOW (4374) -#define TVM_ENSUREVISIBLE (4372) -#define TVM_EXPAND (4354) -#define TVM_GETCOUNT (4357) -#define TVM_GETEDITCONTROL (4367) -#define TVM_GETIMAGELIST (4360) -#define TVM_GETINDENT (4358) -#define TVM_GETITEMRECT (4356) -#define TVM_GETNEXTITEM (4362) -#define TVM_GETVISIBLECOUNT (4368) -#define TVM_HITTEST (4369) -#define TVM_EDITLABELW (4417) -#define TVM_GETISEARCHSTRINGW (4416) -#define TVM_GETITEMW (4414) -#define TVM_INSERTITEMW (4402) -#define TVM_SETITEMW (4415) -#define TVM_EDITLABELA (4366) -#define TVM_GETISEARCHSTRINGA (4375) -#define TVM_GETITEMA (4364) -#define TVM_INSERTITEMA (4352) -#define TVM_SETITEMA (4365) -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define TVM_EDITLABEL TVM_EDITLABELW -#define TVM_GETISEARCHSTRING TVM_GETISEARCHSTRINGW -#define TVM_GETITEM TVM_GETITEMW -#define TVM_INSERTITEM TVM_INSERTITEMW -#define TVM_SETITEM TVM_SETITEMW -#else -#define TVM_EDITLABEL TVM_EDITLABELA -#define TVM_GETISEARCHSTRING TVM_GETISEARCHSTRINGA -#define TVM_GETITEM TVM_GETITEMA -#define TVM_INSERTITEM TVM_INSERTITEMA -#define TVM_SETITEM TVM_SETITEMA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ -#define TVM_SELECTITEM (4363) -#define TVM_SETIMAGELIST (4361) -#define TVM_SETINDENT (4359) -#define TVM_SORTCHILDREN (4371) -#define TVM_SORTCHILDRENCB (4373) - -/* Tree view control notification */ -#define TVN_KEYDOWN (-412) -#define TVN_BEGINDRAGW (-456) -#define TVN_BEGINLABELEDITW (-459) -#define TVN_BEGINRDRAGW (-457) -#define TVN_DELETEITEMW (-458) -#define TVN_ENDLABELEDITW (-460) -#define TVN_GETDISPINFOW (-452) -#define TVN_ITEMEXPANDEDW (-455) -#define TVN_ITEMEXPANDINGW (-454) -#define TVN_SELCHANGEDW (-451) -#define TVN_SELCHANGINGW (-450) -#define TVN_SETDISPINFOW (-453) -#define TVN_BEGINDRAGA (-407) -#define TVN_BEGINLABELEDITA (-410) -#define TVN_BEGINRDRAGA (-408) -#define TVN_DELETEITEMA (-409) -#define TVN_ENDLABELEDITA (-411) -#define TVN_GETDISPINFOA (-403) -#define TVN_ITEMEXPANDEDA (-406) -#define TVN_ITEMEXPANDINGA (-405) -#define TVN_SELCHANGEDA (-402) -#define TVN_SELCHANGINGA (-401) -#define TVN_SETDISPINFOA (-404) -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define TVN_BEGINDRAG TVN_BEGINDRAGW -#define TVN_BEGINLABELEDIT TVN_BEGINLABELEDITW -#define TVN_BEGINRDRAG TVN_BEGINRDRAGW -#define TVN_DELETEITEM TVN_DELETEITEMW -#define TVN_ENDLABELEDIT TVN_ENDLABELEDITW -#define TVN_GETDISPINFO TVN_GETDISPINFOW -#define TVN_ITEMEXPANDED TVN_ITEMEXPANDEDW -#define TVN_ITEMEXPANDING TVN_ITEMEXPANDINGW -#define TVN_SELCHANGED TVN_SELCHANGEDW -#define TVN_SELCHANGING TVN_SELCHANGINGW -#define TVN_SETDISPINFO TVN_SETDISPINFOW -#else -#define TVN_BEGINDRAG TVN_BEGINDRAGA -#define TVN_BEGINLABELEDIT TVN_BEGINLABELEDITA -#define TVN_BEGINRDRAG TVN_BEGINRDRAGA -#define TVN_DELETEITEM TVN_DELETEITEMA -#define TVN_ENDLABELEDIT TVN_ENDLABELEDITA -#define TVN_GETDISPINFO TVN_GETDISPINFOA -#define TVN_ITEMEXPANDED TVN_ITEMEXPANDEDA -#define TVN_ITEMEXPANDING TVN_ITEMEXPANDINGA -#define TVN_SELCHANGED TVN_SELCHANGEDA -#define TVN_SELCHANGING TVN_SELCHANGINGA -#define TVN_SETDISPINFO TVN_SETDISPINFOA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -/* Up/down control */ -#define UDM_GETACCEL (1132) -#define UDM_GETBASE (1134) -#define UDM_GETBUDDY (1130) -#define UDM_GETPOS (1128) -#define UDM_GETRANGE (1126) -#define UDM_SETACCEL (1131) -#define UDM_SETBASE (1133) -#define UDM_SETBUDDY (1129) -#define UDM_SETPOS (1127) -#define UDM_SETRANGE (1125) - -/* Up/down control notification */ -#define UDN_DELTAPOS (-722) - -/* Window messages */ - -#define WM_ACTIVATE (6) -#define WM_ACTIVATEAPP (28) -#define WM_ASKCBFORMATNAME (780) -#define WM_CANCELJOURNAL (75) -#define WM_CANCELMODE (31) -#define WM_CAPTURECHANGED (533) -#define WM_CHANGECBCHAIN (781) -#define WM_CHAR (258) -#define WM_CHARTOITEM (47) -#define WM_CHILDACTIVATE (34) -#define WM_CHOOSEFONT_GETLOGFONT (1025) -#define WM_CHOOSEFONT_SETLOGFONT (1125) -#define WM_CHOOSEFONT_SETFLAGS (1126) -#define WM_CLEAR (771) -#define WM_CLOSE (16) -#define WM_COMMAND (273) -#define WM_COMPACTING (65) -#define WM_COMPAREITEM (57) -#define WM_CONTEXTMENU (123) -#define WM_COPY (769) -#define WM_COPYDATA (74) -#define WM_CREATE (1) -#define WM_CTLCOLORBTN (309) -#define WM_CTLCOLORDLG (310) -#define WM_CTLCOLOREDIT (307) -#define WM_CTLCOLORLISTBOX (308) -#define WM_CTLCOLORMSGBOX (306) -#define WM_CTLCOLORSCROLLBAR (311) -#define WM_CTLCOLORSTATIC (312) -#define WM_CUT (768) -#define WM_DEADCHAR (259) -#define WM_DELETEITEM (45) -#define WM_DESTROY (2) -#define WM_DESTROYCLIPBOARD (775) -#define WM_DEVICECHANGE (537) -#define WM_DEVMODECHANGE (27) -#define WM_DISPLAYCHANGE (126) -#define WM_DRAWCLIPBOARD (776) -#define WM_DRAWITEM (43) -#define WM_DROPFILES (563) -#define WM_DROPOBJECT (544) -#define WM_ENABLE (10) -#define WM_ENDSESSION (22) -#define WM_ENTERIDLE (289) -#define WM_ENTERMENULOOP (529) -#define WM_ENTERSIZEMOVE (561) -#define WM_ERASEBKGND (20) -#define WM_EXITMENULOOP (530) -#define WM_EXITSIZEMOVE (562) -#define WM_FONTCHANGE (29) -#define WM_GETDLGCODE (135) -#define WM_GETFONT (49) -#define WM_GETHOTKEY (51) -#define WM_GETICON (127) -#define WM_GETMINMAXINFO (36) -#define WM_GETTEXT (13) -#define WM_GETTEXTLENGTH (14) -#define WM_HELP (83) -#define WM_HOTKEY (786) -#define WM_HSCROLL (276) -#define WM_HSCROLLCLIPBOARD (782) -#define WM_ICONERASEBKGND (39) -#define WM_IME_CHAR (646) -#define WM_IME_COMPOSITION (271) -#define WM_IME_COMPOSITIONFULL (644) -#define WM_IME_CONTROL (643) -#define WM_IME_ENDCOMPOSITION (270) [truncated at 1000 lines; 192 more skipped]

19 years, 7 months

[greatlrd] 14458: Did forget the info I did change

by greatlrd＠svn.reactos.com

Did forget the info I did change it is remove all hardcode string to En.rc to make it easy to translate Modified: trunk/reactos/subsys/system/cmd/attrib.c Modified: trunk/reactos/subsys/system/cmd/choice.c Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/attrib.c --- trunk/reactos/subsys/system/cmd/attrib.c 2005-04-02 20:23:01 UTC (rev 14457) +++ trunk/reactos/subsys/system/cmd/attrib.c 2005-04-02 20:27:41 UTC (rev 14458) @@ -27,6 +27,9 @@ * * 23-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Added handling of multiple filenames. + * + * 02-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" _____ Modified: trunk/reactos/subsys/system/cmd/choice.c --- trunk/reactos/subsys/system/cmd/choice.c 2005-04-02 20:23:01 UTC (rev 14457) +++ trunk/reactos/subsys/system/cmd/choice.c 2005-04-02 20:27:41 UTC (rev 14458) @@ -16,6 +16,7 @@ * 02 Apr 2005 (Magnus Olsen * Remove Hardcode string so * they can be translate + * */ #include "precomp.h" _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-04-02 20:23:01 UTC (rev 14457) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-04-02 20:27:41 UTC (rev 14458) @@ -124,8 +124,8 @@ * Improved chdir/cd command. * * 02-Apr-2004 (Magnus Olsen <magnus(a)greatlord.com>) - Remove all hard code string so they can be - translate to other langues. + * Remove all hard code string so they can be + * translate to other langues. */ #include "precomp.h"

19 years, 7 months

[greatlrd] 14457:

by greatlrd＠svn.reactos.com

Added: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/attrib.c Modified: trunk/reactos/subsys/system/cmd/choice.c Modified: trunk/reactos/subsys/system/cmd/cmd.rc Modified: trunk/reactos/subsys/system/cmd/internal.c Added: trunk/reactos/subsys/system/cmd/resource.h _____ Added: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-02 19:52:29 UTC (rev 14456) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-02 20:23:01 UTC (rev 14457) @@ -0,0 +1,63 @@ +#include "resource.h" +/* Start move all hard code string to En.rc + * By Magnus Olsen 2005 + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +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 \ +Type ATTRIB without a parameter to display the attributes of all files." + +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_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_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT" + +STRING_MKDIR_HELP, "Creates a directory.\n\n \ +MKDIR [drive:]path\nMD [drive:]path" + +STRING_RMDIR_HELP, "Removes a directory.\n\n \ +RMDIR [drive:]path\nRD [drive:]path" + +STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]" + + + +STRING_CHOICE_OPTION "YN" + + + +STRING_CHOICE_ERROR, "Invalid option. Expected format: /C[:]options" +STRING_CHOICE_ERROR_TXT, "Invalid option. Expected format: /T[:]c,nn" +STRING_CHOICE_ERROR_OPTION, "Illegal Option: %s" +STRING_PARAM_ERROR, "Required parameter missing\n" + +} _____ Modified: trunk/reactos/subsys/system/cmd/attrib.c --- trunk/reactos/subsys/system/cmd/attrib.c 2005-04-02 19:52:29 UTC (rev 14456) +++ trunk/reactos/subsys/system/cmd/attrib.c 2005-04-02 20:23:01 UTC (rev 14457) @@ -30,6 +30,7 @@ */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_ATTRIB @@ -40,7 +41,7 @@ WIN32_FIND_DATA findData; HANDLE hFind; TCHAR szFullName[MAX_PATH]; - LPTSTR pszFileName; + LPTSTR pszFileName; /* prepare full file name buffer */ _tcscpy (szFullName, pszPath); @@ -116,6 +117,7 @@ TCHAR szFullName[MAX_PATH]; LPTSTR pszFileName; + /* prepare full file name buffer */ _tcscpy (szFullName, pszPath); pszFileName = szFullName + _tcslen (szFullName); @@ -192,6 +194,7 @@ BOOL bDirectories = FALSE; DWORD dwAttrib = 0; DWORD dwMask = 0; + WCHAR szMsg[RC_STRING_MAX_SIZE]; /* initialize strings */ szPath[0] = _T('\0'); @@ -200,19 +203,8 @@ /* print help */ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("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.")); + LoadString( GetModuleHandle(NULL), STRING_ATTRIB_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/choice.c --- trunk/reactos/subsys/system/cmd/choice.c 2005-04-02 19:52:29 UTC (rev 14456) +++ trunk/reactos/subsys/system/cmd/choice.c 2005-04-02 20:23:01 UTC (rev 14457) @@ -12,9 +12,14 @@ * * 26 Sep 1999 (Paolo Pantaleo) * Fixed timeout. + * + * 02 Apr 2005 (Magnus Olsen + * Remove Hardcode string so + * they can be translate */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_CHOICE @@ -97,7 +102,8 @@ INT CommandChoice (LPTSTR cmd, LPTSTR param) { - LPTSTR lpOptions = _T("YN"); + LPTSTR lpOptions; + TCHAR Options[2]; LPTSTR lpText = NULL; BOOL bNoPrompt = FALSE; BOOL bCaseSensitive = FALSE; @@ -114,21 +120,17 @@ INT GCret; TCHAR Ch; DWORD amount,clk; + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_CHOICE_OPTION, (LPTSTR) Options,sizeof(lpOptions)); + lpOptions = _T(Options); + if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutPuts (_T("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.")); - return 0; + LoadString( GetModuleHandle(NULL), STRING_CHOICE_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); + + return 0; } /* retrieve text */ @@ -167,7 +169,9 @@ if (_tcslen (lpOptions) == 0) { - ConErrPuts (_T("Invalid option. Expected format: /C[:]options")); + + LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPuts (_T((LPTSTR)szMsg)); freep (arg); return 1; } @@ -197,7 +201,8 @@ if (*s != _T(',')) { - ConErrPuts (_T("Invalid option. Expected format: /T[:]c,nn")); + LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_TXT, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPuts (_T((LPTSTR)szMsg)); freep (arg); return 1; } @@ -208,7 +213,8 @@ } else if (arg[i][0] == _T('/')) { - ConErrPrintf (_T("Illegal Option: %s"), arg[i]); + LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_OPTION, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg), arg[i]); freep (arg); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/cmd.rc --- trunk/reactos/subsys/system/cmd/cmd.rc 2005-04-02 19:52:29 UTC (rev 14456) +++ trunk/reactos/subsys/system/cmd/cmd.rc 2005-04-02 20:23:01 UTC (rev 14457) @@ -7,5 +7,13 @@ #define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (C) 1994-1998 Tim Norman and others\0" #define REACTOS_STR_LEGAL_COPYRIGHT "Copyright (C) 1998-2001 Eric Kohl and others\0" #include <reactos/version.rc> +#include "En.rc" + + 1 ICON DISCARDABLE res/terminal.ico + + + + + _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-04-02 19:52:29 UTC (rev 14456) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-04-02 20:23:01 UTC (rev 14457) @@ -122,11 +122,15 @@ * * 23-Feb-2001 (Carl Nettelblad <cnettel(a)hem.passagen.se>) * Improved chdir/cd command. + * + * 02-Apr-2004 (Magnus Olsen <magnus(a)greatlord.com>) + Remove all hard code string so they can be + translate to other langues. */ #include "precomp.h" +#include "resource.h" - #ifdef INCLUDE_CMD_CHDIR static LPTSTR lpLastPath; @@ -154,21 +158,15 @@ LPTSTR lpOldPath; LPTSTR endofstring; /* pointer to the null character in the directory to change to */ LPTSTR lastquote; /* pointer to the last quotation mark in the directory to change to */ + WCHAR szMsg[RC_STRING_MAX_SIZE]; /*Should we better declare a variable containing _tsclen(dir) ? It's used a few times, but on the other hand paths are generally not very long*/ if (!_tcsncmp (param, _T("/?"), 2)) - { - ConOutPuts (_T("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.")); + { + LoadString( GetModuleHandle(NULL), STRING_CD_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); return 0; } @@ -281,12 +279,13 @@ LPTSTR place; /* used to search for the \ when no space is used */ LPTSTR *p = NULL; INT argc; + WCHAR szMsg[RC_STRING_MAX_SIZE]; - if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Creates a directory.\n\n" - "MKDIR [drive:]path\nMD [drive:]path")); + LoadString( GetModuleHandle(NULL), STRING_MKDIR_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); + return 0; } @@ -321,7 +320,8 @@ if (!dir) { - ConErrPrintf (_T("Required parameter missing\n")); + LoadString( GetModuleHandle(NULL), STRING_PARAM_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg)); return 1; } @@ -357,10 +357,15 @@ LPTSTR *p = NULL; INT argc; + + WCHAR szMsg[RC_STRING_MAX_SIZE]; + if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Removes a directory.\n\n" - "RMDIR [drive:]path\nRD [drive:]path")); + LoadString( GetModuleHandle(NULL), STRING_RMDIR_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + + ConOutPuts (_T((LPTSTR)szMsg)); + return 0; } @@ -394,7 +399,9 @@ if (!dir) { - ConErrPrintf (_T("Required parameter missing\n")); + LoadString( GetModuleHandle(NULL), STRING_PARAM_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg)); + return 1; } @@ -423,9 +430,12 @@ */ INT CommandExit (LPTSTR cmd, LPTSTR param) { + WCHAR szMsg[RC_STRING_MAX_SIZE]; + if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Exits the command line interpreter.\n\nEXIT")); + LoadString( GetModuleHandle(NULL), STRING_EXIT_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); return 0; } @@ -441,10 +451,12 @@ */ INT CommandRem (LPTSTR cmd, LPTSTR param) { + WCHAR szMsg[RC_STRING_MAX_SIZE]; + if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Starts a comment line in a batch file.\n\n" - "REM [Comment]")); + LoadString( GetModuleHandle(NULL), STRING_REM_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); } return 0; _____ Added: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-02 19:52:29 UTC (rev 14456) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-02 20:23:01 UTC (rev 14457) @@ -0,0 +1,22 @@ +#define RC_STRING_MAX_SIZE 2048 + +#define STRING_CHOICE_OPTION 200 + +#define STRING_PARAM_ERROR 300 +#define STRING_CHOICE_ERROR 301 +#define STRING_CHOICE_ERROR_TXT 302 +#define STRING_CHOICE_ERROR_OPTION 303 + + + +#define STRING_ATTRIB_HELP 400 +#define STRING_CD_HELP 401 +#define STRING_CHOICE_HELP 402 +#define STRING_EXIT_HELP 403 +#define STRING_MKDIR_HELP 404 +#define STRING_RMDIR_HELP 405 +#define STRING_REM_HELP 406 + + + +

19 years, 7 months

[sedwards] 14456: here you go

by sedwards＠svn.reactos.com

here you go Deleted: trunk/reactos/lib/shellext/slayer/en.rc _____ Deleted: trunk/reactos/lib/shellext/slayer/en.rc --- trunk/reactos/lib/shellext/slayer/en.rc 2005-04-02 19:47:52 UTC (rev 14455) +++ trunk/reactos/lib/shellext/slayer/en.rc 2005-04-02 19:52:29 UTC (rev 14456) @@ -1,38 +0,0 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Compatibility" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "If you have problems running this program in ReactOS, select an operating system ReactOS should report to the application.", -1, 7,7,210,31 - GROUPBOX "Compatibility mode", IDC_COMPATGROUP, 7,41,210,49 - CHECKBOX "Run this program in compatibility mode for:", IDC_CHKRUNCOMPATIBILITY, 18,57,188,10, BS_AUTOCHECKBOX | WS_TABSTOP - COMBOBOX IDC_COMPATIBILITYMODE, 18,70,188,85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - GROUPBOX "Display settings", -1, 7,99,210,61, BS_GROUPBOX | WS_DISABLED - CHECKBOX "Run in 256 colors", IDC_CHKRUNIN256COLORS, 18,114,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED - CHECKBOX "Run in 640x480 screenresolution", IDC_CHKRUNIN640480RES, 18,129,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED - CHECKBOX "Disable visual themes", IDC_CHKDISABLEVISUALTHEMES, 18,144,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED - PUSHBUTTON "E&dit compatibility modes...", IDC_EDITCOMPATIBILITYMODES, 117,167,100,15 - /* CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7,207,210,10, WS_EX_NOPARENTNOTIFY */ -END - -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Edit Compatibility Modes" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LISTBOX IDC_COMPATIBILITYMODE, 9,6,148,108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Add...", IDC_ADD, 162,6,60,14, WS_DISABLED - PUSHBUTTON "&Edit...", IDC_EDIT, 162,24,60,14, WS_DISABLED - PUSHBUTTON "&Delete", IDC_DELETE, 162,42,60,14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95,116,60,14 - PUSHBUTTON "&Cancel", IDCANCEL, 162,116,60,14 -END - -STRINGTABLE -BEGIN - IDS_SLAYER "Slayer" - IDS_DESCRIPTION "Application Compatibility Layer Shell Extension" -END -

19 years, 7 months

[sedwards] 14455: __USE_W32API

by sedwards＠svn.reactos.com

__USE_W32API Deleted: trunk/reactos/lib/msgina/Makefile Added: trunk/reactos/lib/msgina/makefile Modified: trunk/reactos/lib/msgina/msgina.c Modified: trunk/reactos/lib/msgina/stubs.c _____ Deleted: trunk/reactos/lib/msgina/Makefile --- trunk/reactos/lib/msgina/Makefile 2005-04-02 19:33:08 UTC (rev 14454) +++ trunk/reactos/lib/msgina/Makefile 2005-04-02 19:47:52 UTC (rev 14455) @@ -1,45 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../.. - -TARGET_TYPE = dynlink - -TARGET_NAME = msgina - -TARGET_INSTALLDIR = system32 - -TARGET_BASE = $(TARGET_BASE_LIB_MSGINA) - -TARGET_CFLAGS = \ - -I./include \ - -DUNICODE \ - -D_UNICODE \ - -D__REACTOS__ \ - -Wall \ - -Werror \ - -fno-builtin - -TARGET_LFLAGS = -nostartfiles -nostdlib - -TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a user32.a - -TARGET_GCCLIBS = gcc - -TARGET_PCH = - -TARGET_CLEAN = - -TARGET_OBJECTS = msgina.o stubs.o - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -include $(TOOLS_PATH)/depend.mk - -%/TAGS: - etags -o $(@D)/TAGS $((a)D)/\*.c - -etags: ./TAGS _____ Copied: trunk/reactos/lib/msgina/makefile (from rev 14454, trunk/reactos/lib/msgina/Makefile) --- trunk/reactos/lib/msgina/Makefile 2005-04-02 19:33:08 UTC (rev 14454) +++ trunk/reactos/lib/msgina/makefile 2005-04-02 19:47:52 UTC (rev 14455) @@ -0,0 +1,46 @@ +# $Id$ + +PATH_TO_TOP = ../.. + +TARGET_TYPE = dynlink + +TARGET_NAME = msgina + +TARGET_INSTALLDIR = system32 + +TARGET_BASE = $(TARGET_BASE_LIB_MSGINA) + +TARGET_CFLAGS = \ + -I./include \ + -DUNICODE \ + -D_UNICODE \ + -D__USE_W32API \ + -D__REACTOS__ \ + -Wall \ + -Werror \ + -fno-builtin + +TARGET_LFLAGS = -nostartfiles -nostdlib + +TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a user32.a + +TARGET_GCCLIBS = gcc + +TARGET_PCH = + +TARGET_CLEAN = + +TARGET_OBJECTS = msgina.o stubs.o + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +include $(TOOLS_PATH)/depend.mk + +%/TAGS: + etags -o $(@D)/TAGS $((a)D)/\*.c + +etags: ./TAGS _____ Modified: trunk/reactos/lib/msgina/msgina.c --- trunk/reactos/lib/msgina/msgina.c 2005-04-02 19:33:08 UTC (rev 14454) +++ trunk/reactos/lib/msgina/msgina.c 2005-04-02 19:47:52 UTC (rev 14455) @@ -30,6 +30,8 @@ #include "msgina.h" #include "resource.h" +#include <wine/debug.h> + extern HINSTANCE hDllInstance; typedef struct _DISPLAYSTATUSMSG @@ -203,7 +205,7 @@ if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\ReactOS\\Windows NT\\CurrentVersion\\Winlogon", 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) - {DbgPrint("GINA: Failed: 1\n"); + {ERR("GINA: Failed: 1\n"); VirtualFree(pEnvironment, 0, MEM_RELEASE); return FALSE; } @@ -211,7 +213,7 @@ if((RegQueryValueEx(hKey, L"Userinit", NULL, &ValueType, (LPBYTE)pszUserInitApp, &BufSize) != ERROR_SUCCESS) || !((ValueType == REG_SZ) || (ValueType == REG_EXPAND_SZ))) - {DbgPrint("GINA: Failed: 2\n"); + {ERR("GINA: Failed: 2\n"); RegCloseKey(hKey); VirtualFree(pEnvironment, 0, MEM_RELEASE); return FALSE; @@ -243,7 +245,7 @@ NULL, &si, &pi); - if(!Ret) DbgPrint("GINA: Failed: 3\n"); + if(!Ret) ERR("GINA: Failed: 3\n"); VirtualFree(pEnvironment, 0, MEM_RELEASE); return Ret; } @@ -281,22 +283,22 @@ } case WLX_SAS_TYPE_SC_INSERT: { - DbgPrint("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_SC_INSERT not supported!\n"); + FIXME("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_SC_INSERT not supported!\n"); break; } case WLX_SAS_TYPE_SC_REMOVE: { - DbgPrint("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_SC_REMOVE not supported!\n"); + FIXME("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_SC_REMOVE not supported!\n"); break; } case WLX_SAS_TYPE_TIMEOUT: { - DbgPrint("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_TIMEOUT not supported!\n"); + FIXME("WlxLoggedOnSAS: SasType WLX_SAS_TYPE_TIMEOUT not supported!\n"); break; } default: { - DbgPrint("WlxLoggedOnSAS: Unknown SasType: 0x%x\n", dwSasType); + WARN("WlxLoggedOnSAS: Unknown SasType: 0x%x\n", dwSasType); break; } } @@ -494,7 +496,7 @@ if(!phToken) { - DbgPrint("msgina: phToken == NULL!\n"); + WARN("msgina: phToken == NULL!\n"); return WLX_SAS_ACTION_NONE; } @@ -503,13 +505,13 @@ LOGON32_PROVIDER_DEFAULT, phToken)) { - DbgPrint("msgina: Logonuser() failed\n"); + WARN("msgina: Logonuser() failed\n"); return WLX_SAS_ACTION_NONE; } if(!(*phToken)) { - DbgPrint("msgina: *phToken == NULL!\n"); + WARN("msgina: *phToken == NULL!\n"); return WLX_SAS_ACTION_NONE; } @@ -524,7 +526,7 @@ sizeof(TOKEN_STATISTICS), &cbStats)) { - DbgPrint("msgina: Couldn't get Autentication id from user token!\n"); + WARN("msgina: Couldn't get Autentication id from user token!\n"); return WLX_SAS_ACTION_NONE; } *pAuthenticationId = Stats.AuthenticationId; _____ Modified: trunk/reactos/lib/msgina/stubs.c --- trunk/reactos/lib/msgina/stubs.c 2005-04-02 19:33:08 UTC (rev 14454) +++ trunk/reactos/lib/msgina/stubs.c 2005-04-02 19:47:52 UTC (rev 14455) @@ -12,10 +12,8 @@ #include <windows.h> #include <winwlx.h> -#define UNIMPLEMENTED \ - DbgPrint("MSGINA: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__) +#include <wine/debug.h> - /* * @unimplemented */

19 years, 7 months

[hbirr] 14454: Changed the indentation to a human readable format (no code change).

by hbirr＠svn.reactos.com

Changed the indentation to a human readable format (no code change). Modified: trunk/reactos/lib/kernel32/process/create.c _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-04-02 19:26:54 UTC (rev 14453) +++ trunk/reactos/lib/kernel32/process/create.c 2005-04-02 19:33:08 UTC (rev 14454) @@ -27,74 +27,69 @@ typedef NTSTATUS STDCALL (K32_MBSTR_TO_WCSTR) ( - UNICODE_STRING *, - ANSI_STRING *, - BOOLEAN + UNICODE_STRING *, + ANSI_STRING *, + BOOLEAN ); -NTSTATUS STDCALL K32MbStrToWcStr -( - IN K32_MBSTR_TO_WCSTR * True, - UNICODE_STRING * DestStr, - ANSI_STRING * SourceStr, - BOOLEAN Allocate -) +NTSTATUS STDCALL K32MbStrToWcStr(IN K32_MBSTR_TO_WCSTR * True, + UNICODE_STRING * DestStr, + ANSI_STRING * SourceStr, + BOOLEAN Allocate) { - if(SourceStr->Buffer == NULL) - { - DestStr->Length = DestStr->MaximumLength = 0; - DestStr->Buffer = NULL; - return STATUS_SUCCESS; - } + if(SourceStr->Buffer == NULL) + { + DestStr->Length = DestStr->MaximumLength = 0; + DestStr->Buffer = NULL; + return STATUS_SUCCESS; + } - return True(DestStr, SourceStr, Allocate); + return True(DestStr, SourceStr, Allocate); } -VOID STDCALL RtlRosR32AttribsToNativeAttribs -( - OUT OBJECT_ATTRIBUTES * NativeAttribs, - IN SECURITY_ATTRIBUTES * Ros32Attribs OPTIONAL -) +VOID STDCALL RtlRosR32AttribsToNativeAttribs(OUT OBJECT_ATTRIBUTES * NativeAttribs, + IN SECURITY_ATTRIBUTES * Ros32Attribs OPTIONAL) { - NativeAttribs->Length = sizeof(*NativeAttribs); - NativeAttribs->ObjectName = NULL; - NativeAttribs->RootDirectory = NULL; - NativeAttribs->Attributes = 0; - NativeAttribs->SecurityQualityOfService = NULL; + NativeAttribs->Length = sizeof(*NativeAttribs); + NativeAttribs->ObjectName = NULL; + NativeAttribs->RootDirectory = NULL; + NativeAttribs->Attributes = 0; + NativeAttribs->SecurityQualityOfService = NULL; - if(Ros32Attribs != NULL && Ros32Attribs->nLength >= sizeof(*Ros32Attribs)) - { - NativeAttribs->SecurityDescriptor = Ros32Attribs->lpSecurityDescriptor; + if(Ros32Attribs != NULL && Ros32Attribs->nLength >= sizeof(*Ros32Attribs)) + { + NativeAttribs->SecurityDescriptor = Ros32Attribs->lpSecurityDescriptor; - if(Ros32Attribs->bInheritHandle) - NativeAttribs->Attributes |= OBJ_INHERIT; - } - else - NativeAttribs->SecurityDescriptor = NULL; + if(Ros32Attribs->bInheritHandle) + { + NativeAttribs->Attributes |= OBJ_INHERIT; + } + } + else + { + NativeAttribs->SecurityDescriptor = NULL; + } } -VOID STDCALL RtlRosR32AttribsToNativeAttribsNamed -( - OUT OBJECT_ATTRIBUTES * NativeAttribs, - IN SECURITY_ATTRIBUTES * Ros32Attribs OPTIONAL, - OUT UNICODE_STRING * NativeName OPTIONAL, - IN WCHAR * Ros32Name OPTIONAL, - IN HANDLE Ros32NameRoot OPTIONAL -) +VOID STDCALL RtlRosR32AttribsToNativeAttribsNamed(OUT OBJECT_ATTRIBUTES * NativeAttribs, + IN SECURITY_ATTRIBUTES * Ros32Attribs OPTIONAL, + OUT UNICODE_STRING * NativeName OPTIONAL, + IN WCHAR * Ros32Name OPTIONAL, + IN HANDLE Ros32NameRoot OPTIONAL) { - if(!NativeAttribs) return; + if(!NativeAttribs) return; - RtlRosR32AttribsToNativeAttribs(NativeAttribs, Ros32Attribs); + RtlRosR32AttribsToNativeAttribs(NativeAttribs, Ros32Attribs); - if(Ros32Name != NULL && NativeName != NULL) - { - RtlInitUnicodeString(NativeName, Ros32Name); + if(Ros32Name != NULL && NativeName != NULL) + { + RtlInitUnicodeString(NativeName, Ros32Name); - NativeAttribs->ObjectName = NativeName; - NativeAttribs->RootDirectory = Ros32NameRoot; - NativeAttribs->Attributes |= OBJ_CASE_INSENSITIVE; - } + NativeAttribs->ObjectName = NativeName; + NativeAttribs->RootDirectory = Ros32NameRoot; + NativeAttribs->Attributes |= OBJ_CASE_INSENSITIVE; + } } @@ -144,12 +139,9 @@ BOOL bRetVal; STARTUPINFOW wsiStartupInfo; - NTSTATUS STDCALL_FUNC (*pTrue) - ( - UNICODE_STRING *, - ANSI_STRING *, - BOOLEAN - ); + NTSTATUS STDCALL_FUNC (*pTrue)(UNICODE_STRING *, + ANSI_STRING *, + BOOLEAN); ULONG STDCALL_FUNC (*pRtlMbStringToUnicodeSize)(ANSI_STRING *); @@ -318,9 +310,13 @@ /* translate EXCEPTION_XXX defines into EXCEPTION_DISPOSITION enum values */ if (ExceptionDisposition == EXCEPTION_CONTINUE_EXECUTION) - return ExceptionContinueExecution; + { + return ExceptionContinueExecution; + } else if (ExceptionDisposition == EXCEPTION_CONTINUE_SEARCH) - return ExceptionContinueSearch; + { + return ExceptionContinueSearch; + } return -1; /* unknown return from UnhandledExceptionFilter */ } @@ -343,102 +339,93 @@ } -HANDLE STDCALL KlCreateFirstThread -( - HANDLE ProcessHandle, - LPSECURITY_ATTRIBUTES lpThreadAttributes, - PSECTION_IMAGE_INFORMATION Sii, - LPTHREAD_START_ROUTINE lpStartAddress, - DWORD dwCreationFlags, - LPDWORD lpThreadId -) +HANDLE STDCALL KlCreateFirstThread(HANDLE ProcessHandle, + LPSECURITY_ATTRIBUTES lpThreadAttributes, + PSECTION_IMAGE_INFORMATION Sii, + LPTHREAD_START_ROUTINE lpStartAddress, + DWORD dwCreationFlags, + LPDWORD lpThreadId) { - OBJECT_ATTRIBUTES oaThreadAttribs; - CLIENT_ID cidClientId; - PVOID pTrueStartAddress; - NTSTATUS nErrCode; - HANDLE hThread; + OBJECT_ATTRIBUTES oaThreadAttribs; + CLIENT_ID cidClientId; + PVOID pTrueStartAddress; + NTSTATUS nErrCode; + HANDLE hThread; - /* convert the thread attributes */ - RtlRosR32AttribsToNativeAttribs(&oaThreadAttribs, lpThreadAttributes); + /* convert the thread attributes */ + RtlRosR32AttribsToNativeAttribs(&oaThreadAttribs, lpThreadAttributes); - /* native image */ - if(Sii->Subsystem != IMAGE_SUBSYSTEM_NATIVE) - pTrueStartAddress = (PVOID)BaseProcessStart; - /* Win32 image */ - else - pTrueStartAddress = (PVOID)RtlBaseProcessStartRoutine; + /* native image */ + if(Sii->Subsystem != IMAGE_SUBSYSTEM_NATIVE) + { + pTrueStartAddress = (PVOID)BaseProcessStart; + } + /* Win32 image */ + else + { + pTrueStartAddress = (PVOID)RtlBaseProcessStartRoutine; + } - DPRINT - ( - "RtlRosCreateUserThreadVa\n" - "(\n" - " ProcessHandle %p,\n" - " ObjectAttributes %p,\n" - " CreateSuspended %d,\n" - " StackZeroBits %d,\n" - " StackReserve %lu,\n" - " StackCommit %lu,\n" - " StartAddress %p,\n" - " ThreadHandle %p,\n" - " ClientId %p,\n" - " ParameterCount %u,\n" - " Parameters[0] %p,\n" - " Parameters[1] %p\n" - ")\n", - ProcessHandle, - &oaThreadAttribs, - dwCreationFlags & CREATE_SUSPENDED, - 0, - Sii->StackReserve, - Sii->StackCommit, - pTrueStartAddress, - &hThread, - &cidClientId, - 2, - lpStartAddress, - PEB_BASE - ); + DPRINT("RtlRosCreateUserThreadVa\n" + "(\n" + " ProcessHandle %p,\n" + " ObjectAttributes %p,\n" + " CreateSuspended %d,\n" + " StackZeroBits %d,\n" + " StackReserve %lu,\n" + " StackCommit %lu,\n" + " StartAddress %p,\n" + " ThreadHandle %p,\n" + " ClientId %p,\n" + " ParameterCount %u,\n" + " Parameters[0] %p,\n" + " Parameters[1] %p\n" + ")\n", + ProcessHandle, + &oaThreadAttribs, + dwCreationFlags & CREATE_SUSPENDED, + 0, + Sii->StackReserve, + Sii->StackCommit, + pTrueStartAddress, + &hThread, + &cidClientId, + 2, + lpStartAddress, + PEB_BASE); - /* create the first thread */ - nErrCode = RtlRosCreateUserThreadVa - ( - ProcessHandle, - &oaThreadAttribs, - dwCreationFlags & CREATE_SUSPENDED, - 0, - &(Sii->StackReserve), - &(Sii->StackCommit), - pTrueStartAddress, - &hThread, - &cidClientId, - 2, - (ULONG_PTR)lpStartAddress, - (ULONG_PTR)PEB_BASE - ); - - /* failure */ - if(!NT_SUCCESS(nErrCode)) - { - SetLastErrorByStatus(nErrCode); - return NULL; - } + /* create the first thread */ + nErrCode = RtlRosCreateUserThreadVa(ProcessHandle, + &oaThreadAttribs, + dwCreationFlags & CREATE_SUSPENDED, + 0, + &(Sii->StackReserve), + &(Sii->StackCommit), + pTrueStartAddress, + &hThread, + &cidClientId, + 2, + (ULONG_PTR)lpStartAddress, + (ULONG_PTR)PEB_BASE); + /* failure */ + if(!NT_SUCCESS(nErrCode)) + { + SetLastErrorByStatus(nErrCode); + return NULL; + } - DPRINT - ( - "StackReserve %p\n" - "StackCommit %p\n" - "ThreadHandle %p\n" - "ClientId.UniqueThread %p\n", - Sii->StackReserve, - Sii->StackCommit, - hThread, - cidClientId.UniqueThread - ); + DPRINT("StackReserve %p\n" + "StackCommit %p\n" + "ThreadHandle %p\n" + "ClientId.UniqueThread %p\n", + Sii->StackReserve, + Sii->StackCommit, + hThread, + cidClientId.UniqueThread); - /* success */ - if(lpThreadId) *lpThreadId = (DWORD)cidClientId.UniqueThread; - return hThread; + /* success */ + if(lpThreadId) *lpThreadId = (DWORD)cidClientId.UniqueThread; + return hThread; } HANDLE KlMapFile(LPCWSTR lpApplicationName) @@ -476,20 +463,20 @@ */ Status = NtOpenFile(&hFile, - SYNCHRONIZE|FILE_EXECUTE|FILE_READ_DATA, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_DELETE|FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); + SYNCHRONIZE|FILE_EXECUTE|FILE_READ_DATA, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_DELETE|FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); RtlFreeUnicodeString (&ApplicationNameString); if (!NT_SUCCESS(Status)) - { - DPRINT("Failed to open file\n"); - SetLastErrorByStatus (Status); - return(NULL); - } + { + DPRINT("Failed to open file\n"); + SetLastErrorByStatus (Status); + return(NULL); + } Status = NtCreateSection(&hSection, SECTION_ALL_ACCESS, @@ -501,32 +488,29 @@ NtClose(hFile); if (!NT_SUCCESS(Status)) - { - DPRINT("Failed to create section\n"); - SetLastErrorByStatus (Status); - return(NULL); - } + { + DPRINT("Failed to create section\n"); + SetLastErrorByStatus (Status); + return(NULL); + } return(hSection); } -static NTSTATUS KlInitPeb -( - HANDLE ProcessHandle, - PRTL_USER_PROCESS_PARAMETERS Ppb, - PVOID * ImageBaseAddress, - ULONG ImageSubSystem -) +static NTSTATUS KlInitPeb(HANDLE ProcessHandle, + PRTL_USER_PROCESS_PARAMETERS Ppb, + PVOID * ImageBaseAddress, + ULONG ImageSubSystem) { - NTSTATUS Status; - PVOID PpbBase; - ULONG PpbSize; - ULONG BytesWritten; - ULONG Offset; - PVOID ParentEnv = NULL; - PVOID EnvPtr = NULL; - PWCHAR ptr; - ULONG EnvSize = 0, EnvSize1 = 0; + NTSTATUS Status; + PVOID PpbBase; + ULONG PpbSize; + ULONG BytesWritten; + ULONG Offset; + PVOID ParentEnv = NULL; + PVOID EnvPtr = NULL; + PWCHAR ptr; + ULONG EnvSize = 0, EnvSize1 = 0; /* create the Environment */ if (Ppb->Environment != NULL) @@ -535,7 +519,7 @@ ptr = ParentEnv; while (*ptr) { - while(*ptr++); + while(*ptr++); } ptr++; EnvSize = (PVOID)ptr - ParentEnv; @@ -545,41 +529,41 @@ MEMORY_BASIC_INFORMATION MemInfo; ParentEnv = NtCurrentPeb()->ProcessParameters->Environment; - Status = NtQueryVirtualMemory (NtCurrentProcess (), - ParentEnv, - MemoryBasicInformation, - &MemInfo, - sizeof(MEMORY_BASIC_INFORMATION), - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; - } - EnvSize = MemInfo.RegionSize; - } + Status = NtQueryVirtualMemory (NtCurrentProcess (), + ParentEnv, + MemoryBasicInformation, + &MemInfo, + sizeof(MEMORY_BASIC_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) + { + return Status; + } + EnvSize = MemInfo.RegionSize; + } DPRINT("EnvironmentSize %ld\n", EnvSize); /* allocate and initialize new environment block */ if (EnvSize != 0) - { - EnvSize1 = EnvSize; - Status = NtAllocateVirtualMemory(ProcessHandle, - &EnvPtr, - 0, - &EnvSize1, - MEM_RESERVE | MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - return(Status); - } + { + EnvSize1 = EnvSize; + Status = NtAllocateVirtualMemory(ProcessHandle, + &EnvPtr, + 0, + &EnvSize1, + MEM_RESERVE | MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + return(Status); + } - NtWriteVirtualMemory(ProcessHandle, - EnvPtr, - ParentEnv, - EnvSize, - &BytesWritten); - } + NtWriteVirtualMemory(ProcessHandle, + EnvPtr, + ParentEnv, + EnvSize, + &BytesWritten); + } /* create the PPB */ PpbBase = NULL; @@ -591,9 +575,9 @@ MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); if (!NT_SUCCESS(Status)) - { - return(Status); - } + { + return(Status); + } //DPRINT("Ppb->MaximumLength %x\n", Ppb->MaximumLength); NtWriteVirtualMemory(ProcessHandle, @@ -651,102 +635,102 @@ GetFileName(LPCWSTR CurDir, LPCWSTR AppName, LPWSTR CmdLine, LPWSTR Buffer, unsigned BufLen) { - WCHAR *Name, *Pos, *Ret = NULL; - const WCHAR *p; + WCHAR *Name, *Pos, *Ret = NULL; + const WCHAR *p; - /* if we have an app name, everything is easy */ + /* if we have an app name, everything is easy */ - if (NULL != AppName) - { + if (NULL != AppName) + { /* use the unmodified app name as file name */ wcsncpy(Buffer, AppName, BufLen ); Ret = CmdLine; if (NULL == Ret || L'\0' == CmdLine[0]) - { - /* no command-line, create one */ - Ret = RtlAllocateHeap(GetProcessHeap(), 0, (wcslen(AppName) + 3) * sizeof(WCHAR)); - if (NULL != Ret) - { - Ret[0] = L'"'; - wcscpy(Ret + 1, AppName); - wcscat(Ret, L"\""); - } - } - return Ret; - } + { + /* no command-line, create one */ + Ret = RtlAllocateHeap(GetProcessHeap(), 0, (wcslen(AppName) + 3) * sizeof(WCHAR)); + if (NULL != Ret) + { + Ret[0] = L'"'; + wcscpy(Ret + 1, AppName); + wcscat(Ret, L"\""); + } + } + return Ret; + } - if (NULL == CmdLine) - { + if (NULL == CmdLine) + { SetLastError(ERROR_INVALID_PARAMETER); return NULL; - } + } - /* first check for a quoted file name */ - if (L'"' == CmdLine[0] && NULL != (p = wcschr(CmdLine + 1, L'"'))) - { + /* first check for a quoted file name */ + if (L'"' == CmdLine[0] && NULL != (p = wcschr(CmdLine + 1, L'"'))) + { int Len = p - CmdLine - 1; /* extract the quoted portion as file name */ Name = RtlAllocateHeap(GetProcessHeap(), 0, (Len + 1) * sizeof(WCHAR)); if (NULL == Name) - { - return NULL; - } + { + return NULL; + } memcpy(Name, CmdLine + 1, Len * sizeof(WCHAR)); Name[Len] = L'\0'; if (SearchPathW(NULL, Name, L".exe", BufLen, Buffer, NULL)) - { - Ret = CmdLine; /* no change necessary */ - } + { + Ret = CmdLine; /* no change necessary */ + } RtlFreeHeap(GetProcessHeap(), 0, Name); return Ret; - } + } - /* now try the command-line word by word */ - Name = RtlAllocateHeap(GetProcessHeap(), 0, (wcslen(CmdLine) + 1) * sizeof(WCHAR)); - if (NULL == Name) - { + /* now try the command-line word by word */ + Name = RtlAllocateHeap(GetProcessHeap(), 0, (wcslen(CmdLine) + 1) * sizeof(WCHAR)); + if (NULL == Name) + { return NULL; - } - Pos = Name; - p = CmdLine; + } + Pos = Name; + p = CmdLine; - while (L'\0' != *p) - { + while (L'\0' != *p) + { do - { - *Pos++ = *p++; - } + { + *Pos++ = *p++; + } while (L'\0' != *p && L' ' != *p); *Pos = 0; if (SearchPathW(NULL, Name, L".exe", BufLen, Buffer, NULL)) - { - Ret = CmdLine; - break; - } - } + { + Ret = CmdLine; + break; + } + } - if (NULL == Ret || NULL == wcschr(Name, L' ')) - { + if (NULL == Ret || NULL == wcschr(Name, L' ')) + { RtlFreeHeap(GetProcessHeap(), 0, Name); /* no change necessary */ return Ret; - } + } - /* now build a new command-line with quotes */ - Ret = RtlAllocateHeap(GetProcessHeap(), 0, (wcslen(CmdLine) + 3) * sizeof(WCHAR)); - if (NULL == Ret) - { + /* now build a new command-line with quotes */ + Ret = RtlAllocateHeap(GetProcessHeap(), 0, (wcslen(CmdLine) + 3) * sizeof(WCHAR)); + if (NULL == Ret) + { RtlFreeHeap(GetProcessHeap(), 0, Name); /* no change necessary */ return NULL; - } - Ret[0] = L'"'; - wcscpy(Ret + 1, Name); - wcscat(Ret, L"\""); - wcscat(Ret, p); + } + Ret[0] = L'"'; + wcscpy(Ret + 1, Name); + wcscat(Ret, L"\""); + wcscat(Ret, p); - RtlFreeHeap(GetProcessHeap(), 0, Name); - return Ret; + RtlFreeHeap(GetProcessHeap(), 0, Name); + return Ret; } @@ -754,19 +738,16 @@ * @implemented */ BOOL STDCALL -CreateProcessW -( - LPCWSTR lpApplicationName, - LPWSTR lpCommandLine, - LPSECURITY_ATTRIBUTES lpProcessAttributes, - LPSECURITY_ATTRIBUTES lpThreadAttributes, - BOOL bInheritHandles, - DWORD dwCreationFlags, - LPVOID lpEnvironment, - LPCWSTR lpCurrentDirectory, - LPSTARTUPINFOW lpStartupInfo, - LPPROCESS_INFORMATION lpProcessInformation -) +CreateProcessW(LPCWSTR lpApplicationName, + LPWSTR lpCommandLine, + LPSECURITY_ATTRIBUTES lpProcessAttributes, + LPSECURITY_ATTRIBUTES lpThreadAttributes, + BOOL bInheritHandles, + DWORD dwCreationFlags, + LPVOID lpEnvironment, + LPCWSTR lpCurrentDirectory, + LPSTARTUPINFOW lpStartupInfo, + LPPROCESS_INFORMATION lpProcessInformation) { HANDLE hSection, hProcess, hThread; NTSTATUS Status; @@ -798,99 +779,99 @@ PVOID ProcSecurity = NULL; DPRINT("CreateProcessW(lpApplicationName '%S', lpCommandLine '%S')\n", - lpApplicationName, lpCommandLine); + lpApplicationName, lpCommandLine); TidyCmdLine = GetFileName(lpCurrentDirectory, lpApplicationName, lpCommandLine, Name, sizeof(Name) / sizeof(WCHAR)); if (NULL == TidyCmdLine) - { - return FALSE; - } + { + return FALSE; + } DPRINT("TidyCmdLine '%S'\n", TidyCmdLine); if (lpApplicationName != NULL && lpApplicationName[0] != 0) - { - wcscpy (TempApplicationNameW, lpApplicationName); - i = wcslen(TempApplicationNameW); - if (TempApplicationNameW[i - 1] == L'.') - { - TempApplicationNameW[i - 1] = 0; - } - else - { - s = max(wcsrchr(TempApplicationNameW, L'\\'), wcsrchr(TempApplicationNameW, L'/')); - if (s == NULL) - { - s = TempApplicationNameW; - } - else - { - s++; - } + { + wcscpy (TempApplicationNameW, lpApplicationName); + i = wcslen(TempApplicationNameW); + if (TempApplicationNameW[i - 1] == L'.') + { + TempApplicationNameW[i - 1] = 0; + } + else + { + s = max(wcsrchr(TempApplicationNameW, L'\\'), wcsrchr(TempApplicationNameW, L'/')); + if (s == NULL) + { + s = TempApplicationNameW; + } + else + { + s++; + } + e = wcsrchr(s, L'.'); + if (e == NULL) + { + wcscat(s, L".exe"); e = wcsrchr(s, L'.'); - if (e == NULL) - { - wcscat(s, L".exe"); - e = wcsrchr(s, L'.'); - } - } - } + } + } + } else if (L'"' == TidyCmdLine[0]) - { - wcscpy(TempApplicationNameW, TidyCmdLine + 1); - s = wcschr(TempApplicationNameW, L'"'); - if (NULL == s) - { - return FALSE; - } - *s = L'\0'; - } + { + wcscpy(TempApplicationNameW, TidyCmdLine + 1); + s = wcschr(TempApplicationNameW, L'"'); + if (NULL == s) + { + return FALSE; + } + *s = L'\0'; + } else - { - wcscpy(TempApplicationNameW, TidyCmdLine); - s = wcschr(TempApplicationNameW, L' '); - if (NULL != s) - { - *s = L'\0'; - } - } + { + wcscpy(TempApplicationNameW, TidyCmdLine); + s = wcschr(TempApplicationNameW, L' '); + if (NULL != s) + { + *s = L'\0'; + } + } s = max(wcsrchr(TempApplicationNameW, L'\\'), wcsrchr(TempApplicationNameW, L'/')); if (NULL == s) - { - s = TempApplicationNameW; - } + { + s = TempApplicationNameW; + } s = wcsrchr(s, L'.'); if (NULL == s) - { - wcscat(TempApplicationNameW, L".exe"); - } + { + wcscat(TempApplicationNameW, L".exe"); + } if (!SearchPathW(NULL, TempApplicationNameW, NULL, sizeof(ImagePathName)/sizeof(WCHAR), ImagePathName, &s)) { - return FALSE; + return FALSE; } e = wcsrchr(s, L'.'); if (e != NULL && (!_wcsicmp(e, L".bat") || !_wcsicmp(e, L".cmd"))) { - // the command is a batch file - IsBatchFile = TRUE; - if (lpApplicationName != NULL && lpApplicationName[0]) - { - // FIXME: use COMSPEC for the command interpreter - wcscpy(TempCommandLineNameW, L"cmd /c "); - wcscat(TempCommandLineNameW, lpApplicationName); - lpCommandLine = TempCommandLineNameW; - wcscpy(TempApplicationNameW, L"cmd.exe"); - if (!SearchPathW(NULL, TempApplicationNameW, NULL, sizeof(ImagePathName)/sizeof(WCHAR), ImagePathName, &s)) - { - return FALSE; - } - } - else - { - return FALSE; - } + // the command is a batch file + IsBatchFile = TRUE; + if (lpApplicationName != NULL && lpApplicationName[0]) + { + // FIXME: use COMSPEC for the command interpreter + wcscpy(TempCommandLineNameW, L"cmd /c "); + wcscat(TempCommandLineNameW, lpApplicationName); + lpCommandLine = TempCommandLineNameW; + wcscpy(TempApplicationNameW, L"cmd.exe"); + if (!SearchPathW(NULL, TempApplicationNameW, NULL, sizeof(ImagePathName)/sizeof(WCHAR), ImagePathName, &s)) + { + return FALSE; + } + } + else + { + return FALSE; + } } /* @@ -905,16 +886,16 @@ /* Initialize the current directory string */ if (lpCurrentDirectory != NULL) - { - RtlInitUnicodeString(&CurrentDirectory_U, - lpCurrentDirectory); - } + { + RtlInitUnicodeString(&CurrentDirectory_U, + lpCurrentDirectory); + } else - { - GetCurrentDirectoryW(256, TempCurrentDirectoryW); - RtlInitUnicodeString(&CurrentDirectory_U, - TempCurrentDirectoryW); - } + { + GetCurrentDirectoryW(256, TempCurrentDirectoryW); + RtlInitUnicodeString(&CurrentDirectory_U, + TempCurrentDirectoryW); + } /* * Create a section for the executable @@ -924,91 +905,95 @@ if (hSection == NULL) { ///////////////////////////////////////// - /* - * Inspect the image to determine executable flavour - */ - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING ApplicationNameString; - OBJECT_ATTRIBUTES ObjectAttributes; - PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; - IMAGE_DOS_HEADER DosHeader; - IO_STATUS_BLOCK Iosb; - LARGE_INTEGER Offset; - HANDLE hFile = NULL; + /* + * Inspect the image to determine executable flavour + */ + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING ApplicationNameString; + OBJECT_ATTRIBUTES ObjectAttributes; + PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; + IMAGE_DOS_HEADER DosHeader; + IO_STATUS_BLOCK Iosb; + LARGE_INTEGER Offset; + HANDLE hFile = NULL; + DPRINT("Inspecting Image Header for image type id\n"); - DPRINT("Inspecting Image Header for image type id\n"); + // Find the application name + if (!RtlDosPathNameToNtPathName_U((LPWSTR)lpApplicationName, + &ApplicationNameString, NULL, NULL)) + { + return FALSE; + } + DPRINT("ApplicationName %S\n",ApplicationNameString.Buffer); - // Find the application name - if (!RtlDosPathNameToNtPathName_U((LPWSTR)lpApplicationName, - &ApplicationNameString, NULL, NULL)) { - return FALSE; - } - DPRINT("ApplicationName %S\n",ApplicationNameString.Buffer); + InitializeObjectAttributes(&ObjectAttributes, + &ApplicationNameString, + OBJ_CASE_INSENSITIVE, + NULL, + SecurityDescriptor); - InitializeObjectAttributes(&ObjectAttributes, - &ApplicationNameString, - OBJ_CASE_INSENSITIVE, - NULL, - SecurityDescriptor); + // Try to open the executable + Status = NtOpenFile(&hFile, + SYNCHRONIZE|FILE_EXECUTE|FILE_READ_DATA, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_DELETE|FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); - // Try to open the executable - Status = NtOpenFile(&hFile, - SYNCHRONIZE|FILE_EXECUTE|FILE_READ_DATA, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_DELETE|FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); + RtlFreeUnicodeString(&ApplicationNameString); - RtlFreeUnicodeString(&ApplicationNameString); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to open file\n"); + SetLastErrorByStatus(Status); + return FALSE; + } - if (!NT_SUCCESS(Status)) { - DPRINT("Failed to open file\n"); - SetLastErrorByStatus(Status); - return FALSE; - } + // Read the dos header + Offset.QuadPart = 0; + Status = ZwReadFile(hFile, + NULL, + NULL, + NULL, + &Iosb, + &DosHeader, [truncated at 1000 lines; 325 more skipped]

19 years, 7 months

[weiden] 14453: corrected file name so it matches the include in slayer.rc

by weiden＠svn.reactos.com

corrected file name so it matches the include in slayer.rc Added: trunk/reactos/lib/shellext/slayer/En.rc _____ Added: trunk/reactos/lib/shellext/slayer/En.rc --- trunk/reactos/lib/shellext/slayer/En.rc 2005-04-02 19:13:54 UTC (rev 14452) +++ trunk/reactos/lib/shellext/slayer/En.rc 2005-04-02 19:26:54 UTC (rev 14453) @@ -0,0 +1,38 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Compatibility" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "If you have problems running this program in ReactOS, select an operating system ReactOS should report to the application.", -1, 7,7,210,31 + GROUPBOX "Compatibility mode", IDC_COMPATGROUP, 7,41,210,49 + CHECKBOX "Run this program in compatibility mode for:", IDC_CHKRUNCOMPATIBILITY, 18,57,188,10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18,70,188,85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "Display settings", -1, 7,99,210,61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "Run in 256 colors", IDC_CHKRUNIN256COLORS, 18,114,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Run in 640x480 screenresolution", IDC_CHKRUNIN640480RES, 18,129,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Disable visual themes", IDC_CHKDISABLEVISUALTHEMES, 18,144,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "E&dit compatibility modes...", IDC_EDITCOMPATIBILITYMODES, 117,167,100,15 + /* CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7,207,210,10, WS_EX_NOPARENTNOTIFY */ +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edit Compatibility Modes" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LISTBOX IDC_COMPATIBILITYMODE, 9,6,148,108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "&Add...", IDC_ADD, 162,6,60,14, WS_DISABLED + PUSHBUTTON "&Edit...", IDC_EDIT, 162,24,60,14, WS_DISABLED + PUSHBUTTON "&Delete", IDC_DELETE, 162,42,60,14, WS_DISABLED + PUSHBUTTON "&OK", IDOK, 95,116,60,14 + PUSHBUTTON "&Cancel", IDCANCEL, 162,116,60,14 +END + +STRINGTABLE +BEGIN + IDS_SLAYER "Slayer" + IDS_DESCRIPTION "Application Compatibility Layer Shell Extension" +END +

19 years, 7 months

← Newer
1
...
39
40
41
42
43
44
45
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2005