Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[tkreuzer] 70407: [FREELDR/AMD64] Save parameter registers (rcx, rdx) before calling CallRealMode. Patch by andy-123, applied to a secondary location by me. CORE-10511 #resolve #comment Thanks. I a...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 21 19:36:10 2015 New Revision: 70407 URL: http://svn.reactos.org/svn/reactos?rev=70407&view=rev Log: [FREELDR/AMD64] Save parameter registers (rcx, rdx) before calling CallRealMode. Patch by andy-123, applied to a secondary location by me. CORE-10511 #resolve #comment Thanks. I added the same fix to PnpBiosGet below. Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/pnpbios.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/pnpbios.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/pnpbios.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/pnpbios.S [iso-8859-1] Mon Dec 21 19:36:10 2015 @@ -104,9 +104,17 @@ PUBLIC PnpBiosGetDeviceNodeCount PnpBiosGetDeviceNodeCount: + /* Save param-regs */ + push rcx + push rdx + /* Call the real mode function */ mov bx, FNID_PnpBiosGetDeviceNodeCount call CallRealMode + + /* Restore param-regs */ + pop rdx + pop rcx xor eax, eax mov ax, [BSS_PnpNodeSize] @@ -140,9 +148,15 @@ and eax, HEX(0f) mov word ptr [BSS_PnpBiosBufferOffset], ax + /* Save rcx */ + push rcx + /* Call the real mode function */ mov bx, FNID_PnpBiosGetDeviceNode call CallRealMode + + /* Restore rcx */ + pop rcx /* update node number */ mov al, byte ptr [BSS_PnpNodeNumber]

9 years

[ekohl] 70406: [USERENV] Hack, that fixes the "Volatile Environment" bug by deleting the "Volatile Environment" key before the user hive is unloaded. CORE-10705

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Dec 20 22:30:51 2015 New Revision: 70406 URL: http://svn.reactos.org/svn/reactos?rev=70406&view=rev Log: [USERENV] Hack, that fixes the "Volatile Environment" bug by deleting the "Volatile Environment" key before the user hive is unloaded. CORE-10705 Modified: trunk/reactos/dll/win32/userenv/profile.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Sun Dec 20 22:30:51 2015 @@ -539,8 +539,8 @@ return FALSE; } - wcscpy(lpProfileDir, szProfilePath); - } + wcscpy(lpProfileDir, szProfilePath); + } *lpcchSize = dwLength; @@ -667,8 +667,8 @@ return FALSE; } - wcscpy(lpProfileDir, szProfilePath); - } + wcscpy(lpProfileDir, szProfilePath); + } *lpcchSize = dwLength; @@ -1309,6 +1309,25 @@ return FALSE; } + /* HACK */ + { + HKEY hUserKey; + + Error = RegOpenKeyExW(HKEY_USERS, + SidString.Buffer, + 0, + KEY_WRITE, + &hUserKey); + if (Error == ERROR_SUCCESS) + { + RegDeleteKeyW(hUserKey, + L"Volatile Environment"); + + RegCloseKey(hUserKey); + } + } + /* End of HACK */ + /* Unload the hive */ Error = RegUnLoadKeyW(HKEY_USERS, SidString.Buffer);

9 years

[hbelusca] 70405: [KDCOM] Do not use the "LoaderBlock->u.I386.CommonDataArea; " hack to use FreeLdr's DbgPrint function inside KDCOM, for the simple reason that while it works when KDCOM just initia...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 20 16:21:59 2015 New Revision: 70405 URL: http://svn.reactos.org/svn/reactos?rev=70405&view=rev Log: [KDCOM] Do not use the "LoaderBlock->u.I386.CommonDataArea;" hack to use FreeLdr's DbgPrint function inside KDCOM, for the simple reason that while it works when KDCOM just initializes, the memory area where FreeLdr's DbgPrint function is, gets erased when ReactOS is running. As a result, all attempts to call the DbgPrint function when tracing something in KDCOM at the end of life of ReactOS, just fails lamentably (it hangs). We therefore cannot rely on external code to provide us with DbgPrint. Instead, implement a very simple DbgPrint function inside KDCOM, as done by KDGDB. The KD serial port serving for debugging KDCOM is chosen dynamically amongst the other free COM ports. This needs to be also fixed in KDVM. [KDGDB] Instead of hardcoding the KD serial port number serving for debugging KDGDB, determine it dynamically amongst the other free COM ports. Modified: trunk/reactos/drivers/base/kdcom/kdcom.c trunk/reactos/drivers/base/kdcom/kddll.c trunk/reactos/drivers/base/kdcom/kddll.h trunk/reactos/drivers/base/kdcom/kdserial.c trunk/reactos/drivers/base/kdgdb/kdcom.c Modified: trunk/reactos/drivers/base/kdcom/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.c [iso-8859-1] Sun Dec 20 16:21:59 2015 @@ -10,11 +10,9 @@ #include <cportlib/cportlib.h> #include <arc/arc.h> +#include <stdio.h> #include <stdlib.h> #include <ndk/halfuncs.h> - -#define NDEBUG -#include <debug.h> /* Serial debug connection */ #define DEFAULT_DEBUG_PORT 2 /* COM2 */ @@ -36,11 +34,52 @@ #error Unknown architecture #endif +#define MAX_COM_PORTS (sizeof(BaseArray) / sizeof(BaseArray[0]) - 1) + /* GLOBALS ********************************************************************/ +CPPORT KdComPort; +ULONG KdComPortIrq = 0; // Not used at the moment. +#ifdef KDDEBUG CPPORT KdDebugComPort; -ULONG KdDebugComPortIrq = 0; // Not used at the moment. - +#endif + +/* DEBUGGING ******************************************************************/ + +#ifdef KDDEBUG +ULONG KdpDbgPrint(const char *Format, ...) +{ + va_list ap; + int Length; + char* ptr; + CHAR Buffer[512]; + + va_start(ap, Format); + Length = _vsnprintf(Buffer, sizeof(Buffer), Format, ap); + va_end(ap); + + /* Check if we went past the buffer */ + if (Length == -1) + { + /* Terminate it if we went over-board */ + Buffer[sizeof(Buffer) - 1] = '\n'; + + /* Put maximum */ + Length = sizeof(Buffer); + } + + ptr = Buffer; + while (Length--) + { + if (*ptr == '\n') + CpPutByte(&KdDebugComPort, '\r'); + + CpPutByte(&KdDebugComPort, *ptr++); + } + + return 0; +} +#endif /* FUNCTIONS ******************************************************************/ @@ -83,7 +122,7 @@ KDDBGPRINT("KdpPortInitialize, Port = COM%ld\n", ComPortNumber); - Status = CpInitialize(&KdDebugComPort, + Status = CpInitialize(&KdComPort, UlongToPtr(BaseArray[ComPortNumber]), ComPortBaudRate); if (!NT_SUCCESS(Status)) @@ -92,7 +131,7 @@ } else { - KdComPortInUse = KdDebugComPort.Address; + KdComPortInUse = KdComPort.Address; return STATUS_SUCCESS; } } @@ -113,13 +152,9 @@ PCHAR CommandLine, PortString, BaudString, IrqString; ULONG Value; - /* Check if e have a LoaderBlock */ + /* Check if we have a LoaderBlock */ if (LoaderBlock) { - /* HACK */ - KdpDbgPrint = LoaderBlock->u.I386.CommonDataArea; - KDDBGPRINT("KdDebuggerInitialize0\n"); - /* Get the Command Line */ CommandLine = LoaderBlock->LoadOptions; @@ -191,10 +226,36 @@ { /* Read and set it */ Value = atol(IrqString + 1); - if (Value) KdDebugComPortIrq = Value; + if (Value) KdComPortIrq = Value; } } } + +#ifdef KDDEBUG + /* + * Try to find a free COM port and use it as the KD debugging port. + * NOTE: Inspired by reactos/boot/freeldr/freeldr/comm/rs232.c, Rs232PortInitialize(...) + */ + { + /* + * Start enumerating COM ports from the last one to the first one, + * and break when we find a valid port. + * If we reach the first element of the list, the invalid COM port, + * then it means that no valid port was found. + */ + ULONG ComPort; + for (ComPort = MAX_COM_PORTS; ComPort > 0; ComPort--) + { + /* Check if the port exist; skip the KD port */ + if ((ComPort != ComPortNumber) && CpDoesPortExist(UlongToPtr(BaseArray[ComPort]))) + break; + } + if (ComPort != 0) + CpInitialize(&KdDebugComPort, UlongToPtr(BaseArray[ComPort]), DEFAULT_BAUD_RATE); + } +#endif + + KDDBGPRINT("KdDebuggerInitialize0\n"); /* Initialize the port */ return KdpPortInitialize(ComPortNumber, ComPortBaudRate); @@ -219,21 +280,28 @@ KdpSendByte(IN UCHAR Byte) { /* Send the byte */ - CpPutByte(&KdDebugComPort, Byte); + CpPutByte(&KdComPort, Byte); } KDP_STATUS NTAPI KdpPollByte(OUT PUCHAR OutByte) { + USHORT Status; + /* Poll the byte */ - if (CpGetByte(&KdDebugComPort, OutByte, FALSE, FALSE) == CP_GET_SUCCESS) - { - return KDP_PACKET_RECEIVED; - } - else - { - return KDP_PACKET_TIMEOUT; + Status = CpGetByte(&KdComPort, OutByte, FALSE, FALSE); + switch (Status) + { + case CP_GET_SUCCESS: + return KDP_PACKET_RECEIVED; + + case CP_GET_NODATA: + return KDP_PACKET_TIMEOUT; + + case CP_GET_ERROR: + default: + return KDP_PACKET_RESEND; } } @@ -241,14 +309,21 @@ NTAPI KdpReceiveByte(OUT PUCHAR OutByte) { + USHORT Status; + /* Get the byte */ - if (CpGetByte(&KdDebugComPort, OutByte, TRUE, FALSE) == CP_GET_SUCCESS) - { - return KDP_PACKET_RECEIVED; - } - else - { - return KDP_PACKET_TIMEOUT; + Status = CpGetByte(&KdComPort, OutByte, TRUE, FALSE); + switch (Status) + { + case CP_GET_SUCCESS: + return KDP_PACKET_RECEIVED; + + case CP_GET_NODATA: + return KDP_PACKET_TIMEOUT; + + case CP_GET_ERROR: + default: + return KDP_PACKET_RESEND; } } Modified: trunk/reactos/drivers/base/kdcom/kddll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kddll.c… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] Sun Dec 20 16:21:59 2015 @@ -8,12 +8,8 @@ #include "kddll.h" -#define NDEBUG -#include <debug.h> - /* GLOBALS ********************************************************************/ -PFNDBGPRNT KdpDbgPrint = NULL; ULONG CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; ULONG RemotePacketId = INITIAL_PACKET_ID; Modified: trunk/reactos/drivers/base/kdcom/kddll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kddll.h… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kddll.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kddll.h [iso-8859-1] Sun Dec 20 16:21:59 2015 @@ -13,22 +13,20 @@ #include <ntifs.h> #include <windbgkd.h> -//#define KDDEBUG /* uncomment to enable debugging this dll */ - -typedef ULONG (*PFNDBGPRNT)(const char *Format, ...); -extern PFNDBGPRNT KdpDbgPrint; +// #define KDDEBUG /* uncomment to enable debugging this dll */ #ifndef KDDEBUG #define KDDBGPRINT(...) #else +extern ULONG KdpDbgPrint(const char* Format, ...); #define KDDBGPRINT KdpDbgPrint #endif typedef enum { KDP_PACKET_RECEIVED = 0, - KDP_PACKET_TIMEOUT = 1, - KDP_PACKET_RESEND = 2 + KDP_PACKET_TIMEOUT = 1, + KDP_PACKET_RESEND = 2 } KDP_STATUS; VOID Modified: trunk/reactos/drivers/base/kdcom/kdserial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdseria… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdserial.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdserial.c [iso-8859-1] Sun Dec 20 16:21:59 2015 @@ -7,9 +7,6 @@ */ #include "kddll.h" - -#define NDEBUG -#include <debug.h> /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/drivers/base/kdgdb/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdcom.c [iso-8859-1] Sun Dec 20 16:21:59 2015 @@ -32,6 +32,8 @@ #error Unknown architecture #endif +#define MAX_COM_PORTS (sizeof(BaseArray) / sizeof(BaseArray[0]) - 1) + /* GLOBALS ********************************************************************/ CPPORT KdComPort; @@ -40,6 +42,42 @@ CPPORT KdDebugComPort; #endif +/* DEBUGGING ******************************************************************/ + +#ifdef KDDEBUG +ULONG KdpDbgPrint(const char *Format, ...) +{ + va_list ap; + int Length; + char* ptr; + CHAR Buffer[512]; + + va_start(ap, Format); + Length = _vsnprintf(Buffer, sizeof(Buffer), Format, ap); + va_end(ap); + + /* Check if we went past the buffer */ + if (Length == -1) + { + /* Terminate it if we went over-board */ + Buffer[sizeof(Buffer) - 1] = '\n'; + + /* Put maximum */ + Length = sizeof(Buffer); + } + + ptr = Buffer; + while (Length--) + { + if (*ptr == '\n') + CpPutByte(&KdDebugComPort, '\r'); + + CpPutByte(&KdDebugComPort, *ptr++); + } + + return 0; +} +#endif /* FUNCTIONS ******************************************************************/ @@ -190,8 +228,27 @@ } #ifdef KDDEBUG - /* Use DEBUGPORT=COM1 if you want to debug KDGDB, as we use COM2 for debugging it */ - CpInitialize(&KdDebugComPort, UlongToPtr(BaseArray[2]), DEFAULT_BAUD_RATE); + /* + * Try to find a free COM port and use it as the KD debugging port. + * NOTE: Inspired by reactos/boot/freeldr/freeldr/comm/rs232.c, Rs232PortInitialize(...) + */ + { + /* + * Start enumerating COM ports from the last one to the first one, + * and break when we find a valid port. + * If we reach the first element of the list, the invalid COM port, + * then it means that no valid port was found. + */ + ULONG ComPort; + for (ComPort = MAX_COM_PORTS; ComPort > 0; ComPort--) + { + /* Check if the port exist; skip the KD port */ + if ((ComPort != ComPortNumber) && CpDoesPortExist(UlongToPtr(BaseArray[ComPort]))) + break; + } + if (ComPort != 0) + CpInitialize(&KdDebugComPort, UlongToPtr(BaseArray[ComPort]), DEFAULT_BAUD_RATE); + } #endif /* Initialize the port */ @@ -273,34 +330,4 @@ return KdPacketTimedOut; } -#ifdef KDDEBUG -ULONG KdpDbgPrint(const char* Format, ...) -{ - va_list ap; - static CHAR Buffer[512]; - char* ptr; - int Length; - - va_start(ap, Format); - Length = _vsnprintf(Buffer, sizeof(Buffer), Format, ap); - va_end(ap); - - /* Check if we went past the buffer */ - if (Length == -1) - { - /* Terminate it if we went over-board */ - Buffer[sizeof(Buffer) - 1] = '\n'; - - /* Put maximum */ - Length = sizeof(Buffer); - } - - ptr = Buffer; - while (Length--) - CpPutByte(&KdDebugComPort, *ptr++); - - return 0; -} -#endif - /* EOF */

9 years

[hbelusca] 70404: [NTOS:KDBG]: Sync back the code that I copied in FreeLdr (r70403) for COM port selection.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 20 02:53:30 2015 New Revision: 70404 URL: http://svn.reactos.org/svn/reactos?rev=70404&view=rev Log: [NTOS:KDBG]: Sync back the code that I copied in FreeLdr (r70403) for COM port selection. Modified: trunk/reactos/ntoskrnl/kd/i386/kdbg.c Modified: trunk/reactos/ntoskrnl/kd/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/i386/kdbg.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd/i386/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/i386/kdbg.c [iso-8859-1] Sun Dec 20 02:53:30 2015 @@ -28,13 +28,14 @@ #error Unknown architecture #endif +#define MAX_COM_PORTS (sizeof(BaseArray) / sizeof(BaseArray[0]) - 1) + /* STATIC VARIABLES ***********************************************************/ // static CPPORT DefaultPort = {0, 0, 0}; /* The COM port must only be initialized once! */ // static BOOLEAN PortInitialized = FALSE; - /* REACTOS FUNCTIONS **********************************************************/ @@ -58,7 +59,6 @@ /* * Find the port if needed */ - SIZE_T i; if (!PortInitialized) { @@ -72,12 +72,11 @@ * If we reach the first element of the list, the invalid COM port, * then it means that no valid port was found. */ - for (i = sizeof(BaseArray) / sizeof(BaseArray[0]) - 1; i > 0; i--) + for (ComPortNumber = MAX_COM_PORTS; ComPortNumber > 0; ComPortNumber--) { - if (CpDoesPortExist(UlongToPtr(BaseArray[i]))) + if (CpDoesPortExist(UlongToPtr(BaseArray[ComPortNumber]))) { - PortInformation->Address = DefaultPort.Address = BaseArray[i]; - ComPortNumber = (ULONG)i; + PortInformation->Address = DefaultPort.Address = BaseArray[ComPortNumber]; break; } }

9 years

[hbelusca] 70403: [FREELDR] - Allow to specify in freeldr.ini the debugging port parameters, similarly to what NTLDR allows to do: http://naesten.blogspot.fr/2010/07/undocumented-debug-section-in-b...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 20 02:06:40 2015 New Revision: 70403 URL: http://svn.reactos.org/svn/reactos?rev=70403&view=rev Log: [FREELDR] - Allow to specify in freeldr.ini the debugging port parameters, similarly to what NTLDR allows to do: http://naesten.blogspot.fr/2010/07/undocumented-debug-section-in-bootini.ht… - Update the FREELDR.INI example file to reflect these changes. - Because some FreeLdr components, that need to be initialized before the debugging port parameters can be read from freeldr.ini, use debugging features, we still need to choose some default parameters. For serial ports, we select the possible port starting from COM4 down to COM1. CORE-9023 #comment Revision 70403: Allow to specify a debugging port in freeldr.ini . Modified: trunk/reactos/boot/freeldr/FREELDR.INI trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/cmdline.c trunk/reactos/boot/freeldr/freeldr/comm/rs232.c trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/include/cmdline.h trunk/reactos/boot/freeldr/freeldr/include/debug.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/FREELDR.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/FREELDR.INI?r… ============================================================================== --- trunk/reactos/boot/freeldr/FREELDR.INI [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/FREELDR.INI [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -29,6 +29,7 @@ ; [FREELOADER] Section Commands: ; +; Debug - FreeLoader debugging port parameters, e.g. /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 ; MessageBox - displays the specified text in a message box upon bootup ; MessageLine - adds a new line of text to a message box (must come before MessageBox command) ; TitleText - text that is displayed in the title box @@ -50,15 +51,15 @@ ; [OS-General] Section Commands: ; -; BootType - sets the boot type: ReactOS, Linux, BootSector, Partition, Drive -; BootPath - ARC path e.g. multi(0)disk(0)rdisk(x)partition(y) +; BootType - sets the boot type: Windows, WindowsNT40, Windows2003, Linux, BootSector, Partition, Drive, ReactOSSetup +; BootPath - ARC path, e.g. multi(0)disk(0)rdisk(x)partition(y) ; DriveMap - maps a BIOS drive number to another (i.e. DriveMap=hd1,hd0 maps harddisk1 to harddisk0 or DriveMap=fd1,fd0) ; [BootSector OSType] Section Commands: ; ; BootSector - sets the filename of the bootsector to be loaded -; [ReactOS OSType] Section Commands: +; [Windows(NT40|2003) OSType] Section Commands: ; ; SystemPath - sets the system root path (must be a valid ARC - Path): ; multi(0)disk(0)rdisk(0)partition(1)\reactos @@ -110,7 +111,7 @@ ; Load ReactOS from harddisk (drive C:) [ReactOSHD] -BootType=ReactOS +BootType=Windows2003 SystemPath=multi(0)disk(0)rdisk(0)partition(1)\reactos Options=/DEBUGPORT=SCREEN Kernel=\REACTOS\SYSTEM32\NTOSKRNL.EXE @@ -118,14 +119,14 @@ ; Load ReactOS from floppy (drive A:) [ReactOSFloppy] -BootType=ReactOS +BootType=Windows2003 SystemPath=multi(0)disk(0)fdisk(0) Options=/DEBUGPORT=SCREEN Kernel=\reactos\NTOSKRNL.EXE Hal=\reactos\HAL.DLL ;[ReactOS (Debug)] -;BootType=ReactOS +;BootType=Windows2003 ;SystemPath=multi(0)disk(0)rdisk(0)partition(1)\reactos ;Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=19200 ;Kernel=\NTOSKRNL.EXE 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] Sun Dec 20 02:06:40 2015 @@ -20,6 +20,7 @@ /* INCLUDES *******************************************************************/ #include <freeldr.h> +#include <debug.h> /* GLOBALS ********************************************************************/ @@ -131,7 +132,7 @@ if (DefaultOSName != NULL) { - for (Idx = 0; Idx<OperatingSystemCount; Idx++) + for (Idx = 0; Idx < OperatingSystemCount; Idx++) { if (_stricmp(DefaultOSName, OperatingSystemList[Idx].SystemPartition) == 0) { @@ -208,6 +209,9 @@ return; } + /* Debugger main initialization */ + DebugInit(TRUE); + if (!IniOpenSection("FreeLoader", &SectionId)) { UiMessageBoxCritical("Section [FreeLoader] not found in freeldr.ini."); @@ -216,6 +220,7 @@ TimeOut = GetTimeOut(); + /* UI main initialization */ if (!UiInitialize(TRUE)) { UiMessageBoxCritical("Unable to initialize UI."); Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cmdli… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cmdline.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/cmdline.c [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -14,24 +14,60 @@ typedef struct tagCMDLINEINFO { - const char *DefaultOperatingSystem; + PCCH DebugString; + PCCH DefaultOperatingSystem; LONG TimeOut; } CMDLINEINFO, *PCMDLINEINFO; +CCHAR DebugString[256]; CCHAR DefaultOs[256]; CMDLINEINFO CmdLineInfo; /* FUNCTIONS ******************************************************************/ VOID -CmdLineParse(IN PCHAR CmdLine) +CmdLineParse(IN PCCH CmdLine) { PCHAR End, Setting; ULONG_PTR Length, Offset = 0; /* Set defaults */ + CmdLineInfo.DebugString = NULL; CmdLineInfo.DefaultOperatingSystem = NULL; CmdLineInfo.TimeOut = -1; + + /* + * Get debug string, in the following format: + * "debug=option1=XXX;option2=YYY;..." + * and translate it into the format: + * "OPTION1=XXX OPTION2=YYY ..." + */ + Setting = strstr(CmdLine, "debug="); + if (Setting) + { + /* Check if there are more command-line parameters following */ + Setting += sizeof("debug=") + sizeof(ANSI_NULL); + End = strstr(Setting, " "); + if (End) + Length = End - Setting; + else + Length = sizeof(DebugString); + + /* Copy the debug string and upcase it */ + strncpy(DebugString, Setting, Length); + DebugString[Length - 1] = ANSI_NULL; + _strupr(DebugString); + + /* Replace all separators ';' by spaces */ + Setting = DebugString; + while (*Setting) + { + if (*Setting == ';') *Setting = ' '; + Setting++; + } + + CmdLineInfo.DebugString = DebugString; + } /* Get timeout */ Setting = strstr(CmdLine, "timeout="); @@ -43,7 +79,7 @@ Setting = strstr(CmdLine, "defaultos="); if (Setting) { - /* Check if there's more command-line parameters following */ + /* Check if there are more command-line parameters following */ Setting += sizeof("defaultos=") + sizeof(ANSI_NULL); End = strstr(Setting, " "); if (End) @@ -53,6 +89,7 @@ /* Copy the default OS */ strncpy(DefaultOs, Setting, Length); + DefaultOs[Length - 1] = ANSI_NULL; CmdLineInfo.DefaultOperatingSystem = DefaultOs; } @@ -85,6 +122,12 @@ } PCCH +CmdLineGetDebugString(VOID) +{ + return CmdLineInfo.DebugString; +} + +PCCH CmdLineGetDefaultOS(VOID) { return CmdLineInfo.DefaultOperatingSystem; Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -21,26 +21,36 @@ #ifndef _M_ARM +/* INCLUDES *******************************************************************/ + #include <freeldr.h> #include <cportlib/cportlib.h> -/* MACROS *******************************************************************/ +#if DBG -#if DBG +/* STATIC VARIABLES ***********************************************************/ #define DEFAULT_BAUD_RATE 19200 +#if defined(_M_IX86) || defined(_M_AMD64) +static const ULONG BaseArray[] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; +#elif defined(_M_PPC) +static const ULONG BaseArray[] = {0, 0x800003F8}; +#elif defined(_M_MIPS) +static const ULONG BaseArray[] = {0, 0x80006000, 0x80007000}; +#elif defined(_M_ARM) +static const ULONG BaseArray[] = {0, 0xF1012000}; +#else +#error Unknown architecture +#endif -/* STATIC VARIABLES *********************************************************/ - -static ULONG BaseArray[] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; +#define MAX_COM_PORTS (sizeof(BaseArray) / sizeof(BaseArray[0]) - 1) /* The COM port must only be initialized once! */ -static CPPORT Rs232ComPort; -static BOOLEAN PortInitialized = FALSE; +static ULONG Rs232ComPort = 0; +static CPPORT Rs232ComPortInfo; - -/* FUNCTIONS *********************************************************/ +/* FUNCTIONS ******************************************************************/ BOOLEAN Rs232PortInitialize(IN ULONG ComPort, IN ULONG BaudRate) @@ -48,77 +58,73 @@ NTSTATUS Status; PUCHAR Address; - if (PortInitialized == FALSE) + /* + * Check whether it's the first time we initialize a COM port. + * If not, check whether the specified one was already initialized. + */ + if ((Rs232ComPort != 0) && (Rs232ComPort == ComPort)) + return TRUE; + + if (BaudRate == 0) + BaudRate = DEFAULT_BAUD_RATE; + + if (ComPort == 0) { - if (BaudRate == 0) - { - BaudRate = DEFAULT_BAUD_RATE; - } - - if (ComPort == 0) - { - if (CpDoesPortExist(UlongToPtr(BaseArray[2]))) - { - Address = UlongToPtr(BaseArray[2]); - } - else if (CpDoesPortExist(UlongToPtr(BaseArray[1]))) - { - Address = UlongToPtr(BaseArray[1]); - } - else - { - return FALSE; - } - } - else if (ComPort <= 4) // 4 == MAX_COM_PORTS + /* + * Start enumerating COM ports from the last one to the first one, + * and break when we find a valid port. + * If we reach the first element of the list, the invalid COM port, + * then it means that no valid port was found. + */ + for (ComPort = MAX_COM_PORTS; ComPort > 0; ComPort--) { if (CpDoesPortExist(UlongToPtr(BaseArray[ComPort]))) { Address = UlongToPtr(BaseArray[ComPort]); - } - else - { - return FALSE; + break; } } + if (ComPort == 0) + return FALSE; + } + else if (ComPort <= MAX_COM_PORTS) + { + if (CpDoesPortExist(UlongToPtr(BaseArray[ComPort]))) + Address = UlongToPtr(BaseArray[ComPort]); else - { return FALSE; - } + } + else + { + return FALSE; + } - Status = CpInitialize(&Rs232ComPort, Address, BaudRate); - if (!NT_SUCCESS(Status)) return FALSE; + Status = CpInitialize(&Rs232ComPortInfo, Address, BaudRate); + if (!NT_SUCCESS(Status)) return FALSE; - PortInitialized = TRUE; - } + Rs232ComPort = ComPort; return TRUE; } BOOLEAN Rs232PortGetByte(PUCHAR ByteReceived) { - if (PortInitialized == FALSE) - return FALSE; - - return (CpGetByte(&Rs232ComPort, ByteReceived, TRUE, FALSE) == CP_GET_SUCCESS); + if (Rs232ComPort == 0) return FALSE; + return (CpGetByte(&Rs232ComPortInfo, ByteReceived, TRUE, FALSE) == CP_GET_SUCCESS); } /* BOOLEAN Rs232PortPollByte(PUCHAR ByteReceived) { - if (PortInitialized == FALSE) - return FALSE; - - return (CpGetByte(&Rs232ComPort, ByteReceived, FALSE, FALSE) == CP_GET_SUCCESS); + if (Rs232ComPort == 0) return FALSE; + return (CpGetByte(&Rs232ComPortInfo, ByteReceived, FALSE, FALSE) == CP_GET_SUCCESS); } */ VOID Rs232PortPutByte(UCHAR ByteToSend) { - if (PortInitialized == FALSE) - return; - - CpPutByte(&Rs232ComPort, ByteToSend); + if (Rs232ComPort == 0) return; + CpPutByte(&Rs232ComPortInfo, ByteToSend); } #endif /* DBG */ @@ -126,7 +132,7 @@ BOOLEAN Rs232PortInUse(PUCHAR Base) { #if DBG - return ( (PortInitialized && (Rs232ComPort.Address == Base)) ? TRUE : FALSE ); + return ( ((Rs232ComPort != 0) && (Rs232ComPortInfo.Address == Base)) ? TRUE : FALSE ); #else return FALSE; #endif Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -18,7 +18,6 @@ */ #include <freeldr.h> - #include <debug.h> #if DBG && !defined(_M_ARM) @@ -33,36 +32,31 @@ #define DBG_DEFAULT_LEVELS (ERR_LEVEL|FIXME_LEVEL) +static UCHAR DbgChannels[DBG_CHANNELS_COUNT]; + #define SCREEN 1 #define RS232 2 #define BOCHS 4 -#define COM1 1 -#define COM2 2 -#define COM3 3 -#define COM4 4 - -#define BOCHS_OUTPUT_PORT 0xe9 - -static UCHAR DbgChannels[DBG_CHANNELS_COUNT]; +#define BOCHS_OUTPUT_PORT 0xE9 ULONG DebugPort = RS232; -// ULONG DebugPort = SCREEN; -// ULONG DebugPort = BOCHS; -// ULONG DebugPort = SCREEN|BOCHS; -#ifdef _WINKD_ -/* COM1 is the WinDbg port */ -ULONG ComPort = COM2; -#else -ULONG ComPort = COM1; -#endif -// ULONG BaudRate = 19200; + +/* Serial debug connection */ +ULONG ComPort = 0; // The COM port initializer chooses the first available port starting from COM4 down to COM1. ULONG BaudRate = 115200; +ULONG PortIrq = 0; // Not used at the moment. BOOLEAN DebugStartOfLine = TRUE; -VOID DebugInit(VOID) -{ +VOID DebugInit(BOOLEAN MainInit) +{ + PCHAR CommandLine, PortString, BaudString, IrqString; + ULONG Value; + CHAR DebugString[256]; + + /* Always reset the debugging channels */ + #if defined (DEBUG_ALL) memset(DbgChannels, MAX_LEVEL, DBG_CHANNELS_COUNT); #elif defined (DEBUG_WARN) @@ -83,9 +77,121 @@ DbgChannels[DPRINT_WINDOWS] = MAX_LEVEL; #endif + /* Check for pre- or main initialization phase */ + if (!MainInit) + { + /* Pre-initialization phase: use the FreeLdr command-line debugging string */ + CommandLine = (PCHAR)CmdLineGetDebugString(); + + /* If no command-line is provided, initialize the debug port with default settings */ + if (CommandLine == NULL) + goto Done; + + strcpy(DebugString, CommandLine); + } + else + { + /* Main initialization phase: use the FreeLdr INI debugging string */ + + ULONG_PTR SectionId; + + if (!IniOpenSection("FreeLoader", &SectionId)) + return; + + if (!IniReadSettingByName(SectionId, "Debug", DebugString, sizeof(DebugString))) + return; + } + + /* Get the Command Line */ + CommandLine = DebugString; + + /* Upcase it */ + _strupr(CommandLine); + + /* Get the port and baud rate */ + PortString = strstr(CommandLine, "DEBUGPORT"); + BaudString = strstr(CommandLine, "BAUDRATE"); + IrqString = strstr(CommandLine, "IRQ"); + + /* + * Check if we got /DEBUGPORT parameters. + * NOTE: Inspired by reactos/ntoskrnl/kd/kdinit.c, KdInitSystem(...) + */ + while (PortString) + { + /* Move past the actual string, to reach the port*/ + PortString += strlen("DEBUGPORT"); + + /* Now get past any spaces and skip the equal sign */ + while (*PortString == ' ') PortString++; + PortString++; + + /* Check for possible ports and set the port to use */ + if (strncmp(PortString, "SCREEN", 6) == 0) + { + PortString += 6; + DebugPort |= SCREEN; + } + else if (strncmp(PortString, "BOCHS", 5) == 0) + { + PortString += 5; + DebugPort |= BOCHS; + } + else if (strncmp(PortString, "COM", 3) == 0) + { + PortString += 3; + DebugPort |= RS232; + + /* Set the port to use */ + Value = atol(PortString); + if (Value) ComPort = Value; + } + + PortString = strstr(PortString, "DEBUGPORT"); + } + + /* Check if we got a baud rate */ + if (BaudString) + { + /* Move past the actual string, to reach the rate */ + BaudString += strlen("BAUDRATE"); + + /* Now get past any spaces */ + while (*BaudString == ' ') BaudString++; + + /* And make sure we have a rate */ + if (*BaudString) + { + /* Read and set it */ + Value = atol(BaudString + 1); + if (Value) BaudRate = Value; + } + } + + /* Check Serial Port Settings [IRQ] */ + if (IrqString) + { + /* Move past the actual string, to reach the rate */ + IrqString += strlen("IRQ"); + + /* Now get past any spaces */ + while (*IrqString == ' ') IrqString++; + + /* And make sure we have an IRQ */ + if (*IrqString) + { + /* Read and set it */ + Value = atol(IrqString + 1); + if (Value) PortIrq = Value; + } + } + +Done: + /* Try to initialize the port; if it fails, remove the corresponding flag */ if (DebugPort & RS232) { - Rs232PortInitialize(ComPort, BaudRate); + if (!Rs232PortInitialize(ComPort, BaudRate)) + DebugPort &= ~RS232; } } @@ -114,9 +220,9 @@ ULONG DbgPrint(const char *Format, ...) { - int i; + va_list ap; int Length; - va_list ap; + char* ptr; CHAR Buffer[512]; va_start(ap, Format); @@ -133,10 +239,9 @@ Length = sizeof(Buffer); } - for (i = 0; i < Length; i++) - { - DebugPrintChar(Buffer[i]); - } + ptr = Buffer; + while (Length--) + DebugPrintChar(*ptr++); return 0; } @@ -149,7 +254,7 @@ char *ptr = Buffer; /* Mask out unwanted debug messages */ - if (!(DbgChannels[Mask] & Level) && !(Level & DBG_DEFAULT_LEVELS )) + if (!(DbgChannels[Mask] & Level) && !(Level & DBG_DEFAULT_LEVELS)) { return; } @@ -191,9 +296,8 @@ VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length) { - PUCHAR BufPtr = (PUCHAR)Buffer; - ULONG Idx; - ULONG Idx2; + PUCHAR BufPtr = (PUCHAR)Buffer; + ULONG Idx, Idx2; /* Mask out unwanted debug messages */ if (!(DbgChannels[Mask] & TRACE_LEVEL)) @@ -202,7 +306,7 @@ DebugStartOfLine = FALSE; // We don't want line headers DbgPrint("Dumping buffer at %p with length of %lu bytes:\n", Buffer, Length); - for (Idx=0; Idx<Length; ) + for (Idx = 0; Idx < Length; ) { DebugStartOfLine = FALSE; // We don't want line headers @@ -215,7 +319,7 @@ else DbgPrint("%x:\t", Idx); - for (Idx2=0; Idx2<16; Idx2++,Idx++) + for (Idx2 = 0; Idx2 < 16; Idx2++, Idx++) { if (BufPtr[Idx] < 0x10) { @@ -236,7 +340,7 @@ Idx -= 16; DbgPrint(" "); - for (Idx2=0; Idx2<16; Idx2++,Idx++) + for (Idx2 = 0; Idx2 < 16; Idx2++, Idx++) { if ((BufPtr[Idx] > 20) && (BufPtr[Idx] < 0x80)) { @@ -257,10 +361,10 @@ { int iLevel, iChannel; - if (channel == NULL || *channel == L'\0' || strlen(channel) == 0 ) + if (channel == NULL || *channel == '\0' || strlen(channel) == 0) return FALSE; - if (level == NULL || *level == L'\0' || strlen(level) == 0 ) + if (level == NULL || *level == '\0' || strlen(level) == 0) iLevel = MAX_LEVEL; else if (strcmp(level, "err") == 0) iLevel = ERR_LEVEL; @@ -290,9 +394,9 @@ { int i; - for(i= 0 ; i < DBG_CHANNELS_COUNT; i++) - { - if(op==L'+') + for (i = 0; i < DBG_CHANNELS_COUNT; i++) + { + if (op == '+') DbgChannels[i] |= iLevel; else DbgChannels[i] &= ~iLevel; @@ -302,7 +406,7 @@ } else return FALSE; - if (op == L'+') + if (op == '+') DbgChannels[iChannel] |= iLevel; else DbgChannels[iChannel] &= ~iLevel; Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -26,19 +26,21 @@ /* FUNCTIONS ******************************************************************/ -VOID __cdecl BootMain(LPSTR CmdLine) +VOID __cdecl BootMain(IN PCCH CmdLine) { CmdLineParse(CmdLine); MachInit(CmdLine); FsInit(); - DebugInit(); + /* Debugger pre-initialization */ + DebugInit(FALSE); TRACE("BootMain() called.\n"); /* Check if the CPU is new enough */ FrLdrCheckCpuCompatiblity(); + /* UI pre-initialization */ if (!UiInitialize(FALSE)) { UiMessageBoxCritical("Unable to initialize UI."); Modified: trunk/reactos/boot/freeldr/freeldr/include/cmdline.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/cmdline.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/cmdline.h [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -19,8 +19,9 @@ #pragma once -VOID CmdLineParse(IN PCHAR CmdLine); +VOID CmdLineParse(IN PCCH CmdLine); +PCCH CmdLineGetDebugString(VOID); PCCH CmdLineGetDefaultOS(VOID); LONG CmdLineGetTimeOut(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -40,7 +40,7 @@ #if DBG && !defined(_M_ARM) - VOID DebugInit(VOID); + VOID DebugInit(BOOLEAN MainInit); ULONG DbgPrint(const char *Format, ...); VOID DbgPrint2(ULONG Mask, ULONG Level, const char *File, ULONG Line, char *Format, ...); VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length); @@ -113,7 +113,7 @@ #define UNIMPLEMENTED - #define DebugInit() + #define DebugInit(init) #define BugCheck(fmt, ...) #define DbgDumpBuffer(mask, buf, len) #define DbgParseDebugChannels(val) Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Sun Dec 20 02:06:40 2015 @@ -119,7 +119,7 @@ #include <arch/mips/arcbios.h> #endif -VOID __cdecl BootMain(LPSTR CmdLine); +VOID __cdecl BootMain(IN PCCH CmdLine); VOID LoadOperatingSystem(IN OperatingSystemItem* OperatingSystem); VOID RunLoader(VOID); VOID FrLdrCheckCpuCompatiblity(VOID);

9 years

[ekohl] 70402: [REGEDIT] When the root item in the treeview is selected, remove all items from the listview and wipe the address bar and status bar.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 19 19:18:21 2015 New Revision: 70402 URL: http://svn.reactos.org/svn/reactos?rev=70402&view=rev Log: [REGEDIT] When the root item in the treeview is selected, remove all items from the listview and wipe the address bar and status bar. Modified: trunk/reactos/base/applications/regedit/childwnd.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Sat Dec 19 19:18:21 2015 @@ -347,6 +347,12 @@ EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_ENABLED); } } + } + else + { + (void)ListView_DeleteAllItems(g_pChildWnd->hListWnd); + SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)NULL); + SendMessageW(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)NULL); } }

9 years

[akhaldi] 70401: [0.4.0] * Merge the default user locale fixes by Eric Kohl in revisions 70389, 70398 and 70400. CORE-5989

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Dec 19 10:55:49 2015 New Revision: 70401 URL: http://svn.reactos.org/svn/reactos?rev=70401&view=rev Log: [0.4.0] * Merge the default user locale fixes by Eric Kohl in revisions 70389, 70398 and 70400. CORE-5989 Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/base/setup/usetup/settings.c branches/ros-branch-0_4_0/reactos/boot/bootdata/hivedef.inf branches/ros-branch-0_4_0/reactos/dll/win32/syssetup/install.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Dec 19 10:55:49 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70388 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Dec 19 10:55:49 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70388 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400 Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/settings.c [iso-8859-1] Sat Dec 19 10:55:49 2015 @@ -811,6 +811,43 @@ if (LanguageId == NULL) return FALSE; + DPRINT("LanguageId: %S\n", LanguageId); + + /* Open the default users locale key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\User\\.DEFAULT\\Control Panel\\International"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenKey(&KeyHandle, + KEY_SET_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); + return FALSE; + } + + /* Set default user locale */ + RtlInitUnicodeString(&ValueName, + L"Locale"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)LanguageId, + (wcslen(LanguageId) + 1) * sizeof(WCHAR)); + NtClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + return FALSE; + } + /* Skip first 4 zeroes */ if (wcslen(LanguageId) >= 4) LanguageId += 4; Modified: branches/ros-branch-0_4_0/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_4_0/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Sat Dec 19 10:55:49 2015 @@ -152,44 +152,7 @@ ; International keys HKCU,"Control Panel\International",,0x00000012 -HKCU,"Control Panel\International","Locale",0x00000000,"0409" -HKCU,"Control Panel\International","iCalenderType",2,"1" -HKCU,"Control Panel\International","iCountry",2,"1" -HKCU,"Control Panel\International","iCurrDigits",2,"2" -HKCU,"Control Panel\International","iCurrency",2,"0" -HKCU,"Control Panel\International","iDate",2,"0" -HKCU,"Control Panel\International","iDigits",2,"2" -HKCU,"Control Panel\International","iFirstDayOfWeek",2,"6" -HKCU,"Control Panel\International","iFirstDayOfYear",2,"0" -HKCU,"Control Panel\International","iLZero",2,"1" -HKCU,"Control Panel\International","iMeasure",2,"1" -HKCU,"Control Panel\International","iNegCurr",2,"0" -HKCU,"Control Panel\International","iNegNumber",2,"1" -HKCU,"Control Panel\International","iTime",2,"0" -HKCU,"Control Panel\International","iTimePrefix",2,"0" -HKCU,"Control Panel\International","iTLZero",2,"0" -HKCU,"Control Panel\International","NumShape",2,"1" -HKCU,"Control Panel\International","s1159",2,"AM" -HKCU,"Control Panel\International","s2359",2,"PM" -HKCU,"Control Panel\International","sCountry",2,"United States" -HKCU,"Control Panel\International","sCurrency",2,"$" -HKCU,"Control Panel\International","sDate",2,"/" -HKCU,"Control Panel\International","sDecimal",2,"." -HKCU,"Control Panel\International","sGrouping",2,"3;0" -HKCU,"Control Panel\International","sLanguage",2,"ENU" -HKCU,"Control Panel\International","sList",2,"," -HKCU,"Control Panel\International","sLongDate",2,"dddd, MMMM dd, yyyy" -HKCU,"Control Panel\International","sMonDecimalSep",2,"." -HKCU,"Control Panel\International","sMonGrouping",2,"3;0" -HKCU,"Control Panel\International","sMonThousandSep",2,"," -HKCU,"Control Panel\International","sNativeDigits",2,"0123456789" -HKCU,"Control Panel\International","sNegativeSign",2,"-" -HKCU,"Control Panel\International","sPositiveSign",2,"" -HKCU,"Control Panel\International","sShortDate",2,"M/d/yyyy" -HKCU,"Control Panel\International","sThousand",2,"," -HKCU,"Control Panel\International","sTime",2,":" -HKCU,"Control Panel\International","sTimeFormat",2,"h:mm:ss tt" -HKCU,"Control Panel\International\Geo","Nation",0x00000000,"1" +HKCU,"Control Panel\International\Geo",,0x00000012 ; Cursors Schemes HKCU,"Control Panel\Cursors",,,"ReactOS Default" Modified: branches/ros-branch-0_4_0/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sat Dec 19 10:55:49 2015 @@ -30,6 +30,7 @@ #include <tchar.h> #include <wincon.h> +#include <winnls.h> #include <winsvc.h> #include <userenv.h> #include <shlobj.h> @@ -974,7 +975,117 @@ return 0; } -DWORD WINAPI + +static +VOID +InitializeDefaultUserLocale(VOID) +{ + WCHAR szBuffer[80]; + PWSTR ptr; + HKEY hLocaleKey; + DWORD ret; + DWORD dwSize; + LCID lcid; + INT i; + + struct {LCTYPE LCType; PWSTR pValue;} LocaleData[] = { + /* Number */ + {LOCALE_SDECIMAL, L"sDecimal"}, + {LOCALE_STHOUSAND, L"sThousand"}, + {LOCALE_SNEGATIVESIGN, L"sNegativeSign"}, + {LOCALE_SPOSITIVESIGN, L"sPositiveSign"}, + {LOCALE_SGROUPING, L"sGrouping"}, + {LOCALE_SLIST, L"sList"}, + {LOCALE_SNATIVEDIGITS, L"sNativeDigits"}, + {LOCALE_INEGNUMBER, L"iNegNumber"}, + {LOCALE_IDIGITS, L"iDigits"}, + {LOCALE_ILZERO, L"iLZero"}, + {LOCALE_IMEASURE, L"iMeasure"}, + {LOCALE_IDIGITSUBSTITUTION, L"NumShape"}, + + /* Currency */ + {LOCALE_SCURRENCY, L"sCurrency"}, + {LOCALE_SMONDECIMALSEP, L"sMonDecimalSep"}, + {LOCALE_SMONTHOUSANDSEP, L"sMonThousandSep"}, + {LOCALE_SMONGROUPING, L"sMonGrouping"}, + {LOCALE_ICURRENCY, L"iCurrency"}, + {LOCALE_INEGCURR, L"iNegCurr"}, + {LOCALE_ICURRDIGITS, L"iCurrDigits"}, + + /* Time */ + {LOCALE_STIMEFORMAT, L"sTimeFormat"}, + {LOCALE_STIME, L"sTime"}, + {LOCALE_S1159, L"s1159"}, + {LOCALE_S2359, L"s2359"}, + {LOCALE_ITIME, L"iTime"}, + {LOCALE_ITIMEMARKPOSN, L"iTimePrefix"}, + {LOCALE_ITLZERO, L"iTLZero"}, + + /* Date */ + {LOCALE_SLONGDATE, L"sLongDate"}, + {LOCALE_SSHORTDATE, L"sShortDate"}, + {LOCALE_SDATE, L"sDate"}, + {LOCALE_IFIRSTDAYOFWEEK, L"iFirstDayOfWeek"}, + {LOCALE_IFIRSTWEEKOFYEAR, L"iFirstWeekOfYear"}, + {LOCALE_IDATE, L"iDate"}, + {LOCALE_ICALENDARTYPE, L"iCalendarType"}, + + /* Misc */ + {LOCALE_SCOUNTRY, L"sCountry"}, + {LOCALE_SLANGUAGE, L"sLanguage"}, + {LOCALE_ICOUNTRY, L"iCountry"}, + {0, NULL}}; + + ret = RegOpenKeyExW(HKEY_USERS, + L".DEFAULT\\Control Panel\\International", + 0, + KEY_READ | KEY_WRITE, + &hLocaleKey); + if (ret != ERROR_SUCCESS) + { + return; + } + + dwSize = 9 * sizeof(WCHAR); + ret = RegQueryValueExW(hLocaleKey, + L"Locale", + NULL, + NULL, + (PBYTE)szBuffer, + &dwSize); + if (ret != ERROR_SUCCESS) + goto done; + + lcid = (LCID)wcstoul(szBuffer, &ptr, 16); + if (lcid == 0) + goto done; + + i = 0; + while (LocaleData[i].pValue != NULL) + { + if (GetLocaleInfo(lcid, + LocaleData[i].LCType | LOCALE_NOUSEROVERRIDE, + szBuffer, + sizeof(szBuffer) / sizeof(WCHAR))) + { + RegSetValueExW(hLocaleKey, + LocaleData[i].pValue, + 0, + REG_SZ, + (PBYTE)szBuffer, + (wcslen(szBuffer) + 1) * sizeof(WCHAR)); + } + + i++; + } + +done: + RegCloseKey(hLocaleKey); +} + + +DWORD +WINAPI InstallReactOS(HINSTANCE hInstance) { TCHAR szBuffer[MAX_PATH]; @@ -996,6 +1107,8 @@ CreateTempDir(L"TEMP"); CreateTempDir(L"TMP"); + + InitializeDefaultUserLocale(); if (GetWindowsDirectory(szBuffer, sizeof(szBuffer) / sizeof(TCHAR))) {

9 years

[ekohl] 70400: [BOOTDATA] Remove obsolete default user locale values. They are now set by the 2nd stage installer. #CORE-5989 #resolve

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 19 08:57:56 2015 New Revision: 70400 URL: http://svn.reactos.org/svn/reactos?rev=70400&view=rev Log: [BOOTDATA] Remove obsolete default user locale values. They are now set by the 2nd stage installer. #CORE-5989 #resolve Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Sat Dec 19 08:57:56 2015 @@ -152,44 +152,7 @@ ; International keys HKCU,"Control Panel\International",,0x00000012 -HKCU,"Control Panel\International","Locale",0x00000000,"0409" -HKCU,"Control Panel\International","iCalenderType",2,"1" -HKCU,"Control Panel\International","iCountry",2,"1" -HKCU,"Control Panel\International","iCurrDigits",2,"2" -HKCU,"Control Panel\International","iCurrency",2,"0" -HKCU,"Control Panel\International","iDate",2,"0" -HKCU,"Control Panel\International","iDigits",2,"2" -HKCU,"Control Panel\International","iFirstDayOfWeek",2,"6" -HKCU,"Control Panel\International","iFirstDayOfYear",2,"0" -HKCU,"Control Panel\International","iLZero",2,"1" -HKCU,"Control Panel\International","iMeasure",2,"1" -HKCU,"Control Panel\International","iNegCurr",2,"0" -HKCU,"Control Panel\International","iNegNumber",2,"1" -HKCU,"Control Panel\International","iTime",2,"0" -HKCU,"Control Panel\International","iTimePrefix",2,"0" -HKCU,"Control Panel\International","iTLZero",2,"0" -HKCU,"Control Panel\International","NumShape",2,"1" -HKCU,"Control Panel\International","s1159",2,"AM" -HKCU,"Control Panel\International","s2359",2,"PM" -HKCU,"Control Panel\International","sCountry",2,"United States" -HKCU,"Control Panel\International","sCurrency",2,"$" -HKCU,"Control Panel\International","sDate",2,"/" -HKCU,"Control Panel\International","sDecimal",2,"." -HKCU,"Control Panel\International","sGrouping",2,"3;0" -HKCU,"Control Panel\International","sLanguage",2,"ENU" -HKCU,"Control Panel\International","sList",2,"," -HKCU,"Control Panel\International","sLongDate",2,"dddd, MMMM dd, yyyy" -HKCU,"Control Panel\International","sMonDecimalSep",2,"." -HKCU,"Control Panel\International","sMonGrouping",2,"3;0" -HKCU,"Control Panel\International","sMonThousandSep",2,"," -HKCU,"Control Panel\International","sNativeDigits",2,"0123456789" -HKCU,"Control Panel\International","sNegativeSign",2,"-" -HKCU,"Control Panel\International","sPositiveSign",2,"" -HKCU,"Control Panel\International","sShortDate",2,"M/d/yyyy" -HKCU,"Control Panel\International","sThousand",2,"," -HKCU,"Control Panel\International","sTime",2,":" -HKCU,"Control Panel\International","sTimeFormat",2,"h:mm:ss tt" -HKCU,"Control Panel\International\Geo","Nation",0x00000000,"1" +HKCU,"Control Panel\International\Geo",,0x00000012 ; Cursors Schemes HKCU,"Control Panel\Cursors",,,"ReactOS Default"

9 years

[hbelusca] 70399: [SHELL32]: Tray ToolTips: use the correct buffer size for when calling MultiByteToWideChar. Addendum to r70360. CORE-10497

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 19 01:08:11 2015 New Revision: 70399 URL: http://svn.reactos.org/svn/reactos?rev=70399&view=rev Log: [SHELL32]: Tray ToolTips: use the correct buffer size for when calling MultiByteToWideChar. Addendum to r70360. CORE-10497 Modified: trunk/reactos/dll/win32/shell32/systray.cpp Modified: trunk/reactos/dll/win32/shell32/systray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/systray.… ============================================================================== --- trunk/reactos/dll/win32/shell32/systray.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/systray.cpp [iso-8859-1] Sat Dec 19 01:08:11 2015 @@ -98,8 +98,8 @@ /* szInfo, szInfoTitle */ if (pnid->uFlags & NIF_INFO) { - MultiByteToWideChar(CP_ACP, 0, pnid->szInfo, -1, nidW.szInfo, _countof(nidW.szTip)); - MultiByteToWideChar(CP_ACP, 0, pnid->szInfoTitle, -1, nidW.szInfoTitle, _countof(nidW.szTip)); + MultiByteToWideChar(CP_ACP, 0, pnid->szInfo, -1, nidW.szInfo, _countof(nidW.szInfo)); + MultiByteToWideChar(CP_ACP, 0, pnid->szInfoTitle, -1, nidW.szInfoTitle, _countof(nidW.szInfoTitle)); } nidW.uTimeout = pnid->uTimeout;

9 years

[ekohl] 70398: [USETUP] Set the default user locale after registry setup. #CORE-5989 #comment Please retest!

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Dec 18 21:36:16 2015 New Revision: 70398 URL: http://svn.reactos.org/svn/reactos?rev=70398&view=rev Log: [USETUP] Set the default user locale after registry setup. #CORE-5989 #comment Please retest! Modified: trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Fri Dec 18 21:36:16 2015 @@ -811,6 +811,43 @@ if (LanguageId == NULL) return FALSE; + DPRINT("LanguageId: %S\n", LanguageId); + + /* Open the default users locale key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\User\\.DEFAULT\\Control Panel\\International"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenKey(&KeyHandle, + KEY_SET_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); + return FALSE; + } + + /* Set default user locale */ + RtlInitUnicodeString(&ValueName, + L"Locale"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)LanguageId, + (wcslen(LanguageId) + 1) * sizeof(WCHAR)); + NtClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + return FALSE; + } + /* Skip first 4 zeroes */ if (wcslen(LanguageId) >= 4) LanguageId += 4;

9 years

← Newer
1
...
5
6
7
8
9
10
11
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2015