Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[spetreolle] 41408: Add needed defines for Vista network api
by spetreolle＠svn.reactos.org 14 Jun '09

14 Jun '09

Author: spetreolle Date: Sun Jun 14 18:09:01 2009 New Revision: 41408 URL: http://svn.reactos.org/svn/reactos?rev=41408&view=rev Log: Add needed defines for Vista network api Modified: trunk/reactos/include/psdk/ifdef.h trunk/reactos/include/psdk/iphlpapi.h trunk/reactos/include/psdk/netioapi.h trunk/reactos/include/psdk/ntddndis.h trunk/reactos/include/psdk/ws2tcpip.h Modified: trunk/reactos/include/psdk/ifdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ifdef.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/ifdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ifdef.h [iso-8859-1] Sun Jun 14 18:09:01 2009 @@ -19,5 +19,55 @@ typedef NET_LUID* PNET_LUID; typedef ULONG NET_IFINDEX, *PNET_IFINDEX; +typedef ULONG IFTYPE; +typedef GUID NET_IF_NETWORK_GUID, *PNET_IF_NETWORK_GUID; -#endif +typedef enum { + TUNNEL_TYPE_NONE = 0, + TUNNEL_TYPE_OTHER = 1, + TUNNEL_TYPE_DIRECT = 2, + TUNNEL_TYPE_6TO4 = 11, + TUNNEL_TYPE_ISATAP = 13, + TUNNEL_TYPE_TEREDO = 14, +} TUNNEL_TYPE, *PTUNNEL_TYPE; + +typedef enum _NET_IF_ACCESS_TYPE +{ + NET_IF_ACCESS_LOOPBACK = 1, + NET_IF_ACCESS_BROADCAST = 2, + NET_IF_ACCESS_POINT_TO_POINT = 3, + NET_IF_ACCESS_POINT_TO_MULTI_POINT = 4, + NET_IF_ACCESS_MAXIMUM = 5 +} NET_IF_ACCESS_TYPE, *PNET_IF_ACCESS_TYPE; + +typedef enum _NET_IF_DIRECTION_TYPE +{ + NET_IF_DIRECTION_SENDRECEIVE, + NET_IF_DIRECTION_SENDONLY, + NET_IF_DIRECTION_RECEIVEONLY, + NET_IF_DIRECTION_MAXIMUM +} NET_IF_DIRECTION_TYPE, *PNET_IF_DIRECTION_TYPE; + +typedef enum _NET_IF_ADMIN_STATUS +{ + NET_IF_ADMIN_STATUS_UP = 1, + NET_IF_ADMIN_STATUS_DOWN = 2, + NET_IF_ADMIN_STATUS_TESTING = 3 +} NET_IF_ADMIN_STATUS, *PNET_IF_ADMIN_STATUS; + +typedef enum _NET_IF_MEDIA_CONNECT_STATE +{ + MediaConnectStateUnknown, + MediaConnectStateConnected, + MediaConnectStateDisconnected +} NET_IF_MEDIA_CONNECT_STATE, *PNET_IF_MEDIA_CONNECT_STATE; + +typedef enum _NET_IF_CONNECTION_TYPE +{ + NET_IF_CONNECTION_DEDICATED = 1, + NET_IF_CONNECTION_PASSIVE = 2, + NET_IF_CONNECTION_DEMAND = 3, + NET_IF_CONNECTION_MAXIMUM = 4 +} NET_IF_CONNECTION_TYPE, *PNET_IF_CONNECTION_TYPE; + +#endif /* _IFDEF_ */ Modified: trunk/reactos/include/psdk/iphlpapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/iphlpapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/iphlpapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/iphlpapi.h [iso-8859-1] Sun Jun 14 18:09:01 2009 @@ -4,6 +4,7 @@ #include <iprtrmib.h> #include <ipexport.h> #include <iptypes.h> +#include <netioapi.h> #ifdef __cplusplus extern "C" { #endif Modified: trunk/reactos/include/psdk/netioapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netioapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/netioapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/netioapi.h [iso-8859-1] Sun Jun 14 18:09:01 2009 @@ -17,6 +17,7 @@ #ifdef _WS2IPDEF_ #include <ntddndis.h> +#include <ifdef.h> typedef struct _MIB_IF_ROW2 { NET_LUID InterfaceLuid; @@ -71,8 +72,14 @@ ULONG64 OutQLen; } MIB_IF_ROW2, *PMIB_IF_ROW2; +typedef struct _MIB_IF_TABLE2 +{ + ULONG NumEntries; + MIB_IF_ROW2 Table[1]; +} MIB_IF_TABLE2, *PMIB_IF_TABLE2; NETIOAPI_API GetIfEntry2(IN OUT PMIB_IF_ROW2 Row); +NETIOAPI_API GetIfTable2(OUT PMIB_IF_TABLE2 *Table); #endif Modified: trunk/reactos/include/psdk/ntddndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddndis.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] Sun Jun 14 18:09:01 2009 @@ -82,4 +82,48 @@ NDIS_WLAN_BSSID Bssid[1]; } NDIS_802_11_BSSID_LIST, *PNDIS_802_11_BSSID_LIST; +/* NDIS driver medium (OID_GEN_MEDIA_SUPPORTED / OID_GEN_MEDIA_IN_USE) */ +typedef enum _NDIS_MEDIUM { + NdisMedium802_3, + NdisMedium802_5, + NdisMediumFddi, + NdisMediumWan, + NdisMediumLocalTalk, + NdisMediumDix, + NdisMediumArcnetRaw, + NdisMediumArcnet878_2, + NdisMediumAtm, + NdisMediumWirelessWan, + NdisMediumIrda, + NdisMediumBpc, + NdisMediumCoWan, + NdisMedium1394, + NdisMediumMax +} NDIS_MEDIUM, *PNDIS_MEDIUM; + +typedef enum _NDIS_PHYSICAL_MEDIUM +{ + NdisPhysicalMediumUnspecified, + NdisPhysicalMediumWirelessLan, + NdisPhysicalMediumCableModem, + NdisPhysicalMediumPhoneLine, + NdisPhysicalMediumPowerLine, + NdisPhysicalMediumDSL, + NdisPhysicalMediumFibreChannel, + NdisPhysicalMedium1394, + NdisPhysicalMediumWirelessWan, + NdisPhysicalMediumNative802_11, + NdisPhysicalMediumBluetooth, + NdisPhysicalMediumInfiniband, + NdisPhysicalMediumWiMax, + NdisPhysicalMediumUWB, + NdisPhysicalMedium802_3, + NdisPhysicalMedium802_5, + NdisPhysicalMediumIrda, + NdisPhysicalMediumWiredWAN, + NdisPhysicalMediumWiredCoWan, + NdisPhysicalMediumOther, + NdisPhysicalMediumMax +} NDIS_PHYSICAL_MEDIUM, *PNDIS_PHYSICAL_MEDIUM; + #endif Modified: trunk/reactos/include/psdk/ws2tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2tcpip.h?re… ============================================================================== --- trunk/reactos/include/psdk/ws2tcpip.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ws2tcpip.h [iso-8859-1] Sun Jun 14 18:09:01 2009 @@ -14,6 +14,7 @@ #endif #include <winsock2.h> +#include <ws2ipdef.h> #ifdef __cplusplus extern "C" { #endif

1 0

[dchapyshev] 41407: - Add SectionHandle probing
by dchapyshev＠svn.reactos.org 14 Jun '09

14 Jun '09

Author: dchapyshev Date: Sun Jun 14 12:57:25 2009 New Revision: 41407 URL: http://svn.reactos.org/svn/reactos?rev=41407&view=rev Log: - Add SectionHandle probing Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Jun 14 12:57:25 2009 @@ -3498,13 +3498,17 @@ PreviousMode = ExGetPreviousMode(); - if(MaximumSize != NULL && PreviousMode != KernelMode) + if(PreviousMode != KernelMode) { _SEH2_TRY { - /* make a copy on the stack */ - SafeMaximumSize = ProbeForReadLargeInteger(MaximumSize); - MaximumSize = &SafeMaximumSize; + if (MaximumSize != NULL) + { + /* make a copy on the stack */ + SafeMaximumSize = ProbeForReadLargeInteger(MaximumSize); + MaximumSize = &SafeMaximumSize; + } + ProbeForWriteHandle(SectionHandle); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -4238,6 +4242,7 @@ PROS_SECTION_OBJECT Section; KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); PreviousMode = ExGetPreviousMode();

1 0

[dchapyshev] 41406: - Add probing of the result buffer - Add missing target process reference/dereference in MemorySectionName case of NtQueryVirtualMemory. Fixes 2 "psapi_winetest" failures.
by dchapyshev＠svn.reactos.org 14 Jun '09

14 Jun '09

Author: dchapyshev Date: Sun Jun 14 12:30:22 2009 New Revision: 41406 URL: http://svn.reactos.org/svn/reactos?rev=41406&view=rev Log: - Add probing of the result buffer - Add missing target process reference/dereference in MemorySectionName case of NtQueryVirtualMemory. Fixes 2 "psapi_winetest" failures. Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Sun Jun 14 12:30:22 2009 @@ -849,6 +849,7 @@ SIZE_T NumberOfBytesToProtect = 0; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); /* Check for valid protection flags */ Protection = NewAccessProtection & ~(PAGE_GUARD|PAGE_NOCACHE); @@ -961,6 +962,7 @@ WCHAR ModuleFileNameBuffer[MAX_PATH] = {0}; UNICODE_STRING ModuleFileName; PMEMORY_SECTION_NAME SectionName = NULL; + PEPROCESS Process; union { MEMORY_BASIC_INFORMATION BasicInfo; @@ -975,11 +977,15 @@ PreviousMode = ExGetPreviousMode(); - if (PreviousMode != KernelMode && UnsafeResultLength != NULL) + if (PreviousMode != KernelMode) { _SEH2_TRY { - ProbeForWriteSize_t(UnsafeResultLength); + ProbeForWrite(VirtualMemoryInformation, + Length, + sizeof(ULONG_PTR)); + + if (UnsafeResultLength) ProbeForWriteSize_t(UnsafeResultLength); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1002,6 +1008,19 @@ /* FIXME: Move this inside MiQueryVirtualMemory */ if (VirtualMemoryInformationClass == MemorySectionName) { + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_QUERY_INFORMATION, + NULL, + PreviousMode, + (PVOID*)(&Process), + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT("NtQueryVirtualMemory() = %x\n",Status); + return(Status); + } + RtlInitEmptyUnicodeString(&ModuleFileName, ModuleFileNameBuffer, sizeof(ModuleFileNameBuffer)); Status = MmGetFileNameForAddress(Address, &ModuleFileName); @@ -1039,6 +1058,7 @@ } } } + ObDereferenceObject(Process); return Status; } else

1 0

[cgutman] 41405: - Implement NdisIMGetBindingContext and NdisIMGetDeviceContext
by cgutman＠svn.reactos.org 14 Jun '09

14 Jun '09

Author: cgutman Date: Sun Jun 14 09:42:30 2009 New Revision: 41405 URL: http://svn.reactos.org/svn/reactos?rev=41405&view=rev Log: - Implement NdisIMGetBindingContext and NdisIMGetDeviceContext Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Sun Jun 14 09:42:30 2009 @@ -467,46 +467,6 @@ /* * @unimplemented */ -NDIS_HANDLE -EXPORT -NdisIMGetBindingContext( - IN NDIS_HANDLE NdisBindingHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return (NDIS_HANDLE)NULL; -} - - -/* - * @unimplemented - */ -NDIS_HANDLE -EXPORT -NdisIMGetDeviceContext( - IN NDIS_HANDLE MiniportAdapterHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return (NDIS_HANDLE)NULL; -} - - -/* - * @unimplemented - */ NDIS_STATUS EXPORT NdisIMInitializeDeviceInstanceEx( Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Jun 14 09:42:30 2009 @@ -3031,5 +3031,50 @@ } } + +/* + * @implemented + */ +NDIS_HANDLE +EXPORT +NdisIMGetBindingContext( + IN NDIS_HANDLE NdisBindingHandle) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + PADAPTER_BINDING AdapterBinding = NdisBindingHandle; + PLOGICAL_ADAPTER Adapter = AdapterBinding->Adapter; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + return Adapter->NdisMiniportBlock.DeviceContext; +} + + +/* + * @implemented + */ +NDIS_HANDLE +EXPORT +NdisIMGetDeviceContext( + IN NDIS_HANDLE MiniportAdapterHandle) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + return Adapter->NdisMiniportBlock.DeviceContext; +} + /* EOF */

1 0

[spetreolle] 41404: Fix 2 kernel32:environ tests. The GetComputerNameEx ComputerNameDnsDomain tests can't succeed if we have no domain, as the function succeeds querying a zero length domain into a zero length buffer.
by spetreolle＠svn.reactos.org 13 Jun '09

13 Jun '09

Author: spetreolle Date: Sat Jun 13 19:33:33 2009 New Revision: 41404 URL: http://svn.reactos.org/svn/reactos?rev=41404&view=rev Log: Fix 2 kernel32:environ tests. The GetComputerNameEx ComputerNameDnsDomain tests can't succeed if we have no domain, as the function succeeds querying a zero length domain into a zero length buffer. Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] Sat Jun 13 19:33:33 2009 @@ -286,7 +286,11 @@ WINAPI GetComputerNameA(LPSTR lpBuffer, LPDWORD lpnSize) { - return GetComputerNameExA(ComputerNameNetBIOS, lpBuffer, lpnSize); + BOOL ret; + ret = GetComputerNameExA(ComputerNameNetBIOS, lpBuffer, lpnSize); + if(!ret && GetLastError() == ERROR_MORE_DATA) + SetLastError(ERROR_BUFFER_OVERFLOW); + return ret; } @@ -297,7 +301,11 @@ WINAPI GetComputerNameW(LPWSTR lpBuffer, LPDWORD lpnSize) { - return GetComputerNameExW(ComputerNameNetBIOS, lpBuffer, lpnSize); + BOOL ret; + ret=GetComputerNameExW(ComputerNameNetBIOS, lpBuffer, lpnSize); + if(!ret && GetLastError() == ERROR_MORE_DATA) + SetLastError(ERROR_BUFFER_OVERFLOW); + return ret; }

1 0

[dgorbachev] 41403: Lowercase STATIC and CONST. Fixes build with DBG but without KDBG.
by dgorbachev＠svn.reactos.org 13 Jun '09

13 Jun '09

Author: dgorbachev Date: Sat Jun 13 19:28:33 2009 New Revision: 41403 URL: http://svn.reactos.org/svn/reactos?rev=41403&view=rev Log: Lowercase STATIC and CONST. Fixes build with DBG but without KDBG. Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/kdbg/kdb.h trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/ntoskrnl/kdbg/kdb_expr.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Sat Jun 13 19:28:33 2009 @@ -27,34 +27,34 @@ /* GLOBALS *******************************************************************/ -STATIC LONG KdbEntryCount = 0; -STATIC CHAR KdbStack[KDB_STACK_SIZE]; - -STATIC ULONG KdbBreakPointCount = 0; /* Number of used breakpoints in the array */ -STATIC KDB_BREAKPOINT KdbBreakPoints[KDB_MAXIMUM_BREAKPOINT_COUNT] = {{0}}; /* Breakpoint array */ -STATIC ULONG KdbSwBreakPointCount = 0; /* Number of enabled software breakpoints */ -STATIC ULONG KdbHwBreakPointCount = 0; /* Number of enabled hardware breakpoints */ -STATIC PKDB_BREAKPOINT KdbSwBreakPoints[KDB_MAXIMUM_SW_BREAKPOINT_COUNT]; /* Enabled software breakpoints, orderless */ -STATIC PKDB_BREAKPOINT KdbHwBreakPoints[KDB_MAXIMUM_HW_BREAKPOINT_COUNT]; /* Enabled hardware breakpoints, orderless */ -STATIC PKDB_BREAKPOINT KdbBreakPointToReenable = NULL; /* Set to a breakpoint struct when single stepping after +static LONG KdbEntryCount = 0; +static CHAR KdbStack[KDB_STACK_SIZE]; + +static ULONG KdbBreakPointCount = 0; /* Number of used breakpoints in the array */ +static KDB_BREAKPOINT KdbBreakPoints[KDB_MAXIMUM_BREAKPOINT_COUNT] = {{0}}; /* Breakpoint array */ +static ULONG KdbSwBreakPointCount = 0; /* Number of enabled software breakpoints */ +static ULONG KdbHwBreakPointCount = 0; /* Number of enabled hardware breakpoints */ +static PKDB_BREAKPOINT KdbSwBreakPoints[KDB_MAXIMUM_SW_BREAKPOINT_COUNT]; /* Enabled software breakpoints, orderless */ +static PKDB_BREAKPOINT KdbHwBreakPoints[KDB_MAXIMUM_HW_BREAKPOINT_COUNT]; /* Enabled hardware breakpoints, orderless */ +static PKDB_BREAKPOINT KdbBreakPointToReenable = NULL; /* Set to a breakpoint struct when single stepping after a software breakpoint was hit, to reenable it */ LONG KdbLastBreakPointNr = -1; /* Index of the breakpoint which cause KDB to be entered */ ULONG KdbNumSingleSteps = 0; /* How many single steps to do */ BOOLEAN KdbSingleStepOver = FALSE; /* Whether to step over calls/reps. */ ULONG KdbDebugState = 0; /* KDBG Settings (NOECHO, KDSERIAL) */ -STATIC BOOLEAN KdbEnteredOnSingleStep = FALSE; /* Set to true when KDB was entered because of single step */ +static BOOLEAN KdbEnteredOnSingleStep = FALSE; /* Set to true when KDB was entered because of single step */ PEPROCESS KdbCurrentProcess = NULL; /* The current process context in which KDB runs */ PEPROCESS KdbOriginalProcess = NULL; /* The process in whichs context KDB was intered */ PETHREAD KdbCurrentThread = NULL; /* The current thread context in which KDB runs */ PETHREAD KdbOriginalThread = NULL; /* The thread in whichs context KDB was entered */ PKDB_KTRAP_FRAME KdbCurrentTrapFrame = NULL; /* Pointer to the current trapframe */ -STATIC KDB_KTRAP_FRAME KdbTrapFrame = { { 0 } }; /* The trapframe which was passed to KdbEnterDebuggerException */ -STATIC KDB_KTRAP_FRAME KdbThreadTrapFrame = { { 0 } }; /* The trapframe of the current thread (KdbCurrentThread) */ -STATIC KAPC_STATE KdbApcState; +static KDB_KTRAP_FRAME KdbTrapFrame = { { 0 } }; /* The trapframe which was passed to KdbEnterDebuggerException */ +static KDB_KTRAP_FRAME KdbThreadTrapFrame = { { 0 } }; /* The trapframe of the current thread (KdbCurrentThread) */ +static KAPC_STATE KdbApcState; extern BOOLEAN KdbpBugCheckRequested; /* Array of conditions when to enter KDB */ -STATIC KDB_ENTER_CONDITION KdbEnterConditions[][2] = +static KDB_ENTER_CONDITION KdbEnterConditions[][2] = { /* First chance Last chance */ { KdbDoNotEnter, KdbEnterFromKmode }, /* Zero devide */ @@ -81,7 +81,7 @@ }; /* Exception descriptions */ -STATIC CONST CHAR *ExceptionNrToString[] = +static const CHAR *ExceptionNrToString[] = { "Divide Error", "Debug Trap", @@ -133,7 +133,7 @@ /* FUNCTIONS *****************************************************************/ -STATIC VOID +static VOID KdbpTrapFrameToKdbTrapFrame(PKTRAP_FRAME TrapFrame, PKDB_KTRAP_FRAME KdbTrapFrame) { ULONG TrapCr0, TrapCr2, TrapCr3, TrapCr4; @@ -180,7 +180,7 @@ /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ } -STATIC VOID +static VOID KdbpKdbTrapFrameToTrapFrame(PKDB_KTRAP_FRAME KdbTrapFrame, PKTRAP_FRAME TrapFrame) { /* Copy the TrapFrame only up to Eflags and zero the rest*/ @@ -194,7 +194,7 @@ /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ } -STATIC VOID +static VOID KdbpKdbTrapFrameFromKernelStack(PVOID KernelStack, PKDB_KTRAP_FRAME KdbTrapFrame) { @@ -227,7 +227,7 @@ * * \returns NTSTATUS */ -STATIC NTSTATUS +static NTSTATUS KdbpOverwriteInstruction( IN PEPROCESS Process, IN ULONG_PTR Address, @@ -698,7 +698,7 @@ * * \returns Breakpoint number, -1 on error. */ -STATIC LONG +static LONG KdbpIsBreakPointOurs( IN NTSTATUS ExceptionCode, IN PKTRAP_FRAME TrapFrame) @@ -1174,7 +1174,7 @@ /*!\brief Calls the main loop ... */ -STATIC VOID +static VOID KdbpCallMainLoop() { KdbpCliMainLoop(KdbEnteredOnSingleStep); @@ -1184,7 +1184,7 @@ * * Disables interrupts, releases display ownership, ... */ -STATIC VOID +static VOID KdbpInternalEnter() { PETHREAD Thread; @@ -1218,7 +1218,7 @@ KbdEnableMouse(); } -STATIC ULONG +static ULONG KdbpGetExceptionNumberFromStatus(IN NTSTATUS ExceptionCode) { ULONG Ret; @@ -1507,7 +1507,7 @@ } else { - CONST CHAR *ExceptionString = (ExpNr < RTL_NUMBER_OF(ExceptionNrToString)) ? + const CHAR *ExceptionString = (ExpNr < RTL_NUMBER_OF(ExceptionNrToString)) ? (ExceptionNrToString[ExpNr]) : ("Unknown/User defined exception"); Modified: trunk/reactos/ntoskrnl/kdbg/kdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.h?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.h [iso-8859-1] Sat Jun 13 19:28:33 2009 @@ -5,14 +5,6 @@ #ifndef RTL_NUMBER_OF # define RTL_NUMBER_OF(x) (sizeof(x) / sizeof((x)[0])) -#endif - -#ifndef STATIC -#define STATIC static -#endif - -#ifndef CONST -#define CONST const #endif /* TYPES *********************************************************************/ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Sat Jun 13 19:28:33 2009 @@ -58,50 +58,50 @@ /* PROTOTYPES ****************************************************************/ -STATIC BOOLEAN KdbpCmdEvalExpression(ULONG Argc, PCHAR Argv[]); -STATIC BOOLEAN KdbpCmdDisassembleX(ULONG Argc, PCHAR Argv[]); -STATIC BOOLEAN KdbpCmdRegs(ULONG Argc, PCHAR Argv[]); -STATIC BOOLEAN KdbpCmdBackTrace(ULONG Argc, PCHAR Argv[]); - -STATIC BOOLEAN KdbpCmdContinue(ULONG Argc, PCHAR Argv[]); -STATIC BOOLEAN KdbpCmdStep(ULONG Argc, PCHAR Argv[]); -STATIC BOOLEAN KdbpCmdBreakPointList(ULONG Argc, PCHAR Argv[]); -STATIC BOOLEAN KdbpCmdEnableDisableClearBreakPoint(ULONG Argc, PCHAR Argv[]); -STATIC BOOLEAN KdbpCmdBreakPoint(ULONG Argc, PCHAR Argv[]); - -STATIC BOOLEAN KdbpCmdThread(ULONG Argc, PCHAR Argv[]); -STATIC BOOLEAN KdbpCmdProc(ULONG Argc, PCHAR Argv[]); - -STATIC BOOLEAN KdbpCmdMod(ULONG Argc, PCHAR Argv[]); -STATIC BOOLEAN KdbpCmdGdtLdtIdt(ULONG Argc, PCHAR Argv[]); -STATIC BOOLEAN KdbpCmdPcr(ULONG Argc, PCHAR Argv[]); -STATIC BOOLEAN KdbpCmdTss(ULONG Argc, PCHAR Argv[]); - -STATIC BOOLEAN KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[]); -STATIC BOOLEAN KdbpCmdFilter(ULONG Argc, PCHAR Argv[]); -STATIC BOOLEAN KdbpCmdSet(ULONG Argc, PCHAR Argv[]); -STATIC BOOLEAN KdbpCmdHelp(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdEvalExpression(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdDisassembleX(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdRegs(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdBackTrace(ULONG Argc, PCHAR Argv[]); + +static BOOLEAN KdbpCmdContinue(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdStep(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdBreakPointList(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdEnableDisableClearBreakPoint(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdBreakPoint(ULONG Argc, PCHAR Argv[]); + +static BOOLEAN KdbpCmdThread(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdProc(ULONG Argc, PCHAR Argv[]); + +static BOOLEAN KdbpCmdMod(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdGdtLdtIdt(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdPcr(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdTss(ULONG Argc, PCHAR Argv[]); + +static BOOLEAN KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdFilter(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdSet(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdHelp(ULONG Argc, PCHAR Argv[]); /* GLOBALS *******************************************************************/ -STATIC BOOLEAN KdbUseIntelSyntax = FALSE; /* Set to TRUE for intel syntax */ -STATIC BOOLEAN KdbBreakOnModuleLoad = FALSE; /* Set to TRUE to break into KDB when a module is loaded */ - -STATIC CHAR KdbCommandHistoryBuffer[2048]; /* Command history string ringbuffer */ -STATIC PCHAR KdbCommandHistory[sizeof(KdbCommandHistoryBuffer) / 8] = { NULL }; /* Command history ringbuffer */ -STATIC LONG KdbCommandHistoryBufferIndex = 0; -STATIC LONG KdbCommandHistoryIndex = 0; - -STATIC ULONG KdbNumberOfRowsPrinted = 0; -STATIC ULONG KdbNumberOfColsPrinted = 0; -STATIC BOOLEAN KdbOutputAborted = FALSE; -STATIC LONG KdbNumberOfRowsTerminal = -1; -STATIC LONG KdbNumberOfColsTerminal = -1; +static BOOLEAN KdbUseIntelSyntax = FALSE; /* Set to TRUE for intel syntax */ +static BOOLEAN KdbBreakOnModuleLoad = FALSE; /* Set to TRUE to break into KDB when a module is loaded */ + +static CHAR KdbCommandHistoryBuffer[2048]; /* Command history string ringbuffer */ +static PCHAR KdbCommandHistory[sizeof(KdbCommandHistoryBuffer) / 8] = { NULL }; /* Command history ringbuffer */ +static LONG KdbCommandHistoryBufferIndex = 0; +static LONG KdbCommandHistoryIndex = 0; + +static ULONG KdbNumberOfRowsPrinted = 0; +static ULONG KdbNumberOfColsPrinted = 0; +static BOOLEAN KdbOutputAborted = FALSE; +static LONG KdbNumberOfRowsTerminal = -1; +static LONG KdbNumberOfColsTerminal = -1; PCHAR KdbInitFileBuffer = NULL; /* Buffer where KDBinit file is loaded into during initialization */ BOOLEAN KdbpBugCheckRequested = FALSE; -STATIC CONST struct +static const struct { PCHAR Name; PCHAR Syntax; @@ -163,7 +163,7 @@ * \retval TRUE Success. * \retval FALSE Failure. */ -STATIC BOOLEAN +static BOOLEAN KdbpGetComponentId( IN PCCH ComponentName, OUT PULONG ComponentId) @@ -293,13 +293,13 @@ * \retval TRUE Success. * \retval FALSE Failure. */ -STATIC BOOLEAN +static BOOLEAN KdbpEvaluateExpression( IN PCHAR Expression, IN LONG ErrOffset, OUT PULONGLONG Result) { - STATIC CHAR ErrMsgBuffer[130] = "^ "; + static CHAR ErrMsgBuffer[130] = "^ "; LONG ExpressionErrOffset = -1; PCHAR ErrMsg = ErrMsgBuffer; BOOLEAN Ok; @@ -320,7 +320,7 @@ /*!\brief Evaluates an expression and displays the result. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdEvalExpression(ULONG Argc, PCHAR Argv[]) { ULONG i, len; @@ -375,7 +375,7 @@ /*!\brief Display list of active debug channels */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdFilter(ULONG Argc, PCHAR Argv[]) { ULONG i, j, ComponentId, Level; @@ -455,7 +455,7 @@ /*!\brief Disassembles 10 instructions at eip or given address or * displays 16 dwords from memory at given address. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdDisassembleX(ULONG Argc, PCHAR Argv[]) { ULONG Count; @@ -565,12 +565,12 @@ /*!\brief Displays CPU registers. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdRegs(ULONG Argc, PCHAR Argv[]) { PKTRAP_FRAME Tf = &KdbCurrentTrapFrame->Tf; INT i; - STATIC CONST PCHAR EflagsBits[32] = { " CF", NULL, " PF", " BIT3", " AF", " BIT5", + static const PCHAR EflagsBits[32] = { " CF", NULL, " PF", " BIT3", " AF", " BIT5", " ZF", " SF", " TF", " IF", " DF", " OF", NULL, NULL, " NT", " BIT15", " RF", " VF", " AC", " VIF", " VIP", " ID", " BIT22", @@ -617,11 +617,11 @@ ULONG Cr0, Cr2, Cr3, Cr4; KDESCRIPTOR Gdtr = {0}, Ldtr = {0}, Idtr = {0}; ULONG Tr = 0; - STATIC CONST PCHAR Cr0Bits[32] = { " PE", " MP", " EM", " TS", " ET", " NE", NULL, NULL, + static const PCHAR Cr0Bits[32] = { " PE", " MP", " EM", " TS", " ET", " NE", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, " WP", NULL, " AM", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, " NW", " CD", " PG" }; - STATIC CONST PCHAR Cr4Bits[32] = { " VME", " PVI", " TSD", " DE", " PSE", " PAE", " MCE", " PGE", + static const PCHAR Cr4Bits[32] = { " VME", " PVI", " TSD", " DE", " PSE", " PAE", " MCE", " PGE", " PCE", " OSFXSR", " OSXMMEXCPT", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; @@ -698,7 +698,7 @@ /*!\brief Displays a backtrace. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdBackTrace(ULONG Argc, PCHAR Argv[]) { ULONG Count; @@ -797,7 +797,7 @@ /*!\brief Continues execution of the system/leaves KDB. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdContinue(ULONG Argc, PCHAR Argv[]) { /* Exit the main loop */ @@ -806,7 +806,7 @@ /*!\brief Continues execution of the system/leaves KDB. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdStep(ULONG Argc, PCHAR Argv[]) { ULONG Count = 1; @@ -834,7 +834,7 @@ /*!\brief Lists breakpoints. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdBreakPointList(ULONG Argc, PCHAR Argv[]) { LONG l; @@ -927,7 +927,7 @@ /*!\brief Enables, disables or clears a breakpoint. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdEnableDisableClearBreakPoint(ULONG Argc, PCHAR Argv[]) { PCHAR pend; @@ -966,7 +966,7 @@ /*!\brief Sets a software or hardware (memory) breakpoint at the given address. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdBreakPoint(ULONG Argc, PCHAR Argv[]) { ULONGLONG Result = 0; @@ -1084,7 +1084,7 @@ /*!\brief Lists threads or switches to another thread context. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdThread(ULONG Argc, PCHAR Argv[]) { PLIST_ENTRY Entry; @@ -1096,7 +1096,7 @@ ULONG Eip; ULONG ul = 0; PCHAR State, pend, str1, str2; - STATIC CONST PCHAR ThreadStateToString[DeferredReady+1] = + static const PCHAR ThreadStateToString[DeferredReady+1] = { "Initialized", "Ready", "Running", "Standby", "Terminated", "Waiting", "Transition", "DeferredReady" }; @@ -1268,7 +1268,7 @@ /*!\brief Lists processes or switches to another process context. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdProc(ULONG Argc, PCHAR Argv[]) { PLIST_ENTRY Entry; @@ -1380,7 +1380,7 @@ /*!\brief Lists loaded modules or the one containing the specified address. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdMod(ULONG Argc, PCHAR Argv[]) { ULONGLONG Result = 0; @@ -1441,7 +1441,7 @@ /*!\brief Displays GDT, LDT or IDTd. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdGdtLdtIdt(ULONG Argc, PCHAR Argv[]) { KDESCRIPTOR Reg = {0}; @@ -1642,7 +1642,7 @@ /*!\brief Displays the KPCR */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdPcr(ULONG Argc, PCHAR Argv[]) { PKIPCR Pcr = (PKIPCR)KeGetPcr(); @@ -1687,7 +1687,7 @@ /*!\brief Displays the TSS */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdTss(ULONG Argc, PCHAR Argv[]) { KTSS *Tss = KeGetPcr()->TSS; @@ -1707,7 +1707,7 @@ /*!\brief Bugchecks the system. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[]) { /* Set the flag and quit looping */ @@ -1717,7 +1717,7 @@ /*!\brief Sets or displays a config variables value. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdSet(ULONG Argc, PCHAR Argv[]) { LONG l; @@ -1725,7 +1725,7 @@ PCHAR pend = 0; KDB_ENTER_CONDITION ConditionFirst = KdbDoNotEnter; KDB_ENTER_CONDITION ConditionLast = KdbDoNotEnter; - STATIC CONST PCHAR ExceptionNames[21] = + static const PCHAR ExceptionNames[21] = { "ZERODEVIDE", "DEBUGTRAP", "NMI", "INT3", "OVERFLOW", "BOUND", "INVALIDOP", "NOMATHCOP", "DOUBLEFAULT", "RESERVED(9)", "INVALIDTSS", "SEGMENTNOTPRESENT", "STACKFAULT", "GPF", "PAGEFAULT", "RESERVED(15)", "MATHFAULT", "ALIGNMENTCHECK", @@ -1875,7 +1875,7 @@ /*!\brief Displays help screen. */ -STATIC BOOLEAN +static BOOLEAN KdbpCmdHelp(ULONG Argc, PCHAR Argv[]) { ULONG i; @@ -1912,10 +1912,10 @@ IN PCHAR Format, IN ... OPTIONAL) { - STATIC CHAR Buffer[4096]; - STATIC BOOLEAN TerminalInitialized = FALSE; - STATIC BOOLEAN TerminalConnected = FALSE; - STATIC BOOLEAN TerminalReportsSize = TRUE; + static CHAR Buffer[4096]; + static BOOLEAN TerminalInitialized = FALSE; + static BOOLEAN TerminalConnected = FALSE; + static BOOLEAN TerminalReportsSize = TRUE; CHAR c = '\0'; PCHAR p, p2; ULONG Length; @@ -2122,7 +2122,7 @@ * * \param Command Pointer to the command to append to the history. */ -STATIC VOID +static VOID KdbpCommandHistoryAppend( IN PCHAR Command) { @@ -2194,7 +2194,7 @@ * * \note Accepts only \n newlines, \r is ignored. */ -STATIC VOID +static VOID KdbpReadCommand( OUT PCHAR Buffer, IN ULONG Size) @@ -2203,8 +2203,8 @@ PCHAR Orig = Buffer; ULONG ScanCode = 0; BOOLEAN EchoOn; - STATIC CHAR LastCommand[1024] = ""; - STATIC CHAR NextKey = '\0'; + static CHAR LastCommand[1024] = ""; + static CHAR NextKey = '\0'; INT CmdHistIndex = -1; INT i; @@ -2373,15 +2373,15 @@ * \retval TRUE Don't continue execution. * \retval FALSE Continue execution (leave KDB) */ -STATIC BOOLEAN +static BOOLEAN KdbpDoCommand( IN PCHAR Command) { ULONG i; PCHAR p; ULONG Argc; - STATIC PCH Argv[256]; - STATIC CHAR OrigCommand[1024]; + static PCH Argv[256]; + static CHAR OrigCommand[1024]; strncpy(OrigCommand, Command, sizeof(OrigCommand) - 1); OrigCommand[sizeof(OrigCommand) - 1] = '\0'; @@ -2429,7 +2429,7 @@ KdbpCliMainLoop( IN BOOLEAN EnteredOnSingleStep) { - STATIC CHAR Command[1024]; + static CHAR Command[1024]; BOOLEAN Continue; if (EnteredOnSingleStep) Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_expr.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_expr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_expr.c [iso-8859-1] Sat Jun 13 19:28:33 2009 @@ -87,9 +87,9 @@ #define RPN_VALUE_STACK_SIZE 256 /* GLOBALS *******************************************************************/ -STATIC struct { ULONG Size; ULONG Sp; RPN_OP Ops[RPN_OP_STACK_SIZE]; } RpnStack = { RPN_OP_STACK_SIZE, 0 }; - -STATIC CONST struct { PCHAR Name; UCHAR Offset; UCHAR Size; } RegisterToTrapFrame[] = +static struct { ULONG Size; ULONG Sp; RPN_OP Ops[RPN_OP_STACK_SIZE]; } RpnStack = { RPN_OP_STACK_SIZE, 0 }; + +static const struct { PCHAR Name; UCHAR Offset; UCHAR Size; } RegisterToTrapFrame[] = { {"eip", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Eip), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Eip)}, {"eflags", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.EFlags), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.EFlags)}, @@ -118,7 +118,7 @@ {"cr3", FIELD_OFFSET(KDB_KTRAP_FRAME, Cr3), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr3)}, {"cr4", FIELD_OFFSET(KDB_KTRAP_FRAME, Cr4), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr4)} }; -STATIC CONST INT RegisterToTrapFrameCount = +static const INT RegisterToTrapFrameCount = sizeof (RegisterToTrapFrame) / sizeof (RegisterToTrapFrame[0]); /* FUNCTIONS *****************************************************************/ @@ -268,7 +268,7 @@ * * \param Stack Pointer to a RPN_STACK structure. */ -STATIC VOID +static VOID RpnpClearStack( OUT PRPN_STACK Stack) { @@ -281,7 +281,7 @@ * \param Stack Pointer to a RPN_STACK structure. * \param Op RPN_OP to be copied onto the stack. */ -STATIC BOOLEAN +static BOOLEAN RpnpPushStack( IN OUT PRPN_STACK Stack, IN PRPN_OP Op) @@ -305,7 +305,7 @@ * \retval TRUE Success. * \retval FALSE Failure (stack empty) */ -STATIC BOOLEAN +static BOOLEAN RpnpPopStack( IN OUT PRPN_STACK Stack, OUT PRPN_OP Op OPTIONAL) @@ -329,7 +329,7 @@ * \retval TRUE Success. * \retval FALSE Failure (stack empty) */ -STATIC BOOLEAN +static BOOLEAN RpnpTopStack( IN PRPN_STACK Stack, OUT PRPN_OP Op) @@ -362,7 +362,7 @@ * \retval TRUE Success. * \retval FALSE Failure. */ -STATIC BOOLEAN +static BOOLEAN RpnpParseExpression( IN PRPN_STACK Stack, IN PCHAR Expression, @@ -785,7 +785,7 @@ * \retval TRUE Success. * \retval FALSE Failure. */ -STATIC BOOLEAN +static BOOLEAN RpnpEvaluateStack( IN PRPN_STACK Stack, IN PKDB_KTRAP_FRAME TrapFrame, Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Sat Jun 13 19:28:33 2009 @@ -44,7 +44,7 @@ * * \sa KdbpSymFindModule */ -STATIC BOOLEAN +static BOOLEAN KdbpSymFindUserModule(IN PVOID Address OPTIONAL, IN LPCWSTR Name OPTIONAL, IN INT Index OPTIONAL, @@ -102,7 +102,7 @@ * * \sa KdbpSymFindUserModule */ -STATIC BOOLEAN +static BOOLEAN KdbpSymFindModule(IN PVOID Address OPTIONAL, IN LPCWSTR Name OPTIONAL, IN INT Index OPTIONAL, @@ -296,7 +296,7 @@ * * \sa KdbpSymAddCachedFile */ -STATIC PROSSYM_INFO +static PROSSYM_INFO KdbpSymFindCachedFile(IN PUNICODE_STRING FileName) { PIMAGE_SYMBOL_INFO_CACHE Current; @@ -337,7 +337,7 @@ * * \sa KdbpSymRemoveCachedFile */ -STATIC VOID +static VOID KdbpSymAddCachedFile(IN PUNICODE_STRING FileName, IN PROSSYM_INFO RosSymInfo) { @@ -371,7 +371,7 @@ * * \sa KdbpSymAddCachedFile */ -STATIC VOID +static VOID KdbpSymRemoveCachedFile(IN PROSSYM_INFO RosSymInfo) { PIMAGE_SYMBOL_INFO_CACHE Current; @@ -413,7 +413,7 @@ * * \sa KdbpSymUnloadModuleSymbols */ -STATIC VOID +static VOID KdbpSymLoadModuleSymbols(IN PUNICODE_STRING FileName, OUT PROSSYM_INFO *RosSymInfo) { @@ -484,7 +484,7 @@ * * \sa KdbpSymLoadModuleSymbols */ -STATIC VOID +static VOID KdbpSymUnloadModuleSymbols(IN PROSSYM_INFO RosSymInfo) { DPRINT("Unloading symbols\n");

1 0

[dchapyshev] 41402: - Fix 5 winetests for CreateProcessA/W
by dchapyshev＠svn.reactos.org 13 Jun '09

13 Jun '09

Author: dchapyshev Date: Sat Jun 13 16:24:51 2009 New Revision: 41402 URL: http://svn.reactos.org/svn/reactos?rev=41402&view=rev Log: - Fix 5 winetests for CreateProcessA/W Modified: trunk/reactos/dll/win32/kernel32/misc/utils.c trunk/reactos/dll/win32/kernel32/process/procsup.c Modified: trunk/reactos/dll/win32/kernel32/misc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ut… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] Sat Jun 13 16:24:51 2009 @@ -412,10 +412,14 @@ RelativeName.Handle = NULL; /* Find the application name */ - RtlDosPathNameToNtPathName_U(lpApplicationName, - ApplicationName, - NULL, - &RelativeName); + if (!RtlDosPathNameToNtPathName_U(lpApplicationName, + ApplicationName, + NULL, + &RelativeName)) + { + return STATUS_OBJECT_PATH_NOT_FOUND; + } + DPRINT("ApplicationName %wZ\n", ApplicationName); DPRINT("RelativeName %wZ\n", &RelativeName.DosPath); @@ -442,7 +446,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to open file\n"); - SetLastErrorByStatus (Status); + SetLastErrorByStatus(Status); return Status; } Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Sat Jun 13 16:24:51 2009 @@ -1072,6 +1072,11 @@ &StartupInfo, lpProcessInformation); + case STATUS_OBJECT_NAME_NOT_FOUND: + case STATUS_OBJECT_PATH_NOT_FOUND: + SetLastErrorByStatus(Status); + goto Cleanup; + default: /* Invalid Image Type */ SetLastError(ERROR_BAD_EXE_FORMAT);

1 0

[cgutman] 41401: - Header cleanup
by cgutman＠svn.reactos.org 13 Jun '09

13 Jun '09

Author: cgutman Date: Sat Jun 13 09:51:44 2009 New Revision: 41401 URL: http://svn.reactos.org/svn/reactos?rev=41401&view=rev Log: - Header cleanup Modified: trunk/reactos/drivers/network/ndis/include/buffer.h trunk/reactos/drivers/network/ndis/include/ndissys.h Modified: trunk/reactos/drivers/network/ndis/include/buffer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/buffer.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/buffer.h [iso-8859-1] Sat Jun 13 09:51:44 2009 @@ -25,6 +25,12 @@ NETWORK_HEADER Buffers[0]; } NDIS_BUFFER_POOL, *PNDIS_BUFFER_POOL; +typedef struct _NDISI_PACKET_POOL { + NDIS_SPIN_LOCK SpinLock; + struct _NDIS_PACKET *FreeList; + UINT PacketLength; + UCHAR Buffer[1]; +} NDISI_PACKET_POOL, * PNDISI_PACKET_POOL; UINT CopyBufferToBufferChain( PNDIS_BUFFER DstBuffer, Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] Sat Jun 13 09:51:44 2009 @@ -10,8 +10,6 @@ #ifndef __NDISSYS_H #define __NDISSYS_H -typedef unsigned long NDIS_STATS; - #include <ntifs.h> #include <ndis.h> #include <xfilter.h> @@ -19,474 +17,11 @@ #include <atm.h> #include <ndistapi.h> #include <ndisguid.h> - -struct _ADAPTER_BINDING; - -typedef struct _NDISI_PACKET_POOL { - NDIS_SPIN_LOCK SpinLock; - struct _NDIS_PACKET *FreeList; - UINT PacketLength; - UCHAR Buffer[1]; -} NDISI_PACKET_POOL, * PNDISI_PACKET_POOL; - -/* WDK Compatibility. Taken from w32api DDK */ -#ifndef __NDIS_H -typedef struct _X_FILTER FDDI_FILTER, *PFDDI_FILTER; - -typedef VOID -(NTAPI *FDDI_RCV_COMPLETE_HANDLER)( - IN PFDDI_FILTER Filter); - -typedef VOID -(NTAPI *FDDI_RCV_INDICATE_HANDLER)( - IN PFDDI_FILTER Filter, - IN NDIS_HANDLE MacReceiveContext, - IN PCHAR Address, - IN UINT AddressLength, - IN PVOID HeaderBuffer, - IN UINT HeaderBufferSize, - IN PVOID LookaheadBuffer, - IN UINT LookaheadBufferSize, - IN UINT PacketSize); - -typedef enum _NDIS_WORK_ITEM_TYPE { - NdisWorkItemRequest, - NdisWorkItemSend, - NdisWorkItemReturnPackets, - NdisWorkItemResetRequested, - NdisWorkItemResetInProgress, - NdisWorkItemHalt, - NdisWorkItemSendLoopback, - NdisWorkItemMiniportCallback, - NdisMaxWorkItems -} NDIS_WORK_ITEM_TYPE, *PNDIS_WORK_ITEM_TYPE; - -#define NUMBER_OF_WORK_ITEM_TYPES NdisMaxWorkItems -#define NUMBER_OF_SINGLE_WORK_ITEMS 6 - -typedef struct _NDIS_MINIPORT_WORK_ITEM { - SINGLE_LIST_ENTRY Link; - NDIS_WORK_ITEM_TYPE WorkItemType; - PVOID WorkItemContext; -} NDIS_MINIPORT_WORK_ITEM, *PNDIS_MINIPORT_WORK_ITEM; - -typedef VOID (NTAPI *W_MINIPORT_CALLBACK)( - IN NDIS_HANDLE MiniportAdapterContext, - IN PVOID CallbackContext); - -typedef struct _NDIS_BIND_PATHS { - UINT Number; - NDIS_STRING Paths[1]; -} NDIS_BIND_PATHS, *PNDIS_BIND_PATHS; - -#if ARCNET -#define FILTERDBS_ARCNET_S \ - PARC_FILTER ArcDB; -#else /* !ARCNET */ -#define FILTERDBS_ARCNET_S \ - PVOID XXXDB; -#endif /* !ARCNET */ - -#define FILTERDBS_S \ - union { \ - PETH_FILTER EthDB; \ - PNULL_FILTER NullDB; \ - }; \ - PTR_FILTER TrDB; \ - PFDDI_FILTER FddiDB; \ - FILTERDBS_ARCNET_S - -typedef struct _NDIS_LOG { - PNDIS_MINIPORT_BLOCK Miniport; - KSPIN_LOCK LogLock; - PIRP Irp; - UINT TotalSize; - UINT CurrentSize; - UINT InPtr; - UINT OutPtr; - UCHAR LogBuf[1]; -} NDIS_LOG, *PNDIS_LOG; - -typedef enum _NDIS_PNP_DEVICE_STATE { - NdisPnPDeviceAdded, - NdisPnPDeviceStarted, - NdisPnPDeviceQueryStopped, - NdisPnPDeviceStopped, - NdisPnPDeviceQueryRemoved, - NdisPnPDeviceRemoved, - NdisPnPDeviceSurpriseRemoved -} NDIS_PNP_DEVICE_STATE; - -typedef struct _OID_LIST OID_LIST, *POID_LIST; - -struct _NDIS_MINIPORT_BLOCK { - PVOID Signature; - PNDIS_MINIPORT_BLOCK NextMiniport; - PNDIS_M_DRIVER_BLOCK DriverHandle; - NDIS_HANDLE MiniportAdapterContext; - UNICODE_STRING MiniportName; - PNDIS_BIND_PATHS BindPaths; - NDIS_HANDLE OpenQueue; - REFERENCE ShortRef; - NDIS_HANDLE DeviceContext; - UCHAR Padding1; - UCHAR LockAcquired; - UCHAR PmodeOpens; - UCHAR AssignedProcessor; - KSPIN_LOCK Lock; - PNDIS_REQUEST MediaRequest; - PNDIS_MINIPORT_INTERRUPT Interrupt; - ULONG Flags; - ULONG PnPFlags; - LIST_ENTRY PacketList; - PNDIS_PACKET FirstPendingPacket; - PNDIS_PACKET ReturnPacketsQueue; - ULONG RequestBuffer; - PVOID SetMCastBuffer; - PNDIS_MINIPORT_BLOCK PrimaryMiniport; - PVOID WrapperContext; - PVOID BusDataContext; - ULONG PnPCapabilities; - PCM_RESOURCE_LIST Resources; - NDIS_TIMER WakeUpDpcTimer; - UNICODE_STRING BaseName; - UNICODE_STRING SymbolicLinkName; - ULONG CheckForHangSeconds; - USHORT CFHangTicks; - USHORT CFHangCurrentTick; - NDIS_STATUS ResetStatus; - NDIS_HANDLE ResetOpen; - FILTERDBS_S - FILTER_PACKET_INDICATION_HANDLER PacketIndicateHandler; - NDIS_M_SEND_COMPLETE_HANDLER SendCompleteHandler; - NDIS_M_SEND_RESOURCES_HANDLER SendResourcesHandler; - NDIS_M_RESET_COMPLETE_HANDLER ResetCompleteHandler; - NDIS_MEDIUM MediaType; - ULONG BusNumber; - NDIS_INTERFACE_TYPE BusType; - NDIS_INTERFACE_TYPE AdapterType; - PDEVICE_OBJECT DeviceObject; - PDEVICE_OBJECT PhysicalDeviceObject; - PDEVICE_OBJECT NextDeviceObject; - PMAP_REGISTER_ENTRY MapRegisters; - PNDIS_AF_LIST CallMgrAfList; - PVOID MiniportThread; - PVOID SetInfoBuf; - USHORT SetInfoBufLen; - USHORT MaxSendPackets; - NDIS_STATUS FakeStatus; - PVOID LockHandler; - PUNICODE_STRING pAdapterInstanceName; - PNDIS_MINIPORT_TIMER TimerQueue; - UINT MacOptions; - PNDIS_REQUEST PendingRequest; - UINT MaximumLongAddresses; - UINT MaximumShortAddresses; - UINT CurrentLookahead; - UINT MaximumLookahead; - W_HANDLE_INTERRUPT_HANDLER HandleInterruptHandler; - W_DISABLE_INTERRUPT_HANDLER DisableInterruptHandler; - W_ENABLE_INTERRUPT_HANDLER EnableInterruptHandler; - W_SEND_PACKETS_HANDLER SendPacketsHandler; - NDIS_M_START_SENDS DeferredSendHandler; - ETH_RCV_INDICATE_HANDLER EthRxIndicateHandler; - TR_RCV_INDICATE_HANDLER TrRxIndicateHandler; - FDDI_RCV_INDICATE_HANDLER FddiRxIndicateHandler; - ETH_RCV_COMPLETE_HANDLER EthRxCompleteHandler; - TR_RCV_COMPLETE_HANDLER TrRxCompleteHandler; - FDDI_RCV_COMPLETE_HANDLER FddiRxCompleteHandler; - NDIS_M_STATUS_HANDLER StatusHandler; - NDIS_M_STS_COMPLETE_HANDLER StatusCompleteHandler; - NDIS_M_TD_COMPLETE_HANDLER TDCompleteHandler; - NDIS_M_REQ_COMPLETE_HANDLER QueryCompleteHandler; - NDIS_M_REQ_COMPLETE_HANDLER SetCompleteHandler; - NDIS_WM_SEND_COMPLETE_HANDLER WanSendCompleteHandler; - WAN_RCV_HANDLER WanRcvHandler; - WAN_RCV_COMPLETE_HANDLER WanRcvCompleteHandler; -#if defined(NDIS_WRAPPER) - PNDIS_MINIPORT_BLOCK NextGlobalMiniport; - SINGLE_LIST_ENTRY WorkQueue[NUMBER_OF_WORK_ITEM_TYPES]; - SINGLE_LIST_ENTRY SingleWorkItems[NUMBER_OF_SINGLE_WORK_ITEMS]; - UCHAR SendFlags; - UCHAR TrResetRing; - UCHAR ArcnetAddress; - UCHAR XState; - union { -#if ARCNET - PNDIS_ARC_BUF ArcBuf; -#endif - PVOID BusInterface; - }; - PNDIS_LOG Log; - ULONG SlotNumber; - PCM_RESOURCE_LIST AllocatedResources; - PCM_RESOURCE_LIST AllocatedResourcesTranslated; - SINGLE_LIST_ENTRY PatternList; - NDIS_PNP_CAPABILITIES PMCapabilities; - DEVICE_CAPABILITIES DeviceCaps; - ULONG WakeUpEnable; - DEVICE_POWER_STATE CurrentDevicePowerState; - PIRP pIrpWaitWake; - SYSTEM_POWER_STATE WaitWakeSystemState; - LARGE_INTEGER VcIndex; - KSPIN_LOCK VcCountLock; - LIST_ENTRY WmiEnabledVcs; - PNDIS_GUID pNdisGuidMap; - PNDIS_GUID pCustomGuidMap; - USHORT VcCount; - USHORT cNdisGuidMap; - USHORT cCustomGuidMap; - USHORT CurrentMapRegister; - PKEVENT AllocationEvent; - USHORT BaseMapRegistersNeeded; - USHORT SGMapRegistersNeeded; - ULONG MaximumPhysicalMapping; - NDIS_TIMER MediaDisconnectTimer; - USHORT MediaDisconnectTimeOut; - USHORT InstanceNumber; - NDIS_EVENT OpenReadyEvent; - NDIS_PNP_DEVICE_STATE PnPDeviceState; - NDIS_PNP_DEVICE_STATE OldPnPDeviceState; - PGET_SET_DEVICE_DATA SetBusData; - PGET_SET_DEVICE_DATA GetBusData; - KDPC DeferredDpc; -#if 0 - /* FIXME: */ - NDIS_STATS NdisStats; -#else - ULONG NdisStats; -#endif - PNDIS_PACKET IndicatedPacket[MAXIMUM_PROCESSORS]; - PKEVENT RemoveReadyEvent; - PKEVENT AllOpensClosedEvent; - PKEVENT AllRequestsCompletedEvent; - ULONG InitTimeMs; - NDIS_MINIPORT_WORK_ITEM WorkItemBuffer[NUMBER_OF_SINGLE_WORK_ITEMS]; - PDMA_ADAPTER SystemAdapterObject; - ULONG DriverVerifyFlags; - POID_LIST OidList; - USHORT InternalResetCount; - USHORT MiniportResetCount; - USHORT MediaSenseConnectCount; - USHORT MediaSenseDisconnectCount; - PNDIS_PACKET *xPackets; - ULONG UserModeOpenReferences; - union { - PVOID SavedSendHandler; - PVOID SavedWanSendHandler; - }; - PVOID SavedSendPacketsHandler; - PVOID SavedCancelSendPacketsHandler; - W_SEND_PACKETS_HANDLER WSendPacketsHandler; - ULONG MiniportAttributes; - PDMA_ADAPTER SavedSystemAdapterObject; - USHORT NumOpens; - USHORT CFHangXTicks; - ULONG RequestCount; - ULONG IndicatedPacketsCount; - ULONG PhysicalMediumType; - PNDIS_REQUEST LastRequest; - LONG DmaAdapterRefCount; - PVOID FakeMac; - ULONG LockDbg; - ULONG LockDbgX; - PVOID LockThread; - ULONG InfoFlags; - KSPIN_LOCK TimerQueueLock; - PKEVENT ResetCompletedEvent; - PKEVENT QueuedBindingCompletedEvent; - PKEVENT DmaResourcesReleasedEvent; - FILTER_PACKET_INDICATION_HANDLER SavedPacketIndicateHandler; - ULONG RegisteredInterrupts; - PNPAGED_LOOKASIDE_LIST SGListLookasideList; - ULONG ScatterGatherListSize; -#endif /* _NDIS_ */ -}; - -#if 1 -/* FIXME: */ -typedef PVOID QUEUED_CLOSE; -#endif - -#if defined(NDIS_WRAPPER) -#define NDIS_COMMON_OPEN_BLOCK_WRAPPER_S \ - ULONG Flags; \ - ULONG References; \ - KSPIN_LOCK SpinLock; \ - NDIS_HANDLE FilterHandle; \ - ULONG ProtocolOptions; \ - USHORT CurrentLookahead; \ - USHORT ConnectDampTicks; \ - USHORT DisconnectDampTicks; \ - W_SEND_HANDLER WSendHandler; \ - W_TRANSFER_DATA_HANDLER WTransferDataHandler; \ - W_SEND_PACKETS_HANDLER WSendPacketsHandler; \ - W_CANCEL_SEND_PACKETS_HANDLER CancelSendPacketsHandler; \ - ULONG WakeUpEnable; \ - PKEVENT CloseCompleteEvent; \ - QUEUED_CLOSE QC; \ - ULONG AfReferences; \ - PNDIS_OPEN_BLOCK NextGlobalOpen; -#else -#define NDIS_COMMON_OPEN_BLOCK_WRAPPER_S -#endif - -#define NDIS_COMMON_OPEN_BLOCK_S \ - PVOID MacHandle; \ - NDIS_HANDLE BindingHandle; \ - PNDIS_MINIPORT_BLOCK MiniportHandle; \ - PNDIS_PROTOCOL_BLOCK ProtocolHandle; \ - NDIS_HANDLE ProtocolBindingContext; \ - PNDIS_OPEN_BLOCK MiniportNextOpen; \ - PNDIS_OPEN_BLOCK ProtocolNextOpen; \ - NDIS_HANDLE MiniportAdapterContext; \ - BOOLEAN Reserved1; \ - BOOLEAN Reserved2; \ - BOOLEAN Reserved3; \ - BOOLEAN Reserved4; \ - PNDIS_STRING BindDeviceName; \ - KSPIN_LOCK Reserved5; \ - PNDIS_STRING RootDeviceName; \ - union { \ - SEND_HANDLER SendHandler; \ - WAN_SEND_HANDLER WanSendHandler; \ - }; \ - TRANSFER_DATA_HANDLER TransferDataHandler; \ - SEND_COMPLETE_HANDLER SendCompleteHandler; \ - TRANSFER_DATA_COMPLETE_HANDLER TransferDataCompleteHandler; \ - RECEIVE_HANDLER ReceiveHandler; \ - RECEIVE_COMPLETE_HANDLER ReceiveCompleteHandler; \ - WAN_RECEIVE_HANDLER WanReceiveHandler; \ - REQUEST_COMPLETE_HANDLER RequestCompleteHandler; \ - RECEIVE_PACKET_HANDLER ReceivePacketHandler; \ - SEND_PACKETS_HANDLER SendPacketsHandler; \ - RESET_HANDLER ResetHandler; \ - REQUEST_HANDLER RequestHandler; \ - RESET_COMPLETE_HANDLER ResetCompleteHandler; \ - STATUS_HANDLER StatusHandler; \ - STATUS_COMPLETE_HANDLER StatusCompleteHandler; \ - NDIS_COMMON_OPEN_BLOCK_WRAPPER_S - -typedef struct _NDIS_COMMON_OPEN_BLOCK { - NDIS_COMMON_OPEN_BLOCK_S -} NDIS_COMMON_OPEN_BLOCK; - -struct _NDIS_OPEN_BLOCK -{ -#ifdef __cplusplus - NDIS_COMMON_OPEN_BLOCK NdisCommonOpenBlock; -#else - NDIS_COMMON_OPEN_BLOCK_S -#endif -#if defined(NDIS_WRAPPER) - struct _NDIS_OPEN_CO - { - struct _NDIS_CO_AF_BLOCK * NextAf; - W_CO_CREATE_VC_HANDLER MiniportCoCreateVcHandler; - W_CO_REQUEST_HANDLER MiniportCoRequestHandler; - CO_CREATE_VC_HANDLER CoCreateVcHandler; - CO_DELETE_VC_HANDLER CoDeleteVcHandler; - PVOID CmActivateVcCompleteHandler; - PVOID CmDeactivateVcCompleteHandler; - PVOID CoRequestCompleteHandler; - LIST_ENTRY ActiveVcHead; - LIST_ENTRY InactiveVcHead; - LONG PendingAfNotifications; - PKEVENT AfNotifyCompleteEvent; - }; -#endif /* _NDIS_ */ -}; - -#define NDIS30_PROTOCOL_CHARACTERISTICS_S \ - UCHAR MajorNdisVersion; \ - UCHAR MinorNdisVersion; \ - USHORT Filler; \ - union { \ - UINT Reserved; \ - UINT Flags; \ - }; \ - OPEN_ADAPTER_COMPLETE_HANDLER OpenAdapterCompleteHandler; \ - CLOSE_ADAPTER_COMPLETE_HANDLER CloseAdapterCompleteHandler; \ - union { \ - SEND_COMPLETE_HANDLER SendCompleteHandler; \ - WAN_SEND_COMPLETE_HANDLER WanSendCompleteHandler; \ - }; \ - union { \ - TRANSFER_DATA_COMPLETE_HANDLER TransferDataCompleteHandler; \ - WAN_TRANSFER_DATA_COMPLETE_HANDLER WanTransferDataCompleteHandler; \ - }; \ - RESET_COMPLETE_HANDLER ResetCompleteHandler; \ - REQUEST_COMPLETE_HANDLER RequestCompleteHandler; \ - union { \ - RECEIVE_HANDLER ReceiveHandler; \ - WAN_RECEIVE_HANDLER WanReceiveHandler; \ - }; \ - RECEIVE_COMPLETE_HANDLER ReceiveCompleteHandler; \ - STATUS_HANDLER StatusHandler; \ - STATUS_COMPLETE_HANDLER StatusCompleteHandler; \ - NDIS_STRING Name; - -typedef struct _NDIS30_PROTOCOL_CHARACTERISTICS { - NDIS30_PROTOCOL_CHARACTERISTICS_S -} NDIS30_PROTOCOL_CHARACTERISTICS, *PNDIS30_PROTOCOL_CHARACTERISTICS; - -#define NDIS30_MINIPORT_CHARACTERISTICS_S \ - UCHAR MajorNdisVersion; \ - UCHAR MinorNdisVersion; \ - USHORT Filler; \ - UINT Reserved; \ - W_CHECK_FOR_HANG_HANDLER CheckForHangHandler; \ - W_DISABLE_INTERRUPT_HANDLER DisableInterruptHandler; \ - W_ENABLE_INTERRUPT_HANDLER EnableInterruptHandler; \ - W_HALT_HANDLER HaltHandler; \ - W_HANDLE_INTERRUPT_HANDLER HandleInterruptHandler; \ - W_INITIALIZE_HANDLER InitializeHandler; \ - W_ISR_HANDLER ISRHandler; \ - W_QUERY_INFORMATION_HANDLER QueryInformationHandler; \ - W_RECONFIGURE_HANDLER ReconfigureHandler; \ - W_RESET_HANDLER ResetHandler; \ - union { \ - W_SEND_HANDLER SendHandler; \ - WM_SEND_HANDLER WanSendHandler; \ - }u1; \ - W_SET_INFORMATION_HANDLER SetInformationHandler; \ - union { \ - W_TRANSFER_DATA_HANDLER TransferDataHandler; \ - WM_TRANSFER_DATA_HANDLER WanTransferDataHandler; \ - }u2; - -typedef struct _NDIS30_MINIPORT_CHARACTERISTICS { - NDIS30_MINIPORT_CHARACTERISTICS_S -} NDIS30_MINIPORT_CHARACTERISTICS, *PSNDIS30_MINIPORT_CHARACTERISTICS; - -#ifdef __cplusplus - -#define NDIS40_MINIPORT_CHARACTERISTICS_S \ - NDIS30_MINIPORT_CHARACTERISTICS Ndis30Chars; \ - W_RETURN_PACKET_HANDLER ReturnPacketHandler; \ - W_SEND_PACKETS_HANDLER SendPacketsHandler; \ - W_ALLOCATE_COMPLETE_HANDLER AllocateCompleteHandler; - -#else /* !__cplusplus */ - -#define NDIS40_MINIPORT_CHARACTERISTICS_S \ - NDIS30_MINIPORT_CHARACTERISTICS_S \ - W_RETURN_PACKET_HANDLER ReturnPacketHandler; \ - W_SEND_PACKETS_HANDLER SendPacketsHandler; \ - W_ALLOCATE_COMPLETE_HANDLER AllocateCompleteHandler; - -#endif /* !__cplusplus */ - -typedef struct _NDIS40_MINIPORT_CHARACTERISTICS { - NDIS40_MINIPORT_CHARACTERISTICS_S -} NDIS40_MINIPORT_CHARACTERISTICS, *PNDIS40_MINIPORT_CHARACTERISTICS; - -#endif +#include <debug.h> #include "miniport.h" #include "protocol.h" - -#include <debug.h> +#include "buffer.h" /* Exported functions */ #ifndef EXPORT

1 0

[cgutman] 41400: - Implement NdisIMCopySendPerPacketInfo and NdisIMCopySendCompletePerPacketInfo
by cgutman＠svn.reactos.org 13 Jun '09

13 Jun '09

Author: cgutman Date: Sat Jun 13 09:37:16 2009 New Revision: 41400 URL: http://svn.reactos.org/svn/reactos?rev=41400&view=rev Log: - Implement NdisIMCopySendPerPacketInfo and NdisIMCopySendCompletePerPacketInfo Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c trunk/reactos/drivers/network/ndis/ndis/buffer.c Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Sat Jun 13 09:37:16 2009 @@ -451,44 +451,6 @@ */ VOID EXPORT -NdisIMCopySendCompletePerPacketInfo( - IN PNDIS_PACKET DstPacket, - IN PNDIS_PACKET SrcPacket) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisIMCopySendPerPacketInfo( - IN PNDIS_PACKET DstPacket, - IN PNDIS_PACKET SrcPacket) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT NdisIMDeregisterLayeredMiniport( IN NDIS_HANDLE DriverHandle) /* Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Sat Jun 13 09:37:16 2009 @@ -1320,4 +1320,57 @@ *BytesCopied = Total; } +/* + * @implemented + */ +VOID +EXPORT +NdisIMCopySendCompletePerPacketInfo( + IN PNDIS_PACKET DstPacket, + IN PNDIS_PACKET SrcPacket) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + /* FIXME: What is the difference between NdisIMCopySendPerPacketInfo and + * NdisIMCopySendCompletePerPacketInfo? + */ + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + RtlCopyMemory(NDIS_PACKET_EXTENSION_FROM_PACKET(DstPacket), + NDIS_PACKET_EXTENSION_FROM_PACKET(SrcPacket), + sizeof(NDIS_PACKET_EXTENSION)); +} + + +/* + * @implemented + */ +VOID +EXPORT +NdisIMCopySendPerPacketInfo( + IN PNDIS_PACKET DstPacket, + IN PNDIS_PACKET SrcPacket) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + /* FIXME: What is the difference between NdisIMCopySendPerPacketInfo and + * NdisIMCopySendCompletePerPacketInfo? + */ + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + RtlCopyMemory(NDIS_PACKET_EXTENSION_FROM_PACKET(DstPacket), + NDIS_PACKET_EXTENSION_FROM_PACKET(SrcPacket), + sizeof(NDIS_PACKET_EXTENSION)); +} + /* EOF */

1 0

[cgutman] 41399: - Implement NdisGeneratePartialCancelId
by cgutman＠svn.reactos.org 13 Jun '09

13 Jun '09

Author: cgutman Date: Sat Jun 13 09:25:54 2009 New Revision: 41399 URL: http://svn.reactos.org/svn/reactos?rev=41399&view=rev Log: - Implement NdisGeneratePartialCancelId Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c trunk/reactos/drivers/network/ndis/ndis/misc.c Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Sat Jun 13 09:25:54 2009 @@ -66,18 +66,6 @@ *StacksRemaining = FALSE; return NULL; -} - -/* - * @unimplemented - */ -UCHAR -EXPORT -NdisGeneratePartialCancelId(VOID) -{ - UNIMPLEMENTED - - return 0; } /* 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 Jun 13 09:25:54 2009 @@ -511,4 +511,20 @@ return (UINT) 0x501; } +/* + * @implemented + */ +UCHAR +EXPORT +NdisGeneratePartialCancelId(VOID) +{ + static UCHAR CancelId = 0; + + CancelId++; + + NDIS_DbgPrint(MAX_TRACE, ("Cancel ID %u\n", CancelId)); + + return CancelId; +} + /* EOF */

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2009