Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[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

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" />

14 years, 10 months

[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

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)

14 years, 10 months

[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

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 */")

14 years, 10 months

[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

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; }

14 years, 10 months

[gschneider] 43876: [usetup] Update Italian and Spanish resources too, translations by Gabriel ilardi

by gschneider＠svn.reactos.org

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 }, {

14 years, 10 months

[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

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);

14 years, 10 months

[janderwald] 43874: - Start rewrite of DirectSound - Implemented DirectSoundEnumerateA, DirectSoundEnumerateW, DirectSoundCaptureEnumerateA, DirectSoundCaptureEnumerateW, GetDeviceID - Partly implemented IDirectSound8 / IDirectSoundCapture8, IDirectSoundCaptureBuffer, primary / secondary IDirectSoundBuffer8 interfaces - DllRegisterServer / DllUnregisterServer are taken from Wine DSound implementation (John K. Hohm) - Currently only one primary + secondary buffer are supported for playback - Mixi

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Oct 31 15:53:06 2009 New Revision: 43874 URL: http://svn.reactos.org/svn/reactos?rev=43874&view=rev Log: - Start rewrite of DirectSound - Implemented DirectSoundEnumerateA, DirectSoundEnumerateW, DirectSoundCaptureEnumerateA, DirectSoundCaptureEnumerateW, GetDeviceID - Partly implemented IDirectSound8 / IDirectSoundCapture8, IDirectSoundCaptureBuffer, primary / secondary IDirectSoundBuffer8 interfaces - DllRegisterServer / DllUnregisterServer are taken from Wine DSound implementation (John K. Hohm) - Currently only one primary + secondary buffer are supported for playback - Mixing of IDirectSoundBuffer is not implemented - Capture mode isnt yet supported - Vlc now can use dsound for playback, though stutters in low quality streams are present - Dsound is not yet added to build untill it has stabilized more Added: trunk/reactos/dll/directx/dsound_new/ (props changed) - copied from r43782, trunk/reactos/dll/directx/dsound_new/ trunk/reactos/dll/directx/dsound_new/capture.c (with props) trunk/reactos/dll/directx/dsound_new/capturebuffer.c (with props) trunk/reactos/dll/directx/dsound_new/devicelist.c (with props) trunk/reactos/dll/directx/dsound_new/directsound.c (with props) trunk/reactos/dll/directx/dsound_new/enum.c (with props) trunk/reactos/dll/directx/dsound_new/misc.c (with props) trunk/reactos/dll/directx/dsound_new/primary.c (with props) trunk/reactos/dll/directx/dsound_new/property.c (with props) trunk/reactos/dll/directx/dsound_new/regsvr.c (contents, props changed) - copied, changed from r43844, trunk/reactos/dll/directx/dsound/regsvr.c trunk/reactos/dll/directx/dsound_new/resource.h (with props) trunk/reactos/dll/directx/dsound_new/secondary.c (with props) Modified: trunk/reactos/dll/directx/dsound_new/classfactory.c trunk/reactos/dll/directx/dsound_new/dsound.c trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild trunk/reactos/dll/directx/dsound_new/precomp.h trunk/reactos/dll/directx/dsound_new/stubs.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/directx/dsound_new/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/cap… Added: trunk/reactos/dll/directx/dsound_new/capturebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/cap… Modified: trunk/reactos/dll/directx/dsound_new/classfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/cla… Added: trunk/reactos/dll/directx/dsound_new/devicelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/dev… Added: trunk/reactos/dll/directx/dsound_new/directsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/dir… Modified: trunk/reactos/dll/directx/dsound_new/dsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/dso… Modified: trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/dso… Added: trunk/reactos/dll/directx/dsound_new/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/enu… Added: trunk/reactos/dll/directx/dsound_new/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/mis… Modified: trunk/reactos/dll/directx/dsound_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/pre… Added: trunk/reactos/dll/directx/dsound_new/primary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/pri… Added: trunk/reactos/dll/directx/dsound_new/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/pro… Copied: trunk/reactos/dll/directx/dsound_new/regsvr.c (from r43844, trunk/reactos/dll/directx/dsound/regsvr.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/reg… Added: trunk/reactos/dll/directx/dsound_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/res… Added: trunk/reactos/dll/directx/dsound_new/secondary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/sec… Modified: trunk/reactos/dll/directx/dsound_new/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/stu…

14 years, 10 months

[gschneider] 43873: [usetup] Apply r43870 for German resource file, fix boot loader vs boot sector confusion

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat Oct 31 15:29:38 2009 New Revision: 43873 URL: http://svn.reactos.org/svn/reactos?rev=43873&view=rev Log: [usetup] Apply r43870 for German resource file, fix boot loader vs boot sector confusion Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sat Oct 31 15:29:38 2009 @@ -981,25 +981,25 @@ { 6, 8, - "Setup installiert nun den Boot-Sektor.", + "Setup installiert nun den Boot-Loader.", TEXT_STYLE_NORMAL }, { 8, 12, - "Boot-Sektor im MBR installieren.", + "Boot-Loader auf der Festplatte installieren (Boot-Sektor).", TEXT_STYLE_NORMAL }, { 8, 13, - "Boot-Sektor auf einer Diskette installieren.", + "Boot-Loader auf einer Diskette installieren.", TEXT_STYLE_NORMAL }, { 8, 14, - "Boot-Sektor nicht installieren.", + "Boot-Loader nicht installieren.", TEXT_STYLE_NORMAL }, {

14 years, 10 months

[ahill] 43872: [browseui, shell32, explorer_new, include] - Convert browseui to C++/ATL. As part of this, classes in browseui and now registered with .rgs files. - Add AddressBand, AddressEditBox, BandProxy, BaseBar, BaseBarSite, BrandBand, InternetToolbar, ShellBrowser, ToolsBand, and TravelLog. - Add stub implementations of commonbrowser, globalfoldersettings, and regtreeoptions. - Clean up some msvc compile problems in a few files. - Reorganize some headers to make them better match the Platf

by ahill＠svn.reactos.org

Author: ahill Date: Sat Oct 31 15:25:45 2009 New Revision: 43872 URL: http://svn.reactos.org/svn/reactos?rev=43872&view=rev Log: [browseui, shell32, explorer_new, include] - Convert browseui to C++/ATL. As part of this, classes in browseui and now registered with .rgs files. - Add AddressBand, AddressEditBox, BandProxy, BaseBar, BaseBarSite, BrandBand, InternetToolbar, ShellBrowser, ToolsBand, and TravelLog. - Add stub implementations of commonbrowser, globalfoldersettings, and regtreeoptions. - Clean up some msvc compile problems in a few files. - Reorganize some headers to make them better match the Platform SDK. - Move InlineIsEqualGUID to guiddef.h. - Create new header files shlguid_undoc.h, shlobj_undoc.h, and shlwapi_undoc.h to hold undocumented types, functions, and GUIDs. - Move some undocumented definitions declared in explorer_new/todo.h and undoc.h to new headers. - Rename a few interfaces in explorer_new to the correct name - Add definition of RBSTR_CHANGERECT to commctrl.h - IDeskBarClient inherits from IOleWindow, not IUnknown - HMONITOR was declared in both dxsdk/axextend.idl and wine/wined3d.idl, but not in wtypes.idl where it belongs - Added Init and Term to CComModule - Thanks to encoded for solving the browseui linking problem! Added: trunk/reactos/dll/win32/browseui/aclmulti.cpp - copied, changed from r43824, trunk/reactos/dll/win32/browseui/aclmulti.c trunk/reactos/dll/win32/browseui/aclmulti.h (with props) trunk/reactos/dll/win32/browseui/addressband.cpp (with props) trunk/reactos/dll/win32/browseui/addressband.h (with props) trunk/reactos/dll/win32/browseui/addresseditbox.cpp (with props) trunk/reactos/dll/win32/browseui/addresseditbox.h (with props) trunk/reactos/dll/win32/browseui/bandproxy.cpp (with props) trunk/reactos/dll/win32/browseui/bandproxy.h (with props) trunk/reactos/dll/win32/browseui/bandsite.cpp - copied, changed from r43824, trunk/reactos/dll/win32/browseui/bandsite.c trunk/reactos/dll/win32/browseui/bandsite.h (with props) trunk/reactos/dll/win32/browseui/bandsitemenu.cpp - copied, changed from r43824, trunk/reactos/dll/win32/browseui/bandsitemenu.c trunk/reactos/dll/win32/browseui/bandsitemenu.h (with props) trunk/reactos/dll/win32/browseui/basebar.cpp (with props) trunk/reactos/dll/win32/browseui/basebarsite.cpp (with props) trunk/reactos/dll/win32/browseui/brandband.cpp (with props) trunk/reactos/dll/win32/browseui/brandband.h (with props) trunk/reactos/dll/win32/browseui/browseui.cpp - copied, changed from r43824, trunk/reactos/dll/win32/browseui/browseui_main.c trunk/reactos/dll/win32/browseui/browseui.rc (with props) trunk/reactos/dll/win32/browseui/browseuiord.cpp (with props) trunk/reactos/dll/win32/browseui/commonbrowser.cpp (with props) trunk/reactos/dll/win32/browseui/commonbrowser.h (with props) trunk/reactos/dll/win32/browseui/globalfoldersettings.cpp (with props) trunk/reactos/dll/win32/browseui/globalfoldersettings.h (with props) trunk/reactos/dll/win32/browseui/internettoolbar.cpp (with props) trunk/reactos/dll/win32/browseui/internettoolbar.h (with props) trunk/reactos/dll/win32/browseui/lang/ (with props) trunk/reactos/dll/win32/browseui/lang/en-US.rc (with props) trunk/reactos/dll/win32/browseui/newatlinterfaces.h (with props) trunk/reactos/dll/win32/browseui/regtreeoptions.cpp (with props) trunk/reactos/dll/win32/browseui/regtreeoptions.h (with props) trunk/reactos/dll/win32/browseui/res/ (with props) trunk/reactos/dll/win32/browseui/res/addressband.rgs (with props) trunk/reactos/dll/win32/browseui/res/addresseditbox.rgs (with props) trunk/reactos/dll/win32/browseui/res/autocompletecontainer.rgs (with props) trunk/reactos/dll/win32/browseui/res/bandproxy.rgs (with props) trunk/reactos/dll/win32/browseui/res/bandsitemenu.rgs (with props) trunk/reactos/dll/win32/browseui/res/brandband.rgs (with props) trunk/reactos/dll/win32/browseui/res/commonbrowser.rgs (with props) trunk/reactos/dll/win32/browseui/res/globalfoldersettings.rgs (with props) trunk/reactos/dll/win32/browseui/res/internettoolbar.rgs (with props) trunk/reactos/dll/win32/browseui/res/rebarbandsite.rgs (with props) trunk/reactos/dll/win32/browseui/res/regtreeoptions.rgs (with props) trunk/reactos/dll/win32/browseui/resource.h (with props) trunk/reactos/dll/win32/browseui/shellbrowser.cpp (with props) trunk/reactos/dll/win32/browseui/toolsband.cpp (with props) trunk/reactos/dll/win32/browseui/travellog.cpp (with props) trunk/reactos/dll/win32/browseui/utility.cpp (with props) trunk/reactos/dll/win32/browseui/utility.h (with props) trunk/reactos/include/psdk/shlguid_undoc.h (with props) trunk/reactos/include/psdk/shlobj_undoc.h (with props) trunk/reactos/include/psdk/shlwapi_undoc.h (with props) Removed: trunk/reactos/dll/win32/browseui/aclmulti.c trunk/reactos/dll/win32/browseui/bandsite.c trunk/reactos/dll/win32/browseui/bandsitemenu.c trunk/reactos/dll/win32/browseui/browseui.h trunk/reactos/dll/win32/browseui/browseui_main.c trunk/reactos/dll/win32/browseui/regsvr.c Modified: trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer-new/startmnu.c trunk/reactos/base/shell/explorer-new/taskband.c trunk/reactos/base/shell/explorer-new/tbsite.c trunk/reactos/base/shell/explorer-new/todo.h trunk/reactos/base/shell/explorer-new/undoc.h trunk/reactos/dll/win32/browseui/browseui.rbuild trunk/reactos/dll/win32/browseui/browseui.spec trunk/reactos/dll/win32/shell32/desktop.c trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/she_ocmenu.c trunk/reactos/dll/win32/shell32/shellitem.c trunk/reactos/dll/win32/shell32/shelllink.c trunk/reactos/dll/win32/shell32/shellord.c trunk/reactos/dll/win32/shell32/shfldr_desktop.c trunk/reactos/dll/win32/shell32/shfldr_mydocuments.c trunk/reactos/dll/win32/shell32/shfldr_netplaces.c trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c trunk/reactos/dll/win32/shell32/shv_item_new.c trunk/reactos/dll/win32/shell32/startmenu.c trunk/reactos/dll/win32/shell32/stubs.c trunk/reactos/dll/win32/shell32/undocshell.h trunk/reactos/include/dxsdk/axextend.idl trunk/reactos/include/psdk/commctrl.h trunk/reactos/include/psdk/guiddef.h trunk/reactos/include/psdk/shlguid.h trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/include/psdk/wtypes.idl trunk/reactos/include/reactos/wine/wined3d.idl trunk/reactos/lib/atl/atlbase.h trunk/reactos/lib/sdk/uuid/uuid.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… Modified: trunk/reactos/base/shell/explorer-new/startmnu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/st… Modified: trunk/reactos/base/shell/explorer-new/taskband.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… Modified: trunk/reactos/base/shell/explorer-new/tbsite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tb… Modified: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… Modified: trunk/reactos/base/shell/explorer-new/undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/un… Removed: trunk/reactos/dll/win32/browseui/aclmulti.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/aclmult… Copied: trunk/reactos/dll/win32/browseui/aclmulti.cpp (from r43824, trunk/reactos/dll/win32/browseui/aclmulti.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/aclmult… Added: trunk/reactos/dll/win32/browseui/aclmulti.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/aclmult… Added: trunk/reactos/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… Added: trunk/reactos/dll/win32/browseui/addressband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… Added: trunk/reactos/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… Added: trunk/reactos/dll/win32/browseui/addresseditbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… Added: trunk/reactos/dll/win32/browseui/bandproxy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandpro… Added: trunk/reactos/dll/win32/browseui/bandproxy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandpro… Removed: trunk/reactos/dll/win32/browseui/bandsite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… Copied: trunk/reactos/dll/win32/browseui/bandsite.cpp (from r43824, trunk/reactos/dll/win32/browseui/bandsite.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… Added: trunk/reactos/dll/win32/browseui/bandsite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… Removed: trunk/reactos/dll/win32/browseui/bandsitemenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… Copied: trunk/reactos/dll/win32/browseui/bandsitemenu.cpp (from r43824, trunk/reactos/dll/win32/browseui/bandsitemenu.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… Added: trunk/reactos/dll/win32/browseui/bandsitemenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… Added: trunk/reactos/dll/win32/browseui/basebar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar… Added: trunk/reactos/dll/win32/browseui/basebarsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar… Added: trunk/reactos/dll/win32/browseui/brandband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/brandba… Added: trunk/reactos/dll/win32/browseui/brandband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/brandba… Copied: trunk/reactos/dll/win32/browseui/browseui.cpp (from r43824, trunk/reactos/dll/win32/browseui/browseui_main.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Removed: trunk/reactos/dll/win32/browseui/browseui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Modified: trunk/reactos/dll/win32/browseui/browseui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Added: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Modified: trunk/reactos/dll/win32/browseui/browseui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Removed: trunk/reactos/dll/win32/browseui/browseui_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Added: trunk/reactos/dll/win32/browseui/browseuiord.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Added: trunk/reactos/dll/win32/browseui/commonbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/commonb… Added: trunk/reactos/dll/win32/browseui/commonbrowser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/commonb… Added: trunk/reactos/dll/win32/browseui/globalfoldersettings.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/globalf… Added: trunk/reactos/dll/win32/browseui/globalfoldersettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/globalf… Added: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… Added: trunk/reactos/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… Added: trunk/reactos/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/en… Added: trunk/reactos/dll/win32/browseui/newatlinterfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/newatli… Removed: trunk/reactos/dll/win32/browseui/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/regsvr.… Added: trunk/reactos/dll/win32/browseui/regtreeoptions.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/regtree… Added: trunk/reactos/dll/win32/browseui/regtreeoptions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/regtree… Added: trunk/reactos/dll/win32/browseui/res/addressband.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/add… Added: trunk/reactos/dll/win32/browseui/res/addresseditbox.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/add… Added: trunk/reactos/dll/win32/browseui/res/autocompletecontainer.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/aut… Added: trunk/reactos/dll/win32/browseui/res/bandproxy.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/ban… Added: trunk/reactos/dll/win32/browseui/res/bandsitemenu.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/ban… Added: trunk/reactos/dll/win32/browseui/res/brandband.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/bra… Added: trunk/reactos/dll/win32/browseui/res/commonbrowser.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/com… Added: trunk/reactos/dll/win32/browseui/res/globalfoldersettings.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/glo… Added: trunk/reactos/dll/win32/browseui/res/internettoolbar.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/int… Added: trunk/reactos/dll/win32/browseui/res/rebarbandsite.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/reb… Added: trunk/reactos/dll/win32/browseui/res/regtreeoptions.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/reg… Added: trunk/reactos/dll/win32/browseui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/resourc… Added: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… Added: trunk/reactos/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/toolsba… Added: trunk/reactos/dll/win32/browseui/travellog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/travell… Added: trunk/reactos/dll/win32/browseui/utility.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/utility… Added: trunk/reactos/dll/win32/browseui/utility.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/utility… Modified: trunk/reactos/dll/win32/shell32/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/desktop.… Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… Modified: trunk/reactos/dll/win32/shell32/shellitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellite… Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… Modified: trunk/reactos/dll/win32/shell32/shfldr_mydocuments.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… Modified: trunk/reactos/dll/win32/shell32/shfldr_netplaces.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_n… Modified: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r… Modified: trunk/reactos/dll/win32/shell32/shv_item_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… Modified: trunk/reactos/dll/win32/shell32/startmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/startmen… Modified: trunk/reactos/dll/win32/shell32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.c?… Modified: trunk/reactos/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/undocshe… Modified: trunk/reactos/include/dxsdk/axextend.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/axextend.idl… Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… Modified: trunk/reactos/include/psdk/guiddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/guiddef.h?rev… Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev… Added: trunk/reactos/include/psdk/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid_undoc… Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… Added: trunk/reactos/include/psdk/shlobj_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj_undoc.… Added: trunk/reactos/include/psdk/shlwapi_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlwapi_undoc… Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… Modified: trunk/reactos/include/psdk/wtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wtypes.idl?re… Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Modified: trunk/reactos/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlbase.h?rev=4387… Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=43…

14 years, 10 months

[sginsberg] 43871: - Don't define the SizePcr entry to the size of the PCR PLUS the PRCB SIZE! The PRCB size is already defined in the SizePrcb entry. - Likewise, the OffsetPrcbProcStateSpecialReg entry defines the offset to the special registers in the PRCB, not a PCR + PRCB offset + special registers offset! This can only have worked on x86 and AMD64 if WinDbg uses a hard coded offset, but define it correctly anyway. - The OffsetPcrSelfPcr and OffsetPcrContainedPrcb entries are not applicable

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Oct 31 14:46:16 2009 New Revision: 43871 URL: http://svn.reactos.org/svn/reactos?rev=43871&view=rev Log: - Don't define the SizePcr entry to the size of the PCR PLUS the PRCB SIZE! The PRCB size is already defined in the SizePrcb entry. - Likewise, the OffsetPrcbProcStateSpecialReg entry defines the offset to the special registers in the PRCB, not a PCR + PRCB offset + special registers offset! This can only have worked on x86 and AMD64 if WinDbg uses a hard coded offset, but define it correctly anyway. - The OffsetPcrSelfPcr and OffsetPcrContainedPrcb entries are not applicable for ARM, so define them to 0 for it. Modified: trunk/reactos/ntoskrnl/kd64/kddata.c Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Sat Oct 31 14:46:16 2009 @@ -36,9 +36,9 @@ #elif defined(_M_ARM) -//#define KPCR_SELF_OFFSET +#define KPCR_SELF_OFFSET 0 #define KPCR_CURRENT_PRCB_OFFSET FIELD_OFFSET(KPCR, Prcb) -//#define KPCR_CONTAINED_PRCB_OFFSET +#define KPCR_CONTAINED_PRCB_OFFSET 0 #else #error Unsupported Architecture @@ -485,7 +485,7 @@ {(ULONG_PTR)KdPrintDefaultCircularBuffer}, {(ULONG_PTR)&KdPrintBufferSize}, {(ULONG_PTR)&KeLoaderBlock}, - sizeof(KPCR) + sizeof(KPRCB), + sizeof(KPCR), KPCR_SELF_OFFSET, KPCR_CURRENT_PRCB_OFFSET, KPCR_CONTAINED_PRCB_OFFSET, @@ -494,7 +494,6 @@ 0, 0, 0, - KPCR_CONTAINED_PRCB_OFFSET + FIELD_OFFSET(KPRCB, ProcessorState.SpecialRegisters), #if defined(_M_IX86) //

14 years, 10 months

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 October 2009