Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[akhaldi] 49637: [CMAKE] - Revert back to including the definition files into the source files list.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 19 17:41:48 2010 New Revision: 49637 URL: http://svn.reactos.org/svn/reactos?rev=49637&view=rev Log: [CMAKE] - Revert back to including the definition files into the source files list. Modified: branches/cmake-bringup/dll/win32/acledit/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 17:41:48 2010 @@ -4,7 +4,8 @@ list(APPEND SOURCE acledit.c stubs.c - acledit.rc) + acledit.rc + ${CMAKE_CURRENT_BINARY_DIR}/acledit.def) add_library(acledit SHARED ${SOURCE}) 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 17:41:48 2010 @@ -154,7 +154,7 @@ # empty for now, while import libs are shipped endmacro() -MACRO(spec2def _dllname _spec_file) +macro(spec2def _dllname _spec_file) get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def @@ -162,10 +162,7 @@ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) - add_custom_target( - ${_dllname}.def - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def) -ENDMACRO(spec2def _dllname _spec_file) +endmacro() # Optional 3rd parameter: dllname macro(set_export_spec _module _spec_file) @@ -176,8 +173,6 @@ set(_dllname ${_file}.dll) endif() spec2def(${_dllname} ${_spec_file}) - target_link_libraries(${_module} "${CMAKE_CURRENT_BINARY_DIR}/${_file}.def") - add_dependencies(${_module} ${_dllname}.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 17:41:48 2010 @@ -148,18 +148,15 @@ endforeach() endmacro() -MACRO(spec2def _dllname _spec_file) +macro(spec2def _dllname _spec_file) get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - COMMAND native-spec2def -n --dll ${_dllname} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def + COMMAND native-spec2def -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) - add_custom_target( - ${_dllname}.def - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def) -ENDMACRO(spec2def _dllname _spec_file) +endmacro() # Optional 3rd parameter: dllname macro(set_export_spec _module _spec_file) @@ -170,8 +167,6 @@ set(_dllname ${_file}.dll) endif() spec2def(${_dllname} ${_spec_file}) - add_linkerflag(${_module} "/DEF:${CMAKE_CURRENT_BINARY_DIR}/${_file}.def") - add_dependencies(${_module} ${_dllname}.def) endmacro() file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)

13 years, 11 months

[akhaldi] 49636: [CMAKE] - Improve the _filename condition. - Some minor formatting.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 19 16:43:43 2010 New Revision: 49636 URL: http://svn.reactos.org/svn/reactos?rev=49636&view=rev Log: [CMAKE] - Improve the _filename condition. - Some minor formatting. Modified: branches/cmake-bringup/include/asm/CMakeLists.txt 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 16:43:43 2010 @@ -5,25 +5,21 @@ add_dependencies(genincdata bugcodes) if(MSVC) -set(OPT_MS "-ms") + set(OPT_MS "-ms") else() -set(OPT_MS "") + set(OPT_MS "") endif() if(ARCH MATCHES i386) -set(_filename ks386) -endif() -if(ARCH MATCHES amd64) -set(_filename ksamd64) + set(_filename ks386) +elseif(ARCH MATCHES amd64) + set(_filename ksamd64) endif() add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_filename}.inc COMMAND native-geninc ${CMAKE_CURRENT_BINARY_DIR}/genincdata.dll ${CMAKE_CURRENT_BINARY_DIR}/${_filename}.inc ${OPT_MS} - DEPENDS genincdata -) + DEPENDS genincdata) -add_custom_target( - asm - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_filename}.inc -) +add_custom_target(asm + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_filename}.inc)

13 years, 11 months

[akhaldi] 49635: [CMAKE] - Fix libcntpr build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 19 16:42:39 2010 New Revision: 49635 URL: http://svn.reactos.org/svn/reactos?rev=49635&view=rev Log: [CMAKE] - Fix libcntpr build. Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt 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] Fri Nov 19 16:42:39 2010 @@ -566,4 +566,4 @@ add_library(libcntpr ${LIBCNTPR_SOURCE}) set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE) -add_dependencies(libcntpr psdk buildno_header ks386) +add_dependencies(libcntpr psdk buildno_header asm)

13 years, 11 months

[tkreuzer] 49634: [CMAKE] Fix dependencies, fix native-spec2def

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 19 16:38:25 2010 New Revision: 49634 URL: http://svn.reactos.org/svn/reactos?rev=49634&view=rev Log: [CMAKE] Fix dependencies, fix native-spec2def Modified: branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake 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 16:38:25 2010 @@ -161,7 +161,10 @@ 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) + PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) + add_custom_target( + ${_dllname}.def + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def) ENDMACRO(spec2def _dllname _spec_file) # Optional 3rd parameter: dllname @@ -174,7 +177,7 @@ endif() spec2def(${_dllname} ${_spec_file}) target_link_libraries(${_module} "${CMAKE_CURRENT_BINARY_DIR}/${_file}.def") - add_dependencies(${_module} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def) + add_dependencies(${_module} ${_dllname}.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 16:38:25 2010 @@ -105,13 +105,13 @@ # Generate the asm stub file add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm - COMMAND native-spec2pdef -s ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm + COMMAND native-spec2def -s ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) # Generate a the export def file add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def - COMMAND native-spec2pdef -n -r ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def + COMMAND native-spec2def -n -r ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) # Assemble the file @@ -152,10 +152,13 @@ get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - COMMAND native-spec2pdef -n --dll ${_dllname} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def + COMMAND native-spec2def -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) + add_custom_target( + ${_dllname}.def + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def) ENDMACRO(spec2def _dllname _spec_file) # Optional 3rd parameter: dllname @@ -168,7 +171,7 @@ endif() spec2def(${_dllname} ${_spec_file}) add_linkerflag(${_module} "/DEF:${CMAKE_CURRENT_BINARY_DIR}/${_file}.def") - add_dependencies(${_module} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def) + add_dependencies(${_module} ${_dllname}.def) endmacro() file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)

13 years, 11 months

[akhaldi] 49633: [CMAKE] - Fix gcc host tools build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 19 15:58:35 2010 New Revision: 49633 URL: http://svn.reactos.org/svn/reactos?rev=49633&view=rev Log: [CMAKE] - Fix gcc host tools build. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/cmake/Platform/Windows.cmake 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] Fri Nov 19 15:58:35 2010 @@ -41,7 +41,7 @@ add_subdirectory(lib) if(NOT MSVC) -export(TARGETS widl winebuild nci buildno gendib cabman cdmake mkhive spec2pdef geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) +export(TARGETS widl winebuild nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) else() export(TARGETS winebuild nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) endif() 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 15:58:35 2010 @@ -32,5 +32,5 @@ # 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_VERBOSE_MAKEFILE 1)

13 years, 11 months

[tkreuzer] 49632: [SPEC2DEF] rename spec2pdef to spec2def

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 19 15:27:58 2010 New Revision: 49632 URL: http://svn.reactos.org/svn/reactos?rev=49632&view=rev Log: [SPEC2DEF] rename spec2pdef to spec2def Added: branches/cmake-bringup/tools/spec2def/ - copied from r49615, branches/cmake-bringup/tools/spec2pdef/ branches/cmake-bringup/tools/spec2def/spec2def.c - copied unchanged from r49625, branches/cmake-bringup/tools/spec2pdef/spec2pdef.c Removed: branches/cmake-bringup/tools/spec2def/spec2pdef.c branches/cmake-bringup/tools/spec2pdef/ Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/tools/CMakeLists.txt branches/cmake-bringup/tools/spec2def/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] Fri Nov 19 15:27:58 2010 @@ -43,7 +43,7 @@ if(NOT MSVC) export(TARGETS widl winebuild nci buildno gendib cabman cdmake mkhive spec2pdef geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) else() -export(TARGETS winebuild nci buildno gendib cabman cdmake mkhive spec2pdef geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) +export(TARGETS winebuild nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) endif() else() Modified: branches/cmake-bringup/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.… ============================================================================== --- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Fri Nov 19 15:27:58 2010 @@ -10,7 +10,7 @@ add_subdirectory(geninc) add_subdirectory(mkhive) add_subdirectory(nci) -add_subdirectory(spec2pdef) +add_subdirectory(spec2def) add_subdirectory(unicode) add_subdirectory(winebuild) if(NOT MSVC) Modified: branches/cmake-bringup/tools/spec2def/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/CM… ============================================================================== --- branches/cmake-bringup/tools/spec2def/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/CMakeLists.txt [iso-8859-1] Fri Nov 19 15:27:58 2010 @@ -1,1 +1,1 @@ -add_executable(spec2pdef spec2pdef.c) +add_executable(spec2def spec2def.c) Removed: branches/cmake-bringup/tools/spec2def/spec2pdef.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2pdef/s… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2pdef.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2pdef.c (removed) @@ -1,578 +1,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <ctype.h> -#include <string.h> - -typedef struct -{ - char *pcName; - int nNameLength; - char *pcRedirection; - int nRedirectionLength; - int nCallingConvention; - int nOrdinal; - int nStackBytes; -} EXPORT; - -int (*OutputLine)(FILE *, EXPORT *); -void (*OutputHeader)(FILE *, char *); -int no_decoration = 0; -int no_redirections = 0; -char *pszArchString = "i386"; - -enum -{ - CC_STDCALL, - CC_CDECL, - CC_FASTCALL, - CC_EXTERN, -}; - -char* astrCallingConventions[] = -{ - "STDCALL", - "CDECL", - "FASTCALL", - "EXTERN" -}; - -static -int -IsSeparator(char chr) -{ - return ((chr <= '*' && chr != '$') || - (chr >= ':' && chr <= '?') ); -} - -int -CompareToken(const char *token, const char *comparand) -{ - while (*comparand) - { - if (*token != *comparand) return 0; - token++; - comparand++; - } - if (!IsSeparator(*token)) return 0; - return 1; -} - -char * -NextLine(char *pc) -{ - while (*pc != 0) - { - if (pc[0] == '\n' && pc[1] == '\r') return pc + 2; - else if (pc[0] == '\n') return pc + 1; - pc++; - } - return pc; -} - -int -TokenLength(char *pc) -{ - int length = 0; - - while (!IsSeparator(*pc++)) length++; - - return length; -} - -char * -NextToken(char *pc) -{ - /* Skip token */ - while (!IsSeparator(*pc)) pc++; - - /* Skip white spaces */ - while (*pc == ' ' || *pc == '\t') pc++; - - /* Check for end of line */ - if (*pc == '\n' || *pc == '\r' || *pc == 0) return 0; - - /* Check for comment */ - if (*pc == '#' || *pc == ';') return 0; - - return pc; -} - -void -OutputHeader_stub(FILE *file, char *libname) -{ - fprintf(file, "; File generated automatically, do not edit! \n\n" - ".586\n.model flat\n.code\n"); -} - -int -OutputLine_stub(FILE *fileDest, EXPORT *pexp) -{ - if (pexp->nCallingConvention == CC_STDCALL) - { - fprintf(fileDest, "PUBLIC _%.*s@%d\n_%.*s@%d: nop\n", - pexp->nNameLength, pexp->pcName, pexp->nStackBytes, - pexp->nNameLength, pexp->pcName, pexp->nStackBytes); - } - else if (pexp->nCallingConvention == CC_FASTCALL) - { - fprintf(fileDest, "PUBLIC @%.*s@%d\n@%.*s@%d: nop\n", - pexp->nNameLength, pexp->pcName, pexp->nStackBytes, - pexp->nNameLength, pexp->pcName, pexp->nStackBytes); - } - else if (pexp->nCallingConvention == CC_CDECL) - { - fprintf(fileDest, "PUBLIC _%.*s\n_%.*s: nop\n", - pexp->nNameLength, pexp->pcName, - pexp->nNameLength, pexp->pcName); - } - else if (pexp->nCallingConvention == CC_EXTERN) - { - fprintf(fileDest, "PUBLIC _%.*s\n_%.*s:\n", - pexp->nNameLength, pexp->pcName, - pexp->nNameLength, pexp->pcName); - } - - return 1; -} - -void -OutputHeader_def(FILE *file, char *libname) -{ - fprintf(file, - "; File generated automatically, do not edit!\n\n" - "LIBRARY %s\n\n" - "EXPORTS\n", - libname); -} - -int -OutputLine_def(FILE *fileDest, EXPORT *exp) -{ - fprintf(fileDest, " "); - if (exp->nCallingConvention == CC_FASTCALL && !no_decoration) - { - fprintf(fileDest, "@"); - } - - fprintf(fileDest, "%.*s", exp->nNameLength, exp->pcName); - - if ((exp->nCallingConvention == CC_STDCALL || - exp->nCallingConvention == CC_FASTCALL) && !no_decoration) - { - fprintf(fileDest, "@%d", exp->nStackBytes); - } - - if (exp->pcRedirection && !no_redirections) - { - if (exp->nCallingConvention == CC_FASTCALL && !no_decoration) - { - fprintf(fileDest, "@"); - } - fprintf(fileDest, "=%.*s", exp->nRedirectionLength, exp->pcRedirection); - if ((exp->nCallingConvention == CC_STDCALL || - exp->nCallingConvention == CC_FASTCALL) && !no_decoration) - { - fprintf(fileDest, "@%d", exp->nStackBytes); - } - } - - if (exp->nOrdinal != -1) - { - fprintf(fileDest, " @%d", exp->nOrdinal); - } - - if (exp->nCallingConvention == CC_EXTERN) - { - fprintf(fileDest, " DATA"); - } - - fprintf(fileDest, "\n"); - - return 1; -} - -void -OutputHeader_pdef(FILE *file, char *libname) -{ - fprintf(file, - "; File generated automatically, do not edit!\n\n" - "LIBRARY %s\n\n" - "EXPORTS\n" - "#define FOOL(x) x\n" - "#if defined(__GNUC__) && defined(_X86_)\n" - "#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes\n" - "#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes\n" - "#define _NAME_CDECL(name, stackbytes) FOOL(name)\n" - "#else\n" - "#define _NAME_STDCALL(name, stackbytes) name\n" - "#define _NAME_FASTCALL(name, stackbytes) name\n" - "#define _NAME_CDECL(name, stackbytes) name\n" - "#endif\n" - "#define _NAME_EXTERN(name, stackbytes) name\n" - "#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes)\n", - libname); -} - -int -OutputLine_pdef(FILE *fileDest, EXPORT *exp) -{ - fprintf(fileDest, "_NAME(%.*s,%s,%d)", - exp->nNameLength, exp->pcName, - astrCallingConventions[exp->nCallingConvention], - exp->nStackBytes); - - if (exp->pcRedirection) - { - fprintf(fileDest, "= _NAME(%.*s,%s,%d)", - exp->nRedirectionLength, exp->pcRedirection, - astrCallingConventions[exp->nCallingConvention], - exp->nStackBytes); - } - - if (exp->nOrdinal != -1) - { - fprintf(fileDest, " @%d", exp->nOrdinal); - } - - if (exp->nCallingConvention == CC_EXTERN) - { - fprintf(fileDest, " DATA"); - } - - fprintf(fileDest, "\n"); - - return 1; -} - -int -ParseFile(char* pcStart, FILE *fileDest) -{ - char *pc, *pcLine; - int nLine; - EXPORT exp; - int included; - - //fprintf(stderr, "info: line %d, pcStart:'%.30s'\n", nLine, pcStart); - - /* Loop all lines */ - nLine = 1; - for (pcLine = pcStart; *pcLine; pcLine = NextLine(pcLine), nLine++) - { - pc = pcLine; - - //fprintf(stderr, "info: line %d, token:'%d, %.20s'\n", - // nLine, TokenLength(pcLine), pcLine); - - /* Skip white spaces */ - while (*pc == ' ' || *pc == '\t') pc++; - - /* Skip empty lines, stop at EOF */ - if (*pc == ';' || *pc <= '#') continue; - if (*pc == 0) return 0; - - //fprintf(stderr, "info: line %d, token:'%.*s'\n", - // nLine, TokenLength(pc), pc); - - /* Now we should get either an ordinal or @ */ - if (*pc == '@') exp.nOrdinal = -1; - else exp.nOrdinal = atol(pc); - - /* Go to next token (type) */ - if (!(pc = NextToken(pc))) - { - fprintf(stderr, "error: line %d, unexpected end of line\n", nLine); - return -10; - } - - //fprintf(stderr, "info: Token:'%.10s'\n", pc); - - /* Now we should get the type */ - if (CompareToken(pc, "stdcall")) - { - exp.nCallingConvention = CC_STDCALL; - } - else if (CompareToken(pc, "cdecl") || - CompareToken(pc, "varargs")) - { - exp.nCallingConvention = CC_CDECL; - } - else if (CompareToken(pc, "fastcall") || - CompareToken(pc, "FASTCALL")) - { - exp.nCallingConvention = CC_FASTCALL; - } - else if (CompareToken(pc, "extern") || - CompareToken(pc, "stub")) - { - exp.nCallingConvention = CC_EXTERN; - } - else - { - fprintf(stderr, "error: line %d, expected type, got '%.*s' %d\n", - nLine, TokenLength(pc), pc, *pc); - return -11; - } - - //fprintf(stderr, "info: nCallingConvention: %d\n", exp.nCallingConvention); - - /* Go to next token (options or name) */ - if (!(pc = NextToken(pc))) - { - fprintf(stderr, "fail2\n"); - return -12; - } - - /* Handle options */ - included = 1; - while (*pc == '-') - { - if (CompareToken(pc, "-arch")) - { - /* Default to not included */ - included = 0; - pc += 5; - - /* Look if we are included */ - while (*pc == '=' || *pc == ',') - { - pc++; - if (CompareToken(pc, pszArchString)) - { - included = 1; - break; - } - - /* Skip to next arch or end */ - while (*pc > ',') pc++; - } - } - else - { - fprintf(stderr, "info: ignored option: '%.10s'\n", pc); - } - - /* Go to next token */ - pc = NextToken(pc); - } - - //fprintf(stderr, "info: Name:'%.10s'\n", pc); - - /* If arch didn't match ours, skip this entry */ - if (!included) continue; - - /* Get name */ - exp.pcName = pc; - exp.nNameLength = TokenLength(pc); - - /* Handle parameters */ - exp.nStackBytes = 0; - if (exp.nCallingConvention != CC_EXTERN) - { - //fprintf(stderr, "info: options:'%.10s'\n", pc); - /* Go to next token */ - if (!(pc = NextToken(pc))) - { - fprintf(stderr, "fail4\n"); - return -13; - } - - /* Verify syntax */ - if (*pc++ != '(') - { - fprintf(stderr, "error: line %d, expected '('\n", nLine); - return -14; - } - - /* Skip whitespaces */ - while (*pc == ' ' || *pc == '\t') pc++; - - exp.nStackBytes = 0; - while (*pc >= '0') - { - if (CompareToken(pc, "long")) - exp.nStackBytes += 4; - else if (CompareToken(pc, "double")) - exp.nStackBytes += 8; - else if (CompareToken(pc, "ptr") || - CompareToken(pc, "str") || - CompareToken(pc, "wstr")) - exp.nStackBytes += sizeof(void*); - else - fprintf(stderr, "error: line %d, expected type, got: %.10s\n", nLine, pc); - - /* Go to next parameter */ - if (!(pc = NextToken(pc))) - { - fprintf(stderr, "fail5\n"); - return -15; - } - } - - /* Check syntax */ - if (*pc++ != ')') - { - fprintf(stderr, "error: line %d, expected ')'\n", nLine); - return -16; - } - } - - /* Get optional redirection */ - if ((pc = NextToken(pc))) - { - exp.pcRedirection = pc; - exp.nRedirectionLength = TokenLength(pc); - - /* Check syntax (end of line) */ - if (NextToken(pc)) - { - fprintf(stderr, "error: line %d, additional tokens after ')'\n", nLine); - return -17; - } - } - else - { - exp.pcRedirection = 0; - exp.nRedirectionLength = 0; - } - - OutputLine(fileDest, &exp); - } - -printf("done\n"); - - return 0; -} - - -void usage(void) -{ - printf("syntax: spec2pdef [<options> ...] <source file> <dest file>\n" - "Possible options:\n" - " -d=<file> --dll=<file> names the dll\n" - " -h --help prints this screen\n" - " -s --stubs generates an asm lib stub\n" - " -n --no-decoration removes @xx decorations from def file\n"); -} - -int main(int argc, char *argv[]) -{ - size_t nFileSize; - char *pszSource, *pszDllName = 0; - char achDllName[40]; - FILE *file; - int result, i; - - if (argc < 2) - { - usage(); - return -1; - } - - /* Default to def file */ - OutputLine = OutputLine_def; - OutputHeader = OutputHeader_def; - - /* Read options */ - for (i = 1; i < argc && *argv[i] == '-'; i++) - { - if ((_stricmp(argv[i], "--help") == 0) || - (_stricmp(argv[i], "-h") == 0)) - { - usage(); - return 0; - } - else if ((_stricmp(argv[i], "--stublib") == 0) || - (_stricmp(argv[i], "-s") == 0)) - { - OutputLine = OutputLine_stub; - OutputHeader = OutputHeader_stub; - } - else if ((_stricmp(argv[i], "--dll") == 0) || - (_stricmp(argv[i], "-d") == 0)) - { - pszDllName = argv[i + 1]; - i++; - } - else if ((_stricmp(argv[i], "--no-decoration") == 0) || - (_stricmp(argv[i], "-n") == 0)) - { - no_decoration = 1; - } - else if ((_stricmp(argv[i], "--no-redirection") == 0) || - (_stricmp(argv[i], "-r") == 0)) - { - no_redirections = 1; - } - else - { - fprintf(stderr, "Unrecognized option: %s\n", argv[i]); - return -1; - } - } - - /* Set a default dll name */ - if (!pszDllName) - { - char *p1, *p2; - int len; - - p1 = strrchr(argv[i], '\\'); - if (!p1) p1 = strrchr(argv[i], '/'); - p2 = p1 = p1 ? p1 + 1 : argv[i]; - - /* walk up to '.' */ - while (*p2 != '.' && *p2 != 0) p2++; - len = p2 - p1; - if (len >= sizeof(achDllName) - 5) - { - fprintf(stderr, "name too long: %s\n", p1); - return -2; - } - - strncpy(achDllName, p1, len); - strncpy(achDllName + len, ".dll", sizeof(achDllName) - len); - pszDllName = achDllName; - } - - /* Open input file argv[1] */ - file = fopen(argv[i], "r"); - if (!file) - { - fprintf(stderr, "error: could not open file %s ", argv[i]); - return -3; - } - - /* Get file size */ - fseek(file, 0, SEEK_END); - nFileSize = ftell(file); - rewind(file); - - /* Allocate memory buffer */ - pszSource = malloc(nFileSize + 1); - if (!pszSource) return -4; - - /* Load input file into memory */ - nFileSize = fread(pszSource, 1, nFileSize, file); - fclose(file); - - /* Zero terminate the source */ - pszSource[nFileSize] = '\0'; - - /* Open output file */ - file = fopen(argv[i + 1], "w"); - if (!file) - { - fprintf(stderr, "error: could not open output file %s ", argv[i + 1]); - return -5; - } - - OutputHeader(file, pszDllName); - - result = ParseFile(pszSource, file); - - if (OutputHeader == OutputHeader_stub) fprintf(file, "\nEND\n"); - - fclose(file); - - return result; -}

13 years, 11 months

[dchapyshev] 49631: - Sync atl, hlink, shdocvw, wtsapi32 with Wine 1.3.7

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri Nov 19 15:21:38 2010 New Revision: 49631 URL: http://svn.reactos.org/svn/reactos?rev=49631&view=rev Log: - Sync atl, hlink, shdocvw, wtsapi32 with Wine 1.3.7 Added: trunk/reactos/dll/win32/shdocvw/De.rc (with props) trunk/reactos/dll/win32/shdocvw/Es.rc (with props) trunk/reactos/dll/win32/shdocvw/Fr.rc (with props) trunk/reactos/dll/win32/shdocvw/He.rc (with props) trunk/reactos/dll/win32/shdocvw/It.rc (with props) trunk/reactos/dll/win32/shdocvw/Ko.rc (with props) trunk/reactos/dll/win32/shdocvw/Lt.rc (with props) trunk/reactos/dll/win32/shdocvw/Nl.rc (with props) trunk/reactos/dll/win32/shdocvw/Pl.rc (with props) trunk/reactos/dll/win32/shdocvw/Pt.rc (with props) trunk/reactos/dll/win32/shdocvw/Ro.rc (with props) trunk/reactos/dll/win32/shdocvw/Si.rc (with props) trunk/reactos/dll/win32/shdocvw/Sr.rc (with props) trunk/reactos/dll/win32/shdocvw/Sv.rc (with props) trunk/reactos/dll/win32/shdocvw/Uk.rc (with props) trunk/reactos/dll/win32/shdocvw/ietoolbar.bmp (with props) trunk/reactos/dll/win32/shdocvw/ietoolbar.svg (with props) Modified: trunk/reactos/dll/win32/atl/atl.rgs trunk/reactos/dll/win32/atl/atl_ax.c trunk/reactos/dll/win32/atl/atliface.idl trunk/reactos/dll/win32/atl/registrar.c trunk/reactos/dll/win32/hlink/hlink.spec trunk/reactos/dll/win32/hlink/hlink_main.c trunk/reactos/dll/win32/hlink/link.c trunk/reactos/dll/win32/shdocvw/En.rc trunk/reactos/dll/win32/shdocvw/dochost.c trunk/reactos/dll/win32/shdocvw/frame.c trunk/reactos/dll/win32/shdocvw/ie.c trunk/reactos/dll/win32/shdocvw/iexplore.c trunk/reactos/dll/win32/shdocvw/intshcut.c trunk/reactos/dll/win32/shdocvw/navigate.c trunk/reactos/dll/win32/shdocvw/resource.h trunk/reactos/dll/win32/shdocvw/shdocvw.h trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild trunk/reactos/dll/win32/shdocvw/shdocvw.rc trunk/reactos/dll/win32/shdocvw/shdocvw.spec trunk/reactos/dll/win32/shdocvw/shdocvw_main.c trunk/reactos/dll/win32/shdocvw/webbrowser.c trunk/reactos/dll/win32/wtsapi32/wtsapi32.c trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/atl/atl.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.rgs?rev=… Modified: trunk/reactos/dll/win32/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ax.c?rev… Modified: trunk/reactos/dll/win32/atl/atliface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atliface.idl… Modified: trunk/reactos/dll/win32/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?… Modified: trunk/reactos/dll/win32/hlink/hlink.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink.spec… Modified: trunk/reactos/dll/win32/hlink/hlink_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_main… Modified: trunk/reactos/dll/win32/hlink/link.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/link.c?rev… Added: trunk/reactos/dll/win32/shdocvw/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/De.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/En.rc?re… Added: trunk/reactos/dll/win32/shdocvw/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Es.rc?re… Added: trunk/reactos/dll/win32/shdocvw/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Fr.rc?re… Added: trunk/reactos/dll/win32/shdocvw/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/He.rc?re… Added: trunk/reactos/dll/win32/shdocvw/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/It.rc?re… Added: trunk/reactos/dll/win32/shdocvw/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ko.rc?re… Added: trunk/reactos/dll/win32/shdocvw/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Lt.rc?re… Added: trunk/reactos/dll/win32/shdocvw/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Nl.rc?re… Added: trunk/reactos/dll/win32/shdocvw/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Pl.rc?re… Added: trunk/reactos/dll/win32/shdocvw/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Pt.rc?re… Added: trunk/reactos/dll/win32/shdocvw/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ro.rc?re… Added: trunk/reactos/dll/win32/shdocvw/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Si.rc?re… Added: trunk/reactos/dll/win32/shdocvw/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Sr.rc?re… Added: trunk/reactos/dll/win32/shdocvw/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Sv.rc?re… Added: trunk/reactos/dll/win32/shdocvw/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Uk.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/dochost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/dochost.… Modified: trunk/reactos/dll/win32/shdocvw/frame.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/frame.c?… Modified: trunk/reactos/dll/win32/shdocvw/ie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/ie.c?rev… Added: trunk/reactos/dll/win32/shdocvw/ietoolbar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/ietoolba… Added: trunk/reactos/dll/win32/shdocvw/ietoolbar.svg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/ietoolba… Modified: trunk/reactos/dll/win32/shdocvw/iexplore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/iexplore… Modified: trunk/reactos/dll/win32/shdocvw/intshcut.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/intshcut… Modified: trunk/reactos/dll/win32/shdocvw/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/navigate… Modified: trunk/reactos/dll/win32/shdocvw/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/resource… Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_… Modified: trunk/reactos/dll/win32/shdocvw/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/webbrows… Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3…

13 years, 11 months

[tkreuzer] 49630: [CMAKE] Hack away dxsdk for MSVC for now

by tkreuzer＠svn.reactos.org

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() +

13 years, 11 months

[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

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)

13 years, 11 months

[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

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

13 years, 11 months

← Newer
1
...
22
23
24
25
26
27
28
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2010