Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[hbelusca] 61369: [NTVDM]: Fix VDDInstallIOHook.
by hbelusca＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: hbelusca Date: Tue Dec 24 13:03:04 2013 New Revision: 61369 URL: http://svn.reactos.org/svn/reactos?rev=61369&view=rev Log: [NTVDM]: Fix VDDInstallIOHook. Modified: branches/ntvdm/subsystems/ntvdm/io.c Modified: branches/ntvdm/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/io.c?rev… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/io.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/io.c [iso-8859-1] Tue Dec 24 13:03:04 2013 @@ -557,11 +557,12 @@ IoPortProc[i].IoHandlers.OutsD = NULL; /* Save our handlers */ - IoPortProc[i].VddIoHandlers = *IOhandler; // IOhandler[i]; ????????? + IoPortProc[i].VddIoHandlers = *IOhandler; } - /* Go to next range */ + /* Go to the next range */ ++pPortRange; + ++IOhandler; } return TRUE; @@ -601,7 +602,7 @@ ZeroMemory(&IoPortProc[i], sizeof(IoPortProc[i])); } - /* Go to next range */ + /* Go to the next range */ ++pPortRange; } }

1 0

[hbelusca] 61368: [NTVDM]: IO ports: put our internal handlers and Windows' ones for compatiblity into a union.
by hbelusca＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: hbelusca Date: Tue Dec 24 12:15:27 2013 New Revision: 61368 URL: http://svn.reactos.org/svn/reactos?rev=61368&view=rev Log: [NTVDM]: IO ports: put our internal handlers and Windows' ones for compatiblity into a union. Modified: branches/ntvdm/subsystems/ntvdm/io.c Modified: branches/ntvdm/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/io.c?rev… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/io.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/io.c [iso-8859-1] Tue Dec 24 12:15:27 2013 @@ -16,16 +16,8 @@ /* PRIVATE VARIABLES **********************************************************/ -typedef struct _EMULATOR_IOPORT_HANDLERS -{ - /* For Windows compatibility only, not used internally */ - HANDLE hVdd; // == 0 if unused, - // INVALID_HANDLE_VALUE if handled internally, - // a valid VDD handle if handled externally. - VDD_IO_HANDLERS VddIoHandlers; - - /* We use these members internally */ - +typedef struct _EMULATOR_IO_HANDLERS +{ EMULATOR_INB_PROC InB; EMULATOR_INW_PROC InW; EMULATOR_IND_PROC InD; @@ -41,6 +33,21 @@ EMULATOR_OUTSB_PROC OutsB; EMULATOR_OUTSW_PROC OutsW; EMULATOR_OUTSD_PROC OutsD; +} EMULATOR_IO_HANDLERS, *PEMULATOR_IO_HANDLERS; + +typedef struct _EMULATOR_IOPORT_HANDLERS +{ + HANDLE hVdd; // == 0 if unused, + // INVALID_HANDLE_VALUE if handled internally, + // a valid VDD handle if handled externally. + union + { + /* For Windows compatibility only, not used internally... */ + VDD_IO_HANDLERS VddIoHandlers; + + /* ... we use these members internally */ + EMULATOR_IO_HANDLERS IoHandlers; + }; } EMULATOR_IOPORT_HANDLERS, *PEMULATOR_IOPORT_HANDLERS; /* @@ -55,9 +62,9 @@ PUCHAR Buffer) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && - IoPortProc[Port].InB) - { - *Buffer = IoPortProc[Port].InB(Port); + IoPortProc[Port].IoHandlers.InB) + { + *Buffer = IoPortProc[Port].IoHandlers.InB(Port); } else if (IoPortProc[Port].hVdd > 0 && IoPortProc[Port].VddIoHandlers.inb_handler) @@ -79,9 +86,9 @@ ULONG Count) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && - IoPortProc[Port].InsB) - { - IoPortProc[Port].InsB(Port, Buffer, Count); + IoPortProc[Port].IoHandlers.InsB) + { + IoPortProc[Port].IoHandlers.InsB(Port, Buffer, Count); } else if (IoPortProc[Port].hVdd > 0 && IoPortProc[Port].VddIoHandlers.insb_handler) @@ -101,9 +108,9 @@ PUCHAR Buffer) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && - IoPortProc[Port].OutB) - { - IoPortProc[Port].OutB(Port, *Buffer); + IoPortProc[Port].IoHandlers.OutB) + { + IoPortProc[Port].IoHandlers.OutB(Port, *Buffer); } else if (IoPortProc[Port].hVdd > 0 && IoPortProc[Port].VddIoHandlers.outb_handler) @@ -124,9 +131,9 @@ ULONG Count) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && - IoPortProc[Port].OutsB) - { - IoPortProc[Port].OutsB(Port, Buffer, Count); + IoPortProc[Port].IoHandlers.OutsB) + { + IoPortProc[Port].IoHandlers.OutsB(Port, Buffer, Count); } else if (IoPortProc[Port].hVdd > 0 && IoPortProc[Port].VddIoHandlers.outsb_handler) @@ -146,9 +153,9 @@ PUSHORT Buffer) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && - IoPortProc[Port].InW) - { - *Buffer = IoPortProc[Port].InW(Port); + IoPortProc[Port].IoHandlers.InW) + { + *Buffer = IoPortProc[Port].IoHandlers.InW(Port); } else if (IoPortProc[Port].hVdd > 0 && IoPortProc[Port].VddIoHandlers.inw_handler) @@ -173,9 +180,9 @@ ULONG Count) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && - IoPortProc[Port].InsW) - { - IoPortProc[Port].InsW(Port, Buffer, Count); + IoPortProc[Port].IoHandlers.InsW) + { + IoPortProc[Port].IoHandlers.InsW(Port, Buffer, Count); } else if (IoPortProc[Port].hVdd > 0 && IoPortProc[Port].VddIoHandlers.insw_handler) @@ -195,9 +202,9 @@ PUSHORT Buffer) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && - IoPortProc[Port].OutW) - { - IoPortProc[Port].OutW(Port, *Buffer); + IoPortProc[Port].IoHandlers.OutW) + { + IoPortProc[Port].IoHandlers.OutW(Port, *Buffer); } else if (IoPortProc[Port].hVdd > 0 && IoPortProc[Port].VddIoHandlers.outw_handler) @@ -223,9 +230,9 @@ ULONG Count) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && - IoPortProc[Port].OutsW) - { - IoPortProc[Port].OutsW(Port, Buffer, Count); + IoPortProc[Port].IoHandlers.OutsW) + { + IoPortProc[Port].IoHandlers.OutsW(Port, Buffer, Count); } else if (IoPortProc[Port].hVdd > 0 && IoPortProc[Port].VddIoHandlers.outsw_handler) @@ -245,9 +252,9 @@ PULONG Buffer) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && - IoPortProc[Port].InD) - { - *Buffer = IoPortProc[Port].InD(Port); + IoPortProc[Port].IoHandlers.InD) + { + *Buffer = IoPortProc[Port].IoHandlers.InD(Port); } else { @@ -266,9 +273,9 @@ ULONG Count) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && - IoPortProc[Port].InsD) - { - IoPortProc[Port].InsD(Port, Buffer, Count); + IoPortProc[Port].IoHandlers.InsD) + { + IoPortProc[Port].IoHandlers.InsD(Port, Buffer, Count); } else { @@ -281,9 +288,9 @@ PULONG Buffer) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && - IoPortProc[Port].OutD) - { - IoPortProc[Port].OutD(Port, *Buffer); + IoPortProc[Port].IoHandlers.OutD) + { + IoPortProc[Port].IoHandlers.OutD(Port, *Buffer); } else { @@ -303,9 +310,9 @@ ULONG Count) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && - IoPortProc[Port].OutsD) - { - IoPortProc[Port].OutsD(Port, Buffer, Count); + IoPortProc[Port].IoHandlers.OutsD) + { + IoPortProc[Port].IoHandlers.OutsD(Port, Buffer, Count); } else { @@ -319,15 +326,15 @@ EMULATOR_INB_PROC InHandler, EMULATOR_OUTB_PROC OutHandler) { - if (IoPortProc[Port].InB == NULL) - IoPortProc[Port].InB = InHandler; - else - DPRINT1("IoPortProc[0x%X].InB already registered\n", Port); - - if (IoPortProc[Port].OutB == NULL) - IoPortProc[Port].OutB = OutHandler; - else - DPRINT1("IoPortProc[0x%X].OutB already registered\n", Port); + if (IoPortProc[Port].IoHandlers.InB == NULL) + IoPortProc[Port].IoHandlers.InB = InHandler; + else + DPRINT1("IoPortProc[0x%X].IoHandlers.InB already registered\n", Port); + + if (IoPortProc[Port].IoHandlers.OutB == NULL) + IoPortProc[Port].IoHandlers.OutB = OutHandler; + else + DPRINT1("IoPortProc[0x%X].IoHandlers.OutB already registered\n", Port); /* We hold the I/O port internally */ IoPortProc[Port].hVdd = INVALID_HANDLE_VALUE; @@ -533,21 +540,21 @@ IoPortProc[i].hVdd = hVdd; /* Disable the internal handlers */ - IoPortProc[i].InB = NULL; - IoPortProc[i].InW = NULL; - IoPortProc[i].InD = NULL; - - IoPortProc[i].InsB = NULL; - IoPortProc[i].InsW = NULL; - IoPortProc[i].InsD = NULL; - - IoPortProc[i].OutB = NULL; - IoPortProc[i].OutW = NULL; - IoPortProc[i].OutD = NULL; - - IoPortProc[i].OutsB = NULL; - IoPortProc[i].OutsW = NULL; - IoPortProc[i].OutsD = NULL; + IoPortProc[i].IoHandlers.InB = NULL; + IoPortProc[i].IoHandlers.InW = NULL; + IoPortProc[i].IoHandlers.InD = NULL; + + IoPortProc[i].IoHandlers.InsB = NULL; + IoPortProc[i].IoHandlers.InsW = NULL; + IoPortProc[i].IoHandlers.InsD = NULL; + + IoPortProc[i].IoHandlers.OutB = NULL; + IoPortProc[i].IoHandlers.OutW = NULL; + IoPortProc[i].IoHandlers.OutD = NULL; + + IoPortProc[i].IoHandlers.OutsB = NULL; + IoPortProc[i].IoHandlers.OutsW = NULL; + IoPortProc[i].IoHandlers.OutsD = NULL; /* Save our handlers */ IoPortProc[i].VddIoHandlers = *IOhandler; // IOhandler[i]; ?????????

1 0

[akhaldi] 61367: [HLINK] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in t...
by akhaldi＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: akhaldi Date: Tue Dec 24 11:32:15 2013 New Revision: 61367 URL: http://svn.reactos.org/svn/reactos?rev=61367&view=rev Log: [HLINK] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/hlink/browse_ctx.c trunk/reactos/dll/win32/hlink/extserv.c trunk/reactos/dll/win32/hlink/hlink_main.c trunk/reactos/dll/win32/hlink/hlink_private.h trunk/reactos/dll/win32/hlink/link.c Modified: trunk/reactos/dll/win32/hlink/browse_ctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/browse_ctx… ============================================================================== --- trunk/reactos/dll/win32/hlink/browse_ctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/browse_ctx.c [iso-8859-1] Tue Dec 24 11:32:15 2013 @@ -20,10 +20,7 @@ #include "hlink_private.h" -#include <wine/debug.h> #include <wine/list.h> - -WINE_DEFAULT_DEBUG_CHANNEL(hlink); struct link_entry { Modified: trunk/reactos/dll/win32/hlink/extserv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/extserv.c?… ============================================================================== --- trunk/reactos/dll/win32/hlink/extserv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/extserv.c [iso-8859-1] Tue Dec 24 11:32:15 2013 @@ -18,11 +18,6 @@ #include "hlink_private.h" -#include <wine/debug.h> -//#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(hlink); - typedef struct { IUnknown IUnknown_inner; IAuthenticate IAuthenticate_iface; Modified: trunk/reactos/dll/win32/hlink/hlink_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_main… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/hlink_main.c [iso-8859-1] Tue Dec 24 11:32:15 2013 @@ -22,11 +22,6 @@ #include <winreg.h> #include <rpcproxy.h> -#include <hlguids.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(hlink); static HINSTANCE instance; Modified: trunk/reactos/dll/win32/hlink/hlink_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_priv… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/hlink_private.h [iso-8859-1] Tue Dec 24 11:32:15 2013 @@ -16,22 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> - #define COBJMACROS -//#include "winerror.h" #include <windef.h> #include <winbase.h> -//#include "winuser.h" #include <ole2.h> #include <hlink.h> +#include <hlguids.h> #include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(hlink); extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/hlink/link.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/link.c?rev… ============================================================================== --- trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] Tue Dec 24 11:32:15 2013 @@ -21,11 +21,6 @@ #include "hlink_private.h" #include <shellapi.h> -#include <hlguids.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(hlink); #define HLINK_SAVE_MAGIC 0x00000002 #define HLINK_SAVE_MONIKER_PRESENT 0x01

1 0

[akhaldi] 61366: [XCOPY] * Fix the resources that reference parameters. CORE-7720 #resolve #comment Fixed in r61366. Thanks !
by akhaldi＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: akhaldi Date: Tue Dec 24 11:29:44 2013 New Revision: 61366 URL: http://svn.reactos.org/svn/reactos?rev=61366&view=rev Log: [XCOPY] * Fix the resources that reference parameters. CORE-7720 #resolve #comment Fixed in r61366. Thanks ! Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/De.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/En.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Es.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Fr.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/It.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ja.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ko.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Lt.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Nl.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Pt.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ro.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ru.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Si.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Sq.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Sr.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Sv.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Uk.rc Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,18 +3,18 @@ STRINGTABLE BEGIN STRING_INVPARMS "Ugyldigt antal parametere; brug «xcopy /?» for hjelp\n" - STRING_INVPARM "Ugyldigt parameter «%s»; brug «xcopy /?» for hjelp\n" + STRING_INVPARM "Ugyldigt parameter «%1»; brug «xcopy /?» for hjelp\n" STRING_PAUSE "Tryk Enter for at begynde at kopiere\n" - STRING_SIMCOPY "%d fil(er) vil blive kopieret\n" - STRING_COPY "%d fil(er) kopieret\n" - STRING_QISDIR "Er «%s» et filnavn eller katalog\n\ + STRING_SIMCOPY "%1!d! fil(er) vil blive kopieret\n" + STRING_COPY "%1!d! fil(er) kopieret\n" + STRING_QISDIR "Er «%1» et filnavn eller katalog\n\ på destinationen?\n\ (F - Fil, K - Katalog)\n" - STRING_SRCPROMPT "%s? (Ja|Nei)\n" - STRING_OVERWRITE "Overskrive «%s»? (Ja|Nei|Alle)\n" - STRING_COPYFAIL "Kunne ikke kopiere «%s» til «%s»; fejlet med r/c %d\n" - STRING_OPENFAIL "Kunne ikke åbne «%s»\n" - STRING_READFAIL "Kunne ikke læse «%s»\n" + STRING_SRCPROMPT "%1? (Ja|Nei)\n" + STRING_OVERWRITE "Overskrive «%1»? (Ja|Nei|Alle)\n" + STRING_COPYFAIL "Kunne ikke kopiere «%1» til «%2»; fejlet med r/c %3!d!\n" + STRING_OPENFAIL "Kunne ikke åbne «%1»\n" + STRING_READFAIL "Kunne ikke læse «%1»\n" STRING_YES_CHAR "J" STRING_NO_CHAR "N" STRING_ALL_CHAR "A" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/De.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,18 +3,18 @@ STRINGTABLE BEGIN STRING_INVPARMS "Falsche Parameteranzahl - xcopy /? zeigt Hilfe an\n" - STRING_INVPARM "Unbekannter Parameter '%s' - xcopy /? zeigt Hilfe an\n" + STRING_INVPARM "Unbekannter Parameter '%1' - xcopy /? zeigt Hilfe an\n" STRING_PAUSE "Eingabetaste betÃ¤tigen, um mit dem Kopieren zu beginnen\n" - STRING_SIMCOPY "%d Datei(en) wÃ¼rden kopiert\n" - STRING_COPY "%d Datei(en) kopiert\n" - STRING_QISDIR "Ist '%s' eine Datei oder ein Verzeichnis\n\ + STRING_SIMCOPY "%1!d! Datei(en) wÃ¼rden kopiert\n" + STRING_COPY "%1!d! Datei(en) kopiert\n" + STRING_QISDIR "Ist '%1' eine Datei oder ein Verzeichnis\n\ am Zielsort?\n\ (D - Datei, V - Verzeichnis)\n" - STRING_SRCPROMPT "%s? (Ja|Nein)\n" - STRING_OVERWRITE "%s Ã¼berschreiben? (Ja|Nein|Alle)\n" - STRING_COPYFAIL "Kopieren von '%s' nach '%s' fehlgeschlagen. Fehlernummer: %d\n" - STRING_OPENFAIL "Fehler beim Ãffnen von '%s'\n" - STRING_READFAIL "Fehler beim Lesen von '%s'\n" + STRING_SRCPROMPT "%1? (Ja|Nein)\n" + STRING_OVERWRITE "%1 Ã¼berschreiben? (Ja|Nein|Alle)\n" + STRING_COPYFAIL "Kopieren von '%1' nach '%2' fehlgeschlagen. Fehlernummer: %3!d!\n" + STRING_OPENFAIL "Fehler beim Ãffnen von '%1'\n" + STRING_READFAIL "Fehler beim Lesen von '%1'\n" STRING_YES_CHAR "J" STRING_NO_CHAR "N" STRING_ALL_CHAR "A" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/En.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,18 +3,18 @@ STRINGTABLE BEGIN 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\ + STRING_INVPARM "Invalid parameter '%1' - Use xcopy /? for help\n" + STRING_PAUSE "Press <Enter> to begin copying\n" + STRING_SIMCOPY "%1!d! file(s) would be copied\n" + STRING_COPY "%1!d! file(s) copied\n" + STRING_QISDIR "Is '%1' 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_SRCPROMPT "%1? (Yes|No)\n" + STRING_OVERWRITE "Overwrite %1? (Yes|No|All)\n" + STRING_COPYFAIL "Copying of '%1' to '%2' failed with r/c %3!d!\n" + STRING_OPENFAIL "Failed to open '%1'\n" + STRING_READFAIL "Failed during reading of '%1'\n" STRING_YES_CHAR "Y" STRING_NO_CHAR "N" STRING_ALL_CHAR "A" @@ -24,7 +24,7 @@ "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\ +XCOPY source [destination] [/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\ @@ -33,7 +33,7 @@ \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\ +[/Q] Do not list names during copy, that is be 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\ @@ -47,8 +47,8 @@ [/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\ +[/M] Only copy files with archive attribute set, removes the\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" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Es.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Es.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -2,25 +2,25 @@ STRINGTABLE BEGIN - STRING_INVPARMS, "Cantidad invalido de parametros - Use xcopy /? para obtener ayuda\n" - STRING_INVPARM, "Parametro invalido '%s' - Use xcopy /? para obtener ayuda\n" - STRING_PAUSE, "Unde <enter> para iniciar la copia\n" - STRING_SIMCOPY, "%d archivo(s) seran copiado(s)\n" - STRING_COPY, "%d archivo(s) copiado(s)\n" - STRING_QISDIR, "Es '%s' un nombre de archivo o de directorio\n\ + STRING_INVPARMS "Cantidad invalido de parametros - Use xcopy /? para obtener ayuda\n" + STRING_INVPARM "Parametro invalido '%1' - Use xcopy /? para obtener ayuda\n" + STRING_PAUSE "Unde <enter> para iniciar la copia\n" + STRING_SIMCOPY "%1!d! archivo(s) seran copiado(s)\n" + STRING_COPY "%1!d! archivo(s) copiado(s)\n" + STRING_QISDIR "Es '%1' un nombre de archivo o de directorio\n\ en el punto de destino?\n\ (F - Archivo, D - Directorio)\n" - STRING_SRCPROMPT,"%s? (Si|No)\n" - STRING_OVERWRITE,"Destruir y escribir encima %s? (Si|No|Todo)\n" - STRING_COPYFAIL, "La copia de '%s' a '%s' ha faillecido con r/c %d\n" - STRING_OPENFAIL, "Impossible de abrir '%s'\n" - STRING_READFAIL, "Hubo un error durante la lectura de '%s'\n" - STRING_YES_CHAR, "S" - STRING_NO_CHAR, "N" - STRING_ALL_CHAR, "T" - STRING_FILE_CHAR,"A" - STRING_DIR_CHAR, "D" - STRING_HELP, + STRING_SRCPROMPT "%1? (Si|No)\n" + STRING_OVERWRITE "Destruir y escribir encima %1? (Si|No|Todo)\n" + STRING_COPYFAIL "La copia de '%1' a '%2' ha faillecido con r/c %3!d!\n" + STRING_OPENFAIL "Impossible de abrir '%1'\n" + STRING_READFAIL "Hubo un error durante la lectura de '%1'\n" + STRING_YES_CHAR "S" + STRING_NO_CHAR "N" + STRING_ALL_CHAR "T" + STRING_FILE_CHAR "A" + STRING_DIR_CHAR "D" + STRING_HELP "XCOPY - Copia los archivos o directorios fuentes a un destino\n\ \n\ Sintaxis:\n\ Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Fr.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,18 +3,18 @@ STRINGTABLE BEGIN STRING_INVPARMS "Nombre invalide de paramÃ¨tres - Utilisez xcopy /? pour obtenir de l'aide\n" - STRING_INVPARM "ParamÃ¨tre invalide Â«Â %sÂ Â» - Utilisez xcopy /? pour obtenir de l'aide\n" + STRING_INVPARM "ParamÃ¨tre invalide Â«Â %1Â Â» - Utilisez xcopy /? pour obtenir de l'aide\n" STRING_PAUSE "Appuyez sur ENTRÃE pour dÃ©marrer la copie\n" - STRING_SIMCOPY "%d fichier(s) seront copiÃ©s\n" - STRING_COPY "%d fichier(s) copiÃ©s\n" - STRING_QISDIR "Â«Â %sÂ Â» est-il un fichier ou un rÃ©pertoire\n\ + STRING_SIMCOPY "%1!d! fichier(s) seront copiÃ©s\n" + STRING_COPY "%1!d! fichier(s) copiÃ©s\n" + STRING_QISDIR "Â«Â %1Â Â» est-il un fichier ou un rÃ©pertoire\n\ dans la destinationÂ ?\n\ (F - Fichier, R - RÃ©pertoire)\n" - STRING_SRCPROMPT "%sÂ ? (Oui|Non)\n" - STRING_OVERWRITE "Ãcraser %sÂ ? (Oui|Non|Tous)\n" - STRING_COPYFAIL "La copie de Â«Â %sÂ Â» vers Â«Â %sÂ Â» a Ã©chouÃ© avec le code de retour %d\n" - STRING_OPENFAIL "Impossible d'ouvrir Â«Â %sÂ Â»\n" - STRING_READFAIL "Impossible de lire Â«Â %sÂ Â»\n" + STRING_SRCPROMPT "%1Â ? (Oui|Non)\n" + STRING_OVERWRITE "Ãcraser %1Â ? (Oui|Non|Tous)\n" + STRING_COPYFAIL "La copie de Â«Â %1Â Â» vers Â«Â %2Â Â» a Ã©chouÃ© avec le code de retour %3!d!\n" + STRING_OPENFAIL "Impossible d'ouvrir Â«Â %1Â Â»\n" + STRING_READFAIL "Impossible de lire Â«Â %1Â Â»\n" STRING_YES_CHAR "O" STRING_NO_CHAR "N" STRING_ALL_CHAR "T" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/It.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,18 +3,18 @@ STRINGTABLE BEGIN STRING_INVPARMS "Numero non valido di parametri - Digita xcopy /? per l'aiuto\n" - STRING_INVPARM "Parametro '%s' non valido - Digita xcopy /? per l'aiuto\n" + STRING_INVPARM "Parametro '%1' non valido - Digita xcopy /? per l'aiuto\n" STRING_PAUSE "Premi Invio per iniziare a copiare\n" - STRING_SIMCOPY "%d file saranno copiati\n" - STRING_COPY "%d file copiato/i\n" - STRING_QISDIR "'%s' Ã¨ il nome di un file o una cartella\n\ + STRING_SIMCOPY "%1!d! file saranno copiati\n" + STRING_COPY "%1!d! file copiato/i\n" + STRING_QISDIR "'%1' Ã¨ il nome di un file o una cartella\n\ nella destinazione?\n\ (F - File, C - Cartella)\n" - STRING_SRCPROMPT "%s? (SÃ¬|No)\n" - STRING_OVERWRITE "Sovrascrivere %s? (SÃ¬|No|Tutti)\n" - STRING_COPYFAIL "La copia di '%s' in '%s' Ã¨ fallita con r/c %d\n" - STRING_OPENFAIL "Impossibile aprire '%s'\n" - STRING_READFAIL "Errore durante la lettura di '%s'\n" + STRING_SRCPROMPT "%1? (SÃ¬|No)\n" + STRING_OVERWRITE "Sovrascrivere %1? (SÃ¬|No|Tutti)\n" + STRING_COPYFAIL "La copia di '%1' in '%2' Ã¨ fallita con r/c %3!d!\n" + STRING_OPENFAIL "Impossibile aprire '%1'\n" + STRING_READFAIL "Errore durante la lettura di '%1'\n" STRING_YES_CHAR "S" STRING_NO_CHAR "N" STRING_ALL_CHAR "T" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Ja.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,18 +3,18 @@ STRINGTABLE BEGIN STRING_INVPARMS "ãã©ã¡ã¼ã¿ã®æ°ãéãã¾ããxcopy /? ã§ä½¿ãæ¹ãè¡¨ç¤ºãã¾ã\n" - STRING_INVPARM "ç¡å¹ãªãã©ã¡ã¼ã¿ '%s' ã§ããxcopy /? ã§ä½¿ãæ¹ãè¡¨ç¤ºãã¾ã\n" + STRING_INVPARM "ç¡å¹ãªãã©ã¡ã¼ã¿ '%1' ã§ããxcopy /? ã§ä½¿ãæ¹ãè¡¨ç¤ºãã¾ã\n" STRING_PAUSE "ã³ãã¼ãéå§ããã«ã¯ <enter> ãæ¼ãã¦ãã ãã\n" - STRING_SIMCOPY "%d ãã¡ã¤ã«ãã³ãã¼ãããè¦è¾¼ã¿ã§ãã\n" - STRING_COPY "%d ãã¡ã¤ã«ãã³ãã¼ãã¾ãã\n" - STRING_QISDIR "éãåã® '%s' ã¯ãã¡ã¤ã«åã§ããã\n\ + STRING_SIMCOPY "%1!d! ãã¡ã¤ã«ãã³ãã¼ãããè¦è¾¼ã¿ã§ãã\n" + STRING_COPY "%1!d! ãã¡ã¤ã«ãã³ãã¼ãã¾ãã\n" + STRING_QISDIR "éãåã® '%1' ã¯ãã¡ã¤ã«åã§ããã\n\ ãã£ã¬ã¯ããªã§ãã?\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_SRCPROMPT "%1? (Yes|No)\n" + STRING_OVERWRITE "%1 ãä¸æ¸ããã¾ãã? (Yes|No|All)\n" + STRING_COPYFAIL "'%1' ãã '%2' ã¸ã®ã³ãã¼ã¯å¤±æãã¾ãããæ»ãå¤ %3!d!\n" + STRING_OPENFAIL "'%1' ãéãã¾ãã\n" + STRING_READFAIL "'%1' ã®èªã¿è¾¼ã¿ä¸ã«å¤±æãã¾ãã\n" STRING_YES_CHAR "Y" STRING_NO_CHAR "N" STRING_ALL_CHAR "A" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Ko.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,18 +3,18 @@ STRINGTABLE BEGIN STRING_INVPARMS "ì¬ë°ë¥´ì§ ìì ë§¤ê°ë³ìì ê°¯ì - xcopy /?ë¡ ëìë§ì ë³´ìì¤\n" - STRING_INVPARM "ì¬ë°ë¥´ì§ ìì ë§¤ê°ë³ì '%s' - xcopy /?ë¡ ëìë§ì ë³´ìì¤\n" + STRING_INVPARM "ì¬ë°ë¥´ì§ ìì ë§¤ê°ë³ì '%1' - xcopy /?ë¡ ëìë§ì ë³´ìì¤\n" STRING_PAUSE "<enter> ë¥¼ ëë¥´ë©´ ë³µì¬ê° ììë ê²ìëë¤\n" - STRING_SIMCOPY "%d íì¼ì´ ë³µì¬ë ê²ìëë¤\n" - STRING_COPY "%d íì¼ì´ ë³µì¬ëììµëë¤\n" - STRING_QISDIR "'%s'ì´ ë³µì¬í íì¼ì´ë ëë í ë¦¬?\n\ + STRING_SIMCOPY "%1!d! íì¼ì´ ë³µì¬ë ê²ìëë¤\n" + STRING_COPY "%1!d! íì¼ì´ ë³µì¬ëììµëë¤\n" + STRING_QISDIR "'%1'ì´ ë³µì¬í íì¼ì´ë ëë í ë¦¬?\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_SRCPROMPT "%1? (ì|ìëì¤)\n" + STRING_OVERWRITE "%1ë¥¼ ë®ì´ì°ê² ìµëê¹? (ì|ìëì¤|ëª¨ë)\n" + STRING_COPYFAIL "Copying of '%1' to '%2' failed with r/c %3!d!\n" + STRING_OPENFAIL "'%1' ì´ê¸° ì¤í¨\n" + STRING_READFAIL "'%1ë¥¼ ì½ì§ ëª»íìµëë¤'\n" STRING_YES_CHAR "Y" STRING_NO_CHAR "N" STRING_ALL_CHAR "A" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Lt.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,18 +3,18 @@ STRINGTABLE BEGIN STRING_INVPARMS "Neteisingas parametrÅ³ skaiÄius - pagalba: xcopy /?\n" - STRING_INVPARM "Neteisingas parametras â%sâ - pagalba: xcopy /?\n" + STRING_INVPARM "Neteisingas parametras â%1â - pagalba: xcopy /?\n" STRING_PAUSE "Spauskite <enter> kopijavimui pradÄti\n" - STRING_SIMCOPY "bus nukopijuota failÅ³: %d\n" - STRING_COPY "nukopijuota failÅ³: %d\n" - STRING_QISDIR, "Ar â%sâ yra failas, ar katalogas,\n\ + STRING_SIMCOPY "bus nukopijuota failÅ³: %1!d!\n" + STRING_COPY "nukopijuota failÅ³: %1!d!\n" + STRING_QISDIR "Ar â%1â yra failas, ar katalogas,\n\ ar paskirtis?\n\ (F - failas, K - katalogas)\n" - STRING_SRCPROMPT "%s? (Taip|Ne)\n" - STRING_OVERWRITE "PerraÅ¡yti %s? (Taip|Ne|Visus)\n" - STRING_COPYFAIL "â%sâ kopijavimas Ä¯ â%sâ nepavyko su r/c %d\n" - STRING_OPENFAIL "Nepavyko atverti â%sâ\n" - STRING_READFAIL "Klaida skaitant â%sâ\n" + STRING_SRCPROMPT "%1? (Taip|Ne)\n" + STRING_OVERWRITE "PerraÅ¡yti %1? (Taip|Ne|Visus)\n" + STRING_COPYFAIL "â%1â kopijavimas Ä¯ â%2â nepavyko su r/c %3!d!\n" + STRING_OPENFAIL "Nepavyko atverti â%1â\n" + STRING_READFAIL "Klaida skaitant â%1â\n" STRING_YES_CHAR "T" STRING_NO_CHAR "N" STRING_ALL_CHAR "V" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Nl.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,18 +3,18 @@ STRINGTABLE BEGIN STRING_INVPARMS "Onjuist aantal parameters - Gebruik xcopy /? om hulp te krijgen\n" - STRING_INVPARM "Onjuiste parameter '%s' - Gebruik xcopy /? om hulp te krijgen\n" + STRING_INVPARM "Onjuiste parameter '%1' - Gebruik xcopy /? om hulp te krijgen\n" STRING_PAUSE "Druk op <enter> om te beginnen met kopiÃ«ren\n" - STRING_SIMCOPY "%d bestand(en) zouden worden gekopieerd\n" - STRING_COPY "%d bestand(en) gekopieerd\n" - STRING_QISDIR "Is '%s' een bestand of een map\n\ + STRING_SIMCOPY "%1!d! bestand(en) zouden worden gekopieerd\n" + STRING_COPY "%1!d! bestand(en) gekopieerd\n" + STRING_QISDIR "Is '%1' een bestand of een map\n\ op de bestemming?\n\ (B - Bestand, D - Directory)\n" - STRING_SRCPROMPT "%s? (Ja|Nee)\n" - STRING_OVERWRITE "Overschrijven %s? (Ja|Nee|Alles)\n" - STRING_COPYFAIL "KopiÃ«ren van '%s' naar '%s' mislukt met r/c %d\n" - STRING_OPENFAIL "Fout tijdens openen van '%s'\n" - STRING_READFAIL "Fout tijdens lezen van '%s'\n" + STRING_SRCPROMPT "%1? (Ja|Nee)\n" + STRING_OVERWRITE "Overschrijven %1? (Ja|Nee|Alles)\n" + STRING_COPYFAIL "KopiÃ«ren van '%1' naar '%2' mislukt met r/c %3!d!\n" + STRING_OPENFAIL "Fout tijdens openen van '%1'\n" + STRING_READFAIL "Fout tijdens lezen van '%1'\n" STRING_YES_CHAR "J" STRING_NO_CHAR "N" STRING_ALL_CHAR "A" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,18 +3,18 @@ STRINGTABLE BEGIN STRING_INVPARMS "Ugyldig antall parametere; bruk «xcopy /?» for hjelp\n" - STRING_INVPARM "Ugyldig parameter «%s»; bruk «xcopy /?» for hjelp\n" + STRING_INVPARM "Ugyldig parameter «%1»; bruk «xcopy /?» for hjelp\n" STRING_PAUSE "Trykk Enter for å begynne å kopiere\n" - STRING_SIMCOPY "%d fil(er) ville blitt kopiert\n" - STRING_COPY "%d fil(er) kopiert\n" - STRING_QISDIR "Eer «%s» et filnevn eller katalog\n\ + STRING_SIMCOPY "%1!d! fil(er) ville blitt kopiert\n" + STRING_COPY "%1!d! fil(er) kopiert\n" + STRING_QISDIR "Eer «%1» et filnevn eller katalog\n\ i målet?\n\ (F - Fil, K - Katalog)\n" - STRING_SRCPROMPT "%s? (Ja|Nei)\n" - STRING_OVERWRITE "Skrive over «%s»? (Ja|Nei|Alle)\n" - STRING_COPYFAIL "Klarte ikke kopiere «%s» til «%s»; feilet med r/c %d\n" - STRING_OPENFAIL "Klarte ikke åpne «%s»\n" - STRING_READFAIL "Klarte ikke lese «%s»\n" + STRING_SRCPROMPT "%1? (Ja|Nei)\n" + STRING_OVERWRITE "Skrive over «%1»? (Ja|Nei|Alle)\n" + STRING_COPYFAIL "Klarte ikke kopiere «%1» til «%2»; feilet med r/c %3!d!\n" + STRING_OPENFAIL "Klarte ikke åpne «%1»\n" + STRING_READFAIL "Klarte ikke lese «%1»\n" STRING_YES_CHAR "J" STRING_NO_CHAR "N" STRING_ALL_CHAR "A" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,18 +3,18 @@ STRINGTABLE BEGIN 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_INVPARM "Nieznany parameter '%1' - 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\ + STRING_SIMCOPY "%1!d! plik(ów) zosta³oby skopiowanych\n" + STRING_COPY "%1!d! plik(ów) skopiowanych\n" + STRING_QISDIR "Czy '%1' 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_SRCPROMPT "%1? (Tak|Nie)\n" + STRING_OVERWRITE "Zast¹piæ %1? (Tak|Nie|Wszystkie)\n" + STRING_COPYFAIL "Kopiowanie '%1' do '%2' nie powiod³o siê - kod b³êdu %3!d!\n" + STRING_OPENFAIL "Nie uda³o siê otworzyæ '%1'\n" + STRING_READFAIL "B³¹d podczas czytania '%1'\n" STRING_YES_CHAR "T" STRING_NO_CHAR "N" STRING_ALL_CHAR "W" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Pt.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,18 +3,18 @@ STRINGTABLE BEGIN STRING_INVPARMS "NÃºmero de parÃ¢metros invÃ¡lido - Use xcopy /? para ajuda\n" - STRING_INVPARM "ParÃ¢metro invÃ¡lido '%s' - Use xcopy /? para ajuda\n" + STRING_INVPARM "ParÃ¢metro invÃ¡lido '%1' - Use xcopy /? para ajuda\n" STRING_PAUSE "Pressione <Enter> para iniciar a cÃ³pia\n" - STRING_SIMCOPY "%d arquivo(s) seriam copiado(s)\n" - STRING_COPY "%d arquivo(s) copiado(s)\n" - STRING_QISDIR "'%s' Ã© um arquivo ou diretÃ³rio\n\ + STRING_SIMCOPY "%1!d! arquivo(s) seriam copiado(s)\n" + STRING_COPY "%1!d! arquivo(s) copiado(s)\n" + STRING_QISDIR "'%1' Ã© um arquivo ou diretÃ³rio\n\ no alvo?\n\ (A - Arquivo, D - DirectÃ³rio)\n" - STRING_SRCPROMPT "%s? (Sim|NÃ£o)\n" - STRING_OVERWRITE "Reescrever %s? (Sim|NÃ£o|Tudo)\n" - STRING_COPYFAIL "Falha ao copiar '%s' para '%s' com r/c %d\n" - STRING_OPENFAIL "Falha ao abrir '%s'\n" - STRING_READFAIL "Falha a ler '%s'\n" + STRING_SRCPROMPT "%1? (Sim|NÃ£o)\n" + STRING_OVERWRITE "Reescrever %1? (Sim|NÃ£o|Tudo)\n" + STRING_COPYFAIL "Falha ao copiar '%1' para '%2' com r/c %3!d!\n" + STRING_OPENFAIL "Falha ao abrir '%1'\n" + STRING_READFAIL "Falha a ler '%1'\n" STRING_YES_CHAR "S" STRING_NO_CHAR "N" STRING_ALL_CHAR "T" @@ -59,26 +59,25 @@ STRINGTABLE { - STRING_INVPARMS, "NÃºmero de parÃ¢metros invÃ¡lido - Use xcopy /? para ajuda\n" - STRING_INVPARM, "ParÃ¢metro invÃ¡lido '%s' - Use xcopy /? para ajuda\n" - STRING_PAUSE, "Carregue <Enter> para iniciar cÃ³pia\n" - STRING_SIMCOPY, "%d ficheiro(s) seriam copiado(s)\n" - STRING_COPY, "%d ficheiro(s) copiado(s)\n" - STRING_QISDIR, "'%s' Ã© um ficheiro ou directÃ³rio\n\ + STRING_INVPARMS "NÃºmero de parÃ¢metros invÃ¡lido - Use xcopy /? para ajuda\n" + STRING_INVPARM "ParÃ¢metro invÃ¡lido '%1' - Use xcopy /? para ajuda\n" + STRING_PAUSE "Carregue <Enter> para iniciar cÃ³pia\n" + STRING_SIMCOPY "%1!d! ficheiro(s) seriam copiado(s)\n" + STRING_COPY "%1!d! ficheiro(s) copiado(s)\n" + STRING_QISDIR "'%1' Ã© um ficheiro ou directÃ³rio\n\ no alvo?\n\ (F - Ficheiro, D - DirectÃ³rio)\n" - STRING_SRCPROMPT,"%s? (Yes|No)\n" - STRING_OVERWRITE,"Reescrever %s? (Yes|No|All)\n" - STRING_COPYFAIL, "CÃ³pia de '%s' para '%s' falhou com r/c %d\n" - STRING_OPENFAIL, "Falhou ao abrir '%s'\n" - STRING_READFAIL, "Falhou a ler '%s'\n" - STRING_YES_CHAR, "Y" - STRING_NO_CHAR, "N" - STRING_ALL_CHAR, "A" - STRING_FILE_CHAR,"F" - STRING_DIR_CHAR, "D" - - STRING_HELP, + STRING_SRCPROMPT "%1? (Yes|No)\n" + STRING_OVERWRITE "Reescrever %1? (Yes|No|All)\n" + STRING_COPYFAIL "CÃ³pia de '%1' para '%2' falhou com r/c %3!d!\n" + STRING_OPENFAIL "Falhou ao abrir '%1'\n" + STRING_READFAIL "Falhou a ler '%1'\n" + STRING_YES_CHAR "Y" + STRING_NO_CHAR "N" + STRING_ALL_CHAR "A" + STRING_FILE_CHAR "F" + STRING_DIR_CHAR "D" + STRING_HELP "XCOPY - Copia ficheiros ou directÃ³rios para um destino\n\ \n\ Sintaxe:\n\ Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Ro.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,16 +3,16 @@ STRINGTABLE BEGIN STRING_INVPARMS "NumÄr de parametri nevalid - UtilizaÈi xcopy /? pentru ajutor\n" - STRING_INVPARM "Parametru nevalid â%sâ - UtilizaÈi xcopy /? pentru ajutor\n" + STRING_INVPARM "Parametru nevalid â%1â - UtilizaÈi xcopy /? pentru ajutor\n" STRING_PAUSE "ApÄsaÈi pe <enter> pentru a Ã®ncepe copierea\n" - STRING_SIMCOPY "%d fiÈier(e) ar fi copiat(e)\n" - STRING_COPY "%d fiÈier(e) copiat(e)\n" - STRING_QISDIR "â%sâ este un nume de fiÈier sau un director\ndin destinaÈie?\n(F - FiÈier, D - Director)\n" - STRING_SRCPROMPT "%s? (Da|Nu)\n" - STRING_OVERWRITE "Se suprascrie %s? (Da|Nu|Toate)\n" - STRING_COPYFAIL "Copierea â%sâ Ã®n â%sâ a eÈuat cu cod de retur %d\n" - STRING_OPENFAIL "Deschiderea â%sâ a eÈuat\n" - STRING_READFAIL "Citirea â%sâ a eÈuat\n" + STRING_SIMCOPY "%1!d! fiÈier(e) ar fi copiat(e)\n" + STRING_COPY "%1!d! fiÈier(e) copiat(e)\n" + STRING_QISDIR "â%1â este un nume de fiÈier sau un director\ndin destinaÈie?\n(F - FiÈier, D - Director)\n" + STRING_SRCPROMPT "%1? (Da|Nu)\n" + STRING_OVERWRITE "Se suprascrie %1? (Da|Nu|Toate)\n" + STRING_COPYFAIL "Copierea â%1â Ã®n â%2â a eÈuat cu cod de retur %3!d!\n" + STRING_OPENFAIL "Deschiderea â%1â a eÈuat\n" + STRING_READFAIL "Citirea â%1â a eÈuat\n" STRING_YES_CHAR "D" STRING_NO_CHAR "N" STRING_ALL_CHAR "T" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Ru.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -4,18 +4,18 @@ BEGIN STRING_INVPARMS "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ðµ ÑÐ¸ÑÐ»Ð¾ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² - Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ 'xcopy /?' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ\n\ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾Ð³Ð¾ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ.\n" - STRING_INVPARM "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ '%s' - Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ 'xcopy /?' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾Ð³Ð¾\n\ + STRING_INVPARM "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ '%1' - Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ 'xcopy /?' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾Ð³Ð¾\n\ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ.\n" STRING_PAUSE "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÑ <Enter>, ÑÑÐ¾Ð±Ñ Ð½Ð°ÑÐ°ÑÑ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ.\n" - STRING_SIMCOPY "%d ÑÐ°Ð¹Ð»(Ð¾Ð²) Ð±ÑÐ»Ð¾ Ð±Ñ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" - STRING_COPY "%d ÑÐ°Ð¹Ð»(Ð¾Ð²) ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" - STRING_QISDIR "'%s' ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°Ð¹Ð»Ð¾Ð¼ Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ¾Ð¹?\n\ + STRING_SIMCOPY "%1!d! ÑÐ°Ð¹Ð»(Ð¾Ð²) Ð±ÑÐ»Ð¾ Ð±Ñ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" + STRING_COPY "%1!d! ÑÐ°Ð¹Ð»(Ð¾Ð²) ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" + STRING_QISDIR "'%1' ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°Ð¹Ð»Ð¾Ð¼ Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ¾Ð¹?\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_SRCPROMPT "%1? (Yes|No)\n" + STRING_OVERWRITE "ÐÐµÑÐµÐ¿Ð¸ÑÐ°ÑÑ %1? (Yes|No|All)\n" + STRING_COPYFAIL "ÐÑÐ¸ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ð¸ '%1' Ð² '%2' Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°: %3!d!\n" + STRING_OPENFAIL "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐºÑÑÑÑ '%1'\n" + STRING_READFAIL "ÐÑÐ¸ ÑÑÐµÐ½Ð¸Ð¸ '%1' Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°\n" STRING_YES_CHAR "Y" STRING_NO_CHAR "N" STRING_ALL_CHAR "A" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Si.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,18 +3,18 @@ STRINGTABLE BEGIN STRING_INVPARMS "Neveljavno Å¡tevilo parametrov - za pomoÄ uporabite xcopy /?\n" - STRING_INVPARM "Neveljaven parameter '%s' - za pomoÄ uporabite xcopy /?\n" + STRING_INVPARM "Neveljaven parameter '%1' - za pomoÄ uporabite xcopy /?\n" STRING_PAUSE "Za zaÄetek kopiranja pritisnite <enter>\n" - STRING_SIMCOPY "Prekopiral bom %d datotek\n" - STRING_COPY "Prekopiral sem %d datotek\n" - STRING_QISDIR "Ali je '%s' ime ciljne datoteke\n\ + STRING_SIMCOPY "Prekopiral bom %1!d! datotek\n" + STRING_COPY "Prekopiral sem %1!d! datotek\n" + STRING_QISDIR "Ali je '%1' ime ciljne datoteke\n\ ali mape?\n\ (D - Datoteka, M - Mapa)\n" - STRING_SRCPROMPT "%s? (Da|Ne)\n" - STRING_OVERWRITE "Ali naj prepiÅ¡em %s? (Da|Ne|Vse)\n" - STRING_COPYFAIL "Kopiranje '%s' v '%s' ni uspelo (koda napake: %d)\n" - STRING_OPENFAIL "Napaka pri odpiranju '%s'\n" - STRING_READFAIL "Napaka pri branju '%s'\n" + STRING_SRCPROMPT "%1? (Da|Ne)\n" + STRING_OVERWRITE "Ali naj prepiÅ¡em %1? (Da|Ne|Vse)\n" + STRING_COPYFAIL "Kopiranje '%1' v '%2' ni uspelo (koda napake: %3!d!)\n" + STRING_OPENFAIL "Napaka pri odpiranju '%1'\n" + STRING_READFAIL "Napaka pri branju '%1'\n" STRING_YES_CHAR "D" STRING_NO_CHAR "N" STRING_ALL_CHAR "V" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Sq.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Sq.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -7,18 +7,18 @@ STRINGTABLE BEGIN STRING_INVPARMS "I pavlershem numri i parametrave - perdor xcopy /? per ndihmÃ«\n" - STRING_INVPARM "Parametra te pavlershme '%s' - perdor xcopy /? per ndihmÃ«\n" + STRING_INVPARM "Parametra te pavlershme '%1' - perdor xcopy /? per ndihmÃ«\n" STRING_PAUSE "Shtyp <enter> per tÃ« kopjuar\n" - STRING_SIMCOPY "%d dokumenta(t) do tÃ« kopjohen\n" - STRING_COPY "%d dokumenta(t) u kopjuan\n" - STRING_QISDIR "Ã«shtÃ« '%s' njÃ« dokument ose skedare\n\ + STRING_SIMCOPY "%1!d! dokumenta(t) do tÃ« kopjohen\n" + STRING_COPY "%1!d! dokumenta(t) u kopjuan\n" + STRING_QISDIR "Ã«shtÃ« '%1' njÃ« dokument ose skedare\n\ nÃ« ogjekt?\n\ (F - Dokument, D - SkedÃ«)\n" - STRING_SRCPROMPT "%s? (Po|Jo)\n" - STRING_OVERWRITE "Overwrite %s? (Po|Jo|TÃ« gjith)\n" - STRING_COPYFAIL "Kopje e '%s' nÃ« '%s' dÃ«shtuar me r/c %d\n" - STRING_OPENFAIL "DÃ«shtuar per tu hapur '%s'\n" - STRING_READFAIL "DÃ«shtuar duke lexuar nÃ« '%s'\n" + STRING_SRCPROMPT "%1? (Po|Jo)\n" + STRING_OVERWRITE "Overwrite %1? (Po|Jo|TÃ« gjith)\n" + STRING_COPYFAIL "Kopje e '%1' nÃ« '%2' dÃ«shtuar me r/c %3!d!\n" + STRING_OPENFAIL "DÃ«shtuar per tu hapur '%1'\n" + STRING_READFAIL "DÃ«shtuar duke lexuar nÃ« '%1'\n" STRING_YES_CHAR "P" STRING_NO_CHAR "J" STRING_ALL_CHAR "T" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Sr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Sr.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,18 +3,18 @@ STRINGTABLE BEGIN STRING_INVPARMS "ÐÐµÐ¸ÑÐ¿ÑÐ°Ð²Ð°Ð½ Ð±ÑÐ¾Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°ÑÐ°. ÐÐ¾ÑÐ¸ÑÑÐ¸ÑÐµ xcopy /? Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ\n" - STRING_INVPARM "ÐÐµÐ¸ÑÐ¿ÑÐ°Ð²Ð°Ð½ Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°Ñ â%sâ. ÐÐ¾ÑÐ¸ÑÑÐ¸ÑÐµ xcopy /? Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ\n" + STRING_INVPARM "ÐÐµÐ¸ÑÐ¿ÑÐ°Ð²Ð°Ð½ Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°Ñ â%1â. ÐÐ¾ÑÐ¸ÑÑÐ¸ÑÐµ xcopy /? Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ\n" STRING_PAUSE "ÐÑÐ¸ÑÐ¸ÑÐ½Ð¸ÑÐµ <enter> Ð´Ð° Ð·Ð°Ð¿Ð¾ÑÐ½ÐµÑÐµ ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÐµ\n" - STRING_SIMCOPY "%d Ð´Ð°ÑÐ¾ÑÐµÐºÐ°/Ðµ ÑÐµ Ð±Ð¸ÑÐ¸ ÑÐ¼Ð¾Ð¶ÐµÐ½Ð¾\n" - STRING_COPY "%d Ð´Ð°ÑÐ¾ÑÐµÐºÐ°/Ðµ ÑÐµ ÑÐ¼Ð½Ð¾Ð¶ÐµÐ½Ð¾\n" - STRING_QISDIR "ÐÐ° Ð»Ð¸ ÑÐµ â%sâ Ð½Ð°Ð·Ð¸Ð² Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð¸Ð»Ð¸ ÑÐ°ÑÑÐ¸ÐºÐ»Ð°\n\ + STRING_SIMCOPY "%1!d! Ð´Ð°ÑÐ¾ÑÐµÐºÐ°/Ðµ ÑÐµ Ð±Ð¸ÑÐ¸ ÑÐ¼Ð¾Ð¶ÐµÐ½Ð¾\n" + STRING_COPY "%1!d! Ð´Ð°ÑÐ¾ÑÐµÐºÐ°/Ðµ ÑÐµ ÑÐ¼Ð½Ð¾Ð¶ÐµÐ½Ð¾\n" + STRING_QISDIR "ÐÐ° Ð»Ð¸ ÑÐµ â%1â Ð½Ð°Ð·Ð¸Ð² Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð¸Ð»Ð¸ ÑÐ°ÑÑÐ¸ÐºÐ»Ð°\n\ Ð½Ð° Ð¾Ð´ÑÐµÐ´Ð¸ÑÑÑ?\n\ (Ð - Ð´Ð°ÑÐ¾ÑÐµÐºÐ°, Ð¤ - ÑÐ°ÑÑÐ¸ÐºÐ»Ð°)\n" - STRING_SRCPROMPT "%s? (ÐÐ°|ÐÐµ)\n" - STRING_OVERWRITE "ÐÐ°Ð¼ÐµÐ½Ð¸ÑÐ¸ %s? (ÐÐ°|ÐÐµ|Ð¡Ð²Ðµ)\n" - STRING_COPYFAIL "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÐµ â%sâ Ñ â%sâ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾ ÑÐ° r/c %d\n" - STRING_OPENFAIL "ÐÑÐ²Ð°ÑÐ°ÑÐµ â%sâ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾\n" - STRING_READFAIL "Ð§Ð¸ÑÐ°ÑÐµ â%sâ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾\n" + STRING_SRCPROMPT "%1? (ÐÐ°|ÐÐµ)\n" + STRING_OVERWRITE "ÐÐ°Ð¼ÐµÐ½Ð¸ÑÐ¸ %1? (ÐÐ°|ÐÐµ|Ð¡Ð²Ðµ)\n" + STRING_COPYFAIL "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÐµ â%1â Ñ â%2â Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾ ÑÐ° r/c %3!d!\n" + STRING_OPENFAIL "ÐÑÐ²Ð°ÑÐ°ÑÐµ â%1â Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾\n" + STRING_READFAIL "Ð§Ð¸ÑÐ°ÑÐµ â%1â Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾\n" STRING_YES_CHAR "Ð" STRING_NO_CHAR "Ð" STRING_ALL_CHAR "Ð¡" @@ -59,18 +59,18 @@ STRINGTABLE BEGIN STRING_INVPARMS "Neispravan broj parametara. Koristite xcopy /? za pomoÄ\n" - STRING_INVPARM "Neispravan parametar â%sâ. Koristite xcopy /? za pomoÄ\n" + STRING_INVPARM "Neispravan parametar â%1â. Koristite xcopy /? za pomoÄ\n" STRING_PAUSE "Pritisnite <enter> da zapoÄnete umnoÅ¾avanje\n" - STRING_SIMCOPY "%d datoteka/e Äe biti umoÅ¾eno\n" - STRING_COPY "%d datoteka/e je umnoÅ¾eno\n" - STRING_QISDIR "Da li je â%sâ naziv datoteke ili fascikla\n\ + STRING_SIMCOPY "%1!d! datoteka/e Äe biti umoÅ¾eno\n" + STRING_COPY "%1!d! datoteka/e je umnoÅ¾eno\n" + STRING_QISDIR "Da li je â%1â naziv datoteke ili fascikla\n\ na odrediÅ¡tu?\n\ (D - datoteka, F - fascikla)\n" - STRING_SRCPROMPT "%s? (Da|Ne)\n" - STRING_OVERWRITE "Zameniti %s? (Da|Ne|Sve)\n" - STRING_COPYFAIL "UmnoÅ¾avanje â%sâ u â%sâ nije uspelo sa r/c %d\n" - STRING_OPENFAIL "Otvaranje â%sâ datoteke nije uspelo\n" - STRING_READFAIL "Äitanje â%sâ datoteke nije uspelo\n" + STRING_SRCPROMPT "%1? (Da|Ne)\n" + STRING_OVERWRITE "Zameniti %1? (Da|Ne|Sve)\n" + STRING_COPYFAIL "UmnoÅ¾avanje â%1â u â%2â nije uspelo sa r/c %3!d!\n" + STRING_OPENFAIL "Otvaranje â%1â datoteke nije uspelo\n" + STRING_READFAIL "Äitanje â%1â datoteke nije uspelo\n" STRING_YES_CHAR "D" STRING_NO_CHAR "N" STRING_ALL_CHAR "S" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Sv.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,16 +3,16 @@ STRINGTABLE BEGIN STRING_INVPARMS "Ogiltigt antal parametrar - AnvÃ¤nd xcopy /? fÃ¶r hjÃ¤lp\n" - STRING_INVPARM "Ogiltig parameter '%s' - AnvÃ¤nd xcopy /? fÃ¶r hjÃ¤lp\n" + STRING_INVPARM "Ogiltig parameter '%1' - AnvÃ¤nd xcopy /? fÃ¶r hjÃ¤lp\n" STRING_PAUSE "Tryck <enter> fÃ¶r att bÃ¶rja kopiera\n" - STRING_SIMCOPY "%d fil(er) skulle kopieras\n" - STRING_COPY "%d fil(er) kopierade\n" - STRING_QISDIR "Ãr '%s' ett filnamn eller en katalog\npÃ¥ mÃ¥let?\n(F - Fil, K - Katalog)\n" - STRING_SRCPROMPT "%s? (Ja|Nej)\n" - STRING_OVERWRITE "Skriv Ã¶ver %s? (Ja|Nej|Alla)\n" - STRING_COPYFAIL "Kunde inte kopiera '%s' till '%s'; misslyckades med r/c %d\n" - STRING_OPENFAIL "Kunde inte Ã¶ppna '%s'\n" - STRING_READFAIL "Kunde inte lÃ¤sa '%s'\n" + STRING_SIMCOPY "%1!d! fil(er) skulle kopieras\n" + STRING_COPY "%1!d! fil(er) kopierade\n" + STRING_QISDIR "Ãr '%1' ett filnamn eller en katalog\npÃ¥ mÃ¥let?\n(F - Fil, K - Katalog)\n" + STRING_SRCPROMPT "%1? (Ja|Nej)\n" + STRING_OVERWRITE "Skriv Ã¶ver %1? (Ja|Nej|Alla)\n" + STRING_COPYFAIL "Kunde inte kopiera '%1' till '%2'; misslyckades med r/c %3!d!\n" + STRING_OPENFAIL "Kunde inte Ã¶ppna '%1'\n" + STRING_READFAIL "Kunde inte lÃ¤sa '%1'\n" STRING_YES_CHAR "J" STRING_NO_CHAR "N" STRING_ALL_CHAR "A" Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Uk.rc [iso-8859-1] Tue Dec 24 11:29:44 2013 @@ -3,17 +3,17 @@ STRINGTABLE BEGIN STRING_INVPARMS "ÐÐµÐ²ÑÑÐ½Ð° ÐºÑÐ»ÑÐºÑÑÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑÐ² - ÐÐ²ÐµÐ´ÑÑÑ xcopy /? Ð´Ð»Ñ Ð´Ð¾Ð²ÑÐ´ÐºÐ¸\n" - STRING_INVPARM "ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ '%s' - ÐÐ²ÐµÐ´ÑÑÑ xcopy /? Ð´Ð»Ñ Ð´Ð¾Ð²ÑÐ´ÐºÐ¸\n" + STRING_INVPARM "ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ '%1' - ÐÐ²ÐµÐ´ÑÑÑ xcopy /? Ð´Ð»Ñ Ð´Ð¾Ð²ÑÐ´ÐºÐ¸\n" STRING_PAUSE "ÐÐ°ÑÐ¸ÑÐ½ÑÑÑ <enter> ÑÐ¾Ð± Ð¿Ð¾ÑÐ°ÑÐ¸ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ\n" - STRING_SIMCOPY "%d ÑÐ°Ð¹Ð»(ÑÐ²) Ð±ÑÐ´Ðµ ÑÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ð¾\n" - STRING_COPY "%d ÑÐ°Ð¹Ð»(ÑÐ²) ÑÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ð¾\n" - STRING_QISDIR "'%s' Ñ ÑÐ°Ð¹Ð»Ð¾Ð¼ ÑÐ¸ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑÑ?\n\ + STRING_SIMCOPY "%1!d! ÑÐ°Ð¹Ð»(ÑÐ²) Ð±ÑÐ´Ðµ ÑÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ð¾\n" + STRING_COPY "%1!d! ÑÐ°Ð¹Ð»(ÑÐ²) ÑÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ð¾\n" + STRING_QISDIR "'%1' Ñ ÑÐ°Ð¹Ð»Ð¾Ð¼ ÑÐ¸ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑÑ?\n\ (F - Ð¤Ð°Ð¹Ð», D - ÐÐ¸ÑÐµÐºÑÐ¾ÑÑÑ)\n" - STRING_SRCPROMPT "%s? (Yes|No)\n" - STRING_OVERWRITE "ÐÐµÑÐµÐ¿Ð¸ÑÐ°ÑÐ¸ %s? (Yes|No|All)\n" - STRING_COPYFAIL "ÐÑÐ´ ÑÐ°Ñ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ '%s' Ð² '%s' ÑÑÐ°Ð»Ð°ÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° r/c %d\n" - STRING_OPENFAIL "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²ÑÐ´ÐºÑÐ¸ÑÐ¸ '%s'\n" - STRING_READFAIL "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° ÑÐ¸ÑÐ°Ð½Ð½Ñ '%s'\n" + STRING_SRCPROMPT "%1? (Yes|No)\n" + STRING_OVERWRITE "ÐÐµÑÐµÐ¿Ð¸ÑÐ°ÑÐ¸ %1? (Yes|No|All)\n" + STRING_COPYFAIL "ÐÑÐ´ ÑÐ°Ñ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ '%1' Ð² '%2' ÑÑÐ°Ð»Ð°ÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° r/c %3!d!\n" + STRING_OPENFAIL "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²ÑÐ´ÐºÑÐ¸ÑÐ¸ '%1'\n" + STRING_READFAIL "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° ÑÐ¸ÑÐ°Ð½Ð½Ñ '%1'\n" STRING_YES_CHAR "Y" STRING_NO_CHAR "N" STRING_ALL_CHAR "A"

1 0

[hbelusca] 61365: [NTVDM]: DOS: Implement INT 29h: DOS 2+ Fast Console Output.
by hbelusca＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: hbelusca Date: Mon Dec 23 22:01:17 2013 New Revision: 61365 URL: http://svn.reactos.org/svn/reactos?rev=61365&view=rev Log: [NTVDM]: DOS: Implement INT 29h: DOS 2+ Fast Console Output. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Mon Dec 23 22:01:17 2013 @@ -2575,6 +2575,24 @@ VdmRunning = FALSE; } +VOID WINAPI DosFastConOut(LPWORD Stack) +{ + /* + * This is the DOS 2+ Fast Console Output Interrupt. + * See Ralf Brown: http://www.ctyme.com/intr/rb-4124.htm + * for more information. + */ + UNREFERENCED_PARAMETER(Stack); + + /* + * The default handler under DOS 2.x and 3.x simply calls INT 10/AH=0Eh. + * Do better and call directly BiosPrintCharacter: it's what INT 10/AH=0Eh + * does. Otherwise we would have to set BL to DOS_CHAR_ATTRIBUTE and + * BH to Bda->VideoPage. + */ + BiosPrintCharacter(getAL(), DOS_CHAR_ATTRIBUTE, Bda->VideoPage); +} + VOID WINAPI DosInt2Fh(LPWORD Stack) { DPRINT1("DOS System Function INT 0x2F, AH = %xh, AL = %xh NOT IMPLEMENTED!\n", @@ -2731,6 +2749,7 @@ // RegisterInt32(0x22, DosInt22h ); // Termination RegisterInt32(0x23, DosBreakInterrupt); // Ctrl-C / Ctrl-Break // RegisterInt32(0x24, DosInt24h ); // Critical Error + RegisterInt32(0x29, DosFastConOut ); // DOS 2+ Fast Console Output RegisterInt32(0x2F, DosInt2Fh ); return TRUE;

1 0

[hbelusca] 61364: [NTVDM]: Add support for Windows' VDD_IO_HANDLERS in our I/O ports emulation.
by hbelusca＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: hbelusca Date: Mon Dec 23 21:16:57 2013 New Revision: 61364 URL: http://svn.reactos.org/svn/reactos?rev=61364&view=rev Log: [NTVDM]: Add support for Windows' VDD_IO_HANDLERS in our I/O ports emulation. Modified: branches/ntvdm/subsystems/ntvdm/io.c Modified: branches/ntvdm/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/io.c?rev… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/io.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/io.c [iso-8859-1] Mon Dec 23 21:16:57 2013 @@ -24,10 +24,7 @@ // a valid VDD handle if handled externally. VDD_IO_HANDLERS VddIoHandlers; - /* We use internally these members */ - // EMULATOR_IN_PROC In; - // EMULATOR_OUT_PROC Out; - + /* We use these members internally */ EMULATOR_INB_PROC InB; EMULATOR_INW_PROC InW; @@ -57,9 +54,16 @@ IOReadB(ULONG Port, PUCHAR Buffer) { - if (IoPortProc[Port].InB) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].InB) { *Buffer = IoPortProc[Port].InB(Port); + } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.inb_handler) + { + ASSERT(Port <= MAXWORD); + IoPortProc[Port].VddIoHandlers.inb_handler((WORD)Port, Buffer); } else { @@ -74,16 +78,21 @@ PUCHAR Buffer, ULONG Count) { - if (IoPortProc[Port].InsB) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].InsB) { IoPortProc[Port].InsB(Port, Buffer, Count); } - else - { - while (Count--) - { - IOReadB(Port, Buffer++); - } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.insb_handler) + { + ASSERT(Port <= MAXWORD); + ASSERT(Count <= MAXWORD); + IoPortProc[Port].VddIoHandlers.insb_handler((WORD)Port, Buffer, (WORD)Count); + } + else + { + while (Count--) IOReadB(Port, Buffer++); } } @@ -91,9 +100,16 @@ IOWriteB(ULONG Port, PUCHAR Buffer) { - if (IoPortProc[Port].OutB) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].OutB) { IoPortProc[Port].OutB(Port, *Buffer); + } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.outb_handler) + { + ASSERT(Port <= MAXWORD); + IoPortProc[Port].VddIoHandlers.outb_handler((WORD)Port, *Buffer); } else { @@ -107,16 +123,21 @@ PUCHAR Buffer, ULONG Count) { - if (IoPortProc[Port].OutsB) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].OutsB) { IoPortProc[Port].OutsB(Port, Buffer, Count); } - else - { - while (Count--) - { - IOWriteB(Port, Buffer++); - } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.outsb_handler) + { + ASSERT(Port <= MAXWORD); + ASSERT(Count <= MAXWORD); + IoPortProc[Port].VddIoHandlers.outsb_handler((WORD)Port, Buffer, (WORD)Count); + } + else + { + while (Count--) IOWriteB(Port, Buffer++); } } @@ -124,9 +145,16 @@ IOReadW(ULONG Port, PUSHORT Buffer) { - if (IoPortProc[Port].InW) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].InW) { *Buffer = IoPortProc[Port].InW(Port); + } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.inw_handler) + { + ASSERT(Port <= MAXWORD); + IoPortProc[Port].VddIoHandlers.inw_handler((WORD)Port, Buffer); } else { @@ -144,16 +172,21 @@ PUSHORT Buffer, ULONG Count) { - if (IoPortProc[Port].InsW) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].InsW) { IoPortProc[Port].InsW(Port, Buffer, Count); } - else - { - while (Count--) - { - IOReadW(Port, Buffer++); - } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.insw_handler) + { + ASSERT(Port <= MAXWORD); + ASSERT(Count <= MAXWORD); + IoPortProc[Port].VddIoHandlers.insw_handler((WORD)Port, Buffer, (WORD)Count); + } + else + { + while (Count--) IOReadW(Port, Buffer++); } } @@ -161,9 +194,16 @@ IOWriteW(ULONG Port, PUSHORT Buffer) { - if (IoPortProc[Port].OutW) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].OutW) { IoPortProc[Port].OutW(Port, *Buffer); + } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.outw_handler) + { + ASSERT(Port <= MAXWORD); + IoPortProc[Port].VddIoHandlers.outw_handler((WORD)Port, *Buffer); } else { @@ -182,16 +222,21 @@ PUSHORT Buffer, ULONG Count) { - if (IoPortProc[Port].OutsW) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].OutsW) { IoPortProc[Port].OutsW(Port, Buffer, Count); } - else - { - while (Count--) - { - IOWriteW(Port, Buffer++); - } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.outsw_handler) + { + ASSERT(Port <= MAXWORD); + ASSERT(Count <= MAXWORD); + IoPortProc[Port].VddIoHandlers.outsw_handler((WORD)Port, Buffer, (WORD)Count); + } + else + { + while (Count--) IOWriteW(Port, Buffer++); } } @@ -199,7 +244,8 @@ IOReadD(ULONG Port, PULONG Buffer) { - if (IoPortProc[Port].InD) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].InD) { *Buffer = IoPortProc[Port].InD(Port); } @@ -219,16 +265,14 @@ PULONG Buffer, ULONG Count) { - if (IoPortProc[Port].InsD) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].InsD) { IoPortProc[Port].InsD(Port, Buffer, Count); } else { - while (Count--) - { - IOReadD(Port, Buffer++); - } + while (Count--) IOReadD(Port, Buffer++); } } @@ -236,7 +280,8 @@ IOWriteD(ULONG Port, PULONG Buffer) { - if (IoPortProc[Port].OutD) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].OutD) { IoPortProc[Port].OutD(Port, *Buffer); } @@ -257,16 +302,14 @@ PULONG Buffer, ULONG Count) { - if (IoPortProc[Port].OutsD) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].OutsD) { IoPortProc[Port].OutsD(Port, Buffer, Count); } else { - while (Count--) - { - IOWriteD(Port, Buffer++); - } + while (Count--) IOWriteD(Port, Buffer++); } } @@ -285,12 +328,19 @@ IoPortProc[Port].OutB = OutHandler; else DPRINT1("IoPortProc[0x%X].OutB already registered\n", Port); + + /* We hold the I/O port internally */ + IoPortProc[Port].hVdd = INVALID_HANDLE_VALUE; } VOID UnregisterIoPort(ULONG Port) { - IoPortProc[Port].InB = NULL; - IoPortProc[Port].OutB = NULL; + /* + * Put automagically all the fields to zero: + * the hVdd gets unregistered as well as all the handlers. + */ + // IoPortProc[Port] = {NULL}; + ZeroMemory(&IoPortProc[Port], sizeof(IoPortProc[Port])); } VOID WINAPI

1 0

[akhaldi] 61363: [HID] * Do not include debug.h into the main header. CORE-7716
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 19:02:14 2013 New Revision: 61363 URL: http://svn.reactos.org/svn/reactos?rev=61363&view=rev Log: [HID] * Do not include debug.h into the main header. CORE-7716 Modified: trunk/reactos/dll/win32/hid/hid.c trunk/reactos/dll/win32/hid/precomp.h trunk/reactos/dll/win32/hid/stubs.c Modified: trunk/reactos/dll/win32/hid/hid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/hid.c?rev=61… ============================================================================== --- trunk/reactos/dll/win32/hid/hid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/hid.c [iso-8859-1] Mon Dec 23 19:02:14 2013 @@ -25,7 +25,11 @@ * UPDATE HISTORY: * 07/12/2004 Created */ + #include "precomp.h" + +#define NDEBUG +#include <debug.h> HINSTANCE hDllInstance; Modified: trunk/reactos/dll/win32/hid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/precomp.h?re… ============================================================================== --- trunk/reactos/dll/win32/hid/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/precomp.h [iso-8859-1] Mon Dec 23 19:02:14 2013 @@ -2,7 +2,6 @@ #define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> -#include <debug.h> #define NTOS_MODE_USER #include <ndk/umtypes.h> Modified: trunk/reactos/dll/win32/hid/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/stubs.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/hid/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/stubs.c [iso-8859-1] Mon Dec 23 19:02:14 2013 @@ -8,7 +8,11 @@ * UPDATE HISTORY: * 07/12/2004 Created */ + #include "precomp.h" + +#define NDEBUG +#include <debug.h> /* * @unimplemented

1 0

[akhaldi] 61362: [HHCTRL.OCX] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist...
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 18:59:26 2013 New Revision: 61362 URL: http://svn.reactos.org/svn/reactos?rev=61362&view=rev Log: [HHCTRL.OCX] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716 Modified: trunk/reactos/dll/win32/hhctrl.ocx/chm.c trunk/reactos/dll/win32/hhctrl.ocx/content.c trunk/reactos/dll/win32/hhctrl.ocx/help.c trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc trunk/reactos/dll/win32/hhctrl.ocx/index.c trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc trunk/reactos/dll/win32/hhctrl.ocx/resource.h trunk/reactos/dll/win32/hhctrl.ocx/search.c trunk/reactos/dll/win32/hhctrl.ocx/stream.c trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c Modified: trunk/reactos/dll/win32/hhctrl.ocx/chm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/chm.c… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/chm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/chm.c [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -20,13 +20,9 @@ */ #include "hhctrl.h" -#include "stream.h" #include <winreg.h> #include <shlwapi.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); /* Reads a string from the #STRINGS section in the CHM file */ static LPCSTR GetChmString(CHMInfo *chm, DWORD offset) Modified: trunk/reactos/dll/win32/hhctrl.ocx/content.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/conte… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/content.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/content.c [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -17,16 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "hhctrl.h" -#include "stream.h" + #include "resource.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); typedef enum { INSERT_NEXT, Modified: trunk/reactos/dll/win32/hhctrl.ocx/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/help.… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/help.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/help.c [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -22,15 +22,10 @@ #include "hhctrl.h" -//#include "wingdi.h" -//#include "commctrl.h" +#include <wingdi.h> #include <wininet.h> -#include "wine/debug.h" - #include "resource.h" - -WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); static LRESULT Help_OnSize(HWND hWnd); static void ExpandContract(HHInfo *pHHInfo); Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -19,24 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/debug.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "htmlhelp.h" -#include "ole2.h" -#include "rpcproxy.h" - -#define INIT_GUID #include "hhctrl.h" -WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); +#include <rpcproxy.h> HINSTANCE hhctrl_hinstance; BOOL hh_process = FALSE; Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -20,13 +20,18 @@ #ifndef HHCTRL_H #define HHCTRL_H +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #define COBJMACROS + +#include <initguid.h> #include <windef.h> #include <winbase.h> @@ -38,13 +43,14 @@ #include <mshtmhst.h> #include <commctrl.h> -#ifdef INIT_GUID -#include <initguid.h> -#endif - #include <wine/itss.h> #include <wine/unicode.h> #include <wine/list.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); + +#include "stream.h" #define WB_GOBACK 0 #define WB_GOFORWARD 1 Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -19,13 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS #include <windef.h> -//#include "winbase.h" -//#include "wingdi.h" -//#include "winnls.h" -//#include "htmlhelp.h" -//#include "resource.h" +#include <htmlhelp.h> + +#include "resource.h" #ifdef LANGUAGE_CS_CZ #include "lang/Cs.rc" Modified: trunk/reactos/dll/win32/hhctrl.ocx/index.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/index… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/index.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/index.c [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -17,15 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "hhctrl.h" -#include "stream.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); /* Fill the TreeView object corresponding to the Index items */ static void fill_index_tree(HWND hwnd, IndexItem *item) Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -20,8 +20,6 @@ * 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 "resource.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" LANGUAGE LANG_GREEK, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -20,8 +20,6 @@ * 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 "resource.h" LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -19,8 +19,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -19,8 +19,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -19,8 +19,6 @@ * 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 "resource.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -19,8 +19,6 @@ * 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 "resource.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -19,8 +19,6 @@ * 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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -19,8 +19,6 @@ * 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 "resource.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,8 +18,6 @@ * 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 "resource.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -20,8 +20,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/hhctrl.ocx/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/resou… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/resource.h [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -18,10 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <windef.h> -//#include <winbase.h> -#include <wingdi.h> -#include <htmlhelp.h> +#pragma once #define IDS_CONTENTS 1 #define IDS_INDEX 2 Modified: trunk/reactos/dll/win32/hhctrl.ocx/search.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/searc… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/search.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/search.c [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -16,15 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "hhctrl.h" -#include "stream.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); static SearchItem *SearchCHM_Folder(SearchItem *item, IStorage *pStorage, const WCHAR *folder, const char *needle); Modified: trunk/reactos/dll/win32/hhctrl.ocx/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/strea… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/stream.c [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -17,11 +17,6 @@ */ #include "hhctrl.h" -#include "stream.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); void strbuf_init(strbuf_t *buf) { Modified: trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/webbr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c [iso-8859-1] Mon Dec 23 18:59:26 2013 @@ -19,10 +19,6 @@ */ #include "hhctrl.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); typedef struct IOleClientSiteImpl {

1 0

[akhaldi] 61361: [HHCTRL.OCX] * Remove no longer needed file. CORE-7469
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 18:55:24 2013 New Revision: 61361 URL: http://svn.reactos.org/svn/reactos?rev=61361&view=rev Log: [HHCTRL.OCX] * Remove no longer needed file. CORE-7469 Removed: trunk/reactos/dll/win32/hhctrl.ocx/regsvr.c Removed: trunk/reactos/dll/win32/hhctrl.ocx/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/regsv… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/regsvr.c (removed) @@ -1,511 +0,0 @@ -/* - * self-registerable dll functions for hhctrl.ocx - * - * Copyright (C) 2004 Stefan Leichter - * - * 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 - */ - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <string.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "wingdi.h" -#include <winreg.h> -//#include "winerror.h" - -#include <ole2.h> - -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); - -/* - * Near the bottom of this file are the exported DllRegisterServer and - * DllUnregisterServer, which make all this worthwhile. - */ - -/*********************************************************************** - * interface for self-registering - */ -struct regsvr_interface -{ - IID const *iid; /* NULL for end of list */ - LPCSTR name; /* can be NULL to omit */ - IID const *base_iid; /* can be NULL to omit */ - int num_methods; /* can be <0 to omit */ - CLSID const *ps_clsid; /* can be NULL to omit */ - CLSID const *ps_clsid32; /* can be NULL to omit */ -}; - -static HRESULT register_interfaces(struct regsvr_interface const *list); -static HRESULT unregister_interfaces(struct regsvr_interface const *list); - -struct regsvr_coclass -{ - CLSID const *clsid; /* NULL for end of list */ - LPCSTR name; /* can be NULL to omit */ - LPCSTR ips; /* can be NULL to omit */ - LPCSTR ips32; /* can be NULL to omit */ - LPCSTR ips32_tmodel; /* can be NULL to omit */ - LPCSTR progid; /* can be NULL to omit */ - LPCSTR viprogid; /* can be NULL to omit */ - LPCSTR progid_extra; /* can be NULL to omit */ -}; - -static HRESULT register_coclasses(struct regsvr_coclass const *list); -static HRESULT unregister_coclasses(struct regsvr_coclass const *list); - -/*********************************************************************** - * static string constants - */ -static WCHAR const interface_keyname[10] = { - 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; -static WCHAR const base_ifa_keyname[14] = { - 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', - 'e', 0 }; -static WCHAR const num_methods_keyname[11] = { - 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; -static WCHAR const ps_clsid_keyname[15] = { - 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', - 'i', 'd', 0 }; -static WCHAR const ps_clsid32_keyname[17] = { - 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', - 'i', 'd', '3', '2', 0 }; -static WCHAR const clsid_keyname[6] = { - 'C', 'L', 'S', 'I', 'D', 0 }; -static WCHAR const curver_keyname[7] = { - 'C', 'u', 'r', 'V', 'e', 'r', 0 }; -static WCHAR const ips_keyname[13] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - 0 }; -static WCHAR const ips32_keyname[15] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - '3', '2', 0 }; -static WCHAR const progid_keyname[7] = { - 'P', 'r', 'o', 'g', 'I', 'D', 0 }; -static WCHAR const viprogid_keyname[25] = { - 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', - 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', - 0 }; -static char const tmodel_valuename[] = "ThreadingModel"; - -/*********************************************************************** - * static helper functions - */ -static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid); -static LONG register_key_defvalueW(HKEY base, WCHAR const *name, - WCHAR const *value); -static LONG register_key_defvalueA(HKEY base, WCHAR const *name, - char const *value); -static LONG register_progid(WCHAR const *clsid, - char const *progid, char const *curver_progid, - char const *name, char const *extra); - -/*********************************************************************** - * register_interfaces - */ -static HRESULT register_interfaces(struct regsvr_interface const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY interface_key; - - res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &interface_key, NULL); - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->iid; ++list) { - WCHAR buf[39]; - HKEY iid_key; - - StringFromGUID2(list->iid, buf, 39); - res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &iid_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_interface_key; - - if (list->name) { - res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, - (CONST BYTE*)(list->name), - strlen(list->name) + 1); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (list->base_iid) { - res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (0 <= list->num_methods) { - static WCHAR const fmt[3] = { '%', 'd', 0 }; - HKEY key; - - res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - - sprintfW(buf, fmt, list->num_methods); - res = RegSetValueExW(key, NULL, 0, REG_SZ, - (CONST BYTE*)buf, - (lstrlenW(buf) + 1) * sizeof(WCHAR)); - RegCloseKey(key); - - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (list->ps_clsid) { - res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (list->ps_clsid32) { - res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - error_close_iid_key: - RegCloseKey(iid_key); - } - -error_close_interface_key: - RegCloseKey(interface_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * unregister_interfaces - */ -static HRESULT unregister_interfaces(struct regsvr_interface const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY interface_key; - - res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, - KEY_READ | KEY_WRITE, &interface_key); - if (res == ERROR_FILE_NOT_FOUND) return S_OK; - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->iid; ++list) { - WCHAR buf[39]; - - StringFromGUID2(list->iid, buf, 39); - res = RegDeleteTreeW(interface_key, buf); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - } - - RegCloseKey(interface_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * register_coclasses - */ -static HRESULT register_coclasses(struct regsvr_coclass const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY coclass_key; - - res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->clsid; ++list) { - WCHAR buf[39]; - HKEY clsid_key; - - StringFromGUID2(list->clsid, buf, 39); - res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->name) { - res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, - (CONST BYTE*)(list->name), - strlen(list->name) + 1); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->ips) { - res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->ips32) { - HKEY ips32_key; - - res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, - &ips32_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, - (CONST BYTE*)list->ips32, - lstrlenA(list->ips32) + 1); - if (res == ERROR_SUCCESS && list->ips32_tmodel) - res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, - (CONST BYTE*)list->ips32_tmodel, - strlen(list->ips32_tmodel) + 1); - RegCloseKey(ips32_key); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->progid) { - res = register_key_defvalueA(clsid_key, progid_keyname, - list->progid); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = register_progid(buf, list->progid, NULL, - list->name, list->progid_extra); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->viprogid) { - res = register_key_defvalueA(clsid_key, viprogid_keyname, - list->viprogid); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = register_progid(buf, list->viprogid, list->progid, - list->name, list->progid_extra); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - error_close_clsid_key: - RegCloseKey(clsid_key); - } - -error_close_coclass_key: - RegCloseKey(coclass_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * unregister_coclasses - */ -static HRESULT unregister_coclasses(struct regsvr_coclass const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY coclass_key; - - res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, - KEY_READ | KEY_WRITE, &coclass_key); - if (res == ERROR_FILE_NOT_FOUND) return S_OK; - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->clsid; ++list) { - WCHAR buf[39]; - - StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->progid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - } - - if (list->viprogid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - } - } - -error_close_coclass_key: - RegCloseKey(coclass_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * regsvr_key_guid - */ -static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid) -{ - WCHAR buf[39]; - - StringFromGUID2(guid, buf, 39); - return register_key_defvalueW(base, name, buf); -} - -/*********************************************************************** - * regsvr_key_defvalueW - */ -static LONG register_key_defvalueW( - HKEY base, - WCHAR const *name, - WCHAR const *value) -{ - LONG res; - HKEY key; - - res = RegCreateKeyExW(base, name, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) return res; - res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, - (lstrlenW(value) + 1) * sizeof(WCHAR)); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * regsvr_key_defvalueA - */ -static LONG register_key_defvalueA( - HKEY base, - WCHAR const *name, - char const *value) -{ - LONG res; - HKEY key; - - res = RegCreateKeyExW(base, name, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) return res; - res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, - lstrlenA(value) + 1); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * regsvr_progid - */ -static LONG register_progid( - WCHAR const *clsid, - char const *progid, - char const *curver_progid, - char const *name, - char const *extra) -{ - LONG res; - HKEY progid_key; - - res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &progid_key, NULL); - if (res != ERROR_SUCCESS) return res; - - if (name) { - res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, - (CONST BYTE*)name, strlen(name) + 1); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (clsid) { - res = register_key_defvalueW(progid_key, clsid_keyname, clsid); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (curver_progid) { - res = register_key_defvalueA(progid_key, curver_keyname, - curver_progid); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (extra) { - HKEY extra_key; - - res = RegCreateKeyExA(progid_key, extra, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &extra_key, NULL); - if (res == ERROR_SUCCESS) - RegCloseKey(extra_key); - } - -error_close_progid_key: - RegCloseKey(progid_key); - return res; -} - -/*********************************************************************** - * coclass list - */ -static struct regsvr_coclass const coclass_list[] = { -/* { 41B23C28-488E-4E5C-ACE2-BB0BBABE99E8, - * "HHCtrl Object", - * NULL, - * "hhctrl.ocx", - * "Apartment" - * }, - * { 4662DAB0-D393-11D0-9A56-00C04FB68B66, - * "", - * NULL, - * "hhctrl.ocx", - * "Both" - * }, - * { ADB880A4-D8FF-11CF-9377-00AA003B7A11, - * "", - * NULL, - * "hhctrl.ocx", - * "Both" - * }, - * { ADB880A6-D8FF-11CF-9377-00AA003B7A11, - * "HHCtrl Object", - * NULL, - * "hhctrl.ocx", - * "Apartment" - * }, - */ - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * interface list - */ - -static struct regsvr_interface const interface_list[] = { - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * DllRegisterServer (HHCTRL.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = register_coclasses(coclass_list); - if (SUCCEEDED(hr)) - hr = register_interfaces(interface_list); - return hr; -} - -/*********************************************************************** - * DllUnregisterServer (HHCTRL.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = unregister_coclasses(coclass_list); - if (SUCCEEDED(hr)) - hr = unregister_interfaces(interface_list); - return hr; -}

1 0

[hbelusca] 61360: [DDK]: Define registry manipulation APIs.
by hbelusca＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: hbelusca Date: Mon Dec 23 18:34:30 2013 New Revision: 61360 URL: http://svn.reactos.org/svn/reactos?rev=61360&view=rev Log: [DDK]: Define registry manipulation APIs. Modified: branches/ntvdm/include/ddk/vddsvc.h Modified: branches/ntvdm/include/ddk/vddsvc.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/vddsvc.h?rev=… ============================================================================== --- branches/ntvdm/include/ddk/vddsvc.h [iso-8859-1] (original) +++ branches/ntvdm/include/ddk/vddsvc.h [iso-8859-1] Mon Dec 23 18:34:30 2013 @@ -26,6 +26,210 @@ #include <nt_vdd.h> #endif - +/* + * Registers manipulation + */ +PVOID WINAPI getIntelRegistersPointer(VOID); + +#ifdef __i386__ + +ULONG WINAPI getEAX(VOID); +VOID WINAPI setEAX(ULONG); +USHORT WINAPI getAX(VOID); +VOID WINAPI setAX(USHORT); +UCHAR WINAPI getAH(VOID); +VOID WINAPI setAH(UCHAR); +UCHAR WINAPI getAL(VOID); +VOID WINAPI setAL(UCHAR); + +ULONG WINAPI getEBX(VOID); +VOID WINAPI setEBX(ULONG); +USHORT WINAPI getBX(VOID); +VOID WINAPI setBX(USHORT); +UCHAR WINAPI getBH(VOID); +VOID WINAPI setBH(UCHAR); +UCHAR WINAPI getBL(VOID); +VOID WINAPI setBL(UCHAR); + +ULONG WINAPI getECX(VOID); +VOID WINAPI setECX(ULONG); +USHORT WINAPI getCX(VOID); +VOID WINAPI setCX(USHORT); +UCHAR WINAPI getCH(VOID); +VOID WINAPI setCH(UCHAR); +UCHAR WINAPI getCL(VOID); +VOID WINAPI setCL(UCHAR); + +ULONG WINAPI getEDX(VOID); +VOID WINAPI setEDX(ULONG); +USHORT WINAPI getDX(VOID); +VOID WINAPI setDX(USHORT); +UCHAR WINAPI getDH(VOID); +VOID WINAPI setDH(UCHAR); +UCHAR WINAPI getDL(VOID); +VOID WINAPI setDL(UCHAR); + + + +ULONG WINAPI getESP(VOID); +VOID WINAPI setESP(ULONG); +USHORT WINAPI getSP(VOID); +VOID WINAPI setSP(USHORT); + +ULONG WINAPI getEBP(VOID); +VOID WINAPI setEBP(ULONG); +USHORT WINAPI getBP(VOID); +VOID WINAPI setBP(USHORT); + +ULONG WINAPI getESI(VOID); +VOID WINAPI setESI(ULONG); +USHORT WINAPI getSI(VOID); +VOID WINAPI setSI(USHORT); + +ULONG WINAPI getEDI(VOID); +VOID WINAPI setEDI(ULONG); +USHORT WINAPI getDI(VOID); +VOID WINAPI setDI(USHORT); + +ULONG WINAPI getEIP(VOID); +VOID WINAPI setEIP(ULONG); +USHORT WINAPI getIP(VOID); +VOID WINAPI setIP(USHORT); + +USHORT WINAPI getCS(VOID); +VOID WINAPI setCS(USHORT); +USHORT WINAPI getSS(VOID); +VOID WINAPI setSS(USHORT); +USHORT WINAPI getDS(VOID); +VOID WINAPI setDS(USHORT); +USHORT WINAPI getES(VOID); +VOID WINAPI setES(USHORT); +USHORT WINAPI getFS(VOID); +VOID WINAPI setFS(USHORT); +USHORT WINAPI getGS(VOID); +VOID WINAPI setGS(USHORT); + +ULONG WINAPI getCF(VOID); +VOID WINAPI setCF(ULONG); +ULONG WINAPI getPF(VOID); +VOID WINAPI setPF(ULONG); +ULONG WINAPI getAF(VOID); +VOID WINAPI setAF(ULONG); +ULONG WINAPI getZF(VOID); +VOID WINAPI setZF(ULONG); +ULONG WINAPI getSF(VOID); +VOID WINAPI setSF(ULONG); +ULONG WINAPI getIF(VOID); +VOID WINAPI setIF(ULONG); +ULONG WINAPI getDF(VOID); +VOID WINAPI setDF(ULONG); +ULONG WINAPI getOF(VOID); +VOID WINAPI setOF(ULONG); + +ULONG WINAPI getEFLAGS(VOID); +VOID WINAPI setEFLAGS(ULONG); + +USHORT WINAPI getMSW(VOID); +VOID WINAPI setMSW(USHORT); + +#else + +ULONG WINAPI c_getEAX(VOID); +VOID WINAPI c_setEAX(ULONG); +USHORT WINAPI c_getAX(VOID); +VOID WINAPI c_setAX(USHORT); +UCHAR WINAPI c_getAH(VOID); +VOID WINAPI c_setAH(UCHAR); +UCHAR WINAPI c_getAL(VOID); +VOID WINAPI c_setAL(UCHAR); + +ULONG WINAPI c_getEBX(VOID); +VOID WINAPI c_setEBX(ULONG); +USHORT WINAPI c_getBX(VOID); +VOID WINAPI c_setBX(USHORT); +UCHAR WINAPI c_getBH(VOID); +VOID WINAPI c_setBH(UCHAR); +UCHAR WINAPI c_getBL(VOID); +VOID WINAPI c_setBL(UCHAR); + +ULONG WINAPI c_getECX(VOID); +VOID WINAPI c_setECX(ULONG); +USHORT WINAPI c_getCX(VOID); +VOID WINAPI c_setCX(USHORT); +UCHAR WINAPI c_getCH(VOID); +VOID WINAPI c_setCH(UCHAR); +UCHAR WINAPI c_getCL(VOID); +VOID WINAPI c_setCL(UCHAR); + +ULONG WINAPI c_getEDX(VOID); +VOID WINAPI c_setEDX(ULONG); +USHORT WINAPI c_getDX(VOID); +VOID WINAPI c_setDX(USHORT); +UCHAR WINAPI c_getDH(VOID); +VOID WINAPI c_setDH(UCHAR); +UCHAR WINAPI c_getDL(VOID); +VOID WINAPI c_setDL(UCHAR); + + + +ULONG WINAPI c_getESP(VOID); +VOID WINAPI c_setESP(ULONG); +USHORT WINAPI c_getSP(VOID); +VOID WINAPI c_setSP(USHORT); + +ULONG WINAPI c_getEBP(VOID); +VOID WINAPI c_setEBP(ULONG); +USHORT WINAPI c_getBP(VOID); +VOID WINAPI c_setBP(USHORT); + +ULONG WINAPI c_getESI(VOID); +VOID WINAPI c_setESI(ULONG); +USHORT WINAPI c_getSI(VOID); +VOID WINAPI c_setSI(USHORT); + +ULONG WINAPI c_getEDI(VOID); +VOID WINAPI c_setEDI(ULONG); +USHORT WINAPI c_getDI(VOID); +VOID WINAPI c_setDI(USHORT); + +ULONG WINAPI c_getEIP(VOID); +VOID WINAPI c_setEIP(ULONG); +USHORT WINAPI c_getIP(VOID); +VOID WINAPI c_setIP(USHORT); + +USHORT WINAPI c_getCS(VOID); +VOID WINAPI c_setCS(USHORT); +USHORT WINAPI c_getSS(VOID); +VOID WINAPI c_setSS(USHORT); +USHORT WINAPI c_getDS(VOID); +VOID WINAPI c_setDS(USHORT); +USHORT WINAPI c_getES(VOID); +VOID WINAPI c_setES(USHORT); +USHORT WINAPI c_getFS(VOID); +VOID WINAPI c_setFS(USHORT); +USHORT WINAPI c_getGS(VOID); +VOID WINAPI c_setGS(USHORT); + +ULONG WINAPI c_getCF(VOID); +VOID WINAPI c_setCF(ULONG); +ULONG WINAPI c_getPF(VOID); +VOID WINAPI c_setPF(ULONG); +ULONG WINAPI c_getAF(VOID); +VOID WINAPI c_setAF(ULONG); +ULONG WINAPI c_getZF(VOID); +VOID WINAPI c_setZF(ULONG); +ULONG WINAPI c_getSF(VOID); +VOID WINAPI c_setSF(ULONG); +ULONG WINAPI c_getIF(VOID); +VOID WINAPI c_setIF(ULONG); +ULONG WINAPI c_getDF(VOID); +VOID WINAPI c_setDF(ULONG); +ULONG WINAPI c_getOF(VOID); +VOID WINAPI c_setOF(ULONG); + +USHORT WINAPI c_getMSW(VOID); +VOID WINAPI c_setMSW(USHORT); + +#endif /* EOF */

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
31
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 December 2013