Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[ion] 16288: Satisfy blight's excessively arrogant attitude and overblown ego

by ion＠svn.reactos.com

Satisfy blight's excessively arrogant attitude and overblown ego Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-06-26 14:52:15 UTC (rev 16287) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-06-26 15:22:44 UTC (rev 16288) @@ -5,6 +5,7 @@ * PURPOSE: Thread Context Switching * * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * Gregor Anich (FPU Code) */ /* INCLUDES ******************************************************************/

19 years, 6 months

[ion] 16287: Add NDK FIXME List.

by ion＠svn.reactos.com

Add NDK FIXME List. Added: trunk/reactos/include/ndk/fixmes.txt _____ Added: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-06-26 14:02:36 UTC (rev 16286) +++ trunk/reactos/include/ndk/fixmes.txt 2005-06-26 14:52:15 UTC (rev 16287) @@ -0,0 +1,39 @@ +NDK FIXMES +----------- + +Order: + * Priority 1 = Easiest to fix. + * Priority 5 = Hardest to fix. + +Format: + <Priority Level> + - FIXME Description (Assigned Fixer) [FIXME location(s)] + +List: + Priority 1: + - LDR_DATA_TABLE_ENTRY has a ROSSYM Hack (GvG) [ldrtypes.h] + - LDR_FLAGS are not correct (Alex) [ldrtypes.h] + - Remove extra Process Info classes from ddk [zwtypes.h] + - PsEstablishWin32Callouts + Parameters don't match NT (Alex) [obtypes.h] + - PROCESS_SET_PORT was removed, ThomasW did a patch about this? (Thomas) [pstypes.h] + - Some files need cleanup (Alex + Eric) [zwfuncs.h, rtlfuncs.h, rtltypes.h] + + Priority 2: + - DEVICE_NODE has 2 fields not part of NT's defintion [iotypes.h] + - Object Callbacks don't match NT's (Alex) [obtypes.h] + - Remove Create Callback Hack (Alex) [obtypes.h] + - Object header doesn't match NT (Alex) [obtypes.h] blocks on -> + - Object Directory + implementation doesn't match NT (Alex) [obtypes.h] + + Priority 3: + - Pushlock support is needed to fix EPROCESS (Alex) [pstypes.h] + - MADDRESS_SPACE must be converted into the NT Type (Alex) [pstypes.h, mmtypes.h] + + Priority 4: + - Kernel and Memory Types are not architecture-specific [ketypes.h, mmtypes.h] + - Win32K Builds with windows.h [extypes.h, ketypes.h] + + Priority 5: + - LPC Types are totally wrong. [lpctypes.h] + - Missing System Info Classes [zwtypes.h] + - Process Priority Classes are messed up [pstypes.h] \ No newline at end of file

19 years, 6 months

[ekohl] 16286: Build lsasrv.dll.

by ekohl＠svn.reactos.com

Build lsasrv.dll. Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/lsasrv/lsasrv.xml _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-06-26 12:51:17 UTC (rev 16285) +++ trunk/reactos/lib/directory.xml 2005-06-26 14:02:36 UTC (rev 16286) @@ -133,6 +133,9 @@ <directory name="libwine"> <xi:include href="libwine/libwine.xml" /> </directory> +<directory name="lsasrv"> + <xi:include href="lsasrv/lsasrv.xml" /> +</directory> <directory name="lzexpand"> <xi:include href="lzexpand/lz32.xml" /> </directory> _____ Added: trunk/reactos/lib/lsasrv/lsasrv.xml --- trunk/reactos/lib/lsasrv/lsasrv.xml 2005-06-26 12:51:17 UTC (rev 16285) +++ trunk/reactos/lib/lsasrv/lsasrv.xml 2005-06-26 14:02:36 UTC (rev 16286) @@ -0,0 +1,14 @@ +<module name="lsasrv" type="win32dll" baseaddress="${BASEADDRESS_LSASRV}" entrypoint="0" installbase="system32" installname="lsasrv.dll"> + <importlibrary definition="lsasrv.def" /> + <include base="lsasrv">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__USE_W32API" /> + <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-nostdlib</linkerflag> + <library>ntdll</library> + <library>kernel32</library> + <file>lsaport.c</file> + <file>lsasrv.c</file> + <file>lsasrv.rc</file> +</module>

19 years, 6 months

[hpoussin] 16285: Move variable declaration at the top of the function

by hpoussin＠svn.reactos.com

Move variable declaration at the top of the function Remove unneeded affectation of hProcessHeap (already initialized in DllMain) Modified: trunk/reactos/lib/kernel32/misc/comm.c _____ Modified: trunk/reactos/lib/kernel32/misc/comm.c --- trunk/reactos/lib/kernel32/misc/comm.c 2005-06-26 12:17:27 UTC (rev 16284) +++ trunk/reactos/lib/kernel32/misc/comm.c 2005-06-26 12:51:17 UTC (rev 16285) @@ -936,14 +936,14 @@ GetCommConfig(HANDLE hCommDev, LPCOMMCONFIG lpCC, LPDWORD lpdwSize) { BOOL ReturnValue = FALSE; + LPCOMMPROP lpComPort; DPRINT("GetCommConfig(%d, %p, %p)\n", hCommDev, lpCC, lpdwSize); - hProcessHeap = GetProcessHeap(); + lpComPort = RtlAllocateHeap( hProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(COMMPROP) + 0x100 ); - LPCOMMPROP lpComPort = RtlAllocateHeap( hProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(COMMPROP) + 0x100 ); if(NULL == lpComPort) { DPRINT("GetCommConfig() - ERROR_NOT_ENOUGH_MEMORY\n"); SetLastError(ERROR_NOT_ENOUGH_MEMORY);

19 years, 6 months

[ekohl] 16284: Add cfgmgr32 dll.

by ekohl＠svn.reactos.com

Add cfgmgr32 dll. This is a forwarder dll that passes all calls to setupapi.dll. Added: trunk/reactos/lib/cfgmgr32/ Added: trunk/reactos/lib/cfgmgr32/cfgmgr32.def Added: trunk/reactos/lib/cfgmgr32/cfgmgr32.rc Added: trunk/reactos/lib/cfgmgr32/cfgmgr32.xml Modified: trunk/reactos/lib/directory.xml _____ Added: trunk/reactos/lib/cfgmgr32/cfgmgr32.def --- trunk/reactos/lib/cfgmgr32/cfgmgr32.def 2005-06-26 11:14:48 UTC (rev 16283) +++ trunk/reactos/lib/cfgmgr32/cfgmgr32.def 2005-06-26 12:17:27 UTC (rev 16284) @@ -0,0 +1,208 @@ +; +; ReactOS cfgmgr32.dll +; +; Copyright (C) 2005 Eric Kohl +; +; This program is free software; you can redistribute it and/or modify +; it under the terms of the GNU General Public License as published by +; the Free Software Foundation; either version 2 of the License, or +; (at your option) any later version. +; +; This program is distributed in the hope that it will be useful, +; but WITHOUT ANY WARRANTY; without even the implied warranty of +; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +; GNU General Public License for more details. +; +; You should have received a copy of the GNU General Public License +; along with this program; if not, write to the Free Software +; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +; +LIBRARY CFGMGR32.DLL +EXPORTS +;CMP_Init_Detection +;CMP_RegisterNotification +;CMP_Report_LogOn +;CMP_UnregisterNotification +;CMP_WaitNoPendingInstallEvents +;CMP_WaitServices +;CM_Add_Empty_Log_Conf +;CM_Add_Empty_Log_Conf_Ex +;CM_Add_IDA +;CM_Add_IDW +;CM_Add_ID_ExA +;CM_Add_ID_ExW +;CM_Add_Range +;CM_Add_Res_Des +;CM_Add_Res_Des_Ex +CM_Connect_MachineA(a)8=SETUPAPI.CM_Connect_MachineA +CM_Connect_MachineW(a)8=SETUPAPI.CM_Connect_MachineW +;CM_Create_DevNodeA +;CM_Create_DevNodeW +;CM_Create_DevNode_ExA +;CM_Create_DevNode_ExW +;CM_Create_Range_List +;CM_Delete_Class_Key +;CM_Delete_Class_Key_Ex +;CM_Delete_DevNode_Key +;CM_Delete_DevNode_Key_Ex +;CM_Delete_Range +;CM_Detect_Resource_Conflict +;CM_Detect_Resource_Conflict_Ex +;CM_Disable_DevNode +;CM_Disable_DevNode_Ex +CM_Disconnect_Machine(a)4=SETUPAPI.CM_Disconnect_Machine +;CM_Dup_Range_List +;CM_Enable_DevNode +;CM_Enable_DevNode_Ex +;CM_Enumerate_Classes +;CM_Enumerate_Classes_Ex +;CM_Enumerate_EnumeratorsA +;CM_Enumerate_EnumeratorsW +;CM_Enumerate_Enumerators_ExA +;CM_Enumerate_Enumerators_ExW +;CM_Find_Range +;CM_First_Range +;CM_Free_Log_Conf +;CM_Free_Log_Conf_Ex +;CM_Free_Log_Conf_Handle +;CM_Free_Range_List +;CM_Free_Res_Des +;CM_Free_Res_Des_Ex +;CM_Free_Res_Des_Handle +CM_Get_Child(a)12=SETUPAPI.CM_Get_Child +CM_Get_Child_Ex(a)16=SETUPAPI.CM_Get_ChildEx +;CM_Get_Class_Key_NameA +;CM_Get_Class_Key_NameW +;CM_Get_Class_Key_Name_ExA +;CM_Get_Class_Key_Name_ExW +;CM_Get_Class_NameA +;CM_Get_Class_NameW +;CM_Get_Class_Name_ExA +;CM_Get_Class_Name_ExW +;CM_Get_Depth +;CM_Get_Depth_Ex +;CM_Get_DevNode_Registry_PropertyA +;CM_Get_DevNode_Registry_PropertyW +;CM_Get_DevNode_Registry_Property_ExA +;CM_Get_DevNode_Registry_Property_ExW +;CM_Get_DevNode_Status +;CM_Get_DevNode_Status_Ex +;CM_Get_Device_IDA +;CM_Get_Device_IDW +;CM_Get_Device_ID_ExA +;CM_Get_Device_ID_ExW +CM_Get_Device_ID_ListA(a)16=SETUPAPI.CM_Get_Device_ID_ListA +CM_Get_Device_ID_ListW(a)16=SETUPAPI.CM_Get_Device_ID_ListW +CM_Get_Device_ID_List_ExA(a)20=SETUPAPI.CM_Get_Device_ID_List_ExA +CM_Get_Device_ID_List_ExW(a)20=SETUPAPI.CM_Get_Device_ID_List_ExW +CM_Get_Device_ID_List_SizeA(a)12=SETUPAPI.CM_Get_Device_ID_List_SizeA +CM_Get_Device_ID_List_SizeW(a)12=SETUPAPI.CM_Get_Device_ID_List_SizeW +CM_Get_Device_ID_List_Size_ExA(a)16=SETUPAPI.CM_Get_Device_ID_List_Size_E xA +CM_Get_Device_ID_List_Size_ExW(a)16=SETUPAPI.CM_Get_Device_ID_List_Size_E xA +;CM_Get_Device_ID_Size +;CM_Get_Device_ID_Size_Ex +;CM_Get_Device_Interface_AliasA +;CM_Get_Device_Interface_AliasW +;CM_Get_Device_Interface_Alias_ExA +;CM_Get_Device_Interface_Alias_ExW +;CM_Get_Device_Interface_ListA +;CM_Get_Device_Interface_ListW +;CM_Get_Device_Interface_List_ExA +;CM_Get_Device_Interface_List_ExW +;CM_Get_Device_Interface_List_SizeA +;CM_Get_Device_Interface_List_SizeW +;CM_Get_Device_Interface_List_Size_ExA +;CM_Get_Device_Interface_List_Size_ExW +;CM_Get_First_Log_Conf +;CM_Get_First_Log_Conf_Ex +;CM_Get_Global_State +;CM_Get_Global_State_Ex +;CM_Get_HW_Prof_FlagsA +;CM_Get_HW_Prof_FlagsW +;CM_Get_HW_Prof_Flags_ExA +;CM_Get_HW_Prof_Flags_ExW +;CM_Get_Hardware_Profile_InfoA +;CM_Get_Hardware_Profile_InfoW +;CM_Get_Hardware_Profile_Info_ExA +;CM_Get_Hardware_Profile_Info_ExW +;CM_Get_Log_Conf_Priority +;CM_Get_Log_Conf_Priority_Ex +;CM_Get_Next_Log_Conf +;CM_Get_Next_Log_Conf_Ex +;CM_Get_Next_Res_Des +;CM_Get_Next_Res_Des_Ex +CM_Get_Parent(a)12=SETUPAPI.CM_Get_Parent +CM_Get_Parent_Ex(a)16=SETUPAPI.CM_Get_Parent_Ex +;CM_Get_Res_Des_Data +;CM_Get_Res_Des_Data_Ex +;CM_Get_Res_Des_Data_Size +;CM_Get_Res_Des_Data_Size_Ex +CM_Get_Sibling(a)12=SETUPAPI.CM_Get_Sibling +CM_Get_Sibling_Ex(a)16=SETUPAPI.CM_Get_Sibling_Ex +CM_Get_Version(a)0=SETUPAPI.CM_Get_Version +CM_Get_Version_Ex(a)4=SETUPAPI.CM_Get_Version_Ex +;CM_Intersect_Range_List +;CM_Invert_Range_List +;CM_Is_Dock_Station_Present +CM_Locate_DevNodeA(a)12=SETUPAPI.CM_Locate_DevNodeA +CM_Locate_DevNodeW(a)12=SETUPAPI.CM_Locate_DevNodeW +CM_Locate_DevNode_ExA(a)16=SETUPAPI.CM_Locate_DevNode_ExA +CM_Locate_DevNode_ExW(a)16=SETUPAPI.CM_Locate_DevNode_ExW +;CM_Merge_Range_List +;CM_Modify_Res_Des +;CM_Modify_Res_Des_Ex +;CM_Move_DevNode +;CM_Move_DevNode_Ex +;CM_Next_Range +CM_Open_Class_KeyA(a)24=SETUPAPI.CM_Open_Class_KeyA +CM_Open_Class_KeyW(a)24=SETUPAPI.CM_Open_Class_KeyW +CM_Open_Class_Key_ExA(a)28=SETUPAPI.CM_Open_Class_Key_ExA +CM_Open_Class_Key_ExW(a)28=SETUPAPI.CM_Open_Class_Key_ExW +;CM_Open_DevNode_Key +;CM_Open_DevNode_Key_Ex +;CM_Query_Arbitrator_Free_Data +;CM_Query_Arbitrator_Free_Data_Ex +;CM_Query_Arbitrator_Free_Size +;CM_Query_Arbitrator_Free_Size_Ex +;CM_Query_Remove_SubTree +;CM_Query_Remove_SubTree_Ex +;CM_Reenumerate_DevNode +;CM_Reenumerate_DevNode_Ex +;CM_Register_Device_Driver +;CM_Register_Device_Driver_Ex +;CM_Register_Device_InterfaceA +;CM_Register_Device_InterfaceW +;CM_Register_Device_Interface_ExA +;CM_Register_Device_Interface_ExW +;CM_Remove_SubTree +;CM_Remove_SubTree_Ex +;CM_Remove_Unmarked_Children +;CM_Remove_Unmarked_Children_Ex +;CM_Request_Device_EjectA +;CM_Request_Device_EjectW +;CM_Request_Eject_PC +;CM_Reset_Children_Marks +;CM_Reset_Children_Marks_Ex +;CM_Run_Detection +;CM_Run_Detection_Ex +;CM_Set_DevNode_Problem +;CM_Set_DevNode_Problem_Ex +;CM_Set_DevNode_Registry_PropertyA +;CM_Set_DevNode_Registry_PropertyW +;CM_Set_DevNode_Registry_Property_ExA +;CM_Set_DevNode_Registry_Property_ExW +;CM_Set_HW_Prof +;CM_Set_HW_Prof_Ex +;CM_Set_HW_Prof_FlagsA +;CM_Set_HW_Prof_FlagsW +;CM_Set_HW_Prof_Flags_ExA +;CM_Set_HW_Prof_Flags_ExW +;CM_Setup_DevNode +;CM_Setup_DevNode_Ex +;CM_Test_Range_Available +;CM_Uninstall_DevNode +;CM_Uninstall_DevNode_Ex +;CM_Unregister_Device_InterfaceA +;CM_Unregister_Device_InterfaceW +;CM_Unregister_Device_Interface_ExA +;CM_Unregister_Device_Interface_ExW _____ Added: trunk/reactos/lib/cfgmgr32/cfgmgr32.rc --- trunk/reactos/lib/cfgmgr32/cfgmgr32.rc 2005-06-26 11:14:48 UTC (rev 16283) +++ trunk/reactos/lib/cfgmgr32/cfgmgr32.rc 2005-06-26 12:17:27 UTC (rev 16284) @@ -0,0 +1,25 @@ +/* + * ReactOS cfgmgr32.dll + * + * Copyright (C) 2005 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Configuration Manager DLL\0" +#define REACTOS_STR_INTERNAL_NAME "cfgmgr32\0" +#define REACTOS_STR_ORIGINAL_FILENAME "cfgmgr32.dll\0" +#include <reactos/version.rc> _____ Added: trunk/reactos/lib/cfgmgr32/cfgmgr32.xml --- trunk/reactos/lib/cfgmgr32/cfgmgr32.xml 2005-06-26 11:14:48 UTC (rev 16283) +++ trunk/reactos/lib/cfgmgr32/cfgmgr32.xml 2005-06-26 12:17:27 UTC (rev 16284) @@ -0,0 +1,7 @@ +<module name="cfgmgr32" type="win32dll" baseaddress="${BASEADDRESS_CFGMGR32}" entrypoint="0" installbase="system32" installname="cfgmgr32.dll"> + <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-nostdlib</linkerflag> + <linkerflag>-lgcc</linkerflag> + <importlibrary definition="cfgmgr32.def" /> + <file>cfgmgr32.rc</file> +</module> _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-06-26 11:14:48 UTC (rev 16283) +++ trunk/reactos/lib/directory.xml 2005-06-26 12:17:27 UTC (rev 16284) @@ -19,6 +19,9 @@ <directory name="cards"> <xi:include href="cards/cards.xml" /> </directory> +<directory name="cfgmgr32"> + <xi:include href="cfgmgr32/cfgmgr32.xml" /> +</directory> <directory name="comctl32"> <xi:include href="comctl32/comctl32.xml" /> </directory>

19 years, 6 months

[ekohl] 16283: Don't redefine ANSI_STRING, UNICODE_STRING and OBJECT_ATTRIBUTES if the NDK already defines them.

by ekohl＠svn.reactos.com

Don't redefine ANSI_STRING, UNICODE_STRING and OBJECT_ATTRIBUTES if the NDK already defines them. Modified: trunk/reactos/w32api/include/ntsecapi.h _____ Modified: trunk/reactos/w32api/include/ntsecapi.h --- trunk/reactos/w32api/include/ntsecapi.h 2005-06-26 11:07:15 UTC (rev 16282) +++ trunk/reactos/w32api/include/ntsecapi.h 2005-06-26 11:14:48 UTC (rev 16283) @@ -122,7 +122,7 @@ #define TRUST_TYPE_UPLEVEL 2 #define TRUST_TYPE_MIT 3 #define TRUST_TYPE_DCE 4 -#if !defined(_NTDEF_H) && !defined(_SUBAUTH_H) +#if !defined(_NTDEF_H) && !defined(_SUBAUTH_H) && !defined(_NTNDK_) typedef LONG NTSTATUS, *PNTSTATUS; typedef struct _UNICODE_STRING { USHORT Length; @@ -293,7 +293,7 @@ PSID Sid; } LSA_ENUMERATION_INFORMATION, *PLSA_ENUMERATION_INFORMATION; typedef ULONG LSA_OPERATIONAL_MODE, *PLSA_OPERATIONAL_MODE; -#if !defined(_NTDEF_H) +#if !defined(_NTDEF_H) && !defined(_NTNDK_) typedef struct _LSA_OBJECT_ATTRIBUTES { ULONG Length; HANDLE RootDirectory;

19 years, 6 months

[ekohl] 16282: Add missing resource function prototypes.

by ekohl＠svn.reactos.com

Add missing resource function prototypes. Modified: trunk/reactos/include/ndk/rtlfuncs.h _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-06-26 06:27:34 UTC (rev 16281) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-06-26 11:07:15 UTC (rev 16282) @@ -1161,6 +1161,57 @@ PRTL_CRITICAL_SECTION CriticalSection ); +BOOLEAN +STDCALL +RtlAcquireResourceExclusive( + IN PRTL_RESOURCE Resource, + IN BOOLEAN Wait +); + +BOOLEAN +STDCALL +RtlAcquireResourceShared( + IN PRTL_RESOURCE Resource, + IN BOOLEAN Wait +); + +VOID +STDCALL +RtlConvertExclusiveToShared( + IN PRTL_RESOURCE Resource +); + +VOID +STDCALL +RtlConvertSharedToExclusive( + IN PRTL_RESOURCE Resource +); + +VOID +STDCALL +RtlDeleteResource( + IN PRTL_RESOURCE Resource +); + +VOID +STDCALL +RtlDumpResource( + IN PRTL_RESOURCE Resource +); + +VOID +STDCALL +RtlInitializeResource( + IN PRTL_RESOURCE Resource +); + +VOID +STDCALL +RtlReleaseResource( + IN PRTL_RESOURCE Resource +); + + /* * Compression Functions */ @@ -1248,17 +1299,17 @@ ULONG STDCALL RtlFindClearBits( - PRTL_BITMAP BitMapHeader, - ULONG NumberToFind, - ULONG HintIndex + IN PRTL_BITMAP BitMapHeader, + IN ULONG NumberToFind, + IN ULONG HintIndex ); ULONG STDCALL RtlFindClearBitsAndSet( - PRTL_BITMAP BitMapHeader, - ULONG NumberToFind, - ULONG HintIndex + IN PRTL_BITMAP BitMapHeader, + IN ULONG NumberToFind, + IN ULONG HintIndex ); VOID @@ -1272,9 +1323,9 @@ VOID STDCALL RtlSetBits ( - PRTL_BITMAP BitMapHeader, - ULONG StartingIndex, - ULONG NumberToSet + IN PRTL_BITMAP BitMapHeader, + IN ULONG StartingIndex, + IN ULONG NumberToSet ); /*

19 years, 6 months

[ion] 16281: Hasta la vista ntdll/napi headers

by ion＠svn.reactos.com

Hasta la vista ntdll/napi headers Modified: trunk/reactos/drivers/fs/np/fsctrl.c Deleted: trunk/reactos/include/napi/ Deleted: trunk/reactos/include/ntdll/ Added: trunk/reactos/include/win32k/win32.h Modified: trunk/reactos/ntoskrnl/include/internal/asm.h Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/process.c Modified: trunk/reactos/subsys/win32k/w32k.h Modified: trunk/reactos/tools/nci/nci.mak Modified: trunk/reactos/tools/nci/ncitool.c _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2005-06-26 06:06:51 UTC (rev 16280) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2005-06-26 06:27:34 UTC (rev 16281) @@ -11,7 +11,6 @@ /* INCLUDES ******************************************************************/ #include <ntifs.h> -#include <napi/npipe.h> #include "npfs.h" #define NDEBUG _____ Copied: trunk/reactos/include/win32k/win32.h (from rev 16273, trunk/reactos/include/napi/win32.h) _____ Modified: trunk/reactos/ntoskrnl/include/internal/asm.h --- trunk/reactos/ntoskrnl/include/internal/asm.h 2005-06-26 06:06:51 UTC (rev 16280) +++ trunk/reactos/ntoskrnl/include/internal/asm.h 2005-06-26 06:27:34 UTC (rev 16281) @@ -116,3 +116,7 @@ #define KTRAP_FRAME_V86_GS (0x88) #define KTRAP_FRAME_RESERVED9 (0x8A) #define KTRAP_FRAME_SIZE (0x8C) + +/* User Shared Data */ +#define KUSER_SHARED_SYSCALL 0x7FFE0300 +#define KUSER_SHARED_SYSCALL_RET 0x7FFE0304 _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-06-26 06:06:51 UTC (rev 16280) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-06-26 06:27:34 UTC (rev 16281) @@ -14,7 +14,6 @@ #include <internal/i386/ke.h> #include <internal/asm.h> #include <ndk/i386/segment.h> -#include <napi/shared_data.h> #define UserMode (1) _____ Modified: trunk/reactos/ntoskrnl/ke/process.c --- trunk/reactos/ntoskrnl/ke/process.c 2005-06-26 06:06:51 UTC (rev 16280) +++ trunk/reactos/ntoskrnl/ke/process.c 2005-06-26 06:27:34 UTC (rev 16281) @@ -11,7 +11,7 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> -#include <ntdll/napi.h> +#include <internal/napi.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-06-26 06:06:51 UTC (rev 16280) +++ trunk/reactos/subsys/win32k/w32k.h 2005-06-26 06:27:34 UTC (rev 16281) @@ -22,7 +22,6 @@ #include <windows.h> /* FIXME ? */ #include <windowsx.h> /* FIXME ? */ #include <ndk/ntndk.h> -#include <napi/win32.h> /* FIXME */ /* FIXME: ReactOS will be R-Rated if I really write what I'm about to */ NTSTATUS @@ -46,6 +45,7 @@ /* External Win32K Header */ #include <win32k/win32k.h> +#include <win32k/win32.h> /* Internal Win32K Header */ #include "include/win32k.h" _____ Modified: trunk/reactos/tools/nci/nci.mak --- trunk/reactos/tools/nci/nci.mak 2005-06-26 06:06:51 UTC (rev 16280) +++ trunk/reactos/tools/nci/nci.mak 2005-06-26 06:27:34 UTC (rev 16281) @@ -49,7 +49,7 @@ # NTOSKRNL.EXE KERNEL_SVC_DB = $(NCI_BASE_)sysfuncs.lst -KERNEL_SERVICE_TABLE = include$(SEP)ntdll$(SEP)napi.h +KERNEL_SERVICE_TABLE = ntoskrnl$(SEP)include$(SEP)internal$(SEP)napi.h NTDLL_STUBS = lib$(SEP)ntdll$(SEP)napi.S KERNEL_STUBS = ntoskrnl$(SEP)ex$(SEP)zw.S _____ Modified: trunk/reactos/tools/nci/ncitool.c --- trunk/reactos/tools/nci/ncitool.c 2005-06-26 06:06:51 UTC (rev 16280) +++ trunk/reactos/tools/nci/ncitool.c 2005-06-26 06:27:34 UTC (rev 16281) @@ -130,7 +130,7 @@ " * PROGRAMMER: Computer Generated File. See tools/nci/ncitool.c\n" " * REMARK: DO NOT EDIT OR COMMIT MODIFICATIONS TO THIS FILE\n" " */\n\n\n" - "#include <napi/shared_data.h>\n\n", + "#define KUSER_SHARED_SYSCALL 0x7FFE0300\n\n", FileDescription, FileLocation); }

19 years, 6 months

[ion] 16280: fix diskdump build

by ion＠svn.reactos.com

fix diskdump build Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c Modified: trunk/reactos/include/ddk/core.h _____ Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c --- trunk/reactos/drivers/storage/diskdump/diskdump.c 2005-06-26 05:52:40 UTC (rev 16279) +++ trunk/reactos/drivers/storage/diskdump/diskdump.c 2005-06-26 06:06:51 UTC (rev 16280) @@ -32,9 +32,10 @@ #include <ddk/ntdddisk.h> #include <ddk/ntddscsi.h> #include <ddk/class2.h> +#include <ddk/core.h> -#include <ndk/ntndk.h> -#include <napi/core.h> +#include <ndk/extypes.h> +#include <ndk/rtlfuncs.h> #include "../scsiport/scsiport_int.h" #define NDEBUG _____ Modified: trunk/reactos/include/ddk/core.h --- trunk/reactos/include/ddk/core.h 2005-06-26 05:52:40 UTC (rev 16279) +++ trunk/reactos/include/ddk/core.h 2005-06-26 06:06:51 UTC (rev 16280) @@ -5,6 +5,7 @@ #define MM_CORE_DUMP_HEADER_VERSION (0x1) #include <ddk/ntddscsi.h> +#include <ndk/ketypes.h> typedef struct _MM_CORE_DUMP_HEADER { ULONG Magic;

19 years, 6 months

[ion] 16279: Kill NTOS headers. So long, and thanks for all the fish

by ion＠svn.reactos.com

Kill NTOS headers. So long, and thanks for all the fish Modified: trunk/reactos/apps/utils/ps/ps.c Modified: trunk/reactos/drivers/dd/blue/blue.c Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c Modified: trunk/reactos/drivers/fs/cdfs/rw.c Modified: trunk/reactos/drivers/fs/ms/create.c Modified: trunk/reactos/drivers/fs/np/create.c Modified: trunk/reactos/drivers/fs/ntfs/mft.c Modified: trunk/reactos/drivers/fs/ntfs/rw.c Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c Modified: trunk/reactos/include/csrss/csrss.h Added: trunk/reactos/include/ddk/core.h Modified: trunk/reactos/include/ddk/ntddblue.h Added: trunk/reactos/include/ddk/ntpnp.h Deleted: trunk/reactos/include/napi/core.h Modified: trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/include/ndk/inbvfuncs.h Deleted: trunk/reactos/include/ntos/ Deleted: trunk/reactos/include/ntos.h Modified: trunk/reactos/include/win32k/ntuser.h Modified: trunk/reactos/lib/crt/except/matherr.c Modified: trunk/reactos/lib/wdmguid/wdmguid.c Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/w32api/include/wincon.h _____ Modified: trunk/reactos/apps/utils/ps/ps.c --- trunk/reactos/apps/utils/ps/ps.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/apps/utils/ps/ps.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -23,8 +23,8 @@ */ #include <windows.h> -/* NOTE: W32API ddk/ntapi.h header has wrong definition of SYSTEM_PROCESSES. */ -#include <ntos/types.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> typedef struct _SYSTEM_THREADS { _____ Modified: trunk/reactos/drivers/dd/blue/blue.c --- trunk/reactos/drivers/dd/blue/blue.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/drivers/dd/blue/blue.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -12,9 +12,9 @@ /* INCLUDES ******************************************************************/ #include <ddk/ntddk.h> -#include <ntos/halfuncs.h> +#include <wincon.h> #include <ddk/ntddblue.h> -#include <string.h> +#include <ndk/halfuncs.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c --- trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -25,8 +25,7 @@ #include <ddk/ntddk.h> #include <ddk/ntbootvid.h> -#include <ntos/ldrtypes.h> -#include <ddk/ldrfuncs.h> +#include <ndk/ldrfuncs.h> #include "bootvid.h" #include "resource.h" _____ Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c --- trunk/reactos/drivers/fs/cdfs/fsctl.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/drivers/fs/cdfs/fsctl.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -30,7 +30,6 @@ #include <ddk/ntddk.h> #include <ntddcdrm.h> -#include <ntos/minmax.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/fs/cdfs/rw.c --- trunk/reactos/drivers/fs/cdfs/rw.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/drivers/fs/cdfs/rw.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -29,7 +29,6 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> -#include <ntos/minmax.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/fs/ms/create.c --- trunk/reactos/drivers/fs/ms/create.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/drivers/fs/ms/create.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -10,9 +10,7 @@ /* INCLUDES ******************************************************************/ #include <ntifs.h> -#include <ntos/fstypes.h> /* FIXME: NDK */ -/* FIXME: The headers are broken! */ -#undef CreateMailslot +#include <ndk/iotypes.h> #include "msfs.h" #define NDEBUG _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/drivers/fs/np/create.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -10,7 +10,7 @@ /* INCLUDES ******************************************************************/ #include <ntifs.h> -#include <ntos/fstypes.h> /* FIXME: NDK */ +#include <ndk/iotypes.h> #include "npfs.h" #define NDEBUG _____ Modified: trunk/reactos/drivers/fs/ntfs/mft.c --- trunk/reactos/drivers/fs/ntfs/mft.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/drivers/fs/ntfs/mft.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -29,7 +29,6 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> -#include <ntos/minmax.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/fs/ntfs/rw.c --- trunk/reactos/drivers/fs/ntfs/rw.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/drivers/fs/ntfs/rw.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -29,7 +29,6 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> -#include <ntos/minmax.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c --- trunk/reactos/drivers/storage/cdrom/cdrom.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/drivers/storage/cdrom/cdrom.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -39,7 +39,6 @@ #include <ddk/ntdddisk.h> #include <ddk/ntddcdrm.h> #include <ddk/class2.h> -#include <ntos/minmax.h> #include <stdio.h> #define NDEBUG _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c --- trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -32,7 +32,6 @@ #include <ddk/srb.h> #include <ddk/scsi.h> #include <ddk/ntddscsi.h> -#include <ntos/minmax.h> #include <stdio.h> #define NDEBUG _____ Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c --- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -1,7 +1,6 @@ #include <ddk/ntddk.h> #include <ddk/ntddvdeo.h> #include <ddk/winddi.h> -#include <ntos/minmax.h> #include <stdlib.h> #include "vgavideo.h" _____ Modified: trunk/reactos/include/csrss/csrss.h --- trunk/reactos/include/csrss/csrss.h 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/include/csrss/csrss.h 2005-06-26 05:52:40 UTC (rev 16279) @@ -3,9 +3,6 @@ #include <windows.h> #include <ddk/ntddblue.h> -#ifndef _NTNDK_ -#include <ntos.h> -#endif #define CSR_NATIVE 0x0000 #define CSR_CONSOLE 0x0001 _____ Copied: trunk/reactos/include/ddk/core.h (from rev 16273, trunk/reactos/include/napi/core.h) _____ Modified: trunk/reactos/include/ddk/ntddblue.h --- trunk/reactos/include/ddk/ntddblue.h 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/include/ddk/ntddblue.h 2005-06-26 05:52:40 UTC (rev 16279) @@ -1,8 +1,6 @@ #ifndef _NTDDBLUE_H_INCLUDED_ #define _NTDDBLUE_H_INCLUDED_ -#include <ntos/console.h> - #define IOCTL_CONSOLE_GET_SCREEN_BUFFER_INFO CTL_CODE(FILE_DEVICE_SCREEN, 0x801, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONSOLE_SET_SCREEN_BUFFER_INFO CTL_CODE(FILE_DEVICE_SCREEN, 0x802, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_CONSOLE_GET_CURSOR_INFO CTL_CODE(FILE_DEVICE_SCREEN, 0x803, METHOD_BUFFERED, FILE_READ_ACCESS) _____ Copied: trunk/reactos/include/ddk/ntpnp.h (from rev 16273, trunk/reactos/include/ntos/ntpnp.h) --- trunk/reactos/include/ntos/ntpnp.h 2005-06-26 01:12:21 UTC (rev 16273) +++ trunk/reactos/include/ddk/ntpnp.h 2005-06-26 05:52:40 UTC (rev 16279) @@ -0,0 +1,282 @@ +/* + * ntpnp.h + * + * Plug-and-play interface routines + * + * Contributors: + * Created by Filip Navara <xnavara(a)volny.cz> + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +#ifndef __NTPNP_H +#define __NTPNP_H + +#include <ddk/cfg.h> + +/* + * TODO: + * - Describe the undocumented GUIDs. + * - Finish the description of NtPlugPlayControl. + */ + +/* + * Undocumented GUIDs used by NtGetPlugPlayEvent. + */ + +DEFINE_GUID(GUID_DEVICE_STANDBY_VETOED, 0x03B21C13, 0x18D6, 0x11D3, 0x97, 0xDB, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_KERNEL_INITIATED_EJECT, 0x14689B54, 0x0703, 0x11D3, 0x97, 0xD2, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_THERMAL_ZONE, 0x4AFA3D51, 0x74A7, 0x11D0, 0xBE, 0x5E, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57); +DEFINE_GUID(GUID_DEVICE_SYS_BUTTON, 0x4AFA3D53, 0x74A7, 0x11D0, 0xBE, 0x5E, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57); +DEFINE_GUID(GUID_DEVICE_REMOVAL_VETOED, 0x60DBD5FA, 0xDDD2, 0x11D2, 0x97, 0xB8, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_HIBERNATE_VETOED, 0x61173AD9, 0x194F, 0x11D3, 0x97, 0xDC, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_BATTERY, 0x72631E54, 0x78A4, 0x11D0, 0xBC, 0xF7, 0x00, 0xAA, 0x00, 0xB7, 0xB3, 0x2A); +DEFINE_GUID(GUID_DEVICE_SAFE_REMOVAL, 0x8FBEF967, 0xD6C5, 0x11D2, 0x97, 0xB5, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +#ifndef __USE_W32API +DEFINE_GUID(GUID_DEVICE_INTERFACE_ARRIVAL, 0xCB3A4004, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_INTERFACE_REMOVAL, 0xCB3A4005, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +#endif +DEFINE_GUID(GUID_DEVICE_ARRIVAL, 0xCB3A4009, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_ENUMERATED, 0xCB3A400A, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_ENUMERATE_REQUEST, 0xCB3A400B, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_START_REQUEST, 0xCB3A400C, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_REMOVE_PENDING, 0xCB3A400D, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_QUERY_AND_REMOVE, 0xCB3A400E, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_EJECT, 0xCB3A400F, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_NOOP, 0xCB3A4010, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_WARM_EJECT_VETOED, 0xCBF4C1F9, 0x18D5, 0x11D3, 0x97, 0xDB, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_SURPRISE_REMOVAL, 0xCE5AF000, 0x80DD, 0x11D2, 0xA8, 0x8D, 0x00, 0xA0, 0xC9, 0x69, 0x6B, 0x4B); +DEFINE_GUID(GUID_DEVICE_EJECT_VETOED, 0xCF7B71E8, 0xD8FD, 0x11D2, 0x97, 0xB5, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); +DEFINE_GUID(GUID_DEVICE_EVENT_RBC, 0xD0744792, 0xA98E, 0x11D2, 0x91, 0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3); + + +#ifndef __GUIDS_ONLY__ /* This is defined to build libwdmguid.a */ + +typedef enum _PLUGPLAY_EVENT_CATEGORY { + HardwareProfileChangeEvent, + TargetDeviceChangeEvent, + DeviceClassChangeEvent, + CustomDeviceEvent, + DeviceInstallEvent, + DeviceArrivalEvent, + PowerEvent, + VetoEvent, + BlockedDriverEvent, + MaxPlugEventCategory +} PLUGPLAY_EVENT_CATEGORY; + +/* + * Plug and Play event structure used by NtGetPlugPlayEvent. + * + * EventGuid + * Can be one of the following values: + * GUID_HWPROFILE_QUERY_CHANGE + * GUID_HWPROFILE_CHANGE_CANCELLED + * GUID_HWPROFILE_CHANGE_COMPLETE + * GUID_TARGET_DEVICE_QUERY_REMOVE + * GUID_TARGET_DEVICE_REMOVE_CANCELLED + * GUID_TARGET_DEVICE_REMOVE_COMPLETE + * GUID_PNP_CUSTOM_NOTIFICATION + * GUID_PNP_POWER_NOTIFICATION + * GUID_DEVICE_* (see above) + * + * EventCategory + * Type of the event that happened. + * + * Result + * ? + * + * Flags + * ? + * + * TotalSize + * Size of the event block including the device IDs and other + * per category specific fields. + */ + +typedef struct _PLUGPLAY_EVENT_BLOCK { + GUID EventGuid; + PLUGPLAY_EVENT_CATEGORY EventCategory; + PULONG Result; + ULONG Flags; + ULONG TotalSize; + PVOID DeviceObject; + union { + struct { + GUID ClassGuid; + WCHAR SymbolicLinkName[ANYSIZE_ARRAY]; + } DeviceClass; + struct { + WCHAR DeviceIds[ANYSIZE_ARRAY]; + } TargetDevice; + struct { + WCHAR DeviceId[ANYSIZE_ARRAY]; + } InstallDevice; + struct { + PVOID NotificationStructure; + WCHAR DeviceIds[ANYSIZE_ARRAY]; + } CustomNotification; + struct { + PVOID Notification; + } ProfileNotification; + struct { + ULONG NotificationCode; + ULONG NotificationData; + } PowerNotification; + struct { + PNP_VETO_TYPE VetoType; + WCHAR DeviceIdVetoNameBuffer[ANYSIZE_ARRAY]; + } VetoNotification; + struct { + GUID BlockedDriverGuid; + } BlockedDriverNotification; + }; +} PLUGPLAY_EVENT_BLOCK, *PPLUGPLAY_EVENT_BLOCK; + +/* + * NtGetPlugPlayEvent + * + * Returns one Plug & Play event from a global queue. + * + * Parameters + * Reserved1 + * Reserved2 + * Always set to zero. + * + * Buffer + * The buffer that will be filled with the event information on + * successful return from the function. + * + * BufferSize + * Size of the buffer pointed by the Buffer parameter. If the + * buffer size is not large enough to hold the whole event + * information, error STATUS_BUFFER_TOO_SMALL is returned and + * the buffer remains untouched. + * + * Return Values + * STATUS_PRIVILEGE_NOT_HELD + * STATUS_BUFFER_TOO_SMALL + * STATUS_SUCCESS + * + * Remarks + * This function isn't multi-thread safe! +NTSTATUS STDCALL +NtGetPlugPlayEvent( + ULONG Reserved1, + ULONG Reserved2, + PPLUGPLAY_EVENT_BLOCK Buffer, + ULONG BufferSize); + */ + +/* + * NtPlugPlayControl + * + * A function for doing various Plug & Play operations from user mode. + * + * Parameters + * ControlCode + * 0x00 Reenumerate device tree + * + * Buffer points to UNICODE_STRING decribing the instance + * path (like "HTREE\ROOT\0" or "Root\ACPI_HAL\0000"). For + * more information about instance paths see !devnode command + * in kernel debugger or look at "Inside Windows 2000" book, + * chapter "Driver Loading, Initialization, and Installation". + * + * 0x01 Register new device + * 0x02 Deregister device + * 0x03 Initialize device + * 0x04 Start device + * 0x06 Query and remove device + * 0x07 User response + * + * Called after processing the message from NtGetPlugPlayEvent. + * + * 0x08 Generate legacy device + * 0x09 Get interface device list + * 0x0A Get property data + * 0x0B Device class association (Registration) + * 0x0C Get related device + * 0x0D Get device interface alias + * 0x0E Get/set/clear device status + * 0x0F Get device depth + * 0x10 Query device relations + * 0x11 Query target device relation + * 0x12 Query conflict list + * 0x13 Retrieve dock data + * 0x14 Reset device + * 0x15 Halt device + * 0x16 Get blocked driver data + * + * Buffer + * The buffer contains information that is specific to each control + * code. The buffer is read-only. + * + * BufferSize + * Size of the buffer pointed by the Buffer parameter. If the + * buffer size specifies incorrect value for specified control + * code, error ??? is returned. + * + * Return Values + * STATUS_PRIVILEGE_NOT_HELD + * STATUS_SUCCESS + * ... + */ + +#define PLUGPLAY_USER_RESPONSE 0x07 +#define PLUGPLAY_GET_PROPERTY 0x0A +#define PLUGPLAY_GET_RELATED_DEVICE 0x0C +#define PLUGPLAY_DEVICE_STATUS 0x0E + + +typedef struct _PLUGPLAY_PROPERTY_DATA +{ + UNICODE_STRING DeviceInstance; + ULONG Property; + PVOID Buffer; + ULONG BufferSize; +} PLUGPLAY_PROPERTY_DATA, *PPLUGPLAY_PROPERTY_DATA; + + +/* PLUGPLAY_GET_RELATED_DEVICE (Code 0x0C) */ + +/* Relation values */ +#define PNP_GET_PARENT_DEVICE 1 +#define PNP_GET_CHILD_DEVICE 2 +#define PNP_GET_SIBLING_DEVICE 3 + +typedef struct _PLUGPLAY_RELATED_DEVICE_DATA +{ + UNICODE_STRING DeviceInstance; + UNICODE_STRING RelatedDeviceInstance; + ULONG Relation; /* 1: Parent 2: Child 3: Sibling */ +} PLUGPLAY_RELATED_DEVICE_DATA, *PPLUGPLAY_RELATED_DEVICE_DATA; + + +/* PLUGPLAY_DEVICE_STATUS (Code 0x0E) */ + +/* Action values */ +#define PNP_GET_DEVICE_STATUS 0 +#define PNP_SET_DEVICE_STATUS 1 +#define PNP_CLEAR_DEVICE_STATUS 2 + + +typedef struct _PLUGPLAY_DEVICE_STATUS_DATA +{ + UNICODE_STRING DeviceInstance; + ULONG Action; /* 0: Get 1: Set 2: Clear */ + ULONG Problem; /* CM_PROB_ see cfg.h */ + ULONG Flags; /* DN_ see cfg.h */ +} PLUGPLAY_DEVICE_STATUS_DATA, *PPLUGPLAY_DEVICE_STATUS_DATA; + +#endif /* __GUIDS_ONLY__ */ + +#endif /* __NTPNP_H */ _____ Deleted: trunk/reactos/include/napi/core.h --- trunk/reactos/include/napi/core.h 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/include/napi/core.h 2005-06-26 05:52:40 UTC (rev 16279) @@ -1,29 +0,0 @@ -#ifndef __INCLUDE_NAPI_CORE_H -#define __INCLUDE_NAPI_CORE_H - -#define MM_CORE_DUMP_HEADER_MAGIC (0xdeafbead) -#define MM_CORE_DUMP_HEADER_VERSION (0x1) - -#include <ddk/ntddscsi.h> -typedef struct _MM_CORE_DUMP_HEADER -{ - ULONG Magic; - ULONG Version; - ULONG Type; - KTRAP_FRAME TrapFrame; - ULONG BugCheckCode; - ULONG BugCheckParameters[4]; - PVOID FaultingStackBase; - ULONG FaultingStackSize; - ULONG PhysicalMemorySize; -} MM_CORE_DUMP_HEADER, *PMM_CORE_DUMP_HEADER; - -typedef struct MM_CORE_DUMP_FUNCTIONS -{ - NTSTATUS (STDCALL *DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers); - NTSTATUS (STDCALL *DumpInit)(VOID); - NTSTATUS (STDCALL *DumpWrite)(LARGE_INTEGER Address, PMDL Mdl); - NTSTATUS (STDCALL *DumpFinish)(VOID); -} MM_CORE_DUMP_FUNCTIONS, *PMM_CORE_DUMP_FUNCTIONS; - -#endif /* __INCLUDE_NAPI_CORE_H */ _____ Modified: trunk/reactos/include/ndk/halfuncs.h --- trunk/reactos/include/ndk/halfuncs.h 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/include/ndk/halfuncs.h 2005-06-26 05:52:40 UTC (rev 16279) @@ -24,6 +24,10 @@ BOOLEAN STDCALL +HalQueryDisplayOwnership(VOID); + +BOOLEAN +STDCALL HalAllProcessorsStarted(VOID); NTSTATUS _____ Modified: trunk/reactos/include/ndk/inbvfuncs.h --- trunk/reactos/include/ndk/inbvfuncs.h 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/include/ndk/inbvfuncs.h 2005-06-26 05:52:40 UTC (rev 16279) @@ -90,12 +90,8 @@ STDCALL VidCleanUp(VOID); -BOOLEAN +BOOL STDCALL -VidInitialize(VOID); - -BOOLEAN -STDCALL VidResetDisplay(VOID); BOOLEAN _____ Deleted: trunk/reactos/include/ntos.h --- trunk/reactos/include/ntos.h 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/include/ntos.h 2005-06-26 05:52:40 UTC (rev 16279) @@ -1,104 +0,0 @@ -#ifndef _NTOS_H -#define _NTOS_H -/* $Id$ */ - -#if defined(NTOS_MODE_USER) -/* - * Include windows.h before ntddk.h to get user mode prototype - * for InterlockedXxx functions. - */ -#include <windows.h> -#include <ddk/ntddk.h> -#include <ddk/ntifs.h> -#include <ddk/ntnls.h> -#include <ddk/cfg.h> -#include <evntrace.h> -#include "ntos/types.h" -#include "ntos/cdrom.h" -#include "ntos/console.h" -#include "ntos/disk.h" -#include "ntos/tape.h" -#include "ntos/except.h" -#include "ntos/file.h" -#include "ntos/gditypes.h" -#include "ntos/fstypes.h" /* AG */ -#include "ntos/heap.h" -#include "ntos/keyboard.h" -#include "ntos/minmax.h" -#include "ntos/mm.h" -#include "ntos/ntdef.h" -#include "ntos/port.h" -#include "ntos/ps.h" -#include "ntos/registry.h" -#include "ntos/security.h" -#include "ntos/synch.h" -#include "ntos/time.h" -#include "napi/i386/segment.h" -#include "napi/types.h" -#include "napi/dbg.h" -#include "napi/npipe.h" -#include "napi/shared_data.h" -#include "napi/win32.h" -#include "ntos/rtltypes.h" -#include "ntos/rtl.h" -#include "ntos/zwtypes.h" -#include "ntos/zw.h" -#include "ntos/dbgfuncs.h" -#include "ntos/service.h" -//#include "ntdll/csr.h" -#include "ntdll/dbg.h" -#include "ntdll/ldr.h" -#include "ntdll/rtl.h" -#include "ntdll/trace.h" -#include "rosrtl/thread.h" -#else /* Assume kernel mode */ -#include <ddk/ntddk.h> -#include <ddk/ntifs.h> -#include <ddk/ntnls.h> -#include <ddk/cfg.h> -#include <evntrace.h> -#include "ntos/types.h" -#include "ntos/cdrom.h" -#include "ntos/console.h" -#include "ntos/disk.h" -#include "ntos/tape.h" -#include "ntos/except.h" -#include "ntos/file.h" -#include "ntos/gditypes.h" -#include "ntos/heap.h" -#include "ntos/keyboard.h" -#include "ntos/minmax.h" -#include "ntos/mm.h" -#include "ntos/ntdef.h" -#include "ntos/port.h" -#include "ntos/ps.h" -#include "ntos/registry.h" -#include "ntos/security.h" -#include "ntos/synch.h" -#include "ntos/time.h" -#include "napi/i386/segment.h" -#include "napi/types.h" -#include "napi/dbg.h" -#include "napi/npipe.h" -#include "napi/shared_data.h" -#include "napi/win32.h" -#include "ntos/rtltypes.h" -#include "ntos/rtl.h" -#include "ntos/zwtypes.h" -#include "ntos/zw.h" -#include "ntos/dbgfuncs.h" -#include "ntos/service.h" -#include "ntos/haltypes.h" -#include "ntos/halfuncs.h" -#include "ntos/kdfuncs.h" -#include "ntos/kefuncs.h" /* AG */ -#include "ntos/fstypes.h" /* AG */ -#include "ntos/obtypes.h" -#include "ntos/setypes.h" -#include "ntos/sefuncs.h" -#include "ntos/krnltypes.h" -#include "ntos/tss.h" -#include "rosrtl/thread.h" -#endif - -#endif /* ndef _NTOS_H */ _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/include/win32k/ntuser.h 2005-06-26 05:52:40 UTC (rev 16279) @@ -1,10 +1,6 @@ #ifndef __WIN32K_NTUSER_H #define __WIN32K_NTUSER_H -#ifndef _NTNDK_ -#include <ddk/ntapi.h> -#endif - #define WM_SYSTIMER 280 ULONG STDCALL _____ Modified: trunk/reactos/lib/crt/except/matherr.c --- trunk/reactos/lib/crt/except/matherr.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/lib/crt/except/matherr.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -1,6 +1,5 @@ #include "precomp.h" #include <math.h> -#include <ntos/except.h> int _matherr(struct _exception* e) _____ Modified: trunk/reactos/lib/wdmguid/wdmguid.c --- trunk/reactos/lib/wdmguid/wdmguid.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/lib/wdmguid/wdmguid.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -6,6 +6,6 @@ #include <ddk/wdmguid.h> #define __GUIDS_ONLY__ -#include <ntos/ntpnp.h> +#include <ddk/ntpnp.h> /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -10,7 +10,6 @@ */ #include <ntoskrnl.h> -#include <ntos/bootvid.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/ntoskrnl/inbv/inbv.c --- trunk/reactos/ntoskrnl/inbv/inbv.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/ntoskrnl/inbv/inbv.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -11,7 +11,6 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#include <ntos/bootvid.h> #include <ddk/ntbootvid.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-26 05:52:40 UTC (rev 16279) @@ -19,13 +19,10 @@ #include <ddk/ntddk.h> #include <ddk/ntifs.h> #include <ddk/wdmguid.h> +#include <ddk/ntpnp.h> #include <ndk/ntndk.h> #undef IO_TYPE_FILE #define IO_TYPE_FILE 0x0F5L /* Temp Hack */ - -/* FIXME: Add to ndk, or at least move somewhere else */ -#include <ntos/ntpnp.h> -#include <napi/core.h> /* ReactOS Headers */ #include <reactos/version.h> _____ Modified: trunk/reactos/ntoskrnl/mm/pagefile.c --- trunk/reactos/ntoskrnl/mm/pagefile.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/ntoskrnl/mm/pagefile.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -29,6 +29,7 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> +#include <ddk/core.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-06-26 05:52:40 UTC (rev 16279) @@ -31,10 +31,10 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> #include <ddk/wdmguid.h> +#include <ddk/ntpnp.h> #include <rpc.h> #include <rpcdce.h> -#include <ntos/ntpnp.h> #include "pnp_c.h" _____ Modified: trunk/reactos/w32api/include/wincon.h --- trunk/reactos/w32api/include/wincon.h 2005-06-26 05:06:38 UTC (rev 16278) +++ trunk/reactos/w32api/include/wincon.h 2005-06-26 05:52:40 UTC (rev 16279) @@ -28,6 +28,8 @@ #define ENABLE_MOUSE_INPUT 16 #define ENABLE_PROCESSED_OUTPUT 1 #define ENABLE_WRAP_AT_EOL_OUTPUT 2 +#define CONSOLE_INPUT_MODE_VALID (0x0f) +#define CONSOLE_OUTPUT_MODE_VALID (0x03) #define KEY_EVENT 1 #define MOUSE_EVENT 2 #define WINDOW_BUFFER_SIZE_EVENT 4 @@ -72,6 +74,11 @@ SHORT X; SHORT Y; } COORD; +typedef struct _CONSOLE_SELECTION_INFO { + DWORD dwFlags; + COORD dwSelectionAnchor; + SMALL_RECT srSelection; +} CONSOLE_SELECTION_INFO, *PCONSOLE_SELECTION_INFO; typedef struct _CONSOLE_FONT_INFO { DWORD nFont; COORD dwFontSize;

19 years, 6 months

← Newer
1
...
5
6
7
8
9
10
11
...
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005