Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 16089: Correct the DD_GETDRIVERINFODATA struct it did missing a pointer to DDRAWI_DIRECTDRAW_GBL struct. Some need really check this file if more mistake exists
by greatlrd＠svn.reactos.com 19 Jun '05

19 Jun '05

Correct the DD_GETDRIVERINFODATA struct it did missing a pointer to DDRAWI_DIRECTDRAW_GBL struct. Some need really check this file if more mistake exists Modified: trunk/reactos/include/ddk/ddrawint.h _____ Modified: trunk/reactos/include/ddk/ddrawint.h --- trunk/reactos/include/ddk/ddrawint.h 2005-06-19 10:10:34 UTC (rev 16088) +++ trunk/reactos/include/ddk/ddrawint.h 2005-06-19 12:13:57 UTC (rev 16089) @@ -1129,9 +1129,13 @@ // Output: DWORD dwActualSize; HRESULT ddRVal; + ULONG_PTR dwContext; } DD_GETDRIVERINFODATA, *PDD_GETDRIVERINFODATA; typedef DWORD (STDCALL *PDD_GETDRIVERINFO)(PDD_GETDRIVERINFODATA); + + + /*********************************************************************** */ /* Driver info structures */ /*********************************************************************** */ @@ -1203,6 +1207,7 @@ PDD_D3DBUFCALLBACKS lpD3DBufCallbacks; } DD_HALINFO, *PDD_HALINFO; + DEFINE_GUID(GUID_NonLocalVidMemCaps, 0x86C4FA80, 0x8D84, 0x11D0, 0x94, 0xE8, 0x00, 0xC0, 0x4F, 0xC3, 0x41, 0x37); typedef struct @@ -1228,6 +1233,8 @@ } ddsExtendedHeapRestrictions[1]; } DD_MORESURFACECAPS, *PDD_MORESURFACECAPS; + + #ifdef __cplusplus } /* extern "C" */ #endif

1 0

[greatlrd] 16088: add TAG macro
by greatlrd＠svn.reactos.com 19 Jun '05

19 Jun '05

add TAG macro Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h _____ Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h --- trunk/reactos/drivers/video/displays/vga/vgaddi.h 2005-06-19 09:48:14 UTC (rev 16087) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.h 2005-06-19 10:10:34 UTC (rev 16088) @@ -2,6 +2,8 @@ #include <ddk/winddi.h> #include <ddk/ntddvdeo.h> +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + #define DS_SOLIDBRUSH 0x00000001 #define DS_GREYBRUSH 0x00000002 #define DS_BRUSH 0x00000004

1 0

[hbirr] 16087: Initialized the system call entry independent of the real type of SystemCall.
by hbirr＠svn.reactos.com 19 Jun '05

19 Jun '05

Initialized the system call entry independent of the real type of SystemCall. Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-06-19 09:07:44 UTC (rev 16086) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-06-19 09:48:14 UTC (rev 16087) @@ -521,25 +521,17 @@ } if (FastSystemCallDisable) { - /* Use INT2E */ - SharedUserData->SystemCall[0] = 0x8D; - SharedUserData->SystemCall[1] = 0x54; - SharedUserData->SystemCall[2] = 0x24; - SharedUserData->SystemCall[3] = 0x08; - SharedUserData->SystemCall[4] = 0xCD; - SharedUserData->SystemCall[5] = 0x2E; - SharedUserData->SystemCall[6] = 0xC3; - + const unsigned char Entry[7] = {0x8D, 0x54, 0x24, 0x08, /* lea 0x8(%esp),%edx */ + 0xCD, 0x2E, /* int 0x2e */ + 0xC3}; /* ret */ + memcpy(&SharedUserData->SystemCall, Entry, sizeof(Entry)); } else { - /* Use SYSENTER */ - SharedUserData->SystemCall[0] = 0x8B; - SharedUserData->SystemCall[1] = 0xD4; - SharedUserData->SystemCall[2] = 0x0F; - SharedUserData->SystemCall[3] = 0x34; - SharedUserData->SystemCall[4] = 0xC3; - + const unsigned char Entry[5] = {0x8B, 0xD4, /* movl %esp,%edx */ + 0x0F, 0x34, /* sysenter */ + 0xC3}; /* ret */ + memcpy(&SharedUserData->SystemCall, Entry, sizeof(Entry)); /* Enable SYSENTER/SYSEXIT */ KiFastSystemCallDisable = 0; }

1 0

[navaraf] 16086: Couple of build fixes.
by navaraf＠svn.reactos.com 19 Jun '05

19 Jun '05

Couple of build fixes. Modified: trunk/reactos/drivers/net/tcpip/include/tcpip.h Modified: trunk/reactos/drivers/storage/class2/class2.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h Modified: trunk/reactos/drivers/usb/cromwell/usb_wrapper.h Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h Modified: trunk/reactos/drivers/video/videoprt/videoprt.h Modified: trunk/reactos/hal/halx86/generic/reboot.c Modified: trunk/reactos/hal/halx86/include/hal.h Modified: trunk/reactos/lib/freetype/rosglue.c Modified: trunk/reactos/lib/msafd/include/msafd.h Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/subsys/win32k/misc/driver.c Modified: trunk/reactos/subsys/win32k/w32k.h Modified: trunk/reactos/w32api/include/ddk/kbdmou.h _____ Modified: trunk/reactos/drivers/net/tcpip/include/tcpip.h --- trunk/reactos/drivers/net/tcpip/include/tcpip.h 2005-06-19 08:21:35 UTC (rev 16085) +++ trunk/reactos/drivers/net/tcpip/include/tcpip.h 2005-06-19 09:07:44 UTC (rev 16086) @@ -30,6 +30,7 @@ #include <debug.h> +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_STRING TAG('S', 'T', 'R', ' ') /* string */ /* Define _NTTEST_ to make test version. Device names are prefixed with _____ Modified: trunk/reactos/drivers/storage/class2/class2.c --- trunk/reactos/drivers/storage/class2/class2.c 2005-06-19 08:21:35 UTC (rev 16085) +++ trunk/reactos/drivers/storage/class2/class2.c 2005-06-19 09:07:44 UTC (rev 16086) @@ -45,6 +45,7 @@ #define VERSION "0.0.2" +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_SRBT TAG('S', 'r', 'b', 'T') #define INQUIRY_DATA_SIZE 2048 _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h --- trunk/reactos/drivers/storage/scsiport/scsiport_int.h 2005-06-19 08:21:35 UTC (rev 16085) +++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h 2005-06-19 09:07:44 UTC (rev 16086) @@ -10,6 +10,8 @@ #define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + typedef enum _SCSI_PORT_TIMER_STATES { IDETimerIdle, _____ Modified: trunk/reactos/drivers/usb/cromwell/usb_wrapper.h --- trunk/reactos/drivers/usb/cromwell/usb_wrapper.h 2005-06-19 08:21:35 UTC (rev 16085) +++ trunk/reactos/drivers/usb/cromwell/usb_wrapper.h 2005-06-19 09:07:44 UTC (rev 16086) @@ -4,6 +4,8 @@ #include <ddk/ntddk.h> #include <debug.h> +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + void wait_ms(int mils); #ifndef _snprintf _____ Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h 2005-06-19 08:21:35 UTC (rev 16085) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h 2005-06-19 09:07:44 UTC (rev 16086) @@ -56,6 +56,8 @@ #endif } PDEV, *PPDEV; +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + #define DEVICE_NAME L"framebuf" #define ALLOC_TAG TAG('F','B','U','F') _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.h --- trunk/reactos/drivers/video/videoprt/videoprt.h 2005-06-19 08:21:35 UTC (rev 16085) +++ trunk/reactos/drivers/video/videoprt/videoprt.h 2005-06-19 09:07:44 UTC (rev 16086) @@ -34,6 +34,8 @@ #define NDEBUG #include <debug.h> +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + int swprintf(wchar_t *buf, const wchar_t *fmt, ...); int vsprintf(char *buf, const char *fmt, va_list args); _____ Modified: trunk/reactos/hal/halx86/generic/reboot.c --- trunk/reactos/hal/halx86/generic/reboot.c 2005-06-19 08:21:35 UTC (rev 16085) +++ trunk/reactos/hal/halx86/generic/reboot.c 2005-06-19 09:07:44 UTC (rev 16086) @@ -56,12 +56,12 @@ ULONG Action ) { - if (Action == FIRMWARE_HALT) + if (Action == HalHaltRoutine) { DbgPrint ("HalReturnToFirmware called!\n"); DbgBreakPoint (); } - else if (Action == FIRMWARE_REBOOT) + else if (Action == HalRebootRoutine) { HalReleaseDisplayOwnership(); HalReboot (); _____ Modified: trunk/reactos/hal/halx86/include/hal.h --- trunk/reactos/hal/halx86/include/hal.h 2005-06-19 08:21:35 UTC (rev 16085) +++ trunk/reactos/hal/halx86/include/hal.h 2005-06-19 09:07:44 UTC (rev 16086) @@ -20,6 +20,8 @@ #include <internal/ke.h> #include <internal/i386/ps.h> +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + //Temporary hack below. PVOID STDCALL MmAllocateContiguousAlignedMemory(IN ULONG NumberOfBytes, _____ Modified: trunk/reactos/lib/freetype/rosglue.c --- trunk/reactos/lib/freetype/rosglue.c 2005-06-19 08:21:35 UTC (rev 16085) +++ trunk/reactos/lib/freetype/rosglue.c 2005-06-19 09:07:44 UTC (rev 16086) @@ -19,6 +19,7 @@ #define NDEBUG #include <debug.h> +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_FREETYPE TAG('F', 'T', 'Y', 'P') /* _____ Modified: trunk/reactos/lib/msafd/include/msafd.h --- trunk/reactos/lib/msafd/include/msafd.h 2005-06-19 08:21:35 UTC (rev 16085) +++ trunk/reactos/lib/msafd/include/msafd.h 2005-06-19 09:07:44 UTC (rev 16086) @@ -10,8 +10,8 @@ #include <roscfg.h> #include <stdlib.h> #include <windows.h> -#include <ddk/ntddk.h> -#include <ddk/ntifs.h> +#define NTOS_USER_MODE +#include <ntos.h> #include <wsahelp.h> /* comment for msvc */ //#include "C:\Programming\ReactOS\reactos\w32api\include\wsahelp.h" uncomment for MSVC #include <winsock2.h> @@ -22,10 +22,6 @@ #include <helpers.h> #include <debug.h> -/* Because our headers are f*cked up */ -typedef LARGE_INTEGER TIME; -#include <ntos/zw.h> - extern HANDLE GlobalHeap; extern WSPUPCALLTABLE Upcalls; extern LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest; _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c --- trunk/reactos/ntoskrnl/kdbg/kdb.c 2005-06-19 08:21:35 UTC (rev 16085) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c 2005-06-19 09:07:44 UTC (rev 16086) @@ -15,6 +15,10 @@ /* TYPES *********************************************************************/ +/* FIXME: NDK headers */ +#define TempEsp TempEip +#define TempSegSs TempCs + /* DEFINES *******************************************************************/ #define KDB_STACK_SIZE (4096*3) _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-06-19 08:21:35 UTC (rev 16085) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-06-19 09:07:44 UTC (rev 16086) @@ -37,6 +37,10 @@ /* DEFINES *******************************************************************/ +/* FIXME: NDK headers */ +#define TempEsp TempEip +#define TempSegSs TempCs + #define KEY_BS 8 #define KEY_ESC 27 #define KEY_DEL 127 _____ Modified: trunk/reactos/subsys/win32k/misc/driver.c --- trunk/reactos/subsys/win32k/misc/driver.c 2005-06-19 08:21:35 UTC (rev 16085) +++ trunk/reactos/subsys/win32k/misc/driver.c 2005-06-19 09:07:44 UTC (rev 16086) @@ -23,19 +23,8 @@ * */ -#undef WIN32_LEAN_AND_MEAN -#define WIN32_NO_PEHDR +#include <w32k.h> -#include <ddk/ntddk.h> -#include <windows.h> -#include <win32k/driver.h> -#include <win32k/misc.h> -#include <wchar.h> -#include <ddk/winddi.h> -#include <ddk/ntapi.h> -#include <rosrtl/string.h> -#include <include/tags.h> - #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-06-19 08:21:35 UTC (rev 16085) +++ trunk/reactos/subsys/win32k/w32k.h 2005-06-19 09:07:44 UTC (rev 16086) @@ -85,6 +85,7 @@ #include <dib/dib.h> +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + #define NDEBUG #include <win32k/debug1.h> - _____ Modified: trunk/reactos/w32api/include/ddk/kbdmou.h --- trunk/reactos/w32api/include/ddk/kbdmou.h 2005-06-19 08:21:35 UTC (rev 16085) +++ trunk/reactos/w32api/include/ddk/kbdmou.h 2005-06-19 09:07:44 UTC (rev 16086) @@ -1,5 +1,5 @@ /* - * ntddmou.h + * kbdmou.h * * Structures and definitions for Keyboard/Mouse class and port drivers. *

1 0

[navaraf] 16085: Add TAG macro definition.
by navaraf＠svn.reactos.com 19 Jun '05

19 Jun '05

Add TAG macro definition. Modified: trunk/reactos/drivers/net/ndis/include/ndissys.h _____ Modified: trunk/reactos/drivers/net/ndis/include/ndissys.h --- trunk/reactos/drivers/net/ndis/include/ndissys.h 2005-06-19 08:20:08 UTC (rev 16084) +++ trunk/reactos/drivers/net/ndis/include/ndissys.h 2005-06-19 08:21:35 UTC (rev 16085) @@ -47,6 +47,7 @@ #define EXPORT STDCALL #endif +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define NDIS_TAG 0x4e4d4953 #ifdef DBG

1 0

[navaraf] 16084: Add TAG macro definition.
by navaraf＠svn.reactos.com 19 Jun '05

19 Jun '05

Add TAG macro definition. Modified: trunk/reactos/drivers/net/npf/dump.c Modified: trunk/reactos/drivers/net/npf/jitter.c Modified: trunk/reactos/drivers/net/npf/openclos.c Modified: trunk/reactos/drivers/net/npf/packet.c _____ Modified: trunk/reactos/drivers/net/npf/dump.c --- trunk/reactos/drivers/net/npf/dump.c 2005-06-19 08:15:10 UTC (rev 16083) +++ trunk/reactos/drivers/net/npf/dump.c 2005-06-19 08:20:08 UTC (rev 16084) @@ -33,6 +33,8 @@ #endif #endif +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + #include "debug.h" #include "packet.h" #include "win_bpf.h" _____ Modified: trunk/reactos/drivers/net/npf/jitter.c --- trunk/reactos/drivers/net/npf/jitter.c 2005-06-19 08:15:10 UTC (rev 16083) +++ trunk/reactos/drivers/net/npf/jitter.c 2005-06-19 08:20:08 UTC (rev 16084) @@ -32,6 +32,8 @@ #include "packet.h" #include "win_bpf.h" +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + emit_func emitm; // _____ Modified: trunk/reactos/drivers/net/npf/openclos.c --- trunk/reactos/drivers/net/npf/openclos.c 2005-06-19 08:15:10 UTC (rev 16083) +++ trunk/reactos/drivers/net/npf/openclos.c 2005-06-19 08:20:08 UTC (rev 16084) @@ -30,6 +30,8 @@ #include "debug.h" #include "packet.h" +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + static NDIS_MEDIUM MediumArray[] = { NdisMedium802_3, NdisMediumWan, _____ Modified: trunk/reactos/drivers/net/npf/packet.c --- trunk/reactos/drivers/net/npf/packet.c 2005-06-19 08:15:10 UTC (rev 16083) +++ trunk/reactos/drivers/net/npf/packet.c 2005-06-19 08:20:08 UTC (rev 16084) @@ -38,6 +38,8 @@ #include "tme.h" +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + #if DBG // Declare the global debug flag for this driver. //ULONG PacketDebugFlag = PACKET_DEBUG_LOUD;

1 0

[navaraf] 16083: Move the TAG define.
by navaraf＠svn.reactos.com 19 Jun '05

19 Jun '05

Move the TAG define. Modified: trunk/reactos/drivers/dd/serial/serial.h _____ Modified: trunk/reactos/drivers/dd/serial/serial.h --- trunk/reactos/drivers/dd/serial/serial.h 2005-06-19 08:14:18 UTC (rev 16082) +++ trunk/reactos/drivers/dd/serial/serial.h 2005-06-19 08:15:10 UTC (rev 16083) @@ -22,8 +22,6 @@ #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) - #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - NTSTATUS STDCALL IoAttachDeviceToDeviceStackSafe( IN PDEVICE_OBJECT SourceDevice, @@ -42,6 +40,8 @@ #error Unknown compiler! #endif +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + typedef enum { dsStopped,

1 0

[navaraf] 16082: Add TAG macro definition.
by navaraf＠svn.reactos.com 19 Jun '05

19 Jun '05

Add TAG macro definition. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h --- trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-06-19 08:05:01 UTC (rev 16081) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-06-19 08:14:18 UTC (rev 16082) @@ -213,6 +213,7 @@ /* * Some defines */ +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_I8042 TAG('8', '0', '4', '2') #define KBD_WRAP_MASK 0x1F

1 0

[navaraf] 16081: Move the TAG define.
by navaraf＠svn.reactos.com 19 Jun '05

19 Jun '05

Move the TAG define. Modified: trunk/reactos/drivers/bus/serenum/serenum.h _____ Modified: trunk/reactos/drivers/bus/serenum/serenum.h --- trunk/reactos/drivers/bus/serenum/serenum.h 2005-06-19 07:41:35 UTC (rev 16080) +++ trunk/reactos/drivers/bus/serenum/serenum.h 2005-06-19 08:05:01 UTC (rev 16081) @@ -26,8 +26,6 @@ #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint #define CHECKPOINT1 DbgPrint("(%s:%d)\n") - #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - NTSTATUS STDCALL IoAttachDeviceToDeviceStackSafe( IN PDEVICE_OBJECT SourceDevice, @@ -42,6 +40,8 @@ #error Unknown compiler! #endif +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + typedef enum { dsStopped,

1 0

[ion] 16080: Some more NDK fixes
by ion＠svn.reactos.com 19 Jun '05

19 Jun '05

Some more NDK fixes Modified: trunk/reactos/include/napi/core.h Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/include/ndk/haltypes.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/include/ndk/zwtypes.h Modified: trunk/reactos/include/ntos/haltypes.h Modified: trunk/reactos/ntoskrnl/ex/power.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h _____ Modified: trunk/reactos/include/napi/core.h --- trunk/reactos/include/napi/core.h 2005-06-19 07:15:07 UTC (rev 16079) +++ trunk/reactos/include/napi/core.h 2005-06-19 07:41:35 UTC (rev 16080) @@ -7,10 +7,6 @@ #define MM_CORE_DUMP_HEADER_MAGIC (0xdeafbead) #define MM_CORE_DUMP_HEADER_VERSION (0x1) -#define MM_CORE_DUMP_TYPE_NONE (0x0) -#define MM_CORE_DUMP_TYPE_MINIMAL (0x1) -#define MM_CORE_DUMP_TYPE_FULL (0x2) - typedef struct _MM_CORE_DUMP_HEADER { ULONG Magic; _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-06-19 07:15:07 UTC (rev 16079) +++ trunk/reactos/include/ndk/extypes.h 2005-06-19 07:41:35 UTC (rev 16080) @@ -18,6 +18,7 @@ extern NTOSAPI POBJECT_TYPE ExTimerType; /* CONSTANTS *****************************************************************/ +#define INVALID_HANDLE_VALUE (HANDLE)-1 /* ENUMERATIONS **************************************************************/ @@ -70,6 +71,12 @@ ULONG AuditMask; } HANDLE_TABLE_ENTRY_INFO, *PHANDLE_TABLE_ENTRY_INFO; +typedef struct _RUNDOWN_DESCRIPTOR +{ + ULONG_PTR References; + KEVENT RundownEvent; +} RUNDOWN_DESCRIPTOR, *PRUNDOWN_DESCRIPTOR; + typedef struct _HANDLE_TABLE_ENTRY { union _____ Modified: trunk/reactos/include/ndk/halfuncs.h --- trunk/reactos/include/ndk/halfuncs.h 2005-06-19 07:15:07 UTC (rev 16079) +++ trunk/reactos/include/ndk/halfuncs.h 2005-06-19 07:41:35 UTC (rev 16080) @@ -114,7 +114,7 @@ VOID STDCALL HalReturnToFirmware( - FIRMWARE_ENTRY Action + FIRMWARE_REENTRY Action ); VOID _____ Modified: trunk/reactos/include/ndk/haltypes.h --- trunk/reactos/include/ndk/haltypes.h 2005-06-19 07:15:07 UTC (rev 16079) +++ trunk/reactos/include/ndk/haltypes.h 2005-06-19 07:41:35 UTC (rev 16080) @@ -34,9 +34,13 @@ /* ENUMERATIONS **************************************************************/ typedef enum _FIRMWARE_ENTRY { - /*FIXME */ - HalFixMe -} FIRMWARE_ENTRY; + HalHaltRoutine, + HalPowerDownRoutine, + HalRestartRoutine, + HalRebootRoutine, + HalInteractiveModeRoutine, + HalMaximumRoutine +} FIRMWARE_REENTRY, *PFIRMWARE_REENTRY; /* TYPES *********************************************************************/ _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-06-19 07:15:07 UTC (rev 16079) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-06-19 07:41:35 UTC (rev 16080) @@ -1396,7 +1396,7 @@ NTSTATUS STDCALL NtOpenSemaphore( - IN HANDLE SemaphoreHandle, + OUT PHANDLE SemaphoreHandle, IN ACCESS_MASK DesiredAcces, IN POBJECT_ATTRIBUTES ObjectAttributes ); @@ -1404,7 +1404,7 @@ NTSTATUS STDCALL ZwOpenSemaphore( - IN HANDLE SemaphoreHandle, + OUT PHANDLE SemaphoreHandle, IN ACCESS_MASK DesiredAcces, IN POBJECT_ATTRIBUTES ObjectAttributes ); @@ -2945,13 +2945,13 @@ NTSTATUS STDCALL NtShutdownSystem( - IN ULONG Action + IN SHUTDOWN_ACTION Action ); NTSTATUS STDCALL ZwShutdownSystem( - IN ULONG Action + IN SHUTDOWN_ACTION Action ); NTSTATUS _____ Modified: trunk/reactos/include/ndk/zwtypes.h --- trunk/reactos/include/ndk/zwtypes.h 2005-06-19 07:15:07 UTC (rev 16079) +++ trunk/reactos/include/ndk/zwtypes.h 2005-06-19 07:41:35 UTC (rev 16080) @@ -21,6 +21,13 @@ /* ENUMERATIONS **************************************************************/ +typedef enum SHUTDOWN_ACTION_TAG +{ + ShutdownNoReboot, + ShutdownReboot, + ShutdownPowerOff +} SHUTDOWN_ACTION; + typedef enum _PLUGPLAY_BUS_CLASS { SystemBus, @@ -198,7 +205,7 @@ typedef struct _MUTANT_BASIC_INFORMATION { LONG CurrentCount; - BOOLEAN OwnedbyCalled; + BOOLEAN OwnedByCaller; BOOLEAN AbandonedState; } MUTANT_BASIC_INFORMATION, *PMUTANT_BASIC_INFORMATION; _____ Modified: trunk/reactos/include/ntos/haltypes.h --- trunk/reactos/include/ntos/haltypes.h 2005-06-19 07:15:07 UTC (rev 16079) +++ trunk/reactos/include/ntos/haltypes.h 2005-06-19 07:41:35 UTC (rev 16080) @@ -24,8 +24,15 @@ /* HalReturnToFirmware */ -#define FIRMWARE_HALT 1 -#define FIRMWARE_REBOOT 3 +typedef enum _FIRMWARE_ENTRY +{ + HalHaltRoutine, + HalPowerDownRoutine, + HalRestartRoutine, + HalRebootRoutine, + HalInteractiveModeRoutine, + HalMaximumRoutine +} FIRMWARE_REENTRY, *PFIRMWARE_REENTRY; #ifndef __USE_W32API _____ Modified: trunk/reactos/ntoskrnl/ex/power.c --- trunk/reactos/ntoskrnl/ex/power.c 2005-06-19 07:15:07 UTC (rev 16079) +++ trunk/reactos/ntoskrnl/ex/power.c 2005-06-19 07:41:35 UTC (rev 16080) @@ -96,11 +96,11 @@ } else if (Action == ShutdownReboot) { - HalReturnToFirmware (FIRMWARE_REBOOT); + HalReturnToFirmware (HalRebootRoutine); } else { - HalReturnToFirmware (FIRMWARE_HALT); + HalReturnToFirmware (HalHaltRoutine); } } _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-19 07:15:07 UTC (rev 16079) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-19 07:41:35 UTC (rev 16080) @@ -323,6 +323,10 @@ #define MM_PHYSICAL_PAGE_MPW_PENDING (0x8) +#define MM_CORE_DUMP_TYPE_NONE (0x0) +#define MM_CORE_DUMP_TYPE_MINIMAL (0x1) +#define MM_CORE_DUMP_TYPE_FULL (0x2) + #define MM_PAGEOP_PAGEIN (1) #define MM_PAGEOP_PAGEOUT (2) #define MM_PAGEOP_PAGESYNCH (3)

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