Ros-diffs May 2014

ros-diffs@reactos.org

14 participants
437 discussions

[akhaldi] 63473: [STLPORT] * Don't use _fseeki64 which shouldn't be exported. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon May 26 18:04:49 2014 New Revision: 63473 URL: http://svn.reactos.org/svn/reactos?rev=63473&view=rev Log: [STLPORT] * Don't use _fseeki64 which shouldn't be exported. CORE-8174 Modified: trunk/reactos/lib/3rdparty/stlport/src/stdio_streambuf.cpp Modified: trunk/reactos/lib/3rdparty/stlport/src/stdio_streambuf.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/stlport/src/s… ============================================================================== --- trunk/reactos/lib/3rdparty/stlport/src/stdio_streambuf.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/stlport/src/stdio_streambuf.cpp [iso-8859-1] Mon May 26 18:04:49 2014 @@ -34,7 +34,7 @@ #if defined (_STLP_USE_DEFAULT_FILE_OFFSET) || \ (!defined(_LARGEFILE_SOURCE) && !defined(_LARGEFILE64_SOURCE)) -# if !defined (_STLP_MSVC) || (_STLP_MSVC < 1400) || defined(_STLP_WCE) +# if !defined (_STLP_MSVC) || (_STLP_MSVC < 1400) || defined(_STLP_WCE) || defined(__REACTOS__) # define FSEEK fseek # else # define FSEEK _fseeki64

10 years, 7 months

[akhaldi] 63472: [MSVCRT] * Zap some exports that do not exist in native. * Reorder some exports. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon May 26 16:10:49 2014 New Revision: 63472 URL: http://svn.reactos.org/svn/reactos?rev=63472&view=rev Log: [MSVCRT] * Zap some exports that do not exist in native. * Reorder some exports. CORE-8174 Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Mon May 26 16:10:49 2014 @@ -270,14 +270,12 @@ # stub _cputws @ cdecl _creat(str long) @ varargs _cscanf(str) -@ cdecl _ctime32(ptr) @ cdecl _ctime64(ptr) @ extern _ctype @ cdecl _cwait(ptr long long) @ varargs _cwprintf(wstr) # @ varargs _cwscanf(wstr) @ extern _daylight -@ cdecl _difftime32(long long) @ cdecl _difftime64(long long) @ extern _dstbias @ cdecl _dup(long) @@ -334,28 +332,17 @@ @ cdecl _fstati64(long ptr) @ cdecl -ret64 _ftelli64(ptr) @ cdecl _ftime(ptr) -@ cdecl _ftime32(ptr) @ cdecl _ftime64(ptr) @ cdecl -arch=i386 -ret64 _ftol() @ cdecl -arch=i386 -ret64 _ftol2() _ftol @ cdecl -arch=i386 -ret64 _ftol2_sse() _ftol #FIXME: SSE variant should be implemented @ cdecl _fullpath(ptr str long) @ cdecl _futime(long ptr) -@ cdecl _futime32(long ptr) @ cdecl _futime64(long ptr) @ cdecl _gcvt(double long str) -@ cdecl _get_doserrno(ptr) -@ cdecl _get_errno(ptr) # @ cdecl _get_heap_handle() @ cdecl _get_osfhandle(long) -@ cdecl _get_osplatform(ptr) -@ cdecl _get_output_format() -@ cdecl _get_pgmptr(ptr) @ cdecl _get_sbh_threshold() -@ cdecl _get_wpgmptr(ptr) -@ cdecl _get_terminate() -@ cdecl _get_tzname(ptr str long long) -@ cdecl _get_unexpected() @ cdecl _getch() @ cdecl _getche() @ cdecl _getcwd(str long) @@ -373,7 +360,6 @@ # stub _getwche @ cdecl _getws(ptr) @ cdecl -i386 _global_unwind2(ptr) -@ cdecl _gmtime32(ptr) @ cdecl _gmtime64(ptr) @ cdecl _heapadd(ptr long) @ cdecl _heapchk() @@ -389,11 +375,9 @@ @ cdecl -arch=i386 _inp(long) MSVCRT__inp @ cdecl -arch=i386 _inpd(long) MSVCRT__inpd @ cdecl -arch=i386 _inpw(long) MSVCRT__inpw -@ cdecl _invalid_parameter(wstr wstr wstr long long) @ extern _iob @ cdecl _isatty(long) @ cdecl _isctype(long long) -@ cdecl _isctype_l(long long ptr) @ cdecl _ismbbalnum(long) @ cdecl _ismbbalpha(long) @ cdecl _ismbbgraph(long) @@ -434,7 +418,6 @@ @ cdecl _loaddll(str) @ cdecl -i386 _local_unwind2(ptr long) @ cdecl -i386 _local_unwind4(ptr ptr long) -@ cdecl _localtime32(ptr) @ cdecl _localtime64(ptr) @ cdecl _lock(long) @ cdecl _locking(long long long) @@ -507,10 +490,8 @@ @ cdecl _memicmp(str str long) @ cdecl _mkdir(str) @ cdecl _mkgmtime(ptr) -@ cdecl _mkgmtime32(ptr) @ cdecl _mkgmtime64(ptr) @ cdecl _mktemp(str) -@ cdecl _mktime32(ptr) @ cdecl _mktime64(ptr) @ cdecl _msize(ptr) @ cdecl _nextafter(double double) @@ -553,8 +534,6 @@ @ stdcall -i386 _seh_longjmp_unwind4(ptr) @ stdcall -i386 _seh_longjmp_unwind(ptr) # stub _set_SSE2_enable -@ cdecl _set_doserrno(long) -@ cdecl _set_errno(long) @ cdecl _set_error_mode(long) @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long) @@ -602,13 +581,11 @@ @ cdecl _strtoui64(str ptr long) strtoull @ cdecl _strupr(str) @ cdecl _swab(str str long) -@ varargs _swprintf(ptr str) swprintf @ extern _sys_errlist @ extern _sys_nerr @ cdecl _tell(long) @ cdecl -ret64 _telli64(long) @ cdecl _tempnam(str str) -@ cdecl _time32(ptr) @ cdecl _time64(ptr) @ extern _timezone @ cdecl _tolower(long) @@ -625,17 +602,12 @@ @ cdecl _unlink(str) @ cdecl _unloaddll(long) @ cdecl _unlock(long) -@ cdecl _utime32(str ptr) +@ cdecl _utime(str ptr) @ cdecl _utime64(str ptr) -@ cdecl _vcwprintf(wstr ptr) -@ cdecl _utime(str ptr) @ cdecl _vscprintf(str ptr) @ cdecl _vscwprintf(wstr ptr) @ cdecl _vsnprintf(ptr long str ptr) -@ cdecl _vsnprintf_c(ptr long str ptr) _vsnprintf @ cdecl _vsnwprintf(ptr long wstr ptr) -@ cdecl _vsprintf_p(ptr long str ptr) -@ cdecl _vswprintf_c(ptr long wstr ptr) _vsnwprintf @ cdecl _waccess(wstr long) @ cdecl _wasctime(ptr) @ cdecl _wchdir(wstr) @@ -654,11 +626,9 @@ @ cdecl _wcsrev(wstr) @ cdecl _wcsset(wstr long) @ cdecl _wcstoi64(wstr ptr long) -@ cdecl _wcstombs_l(ptr ptr long ptr) @ cdecl _wcstoui64(wstr ptr long) @ cdecl _wcsupr(wstr) @ cdecl _wctime(ptr) -@ cdecl _wctime32(ptr) @ cdecl _wctime64(ptr) # stub _wctype @ extern _wenviron @@ -712,8 +682,8 @@ @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) @ cdecl _wstat(wstr ptr) +@ cdecl _wstat64(wstr ptr) @ cdecl _wstati64(wstr ptr) -@ cdecl _wstat64(wstr ptr) @ cdecl _wstrdate(ptr) @ cdecl _wstrtime(ptr) @ cdecl _wsystem(wstr) @@ -725,7 +695,6 @@ @ cdecl _wtol(wstr) @ cdecl _wunlink(wstr) @ cdecl _wutime(wstr ptr) -@ cdecl _wutime32(wstr ptr) @ cdecl _wutime64(wstr ptr) @ cdecl _y0(double) @ cdecl _y1(double)

10 years, 7 months

[akhaldi] 63471: [MSTSC] * Don't use _swprintf in the MSVC build, it shouldn't be exported. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon May 26 15:39:58 2014 New Revision: 63471 URL: http://svn.reactos.org/svn/reactos?rev=63471&view=rev Log: [MSTSC] * Don't use _swprintf in the MSVC build, it shouldn't be exported. CORE-8174 Modified: trunk/reactos/base/applications/mstsc/connectdialog.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Mon May 26 15:39:58 2014 @@ -647,19 +647,11 @@ Pixel, sizeof(Pixel) / sizeof(WCHAR))) { -#ifdef _MSC_VER - _swprintf(Buffer, - Pixel, - pInfo->DisplayDeviceList->Resolutions[position].dmPelsWidth, - pInfo->DisplayDeviceList->Resolutions[position].dmPelsHeight, - Pixel); -#else - swprintf(Buffer, - Pixel, - pInfo->DisplayDeviceList->Resolutions[position].dmPelsWidth, - pInfo->DisplayDeviceList->Resolutions[position].dmPelsHeight, - Pixel); -#endif + swprintf(Buffer, + Pixel, + pInfo->DisplayDeviceList->Resolutions[position].dmPelsWidth, + pInfo->DisplayDeviceList->Resolutions[position].dmPelsHeight, + Pixel); } }

10 years, 7 months

[akhaldi] 63470: [CMAKE] * Fix what seems to be a typo in the definition.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon May 26 15:32:48 2014 New Revision: 63470 URL: http://svn.reactos.org/svn/reactos?rev=63470&view=rev Log: [CMAKE] * Fix what seems to be a typo in the definition. 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=63470… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Mon May 26 15:32:48 2014 @@ -291,7 +291,7 @@ endfunction() if(ARCH STREQUAL "amd64") - add_definitions(/D__x86_64) + add_definitions(/D__x86_64__) set(SPEC2DEF_ARCH x86_64) elseif(ARCH STREQUAL "arm") add_definitions(/D__arm__)

10 years, 7 months

[akhaldi] 63469: [CMAKE/ARM] * Do not handle hotpatchable images in MSVC ARM builds (the flag is unknown to the compiler).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon May 26 15:31:07 2014 New Revision: 63469 URL: http://svn.reactos.org/svn/reactos?rev=63469&view=rev Log: [CMAKE/ARM] * Do not handle hotpatchable images in MSVC ARM builds (the flag is unknown to the compiler). Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Mon May 26 15:31:07 2014 @@ -459,7 +459,7 @@ # Handle hotpatchable images. # GCC has this as a function attribute so we're handling it using DECLSPEC_HOTPATCH - if(__module_HOTPATCHABLE AND MSVC) + if(__module_HOTPATCHABLE AND MSVC AND (NOT ARCH STREQUAL "arm")) set_property(TARGET ${MODULE} APPEND_STRING PROPERTY COMPILE_FLAGS " /hotpatch") if(ARCH STREQUAL "i386") set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS " /FUNCTIONPADMIN:5")

10 years, 7 months

[akhaldi] 63468: [CMAKE/ARM] * Add armasm assembler support. Inspired by Yuntian Zhang's patch. CORE-7439

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon May 26 15:28:12 2014 New Revision: 63468 URL: http://svn.reactos.org/svn/reactos?rev=63468&view=rev Log: [CMAKE/ARM] * Add armasm assembler support. Inspired by Yuntian Zhang's patch. CORE-7439 Modified: trunk/reactos/cmake/msvc.cmake trunk/reactos/toolchain-msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=63468… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Mon May 26 15:28:12 2014 @@ -103,9 +103,15 @@ set(rc_nologo_flag) endif() set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_nologo_flag} <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") - set(CMAKE_ASM_COMPILE_OBJECT - "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" - "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") + if(ARCH STREQUAL "arm") + set(CMAKE_ASM_COMPILE_OBJECT + "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "<CMAKE_ASM_COMPILER> -nologo -o <OBJECT> <OBJECT>.tmp") + else() + set(CMAKE_ASM_COMPILE_OBJECT + "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") + endif() endif() if(_VS_ANALYZE_) @@ -222,7 +228,13 @@ # Define those for having real libraries set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "LINK /LIB /NOLOGO <LINK_FLAGS> /OUT:<TARGET> <OBJECTS>") -set(CMAKE_STUB_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <SOURCE>") + +if(ARCH STREQUAL "arm") + set(CMAKE_STUB_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -nologo -o <OBJECT> <SOURCE>") +else() + set(CMAKE_STUB_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <SOURCE>") +endif() + function(add_delay_importlibs _module) get_target_property(_module_type ${_module} TYPE) if(_module_type STREQUAL "STATIC_LIBRARY") @@ -248,9 +260,14 @@ if(MSVC_IDE) # Compile the generated asm stub file + if(ARCH STREQUAL "arm") + set(_asm_stub_command ${CMAKE_ASM_COMPILER} -nologo -o ${_asm_stubs_file}.obj ${_asm_stubs_file}) + else() + set(_asm_stub_command ${CMAKE_ASM_COMPILER} /Cp /Fo${_asm_stubs_file}.obj /c /Ta ${_asm_stubs_file}) + endif() add_custom_command( OUTPUT ${_asm_stubs_file}.obj - COMMAND ${CMAKE_ASM_COMPILER} /Cp /Fo${_asm_stubs_file}.obj /c /Ta ${_asm_stubs_file} + COMMAND ${_asm_stub_command} DEPENDS ${_asm_stubs_file}) else() # Be clear about the "language" @@ -276,6 +293,9 @@ if(ARCH STREQUAL "amd64") add_definitions(/D__x86_64) set(SPEC2DEF_ARCH x86_64) +elseif(ARCH STREQUAL "arm") + add_definitions(/D__arm__) + set(SPEC2DEF_ARCH arm) else() set(SPEC2DEF_ARCH i386) endif() @@ -320,6 +340,8 @@ # both the x86 and x64 versions of ml are available. if((ARCH STREQUAL "amd64") AND (DEFINED ENV{VCINSTALLDIR})) set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe) +elseif(ARCH STREQUAL "arm") + set(CMAKE_ASM16_COMPILER armasm.exe) else() set(CMAKE_ASM16_COMPILER ml.exe) endif() @@ -333,9 +355,15 @@ COMMAND ${CMAKE_C_COMPILER} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file} DEPENDS ${_asm_file}) + if(ARCH STREQUAL "arm") + set(_asm16_command ${CMAKE_ASM16_COMPILER} -nologo -o ${_object_file} ${_temp_file}) + else() + set(_asm16_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file}) + endif() + add_custom_command( OUTPUT ${_object_file} - COMMAND ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file} + COMMAND ${_asm16_command} DEPENDS ${_temp_file}) add_custom_command( @@ -368,9 +396,14 @@ list(APPEND _source_file_defines -D${_define}) endif() endforeach() + if(ARCH STREQUAL "arm") + set(_pp_asm_compile_command ${CMAKE_ASM_COMPILER} -nologo -o ${_object_file} ${_preprocessed_asm_file}) + else() + set(_pp_asm_compile_command ${CMAKE_ASM_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file}) + endif() add_custom_command( OUTPUT ${_preprocessed_asm_file} ${_object_file} - COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_source_file_full_path} > ${_preprocessed_asm_file} && ${CMAKE_ASM_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file} + COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_source_file_full_path} > ${_preprocessed_asm_file} && ${_pp_asm_compile_command} DEPENDS ${_source_file_full_path}) set_source_files_properties(${_object_file} PROPERTIES EXTERNAL_OBJECT 1) list(APPEND ${_target} ${_object_file}) Modified: trunk/reactos/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-msvc.cmake?rev=6… ============================================================================== --- trunk/reactos/toolchain-msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-msvc.cmake [iso-8859-1] Mon May 26 15:28:12 2014 @@ -21,6 +21,8 @@ set(CMAKE_RC_COMPILER rc) if(ARCH STREQUAL "amd64") set(CMAKE_ASM_COMPILER ml64) +elseif(ARCH STREQUAL "arm") + set(CMAKE_ASM_COMPILER armasm) else() set(CMAKE_ASM_COMPILER ml) endif()

10 years, 7 months

[cwittich] 63467: [bootdata] Polish translation by Olaf Siejka

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon May 26 14:33:26 2014 New Revision: 63467 URL: http://svn.reactos.org/svn/reactos?rev=63467&view=rev Log: [bootdata] Polish translation by Olaf Siejka Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [UTF-16] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [UTF-16] Mon May 26 14:33:26 2014 @@ -477,6 +477,11 @@ CPLFILE="Systemsteuerungselement" CPLFILE_OPENWITH="Mit der Systemsteuerung öffnen" +; LANG_POLISH SUBLANG_NEUTRAL +[Strings.0015] +CPLFILE="Aplet Panelu Sterowania" +CPLFILE_OPENWITH="Otwórz poprzez Panel Sterowania" + ; LANG_FRENCH SUBLANG_NEUTRAL [Strings.000C] CPLFILE="Extension du Panneau de Contrôle"

10 years, 7 months

[cwittich] 63466: [bootdata] set encoding to UTF-16 instead of UTF-16LE to make viewvc happy

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon May 26 14:29:11 2014 New Revision: 63466 URL: http://svn.reactos.org/svn/reactos?rev=63466&view=rev Log: [bootdata] set encoding to UTF-16 instead of UTF-16LE to make viewvc happy Modified: trunk/reactos/boot/bootdata/hivecls.inf (props changed) trunk/reactos/boot/bootdata/hivedef.inf (props changed) Propchange: trunk/reactos/boot/bootdata/hivecls.inf ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Mon May 26 14:29:11 2014 @@ -1 +1 @@ -text/plain;charset=UTF-16LE +text/plain;charset=UTF-16 Propchange: trunk/reactos/boot/bootdata/hivedef.inf ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Mon May 26 14:29:11 2014 @@ -1 +1 @@ -text/plain;charset=UTF-16LE +text/plain;charset=UTF-16

10 years, 7 months

[akhaldi] 63465: [APPWIZ] * Don't use _swprintf in the MSVC build, it shouldn't be exported. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon May 26 14:24:06 2014 New Revision: 63465 URL: http://svn.reactos.org/svn/reactos?rev=63465&view=rev Log: [APPWIZ] * Don't use _swprintf in the MSVC build, it shouldn't be exported. CORE-8174 Modified: trunk/reactos/dll/cpl/appwiz/createlink.c Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] Mon May 26 14:24:06 2014 @@ -226,11 +226,7 @@ LoadStringW(hApplet, IDS_ERROR_NOT_FOUND, szPath, MAX_PATH) < MAX_PATH) { WCHAR szError[MAX_PATH + 100]; -#ifdef _MSC_VER - _swprintf(szError, szPath, pContext->szTarget); -#else swprintf(szError, szPath, pContext->szTarget); -#endif MessageBoxW(hwndDlg, szError, szDesc, MB_ICONERROR); } SendDlgItemMessage(hwndDlg, IDC_SHORTCUT_LOCATION, EM_SETSEL, 0, -1);

10 years, 7 months

[akhaldi] 63464: [TCPSVCS] * Use swprintf instead of _swprintf which shouldn't be exported. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon May 26 14:03:24 2014 New Revision: 63464 URL: http://svn.reactos.org/svn/reactos?rev=63464&view=rev Log: [TCPSVCS] * Use swprintf instead of _swprintf which shouldn't be exported. CORE-8174 Modified: trunk/reactos/base/services/tcpsvcs/discard.c trunk/reactos/base/services/tcpsvcs/echo.c trunk/reactos/base/services/tcpsvcs/skelserver.c trunk/reactos/base/services/tcpsvcs/tcpsvcs.c trunk/reactos/base/services/tcpsvcs/tcpsvcs.h Modified: trunk/reactos/base/services/tcpsvcs/discard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/disc… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/discard.c [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/discard.c [iso-8859-1] Mon May 26 14:03:24 2014 @@ -24,7 +24,7 @@ { TCHAR logBuf[256]; - _swprintf(logBuf, L"Discard: Received %d bytes from client", readBytes); + swprintf(logBuf, L"Discard: Received %d bytes from client", readBytes); LogEvent(logBuf, 0, 0, LOG_FILE); } else if (readBytes == SOCKET_ERROR) Modified: trunk/reactos/base/services/tcpsvcs/echo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/echo… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/echo.c [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/echo.c [iso-8859-1] Mon May 26 14:03:24 2014 @@ -25,7 +25,7 @@ readBytes = recv(sock, readBuffer, RECV_BUF, 0); if (readBytes > 0) { - _swprintf(logBuf, L"Received %d bytes from client", readBytes); + swprintf(logBuf, L"Received %d bytes from client", readBytes); LogEvent(logBuf, 0, 0, LOG_FILE); totalSentBytes = 0; @@ -34,7 +34,7 @@ retVal = send(sock, readBuffer + totalSentBytes, readBytes - totalSentBytes, 0); if (retVal > 0) { - _swprintf(logBuf, L"Sent %d bytes back to client", retVal); + swprintf(logBuf, L"Sent %d bytes back to client", retVal); LogEvent(logBuf, 0, 0, LOG_FILE); totalSentBytes += retVal; } Modified: trunk/reactos/base/services/tcpsvcs/skelserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/skel… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/skelserver.c [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/skelserver.c [iso-8859-1] Mon May 26 14:03:24 2014 @@ -84,14 +84,14 @@ sock = accept(listeningSocket, (SOCKADDR*)&client, &addrSize); if (sock != INVALID_SOCKET) { - _swprintf(logBuf, - L"Accepted connection to %s server from %S:%d", - lpName, - inet_ntoa(client.sin_addr), - ntohs(client.sin_port)); + swprintf(logBuf, + L"Accepted connection to %s server from %S:%d", + lpName, + inet_ntoa(client.sin_addr), + ntohs(client.sin_port)); LogEvent(logBuf, 0, 0, LOG_FILE); - _swprintf(logBuf, L"Creating worker thread for %s", lpName); + swprintf(logBuf, L"Creating worker thread for %s", lpName); LogEvent(logBuf, 0, 0, LOG_FILE); if (!bShutdown) @@ -103,8 +103,8 @@ } else { - _swprintf(logBuf, L"Failed to start worker thread for the %s server", - lpName); + swprintf(logBuf, L"Failed to start worker thread for the %s server", + lpName); LogEvent(logBuf, 0, 0, LOG_FILE); } } @@ -149,7 +149,7 @@ ret = recv(sock, readBuffer, BUF, 0); if (ret >= 0) { - _swprintf(logBuf, L"FYI, received %d unexpected bytes during shutdown", ret); + swprintf(logBuf, L"FYI, received %d unexpected bytes during shutdown", ret); LogEvent(logBuf, 0, 0, LOG_FILE); } } while (ret > 0); @@ -170,7 +170,7 @@ pServices = (PSERVICES)lpParam; - _swprintf(logBuf, L"Starting %s server", pServices->lpName); + swprintf(logBuf, L"Starting %s server", pServices->lpName); LogEvent(logBuf, 0, 0, LOG_FILE); if (!bShutdown) @@ -178,10 +178,10 @@ listeningSocket = SetUpListener(htons(pServices->Port)); if (!bShutdown && listeningSocket != INVALID_SOCKET) { - _swprintf(logBuf, - L"%s is waiting for connections on port %d", - pServices->lpName, - pServices->Port); + swprintf(logBuf, + L"%s is waiting for connections on port %d", + pServices->lpName, + pServices->Port); LogEvent(logBuf, 0, 0, LOG_FILE); AcceptConnections(listeningSocket, pServices->lpService, pServices->lpName); @@ -192,9 +192,7 @@ } } - _swprintf(logBuf, - L"Exiting %s thread", - pServices->lpName); + swprintf(logBuf, L"Exiting %s thread", pServices->lpName); LogEvent(logBuf, 0, 0, LOG_FILE); ExitThread(0); } Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/tcps… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.c [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.c [iso-8859-1] Mon May 26 14:03:24 2014 @@ -72,7 +72,7 @@ if ((RetVal = WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0) { - _swprintf(buf, L"WSAStartup() failed : %lu\n", RetVal); + swprintf(buf, L"WSAStartup() failed : %lu\n", RetVal); LogEvent(buf, 0, 100, LOG_ALL); return FALSE; } @@ -84,7 +84,7 @@ /* Create worker threads. */ for (i = 0; i < NUM_SERVICES; i++) { - _swprintf(buf, L"Creating thread for %s server", Services[i].lpName); + swprintf(buf, L"Creating thread for %s server", Services[i].lpName); LogEvent(buf, 0, 0, LOG_FILE); hThread[i] = CreateThread(NULL, @@ -96,7 +96,7 @@ if (hThread[i] == NULL) { - _swprintf(buf, L"\nError creating %s server thread\n", Services[i].lpName); + swprintf(buf, L"\nError creating %s server thread\n", Services[i].lpName); LogEvent(buf, GetLastError(), 0, LOG_ALL); return FALSE; } Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/tcps… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.h [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.h [iso-8859-1] Mon May 26 14:03:24 2014 @@ -9,10 +9,6 @@ #define _INC_WINDOWS #include <winsock2.h> #include <tchar.h> - -#ifndef _MSC_VER -#define _swprintf swprintf -#endif #define LOG_FILE 1 #define LOG_EVENTLOG 2

10 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
44
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 May 2014