Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[tkreuzer] 49868: [SPEC2DEF] Fix DPRINT output 2
by tkreuzer＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: tkreuzer Date: Mon Nov 29 18:39:18 2010 New Revision: 49868 URL: http://svn.reactos.org/svn/reactos?rev=49868&view=rev Log: [SPEC2DEF] Fix DPRINT output 2 Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Mon Nov 29 18:39:18 2010 @@ -179,7 +179,7 @@ case ARG_DBL: fprintf(file, "%%\"PRix64\""); break; } } - fprintf(file, ")\\n\"); + fprintf(file, ")\\n\""); for (i = 0; i < pexp->nArgCount; i++) {

1 0

[tkreuzer] 49867: [SPEC2DEF] Fix DPRINT output
by tkreuzer＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: tkreuzer Date: Mon Nov 29 18:38:09 2010 New Revision: 49867 URL: http://svn.reactos.org/svn/reactos?rev=49867&view=rev Log: [SPEC2DEF] Fix DPRINT output Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Mon Nov 29 18:38:09 2010 @@ -179,11 +179,11 @@ case ARG_DBL: fprintf(file, "%%\"PRix64\""); break; } } - fprintf(file, ")\\n\", "); + fprintf(file, ")\\n\"); for (i = 0; i < pexp->nArgCount; i++) { - if (i != 0) fprintf(file, ", "); + fprintf(file, ", "); switch (pexp->anArgs[i]) { case ARG_LONG: fprintf(file, "(long)a%d", i); break;

1 0

[akhaldi] 49866: [CMAKE] - Add the stubs file as an output file.
by akhaldi＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: akhaldi Date: Mon Nov 29 18:36:22 2010 New Revision: 49866 URL: http://svn.reactos.org/svn/reactos?rev=49866&view=rev Log: [CMAKE] - Add the stubs file as an output file. 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=498… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Mon Nov 29 18:36:22 2010 @@ -195,7 +195,7 @@ macro(spec2def _dllname _spec_file) get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c COMMAND native-spec2def -@ -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c

1 0

[akhaldi] 49865: [CMAKE] - Add auto stubs support to the msvc based toolchains.
by akhaldi＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: akhaldi Date: Mon Nov 29 18:35:43 2010 New Revision: 49865 URL: http://svn.reactos.org/svn/reactos?rev=49865&view=rev Log: [CMAKE] - Add auto stubs support to the msvc based toolchains. 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=498… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Mon Nov 29 18:35:43 2010 @@ -196,9 +196,9 @@ get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - COMMAND native-spec2def -@ -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def -@ -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE) endmacro()

1 0

[akhaldi] 49864: [CMAKE] - Add auto stubs support to the gcc based toolchains.
by akhaldi＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: akhaldi Date: Mon Nov 29 18:33:07 2010 New Revision: 49864 URL: http://svn.reactos.org/svn/reactos?rev=49864&view=rev Log: [CMAKE] - Add auto stubs support to the gcc based toolchains. Modified: branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Nov 29 18:33:07 2010 @@ -200,11 +200,12 @@ 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=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c + COMMAND native-spec2def -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE) endmacro() # Optional 3rd parameter: dllname

1 0

[tkreuzer] 49863: add stubs.h
by tkreuzer＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: tkreuzer Date: Mon Nov 29 18:07:36 2010 New Revision: 49863 URL: http://svn.reactos.org/svn/reactos?rev=49863&view=rev Log: add stubs.h Added: branches/cmake-bringup/include/reactos/stubs.h (with props) Added: branches/cmake-bringup/include/reactos/stubs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/s… ============================================================================== --- branches/cmake-bringup/include/reactos/stubs.h (added) +++ branches/cmake-bringup/include/reactos/stubs.h [iso-8859-1] Mon Nov 29 18:07:36 2010 @@ -1,0 +1,17 @@ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/config.h" +#include "wine/exception.h" + +#include <debug.h> + +void __wine_spec_unimplemented_stub(const char *module, const char *function ) +{ + ULONG_PTR args[2]; + + args[0] = (ULONG_PTR)module; + args[1] = (ULONG_PTR)function; + RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); +} Propchange: branches/cmake-bringup/include/reactos/stubs.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 49862: [SPEC2DEF] - add support for stubs generation - add support for "proper" stubs, with calling convention and parameter dump - handle -private - change invokation a bit [CMAKE] - re...
by tkreuzer＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: tkreuzer Date: Mon Nov 29 17:53:20 2010 New Revision: 49862 URL: http://svn.reactos.org/svn/reactos?rev=49862&view=rev Log: [SPEC2DEF] - add support for stubs generation - add support for "proper" stubs, with calling convention and parameter dump - handle -private - change invokation a bit [CMAKE] - remove the old VARIANT hack Modified: branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Nov 29 17:53:20 2010 @@ -201,7 +201,7 @@ get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - COMMAND native-spec2def --dll ${_dllname} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def + COMMAND native-spec2def -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Mon Nov 29 17:53:20 2010 @@ -131,7 +131,7 @@ #idl files support set(IDL_COMPILER midl) -set(IDL_FLAGS /win32 /DIEnumVARIANT=IEnumXVARIANT) +set(IDL_FLAGS /win32) set(IDL_HEADER_ARG /h) #.h set(IDL_TYPELIB_ARG /tlb) #.tlb set(IDL_SERVER_ARG /sstub) #.c for stub server library @@ -146,13 +146,13 @@ # Generate the asm stub file add_custom_command( OUTPUT ${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 + COMMAND native-spec2def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} 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-spec2def -n -r ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def + COMMAND native-spec2def -@ -r -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) # Assemble the file @@ -196,7 +196,7 @@ 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=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES GENERATED TRUE) Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Mon Nov 29 17:53:20 2010 @@ -12,14 +12,23 @@ int nCallingConvention; int nOrdinal; int nStackBytes; + int nArgCount; + int anArgs[30]; + unsigned int uFlags; } EXPORT; -int (*OutputLine)(FILE *, EXPORT *); -void (*OutputHeader)(FILE *, char *); +typedef int (*PFNOUTLINE)(FILE *, EXPORT *); int no_decoration = 0; int no_redirections = 0; char *pszArchString = "i386"; char *pszArchString2; +char *pszDllName = 0; + +enum +{ + FL_PRIVATE = 1, + FL_STUB = 2, +}; enum { @@ -27,6 +36,16 @@ CC_CDECL, CC_FASTCALL, CC_EXTERN, + CC_STUB, +}; + +enum +{ + ARG_LONG, + ARG_PTR, + ARG_STR, + ARG_WSTR, + ARG_DBL }; char* astrCallingConventions[] = @@ -109,16 +128,100 @@ } void -OutputHeader_stub(FILE *file, char *libname) +OutputHeader_stub(FILE *file) +{ + fprintf(file, "/* This file is autogenerated, do not edit. */\n\n" + "#include <stubs.h>\n\n"); +} + +int +OutputLine_stub(FILE *file, EXPORT *pexp) +{ + int i; + + if (pexp->nCallingConvention != CC_STUB && + (pexp->uFlags & FL_STUB) == 0) return 0; + + fprintf(file, "int "); + if (strcmp(pszArchString, "i386") == 0 && + pexp->nCallingConvention == CC_STDCALL) + { + fprintf(file, "__stdcall "); + } + + fprintf(file, "%.*s(", pexp->nNameLength, pexp->pcName); + + for (i = 0; i < pexp->nArgCount; i++) + { + if (i != 0) fprintf(file, ", "); + switch (pexp->anArgs[i]) + { + case ARG_LONG: fprintf(file, "long"); break; + case ARG_PTR: fprintf(file, "void*"); break; + case ARG_STR: fprintf(file, "char*"); break; + case ARG_WSTR: fprintf(file, "wchar_t*"); break; + case ARG_DBL: fprintf(file, "__int64"); break; + } + fprintf(file, " a%d", i); + } + fprintf(file, ")\n{\n\tDPRINT1(\"WARNING: calling stub %.*s(", + pexp->nNameLength, pexp->pcName); + + for (i = 0; i < pexp->nArgCount; i++) + { + if (i != 0) fprintf(file, ","); + switch (pexp->anArgs[i]) + { + case ARG_LONG: fprintf(file, "0x%%lx"); break; + case ARG_PTR: fprintf(file, "0x%%p"); break; + case ARG_STR: fprintf(file, "'%%s'"); break; + case ARG_WSTR: fprintf(file, "'%%ws'"); break; + case ARG_DBL: fprintf(file, "%%\"PRix64\""); break; + } + } + fprintf(file, ")\\n\", "); + + for (i = 0; i < pexp->nArgCount; i++) + { + if (i != 0) fprintf(file, ", "); + switch (pexp->anArgs[i]) + { + case ARG_LONG: fprintf(file, "(long)a%d", i); break; + case ARG_PTR: fprintf(file, "(void*)a%d", i); break; + case ARG_STR: fprintf(file, "(char*)a%d", i); break; + case ARG_WSTR: fprintf(file, "(wchar_t*)a%d", i); break; + case ARG_DBL: fprintf(file, "(__int64)a%d", i); break; + } + } + fprintf(file, ");\n"); + + if (pexp->nCallingConvention == CC_STUB) + { + fprintf(file, "\t__wine_spec_unimplemented_stub(\"%s\", __FUNCTION__);\n", pszDllName); + } + + fprintf(file, "\treturn 0;\n}\n\n"); + + return 1; +} + +void +OutputHeader_asmstub(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) +OutputLine_asmstub(FILE *fileDest, EXPORT *pexp) +{ + /* Handle autoname */ + if (pexp->nNameLength == 1 && pexp->pcName[0] == '@') + { + fprintf(fileDest, "PUBLIC ordinal%d\nordinal%d: nop\n", + pexp->nOrdinal, pexp->nOrdinal); + } + else if (pexp->nCallingConvention == CC_STDCALL) { fprintf(fileDest, "PUBLIC _%.*s@%d\n_%.*s@%d: nop\n", pexp->nNameLength, pexp->pcName, pexp->nStackBytes, @@ -130,7 +233,8 @@ pexp->nNameLength, pexp->pcName, pexp->nStackBytes, pexp->nNameLength, pexp->pcName, pexp->nStackBytes); } - else if (pexp->nCallingConvention == CC_CDECL) + else if (pexp->nCallingConvention == CC_CDECL || + pexp->nCallingConvention == CC_STUB) { fprintf(fileDest, "PUBLIC _%.*s\n_%.*s: nop\n", pexp->nNameLength, pexp->pcName, @@ -157,63 +261,77 @@ } int -OutputLine_def(FILE *fileDest, EXPORT *exp) +OutputLine_def(FILE *fileDest, EXPORT *pexp) { 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) + + /* Handle autoname */ + if (pexp->nNameLength == 1 && pexp->pcName[0] == '@') + { + fprintf(fileDest, "ordinal%d", pexp->nOrdinal); + } + else + { + if (pexp->nCallingConvention == CC_FASTCALL && !no_decoration) + { + fprintf(fileDest, "@"); + } + + fprintf(fileDest, "%.*s", pexp->nNameLength, pexp->pcName); + + if ((pexp->nCallingConvention == CC_STDCALL || + pexp->nCallingConvention == CC_FASTCALL) && !no_decoration) + { + fprintf(fileDest, "@%d", pexp->nStackBytes); + } + } + + if (pexp->pcRedirection && !no_redirections) { int bAddDecorations = 1; fprintf(fileDest, "="); /* No decorations, if switch was passed or this is an external */ - if (no_decoration || ScanToken(exp->pcRedirection, '.')) + if (no_decoration || ScanToken(pexp->pcRedirection, '.')) { bAddDecorations = 0; } - if (exp->nCallingConvention == CC_FASTCALL && bAddDecorations) + if (pexp->nCallingConvention == CC_FASTCALL && bAddDecorations) { fprintf(fileDest, "@"); } - fprintf(fileDest, "%.*s", exp->nRedirectionLength, exp->pcRedirection); - if ((exp->nCallingConvention == CC_STDCALL || - exp->nCallingConvention == CC_FASTCALL) && bAddDecorations) - { - fprintf(fileDest, "@%d", exp->nStackBytes); - } - } - - if (exp->nOrdinal != -1) - { - fprintf(fileDest, " @%d", exp->nOrdinal); - } - - if (exp->nCallingConvention == CC_EXTERN) + fprintf(fileDest, "%.*s", pexp->nRedirectionLength, pexp->pcRedirection); + if ((pexp->nCallingConvention == CC_STDCALL || + pexp->nCallingConvention == CC_FASTCALL) && bAddDecorations) + { + fprintf(fileDest, "@%d", pexp->nStackBytes); + } + } + + if (pexp->nOrdinal != -1) + { + fprintf(fileDest, " @%d", pexp->nOrdinal); + } + + if (pexp->nCallingConvention == CC_EXTERN) { fprintf(fileDest, " DATA"); } + if (pexp->uFlags & FL_PRIVATE) + { + fprintf(fileDest, " PRIVATE"); + } + fprintf(fileDest, "\n"); return 1; } int -ParseFile(char* pcStart, FILE *fileDest) +ParseFile(char* pcStart, FILE *fileDest, PFNOUTLINE OutputLine) { char *pc, *pcLine; int nLine; @@ -228,6 +346,9 @@ { pc = pcLine; + exp.nArgCount = 0; + exp.uFlags = 0; + //fprintf(stderr, "info: line %d, token:'%d, %.20s'\n", // nLine, TokenLength(pcLine), pcLine); @@ -264,8 +385,7 @@ { exp.nCallingConvention = CC_CDECL; } - else if (CompareToken(pc, "fastcall") || - CompareToken(pc, "FASTCALL")) + else if (CompareToken(pc, "fastcall")) { exp.nCallingConvention = CC_FASTCALL; } @@ -275,9 +395,7 @@ } else if (CompareToken(pc, "stub")) { - pc = NextToken(pc); - printf("warning: stub skipped: %.*s\n", TokenLength(pc), pc); - continue; + exp.nCallingConvention = CC_STUB; } else { @@ -323,10 +441,17 @@ { if (_stricmp(pszArchString, "i386") != 0) included = 0; } + else if (CompareToken(pc, "-private")) + { + exp.uFlags |= FL_PRIVATE; + } + else if (CompareToken(pc, "-stub")) + { + exp.uFlags |= FL_STUB; + } else if (CompareToken(pc, "-noname") || CompareToken(pc, "-norelay") || - CompareToken(pc, "-ret64") || - CompareToken(pc, "-private")) + CompareToken(pc, "-ret64")) { /* silently ignore these */ } @@ -351,7 +476,8 @@ /* Handle parameters */ exp.nStackBytes = 0; - if (exp.nCallingConvention != CC_EXTERN) + if (exp.nCallingConvention != CC_EXTERN && + exp.nCallingConvention != CC_STUB) { //fprintf(stderr, "info: options:'%.10s'\n", pc); /* Go to next token */ @@ -375,15 +501,26 @@ while (*pc >= '0') { if (CompareToken(pc, "long")) + { exp.nStackBytes += 4; + exp.anArgs[exp.nArgCount] = ARG_LONG; + } else if (CompareToken(pc, "double")) + { exp.nStackBytes += 8; + exp.anArgs[exp.nArgCount] = ARG_DBL; + } else if (CompareToken(pc, "ptr") || CompareToken(pc, "str") || CompareToken(pc, "wstr")) + { exp.nStackBytes += sizeof(void*); + exp.anArgs[exp.nArgCount] = ARG_PTR; // FIXME: handle strings + } else fprintf(stderr, "error: line %d, expected type, got: %.10s\n", nLine, pc); + + exp.nArgCount++; /* Go to next parameter */ if (!(pc = NextToken(pc))) @@ -431,17 +568,20 @@ { 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" - " --arch <arch> Set architecture to <arch>. (i386, x86_64, arm)\n"); + " -l=<file> generates an asm lib stub\n" + " -d=<file> generates a def file\n" + " -s=<file> generates a stub file\n" + " -n=<file> names the dll\n" + " -@ removes @xx decorations from def file\n" + " -r removes redirections from def file\n" + " -a=<arch> Set architecture to <arch>. (i386, x86_64, arm)\n"); } int main(int argc, char *argv[]) { size_t nFileSize; - char *pszSource, *pszDllName = 0; + char *pszSource, *pszDefFileName = 0, *pszStubFileName = 0, *pszLibStubName = 0; char achDllName[40]; FILE *file; int result, i; @@ -452,10 +592,6 @@ return -1; } - /* Default to def file */ - OutputLine = OutputLine_def; - OutputHeader = OutputHeader_def; - /* Read options */ for (i = 1; i < argc && *argv[i] == '-'; i++) { @@ -465,32 +601,33 @@ 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)) + else if (argv[i][1] == 'd' && argv[i][2] == '=') + { + pszDefFileName = argv[i] + 3; + } + else if (argv[i][1] == 'l' && argv[i][2] == '=') + { + pszLibStubName = argv[i] + 3; + } + else if (argv[i][1] == 's' && argv[i][2] == '=') + { + pszStubFileName = argv[i] + 3; + } + else if (argv[i][1] == 'n' && argv[i][2] == '=') + { + pszDllName = argv[i] + 3; + } + else if ((_stricmp(argv[i], "-@") == 0)) { no_decoration = 1; } - else if ((_stricmp(argv[i], "--no-redirection") == 0) || - (_stricmp(argv[i], "-r") == 0)) + else if ((_stricmp(argv[i], "-r") == 0)) { no_redirections = 1; } - else if ((_stricmp(argv[i], "--arch") == 0)) - { - pszArchString = argv[i + 1]; - i++; + else if (argv[i][1] == 'a' && argv[i][1] == '=') + { + pszArchString = argv[i] + 3; } else { @@ -555,21 +692,52 @@ /* 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); + if (pszDefFileName) + { + /* Open output file */ + file = fopen(pszDefFileName, "w"); + if (!file) + { + fprintf(stderr, "error: could not open output file %s ", argv[i + 1]); + return -5; + } + + OutputHeader_def(file, pszDllName); + result = ParseFile(pszSource, file, OutputLine_def); + fclose(file); + } + + if (pszStubFileName) + { + /* Open output file */ + file = fopen(pszStubFileName, "w"); + if (!file) + { + fprintf(stderr, "error: could not open output file %s ", argv[i + 1]); + return -5; + } + + OutputHeader_stub(file); + result = ParseFile(pszSource, file, OutputLine_stub); + fclose(file); + } + + if (pszLibStubName) + { + /* Open output file */ + file = fopen(pszLibStubName, "w"); + if (!file) + { + fprintf(stderr, "error: could not open output file %s ", argv[i + 1]); + return -5; + } + + OutputHeader_asmstub(file, pszDllName); + result = ParseFile(pszSource, file, OutputLine_asmstub); + fprintf(file, "\nEND\n"); + fclose(file); + } + return result; }

1 0

[jimtabor] 49861: [User32] - Fixed export for PrintWindow see bug 5466 and 5609.
by jimtabor＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: jimtabor Date: Mon Nov 29 16:48:27 2010 New Revision: 49861 URL: http://svn.reactos.org/svn/reactos?rev=49861&view=rev Log: [User32] - Fixed export for PrintWindow see bug 5466 and 5609. Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/user32.pspec Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Mon Nov 29 16:48:27 2010 @@ -311,7 +311,7 @@ } /* - * @unimplemented + * @implemented */ LRESULT WINAPI @@ -320,8 +320,9 @@ INT nInput, UINT cbSizeHeader) { - UNIMPLEMENTED; - return 0; + if (cbSizeHeader == sizeof(RAWINPUTHEADER)) + return S_OK; + return 1; } /* @@ -391,20 +392,6 @@ */ BOOL WINAPI -PrintWindow( - HWND hwnd, - HDC hdcBlt, - UINT nFlags) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI RegisterRawInputDevices( PCRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, Modified: trunk/reactos/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.ps… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Mon Nov 29 16:48:27 2010 @@ -526,7 +526,7 @@ @ stdcall PostQuitMessage(long) @ stdcall PostThreadMessageA(long long long long) @ stdcall PostThreadMessageW(long long long long) -; @ stub PrintWindow +@ stdcall PrintWindow(ptr ptr long) NtUserPrintWindow @ stdcall PrivateExtractIconExA(str long ptr ptr long) @ stdcall PrivateExtractIconExW(wstr long ptr ptr long) @ stdcall PrivateExtractIconsA(str long long long ptr ptr long long)

1 0

[tkreuzer] 49860: [DXSDK] Don't use stdole32.tlb. Seems that this is the problem that made midl fail. Maybe not. Yesterday it was all about VARIANT, which has no effect today. Let's see what tomorr...
by tkreuzer＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: tkreuzer Date: Mon Nov 29 14:43:30 2010 New Revision: 49860 URL: http://svn.reactos.org/svn/reactos?rev=49860&view=rev Log: [DXSDK] Don't use stdole32.tlb. Seems that this is the problem that made midl fail. Maybe not. Yesterday it was all about VARIANT, which has no effect today. Let's see what tomorrow will bring :-? Modified: branches/cmake-bringup/include/dxsdk/bdatif.idl Modified: branches/cmake-bringup/include/dxsdk/bdatif.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/dxsdk/bda… ============================================================================== --- branches/cmake-bringup/include/dxsdk/bdatif.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/dxsdk/bdatif.idl [iso-8859-1] Mon Nov 29 14:43:30 2010 @@ -254,7 +254,9 @@ ] library PSISLOADLib { +#ifndef __midl importlib("stdole32.tlb"); +#endif importlib("stdole2.tlb"); [

1 0

[tkreuzer] 49859: [WINE] Add msvchelper.h, a file that helps wine dx stuff to comple on msvc.
by tkreuzer＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: tkreuzer Date: Mon Nov 29 09:29:20 2010 New Revision: 49859 URL: http://svn.reactos.org/svn/reactos?rev=49859&view=rev Log: [WINE] Add msvchelper.h, a file that helps wine dx stuff to comple on msvc. Added: branches/cmake-bringup/include/reactos/msvchelper.h (with props) Added: branches/cmake-bringup/include/reactos/msvchelper.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/m… ============================================================================== --- branches/cmake-bringup/include/reactos/msvchelper.h (added) +++ branches/cmake-bringup/include/reactos/msvchelper.h [iso-8859-1] Mon Nov 29 09:29:20 2010 @@ -1,0 +1,32 @@ + +// +#ifdef _M_IX86 +void __stdcall wined3d_mutex_lock(void); +void __stdcall wined3d_mutex_unlock(void); +void* __stdcall WineDirect3DCreate(unsigned int dxVersion,void *parent); + +void __inline wined3d_mutex_lock_inline(void) +{ + wined3d_mutex_lock(); +} + +void __inline wined3d_mutex_unlock_inline(void) +{ + wined3d_mutex_unlock(); +} + +__inline +struct IWineD3D* WineDirect3DCreate_inline(unsigned int dxVersion,void *parent) +{ + return WineDirect3DCreate(dxVersion, parent); +} + +#define wined3d_mutex_lock wined3d_mutex_lock_inline +#define wined3d_mutex_unlock wined3d_mutex_unlock_inline +#define WineDirect3DCreate WineDirect3DCreate_inline + +#endif /* _M_IX86 */ + + + + Propchange: branches/cmake-bringup/include/reactos/msvchelper.h ------------------------------------------------------------------------------ svn:eol-style = native

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 November 2010