Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 49630: [CMAKE] Hack away dxsdk for MSVC for now
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 15:16:26 2010 New Revision: 49630 URL: http://svn.reactos.org/svn/reactos?rev=49630&view=rev Log: [CMAKE] Hack away dxsdk for MSVC for now Modified: branches/cmake-bringup/include/dxsdk/CMakeLists.txt Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/include/dxsdk/CMakeLists.txt [iso-8859-1] Fri Nov 19 15:16:26 2010 @@ -23,5 +23,9 @@ videoacc.idl #vmrender.idl ) - -ADD_INTERFACE_DEFINITIONS(dxsdk ${SOURCE}) + +# HACK: dxsdk is broken +if (NOT MSVC) + ADD_INTERFACE_DEFINITIONS(dxsdk ${SOURCE}) +endif() +

1 0

[tkreuzer] 49629: [CMAKE] Add a new macro set_export_spec(), that replaces the use of spec2def + adding the generated def file to the sources Remove EXTERNAL_OBJECT TRUE property for the generated ...
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 14:21:18 2010 New Revision: 49629 URL: http://svn.reactos.org/svn/reactos?rev=49629&view=rev Log: [CMAKE] Add a new macro set_export_spec(), that replaces the use of spec2def + adding the generated def file to the sources Remove EXTERNAL_OBJECT TRUE property for the generated def files. Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt branches/cmake-bringup/dll/win32/batt/CMakeLists.txt branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt branches/cmake-bringup/dll/win32/cards/CMakeLists.txt branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt branches/cmake-bringup/dll/win32/localui/CMakeLists.txt branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Fri Nov 19 14:21:18 2010 @@ -1,18 +1,16 @@ set_unicode() - -spec2def(acledit.dll acledit.spec) list(APPEND SOURCE acledit.c stubs.c - acledit.rc - ${CMAKE_CURRENT_BINARY_DIR}/acledit.def) - + acledit.rc) add_library(acledit SHARED ${SOURCE}) set_module_type(acledit win32dll) + +set_export_spec(acledit acledit.spec) add_importlibs(acledit ntdll) Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/C… ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Fri Nov 19 14:21:18 2010 @@ -17,7 +17,8 @@ set_module_type(aclui win32dll) -set_pdef_file(aclui aclui.pdef) +set_export_spec(aclui aclui.spec aclui.dll) + add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/aclui.def) add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap3… ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] Fri Nov 19 14:21:18 2010 @@ -5,7 +5,8 @@ set_module_type(avicap32 win32dll) -set_pdef_file(avicap32 avicap32.pdef) +set_export_spec(avicap32 avicap32.spec) + add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/avicap32.def) target_link_libraries(avicap32 wine) Modified: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] Fri Nov 19 14:21:18 2010 @@ -5,7 +5,8 @@ set_module_type(batt win32dll) -set_pdef_file(batt batt.pdef) +set_export_spec(batt batt.spec) + add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/batt.def) add_importlibs(batt kernel32) Modified: branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmid… ============================================================================== --- branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] Fri Nov 19 14:21:18 2010 @@ -3,11 +3,13 @@ add_library(beepmidi SHARED beepmidi.c) -set_pdef_file(beepmidi beepmidi.pdef) +set_export_spec(beepmidi beepmidi.spec) + add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def) set_entrypoint(beepmidi 0) add_importlibs(beepmidi winmm kernel32 ntdll) add_dependencies(beepmidi psdk) -add_cab_target(beepmidi 1) +add_cab_target(beepmidi 1) + Modified: branches/cmake-bringup/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/C… ============================================================================== --- branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] Fri Nov 19 14:21:18 2010 @@ -6,7 +6,8 @@ add_library(cards SHARED cards.c cards.rc) -set_pdef_file(cards cards.pdef) +set_export_spec(cards cards.spec) + add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/cards.def) set_module_type(cards win32dll) Modified: branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/compstu… ============================================================================== --- branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt [iso-8859-1] Fri Nov 19 14:21:18 2010 @@ -4,13 +4,14 @@ add_library(compstui SHARED compstui_main.c) -set_pdef_file(compstui compstui.pdef) -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/compstui.def) +set_module_type(compstui win32dll) -set_module_type(compstui win32dll) +set_export_spec(compstui compstui.spec) target_link_libraries(compstui wine) add_importlibs(compstui kernel32 ntdll) add_cab_target(compstui 1) +add_importlib_target(compstui.spec) + Modified: branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] Fri Nov 19 14:21:18 2010 @@ -49,7 +49,7 @@ dxguid ${PSEH_LIB}) -set_pdef_file(gdi32 gdi32.pdef) +set_export_spec(gdi32 gdi32.spec) add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) add_pch(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) Modified: branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/getunam… ============================================================================== --- branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt [iso-8859-1] Fri Nov 19 14:21:18 2010 @@ -5,7 +5,8 @@ add_library(getuname SHARED getuname.c getuname.rc) -set_pdef_file(getuname getuname.pdef) +set_export_spec(getuname getuname.spec) + add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/getuname.def) set_module_type(getuname win32dll) Modified: branches/cmake-bringup/dll/win32/localui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localui… ============================================================================== --- branches/cmake-bringup/dll/win32/localui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/localui/CMakeLists.txt [iso-8859-1] Fri Nov 19 14:21:18 2010 @@ -4,7 +4,8 @@ add_library(localui SHARED localui.c localui.rc) -set_pdef_file(localui localui.pdef) +set_export_spec(localui localui.spec) + add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/localui.def) set_module_type(localui win32dll) Modified: branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt [iso-8859-1] Fri Nov 19 14:21:18 2010 @@ -6,7 +6,8 @@ add_library(lpk SHARED dllmain.c stub.c lpk.rc) -set_pdef_file(lpk lpk.pdef) +set_export_spec(lpk lpk.spec) + add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/lpk.def) set_module_type(lpk win32dll) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=496… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Nov 19 14:21:18 2010 @@ -161,27 +161,20 @@ COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} --filename ${_dllname} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) + PROPERTIES GENERATED TRUE) ENDMACRO(spec2def _dllname _spec_file) -macro(pdef2def _pdef_file) - get_filename_component(_file ${_pdef_file} NAME_WE) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - COMMAND ${MINGW_PREFIX}cpp -o ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -P -E ${CMAKE_CURRENT_SOURCE_DIR}/${_pdef_file} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_pdef_file}) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) - add_custom_target( - ${_file}_def - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def) -endmacro(pdef2def _pdef_file) - -macro(set_pdef_file _module _pdef_file) - pdef2def(${_pdef_file}) - get_filename_component(_file ${_pdef_file} NAME_WE) +# Optional 3rd parameter: dllname +macro(set_export_spec _module _spec_file) + get_filename_component(_file ${_spec_file} NAME_WE) + if (${ARGC} GREATER 2) + set(_dllname ${ARGV2}) + else() + set(_dllname ${_file}.dll) + endif() + spec2def(${_dllname} ${_spec_file}) target_link_libraries(${_module} "${CMAKE_CURRENT_BINARY_DIR}/${_file}.def") - add_dependencies(${_module} ${_file}_def) + add_dependencies(${_module} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def) endmacro() #pseh lib, needed with mingw Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=496… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Fri Nov 19 14:21:18 2010 @@ -155,25 +155,20 @@ COMMAND native-spec2pdef -n --dll ${_dllname} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) + PROPERTIES GENERATED TRUE) ENDMACRO(spec2def _dllname _spec_file) -macro(pdef2def _pdef_file) - get_filename_component(_file ${_pdef_file} NAME_WE) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - COMMAND ${CMAKE_C_COMPILER} /EP /c ${CMAKE_CURRENT_SOURCE_DIR}/${_pdef_file} > ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_pdef_file}) - add_custom_target( - ${_file}_def - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def) -endmacro(pdef2def _pdef_file) - -macro(set_pdef_file _module _pdef_file) - pdef2def(${_pdef_file}) - get_filename_component(_file ${_pdef_file} NAME_WE) +# Optional 3rd parameter: dllname +macro(set_export_spec _module _spec_file) + get_filename_component(_file ${_spec_file} NAME_WE) + if (${ARGC} GREATER 2) + set(_dllname ${ARGV2}) + else() + set(_dllname ${_file}.dll) + endif() + spec2def(${_dllname} ${_spec_file}) add_linkerflag(${_module} "/DEF:${CMAKE_CURRENT_BINARY_DIR}/${_file}.def") - add_dependencies(${_module} ${_file}_def) + add_dependencies(${_module} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def) endmacro() file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)

1 0

[tkreuzer] 49628: [INTRIN] Add a workaround for __readcr4, MSVC suffers an internal error when using the intrinsic and optimization is on.
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 13:55:58 2010 New Revision: 49628 URL: http://svn.reactos.org/svn/reactos?rev=49628&view=rev Log: [INTRIN] Add a workaround for __readcr4, MSVC suffers an internal error when using the intrinsic and optimization is on. Modified: branches/cmake-bringup/include/crt/msc/intrin.h Modified: branches/cmake-bringup/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/msc/i… ============================================================================== --- branches/cmake-bringup/include/crt/msc/intrin.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/msc/intrin.h [iso-8859-1] Fri Nov 19 13:55:58 2010 @@ -283,7 +283,12 @@ unsigned long __readcr0(void); unsigned long __readcr2(void); unsigned long __readcr3(void); -unsigned long __readcr4(void); +//unsigned long __readcr4(void); +//#pragma intrinsic(__readcr4) +// HACK: MSVC is broken +unsigned long ___readcr4(void); +#define __readcr4 ___readcr4 + unsigned int __readdr(unsigned int reg); void __writedr(unsigned reg, unsigned int value); #endif

1 0

[tkreuzer] 49627: [NDK] Simplify NtCurrentTeb, always use intrinsics remove GetCurrentFiber
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 13:52:12 2010 New Revision: 49627 URL: http://svn.reactos.org/svn/reactos?rev=49627&view=rev Log: [NDK] Simplify NtCurrentTeb, always use intrinsics remove GetCurrentFiber Modified: branches/cmake-bringup/include/ndk/inline_ntcurrentteb.h Modified: branches/cmake-bringup/include/ndk/inline_ntcurrentteb.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ndk/inlin… ============================================================================== --- branches/cmake-bringup/include/ndk/inline_ntcurrentteb.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/ndk/inline_ntcurrentteb.h [iso-8859-1] Fri Nov 19 13:52:12 2010 @@ -1,20 +1,10 @@ #ifndef _INLINE_NT_CURRENTTEB_H_ #define _INLINE_NT_CURRENTTEB_H_ - -#ifdef __GNUC__ #if defined(_M_IX86) FORCEINLINE struct _TEB * NtCurrentTeb(void) { - struct _TEB *ret; - - __asm__ __volatile__ ( - "movl %%fs:0x18, %0\n" - : "=r" (ret) - : /* no inputs */ - ); - - return ret; + return (struct _TEB *)__readfsdword(0x18); } #elif defined(_M_ARM) @@ -24,63 +14,17 @@ #include <armddk.h> #elif defined(_M_AMD64) -FORCEINLINE struct _TEB * NtCurrentTeb(VOID) +FORCEINLINE struct _TEB * NtCurrentTeb(void) { return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); } #elif defined(_M_PPC) -extern __inline__ struct _TEB * NtCurrentTeb(void) +FORCEINLINE struct _TEB * NtCurrentTeb(void) { - return __readfsdword_winnt(0x18); + return (struct _TEB *)__readfsdword_winnt(0x18); } #else -extern __inline__ struct _TEB * NtCurrentTeb(void) -{ - return __readfsdword_winnt(0x18); -} +#error Unsupported architecture #endif -#elif defined(__WATCOMC__) - -extern PVOID GetCurrentFiber(void); -#pragma aux GetCurrentFiber = \ - "mov eax, dword ptr fs:0x10" \ - value [eax] \ - modify [eax]; - -extern struct _TEB * NtCurrentTeb(void); -#pragma aux NtCurrentTeb = \ - "mov eax, dword ptr fs:0x18" \ - value [eax] \ - modify [eax]; - -#elif defined(_MSC_VER) - -#if (_MSC_FULL_VER >= 13012035) - -__inline PVOID GetCurrentFiber(void) { return (PVOID)(ULONG_PTR)__readfsdword(0x10); } -__inline struct _TEB * NtCurrentTeb(void) { return (struct _TEB *)(ULONG_PTR)__readfsdword(0x18); } - -#else - -static __inline PVOID GetCurrentFiber(void) -{ - PVOID p; - __asm mov eax, fs:[10h] - __asm mov [p], eax - return p; -} - -static __inline struct _TEB * NtCurrentTeb(void) -{ - struct _TEB *p; - __asm mov eax, fs:[18h] - __asm mov [p], eax - return p; -} - -#endif /* _MSC_FULL_VER */ - -#endif /* __GNUC__/__WATCOMC__/_MSC_VER */ - #endif//_INLINE_NT_CURRENTTEB_H_

1 0

[akhaldi] 49626: [CMAKE] - Make nmake makefiles verbose.
by akhaldi＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: akhaldi Date: Fri Nov 19 13:51:32 2010 New Revision: 49626 URL: http://svn.reactos.org/svn/reactos?rev=49626&view=rev Log: [CMAKE] - Make nmake makefiles verbose. Modified: branches/cmake-bringup/cmake/Platform/Windows.cmake Modified: branches/cmake-bringup/cmake/Platform/Windows.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/Platform/Wi… ============================================================================== --- branches/cmake-bringup/cmake/Platform/Windows.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/cmake/Platform/Windows.cmake [iso-8859-1] Fri Nov 19 13:51:32 2010 @@ -30,7 +30,7 @@ INCLUDE(Platform/WindowsPaths) # uncomment these out to debug nmake and borland makefiles -#SET(CMAKE_START_TEMP_FILE "") -#SET(CMAKE_END_TEMP_FILE "") -#SET(CMAKE_VERBOSE_MAKEFILE 1) +SET(CMAKE_START_TEMP_FILE "") +SET(CMAKE_END_TEMP_FILE "") +SET(CMAKE_VERBOSE_MAKEFILE 1)

1 0

[tkreuzer] 49625: [SPEC2PDEF] Handle ? as valid character in identifier name
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 12:34:27 2010 New Revision: 49625 URL: http://svn.reactos.org/svn/reactos?rev=49625&view=rev Log: [SPEC2PDEF] Handle ? as valid character in identifier name Modified: branches/cmake-bringup/tools/spec2pdef/spec2pdef.c Modified: branches/cmake-bringup/tools/spec2pdef/spec2pdef.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2pdef/s… ============================================================================== --- branches/cmake-bringup/tools/spec2pdef/spec2pdef.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2pdef/spec2pdef.c [iso-8859-1] Fri Nov 19 12:34:27 2010 @@ -41,7 +41,7 @@ IsSeparator(char chr) { return ((chr <= '*' && chr != '$') || - (chr >= ':' && chr <= '?') ); + (chr >= ':' && chr < '?') ); } int

1 0

[tkreuzer] 49624: [NDK] Fix 64 bit TEB definition
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 11:43:22 2010 New Revision: 49624 URL: http://svn.reactos.org/svn/reactos?rev=49624&view=rev Log: [NDK] Fix 64 bit TEB definition Modified: branches/cmake-bringup/include/ndk/peb_teb.h Modified: branches/cmake-bringup/include/ndk/peb_teb.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ndk/peb_t… ============================================================================== --- branches/cmake-bringup/include/ndk/peb_teb.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/ndk/peb_teb.h [iso-8859-1] Fri Nov 19 11:43:22 2010 @@ -12,7 +12,7 @@ #define PTR(x) x #endif -#if defined(_WIN64) && !defined(EXPLICIT_32BIT) +#if (defined(_WIN64) && !defined(EXPLICIT_32BIT)) || defined(EXPLICIT_64BIT) #define GDI_HANDLE_BUFFER_SIZE 60 #else #define GDI_HANDLE_BUFFER_SIZE 34

1 0

[tkreuzer] 49623: [NCI] Include new autogenerated definitions file into the asm stub files. Currently hardcoded to ks286.inc
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 11:14:51 2010 New Revision: 49623 URL: http://svn.reactos.org/svn/reactos?rev=49623&view=rev Log: [NCI] Include new autogenerated definitions file into the asm stub files. Currently hardcoded to ks286.inc Modified: branches/cmake-bringup/tools/nci/ncitool.c Modified: branches/cmake-bringup/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/nci/ncitool… ============================================================================== --- branches/cmake-bringup/tools/nci/ncitool.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/nci/ncitool.c [iso-8859-1] Fri Nov 19 11:14:51 2010 @@ -167,19 +167,14 @@ " * PURPOSE: %s\n" " * PROGRAMMER: Computer Generated File. See tools/nci/ncitool.c\n" " * REMARK: DO NOT EDIT OR COMMIT MODIFICATIONS TO THIS FILE\n" - " */\n\n\n" - "#ifdef __ASM__\n" - "#include <reactos/asm.h>\n" - ".code\n" - "#endif\n" - "#include <ndk/asm.h>\n\n", + " */\n\n\n", FileDescription, FileLocation); } /*++ - * WriteFileHeader + * WriteStubHeader * * Prints out the File Header for a Stub File. * @@ -693,11 +688,17 @@ WriteFileHeader(Files[NtosUserStubs], "System Call Stubs for Native API", argv[NtosUserStubs + ArgOffset]); + fputs("#include <asm.inc>\n" + "#include <ks386.inc>\n" + ".code\n\n", Files[NtosUserStubs]); WriteFileHeader(Files[NtosKernelStubs], "System Call Stubs for Native API", argv[NtosKernelStubs + ArgOffset]); - fputs("#include <ndk/asm.h>\n\n", Files[NtosKernelStubs]); + fputs("#include <asm.inc>\n" + "#include <ks386.inc>\n" + ".code\n" + "EXTERN _KiSystemService:PROC\n\n", Files[NtosKernelStubs]); WriteFileHeader(Files[Win32kStubs], "System Call Stubs for Native API",

1 0

[tkreuzer] 49622: [ASM] Rename the target to asm, to simplify dependencies add missing constants
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 11:11:49 2010 New Revision: 49622 URL: http://svn.reactos.org/svn/reactos?rev=49622&view=rev Log: [ASM] Rename the target to asm, to simplify dependencies add missing constants Modified: branches/cmake-bringup/include/asm/CMakeLists.txt branches/cmake-bringup/include/asm/ks386.template.h branches/cmake-bringup/include/asm/ksx.template.h Modified: branches/cmake-bringup/include/asm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/CMake… ============================================================================== --- branches/cmake-bringup/include/asm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/CMakeLists.txt [iso-8859-1] Fri Nov 19 11:11:49 2010 @@ -24,6 +24,6 @@ ) add_custom_target( - ${_filename} + asm DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_filename}.inc ) Modified: branches/cmake-bringup/include/asm/ks386.template.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ks386… ============================================================================== --- branches/cmake-bringup/include/asm/ks386.template.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/ks386.template.h [iso-8859-1] Fri Nov 19 11:11:49 2010 @@ -211,3 +211,211 @@ OFFSET(TssIoMapBase, KTSS, IoMapBase), OFFSET(TssIoMaps, KTSS, IoMaps), SIZE(TssLength, KTSS), + +// ReactOS stuff here +HEADER("KPCR"), +OFFSET(KPCR_EXCEPTION_LIST, KPCR, NtTib.ExceptionList), +//KPCR_INITIAL_STACK +//KPCR_STACK_LIMIT +OFFSET(KPCR_PERF_GLOBAL_GROUP_MASK, KIPCR, PerfGlobalGroupMask), +OFFSET(KPCR_CONTEXT_SWITCHES, KPCR, ContextSwitches), +// KPCR_SET_MEMBER_COPY +OFFSET(KPCR_TEB, KIPCR, Used_Self), +OFFSET(KPCR_SELF, KIPCR, Self), +OFFSET(KPCR_PRCB, KPCR, Prcb), +//KPCR_IRQL +//KPCR_IRR +//KPCR_IRR_ACTIVE +//KPCR_IDR +//KPCR_KD_VERSION_BLOCK +OFFSET(KPCR_IDT, KIPCR, IDT), +OFFSET(KPCR_GDT, KIPCR, GDT), +OFFSET(KPCR_TSS, KPCR, TSS), +OFFSET(KPCR_STALL_SCALE_FACTOR, KPCR, StallScaleFactor), +//KPCR_SET_MEMBER +//KPCR_NUMBER +//KPCR_VDM_ALERT +OFFSET(KPCR_PRCB_DATA, KIPCR, PrcbData), +OFFSET(KPCR_CURRENT_THREAD, KIPCR, PrcbData.CurrentThread), +OFFSET(KPCR_PRCB_NEXT_THREAD, KIPCR, PrcbData.NextThread), +//KPCR_PRCB_IDLE_THREAD +//KPCR_PROCESSOR_NUMBER +//KPCR_PRCB_SET_MEMBER +//KPCR_PRCB_CPU_TYPE +//KPCR_PRCB_PRCB_LOCK +//KPCR_NPX_THREAD +//KPCR_DR6 +//KPCR_DR7 +//KPCR_PRCB_INTERRUPT_COUNT 0x644 +//KPCR_PRCB_KERNEL_TIME 0x648 +//KPCR_PRCB_USER_TIME 0x64C +//KPCR_PRCB_DPC_TIME 0x650 +//KPCR_PRCB_DEBUG_DPC_TIME 0x654 +//KPCR_PRCB_INTERRUPT_TIME 0x658 +//KPCR_PRCB_ADJUST_DPC_THRESHOLD 0x65C +//KPCR_PRCB_SKIP_TICK 0x664 +//KPCR_SYSTEM_CALLS 0x6B8 +OFFSET(KPCR_PRCB_DPC_QUEUE_DEPTH, KIPCR, PrcbData.DpcData[0].DpcQueueDepth), +//KPCR_PRCB_DPC_COUNT 0xA50 +OFFSET(KPCR_PRCB_DPC_STACK, KIPCR, PrcbData.DpcStack), +OFFSET(KPCR_PRCB_MAXIMUM_DPC_QUEUE_DEPTH, KIPCR, PrcbData.MaximumDpcQueueDepth), +//KPCR_PRCB_MAXIMUM_DPC_QUEUE_DEPTH 0xA6C +//KPCR_PRCB_DPC_REQUEST_RATE 0xA70 +//KPCR_PRCB_DPC_INTERRUPT_REQUESTED 0xA78 +OFFSET(KPCR_PRCB_DPC_ROUTINE_ACTIVE, KIPCR, PrcbData.DpcRoutineActive), +//KPCR_PRCB_DPC_LAST_COUNT 0xA80 +OFFSET(KPCR_PRCB_TIMER_REQUEST, KIPCR, PrcbData.TimerRequest), +OFFSET(KPCR_PRCB_QUANTUM_END, KIPCR, PrcbData.QuantumEnd), +//KPCR_PRCB_IDLE_SCHEDULE 0xAA3 +OFFSET(KPCR_PRCB_DEFERRED_READY_LIST_HEAD, KIPCR, PrcbData.DeferredReadyListHead), +OFFSET(KPCR_PRCB_POWER_STATE_IDLE_FUNCTION, KIPCR, PrcbData.PowerState.IdleFunction), + +HEADER("KTRAP_FRAME"), +//OFFSET(KTRAP_FRAME_DEBUGEBP 0x0 +//OFFSET(KTRAP_FRAME_DEBUGEIP 0x4 +//OFFSET(KTRAP_FRAME_DEBUGARGMARK 0x8 +//OFFSET(KTRAP_FRAME_DEBUGPOINTER 0xC +//OFFSET(KTRAP_FRAME_TEMPCS 0x10 +OFFSET(KTRAP_FRAME_TEMPESP, KTRAP_FRAME, TempEsp), +OFFSET(KTRAP_FRAME_DR0, KTRAP_FRAME, Dr0), +OFFSET(KTRAP_FRAME_DR1, KTRAP_FRAME, Dr1), +OFFSET(KTRAP_FRAME_DR2, KTRAP_FRAME, Dr2), +OFFSET(KTRAP_FRAME_DR3, KTRAP_FRAME, Dr3), +OFFSET(KTRAP_FRAME_DR6, KTRAP_FRAME, Dr6), +OFFSET(KTRAP_FRAME_DR7, KTRAP_FRAME, Dr7), +OFFSET(KTRAP_FRAME_GS, KTRAP_FRAME, SegGs), +//OFFSET(KTRAP_FRAME_RESERVED1 0x32 +OFFSET(KTRAP_FRAME_ES, KTRAP_FRAME, SegEs), +//OFFSET(KTRAP_FRAME_RESERVED2 0x36 +OFFSET(KTRAP_FRAME_DS, KTRAP_FRAME, SegDs), +//OFFSET(KTRAP_FRAME_RESERVED3 0x3A +OFFSET(KTRAP_FRAME_EDX, KTRAP_FRAME, Edx), +OFFSET(KTRAP_FRAME_ECX, KTRAP_FRAME, Ecx), +OFFSET(KTRAP_FRAME_EAX, KTRAP_FRAME, Eax), +OFFSET(KTRAP_FRAME_PREVIOUS_MODE, KTRAP_FRAME, PreviousPreviousMode), +OFFSET(KTRAP_FRAME_EXCEPTION_LIST, KTRAP_FRAME, ExceptionList), +OFFSET(KTRAP_FRAME_FS, KTRAP_FRAME, SegFs), +//OFFSET(KTRAP_FRAME_RESERVED4 0x52 +OFFSET(KTRAP_FRAME_EDI, KTRAP_FRAME, Edi), +OFFSET(KTRAP_FRAME_ESI, KTRAP_FRAME, Esi), +OFFSET(KTRAP_FRAME_EBX, KTRAP_FRAME, Ebx), +OFFSET(KTRAP_FRAME_EBP, KTRAP_FRAME, Ebp), +OFFSET(KTRAP_FRAME_ERROR_CODE, KTRAP_FRAME, ErrCode), +OFFSET(KTRAP_FRAME_EIP, KTRAP_FRAME, Eip), +//OFFSET(KTRAP_FRAME_CS 0x6C +OFFSET(KTRAP_FRAME_EFLAGS, KTRAP_FRAME, EFlags), +OFFSET(KTRAP_FRAME_ESP, KTRAP_FRAME, HardwareEsp), +OFFSET(KTRAP_FRAME_SS, KTRAP_FRAME, HardwareSegSs), +//OFFSET(KTRAP_FRAME_RESERVED5 0x7A +OFFSET(KTRAP_FRAME_V86_ES, KTRAP_FRAME, V86Es), +//OFFSET(KTRAP_FRAME_RESERVED6 0x7E +OFFSET(KTRAP_FRAME_V86_DS, KTRAP_FRAME, V86Ds), +//OFFSET(KTRAP_FRAME_RESERVED7 0x82 +OFFSET(KTRAP_FRAME_V86_FS, KTRAP_FRAME, V86Fs), +//OFFSET(KTRAP_FRAME_RESERVED8 0x86 +OFFSET(KTRAP_FRAME_V86_GS, KTRAP_FRAME, V86Gs), +//OFFSET(KTRAP_FRAME_RESERVED9 0x8A +//OFFSET(KTRAP_FRAME_SIZE 0x8C +//OFFSET(KTRAP_FRAME_LENGTH 0x8C +//OFFSET(KTRAP_FRAME_ALIGN 0x04 +SIZE(KTRAP_FRAME_SIZE, KTRAP_FRAME), +CONSTANT(FRAME_EDITED), + +// ok + +HEADER("CONTEXT"), +OFFSET(CONTEXT_FLAGS, CONTEXT, ContextFlags), +//OFFSET(CONTEXT_DR6 0x14 +//OFFSET(CONTEXT_FLOAT_SAVE 0x1C +OFFSET(CONTEXT_SEGGS, CONTEXT, SegGs), +OFFSET(CONTEXT_SEGFS, CONTEXT, SegFs), +OFFSET(CONTEXT_SEGES, CONTEXT, SegEs), +OFFSET(CONTEXT_SEGDS, CONTEXT, SegDs), +OFFSET(CONTEXT_EDI, CONTEXT, Edi), +OFFSET(CONTEXT_ESI, CONTEXT, Esi), +OFFSET(CONTEXT_EBX, CONTEXT, Ebx), +OFFSET(CONTEXT_EDX, CONTEXT, Edx), +OFFSET(CONTEXT_ECX, CONTEXT, Ecx), +OFFSET(CONTEXT_EAX, CONTEXT, Eax), +OFFSET(CONTEXT_EBP, CONTEXT, Ebp), +OFFSET(CONTEXT_EIP, CONTEXT, Eip), +OFFSET(CONTEXT_SEGCS, CONTEXT, SegCs), +OFFSET(CONTEXT_EFLAGS, CONTEXT, EFlags), +OFFSET(CONTEXT_ESP, CONTEXT, Esp), +OFFSET(CONTEXT_SEGSS, CONTEXT, SegSs), +//OFFSET(CONTEXT_FLOAT_SAVE_CONTROL_WORD CONTEXT_FLOAT_SAVE + FP_CONTROL_WORD +//OFFSET(CONTEXT_FLOAT_SAVE_STATUS_WORD CONTEXT_FLOAT_SAVE + FP_STATUS_WORD +//OFFSET(CONTEXT_FLOAT_SAVE_TAG_WORD CONTEXT_FLOAT_SAVE + FP_TAG_WORD +//OFFSET(CONTEXT_ALIGNED_SIZE 0x2CC +//OFFSET(CONTEXT_FRAME_LENGTH 0x2D0 +SIZE(CONTEXT_FRAME_LENGTH, CONTEXT), + +HEADER("KTSS"), +OFFSET(KTSS_IOMAPBASE, KTSS, IoMapBase), +OFFSET(KTSS_ESP0, KTSS, Esp0), + +HEADER("EXCEPTION_RECORD"), +OFFSET(EXCEPTION_RECORD_EXCEPTION_CODE, EXCEPTION_RECORD, ExceptionCode), +OFFSET(EXCEPTION_RECORD_EXCEPTION_FLAGS, EXCEPTION_RECORD, ExceptionFlags), +OFFSET(EXCEPTION_RECORD_EXCEPTION_RECORD, EXCEPTION_RECORD, ExceptionRecord), +OFFSET(EXCEPTION_RECORD_EXCEPTION_ADDRESS, EXCEPTION_RECORD, ExceptionAddress), +OFFSET(EXCEPTION_RECORD_NUMBER_PARAMETERS, EXCEPTION_RECORD, NumberParameters), +SIZE(SIZEOF_EXCEPTION_RECORD, EXCEPTION_RECORD), +//#define EXCEPTION_RECORD_LENGTH 0x50 + +HEADER("KTHREAD"), +OFFSET(KTHREAD_DEBUG_ACTIVE, KTHREAD, DispatcherHeader.DebugActive), +OFFSET(KTHREAD_INITIAL_STACK, KTHREAD, InitialStack), +OFFSET(KTHREAD_STACK_LIMIT, KTHREAD, StackLimit), +OFFSET(KTHREAD_TEB, KTHREAD, Teb), +OFFSET(KTHREAD_KERNEL_STACK, KTHREAD, KernelStack), +//OFFSET(KTHREAD_ALERTED 0x5E +OFFSET(KTHREAD_APCSTATE_PROCESS, KTHREAD, ApcState.Process), +//OFFSET(KTHREAD_PENDING_USER_APC 0x28 + 0x16 +OFFSET(KTHREAD_PENDING_KERNEL_APC, KTHREAD, ApcState.KernelApcPending), +OFFSET(KTHREAD_CONTEXT_SWITCHES, KTHREAD, ContextSwitches), +OFFSET(KTHREAD_STATE_, KTHREAD, State), +OFFSET(KTHREAD_NPX_STATE, KTHREAD, NpxState), +OFFSET(KTHREAD_WAIT_IRQL, KTHREAD, WaitIrql), +//OFFSET(KTHREAD_NEXT_PROCESSOR 0x40 +OFFSET(KTHREAD_WAIT_REASON, KTHREAD, WaitReason), +//OFFSET(KTHREAD_PRIORITY 0x5B +//OFFSET(KTHREAD_SWAP_BUSY 0x5D +//OFFSET(KTHREAD_SERVICE_TABLE 0x118 +//OFFSET(KTHREAD_PREVIOUS_MODE 0xD7 +//OFFSET(KTHREAD_COMBINED_APC_DISABLE 0x70 +OFFSET(KTHREAD_SPECIAL_APC_DISABLE, KTHREAD, SpecialApcDisable), +OFFSET(KTHREAD_LARGE_STACK, KTHREAD, LargeStack), +OFFSET(KTHREAD_TRAP_FRAME, KTHREAD, TrapFrame), +OFFSET(KTHREAD_CALLBACK_STACK, KTHREAD, CallbackStack), +//OFFSET(KTHREAD_APC_STATE_INDEX 0x11C +OFFSET(KTHREAD_STACK_BASE, KTHREAD, StackBase), +//OFFSET(KTHREAD_QUANTUM 0x15D +//OFFSET(KTHREAD_KERNEL_TIME 0x160 +//OFFSET(KTHREAD_USER_TIME 0x18C + +HEADER("KPROCESS"), +OFFSET(KPROCESS_DIRECTORY_TABLE_BASE, KPROCESS, DirectoryTableBase), +OFFSET(KPROCESS_LDT_DESCRIPTOR0, KPROCESS, LdtDescriptor), +OFFSET(KPROCESS_LDT_DESCRIPTOR1, KPROCESS, LdtDescriptor.HighWord), +OFFSET(KPROCESS_INT21_DESCRIPTOR0, KPROCESS, Int21Descriptor), +OFFSET(KPROCESS_INT21_DESCRIPTOR1, KPROCESS, Int21Descriptor.Access), +OFFSET(KPROCESS_IOPM_OFFSET, KPROCESS, IopmOffset), +//OFFSET(KPROCESS_ACTIVE_PROCESSORS 0x34 +//OFFSET(EPROCESS_VDM_OBJECTS 0x144 + +HEADER("Misc"), +CONSTANT(NPX_FRAME_LENGTH), +CONSTANT(FN_CR0_NPX_STATE), +CONSTANT(DR7_RESERVED_MASK), +CONSTANT(FP_CONTROL_WORD), +CONSTANT(FP_STATUS_WORD), +CONSTANT(FP_TAG_WORD), +CONSTANT(FP_DATA_SELECTOR), +CONSTANT(CBSTACK_RESULT), +CONSTANT(CBSTACK_RESULT_LENGTH), +CONSTANT(CBSTACK_TRAP_FRAME), +CONSTANT(CBSTACK_CALLBACK_STACK), +SIZE(SIZEOF_FX_SAVE_AREA, FX_SAVE_AREA), +OFFSET(TEB_EXCEPTION_LIST, TEB, NtTib.ExceptionList), +CONSTANT(KUSER_SHARED_SYSCALL), Modified: branches/cmake-bringup/include/asm/ksx.template.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ksx.t… ============================================================================== --- branches/cmake-bringup/include/asm/ksx.template.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/ksx.template.h [iso-8859-1] Fri Nov 19 11:11:49 2010 @@ -761,34 +761,3 @@ OFFSET(WbWaitKey, KWAIT_BLOCK, WaitKey), OFFSET(WbWaitType, KWAIT_BLOCK, WaitType), -// ReactOS stuff here -HEADER("KPCR"), -OFFSET(KPCR_STALL_SCALE_FACTOR, KPCR, StallScaleFactor), - -OFFSET(TEB_EXCEPTION_LIST, TEB, NtTib.ExceptionList), -OFFSET(CONTEXT_EAX, CONTEXT, Eax), -OFFSET(CONTEXT_ECX, CONTEXT, Ecx), -OFFSET(CONTEXT_EDX, CONTEXT, Edx), -//CONTEXT.Edx -OFFSET(CONTEXT_EBX, CONTEXT, Ebx), -OFFSET(CONTEXT_ESI, CONTEXT, Esi), -OFFSET(CONTEXT_EDI, CONTEXT, Edi), -OFFSET(CONTEXT_SEGCS, CONTEXT, SegCs), -OFFSET(CONTEXT_SEGDS, CONTEXT, SegDs), -OFFSET(CONTEXT_SEGES, CONTEXT, SegEs), -OFFSET(CONTEXT_SEGFS, CONTEXT, SegFs), -OFFSET(CONTEXT_SEGGS, CONTEXT, SegGs), -OFFSET(CONTEXT_SEGSS, CONTEXT, SegSs), -OFFSET(CONTEXT_EFLAGS, CONTEXT, EFlags), -OFFSET(CONTEXT_EIP, CONTEXT, Eip), -OFFSET(CONTEXT_EBP, CONTEXT, Ebp), -OFFSET(CONTEXT_ESP, CONTEXT, Esp), -OFFSET(CONTEXT_FLAGS, CONTEXT, ContextFlags), -SIZE(CONTEXT_FRAME_LENGTH, CONTEXT), - -OFFSET(EXCEPTION_RECORD_EXCEPTION_ADDRESS, EXCEPTION_RECORD, ExceptionAddress), -OFFSET(EXCEPTION_RECORD_EXCEPTION_FLAGS, EXCEPTION_RECORD, ExceptionFlags), -OFFSET(EXCEPTION_RECORD_EXCEPTION_CODE, EXCEPTION_RECORD, ExceptionCode), -OFFSET(EXCEPTION_RECORD_EXCEPTION_RECORD, EXCEPTION_RECORD, ExceptionRecord), -OFFSET(EXCEPTION_RECORD_NUMBER_PARAMETERS, EXCEPTION_RECORD, NumberParameters), -

1 0

[tkreuzer] 49621: [CMAKE] Fix typos in add_importlib_target macro, use /NOLOGO
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 10:54:05 2010 New Revision: 49621 URL: http://svn.reactos.org/svn/reactos?rev=49621&view=rev Log: [CMAKE] Fix typos in add_importlib_target macro, use /NOLOGO Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=496… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Fri Nov 19 10:54:05 2010 @@ -117,26 +117,27 @@ # Assemble the file add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj - COMMAND ${CMAKE_ASM_COMPILER} /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm + COMMAND ${CMAKE_ASM_COMPILER} /NOLOGO /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm DEPENDS "${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm" ) # Add neccessary importlibs for redirections + set(_libraries "") foreach(_lib ${ARGN}) list(APPEND _libraries "${CMAKE_BINARY_DIR}/importlibs/${_lib}.lib") endforeach() # Build the importlib add_custom_command( - OUTPUT {CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib - COMMAND LINK /LIB /MACHINE:X86 /DEF:${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def /OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj ${_libraries} - DEPENDS "${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj" "${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def" ${_libraries} + OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib + COMMAND LINK /LIB /NOLOGO /MACHINE:X86 /DEF:${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def /OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj ${_libraries} + DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def ${_libraries} ) # Add the importlib target add_custom_target( lib${_name} - DEPENDS {CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib + DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib ) endmacro()

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