Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 42219: - RamdiskWorkerThread: Don't return IoCompleteRequest as we return void (IoCompleteRequest returns void though), msvc doesn't like this. - Fix calling convention declaration for scsi function prototypes
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 22:24:50 2009 New Revision: 42219 URL: http://svn.reactos.org/svn/reactos?rev=42219&view=rev Log: - RamdiskWorkerThread: Don't return IoCompleteRequest as we return void (IoCompleteRequest returns void though), msvc doesn't like this. - Fix calling convention declaration for scsi function prototypes Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c trunk/reactos/include/ddk/scsiwmi.h trunk/reactos/include/ddk/srb.h Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sat Jul 25 22:24:50 2009 @@ -1012,7 +1012,8 @@ IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; - return IoCompleteRequest(Irp, IO_DISK_INCREMENT); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return; } // @@ -1020,7 +1021,8 @@ // Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; - return IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return; } NTSTATUS Modified: trunk/reactos/include/ddk/scsiwmi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/scsiwmi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/scsiwmi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/scsiwmi.h [iso-8859-1] Sat Jul 25 22:24:50 2009 @@ -60,14 +60,14 @@ ULONG Flags; } SCSIWMIGUIDREGINFO, *PSCSIWMIGUIDREGINFO; -typedef UCHAR DDKAPI -(*PSCSIWMI_QUERY_REGINFO)( +typedef UCHAR +(DDKAPI *PSCSIWMI_QUERY_REGINFO)( IN PVOID DeviceContext, IN PSCSIWMI_REQUEST_CONTEXT RequestContext, OUT PWCHAR *MofResourceName); -typedef BOOLEAN DDKAPI -(*PSCSIWMI_QUERY_DATABLOCK)( +typedef BOOLEAN +(DDKAPI *PSCSIWMI_QUERY_DATABLOCK)( IN PVOID Context, IN PSCSIWMI_REQUEST_CONTEXT DispatchContext, IN ULONG GuidIndex, @@ -77,8 +77,8 @@ IN ULONG BufferAvail, OUT PUCHAR Buffer); -typedef BOOLEAN DDKAPI -(*PSCSIWMI_SET_DATABLOCK)( +typedef BOOLEAN +(DDKAPI *PSCSIWMI_SET_DATABLOCK)( IN PVOID DeviceContext, IN PSCSIWMI_REQUEST_CONTEXT RequestContext, IN ULONG GuidIndex, @@ -86,8 +86,8 @@ IN ULONG BufferSize, IN PUCHAR Buffer); -typedef BOOLEAN DDKAPI -(*PSCSIWMI_SET_DATAITEM)( +typedef BOOLEAN +(DDKAPI *PSCSIWMI_SET_DATAITEM)( IN PVOID DeviceContext, IN PSCSIWMI_REQUEST_CONTEXT RequestContext, IN ULONG GuidIndex, @@ -96,8 +96,8 @@ IN ULONG BufferSize, IN PUCHAR Buffer); -typedef BOOLEAN DDKAPI -(*PSCSIWMI_EXECUTE_METHOD)( +typedef BOOLEAN +(DDKAPI *PSCSIWMI_EXECUTE_METHOD)( IN PVOID DeviceContext, IN PSCSIWMI_REQUEST_CONTEXT RequestContext, IN ULONG GuidIndex, @@ -112,8 +112,8 @@ ScsiWmiDataBlockControl } SCSIWMI_ENABLE_DISABLE_CONTROL; -typedef BOOLEAN DDKAPI -(*PSCSIWMI_FUNCTION_CONTROL)( +typedef BOOLEAN +(DDKAPI *PSCSIWMI_FUNCTION_CONTROL)( IN PVOID DeviceContext, IN PSCSIWMI_REQUEST_CONTEXT RequestContext, IN ULONG GuidIndex, Modified: trunk/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=4221… ============================================================================== --- trunk/reactos/include/ddk/srb.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/srb.h [iso-8859-1] Sat Jul 25 22:24:50 2009 @@ -300,14 +300,14 @@ BOOLEAN SupportedTypeList[0]; } SCSI_SUPPORTED_CONTROL_TYPE_LIST, *PSCSI_SUPPORTED_CONTROL_TYPE_LIST; -typedef SCSI_ADAPTER_CONTROL_STATUS DDKAPI -(*PHW_ADAPTER_CONTROL)( +typedef SCSI_ADAPTER_CONTROL_STATUS +(DDKAPI *PHW_ADAPTER_CONTROL)( IN PVOID DeviceExtension, IN SCSI_ADAPTER_CONTROL_TYPE ControlType, IN PVOID Parameters); -typedef BOOLEAN DDKAPI -(*PHW_ADAPTER_STATE)( +typedef BOOLEAN +(DDKAPI *PHW_ADAPTER_STATE)( IN PVOID DeviceExtension, IN PVOID Context, IN BOOLEAN SaveState); @@ -317,8 +317,8 @@ #define SP_RETURN_ERROR 2 #define SP_RETURN_BAD_CONFIG 3 -typedef ULONG DDKAPI -(*PHW_FIND_ADAPTER)( +typedef ULONG +(DDKAPI *PHW_FIND_ADAPTER)( IN PVOID DeviceExtension, IN PVOID HwContext, IN PVOID BusInformation, @@ -326,30 +326,30 @@ IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo, OUT PBOOLEAN Again); -typedef BOOLEAN DDKAPI -(*PHW_INITIALIZE)( +typedef BOOLEAN +(DDKAPI *PHW_INITIALIZE)( IN PVOID DeviceExtension); -typedef BOOLEAN DDKAPI -(*PHW_INTERRUPT)( +typedef BOOLEAN +(DDKAPI *PHW_INTERRUPT)( IN PVOID DeviceExtension); -typedef BOOLEAN DDKAPI -(*PHW_RESET_BUS)( +typedef BOOLEAN +(DDKAPI *PHW_RESET_BUS)( IN PVOID DeviceExtension, IN ULONG PathId); -typedef VOID DDKAPI -(*PHW_DMA_STARTED)( +typedef VOID +(DDKAPI *PHW_DMA_STARTED)( IN PVOID DeviceExtension); -typedef BOOLEAN DDKAPI -(*PHW_STARTIO)( +typedef BOOLEAN +(DDKAPI *PHW_STARTIO)( IN PVOID DeviceExtension, IN PSCSI_REQUEST_BLOCK Srb); -typedef VOID DDKAPI -(*PHW_TIMER)( +typedef VOID +(DDKAPI *PHW_TIMER)( IN PVOID DeviceExtension); typedef struct _HW_INITIALIZATION_DATA {

1 0

[sginsberg] 42218: - Fix most freeldr compilation issues, most notably: - Define structure packing correctly for msvc. - Define Ke386EraseFlags for msvc too. - Don't return a function returning void in a function returning void. - VideoFadeIn: Don't rely on some fishy gcc extension for allocating memory from the stack -- just use the heap instead. - Winldr remains
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 22:17:23 2009 New Revision: 42218 URL: http://svn.reactos.org/svn/reactos?rev=42218&view=rev Log: - Fix most freeldr compilation issues, most notably: - Define structure packing correctly for msvc. - Define Ke386EraseFlags for msvc too. - Don't return a function returning void in a function returning void. - VideoFadeIn: Don't rely on some fishy gcc extension for allocating memory from the stack -- just use the heap instead. - Winldr remains Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/machine.c trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c trunk/reactos/boot/freeldr/freeldr/ui/tui.c trunk/reactos/boot/freeldr/freeldr/video/fade.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -22,12 +22,7 @@ #define NDEBUG #include <debug.h> -/* non-standard specifier from windef.h -- please deprecate */ -#undef PACKED -#ifdef __GNUC__ -#define PACKED __attribute__((packed)) -#endif - +#include <pshpack2.h> typedef struct { UCHAR Signature[4]; // (ret) signature ("VESA") @@ -55,7 +50,8 @@ // accelerated video modes (list of words terminated with FFFFh) UCHAR Reserved[216]; // reserved for VBE implementation UCHAR ScratchPad[256]; // OEM scratchpad (for OEM strings, etc.) -} PACKED VESA_SVGA_INFO, *PVESA_SVGA_INFO; +} VESA_SVGA_INFO, *PVESA_SVGA_INFO; +#include <poppack.h> // Bitfields for VESA capabilities: // Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -22,12 +22,7 @@ #define NDEBUG #include <debug.h> -/* non-standard specifier from windef.h -- please deprecate */ -#undef PACKED -#ifdef __GNUC__ -#define PACKED __attribute__((packed)) -#endif - +#include <pshpack2.h> typedef struct { UCHAR PacketSize; // 00h - Size of packet (10h or 18h) @@ -40,7 +35,8 @@ // used if DWORD at 04h is FFFFh:FFFFh // Commented since some earlier BIOSes refuse to work with // such extended structure -} PACKED I386_DISK_ADDRESS_PACKET, *PI386_DISK_ADDRESS_PACKET; +} I386_DISK_ADDRESS_PACKET, *PI386_DISK_ADDRESS_PACKET; +#include <poppack.h> ///////////////////////////////////////////////////////////////////////////////////////////// // FUNCTIONS Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -22,12 +22,6 @@ #define NDEBUG #include <debug.h> -/* non-standard specifier from windef.h -- please deprecate */ -#undef PACKED -#ifdef __GNUC__ -#define PACKED __attribute__((packed)) -#endif - #define VIDEOPORT_PALETTE_READ 0x03C7 #define VIDEOPORT_PALETTE_WRITE 0x03C8 #define VIDEOPORT_PALETTE_DATA 0x03C9 @@ -57,6 +51,7 @@ #define VERTRES_350_SCANLINES 0x01 #define VERTRES_400_SCANLINES 0x02 +#include <pshpack2.h> typedef struct { USHORT ModeAttributes; /* mode attributes (see #00080) */ @@ -110,7 +105,8 @@ UCHAR LinearReservedMaskPosition; /* linear modes:Bit position of reserved mask LSB */ ULONG MaximumPixelClock; /* maximum pixel clock for graphics video mode, in Hz */ UCHAR Reserved2[190]; /* 190 BYTEs reserved (0) */ -} PACKED SVGA_MODE_INFORMATION, *PSVGA_MODE_INFORMATION; +} SVGA_MODE_INFORMATION, *PSVGA_MODE_INFORMATION; +#include <poppack.h> static ULONG BiosVideoMode; /* Current video mode as known by BIOS */ static ULONG ScreenWidth = 80; /* Screen Width in characters */ Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -29,8 +29,8 @@ VOID PcMachInit(const char *CmdLine); VOID PcConsPutChar(int Ch); -BOOLEAN PcConsKbHit(); -int PcConsGetCh(); +BOOLEAN PcConsKbHit(VOID); +int PcConsGetCh(VOID); VOID PcVideoClearScreen(UCHAR Attr); VIDEODISPLAYMODE PcVideoSetDisplayMode(char *DisplayMode, BOOLEAN Init); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -29,8 +29,8 @@ VOID XboxMachInit(const char *CmdLine); VOID XboxConsPutChar(int Ch); -BOOLEAN XboxConsKbHit(); -int XboxConsGetCh(); +BOOLEAN XboxConsKbHit(VOID); +int XboxConsGetCh(VOID); VOID XboxVideoInit(VOID); VOID XboxVideoClearScreen(UCHAR Attr); Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -110,12 +110,22 @@ #include <bytesex.h> /* arch defines */ +#ifdef __GNUC__ #ifdef _X86_ -#define Ke386EraseFlags(x) __asm__ __volatile__("pushl $0 ; popfl\n") +#define Ke386EraseFlags() __asm__ __volatile__("pushl $0 ; popfl\n") #endif #ifdef _M_AMD64 -#define KeAmd64EraseFlags(x) __asm__ __volatile__("pushq $0 ; popfq\n") +#define KeAmd64EraseFlags() __asm__ __volatile__("pushq $0 ; popfq\n") +#endif +#else +#ifdef _X86_ +#define Ke386EraseFlags() __asm push 0; __asm popf; +#endif + +#ifdef _M_AMD64 +#error FIXME +#endif #endif VOID BootMain(LPSTR CmdLine); Modified: trunk/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/machi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -83,7 +83,7 @@ VOID MachVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG Depth) { - return MachVtbl.VideoGetDisplaySize(Width, Height, Depth); + MachVtbl.VideoGetDisplaySize(Width, Height, Depth); } ULONG @@ -95,7 +95,7 @@ VOID MachVideoSetTextCursorPosition(ULONG X, ULONG Y) { - return MachVtbl.VideoSetTextCursorPosition(X, Y); + MachVtbl.VideoSetTextCursorPosition(X, Y); } VOID @@ -125,13 +125,13 @@ VOID MachVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue) { - return MachVtbl.VideoSetPaletteColor(Color, Red, Green, Blue); + MachVtbl.VideoSetPaletteColor(Color, Red, Green, Blue); } VOID MachVideoGetPaletteColor(UCHAR Color, UCHAR *Red, UCHAR *Green, UCHAR *Blue) { - return MachVtbl.VideoGetPaletteColor(Color, Red, Green, Blue); + MachVtbl.VideoGetPaletteColor(Color, Red, Green, Blue); } VOID Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -40,7 +40,7 @@ NTAPI CmpFree (PVOID Ptr, IN ULONG Quota) { - return MmHeapFree(Ptr); + MmHeapFree(Ptr); } static BOOLEAN Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -60,11 +60,12 @@ NULL }; CHAR FileName[256]; - HINF InfHandle; - ULONG ErrorLine; - INFCONTEXT InfContext; + HINF InfHandle; + ULONG ErrorLine; + INFCONTEXT InfContext; PIMAGE_NT_HEADERS NtHeader; PVOID LoadBase; + extern BOOLEAN FrLdrBootType; /* Setup multiboot information structure */ LoaderBlock.CommandLine = reactos_kernel_cmdline; @@ -108,8 +109,7 @@ #endif UiDrawStatusText(""); - extern BOOLEAN FrLdrBootType; - FrLdrBootType = TRUE; + FrLdrBootType = TRUE; /* Detect hardware */ UiDrawStatusText("Detecting hardware..."); Modified: trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/rtl/l… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -42,5 +42,5 @@ RtlpFreeMemory(PVOID Mem, ULONG Tag) { - return MmHeapFree(Mem); + MmHeapFree(Mem); } Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -27,9 +27,9 @@ */ int TuiPrintf(const char *format, ... ) { + char c, *ptr, str[16]; va_list ap; va_start(ap,format); - char c, *ptr, str[16]; while ((c = *(format++))) { Modified: trunk/reactos/boot/freeldr/freeldr/video/fade.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/video… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/video/fade.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/video/fade.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -38,7 +38,10 @@ { ULONG Index; ULONG Color; - PALETTE_ENTRY PaletteColors[ColorCount]; + PPALETTE_ENTRY PaletteColors; + + PaletteColors = MmHeapAlloc(sizeof(PALETTE_ENTRY) * ColorCount); + if (!PaletteColors) return; for (Index=0; Index<RGB_MAX; Index++) {

1 0

[cgutman] 42217: - Make ipconfig /renew work even if we haven't got an address yet - Fix several potential crashes - Fix an infinite loop caused by us sending a discover packet without adding a protocol first (this is exposed by releasing then renewing) - Fixes bug 4630
by cgutman＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: cgutman Date: Sat Jul 25 21:51:54 2009 New Revision: 42217 URL: http://svn.reactos.org/svn/reactos?rev=42217&view=rev Log: - Make ipconfig /renew work even if we haven't got an address yet - Fix several potential crashes - Fix an infinite loop caused by us sending a discover packet without adding a protocol first (this is exposed by releasing then renewing) - Fixes bug 4630 Modified: trunk/reactos/base/services/dhcp/api.c Modified: trunk/reactos/base/services/dhcp/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/api.c?r… ============================================================================== --- trunk/reactos/base/services/dhcp/api.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/api.c [iso-8859-1] Sat Jul 25 21:51:54 2009 @@ -78,6 +78,7 @@ DWORD DSReleaseIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { COMM_DHCP_REPLY Reply; PDHCP_ADAPTER Adapter; + struct protocol* proto; ApiLock(); @@ -86,8 +87,12 @@ Reply.Reply = Adapter ? 1 : 0; if( Adapter ) { - DeleteIPAddress( Adapter->NteContext ); - remove_protocol( find_protocol_by_adapter( &Adapter->DhclientInfo ) ); + if (Adapter->NteContext) + DeleteIPAddress( Adapter->NteContext ); + + proto = find_protocol_by_adapter( &Adapter->DhclientInfo ); + if (proto) + remove_protocol(proto); } ApiUnlock(); @@ -103,7 +108,7 @@ Adapter = AdapterFindIndex( Req->AdapterIndex ); - if( !Adapter || Adapter->DhclientState.state != S_BOUND ) { + if( !Adapter || Adapter->DhclientState.state == S_STATIC ) { Reply.Reply = 0; ApiUnlock(); return Send( &Reply ); @@ -111,8 +116,11 @@ Reply.Reply = 1; - send_discover( &Adapter->DhclientInfo ); - state_bound( &Adapter->DhclientInfo ); + add_protocol( Adapter->DhclientInfo.name, + Adapter->DhclientInfo.rfdesc, got_one, + &Adapter->DhclientInfo ); + Adapter->DhclientInfo.client->state = S_INIT; + state_reboot(&Adapter->DhclientInfo); ApiUnlock(); @@ -123,6 +131,7 @@ NTSTATUS Status; COMM_DHCP_REPLY Reply; PDHCP_ADAPTER Adapter; + struct protocol* proto; ApiLock(); @@ -131,9 +140,12 @@ Reply.Reply = Adapter ? 1 : 0; if( Adapter ) { - DeleteIPAddress( Adapter->NteContext ); + if (Adapter->NteContext) + DeleteIPAddress( Adapter->NteContext ); Adapter->DhclientState.state = S_STATIC; - remove_protocol( find_protocol_by_adapter( &Adapter->DhclientInfo ) ); + proto = find_protocol_by_adapter( &Adapter->DhclientInfo ); + if (proto) + remove_protocol(proto); Status = AddIPAddress( Req->Body.StaticRefreshParams.IPAddress, Req->Body.StaticRefreshParams.Netmask, Req->AdapterIndex,

1 0

[sginsberg] 42216: - FIELD_OFFSET returns LONG, not LONG_PTR or size_t. - Define TYPE_ALIGNMENT for msvc. - Define DbgPrintEx the same way in NDK and DDK - C_ASSERT is a typedef, so don't put it inside functions as msvc doesn't allow this. - Kernel now *compiles* with RosBE + msvc _and_ our DDK. Linker errors from the ninth circle of hell remains.
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 21:38:52 2009 New Revision: 42216 URL: http://svn.reactos.org/svn/reactos?rev=42216&view=rev Log: - FIELD_OFFSET returns LONG, not LONG_PTR or size_t. - Define TYPE_ALIGNMENT for msvc. - Define DbgPrintEx the same way in NDK and DDK - C_ASSERT is a typedef, so don't put it inside functions as msvc doesn't allow this. - Kernel now *compiles* with RosBE + msvc _and_ our DDK. Linker errors from the ninth circle of hell remains. Modified: trunk/reactos/include/ddk/ntdef.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/host/typedefs.h trunk/reactos/include/psdk/winnt.h trunk/reactos/ntoskrnl/ke/wait.c trunk/reactos/ntoskrnl/mm/pe.c Modified: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Sat Jul 25 21:38:52 2009 @@ -155,20 +155,20 @@ // // Returns the byte offset of the specified structure's member // -#ifndef FIELD_OFFSET #ifndef __GNUC__ -#define FIELD_OFFSET(Type, Field) \ - ((LONG)(LONG_PTR) (&(((Type *) 0)->Field))) +#define FIELD_OFFSET(Type, Field) ((LONG)(LONG_PTR)&(((Type*) 0)->Field)) #else #define FIELD_OFFSET(Type, Field) __builtin_offsetof(Type, Field) #endif -#endif // // Returns the type's alignment // +#if defined(_MSC_VER) && (_MSC_VER >= 1300) +#define TYPE_ALIGNMENT(t) __alignof(t) +#else #define TYPE_ALIGNMENT(t) FIELD_OFFSET( struct { char x; t test; }, test ) - +#endif // // Calling Conventions Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sat Jul 25 21:38:52 2009 @@ -10277,6 +10277,7 @@ IN PCCH Format, IN ...); +NTSYSAPI ULONG DDKCDECLAPI DbgPrintEx( Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h [iso-8859-1] (original) +++ trunk/reactos/include/host/typedefs.h [iso-8859-1] Sat Jul 25 21:38:52 2009 @@ -219,9 +219,9 @@ #define NT_SUCCESS(x) ((x)>=0) #if !defined(__GNUC__) -#define FIELD_OFFSET(t,f) ((LONG_PTR)&(((t*)0)->f)) +#define FIELD_OFFSET(t,f) ((LONG)(LONG_PTR)&(((t*) 0)->f)) #else -#define FIELD_OFFSET(t,f) __builtin_offsetof(t,f) +#define FIELD_OFFSET(t,f) ((LONG)__builtin_offsetof(t,f)) #endif #define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } #define CONTAINING_RECORD(address, type, field) ((type *)(((ULONG_PTR)address) - (ULONG_PTR)(&(((type *)0)->field)))) Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Jul 25 21:38:52 2009 @@ -1311,10 +1311,10 @@ #define RTL_CRITSECT_TYPE 0 #define RTL_RESOURCE_TYPE 1 /* Also in winddk.h */ -#ifndef __GNUC__ -#define FIELD_OFFSET(t,f) ((LONG_PTR)&(((t*)0)->f)) +#if !defined(__GNUC__) +#define FIELD_OFFSET(t,f) ((LONG)(LONG_PTR)&(((t*) 0)->f)) #else -#define FIELD_OFFSET(t,f) __builtin_offsetof(t,f) +#define FIELD_OFFSET(t,f) ((LONG)__builtin_offsetof(t,f)) #endif #ifndef CONTAINING_RECORD #define CONTAINING_RECORD(address, type, field) \ Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=422… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Sat Jul 25 21:38:52 2009 @@ -116,6 +116,9 @@ FALSE, NULL); } + +/* KiAcquireGuardedMutex depends on these bits being right */ +C_ASSERT((GM_LOCK_WAITER_WOKEN * 2) == GM_LOCK_WAITER_INC); VOID FASTCALL @@ -181,9 +184,6 @@ /* Ok, the wait is done, so set the new bits */ BitsToRemove = GM_LOCK_BIT | GM_LOCK_WAITER_WOKEN; BitsToAdd = GM_LOCK_WAITER_WOKEN; - - /* We depend on these bits being just right */ - C_ASSERT((GM_LOCK_WAITER_WOKEN * 2) == GM_LOCK_WAITER_INC); } } Modified: trunk/reactos/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pe.c?rev=42216… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pe.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pe.c [iso-8859-1] Sat Jul 25 21:38:52 2009 @@ -136,6 +136,84 @@ (RTL_FIELD_SIZE(TYPE1_, FIELD_) == RTL_FIELD_SIZE(TYPE2_, FIELD_)) \ ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +// +// FIXME: All this whitespace is "padding" so the C_ASSERTs aren't on the same lines as asserts in other headers. +// This is necessary because of the way we define C_ASSERT in a gcc compatible way. +// This can be removed once we upgrade to gcc 4.3.x or later (which implements __COUNTER__). +// + + + + + + + + + + + + + + + + + + + + + + + + +// +// PeFmtCreateSection depends on the following: +// +C_ASSERT(EXEFMT_LOAD_HEADER_SIZE >= sizeof(IMAGE_DOS_HEADER)); +C_ASSERT(sizeof(IMAGE_NT_HEADERS32) <= sizeof(IMAGE_NT_HEADERS64)); + +C_ASSERT(TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) == TYPE_ALIGNMENT(IMAGE_NT_HEADERS64)); +C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader) == RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS64, FileHeader)); +C_ASSERT(FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader) == FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader)); + +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Magic)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SectionAlignment)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, FileAlignment)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Subsystem)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MinorSubsystemVersion)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MajorSubsystemVersion)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, AddressOfEntryPoint)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfCode)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfHeaders)); + /* References: [1] Microsoft Corporation, "Microsoft Portable Executable and Common Object @@ -178,7 +256,6 @@ ASSERT(Intsafe_CanOffsetPointer(FileHeader, FileHeaderSize)); - C_ASSERT(EXEFMT_LOAD_HEADER_SIZE >= sizeof(IMAGE_DOS_HEADER)); ASSERT(((UINT_PTR)FileHeader % TYPE_ALIGNMENT(IMAGE_DOS_HEADER)) == 0); #define DIE(ARGS_) { DPRINT ARGS_; goto l_Return; } @@ -219,11 +296,6 @@ pinhNtHeader = (PVOID)((UINT_PTR)FileHeader + pidhDosHeader->e_lfanew); } - C_ASSERT(sizeof(IMAGE_NT_HEADERS32) <= sizeof(IMAGE_NT_HEADERS64)); - C_ASSERT(TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) == TYPE_ALIGNMENT(IMAGE_NT_HEADERS64)); - C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader) == RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS64, FileHeader)); - C_ASSERT(FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader) == FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader)); - /* * the buffer doesn't contain the NT file header, or the alignment is wrong: we * need to read the header from the file @@ -307,8 +379,6 @@ nStatus = STATUS_INVALID_IMAGE_FORMAT; - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Magic)); - if(!RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Magic)) DIE(("The optional header doesn't contain the Magic field, SizeOfOptionalHeader is %X\n", cbOptHeaderSize)); @@ -323,9 +393,6 @@ default: DIE(("Unrecognized optional header, Magic is %X\n", piohOptHeader->Magic)); } - - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SectionAlignment)); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, FileAlignment)); if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SectionAlignment) && RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, FileAlignment)) @@ -421,10 +488,6 @@ if((ULONG_PTR)ImageSectionObject->ImageBase % 0x10000) DIE(("ImageBase is not aligned on a 64KB boundary")); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Subsystem)); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MinorSubsystemVersion)); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MajorSubsystemVersion)); - if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Subsystem)) { ImageSectionObject->Subsystem = piohOptHeader->Subsystem; @@ -437,15 +500,11 @@ } } - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, AddressOfEntryPoint)); - if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, AddressOfEntryPoint)) { ImageSectionObject->EntryPoint = piohOptHeader->ImageBase + piohOptHeader->AddressOfEntryPoint; } - - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfCode)); if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfCode)) ImageSectionObject->Executable = piohOptHeader->SizeOfCode != 0; @@ -482,8 +541,6 @@ if(!Intsafe_AddULong32(&cbSectionHeadersOffsetSize, cbSectionHeadersOffset, cbSectionHeadersSize)) DIE(("Section headers too large\n")); - - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfHeaders)); /* size of the executable's headers */ if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfHeaders))

1 0

[sginsberg] 42215: - Fix a critical bug in ExAllocatePoolWithQuota spotted by msvc. Because of the current POOL_TAGGING mess in wdm.h, ExAllocatePoolWithQuotaTag is defined to ExAllocatePoolWithQuota, so when ExAllocatePoolWithQuota called the with-tag version, it ended up calling _itself_. Fix this by undefining the broken macro.
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 18:53:25 2009 New Revision: 42215 URL: http://svn.reactos.org/svn/reactos?rev=42215&view=rev Log: - Fix a critical bug in ExAllocatePoolWithQuota spotted by msvc. Because of the current POOL_TAGGING mess in wdm.h, ExAllocatePoolWithQuotaTag is defined to ExAllocatePoolWithQuota, so when ExAllocatePoolWithQuota called the with-tag version, it ended up calling _itself_. Fix this by undefining the broken macro. Modified: trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=422… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Sat Jul 25 18:53:25 2009 @@ -164,6 +164,7 @@ * @implemented */ #undef ExAllocatePoolWithQuota +#undef ExAllocatePoolWithQuotaTag PVOID NTAPI ExAllocatePoolWithQuota (POOL_TYPE PoolType, ULONG NumberOfBytes) { @@ -201,7 +202,6 @@ /* * @implemented */ -#undef ExAllocatePoolWithQuotaTag PVOID NTAPI ExAllocatePoolWithQuotaTag (IN POOL_TYPE PoolType,

1 0

[dchapyshev] 42214: - Add stubs for AppCleanup and videoThunk32 - Partially implement capCreateCaptureWindowW and capGetDriverDescriptionW
by dchapyshev＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: dchapyshev Date: Sat Jul 25 17:57:18 2009 New Revision: 42214 URL: http://svn.reactos.org/svn/reactos?rev=42214&view=rev Log: - Add stubs for AppCleanup and videoThunk32 - Partially implement capCreateCaptureWindowW and capGetDriverDescriptionW Modified: trunk/reactos/dll/win32/avicap32/avicap32.c trunk/reactos/dll/win32/avicap32/avicap32.spec Modified: trunk/reactos/dll/win32/avicap32/avicap32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avicap32/avicap3… ============================================================================== --- trunk/reactos/dll/win32/avicap32/avicap32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avicap32/avicap32.c [iso-8859-1] Sat Jul 25 17:57:18 2009 @@ -8,6 +8,7 @@ #include <windows.h> #include <winternl.h> #include <vfw.h> +#include <wchar.h> #include "wine/debug.h" @@ -16,8 +17,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(avicap32); -/* - * unimplemented +HINSTANCE hInstance; + + +/* INTRENAL FUNCTIONS **************************************************/ + +LRESULT +CALLBACK +CaptureWindowProc(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + switch (Msg) + { + case WM_CREATE: + break; + + case WM_PAINT: + break; + + case WM_DESTROY: + break; + } + + return DefWindowProc(hwnd, Msg, wParam, lParam); +} + + +/* FUNCTIONS ***********************************************************/ + +/* + * implemented */ HWND VFWAPI @@ -30,8 +58,37 @@ HWND hWnd, INT nID) { - UNIMPLEMENTED; - return NULL; + WCHAR szWindowClass[] = L"ClsCapWin"; + WNDCLASSEXW WndClass = {0}; + DWORD dwExStyle = 0; + + FIXME("capCreateCaptureWindowW() not fully implemented!\n"); + + WndClass.cbSize = sizeof(WNDCLASSEXW); + WndClass.lpszClassName = szWindowClass; + WndClass.lpfnWndProc = CaptureWindowProc; /* TODO: Implement CaptureWindowProc */ + WndClass.hInstance = hInstance; + WndClass.style = CS_HREDRAW | CS_VREDRAW; + WndClass.hCursor = LoadCursorW(0, IDC_ARROW); + WndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + + if (RegisterClassExW(&WndClass) == (ATOM)0) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + return NULL; + } + + return CreateWindowExW(dwExStyle, + szWindowClass, + lpszWindowName, + dwStyle, + x, y, + nWidth, + nHeight, + hWnd, + (HMENU)nID, + hInstance, + NULL); } /* @@ -70,7 +127,7 @@ /* - * unimplemented + * implemented */ BOOL VFWAPI @@ -80,7 +137,112 @@ LPWSTR lpszVer, INT cbVer) { - UNIMPLEMENTED; + DWORD dwSize, dwIndex = 0; + WCHAR szDriver[MAX_PATH]; + WCHAR szDriverName[MAX_PATH]; + WCHAR szFileName[MAX_PATH]; + WCHAR szVersion[MAX_PATH]; + HKEY hKey, hSubKey; + + /* TODO: Add support of data acquisition from system.ini */ + FIXME("capGetDriverDescriptionW() not fully implemented!\n"); + + if (lpszName && cbName) + lpszName[0] = L'\0'; + + if (lpszVer && cbVer) + lpszVer[0] = L'\0'; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\MediaResources\\msvideo", + 0, + KEY_READ, + &hKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwSize = sizeof(szDriver) / sizeof(WCHAR); + + while (RegEnumKeyExW(hKey, dwIndex, + szDriver, &dwSize, + NULL, NULL, + NULL, NULL) == ERROR_SUCCESS) + { + if (RegOpenKeyW(hKey, szDriver, &hSubKey) == ERROR_SUCCESS) + { + dwSize = sizeof(szFileName) / sizeof(WCHAR); + + if (RegQueryValueExW(hSubKey, + L"Driver", + NULL, + NULL, + (LPBYTE)&szFileName, + &dwSize) == ERROR_SUCCESS) + { + dwSize = sizeof(szDriverName) / sizeof(WCHAR); + + if (RegQueryValueExW(hSubKey, + L"FriendlyName", + NULL, + NULL, + (LPBYTE)&szDriverName, + &dwSize) != ERROR_SUCCESS) + { + wcscpy(szDriverName, L"Unknown Driver Name"); + } + + if (dwIndex == (DWORD)wDriverIndex) + { + if (lpszName && cbName) + { + lstrcpynW(lpszName, szDriverName, cbName); + } + + if (lpszVer && cbVer) + { + LPVOID Version, Ms; + DWORD dwInfoSize; + VS_FIXEDFILEINFO FileInfo; + UINT Ls; + + dwInfoSize = GetFileVersionInfoSize(szFileName, NULL); + if (dwInfoSize) + { + Version = HeapAlloc(GetProcessHeap(), 0, dwInfoSize); + + GetFileVersionInfo(szFileName, 0, dwInfoSize, Version); + + if (VerQueryValueW(Version, L"\\", &Ms, &Ls)) + { + memmove(&FileInfo, Ms, Ls); + swprintf(szVersion, L"Version: %d.%d.%d.%d", + HIWORD(FileInfo.dwFileVersionMS), + LOWORD(FileInfo.dwFileVersionMS), + HIWORD(FileInfo.dwFileVersionLS), + LOWORD(FileInfo.dwFileVersionLS)); + + lstrcpynW(lpszVer, szVersion, cbVer); + } + HeapFree(GetProcessHeap(), 0, Version); + } + } + + RegCloseKey(hSubKey); + RegCloseKey(hKey); + return TRUE; + } + } + + RegCloseKey(hSubKey); + } + + dwSize = sizeof(szDriver) / sizeof(WCHAR); + dwIndex++; + } + + RegCloseKey(hKey); + return FALSE; } @@ -110,6 +272,29 @@ } +/* + * unimplemented + */ +VOID +VFWAPI +AppCleanup(HINSTANCE hInst) +{ + UNIMPLEMENTED; +} + + +/* + * unimplemented + */ +DWORD +VFWAPI +videoThunk32(DWORD dwUnknown1, DWORD dwUnknown2, DWORD dwUnknown3, DWORD dwUnknown4, DWORD dwUnknown5) +{ + UNIMPLEMENTED; + return 0; +} + + BOOL WINAPI DllMain(IN HINSTANCE hinstDLL, @@ -119,6 +304,8 @@ switch (dwReason) { case DLL_PROCESS_ATTACH: + TRACE("avicap32 attached!\n"); + hInstance = hinstDLL; break; } Modified: trunk/reactos/dll/win32/avicap32/avicap32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avicap32/avicap3… ============================================================================== --- trunk/reactos/dll/win32/avicap32/avicap32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avicap32/avicap32.spec [iso-8859-1] Sat Jul 25 17:57:18 2009 @@ -1,6 +1,6 @@ -@ stub AppCleanup -@ stdcall capCreateCaptureWindowA(str long long long long long long long) +@ stdcall AppCleanup(ptr) +@ stdcall capCreateCaptureWindowA(str long long long long long long long) @ stdcall capCreateCaptureWindowW(wstr long long long long long long long) @ stdcall capGetDriverDescriptionA(long ptr long ptr long) @ stdcall capGetDriverDescriptionW(long ptr long ptr long) -@ stub videoThunk32 +@ stdcall videoThunk32(long long long long long)

1 0

[sginsberg] 42213: - Fix incorrect definition of ZwCreateDebugObject after revision 41969 -- spotted by BugBoy
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 17:31:57 2009 New Revision: 42213 URL: http://svn.reactos.org/svn/reactos?rev=42213&view=rev Log: - Fix incorrect definition of ZwCreateDebugObject after revision 41969 -- spotted by BugBoy Modified: trunk/reactos/include/ndk/dbgkfuncs.h Modified: trunk/reactos/include/ndk/dbgkfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/dbgkfuncs.h?re… ============================================================================== --- trunk/reactos/include/ndk/dbgkfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/dbgkfuncs.h [iso-8859-1] Sat Jul 25 17:31:57 2009 @@ -99,7 +99,7 @@ OUT PHANDLE DebugHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, - IN BOOLEAN KillProcessOnExit + IN ULONG Flags ); NTSYSAPI

1 0

[sginsberg] 42212: - Leftover 2 from 42210
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 16:55:52 2009 New Revision: 42212 URL: http://svn.reactos.org/svn/reactos?rev=42212&view=rev Log: - Leftover 2 from 42210 Modified: trunk/reactos/lib/drivers/ip/transport/tcp/if.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Sat Jul 25 16:55:52 2009 @@ -33,14 +33,16 @@ POSK_IFADDR TCPGetInterfaceData( PIP_INTERFACE IF ) { NTSTATUS Status; POSK_IFADDR ifaddr = IF->TCPContext; + struct sockaddr_in *addr_in; + struct sockaddr_in *dstaddr_in; ASSERT(ifaddr); ASSERT_LOCKED(&TCPLock); RtlZeroMemory(ifaddr, sizeof(OSK_IFADDR) + 2 * sizeof( struct sockaddr_in )); - struct sockaddr_in *addr_in = (struct sockaddr_in *)&ifaddr[1]; - struct sockaddr_in *dstaddr_in = (struct sockaddr_in *)&addr_in[1]; + addr_in = (struct sockaddr_in *)&ifaddr[1]; + dstaddr_in = (struct sockaddr_in *)&addr_in[1]; TI_DbgPrint(DEBUG_TCPIF,("Called\n")); Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Sat Jul 25 16:55:52 2009 @@ -312,12 +312,12 @@ * Status of operation */ { + NTSTATUS Status; + #ifdef __NTDRIVER__ RtlZeroMemory(&UDPStats, sizeof(UDP_STATISTICS)); #endif - NTSTATUS Status; - Status = PortsStartup( &UDPPorts, 1, UDP_STARTING_PORT + UDP_DYNAMIC_PORTS ); if( !NT_SUCCESS(Status) ) return Status;

1 0

[sginsberg] 42211: - Leftover from previous commit
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 16:54:31 2009 New Revision: 42211 URL: http://svn.reactos.org/svn/reactos?rev=42211&view=rev Log: - Leftover from previous commit Modified: trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=422… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Sat Jul 25 16:54:31 2009 @@ -1540,7 +1540,7 @@ } NDIS_PROTOCOL_CHARACTERISTICS, *PNDIS_PROTOCOL_CHARACTERISTICS; #elif defined(NDIS40) typedef struct _NDIS_PROTOCOL_CHARACTERISTICS { - NDIS40_PROTOCOL_CHARACTERISTICS_S; + NDIS40_PROTOCOL_CHARACTERISTICS_S } NDIS_PROTOCOL_CHARACTERISTICS, *PNDIS_PROTOCOL_CHARACTERISTICS; #else /* NDIS30 */ typedef struct _NDIS_PROTOCOL_CHARACTERISTICS {

1 0

[sginsberg] 42210: - Fix most of the network stack for msvc (except tcpip and oskittcp) - Fix calling convention definitions for ntdd8042.h - Fix msfs' calling convention
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 16:51:56 2009 New Revision: 42210 URL: http://svn.reactos.org/svn/reactos?rev=42210&view=rev Log: - Fix most of the network stack for msvc (except tcpip and oskittcp) - Fix calling convention definitions for ntdd8042.h - Fix msfs' calling convention Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/ndis/ndis/misc.c trunk/reactos/include/ddk/ndis.h trunk/reactos/include/ddk/ntdd8042.h trunk/reactos/include/ddk/tdikrnl.h Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] Sat Jul 25 16:51:56 2009 @@ -12,21 +12,7 @@ #include <ntifs.h> #include <iotypes.h> -/* - * FIXME: GCC doesn't have a working option for defaulting to a calling - * convention. It will always default to cdecl. The MS DDK was designed - * for compilers which support this option, and thus some of their headers - * do not specify STDCALL or NTAPI everywhere. As such, callbacks will be - * interpreted as cdecl on gcc, while they should be stdcall. Defining - * NTAPI manually won't work either, since msvc will realize that the - * two definitions are different. So we have to use something to close - * the compatibility gap, until someone fixes gcc. - */ -#ifdef _MSC_VER -#define DEFAULTAPI -#else -#define DEFAULTAPI __stdcall -#endif +#define DEFAULTAPI NTAPI typedef struct _MSFS_DEVICE_EXTENSION { Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Sat Jul 25 16:51:56 2009 @@ -73,13 +73,14 @@ UINT Size = sizeof(AFD_WSABUF) * (Count + Lock); PAFD_WSABUF NewBuf = ExAllocatePool( PagedPool, Size * 2 ); BOOLEAN LockFailed = FALSE; + PAFD_MAPBUF MapBuf; AFD_DbgPrint(MID_TRACE,("Called(%08x)\n", NewBuf)); if( NewBuf ) { RtlZeroMemory(NewBuf, Size * 2); - PAFD_MAPBUF MapBuf = (PAFD_MAPBUF)(NewBuf + Count + Lock); + MapBuf = (PAFD_MAPBUF)(NewBuf + Count + Lock); _SEH2_TRY { RtlCopyMemory( NewBuf, Buf, sizeof(AFD_WSABUF) * Count ); Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Sat Jul 25 16:51:56 2009 @@ -462,8 +462,8 @@ pNdisItem->Routine(pNdisItem, pNdisItem->Context); } -EXPORT NDIS_STATUS +EXPORT NdisScheduleWorkItem( IN PNDIS_WORK_ITEM pWorkItem) { Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=422… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Sat Jul 25 16:51:56 2009 @@ -258,8 +258,8 @@ /* Timer */ -typedef VOID DDKAPI -(*PNDIS_TIMER_FUNCTION)( +typedef VOID +(DDKAPI *PNDIS_TIMER_FUNCTION)( IN PVOID SystemSpecific1, IN PVOID FunctionContext, IN PVOID SystemSpecific2, @@ -635,17 +635,17 @@ } NDIS_WAN_LINE_UP, *PNDIS_WAN_LINE_UP; -typedef VOID DDKAPI -(*ADAPTER_SHUTDOWN_HANDLER)( +typedef VOID +(DDKAPI *ADAPTER_SHUTDOWN_HANDLER)( IN PVOID ShutdownContext); -typedef NTSTATUS DDKAPI -(*TDI_REGISTER_CALLBACK)( +typedef NTSTATUS +(DDKAPI *TDI_REGISTER_CALLBACK)( IN PUNICODE_STRING DeviceName, OUT HANDLE* TdiHandle); -typedef NTSTATUS DDKAPI -(*TDI_PNP_HANDLER)( +typedef NTSTATUS +(DDKAPI *TDI_PNP_HANDLER)( IN PUNICODE_STRING UpperComponent, IN PUNICODE_STRING LowerComponent, IN PUNICODE_STRING BindList, @@ -1072,97 +1072,97 @@ /* Call Manager */ -typedef VOID DDKAPI -(*CM_ACTIVATE_VC_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CM_ACTIVATE_VC_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE CallMgrVcContext, IN PCO_CALL_PARAMETERS CallParameters); -typedef NDIS_STATUS DDKAPI -(*CM_ADD_PARTY_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_ADD_PARTY_HANDLER)( IN NDIS_HANDLE CallMgrVcContext, IN OUT PCO_CALL_PARAMETERS CallParameters, IN NDIS_HANDLE NdisPartyHandle, OUT PNDIS_HANDLE CallMgrPartyContext); -typedef NDIS_STATUS DDKAPI -(*CM_CLOSE_AF_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_CLOSE_AF_HANDLER)( IN NDIS_HANDLE CallMgrAfContext); -typedef NDIS_STATUS DDKAPI -(*CM_CLOSE_CALL_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_CLOSE_CALL_HANDLER)( IN NDIS_HANDLE CallMgrVcContext, IN NDIS_HANDLE CallMgrPartyContext OPTIONAL, IN PVOID CloseData OPTIONAL, IN UINT Size OPTIONAL); -typedef NDIS_STATUS DDKAPI -(*CM_DEREG_SAP_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_DEREG_SAP_HANDLER)( IN NDIS_HANDLE CallMgrSapContext); -typedef VOID DDKAPI -(*CM_DEACTIVATE_VC_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CM_DEACTIVATE_VC_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE CallMgrVcContext); -typedef NDIS_STATUS DDKAPI -(*CM_DROP_PARTY_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_DROP_PARTY_HANDLER)( IN NDIS_HANDLE CallMgrPartyContext, IN PVOID CloseData OPTIONAL, IN UINT Size OPTIONAL); -typedef VOID DDKAPI -(*CM_INCOMING_CALL_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CM_INCOMING_CALL_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE CallMgrVcContext, IN PCO_CALL_PARAMETERS CallParameters); -typedef NDIS_STATUS DDKAPI -(*CM_MAKE_CALL_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_MAKE_CALL_HANDLER)( IN NDIS_HANDLE CallMgrVcContext, IN OUT PCO_CALL_PARAMETERS CallParameters, IN NDIS_HANDLE NdisPartyHandle OPTIONAL, OUT PNDIS_HANDLE CallMgrPartyContext OPTIONAL); -typedef NDIS_STATUS DDKAPI -(*CM_MODIFY_CALL_QOS_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_MODIFY_CALL_QOS_HANDLER)( IN NDIS_HANDLE CallMgrVcContext, IN PCO_CALL_PARAMETERS CallParameters); -typedef NDIS_STATUS DDKAPI -(*CM_OPEN_AF_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_OPEN_AF_HANDLER)( IN NDIS_HANDLE CallMgrBindingContext, IN PCO_ADDRESS_FAMILY AddressFamily, IN NDIS_HANDLE NdisAfHandle, OUT PNDIS_HANDLE CallMgrAfContext); -typedef NDIS_STATUS DDKAPI -(*CM_REG_SAP_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_REG_SAP_HANDLER)( IN NDIS_HANDLE CallMgrAfContext, IN PCO_SAP Sap, IN NDIS_HANDLE NdisSapHandle, OUT PNDIS_HANDLE CallMgrSapContext); -typedef NDIS_STATUS DDKAPI -(*CO_CREATE_VC_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CO_CREATE_VC_HANDLER)( IN NDIS_HANDLE ProtocolAfContext, IN NDIS_HANDLE NdisVcHandle, OUT PNDIS_HANDLE ProtocolVcContext); -typedef NDIS_STATUS DDKAPI -(*CO_DELETE_VC_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CO_DELETE_VC_HANDLER)( IN NDIS_HANDLE ProtocolVcContext); -typedef VOID DDKAPI -(*CO_REQUEST_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CO_REQUEST_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolAfContext OPTIONAL, IN NDIS_HANDLE ProtocolVcContext OPTIONAL, IN NDIS_HANDLE ProtocolPartyContext OPTIONAL, IN PNDIS_REQUEST NdisRequest); -typedef NDIS_STATUS DDKAPI -(*CO_REQUEST_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CO_REQUEST_HANDLER)( IN NDIS_HANDLE ProtocolAfContext, IN NDIS_HANDLE ProtocolVcContext OPTIONAL, IN NDIS_HANDLE ProtocolPartyContext OPTIONAL, @@ -1200,81 +1200,81 @@ IN NDIS_HANDLE ProtocolAfContext, IN NDIS_HANDLE NdisAfHandle); -typedef VOID DDKAPI -(*CL_CLOSE_AF_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_CLOSE_AF_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolAfContext); -typedef VOID DDKAPI -(*CL_REG_SAP_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_REG_SAP_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolSapContext, IN PCO_SAP Sap, IN NDIS_HANDLE NdisSapHandle); -typedef VOID DDKAPI -(*CL_DEREG_SAP_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_DEREG_SAP_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolSapContext); -typedef VOID DDKAPI -(*CL_MAKE_CALL_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_MAKE_CALL_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolVcContext, IN NDIS_HANDLE NdisPartyHandle OPTIONAL, IN PCO_CALL_PARAMETERS CallParameters); -typedef VOID DDKAPI -(*CL_MODIFY_CALL_QOS_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_MODIFY_CALL_QOS_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolVcContext, IN PCO_CALL_PARAMETERS CallParameters); -typedef VOID DDKAPI -(*CL_CLOSE_CALL_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_CLOSE_CALL_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolVcContext, IN NDIS_HANDLE ProtocolPartyContext OPTIONAL); -typedef VOID DDKAPI -(*CL_ADD_PARTY_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_ADD_PARTY_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolPartyContext, IN NDIS_HANDLE NdisPartyHandle, IN PCO_CALL_PARAMETERS CallParameters); -typedef VOID DDKAPI -(*CL_DROP_PARTY_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_DROP_PARTY_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolPartyContext); -typedef NDIS_STATUS DDKAPI -(*CL_INCOMING_CALL_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CL_INCOMING_CALL_HANDLER)( IN NDIS_HANDLE ProtocolSapContext, IN NDIS_HANDLE ProtocolVcContext, IN OUT PCO_CALL_PARAMETERS CallParameters); -typedef VOID DDKAPI -(*CL_INCOMING_CALL_QOS_CHANGE_HANDLER)( +typedef VOID +(DDKAPI *CL_INCOMING_CALL_QOS_CHANGE_HANDLER)( IN NDIS_HANDLE ProtocolVcContext, IN PCO_CALL_PARAMETERS CallParameters); -typedef VOID DDKAPI -(*CL_INCOMING_CLOSE_CALL_HANDLER)( +typedef VOID +(DDKAPI *CL_INCOMING_CLOSE_CALL_HANDLER)( IN NDIS_STATUS CloseStatus, IN NDIS_HANDLE ProtocolVcContext, IN PVOID CloseData OPTIONAL, IN UINT Size OPTIONAL); -typedef VOID DDKAPI -(*CL_INCOMING_DROP_PARTY_HANDLER)( +typedef VOID +(DDKAPI *CL_INCOMING_DROP_PARTY_HANDLER)( IN NDIS_STATUS DropStatus, IN NDIS_HANDLE ProtocolPartyContext, IN PVOID CloseData OPTIONAL, IN UINT Size OPTIONAL); -typedef VOID DDKAPI -(*CL_CALL_CONNECTED_HANDLER)( +typedef VOID +(DDKAPI *CL_CALL_CONNECTED_HANDLER)( IN NDIS_HANDLE ProtocolVcContext); @@ -1308,65 +1308,65 @@ /* Prototypes for NDIS 3.0 protocol characteristics */ -typedef VOID DDKAPI -(*OPEN_ADAPTER_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *OPEN_ADAPTER_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS Status, IN NDIS_STATUS OpenErrorStatus); -typedef VOID DDKAPI -(*CLOSE_ADAPTER_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CLOSE_ADAPTER_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS Status); -typedef VOID DDKAPI -(*RESET_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *RESET_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS Status); -typedef VOID DDKAPI -(*REQUEST_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *REQUEST_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_REQUEST NdisRequest, IN NDIS_STATUS Status); -typedef VOID DDKAPI -(*STATUS_HANDLER)( +typedef VOID +(DDKAPI *STATUS_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS GeneralStatus, IN PVOID StatusBuffer, IN UINT StatusBufferSize); -typedef VOID DDKAPI -(*STATUS_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *STATUS_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext); -typedef VOID DDKAPI -(*SEND_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *SEND_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_PACKET Packet, IN NDIS_STATUS Status); -typedef VOID DDKAPI -(*WAN_SEND_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *WAN_SEND_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_WAN_PACKET Packet, IN NDIS_STATUS Status); -typedef VOID DDKAPI -(*TRANSFER_DATA_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *TRANSFER_DATA_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_PACKET Packet, IN NDIS_STATUS Status, IN UINT BytesTransferred); -typedef VOID DDKAPI -(*WAN_TRANSFER_DATA_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *WAN_TRANSFER_DATA_COMPLETE_HANDLER)( VOID); -typedef NDIS_STATUS DDKAPI -(*RECEIVE_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *RECEIVE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_HANDLE MacReceiveContext, IN PVOID HeaderBuffer, @@ -1375,14 +1375,14 @@ IN UINT LookaheadBufferSize, IN UINT PacketSize); -typedef NDIS_STATUS DDKAPI -(*WAN_RECEIVE_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *WAN_RECEIVE_HANDLER)( IN NDIS_HANDLE NdisLinkHandle, IN PUCHAR Packet, IN ULONG PacketSize); -typedef VOID DDKAPI -(*RECEIVE_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *RECEIVE_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext); @@ -1424,32 +1424,32 @@ /* Prototypes for NDIS 4.0 protocol characteristics */ -typedef INT DDKAPI -(*RECEIVE_PACKET_HANDLER)( +typedef INT +(DDKAPI *RECEIVE_PACKET_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_PACKET Packet); -typedef VOID DDKAPI -(*BIND_HANDLER)( +typedef VOID +(DDKAPI *BIND_HANDLER)( OUT PNDIS_STATUS Status, IN NDIS_HANDLE BindContext, IN PNDIS_STRING DeviceName, IN PVOID SystemSpecific1, IN PVOID SystemSpecific2); -typedef VOID DDKAPI -(*UNBIND_HANDLER)( +typedef VOID +(DDKAPI *UNBIND_HANDLER)( OUT PNDIS_STATUS Status, IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_HANDLE UnbindContext); -typedef NDIS_STATUS DDKAPI -(*PNP_EVENT_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *PNP_EVENT_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNET_PNP_EVENT NetPnPEvent); -typedef VOID DDKAPI -(*UNLOAD_PROTOCOL_HANDLER)( +typedef VOID +(DDKAPI *UNLOAD_PROTOCOL_HANDLER)( VOID); @@ -1483,28 +1483,28 @@ /* Prototypes for NDIS 5.0 protocol characteristics */ -typedef VOID DDKAPI -(*CO_SEND_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CO_SEND_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolVcContext, IN PNDIS_PACKET Packet); -typedef VOID DDKAPI -(*CO_STATUS_HANDLER)( +typedef VOID +(DDKAPI *CO_STATUS_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_HANDLE ProtocolVcContext OPTIONAL, IN NDIS_STATUS GeneralStatus, IN PVOID StatusBuffer, IN UINT StatusBufferSize); -typedef UINT DDKAPI -(*CO_RECEIVE_PACKET_HANDLER)( +typedef UINT +(DDKAPI *CO_RECEIVE_PACKET_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_HANDLE ProtocolVcContext, IN PNDIS_PACKET Packet); -typedef VOID DDKAPI -(*CO_AF_REGISTER_NOTIFY_HANDLER)( +typedef VOID +(DDKAPI *CO_AF_REGISTER_NOTIFY_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PCO_ADDRESS_FAMILY AddressFamily); @@ -1536,7 +1536,7 @@ #if defined(NDIS50) || defined(NDIS51) typedef struct _NDIS_PROTOCOL_CHARACTERISTICS { - NDIS50_PROTOCOL_CHARACTERISTICS_S; + NDIS50_PROTOCOL_CHARACTERISTICS_S } NDIS_PROTOCOL_CHARACTERISTICS, *PNDIS_PROTOCOL_CHARACTERISTICS; #elif defined(NDIS40) typedef struct _NDIS_PROTOCOL_CHARACTERISTICS { @@ -2452,8 +2452,8 @@ #define NdisZeroMemory(Destination, Length) \ RtlZeroMemory(Destination, Length) -typedef VOID DDKAPI -(*NDIS_BLOCK_INITIALIZER) ( +typedef VOID +(DDKAPI *NDIS_BLOCK_INITIALIZER) ( IN PUCHAR Block, IN SIZE_T NumberOfBytes ); @@ -3646,28 +3646,28 @@ /* Prototypes for NDIS_MINIPORT_CHARACTERISTICS */ -typedef BOOLEAN DDKAPI -(*W_CHECK_FOR_HANG_HANDLER)( +typedef BOOLEAN +(DDKAPI *W_CHECK_FOR_HANG_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext); -typedef VOID DDKAPI -(*W_DISABLE_INTERRUPT_HANDLER)( +typedef VOID +(DDKAPI *W_DISABLE_INTERRUPT_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext); -typedef VOID DDKAPI -(*W_ENABLE_INTERRUPT_HANDLER)( +typedef VOID +(DDKAPI *W_ENABLE_INTERRUPT_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext); -typedef VOID DDKAPI -(*W_HALT_HANDLER)( +typedef VOID +(DDKAPI *W_HALT_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext); -typedef VOID DDKAPI -(*W_HANDLE_INTERRUPT_HANDLER)( +typedef VOID +(DDKAPI *W_HANDLE_INTERRUPT_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext); -typedef NDIS_STATUS DDKAPI -(*W_INITIALIZE_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_INITIALIZE_HANDLER)( OUT PNDIS_STATUS OpenErrorStatus, OUT PUINT SelectedMediumIndex, IN PNDIS_MEDIUM MediumArray, @@ -3675,14 +3675,14 @@ IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE WrapperConfigurationContext); -typedef VOID DDKAPI -(*W_ISR_HANDLER)( +typedef VOID +(DDKAPI *W_ISR_HANDLER)( OUT PBOOLEAN InterruptRecognized, OUT PBOOLEAN QueueMiniportHandleInterrupt, IN NDIS_HANDLE MiniportAdapterContext); -typedef NDIS_STATUS DDKAPI -(*W_QUERY_INFORMATION_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_QUERY_INFORMATION_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_OID Oid, IN PVOID InformationBuffer, @@ -3690,31 +3690,31 @@ OUT PULONG BytesWritten, OUT PULONG BytesNeeded); -typedef NDIS_STATUS DDKAPI -(*W_RECONFIGURE_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_RECONFIGURE_HANDLER)( OUT PNDIS_STATUS OpenErrorStatus, IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE WrapperConfigurationContext); -typedef NDIS_STATUS DDKAPI -(*W_RESET_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_RESET_HANDLER)( OUT PBOOLEAN AddressingReset, IN NDIS_HANDLE MiniportAdapterContext); -typedef NDIS_STATUS DDKAPI -(*W_SEND_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_SEND_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN PNDIS_PACKET Packet, IN UINT Flags); -typedef NDIS_STATUS DDKAPI -(*WM_SEND_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *WM_SEND_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE NdisLinkHandle, IN PNDIS_WAN_PACKET Packet); -typedef NDIS_STATUS DDKAPI -(*W_SET_INFORMATION_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_SET_INFORMATION_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_OID Oid, IN PVOID InformationBuffer, @@ -3722,8 +3722,8 @@ OUT PULONG BytesRead, OUT PULONG BytesNeeded); -typedef NDIS_STATUS DDKAPI -(*W_TRANSFER_DATA_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_TRANSFER_DATA_HANDLER)( OUT PNDIS_PACKET Packet, OUT PUINT BytesTransferred, IN NDIS_HANDLE MiniportAdapterContext, @@ -3731,8 +3731,8 @@ IN UINT ByteOffset, IN UINT BytesToTransfer); -typedef NDIS_STATUS DDKAPI -(*WM_TRANSFER_DATA_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *WM_TRANSFER_DATA_HANDLER)( VOID); @@ -3763,19 +3763,19 @@ /* Extensions for NDIS 4.0 miniports */ -typedef VOID DDKAPI -(*W_SEND_PACKETS_HANDLER)( +typedef VOID +(DDKAPI *W_SEND_PACKETS_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN PPNDIS_PACKET PacketArray, IN UINT NumberOfPackets); -typedef VOID DDKAPI -(*W_RETURN_PACKET_HANDLER)( +typedef VOID +(DDKAPI *W_RETURN_PACKET_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN PNDIS_PACKET Packet); -typedef VOID DDKAPI -(*W_ALLOCATE_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *W_ALLOCATE_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN PVOID VirtualAddress, IN PNDIS_PHYSICAL_ADDRESS PhysicalAddress, @@ -3807,33 +3807,33 @@ /* Extensions for NDIS 5.0 miniports */ -typedef NDIS_STATUS DDKAPI -(*W_CO_CREATE_VC_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_CO_CREATE_VC_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE NdisVcHandle, OUT PNDIS_HANDLE MiniportVcContext); -typedef NDIS_STATUS DDKAPI -(*W_CO_DELETE_VC_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_CO_DELETE_VC_HANDLER)( IN NDIS_HANDLE MiniportVcContext); -typedef NDIS_STATUS DDKAPI -(*W_CO_ACTIVATE_VC_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_CO_ACTIVATE_VC_HANDLER)( IN NDIS_HANDLE MiniportVcContext, IN OUT PCO_CALL_PARAMETERS CallParameters); -typedef NDIS_STATUS DDKAPI -(*W_CO_DEACTIVATE_VC_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_CO_DEACTIVATE_VC_HANDLER)( IN NDIS_HANDLE MiniportVcContext); -typedef VOID DDKAPI -(*W_CO_SEND_PACKETS_HANDLER)( +typedef VOID +(DDKAPI *W_CO_SEND_PACKETS_HANDLER)( IN NDIS_HANDLE MiniportVcContext, IN PPNDIS_PACKET PacketArray, IN UINT NumberOfPackets); -typedef NDIS_STATUS DDKAPI -(*W_CO_REQUEST_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_CO_REQUEST_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE MiniportVcContext OPTIONAL, IN OUT PNDIS_REQUEST NdisRequest); @@ -3869,20 +3869,20 @@ /* Extensions for NDIS 5.1 miniports */ -typedef VOID DDKAPI -(*W_CANCEL_SEND_PACKETS_HANDLER)( +typedef VOID +(DDKAPI *W_CANCEL_SEND_PACKETS_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN PVOID CancelId); -typedef VOID DDKAPI -(*W_PNP_EVENT_NOTIFY_HANDLER)( +typedef VOID +(DDKAPI *W_PNP_EVENT_NOTIFY_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_DEVICE_PNP_EVENT PnPEvent, IN PVOID InformationBuffer, IN ULONG InformationBufferLength); -typedef VOID DDKAPI -(*W_MINIPORT_SHUTDOWN_HANDLER)( +typedef VOID +(DDKAPI *W_MINIPORT_SHUTDOWN_HANDLER)( IN PVOID ShutdownContext); #ifdef __cplusplus @@ -3926,13 +3926,13 @@ #endif -typedef NDIS_STATUS DDKAPI -(*SEND_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *SEND_HANDLER)( IN NDIS_HANDLE MacBindingHandle, IN PNDIS_PACKET Packet); -typedef NDIS_STATUS DDKAPI -(*TRANSFER_DATA_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *TRANSFER_DATA_HANDLER)( IN NDIS_HANDLE MacBindingHandle, IN NDIS_HANDLE MacReceiveContext, IN UINT ByteOffset, @@ -3940,12 +3940,12 @@ OUT PNDIS_PACKET Packet, OUT PUINT BytesTransferred); -typedef NDIS_STATUS DDKAPI -(*RESET_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *RESET_HANDLER)( IN NDIS_HANDLE MacBindingHandle); -typedef NDIS_STATUS DDKAPI -(*REQUEST_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *REQUEST_HANDLER)( IN NDIS_HANDLE MacBindingHandle, IN PNDIS_REQUEST NdisRequest); @@ -3953,12 +3953,12 @@ /* Structures available only to full MAC drivers */ -typedef BOOLEAN DDKAPI -(*PNDIS_INTERRUPT_SERVICE)( +typedef BOOLEAN +(DDKAPI *PNDIS_INTERRUPT_SERVICE)( IN PVOID InterruptContext); -typedef VOID DDKAPI -(*PNDIS_DEFERRED_PROCESSING)( +typedef VOID +(DDKAPI *PNDIS_DEFERRED_PROCESSING)( IN PVOID SystemSpecific1, IN PVOID InterruptContext, IN PVOID SystemSpecific2, @@ -4051,12 +4051,12 @@ } NDIS_BIND_PATHS, *PNDIS_BIND_PATHS; -typedef VOID DDKAPI -(*ETH_RCV_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *ETH_RCV_COMPLETE_HANDLER)( IN PETH_FILTER Filter); -typedef VOID DDKAPI -(*ETH_RCV_INDICATE_HANDLER)( +typedef VOID +(DDKAPI *ETH_RCV_INDICATE_HANDLER)( IN PETH_FILTER Filter, IN NDIS_HANDLE MacReceiveContext, IN PCHAR Address, @@ -4066,12 +4066,12 @@ IN UINT LookaheadBufferSize, IN UINT PacketSize); -typedef VOID DDKAPI -(*FDDI_RCV_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *FDDI_RCV_COMPLETE_HANDLER)( IN PFDDI_FILTER Filter); -typedef VOID DDKAPI -(*FDDI_RCV_INDICATE_HANDLER)( +typedef VOID +(DDKAPI *FDDI_RCV_INDICATE_HANDLER)( IN PFDDI_FILTER Filter, IN NDIS_HANDLE MacReceiveContext, IN PCHAR Address, @@ -4082,18 +4082,18 @@ IN UINT LookaheadBufferSize, IN UINT PacketSize); -typedef VOID DDKAPI -(*FILTER_PACKET_INDICATION_HANDLER)( +typedef VOID +(DDKAPI *FILTER_PACKET_INDICATION_HANDLER)( IN NDIS_HANDLE Miniport, IN PPNDIS_PACKET PacketArray, IN UINT NumberOfPackets); -typedef VOID DDKAPI -(*TR_RCV_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *TR_RCV_COMPLETE_HANDLER)( IN PTR_FILTER Filter); -typedef VOID DDKAPI -(*TR_RCV_INDICATE_HANDLER)( +typedef VOID +(DDKAPI *TR_RCV_INDICATE_HANDLER)( IN PTR_FILTER Filter, IN NDIS_HANDLE MacReceiveContext, IN PVOID HeaderBuffer, @@ -4102,75 +4102,75 @@ IN UINT LookaheadBufferSize, IN UINT PacketSize); -typedef VOID DDKAPI -(*WAN_RCV_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *WAN_RCV_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_HANDLE NdisLinkContext); -typedef VOID DDKAPI -(*WAN_RCV_HANDLER)( +typedef VOID +(DDKAPI *WAN_RCV_HANDLER)( OUT PNDIS_STATUS Status, IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_HANDLE NdisLinkContext, IN PUCHAR Packet, IN ULONG PacketSize); -typedef VOID FASTCALL -(*NDIS_M_DEQUEUE_WORK_ITEM)( +typedef VOID +(FASTCALL *NDIS_M_DEQUEUE_WORK_ITEM)( IN PNDIS_MINIPORT_BLOCK Miniport, IN NDIS_WORK_ITEM_TYPE WorkItemType, OUT PVOID *WorkItemContext); -typedef NDIS_STATUS FASTCALL -(*NDIS_M_QUEUE_NEW_WORK_ITEM)( +typedef NDIS_STATUS +(FASTCALL *NDIS_M_QUEUE_NEW_WORK_ITEM)( IN PNDIS_MINIPORT_BLOCK Miniport, IN NDIS_WORK_ITEM_TYPE WorkItemType, IN PVOID WorkItemContext); -typedef NDIS_STATUS FASTCALL -(*NDIS_M_QUEUE_WORK_ITEM)( +typedef NDIS_STATUS +(FASTCALL *NDIS_M_QUEUE_WORK_ITEM)( IN PNDIS_MINIPORT_BLOCK Miniport, IN NDIS_WORK_ITEM_TYPE WorkItemType, IN PVOID WorkItemContext); -typedef VOID DDKAPI -(*NDIS_M_REQ_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *NDIS_M_REQ_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_STATUS Status); -typedef VOID DDKAPI -(*NDIS_M_RESET_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *NDIS_M_RESET_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_STATUS Status, IN BOOLEAN AddressingReset); -typedef VOID DDKAPI -(*NDIS_M_SEND_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *NDIS_M_SEND_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle, IN PNDIS_PACKET Packet, IN NDIS_STATUS Status); -typedef VOID DDKAPI -(*NDIS_M_SEND_RESOURCES_HANDLER)( +typedef VOID +(DDKAPI *NDIS_M_SEND_RESOURCES_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle); -typedef BOOLEAN FASTCALL -(*NDIS_M_START_SENDS)( +typedef BOOLEAN +(FASTCALL *NDIS_M_START_SENDS)( IN PNDIS_MINIPORT_BLOCK Miniport); -typedef VOID DDKAPI -(*NDIS_M_STATUS_HANDLER)( +typedef VOID +(DDKAPI *NDIS_M_STATUS_HANDLER)( IN NDIS_HANDLE MiniportHandle, IN NDIS_STATUS GeneralStatus, IN PVOID StatusBuffer, IN UINT StatusBufferSize); -typedef VOID DDKAPI -(*NDIS_M_STS_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *NDIS_M_STS_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle); -typedef VOID DDKAPI -(*NDIS_M_TD_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *NDIS_M_TD_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle, IN PNDIS_PACKET Packet, IN NDIS_STATUS Status, Modified: trunk/reactos/include/ddk/ntdd8042.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdd8042.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntdd8042.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdd8042.h [iso-8859-1] Sat Jul 25 16:51:56 2009 @@ -133,38 +133,38 @@ ULONG Reserved[8]; } INTERNAL_I8042_START_INFORMATION, *PINTERNAL_I8042_START_INFORMATION; -typedef VOID DDKAPI -(*PI8042_ISR_WRITE_PORT)( +typedef VOID +(DDKAPI *PI8042_ISR_WRITE_PORT)( IN PVOID Context, IN UCHAR Value); -typedef VOID DDKAPI -(*PI8042_QUEUE_PACKET)( +typedef VOID +(DDKAPI *PI8042_QUEUE_PACKET)( IN PVOID Context); -typedef NTSTATUS DDKAPI -(*PI8042_SYNCH_READ_PORT) ( +typedef NTSTATUS +(DDKAPI *PI8042_SYNCH_READ_PORT) ( IN PVOID Context, OUT PUCHAR Value, IN BOOLEAN WaitForACK); -typedef NTSTATUS DDKAPI -(*PI8042_SYNCH_WRITE_PORT)( +typedef NTSTATUS +(DDKAPI *PI8042_SYNCH_WRITE_PORT)( IN PVOID Context, IN UCHAR Value, IN BOOLEAN WaitForACK); -typedef NTSTATUS DDKAPI -(*PI8042_KEYBOARD_INITIALIZATION_ROUTINE)( +typedef NTSTATUS +(DDKAPI *PI8042_KEYBOARD_INITIALIZATION_ROUTINE)( IN PVOID InitializationContext, IN PVOID SynchFuncContext, IN PI8042_SYNCH_READ_PORT ReadPort, IN PI8042_SYNCH_WRITE_PORT WritePort, OUT PBOOLEAN TurnTranslationOn); -typedef BOOLEAN DDKAPI -(*PI8042_KEYBOARD_ISR)( +typedef BOOLEAN +(DDKAPI *PI8042_KEYBOARD_ISR)( PVOID IsrContext, PKEYBOARD_INPUT_DATA CurrentInput, POUTPUT_PACKET CurrentOutput, @@ -182,8 +182,8 @@ IN PVOID CallContext; } INTERNAL_I8042_HOOK_KEYBOARD, *PINTERNAL_I8042_HOOK_KEYBOARD; -typedef BOOLEAN DDKAPI -(*PI8042_MOUSE_ISR)( +typedef BOOLEAN +(DDKAPI *PI8042_MOUSE_ISR)( PVOID IsrContext, PMOUSE_INPUT_DATA CurrentInput, POUTPUT_PACKET CurrentOutput, Modified: trunk/reactos/include/ddk/tdikrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tdikrnl.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/tdikrnl.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/tdikrnl.h [iso-8859-1] Sat Jul 25 16:51:56 2009 @@ -156,8 +156,8 @@ #define TDI_EVENT_CHAINED_RECEIVE_EXPEDITED 9 #define TDI_EVENT_ERROR_EX 10 -typedef NTSTATUS DDKAPI -(*PTDI_IND_CONNECT)( +typedef NTSTATUS +(DDKAPI *PTDI_IND_CONNECT)( IN PVOID TdiEventContext, IN LONG RemoteAddressLength, IN PVOID RemoteAddress, @@ -182,8 +182,8 @@ OUT CONNECTION_CONTEXT *ConnectionContext, OUT PIRP *AcceptIrp); -typedef NTSTATUS DDKAPI -(*PTDI_IND_DISCONNECT)( +typedef NTSTATUS +(DDKAPI *PTDI_IND_DISCONNECT)( IN PVOID TdiEventContext, IN CONNECTION_CONTEXT ConnectionContext, IN LONG DisconnectDataLength, @@ -204,13 +204,13 @@ IN PVOID DisconnectInformation, IN ULONG DisconnectFlags); -typedef NTSTATUS DDKAPI -(*PTDI_IND_ERROR)( +typedef NTSTATUS +(DDKAPI *PTDI_IND_ERROR)( IN PVOID TdiEventContext, IN NTSTATUS Status); -typedef NTSTATUS DDKAPI -(*PTDI_IND_ERROR_EX)( +typedef NTSTATUS +(DDKAPI *PTDI_IND_ERROR_EX)( IN PVOID TdiEventContext, IN NTSTATUS Status, IN PVOID Buffer); @@ -222,8 +222,8 @@ IN PVOID TdiEventContext, IN NTSTATUS Status); -typedef NTSTATUS DDKAPI -(*PTDI_IND_RECEIVE)( +typedef NTSTATUS +(DDKAPI *PTDI_IND_RECEIVE)( IN PVOID TdiEventContext, IN CONNECTION_CONTEXT ConnectionContext, IN ULONG ReceiveFlags, @@ -246,8 +246,8 @@ IN PVOID Tsdu, OUT PIRP *IoRequestPacket); -typedef NTSTATUS DDKAPI -(*PTDI_IND_RECEIVE_DATAGRAM)( +typedef NTSTATUS +(DDKAPI *PTDI_IND_RECEIVE_DATAGRAM)( IN PVOID TdiEventContext, IN LONG SourceAddressLength, IN PVOID SourceAddress, @@ -275,8 +275,8 @@ IN PVOID Tsdu, OUT PIRP *IoRequestPacket); -typedef NTSTATUS DDKAPI -(*PTDI_IND_RECEIVE_EXPEDITED)( +typedef NTSTATUS +(DDKAPI *PTDI_IND_RECEIVE_EXPEDITED)( IN PVOID TdiEventContext, IN CONNECTION_CONTEXT ConnectionContext, IN ULONG ReceiveFlags, @@ -299,8 +299,8 @@ IN PVOID Tsdu, OUT PIRP *IoRequestPacket); -typedef NTSTATUS DDKAPI -(*PTDI_IND_CHAINED_RECEIVE)( +typedef NTSTATUS +(DDKAPI *PTDI_IND_CHAINED_RECEIVE)( IN PVOID TdiEventContext, IN CONNECTION_CONTEXT ConnectionContext, IN ULONG ReceiveFlags, @@ -321,8 +321,8 @@ IN PMDL Tsdu, IN PVOID TsduDescriptor); -typedef NTSTATUS DDKAPI -(*PTDI_IND_CHAINED_RECEIVE_DATAGRAM)( +typedef NTSTATUS +(DDKAPI *PTDI_IND_CHAINED_RECEIVE_DATAGRAM)( IN PVOID TdiEventContext, IN LONG SourceAddressLength, IN PVOID SourceAddress, @@ -349,8 +349,8 @@ IN PMDL Tsdu, IN PVOID TsduDescriptor); -typedef NTSTATUS DDKAPI -(*PTDI_IND_CHAINED_RECEIVE_EXPEDITED)( +typedef NTSTATUS +(DDKAPI *PTDI_IND_CHAINED_RECEIVE_EXPEDITED)( IN PVOID TdiEventContext, IN CONNECTION_CONTEXT ConnectionContext, IN ULONG ReceiveFlags, @@ -371,8 +371,8 @@ IN PMDL Tsdu, IN PVOID TsduDescriptor); -typedef NTSTATUS DDKAPI -(*PTDI_IND_SEND_POSSIBLE)( +typedef NTSTATUS +(DDKAPI *PTDI_IND_SEND_POSSIBLE)( IN PVOID TdiEventContext, IN PVOID ConnectionContext, IN ULONG BytesAvailable); @@ -866,49 +866,49 @@ UCHAR ContextData[1]; } TDI_PNP_CONTEXT, *PTDI_PNP_CONTEXT; -typedef VOID DDKAPI -(*TDI_ADD_ADDRESS_HANDLER)( +typedef VOID +(DDKAPI *TDI_ADD_ADDRESS_HANDLER)( IN PTA_ADDRESS Address); -typedef VOID DDKAPI -(*TDI_ADD_ADDRESS_HANDLER_V2)( +typedef VOID +(DDKAPI *TDI_ADD_ADDRESS_HANDLER_V2)( IN PTA_ADDRESS Address, IN PUNICODE_STRING DeviceName, IN PTDI_PNP_CONTEXT Context); -typedef VOID DDKAPI -(*TDI_BINDING_HANDLER)( +typedef VOID +(DDKAPI *TDI_BINDING_HANDLER)( IN TDI_PNP_OPCODE PnPOpcode, IN PUNICODE_STRING DeviceName, IN PWSTR MultiSZBindList); -typedef VOID DDKAPI -(*TDI_BIND_HANDLER)( +typedef VOID +(DDKAPI *TDI_BIND_HANDLER)( IN PUNICODE_STRING DeviceName); -typedef VOID DDKAPI -(*TDI_DEL_ADDRESS_HANDLER)( +typedef VOID +(DDKAPI *TDI_DEL_ADDRESS_HANDLER)( IN PTA_ADDRESS Address); -typedef VOID DDKAPI -(*TDI_DEL_ADDRESS_HANDLER_V2)( +typedef VOID +(DDKAPI *TDI_DEL_ADDRESS_HANDLER_V2)( IN PTA_ADDRESS Address, IN PUNICODE_STRING DeviceName, IN PTDI_PNP_CONTEXT Context); -typedef NTSTATUS DDKAPI -(*TDI_PNP_POWER_HANDLER)( +typedef NTSTATUS +(DDKAPI *TDI_PNP_POWER_HANDLER)( IN PUNICODE_STRING DeviceName, IN PNET_PNP_EVENT PowerEvent, IN PTDI_PNP_CONTEXT Context1, IN PTDI_PNP_CONTEXT Context2); -typedef VOID DDKAPI -(*TDI_UNBIND_HANDLER)( +typedef VOID +(DDKAPI *TDI_UNBIND_HANDLER)( IN PUNICODE_STRING DeviceName); -typedef VOID DDKAPI -(*ProviderPnPPowerComplete)( +typedef VOID +(DDKAPI *ProviderPnPPowerComplete)( IN PNET_PNP_EVENT NetEvent, IN NTSTATUS ProviderStatus);

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