Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 48297: [CMAKE] - Separate the resources creation into several targets. With this we're able to set proper dependencies on them selectively, and not as a whole. - Make chew and csq, as a result, depend only on bugcodes.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 01:36:55 2010 New Revision: 48297 URL: http://svn.reactos.org/svn/reactos?rev=48297&view=rev Log: [CMAKE] - Separate the resources creation into several targets. With this we're able to set proper dependencies on them selectively, and not as a whole. - Make chew and csq, as a result, depend only on bugcodes. Modified: branches/cmake-bringup/include/reactos/mc/CMakeLists.txt branches/cmake-bringup/lib/drivers/chew/CMakeLists.txt branches/cmake-bringup/lib/drivers/csq/CMakeLists.txt Modified: branches/cmake-bringup/include/reactos/mc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/m… ============================================================================== --- branches/cmake-bringup/include/reactos/mc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/mc/CMakeLists.txt [iso-8859-1] Tue Jul 27 01:36:55 2010 @@ -1,30 +1,74 @@ - -MACRO (MACRO_ADD_RESOURCES) - - FOREACH(_in_FILE ${ARGN}) - - GET_FILENAME_COMPONENT(FILE ${_in_FILE} NAME_WE) - + # bugcodes ADD_CUSTOM_COMMAND( - OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h - COMMAND native-wmc -i -H ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h -o ${REACTOS_BINARY_DIR}/include/reactos/mc/${FILE}.rc ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc + OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/bugcodes.h + COMMAND native-wmc -i -H ${REACTOS_BINARY_DIR}/include/reactos/bugcodes.h -o ${REACTOS_BINARY_DIR}/include/reactos/mc/bugcodes.rc ${REACTOS_SOURCE_DIR}/include/reactos/mc/bugcodes.mc DEPENDS native-wmc ) SET_SOURCE_FILES_PROPERTIES( - ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h + ${REACTOS_BINARY_DIR}/include/reactos/bugcodes.h PROPERTIES GENERATED TRUE ) - - LIST(APPEND RESOURCES ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h) - ENDFOREACH(_in_FILE ${ARGN}) + ADD_CUSTOM_TARGET(bugcodes ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/bugcodes.h) -ENDMACRO (MACRO_ADD_RESOURCES) + # errcodes + ADD_CUSTOM_COMMAND( + OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/errcodes.h + COMMAND native-wmc -i -H ${REACTOS_BINARY_DIR}/include/reactos/errcodes.h -o ${REACTOS_BINARY_DIR}/include/reactos/mc/errcodes.rc ${REACTOS_SOURCE_DIR}/include/reactos/mc/errcodes.mc + DEPENDS native-wmc + ) -file(GLOB_RECURSE SOURCE "*.mc") + SET_SOURCE_FILES_PROPERTIES( + ${REACTOS_BINARY_DIR}/include/reactos/errcodes.h + PROPERTIES + GENERATED TRUE + ) -MACRO_ADD_RESOURCES(${SOURCE}) + ADD_CUSTOM_TARGET(errcodes ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/errcodes.h) -ADD_CUSTOM_TARGET(build_resources ALL DEPENDS ${RESOURCES}) + # netevent + ADD_CUSTOM_COMMAND( + OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/netevent.h + COMMAND native-wmc -i -H ${REACTOS_BINARY_DIR}/include/reactos/netevent.h -o ${REACTOS_BINARY_DIR}/include/reactos/mc/netevent.rc ${REACTOS_SOURCE_DIR}/include/reactos/mc/netevent.mc + DEPENDS native-wmc + ) + + SET_SOURCE_FILES_PROPERTIES( + ${REACTOS_BINARY_DIR}/include/reactos/netevent.h + PROPERTIES + GENERATED TRUE + ) + + ADD_CUSTOM_TARGET(netevent ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/netevent.h) + + # ntstatus + ADD_CUSTOM_COMMAND( + OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/ntstatus.h + COMMAND native-wmc -i -H ${REACTOS_BINARY_DIR}/include/reactos/ntstatus.h -o ${REACTOS_BINARY_DIR}/include/reactos/mc/ntstatus.rc ${REACTOS_SOURCE_DIR}/include/reactos/mc/ntstatus.mc + DEPENDS native-wmc + ) + + SET_SOURCE_FILES_PROPERTIES( + ${REACTOS_BINARY_DIR}/include/reactos/ntstatus.h + PROPERTIES + GENERATED TRUE + ) + + ADD_CUSTOM_TARGET(ntstatus ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/ntstatus.h) + + # pciclass + ADD_CUSTOM_COMMAND( + OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/pciclass.h + COMMAND native-wmc -i -H ${REACTOS_BINARY_DIR}/include/reactos/pciclass.h -o ${REACTOS_BINARY_DIR}/include/reactos/mc/pciclass.rc ${REACTOS_SOURCE_DIR}/include/reactos/mc/pciclass.mc + DEPENDS native-wmc + ) + + SET_SOURCE_FILES_PROPERTIES( + ${REACTOS_BINARY_DIR}/include/reactos/pciclass.h + PROPERTIES + GENERATED TRUE + ) + + ADD_CUSTOM_TARGET(pciclass ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/pciclass.h) Modified: branches/cmake-bringup/lib/drivers/chew/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/chew/… ============================================================================== --- branches/cmake-bringup/lib/drivers/chew/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/chew/CMakeLists.txt [iso-8859-1] Tue Jul 27 01:36:55 2010 @@ -1,4 +1,4 @@ add_definitions(-D_NTOSKRNL_) add_library(chew workqueue.c) -add_dependencies(chew build_resources) +add_dependencies(chew bugcodes) Modified: branches/cmake-bringup/lib/drivers/csq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/csq/C… ============================================================================== --- branches/cmake-bringup/lib/drivers/csq/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/csq/CMakeLists.txt [iso-8859-1] Tue Jul 27 01:36:55 2010 @@ -1,4 +1,4 @@ add_definitions(-D_NTOSKRNL_) add_library(csq csq.c) -add_dependencies(csq build_resources) +add_dependencies(csq bugcodes)

1 0

[akhaldi] 48296: [CMAKE] - Add rsym to build. - Add fslib, nls and pseh placeholders. - Make crt depend on psdk interfaces.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 01:32:49 2010 New Revision: 48296 URL: http://svn.reactos.org/svn/reactos?rev=48296&view=rev Log: [CMAKE] - Add rsym to build. - Add fslib, nls and pseh placeholders. - Make crt depend on psdk interfaces. Modified: branches/cmake-bringup/lib/CMakeLists.txt branches/cmake-bringup/lib/rossym/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Tue Jul 27 01:32:49 2010 @@ -10,8 +10,12 @@ add_subdirectory(dnslib) add_subdirectory(drivers) add_subdirectory(epsapi) +#add_subdirectory(fslib) add_subdirectory(lsalib) +#add_subdirectory(nls) +#add_subdirectory(pseh) add_subdirectory(recyclebin) +add_subdirectory(rossym) #add_subdirectory(rtl) add_subdirectory(sdk) add_subdirectory(smlib) Modified: branches/cmake-bringup/lib/rossym/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] Tue Jul 27 01:32:49 2010 @@ -1,3 +1,5 @@ + +add_definitions(-D_NTSYSTEM_) file(GLOB_RECURSE SOURCE "*.c") Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Tue Jul 27 01:32:49 2010 @@ -14,3 +14,5 @@ LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strtold.c) add_library(crt ${SOURCE}) + +add_dependencies(crt psdk)

1 0

[akhaldi] 48295: [CMAKE] - No need to check these drivers for CMAKE_CROSSCOMPILING.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 00:51:21 2010 New Revision: 48295 URL: http://svn.reactos.org/svn/reactos?rev=48295&view=rev Log: [CMAKE] - No need to check these drivers for CMAKE_CROSSCOMPILING. Modified: branches/cmake-bringup/lib/drivers/CMakeLists.txt Modified: branches/cmake-bringup/lib/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/CMake… ============================================================================== --- branches/cmake-bringup/lib/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/CMakeLists.txt [iso-8859-1] Tue Jul 27 00:51:21 2010 @@ -1,11 +1,6 @@ - -if(CMAKE_CROSSCOMPILING) add_subdirectory(chew) add_subdirectory(csq) #add_subdirectory(ip) #add_subdirectory(oskittcp) #add_subdirectory(sound) - -else() -endif()

1 0

[akhaldi] 48294: [CMAKE] - Rename MACRO_ADD_INTERFACES to MACRO_ADD_PSDK_INTERFACES, HEADERS to PSDK_HEADERS. - Change the psdk target name from build_headers to psdk.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 00:49:52 2010 New Revision: 48294 URL: http://svn.reactos.org/svn/reactos?rev=48294&view=rev Log: [CMAKE] - Rename MACRO_ADD_INTERFACES to MACRO_ADD_PSDK_INTERFACES, HEADERS to PSDK_HEADERS. - Change the psdk target name from build_headers to psdk. Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak… ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Tue Jul 27 00:49:52 2010 @@ -1,5 +1,5 @@ -MACRO (MACRO_ADD_INTERFACES) +MACRO (MACRO_ADD_PSDK_INTERFACES) FOREACH(_in_FILE ${ARGN}) @@ -17,11 +17,11 @@ GENERATED TRUE ) - LIST(APPEND HEADERS ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h) + LIST(APPEND PSDK_HEADERS ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h) ENDFOREACH(_in_FILE ${ARGN}) -ENDMACRO (MACRO_ADD_INTERFACES) +ENDMACRO (MACRO_ADD_PSDK_INTERFACES) file(GLOB_RECURSE SOURCE "*.idl") LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/access.idl) @@ -47,6 +47,6 @@ LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/dbs.idl) LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/dbprop.idl) -MACRO_ADD_INTERFACES(${SOURCE}) +MACRO_ADD_PSDK_INTERFACES(${SOURCE}) -ADD_CUSTOM_TARGET(build_headers ALL DEPENDS ${HEADERS}) +ADD_CUSTOM_TARGET(psdk ALL DEPENDS ${PSDK_HEADERS})

1 0

[akhaldi] 48293: [CMAKE] - Add dxsdk interfaces to build.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 00:48:07 2010 New Revision: 48293 URL: http://svn.reactos.org/svn/reactos?rev=48293&view=rev Log: [CMAKE] - Add dxsdk interfaces to build. Added: branches/cmake-bringup/include/dxsdk/CMakeLists.txt (with props) Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Tue Jul 27 00:48:07 2010 @@ -50,6 +50,8 @@ include_directories(./include) include_directories(./include/psdk) +include_directories(./include/dxsdk) +include_directories(${REACTOS_BINARY_DIR}/include/dxsdk) include_directories(${REACTOS_BINARY_DIR}/include/psdk) include_directories(${REACTOS_BINARY_DIR}/include/reactos) include_directories(./include/crt) @@ -60,6 +62,7 @@ include_directories(./include/reactos/libs) add_subdirectory(include/psdk) +add_subdirectory(include/dxsdk) add_subdirectory(include/reactos/mc) add_subdirectory(lib) Added: branches/cmake-bringup/include/dxsdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/dxsdk/CMa… ============================================================================== --- branches/cmake-bringup/include/dxsdk/CMakeLists.txt (added) +++ branches/cmake-bringup/include/dxsdk/CMakeLists.txt [iso-8859-1] Tue Jul 27 00:48:07 2010 @@ -1,0 +1,37 @@ + +MACRO (MACRO_ADD_DXSDK_INTERFACES) + + FOREACH(_in_FILE ${ARGN}) + + GET_FILENAME_COMPONENT(FILE ${_in_FILE} NAME_WE) + + ADD_CUSTOM_COMMAND( + OUTPUT ${REACTOS_BINARY_DIR}/include/dxsdk/${FILE}.h + COMMAND native-widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -h -H ${REACTOS_BINARY_DIR}/include/dxsdk/${FILE}.h ${REACTOS_SOURCE_DIR}/include/dxsdk/${FILE}.idl + DEPENDS native-widl + ) + + SET_SOURCE_FILES_PROPERTIES( + ${REACTOS_BINARY_DIR}/include/dxsdk/${FILE}.h + PROPERTIES + GENERATED TRUE + ) + + LIST(APPEND DXSDK_HEADERS ${REACTOS_BINARY_DIR}/include/dxsdk/${FILE}.h) + + ENDFOREACH(_in_FILE ${ARGN}) + +ENDMACRO (MACRO_ADD_DXSDK_INTERFACES) + +file(GLOB_RECURSE SOURCE "*.idl") + +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/dxsdk/axcore.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/dxsdk/axextend.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/dxsdk/devenum.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/dxsdk/dshowasf.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/dxsdk/dyngraph.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/dxsdk/vmrender.idl) + +MACRO_ADD_DXSDK_INTERFACES(${SOURCE}) + +ADD_CUSTOM_TARGET(dxsdk ALL DEPENDS ${DXSDK_HEADERS}) Propchange: branches/cmake-bringup/include/dxsdk/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 48292: Maybe fix dbghelp build on 64 bit.
by dreimer＠svn.reactos.org 26 Jul '10

26 Jul '10

Author: dreimer Date: Mon Jul 26 23:48:15 2010 New Revision: 48292 URL: http://svn.reactos.org/svn/reactos?rev=48292&view=rev Log: Maybe fix dbghelp build on 64 bit. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Jul 26 23:48:15 2010 @@ -2210,6 +2210,10 @@ } CONTEXT; #elif defined(__x86_64__) +#define UNW_FLAG_NHANDLER 0 +#define UNW_FLAG_EHANDLER 1 +#define UNW_FLAG_UHANDLER 2 +#define UNW_FLAG_CHAININFO 4 #define CONTEXT_AMD64 0x100000

1 0

[dreimer] 48290: Sync dbghelp and imagehlp to Wine 1.2 Winhttp and Wininet don't like me and so I skip them for now.
by dreimer＠svn.reactos.org 26 Jul '10

26 Jul '10

Author: dreimer Date: Mon Jul 26 22:33:59 2010 New Revision: 48290 URL: http://svn.reactos.org/svn/reactos?rev=48290&view=rev Log: Sync dbghelp and imagehlp to Wine 1.2 Winhttp and Wininet don't like me and so I skip them for now. Removed: trunk/reactos/dll/win32/dbghelp/memory.c Modified: trunk/reactos/dll/win32/dbghelp/cpu_i386.c trunk/reactos/dll/win32/dbghelp/cpu_ppc.c trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c trunk/reactos/dll/win32/dbghelp/crc32.c trunk/reactos/dll/win32/dbghelp/dbghelp.c trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild trunk/reactos/dll/win32/dbghelp/dbghelp.spec trunk/reactos/dll/win32/dbghelp/dbghelp_private.h trunk/reactos/dll/win32/dbghelp/dwarf.c trunk/reactos/dll/win32/dbghelp/dwarf.h trunk/reactos/dll/win32/dbghelp/elf_module.c trunk/reactos/dll/win32/dbghelp/module.c trunk/reactos/dll/win32/dbghelp/pe_module.c trunk/reactos/dll/win32/dbghelp/stack.c trunk/reactos/dll/win32/dbghelp/symbol.c trunk/reactos/dll/win32/dbghelp/type.c trunk/reactos/dll/win32/imagehlp/access.c trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild trunk/reactos/dll/win32/imagehlp/imagehlp.spec trunk/reactos/dll/win32/imagehlp/imagehlp_main.c trunk/reactos/dll/win32/imagehlp/integrity.c trunk/reactos/dll/win32/imagehlp/modify.c trunk/reactos/include/psdk/winnt.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/dbghelp/cpu_i386.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_i386… Modified: trunk/reactos/dll/win32/dbghelp/cpu_ppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_ppc.… Modified: trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_x86_… Modified: trunk/reactos/dll/win32/dbghelp/crc32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/crc32.c?… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?… Modified: trunk/reactos/dll/win32/dbghelp/dwarf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.h?… Modified: trunk/reactos/dll/win32/dbghelp/elf_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/elf_modu… Removed: trunk/reactos/dll/win32/dbghelp/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/memory.c… Modified: trunk/reactos/dll/win32/dbghelp/module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/module.c… Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_modul… Modified: trunk/reactos/dll/win32/dbghelp/stack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stack.c?… Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… Modified: trunk/reactos/dll/win32/dbghelp/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/type.c?r… Modified: trunk/reactos/dll/win32/imagehlp/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/access.… Modified: trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl… Modified: trunk/reactos/dll/win32/imagehlp/imagehlp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl… Modified: trunk/reactos/dll/win32/imagehlp/imagehlp_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl… Modified: trunk/reactos/dll/win32/imagehlp/integrity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/integri… Modified: trunk/reactos/dll/win32/imagehlp/modify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/modify.… Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[gadamopoulos] 48289: Revert a part of my previous commit
by gadamopoulos＠svn.reactos.org 26 Jul '10

26 Jul '10

Author: gadamopoulos Date: Mon Jul 26 21:48:52 2010 New Revision: 48289 URL: http://svn.reactos.org/svn/reactos?rev=48289&view=rev Log: Revert a part of my previous commit Modified: trunk/reactos/include/crt/setjmp.h Modified: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/setjmp.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/setjmp.h [iso-8859-1] Mon Jul 26 21:48:52 2010 @@ -136,7 +136,7 @@ #define _JMP_BUF_DEFINED #endif -FORCEINLINE void * mingw_getsp(void) +static inline __attribute__((always_inline)) void * mingw_getsp(void) { void *value; #if defined(__x86_64)

1 0

[sir_richard] 48288: [NTOS]: Another long-lost-promised straggler for Timo. There may be more of these needed, this is what I had done on my disk.
by sir_richard＠svn.reactos.org 26 Jul '10

26 Jul '10

Author: sir_richard Date: Mon Jul 26 21:45:42 2010 New Revision: 48288 URL: http://svn.reactos.org/svn/reactos?rev=48288&view=rev Log: [NTOS]: Another long-lost-promised straggler for Timo. There may be more of these needed, this is what I had done on my disk. Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Mon Jul 26 21:45:42 2010 @@ -813,6 +813,10 @@ // Assume failure and check for non-mapped pages // *MdlPages = -1; +#if (_MI_PAGING_LEVELS >= 3) + /* Should be checking the PPE and PXE */ + ASSERT(FALSE); +#endif while ((PointerPde->u.Hard.Valid == 0) || (PointerPte->u.Hard.Valid == 0)) { Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Mon Jul 26 21:45:42 2010 @@ -153,6 +153,7 @@ PVOID MiSystemViewStart; SIZE_T MmSystemViewSize; +#if (_MI_PAGING_LEVELS == 2) // // A copy of the system page directory (the page directory associated with the // System process) is kept (double-mapped) by the manager in order to lazily @@ -161,6 +162,7 @@ // PFN_NUMBER MmSystemPageDirectory[PD_COUNT]; PMMPTE MmSystemPagePtes; +#endif // // The system cache starts right after hyperspace. The first few pages are for @@ -228,6 +230,9 @@ /* And these store the respective highest PTE/PDE address */ PMMPTE MiHighestUserPte; PMMPDE MiHighestUserPde; +#if (_MI_PAGING_LEVELS >= 3) +/* We need the highest PPE and PXE addresses */ +#endif /* These variables define the system cache address space */ PVOID MmSystemCacheStart; @@ -1476,7 +1481,7 @@ PFN_NUMBER PageFrameIndex; KIRQL OldIrql; ULONG Size, BitMapSize; - +#if (_MI_PAGING_LEVELS == 2) // // Get the page frame number for the system page directory // @@ -1502,7 +1507,7 @@ ASSERT(PD_COUNT == 1); TempPte.u.Hard.PageFrameNumber = MmSystemPageDirectory[0]; MI_WRITE_VALID_PTE(PointerPte, TempPte); - +#endif // // Let's get back to paged pool work: size it up. // By default, it should be twice as big as nonpaged pool. @@ -1554,6 +1559,14 @@ // So now get the PDE for paged pool and zero it out // PointerPde = MiAddressToPde(MmPagedPoolStart); + +#if (_MI_PAGING_LEVELS >= 3) + /* On these systems, there's no double-mapping, so instead, the PPE and PXEs + * are setup to span the entire paged pool area, so there's no need for the + * system PD */ + ASSERT(FALSE); +#endif + RtlZeroMemory(PointerPde, (1 + MiAddressToPde(MmPagedPoolEnd) - PointerPde) * sizeof(MMPTE)); @@ -1573,7 +1586,14 @@ PageFrameIndex = MiRemoveZeroPage(0); TempPte.u.Hard.PageFrameNumber = PageFrameIndex; MI_WRITE_VALID_PTE(PointerPde, TempPte); - +#if (_MI_PAGING_LEVELS >= 3) + /* Use the PPE of MmPagedPoolStart that was setup above */ +// Bla = PFN_FROM_PTE(PpeAddress(MmPagedPool...)); + ASSERT(FALSE); +#else + /* Do it this way */ +// Bla = MmSystemPageDirectory[(PointerPde - (PMMPTE)PDE_BASE) / PDE_COUNT] +#endif /* Initialize the PFN entry for it */ MiInitializePfnForOtherProcess(PageFrameIndex, PointerPde, @@ -1700,7 +1720,10 @@ /* Highest PTE and PDE based on the addresses above */ MiHighestUserPte = MiAddressToPte(MmHighestUserAddress); MiHighestUserPde = MiAddressToPde(MmHighestUserAddress); - +#if (_MI_PAGING_LEVELS >= 3) + /* We need the highest PPE and PXE addresses */ + ASSERT(FALSE); +#endif // // Get the size of the boot loader's image allocations and then round // that region up to a PDE size, so that any PDEs we might create for Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Mon Jul 26 21:45:42 2010 @@ -463,7 +463,11 @@ // PointerPte = MiAddressToPte(Address); PointerPde = MiAddressToPde(Address); - +#if (_MI_PAGING_LEVELS >= 3) + /* We need the PPE and PXE addresses */ + ASSERT(FALSE); +#endif + // // Check for dispatch-level snafu // @@ -488,6 +492,11 @@ // if (Mode == UserMode) return STATUS_ACCESS_VIOLATION; +#if (_MI_PAGING_LEVELS >= 3) + /* Need to check PXE and PDE validity */ + ASSERT(FALSE); +#endif + // // Is the PDE valid? // @@ -497,12 +506,12 @@ // Debug spew (eww!) // DPRINT("Invalid PDE\n"); - +#if (_MI_PAGING_LEVELS == 2) // // Handle mapping in "Special" PDE directoreis // MiCheckPdeForPagedPool(Address); - +#endif // // Now we SHOULD be good // @@ -556,7 +565,7 @@ // This might happen...not sure yet // DPRINT1("FAULT ON PAGE TABLES: %p %lx %lx!\n", Address, *PointerPte, *PointerPde); - +#if (_MI_PAGING_LEVELS == 2) // // Map in the page table // @@ -565,7 +574,7 @@ DPRINT1("PAGE TABLES FAULTED IN!\n"); return STATUS_SUCCESS; } - +#endif // // Otherwise the page table doesn't actually exist // @@ -650,6 +659,11 @@ /* Lock the working set */ MiLockProcessWorkingSet(CurrentProcess, CurrentThread); +#if (_MI_PAGING_LEVELS >= 3) + /* Need to check/handle PPE and PXE validity too */ + ASSERT(FALSE); +#endif + /* First things first, is the PDE valid? */ ASSERT(PointerPde != MiAddressToPde(PTE_BASE)); ASSERT(PointerPde->u.Hard.LargePage == 0); @@ -679,6 +693,10 @@ /* We should come back with APCs enabled, and with a valid PDE */ ASSERT(KeAreAllApcsDisabled() == TRUE); +#if (_MI_PAGING_LEVELS >= 3) + /* Need to check/handle PPE and PXE validity too */ + ASSERT(FALSE); +#endif ASSERT(PointerPde->u.Hard.Valid == 1); } Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Mon Jul 26 21:45:42 2010 @@ -329,14 +329,16 @@ /* Request a page */ PageFrameNumber = MiRemoveAnyPage(0); TempPte.u.Hard.PageFrameNumber = PageFrameNumber; - + +#if (_MI_PAGING_LEVELS >= 3) + /* On PAE/x64 systems, there's no double-buffering */ + ASSERT(FALSE); +#else // // Save it into our double-buffered system page directory // -#ifndef _M_AMD64 /* This seems to be making the assumption that one PDE is one page long */ C_ASSERT(PAGE_SIZE == (PD_COUNT * (sizeof(MMPTE) * PDE_COUNT))); -#endif MmSystemPagePtes[(ULONG_PTR)PointerPte & (PAGE_SIZE - 1) / sizeof(MMPTE)] = TempPte; @@ -347,7 +349,7 @@ /* Write the actual PTE now */ MI_WRITE_VALID_PTE(PointerPte++, TempPte); - +#endif // // Move on to the next expansion address //

1 0

[gadamopoulos] 48287: [ntos] - Fix several issues with msvc in ntoskrnl - Add ATTRIB_NORETURN definition which will be used by function pointers because msvc doesn't like DECLSPEC_NORETURN in function pointers
by gadamopoulos＠svn.reactos.org 26 Jul '10

26 Jul '10

Author: gadamopoulos Date: Mon Jul 26 21:32:38 2010 New Revision: 48287 URL: http://svn.reactos.org/svn/reactos?rev=48287&view=rev Log: [ntos] - Fix several issues with msvc in ntoskrnl - Add ATTRIB_NORETURN definition which will be used by function pointers because msvc doesn't like DECLSPEC_NORETURN in function pointers Modified: trunk/reactos/hal/halx86/include/halp.h trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/setjmp.h trunk/reactos/include/crt/stdlib.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/irqobj.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -28,10 +28,9 @@ ); typedef -FASTCALL -VOID -DECLSPEC_NORETURN -(*PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY)( +VOID +ATTRIB_NORETURN +(FASTCALL *PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY)( IN PKTRAP_FRAME TrapFrame ); @@ -558,8 +557,8 @@ VOID HalpApcInterrupt(VOID); VOID HalpDispatchInterrupt(VOID); VOID HalpDispatchInterrupt2(VOID); -VOID FASTCALL DECLSPEC_NORETURN HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); -VOID FASTCALL DECLSPEC_NORETURN HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); +DECLSPEC_NORETURN VOID FASTCALL HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); +DECLSPEC_NORETURN VOID FASTCALL HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); /* timer.c */ VOID NTAPI HalpInitializeClock(VOID); Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/_mingw.h [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -205,6 +205,12 @@ #define _CRT_UNUSED(x) (void)x #endif +#ifdef _MSC_VER +#define ATTRIB_NORETURN +#else +#define ATTRIB_NORETURN DECLSPEC_NORETURN +#endif + #include "_mingw_mac.h" #endif /* !_INC_MINGW */ Modified: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/setjmp.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/setjmp.h [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -136,7 +136,7 @@ #define _JMP_BUF_DEFINED #endif -static inline __attribute__((always_inline)) void * mingw_getsp(void) +FORCEINLINE void * mingw_getsp(void) { void *value; #if defined(__x86_64) Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -489,7 +489,9 @@ __MINGW_EXTENSION lldiv_t __cdecl lldiv(long long, long long); +#ifndef _MSC_VER __MINGW_EXTENSION __CRT_INLINE long long __cdecl llabs(long long _j) { return (_j >= 0 ? _j : -_j); } +#endif __MINGW_EXTENSION long long __cdecl strtoll(const char* __restrict__, char** __restrict, int); __MINGW_EXTENSION unsigned long long __cdecl strtoull(const char* __restrict__, char** __restrict__, int); Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=482… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -1230,6 +1230,8 @@ SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_ARCHITECTURE; } +extern BOOLEAN AllowPagedPool; + VOID NTAPI Phase1InitializationDiscard(IN PVOID Context) @@ -1860,7 +1862,6 @@ InbvEnableDisplayString(TRUE); /* Enough fun for now */ - extern BOOLEAN AllowPagedPool; AllowPagedPool = FALSE; /* Wait 5 seconds for it to initialize */ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -455,7 +455,7 @@ extern ULONG KiFastSystemCallDisable; extern UCHAR KiDebugRegisterTrapOffsets[9]; extern UCHAR KiDebugRegisterContextOffsets[9]; -extern VOID __cdecl KiTrap02(VOID); +extern DECLSPEC_NORETURN VOID __cdecl KiTrap02(VOID); extern VOID __cdecl KiTrap08(VOID); extern VOID __cdecl KiTrap13(VOID); extern VOID __cdecl KiFastCallEntry(VOID); Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -940,6 +940,7 @@ IN PKTRAP_FRAME TrapFrame ); +DECLSPEC_NORETURN VOID FASTCALL KiServiceExit( @@ -947,6 +948,7 @@ IN NTSTATUS Status ); +DECLSPEC_NORETURN VOID FASTCALL KiServiceExit2( Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -199,7 +199,7 @@ DECLSPEC_NORETURN VOID FASTCALL KiTrapReturnNoSegments(IN PKTRAP_FRAME TrapFrame); typedef -DECLSPEC_NORETURN +ATTRIB_NORETURN VOID (FASTCALL *PFAST_SYSTEM_CALL_EXIT)( IN PKTRAP_FRAME TrapFrame Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -29,8 +29,8 @@ NTAPI IopReadyDeviceObjects(IN PDRIVER_OBJECT Driver) { + PDEVICE_OBJECT DeviceObject; PAGED_CODE(); - PDEVICE_OBJECT DeviceObject; /* Set the driver as initialized */ Driver->Flags |= DRVO_INITIALIZED; Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -3035,10 +3035,11 @@ PpIrpQueryCapabilities(IN PDEVICE_OBJECT DeviceObject, OUT PDEVICE_CAPABILITIES DeviceCaps) { - PAGED_CODE(); PVOID Dummy; IO_STACK_LOCATION Stack; - + + PAGED_CODE(); + /* Set up the Header */ RtlZeroMemory(DeviceCaps, sizeof(DEVICE_CAPABILITIES)); DeviceCaps->Size = sizeof(DEVICE_CAPABILITIES); Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -1173,7 +1173,12 @@ Cr0 = __readcr0() & ~(CR0_MP | CR0_TS | CR0_EM | CR0_ET); /* Store on FPU stack */ +#ifdef _MSC_VER + __asm fninit; + __asm fnstsw Magic; +#else asm volatile ("fninit;" "fnstsw %0" : "+m"(Magic)); +#endif /* Magic should now be cleared */ if (Magic & 0xFF) @@ -1210,7 +1215,7 @@ __writecr0(Cr0 & ~(CR0_MP | CR0_TS | CR0_EM)); /* Initialize FPU state */ - asm volatile ("fninit"); + Ke386FnInit(); /* Multiply the magic values and divide, we should get the result back */ Value1 = 4195835.0; @@ -1227,8 +1232,8 @@ return ErrataPresent; } -NTAPI -VOID +VOID +NTAPI KiFlushNPXState(IN PFLOATING_SAVE_AREA SaveArea) { ULONG EFlags, Cr0; Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -1106,9 +1106,9 @@ return; } +DECLSPEC_NORETURN VOID NTAPI -DECLSPEC_NORETURN KiDispatchExceptionFromTrapFrame(IN NTSTATUS Code, IN ULONG_PTR Address, IN ULONG ParameterCount, @@ -1145,9 +1145,9 @@ KiEoiHelper(TrapFrame); } +DECLSPEC_NORETURN VOID FASTCALL -DECLSPEC_NORETURN KiSystemFatalException(IN ULONG ExceptionCode, IN PKTRAP_FRAME TrapFrame) { Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -184,9 +184,8 @@ } typedef -FASTCALL -VOID -(PKI_INTERRUPT_DISPATCH)( +VOID +(FASTCALL *PKI_INTERRUPT_DISPATCH)( IN PKTRAP_FRAME TrapFrame, IN PKINTERRUPT Interrupt ); @@ -310,7 +309,7 @@ KiEnterInterruptTrap(TrapFrame); /* Call the correct dispatcher */ - ((PKI_INTERRUPT_DISPATCH*)Interrupt->DispatchAddress)(TrapFrame, Interrupt); + ((PKI_INTERRUPT_DISPATCH)Interrupt->DispatchAddress)(TrapFrame, Interrupt); } Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -16,8 +16,8 @@ /* GLOBALS *******************************************************************/ /* Boot and double-fault/NMI/DPC stack */ -UCHAR P0BootStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))) = {0}; -UCHAR KiDoubleFaultStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))) = {0}; +UCHAR DECLSPEC_ALIGN(16) P0BootStackData[KERNEL_STACK_SIZE] = {0}; +UCHAR DECLSPEC_ALIGN(16) KiDoubleFaultStackData[KERNEL_STACK_SIZE] = {0}; ULONG_PTR P0BootStack = (ULONG_PTR)&P0BootStackData[KERNEL_STACK_SIZE]; ULONG_PTR KiDoubleFaultStack = (ULONG_PTR)&KiDoubleFaultStackData[KERNEL_STACK_SIZE]; Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -102,9 +102,9 @@ } } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiEoiHelper(IN PKTRAP_FRAME TrapFrame) { /* Common trap exit code */ @@ -123,9 +123,9 @@ KiTrapReturnNoSegments(TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiServiceExit(IN PKTRAP_FRAME TrapFrame, IN NTSTATUS Status) { @@ -161,9 +161,9 @@ KiSystemCallReturn(TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiServiceExit2(IN PKTRAP_FRAME TrapFrame) { /* Common trap exit code */ @@ -188,9 +188,9 @@ /* TRAP HANDLERS **************************************************************/ -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiDebugHandler(IN PKTRAP_FRAME TrapFrame, IN ULONG Parameter1, IN ULONG Parameter2, @@ -212,9 +212,9 @@ TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiNpxHandler(IN PKTRAP_FRAME TrapFrame, IN PKTHREAD Thread, IN PFX_SAVE_AREA SaveArea) @@ -369,9 +369,9 @@ KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 1, Error, 0, 0, TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap00Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -389,9 +389,9 @@ TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap01Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -410,8 +410,9 @@ TrapFrame); } -VOID -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +__cdecl KiTrap02(VOID) { PKTSS Tss, NmiTss; @@ -556,9 +557,9 @@ KiSystemFatalException(EXCEPTION_NMI, NULL); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap03Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -568,9 +569,9 @@ KiDebugHandler(TrapFrame, BREAKPOINT_BREAK, 0, 0); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap04Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -588,9 +589,9 @@ TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap05Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -611,9 +612,9 @@ TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap06Handler(IN PKTRAP_FRAME TrapFrame) { PUCHAR Instruction; @@ -693,9 +694,9 @@ } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap07Handler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread, NpxThread; @@ -803,18 +804,18 @@ KiNpxHandler(TrapFrame, Thread, SaveArea); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap08Handler(IN PKTRAP_FRAME TrapFrame) { /* FIXME: Not handled */ KiSystemFatalException(EXCEPTION_DOUBLE_FAULT, TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap09Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -825,9 +826,9 @@ KiSystemFatalException(EXCEPTION_NPX_OVERRUN, TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap0AHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -840,9 +841,9 @@ KiSystemFatalException(EXCEPTION_INVALID_TSS, TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap0BHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -853,9 +854,9 @@ KiSystemFatalException(EXCEPTION_SEGMENT_NOT_PRESENT, TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap0CHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -866,9 +867,9 @@ KiSystemFatalException(EXCEPTION_STACK_FAULT, TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap0DHandler(IN PKTRAP_FRAME TrapFrame) { ULONG i, j, Iopl; @@ -1145,9 +1146,9 @@ KiTrapReturn(TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap0EHandler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; @@ -1260,9 +1261,9 @@ TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap0FHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1273,9 +1274,9 @@ KiSystemFatalException(EXCEPTION_RESERVED_TRAP, TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap10Handler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; @@ -1301,9 +1302,9 @@ KiNpxHandler(TrapFrame, Thread, SaveArea); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap11Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1314,9 +1315,9 @@ KiSystemFatalException(EXCEPTION_ALIGNMENT_CHECK, TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiTrap13Handler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; @@ -1417,9 +1418,9 @@ while (TRUE); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiRaiseAssertionHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1434,9 +1435,9 @@ TrapFrame); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiDebugServiceHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1449,9 +1450,9 @@ KiDebugHandler(TrapFrame, TrapFrame->Eax, TrapFrame->Ecx, TrapFrame->Edx); } +DECLSPEC_NORETURN VOID FORCEINLINE -DECLSPEC_NORETURN KiSystemCall(IN PKTRAP_FRAME TrapFrame, IN PVOID Arguments) { @@ -1574,9 +1575,9 @@ KiServiceExit(TrapFrame, Result); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiSystemServiceHandler(IN PKTRAP_FRAME TrapFrame, IN PVOID Arguments) { @@ -1584,9 +1585,9 @@ KiSystemCall(TrapFrame, Arguments); } -VOID -FASTCALL -DECLSPEC_NORETURN +DECLSPEC_NORETURN +VOID +FASTCALL KiFastCallEntryHandler(IN PKTRAP_FRAME TrapFrame, IN PVOID Arguments) { Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Mon Jul 26 21:32:38 2010 @@ -145,6 +145,8 @@ } } +extern KEVENT ZeroPageThreadEvent; + NTSTATUS NTAPI MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) @@ -497,7 +499,6 @@ MiInitializeColorTables(); /* ReactOS Stuff */ - extern KEVENT ZeroPageThreadEvent; KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); /* Build the PFN Database */ 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 Jul 26 21:32:38 2010 @@ -566,6 +566,8 @@ return Pfn1; } +extern KEVENT ZeroPageThreadEvent; + VOID NTAPI MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex) @@ -674,7 +676,6 @@ #endif /* Notify zero page thread if enough pages are on the free list now */ - extern KEVENT ZeroPageThreadEvent; if ((MmFreePageListHead.Total > 8) && !(KeReadStateEvent(&ZeroPageThreadEvent))) { /* This is ReactOS-specific */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs