Ros-diffs April 2012

ros-diffs@reactos.org

11 participants
156 discussions

[akhaldi] 56323: [WIN32SS] * Compile diblib only when we use it.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Apr 2 18:44:48 2012 New Revision: 56323 URL: http://svn.reactos.org/svn/reactos?rev=56323&view=rev Log: [WIN32SS] * Compile diblib only when we use it. Modified: trunk/reactos/win32ss/CMakeLists.txt Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Mon Apr 2 18:44:48 2012 @@ -2,7 +2,11 @@ set(USE_DIBLIB FALSE) add_subdirectory(drivers) -add_subdirectory(gdi/diblib) + +if(USE_DIBLIB) + add_subdirectory(gdi/diblib) +endif() + add_subdirectory(gdi/gdi32) add_subdirectory(reactx) add_subdirectory(user/user32)

12 years, 8 months

[akhaldi] 56322: [W32KNAPI] * Adapt to the new subsystem layout.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Apr 2 18:43:35 2012 New Revision: 56322 URL: http://svn.reactos.org/svn/reactos?rev=56322&view=rev Log: [W32KNAPI] * Adapt to the new subsystem layout. Modified: trunk/rostests/apitests/w32knapi/CMakeLists.txt trunk/rostests/apitests/w32knapi/w32knapi.h Modified: trunk/rostests/apitests/w32knapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/CMakeLi… ============================================================================== --- trunk/rostests/apitests/w32knapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/CMakeLists.txt [iso-8859-1] Mon Apr 2 18:43:35 2012 @@ -1,7 +1,6 @@ add_definitions(-D_DLL -D__USE_CRTIMP) - -set_rc_compiler() +include_directories(${REACTOS_SOURCE_DIR}/win32ss/include) list(APPEND SOURCE osver.c Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h [iso-8859-1] Mon Apr 2 18:43:35 2012 @@ -16,12 +16,12 @@ #include <prntfont.h> /* Public Win32K Headers */ -#include <win32k/ntusrtyp.h> -#include <win32k/ntuser.h> -#include <win32k/callback.h> -#include <win32k/ntgdityp.h> +#include <ntusrtyp.h> +#include <ntuser.h> +#include <callback.h> +#include <ntgdityp.h> #include <ntgdi.h> -#include <win32k/ntgdihdl.h> +#include <ntgdihdl.h> #include "../apitest.h" #include "resource.h"

12 years, 8 months

[akhaldi] 56321: [CMAKE] * CMake automatically handles def files when they're added to the source list, so we don't need to mark it as an external object here.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Apr 2 15:27:35 2012 New Revision: 56321 URL: http://svn.reactos.org/svn/reactos?rev=56321&view=rev Log: [CMAKE] * CMake automatically handles def files when they're added to the source list, so we don't need to mark it as an external object here. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=56321&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Apr 2 15:27:35 2012 @@ -243,8 +243,7 @@ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c COMMAND native-spec2def -n=${_dllname} --kill-at -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES EXTERNAL_OBJECT TRUE) - + if(__add_importlib) # generate the def for the export lib add_custom_command( @@ -252,7 +251,7 @@ COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_implib.def PROPERTIES EXTERNAL_OBJECT TRUE) - + #create normal importlib _add_library(lib${_file} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${_file}_implib.def) set_target_properties(lib${_file} PROPERTIES LINKER_LANGUAGE "IMPLIB" PREFIX "")

12 years, 8 months

[akhaldi] 56320: [GDI32_APITEST] * Addendum to r56319.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Apr 2 10:52:54 2012 New Revision: 56320 URL: http://svn.reactos.org/svn/reactos?rev=56320&view=rev Log: [GDI32_APITEST] * Addendum to r56319. Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/CombineTransform.c trunk/rostests/apitests/gdi32/CreatePen.c trunk/rostests/apitests/gdi32/ExtCreatePen.c trunk/rostests/apitests/gdi32/GetCurrentObject.c trunk/rostests/apitests/gdi32/GetObject.c trunk/rostests/apitests/gdi32/GetStockObject.c trunk/rostests/apitests/gdi32/SelectObject.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Mon Apr 2 10:52:54 2012 @@ -1,5 +1,6 @@ add_definitions(-D_DLL -D__USE_CRTIMP) +include_directories(${REACTOS_SOURCE_DIR}/win32ss) list(APPEND SOURCE AddFontResource.c Modified: trunk/rostests/apitests/gdi32/CombineTransform.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineTra… ============================================================================== --- trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] Mon Apr 2 10:52:54 2012 @@ -9,8 +9,6 @@ #include <wine/test.h> #include <windows.h> #include <winddi.h> -#include <reactos/win32k/ntgdityp.h> -#include <reactos/win32k/ntgdihdl.h> #define ok_int(x, y) ok(x == y, "Wrong value for " #x ", expected " #y ", got %ld\n", (long)x); #define ok_flt(x, y) ok(x == y, "Wrong value for " #x ", expected " #y ", got %f\n", (double)x); Modified: trunk/rostests/apitests/gdi32/CreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreatePen.… ============================================================================== --- trunk/rostests/apitests/gdi32/CreatePen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreatePen.c [iso-8859-1] Mon Apr 2 10:52:54 2012 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> #include <winddi.h> -#include <reactos/win32k/ntgdityp.h> -#include <reactos/win32k/ntgdihdl.h> +#include <include/ntgdityp.h> +#include <include/ntgdihdl.h> void Test_CreatePen() { Modified: trunk/rostests/apitests/gdi32/ExtCreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExtCreateP… ============================================================================== --- trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] Mon Apr 2 10:52:54 2012 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> #include <winddi.h> -#include <reactos/win32k/ntgdityp.h> -#include <reactos/win32k/ntgdihdl.h> +#include <include/ntgdityp.h> +#include <include/ntgdihdl.h> void Test_ExtCreatePen() { Modified: trunk/rostests/apitests/gdi32/GetCurrentObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetCurrent… ============================================================================== --- trunk/rostests/apitests/gdi32/GetCurrentObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetCurrentObject.c [iso-8859-1] Mon Apr 2 10:52:54 2012 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> #include <winddi.h> -#include <reactos/win32k/ntgdityp.h> -#include <reactos/win32k/ntgdihdl.h> +#include <include/ntgdityp.h> +#include <include/ntgdihdl.h> void Test_GetCurrentObject() { Modified: trunk/rostests/apitests/gdi32/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetObject.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] Mon Apr 2 10:52:54 2012 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> #include <winddi.h> -#include <reactos/win32k/ntgdityp.h> -#include <reactos/win32k/ntgdihdl.h> +#include <include/ntgdityp.h> +#include <include/ntgdihdl.h> void Test_General(void) Modified: trunk/rostests/apitests/gdi32/GetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetStockOb… ============================================================================== --- trunk/rostests/apitests/gdi32/GetStockObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetStockObject.c [iso-8859-1] Mon Apr 2 10:52:54 2012 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> #include <winddi.h> -#include <reactos/win32k/ntgdityp.h> -#include <reactos/win32k/ntgdihdl.h> +#include <include/ntgdityp.h> +#include <include/ntgdihdl.h> #define TEST(x) ok(x, #x"\n") #define RTEST(x) ok(x, #x"\n") Modified: trunk/rostests/apitests/gdi32/SelectObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SelectObje… ============================================================================== --- trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] Mon Apr 2 10:52:54 2012 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> #include <winddi.h> -#include <reactos/win32k/ntgdityp.h> -#include <reactos/win32k/ntgdihdl.h> +#include <include/ntgdityp.h> +#include <include/ntgdihdl.h> #define TEST(x) ok(x, #x"\n") #define RTEST(x) ok(x, #x"\n")

12 years, 8 months

[akhaldi] 56319: [WIN32SS] * Move win32k headers to win32ss/include.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Apr 2 10:52:36 2012 New Revision: 56319 URL: http://svn.reactos.org/svn/reactos?rev=56319&view=rev Log: [WIN32SS] * Move win32k headers to win32ss/include. Added: trunk/reactos/win32ss/include/ - copied from r56306, trunk/reactos/include/reactos/win32k/ Removed: trunk/reactos/include/reactos/win32k/ Modified: trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt trunk/reactos/win32ss/gdi/gdi32/include/precomp.h trunk/reactos/win32ss/pch.h trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/user32/include/user32.h trunk/reactos/win32ss/user/win32csr/CMakeLists.txt trunk/reactos/win32ss/user/win32csr/w32csr.h Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -8,7 +8,8 @@ include_directories( BEFORE include - ${REACTOS_SOURCE_DIR}/include/reactos/subsys) + ${REACTOS_SOURCE_DIR}/include/reactos/subsys + ${REACTOS_SOURCE_DIR}/win32ss/include) list(APPEND SOURCE csr/api.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -10,7 +10,7 @@ /* INCLUDES *****************************************************************/ #include <ntdll.h> -#include <win32k/callback.h> +#include <callback.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/CMakeLis… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -2,7 +2,9 @@ add_definitions(-DLANGPACK) -include_directories(include) +include_directories( + include + ${REACTOS_SOURCE_DIR}/win32ss/include) spec2def(gdi32.dll gdi32.spec ADD_IMPORTLIB) Modified: trunk/reactos/win32ss/gdi/gdi32/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -33,14 +33,14 @@ #include <d3dhal.h> /* Public Win32K Headers */ -#include <win32k/ntgdityp.h> +#include <ntgdityp.h> #include <ntgdi.h> -#include <win32k/ntgdihdl.h> +#include <ntgdihdl.h> /* Private GDI32 Header */ #include "gdi32p.h" /* Deprecated NTGDI calls which shouldn't exist */ -#include <win32k/ntgdibad.h> +#include <ntgdibad.h> /* EOF */ Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=56319&r1… ============================================================================== --- trunk/reactos/win32ss/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -72,12 +72,12 @@ #include <csrss/csrss.h> /* Public Win32K headers */ -#include <win32k/callback.h> -#include <win32k/ntusrtyp.h> -#include <win32k/ntuser.h> -#include <win32k/ntgdityp.h> -#include <win32k/ntgdibad.h> -#include <win32k/ntgdihdl.h> +#include <include/callback.h> +#include <include/ntusrtyp.h> +#include <include/ntuser.h> +#include <include/ntgdityp.h> +#include <include/ntgdibad.h> +#include <include/ntgdihdl.h> #include <ntgdi.h> /* Undocumented user definitions */ Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -4,7 +4,8 @@ include_directories( BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine ${REACTOS_SOURCE_DIR}/include/reactos/subsys - include) + include + ${REACTOS_SOURCE_DIR}/win32ss/include) set_rc_compiler() Modified: trunk/reactos/win32ss/user/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user32.h [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -33,9 +33,9 @@ #include <csrss/csrss.h> /* Public Win32K Headers */ -#include <win32k/ntusrtyp.h> -#include <win32k/ntuser.h> -#include <win32k/callback.h> +#include <ntusrtyp.h> +#include <ntuser.h> +#include <callback.h> /* Undocumented user definitions*/ #include <undocuser.h> Modified: trunk/reactos/win32ss/user/win32csr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/CMak… ============================================================================== --- trunk/reactos/win32ss/user/win32csr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/win32csr/CMakeLists.txt [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -4,7 +4,8 @@ ${REACTOS_SOURCE_DIR}/subsystems/win32/csrss/include ${REACTOS_SOURCE_DIR}/include/reactos/subsys ${REACTOS_SOURCE_DIR}/include/reactos/drivers - ${REACTOS_SOURCE_DIR}/dll/cpl/console) + ${REACTOS_SOURCE_DIR}/dll/cpl/console + ${REACTOS_SOURCE_DIR}/win32ss/include) spec2def(win32csr.dll win32csr.spec) Modified: trunk/reactos/win32ss/user/win32csr/w32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/w32c… ============================================================================== --- trunk/reactos/win32ss/user/win32csr/w32csr.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/win32csr/w32csr.h [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -16,7 +16,7 @@ #include "tuiconsole.h" /* Public Win32K Headers */ -#include <win32k/ntuser.h> +#include <ntuser.h> #include "resource.h"

12 years, 8 months

[tkreuzer] 56318: [PSDK/NDK] - Don't include NDK from winnt.h, instead duplicate NtCurrentTeb inline definition between psfuncs.h and winnt.h as it used to be - remove duplicated _GENERAL_LOOKASIDE...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Apr 2 08:28:17 2012 New Revision: 56318 URL: http://svn.reactos.org/svn/reactos?rev=56318&view=rev Log: [PSDK/NDK] - Don't include NDK from winnt.h, instead duplicate NtCurrentTeb inline definition between psfuncs.h and winnt.h as it used to be - remove duplicated _GENERAL_LOOKASIDE_POOL - Add missing NTKERNELAPI to ObDereferenceObjectDeferDelete Modified: trunk/reactos/include/ndk/amd64/ketypes.h trunk/reactos/include/ndk/obfuncs.h trunk/reactos/include/ndk/psfuncs.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/ketypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Mon Apr 2 08:28:17 2012 @@ -436,51 +436,7 @@ CONTEXT ContextFrame; } KPROCESSOR_STATE, *PKPROCESSOR_STATE; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) -typedef struct _GENERAL_LOOKASIDE_POOL -{ - union - { - SLIST_HEADER ListHead; - SINGLE_LIST_ENTRY SingleListHead; - }; - USHORT Depth; - USHORT MaximumDepth; - ULONG TotalAllocates; - union - { - ULONG AllocateMisses; - ULONG AllocateHits; - }; - union - { - ULONG TotalFrees; - ULONG FreeMisses; - }; - ULONG FreeHits; - POOL_TYPE Type; - ULONG Tag; - ULONG Size; - union - { - PVOID AllocateEx; - PVOID Allocate; - }; - union - { - PVOID FreeEx; - PVOID Free; - }; - LIST_ENTRY ListEntry; - ULONG LastTotalAllocates; - union - { - ULONG LastAllocateMisses; - ULONG LastAllocateHits; - }; - ULONG Future[2]; -} GENERAL_LOOKASIDE_POOL, *PGENERAL_LOOKASIDE_POOL; -#else +#if (NTDDI_VERSION < NTDDI_LONGHORN) #define GENERAL_LOOKASIDE_POOL PP_LOOKASIDE_LIST #endif Modified: trunk/reactos/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/obfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/obfuncs.h [iso-8859-1] Mon Apr 2 08:28:17 2012 @@ -153,6 +153,7 @@ OUT PHANDLE Handle ); +NTKERNELAPI VOID NTAPI ObDereferenceObjectDeferDelete( Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Mon Apr 2 08:28:17 2012 @@ -143,7 +143,7 @@ PsGetCurrentProcessSessionId( VOID ); - + // // Process Impersonation Functions // @@ -371,7 +371,18 @@ IN BOOLEAN CreateSuspended ); -#include "inline_ntcurrentteb.h" +#ifndef NTOS_MODE_USER +FORCEINLINE struct _TEB * NtCurrentTeb(VOID) +{ +#if defined(_M_IX86) + return (PTEB)__readfsdword(0x18); +#elif defined (_M_AMD64) + return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); +#endif +} +#else +struct _TEB * NtCurrentTeb(void); +#endif NTSYSCALLAPI NTSTATUS Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Apr 2 08:28:17 2012 @@ -5152,12 +5152,19 @@ } OBJECT_TYPE_LIST, *POBJECT_TYPE_LIST; #if defined(_M_IX86) +FORCEINLINE struct _TEB * NtCurrentTeb(void) +{ + return (struct _TEB *)__readfsdword(0x18); +} FORCEINLINE PVOID GetCurrentFiber(VOID) { return (PVOID)(ULONG_PTR)__readfsdword(0x10); } - #elif defined (_M_AMD64) +FORCEINLINE struct _TEB * NtCurrentTeb(void) +{ + return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); +} FORCEINLINE PVOID GetCurrentFiber(VOID) { #ifdef NONAMELESSUNION @@ -5166,12 +5173,10 @@ return (PVOID)__readgsqword(FIELD_OFFSET(NT_TIB, FiberData)); #endif } - #elif defined (_M_ARM) PVOID WINAPI GetCurrentFiber(VOID); - #elif defined(_M_PPC) -static __inline__ __attribute__((always_inline)) unsigned long __readfsdword_winnt(const unsigned long Offset) +FORCEINLINE unsigned long _read_teb_dword(const unsigned long Offset) { unsigned long result; __asm__("\tadd 7,13,%1\n" @@ -5181,18 +5186,17 @@ : "r7"); return result; } - -static __inline__ PVOID GetCurrentFiber(void) +FORCEINLINE struct _TEB * NtCurrentTeb(void) { - return __readfsdword_winnt(0x10); + return (struct _TEB *)_read_teb_dword(0x18); +} +FORCEINLINE PVOID GetCurrentFiber(void) +{ + return _read_teb_dword(0x10); } #else #error Unknown architecture #endif - - - -#include "inline_ntcurrentteb.h" static __inline PVOID GetFiberData(void) {

12 years, 8 months

[sir_richard] 56317: [NTOS]: Add support for unmapping ARM3 sections. Trunk should now be ready for switching to ARM3 shared-memory, pagefile-backed sections, instead of Ros Mm.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Apr 2 07:23:49 2012 New Revision: 56317 URL: http://svn.reactos.org/svn/reactos?rev=56317&view=rev Log: [NTOS]: Add support for unmapping ARM3 sections. Trunk should now be ready for switching to ARM3 shared-memory, pagefile-backed sections, instead of Ros Mm. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Apr 2 07:23:49 2012 @@ -688,6 +688,111 @@ NTSTATUS NTAPI +MiUnmapViewOfSection(IN PEPROCESS Process, + IN PVOID BaseAddress, + IN ULONG Flags) +{ + PMEMORY_AREA MemoryArea; + BOOLEAN Attached = FALSE; + KAPC_STATE ApcState; + PMMVAD Vad; + PVOID DbgBase = NULL; + SIZE_T RegionSize; + NTSTATUS Status; + PAGED_CODE(); + + /* Check for Mm Region */ + MemoryArea = MmLocateMemoryAreaByAddress(&Process->Vm, BaseAddress); + if ((MemoryArea) && (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3)) + { + /* Call Mm API */ + return MiRosUnmapViewOfSection(Process, BaseAddress, Flags); + } + + /* Check if we should attach to the process */ + if (PsGetCurrentProcess() != Process) + { + /* The process is different, do an attach */ + KeStackAttachProcess(&Process->Pcb, &ApcState); + Attached = TRUE; + } + + /* Check if we need to lock the address space */ + if (!Flags) MmLockAddressSpace(&Process->Vm); + + /* Check if the process is already daed */ + if (Process->VmDeleted) + { + /* Fail the call */ + DPRINT1("Process died!\n"); + if (!Flags) MmUnlockAddressSpace(&Process->Vm); + Status = STATUS_PROCESS_IS_TERMINATING; + goto Quickie; + } + + /* Find the VAD for the address and make sure it's a section VAD */ + Vad = MiLocateAddress(BaseAddress); + if (!(Vad) || (Vad->u.VadFlags.PrivateMemory)) + { + /* Couldn't find it, or invalid VAD, fail */ + DPRINT1("No VAD or invalid VAD\n"); + if (!Flags) MmUnlockAddressSpace(&Process->Vm); + Status = STATUS_NOT_MAPPED_VIEW; + goto Quickie; + } + + /* We should be attached */ + ASSERT(Process == PsGetCurrentProcess()); + + /* We need the base address for the debugger message on image-backed VADs */ + if (Vad->u.VadFlags.VadType == VadImageMap) + { + DbgBase = (PVOID)(Vad->StartingVpn >> PAGE_SHIFT); + } + + /* Compute the size of the VAD region */ + RegionSize = PAGE_SIZE + ((Vad->EndingVpn - Vad->StartingVpn) << PAGE_SHIFT); + + /* For SEC_NO_CHANGE sections, we need some extra checks */ + if (Vad->u.VadFlags.NoChange == 1) + { + DPRINT1("Unmapping SEC_NO_CHANGE. Should validate if allowed!\n"); + } + + /* Not currently supported */ + ASSERT(Vad->u.VadFlags.VadType != VadRotatePhysical); + + /* FIXME: Remove VAD charges */ + + /* Lock the working set */ + MiLockWorkingSet(PsGetCurrentThread(), &Process->Vm); + + /* Remove the VAD */ + ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); + MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); + + /* Remove the PTEs for this view */ + MiRemoveMappedView(Process, Vad); + + /* FIXME: Remove commitment */ + + /* Update performance counter and release the lock */ + Process->VirtualSize -= RegionSize; + if (!Flags) MmUnlockAddressSpace(&Process->Vm); + + /* Destroy the VAD and return success */ + ExFreePool(Vad); + Status = STATUS_SUCCESS; + + /* Failure and success case -- send debugger message, detach, and return */ +Quickie: + if (DbgBase) DbgkUnMapViewOfSection(DbgBase); + if (Attached) KeUnstackDetachProcess(&ApcState); + return Status; +} + +NTSTATUS +NTAPI MiMapViewInSystemSpace(IN PVOID Section, IN PMMSESSION Session, OUT PVOID *MappedBase, @@ -1355,6 +1460,404 @@ } ObDereferenceObject(Process); return Status; +} + +VOID +NTAPI +MiFlushTbAndCapture(IN PMMVAD FoundVad, + IN PMMPTE PointerPte, + IN ULONG ProtectionMask, + IN PMMPFN Pfn1, + IN BOOLEAN CaptureDirtyBit) +{ + MMPTE TempPte, PreviousPte; + KIRQL OldIrql; + + // + // User for sanity checking later on + // + PreviousPte = *PointerPte; + + // + // Build the PTE and acquire the PFN lock + // + MI_MAKE_HARDWARE_PTE_USER(&TempPte, + PointerPte, + ProtectionMask, + PreviousPte.u.Hard.PageFrameNumber); + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + // + // We don't support I/O mappings in this path yet, and only cached memory + // + ASSERT(Pfn1 != NULL); + ASSERT(Pfn1->u3.e1.CacheAttribute == MiCached); + ASSERT((ProtectionMask & (MM_NOCACHE | MM_NOACCESS)) == 0); + + // + // Write the new PTE, making sure we are only changing the bits + // + ASSERT(PointerPte->u.Hard.Valid == 1); + ASSERT(TempPte.u.Hard.Valid == 1); + ASSERT(PointerPte->u.Hard.PageFrameNumber == TempPte.u.Hard.PageFrameNumber); + *PointerPte = TempPte; + + // + // Flush the TLB + // + ASSERT(PreviousPte.u.Hard.Valid == 1); + KeFlushCurrentTb(); + ASSERT(PreviousPte.u.Hard.Valid == 1); + + // + // Windows updates the relevant PFN1 information, we currently don't. + // + if (CaptureDirtyBit) DPRINT1("Warning, not handling dirty bit\n"); + + // + // Not supported in ARM3 + // + ASSERT(FoundVad->u.VadFlags.VadType != VadWriteWatch); + + // + // Release the PFN lock, we are done + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); +} + +// +// NOTE: This function gets a lot more complicated if we want Copy-on-Write support +// +NTSTATUS +NTAPI +MiSetProtectionOnSection(IN PEPROCESS Process, + IN PMMVAD FoundVad, + IN PVOID StartingAddress, + IN PVOID EndingAddress, + IN ULONG NewProtect, + OUT PULONG CapturedOldProtect, + IN ULONG DontCharge, + OUT PULONG Locked) +{ + PMMPTE PointerPte, LastPte; + MMPTE TempPte, PteContents; + PMMPDE PointerPde; + PMMPFN Pfn1; + ULONG ProtectionMask, QuotaCharge = 0; + PUSHORT UsedPageTableEntries; + //PETHREAD Thread = PsGetCurrentThread(); + PAGED_CODE(); + + // + // Tell caller nothing is being locked + // + *Locked = FALSE; + + // + // This function should only be used for section VADs. Windows ASSERT */ + // + ASSERT(FoundVad->u.VadFlags.PrivateMemory == 0); + + // + // We don't support these features in ARM3 + // + ASSERT(FoundVad->u.VadFlags.VadType != VadImageMap); + ASSERT(FoundVad->u2.VadFlags2.CopyOnWrite == 0); + + // + // Convert and validate the protection mask + // + ProtectionMask = MiMakeProtectionMask(NewProtect); + if (ProtectionMask == MM_INVALID_PROTECTION) + { + DPRINT1("Invalid section protect\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + + // + // Get the PTE and PDE for the address, as well as the final PTE + // + //MiLockProcessWorkingSet(Thread, Process); + PointerPde = MiAddressToPde(StartingAddress); + PointerPte = MiAddressToPte(StartingAddress); + LastPte = MiAddressToPte(EndingAddress); + + // + // Make the PDE valid, and check the status of the first PTE + // + MiMakePdeExistAndMakeValid(PointerPde, Process, MM_NOIRQL); + if (PointerPte->u.Long) + { + // + // Not supported in ARM3 + // + ASSERT(FoundVad->u.VadFlags.VadType != VadRotatePhysical); + + // + // Capture the page protection and make the PDE valid + // + *CapturedOldProtect = MiGetPageProtection(PointerPte); + MiMakePdeExistAndMakeValid(PointerPde, Process, MM_NOIRQL); + } + else + { + // + // Only pagefile-backed section VADs are supported for now + // + ASSERT(FoundVad->u.VadFlags.VadType != VadImageMap); + + // + // Grab the old protection from the VAD itself + // + *CapturedOldProtect = MmProtectToValue[FoundVad->u.VadFlags.Protection]; + } + + // + // Loop all the PTEs now + // + MiMakePdeExistAndMakeValid(PointerPde, Process, MM_NOIRQL); + while (PointerPte <= LastPte) + { + // + // Check if we've crossed a PDE boundary and make the new PDE valid too + // + if ((((ULONG_PTR)PointerPte) & (SYSTEM_PD_SIZE - 1)) == 0) + { + PointerPde = MiAddressToPte(PointerPte); + MiMakePdeExistAndMakeValid(PointerPde, Process, MM_NOIRQL); + } + + // + // Capture the PTE and see what we're dealing with + // + PteContents = *PointerPte; + if (PteContents.u.Long == 0) + { + // + // This used to be a zero PTE and it no longer is, so we must add a + // reference to the pagetable. + // + UsedPageTableEntries = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(MiPteToAddress(PointerPte))]; + (*UsedPageTableEntries)++; + ASSERT((*UsedPageTableEntries) <= PTE_COUNT); + + // + // Create the demand-zero prototype PTE + // + TempPte = PrototypePte; + TempPte.u.Soft.Protection = ProtectionMask; + MI_WRITE_INVALID_PTE(PointerPte, TempPte); + } + else if (PteContents.u.Hard.Valid == 1) + { + // + // Get the PFN entry + // + Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(&PteContents)); + + // + // We don't support these yet + // + ASSERT((NewProtect & (PAGE_NOACCESS | PAGE_GUARD)) == 0); + ASSERT(Pfn1->u3.e1.PrototypePte == 0); + + // + // Write the protection mask and write it with a TLB flush + // + Pfn1->OriginalPte.u.Soft.Protection = ProtectionMask; + MiFlushTbAndCapture(FoundVad, + PointerPte, + ProtectionMask, + Pfn1, + TRUE); + } + else + { + // + // We don't support these cases yet + // + ASSERT(PteContents.u.Soft.Prototype == 0); + ASSERT(PteContents.u.Soft.Transition == 0); + + // + // The PTE is already demand-zero, just update the protection mask + // + PointerPte->u.Soft.Protection = ProtectionMask; + } + + PointerPte++; + } + + // + // Unlock the working set and update quota charges if needed, then return + // + //MiUnlockProcessWorkingSet(Thread, Process); + if ((QuotaCharge > 0) && (!DontCharge)) + { + FoundVad->u.VadFlags.CommitCharge -= QuotaCharge; + Process->CommitCharge -= QuotaCharge; + } + return STATUS_SUCCESS; +} + +VOID +NTAPI +MiRemoveMappedPtes(IN PVOID BaseAddress, + IN ULONG NumberOfPtes, + IN PCONTROL_AREA ControlArea, + IN PMMSUPPORT Ws) +{ + PMMPTE PointerPte, FirstPte; + PMMPDE PointerPde, SystemMapPde; + PMMPFN Pfn1, Pfn2; + MMPTE PteContents; + KIRQL OldIrql; + DPRINT("Removing mapped view at: 0x%p\n", BaseAddress); + + /* Get the PTE and loop each one */ + PointerPte = MiAddressToPte(BaseAddress); + FirstPte = PointerPte; + while (NumberOfPtes) + { + /* Check if the PTE is already valid */ + PteContents = *PointerPte; + if (PteContents.u.Hard.Valid == 1) + { + /* Get the PFN entry */ + Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(&PteContents)); + + /* Get the PTE */ + PointerPde = MiAddressToPte(PointerPte); + + /* Lock the PFN database and make sure this isn't a mapped file */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + ASSERT(((Pfn1->u3.e1.PrototypePte) && (Pfn1->OriginalPte.u.Soft.Prototype)) == 0); + + /* FIXME: Dirty bit management */ + + /* Was the PDE invalid */ + if (PointerPde->u.Long == 0) + { + /* Find the system double-mapped PDE that describes this mapping */ + SystemMapPde = &MmSystemPagePtes[((ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)) / sizeof(MMPTE)]; + + /* Make it valid */ + ASSERT(SystemMapPde->u.Hard.Valid == 1); + MI_WRITE_VALID_PDE(PointerPde, *SystemMapPde); + } + + /* Dereference the PDE and the PTE */ + Pfn2 = MiGetPfnEntry(PFN_FROM_PTE(PointerPde)); + //MiDecrementShareCount(Pfn2, PFN_FROM_PTE(PointerPde)); + MiDecrementShareCount(Pfn1, PFN_FROM_PTE(&PteContents)); + + /* Release the PFN lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } + else + { + /* Windows ASSERT */ + ASSERT((PteContents.u.Long == 0) || (PteContents.u.Soft.Prototype == 1)); + + /* But not handled in ARM3 */ + ASSERT(PteContents.u.Soft.Prototype == 0); + } + + /* Make the PTE into a zero PTE */ + PointerPte->u.Long = 0; + + /* Move to the next PTE */ + PointerPte++; + NumberOfPtes--; + } + + /* Flush the TLB */ + KeFlushCurrentTb(); + + /* Acquire the PFN lock */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Decrement the accounting counters */ + ControlArea->NumberOfUserReferences--; + ControlArea->NumberOfMappedViews--; + + /* Check if we should destroy the CA and release the lock */ + MiCheckControlArea(ControlArea, OldIrql); +} + +ULONG +NTAPI +MiRemoveFromSystemSpace(IN PMMSESSION Session, + IN PVOID Base, + OUT PCONTROL_AREA *ControlArea) +{ + ULONG Hash, Size, Count = 0, Entry; + PAGED_CODE(); + + /* Compute the hash for this entry and loop trying to find it */ + Entry = (ULONG_PTR)Base >> 16; + Hash = Entry % Session->SystemSpaceHashKey; + while ((Session->SystemSpaceViewTable[Hash].Entry >> 16) != Entry) + { + /* Check if we overflew past the end of the hash table */ + if (++Hash >= Session->SystemSpaceHashSize) + { + /* Reset the hash to zero and keep searching from the bottom */ + Hash = 0; + if (++Count == 2) + { + /* But if we overflew twice, then this is not a real mapping */ + KeBugCheckEx(0xD7, //DRIVER_UNMAPPING_INVALID_VIEW, + (ULONG_PTR)Base, + 1, + 0, + 0); + } + } + } + + /* One less entry */ + Session->SystemSpaceHashEntries--; + + /* Extract the size and clear the entry */ + Size = Session->SystemSpaceViewTable[Hash].Entry & 0xFFFF; + Session->SystemSpaceViewTable[Hash].Entry = 0; + + /* Return the control area and the size */ + *ControlArea = Session->SystemSpaceViewTable[Hash].ControlArea; + return Size; +} + +NTSTATUS +NTAPI +MiUnmapViewInSystemSpace(IN PMMSESSION Session, + IN PVOID MappedBase) +{ + ULONG Size; + PCONTROL_AREA ControlArea; + PAGED_CODE(); + + /* Only global mappings supported for now */ + ASSERT(Session == &MmSession); + + /* Remove this mapping */ + KeAcquireGuardedMutex(Session->SystemSpaceViewLockPointer); + Size = MiRemoveFromSystemSpace(Session, MappedBase, &ControlArea); + + /* Clear the bits for this mapping */ + RtlClearBits(Session->SystemSpaceBitMap, + ((ULONG_PTR)MappedBase - (ULONG_PTR)Session->SystemSpaceViewStart) >> 16, + Size); + + /* Convert the size from a bit size into the actual size */ + Size = Size * (_64K >> PAGE_SHIFT); + + /* Remove the PTEs now */ + MiRemoveMappedPtes(MappedBase, Size, ControlArea, NULL); + KeReleaseGuardedMutex(Session->SystemSpaceViewLockPointer); + + /* Return success */ + return STATUS_SUCCESS; } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -1701,6 +2204,17 @@ */ NTSTATUS NTAPI +MmUnmapViewOfSection(IN PEPROCESS Process, + IN PVOID BaseAddress) +{ + return MiUnmapViewOfSection(Process, BaseAddress, 0); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI MmUnmapViewInSystemSpace(IN PVOID MappedBase) { PMEMORY_AREA MemoryArea; @@ -1714,10 +2228,7 @@ } /* It was not, call the ARM3 routine */ - ASSERT(FALSE); - return STATUS_SUCCESS; -// DPRINT("ARM3 unmapping\n"); -// return MiUnmapViewInSystemSpace(&MmSession, MappedBase); + return MiUnmapViewInSystemSpace(&MmSession, MappedBase); } /* SYSTEM CALLS ***************************************************************/ @@ -2188,7 +2699,7 @@ if (!NT_SUCCESS(Status)) return Status; /* Unmap the view */ - Status = MmUnmapViewOfSection(Process, BaseAddress); + Status = MiUnmapViewOfSection(Process, BaseAddress, 0); /* Dereference the process and return status */ ObDereferenceObject(Process); 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] Mon Apr 2 07:23:49 2012 @@ -4198,12 +4198,11 @@ return(Status); } -/* - * @implemented - */ -NTSTATUS NTAPI -MmUnmapViewOfSection(PEPROCESS Process, - PVOID BaseAddress) +NTSTATUS +NTAPI +MiRosUnmapViewOfSection(IN PEPROCESS Process, + IN PVOID BaseAddress, + IN ULONG Flags) { NTSTATUS Status; PMEMORY_AREA MemoryArea;

12 years, 8 months

[sir_richard] 56316: [NTOS]: Correctly handle transition vs free PTEs in MiDecrementShareCount.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Apr 2 06:54:41 2012 New Revision: 56316 URL: http://svn.reactos.org/svn/reactos?rev=56316&view=rev Log: [NTOS]: Correctly handle transition vs free PTEs in MiDecrementShareCount. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Mon Apr 2 06:54:41 2012 @@ -1233,9 +1233,6 @@ ASSERT(Pfn1->u3.e2.ReferenceCount != 0); if (Pfn1->u3.e2.ReferenceCount == 1) { - /* In ReactOS, this path should always be hit with a deleted PFN */ - ASSERT((MI_IS_PFN_DELETED(Pfn1) == TRUE) || (Pfn1->u3.e1.PrototypePte == 1)); -#if 0 // INVESTIGATE /* Is there still a PFN for this page? */ if (MI_IS_PFN_DELETED(Pfn1) == TRUE) { @@ -1254,17 +1251,6 @@ /* PFN not yet deleted, drop a ref count */ MiDecrementReferenceCount(Pfn1, PageFrameIndex); } -#endif - - /* Clear the last reference */ - Pfn1->u3.e2.ReferenceCount = 0; - ASSERT(Pfn1->OriginalPte.u.Soft.Prototype == 0); - - /* Mark the page temporarily as valid, we're going to make it free soon */ - Pfn1->u3.e1.PageLocation = ActiveAndValid; - - /* Bring it back into the free list */ - MiInsertPageInFreeList(PageFrameIndex); } else {

12 years, 8 months

[tkreuzer] 56315: [XDK/DDK] Some fixes for Vista/Win7

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 1 22:30:00 2012 New Revision: 56315 URL: http://svn.reactos.org/svn/reactos?rev=56315&view=rev Log: [XDK/DDK] Some fixes for Vista/Win7 Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/iotypes.h trunk/reactos/include/xdk/ketypes.h trunk/reactos/include/xdk/sspi.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=56… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sun Apr 1 22:30:00 2012 @@ -4501,8 +4501,8 @@ ULONG ResponseLevel; ULONG NumberEntries; _ANONYMOUS_UNION union { - STORAGE_QUERY_DEPENDENT_VOLUME_LEV1_ENTRY Lev1Depends[]; - STORAGE_QUERY_DEPENDENT_VOLUME_LEV2_ENTRY Lev2Depends[]; + STORAGE_QUERY_DEPENDENT_VOLUME_LEV1_ENTRY Lev1Depends[0]; + STORAGE_QUERY_DEPENDENT_VOLUME_LEV2_ENTRY Lev2Depends[0]; } DUMMYUNIONNAME; } STORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE, *PSTORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE; @@ -10572,14 +10572,14 @@ SspiMarshalAuthIdentity( _In_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity, _Out_ PULONG AuthIdentityLength, - _Deref_out__bcount(*AuthIdentityLength) PCHAR* AuthIdentityByteArray); + _Outptr_result_bytebuffer_(*AuthIdentityLength) PCHAR* AuthIdentityByteArray); SECURITY_STATUS SEC_ENTRY SspiUnmarshalAuthIdentity( _In_ PULONG AuthIdentityLength, - _In__bcount(AuthIdentityLength) PCHAR AuthIdentityByteArray, - _Deref_out_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppAuthIdentity); + _In_reads_bytes_(AuthIdentityLength) PCHAR AuthIdentityByteArray, + _Outptr_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppAuthIdentity); BOOLEAN SEC_ENTRY @@ -10590,14 +10590,14 @@ SEC_ENTRY SspiGetTargetHostName( _In_ PCWSTR pszTargetName, - _Deref_out_ PWSTR* pszHostName); + _Outptr_ PWSTR* pszHostName); SECURITY_STATUS SEC_ENTRY SspiExcludePackage( _In_opt_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity, _In_ PCWSTR pszPackageName, - _Deref_out_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppNewAuthIdentity); + _Outptr_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppNewAuthIdentity); #define SEC_WINNT_AUTH_IDENTITY_MARSHALLED 0x04 #define SEC_WINNT_AUTH_IDENTITY_ONLY 0x08 Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5631… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Apr 1 22:30:00 2012 @@ -1033,7 +1033,7 @@ struct _KWAIT_BLOCK *NextWaitBlock; USHORT WaitKey; UCHAR WaitType; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#if (NTDDI_VERSION >= NTDDI_WIN7) volatile UCHAR BlockState; #else UCHAR SpareByte; Modified: trunk/reactos/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iotypes.h [iso-8859-1] Sun Apr 1 22:30:00 2012 @@ -6588,8 +6588,8 @@ ULONG ResponseLevel; ULONG NumberEntries; _ANONYMOUS_UNION union { - STORAGE_QUERY_DEPENDENT_VOLUME_LEV1_ENTRY Lev1Depends[]; - STORAGE_QUERY_DEPENDENT_VOLUME_LEV2_ENTRY Lev2Depends[]; + STORAGE_QUERY_DEPENDENT_VOLUME_LEV1_ENTRY Lev1Depends[0]; + STORAGE_QUERY_DEPENDENT_VOLUME_LEV2_ENTRY Lev2Depends[0]; } DUMMYUNIONNAME; } STORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE, *PSTORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE; Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Sun Apr 1 22:30:00 2012 @@ -463,7 +463,7 @@ struct _KWAIT_BLOCK *NextWaitBlock; USHORT WaitKey; UCHAR WaitType; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#if (NTDDI_VERSION >= NTDDI_WIN7) volatile UCHAR BlockState; #else UCHAR SpareByte; Modified: trunk/reactos/include/xdk/sspi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/sspi.h?rev=563… ============================================================================== --- trunk/reactos/include/xdk/sspi.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/sspi.h [iso-8859-1] Sun Apr 1 22:30:00 2012 @@ -1234,14 +1234,14 @@ SspiMarshalAuthIdentity( _In_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity, _Out_ PULONG AuthIdentityLength, - _Deref_out__bcount(*AuthIdentityLength) PCHAR* AuthIdentityByteArray); + _Outptr_result_bytebuffer_(*AuthIdentityLength) PCHAR* AuthIdentityByteArray); SECURITY_STATUS SEC_ENTRY SspiUnmarshalAuthIdentity( _In_ PULONG AuthIdentityLength, - _In__bcount(AuthIdentityLength) PCHAR AuthIdentityByteArray, - _Deref_out_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppAuthIdentity); + _In_reads_bytes_(AuthIdentityLength) PCHAR AuthIdentityByteArray, + _Outptr_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppAuthIdentity); BOOLEAN SEC_ENTRY @@ -1252,14 +1252,14 @@ SEC_ENTRY SspiGetTargetHostName( _In_ PCWSTR pszTargetName, - _Deref_out_ PWSTR* pszHostName); + _Outptr_ PWSTR* pszHostName); SECURITY_STATUS SEC_ENTRY SspiExcludePackage( _In_opt_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity, _In_ PCWSTR pszPackageName, - _Deref_out_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppNewAuthIdentity); + _Outptr_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppNewAuthIdentity); #define SEC_WINNT_AUTH_IDENTITY_MARSHALLED 0x04 #define SEC_WINNT_AUTH_IDENTITY_ONLY 0x08

12 years, 8 months

[tkreuzer] 56314: [NDK] A number of fixes for Vista/Win7, now all C_ASSERTs pass

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 1 22:25:05 2012 New Revision: 56314 URL: http://svn.reactos.org/svn/reactos?rev=56314&view=rev Log: [NDK] A number of fixes for Vista/Win7, now all C_ASSERTs pass Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Sun Apr 1 22:25:05 2012 @@ -682,6 +682,42 @@ UCHAR Spare:2; } KEXECUTE_OPTIONS, *PKEXECUTE_OPTIONS; +#if (NTDDI_VERSION >= NTDDI_WIN7) +typedef union _KWAIT_STATUS_REGISTER +{ + UCHAR Flags; + struct + { + UCHAR State:2; + UCHAR Affinity:1; + UCHAR Priority:1; + UCHAR Apc:1; + UCHAR UserApc:1; + UCHAR Alert:1; + UCHAR Unused:1; + }; +} KWAIT_STATUS_REGISTER, *PKWAIT_STATUS_REGISTER; + +typedef struct _COUNTER_READING +{ + enum _HARDWARE_COUNTER_TYPE Type; + ULONG Index; + ULONG64 Start; + ULONG64 Total; +}COUNTER_READING, *PCOUNTER_READING; + +typedef struct _KTHREAD_COUNTERS +{ + ULONG64 WaitReasonBitMap; + struct _THREAD_PERFORMANCE_DATA* UserData; + ULONG Flags; + ULONG ContextSwitches; + ULONG64 CycleTimeBias; + ULONG64 HardwareCounters; + COUNTER_READING HwCounter[16]; +}KTHREAD_COUNTERS, *PKTHREAD_COUNTERS; +#endif + // // Kernel Thread (KTHREAD) // @@ -735,15 +771,20 @@ UCHAR ApcStateFill[FIELD_OFFSET(KAPC_STATE, UserApcPending) + 1]; #if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ SCHAR Priority; +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + /* On x86, the following members "fall out" of the union */ + volatile ULONG NextProcessor; + volatile ULONG DeferredProcessor; +#else // ][ + /* On x86, the following members "fall out" of the union */ + volatile USHORT NextProcessor; + volatile USHORT DeferredProcessor; +#endif // ] #else // ][ UCHAR ApcQueueable; -#endif // ] /* On x86, the following members "fall out" of the union */ volatile UCHAR NextProcessor; -#if (NTDDI_VERSION < NTDDI_WIN7) // [ volatile UCHAR DeferredProcessor; -#endif // ] -#if (NTDDI_VERSION < NTDDI_LONGHORN) // [ UCHAR AdjustReason; SCHAR AdjustIncrement; #endif // ] @@ -787,8 +828,10 @@ BOOLEAN WaitNext; #endif // ] UCHAR WaitReason; +#if (NTDDI_VERSION < NTDDI_LONGHORN) SCHAR Priority; BOOLEAN EnableStackSwap; +#endif // ] volatile UCHAR SwapBusy; BOOLEAN Alerted[MaximumMode]; #endif // ] @@ -824,13 +867,14 @@ #if !defined(_WIN64) // [ }; }; +#endif // ] #endif // ] union { struct { - LONG AutoAlignment:1; - LONG DisableBoost:1; + ULONG AutoAlignment:1; + ULONG DisableBoost:1; #if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ ULONG EtwStackTraceApc1Inserted:1; ULONG EtwStackTraceApc2Inserted:1; @@ -846,9 +890,15 @@ }; LONG ThreadFlags; }; +#if defined(_WIN64) && (NTDDI_VERSION < NTDDI_WIN7) // [ + }; + }; +#endif // ] +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ #if defined(_WIN64) // [ - }; - }; + ULONG Spare0; +#else // ][ + PVOID ServiceTable; #endif // ] #endif // ] union @@ -899,9 +949,21 @@ UCHAR WaitBlockFill6[2 * sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareLong)]; ULONG WaitTime; }; - struct - { +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + struct + { + UCHAR WaitBlockFill7[168]; + PVOID TebMappedLowVa; + struct _UMS_CONTROL_BLOCK* Ucb; + }; +#endif // ] + struct + { +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + UCHAR WaitBlockFill8[188]; +#else // ][ UCHAR WaitBlockFill7[3 * sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareLong)]; +#endif // ] union { struct @@ -921,7 +983,7 @@ union // 2 elements, 0x8 bytes (sizeof) { PVOID CallbackStack; - ULONG64 CallbackDepth; + ULONG_PTR CallbackDepth; }; #else // ][ PVOID CallbackStack; @@ -949,24 +1011,30 @@ BOOLEAN Preempted; UCHAR AdjustReason; CHAR AdjustIncrement; - UINT8 Spare01; +#if (NTDDI_VERSION >= NTDDI_WIN7) + UCHAR PreviousMode; +#else + UCHAR Spare01; +#endif #endif // ] CHAR Saturation; #if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ ULONG SystemCallNumber; #if (NTDDI_VERSION >= NTDDI_WIN7) // [ - ULONG2 FreezeCount; -#else // ][ - ULONG Spare2; -#endif // ] -#endif // ] - KAFFINITY UserAffinity; + ULONG FreezeCount; +#else // ][ + ULONG Spare02; +#endif // ] +#endif // ] +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + GROUP_AFFINITY UserAffinity; struct _KPROCESS *Process; -#if (NTDDI_VERSION >= NTDDI_WIN7) // [ GROUP_AFFINITY Affinity; ULONG IdealProcessor; ULONG UserIdealProcessor; #else // ][ + KAFFINITY UserAffinity; + struct _KPROCESS *Process; KAFFINITY Affinity; #endif // ] PKAPC_STATE ApcStatePointer[2]; @@ -993,7 +1061,7 @@ #endif // ] #if (NTDDI_VERSION >= NTDDI_WIN7) // [ #elif (NTDDI_VERSION >= NTDDI_LONGHORN) // ][ - UCHAR Spare3; + UCHAR Spare03; #else // ][ UCHAR CalloutActive; #endif // ] @@ -1096,7 +1164,7 @@ PKTHREAD_COUNTERS ThreadCounters; PXSTATE_SAVE XStateSave; #elif (NTDDI_VERSION >= NTDDI_LONGHORN) // ][ - PVOID MdlForLockedteb; + PVOID MdlForLockedTeb; #endif // ] } KTHREAD; @@ -1159,9 +1227,9 @@ }; ULONG StackCount; LIST_ENTRY ProcessListEntry; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ ULONGLONG CycleTime; -#endif +#endif // ] } KPROCESS; #define ASSERT_PROCESS(object) \

12 years, 8 months

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 April 2012