Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 16488: #include "precomp.h" -> #include <precomp.h>
by navaraf＠svn.reactos.com 07 Jul '05

07 Jul '05

#include "precomp.h" -> #include <precomp.h> Modified: trunk/reactos/subsys/system/cmd/alias.c Modified: trunk/reactos/subsys/system/cmd/attrib.c Modified: trunk/reactos/subsys/system/cmd/batch.c Modified: trunk/reactos/subsys/system/cmd/beep.c Modified: trunk/reactos/subsys/system/cmd/call.c Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/choice.c Modified: trunk/reactos/subsys/system/cmd/cls.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmdinput.c Modified: trunk/reactos/subsys/system/cmd/cmdtable.c Modified: trunk/reactos/subsys/system/cmd/color.c Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/date.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/delay.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/dirstack.c Modified: trunk/reactos/subsys/system/cmd/echo.c Modified: trunk/reactos/subsys/system/cmd/error.c Modified: trunk/reactos/subsys/system/cmd/filecomp.c Modified: trunk/reactos/subsys/system/cmd/for.c Modified: trunk/reactos/subsys/system/cmd/free.c Modified: trunk/reactos/subsys/system/cmd/goto.c Modified: trunk/reactos/subsys/system/cmd/history.c Modified: trunk/reactos/subsys/system/cmd/if.c Modified: trunk/reactos/subsys/system/cmd/internal.c Modified: trunk/reactos/subsys/system/cmd/label.c Modified: trunk/reactos/subsys/system/cmd/locale.c Modified: trunk/reactos/subsys/system/cmd/memory.c Modified: trunk/reactos/subsys/system/cmd/misc.c Modified: trunk/reactos/subsys/system/cmd/move.c Modified: trunk/reactos/subsys/system/cmd/msgbox.c Modified: trunk/reactos/subsys/system/cmd/path.c Modified: trunk/reactos/subsys/system/cmd/pause.c Modified: trunk/reactos/subsys/system/cmd/prompt.c Modified: trunk/reactos/subsys/system/cmd/redir.c Modified: trunk/reactos/subsys/system/cmd/ren.c Modified: trunk/reactos/subsys/system/cmd/screen.c Modified: trunk/reactos/subsys/system/cmd/set.c Modified: trunk/reactos/subsys/system/cmd/shift.c Modified: trunk/reactos/subsys/system/cmd/start.c Modified: trunk/reactos/subsys/system/cmd/strtoclr.c Modified: trunk/reactos/subsys/system/cmd/time.c Modified: trunk/reactos/subsys/system/cmd/timer.c Modified: trunk/reactos/subsys/system/cmd/title.c Modified: trunk/reactos/subsys/system/cmd/type.c Modified: trunk/reactos/subsys/system/cmd/ver.c Modified: trunk/reactos/subsys/system/cmd/verify.c Modified: trunk/reactos/subsys/system/cmd/vol.c Modified: trunk/reactos/subsys/system/cmd/where.c Modified: trunk/reactos/subsys/system/cmd/window.c _____ Modified: trunk/reactos/subsys/system/cmd/alias.c --- trunk/reactos/subsys/system/cmd/alias.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/alias.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -30,7 +30,7 @@ */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef FEATURE_ALIASES _____ Modified: trunk/reactos/subsys/system/cmd/attrib.c --- trunk/reactos/subsys/system/cmd/attrib.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/attrib.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -32,7 +32,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_ATTRIB _____ Modified: trunk/reactos/subsys/system/cmd/batch.c --- trunk/reactos/subsys/system/cmd/batch.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/batch.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -58,7 +58,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" _____ Modified: trunk/reactos/subsys/system/cmd/beep.c --- trunk/reactos/subsys/system/cmd/beep.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/beep.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -24,7 +24,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_BEEP _____ Modified: trunk/reactos/subsys/system/cmd/call.c --- trunk/reactos/subsys/system/cmd/call.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/call.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -28,7 +28,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" _____ Modified: trunk/reactos/subsys/system/cmd/chcp.c --- trunk/reactos/subsys/system/cmd/chcp.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/chcp.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -11,7 +11,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" _____ Modified: trunk/reactos/subsys/system/cmd/choice.c --- trunk/reactos/subsys/system/cmd/choice.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/choice.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -19,7 +19,7 @@ * */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_CHOICE _____ Modified: trunk/reactos/subsys/system/cmd/cls.c --- trunk/reactos/subsys/system/cmd/cls.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/cls.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -26,7 +26,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_CLS _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -141,7 +141,7 @@ * handling for memmory handling need to be improve */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifndef NT_SUCCESS _____ Modified: trunk/reactos/subsys/system/cmd/cmdinput.c --- trunk/reactos/subsys/system/cmd/cmdinput.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/cmdinput.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -97,7 +97,7 @@ * Fixed problems when the screen was scrolled away. */ -#include "precomp.h" +#include <precomp.h> SHORT maxx; _____ Modified: trunk/reactos/subsys/system/cmd/cmdtable.c --- trunk/reactos/subsys/system/cmd/cmdtable.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/cmdtable.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -17,7 +17,7 @@ * Unicode ready! */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" _____ Modified: trunk/reactos/subsys/system/cmd/color.c --- trunk/reactos/subsys/system/cmd/color.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/color.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -20,7 +20,7 @@ * Move all hardcoded strings to En.rc. */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_COLOR _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/console.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -16,7 +16,7 @@ -#include "precomp.h" +#include <precomp.h> #include "resource.h" _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -24,7 +24,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_COPY _____ Modified: trunk/reactos/subsys/system/cmd/date.c --- trunk/reactos/subsys/system/cmd/date.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/date.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -31,7 +31,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_DATE _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/del.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -40,7 +40,7 @@ * Implemented /A example "del /A:H /A:-R *.exe -ping.exe" */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_DEL _____ Modified: trunk/reactos/subsys/system/cmd/delay.c --- trunk/reactos/subsys/system/cmd/delay.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/delay.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -9,7 +9,7 @@ * */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_DELAY _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -129,7 +129,7 @@ * Added /p back in using ConOutPrintfPaging */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_DIR _____ Modified: trunk/reactos/subsys/system/cmd/dirstack.c --- trunk/reactos/subsys/system/cmd/dirstack.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/dirstack.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -14,7 +14,7 @@ * Added DIRS command. */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef FEATURE_DIRECTORY_STACK _____ Modified: trunk/reactos/subsys/system/cmd/echo.c --- trunk/reactos/subsys/system/cmd/echo.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/echo.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -26,7 +26,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" _____ Modified: trunk/reactos/subsys/system/cmd/error.c --- trunk/reactos/subsys/system/cmd/error.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/error.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -20,7 +20,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" _____ Modified: trunk/reactos/subsys/system/cmd/filecomp.c --- trunk/reactos/subsys/system/cmd/filecomp.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/filecomp.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -20,7 +20,7 @@ * Now expands lfn even when trailing " is omitted. */ -#include "precomp.h" +#include <precomp.h> #ifdef FEATURE_UNIX_FILENAME_COMPLETION _____ Modified: trunk/reactos/subsys/system/cmd/for.c --- trunk/reactos/subsys/system/cmd/for.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/for.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -30,7 +30,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" _____ Modified: trunk/reactos/subsys/system/cmd/free.c --- trunk/reactos/subsys/system/cmd/free.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/free.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -11,7 +11,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_FREE _____ Modified: trunk/reactos/subsys/system/cmd/goto.c --- trunk/reactos/subsys/system/cmd/goto.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/goto.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -26,7 +26,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" _____ Modified: trunk/reactos/subsys/system/cmd/history.c --- trunk/reactos/subsys/system/cmd/history.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/history.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -37,7 +37,7 @@ * */ -#include "precomp.h" +#include <precomp.h> #ifdef FEATURE_HISTORY _____ Modified: trunk/reactos/subsys/system/cmd/if.c --- trunk/reactos/subsys/system/cmd/if.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/if.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -30,7 +30,7 @@ * */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -128,7 +128,7 @@ * translate to other langues. */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_CHDIR _____ Modified: trunk/reactos/subsys/system/cmd/label.c --- trunk/reactos/subsys/system/cmd/label.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/label.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -17,7 +17,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_LABEL _____ Modified: trunk/reactos/subsys/system/cmd/locale.c --- trunk/reactos/subsys/system/cmd/locale.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/locale.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -11,7 +11,7 @@ * Unicode safe! */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" _____ Modified: trunk/reactos/subsys/system/cmd/memory.c --- trunk/reactos/subsys/system/cmd/memory.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/memory.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -11,7 +11,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_MEMORY _____ Modified: trunk/reactos/subsys/system/cmd/misc.c --- trunk/reactos/subsys/system/cmd/misc.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/misc.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -32,7 +32,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" _____ Modified: trunk/reactos/subsys/system/cmd/move.c --- trunk/reactos/subsys/system/cmd/move.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/move.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -29,7 +29,7 @@ * added /y and /-y */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_MOVE _____ Modified: trunk/reactos/subsys/system/cmd/msgbox.c --- trunk/reactos/subsys/system/cmd/msgbox.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/msgbox.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -10,7 +10,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_MSGBOX _____ Modified: trunk/reactos/subsys/system/cmd/path.c --- trunk/reactos/subsys/system/cmd/path.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/path.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -25,7 +25,7 @@ * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_PATH _____ Modified: trunk/reactos/subsys/system/cmd/pause.c --- trunk/reactos/subsys/system/cmd/pause.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/pause.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -17,7 +17,7 @@ * Unicode ready! */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_PAUSE _____ Modified: trunk/reactos/subsys/system/cmd/prompt.c --- trunk/reactos/subsys/system/cmd/prompt.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/prompt.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -46,7 +46,7 @@ * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" /* _____ Modified: trunk/reactos/subsys/system/cmd/redir.c --- trunk/reactos/subsys/system/cmd/redir.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/redir.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -25,7 +25,7 @@ * simple check to fix > and | bug with 'rem' */ -#include "precomp.h" +#include <precomp.h> #ifdef FEATURE_REDIRECTION _____ Modified: trunk/reactos/subsys/system/cmd/ren.c --- trunk/reactos/subsys/system/cmd/ren.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/ren.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -20,7 +20,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_RENAME _____ Modified: trunk/reactos/subsys/system/cmd/screen.c --- trunk/reactos/subsys/system/cmd/screen.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/screen.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -11,7 +11,7 @@ * */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_SCREEN _____ Modified: trunk/reactos/subsys/system/cmd/set.c --- trunk/reactos/subsys/system/cmd/set.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/set.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -34,7 +34,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_SET _____ Modified: trunk/reactos/subsys/system/cmd/shift.c --- trunk/reactos/subsys/system/cmd/shift.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/shift.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -23,7 +23,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/start.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -11,7 +11,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_START _____ Modified: trunk/reactos/subsys/system/cmd/strtoclr.c --- trunk/reactos/subsys/system/cmd/strtoclr.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/strtoclr.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -16,7 +16,7 @@ other are internal service functions*/ -#include "precomp.h" +#include <precomp.h> #define _B FOREGROUND_BLUE #define _G FOREGROUND_GREEN _____ Modified: trunk/reactos/subsys/system/cmd/time.c --- trunk/reactos/subsys/system/cmd/time.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/time.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -24,7 +24,7 @@ * Remove all hardcode string to En.rc. */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_TIME _____ Modified: trunk/reactos/subsys/system/cmd/timer.c --- trunk/reactos/subsys/system/cmd/timer.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/timer.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -7,7 +7,7 @@ * started - Paolo Pantaleo <paolopan(a)freemail.it> */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_TIMER _____ Modified: trunk/reactos/subsys/system/cmd/title.c --- trunk/reactos/subsys/system/cmd/title.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/title.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -9,7 +9,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_TITLE _____ Modified: trunk/reactos/subsys/system/cmd/type.c --- trunk/reactos/subsys/system/cmd/type.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/type.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -26,7 +26,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_TYPE _____ Modified: trunk/reactos/subsys/system/cmd/ver.c --- trunk/reactos/subsys/system/cmd/ver.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/ver.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -21,7 +21,7 @@ * New version info and some output changes. */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #include <reactos/resource.h> _____ Modified: trunk/reactos/subsys/system/cmd/verify.c --- trunk/reactos/subsys/system/cmd/verify.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/verify.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -18,7 +18,7 @@ * Remove all hardcode string to En.rc */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_VERIFY _____ Modified: trunk/reactos/subsys/system/cmd/vol.c --- trunk/reactos/subsys/system/cmd/vol.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/vol.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -20,7 +20,7 @@ * Redirection ready! */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #ifdef INCLUDE_CMD_VOL _____ Modified: trunk/reactos/subsys/system/cmd/where.c --- trunk/reactos/subsys/system/cmd/where.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/where.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -74,7 +74,7 @@ * */ -#include "precomp.h" +#include <precomp.h> /* initial size of environment variable buffer */ _____ Modified: trunk/reactos/subsys/system/cmd/window.c --- trunk/reactos/subsys/system/cmd/window.c 2005-07-07 16:32:34 UTC (rev 16487) +++ trunk/reactos/subsys/system/cmd/window.c 2005-07-07 16:45:42 UTC (rev 16488) @@ -16,7 +16,7 @@ */ -#include "precomp.h" +#include <precomp.h> #include "resource.h" #if ( defined(INCLUDE_CMD_WINDOW) || defined(INCLUDE_CMD_ACTIVATE) )

1 0

[hpoussin] 16487: Enumerate serial interfaces by calling QueryDosDevice on Wine
by hpoussin＠svn.reactos.com 07 Jul '05

07 Jul '05

Enumerate serial interfaces by calling QueryDosDevice on Wine Wine-ify th whole file by removing the L"..." strings, by using debugstr_w(), ... Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-07-07 16:22:45 UTC (rev 16486) +++ trunk/reactos/lib/setupapi/devinst.c 2005-07-07 16:32:34 UTC (rev 16487) @@ -50,6 +50,7 @@ static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0}; static const WCHAR Class[] = {'C','l','a','s','s',0}; static const WCHAR ClassInstall32[] = {'C','l','a','s','s','I','n','s','t','a','l','l','3','2',0}; +static const WCHAR DeviceInstance[] = {'D','e','v','i','c','e','I','n','s','t','a','n','c','e',0}; static const WCHAR NoDisplayClass[] = {'N','o','D','i','s','p','l','a','y','C','l','a','s','s',0}; static const WCHAR NoInstallClass[] = {'N','o','I','s','t','a','l','l','C','l','a','s','s',0}; static const WCHAR NoUseClass[] = {'N','o','U','s','e','C','l','a','s','s',0}; @@ -69,14 +70,14 @@ 'C','o','n','t','r','o','l','\\', 'D','e','v','i','c','e','C','l','a','s','s','e','s',0}; +static const WCHAR EnumKeyName[] = {'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\' , + 'E','n','u','m',0}; + typedef struct _DeviceInfo { LIST_ENTRY ItemEntry; -#ifdef __WINE__ - PWSTR InterfaceName; /* "COMx:" */ - LPGUID InterfaceGuid; /* GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR */ -#else BOOL IsDevice; /* This entry is a device or an interface */ union { @@ -87,12 +88,15 @@ } Device; struct { - GUID ClassGuid; GUID InterfaceGuid; - WCHAR DeviceInstance[0]; /* "ACPI\PNP0501\4&2658d0a0&0"... */ +#ifdef __WINE__ + WCHAR InterfaceName[0]; /* "COMx" */ +#else + GUID ClassGuid; + WCHAR DeviceInstance[0]; /* "ACPI\PNP0501\4&2658d0a0&0"..., NULL on Wine */ +#endif } Interface; }; -#endif } DeviceInfo; #define SETUP_DEV_INFO_LIST_MAGIC 0xd00ff056 @@ -710,19 +714,11 @@ DevInfo = (DeviceInfo *)ItemList; if (DevInfo->IsDevice) { -#ifdef __WINE__ memcpy(&DeviceInfoData->ClassGuid, - DevInfo->InterfaceGuid, - sizeof(GUID)); - DeviceInfoData->DevInst = 0; /* FIXME */ - DeviceInfoData->Reserved = 0; -#else - memcpy(&DeviceInfoData->ClassGuid, &DevInfo->Device.ClassGuid, sizeof(GUID)); DeviceInfoData->DevInst = 0; /* FIXME */ - DeviceInfoData->Reserved = 0; -#endif + DeviceInfoData->Reserved = (ULONG_PTR)0; ret = TRUE; } else @@ -1081,79 +1077,6 @@ return ret; } -#ifdef __WINE__ -static HDEVINFO SETUP_CreateSerialDeviceList(void) -{ - static const size_t initialSize = 100; - size_t size; - WCHAR buf[initialSize]; - LPWSTR devices; - HDEVINFO ret; - BOOL failed = FALSE; - - devices = buf; - size = initialSize; - do { - if (QueryDosDeviceW(NULL, devices, size) == 0) - { - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - size *= 2; - if (devices != buf) - HeapFree(GetProcessHeap(), 0, devices); - devices = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (!devices) - failed = TRUE; - else - *devices = 0; - } - else - failed = TRUE; - } - } while (!*devices && !failed); - if (!failed) - { - static const WCHAR comW[] = { 'C','O','M',0 }; - LPWSTR ptr; - UINT numSerialPorts = 0; - SerialPortList *list; - - for (ptr = devices; *ptr; ptr += strlenW(ptr) + 1) - { - if (!strncmpW(comW, ptr, sizeof(comW) / sizeof(comW[0]) - 1)) - numSerialPorts++; - } - list = HeapAlloc(GetProcessHeap(), 0, sizeof(SerialPortList) + - numSerialPorts ? (numSerialPorts - 1) * sizeof(SerialPortName) : 0); - if (list) - { - list->magic = SETUP_SERIAL_PORT_MAGIC; - list->numPorts = 0; - for (ptr = devices; *ptr; ptr += strlenW(ptr) + 1) - { - if (!strncmpW(comW, ptr, sizeof(comW) / sizeof(comW[0]) - 1)) - { - lstrcpynW(list->names[list->numPorts].name, ptr, - sizeof(list->names[list->numPorts].name) / - sizeof(list->names[list->numPorts].name[0])); - TRACE("Adding %s to list\n", - debugstr_w(list->names[list->numPorts].name)); - list->numPorts++; - } - } - TRACE("list->numPorts is %d\n", list->numPorts); - } - ret = (HDEVINFO)list; - } - else - ret = (HDEVINFO)INVALID_HANDLE_VALUE; - if (devices != buf) - HeapFree(GetProcessHeap(), 0, devices); - TRACE("returning %p\n", ret); - return ret; -} -#endif /* __WINE__ */ - static LONG SETUP_CreateDevListFromClass( DeviceInfoList *list, PCWSTR MachineName, @@ -1212,11 +1135,84 @@ return ERROR_SUCCESS; } +#ifdef __WINE__ +static LONG SETUP_CreateSerialDeviceList( + DeviceInfoList *list, + PCWSTR MachineName, + LPGUID InterfaceGuid, + PCWSTR DeviceInstanceW) +{ + static const size_t initialSize = 100; + size_t size; + WCHAR buf[initialSize]; + LPWSTR devices; + static const WCHAR devicePrefixW[] = { 'C','O','M',0 }; + LPWSTR ptr; + DeviceInfo *deviceInfo; + + if (MachineName) + WARN("'MachineName' is ignored on Wine!\n"); + if (DeviceInstanceW){ + WARN("'DeviceInstanceW' can't be set on Wine!\n"); + + devices = buf; + size = initialSize; + while (TRUE) + { + if (QueryDosDeviceW(NULL, devices, size) != 0) + break; + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + size *= 2; + if (devices != buf) + HeapFree(GetProcessHeap(), 0, devices); + devices = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (!devices) + return ERROR_NO_SYSTEM_RESOURCES; + *devices = UNICODE_NULL; + } + else + { + if (devices != buf) + HeapFree(GetProcessHeap(), 0, devices); + return GetLastError(); + } + } + + /* 'devices' is a MULTI_SZ string */ + for (ptr = devices; *ptr; ptr += strlenW(ptr) + 1) + { + if (strncmpW(devicePrefixW, ptr, sizeof(devicePrefixW) / sizeof(devicePrefixW[0]) - 1) == 0) + { + /* We have found a device */ + TRACE("Adding %s to list\n", debugstr_w(ptr)); + deviceInfo = HeapAlloc(GetProcessHeap(), 0, + FIELD_OFFSET(DeviceInfo, Interface.InterfaceName) + strlenW(ptr) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!deviceInfo) + { + if (devices != buf) + HeapFree(GetProcessHeap(), 0, devices); + return ERROR_NO_SYSTEM_RESOURCES; + } + deviceInfo->IsDevice = FALSE; + memcpy(&deviceInfo->Interface.InterfaceGuid, InterfaceGuid, sizeof(GUID)); + wcscpy(&deviceInfo->Interface.InterfaceName[0], ptr); + InsertTailList(&list->ListHead, &deviceInfo->ItemEntry); + list->numberOfEntries++; + } + } + if (devices != buf) + HeapFree(GetProcessHeap(), 0, devices); + return ERROR_SUCCESS; +} + +#else /* __WINE__ */ + static LONG SETUP_CreateInterfaceList( DeviceInfoList *list, PCWSTR MachineName, LPGUID InterfaceGuid, - PCWSTR DeviceInstance /* OPTIONAL */) + PCWSTR DeviceInstanceW /* OPTIONAL */) { HKEY hInterfaceKey, hEnumKey, hKey; LONG rc; @@ -1254,7 +1250,7 @@ } /* Read DeviceInstance value */ - rc = RegQueryValueExW(hKey, L"DeviceInstance", NULL, &dwRegType, NULL, &dwLength); + rc = RegQueryValueExW(hKey, DeviceInstance, NULL, &dwRegType, NULL, &dwLength); if (rc != ERROR_SUCCESS ) { RegCloseKey(hKey); @@ -1276,7 +1272,7 @@ RegCloseKey(hInterfaceKey); return ERROR_NO_SYSTEM_RESOURCES; } - rc = RegQueryValueExW(hKey, L"DeviceInstance", NULL, NULL, (LPBYTE)&deviceInfo->Interface.DeviceInstance[0], &dwLength); + rc = RegQueryValueExW(hKey, DeviceInstance, NULL, NULL, (LPBYTE)&deviceInfo->Interface.DeviceInstance[0], &dwLength); if (rc != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, deviceInfo); @@ -1285,13 +1281,13 @@ return rc; } deviceInfo->Interface.DeviceInstance[dwLength / sizeof(WCHAR)] = UNICODE_NULL; - TRACE("DeviceInstance %S\n", deviceInfo->Interface.DeviceInstance); + TRACE("DeviceInstance %s\n", debugstr_w(deviceInfo->Interface.DeviceInstance)); RegCloseKey(hKey); - if (DeviceInstance) + if (DeviceInstanceW) { /* Check if device enumerator is not the right one */ - if (wcscmp(DeviceInstance, deviceInfo->Interface.DeviceInstance) != 0) + if (wcscmp(DeviceInstanceW, deviceInfo->Interface.DeviceInstance) != 0) { HeapFree(GetProcessHeap(), 0, deviceInfo);; continue; @@ -1301,7 +1297,7 @@ /* Find class GUID associated to the device instance */ rc = RegOpenKeyEx( HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Enum", + EnumKeyName, 0, /* Options */ KEY_ENUMERATE_SUB_KEYS, &hEnumKey); @@ -1325,7 +1321,7 @@ return rc; } dwLength = sizeof(KeyBuffer) - sizeof(UNICODE_NULL); - rc = RegQueryValueExW(hKey, L"ClassGUID", NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); + rc = RegQueryValueExW(hKey, ClassGUID, NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); if (rc != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, deviceInfo); @@ -1341,7 +1337,7 @@ HeapFree(GetProcessHeap(), 0, deviceInfo); return ERROR_GEN_FAILURE; } - TRACE("ClassGUID %S\n", KeyBuffer); + TRACE("ClassGUID %s\n", debugstr_guid(&deviceInfo->Interface.ClassGuid)); /* If current device matches the list GUID (if any), append the entry to the list */ if (IsEqualIID(&list->ClassGuid, &GUID_NULL) || IsEqualIID(&list->ClassGuid, &deviceInfo->Interface.ClassGuid)) @@ -1363,6 +1359,7 @@ RegCloseKey(hInterfaceKey); return ERROR_SUCCESS; } +#endif /* __WINE__ */ /*********************************************************************** * SetupDiGetClassDevsExW (SETUPAPI.@) @@ -1475,21 +1472,18 @@ #ifdef __WINE__ /* Special case: find serial ports by calling QueryDosDevice */ - if (IsEqualIID(class, &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR) + if (IsEqualIID(class, &GUID_DEVINTERFACE_COMPORT)) + rc = SETUP_CreateSerialDeviceList(list, machine, (LPGUID)class, enumstr); + if (IsEqualIID(class, &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR)) + rc = SETUP_CreateSerialDeviceList(list, machine, (LPGUID)class, enumstr); + else { - rc = SETUP_CreateSerialDeviceList(); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - if (!deviceset) - SetupDiDestroyDeviceInfoList(hDeviceInfo); - return INVALID_HANDLE_VALUE; - } - return hDeviceInfo; + ERR("Wine can only enumerate serial devices at the moment!\n"); + rc = ERROR_INVALID_PARAMETER; } -#endif - +#else /* __WINE__ */ rc = SETUP_CreateInterfaceList(list, machine, (LPGUID)class, enumstr); +#endif /* __WINE__ */ if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -1527,10 +1521,13 @@ TRACE("%p, %p, %s, 0x%08lx, %p\n", DeviceInfoSet, DeviceInfoData, debugstr_guid(InterfaceClassGuid), MemberIndex, DeviceInterfaceData); + if (DeviceInfoData) + FIXME(": unimplemented with PSP_DEVINFO_DATA set\n"); + if (!DeviceInterfaceData) SetLastError(ERROR_INVALID_PARAMETER); - else if (DeviceInfoData) - FIXME(": unimplemented with PSP_DEVINFO_DATA set\n"); + else if (DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); else if (DeviceInfoSet && DeviceInfoSet != (HDEVINFO)INVALID_HANDLE_VALUE) { DeviceInfoList *list = (DeviceInfoList *)DeviceInfoSet; @@ -1549,23 +1546,19 @@ if (!DevInfo->IsDevice) { - DeviceInterfaceData->cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); /* FIXME: verify instead of setting */ -#ifdef __WINE__ - /* FIXME: this assumes the only possible enumeration is of serial - * ports. - */ memcpy(&DeviceInterfaceData->InterfaceClassGuid, - DevInfo->InterfaceGuid, + &DevInfo->Interface.InterfaceGuid, sizeof(DeviceInterfaceData->InterfaceClassGuid)); - DeviceInterfaceData->Flags = 0; + DeviceInterfaceData->Flags = 0; /* FIXME */ /* Note: this appears to be dangerous, passing a private * pointer a heap-allocated datum to the caller. However, the * expected lifetime of the device data is the same as the * HDEVINFO; once that is closed, the data are no longer valid. */ - DeviceInterfaceData->Reserved = (ULONG_PTR)DevInfo->InterfaceName; +#ifdef __WINE__ + DeviceInterfaceData->Reserved = (ULONG_PTR)DevInfo->Interface.InterfaceName; #else - FIXME("unimplemented\n"); + DeviceInterfaceData->Reserved = (ULONG_PTR)DevInfo; #endif ret = TRUE; } @@ -2273,8 +2266,8 @@ DWORD CreationFlags, PSP_DEVINFO_DATA DeviceInfoData) { - FIXME("%p %S %p %S %p %lx %p\n", DeviceInfoSet, debugstr_w(DeviceName), - ClassGuid, debugstr_w(DeviceDescription), hwndParent, + FIXME("%p %s %s %s %p %lx %p\n", DeviceInfoSet, debugstr_w(DeviceName), + debugstr_guid(ClassGuid), debugstr_w(DeviceDescription), hwndParent, CreationFlags, DeviceInfoData); return FALSE; }

1 0

[greatlrd] 16486: Fix bug "mv foo.txt c:\temp gives you c:\tempfoo.txt" by Brandon Turner
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

Fix bug "mv foo.txt c:\temp gives you c:\tempfoo.txt" by Brandon Turner Modified: trunk/reactos/subsys/system/cmd/move.c _____ Modified: trunk/reactos/subsys/system/cmd/move.c --- trunk/reactos/subsys/system/cmd/move.c 2005-07-07 16:06:43 UTC (rev 16485) +++ trunk/reactos/subsys/system/cmd/move.c 2005-07-07 16:22:45 UTC (rev 16486) @@ -182,9 +182,10 @@ /*build the dest string(accounts for *)*/ TCHAR szFullDestPath[MAX_PATH]; _tcscpy (szFullDestPath, szDestPath); - /*this line causes a one to many slashes, GetFullPathName must - be adding on a \ when it sees that is a dir*/ - //_tcscat (szFullDestPath, _T("\\")); + /*check to see if there is an ending slash, if not add one*/ + if(szFullDestPath[_tcslen(szFullDestPath) - 1] != _T('\\')) + _tcscat (szFullDestPath, _T("\\")); + _tcscat (szFullDestPath, findBuffer.cFileName); /*checks to make sure user wanted/wants the override*/

1 0

[greatlrd] 16485: add %DATE% example echo %date% are working now. Bugfix date so it print out the week days names.
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

add %DATE% example echo %date% are working now. Bugfix date so it print out the week days names. Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/locale.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 15:05:36 UTC (rev 16484) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 16:06:43 UTC (rev 16485) @@ -990,10 +990,8 @@ *tp = _T('\0'); /* FIXME: Correct error handling when it can not alloc memmory */ - evar = malloc ( size * sizeof(TCHAR)); - if (evar==NULL) - return 1; - + + /* %CD% */ if (_tcsicmp(ip,_T("cd")) ==0) { TCHAR szPath[MAX_PATH]; @@ -1001,21 +999,47 @@ cp = _stpcpy (cp, szPath); } + /* %TIME% */ else if (_tcsicmp(ip,_T("time")) ==0) { TCHAR szTime[40]; GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, szTime, sizeof(szTime)); cp = _stpcpy (cp, szTime); } + + else if (_tcsicmp(ip,_T("date")) ==0) + { + TCHAR szDate[40]; + + GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("ddd"), szDate, sizeof (szDate)); + cp = _stpcpy (cp, szDate); + cp = _stpcpy (cp, _T(" ")); + GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, szDate, sizeof (szDate)); + + cp = _stpcpy (cp, szDate); + + } + + /* %ERRORLEVEL% */ else if (_tcsicmp(ip,_T("errorlevel")) ==0) - { + { + evar = malloc ( size * sizeof(TCHAR)); + if (evar==NULL) + return 1; + memset(evar,0,512 * sizeof(TCHAR)); _itot(nErrorLevel,evar,10); cp = _stpcpy (cp, evar); + + free(evar); } else { + evar = malloc ( size * sizeof(TCHAR)); + if (evar==NULL) + return 1; + size = GetEnvironmentVariable (ip, evar, size); if (size!=0) { @@ -1030,12 +1054,10 @@ { cp = _stpcpy (cp, evar); } - } - if (evar!=NULL) - { free(evar); - } + } + ip = tp + 1; } _____ Modified: trunk/reactos/subsys/system/cmd/locale.c --- trunk/reactos/subsys/system/cmd/locale.c 2005-07-07 15:05:36 UTC (rev 16484) +++ trunk/reactos/subsys/system/cmd/locale.c 2005-07-07 16:06:43 UTC (rev 16485) @@ -58,11 +58,13 @@ VOID PrintDate (VOID) { + TCHAR szDateDay[32]; TCHAR szDate[32]; - GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, - szDate, sizeof (szDate)); - ConOutPrintf(_T("%s"), szDate); + GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("ddd"), szDateDay, sizeof (szDateDay)); + + GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL,szDate, sizeof (szDate)); + ConOutPrintf(_T("%s %s"),szDateDay, szDate); }

1 0

[gvg] 16484: Sync to Wine-20050628:
by gvg＠svn.reactos.com 07 Jul '05

07 Jul '05

Sync to Wine-20050628: Alexandre Julliard <julliard(a)winehq.org> - Sort entry points in the same order as Windows. - Added magic comments to all Wine-specific registry accesses to make them easier to grep. Modified: trunk/reactos/lib/mpr/mpr.spec Modified: trunk/reactos/lib/mpr/pwcache.c _____ Modified: trunk/reactos/lib/mpr/mpr.spec --- trunk/reactos/lib/mpr/mpr.spec 2005-07-07 13:43:03 UTC (rev 16483) +++ trunk/reactos/lib/mpr/mpr.spec 2005-07-07 15:05:36 UTC (rev 16484) @@ -67,17 +67,22 @@ @ stdcall WNetEnumCachedPasswords(str long long ptr long) @ stdcall WNetEnumResourceA(long ptr ptr ptr) @ stdcall WNetEnumResourceW(long ptr ptr ptr) +@ stub WNetFMXEditPerm +@ stub WNetFMXGetPermCaps +@ stub WNetFMXGetPermHelp @ stub WNetFormatNetworkNameA @ stub WNetFormatNetworkNameW @ stdcall WNetGetCachedPassword(ptr long ptr ptr long) @ stdcall WNetGetConnectionA(str ptr ptr) @ stdcall WNetGetConnectionW(wstr ptr ptr) +@ stub WNetGetDirectoryTypeA @ stub WNetGetHomeDirectoryA @ stub WNetGetHomeDirectoryW @ stdcall WNetGetLastErrorA(ptr ptr long ptr long) @ stdcall WNetGetLastErrorW(ptr ptr long ptr long) @ stdcall WNetGetNetworkInformationA(str ptr) @ stdcall WNetGetNetworkInformationW(wstr ptr) +@ stub WNetGetPropertyTextA @ stdcall WNetGetProviderNameA(long ptr ptr) @ stdcall WNetGetProviderNameW(long ptr ptr) @ stdcall WNetGetResourceInformationA(ptr ptr ptr ptr) @@ -91,10 +96,14 @@ @ stdcall WNetLogoffA(str long) @ stdcall WNetLogoffW(wstr long) @ stdcall WNetLogonA(str long) +@ stub WNetLogonNotify @ stdcall WNetLogonW(wstr long) @ stdcall WNetOpenEnumA(long long long ptr ptr) @ stdcall WNetOpenEnumW(long long long ptr ptr) +@ stub WNetPasswordChangeNotify +@ stub WNetPropertyDialogA @ stdcall WNetRemoveCachedPassword(long long long) +@ stub WNetRestoreConnection @ stdcall WNetRestoreConnectionA(long str) @ stdcall WNetRestoreConnectionW(long wstr) @ stdcall WNetSetConnectionA(str long ptr) @@ -103,14 +112,3 @@ @ stdcall WNetUseConnectionW(long ptr wstr wstr long wstr ptr ptr) @ stdcall WNetVerifyPasswordA(str ptr) @ stdcall WNetVerifyPasswordW(wstr ptr) - -#additions, not in win95 mpr.dll -@ stub WNetRestoreConnection -@ stub WNetLogonNotify -@ stub WNetPasswordChangeNotify -@ stub WNetGetPropertyTextA -@ stub WNetPropertyDialogA -@ stub WNetGetDirectoryTypeA -@ stub WNetFMXGetPermHelp -@ stub WNetFMXEditPerm -@ stub WNetFMXGetPermCaps _____ Modified: trunk/reactos/lib/mpr/pwcache.c --- trunk/reactos/lib/mpr/pwcache.c 2005-07-07 13:43:03 UTC (rev 16483) +++ trunk/reactos/lib/mpr/pwcache.c 2005-07-07 15:05:36 UTC (rev 16484) @@ -99,6 +99,7 @@ pbPassword, debugstr_a(pbPassword), cbPassword, nType, x ); + /* @@ Wine registry key: HKCU\Software\Wine\Wine\Mpr */ r = RegCreateKeyA( HKEY_CURRENT_USER, mpr_key, &hkey ); if( r ) return WN_ACCESS_DENIED; @@ -137,6 +138,7 @@ WARN( "(%p(%s), %d, %d): totally insecure\n", pbResource, debugstr_a(pbResource), cbResource, nType ); + /* @@ Wine registry key: HKCU\Software\Wine\Wine\Mpr */ r = RegCreateKeyA( HKEY_CURRENT_USER, mpr_key, &hkey ); if( r ) return WN_ACCESS_DENIED; @@ -191,6 +193,7 @@ memset( pbPassword, 0, *pcbPassword); + /* @@ Wine registry key: HKCU\Software\Wine\Wine\Mpr */ r = RegCreateKeyA( HKEY_CURRENT_USER, mpr_key, &hkey ); if( r ) return WN_ACCESS_DENIED; @@ -249,6 +252,7 @@ debugstr_an(pbPrefix,cbPrefix), cbPrefix, nType, enumPasswordProc, param ); + /* @@ Wine registry key: HKCU\Software\Wine\Wine\Mpr */ r = RegCreateKeyA( HKEY_CURRENT_USER, mpr_key, &hkey ); if( r ) return WN_ACCESS_DENIED;

1 0

[greatlrd] 16483: add %time% and %cd% internal value. Example echo %cd% or echo %time%.
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

add %time% and %cd% internal value. Example echo %cd% or echo %time%. Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 11:44:15 UTC (rev 16482) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 13:43:03 UTC (rev 16483) @@ -993,8 +993,22 @@ evar = malloc ( size * sizeof(TCHAR)); if (evar==NULL) return 1; - - if (_tcsicmp(ip,_T("errorlevel")) ==0) + + if (_tcsicmp(ip,_T("cd")) ==0) + { + TCHAR szPath[MAX_PATH]; + GetCurrentDirectory (MAX_PATH, szPath); + cp = _stpcpy (cp, szPath); + } + + else if (_tcsicmp(ip,_T("time")) ==0) + { + TCHAR szTime[40]; + GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, szTime, sizeof(szTime)); + cp = _stpcpy (cp, szTime); + } + + else if (_tcsicmp(ip,_T("errorlevel")) ==0) { memset(evar,0,512 * sizeof(TCHAR)); _itot(nErrorLevel,evar,10);

1 0

[greatlrd] 16482: Update command help text with \n at the end of the text
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

Update command help text with \n at the end of the text Modified: trunk/reactos/subsys/system/cmd/De.rc Modified: trunk/reactos/subsys/system/cmd/En.rc _____ Modified: trunk/reactos/subsys/system/cmd/De.rc --- trunk/reactos/subsys/system/cmd/De.rc 2005-07-07 11:26:38 UTC (rev 16481) +++ trunk/reactos/subsys/system/cmd/De.rc 2005-07-07 11:44:15 UTC (rev 16482) @@ -560,7 +560,7 @@ VER Zeigt die Windows-Version an.\n\ VERIFY Legt fest, ob ueberwacht werden soll, ob Dateien korrekt auf den\n\ Datentraeger geschrieben werden.\n\ -VOL Zeigt die Datentraegervolumebezeichnung und die Seriennummer an." +VOL Zeigt die Datentraegervolumebezeichnung und die Seriennummer an.\n" STRING_CHOICE_OPTION, "JN" _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-07-07 11:26:38 UTC (rev 16481) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-07-07 11:44:15 UTC (rev 16482) @@ -551,7 +551,7 @@ VER Displays the Windows version.\n\ VERIFY Tells Windows whether to verify that your files are written\n\ correctly to a disk.\n\ -VOL Displays a disk volume label and serial number." +VOL Displays a disk volume label and serial number.\n" STRING_CHOICE_OPTION, "YN"

1 0

[greatlrd] 16481: Fix minior bug in ConPrintfPaging so it count line right and do pause on the screen before it getting full. Fix the row size calc code. Move in page break code to the for. Write one char at time. Need to be fixed so it can write more that one char at time.
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

Fix minior bug in ConPrintfPaging so it count line right and do pause on the screen before it getting full. Fix the row size calc code. Move in page break code to the for. Write one char at time. Need to be fixed so it can write more that one char at time. Modified: trunk/reactos/subsys/system/cmd/console.c _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-07-07 09:56:47 UTC (rev 16480) +++ trunk/reactos/subsys/system/cmd/console.c 2005-07-07 11:26:38 UTC (rev 16481) @@ -222,11 +222,14 @@ #else pBuf = szOut; #endif + WriteFile (GetStdHandle (nStdHandle), pBuf, len, &dwWritten, NULL); + + #ifdef UNICODE free(pBuf); #endif @@ -239,35 +242,42 @@ CONSOLE_SCREEN_BUFFER_INFO csbi; TCHAR szOut[OUTPUT_BUFFER_SIZE]; DWORD dwWritten; - static int LineCount = 0; //used to count number of lines since last pause - int ScreenLines = 0; //used to see how big the screen is - int ScreenCol = 0; //the number of chars in a roow - int CharEL = 0; //chars since end of line + + /* used to count number of lines since last pause */ + static int LineCount = 0; + + /* used to see how big the screen is */ + int ScreenLines = 0; + + /* the number of chars in a roow */ + int ScreenCol = 0; + + /* chars since end of line */ + int CharEL = 0; + int i = 0; if(NewPage == TRUE) LineCount = 0; + /* rest LineCount and return if no string have been given */ + if (szFormat == NULL) + return; + + //get the size of the visual screen that can be printed too GetConsoleScreenBufferInfo(hConsole, &csbi); //subtract 2 to account for "press any key..." and for the blank line at the end of PagePrompt() - ScreenLines = csbi.srWindow.Bottom - csbi.srWindow.Top - 2; - ScreenCol = csbi.srWindow.Right + 1; + ScreenLines = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; + ScreenCol = (csbi.srWindow.Right - csbi.srWindow.Left) + 1; //make sure they didnt make the screen to small - if(ScreenLines<2) + if(ScreenLines<4) + { ConPrintf(szFormat, arg_ptr, nStdHandle); - //if more lines have been printed then screen size it is time to stop - if(LineCount >= ScreenLines) - { - if(PagePrompt() != PROMPT_YES) - { - return; - } - //reset the number of lines being printed - LineCount = 0; - } - + return ; + } + len = _vstprintf (szOut, szFormat, arg_ptr); #ifdef _UNICODE pBuf = malloc(len + 1); @@ -275,43 +285,45 @@ #else pBuf = szOut; #endif - WriteFile (GetStdHandle (nStdHandle), - pBuf, - len, - &dwWritten, - NULL); + + for(i = 0; i < len; i++) + { + + if(szOut[i] == _T('\n')) + { + LineCount++; + CharEL=0; + } + else + { + CharEL++; + if (CharEL>=ScreenCol) + { + if (i+1<len) + { + if(szOut[i+1] != _T('\n')) LineCount++; + } + CharEL=0; + } + } + /* FIXME : write more that one char at time */ + WriteFile (GetStdHandle (nStdHandle),&pBuf[i],sizeof(TCHAR),&dwWritten,NULL); + if(LineCount >= ScreenLines) + { + if(_tcsncicmp(&szOut[i],_T("\n"),2)!=0) + WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(TCHAR),&dwWritten,NULL); - - if(len < ScreenCol) - { - //if it is smaller then a row then just check for \n - for(i = 0; i < len; i++) - if(szOut[i] == '\n') - LineCount++; - - } - else - { - //if it is bigger then a row check for \n and a string longer then a row can handle - for(i = 0; i < len; i++) - { - if(szOut[i] == '\n') - { - CharEL = 0; - LineCount++; - } - else - { - CharEL++; - if(CharEL > ScreenCol) - { - CharEL = 0; - LineCount++; - } - } + if(PagePrompt() != PROMPT_YES) + { + return; + } + //reset the number of lines being printed + LineCount = 0; + CharEL=0; + } + } - } #ifdef UNICODE free(pBuf);

1 0

[navaraf] 16480: Once more, this time with proper character encoding.
by navaraf＠svn.reactos.com 07 Jul '05

07 Jul '05

Once more, this time with proper character encoding. Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2005-07-07 09:48:44 UTC (rev 16479) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2005-07-07 09:56:47 UTC (rev 16480) @@ -1,6 +1,6 @@ /* * ReactOS Xbox miniport video driver - * Copyright (C) 2004 Gé van Geldorp + * Copyright (C) 2004 GÚ van Geldorp * * Based on VBE miniport video driver * Copyright (C) 2004 Filip Navara _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2005-07-07 09:48:44 UTC (rev 16479) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2005-07-07 09:56:47 UTC (rev 16480) @@ -1,6 +1,6 @@ /* * ReactOS Xbox miniport video driver - * Copyright (C) 2004 Gé van Geldorp + * Copyright (C) 2004 GÚ van Geldorp * * Based on VBE miniport video driver * Copyright (C) 2004 Filip Navara

1 0

[navaraf] 16479: Correct the copyright headers.
by navaraf＠svn.reactos.com 07 Jul '05

07 Jul '05

Correct the copyright headers. Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2005-07-07 08:57:03 UTC (rev 16478) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2005-07-07 09:48:44 UTC (rev 16479) @@ -1,12 +1,10 @@ /* * ReactOS Xbox miniport video driver + * Copyright (C) 2004 Gé van Geldorp * * Based on VBE miniport video driver * Copyright (C) 2004 Filip Navara * - * Power Management and VBE 1.2 support - * Copyright (C) 2004 Magnus Olsen - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2005-07-07 08:57:03 UTC (rev 16478) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2005-07-07 09:48:44 UTC (rev 16479) @@ -1,5 +1,6 @@ /* * ReactOS Xbox miniport video driver + * Copyright (C) 2004 Gé van Geldorp * * Based on VBE miniport video driver * Copyright (C) 2004 Filip Navara

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs