Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ablackmann] 43884: Add sample US layout keyboard layout file. Generated with MSKLC by loading the US layout in Windows 7.
by ablackmann＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: ablackmann Date: Sat Oct 31 20:51:27 2009 New Revision: 43884 URL: http://svn.reactos.org/svn/reactos?rev=43884&view=rev Log: Add sample US layout keyboard layout file. Generated with MSKLC by loading the US layout in Windows 7. Added: trunk/reactos/tools/kbdtool/test.klc Added: trunk/reactos/tools/kbdtool/test.klc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/test.klc?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/test.klc (added) +++ trunk/reactos/tools/kbdtool/test.klc [iso-8859-1] Sat Oct 31 20:51:27 2009 @@ -1,0 +1,162 @@ +KBD Layout01 "US - Custom" + +COPYRIGHT "(c) 2009 Company" + +COMPANY "Company" + +LOCALENAME "en-US" + +LOCALEID "00000409" + +VERSION 1.0 + +SHIFTSTATE + +0 //Column 4 +1 //Column 5 : Shft +2 //Column 6 : Ctrl + +LAYOUT ;an extra '@' at the end is a dead key + +//SC VK_ Cap 0 1 2 +//-- ---- ---- ---- ---- ---- + +02 1 0 1 0021 -1 // DIGIT ONE, EXCLAMATION MARK, <none> +03 2 0 2 0040 -1 // DIGIT TWO, COMMERCIAL AT, <none> +04 3 0 3 0023 -1 // DIGIT THREE, NUMBER SIGN, <none> +05 4 0 4 0024 -1 // DIGIT FOUR, DOLLAR SIGN, <none> +06 5 0 5 0025 -1 // DIGIT FIVE, PERCENT SIGN, <none> +07 6 0 6 005e -1 // DIGIT SIX, CIRCUMFLEX ACCENT, <none> +08 7 0 7 0026 -1 // DIGIT SEVEN, AMPERSAND, <none> +09 8 0 8 002a -1 // DIGIT EIGHT, ASTERISK, <none> +0a 9 0 9 0028 -1 // DIGIT NINE, LEFT PARENTHESIS, <none> +0b 0 0 0 0029 -1 // DIGIT ZERO, RIGHT PARENTHESIS, <none> +0c OEM_MINUS 0 002d 005f -1 // HYPHEN-MINUS, LOW LINE, <none> +0d OEM_PLUS 0 003d 002b -1 // EQUALS SIGN, PLUS SIGN, <none> +10 Q 1 q Q -1 // LATIN SMALL LETTER Q, LATIN CAPITAL LETTER Q, <none> +11 W 1 w W -1 // LATIN SMALL LETTER W, LATIN CAPITAL LETTER W, <none> +12 E 1 e E -1 // LATIN SMALL LETTER E, LATIN CAPITAL LETTER E, <none> +13 R 1 r R -1 // LATIN SMALL LETTER R, LATIN CAPITAL LETTER R, <none> +14 T 1 t T -1 // LATIN SMALL LETTER T, LATIN CAPITAL LETTER T, <none> +15 Y 1 y Y -1 // LATIN SMALL LETTER Y, LATIN CAPITAL LETTER Y, <none> +16 U 1 u U -1 // LATIN SMALL LETTER U, LATIN CAPITAL LETTER U, <none> +17 I 1 i I -1 // LATIN SMALL LETTER I, LATIN CAPITAL LETTER I, <none> +18 O 1 o O -1 // LATIN SMALL LETTER O, LATIN CAPITAL LETTER O, <none> +19 P 1 p P -1 // LATIN SMALL LETTER P, LATIN CAPITAL LETTER P, <none> +1a OEM_4 0 005b 007b 001b // LEFT SQUARE BRACKET, LEFT CURLY BRACKET, ESCAPE +1b OEM_6 0 005d 007d 001d // RIGHT SQUARE BRACKET, RIGHT CURLY BRACKET, INFORMATION SEPARATOR THREE +1e A 1 a A -1 // LATIN SMALL LETTER A, LATIN CAPITAL LETTER A, <none> +1f S 1 s S -1 // LATIN SMALL LETTER S, LATIN CAPITAL LETTER S, <none> +20 D 1 d D -1 // LATIN SMALL LETTER D, LATIN CAPITAL LETTER D, <none> +21 F 1 f F -1 // LATIN SMALL LETTER F, LATIN CAPITAL LETTER F, <none> +22 G 1 g G -1 // LATIN SMALL LETTER G, LATIN CAPITAL LETTER G, <none> +23 H 1 h H -1 // LATIN SMALL LETTER H, LATIN CAPITAL LETTER H, <none> +24 J 1 j J -1 // LATIN SMALL LETTER J, LATIN CAPITAL LETTER J, <none> +25 K 1 k K -1 // LATIN SMALL LETTER K, LATIN CAPITAL LETTER K, <none> +26 L 1 l L -1 // LATIN SMALL LETTER L, LATIN CAPITAL LETTER L, <none> +27 OEM_1 0 003b 003a -1 // SEMICOLON, COLON, <none> +28 OEM_7 0 0027 0022 -1 // APOSTROPHE, QUOTATION MARK, <none> +29 OEM_3 0 0060 007e -1 // GRAVE ACCENT, TILDE, <none> +2b OEM_5 0 005c 007c 001c // REVERSE SOLIDUS, VERTICAL LINE, INFORMATION SEPARATOR FOUR +2c Z 1 z Z -1 // LATIN SMALL LETTER Z, LATIN CAPITAL LETTER Z, <none> +2d X 1 x X -1 // LATIN SMALL LETTER X, LATIN CAPITAL LETTER X, <none> +2e C 1 c C -1 // LATIN SMALL LETTER C, LATIN CAPITAL LETTER C, <none> +2f V 1 v V -1 // LATIN SMALL LETTER V, LATIN CAPITAL LETTER V, <none> +30 B 1 b B -1 // LATIN SMALL LETTER B, LATIN CAPITAL LETTER B, <none> +31 N 1 n N -1 // LATIN SMALL LETTER N, LATIN CAPITAL LETTER N, <none> +32 M 1 m M -1 // LATIN SMALL LETTER M, LATIN CAPITAL LETTER M, <none> +33 OEM_COMMA 0 002c 003c -1 // COMMA, LESS-THAN SIGN, <none> +34 OEM_PERIOD 0 002e 003e -1 // FULL STOP, GREATER-THAN SIGN, <none> +35 OEM_2 0 002f 003f -1 // SOLIDUS, QUESTION MARK, <none> +39 SPACE 0 0020 0020 0020 // SPACE, SPACE, SPACE +56 OEM_102 0 005c 007c 001c // REVERSE SOLIDUS, VERTICAL LINE, INFORMATION SEPARATOR FOUR +53 DECIMAL 0 002e 002e -1 // FULL STOP, FULL STOP, + + +KEYNAME + +01 Esc +0e Backspace +0f Tab +1c Enter +1d Ctrl +2a Shift +36 "Right Shift" +37 "Num *" +38 Alt +39 Space +3a "Caps Lock" +3b F1 +3c F2 +3d F3 +3e F4 +3f F5 +40 F6 +41 F7 +42 F8 +43 F9 +44 F10 +45 Pause +46 "Scroll Lock" +47 "Num 7" +48 "Num 8" +49 "Num 9" +4a "Num -" +4b "Num 4" +4c "Num 5" +4d "Num 6" +4e "Num +" +4f "Num 1" +50 "Num 2" +51 "Num 3" +52 "Num 0" +53 "Num Del" +54 "Sys Req" +57 F11 +58 F12 +7c F13 +7d F14 +7e F15 +7f F16 +80 F17 +81 F18 +82 F19 +83 F20 +84 F21 +85 F22 +86 F23 +87 F24 + +KEYNAME_EXT + +1c "Num Enter" +1d "Right Ctrl" +35 "Num /" +37 "Prnt Scrn" +38 "Right Alt" +45 "Num Lock" +46 Break +47 Home +48 Up +49 "Page Up" +4b Left +4d Right +4f End +50 Down +51 "Page Down" +52 Insert +53 Delete +54 <00> +56 Help +5b "Left Windows" +5c "Right Windows" +5d Application + +DESCRIPTIONS + +0409 US - Custom +LANGUAGENAMES + +0409 English (United States) +ENDKBD +

1 0

[cgutman] 43883: - Don't disconnect the same socket multiple times (once per TDI_SEND IRP cancelled, once per TDI_RECEIVE IRP cancelled, once per TDI_SEND IRP on a closing socket, and once per TDI_RECEIVE IRP on a closing socket) - Implement support for graceful socket closure - Fix some memory leaks
by cgutman＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: cgutman Date: Sat Oct 31 19:46:08 2009 New Revision: 43883 URL: http://svn.reactos.org/svn/reactos?rev=43883&view=rev Log: - Don't disconnect the same socket multiple times (once per TDI_SEND IRP cancelled, once per TDI_RECEIVE IRP cancelled, once per TDI_SEND IRP on a closing socket, and once per TDI_RECEIVE IRP on a closing socket) - Implement support for graceful socket closure - Fix some memory leaks Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sat Oct 31 19:46:08 2009 @@ -102,26 +102,6 @@ TI_DbgPrint(DEBUG_IRP, ("Done Completing IRP\n")); } -VOID DispDoDisconnect( PVOID Data ) { - PDISCONNECT_TYPE DisType = (PDISCONNECT_TYPE)Data; - - TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect\n")); - TcpipRecursiveMutexEnter(&TCPLock, TRUE); - TCPDisconnect - ( DisType->Context, - DisType->Type, - NULL, - NULL, - DispDataRequestComplete, - DisType->Irp ); - TcpipRecursiveMutexLeave(&TCPLock); - TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect done\n")); - - DispDataRequestComplete(DisType->Irp, STATUS_CANCELLED, 0); - - exFreePool(DisType); -} - VOID NTAPI DispCancelRequest( PDEVICE_OBJECT Device, PIRP Irp) @@ -136,7 +116,6 @@ PTRANSPORT_CONTEXT TranContext; PFILE_OBJECT FileObject; UCHAR MinorFunction; - PDISCONNECT_TYPE DisType; TI_DbgPrint(DEBUG_IRP, ("Called.\n")); @@ -159,22 +138,8 @@ switch(MinorFunction) { case TDI_SEND: case TDI_RECEIVE: - DisType = exAllocatePool(NonPagedPool, sizeof(DISCONNECT_TYPE)); - if (DisType) - { - DisType->Type = TDI_DISCONNECT_RELEASE | - ((MinorFunction == TDI_RECEIVE) ? TDI_DISCONNECT_ABORT : 0); - DisType->Context = TranContext->Handle.ConnectionContext; - DisType->Irp = Irp; - - TCPRemoveIRP( TranContext->Handle.ConnectionContext, Irp ); - - if (!ChewCreate(DispDoDisconnect, DisType)) - exFreePool(DisType); - } - - IoReleaseCancelSpinLock(Irp->CancelIrql); - return; + TCPRemoveIRP( TranContext->Handle.ConnectionContext, Irp ); + break; case TDI_SEND_DATAGRAM: if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sat Oct 31 19:46:08 2009 @@ -44,15 +44,6 @@ Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; - /* We have to notify oskittcp of the abortion */ - TCPDisconnect - ( Connection, - TDI_DISCONNECT_RELEASE | TDI_DISCONNECT_ABORT, - NULL, - NULL, - Bucket->Request.RequestNotifyObject, - (PIRP)Bucket->Request.RequestContext ); - Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); exFreePool(Bucket); @@ -64,15 +55,6 @@ Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; - /* We have to notify oskittcp of the abortion */ - TCPDisconnect - ( Connection, - TDI_DISCONNECT_RELEASE, - NULL, - NULL, - Bucket->Request.RequestNotifyObject, - (PIRP)Bucket->Request.RequestContext ); - Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); exFreePool(Bucket); @@ -89,6 +71,8 @@ Connection); Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); + + exFreePool(Bucket); } while ((Entry = ExInterlockedRemoveHeadList( &Connection->ConnectRequest, @@ -98,6 +82,8 @@ Complete = Bucket->Request.RequestNotifyObject; Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); + + exFreePool(Bucket); } Connection->SignalState = 0; @@ -671,29 +657,17 @@ PTDI_CONNECTION_INFORMATION ReturnInfo, PTCP_COMPLETION_ROUTINE Complete, PVOID Context ) { - NTSTATUS Status; + NTSTATUS Status = STATUS_INVALID_PARAMETER; ASSERT_LOCKED(&TCPLock); TI_DbgPrint(DEBUG_TCP,("started\n")); - switch( Flags & (TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE) ) { - case 0: - case TDI_DISCONNECT_ABORT: - Flags = 0; - break; - - case TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE: - Flags = 2; - break; - - case TDI_DISCONNECT_RELEASE: - Flags = 1; - break; - } - - Status = TCPTranslateError - ( OskitTCPShutdown( Connection->SocketContext, Flags ) ); + if (Flags & TDI_DISCONNECT_RELEASE) + Status = TCPTranslateError(OskitTCPDisconnect(Connection->SocketContext)); + + if ((Flags & TDI_DISCONNECT_ABORT) || !Flags) + Status = TCPTranslateError(OskitTCPShutdown(Connection->SocketContext, FWRITE | FREAD)); TI_DbgPrint(DEBUG_TCP,("finished %x\n", Status));

1 0

[ablackmann] 43882: Implement opening the layout file and printing out the target DLL architecture. Add missing exit(0).
by ablackmann＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: ablackmann Date: Sat Oct 31 19:43:15 2009 New Revision: 43882 URL: http://svn.reactos.org/svn/reactos?rev=43882&view=rev Log: Implement opening the layout file and printing out the target DLL architecture. Add missing exit(0). Modified: trunk/reactos/tools/kbdtool/main.c Modified: trunk/reactos/tools/kbdtool/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/main.c?rev=4… ============================================================================== --- trunk/reactos/tools/kbdtool/main.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/main.c [iso-8859-1] Sat Oct 31 19:43:15 2009 @@ -21,6 +21,8 @@ ULONG gSubVersion = 40; BOOLEAN UnicodeFile, Verbose, NoLogo, FallbackDriver, SanityCheck, SourceOnly; ULONG BuildType; +PCHAR gpszFileName; +FILE* gfpInput; /* FUNCTIONS ******************************************************************/ @@ -60,6 +62,8 @@ char** argv) { CHAR Option; + PCHAR OpenFlags; + CHAR BuildOptions[16] = {0}; /* Loop for parameter */ while (TRUE) @@ -157,8 +161,62 @@ gVersion, gSubVersion); } - /* Otherwise... do something */ - printf("Zoom zoom...\n"); + /* Save the file name */ + gpszFileName = argv[optind]; + + /* Open either as binary or text */ + OpenFlags = "rb"; + if (!UnicodeFile) OpenFlags = "rt"; + + /* Open a handle to the file */ + gfpInput = fopen(gpszFileName, OpenFlags); + if (!gfpInput) + { + /* Couldn't open it */ + printf("Unable to open '%s' for read.\n", gpszFileName); + exit(1); + } + + /* Should we print out what we're doing? */ + if (!NoLogo) + { + /* Are we only building the source files? */ + if (SourceOnly) + { + /* Then there's no target architecture */ + strcpy(BuildOptions, "source files"); + } + else + { + /* Take a look at the target architecture*/ + switch (BuildType) + { + /* Print the appropriate message depending on what was chosen */ + case 0: + strcpy(BuildOptions, "i386/x86"); + break; + case 1: + strcpy(BuildOptions, "ia64"); + break; + case 2: + strcpy(BuildOptions, "amd64/x64"); + break; + case 3: + strcpy(BuildOptions, "wow64"); + break; + default: + strcpy(BuildOptions, "unknown purpose"); + break; + } + } + + /* Now inform the user */ + printf("Compiling layout information from '%s' for %s.\n", gpszFileName, BuildOptions); + } + + /* Now do something... */ + printf("Like a rock...\n"); + exit(0); } /* EOF */

1 0

[cgutman] 43881: - Implement OskitTCPDisconnect
by cgutman＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: cgutman Date: Sat Oct 31 19:15:23 2009 New Revision: 43881 URL: http://svn.reactos.org/svn/reactos?rev=43881&view=rev Log: - Implement OskitTCPDisconnect Modified: trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] Sat Oct 31 19:15:23 2009 @@ -162,6 +162,8 @@ char *buffer, int size); +int OskitTCPDisconnect(void *socket); + #undef errno void *fbsd_malloc( unsigned int bytes, char *file, unsigned line, ... ); @@ -182,4 +184,7 @@ #define OSK_MSG_PEEK 0x02 #define OSK_MSG_DONTWAIT 0x80 +#define FREAD 0x0001 +#define FWRITE 0x0002 + #endif/*OSKITTCP_H*/ Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Sat Oct 31 19:15:23 2009 @@ -236,6 +236,14 @@ return (error); } +int OskitTCPDisconnect(void *socket) +{ + if (!socket) + return OSK_ESHUTDOWN; + + return sodisconnect(socket); +} + int OskitTCPShutdown( void *socket, int disconn_type ) { if (!socket) return OSK_ESHUTDOWN;

1 0

[ablackmann] 43880: Begin implementing Keyboard Layout Compiler Tool, as requested by KJK::Hyperion. This is a UNIX-style (Win32-compatible) command-line tool that will take a standard keyboard layout file (in text) and generate the source, defininition, header and resource data for it. The second part of the tool will spawn off the compiler to build the keyboard DLL, or perhaps generate an .rbuild file to perform the work.
by ablackmann＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: ablackmann Date: Sat Oct 31 19:13:26 2009 New Revision: 43880 URL: http://svn.reactos.org/svn/reactos?rev=43880&view=rev Log: Begin implementing Keyboard Layout Compiler Tool, as requested by KJK::Hyperion. This is a UNIX-style (Win32-compatible) command-line tool that will take a standard keyboard layout file (in text) and generate the source, defininition, header and resource data for it. The second part of the tool will spawn off the compiler to build the keyboard DLL, or perhaps generate an .rbuild file to perform the work. Added: trunk/reactos/tools/kbdtool/ trunk/reactos/tools/kbdtool/kbdtool.rbuild (with props) trunk/reactos/tools/kbdtool/main.c (with props) trunk/reactos/tools/kbdtool/output.c (with props) trunk/reactos/tools/kbdtool/parser.c (with props) Modified: trunk/reactos/tools/tools.rbuild Added: trunk/reactos/tools/kbdtool/kbdtool.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/kbdtool.rbui… ============================================================================== --- trunk/reactos/tools/kbdtool/kbdtool.rbuild (added) +++ trunk/reactos/tools/kbdtool/kbdtool.rbuild [iso-8859-1] Sat Oct 31 19:13:26 2009 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name="kbdtool" type="buildtool"> + <file>main.c</file> + <file>output.c</file> + <file>parser.c</file> +</module> Propchange: trunk/reactos/tools/kbdtool/kbdtool.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/kbdtool/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/main.c?rev=4… ============================================================================== --- trunk/reactos/tools/kbdtool/main.c (added) +++ trunk/reactos/tools/kbdtool/main.c [iso-8859-1] Sat Oct 31 19:13:26 2009 @@ -1,0 +1,164 @@ +/* + * PROJECT: ReactOS Build Tools [Keyboard Layout Compiler] + * LICENSE: BSD - See COPYING.BSD in the top level directory + * FILE: tools/kbdtool/main.c + * PURPOSE: Main Logic Loop + * PROGRAMMERS: ReactOS Foundation + */ + +/* INCLUDES *******************************************************************/ + +#include <string.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include "getopt.h" +#include <host/typedefs.h> + +/* GLOBALS ********************************************************************/ + +ULONG gVersion = 3; +ULONG gSubVersion = 40; +BOOLEAN UnicodeFile, Verbose, NoLogo, FallbackDriver, SanityCheck, SourceOnly; +ULONG BuildType; + +/* FUNCTIONS ******************************************************************/ + +void +usage() +{ + /* This is who we are */ + printf("\nKbdTool v%d.%02d - convert keyboard text file to C file or a keyboard layout DLL\n\n", + gVersion, gSubVersion); + + /* This is what we do */ + printf("Usage: KbdTool [-v] [-n] [-w] [-k] [-n] [-u|a] [-i|x|m|o|s] FILE\n\n"); + printf("\t[-?] display this message\n"); + printf("\t[-n] no logo or normal build information displayed\n\n"); + printf("\t[-a] Uses non-Unicode source files (default)\n"); + printf("\t[-u] Uses Unicode source files\n\n"); + printf("\t[-v] Verbose diagnostics (and warnings, with -w)\n"); + printf("\t[-w] display extended Warnings\n\n"); + printf("\t[-x] Builds for x86 (default)\n"); + printf("\t[-i] Builds for IA64\n"); + printf("\t[-m] Builds for AMD64\n"); + printf("\t[-o] Builds for WOW64\n"); + printf("\t[-s] Generate Source files (no build)\n\n"); + printf("\tFILE The source keyboard file (required)\n\n"); + + /* Extra hints */ + printf("\t-u/-a are mutually exclusive; kbdutool will use the last one if you specify more than one.\n"); + printf("\t-i/-x/-m/-o-s will exhibit the same behavior when than one of them is specified.\n\n"); + + /* Quit */ + _exit(1); + printf("should not be here"); +} + +int +main(int argc, + char** argv) +{ + CHAR Option; + + /* Loop for parameter */ + while (TRUE) + { + /* Get the options */ + Option = getopt(argc, argv, "aAeEiIkKmMnNOosSuUvVwWxX?"); + if (Option != -1) + { + /* Check supported options */ + switch (Option) + { + /* ASCII File */ + case 'A': + case 'a': + UnicodeFile = 0; + continue; + + /* UNICODE File */ + case 'U': + case 'u': + UnicodeFile = 1; + continue; + + /* Verbose */ + case 'V': + case 'v': + Verbose = 1; + continue; + + /* No logo */ + case 'N': + case 'n': + NoLogo = 1; + continue; + + /* Fallback driver */ + case 'K': + case 'k': + FallbackDriver = 1; + continue; + + /* Sanity Check */ + case 'W': + case 'w': + SanityCheck = 1; + continue; + + /* Itanium */ + case 'I': + case 'i': + BuildType = 1; + continue; + + /* X86 */ + case 'X': + case 'x': + BuildType = 0; + continue; + + /* AMD64 */ + case 'M': + case 'm': + BuildType = 2; + continue; + + /* WOW64 */ + case 'O': + case 'o': + BuildType = 3; + continue; + + /* Source only */ + case 'S': + case 's': + SourceOnly = 1; + continue; + default: + break; + } + + /* If you got here, the options are invalid or missing */ + usage(); + } + break; + } + + /* Do we have no options? */ + if (optind == argc) usage(); + + /* Should we announce ourselves? */ + if (!NoLogo) + { + /* This is who we are */ + printf("\nKbdTool v%d.%02d - convert keyboard text file to C file or a keyboard layout DLL\n\n", + gVersion, gSubVersion); + } + + /* Otherwise... do something */ + printf("Zoom zoom...\n"); +} + +/* EOF */ Propchange: trunk/reactos/tools/kbdtool/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/kbdtool/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/output.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/output.c (added) +++ trunk/reactos/tools/kbdtool/output.c [iso-8859-1] Sat Oct 31 19:13:26 2009 @@ -1,0 +1,21 @@ +/* + * PROJECT: ReactOS Build Tools [Keyboard Layout Compiler] + * LICENSE: BSD - See COPYING.BSD in the top level directory + * FILE: tools/kbdtool/output.c + * PURPOSE: Output Logic (Source Builder) + * PROGRAMMERS: ReactOS Foundation + */ + +/* INCLUDES *******************************************************************/ + +#include <string.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <host/typedefs.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/tools/kbdtool/output.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c (added) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Sat Oct 31 19:13:26 2009 @@ -1,0 +1,21 @@ +/* + * PROJECT: ReactOS Build Tools [Keyboard Layout Compiler] + * LICENSE: BSD - See COPYING.BSD in the top level directory + * FILE: tools/kbdtool/parser.c + * PURPOSE: Parsing Logic + * PROGRAMMERS: ReactOS Foundation + */ + +/* INCLUDES *******************************************************************/ + +#include <string.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <host/typedefs.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/tools/kbdtool/parser.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/tools/tools.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.rbuild?rev=438… ============================================================================== --- trunk/reactos/tools/tools.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/tools.rbuild [iso-8859-1] Sat Oct 31 19:13:26 2009 @@ -6,6 +6,9 @@ </directory> <directory name="cdmake"> <xi:include href="cdmake/cdmake.rbuild" /> +</directory> +<directory name="kbdtool"> + <xi:include href="kbdtool/kbdtool.rbuild" /> </directory> <directory name="mkhive"> <xi:include href="mkhive/mkhive.rbuild" />

1 0

[janderwald] 43879: [KS] - Add comment for using ms portcls in ReactOS [WDMAUD_KERNEL] - Handle error [SYSAUDIO] - Fix several bugs in the mixer handling code - Disable kmixer untill all issues are resolved
by janderwald＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: janderwald Date: Sat Oct 31 19:00:05 2009 New Revision: 43879 URL: http://svn.reactos.org/svn/reactos?rev=43879&view=rev Log: [KS] - Add comment for using ms portcls in ReactOS [WDMAUD_KERNEL] - Handle error [SYSAUDIO] - Fix several bugs in the mixer handling code - Disable kmixer untill all issues are resolved Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c trunk/reactos/drivers/wdm/audio/sysaudio/control.c trunk/reactos/drivers/wdm/audio/sysaudio/pin.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Sat Oct 31 19:00:05 2009 @@ -888,6 +888,10 @@ goto ProbeMdl; } +#if 0 + // HACK for MS PORTCLS + HeaderSize = Length; +#endif /* probe user mode buffers */ if (Length && ( (!HeaderSize) || (Length % HeaderSize == 0) || ((ProbeFlags & KSPROBE_ALLOWFORMATCHANGE) && (Length == sizeof(KSSTREAM_HEADER))) ) ) { @@ -1940,7 +1944,7 @@ IN ULONG MajorFunction) { DPRINT("KsSetMajorFunctionHandler Function %x\n", MajorFunction); -#if 0 +#if 1 // HACK // for MS PORTCLS // Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Sat Oct 31 19:00:05 2009 @@ -1888,6 +1888,12 @@ } MixerLineSrc = GetSourceMixerLineByComponentType(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwComponentType); + if (!MixerLineSrc) + { + DPRINT1("Failed to find component type %x\n", DeviceInfo->u.MixLine.dwComponentType); + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + ASSERT(MixerLineSrc); /* copy cached data */ Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Sat Oct 31 19:00:05 2009 @@ -208,7 +208,7 @@ MultipleItem = (PKSMULTIPLE_ITEM)(PinRequest + 1); MultipleItem->Count = 1; - MultipleItem->Size = sizeof(KSMULTIPLE_ITEM) + ClientFormat->DataFormat.FormatSize; + MultipleItem->Size = ClientFormat->DataFormat.FormatSize; RtlMoveMemory(MultipleItem + 1, ClientFormat, ClientFormat->DataFormat.FormatSize); /* Query the miniport data intersection handler */ @@ -229,7 +229,7 @@ if (Status != STATUS_MORE_ENTRIES) { - /* Failed to data ranges */ + /* Failed to get data ranges */ return Status; } @@ -276,7 +276,7 @@ MixerFormat->WaveFormatEx.wBitsPerSample = 16; #else - MixerFormat->WaveFormatEx.nChannels = min(ClientFormat->WaveFormatEx.nSamplesPerSec, AudioRange->MaximumChannels); + MixerFormat->WaveFormatEx.nChannels = min(ClientFormat->WaveFormatEx.nChannels, AudioRange->MaximumChannels); MixerFormat->WaveFormatEx.wBitsPerSample = AudioRange->MaximumBitsPerSample; #endif Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Sat Oct 31 19:00:05 2009 @@ -17,7 +17,7 @@ PDISPATCH_CONTEXT Context; NTSTATUS Status; ULONG BytesReturned; - PFILE_OBJECT FileObject; + PFILE_OBJECT FileObject = NULL; PIO_STACK_LOCATION IoStack; DPRINT("Pin_fnDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject, Irp); @@ -131,7 +131,7 @@ PDISPATCH_CONTEXT Context; PIO_STACK_LOCATION IoStack; - DPRINT("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject, Irp); + //DPRINT("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject, Irp); /* Get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -143,7 +143,11 @@ { ZwClose(Context->Handle); } - ZwClose(Context->hMixerPin); + + if (Context->hMixerPin) + { + ZwClose(Context->hMixerPin); + } ExFreePool(Context); @@ -217,7 +221,7 @@ { NTSTATUS Status; HANDLE PinHandle; - PFILE_OBJECT FileObject; + PFILE_OBJECT FileObject = NULL; Status = KsCreatePin(KMixerHandle, PinConnect, GENERIC_READ | GENERIC_WRITE, &PinHandle); @@ -242,6 +246,7 @@ { ObDereferenceObject(FileObject); ZwClose(PinHandle); + return Status; } ObDereferenceObject(FileObject); @@ -298,6 +303,13 @@ /* Let's try to create the audio irp pin */ Status = KsCreatePin(DeviceEntry->Handle, Connect, GENERIC_READ | GENERIC_WRITE, &RealPinHandle); + if (!NT_SUCCESS(Status)) + { + /* FIXME disable kmixer + */ + return STATUS_UNSUCCESSFUL; + } +#if 0 if (!NT_SUCCESS(Status)) { /* the audio irp pin didnt accept the input format @@ -340,6 +352,7 @@ return Status; } } +#endif DeviceEntry->Pins[Connect->PinId].References = 0; @@ -348,6 +361,8 @@ DispatchContext->PinId = Connect->PinId; DispatchContext->AudioEntry = DeviceEntry; + + DPRINT1("RealPinHandle %p\n", RealPinHandle); /* Do we need to transform the audio stream */ if (OutputFormat != NULL)

1 0

[ahill] 43878: [includes] - Fix TestCD - IDeskBar is only defined when WIN32_IE >= _WIN32_IE_IE60, so ITrackShellMenu should also be defined only when WIN32_IE >= _WIN32_IE_IE60
by ahill＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: ahill Date: Sat Oct 31 17:59:33 2009 New Revision: 43878 URL: http://svn.reactos.org/svn/reactos?rev=43878&view=rev Log: [includes] - Fix TestCD - IDeskBar is only defined when WIN32_IE >= _WIN32_IE_IE60, so ITrackShellMenu should also be defined only when WIN32_IE >= _WIN32_IE_IE60 Modified: trunk/reactos/include/psdk/shobjidl.idl Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Sat Oct 31 17:59:33 2009 @@ -2701,6 +2701,7 @@ HRESULT _ResizeAllBorders(); } +cpp_quote("#if (_WIN32_IE >= _WIN32_IE_IE60)") /***************************************************************************** * ITrackShellMenu interface @@ -2724,3 +2725,5 @@ [in] RECTL *prcExclude, MP_POPUPFLAGS dwFlags); }; + +cpp_quote("#endif /* _WIN32_IE_IE60 */")

1 0

[cgutman] 43877: - Fix translation for OSK_EAGAIN/OSK_EWOULDBLOCK - Don't clear other socket state flags when enabling non-blocking mode - Remove some incorrect code that plays tricks on oskittcp
by cgutman＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: cgutman Date: Sat Oct 31 16:53:19 2009 New Revision: 43877 URL: http://svn.reactos.org/svn/reactos?rev=43877&view=rev Log: - Fix translation for OSK_EAGAIN/OSK_EWOULDBLOCK - Don't clear other socket state flags when enabling non-blocking mode - Remove some incorrect code that plays tricks on oskittcp Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sat Oct 31 16:53:19 2009 @@ -559,12 +559,12 @@ switch( OskitError ) { case 0: Status = STATUS_SUCCESS; break; - case OSK_EADDRNOTAVAIL: + case OSK_EADDRNOTAVAIL: Status = STATUS_INVALID_ADDRESS; break; case OSK_EAFNOSUPPORT: Status = STATUS_INVALID_CONNECTION; break; case OSK_ECONNREFUSED: case OSK_ECONNRESET: Status = STATUS_REMOTE_NOT_LISTENING; break; + case OSK_EWOULDBLOCK: case OSK_EINPROGRESS: Status = STATUS_PENDING; break; - case OSK_EWOULDBLOCK: Status = STATUS_CANT_WAIT; break; case OSK_EINVAL: Status = STATUS_INVALID_PARAMETER; break; case OSK_ENOMEM: case OSK_ENOBUFS: Status = STATUS_INSUFFICIENT_RESOURCES; break; Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Sat Oct 31 16:53:19 2009 @@ -118,11 +118,7 @@ int error = socreate(domain, &so, type, proto); if( !error ) { so->so_connection = context; - so->so_state = SS_NBIO; - so->so_error = 0; - so->so_q = so->so_q0 = NULL; - so->so_qlen = 0; - so->so_head = NULL; + so->so_state |= SS_NBIO; *aso = so; } return error; @@ -138,8 +134,6 @@ int error = 0; int tcp_flags = 0; - *OutLen = 0; - OS_DbgPrint(OSK_MID_TRACE, ("so->so_state %x\n", ((struct socket *)connection)->so_state)); @@ -147,21 +141,21 @@ if( Flags & OSK_MSG_DONTWAIT ) tcp_flags |= MSG_DONTWAIT; if( Flags & OSK_MSG_PEEK ) tcp_flags |= MSG_PEEK; - uio.uio_resid = Len; - uio.uio_iov = &iov; - uio.uio_rw = UIO_READ; - uio.uio_iovcnt = 1; iov.iov_len = Len; iov.iov_base = (char *)Data; + uio.uio_iov = &iov; + uio.uio_iovcnt = 1; + uio.uio_offset = 0; + uio.uio_resid = Len; + uio.uio_segflg = UIO_SYSSPACE; + uio.uio_rw = UIO_READ; + uio.uio_procp = NULL; OS_DbgPrint(OSK_MID_TRACE,("Reading %d bytes from TCP:\n", Len)); error = soreceive( connection, NULL, &uio, NULL, NULL /* SCM_RIGHTS */, &tcp_flags ); - - if( error == 0 ) { - *OutLen = Len - uio.uio_resid; - } + *OutLen = Len - uio.uio_resid; return error; } @@ -280,10 +274,7 @@ uio.uio_procp = NULL; error = sosend( socket, NULL, &uio, NULL, NULL, 0 ); - if (OSK_EWOULDBLOCK == error) { - ((struct socket *) socket)->so_snd.sb_flags |= SB_WAIT; - } - *OutLen = uio.uio_offset; + *OutLen = Len - uio.uio_resid; return error; }

1 0

[gschneider] 43876: [usetup] Update Italian and Spanish resources too, translations by Gabriel ilardi
by gschneider＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: gschneider Date: Sat Oct 31 16:24:00 2009 New Revision: 43876 URL: http://svn.reactos.org/svn/reactos?rev=43876&view=rev Log: [usetup] Update Italian and Spanish resources too, translations by Gabriel ilardi Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/it-IT.h Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sat Oct 31 16:24:00 2009 @@ -987,7 +987,7 @@ { 8, 12, - "Instalar cargador de arranque en el disco duro (MBR).", + "Instalar cargador de arranque en el disco duro (sector de boot).", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sat Oct 31 16:24:00 2009 @@ -987,7 +987,7 @@ { 8, 12, - "Installazione del bootloader sul disco fisso (MBR).", + "Installazione del bootloader sul disco fisso (settore di avvio).", TEXT_STYLE_NORMAL }, {

1 0

[hpoussin] 43875: [freeldr/WINLDR] Simplify freeldr.ini syntax for common cases - If boot type is not specified, autodetect bootsector and Windows types - Try to automatically detect version of loaded Windows - Accept boot options after name of OS - Separate loading and scanning of system hive As a result, lines like "multi(0)disk(0)rdisk(0)partition(1)\WINNT="Windows NT4" /DEBUG /BREAK" work
by hpoussin＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: hpoussin Date: Sat Oct 31 16:09:03 2009 New Revision: 43875 URL: http://svn.reactos.org/svn/reactos?rev=43875&view=rev Log: [freeldr/WINLDR] Simplify freeldr.ini syntax for common cases - If boot type is not specified, autodetect bootsector and Windows types - Try to automatically detect version of loaded Windows - Accept boot options after name of OS - Separate loading and scanning of system hive As a result, lines like "multi(0)disk(0)rdisk(0)partition(1)\WINNT="Windows NT4" /DEBUG /BREAK" work Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/include/winldr.h trunk/reactos/boot/freeldr/freeldr/oslist.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Sat Oct 31 16:09:03 2009 @@ -22,6 +22,7 @@ VOID RunLoader(VOID) { CHAR SettingValue[80]; + CHAR BootType[80]; ULONG_PTR SectionId; ULONG OperatingSystemCount; PCSTR *OperatingSystemSectionNames; @@ -98,53 +99,49 @@ if (IniOpenSection(SectionName, &SectionId)) { // Try to read the boot type - IniReadSettingByName(SectionId, "BootType", SettingValue, sizeof(SettingValue)); - } - - if (SettingValue[0] == ANSI_NULL && SectionName[0] != ANSI_NULL) + IniReadSettingByName(SectionId, "BootType", BootType, sizeof(BootType)); + } + else + BootType[0] = ANSI_NULL; + + if (BootType[0] == ANSI_NULL && SectionName[0] != ANSI_NULL) { // Try to infere boot type value #ifdef __i386__ - CHAR LastChar; - LastChar = SectionName[strlen(SectionName) - 1]; - if (LastChar == '\\' || - (strstr(SectionName, ")partition(") != NULL && - strstr(SectionName, ")partition(0)") == NULL)) + ULONG FileId; + if (ArcOpen((CHAR*)SectionName, OpenReadOnly, &FileId) == ESUCCESS) { - strcpy(SettingValue, "Partition"); - } - else if (LastChar == ')' || LastChar == ':') - { - strcpy(SettingValue, "Drive"); - } - else if (TRUE) - { - strcpy(SettingValue, "BootSector"); + ArcClose(FileId); + strcpy(BootType, "BootSector"); } else #endif { - strcpy(SettingValue, "Windows2003"); + strcpy(BootType, "Windows"); } } + // Get OS setting value + IniOpenSection("Operating Systems", &SectionId); + IniReadSettingByName(SectionId, SectionName, SettingValue, sizeof(SettingValue)); + // Install the drive mapper according to this sections drive mappings #ifdef __i386__ DriveMapMapDrivesInSection(SectionName); #endif - if (_stricmp(SettingValue, "ReactOS") == 0) + if (_stricmp(BootType, "ReactOS") == 0) { LoadAndBootReactOS(SectionName); } #ifdef FREELDR_REACTOS_SETUP - else if (_stricmp(SettingValue, "ReactOSSetup") == 0) + else if (_stricmp(BootType, "ReactOSSetup") == 0) { // In future we could pass the selected OS details through this // to have different install methods, etc. LoadReactOSSetup(); } #ifdef __i386__ - else if (_stricmp(SettingValue, "ReactOSSetup2") == 0) + else if (_stricmp(BootType, "ReactOSSetup2") == 0) { // WinLdr-style boot LoadReactOSSetup2(); @@ -152,27 +149,31 @@ #endif #endif #ifdef __i386__ + else if (_stricmp(BootType, "Windows") == 0) + { + LoadAndBootWindows(SectionName, SettingValue, 0); + } else if (_stricmp(SettingValue, "WindowsNT40") == 0) { - LoadAndBootWindows(SectionName, _WIN32_WINNT_NT4); + LoadAndBootWindows(BootType, SettingValue, _WIN32_WINNT_NT4); } else if (_stricmp(SettingValue, "Windows2003") == 0) { - LoadAndBootWindows(SectionName, _WIN32_WINNT_WS03); + LoadAndBootWindows(BootType, SettingValue, _WIN32_WINNT_WS03); } else if (_stricmp(SettingValue, "Linux") == 0) { - LoadAndBootLinux(SectionName, OperatingSystemDisplayNames[SelectedOperatingSystem]); + LoadAndBootLinux(BootType, OperatingSystemDisplayNames[SelectedOperatingSystem]); } else if (_stricmp(SettingValue, "BootSector") == 0) { LoadAndBootBootSector(SectionName); } - else if (_stricmp(SettingValue, "Partition") == 0) + else if (_stricmp(BootType, "Partition") == 0) { LoadAndBootPartition(SectionName); } - else if (_stricmp(SettingValue, "Drive") == 0) + else if (_stricmp(BootType, "Drive") == 0) { LoadAndBootDrive(SectionName); } Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] Sat Oct 31 16:09:03 2009 @@ -27,7 +27,9 @@ // ReactOS Loading Functions // /////////////////////////////////////////////////////////////////////////////////////// -VOID LoadAndBootWindows(PCSTR OperatingSystemName, USHORT OperatingSystemVersion); +VOID LoadAndBootWindows(PCSTR OperatingSystemName, + PSTR SettingsValue, + USHORT OperatingSystemVersion); /* Entry-point to kernel */ typedef VOID (NTAPI *KERNEL_ENTRY_POINT) (PLOADER_PARAMETER_BLOCK LoaderBlock); @@ -77,8 +79,11 @@ PVOID GdtIdt); // wlregistry.c -BOOLEAN WinLdrLoadAndScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath); +BOOLEAN WinLdrInitSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + IN LPCSTR DirectoryPath); + +BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + IN LPCSTR DirectoryPath); /* FIXME: Should be moved to NDK, and respective ACPI header files */ Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/oslis… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/oslist.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/oslist.c [iso-8859-1] Sat Oct 31 16:09:03 2009 @@ -169,29 +169,28 @@ BOOLEAN RemoveQuotes(PCHAR QuotedString) { CHAR TempString[200]; + PCHAR p; + PSTR Start; // - // If this string is not quoted then return FALSE + // Skip spaces up to " // - if ((QuotedString[0] != '\"') && (QuotedString[strlen(QuotedString)-1] != '\"')) - { - return FALSE; - } + p = QuotedString; + while (*p == ' ' || *p == '"') + p++; + Start = p; - if (QuotedString[0] == '\"') - { - strcpy(TempString, (QuotedString + 1)); - } - else - { - strcpy(TempString, QuotedString); - } + // + // Go up to next " + // + while (*p != '"' && *p != ANSI_NULL) + p++; + *p = ANSI_NULL; - if (TempString[strlen(TempString)-1] == '\"') - { - TempString[strlen(TempString)-1] = '\0'; - } - + // + // Copy result + // + strcpy(TempString, Start); strcpy(QuotedString, TempString); return TRUE; Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sat Oct 31 16:09:03 2009 @@ -383,11 +383,34 @@ } +USHORT +WinLdrDetectVersion() +{ + LONG rc; + FRLDRHKEY hKey; + + rc = RegOpenKey( + NULL, + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\Terminal Server", + &hKey); + if (rc != ERROR_SUCCESS) + { + // Key doesn't exist; assume NT 4.0 + return _WIN32_WINNT_NT4; + } + + // We may here want to read the value of ProductVersion + return _WIN32_WINNT_WS03; +} + + VOID -LoadAndBootWindows(PCSTR OperatingSystemName, USHORT OperatingSystemVersion) -{ - CHAR MsgBuffer[256]; - CHAR FullPath[MAX_PATH], SystemRoot[MAX_PATH], BootPath[MAX_PATH]; +LoadAndBootWindows(PCSTR OperatingSystemName, + PSTR SettingsValue, + USHORT OperatingSystemVersion) +{ + BOOLEAN HasSection; + char FullPath[MAX_PATH], SystemRoot[MAX_PATH], BootPath[MAX_PATH]; CHAR FileName[MAX_PATH]; CHAR BootOptions[256]; PCHAR File; @@ -403,27 +426,18 @@ ULONG PcrBasePage=0; ULONG TssBasePage=0; - //sprintf(MsgBuffer,"Booting Microsoft(R) Windows(R) OS version '%04x' is not implemented yet", OperatingSystemVersion); - //UiMessageBox(MsgBuffer); - // Open the operating system section // specified in the .ini file - if (!IniOpenSection(OperatingSystemName, &SectionId)) - { - sprintf(MsgBuffer,"Operating System section '%s' not found in freeldr.ini", OperatingSystemName); - UiMessageBox(MsgBuffer); - return; - } + HasSection = IniOpenSection(OperatingSystemName, &SectionId); UiDrawBackdrop(); UiDrawStatusText("Detecting Hardware..."); UiDrawProgressBarCenter(1, 100, "Loading Windows..."); - /* Make sure the system path is set in the .ini file */ - if (!IniReadSettingByName(SectionId, "SystemPath", FullPath, sizeof(FullPath))) - { - UiMessageBox("System path not specified for selected operating system."); - return; + /* Read the system path is set in the .ini file */ + if (!HasSection || !IniReadSettingByName(SectionId, "SystemPath", FullPath, sizeof(FullPath))) + { + strcpy(FullPath, OperatingSystemName); } /* Special case for LiveCD */ @@ -440,10 +454,16 @@ strcat(SystemRoot, "\\"); /* Read booting options */ - if (!IniReadSettingByName(SectionId, "Options", BootOptions, sizeof(BootOptions))) - { - /* Nothing read, make the string empty */ - strcpy(BootOptions, ""); + if (!HasSection || !IniReadSettingByName(SectionId, "Options", BootOptions, sizeof(BootOptions))) + { + /* Get options after the title */ + const CHAR*p = SettingsValue; + while (*p == ' ' || *p == '"') + p++; + while (*p != '\0' && *p != '"') + p++; + strcpy(BootOptions, p); + DPRINTM(DPRINT_WINDOWS,"BootOptions: '%s'\n", BootOptions); } // @@ -485,6 +505,13 @@ /* Detect hardware */ UseRealHeap = TRUE; LoaderBlock->ConfigurationRoot = MachHwDetect(); + + /* Load Hive */ + Status = WinLdrInitSystemHive(LoaderBlock, BootPath); + DPRINTM(DPRINT_WINDOWS, "SYSTEM hive loaded with status %d\n", Status); + + if (OperatingSystemVersion == 0) + OperatingSystemVersion = WinLdrDetectVersion(); /* Load kernel */ strcpy(FileName, BootPath); @@ -526,9 +553,9 @@ if (KdComDTE) WinLdrScanImportDescriptorTable(LoaderBlock, FileName, KdComDTE); - /* Load Hive, and then NLS data, OEM font, and prepare boot drivers list */ - Status = WinLdrLoadAndScanSystemHive(LoaderBlock, BootPath); - DPRINTM(DPRINT_WINDOWS, "SYSTEM hive loaded and scanned with status %d\n", Status); + /* Load NLS data, OEM font, and prepare boot drivers list */ + Status = WinLdrScanSystemHive(LoaderBlock, BootPath); + DPRINTM(DPRINT_WINDOWS, "SYSTEM hive scanned with status %d\n", Status); /* Load boot drivers */ Status = WinLdrLoadBootDrivers(LoaderBlock, BootPath); Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] Sat Oct 31 16:09:03 2009 @@ -124,42 +124,51 @@ return TRUE; } -BOOLEAN WinLdrLoadAndScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath) +BOOLEAN WinLdrInitSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + IN LPCSTR DirectoryPath) +{ + CHAR SearchPath[1024]; + BOOLEAN Status; + + // There is a simple logic here: try to load usual hive (system), if it + // fails, then give system.alt a try, and finally try a system.sav + + // FIXME: For now we only try system + strcpy(SearchPath, DirectoryPath); + strcat(SearchPath, "SYSTEM32\\CONFIG\\"); + Status = WinLdrLoadSystemHive(LoaderBlock, SearchPath, "SYSTEM"); + + // Fail if failed... + if (!Status) + return FALSE; + + // Initialize in-memory registry + RegInitializeRegistry(); + + // Import what was loaded + Status = RegImportBinaryHive((PCHAR)VaToPa(LoaderBlock->RegistryBase), LoaderBlock->RegistryLength); + if (!Status) + { + UiMessageBox("Importing binary hive failed!"); + return FALSE; + } + + // Initialize the 'CurrentControlSet' link + if (RegInitCurrentControlSet(FALSE) != ERROR_SUCCESS) + { + UiMessageBox("Initializing CurrentControlSet link failed!"); + return FALSE; + } + + return TRUE; +} + +BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + IN LPCSTR DirectoryPath) { CHAR SearchPath[1024]; CHAR AnsiName[256], OemName[256], LangName[256]; BOOLEAN Status; - - // There is a simple logic here: try to load usual hive (system), if it - // fails, then give system.alt a try, and finally try a system.sav - - // FIXME: For now we only try system - strcpy(SearchPath, DirectoryPath); - strcat(SearchPath, "SYSTEM32\\CONFIG\\"); - Status = WinLdrLoadSystemHive(LoaderBlock, SearchPath, "SYSTEM"); - - // Fail if failed... - if (!Status) - return FALSE; - - // Initialize in-memory registry - RegInitializeRegistry(); - - // Import what was loaded - Status = RegImportBinaryHive((PCHAR)VaToPa(LoaderBlock->RegistryBase), LoaderBlock->RegistryLength); - if (!Status) - { - UiMessageBox("Importing binary hive failed!"); - return FALSE; - } - - // Initialize the 'CurrentControlSet' link - if (RegInitCurrentControlSet(FALSE) != ERROR_SUCCESS) - { - UiMessageBox("Initializing CurrentControlSet link failed!"); - return FALSE; - } // Scan registry and prepare boot drivers list WinLdrScanRegistry(LoaderBlock, DirectoryPath);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs