Ros-diffs January 2011

ros-diffs@reactos.org

20 participants
336 discussions

[tkreuzer] 50584: [CMAKE] add ftol2_asm.s to crt and ci.c to msvcsup

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 31 23:29:03 2011 New Revision: 50584 URL: http://svn.reactos.org/svn/reactos?rev=50584&view=rev Log: [CMAKE] add ftol2_asm.s to crt and ci.c to msvcsup 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] Mon Jan 31 23:29:03 2011 @@ -346,6 +346,7 @@ math/i386/floor_asm.s math/i386/floorf.S math/i386/ftol_asm.s + math/i386/ftol2_asm.s math/i386/log_asm.s math/i386/log10_asm.s math/i386/pow_asm.s @@ -620,10 +621,11 @@ list(APPEND MSVCSUP_SOURCE misc/fltused.c except/i386/chkstk_asm.s + math/i386/ci.c math/i386/ftol2_asm.S) add_library(msvcsup ${MSVCSUP_SOURCE}) add_dependencies(msvcsup psdk buildno_header asm) endif() -add_subdirectory(printf) +add_subdirectory(printf)

13 years, 10 months

[tkreuzer] 50583: [CRT] Implement call_finally_block, call_filter and call_unwind_func for MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 31 22:10:17 2011 New Revision: 50583 URL: http://svn.reactos.org/svn/reactos?rev=50583&view=rev Log: [CRT] Implement call_finally_block, call_filter and call_unwind_func for MSVC Modified: branches/cmake-bringup/lib/sdk/crt/except/except.c Modified: branches/cmake-bringup/lib/sdk/crt/except/except.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/except.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/except/except.c [iso-8859-1] Mon Jan 31 22:10:17 2011 @@ -96,6 +96,57 @@ : "ecx", "edx", "memory" ); return ret; } +#elif defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4731) // Don't complain about changing ebp +void __inline call_finally_block( void *code_block, void *base_ptr ) +{ + __asm + { + mov eax, code_block + mov ebp, base_ptr + call [eax] + } +} + +int __inline call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *_ebp ) +{ + int _ret; + __asm + { + push ebp + mov eax, arg + push eax + mov ebp, _ebp + mov eax, func + call [eax] + mov _ret, eax + pop ebp + pop ebp + } + return _ret; +} +int __inline call_unwind_func( int (*func)(void), void *_ebp ) +{ + int _ret; + + __asm + { + push ebp + push ebx + push esi + push edi + mov ebp, _ebp + call dword ptr [func] + mov _ret, eax + pop edi + pop esi + pop ebx + pop ebp + } + return _ret; +} +#pragma warning(pop) #endif static DWORD MSVCRT_nested_handler(PEXCEPTION_RECORD rec,

13 years, 10 months

[spetreolle] 50582: [ROSTESTS] Add mmixer_test to cmake build.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Mon Jan 31 21:50:16 2011 New Revision: 50582 URL: http://svn.reactos.org/svn/reactos?rev=50582&view=rev Log: [ROSTESTS] Add mmixer_test to cmake build. Added: trunk/rostests/tests/mmixer_test/CMakeLists.txt (with props) Modified: trunk/rostests/tests/CMakeLists.txt Modified: trunk/rostests/tests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/CMakeLists.txt?rev=… ============================================================================== --- trunk/rostests/tests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/tests/CMakeLists.txt [iso-8859-1] Mon Jan 31 21:50:16 2011 @@ -1,1 +1,2 @@ +add_subdirectory(mmixer_test) add_subdirectory(pseh2) Added: trunk/rostests/tests/mmixer_test/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/mmixer_test/CMakeLi… ============================================================================== --- trunk/rostests/tests/mmixer_test/CMakeLists.txt (added) +++ trunk/rostests/tests/mmixer_test/CMakeLists.txt [iso-8859-1] Mon Jan 31 21:50:16 2011 @@ -1,0 +1,11 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer) + +add_executable(mmixer_test test.c) +set_module_type(mmixer_test win32cui) + +target_link_libraries(mmixer_test mmixer) +add_importlibs(mmixer_test advapi32 setupapi winmm ksuser user32 kernel32 msvcrt) Propchange: trunk/rostests/tests/mmixer_test/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 10 months

[spetreolle] 50581: [CMAKE] Sync trunk up to r50570.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Mon Jan 31 21:47:39 2011 New Revision: 50581 URL: http://svn.reactos.org/svn/reactos?rev=50581&view=rev Log: [CMAKE] Sync trunk up to r50570. Added: branches/cmake-bringup/drivers/ksfilter/ks/swenum.c - copied unchanged from r50570, trunk/reactos/drivers/ksfilter/ks/swenum.c branches/cmake-bringup/drivers/ksfilter/swenum/CMakeLists.txt (with props) branches/cmake-bringup/drivers/network/tdi/cte/events.c - copied unchanged from r50570, trunk/reactos/drivers/network/tdi/cte/events.c branches/cmake-bringup/drivers/network/tdi/cte/timer.c - copied unchanged from r50570, trunk/reactos/drivers/network/tdi/cte/timer.c branches/cmake-bringup/lib/drivers/sound/mmixer/TODO - copied unchanged from r50570, trunk/reactos/lib/drivers/sound/mmixer/TODO Removed: branches/cmake-bringup/drivers/network/tdi/cte/stubs.c Modified: branches/cmake-bringup/ (props changed) branches/cmake-bringup/base/shell/explorer-new/traywnd.c branches/cmake-bringup/dll/cpl/desk/appearance.c branches/cmake-bringup/dll/cpl/desk/theme.c branches/cmake-bringup/dll/win32/kernel32/file/dir.c branches/cmake-bringup/dll/win32/kernel32/file/file.c branches/cmake-bringup/dll/win32/wdmaud.drv/legacy.c branches/cmake-bringup/dll/win32/wdmaud.drv/mmixer.c branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.h branches/cmake-bringup/drivers/filesystems/npfs/dirctl.c branches/cmake-bringup/drivers/filesystems/npfs/npfs.h branches/cmake-bringup/drivers/ksfilter/CMakeLists.txt branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt branches/cmake-bringup/drivers/ksfilter/ks/allocators.c branches/cmake-bringup/drivers/ksfilter/ks/api.c branches/cmake-bringup/drivers/ksfilter/ks/clocks.c branches/cmake-bringup/drivers/ksfilter/ks/device.c branches/cmake-bringup/drivers/ksfilter/ks/filter.c branches/cmake-bringup/drivers/ksfilter/ks/filterfactory.c branches/cmake-bringup/drivers/ksfilter/ks/irp.c branches/cmake-bringup/drivers/ksfilter/ks/ksfunc.h branches/cmake-bringup/drivers/ksfilter/ks/ksiface.h branches/cmake-bringup/drivers/ksfilter/ks/kstypes.h branches/cmake-bringup/drivers/ksfilter/ks/misc.c branches/cmake-bringup/drivers/ksfilter/ks/pin.c branches/cmake-bringup/drivers/ksfilter/ks/priv.h branches/cmake-bringup/drivers/ksfilter/swenum/swenum.c branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt branches/cmake-bringup/drivers/network/tdi/misc/main.c branches/cmake-bringup/drivers/network/tdi/misc/tdi.spec branches/cmake-bringup/drivers/network/tdi/tdi/dereg.c branches/cmake-bringup/drivers/network/tdi/tdi/stubs.c branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/mmixer.c branches/cmake-bringup/include/psdk/ks.h branches/cmake-bringup/include/reactos/libs/sound/mmebuddy.h branches/cmake-bringup/include/reactos/wine/port.h branches/cmake-bringup/include/reactos/winlogon.h branches/cmake-bringup/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c branches/cmake-bringup/lib/drivers/sound/mmebuddy/mmewrap.c branches/cmake-bringup/lib/drivers/sound/mmebuddy/wave/format.c branches/cmake-bringup/lib/drivers/sound/mmebuddy/wave/streaming.c branches/cmake-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c branches/cmake-bringup/lib/drivers/sound/mmixer/controls.c branches/cmake-bringup/lib/drivers/sound/mmixer/midi.c branches/cmake-bringup/lib/drivers/sound/mmixer/mixer.c branches/cmake-bringup/lib/drivers/sound/mmixer/mmixer.h branches/cmake-bringup/lib/drivers/sound/mmixer/priv.h branches/cmake-bringup/lib/drivers/sound/mmixer/sup.c branches/cmake-bringup/lib/drivers/sound/mmixer/topology.c branches/cmake-bringup/lib/drivers/sound/mmixer/wave.c branches/cmake-bringup/lib/lsalib/lsa.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/painting.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/timer.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/cmake-bringup/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… Modified: branches/cmake-bringup/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/desk/appe… Modified: branches/cmake-bringup/dll/cpl/desk/theme.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/desk/them… Modified: branches/cmake-bringup/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… Modified: branches/cmake-bringup/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/legacy.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… Modified: branches/cmake-bringup/drivers/filesystems/npfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… Modified: branches/cmake-bringup/drivers/filesystems/npfs/npfs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… Modified: branches/cmake-bringup/drivers/ksfilter/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/ksfilter/ks/allocators.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/ksfilter/ks/clocks.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/ksfilter/ks/filterfactory.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/ksfilter/ks/ksiface.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/ksfilter/ks/priv.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Added: branches/cmake-bringup/drivers/ksfilter/swenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/ksfilter/swenum/swenum.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/t… Removed: branches/cmake-bringup/drivers/network/tdi/cte/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/t… Modified: branches/cmake-bringup/drivers/network/tdi/misc/main.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/t… Modified: branches/cmake-bringup/drivers/network/tdi/misc/tdi.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/t… Modified: branches/cmake-bringup/drivers/network/tdi/tdi/dereg.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/t… Modified: branches/cmake-bringup/drivers/network/tdi/tdi/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/t… Modified: branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/mmixer.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… Modified: branches/cmake-bringup/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/ks.h… Modified: branches/cmake-bringup/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/l… Modified: branches/cmake-bringup/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… Modified: branches/cmake-bringup/include/reactos/winlogon.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… Modified: branches/cmake-bringup/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… Modified: branches/cmake-bringup/lib/drivers/sound/mmebuddy/mmewrap.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… Modified: branches/cmake-bringup/lib/drivers/sound/mmebuddy/wave/format.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… Modified: branches/cmake-bringup/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… Modified: branches/cmake-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/midi.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/mmixer.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/priv.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/topology.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/wave.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… Modified: branches/cmake-bringup/lib/lsalib/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/lsalib/lsa.c?… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

13 years, 10 months

[tkreuzer] 50580: [CMAKE] (M)IDL doesn't allow definiting multiple identifiers with the same name and different case. Define MSIRUNMODE to MSIRUNMODE_T so it doesn't conflict with MsiRunMode anymore.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 31 21:44:35 2011 New Revision: 50580 URL: http://svn.reactos.org/svn/reactos?rev=50580&view=rev Log: [CMAKE] (M)IDL doesn't allow definiting multiple identifiers with the same name and different case. Define MSIRUNMODE to MSIRUNMODE_T so it doesn't conflict with MsiRunMode anymore. Modified: branches/cmake-bringup/dll/win32/msi/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] Mon Jan 31 21:44:35 2011 @@ -1,6 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -DMSIRUNMODE=MSIRUNMODE_T) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600)

13 years, 10 months

[tkreuzer] 50579: [CMAKE] Fix MSVC build of imm32

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 31 21:11:21 2011 New Revision: 50579 URL: http://svn.reactos.org/svn/reactos?rev=50579&view=rev Log: [CMAKE] Fix MSVC build of imm32 Modified: branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imm32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt [iso-8859-1] Mon Jan 31 21:11:21 2011 @@ -3,6 +3,10 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) + +if(MSVC) + add_definitions(/FIwine/typeof.h) +endif() include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

13 years, 10 months

[tkreuzer] 50578: [CMAKE] Disable run-time type information for MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 31 19:47:02 2011 New Revision: 50578 URL: http://svn.reactos.org/svn/reactos?rev=50578&view=rev Log: [CMAKE] Disable run-time type information for MSVC 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=505… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Mon Jan 31 19:47:02 2011 @@ -13,7 +13,7 @@ endif() endif() -add_definitions(/X /GS- /Zl /Zi) +add_definitions(/X /GR- /GS- /Zl /Zi) add_definitions(-Dinline=__inline -D__STDC__=1) if(${_MACHINE_ARCH_FLAG} MATCHES X86)

13 years, 10 months

[tkreuzer] 50577: [CRT] Put __declspec(nothrow) at a valid (for MSVC) position.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 31 19:46:05 2011 New Revision: 50577 URL: http://svn.reactos.org/svn/reactos?rev=50577&view=rev Log: [CRT] Put __declspec(nothrow) at a valid (for MSVC) position. Modified: branches/cmake-bringup/include/crt/setjmp.h Modified: branches/cmake-bringup/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/setjm… ============================================================================== --- branches/cmake-bringup/include/crt/setjmp.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/setjmp.h [iso-8859-1] Mon Jan 31 19:46:05 2011 @@ -155,18 +155,18 @@ ({ void* value; __asm__ __volatile__("movl %%esp, %[value]" : [value] "=r" (value)); value; }) #endif #define setjmp(BUF) _setjmp((BUF),mingw_getsp()) - int __cdecl __MINGW_NOTHROW _setjmp(jmp_buf _Buf,void *_Ctx); + int __MINGW_NOTHROW __cdecl _setjmp(jmp_buf _Buf,void *_Ctx); #else /* _INC_SETJMPEX */ #undef setjmp #define setjmp(BUF) _setjmpex((BUF),mingw_getsp()) #define setjmpex(BUF) _setjmpex((BUF),mingw_getsp()) - int __cdecl __MINGW_NOTHROW _setjmpex(jmp_buf _Buf,void *_Ctx); + int __MINGW_NOTHROW __cdecl _setjmpex(jmp_buf _Buf,void *_Ctx); #endif /* _INC_SETJMPEX */ #else /* !USE_MINGW_SETJMP_TWO_ARGS */ #ifndef _INC_SETJMPEX #define setjmp _setjmp #endif - int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf); + int __MINGW_NOTHROW __cdecl setjmp(jmp_buf _Buf); #endif /* !USE_MINGW_SETJMP_TWO_ARGS */ __declspec(noreturn) __MINGW_NOTHROW void __cdecl ms_longjmp(jmp_buf _Buf,int _Value)/* throw(...)*/;

13 years, 10 months

[spetreolle] 50576: [CMAKE] Fix WSCUpdateProvider spec entry.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Mon Jan 31 16:32:16 2011 New Revision: 50576 URL: http://svn.reactos.org/svn/reactos?rev=50576&view=rev Log: [CMAKE] Fix WSCUpdateProvider spec entry. Modified: branches/cmake-bringup/dll/win32/ws2_32/ws2_32.spec Modified: branches/cmake-bringup/dll/win32/ws2_32/ws2_32.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32/… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32/ws2_32.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2_32/ws2_32.spec [iso-8859-1] Mon Jan 31 16:32:16 2011 @@ -111,7 +111,7 @@ @ stdcall WSCInstallNameSpace(wstr wstr long long ptr) @ stdcall WSCInstallProvider(ptr wstr ptr long ptr) @ stdcall WSCUnInstallNameSpace(ptr) -@ stdcall WSCUpdateProvider(ptr ptr long ptr) +@ stdcall WSCUpdateProvider(ptr ptr ptr long ptr) @ stdcall WSCWriteNameSpaceOrder(ptr long) @ stdcall WSCWriteProviderOrder(ptr long) @ stdcall freeaddrinfo(ptr)

13 years, 10 months

[spetreolle] 50575: [CMAKE] Fix classpnp build.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Mon Jan 31 15:56:39 2011 New Revision: 50575 URL: http://svn.reactos.org/svn/reactos?rev=50575&view=rev Log: [CMAKE] Fix classpnp build. Modified: branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt Modified: branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Mon Jan 31 15:56:39 2011 @@ -19,7 +19,6 @@ spec2def(classpnp.sys class.spec) -list(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_BINARY_DIR}/class_stubs.c) list(APPEND SOURCE autorun.c class.c

13 years, 10 months

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 January 2011