Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 61029: [CMAKE] - Make C4113 (function pointer parameter lists differ) an error. CORE-7538 - Properly ignore "export of deleting destructor" warning in msvcrt
by tfaber＠svn.reactos.org 17 Nov '13

17 Nov '13

Author: tfaber Date: Sun Nov 17 23:38:31 2013 New Revision: 61029 URL: http://svn.reactos.org/svn/reactos?rev=61029&view=rev Log: [CMAKE] - Make C4113 (function pointer parameter lists differ) an error. CORE-7538 - Properly ignore "export of deleting destructor" warning in msvcrt Modified: trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/win32/msvcrt/CMakeLists.txt Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=61029… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Nov 17 23:38:31 2013 @@ -44,11 +44,12 @@ # - TODO: C4090: different 'modifier' qualifiers (for C programs only; # for C++ programs, the compiler error C2440 is issued) # - C4098: void function returning a value +# - C4113: parameter lists differ # - C4129: unrecognized escape sequence # - TODO: C4133: incompatible types # - C4229: modifiers on data are ignored # - C4700: uninitialized variable usage -add_compile_flags("/we4022 /we4047 /we4098 /we4129 /we4229 /we4700") +add_compile_flags("/we4022 /we4047 /we4098 /we4113 /we4129 /we4229 /we4700") # Debugging #if(${CMAKE_BUILD_TYPE} STREQUAL "Debug") Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Sun Nov 17 23:38:31 2013 @@ -26,6 +26,7 @@ if(MSVC) # export of deleting destructor "name" add_target_link_flags(msvcrt "/ignore:4102") + add_target_link_flags(libmsvcrt "/ignore:4102") endif() add_importlibs(msvcrt kernel32 ntdll)

1 0

[tkreuzer] 61028: [SPEC2DEF] Remove a spurious %
by tkreuzer＠svn.reactos.org 17 Nov '13

17 Nov '13

Author: tkreuzer Date: Sun Nov 17 22:43:23 2013 New Revision: 61028 URL: http://svn.reactos.org/svn/reactos?rev=61028&view=rev Log: [SPEC2DEF] Remove a spurious % Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Sun Nov 17 22:43:23 2013 @@ -359,7 +359,7 @@ /* Print the prefix, but skip it for (GCC && stdcall) */ if (gbMSComp || (pexp->nCallingConvention != CC_STDCALL)) { - fprintf(fileDest, "%c%", pexp->nCallingConvention == CC_FASTCALL ? '@' : '_'); + fprintf(fileDest, "%c", pexp->nCallingConvention == CC_FASTCALL ? '@' : '_'); } /* Print the name with trailing decoration */

1 0

[tkreuzer] 61027: [SPEC2DEF] Fix MSVC build as well
by tkreuzer＠svn.reactos.org 17 Nov '13

17 Nov '13

Author: tkreuzer Date: Sun Nov 17 22:31:15 2013 New Revision: 61027 URL: http://svn.reactos.org/svn/reactos?rev=61027&view=rev Log: [SPEC2DEF] Fix MSVC build as well Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Sun Nov 17 22:31:15 2013 @@ -427,8 +427,8 @@ /* Check if this is a forwarded export */ if (pexp->strTarget.buf) { + int fIsExternal = !!ScanToken(pexp->strTarget.buf, '.'); DbgPrint("Got redirect '%.*s'\n", pexp->strTarget.len, pexp->strTarget.buf); - int fIsExternal = !!ScanToken(pexp->strTarget.buf, '.'); /* print the target name, don't decorate if it is external */ fprintf(fileDest, "=");

1 0

[ekohl] 61026: [EVENTLOG] LogfInitializeExisting: Do not try to write to a file that has been opened as a backup file. It has been opened read-only.
by ekohl＠svn.reactos.org 17 Nov '13

17 Nov '13

Author: ekohl Date: Sun Nov 17 22:30:55 2013 New Revision: 61026 URL: http://svn.reactos.org/svn/reactos?rev=61026&view=rev Log: [EVENTLOG] LogfInitializeExisting: Do not try to write to a file that has been opened as a backup file. It has been opened read-only. Modified: trunk/reactos/base/services/eventlog/file.c Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Sun Nov 17 22:30:55 2013 @@ -82,7 +82,7 @@ static NTSTATUS -LogfInitializeExisting(PLOGFILE LogFile) +LogfInitializeExisting(PLOGFILE LogFile, BOOL Backup) { DWORD dwRead; DWORD dwRecordsNumber = 0; @@ -264,27 +264,30 @@ But for now limit EventLog size to just under 5K. */ LogFile->Header.MaxSize = 5000; - if (SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN) == - INVALID_SET_FILE_POINTER) - { - DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); - return STATUS_EVENTLOG_FILE_CORRUPT; - } - - if (!WriteFile(LogFile->hFile, - &LogFile->Header, - sizeof(EVENTLOGHEADER), - &dwRead, - NULL)) - { - DPRINT1("WriteFile failed! %d\n", GetLastError()); - return STATUS_EVENTLOG_FILE_CORRUPT; - } - - if (!FlushFileBuffers(LogFile->hFile)) - { - DPRINT1("FlushFileBuffers failed! %d\n", GetLastError()); - return STATUS_EVENTLOG_FILE_CORRUPT; + if (!Backup) + { + if (SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN) == + INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); + return STATUS_EVENTLOG_FILE_CORRUPT; + } + + if (!WriteFile(LogFile->hFile, + &LogFile->Header, + sizeof(EVENTLOGHEADER), + &dwRead, + NULL)) + { + DPRINT1("WriteFile failed! %d\n", GetLastError()); + return STATUS_EVENTLOG_FILE_CORRUPT; + } + + if (!FlushFileBuffers(LogFile->hFile)) + { + DPRINT1("FlushFileBuffers failed! %d\n", GetLastError()); + return STATUS_EVENTLOG_FILE_CORRUPT; + } } return STATUS_SUCCESS; @@ -380,7 +383,7 @@ if (bCreateNew) Status = LogfInitializeNew(pLogFile); else - Status = LogfInitializeExisting(pLogFile); + Status = LogfInitializeExisting(pLogFile, Backup); if (!NT_SUCCESS(Status)) goto fail;

1 0

[tkreuzer] 61025: [CMAKE/SPEC2DEF] Fix build.
by tkreuzer＠svn.reactos.org 17 Nov '13

17 Nov '13

Author: tkreuzer Date: Sun Nov 17 22:24:02 2013 New Revision: 61025 URL: http://svn.reactos.org/svn/reactos?rev=61025&view=rev Log: [CMAKE/SPEC2DEF] Fix build. Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=61025&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Nov 17 22:24:02 2013 @@ -279,7 +279,7 @@ # generate exports def and stubs C file for the module add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c - COMMAND native-spec2def -n=${_dllname} --kill-at -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) if(__add_importlib) Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Sun Nov 17 22:24:02 2013 @@ -827,8 +827,7 @@ " -s=<file> generates a stub file\n" " --ms msvc compatibility\n" " -n=<name> name of the dll\n" - " --kill-at removes @xx decorations from exports\n" - " -r removes redirections from def file\n" + " --implib generate a def file for an import library\n" " -a=<arch> Set architecture to <arch>. (i386, x86_64, arm)\n"); }

1 0

[tkreuzer] 61024: [SPEC2DEF] Rewrite the code for generating def files. Remove useless switches. Seperate code for GCC and MSVC for easier maintainability. Make use of the new dlltool feature imple...
by tkreuzer＠svn.reactos.org 17 Nov '13

17 Nov '13

Author: tkreuzer Date: Sun Nov 17 22:11:04 2013 New Revision: 61024 URL: http://svn.reactos.org/svn/reactos?rev=61024&view=rev Log: [SPEC2DEF] Rewrite the code for generating def files. Remove useless switches. Seperate code for GCC and MSVC for easier maintainability. Make use of the new dlltool feature implemented by Kai Tietz, that allows to specify the name of an import/export. It is now possible to both export stdcall and fastcall decorated symbols as well as import from them. Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=61024&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Nov 17 22:11:04 2013 @@ -96,6 +96,7 @@ if(ARCH STREQUAL "i386") add_compile_flags("-mpreferred-stack-boundary=3 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer") + # FIXME: this doesn't work. CMAKE_BUILD_TYPE is always "Debug" if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") add_compile_flags("-momit-leaf-frame-pointer") endif() @@ -241,7 +242,7 @@ # generate the def for the import lib add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def - COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} --implib -d=${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def PROPERTIES EXTERNAL_OBJECT TRUE) Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=61024… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Nov 17 22:11:04 2013 @@ -176,7 +176,7 @@ # Generate the asm stub file and the def file for import library add_custom_command( OUTPUT ${_asm_stubs_file} ${_def_file} - COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_dllname} -d=${_def_file} -l=${_asm_stubs_file} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def --ms -a=${SPEC2DEF_ARCH} --implib -n=${_dllname} -d=${_def_file} -l=${_asm_stubs_file} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) if(MSVC_IDE) @@ -233,7 +233,7 @@ #generate def for the DLL and C stubs file add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c - COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def --ms -a=${SPEC2DEF_ARCH} -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} native-spec2def) if(__add_importlib) Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Sun Nov 17 22:11:04 2013 @@ -7,12 +7,16 @@ #define strcasecmp _stricmp #endif +typedef struct _STRING +{ + const char *buf; + int len; +} STRING, *PSTRING; + typedef struct { - char *pcName; - int nNameLength; - char *pcRedirection; - int nRedirectionLength; + STRING strName; + STRING strTarget; int nCallingConvention; int nOrdinal; int nStackBytes; @@ -32,15 +36,15 @@ }; typedef int (*PFNOUTLINE)(FILE *, EXPORT *); -int gbKillAt = 0; int gbMSComp = 0; int gbImportLib = 0; -int no_redirections = 0; int giArch = ARCH_X86; char *pszArchString = "i386"; char *pszArchString2; char *pszDllName = 0; char *gpszUnderscore = ""; +int gbDebug; +#define DbgPrint(...) (!gbDebug || fprintf(stderr, __VA_ARGS__)) enum { @@ -101,12 +105,13 @@ return 1; } -int +const char * ScanToken(const char *token, char chr) { while (!IsSeparator(*token)) { - if (*token++ == chr) return 1; + if (*token == chr) return token; + token++; } return 0; } @@ -174,13 +179,13 @@ } /* Check for C++ */ - if (pexp->pcName[0] == '?') + if (pexp->strName.buf[0] == '?') { fprintf(file, "stub_function%d(", pexp->nNumber); } else { - fprintf(file, "%.*s(", pexp->nNameLength, pexp->pcName); + fprintf(file, "%.*s(", pexp->strName.len, pexp->strName.buf); } for (i = 0; i < pexp->nArgCount; i++) @@ -200,7 +205,7 @@ fprintf(file, " a%d", i); } fprintf(file, ")\n{\n\tDPRINT1(\"WARNING: calling stub %.*s(", - pexp->nNameLength, pexp->pcName); + pexp->strName.len, pexp->strName.buf); for (i = 0; i < pexp->nArgCount; i++) { @@ -261,7 +266,7 @@ OutputLine_asmstub(FILE *fileDest, EXPORT *pexp) { /* Handle autoname */ - if (pexp->nNameLength == 1 && pexp->pcName[0] == '@') + if (pexp->strName.len == 1 && pexp->strName.buf[0] == '@') { fprintf(fileDest, "PUBLIC %sordinal%d\n%sordinal%d: nop\n", gpszUnderscore, pexp->nOrdinal, gpszUnderscore, pexp->nOrdinal); @@ -269,33 +274,33 @@ else if (giArch != ARCH_X86) { fprintf(fileDest, "PUBLIC _stub_%.*s\n_stub_%.*s: nop\n", - pexp->nNameLength, pexp->pcName, - pexp->nNameLength, pexp->pcName); + pexp->strName.len, pexp->strName.buf, + pexp->strName.len, pexp->strName.buf); } else if (pexp->nCallingConvention == CC_STDCALL) { fprintf(fileDest, "PUBLIC __stub_%.*s@%d\n__stub_%.*s@%d: nop\n", - pexp->nNameLength, pexp->pcName, pexp->nStackBytes, - pexp->nNameLength, pexp->pcName, pexp->nStackBytes); + pexp->strName.len, pexp->strName.buf, pexp->nStackBytes, + pexp->strName.len, pexp->strName.buf, pexp->nStackBytes); } else if (pexp->nCallingConvention == CC_FASTCALL) { fprintf(fileDest, "PUBLIC @_stub_%.*s@%d\n@_stub_%.*s@%d: nop\n", - pexp->nNameLength, pexp->pcName, pexp->nStackBytes, - pexp->nNameLength, pexp->pcName, pexp->nStackBytes); + pexp->strName.len, pexp->strName.buf, pexp->nStackBytes, + pexp->strName.len, pexp->strName.buf, pexp->nStackBytes); } else if (pexp->nCallingConvention == CC_CDECL || pexp->nCallingConvention == CC_STUB) { fprintf(fileDest, "PUBLIC __stub_%.*s\n__stub_%.*s: nop\n", - pexp->nNameLength, pexp->pcName, - pexp->nNameLength, pexp->pcName); + pexp->strName.len, pexp->strName.buf, + pexp->strName.len, pexp->strName.buf); } else if (pexp->nCallingConvention == CC_EXTERN) { fprintf(fileDest, "PUBLIC __stub_%.*s\n__stub_%.*s:\n", - pexp->nNameLength, pexp->pcName, - pexp->nNameLength, pexp->pcName); + pexp->strName.len, pexp->strName.buf, + pexp->strName.len, pexp->strName.buf); } return 1; @@ -312,25 +317,151 @@ } void -PrintName(FILE *fileDest, EXPORT *pexp, char *pszPrefix, int fRedir, int fDeco) -{ - char *pcName = fRedir ? pexp->pcRedirection : pexp->pcName; - int nNameLength = fRedir ? pexp->nRedirectionLength : pexp->nNameLength; - - /* Handle autoname */ - if (nNameLength == 1 && pcName[0] == '@') - { - fprintf(fileDest, "ordinal%d", pexp->nOrdinal); +PrintName(FILE *fileDest, EXPORT *pexp, PSTRING pstr, int fDeco) +{ + const char *pcName = pstr->buf; + int nNameLength = pstr->len; + const char* pcDot, *pcAt; + + if ((giArch == ARCH_X86) && fDeco && + ((pexp->nCallingConvention == CC_STDCALL) || + (pexp->nCallingConvention == CC_FASTCALL))) + { + /* Scan for a dll forwarding dot */ + pcDot = ScanToken(pcName, '.'); + if (pcDot) + { + /* First print the dll name, followed by a dot */ + nNameLength = pcDot - pcName; + fprintf(fileDest, "%.*s.", nNameLength, pcName); + + /* Now the actual function name */ + pcName = pcDot + 1; + nNameLength = pexp->strTarget.len - nNameLength - 1; + } + + /* Does the string already have decoration? */ + pcAt = ScanToken(pcName, '@'); + if (pcAt && (pcAt < (pcName + nNameLength))) + { + /* On GCC, we need to remove the leading stdcall underscore */ + if (!gbMSComp && (pexp->nCallingConvention == CC_STDCALL)) + { + pcName++; + nNameLength--; + } + + /* Print the already decorated function name */ + fprintf(fileDest, "%.*s", nNameLength, pcName); + } + else + { + /* Print the prefix, but skip it for (GCC && stdcall) */ + if (gbMSComp || (pexp->nCallingConvention != CC_STDCALL)) + { + fprintf(fileDest, "%c%", pexp->nCallingConvention == CC_FASTCALL ? '@' : '_'); + } + + /* Print the name with trailing decoration */ + fprintf(fileDest, "%.*s@%d", nNameLength, pcName, pexp->nStackBytes); + } } else { - if (fDeco && pexp->nCallingConvention == CC_FASTCALL) - fprintf(fileDest, "@"); - fprintf(fileDest, "%s%.*s", pszPrefix, nNameLength, pcName); - if ((pexp->nCallingConvention == CC_STDCALL || - pexp->nCallingConvention == CC_FASTCALL) && fDeco) - { - fprintf(fileDest, "@%d", pexp->nStackBytes); + /* Print the undecorated function name */ + fprintf(fileDest, "%.*s", nNameLength, pcName); + } +} + +void +OutputLine_def_MS(FILE *fileDest, EXPORT *pexp) +{ + PrintName(fileDest, pexp, &pexp->strName, 0); + + if (gbImportLib) + { + /* Redirect to a stub function, to get the right decoration in the lib */ + fprintf(fileDest, "=_stub_%.*s", pexp->strName.len, pexp->strName.buf); + } + else if (pexp->strTarget.buf) + { + if (pexp->strName.buf[0] == '?') + { + fprintf(stderr, "warning: ignoring C++ redirection %.*s -> %.*s\n", + pexp->strName.len, pexp->strName.buf, pexp->strTarget.len, pexp->strTarget.buf); + } + else + { + fprintf(fileDest, "="); + + /* If the original name was decorated, use decoration in the forwarder as well */ + if ((giArch == ARCH_X86) && ScanToken(pexp->strName.buf, '@') && + !ScanToken(pexp->strTarget.buf, '@') && + ((pexp->nCallingConvention == CC_STDCALL) || + (pexp->nCallingConvention == CC_FASTCALL)) ) + { + PrintName(fileDest, pexp, &pexp->strTarget, 1); + } + else + { + /* Write the undecorated redirection name */ + fprintf(fileDest, "%.*s", pexp->strTarget.len, pexp->strTarget.buf); + } + } + } + else if (((pexp->uFlags & FL_STUB) || (pexp->nCallingConvention == CC_STUB)) && + (pexp->strName.buf[0] == '?')) + { + /* C++ stubs are forwarded to C stubs */ + fprintf(fileDest, "=stub_function%d", pexp->nNumber); + } +} + +void +OutputLine_def_GCC(FILE *fileDest, EXPORT *pexp) +{ + /* Print the function name, with decoration for export libs */ + PrintName(fileDest, pexp, &pexp->strName, gbImportLib); + DbgPrint("Generating def line for '%.*s'\n", pexp->strName.len, pexp->strName.buf); + + /* Check if this is a forwarded export */ + if (pexp->strTarget.buf) + { + DbgPrint("Got redirect '%.*s'\n", pexp->strTarget.len, pexp->strTarget.buf); + int fIsExternal = !!ScanToken(pexp->strTarget.buf, '.'); + + /* print the target name, don't decorate if it is external */ + fprintf(fileDest, "="); + PrintName(fileDest, pexp, &pexp->strTarget, !fIsExternal); + } + else if (((pexp->uFlags & FL_STUB) || (pexp->nCallingConvention == CC_STUB)) && + (pexp->strName.buf[0] == '?')) + { + /* C++ stubs are forwarded to C stubs */ + fprintf(fileDest, "=stub_function%d", pexp->nNumber); + } + + /* Special handling for stdcall and fastcall */ + if ((giArch == ARCH_X86) && + ((pexp->nCallingConvention == CC_STDCALL) || + (pexp->nCallingConvention == CC_FASTCALL))) + { + /* Is this the import lib? */ + if (gbImportLib) + { + /* Is the name in the spec file decorated? */ + const char* pcDeco = ScanToken(pexp->strName.buf, '@'); + if (pcDeco && (pcDeco < pexp->strName.buf + pexp->strName.len)) + { + /* Write the name including the leading @ */ + fprintf(fileDest, "==%.*s", pexp->strName.len, pexp->strName.buf); + } + } + else if (!pexp->strTarget.buf) + { + /* Write a forwarder to the actual decorated symbol */ + fprintf(fileDest, "="); + PrintName(fileDest, pexp, &pexp->strName, 1); } } } @@ -340,43 +471,10 @@ { fprintf(fileDest, " "); - PrintName(fileDest, pexp, "", 0, (giArch == ARCH_X86) && !gbKillAt); - - if (gbImportLib) - { - fprintf(fileDest, "="); - PrintName(fileDest, pexp, "_stub_", 0, 0); - } - else if (pexp->pcRedirection) - { - if (gbMSComp && (pexp->pcName[0] == '?')) - { - fprintf(stderr, "warning: ignoring C++ redirection %.*s -> %.*s\n", - pexp->nNameLength, pexp->pcName, pexp->nRedirectionLength, pexp->pcRedirection); - } - else - { - int fDeco; - - fDeco = ((giArch == ARCH_X86) && !ScanToken(pexp->pcRedirection, '.')); - fprintf(fileDest, "="); - PrintName(fileDest, pexp, "", 1, fDeco && !gbMSComp); - } - } - else if (((pexp->uFlags & FL_STUB) || (pexp->nCallingConvention == CC_STUB)) && - (pexp->pcName[0] == '?')) - { - /* C++ stubs are forwarded to C stubs */ - fprintf(fileDest, "="); - fprintf(fileDest, "stub_function%d", pexp->nNumber); - } - else if ((giArch == ARCH_X86) && gbKillAt && !gbMSComp && - (pexp->nCallingConvention == CC_STDCALL || - pexp->nCallingConvention == CC_FASTCALL)) - { - fprintf(fileDest, "="); - PrintName(fileDest, pexp, "", 0, 1); - } + if (gbMSComp) + OutputLine_def_MS(fileDest, pexp); + else + OutputLine_def_GCC(fileDest, pexp); if (pexp->nOrdinal != -1) { @@ -410,6 +508,7 @@ int nLine; EXPORT exp; int included; + char namebuffer[16]; //fprintf(stderr, "info: line %d, pcStart:'%.30s'\n", nLine, pcStart); @@ -424,6 +523,10 @@ exp.uFlags = 0; exp.nNumber++; + + //if (!strncmp(pcLine, "22 stdcall @(long) MPR_Alloc",28)) + // gbDebug = 1; + //fprintf(stderr, "info: line %d, token:'%d, %.20s'\n", // nLine, TokenLength(pcLine), pcLine); @@ -448,7 +551,7 @@ return -10; } - //fprintf(stderr, "info: Token:'%.10s'\n", pc); + //fprintf(stderr, "info: Token:'%.*s'\n", TokenLength(pc), pc); /* Now we should get the type */ if (CompareToken(pc, "stdcall")) @@ -478,7 +581,7 @@ } else { - fprintf(stderr, "error: line %d, expected type, got '%.*s' %d\n", + fprintf(stderr, "error: line %d, expected callconv, got '%.*s' %d\n", nLine, TokenLength(pc), pc, *pc); return -11; } @@ -555,8 +658,17 @@ if (!included) continue; /* Get name */ - exp.pcName = pc; - exp.nNameLength = TokenLength(pc); + exp.strName.buf = pc; + exp.strName.len = TokenLength(pc); + + /* Check for autoname */ + if ((exp.strName.len == 1) && (exp.strName.buf[0] == '@')) + { + sprintf(namebuffer, "ordinal%d", exp.nOrdinal); + exp.strName.len = strlen(namebuffer); + exp.strName.buf = namebuffer; + exp.uFlags |= FL_NONAME; + } /* Handle parameters */ exp.nStackBytes = 0; @@ -649,12 +761,14 @@ else { /* Check for stdcall name */ - char *p = strchr(pc, '@'); - if (p && (p - pc < exp.nNameLength)) + const char *p = ScanToken(pc, '@'); + if (p && (p - pc < exp.strName.len)) { int i; - exp.nNameLength = (int)(p - pc); - if (exp.nNameLength < 1) + + /* Truncate the name to before the @ */ + exp.strName.len = (int)(p - pc); + if (exp.strName.len < 1) { fprintf(stderr, "error, @ in line %d\n", nLine); return -1; @@ -673,8 +787,8 @@ pc = NextToken(pc); if (pc) { - exp.pcRedirection = pc; - exp.nRedirectionLength = TokenLength(pc); + exp.strTarget.buf = pc; + exp.strTarget.len = TokenLength(pc); /* Check syntax (end of line) */ if (NextToken(pc)) @@ -685,11 +799,18 @@ } else { - exp.pcRedirection = 0; - exp.nRedirectionLength = 0; + exp.strTarget.buf = 0; + exp.strTarget.len = 0; + } + + /* Check for no-name without ordinal */ + if ((exp.uFlags & FL_NONAME) && (exp.nOrdinal == -1)) + { + fprintf(stderr, "error: line %d, noname export without ordinal!\n", nLine); } OutputLine(fileDest, &exp); + gbDebug = 0; } return 0; @@ -752,20 +873,11 @@ } else if ((strcasecmp(argv[i], "--implib") == 0)) { - no_redirections = 1; gbImportLib = 1; } - else if ((strcasecmp(argv[i], "--kill-at") == 0)) - { - gbKillAt = 1; - } else if ((strcasecmp(argv[i], "--ms") == 0)) { gbMSComp = 1; - } - else if ((strcasecmp(argv[i], "-r") == 0)) - { - no_redirections = 1; } else if (argv[i][1] == 'a' && argv[i][2] == '=') {

1 0

[tfaber] 61023: [USER32] - Fix MSVC warnings
by tfaber＠svn.reactos.org 17 Nov '13

17 Nov '13

Author: tfaber Date: Sun Nov 17 22:10:42 2013 New Revision: 61023 URL: http://svn.reactos.org/svn/reactos?rev=61023&view=rev Log: [USER32] - Fix MSVC warnings Modified: trunk/reactos/win32ss/user/user32/misc/usrapihk.c Modified: trunk/reactos/win32ss/user/user32/misc/usrapihk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/u… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/usrapihk.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/usrapihk.c [iso-8859-1] Sun Nov 17 22:10:42 2013 @@ -132,21 +132,21 @@ { // Setup Structure..... puah->size = sizeof(USERAPIHOOK); - puah->DefWindowProcA = (WNDPROC)RealDefWindowProcA; - puah->DefWindowProcW = (WNDPROC)RealDefWindowProcW; + puah->DefWindowProcA = RealDefWindowProcA; + puah->DefWindowProcW = RealDefWindowProcW; puah->DefWndProcArray.MsgBitArray = NULL; puah->DefWndProcArray.Size = 0; puah->GetScrollInfo = (FARPROC)RealGetScrollInfo; puah->SetScrollInfo = (FARPROC)RealSetScrollInfo; puah->EnableScrollBar = (FARPROC)NtUserEnableScrollBar; puah->AdjustWindowRectEx = (FARPROC)RealAdjustWindowRectEx; - puah->SetWindowRgn = (FARPROC)NtUserSetWindowRgn; - puah->PreWndProc = (WNDPROC_OWP)DefaultOWP; - puah->PostWndProc = (WNDPROC_OWP)DefaultOWP; + puah->SetWindowRgn = NtUserSetWindowRgn; + puah->PreWndProc = DefaultOWP; + puah->PostWndProc = DefaultOWP; puah->WndProcArray.MsgBitArray = NULL; puah->WndProcArray.Size = 0; - puah->PreDefDlgProc = (WNDPROC_OWP)DefaultOWP; - puah->PostDefDlgProc = (WNDPROC_OWP)DefaultOWP; + puah->PreDefDlgProc = DefaultOWP; + puah->PostDefDlgProc = DefaultOWP; puah->DlgProcArray.MsgBitArray = NULL; puah->DlgProcArray.Size = 0; puah->GetSystemMetrics = (FARPROC)RealGetSystemMetrics; @@ -343,19 +343,19 @@ USERAPIHOOK guah = { sizeof(USERAPIHOOK), - (WNDPROC)RealDefWindowProcA, - (WNDPROC)RealDefWindowProcW, + RealDefWindowProcA, + RealDefWindowProcW, {NULL, 0}, (FARPROC)RealGetScrollInfo, (FARPROC)RealSetScrollInfo, (FARPROC)NtUserEnableScrollBar, (FARPROC)RealAdjustWindowRectEx, - (FARPROC)NtUserSetWindowRgn, - (WNDPROC_OWP)DefaultOWP, - (WNDPROC_OWP)DefaultOWP, + NtUserSetWindowRgn, + DefaultOWP, + DefaultOWP, {NULL, 0}, - (WNDPROC_OWP)DefaultOWP, - (WNDPROC_OWP)DefaultOWP, + DefaultOWP, + DefaultOWP, {NULL, 0}, (FARPROC)RealGetSystemMetrics, (FARPROC)RealSystemParametersInfoA,

1 0

[tfaber] 61022: [NTOS:MM] - Fix some MSVC warnings
by tfaber＠svn.reactos.org 17 Nov '13

17 Nov '13

Author: tfaber Date: Sun Nov 17 21:58:48 2013 New Revision: 61022 URL: http://svn.reactos.org/svn/reactos?rev=61022&view=rev Log: [NTOS:MM] - Fix some MSVC warnings Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sun Nov 17 21:58:48 2013 @@ -724,8 +724,9 @@ (FreeEntry->Size << PAGE_SHIFT)); /* Remove the item from the list, depending if pool is protected */ - MmProtectFreedNonPagedPool ? - MiProtectedPoolRemoveEntryList(&FreeEntry->List) : + if (MmProtectFreedNonPagedPool) + MiProtectedPoolRemoveEntryList(&FreeEntry->List); + else RemoveEntryList(&FreeEntry->List); // @@ -738,8 +739,9 @@ if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; /* Insert the entry into the free list head, check for prot. pool */ - MmProtectFreedNonPagedPool ? - MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List, TRUE) : + if (MmProtectFreedNonPagedPool) + MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List, TRUE); + else InsertTailList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List); /* Is freed non paged pool protected? */ @@ -1085,8 +1087,9 @@ FreePages += FreeEntry->Size; /* Remove the item from the list, depending if pool is protected */ - MmProtectFreedNonPagedPool ? - MiProtectedPoolRemoveEntryList(&FreeEntry->List) : + if (MmProtectFreedNonPagedPool) + MiProtectedPoolRemoveEntryList(&FreeEntry->List); + else RemoveEntryList(&FreeEntry->List); } @@ -1165,8 +1168,9 @@ if (FreeEntry->Size < (MI_MAX_FREE_PAGE_LISTS - 1)) { /* Remove the item from the list, depending if pool is protected */ - MmProtectFreedNonPagedPool ? - MiProtectedPoolRemoveEntryList(&FreeEntry->List) : + if (MmProtectFreedNonPagedPool) + MiProtectedPoolRemoveEntryList(&FreeEntry->List); + else RemoveEntryList(&FreeEntry->List); // @@ -1181,8 +1185,9 @@ if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; /* Insert the entry into the free list head, check for prot. pool */ - MmProtectFreedNonPagedPool ? - MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List, TRUE) : + if (MmProtectFreedNonPagedPool) + MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List, TRUE); + else InsertTailList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List); } else @@ -1212,8 +1217,9 @@ if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; /* Insert the entry into the free list head, check for prot. pool */ - MmProtectFreedNonPagedPool ? - MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List, TRUE) : + if (MmProtectFreedNonPagedPool) + MiProtectedPoolInsertList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List, TRUE); + else InsertTailList(&MmNonPagedPoolFreeListHead[i], &FreeEntry->List); } Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sun Nov 17 21:58:48 2013 @@ -557,8 +557,10 @@ OldIrql = KeAcquireSpinLockRaiseToSynch(&PsLoadedModuleSpinLock); /* Insert or remove from the list */ - Insert ? InsertTailList(&PsLoadedModuleList, &LdrEntry->InLoadOrderLinks) : - RemoveEntryList(&LdrEntry->InLoadOrderLinks); + if (Insert) + InsertTailList(&PsLoadedModuleList, &LdrEntry->InLoadOrderLinks); + else + RemoveEntryList(&LdrEntry->InLoadOrderLinks); /* Release locks */ KeReleaseSpinLock(&PsLoadedModuleSpinLock, OldIrql);

1 0

[hbelusca] 61021: [NTVDM] Initialize LastClockUpdate, LastVerticalRefresh and LastCyclePrintout with the value of StartTickCount.
by hbelusca＠svn.reactos.org 17 Nov '13

17 Nov '13

Author: hbelusca Date: Sun Nov 17 20:44:23 2013 New Revision: 61021 URL: http://svn.reactos.org/svn/reactos?rev=61021&view=rev Log: [NTVDM] Initialize LastClockUpdate, LastVerticalRefresh and LastCyclePrintout with the value of StartTickCount. Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sun Nov 17 20:44:23 2013 @@ -70,15 +70,14 @@ { INT i; CHAR CommandLine[DOS_CMDLINE_LENGTH]; - DWORD CurrentTickCount; - DWORD Cycles = 0; - DWORD LastCyclePrintout = GetTickCount(); - DWORD LastVerticalRefresh = GetTickCount(); - DWORD LastClockUpdate = GetTickCount(); + LARGE_INTEGER StartPerfCount; LARGE_INTEGER Frequency, LastTimerTick, LastRtcTick, Counter; LONGLONG TimerTicks; - LARGE_INTEGER StartPerfCount; - DWORD StartTickCount; + DWORD StartTickCount, CurrentTickCount; + DWORD LastClockUpdate; + DWORD LastVerticalRefresh; + DWORD LastCyclePrintout; + DWORD Cycles = 0; /* Set the handler routine */ SetConsoleCtrlHandler(ConsoleCtrlHandler, TRUE); @@ -109,7 +108,7 @@ wprintf(L"FATAL: Failed to initialize the CPU emulator\n"); goto Cleanup; } - + /* Initialize the performance counter (needed for hardware timers) */ if (!QueryPerformanceFrequency(&Frequency)) { @@ -151,7 +150,10 @@ /* Find the starting performance and tick count */ StartTickCount = GetTickCount(); QueryPerformanceCounter(&StartPerfCount); - + + /* Set the different last counts to the starting count */ + LastClockUpdate = LastVerticalRefresh = LastCyclePrintout = StartTickCount; + /* Set the last timer ticks to the current time */ LastTimerTick = LastRtcTick = StartPerfCount; @@ -163,7 +165,7 @@ /* Get the current number of ticks */ CurrentTickCount = GetTickCount(); - + if ((PitResolution <= 1000) && (RtcFrequency <= 1000)) { /* Calculate the approximate performance counter value instead */ @@ -176,7 +178,7 @@ /* Get the current performance counter value */ QueryPerformanceCounter(&Counter); } - + /* Get the number of PIT ticks that have passed */ TimerTicks = ((Counter.QuadPart - LastTimerTick.QuadPart) * PIT_BASE_FREQUENCY) / Frequency.QuadPart;

1 0

[tfaber] 61020: [CMAKE] - Make warning C4229 (modifiers on data are ignored) an error
by tfaber＠svn.reactos.org 17 Nov '13

17 Nov '13

Author: tfaber Date: Sun Nov 17 19:45:32 2013 New Revision: 61020 URL: http://svn.reactos.org/svn/reactos?rev=61020&view=rev Log: [CMAKE] - Make warning C4229 (modifiers on data are ignored) an error Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=61020… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Nov 17 19:45:32 2013 @@ -46,8 +46,9 @@ # - C4098: void function returning a value # - C4129: unrecognized escape sequence # - TODO: C4133: incompatible types +# - C4229: modifiers on data are ignored # - C4700: uninitialized variable usage -add_compile_flags("/we4022 /we4047 /we4098 /we4129 /we4700") +add_compile_flags("/we4022 /we4047 /we4098 /we4129 /we4229 /we4700") # Debugging #if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")

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