Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 47872: [NTOS]: Add "vf" NTOS component, required NDK headers, and enable exports required for PCI driver to load.
by sir_richard＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: sir_richard Date: Sun Jun 27 20:47:52 2010 New Revision: 47872 URL: http://svn.reactos.org/svn/reactos?rev=47872&view=rev Log: [NTOS]: Add "vf" NTOS component, required NDK headers, and enable exports required for PCI driver to load. Added: trunk/reactos/include/ndk/vffuncs.h (with props) trunk/reactos/include/ndk/vftypes.h (with props) trunk/reactos/ntoskrnl/vf/ trunk/reactos/ntoskrnl/vf/driver.c (with props) Modified: trunk/reactos/include/ndk/ntndk.h trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/ntoskrnl/ntoskrnl.pspec Modified: trunk/reactos/include/ndk/ntndk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ntndk.h?rev=47… ============================================================================== --- trunk/reactos/include/ndk/ntndk.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ntndk.h [iso-8859-1] Sun Jun 27 20:47:52 2010 @@ -59,6 +59,7 @@ #include <pstypes.h> // Process Manager Types #include <rtltypes.h> // Runtime Library Types #include <setypes.h> // Security Subsystem Types +#include <vftypes.h> // Verifier Types // // Function Headers @@ -80,6 +81,7 @@ #include <rtlfuncs.h> // Runtime Library Functions #include <sefuncs.h> // Security Subsystem Functions #include <umfuncs.h> // User-Mode NT Library Functions +#include <vffuncs.h> // Verifier Functions // // Assembly Support Added: trunk/reactos/include/ndk/vffuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/vffuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/vffuncs.h (added) +++ trunk/reactos/include/ndk/vffuncs.h [iso-8859-1] Sun Jun 27 20:47:52 2010 @@ -1,0 +1,54 @@ +/*++ NDK Version: 0098 + +Copyright (c) Alex Ionescu. All rights reserved. + +Header Name: + + vffuncs.h + +Abstract: + + Function definitions for the Power Subsystem. + +Author: + + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 + +--*/ + +#ifndef _VFFUNCS_H +#define _VFFUNCS_H + +// +// Dependencies +// +#include <umtypes.h> +#include <vftypes.h> + +#ifndef NTOS_MODE_USER + +// +// Verifier Device Driver Interface +// +BOOLEAN +NTAPI +VfIsVerificationEnabled( + IN VF_OBJECT_TYPE VfObjectType, + IN PVOID Object OPTIONAL +); + +VOID +NTAPI +VfFailDeviceNode( + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN ULONG BugCheckMajorCode, + IN ULONG BugCheckMinorCode, + IN VF_FAILURE_CLASS FailureClass, + IN OUT PULONG AssertionControl, + IN PSTR DebuggerMessageText, + IN PSTR ParameterFormatString, + ... +); +#endif + +#endif Propchange: trunk/reactos/include/ndk/vffuncs.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/ndk/vftypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/vftypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/vftypes.h (added) +++ trunk/reactos/include/ndk/vftypes.h [iso-8859-1] Sun Jun 27 20:47:52 2010 @@ -1,0 +1,47 @@ +/*++ NDK Version: 0098 + +Copyright (c) Alex Ionescu. All rights reserved. + +Header Name: + + vftypes.h + +Abstract: + + Type definitions for the Power Subystem + +Author: + + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 + +--*/ + +#ifndef _VFTYPES_H +#define _VFTYPES_H + +// +// Dependencies +// +#include <umtypes.h> + +// +// Failure Classes +// +typedef enum _VF_FAILURE_CLASS +{ + VFFAILURE_FAIL_IN_FIELD, + VFFAILURE_FAIL_LOGO, + VFFAILURE_FAIL_UNDER_DEBUGGER +} VF_FAILURE_CLASS, *PVF_FAILURE_CLASS; + +// +// Object Types +// +typedef enum _VF_OBJECT_TYPE +{ + VFOBJTYPE_DRIVER, + VFOBJTYPE_DEVICE, + VFOBJTYPE_SYSTEM_BIOS +} VF_OBJECT_TYPE, PVF_OBJECT_TYPE; + +#endif // _VFTYPES_H Propchange: trunk/reactos/include/ndk/vftypes.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Jun 27 20:47:52 2010 @@ -508,6 +508,9 @@ <directory name="wmi"> <file>wmi.c</file> </directory> + <directory name="vf"> + <file>driver.c</file> + </directory> <file>ntoskrnl.rc</file> <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> </group> Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Sun Jun 27 20:47:52 2010 @@ -1397,10 +1397,10 @@ @ stdcall SeUnregisterLogonSessionTerminatedRoutine(ptr) @ stdcall SeValidSecurityDescriptor(long ptr) @ stdcall VerSetConditionMask(long long long long) -;VfFailDeviceNode +@ stdcall VfFailDeviceNode(ptr long long long ptr ptr ptr) ;VfFailDriver ;VfFailSystemBIOS -;VfIsVerificationEnabled +@ stdcall VfIsVerificationEnabled(long ptr) #ifndef __x86_64__ @ stdcall WRITE_REGISTER_BUFFER_UCHAR(ptr ptr long) @ stdcall WRITE_REGISTER_BUFFER_ULONG(ptr ptr long) Added: trunk/reactos/ntoskrnl/vf/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vf/driver.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/vf/driver.c (added) +++ trunk/reactos/ntoskrnl/vf/driver.c [iso-8859-1] Sun Jun 27 20:47:52 2010 @@ -1,0 +1,46 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/vf/driver.c + * PURPOSE: Driver Verifier Device Driver Interface + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +VfIsVerificationEnabled(IN VF_OBJECT_TYPE VfObjectType, + IN PVOID Object OPTIONAL) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +VOID +NTAPI +VfFailDeviceNode(IN PDEVICE_OBJECT PhysicalDeviceObject, + IN ULONG BugCheckMajorCode, + IN ULONG BugCheckMinorCode, + IN VF_FAILURE_CLASS FailureClass, + IN OUT PULONG AssertionControl, + IN PSTR DebuggerMessageText, + IN PSTR ParameterFormatString, + ...) +{ + UNIMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/vf/driver.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sir_richard] 47871: [NTOS]: I am sorry, this is embarssing. Fix build again.
by sir_richard＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: sir_richard Date: Sun Jun 27 20:45:15 2010 New Revision: 47871 URL: http://svn.reactos.org/svn/reactos?rev=47871&view=rev Log: [NTOS]: I am sorry, this is embarssing. Fix build again. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=478… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sun Jun 27 20:45:15 2010 @@ -1044,7 +1044,7 @@ if (NT_SUCCESS(Status)) { /* Setup the string */ - RtlInitAnsiString(&CsdString, MsgEntry->Text); + RtlInitAnsiString(&CsdString, (PCHAR)MsgEntry->Text); /* Remove trailing newline */ while ((CsdString.Length > 0) && @@ -1371,7 +1371,7 @@ /* Create the banner message */ Status = RtlStringCbPrintfA(EndBuffer, Size, - MsgEntry->Text, + (PCHAR)MsgEntry->Text, StringBuffer, NtBuildNumber & 0xFFFF, BeginBuffer); @@ -1486,7 +1486,7 @@ Status = RtlStringCbPrintfA(StringBuffer, 256, NT_SUCCESS(MsgStatus) ? - MsgEntry->Text : + (PCHAR)MsgEntry->Text : "%u System Processor [%u MB Memory] %Z\n", KeNumberProcessors, Size, @@ -1650,7 +1650,7 @@ if (NT_SUCCESS(Status)) { /* Display it */ - InbvDisplayString(MsgEntry->Text); + InbvDisplayString((PCHAR)MsgEntry->Text); } } } @@ -1670,7 +1670,7 @@ if (NT_SUCCESS(Status)) { /* Display it */ - InbvDisplayString(MsgEntry->Text); + InbvDisplayString((PCHAR)MsgEntry->Text); } /* Setup boot logging */ Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4787… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sun Jun 27 20:45:15 2010 @@ -463,7 +463,7 @@ } /* Get the final Code */ - BugCode = ((PMESSAGE_RESOURCE_ENTRY)MessageEntry)->Text; + BugCode = (PCHAR)((PMESSAGE_RESOURCE_ENTRY)MessageEntry)->Text; i = strlen(BugCode); /* Handle newlines */

1 0

[pschweitzer] 47870: Fix ARM build
by pschweitzer＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: pschweitzer Date: Sun Jun 27 20:44:47 2010 New Revision: 47870 URL: http://svn.reactos.org/svn/reactos?rev=47870&view=rev Log: Fix ARM build Modified: trunk/reactos/ReactOS-arm.rbuild Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=478… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Sun Jun 27 20:44:47 2010 @@ -91,6 +91,9 @@ <xi:include href="lib/sdk/crt/crt.rbuild" /> <xi:include href="lib/sdk/crt/libcntpr.rbuild" /> </directory> + <directory name="ioevent"> + <xi:include href="lib/sdk/ioevent/ioevent.rbuild" /> + </directory> <directory name="nt"> <xi:include href="lib/sdk/nt/nt.rbuild" /> </directory>

1 0

[sir_richard] 47869: [NTOS]: My SVN is haunted. Commit missing changes?
by sir_richard＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: sir_richard Date: Sun Jun 27 20:38:12 2010 New Revision: 47869 URL: http://svn.reactos.org/svn/reactos?rev=47869&view=rev Log: [NTOS]: My SVN is haunted. Commit missing changes? Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=478… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sun Jun 27 20:38:12 2010 @@ -827,7 +827,7 @@ PCHAR CommandLine, PerfMem; ULONG PerfMemUsed; PLDR_DATA_TABLE_ENTRY NtosEntry; - PRTL_MESSAGE_RESOURCE_ENTRY MsgEntry; + PMESSAGE_RESOURCE_ENTRY MsgEntry; ANSI_STRING CsdString; SIZE_T Remaining = 0; PCHAR RcEnd = NULL; @@ -1240,7 +1240,7 @@ LARGE_INTEGER SystemBootTime, UniversalBootTime, OldTime, Timeout; BOOLEAN SosEnabled, NoGuiBoot, ResetBias = FALSE, AlternateShell = FALSE; PLDR_DATA_TABLE_ENTRY NtosEntry; - PRTL_MESSAGE_RESOURCE_ENTRY MsgEntry; + PMESSAGE_RESOURCE_ENTRY MsgEntry; PCHAR CommandLine, Y2KHackRequired, SafeBoot, Environment; PCHAR StringBuffer, EndBuffer, BeginBuffer, MpString = ""; PINIT_BUFFER InitBuffer; Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4786… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sun Jun 27 20:38:12 2010 @@ -458,12 +458,12 @@ for (i = 0; i < IdOffset; i++) { /* Advance in the Entries */ - MessageEntry += ((PRTL_MESSAGE_RESOURCE_ENTRY)MessageEntry)-> + MessageEntry += ((PMESSAGE_RESOURCE_ENTRY)MessageEntry)-> Length; } /* Get the final Code */ - BugCode = ((PRTL_MESSAGE_RESOURCE_ENTRY)MessageEntry)->Text; + BugCode = ((PMESSAGE_RESOURCE_ENTRY)MessageEntry)->Text; i = strlen(BugCode); /* Handle newlines */

1 0

[ekohl] 47868: [NTOSKRNL] NtDuplicateToken: Fail, if TokenType is neither TokenImpersonation nor TokenPrimary.
by ekohl＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: ekohl Date: Sun Jun 27 20:13:44 2010 New Revision: 47868 URL: http://svn.reactos.org/svn/reactos?rev=47868&view=rev Log: [NTOSKRNL] NtDuplicateToken: Fail, if TokenType is neither TokenImpersonation nor TokenPrimary. Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=47… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Sun Jun 27 20:13:44 2010 @@ -1811,6 +1811,10 @@ PAGED_CODE(); + if (TokenType != TokenImpersonation && + TokenType != TokenPrimary) + return STATUS_INVALID_PARAMETER; + PreviousMode = KeGetPreviousMode(); if (PreviousMode != KernelMode)

1 0

[sir_richard] 47867: [MC]: Add pciclass.mc required for eVb's PCI driver. Matches resource data in Windows driver, minus typos.
by sir_richard＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: sir_richard Date: Sun Jun 27 20:08:38 2010 New Revision: 47867 URL: http://svn.reactos.org/svn/reactos?rev=47867&view=rev Log: [MC]: Add pciclass.mc required for eVb's PCI driver. Matches resource data in Windows driver, minus typos. Added: trunk/reactos/include/reactos/mc/pciclass.mc Modified: trunk/reactos/include/reactos/mc/mc.rbuild Modified: trunk/reactos/include/reactos/mc/mc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/mc.rbui… ============================================================================== --- trunk/reactos/include/reactos/mc/mc.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/mc.rbuild [iso-8859-1] Sun Jun 27 20:08:38 2010 @@ -12,6 +12,10 @@ <module name="errcodes" type="messageheader"> <file>errcodes.mc</file> </module> + + <module name="pciclass" type="messageheader"> + <file>pciclass.mc</file> + </module> <module name="neteventmsg" type="messageheader"> <file>netevent.mc</file> Added: trunk/reactos/include/reactos/mc/pciclass.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/pciclas… ============================================================================== --- trunk/reactos/include/reactos/mc/pciclass.mc (added) +++ trunk/reactos/include/reactos/mc/pciclass.mc [iso-8859-1] Sun Jun 27 20:08:38 2010 @@ -1,0 +1,599 @@ +MessageId=0 +SymbolicName=NONE +Language=English +PCI Device +. + +MessageId=1 +SymbolicName=NONE +Language=English +VGA Device +. + +MessageId=256 +SymbolicName=NONE +Language=English +SCSI Controller +. + +MessageId=257 +SymbolicName=NONE +Language=English +IDE Controller +. + +MessageId=258 +SymbolicName=NONE +Language=English +Floppy Controller +. + +MessageId=259 +SymbolicName=NONE +Language=English +IPI Controller +. + +MessageId=260 +SymbolicName=NONE +Language=English +RAID Controller +. + +MessageId=261 +SymbolicName=NONE +Language=English +ATA Controller +. + +MessageId=262 +SymbolicName=NONE +Language=English +Serial ATA Controller +. + +MessageId=263 +SymbolicName=NONE +Language=English +SAS Controller +. + +MessageId=384 +SymbolicName=NONE +Language=English +Mass Storage Controller +. + +MessageId=512 +SymbolicName=NONE +Language=English +Ethernet Controller +. + +MessageId=513 +SymbolicName=NONE +Language=English +Token Ring Network Controller +. + +MessageId=514 +SymbolicName=NONE +Language=English +FDDI Network Controller +. + +MessageId=515 +SymbolicName=NONE +Language=English +ATM Network Controller +. + +MessageId=516 +SymbolicName=NONE +Language=English +ISDN Controller +. + +MessageId=517 +SymbolicName=NONE +Language=English +WorldFip Controller +. + +MessageId=640 +SymbolicName=NONE +Language=English +Network Controller +. + +MessageId=768 +SymbolicName=NONE +Language=English +Video Controller (VGA Compatible) +. + +MessageId=769 +SymbolicName=NONE +Language=English +Video Controller (VGA Compatible) +. + +MessageId=770 +SymbolicName=NONE +Language=English +3D Video Controller +. + +MessageId=896 +SymbolicName=NONE +Language=English +Video Controller +. + +MessageId=1024 +SymbolicName=NONE +Language=English +Multimedia Video Controller +. + +MessageId=1025 +SymbolicName=NONE +Language=English +Multimedia Audio Controller +. + +MessageId=1026 +SymbolicName=NONE +Language=English +Computer Telephony Device +. + +MessageId=1152 +SymbolicName=NONE +Language=English +Multimedia Controller +. + +MessageId=1280 +SymbolicName=NONE +Language=English +PCI Memory +. + +MessageId=1281 +SymbolicName=NONE +Language=English +PCI FLASH Memory +. + +MessageId=1408 +SymbolicName=NONE +Language=English +PCI Memory Controller +. + +MessageId=1536 +SymbolicName=NONE +Language=English +PCI HOST Bridge +. + +MessageId=1537 +SymbolicName=NONE +Language=English +PCI to ISA Bridge +. + +MessageId=1538 +SymbolicName=NONE +Language=English +PCI to EISA Bridge +. + +MessageId=1539 +SymbolicName=NONE +Language=English +PCI to Micro Channel Bridge +. + +MessageId=1540 +SymbolicName=NONE +Language=English +PCI to PCI Bridge +. + +MessageId=1541 +SymbolicName=NONE +Language=English +PCI to PCMCIA Bridge +. + +MessageId=1542 +SymbolicName=NONE +Language=English +PCI to NUBUS Bridge +. + +MessageId=1543 +SymbolicName=NONE +Language=English +PCI to CARDBUS Bridge +. + +MessageId=1544 +SymbolicName=NONE +Language=English +PCI to RACEway Bridge +. + +MessageId=1545 +SymbolicName=NONE +Language=English +Semi-transparent PCI to PCI Bridge +. + +MessageId=1546 +SymbolicName=NONE +Language=English +Infiniband to PCI Host Bridge +. + +MessageId=1664 +SymbolicName=NONE +Language=English +Other PCI Bridge Device +. + +MessageId=1792 +SymbolicName=NONE +Language=English +PCI Serial Port +. + +MessageId=1793 +SymbolicName=NONE +Language=English +PCI Parallel Port +. + +MessageId=1794 +SymbolicName=NONE +Language=English +PCI Multiport Serial Controller +. + +MessageId=1795 +SymbolicName=NONE +Language=English +PCI Modem +. + +MessageId=1796 +SymbolicName=NONE +Language=English +PCI GBIB Controller +. + +MessageId=1797 +SymbolicName=NONE +Language=English +PCI Smart Card +. + +MessageId=1920 +SymbolicName=NONE +Language=English +PCI Simple Communications Controller +. + +MessageId=2048 +SymbolicName=NONE +Language=English +System Interrupt Controller +. + +MessageId=2049 +SymbolicName=NONE +Language=English +System DMA Controller +. + +MessageId=2050 +SymbolicName=NONE +Language=English +System Timer +. + +MessageId=2051 +SymbolicName=NONE +Language=English +Real Time CLock +. + +MessageId=2052 +SymbolicName=NONE +Language=English +Generic PCI Hot-Plug Controller +. + +MessageId=2053 +SymbolicName=NONE +Language=English +SD Host Controller +. + +MessageId=2173 +SymbolicName=NONE +Language=English +Base System Device +. + +MessageId=2304 +SymbolicName=NONE +Language=English +PCI Keyboard Controller +. + +MessageId=2305 +SymbolicName=NONE +Language=English +PCI Digitizer +. + +MessageId=2306 +SymbolicName=NONE +Language=English +PCI Mouse Controller +. + +MessageId=2307 +SymbolicName=NONE +Language=English +PCI Scanner Controller +. + +MessageId=2308 +SymbolicName=NONE +Language=English +PCI Gameport Controller +. + +MessageId=2432 +SymbolicName=NONE +Language=English +PCI Input Device +. + +MessageId=2560 +SymbolicName=NONE +Language=English +Docking Station +. + +MessageId=2688 +SymbolicName=NONE +Language=English +Docking Station (Unknown type) +. + +MessageId=2816 +SymbolicName=NONE +Language=English +386 Processor +. + +MessageId=2817 +SymbolicName=NONE +Language=English +486 Processor +. + +MessageId=2818 +SymbolicName=NONE +Language=English +Pentium Processor +. + +MessageId=2832 +SymbolicName=NONE +Language=English +ALPHA Processor +. + +MessageId=2848 +SymbolicName=NONE +Language=English +PowerPC Processor +. + +MessageId=2880 +SymbolicName=NONE +Language=English +Coprocessor +. + +MessageId=3072 +SymbolicName=NONE +Language=English +IEEE 1394 Controller +. + +MessageId=3073 +SymbolicName=NONE +Language=English +ACCESS Bus Controller +. + +MessageId=3074 +SymbolicName=NONE +Language=English +SSA Controller +. + +MessageId=3075 +SymbolicName=NONE +Language=English +Universal Serial Bus (USB) Controller +. + +MessageId=3076 +SymbolicName=NONE +Language=English +Fibre Channel Controller +. + +MessageId=3077 +SymbolicName=NONE +Language=English +SM Bus Controller +. + +MessageId=3078 +SymbolicName=NONE +Language=English +Infiniband Controller +. + +MessageId=3079 +SymbolicName=NONE +Language=English +IPMI Interface +. + +MessageId=3080 +SymbolicName=NONE +Language=English +SERCOS Interface +. + +MessageId=3081 +SymbolicName=NONE +Language=English +CANbus Controller +. + +MessageId=3328 +SymbolicName=NONE +Language=English +iRDA Compatible Controller +. + +MessageId=3329 +SymbolicName=NONE +Language=English +Consumer IR Controller +. + +MessageId=3344 +SymbolicName=NONE +Language=English +RF Controller +. + +MessageId=3345 +SymbolicName=NONE +Language=English +Bluetooth Controller +. + +MessageId=3346 +SymbolicName=NONE +Language=English +Broadband Controller +. + +MessageId=3360 +SymbolicName=NONE +Language=English +Ethernet 802.11a Controller +. + +MessageId=3361 +SymbolicName=NONE +Language=English +Ethernet 802.11b Controller +. + +MessageId=3456 +SymbolicName=NONE +Language=English +PCI Wireless Controller +. + +MessageId=3584 +SymbolicName=NONE +Language=English +Intelligent I/O (I2O) Controller +. + +MessageId=3841 +SymbolicName=NONE +Language=English +Satellite Communications Television Controller +. + +MessageId=3842 +SymbolicName=NONE +Language=English +Satellite Communications Audio Controller +. + +MessageId=3843 +SymbolicName=NONE +Language=English +Satellite Communications Voice Controller +. + +MessageId=3844 +SymbolicName=NONE +Language=English +Satellite Communications Data Controller +. + +MessageId=4096 +SymbolicName=NONE +Language=English +Network and Computing Encryption/Decryption Controller +. + +MessageId=4112 +SymbolicName=NONE +Language=English +Entertainment Encryption/Decryption Controller +. + +MessageId=4224 +SymbolicName=NONE +Language=English +PCI Encryption/Decryption Controller +. + +MessageId=4352 +SymbolicName=NONE +Language=English +DPIO Module +. + +MessageId=4353 +SymbolicName=NONE +Language=English +Performance Counters +. + +MessageId=4368 +SymbolicName=NONE +Language=English +PCI Communications Synchronization plus Time and Frequency Test/Measurement Controller +. + +MessageId=4384 +SymbolicName=NONE +Language=English +Management Card +. + +MessageId=4480 +SymbolicName=NONE +Language=English +PCI Data Acquisition and Signal Processing Controller +.

1 0

[cgutman] 47866: [DHCPCSVC] - Use an event to signal when an adapter has been added
by cgutman＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: cgutman Date: Sun Jun 27 20:05:52 2010 New Revision: 47866 URL: http://svn.reactos.org/svn/reactos?rev=47866&view=rev Log: [DHCPCSVC] - Use an event to signal when an adapter has been added Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ad… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] Sun Jun 27 20:05:52 2010 @@ -227,10 +227,11 @@ /* * XXX Figure out the way to bind a specific adapter to a socket. */ -DWORD WINAPI AdapterDiscoveryThread(LPVOID Unused) { +DWORD WINAPI AdapterDiscoveryThread(LPVOID Context) { PMIB_IFTABLE Table = (PMIB_IFTABLE) malloc(sizeof(MIB_IFTABLE)); DWORD Error, Size = sizeof(MIB_IFTABLE); PDHCP_ADAPTER Adapter = NULL; + HANDLE AdapterStateChangedEvent = (HANDLE)Context; struct interface_info *ifi = NULL; int i; @@ -345,6 +346,8 @@ ApiLock(); InsertTailList( &AdapterList, &Adapter->ListEntry ); + DbgPrint("DHCPCSVC: Discovered new adapter [%s]\n", Adapter->DhclientInfo.name); + SetEvent(AdapterStateChangedEvent); ApiUnlock(); } else { free( Adapter ); Adapter = 0; } } else { free( Adapter ); Adapter = 0; } @@ -361,22 +364,27 @@ return Error; } -BOOLEAN StartAdapterDiscovery(VOID) { - HANDLE ThreadHandle; +HANDLE StartAdapterDiscovery(VOID) { + HANDLE ThreadHandle, EventHandle; + + EventHandle = CreateEvent(NULL, + FALSE, + FALSE, + NULL); ThreadHandle = CreateThread(NULL, 0, AdapterDiscoveryThread, - NULL, + (LPVOID)EventHandle, 0, NULL); if (ThreadHandle == NULL) - return FALSE; + return NULL; CloseHandle(ThreadHandle); - return TRUE; + return EventHandle; } void AdapterStop() { Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/di… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c [iso-8859-1] Sun Jun 27 20:05:52 2010 @@ -68,8 +68,10 @@ fd_set fds; time_t howlong, cur_time; struct timeval timeval; - - if (!StartAdapterDiscovery()) + HANDLE AdapterStateChangedEvent; + + AdapterStateChangedEvent = StartAdapterDiscovery(); + if (!AdapterStateChangedEvent) return; ApiLock(); @@ -103,29 +105,31 @@ if (howlong > INT_MAX / 1000) howlong = INT_MAX / 1000; to_msec = howlong * 1000; - } else - to_msec = 5000; - - /* Set up the descriptors to be polled. */ - FD_ZERO(&fds); - - for (l = protocols; l; l = l->next) - FD_SET(l->fd, &fds); - - /* Wait for a packet or a timeout... XXX */ - timeval.tv_sec = to_msec / 1000; - timeval.tv_usec = to_msec % 1000; - - ApiUnlock(); - - if (protocols) + + /* Set up the descriptors to be polled. */ + FD_ZERO(&fds); + + for (l = protocols; l; l = l->next) + FD_SET(l->fd, &fds); + + /* Wait for a packet or a timeout... XXX */ + timeval.tv_sec = to_msec / 1000; + timeval.tv_usec = to_msec % 1000; + + ApiUnlock(); + count = select(0, &fds, NULL, NULL, &timeval); - else { - Sleep(to_msec); - count = 0; - } - - ApiLock(); + + ApiLock(); + } + else + { + ApiUnlock(); + WaitForSingleObject(AdapterStateChangedEvent, INFINITE); + ApiLock(); + + continue; + } DH_DbgPrint(MID_TRACE,("Select: %d\n", count)); @@ -148,6 +152,8 @@ } } } while (1); + + CloseHandle(AdapterStateChangedEvent); ApiUnlock(); } Modified: trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/include… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h [iso-8859-1] Sun Jun 27 20:05:52 2010 @@ -77,7 +77,7 @@ #define srandom srand void AdapterInit(VOID); -BOOLEAN StartAdapterDiscovery(VOID); +HANDLE StartAdapterDiscovery(VOID); void AdapterStop(VOID); extern PDHCP_ADAPTER AdapterGetFirst(); extern PDHCP_ADAPTER AdapterGetNext(PDHCP_ADAPTER);

1 0

[sir_richard] 47865: - There's no such thing as PRTL_MESSAGE_RESOURCE_ENTRY, use PMESSAGE_RESOURCE_ENTRY instead.
by sir_richard＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: sir_richard Date: Sun Jun 27 19:56:57 2010 New Revision: 47865 URL: http://svn.reactos.org/svn/reactos?rev=47865&view=rev Log: - There's no such thing as PRTL_MESSAGE_RESOURCE_ENTRY, use PMESSAGE_RESOURCE_ENTRY instead. Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/lib/rtl/message.c trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Jun 27 19:56:57 2010 @@ -2796,7 +2796,7 @@ IN ULONG Type, IN ULONG Language, IN ULONG MessageId, - OUT PRTL_MESSAGE_RESOURCE_ENTRY *MessageResourceEntry + OUT PMESSAGE_RESOURCE_ENTRY *MessageResourceEntry ); NTSYSAPI Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Sun Jun 27 19:56:57 2010 @@ -1083,29 +1083,6 @@ ULONG TimeoutBoost; PVOID DebugInfo; } RTL_RESOURCE, *PRTL_RESOURCE; - -// -// RTL Message Structures for PE Resources -// -typedef struct _RTL_MESSAGE_RESOURCE_ENTRY -{ - USHORT Length; - USHORT Flags; - CHAR Text[1]; -} RTL_MESSAGE_RESOURCE_ENTRY, *PRTL_MESSAGE_RESOURCE_ENTRY; - -typedef struct _RTL_MESSAGE_RESOURCE_BLOCK -{ - ULONG LowId; - ULONG HighId; - ULONG OffsetToEntries; -} RTL_MESSAGE_RESOURCE_BLOCK, *PRTL_MESSAGE_RESOURCE_BLOCK; - -typedef struct _RTL_MESSAGE_RESOURCE_DATA -{ - ULONG NumberOfBlocks; - RTL_MESSAGE_RESOURCE_BLOCK Blocks[1]; -} RTL_MESSAGE_RESOURCE_DATA, *PRTL_MESSAGE_RESOURCE_DATA; // // Structures for RtlCreateUserProcess Modified: trunk/reactos/lib/rtl/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/message.c?rev=4786… ============================================================================== --- trunk/reactos/lib/rtl/message.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/message.c [iso-8859-1] Sun Jun 27 19:56:57 2010 @@ -24,14 +24,14 @@ ULONG Type, ULONG Language, ULONG MessageId, - PRTL_MESSAGE_RESOURCE_ENTRY *MessageResourceEntry) + PMESSAGE_RESOURCE_ENTRY *MessageResourceEntry) { LDR_RESOURCE_INFO ResourceInfo; PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; - PRTL_MESSAGE_RESOURCE_DATA MessageTable; + PMESSAGE_RESOURCE_DATA MessageTable; NTSTATUS Status; ULONG EntryOffset = 0, IdOffset = 0; - PRTL_MESSAGE_RESOURCE_ENTRY MessageEntry; + PMESSAGE_RESOURCE_ENTRY MessageEntry; ULONG i; DPRINT("RtlFindMessage()\n"); @@ -92,7 +92,7 @@ return STATUS_MESSAGE_NOT_FOUND; } - MessageEntry = (PRTL_MESSAGE_RESOURCE_ENTRY) + MessageEntry = (PMESSAGE_RESOURCE_ENTRY) ((PUCHAR)MessageTable + MessageTable->Blocks[i].OffsetToEntries); DPRINT("EntryOffset 0x%08lx\n", EntryOffset); @@ -101,7 +101,7 @@ DPRINT("MessageEntry: %p\n", MessageEntry); for (i = 0; i < IdOffset; i++) { - MessageEntry = (PRTL_MESSAGE_RESOURCE_ENTRY) + MessageEntry = (PMESSAGE_RESOURCE_ENTRY) ((PUCHAR)MessageEntry + (ULONG)MessageEntry->Length); } Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4786… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sun Jun 27 19:56:57 2010 @@ -23,7 +23,7 @@ KSPIN_LOCK BugCheckCallbackLock; ULONG KeBugCheckActive, KeBugCheckOwner; LONG KeBugCheckOwnerRecursionCount; -PRTL_MESSAGE_RESOURCE_DATA KiBugCodeMessages; +PMESSAGE_RESOURCE_DATA KiBugCodeMessages; ULONG KeBugCheckCount = 1; ULONG KiHardwareTrigger; PUNICODE_STRING KiBugCheckDriver; @@ -394,7 +394,7 @@ NTAPI KiInitializeBugCheck(VOID) { - PRTL_MESSAGE_RESOURCE_DATA BugCheckData; + PMESSAGE_RESOURCE_DATA BugCheckData; LDR_RESOURCE_INFO ResourceInfo; PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; NTSTATUS Status;

1 0

[sir_richard] 47864: [NTOS]: Warn only once about MmLockPageableImageSection being unimplemented.
by sir_richard＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: sir_richard Date: Sun Jun 27 19:55:36 2010 New Revision: 47864 URL: http://svn.reactos.org/svn/reactos?rev=47864&view=rev Log: [NTOS]: Warn only once about MmLockPageableImageSection being unimplemented. Modified: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] Sun Jun 27 19:55:36 2010 @@ -60,7 +60,7 @@ // // We should just find the section and call MmLockPageableSectionByHandle // - UNIMPLEMENTED; + static BOOLEAN Warn; if (!Warn++) UNIMPLEMENTED; return AddressWithinSection; }

1 0

[cgutman] 47863: [MSAFD] - Handle the case (again) where we get passed an invalid lpErrno pointer to a WSP function - Fixes some crashes I encountered when running Opera 9
by cgutman＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: cgutman Date: Sun Jun 27 17:21:03 2010 New Revision: 47863 URL: http://svn.reactos.org/svn/reactos?rev=47863&view=rev Log: [MSAFD] - Handle the case (again) where we get passed an invalid lpErrno pointer to a WSP function - Fixes some crashes I encountered when running Opera 9 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/msafd.h Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Jun 27 17:21:03 2010 @@ -380,24 +380,6 @@ DbgPrint("MSAFD: Unhandled NTSTATUS value: 0x%x\n", Status); return WSAENETDOWN; } -} - -DWORD MsafdReturnWithErrno(NTSTATUS Status, - LPINT Errno, - DWORD Received, - LPDWORD ReturnedBytes) -{ - *Errno = TranslateNtStatusError(Status); - - if (ReturnedBytes) - { - if (!*Errno) - *ReturnedBytes = Received; - else - *ReturnedBytes = 0; - } - - return *Errno ? SOCKET_ERROR : 0; } /* @@ -2088,7 +2070,16 @@ } - /* FIXME: We should handle some cases here */ + /* FIXME: We should handle some more cases here */ + if (level == SOL_SOCKET) + { + switch (optname) + { + case SO_BROADCAST: + Socket->SharedData.Broadcast = (*optval != 0) ? 1 : 0; + return 0; + } + } *lpErrno = Socket->HelperData->WSHSetSocketInformation(Socket->HelperContext, Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] Sun Jun 27 17:21:03 2010 @@ -467,11 +467,35 @@ IN PSOCKET_INFORMATION Socket, IN ULONG Event ); + +typedef VOID (*PASYNC_COMPLETION_ROUTINE)(PVOID Context, PIO_STATUS_BLOCK IoStatusBlock); -DWORD MsafdReturnWithErrno( NTSTATUS Status, LPINT Errno, DWORD Received, - LPDWORD ReturnedBytes ); - -typedef VOID (*PASYNC_COMPLETION_ROUTINE)(PVOID Context, PIO_STATUS_BLOCK IoStatusBlock); +DWORD +FORCEINLINE +MsafdReturnWithErrno(NTSTATUS Status, + LPINT Errno, + DWORD Received, + LPDWORD ReturnedBytes) +{ + if (Errno) + { + *Errno = TranslateNtStatusError(Status); + + if (ReturnedBytes) + *ReturnedBytes = (*Errno == 0) ? Received : 0; + + return (*Errno == 0) ? 0 : SOCKET_ERROR; + } + else + { + DbgPrint("%s: Received invalid lpErrno pointer!\n", __FUNCTION__); + + if (ReturnedBytes) + *ReturnedBytes = (Status == STATUS_SUCCESS) ? Received : 0; + + return (Status == STATUS_SUCCESS) ? 0 : SOCKET_ERROR; + } +} #endif /* __MSAFD_H */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs