Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[hpoussin] 16501: Minimize differences between GCC and MSVC in header file
by hpoussin＠svn.reactos.com 07 Jul '05

07 Jul '05

Minimize differences between GCC and MSVC in header file Don't define SR_MSR_DSR as it already exists under the name SERIAL_DSR_STATE Remove $Id: tags Modified: trunk/reactos/drivers/bus/serenum/detect.c Modified: trunk/reactos/drivers/bus/serenum/fdo.c Modified: trunk/reactos/drivers/bus/serenum/misc.c Modified: trunk/reactos/drivers/bus/serenum/pdo.c Modified: trunk/reactos/drivers/bus/serenum/serenum.c Modified: trunk/reactos/drivers/bus/serenum/serenum.h _____ Modified: trunk/reactos/drivers/bus/serenum/detect.c --- trunk/reactos/drivers/bus/serenum/detect.c 2005-07-07 22:27:30 UTC (rev 16500) +++ trunk/reactos/drivers/bus/serenum/detect.c 2005-07-07 23:10:35 UTC (rev 16501) @@ -1,5 +1,4 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Serial enumerator driver * FILE: drivers/bus/serenum/detect.c @@ -285,7 +284,7 @@ Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS, NULL, 0, &Msr, &Size); if (!NT_SUCCESS(Status)) goto ByeBye; - if ((Msr & SR_MSR_DSR) == 0) goto SerenumDisconnectIdle; + if ((Msr & SERIAL_DSR_STATE) == 0) goto SerenumDisconnectIdle; /* 2. COM port setup, 1st phase */ CHECKPOINT; @@ -356,7 +355,7 @@ Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS, NULL, 0, &Msr, &Size); if (!NT_SUCCESS(Status)) goto ByeBye; - if ((Msr & SR_MSR_DSR) == 0) goto SerenumVerifyDisconnect; else goto SerenumConnectIdle; + if ((Msr & SERIAL_DSR_STATE) == 0) goto SerenumVerifyDisconnect; else goto SerenumConnectIdle; /* 6. Collect PnP COM device ID */ SerenumCollectPnpComDeviceId: @@ -395,7 +394,7 @@ Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS, NULL, 0, &Msr, &Size); if (!NT_SUCCESS(Status)) goto ByeBye; - if ((Msr & SR_MSR_DSR) == 0) goto SerenumVerifyDisconnect; + if ((Msr & SERIAL_DSR_STATE) == 0) goto SerenumVerifyDisconnect; /* 7. Verify disconnect */ SerenumVerifyDisconnect: _____ Modified: trunk/reactos/drivers/bus/serenum/fdo.c --- trunk/reactos/drivers/bus/serenum/fdo.c 2005-07-07 22:27:30 UTC (rev 16500) +++ trunk/reactos/drivers/bus/serenum/fdo.c 2005-07-07 23:10:35 UTC (rev 16501) @@ -1,5 +1,4 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Serial enumerator driver * FILE: drivers/bus/serenum/fdo.c _____ Modified: trunk/reactos/drivers/bus/serenum/misc.c --- trunk/reactos/drivers/bus/serenum/misc.c 2005-07-07 22:27:30 UTC (rev 16500) +++ trunk/reactos/drivers/bus/serenum/misc.c 2005-07-07 23:10:35 UTC (rev 16501) @@ -1,5 +1,4 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Serial enumerator driver * FILE: drivers/dd/serenum/misc.c _____ Modified: trunk/reactos/drivers/bus/serenum/pdo.c --- trunk/reactos/drivers/bus/serenum/pdo.c 2005-07-07 22:27:30 UTC (rev 16500) +++ trunk/reactos/drivers/bus/serenum/pdo.c 2005-07-07 23:10:35 UTC (rev 16501) @@ -1,5 +1,4 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Serial enumerator driver * FILE: drivers/bus/serenum/pdo.c @@ -283,11 +282,11 @@ Status = STATUS_INSUFFICIENT_RESOURCES; else { - BusInfo->BusTypeGuid = GUID_BUS_TYPE_SERENUM; - /* FIXME: real value should be PNPBus, but PNPBus seems to be - * the only value in INTERFACE_TYPE enum that doesn't work... - */ - BusInfo->LegacyBusType = PNPISABus; + memcpy( + &BusInfo->BusTypeGuid, + &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, + sizeof(BusInfo->BusTypeGuid)); + BusInfo->LegacyBusType = PNPBus; /* We're the only serial bus enumerator on the computer */ BusInfo->BusNumber = 0; Information = (ULONG_PTR)BusInfo; _____ Modified: trunk/reactos/drivers/bus/serenum/serenum.c --- trunk/reactos/drivers/bus/serenum/serenum.c 2005-07-07 22:27:30 UTC (rev 16500) +++ trunk/reactos/drivers/bus/serenum/serenum.c 2005-07-07 23:10:35 UTC (rev 16501) @@ -1,5 +1,4 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Serial enumerator driver * FILE: drivers/bus/serenum/serenum.c _____ Modified: trunk/reactos/drivers/bus/serenum/serenum.h --- trunk/reactos/drivers/bus/serenum/serenum.h 2005-07-07 22:27:30 UTC (rev 16500) +++ trunk/reactos/drivers/bus/serenum/serenum.h 2005-07-07 23:10:35 UTC (rev 16501) @@ -1,47 +1,38 @@ -#if defined(__GNUC__) - #include <ddk/ntddk.h> - #include <ddk/ntddser.h> - #include <ddk/wdmguid.h> - #include <stdio.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Serial enumerator driver + * FILE: drivers/bus/serenum/serenum.h + * PURPOSE: Serial enumerator driver header + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + */ - #include <debug.h> +#include <ntddk.h> +#include <ntddser.h> +#include <stdio.h> - #define SR_MSR_DSR 0x20 - - /* FIXME: these prototypes MUST NOT be here! */ - NTSTATUS STDCALL - IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); - +#if defined(__GNUC__) + #include <debug.h> #elif defined(_MSC_VER) - #include <ntddk.h> - #include <ntddser.h> - #include <c:/progra~1/winddk/inc/ddk/wdm/wxp/wdmguid.h> - #include <stdio.h> - #define STDCALL #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint #define CHECKPOINT1 DbgPrint("(%s:%d)\n") - - NTSTATUS STDCALL - IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); - #define DPRINT DPRINT1 #define CHECKPOINT CHECKPOINT1 - - #define SR_MSR_DSR 0x20 #else #error Unknown compiler! #endif #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +/* FIXME: I don't know why it is not defined anywhere... */ +NTSTATUS STDCALL +IoAttachDeviceToDeviceStackSafe( + IN PDEVICE_OBJECT SourceDevice, + IN PDEVICE_OBJECT TargetDevice, + OUT PDEVICE_OBJECT *AttachedToDeviceObject); + typedef enum { dsStopped,

1 0

[greatlrd] 16500: Set right %ERRORLEVEL% value, fixing end of line for /? after implement of page break.
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

Set right %ERRORLEVEL% value, fixing end of line for /? after implement of page break. Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/label.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-07-07 22:23:26 UTC (rev 16499) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-07-07 22:27:30 UTC (rev 16500) @@ -276,7 +276,7 @@ label Specifies a text string used in a batch script as a label.\n\n\ You type a label on a line by itself, beginning with a colon." -STRING_LABEL_HELP1, "Displays or changes drive label.\n\nLABEL [drive:][label]" +STRING_LABEL_HELP1, "Displays or changes drive label.\n\nLABEL [drive:][label]\n" STRING_LABEL_HELP2, "Volume in drive %c: is %s\n" STRING_LABEL_HELP3, "Volume in drive %c: has no label\n" _____ Modified: trunk/reactos/subsys/system/cmd/label.c --- trunk/reactos/subsys/system/cmd/label.c 2005-07-07 22:23:26 UTC (rev 16499) +++ trunk/reactos/subsys/system/cmd/label.c 2005-07-07 22:27:30 UTC (rev 16500) @@ -43,6 +43,8 @@ return 0; } + nErrorLevel = 0; + /* get parameters */ arg = split (param, &args, FALSE); @@ -51,6 +53,7 @@ /* too many parameters */ error_too_many_parameters (arg[args - 1]); freep (arg); + nErrorLevel = 1; return 1; } @@ -83,6 +86,7 @@ { error_invalid_drive (); freep (arg); + nErrorLevel = 1; return 1; }

1 0

[hpoussin] 16499: Add missing registry entries for serial ports
by hpoussin＠svn.reactos.com 07 Jul '05

07 Jul '05

Add missing registry entries for serial ports Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-07-07 20:41:13 UTC (rev 16498) +++ trunk/reactos/bootdata/hivesys.inf 2005-07-07 22:23:26 UTC (rev 16499) @@ -828,7 +828,9 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","0",0x00000000,"ACP I\PNP0501" HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","Count",0x00010001, 0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","NextInstance",0x00 010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","ClassGUID",0x00000 000,"{4D36E978-E325-11CE-BFC1-08002BE10318}" HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","Service",0x00000000 ,"serial" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","ClassGUID",0x00000 000,"{4D36E978-E325-11CE-BFC1-08002BE10318}" HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","Service",0x00000000 ,"serial" ; Packet driver

1 0

[greatlrd] 16498: Set right %ERRORLEVEL% value, fixing end of line for /? for most commands after implement of page break.
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

Set right %ERRORLEVEL% value, fixing end of line for /? for most commands after implement of page break. Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/time.c Modified: trunk/reactos/subsys/system/cmd/ver.c Modified: trunk/reactos/subsys/system/cmd/verify.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-07-07 19:54:25 UTC (rev 16497) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-07-07 20:41:13 UTC (rev 16498) @@ -20,7 +20,7 @@ /S Processes matching files in the current directory\n\ and all subdirectories\n\ /D Processes directories as well\n\n\ -Type ATTRIB without a parameter to display the attributes of all files." +Type ATTRIB without a parameter to display the attributes of all files.\n" STRING_ALIAS_HELP, "Sets, removes or shows aliases.\n\n\ ALIAS [alias=[command]]\n\n\ @@ -33,7 +33,7 @@ To remove an alias from the alias list:\n\ ALIAS da=" -STRING_BEEP_HELP, "Beep the speaker.\n\nBEEP" +STRING_BEEP_HELP, "Beep the speaker.\n\nBEEP\n" STRING_CALL_HELP, "Calls one batch program from another.\n\n\ CALL [drive:][path]filename [batch-parameter]\n\n\ @@ -48,12 +48,12 @@ .. 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." +Type CD without a parameter to display the current drive and directory.\n" STRING_CHCP_HELP, "Displays or sets the active code page number.\n\n\ CHCP [nnn]\n\n\ nnn Specifies the active code page number.\n\n\ -Type CHCP without a parameter to display the active code page number." +Type CHCP without a parameter to display the active code page number.\n" STRING_CHOICE_HELP, "Waits for the user to choose one of a set of choices.\n\n\ CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\ @@ -62,9 +62,9 @@ /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." +ERRORLEVEL is set to offset of key user presses in choices.\n" -STRING_CLS_HELP, "Clears the screen.\n\nCLS" +STRING_CLS_HELP, "Clears the screen.\n\nCLS\n" STRING_CMD_HELP1, "\nInternal commands available:\n" @@ -86,7 +86,7 @@ /K command Runs the specified command and remains.\n\ /P CMD becomes permanent and runs autoexec.bat\n\ (cannot be terminated).\n\ - /T:bf Sets the background/foreground color (see COLOR command)." + /T:bf Sets the background/foreground color (see COLOR command).\n" STRING_COLOR_HELP1, "Sets the default foreground and background colors.\n\n\ COLOR [attr [/-F]] \n\n\ @@ -105,7 +105,7 @@ 4 4 Red 12 C Bright Red\n\ 5 5 Magenta 13 D Bright Magenta\n\ 6 6 Yellow 14 E Bright Yellow\n\ -7 7 White 15 F Bright White" +7 7 White 15 F Bright White\n" STRING_COPY_HELP1, "Overwrite %s (Yes/No/All)? " @@ -122,7 +122,7 @@ /-Y Causes prompting to confirm you want to overwrite an\n\ existing destination file.\n\n\ The switch /Y may be present in the COPYCMD environment variable.\n\ -..." +...\n" STRING_DATE_HELP1, "\nEnter new date (mm%cdd%cyyyy): " @@ -134,7 +134,7 @@ DATE [/T][date]\n\n\ /T display only\n\n\ Type DATE without parameters to display the current date setting and\n\ -a prompt for a new one. Press ENTER to keep the same date." +a prompt for a new one. Press ENTER to keep the same date.\n" STRING_DEL_HELP1, "Deletes one or more files.\n\n\ DEL [/N /P /T /Q /W /Y /Z /A[[:]attributes]] file ...\n\ @@ -163,7 +163,7 @@ STRING_DELAY_HELP, "pause for n seconds or milliseconds\n\ DELAY [/m]n\n\n\ /m specifiy than n are milliseconds\n\ - otherwise n are seconds" + otherwise n are seconds\n" STRING_DIR_HELP1, "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ @@ -210,7 +210,7 @@ STRING_DIRSTACK_HELP1, "Stores the current directory for use by the POPD command, then\n\ changes to the specified directory.\n\n\ PUSHD [path | ..]\n\n\ - path Specifies the directory to make the current directory" + path Specifies the directory to make the current directory\n" STRING_DIRSTACK_HELP2, "Changes to the directory stored by the PUSHD command.\n\nPOPD" @@ -236,7 +236,7 @@ STRING_ECHO_HELP5, "ECHO is %s\n" -STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT" +STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT\n" STRING_FOR_HELP1, "Runs a specified command for each file in a set of files\n\n\ FOR %variable IN (set) DO command [parameters]\n\n\ @@ -245,7 +245,7 @@ command Specifies the command to carry out for each file.\n\ parameters Specifies parameters or switches for the specified command.\n\n\ To use the FOR command in a batch program, specify %%variable instead of\n\ -%variable." +%variable.\n" STRING_FREE_HELP1, "\nVolume in drive %s is %-11s\n\ Serial number is %s\n\ @@ -253,7 +253,7 @@ %16s bytes used\n\ %16s bytes free\n" -STRING_FREE_HELP2, "Displays drive information.\n\nFREE [drive: ...]" +STRING_FREE_HELP2, "Displays drive information.\n\nFREE [drive: ...]\n" STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ @@ -269,7 +269,7 @@ match.\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ - defined." + defined.\n" STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch script.\n\n\ GOTO label\n\n\ @@ -349,7 +349,7 @@ $T Current time\n\ $V OS version number\n\ $_ Carriage return and linefeed\n\ - $$ $ (dollar sign)" + $$ $ (dollar sign)\n" STRING_PAUSE_HELP1, "Stops the execution of a batch file and shows the following message:\n\ 'Press any key to continue...' or a user defined message.\n\n\ @@ -375,7 +375,7 @@ /S Rename subdirectories.\n\ /T Display total number of renamed files.\n\n\ Note that you cannot specify a new drive or path for your destination. Use\n\ -the MOVE command for that purpose." +the MOVE command for that purpose.\n" STRING_REN_HELP2, " %lu file renamed\n" @@ -402,13 +402,13 @@ STRING_TITLE_HELP, "Sets the window title for the command prompt window.\n\n\ TITLE [string]\n\n\ -string Specifies the title for the command prompt window." +string Specifies the title for the command prompt window.\n" STRING_TIME_HELP1, "Displays or sets the system time.\n\n\ TIME [/T][time]\n\n\ /T display only\n\n\ Type TIME with no parameters to display the current time setting and a prompt\n\ -for a new one. Press ENTER to keep the same time." +for a new one. Press ENTER to keep the same time.\n" STRING_TIME_HELP2, "Enter new time: " @@ -438,7 +438,7 @@ Sets whether to verify that your files are written correctly to a\n\ disk.\n\n\ VERIFY [ON | OFF]\n\n\ -Type VERIFY without a parameter to display the current VERIFY setting." +Type VERIFY without a parameter to display the current VERIFY setting.\n" STRING_VERIFY_HELP2, "VERIFY is %s.\n" @@ -463,7 +463,7 @@ STRING_VERSION_HELP4, "\n This program is free software; you can redistribute it and/or modify\n\ it under the terms of the GNU General Public License as published by\n\ the Free Software Foundation; either version 2 of the License, or\n\ - (at your option) any later version." + (at your option) any later version.\n" STRING_VERSION_HELP5, "\nSend bug reports to <ros-dev(a)reactos.com>.\n\ Updates are available at: http://www.reactos.com" @@ -493,7 +493,7 @@ MIN minimize the window\n\ MAX maximize the window\n\ RESTORE restore the window\n\ -title new title" +title new title\n" STRING_HELP1, "List of all available commands (+ description)\n\n\ _____ Modified: trunk/reactos/subsys/system/cmd/time.c --- trunk/reactos/subsys/system/cmd/time.c 2005-07-07 19:54:25 UTC (rev 16497) +++ trunk/reactos/subsys/system/cmd/time.c 2005-07-07 20:41:13 UTC (rev 16498) @@ -144,6 +144,8 @@ return 0; } + nErrorLevel = 0; + /* build parameter array */ arg = split (param, &argc, FALSE); @@ -202,6 +204,7 @@ } ConErrResPuts(STRING_TIME_ERROR1); + nErrorLevel = 1; } freep (arg); _____ Modified: trunk/reactos/subsys/system/cmd/ver.c --- trunk/reactos/subsys/system/cmd/ver.c 2005-07-07 19:54:25 UTC (rev 16497) +++ trunk/reactos/subsys/system/cmd/ver.c 2005-07-07 20:41:13 UTC (rev 16498) @@ -65,6 +65,8 @@ { INT i; + nErrorLevel = 0; + if (_tcsstr (param, _T("/?")) != NULL) { ConOutResPaging(TRUE,STRING_VERSION_HELP1); _____ Modified: trunk/reactos/subsys/system/cmd/verify.c --- trunk/reactos/subsys/system/cmd/verify.c 2005-07-07 19:54:25 UTC (rev 16497) +++ trunk/reactos/subsys/system/cmd/verify.c 2005-07-07 20:41:13 UTC (rev 16498) @@ -38,6 +38,8 @@ return 0; } + nErrorLevel = 0; + if (!*param) { LoadString(CMD_ModuleHandle, STRING_VERIFY_HELP2, szMsg, RC_STRING_MAX_SIZE);

1 0

[hbirr] 16497: Fixed a bug which was introduced by r16441.
by hbirr＠svn.reactos.com 07 Jul '05

07 Jul '05

Fixed a bug which was introduced by r16441. Modified: trunk/reactos/ntoskrnl/mm/i386/page.c _____ Modified: trunk/reactos/ntoskrnl/mm/i386/page.c --- trunk/reactos/ntoskrnl/mm/i386/page.c 2005-07-07 19:51:09 UTC (rev 16496) +++ trunk/reactos/ntoskrnl/mm/i386/page.c 2005-07-07 19:54:25 UTC (rev 16497) @@ -2102,14 +2102,14 @@ } else { - for (i = Page %1024; i >= 0; i--, Pte--) + for (i = Page %1024; (LONG)i >= 0; i--, Pte--) { if (0LL == ExfInterlockedCompareExchange64UL(Pte, &Entry, &ZeroEntry)) { break; } } - if (i < 0) + if ((LONG)i < 0) { Pte = PAE_ADDR_TO_PTE(HYPERSPACE) + 1023; for (i = 1023; i > Page % 1024; i--, Pte--) @@ -2159,14 +2159,14 @@ } else { - for (i = Page % 1024; i >= 0; i--, Pte--) + for (i = Page % 1024; (LONG)i >= 0; i--, Pte--) { if (0 == InterlockedCompareExchange((PLONG)Pte, (LONG)Entry, 0)) { break; } } - if (i < 0) + if ((LONG)i < 0) { Pte = ADDR_TO_PTE(HYPERSPACE) + 1023; for (i = 1023; i > Page % 1024; i--, Pte--)

1 0

[greatlrd] 16496: set right value of %ERRORLEVEL% for vol
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

set right value of %ERRORLEVEL% for vol Modified: trunk/reactos/subsys/system/cmd/vol.c _____ Modified: trunk/reactos/subsys/system/cmd/vol.c --- trunk/reactos/subsys/system/cmd/vol.c 2005-07-07 19:26:46 UTC (rev 16495) +++ trunk/reactos/subsys/system/cmd/vol.c 2005-07-07 19:51:09 UTC (rev 16496) @@ -43,7 +43,7 @@ NULL, 0)) { - ErrorMessage (GetLastError (), _T("")); + ErrorMessage (GetLastError (), _T("")); return 1; } @@ -77,6 +77,8 @@ return 0; } + nErrorLevel = 0; + if (param[0] == _T('\0')) { GetCurrentDirectory (MAX_PATH, szPath); @@ -89,20 +91,24 @@ szRootPath[0] = param[0]; else { - error_invalid_drive (); + error_invalid_drive (); + nErrorLevel = 1; return 1; } } if (!IsValidPathName (szRootPath)) { - error_invalid_drive (); + error_invalid_drive (); + nErrorLevel = 1; return 1; } /* print the header */ if (!PrintVolumeHeader (szRootPath)) + { return 1; + } return 0; }

1 0

[greatlrd] 16495: add %CMDEXTVERSION% example to use it echo %CMDEXTVERSION% the value are hardcode to 2. for it is that value ms win2k / winxp report back. thx arty to test it in win xp.
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

add %CMDEXTVERSION% example to use it echo %CMDEXTVERSION% the value are hardcode to 2. for it is that value ms win2k / winxp report back. thx arty to test it in win xp. 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 19:16:46 UTC (rev 16494) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 19:26:46 UTC (rev 16495) @@ -1037,7 +1037,15 @@ cp = _stpcpy (cp, pargv); } - + /* %CMDEXTVERSION% */ + else if (_tcsicmp(ip,_T("cmdextversion")) ==0) + { + TCHAR szVER[40]; + /* Set version number to 2 */ + _itot(2,szVER,10); + cp = _stpcpy (cp, szVER); + } + /* %ERRORLEVEL% */ else if (_tcsicmp(ip,_T("errorlevel")) ==0) {

1 0

[greatlrd] 16494: adding %cmdcmdline%, example how to use it echo %CMDCMDLINE%
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

adding %cmdcmdline%, example how to use it echo %CMDCMDLINE% 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 18:44:08 UTC (rev 16493) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 19:16:46 UTC (rev 16494) @@ -1028,6 +1028,15 @@ cp = _stpcpy (cp, szRand); } + /* %CMDCMDLINE% */ + else if (_tcsicmp(ip,_T("cmdcmdline")) ==0) + { + TCHAR *pargv; + /* Get random number */ + pargv = GetCommandLine(); + cp = _stpcpy (cp, pargv); + } + /* %ERRORLEVEL% */ else if (_tcsicmp(ip,_T("errorlevel")) ==0) @@ -1493,6 +1502,7 @@ argv = CommandLineToArgvW(GetCommandLineW(), &argc); #endif #endif + SetFileApisToOEM(); InputCodePage= 0; @@ -1512,16 +1522,18 @@ InputCodePage= GetConsoleCP(); OutputCodePage = GetConsoleOutputCP(); CMD_ModuleHandle = GetModuleHandle(NULL); - + /* check switches on command-line */ Initialize(argc, argv); /* call prompt routine */ nExitCode = ProcessInput(FALSE); + /* do the cleanup */ Cleanup(argc, argv); + return(nExitCode); }

1 0

[mf] 16493: Sync to Wine:
by mf＠svn.reactos.com 07 Jul '05

07 Jul '05

Sync to Wine: - switch to UNICODE compilaton in Wine - remove separate unixcalls.c file - don't crash in set_curdir() for NULL in the 'entry' pointer Deleted: trunk/reactos/subsys/system/winefile/unixcalls.c Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/winefile.h _____ Deleted: trunk/reactos/subsys/system/winefile/unixcalls.c --- trunk/reactos/subsys/system/winefile/unixcalls.c 2005-07-07 18:21:44 UTC (rev 16492) +++ trunk/reactos/subsys/system/winefile/unixcalls.c 2005-07-07 18:44:08 UTC (rev 16493) @@ -1,90 +0,0 @@ -/* - * Winefile - * - * Copyright 2004 Martin Fuchs - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifdef __WINE__ - -#include <unistd.h> -#include <string.h> -#include <sys/stat.h> -#include <sys/types.h> -#include <dirent.h> - - -void call_getcwd(char* buffer, size_t len) -{ - getcwd(buffer, len); -} - - -#ifndef _NO_EXTENSIONS - -/* proxy functions to call UNIX readdir() */ - -void* call_opendir(const char* path) -{ - DIR* pdir = opendir(path); - - return pdir; -} - -int call_readdir(void* pdir, char* name, unsigned* inode) -{ - struct dirent* ent = readdir((DIR*)pdir); - - if (!ent) - return 0; - - strcpy(name, ent->d_name); - *inode = ent->d_ino; - - return 1; -} - -void call_closedir(void* pdir) -{ - closedir((DIR*)pdir); -} - - -/* proxy function to call UNIX stat() */ -int call_stat( - const char* path, int* pis_dir, - unsigned long* psize_low, unsigned long* psize_high, - time_t* patime, time_t* pmtime, - unsigned long* plinks -) -{ - struct stat st; - - if (stat(path, &st)) - return 1; - - *pis_dir = S_ISDIR(st.st_mode); - *psize_low = st.st_size & 0xFFFFFFFF; - *psize_high = 0; /*st.st_size >> 32;*/ - *patime = st.st_atime; - *pmtime = st.st_mtime; - - return 0; -} - -#endif /* _NO_EXTENSIONS */ - -#endif /* __WINE__ */ _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-07-07 18:21:44 UTC (rev 16492) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-07-07 18:44:08 UTC (rev 16493) @@ -21,6 +21,11 @@ #ifdef __WINE__ #include "config.h" #include "wine/port.h" + +/* for unix filesystem function calls */ +#include <sys/stat.h> +#include <sys/types.h> +#include <dirent.h> #endif #include "winefile.h" @@ -501,8 +506,9 @@ Entry* first_entry = NULL; Entry* last = NULL; Entry* entry; - void* pdir; + DIR* pdir; + int level = dir->level + 1; #ifdef UNICODE char cpath[MAX_PATH]; @@ -511,17 +517,13 @@ const char* cpath = path; #endif - pdir = call_opendir(cpath); + pdir = opendir(cpath); - int level = dir->level + 1; - if (pdir) { - char buffer[MAX_PATH]; - time_t atime, mtime; - unsigned inode; - int is_dir; + struct stat st; + struct dirent* ent; + char buffer[MAX_PATH], *p; const char* s; - char* p; for(p=buffer,s=cpath; *s; ) *p++ = *s++; @@ -529,7 +531,7 @@ if (p==buffer || p[-1]!='/') *p++ = '/'; - while(call_readdir(pdir, p, &inode)) { + while((ent=readdir(pdir))) { entry = alloc_entry(); if (!first_entry) @@ -540,28 +542,31 @@ entry->etype = ET_UNIX; + strcpy(p, ent->d_name); #ifdef UNICODE MultiByteToWideChar(CP_UNIXCP, 0, p, -1, entry->data.cFileName, MAX_PATH); #else lstrcpy(entry->data.cFileName, p); #endif - entry->data.dwFileAttributes = p[0]=='.'? FILE_ATTRIBUTE_HIDDEN: 0; + if (!stat(buffer, &st)) { + entry->data.dwFileAttributes = p[0]=='.'? FILE_ATTRIBUTE_HIDDEN: 0; - if (!call_stat(buffer, &is_dir, - &entry->data.nFileSizeLow, &entry->data.nFileSizeHigh, - &atime, &mtime, &entry->bhfi.nNumberOfLinks)) - { - if (is_dir) + if (S_ISDIR(st.st_mode)) entry->data.dwFileAttributes |= FILE_ATTRIBUTE_DIRECTORY; + entry->data.nFileSizeLow = st.st_size & 0xFFFFFFFF; + entry->data.nFileSizeHigh = st.st_size >> 32; + memset(&entry->data.ftCreationTime, 0, sizeof(FILETIME)); - time_to_filetime(&atime, &entry->data.ftLastAccessTime); - time_to_filetime(&mtime, &entry->data.ftLastWriteTime); + time_to_filetime(&st.st_atime, &entry->data.ftLastAccessTime); + time_to_filetime(&st.st_mtime, &entry->data.ftLastWriteTime); - entry->bhfi.nFileIndexLow = inode; + entry->bhfi.nFileIndexLow = ent->d_ino; entry->bhfi.nFileIndexHigh = 0; + entry->bhfi.nNumberOfLinks = st.st_nlink; + entry->bhfi_valid = TRUE; } else { entry->data.nFileSizeLow = 0; @@ -581,7 +586,7 @@ if (last) last->next = NULL; - call_closedir(pdir); + closedir(pdir); } dir->down = first_entry; @@ -2348,10 +2353,10 @@ #ifdef UNICODE - call_getcwd(cpath, MAX_PATH); + getcwd(cpath, MAX_PATH); MultiByteToWideChar(CP_UNIXCP, 0, cpath, -1, path, MAX_PATH); #else - call_getcwd(path, MAX_PATH); + getcwd(path, MAX_PATH); #endif child = alloc_child_window(path, NULL, hwnd); @@ -2717,7 +2722,7 @@ return TRUE; } -static BOOL pattern_match_ncase(LPCTSTR str, LPCTSTR pattern) +static BOOL pattern_imatch(LPCTSTR str, LPCTSTR pattern) { TCHAR b1[BUFFER_LEN], b2[BUFFER_LEN]; @@ -2773,7 +2778,7 @@ /* filter using the file name pattern */ if (pattern) - if (!pattern_match_ncase(entry->data.cFileName, pattern)) + if (!pattern_imatch(entry->data.cFileName, pattern)) continue; /* filter system and hidden files */ @@ -3691,6 +3696,9 @@ { TCHAR path[MAX_PATH]; + if (!entry) + return; + path[0] = '\0'; child->left.cur = entry; _____ Modified: trunk/reactos/subsys/system/winefile/winefile.h --- trunk/reactos/subsys/system/winefile/winefile.h 2005-07-07 18:21:44 UTC (rev 16492) +++ trunk/reactos/subsys/system/winefile/winefile.h 2005-07-07 18:44:08 UTC (rev 16493) @@ -163,21 +163,6 @@ #define _stprintf sprintf #endif - -/* functions in unixcalls.c */ - -extern void call_getcwd(char* buffer, size_t len); -extern void* call_opendir(const char* path); -extern int call_readdir(void* pdir, char* name, unsigned* pinode); -extern void call_closedir(void* pdir); - -extern int call_stat( - const char* path, int* pis_dir, - unsigned long* psize_low, unsigned long* psize_high, - time_t* patime, time_t* pmtime, - unsigned long* plinks -); - #else #include <tchar.h> /* for _tsplitpath() */

1 0

[greatlrd] 16492: Did forget instate in for loop the patternX, the right way. thx GvG to spot it and tell me how to fix.
by greatlrd＠svn.reactos.com 07 Jul '05

07 Jul '05

Did forget instate in for loop the patternX, the right way. thx GvG to spot it and tell me how to fix. Modified: trunk/reactos/tools/gendib/gendib.c _____ Modified: trunk/reactos/tools/gendib/gendib.c --- trunk/reactos/tools/gendib/gendib.c 2005-07-07 18:07:40 UTC (rev 16491) +++ trunk/reactos/tools/gendib/gendib.c 2005-07-07 18:21:44 UTC (rev 16492) @@ -483,7 +483,7 @@ } if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) { - Output(Out, "PatternX = (BltInfo->DestRect.left + BltInfo->BrushOrigin.x) %%\n"); + Output(Out, "BasePatternX = (BltInfo->DestRect.left + BltInfo->BrushOrigin.x) %%\n"); Output(Out, " BltInfo->PatternSurface->sizlBitmap.cx;\n"); } @@ -503,6 +503,11 @@ } Output(Out, "DestPtr = (PULONG) DestBase;\n"); } + + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + Output(Out, "PatternX = BasePatternX;\n"); + } if (ROPCODE_SRCCOPY == RopInfo->RopCode && 0 != (Flags & FLAG_TRIVIALXLATE) && Bpp == SourceBpp) @@ -744,7 +749,7 @@ #endif if (RopInfo->UsesPattern) { - Output(Out, "ULONG PatternX, PatternY = 0;\n"); + Output(Out, "ULONG PatternX =0, PatternY = 0, BasePatternX = 0;\n"); } First = 1; if (RopInfo->UsesSource)

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005