Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[peterw] 29800: - Make some error messages a bit more consistent.
by peterw＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: peterw Date: Tue Oct 23 01:41:23 2007 New Revision: 29800 URL: http://svn.reactos.org/svn/reactos?rev=29800&view=rev Log: - Make some error messages a bit more consistent. Modified: trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/Config.cmd Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Tue Oct 23 01:41:23 2007 @@ -66,9 +66,11 @@ if not exist "%_ROSBE_LOGDIR%\." ( mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL if errorlevel 1 ( - echo *** Error - Writing logs requested, but log directory doesn't *** - echo *** exist and can't be created. Logs will be created in the *** - echo *** current directory as a fallback. *** + echo. + echo *** Writing logs requested, but log directory doesn't *** + echo *** exist and can't be created. Logs will be created *** + echo *** in the current directory as a fallback. *** + echo. set _ROSBE_LOGDIR=%CD% ) ) Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Tue Oct 23 01:41:23 2007 @@ -63,13 +63,14 @@ ) :: -:: N00b Blocker :-P -:: -echo WARNING: -echo Non-Default-Configurations are not useable for pasteing Bugs to -echo Bugzilla or asking quesions about in Forum/Chat! -echo. -echo DID YOU UNDERSTAND? +:: Help prevent non-useful bug reports/questions. +:: +echo. +echo *** Configurations other than release/debug are not useful for *** +echo *** posting bug reports, and generally not very useful for *** +echo *** IRC/Forum discussion. Please refrain from doing so unless *** +echo *** you are sure about what you are doing. *** +echo. set /p XY="(yes), (no)"

1 0

[dreimer] 29799: Translate xcopy into German and fix the SUBLANGs of the rest. Update German Shell32 Translation
by dreimer＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: dreimer Date: Tue Oct 23 01:24:42 2007 New Revision: 29799 URL: http://svn.reactos.org/svn/reactos?rev=29799&view=rev Log: Translate xcopy into German and fix the SUBLANGs of the rest. Update German Shell32 Translation Added: trunk/reactos/base/applications/cmdutils/xcopy/De.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/xcopy/En.rc trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc Added: trunk/reactos/base/applications/cmdutils/xcopy/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/De.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/De.rc Tue Oct 23 01:24:42 2007 @@ -1,0 +1,79 @@ +/* + * XCOPY - Wine-compatible xcopy program + * German language support + * + * Copyright (C) 2007 Daniel Reimer + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_INVPARMS, "Ungültige Anzahl an Parametern - Nutze xcopy /? für Hilfe\n" + STRING_INVPARM, "Ungültiger Parameter '%s' - Nutze xcopy /? für Hilfe\n" + STRING_PAUSE, "Drücke <Enter> um den Kopiervorgang zu starten\n" + STRING_SIMCOPY, "%d Datei(en) würden kopiert werden\n" + STRING_COPY, "%d Datei(en) kopiert\n" + STRING_QISDIR, "Ist '%s' eine Datei oder ein Ordner\n" \ + "im Zielordner?\n" \ + "(D - Datei, O - Ordner)\n" + STRING_SRCPROMPT,"%s? (Ja|Nein)\n" + STRING_OVERWRITE,"Überschreibe %s? (Ja|Nein|Alle)\n" + STRING_COPYFAIL, "Kopieren von '%s' nach '%s' fehlgeschlagen mit r/c %d\n" + STRING_OPENFAIL, "Öffnen von '%s' fehlgeschlagen\n" + STRING_READFAIL, "Lesen von '%s' fehlgeschlagen\n" + STRING_YES_CHAR, "J" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"D" + STRING_DIR_CHAR, "O" + + STRING_HELP, +"XCOPY - Kopiert Quelldaten oder Verzeichnisbäume and einen Ort\n\ +\n\ +Syntax:\n\ +XCOPY Quelle [Ziel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Wo:\n\ +\n\ +[/I] Falls Ziel nicht vorhanden ist und mehrere Dateien kopiert \n\ +\twerden, nimmt XCOPY an, dass das Ziel ein Verzeichnis ist\n\ +[/S] Kopiert Verzeichnisse und Unterverzeichnisse, die nicht leer sind\n\ +[/E] Kopiert alle Unterverzeichnisse, eingeschlossen leere\n\ +[/Q] Zeigt beim Kopieren keine Dateinamen an\n\ +[/F] Zeigt die Namen der Quell- und Zieldateien beim Kopieren an\n\ +[/L] Listet lediglich die Dateien auf, die kopiert werden würden\n\ +[/W] Fordert vor dem Beginn des Kopiervorgangs eine Bestätigung\n\ +[/T] Erstellt die Verzeichnisstruktur, kopiert aber keine Dateien\n\ +[/Y] Unterdrücke eine Bestätigung vor dem überschreiben einer Datei\n\ +[/-Y] Fordert vor dem überschreiben einer Datei eine Bestätigung\n\ +[/P] Fordert vor jedem Kopiervorgang eine Bestätigung\n\ +[/N] Kurznamen beim kopieren verwenden\n\ +[/U] Kopiert nur Dateien, die im Zielverzeichnis vorhanden sind\n\ +[/R] Schreibgeschützte Dateien überschreiben\n\ +[/H] Verstecke und Systemdateien in den Kopiervorgang miteinbeziehen\n\ +[/C] Kopiervorgang selbst nach Fehlern fortsetzen\n\ +[/A] Nur Dateien mit gestztem Archiv Attribut kopieren\n\ +[/M] Nur Dateien mit gestztem Archiv Attribut kopieren und \n\ +\tdieses entfernen\n\ +[/D | /D:m-d-y] Kopiert nur die an oder nach dem Datum geänderten Dateien.\n\ +\t\tIst kein Datum angegeben, werden nur Dateien kopiert,\n\ +\t\tdie neuer als die bestehenden Zieldateien sind.\n\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/De.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/xcopy/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/En.rc (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/En.rc Tue Oct 23 01:24:42 2007 @@ -20,7 +20,7 @@ */ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE { Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc Tue Oct 23 01:24:42 2007 @@ -22,6 +22,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#include "De.rc" #include "En.rc" #include "Ko.rc" #include "Pl.rc" Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Tue Oct 23 01:24:42 2007 @@ -317,16 +317,16 @@ BITBUCKET_PROPERTIES_DLG DIALOGEX 0, 0, 240, 190 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Recycle Bin Properties" +CAPTION "Papierkorb Einstellungen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 - GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70 - RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10 - EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP | ES_NUMBER - LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10 - RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP + GROUPBOX "Einstellungen für gewählten Ort", -1, 10, 80, 220, 70 + RADIOBUTTON "&Benutzerdefinierte Größe:", 14001, 20, 90, 100, 10 + EDITTEXT 14002, 120, 90, 50, 10, WS_TABSTOP | ES_NUMBER + LTEXT "M&aximale Größe (MB):", -1, 32, 100, 70, 10 + RADIOBUTTON "Dateien nicht in den Papie&rkorb verschieben, sondern sofort löschen.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP + RADIOBUTTON "Bestätigungs&dialog nach erfolgreichem Löschvorgang anzeigen", 14004, 10, 155, 220, 10, WS_TABSTOP END STRINGTABLE DISCARDABLE

1 0

[greatlrd] 29798: actvate more code and slash away more notes to the trachcan, and smaller cleanup
by greatlrd＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: greatlrd Date: Tue Oct 23 01:15:10 2007 New Revision: 29798 URL: http://svn.reactos.org/svn/reactos?rev=29798&view=rev Log: actvate more code and slash away more notes to the trachcan, and smaller cleanup Modified: branches/reactx/reactos/drivers/directx/directory.rbuild branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild branches/reactx/reactos/drivers/directx/dxg/main.c Modified: branches/reactx/reactos/drivers/directx/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/directory.rbuild (original) +++ branches/reactx/reactos/drivers/directx/directory.rbuild Tue Oct 23 01:15:10 2007 @@ -4,4 +4,7 @@ <directory name="dxg"> <xi:include href="dxg/dxg.rbuild" /> </directory> +<directory name="dxgthk"> + <xi:include href="dxgthk/dxgthk.rbuild" /> +</directory> </group> Modified: branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild Tue Oct 23 01:15:10 2007 @@ -5,6 +5,7 @@ <importlibrary definition="dxg.def" /> <include base="dxg">.</include> <define name="__USE_W32API" /> + <library>dxgthk</library> <file>main.c</file> <file>dxg.rc</file> </module> Modified: branches/reactx/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/main.c (original) +++ branches/reactx/reactos/drivers/directx/dxg/main.c Tue Oct 23 01:15:10 2007 @@ -12,14 +12,18 @@ #include <dxg_int.h> -ULONG gcDxgFuncs = 0x5C; + ULONG gcMaxDdHmgr = 0; ULONG gcSizeDdHmgr = 0; -gcDummyPageRefCnt = 0; +LONG gcDummyPageRefCnt = 0; +HSEMAPHORE ghsemHmgr = NULL; +HSEMAPHORE ghsemDummyPage = NULL; +VOID *gpDummyPage = NULL; +PEPROCESS gpepSession = NULL; -HSEMAPHORE *ghsemHmgr = NULL; -VOID * gpDummyPage; +PDRVFN gpEngFuncs; +const ULONG gcDxgFuncs = DXG_INDEX_DxDdIoctl + 1; DRVFN gaDxgFuncs [] = { {0, (PFN) NULL} @@ -46,6 +50,7 @@ { PDRVFN drv_func; + INT i; /* Test see if the data is vaild we got from win32k.sys */ if ((SizeEngDrv != sizeof(DRVENABLEDATA)) || @@ -55,9 +60,9 @@ } /* rest static value */ - gpDummyPage = 0; + gpDummyPage = NULL; gcDummyPageRefCnt = 0; - ghsemDummyPage = 0; + ghsemDummyPage = NULL; /* * Setup internal driver functions list we got from dxg driver functions list @@ -71,7 +76,7 @@ { return STATUS_INTERNAL_ERROR; } -#if 0 + /* * Check if all drv functions are sorted right * and if it really are exported @@ -79,7 +84,7 @@ for (i=1 ; i < DXENG_INDEX_DxEngLoadImage + 1; i++) { - drv_func = &EngDrv->pdrvfn[i]; + drv_func = &pDxEngDrv->pdrvfn[i]; if ((drv_func->iFunc != i) || (drv_func->pfn == 0)) @@ -93,6 +98,7 @@ /* Note 12/1-2004 : Why is this set to 0x618 */ *DirectDrawContext = 0x618; +#if 0 if (DdHmgCreate()) { ghsemDummyPage = EngCreateSemaphore(); @@ -103,6 +109,7 @@ return STATUS_SUCCESS; } } +#endif DdHmgDestroy(); @@ -111,37 +118,39 @@ EngDeleteSemaphore(ghsemDummyPage); ghsemDummyPage = 0; } -#endif + return STATUS_NO_MEMORY; } NTSTATUS DxDdCleanupDxGraphics() { -#if 0 + DdHmgDestroy(); if (!ghsemDummyPage) { if (!gpDummyPage) { +#if 0 ExFreePoolWithTag(gpDummyPage,0); - gpDummyPage = 0; +#endif + gpDummyPage = NULL; gcDummyPageRefCnt = 0; } - EngDeleteSemaphore(ghsemDummyPage) + EngDeleteSemaphore(ghsemDummyPage); } -#endif + return 0; } BOOL DdHmgDestroy() { + gcMaxDdHmgr = 0; + gcSizeDdHmgr = 0; #if 0 ghFreeDdHmgr = 0; - gcMaxDdHmgr = 0; - gcSizeDdHmgr = 0; gpentDdHmgrLast = 0; if (gpentDdHmgr) @@ -149,12 +158,13 @@ EngFreeMem(gpentDdHmgr); gpentDdHmgr = 0; } - +#endif if (ghsemHmgr) { EngDeleteSemaphore(ghsemHmgr); + ghsemHmgr = NULL; } -#endif + return TRUE; }

1 0

[greatlrd] 29797: dxgthk 100% finish, it should work now in windows, complete replacement for ms dxgthk.sys now. not tested yet in windows.
by greatlrd＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: greatlrd Date: Tue Oct 23 00:55:18 2007 New Revision: 29797 URL: http://svn.reactos.org/svn/reactos?rev=29797&view=rev Log: dxgthk 100% finish, it should work now in windows, complete replacement for ms dxgthk.sys now. not tested yet in windows. Modified: branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.def branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rbuild branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rc branches/reactx/reactos/drivers/directx/dxgthk/main.c Modified: branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.def (original) +++ branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.def Tue Oct 23 00:55:18 2007 @@ -4,4 +4,23 @@ ; EXPORTS DriverEntry@8 +EngAcquireSemaphore@4=win32k.EngAcquireSemaphore@4 +EngAllocMem@12=win32k.EngAllocMem@12 +EngAllocUserMem@8=win32k.EngAllocUserMem@8 +EngCopyBits@24=win32k.EngCopyBits@24 +EngCreateBitmap@24=win32k.EngCreateBitmap@24 +EngCreatePalette@24=win32k.EngCreatePalette@24 +EngCreateSemaphore@0=win32k.EngCreateSemaphore@0 +EngDeletePalette@4=win32k.EngDeletePalette@4 +EngDeleteSemaphore@4=win32k.EngDeleteSemaphore@4 +EngDeleteSurface@4=win32k.EngDeleteSurface@4 +EngFindImageProcAddress@8=win32k.EngFindImageProcAddress@8 +EngFreeMem@4=win32k.EngFreeMem@4 +EngFreeUserMem@4=win32k.EngFreeUserMem@4 +EngLoadImage@4=win32k.EngLoadImage@4 +EngLockSurface@4=win32k.EngLockSurface@4 +EngReleaseSemaphore@4=win32k.EngReleaseSemaphore@4 +EngSetLastError@4=win32k.EngSetLastError@4 +EngUnloadImage@4=win32k.EngUnloadImage@4 +EngUnlockSurface@4=win32k.EngUnlockSurface@4 Modified: branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rbuild (original) +++ branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rbuild Tue Oct 23 00:55:18 2007 @@ -5,6 +5,7 @@ <importlibrary definition="dxgthk.def" /> <include base="dxgthk">.</include> <define name="__USE_W32API" /> + <library>win32k</library> <file>main.c</file> <file>dxgthk.rc</file> </module> Modified: branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rc (original) +++ branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rc Tue Oct 23 00:55:18 2007 @@ -1,7 +1,7 @@ /* $Id: vbemp.rc 21844 2006-05-07 19:34:23Z ion $ */ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "DXG DirectX trunk Driver\0" +#define REACTOS_STR_FILE_DESCRIPTION "DirectX Graphics Driver Thunk\0" #define REACTOS_STR_INTERNAL_NAME "dxgthk\0" #define REACTOS_STR_ORIGINAL_FILENAME "dxgthk\0" #include <reactos/version.rc> Modified: branches/reactx/reactos/drivers/directx/dxgthk/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxgthk/main.c (original) +++ branches/reactx/reactos/drivers/directx/dxgthk/main.c Tue Oct 23 00:55:18 2007 @@ -9,10 +9,17 @@ * 15/10-2007 Magnus Olsen */ +/* DDK/NDK/SDK Headers */ +#include <ddk/ntddk.h> + NTSTATUS DriverEntry(IN PVOID Context1, IN PVOID Context2) { + /* + * NOTE this driver will never be load, it only contain export list + * to win32k eng functions + */ return 0; }

1 0

[greatlrd] 29796: rename dxg.def to dxgthk.def
by greatlrd＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: greatlrd Date: Tue Oct 23 00:16:48 2007 New Revision: 29796 URL: http://svn.reactos.org/svn/reactos?rev=29796&view=rev Log: rename dxg.def to dxgthk.def Added: branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.def - copied unchanged from r29795, branches/reactx/reactos/drivers/directx/dxgthk/dxg.def Removed: branches/reactx/reactos/drivers/directx/dxgthk/dxg.def Removed: branches/reactx/reactos/drivers/directx/dxgthk/dxg.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxgthk/dxg.def (original) +++ branches/reactx/reactos/drivers/directx/dxgthk/dxg.def (removed) @@ -1,7 +1,0 @@ -; $Id: videoprt.def 27062 2007-06-07 21:13:06Z greatlrd $ -; -; dxg.def - export definition file for ReactOS -; -EXPORTS -DriverEntry@8 -

1 0

[greatlrd] 29795: adding dxgthk.sys stub we need it for dxg.sys
by greatlrd＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: greatlrd Date: Tue Oct 23 00:15:49 2007 New Revision: 29795 URL: http://svn.reactos.org/svn/reactos?rev=29795&view=rev Log: adding dxgthk.sys stub we need it for dxg.sys Added: branches/reactx/reactos/drivers/directx/dxgthk/ branches/reactx/reactos/drivers/directx/dxgthk/dxg.def (with props) branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rbuild (with props) branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rc (with props) branches/reactx/reactos/drivers/directx/dxgthk/main.c (with props) Added: branches/reactx/reactos/drivers/directx/dxgthk/dxg.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxgthk/dxg.def (added) +++ branches/reactx/reactos/drivers/directx/dxgthk/dxg.def Tue Oct 23 00:15:49 2007 @@ -1,0 +1,7 @@ +; $Id: videoprt.def 27062 2007-06-07 21:13:06Z greatlrd $ +; +; dxg.def - export definition file for ReactOS +; +EXPORTS +DriverEntry@8 + Propchange: branches/reactx/reactos/drivers/directx/dxgthk/dxg.def ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rbuild (added) +++ branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rbuild Tue Oct 23 00:15:49 2007 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="dxgthk" type="kernelmodedriver" +installbase="system32/drivers" installname="dxgthk.sys"> + <importlibrary definition="dxgthk.def" /> + <include base="dxgthk">.</include> + <define name="__USE_W32API" /> + <file>main.c</file> + <file>dxgthk.rc</file> +</module> Propchange: branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rc (added) +++ branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rc Tue Oct 23 00:15:49 2007 @@ -1,0 +1,7 @@ +/* $Id: vbemp.rc 21844 2006-05-07 19:34:23Z ion $ */ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "DXG DirectX trunk Driver\0" +#define REACTOS_STR_INTERNAL_NAME "dxgthk\0" +#define REACTOS_STR_ORIGINAL_FILENAME "dxgthk\0" +#include <reactos/version.rc> Propchange: branches/reactx/reactos/drivers/directx/dxgthk/dxgthk.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/drivers/directx/dxgthk/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxgthk/main.c (added) +++ branches/reactx/reactos/drivers/directx/dxgthk/main.c Tue Oct 23 00:15:49 2007 @@ -1,0 +1,19 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Native driver for dxg implementation + * FILE: drivers/directx/dxg/main.c + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) + * REVISION HISTORY: + * 15/10-2007 Magnus Olsen + */ + +NTSTATUS +DriverEntry(IN PVOID Context1, + IN PVOID Context2) +{ + return 0; +} + + Propchange: branches/reactx/reactos/drivers/directx/dxgthk/main.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mpiulachs] 29794: Wine imported xcopy command line tool
by mpiulachs＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: mpiulachs Date: Mon Oct 22 23:55:26 2007 New Revision: 29794 URL: http://svn.reactos.org/svn/reactos?rev=29794&view=rev Log: Wine imported xcopy command line tool Added: trunk/reactos/base/applications/cmdutils/xcopy/ trunk/reactos/base/applications/cmdutils/xcopy/En.rc (with props) trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc (with props) trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc (with props) trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc (with props) trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc (with props) trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c (with props) trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h (with props) trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild (with props) trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/cmdutils.rbuild (original) +++ trunk/reactos/base/applications/cmdutils/cmdutils.rbuild Mon Oct 22 23:55:26 2007 @@ -10,4 +10,7 @@ <directory name="more"> <xi:include href="more/more.rbuild" /> </directory> + <directory name="xcopy"> + <xi:include href="xcopy/xcopy.rbuild" /> + </directory> </group> Added: trunk/reactos/base/applications/cmdutils/xcopy/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/En.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/En.rc Mon Oct 22 23:55:26 2007 @@ -1,0 +1,79 @@ +/* + * XCOPY - Wine-compatible xcopy program + * English language support + * + * Copyright (C) 2007 J. Edmeades + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "Invalid number of parameters - Use xcopy /? for help\n" + STRING_INVPARM, "Invalid parameter '%s' - Use xcopy /? for help\n" + STRING_PAUSE, "Press <enter> to begin copying\n" + STRING_SIMCOPY, "%d file(s) would be copied\n" + STRING_COPY, "%d file(s) copied\n" + STRING_QISDIR, "Is '%s' a filename or directory\n" \ + "on the target?\n" \ + "(F - File, D - Directory)\n" + STRING_SRCPROMPT,"%s? (Yes|No)\n" + STRING_OVERWRITE,"Overwrite %s? (Yes|No|All)\n" + STRING_COPYFAIL, "Copying of '%s' to '%s' failed with r/c %d\n" + STRING_OPENFAIL, "Failed to open '%s'\n" + STRING_READFAIL, "Failed during reading of '%s'\n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - Copies source files or directory trees to a destination\n\ +\n\ +Syntax:\n\ +XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Where:\n\ +\n\ +[/I] Assume directory if destination does not exist and copying 2 or \n\ +\tmore files\n\ +[/S] Copy directories and subdirectories\n\ +[/E] Copy directories and subdirectories, including any empty ones\n\ +[/Q] Do not list names during copy, ie quiet.\n\ +[/F] Show full source and destination names during copy\n\ +[/L] Simulate operation, showing names which would be copied\n\ +[/W] Prompts before beginning the copy operation\n\ +[/T] Creates empty directory structure but does not copy files\n\ +[/Y] Suppress prompting when overwriting files\n\ +[/-Y] Enable prompting when overwriting files\n\ +[/P] Prompts on each source file before copying\n\ +[/N] Copy using short names\n\ +[/U] Copy only files which already exist in destination\n\ +[/R] Overwrite any read only files\n\ +[/H] Include hidden and system files in the copy\n\ +[/C] Continue even if an error occurs during the copy\n\ +[/A] Only copy files with archive attribute set\n\ +[/M] Only copy files with archive attribute set, removes \n\ +\tarchive attribute\n\ +[/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\ +\t\tIf no date is supplied, only copy if destination is older\n\ +\t\tthan source\n\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/En.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc Mon Oct 22 23:55:26 2007 @@ -1,0 +1,80 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Korean language support + * + * Copyright (C) 2007 J. Edmeades + * Copyright (C) 2007 YunSong Hwang(hys545(a)dreamwiz.com) + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "¿Ã¹Ù¸£Áö ¾ÊÀº ¸Å°³º¯¼öÀÇ °¹¼ö - xcopy /?·Î µµ¿ò¸»À» º¸½Ã¿À\n" + STRING_INVPARM, "¿Ã¹Ù¸£Áö ¾ÊÀº ¸Å°³º¯¼ö '%s' - xcopy /?·Î µµ¿ò¸»À» º¸½Ã¿À\n" + STRING_PAUSE, "<enter> ¸¦ ´©¸£¸é º¹»ç°¡ ½ÃÀÛµÉ °ÍÀÔ´Ï´Ù\n" + STRING_SIMCOPY, "%d ÆÄÀÏÀÌ º¹»çµÉ °ÍÀÔ´Ï´Ù\n" + STRING_COPY, "%d ÆÄÀÏÀÌ º¹»çµÇ¾ú½À´Ï´Ù\n" + STRING_QISDIR, "'%s'ÀÌ º¹»çÇÒ ÆÄÀÏÀÌ³ª µð·ºÅä¸®?\n" \ + "ÀÔ´Ï±î?\n" \ + "(F - ÆÄÀÏ, D - µð·ºÅä¸®)\n" + STRING_SRCPROMPT,"%s? (¿¹|¾Æ´Ï¿À)\n" + STRING_OVERWRITE,"%s¸¦ µ¤¾î¾²°Ú½À´Ï±î? (¿¹|¾Æ´Ï¿À|¸ðµÎ)\n" + STRING_COPYFAIL, "Copying of '%s' to '%s' failed with r/c %d\n" + STRING_OPENFAIL, "'%s' ¿±â ½ÇÆÐ\n" + STRING_READFAIL, "'%s¸¦ ÀÐÁö ¸øÇß½À´Ï´Ù'\n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - ¿øº» ÆÄÀÏÀÌ³ª µð·ºÅä¸® ±¸Á¶¸¦ ¸ñÀûÁö·Î º¹»ç\n\ +\n\ +¹®¹ý:\n\ +XCOPY ¿øº» [´ë»ó] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Where:\n\ +\n\ +[/I] Assume directory if destination does not exist and copying 2 or \n\ +\tmore files\n\ +[/S] µð·ºÅä¸®ÇÏ°í ÇÏÀ§ µð·ºÅä¸® º¹»ç\n\ +[/E] ºó µð·ºÅä¸®¸¦ Æ÷ÇÔÇØ¼ µð·ºÅä¸®¿Í ÇÏÀ§ µð·ºÅä¸® º¹»ç\n\ +[/Q] Á¶¿ëÇÏ°Ô º¹»çµÇ´Â ÆÄÀÏÀÌ³ª µð·ºÅä¸®¸¦ Ç¥½ÃÇÏÁö ¾Ê°í º¹»ç.\n\ +[/F] º¹»çÇÏ´Â µ¿¾È ¿ÏÀüÇÑ ¿øº»°ú ´ë»ó º¸¿©ÁÖ±â\n\ +[/L] º¹»çµÉ °ÍÀ» º¸¿©ÁÖ¸é¼ °¡»óÀ¸·Î ÀÛ¾÷\n\ +[/W] º¹»ç½ÃÀÛ ÇÏ±â Àü¿¡ È®ÀÎÇÏ±â\n\ +[/T] ÆÄÀÏÀº º¹»çÇÏÁö ¾Ê°í ºó µð·ºÅä¸® ±¸Á¶¸¸ º¹»ç\n\ +[/Y] ÆÄÀÏ µ¤¾î ¾µ ¶§ È®ÀÎÇÏÁö ¾Ê±â\n\ +[/-Y] ÆÄÀÏÀ» µ¤¾î ¾µ ¶§ È®ÀÎÇÏ±â\n\ +[/P] º¹»çÇÏ´Â µ¿¾È¿¡ °¢°¡ÀÇ ¿øº» ÆÄÀÏ¸¶´Ù È®ÀÎ\n\ +[/N] ÂªÀº ÀÌ¸§À» »ç¿ëÇØ¼ º¹»ç\n\ +[/U] ÀÌ¹Ì ´ë»ó µð·ºÅä¸®¿¡ Á¸ÀçÇÏ´Â ÆÄÀÏ¸¸ º¹»ç\n\ +[/R] ÀÐ±â Àü¿ë ÆÄÀÏµµ µ¤¾î ¾²±â\n\ +[/H] ¼ûÀº ÆÄÀÏÀÌ³ª ½Ã½ºÅÛ ÆÄÀÏµµ Æ÷ÇÔÇØ¼ º¹»ç\n\ +[/C] º¹»çÇÏ´Â µ¿¾È¿¡ ¿¡·¯°¡ ¹ß»ýÇØµµ °è¼Ó ÁøÇà\n\ +[/A] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â ÆÄÀÏ¸¸ º¹»ç\n\ +[/M] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀ» Á¦°ÅÇÏ¸é¼ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â \n\ +\ÆÄÀÏ¸¸ º¹»ç \n\ +[/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\ +\t\tIf no date is supplied, only copy if destination is older\n\ +\t\tthan source\n\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc Mon Oct 22 23:55:26 2007 @@ -1,0 +1,79 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Polish language support + * + * Copyright (C) 2007 J. Edmeades + * Copyright (C) 2007 Mikolaj Zalewski + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "Niew³aciwa liczba parametrów - uruchom xcopy /? aby wywietliæ pomoc\n" + STRING_INVPARM, "Nieznany parameter '%s' - uruchom xcopy /? aby wywietliæ pomoc\n" + STRING_PAUSE, "Nacinij <enter> aby rozpocz¹æ kopiowanie\n" + STRING_SIMCOPY, "%d plik(ów) zosta³oby skopiowanych\n" + STRING_COPY, "%d plik(ów) skopiowanych\n" + STRING_QISDIR, "Czy '%s' jest nazw¹ pliku czy katalogu\n" \ + "docelowego?\n" \ + "(P - plik, K - katalog)\n" + STRING_SRCPROMPT,"%s? (Tak|Nie)\n" + STRING_OVERWRITE,"Zast¹piæ %s? (Tak|Nie|Wszystkie)\n" + STRING_COPYFAIL, "Kopiowanie '%s' do '%s' nie powiod³o siê - kod b³êdu %d\n" + STRING_OPENFAIL, "Nie uda³o siê otworzyæ '%s'\n" + STRING_READFAIL, "B³¹d podczas czytania '%s'\n" + STRING_YES_CHAR, "T" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "W" + STRING_FILE_CHAR,"P" + STRING_DIR_CHAR, "K" + + STRING_HELP, +"XCOPY - kopiuje pliki lub drzewa katalogów\n\ +\n\ +Sk³adnia:\n\ +XCOPY ród³o [cel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Gdzie:\n\ +\n\ +[/I] Je¿eli \"cel\" nie istnieje i kopiowane s¹ co najmniej dwa pliki,\n\ +\tzak³ada, ¿e \"cel\" powien byæ katalogiem\n\ +[/S] Kopiuje katalogi i podkatalogi\n\ +[/E] Kopiuje katalogi i podkatalogi, ³¹cznie z pustymi\n\ +[/Q] Nie wypisuje nazw plików podczas kopiowania (tryb cichy)\n\ +[/F] Wypisuje pe³ne cie¿ki ród³owe i docelowe podczas kopiowania\n\ +[/L] Jedynie symuluje operacjê, pokazuj¹c pliki, które by³yby kopiowane\n\ +[/W] Prosi o potwierdzenie przed rozpoczêciem kopiowania\n\ +[/T] Tworzy puste katalogi, ale nie kopiuje plików\n\ +[/Y] Zastêpuje pliki bez proby o potwierdzenie\n\ +[/-Y] Zawsze prosi o potwierdzenie przed zast¹pieniem pliku\n\ +[/P] Prosi o potwierdzenie przed skopiowaniem ka¿dego pliku\n\ +[/N] Kopiuje u¿ywaj¹c krótkich nazw plików\n\ +[/U] Kopiuje tylko pliki, które ju¿ istniej¹ w miejscu docelowym\n\ +[/R] Zastêpuje pliki tylko do odczytu\n\ +[/H] Kopiuje równie¿ pliki ukryte i systemowe\n\ +[/C] Kontynuuje nawet je¿eli podczas kopiowania wystêpi³y b³êdy\n\ +[/A] Kopiuje tylko pliki z atrybutem archiwalny\n\ +[/M] Kopiuje tylko pliki z atrybutem archiwalny i usuwa ten atrybut\n\ +[/D | /D:m-d-y] Kopiuje tylko nowe pliki lub te zmodifikowane po podanej dacie.\n\ +\t\tJe¿eli nie podano ¿adnej daty, to kopiowane s¹ pliki, które s¹\n\ +\t\tnowsze ni¿ w katalogu docelowym\n\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc Mon Oct 22 23:55:26 2007 @@ -1,0 +1,82 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Russian language support + * + * Copyright (C) 2007 J. Edmeades + * Copyright (C) 2007 Kirill K. Smirnov + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, +"Íåäîïóñòèìîå ÷èñëî ïàðàìåòðîâ - ïîïðîáóéòå 'xcopy /?' äëÿ ïîëó÷åíèÿ\n\ +ïîäðîáíîãî îïèñàíèÿ.\n" + STRING_INVPARM, +"Íåäîïóñòèìûé ïàðàìåòð '%s' - ïîïðîáóéòå 'xcopy /?' äëÿ ïîëó÷åíèÿ ïîäðîáíîãî\n\ +îïèñàíèÿ.\n" + STRING_PAUSE, "Íàæìèòå êëàâèøó <enter>, ÷òîáû íà÷àòü êîïèðîâàíèå.\n" + STRING_SIMCOPY, "%d ôàéë(îâ) áûëî áû ñêîïèðîâàíî.\n" + STRING_COPY, "%d ôàéë(îâ) ñêîïèðîâàíî.\n" + STRING_QISDIR, "'%s' ÿâëÿåòñÿ ôàéëîì èëè ïàïêîé?\n" \ + "(F - Ôàéë, D - Ïàïêà)\n" + STRING_SRCPROMPT,"%s? (Yes|No)\n" + STRING_OVERWRITE,"Ïåðåïèñàòü %s? (Yes|No|All)\n" + STRING_COPYFAIL, "Ïðè êîïèðîâàíèè '%s' â '%s' ïðîèçîøëà îøèáêà: %d\n" + STRING_OPENFAIL, "Íåâîçìîæíî îòêðûòü '%s'\n" + STRING_READFAIL, "Ïðè ÷òåíèè '%s' ïðîèçîøëà îøèáêà\n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - Êîïèðóåò ôàéëû è äåðåâüÿ ïàïîê\n\ +\n\ +Ñèíòàêñèñ:\n\ +XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Ãäå:\n\ +\n\ +[/I] Åñëè êîíå÷íàÿ ïàïêà îòñóòñòâóåò è êîïèðóåòñÿ áîëåå îäíîãî ôàéëà, \n\ + òî ïðåäïîëàãàåòñÿ ïàïêà â êà÷åñòâå ìåñòà íàçíà÷åíèÿ.\n\ +[/S] Êîïèðóåò ïàïêè è ïîäïàïêè.\n\ +[/E] Êîïèðóåò ïàïêè è ïîäïàïêè, âêëþ÷àÿ ïóñòûå.\n\ +[/Q] Íå îòîáðàæàåò èìåíà êîïèðóåìûõ ôàéëîâ.\n\ +[/F] Îòîáðàæàåò ïîëíûå èìåíà èñõîäíûõ è êîíå÷íûõ ôàéëîâ.\n\ +[/L] Âûâîäèò ñïèñîê ôàéëîâ, êîòîðûå áóäóò ñêîïèðîâàíû.\n\ +[/W] Çàïðàøèâàåò ïîäòâåðæäåíèå ïåðåä íà÷àëîì êîïèðîâàíèÿ.\n\ +[/T] Ñîçäàåò ñòðóêòóðó ïàïîê, íî íå êîïèðóåò ôàéëû.\n\ +[/Y] Ïîäàâëÿåò çàïðîñ íà ïîäòâåðæäåíèå ïåðåçàïèñè ôàéëîâ.\n\ +[/-Y] Çàïðàøèâàåò ïîäòâåðæäåíèå íà ïåðåçàïèñü ôàéëîâ.\n\ +[/P] Çàïðàøèâàåò ïîäòâåðæäåíèå äëÿ êàæäîãî êîïèðóåìîãî ôàéëà.\n\ +[/N] Èñïîëüçóåò êîðîòêèå èìåíà ôàéëîâ ïðè êîïèðîâàíèè.\n\ +[/U] Êîïèðóåò òîëüêî òå ôàéëû, êîòîðûå óæå ñóùåñòâóþò â êîíå÷íîé ïàïêå.\n\ +[/R] Ïåðåçàïèñûâàåò ôàéëû, äîñòóïíûå òîëüêî äëÿ ÷òåíèÿ.\n\ +[/H] Êîïèðóåò ñêðûòûå è ñèñòåìíûå ôàéëû.\n\ +[/C] Ïðîäîëæàåò ðàáîòó, äàæå åñëè ïðîèçîøëà îøèáêà.\n\ +[/A] Êîïèðóåò òîëüêî òå ôàéëû, äëÿ êîòîðûõ óñòàíîâëåí àòðèáóò \"àðõèâíûé\". \n\ +[/M] Êîïèðóåò òîëüêî òå ôàéëû, äëÿ êîòîðûõ óñòàíîâëåí àòðèáóò \"àðõèâíûé\",\n\ + ïðè ýòîì àòðèáóò óäàëÿåòñÿ.\n\ +[/D | /D:m-d-y] Êîïèðóåò òîëüêî íîâûå ôàéëû èëè òå, êîòîðûå áûëè èçìåíåíû\n\ + ïîñëå óêàçàííîé äàòû. Åñëè äàòà íå óêàçàíà, êîïèðóåò òîëüêî\n\ + òå ôàéëû, êîòîðûå íîâåå â èñõîäíîé ïàïêå.\n" +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc Mon Oct 22 23:55:26 2007 @@ -1,0 +1,28 @@ +/* + * Copyright 2007 Jason Edmeades + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +#include "xcopy.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "En.rc" +#include "Ko.rc" +#include "Pl.rc" +#include "Ru.rc" Propchange: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c Mon Oct 22 23:55:26 2007 @@ -1,0 +1,1041 @@ +/* + * XCOPY - Wine-compatible xcopy program + * + * Copyright (C) 2007 J. Edmeades + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * FIXME: + * This should now support all options listed in the xcopy help from + * windows XP except: + * /Z - Copy from network drives in restartable mode + * /X - Copy file audit settings (sets /O) + * /O - Copy file ownership + ACL info + * /G - Copy encrypted files to unencrypted destination + * /V - Verifies files + */ + +/* + * Notes: + * Apparently, valid return codes are: + * 0 - OK + * 1 - No files found to copy + * 2 - CTRL+C during copy + * 4 - Initialization error, or invalid source specification + * 5 - Disk write error + */ + + +#include <stdio.h> +#include <windows.h> +#include <wine/debug.h> +#include "xcopy.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xcopy); + +/* Prototypes */ +static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, + WCHAR *spec, DWORD flags); +static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, + WCHAR *spec, WCHAR *srcspec, DWORD flags); +static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, + WCHAR *deststem, WCHAR *destspec, + DWORD flags); +static BOOL XCOPY_CreateDirectory(const WCHAR* path); +static BOOL XCOPY_ProcessExcludeList(WCHAR* parms); +static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName); +static WCHAR *XCOPY_LoadMessage(UINT id); +static void XCOPY_FailMessage(DWORD err); +static int XCOPY_wprintf(const WCHAR *format, ...); + +/* Typedefs */ +typedef struct _EXCLUDELIST +{ + struct _EXCLUDELIST *next; + WCHAR *name; +} EXCLUDELIST; + + +/* Global variables */ +static ULONG filesCopied = 0; /* Number of files copied */ +static EXCLUDELIST *excludeList = NULL; /* Excluded strings list */ +static FILETIME dateRange; /* Date range to copy after*/ +static const WCHAR wchr_slash[] = {'\\', 0}; +static const WCHAR wchr_star[] = {'*', 0}; +static const WCHAR wchr_dot[] = {'.', 0}; +static const WCHAR wchr_dotdot[] = {'.', '.', 0}; + +/* Constants (Mostly for widechars) */ + + +/* To minimize stack usage during recursion, some temporary variables + made global */ +static WCHAR copyFrom[MAX_PATH]; +static WCHAR copyTo[MAX_PATH]; + + +/* ========================================================================= + main - Main entrypoint for the xcopy command + + Processes the args, and drives the actual copying + ========================================================================= */ +int wmain (int argc, WCHAR *argvW[]) +{ + int rc = 0; + WCHAR suppliedsource[MAX_PATH] = {0}; /* As supplied on the cmd line */ + WCHAR supplieddestination[MAX_PATH] = {0}; + WCHAR sourcestem[MAX_PATH] = {0}; /* Stem of source */ + WCHAR sourcespec[MAX_PATH] = {0}; /* Filespec of source */ + WCHAR destinationstem[MAX_PATH] = {0}; /* Stem of destination */ + WCHAR destinationspec[MAX_PATH] = {0}; /* Filespec of destination */ + WCHAR copyCmd[MAXSTRING]; /* COPYCMD env var */ + DWORD flags = 0; /* Option flags */ + const WCHAR PROMPTSTR1[] = {'/', 'Y', 0}; + const WCHAR PROMPTSTR2[] = {'/', 'y', 0}; + const WCHAR COPYCMD[] = {'C', 'O', 'P', 'Y', 'C', 'M', 'D', 0}; + const WCHAR EXCLUDE[] = {'E', 'X', 'C', 'L', 'U', 'D', 'E', ':', 0}; + + /* + * Parse the command line + */ + + /* Confirm at least one parameter */ + if (argc < 2) { + XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARMS)); + return RC_INITERROR; + } + + /* Preinitialize flags based on COPYCMD */ + if (GetEnvironmentVariable(COPYCMD, copyCmd, MAXSTRING)) { + if (wcsstr(copyCmd, PROMPTSTR1) != NULL || + wcsstr(copyCmd, PROMPTSTR2) != NULL) { + flags |= OPT_NOPROMPT; + } + } + + /* FIXME: On UNIX, files starting with a '.' are treated as hidden under + wine, but on windows these can be normal files. At least one installer + uses files such as .packlist and (validly) expects them to be copied. + Under wine, if we do not copy hidden files by default then they get + lose */ + flags |= OPT_COPYHIDSYS; + + /* Skip first arg, which is the program name */ + argvW++; + + while (argc > 1) + { + argc--; + WINE_TRACE("Processing Arg: '%s'\n", wine_dbgstr_w(*argvW)); + + /* First non-switch parameter is source, second is destination */ + if (*argvW[0] != '/') { + if (suppliedsource[0] == 0x00) { + lstrcpyW(suppliedsource, *argvW); + } else if (supplieddestination[0] == 0x00) { + lstrcpyW(supplieddestination, *argvW); + } else { + XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARMS)); + return RC_INITERROR; + } + } else { + /* Process all the switch options + Note: Windows docs say /P prompts when dest is created + but tests show it is done for each src file + regardless of the destination */ + switch (toupper(argvW[0][1])) { + case 'I': flags |= OPT_ASSUMEDIR; break; + case 'S': flags |= OPT_RECURSIVE; break; + case 'Q': flags |= OPT_QUIET; break; + case 'F': flags |= OPT_FULL; break; + case 'L': flags |= OPT_SIMULATE; break; + case 'W': flags |= OPT_PAUSE; break; + case 'T': flags |= OPT_NOCOPY | OPT_RECURSIVE; break; + case 'Y': flags |= OPT_NOPROMPT; break; + case 'N': flags |= OPT_SHORTNAME; break; + case 'U': flags |= OPT_MUSTEXIST; break; + case 'R': flags |= OPT_REPLACEREAD; break; + case 'H': flags |= OPT_COPYHIDSYS; break; + case 'C': flags |= OPT_IGNOREERRORS; break; + case 'P': flags |= OPT_SRCPROMPT; break; + case 'A': flags |= OPT_ARCHIVEONLY; break; + case 'M': flags |= OPT_ARCHIVEONLY | + OPT_REMOVEARCH; break; + + /* E can be /E or /EXCLUDE */ + case 'E': if (CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + &argvW[0][1], 8, + EXCLUDE, -1) == 2) { + if (XCOPY_ProcessExcludeList(&argvW[0][9])) { + XCOPY_FailMessage(ERROR_INVALID_PARAMETER); + return RC_INITERROR; + } else flags |= OPT_EXCLUDELIST; + } else flags |= OPT_EMPTYDIR | OPT_RECURSIVE; + break; + + /* D can be /D or /D: */ + case 'D': if ((argvW[0][2])==':' && isdigit(argvW[0][3])) { + SYSTEMTIME st; + WCHAR *pos = &argvW[0][3]; + BOOL isError = FALSE; + memset(&st, 0x00, sizeof(st)); + + /* Parse the arg : Month */ + st.wMonth = _wtol(pos); + while (*pos && isdigit(*pos)) pos++; + if (*pos++ != '-') isError = TRUE; + + /* Parse the arg : Day */ + if (!isError) { + st.wDay = _wtol(pos); + while (*pos && isdigit(*pos)) pos++; + if (*pos++ != '-') isError = TRUE; + } + + /* Parse the arg : Day */ + if (!isError) { + st.wYear = _wtol(pos); + if (st.wYear < 100) st.wYear+=2000; + } + + if (!isError && SystemTimeToFileTime(&st, &dateRange)) { + SYSTEMTIME st; + WCHAR datestring[32], timestring[32]; + + flags |= OPT_DATERANGE; + + /* Debug info: */ + FileTimeToSystemTime (&dateRange, &st); + GetDateFormat (0, DATE_SHORTDATE, &st, NULL, datestring, + sizeof(datestring)); + GetTimeFormat (0, TIME_NOSECONDS, &st, + NULL, timestring, sizeof(timestring)); + + WINE_TRACE("Date being used is: %s %s\n", + wine_dbgstr_w(datestring), wine_dbgstr_w(timestring)); + } else { + XCOPY_FailMessage(ERROR_INVALID_PARAMETER); + return RC_INITERROR; + } + } else { + flags |= OPT_DATENEWER; + } + break; + + case '-': if (toupper(argvW[0][2])=='Y') + flags &= ~OPT_NOPROMPT; break; + case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); + return RC_OK; + default: + WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(*argvW)); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARM), *argvW); + return RC_INITERROR; + } + } + argvW++; + } + + /* Default the destination if not supplied */ + if (supplieddestination[0] == 0x00) + lstrcpyW(supplieddestination, wchr_dot); + + /* Trace out the supplied information */ + WINE_TRACE("Supplied parameters:\n"); + WINE_TRACE("Source : '%s'\n", wine_dbgstr_w(suppliedsource)); + WINE_TRACE("Destination : '%s'\n", wine_dbgstr_w(supplieddestination)); + + /* Extract required information from source specification */ + rc = XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags); + + /* Extract required information from destination specification */ + rc = XCOPY_ProcessDestParm(supplieddestination, destinationstem, + destinationspec, sourcespec, flags); + + /* Trace out the resulting information */ + WINE_TRACE("Resolved parameters:\n"); + WINE_TRACE("Source Stem : '%s'\n", wine_dbgstr_w(sourcestem)); + WINE_TRACE("Source Spec : '%s'\n", wine_dbgstr_w(sourcespec)); + WINE_TRACE("Dest Stem : '%s'\n", wine_dbgstr_w(destinationstem)); + WINE_TRACE("Dest Spec : '%s'\n", wine_dbgstr_w(destinationspec)); + + /* Pause if necessary */ + if (flags & OPT_PAUSE) { + DWORD count; + char pausestr[10]; + + XCOPY_wprintf(XCOPY_LoadMessage(STRING_PAUSE)); + ReadFile (GetStdHandle(STD_INPUT_HANDLE), pausestr, sizeof(pausestr), + &count, NULL); + } + + /* Now do the hard work... */ + rc = XCOPY_DoCopy(sourcestem, sourcespec, + destinationstem, destinationspec, + flags); + + /* Clear up exclude list allocated memory */ + while (excludeList) { + EXCLUDELIST *pos = excludeList; + excludeList = excludeList -> next; + HeapFree(GetProcessHeap(), 0, pos->name); + HeapFree(GetProcessHeap(), 0, pos); + } + + /* Finished - print trailer and exit */ + if (flags & OPT_SIMULATE) { + XCOPY_wprintf(XCOPY_LoadMessage(STRING_SIMCOPY), filesCopied); + } else if (!(flags & OPT_NOCOPY)) { + XCOPY_wprintf(XCOPY_LoadMessage(STRING_COPY), filesCopied); + } + if (rc == RC_OK && filesCopied == 0) rc = RC_NOFILES; + return rc; + +} + + +/* ========================================================================= + XCOPY_ProcessSourceParm - Takes the supplied source parameter, and + converts it into a stem and a filespec + ========================================================================= */ +static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, + WCHAR *spec, DWORD flags) +{ + WCHAR actualsource[MAX_PATH]; + WCHAR *starPos; + WCHAR *questPos; + DWORD attribs; + + /* + * Validate the source, expanding to full path ensuring it exists + */ + if (GetFullPathName(suppliedsource, MAX_PATH, actualsource, NULL) == 0) { + WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError()); + return RC_INITERROR; + } + + /* If full names required, convert to using the full path */ + if (flags & OPT_FULL) { + lstrcpyW(suppliedsource, actualsource); + } + + /* + * Work out the stem of the source + */ + + /* If a directory is supplied, use that as-is (either fully or + partially qualified) + If a filename is supplied + a directory or drive path, use that + as-is + Otherwise + If no directory or path specified, add eg. C: + stem is Drive/Directory is bit up to last \ (or first :) + spec is bit after that */ + + starPos = wcschr(suppliedsource, '*'); + questPos = wcschr(suppliedsource, '?'); + if (starPos || questPos) { + attribs = 0x00; /* Ensures skips invalid or directory check below */ + } else { + attribs = GetFileAttributes(actualsource); + } + + if (attribs == INVALID_FILE_ATTRIBUTES) { + XCOPY_FailMessage(GetLastError()); + return RC_INITERROR; + + /* Directory: + stem should be exactly as supplied plus a '\', unless it was + eg. C: in which case no slash required */ + } else if (attribs & FILE_ATTRIBUTE_DIRECTORY) { + WCHAR lastChar; + + WINE_TRACE("Directory supplied\n"); + lstrcpyW(stem, suppliedsource); + lastChar = stem[lstrlenW(stem)-1]; + if (lastChar != '\\' && lastChar != ':') { + lstrcatW(stem, wchr_slash); + } + lstrcpyW(spec, wchr_star); + + /* File or wildcard search: + stem should be: + Up to and including last slash if directory path supplied + If c:filename supplied, just the c: + Otherwise stem should be the current drive letter + ':' */ + } else { + WCHAR *lastDir; + + WINE_TRACE("Filename supplied\n"); + lastDir = wcsrchr(suppliedsource, '\\'); + + if (lastDir) { + lstrcpyW(stem, suppliedsource); + stem[(lastDir-suppliedsource) + 1] = 0x00; + lstrcpyW(spec, (lastDir+1)); + } else if (suppliedsource[1] == ':') { + lstrcpyW(stem, suppliedsource); + stem[2] = 0x00; + lstrcpyW(spec, suppliedsource+2); + } else { + WCHAR curdir[MAXSTRING]; + GetCurrentDirectory (sizeof(curdir), curdir); + stem[0] = curdir[0]; + stem[1] = curdir[1]; + stem[2] = 0x00; + lstrcpyW(spec, suppliedsource); + } + } + + return RC_OK; +} + +/* ========================================================================= + XCOPY_ProcessDestParm - Takes the supplied destination parameter, and + converts it into a stem + ========================================================================= */ +static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, WCHAR *spec, + WCHAR *srcspec, DWORD flags) +{ + WCHAR actualdestination[MAX_PATH]; + DWORD attribs; + BOOL isDir = FALSE; + + /* + * Validate the source, expanding to full path ensuring it exists + */ + if (GetFullPathName(supplieddestination, MAX_PATH, actualdestination, NULL) == 0) { + WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError()); + return RC_INITERROR; + } + + /* Destination is either a directory or a file */ + attribs = GetFileAttributes(actualdestination); + + if (attribs == INVALID_FILE_ATTRIBUTES) { + + /* If /I supplied and wildcard copy, assume directory */ + if (flags & OPT_ASSUMEDIR && + (wcschr(srcspec, '?') || wcschr(srcspec, '*'))) { + + isDir = TRUE; + + } else { + DWORD count; + char answer[10] = ""; + WCHAR fileChar[2]; + WCHAR dirChar[2]; + + /* Read the F and D characters from the resource file */ + wcscpy(fileChar, XCOPY_LoadMessage(STRING_FILE_CHAR)); + wcscpy(dirChar, XCOPY_LoadMessage(STRING_DIR_CHAR)); + + while (answer[0] != fileChar[0] && answer[0] != dirChar[0]) { + XCOPY_wprintf(XCOPY_LoadMessage(STRING_QISDIR), supplieddestination); + + ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer), &count, NULL); + WINE_TRACE("User answer %c\n", answer[0]); + + answer[0] = toupper(answer[0]); + } + + if (answer[0] == dirChar[0]) { + isDir = TRUE; + } else { + isDir = FALSE; + } + } + } else { + isDir = (attribs & FILE_ATTRIBUTE_DIRECTORY); + } + + if (isDir) { + lstrcpyW(stem, actualdestination); + *spec = 0x00; + + /* Ensure ends with a '\' */ + if (stem[lstrlenW(stem)-1] != '\\') { + lstrcatW(stem, wchr_slash); + } + + } else { + WCHAR drive[MAX_PATH]; + WCHAR dir[MAX_PATH]; + WCHAR fname[MAX_PATH]; + WCHAR ext[MAX_PATH]; + _wsplitpath(actualdestination, drive, dir, fname, ext); + lstrcpyW(stem, drive); + lstrcatW(stem, dir); + lstrcpyW(spec, fname); + lstrcatW(spec, ext); + } + return RC_OK; +} + +/* ========================================================================= + XCOPY_DoCopy - Recursive function to copy files based on input parms + of a stem and a spec + + This works by using FindFirstFile supplying the source stem and spec. + If results are found, any non-directory ones are processed + Then, if /S or /E is supplied, another search is made just for + directories, and this function is called again for that directory + + ========================================================================= */ +static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, + WCHAR *deststem, WCHAR *destspec, + DWORD flags) +{ + WIN32_FIND_DATA *finddata; + HANDLE h; + BOOL findres = TRUE; + WCHAR *inputpath, *outputpath; + BOOL copiedFile = FALSE; + DWORD destAttribs, srcAttribs; + BOOL skipFile; + + /* Allocate some working memory on heap to minimize footprint */ + finddata = HeapAlloc(GetProcessHeap(), 0, sizeof(WIN32_FIND_DATA)); + inputpath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + outputpath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + + /* Build the search info into a single parm */ + lstrcpyW(inputpath, srcstem); + lstrcatW(inputpath, srcspec); + + /* Search 1 - Look for matching files */ + h = FindFirstFile(inputpath, finddata); + while (h != INVALID_HANDLE_VALUE && findres) { + + skipFile = FALSE; + + /* Ignore . and .. */ + if (lstrcmpW(finddata->cFileName, wchr_dot)==0 || + lstrcmpW(finddata->cFileName, wchr_dotdot)==0 || + finddata->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + + WINE_TRACE("Skipping directory, . or .. (%s)\n", wine_dbgstr_w(finddata->cFileName)); + } else { + + /* Get the filename information */ + lstrcpyW(copyFrom, srcstem); + if (flags & OPT_SHORTNAME) { + lstrcatW(copyFrom, finddata->cAlternateFileName); + } else { + lstrcatW(copyFrom, finddata->cFileName); + } + + lstrcpyW(copyTo, deststem); + if (*destspec == 0x00) { + if (flags & OPT_SHORTNAME) { + lstrcatW(copyTo, finddata->cAlternateFileName); + } else { + lstrcatW(copyTo, finddata->cFileName); + } + } else { + lstrcatW(copyTo, destspec); + } + + /* Do the copy */ + WINE_TRACE("ACTION: Copy '%s' -> '%s'\n", wine_dbgstr_w(copyFrom), + wine_dbgstr_w(copyTo)); + if (!copiedFile && !(flags & OPT_SIMULATE)) XCOPY_CreateDirectory(deststem); + + /* See if allowed to copy it */ + srcAttribs = GetFileAttributesW(copyFrom); + WINE_TRACE("Source attribs: %d\n", srcAttribs); + + if ((srcAttribs & FILE_ATTRIBUTE_HIDDEN) || + (srcAttribs & FILE_ATTRIBUTE_SYSTEM)) { + + if (!(flags & OPT_COPYHIDSYS)) { + skipFile = TRUE; + } + } + + if (!(srcAttribs & FILE_ATTRIBUTE_ARCHIVE) && + (flags & OPT_ARCHIVEONLY)) { + skipFile = TRUE; + } + + /* See if file exists */ + destAttribs = GetFileAttributesW(copyTo); + WINE_TRACE("Dest attribs: %d\n", srcAttribs); + + /* Check date ranges if a destination file already exists */ + if (!skipFile && (flags & OPT_DATERANGE) && + (CompareFileTime(&finddata->ftLastWriteTime, &dateRange) < 0)) { + WINE_TRACE("Skipping file as modified date too old\n"); + skipFile = TRUE; + } + + /* If just /D supplied, only overwrite if src newer than dest */ + if (!skipFile && (flags & OPT_DATENEWER) && + (destAttribs != INVALID_FILE_ATTRIBUTES)) { + HANDLE h = CreateFile(copyTo, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, + NULL); + if (h != INVALID_HANDLE_VALUE) { + FILETIME writeTime; + GetFileTime(h, NULL, NULL, &writeTime); + + if (CompareFileTime(&finddata->ftLastWriteTime, &writeTime) <= 0) { + WINE_TRACE("Skipping file as dest newer or same date\n"); + skipFile = TRUE; + } + CloseHandle(h); + } + } + + /* See if exclude list provided. Note since filenames are case + insensitive, need to uppercase the filename before doing + strstr */ + if (!skipFile && (flags & OPT_EXCLUDELIST)) { + EXCLUDELIST *pos = excludeList; + WCHAR copyFromUpper[MAX_PATH]; + + /* Uppercase source filename */ + lstrcpyW(copyFromUpper, copyFrom); + CharUpperBuff(copyFromUpper, lstrlenW(copyFromUpper)); + + /* Loop through testing each exclude line */ + while (pos) { + if (wcsstr(copyFromUpper, pos->name) != NULL) { + WINE_TRACE("Skipping file as matches exclude '%s'\n", + wine_dbgstr_w(pos->name)); + skipFile = TRUE; + pos = NULL; + } else { + pos = pos->next; + } + } + } + + /* Prompt each file if necessary */ + if (!skipFile && (flags & OPT_SRCPROMPT)) { + DWORD count; + char answer[10]; + BOOL answered = FALSE; + WCHAR yesChar[2]; + WCHAR noChar[2]; + + /* Read the Y and N characters from the resource file */ + wcscpy(yesChar, XCOPY_LoadMessage(STRING_YES_CHAR)); + wcscpy(noChar, XCOPY_LoadMessage(STRING_NO_CHAR)); + + while (!answered) { + XCOPY_wprintf(XCOPY_LoadMessage(STRING_SRCPROMPT), copyFrom); + ReadFile (GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer), + &count, NULL); + + answered = TRUE; + if (toupper(answer[0]) == noChar[0]) + skipFile = TRUE; + else if (toupper(answer[0]) != yesChar[0]) + answered = FALSE; + } + } + + if (!skipFile && + destAttribs != INVALID_FILE_ATTRIBUTES && !(flags & OPT_NOPROMPT)) { + DWORD count; + char answer[10]; + BOOL answered = FALSE; + WCHAR yesChar[2]; + WCHAR allChar[2]; + WCHAR noChar[2]; + + /* Read the A,Y and N characters from the resource file */ + wcscpy(yesChar, XCOPY_LoadMessage(STRING_YES_CHAR)); + wcscpy(allChar, XCOPY_LoadMessage(STRING_ALL_CHAR)); + wcscpy(noChar, XCOPY_LoadMessage(STRING_NO_CHAR)); + + while (!answered) { + XCOPY_wprintf(XCOPY_LoadMessage(STRING_OVERWRITE), copyTo); + ReadFile (GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer), + &count, NULL); + + answered = TRUE; + if (toupper(answer[0]) == allChar[0]) + flags |= OPT_NOPROMPT; + else if (toupper(answer[0]) == noChar[0]) + skipFile = TRUE; + else if (toupper(answer[0]) != yesChar[0]) + answered = FALSE; + } + } + + /* See if it has to exist! */ + if (destAttribs == INVALID_FILE_ATTRIBUTES && (flags & OPT_MUSTEXIST)) { + skipFile = TRUE; + } + + /* Output a status message */ + if (!skipFile) { + if (flags & OPT_QUIET) { + /* Skip message */ + } else if (flags & OPT_FULL) { + const WCHAR infostr[] = {'%', 's', ' ', '-', '>', ' ', + '%', 's', '\n', 0}; + + XCOPY_wprintf(infostr, copyFrom, copyTo); + } else { + const WCHAR infostr[] = {'%', 's', '\n', 0}; + XCOPY_wprintf(infostr, copyFrom); + } + + /* If allowing overwriting of read only files, remove any + write protection */ + if ((destAttribs & FILE_ATTRIBUTE_READONLY) && + (flags & OPT_REPLACEREAD)) { + SetFileAttributes(copyTo, destAttribs & ~FILE_ATTRIBUTE_READONLY); + } + + copiedFile = TRUE; + if (flags & OPT_SIMULATE || flags & OPT_NOCOPY) { + /* Skip copy */ + } else if (CopyFile(copyFrom, copyTo, FALSE) == 0) { + + DWORD error = GetLastError(); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_COPYFAIL), + copyFrom, copyTo, error); + XCOPY_FailMessage(error); + + if (flags & OPT_IGNOREERRORS) { + skipFile = TRUE; + } else { + return RC_WRITEERROR; + } + } + + /* If /M supplied, remove the archive bit after successful copy */ + if (!skipFile) { + if ((srcAttribs & FILE_ATTRIBUTE_ARCHIVE) && + (flags & OPT_REMOVEARCH)) { + SetFileAttributes(copyFrom, (srcAttribs & ~FILE_ATTRIBUTE_ARCHIVE)); + } + filesCopied++; + } + } + } + + /* Find next file */ + findres = FindNextFile(h, finddata); + } + FindClose(h); + + /* Search 2 - do subdirs */ + if (flags & OPT_RECURSIVE) { + lstrcpyW(inputpath, srcstem); + lstrcatW(inputpath, wchr_star); + findres = TRUE; + WINE_TRACE("Processing subdirs with spec: %s\n", wine_dbgstr_w(inputpath)); + + h = FindFirstFile(inputpath, finddata); + while (h != INVALID_HANDLE_VALUE && findres) { + + /* Only looking for dirs */ + if ((finddata->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && + (lstrcmpW(finddata->cFileName, wchr_dot) != 0) && + (lstrcmpW(finddata->cFileName, wchr_dotdot) != 0)) { + + WINE_TRACE("Handling subdir: %s\n", wine_dbgstr_w(finddata->cFileName)); + + /* Make up recursive information */ + lstrcpyW(inputpath, srcstem); + lstrcatW(inputpath, finddata->cFileName); + lstrcatW(inputpath, wchr_slash); + + lstrcpyW(outputpath, deststem); + if (*destspec == 0x00) { + lstrcatW(outputpath, finddata->cFileName); + + /* If /E is supplied, create the directory now */ + if ((flags & OPT_EMPTYDIR) && + !(flags & OPT_SIMULATE)) + XCOPY_CreateDirectory(outputpath); + + lstrcatW(outputpath, wchr_slash); + } + + XCOPY_DoCopy(inputpath, srcspec, outputpath, destspec, flags); + } + + /* Find next one */ + findres = FindNextFile(h, finddata); + } + } + + /* free up memory */ + HeapFree(GetProcessHeap(), 0, finddata); + HeapFree(GetProcessHeap(), 0, inputpath); + HeapFree(GetProcessHeap(), 0, outputpath); + + return 0; +} + +/* ========================================================================= + * Routine copied from cmd.exe md command - + * This works recursivly. so creating dir1\dir2\dir3 will create dir1 and + * dir2 if they do not already exist. + * ========================================================================= */ +static BOOL XCOPY_CreateDirectory(const WCHAR* path) +{ + int len; + WCHAR *new_path; + BOOL ret = TRUE; + + new_path = HeapAlloc(GetProcessHeap(),0, sizeof(WCHAR) * (lstrlenW(path)+1)); + lstrcpyW(new_path,path); + + while ((len = lstrlenW(new_path)) && new_path[len - 1] == '\\') + new_path[len - 1] = 0; + + while (!CreateDirectory(new_path,NULL)) + { + WCHAR *slash; + DWORD last_error = GetLastError(); + if (last_error == ERROR_ALREADY_EXISTS) + break; + + if (last_error != ERROR_PATH_NOT_FOUND) + { + ret = FALSE; + break; + } + + if (!(slash = wcsrchr(new_path,'\\')) && ! (slash = wcsrchr(new_path,'/'))) + { + ret = FALSE; + break; + } + + len = slash - new_path; + new_path[len] = 0; + if (!XCOPY_CreateDirectory(new_path)) + { + ret = FALSE; + break; + } + new_path[len] = '\\'; + } + HeapFree(GetProcessHeap(),0,new_path); + return ret; +} + +/* ========================================================================= + * Process the /EXCLUDE: file list, building up a list of substrings to + * avoid copying + * Returns TRUE on any failure + * ========================================================================= */ +static BOOL XCOPY_ProcessExcludeList(WCHAR* parms) { + + WCHAR *filenameStart = parms; + + WINE_TRACE("/EXCLUDE parms: '%s'\n", wine_dbgstr_w(parms)); + excludeList = NULL; + + while (*parms && *parms != ' ' && *parms != '/') { + + /* If found '+' then process the file found so far */ + if (*parms == '+') { + if (XCOPY_ProcessExcludeFile(filenameStart, parms)) { + return TRUE; + } + filenameStart = parms+1; + } + parms++; + } + + if (filenameStart != parms) { + if (XCOPY_ProcessExcludeFile(filenameStart, parms)) { + return TRUE; + } + } + + return FALSE; +} + +/* ========================================================================= + * Process a single file from the /EXCLUDE: file list, building up a list + * of substrings to avoid copying + * Returns TRUE on any failure + * ========================================================================= */ +static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { + + WCHAR endChar = *endOfName; + WCHAR buffer[MAXSTRING]; + FILE *inFile = NULL; + const WCHAR readTextMode[] = {'r', 't', 0}; + + /* Null terminate the filename (temporarily updates the filename hence + parms not const) */ + *endOfName = 0x00; + + /* Open the file */ + inFile = _wfopen(filename, readTextMode); + if (inFile == NULL) { + XCOPY_wprintf(XCOPY_LoadMessage(STRING_OPENFAIL), filename); + *endOfName = endChar; + return TRUE; + } + + /* Process line by line */ + while (fgetws(buffer, sizeof(buffer), inFile) != NULL) { + EXCLUDELIST *thisEntry; + int length = lstrlenW(buffer); + + /* Strip CRLF */ + buffer[length-1] = 0x00; + + /* If more than CRLF */ + if (length > 1) { + thisEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCLUDELIST)); + thisEntry->next = excludeList; + excludeList = thisEntry; + thisEntry->name = HeapAlloc(GetProcessHeap(), 0, + (length * sizeof(WCHAR))+1); + lstrcpyW(thisEntry->name, buffer); + CharUpperBuff(thisEntry->name, length); + WINE_TRACE("Read line : '%s'\n", wine_dbgstr_w(thisEntry->name)); + } + } + + /* See if EOF or error occurred */ + if (!feof(inFile)) { + XCOPY_wprintf(XCOPY_LoadMessage(STRING_READFAIL), filename); + *endOfName = endChar; + return TRUE; + } + + /* Revert the input string to original form, and cleanup + return */ + *endOfName = endChar; + fclose(inFile); + return FALSE; +} + +/* ========================================================================= + * Load a string from the resource file, handling any error + * Returns string retrieved from resource file + * ========================================================================= */ +static WCHAR *XCOPY_LoadMessage(UINT id) { + static WCHAR msg[MAXSTRING]; + const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; + + if (!LoadString(GetModuleHandle(NULL), id, msg, sizeof(msg))) { + WINE_FIXME("LoadString failed with %d\n", GetLastError()); + lstrcpyW(msg, failedMsg); + } + return msg; +} + +/* ========================================================================= + * Load a string for a system error and writes it to the screen + * Returns string retrieved from resource file + * ========================================================================= */ +static void XCOPY_FailMessage(DWORD err) { + LPWSTR lpMsgBuf; + int status; + + status = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM, + NULL, err, 0, + (LPTSTR) &lpMsgBuf, 0, NULL); + if (!status) { + WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n", + err, GetLastError()); + } else { + const WCHAR infostr[] = {'%', 's', '\n', 0}; + XCOPY_wprintf(infostr, lpMsgBuf); + LocalFree ((HLOCAL)lpMsgBuf); + } +} + +/* ========================================================================= + * Output a formatted unicode string. Ideally this will go to the console + * and hence required WriteConsoleW to output it, however if file i/o is + * redirected, it needs to be WriteFile'd using OEM (not ANSI) format + * ========================================================================= */ +int XCOPY_wprintf(const WCHAR *format, ...) { + + static WCHAR *output_bufW = NULL; + static char *output_bufA = NULL; + static BOOL toConsole = TRUE; + static BOOL traceOutput = FALSE; +#define MAX_WRITECONSOLE_SIZE 65535 + + va_list parms; + DWORD len, nOut; + DWORD res = 0; + + /* + * Allocate buffer to use when writing to console + * Note: Not freed - memory will be allocated once and released when + * xcopy ends + */ + + if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0, + MAX_WRITECONSOLE_SIZE); + if (!output_bufW) { + WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n"); + return 0; + } + + /* Use wvsprintf to store output into unicode buffer */ + va_start(parms, format); + len = vswprintf(output_bufW, format, parms); + va_end(parms); + + /* Try to write as unicode all the time we think its a console */ + if (toConsole) { + res = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), + output_bufW, len, &nOut, NULL); + } + + /* If writing to console has failed (ever) we assume its file + i/o so convert to OEM codepage and output */ + if (!res) { + BOOL usedDefaultChar = FALSE; + DWORD convertedChars; + + toConsole = FALSE; + + /* + * Allocate buffer to use when writing to file. Not freed, as above + */ + if (!output_bufA) output_bufA = HeapAlloc(GetProcessHeap(), 0, + MAX_WRITECONSOLE_SIZE); + if (!output_bufA) { + WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n"); + return 0; + } + + /* Convert to OEM, then output */ + convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, + len, output_bufA, MAX_WRITECONSOLE_SIZE, + "?", &usedDefaultChar); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), output_bufA, convertedChars, + &nOut, FALSE); + } + + /* Trace whether screen or console */ + if (!traceOutput) { + WINE_TRACE("Writing to console? (%d)\n", toConsole); + traceOutput = TRUE; + } + return nOut; +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h Mon Oct 22 23:55:26 2007 @@ -1,0 +1,68 @@ +/* + * XCOPY - Wine-compatible xcopy program + * + * Copyright (C) 2007 J. Edmeades + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Local #defines */ +#define RC_OK 0 +#define RC_NOFILES 1 +#define RC_CTRLC 2 +#define RC_INITERROR 4 +#define RC_WRITEERROR 5 + +#define OPT_ASSUMEDIR 0x00000001 +#define OPT_RECURSIVE 0x00000002 +#define OPT_EMPTYDIR 0x00000004 +#define OPT_QUIET 0x00000008 +#define OPT_FULL 0x00000010 +#define OPT_SIMULATE 0x00000020 +#define OPT_PAUSE 0x00000040 +#define OPT_NOCOPY 0x00000080 +#define OPT_NOPROMPT 0x00000100 +#define OPT_SHORTNAME 0x00000200 +#define OPT_MUSTEXIST 0x00000400 +#define OPT_REPLACEREAD 0x00000800 +#define OPT_COPYHIDSYS 0x00001000 +#define OPT_IGNOREERRORS 0x00002000 +#define OPT_SRCPROMPT 0x00004000 +#define OPT_ARCHIVEONLY 0x00008000 +#define OPT_REMOVEARCH 0x00010000 +#define OPT_EXCLUDELIST 0x00020000 +#define OPT_DATERANGE 0x00040000 +#define OPT_DATENEWER 0x00080000 + +#define MAXSTRING 8192 + +/* Translation ids */ +#define STRING_INVPARMS 101 +#define STRING_INVPARM 102 +#define STRING_PAUSE 103 +#define STRING_SIMCOPY 104 +#define STRING_COPY 105 +#define STRING_QISDIR 106 +#define STRING_SRCPROMPT 107 +#define STRING_OVERWRITE 108 +#define STRING_COPYFAIL 109 +#define STRING_OPENFAIL 110 +#define STRING_READFAIL 111 +#define STRING_YES_CHAR 112 +#define STRING_NO_CHAR 113 +#define STRING_ALL_CHAR 114 +#define STRING_FILE_CHAR 115 +#define STRING_DIR_CHAR 116 +#define STRING_HELP 117 Propchange: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild Mon Oct 22 23:55:26 2007 @@ -1,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="xcopy" type="win32cui" installbase="system32" installname="xcopy.exe" allowwarnings="true" unicode="true"> + <include base="xcopy">.</include> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <file>xcopy.c</file> + <file>xcopy.rc</file> + <metadata description="xcopy command-line tool" /> +</module> Propchange: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rc Mon Oct 22 23:55:26 2007 @@ -1,0 +1,17 @@ +#include <windows.h> +#include <commctrl.h> + +#include "resource.h" + + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "xcopy command\0" +#define REACTOS_STR_INTERNAL_NAME "xcopy\0" +#define REACTOS_STR_ORIGINAL_FILENAME "xcopy.exe\0" +#include <reactos/version.rc> + +#include "rsrc.rc" + + Propchange: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gbrunmar] 29793: More svchost stub, end-of-the-day checkin.
by gbrunmar＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: gbrunmar Date: Mon Oct 22 23:54:51 2007 New Revision: 29793 URL: http://svn.reactos.org/svn/reactos?rev=29793&view=rev Log: More svchost stub, end-of-the-day checkin. Modified: trunk/reactos/base/services/svchost/svchost.c Modified: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.c (original) +++ trunk/reactos/base/services/svchost/svchost.c Mon Oct 22 23:54:51 2007 @@ -139,7 +139,7 @@ return TRUE; } -BOOL FreeServices() +VOID FreeServices() { while (FirstService) { @@ -151,11 +151,12 @@ HeapFree(GetProcessHeap(), 0, Service->Name); HeapFree(GetProcessHeap(), 0, Service); } - - return TRUE; -} - -BOOL LoadServiceCategory(LPCTSTR ServiceCategory) +} + +/* + * Returns the number of services successfully loaded from the category + */ +DWORD LoadServiceCategory(LPCTSTR ServiceCategory) { HKEY hServicesKey; DWORD KeyType; @@ -163,19 +164,20 @@ TCHAR Buffer[REG_MAX_DATA_SIZE]; LPCTSTR ServiceName; DWORD BufferIndex = 0; + DWORD NrOfServices = 0; /* Get all the services in this category */ if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, SVCHOST_REG_KEY, 0, KEY_READ, &hServicesKey)) { DPRINT1("Could not open service category: %s\n", ServiceCategory); - return FALSE; + return 0; } if (ERROR_SUCCESS != RegQueryValueEx(hServicesKey, ServiceCategory, NULL, &KeyType, (LPBYTE)Buffer, &BufferSize)) { DPRINT1("Could not open service category (2): %s\n", ServiceCategory); RegCloseKey(hServicesKey); - return FALSE; + return 0; } /* Clean up */ @@ -191,18 +193,23 @@ if (0 == Length) break; - PrepareService(ServiceName); + if (TRUE == PrepareService(ServiceName)) + ++NrOfServices; BufferIndex += (Length + 1) * sizeof(TCHAR); ServiceName = &Buffer[BufferIndex]; } - return TRUE; + return NrOfServices; } int _tmain (int argc, LPTSTR argv []) { + DWORD NrOfServices; + LPSERVICE_TABLE_ENTRY ServiceTable; + DWORD i; + if (argc < 3) { /* MS svchost.exe doesn't seem to print help, should we? */ @@ -215,7 +222,32 @@ return 1; } - LoadServiceCategory(argv[2]); + NrOfServices = LoadServiceCategory(argv[2]); + + if (0 == NrOfServices) + return 1; + + ServiceTable = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE_TABLE_ENTRY) * (NrOfServices + 1)); + + if (NULL != ServiceTable) + { + PSERVICE Service = FirstService; + + for (i = 0; i < NrOfServices; ++i) + { + ServiceTable[i].lpServiceName = Service->Name; + ServiceTable[i].lpServiceProc = Service->ServiceMainFunc; + Service = Service->Next; + } + + StartServiceCtrlDispatcher(ServiceTable); + + HeapFree(GetProcessHeap(), 0, ServiceTable); + } + else + { + DPRINT1("Not enough memory for the service table, trying to allocate %u bytes\n", sizeof(SERVICE_TABLE_ENTRY) * (NrOfServices + 1)); + } FreeServices();

1 0

[peterw] 29792: - Remove the rosbe-options.cmd check from Build.cmd, it doesn't need to be here.
by peterw＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: peterw Date: Mon Oct 22 23:50:40 2007 New Revision: 29792 URL: http://svn.reactos.org/svn/reactos?rev=29792&view=rev Log: - Remove the rosbe-options.cmd check from Build.cmd, it doesn't need to be here. Modified: trunk/tools/RosBE-Windows/Root/Build.cmd Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Mon Oct 22 23:50:40 2007 @@ -11,14 +11,6 @@ @echo off title Building... - -:: -:: Check if the user has used the options utility and -:: if so, load their options. -:: -if exist "%_ROSBE_BASEDIR%\rosbe-options.cmd" ( - call "%_ROSBE_BASEDIR%\rosbe-options.cmd" -) :: :: Check if config.template.rbuild is newer than config.rbuild, if it is then

1 0

[greatlrd] 29791: fix the build for win32k.sys
by greatlrd＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: greatlrd Date: Mon Oct 22 23:49:06 2007 New Revision: 29791 URL: http://svn.reactos.org/svn/reactos?rev=29791&view=rev Log: fix the build for win32k.sys Modified: branches/reactx/reactos/subsystems/win32/win32k/include/dib.h branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h Modified: branches/reactx/reactos/subsystems/win32/win32k/include/dib.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/dib.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/dib.h Mon Oct 22 23:49:06 2007 @@ -1,7 +1,7 @@ #ifndef _WIN32K_DIB_H #define _WIN32K_DIB_H -#include "dc.h" +#include <reactos/win32k/win32kdc.h> INT FASTCALL DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse); Modified: branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h Mon Oct 22 23:49:06 2007 @@ -1,7 +1,7 @@ #ifndef __WIN32K_FLOAT_H #define __WIN32K_FLOAT_H -#include "dc.h" +#include <reactos/win32k/win32kdc.h> #include "math.h" #include <ft2build.h> #include FT_FREETYPE_H

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
71
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 October 2007