Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 49540: [SPEC2PDEF] Handle varargs like cdecl
by tkreuzer＠svn.reactos.org 09 Nov '10

09 Nov '10

Author: tkreuzer Date: Tue Nov 9 13:07:59 2010 New Revision: 49540 URL: http://svn.reactos.org/svn/reactos?rev=49540&view=rev Log: [SPEC2PDEF] Handle varargs like cdecl Modified: branches/cmake-bringup/tools/spec2pdef/spec2pdef.c Modified: branches/cmake-bringup/tools/spec2pdef/spec2pdef.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2pdef/s… ============================================================================== --- branches/cmake-bringup/tools/spec2pdef/spec2pdef.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2pdef/spec2pdef.c [iso-8859-1] Tue Nov 9 13:07:59 2010 @@ -95,7 +95,8 @@ { pexp->nCallingConvention = CC_STDCALL; } - else if (_strcmpx(pcCurrent, "cdecl ") == 0) + else if ( (_strcmpx(pcCurrent, "cdecl ") == 0) || + (_strcmpx(pcCurrent, "varargs ") == 0) ) { pexp->nCallingConvention = CC_CDECL; }

1 0

[tkreuzer] 49539: [CABMAN] _strcmpi -> _stricmp
by tkreuzer＠svn.reactos.org 09 Nov '10

09 Nov '10

Author: tkreuzer Date: Tue Nov 9 08:58:09 2010 New Revision: 49539 URL: http://svn.reactos.org/svn/reactos?rev=49539&view=rev Log: [CABMAN] _strcmpi -> _stricmp Modified: branches/cmake-bringup/tools/cabman/cabinet.h Modified: branches/cmake-bringup/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/cabman/cabi… ============================================================================== --- branches/cmake-bringup/tools/cabman/cabinet.h [iso-8859-1] (original) +++ branches/cmake-bringup/tools/cabman/cabinet.h [iso-8859-1] Tue Nov 9 08:58:09 2010 @@ -29,7 +29,7 @@ #define DIR_SEPARATOR_CHAR '\\' #define DIR_SEPARATOR_STRING "\\" -#define strcasecmp _strcmpi +#define strcasecmp _stricmp #define strdup _strdup #define AllocateMemory(size) HeapAlloc(GetProcessHeap(), 0, size)

1 0

[tkreuzer] 49538: [CMAKE] Add a hack to fix compilation of irot.idl with MSVC. If someone knows how to correctly fix this, please let me know.
by tkreuzer＠svn.reactos.org 09 Nov '10

09 Nov '10

Author: tkreuzer Date: Tue Nov 9 01:42:06 2010 New Revision: 49538 URL: http://svn.reactos.org/svn/reactos?rev=49538&view=rev Log: [CMAKE] Add a hack to fix compilation of irot.idl with MSVC. If someone knows how to correctly fix this, please let me know. Modified: branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Tue Nov 9 01:42:06 2010 @@ -32,7 +32,7 @@ SET(CMAKE_IDL_COMPILER midl) SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") -SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> /win32 /h <OBJECT> <SOURCE>") +SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> /win32 /Dstrict_context_handle= /h <OBJECT> <SOURCE>") SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"

1 0

[akhaldi] 49537: [CMAKE] - Use pdef files in some dlls.
by akhaldi＠svn.reactos.org 08 Nov '10

08 Nov '10

Author: akhaldi Date: Mon Nov 8 22:57:05 2010 New Revision: 49537 URL: http://svn.reactos.org/svn/reactos?rev=49537&view=rev Log: [CMAKE] - Use pdef files in some dlls. Added: branches/cmake-bringup/dll/win32/aclui/aclui.pdef (with props) branches/cmake-bringup/dll/win32/avicap32/avicap32.pdef (with props) branches/cmake-bringup/dll/win32/batt/batt.pdef (with props) branches/cmake-bringup/dll/win32/beepmidi/beepmidi.pdef (with props) branches/cmake-bringup/dll/win32/cards/cards.pdef (with props) branches/cmake-bringup/dll/win32/compstui/compstui.pdef (with props) branches/cmake-bringup/dll/win32/getuname/getuname.pdef (with props) branches/cmake-bringup/dll/win32/localui/localui.pdef (with props) branches/cmake-bringup/dll/win32/lpk/lpk.pdef (with props) Removed: branches/cmake-bringup/dll/win32/aclui/aclui.def branches/cmake-bringup/dll/win32/avicap32/avicap32.def branches/cmake-bringup/dll/win32/batt/batt.def branches/cmake-bringup/dll/win32/beepmidi/beepmidi.def branches/cmake-bringup/dll/win32/cards/cards.def branches/cmake-bringup/dll/win32/getuname/getuname.def branches/cmake-bringup/dll/win32/localui/localui.def branches/cmake-bringup/dll/win32/lpk/lpk.def Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt branches/cmake-bringup/dll/win32/batt/CMakeLists.txt branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt branches/cmake-bringup/dll/win32/cards/CMakeLists.txt branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt branches/cmake-bringup/dll/win32/localui/CMakeLists.txt branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -4,8 +4,7 @@ list(APPEND SOURCE acledit.c stubs.c - acledit.rc - ) + acledit.rc) add_library(acledit SHARED ${SOURCE}) Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/C… ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -9,13 +9,7 @@ guid.c misc.c sidcache.c - aclui.rc - aclui.def) - -if(NOT MSVC) - set_source_files_properties(aclui.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() - + aclui.rc) add_library(aclui SHARED ${CMAKE_CURRENT_BINARY_DIR}/aclui_precomp.h.gch @@ -23,6 +17,9 @@ set_module_type(aclui win32dll) +set_pdef_file(aclui aclui.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/aclui.def) + add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme kernel32 ntdll) add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) Removed: branches/cmake-bringup/dll/win32/aclui/aclui.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/a… ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/aclui.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/aclui/aclui.def (removed) @@ -1,7 +1,0 @@ - -LIBRARY aclui.dll - -EXPORTS - CreateSecurityPage@4 @1 - EditSecurity@8 @2 - IID_ISecurityInformation @3 DATA Added: branches/cmake-bringup/dll/win32/aclui/aclui.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/a… ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/aclui.pdef (added) +++ branches/cmake-bringup/dll/win32/aclui/aclui.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,20 @@ +; File generated automatically, do not edit! + +LIBRARY aclui.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(CreateSecurityPage,STDCALL,4) +_NAME(EditSecurity,STDCALL,8) +_NAME(IID_ISecurityInformation,EXTERN,0) DATA Propchange: branches/cmake-bringup/dll/win32/aclui/aclui.pdef ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap3… ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,13 +1,12 @@ set_unicode() -add_library(avicap32 SHARED avicap32.c avicap32.rc avicap32.def) - -if(NOT MSVC) - set_source_files_properties(avicap32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(avicap32 SHARED avicap32.c avicap32.rc) set_module_type(avicap32 win32dll) + +set_pdef_file(avicap32 avicap32.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/avicap32.def) target_link_libraries(avicap32 wine) Removed: branches/cmake-bringup/dll/win32/avicap32/avicap32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap3… ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/avicap32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avicap32/avicap32.def (removed) @@ -1,10 +1,0 @@ - -LIBRARY avicap32.dll - -EXPORTS - AppCleanup@4 @1 - capCreateCaptureWindowA@32 @2 - capCreateCaptureWindowW@32 @3 - capGetDriverDescriptionA@20 @4 - capGetDriverDescriptionW@20 @5 - videoThunk32@20 @6 Added: branches/cmake-bringup/dll/win32/avicap32/avicap32.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap3… ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/avicap32.pdef (added) +++ branches/cmake-bringup/dll/win32/avicap32/avicap32.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,23 @@ +; File generated automatically, do not edit! + +LIBRARY avicap32.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(AppCleanup,STDCALL,4) +_NAME(capCreateCaptureWindowA,STDCALL,32) +_NAME(capCreateCaptureWindowW,STDCALL,32) +_NAME(capGetDriverDescriptionA,STDCALL,20) +_NAME(capGetDriverDescriptionW,STDCALL,20) +_NAME(videoThunk32,STDCALL,20) Propchange: branches/cmake-bringup/dll/win32/avicap32/avicap32.pdef ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,13 +1,12 @@ set_unicode() -add_library(batt SHARED batt.c batt.rc batt.def) - -if(NOT MSVC) - set_source_files_properties(batt.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(batt SHARED batt.c batt.rc) set_module_type(batt win32dll) + +set_pdef_file(batt batt.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/batt.def) add_importlibs(batt kernel32) Removed: branches/cmake-bringup/dll/win32/batt/batt.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/ba… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/batt.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/batt/batt.def (removed) @@ -1,6 +1,0 @@ - -LIBRARY batt.dll - -EXPORTS - BatteryClassCoInstaller@16 @1 - BatteryClassInstall@12 @2 Added: branches/cmake-bringup/dll/win32/batt/batt.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/ba… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/batt.pdef (added) +++ branches/cmake-bringup/dll/win32/batt/batt.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,19 @@ +; File generated automatically, do not edit! + +LIBRARY batt.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(BatteryClassCoInstaller,STDCALL,16) +_NAME(BatteryClassInstall,STDCALL,12) Propchange: branches/cmake-bringup/dll/win32/batt/batt.pdef ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmid… ============================================================================== --- branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,11 +1,10 @@ set_unicode() -add_library(beepmidi SHARED beepmidi.c beepmidi.def) +add_library(beepmidi SHARED beepmidi.c) -if(NOT MSVC) - set_source_files_properties(beepmidi.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +set_pdef_file(beepmidi beepmidi.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def) set_entrypoint(beepmidi 0) Removed: branches/cmake-bringup/dll/win32/beepmidi/beepmidi.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmid… ============================================================================== --- branches/cmake-bringup/dll/win32/beepmidi/beepmidi.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/beepmidi/beepmidi.def (removed) @@ -1,6 +1,0 @@ - -LIBRARY beepmidi.dll - -EXPORTS - DriverProc@20 @1 - modMessage@20 @2 Added: branches/cmake-bringup/dll/win32/beepmidi/beepmidi.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmid… ============================================================================== --- branches/cmake-bringup/dll/win32/beepmidi/beepmidi.pdef (added) +++ branches/cmake-bringup/dll/win32/beepmidi/beepmidi.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,19 @@ +; File generated automatically, do not edit! + +LIBRARY beepmidi.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(DriverProc,STDCALL,20) +_NAME(modMessage,STDCALL,20) Propchange: branches/cmake-bringup/dll/win32/beepmidi/beepmidi.pdef ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/C… ============================================================================== --- branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -4,11 +4,10 @@ # Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN add_definitions(-DCARDSTYLE_DEFAULT) -add_library(cards SHARED cards.c cards.rc cards.def) +add_library(cards SHARED cards.c cards.rc) -if(NOT MSVC) - set_source_files_properties(cards.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +set_pdef_file(cards cards.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/cards.def) set_module_type(cards win32dll) Removed: branches/cmake-bringup/dll/win32/cards/cards.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/c… ============================================================================== --- branches/cmake-bringup/dll/win32/cards/cards.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cards/cards.def (removed) @@ -1,10 +1,0 @@ - -LIBRARY cards.dll - -EXPORTS - WEP@4 @1 - cdtAnimate@20 @2 - cdtDraw@24 @3 - cdtDrawExt@32 @4 - cdtInit@8 @5 - cdtTerm@0 @6 Added: branches/cmake-bringup/dll/win32/cards/cards.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/c… ============================================================================== --- branches/cmake-bringup/dll/win32/cards/cards.pdef (added) +++ branches/cmake-bringup/dll/win32/cards/cards.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,23 @@ +; File generated automatically, do not edit! + +LIBRARY cards.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(WEP,STDCALL,4) +_NAME(cdtAnimate,STDCALL,20) +_NAME(cdtDraw,STDCALL,24) +_NAME(cdtDrawExt,STDCALL,32) +_NAME(cdtInit,STDCALL,8) +_NAME(cdtTerm,STDCALL,0) Propchange: branches/cmake-bringup/dll/win32/cards/cards.pdef ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/compstu… ============================================================================== --- branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,13 +1,11 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(compstui SHARED compstui_main.c compstui.def) +add_library(compstui SHARED compstui_main.c) -if(NOT MSVC) - set_source_files_properties(compstui.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +set_pdef_file(compstui compstui.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/compstui.def) set_module_type(compstui win32dll) Added: branches/cmake-bringup/dll/win32/compstui/compstui.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/compstu… ============================================================================== --- branches/cmake-bringup/dll/win32/compstui/compstui.pdef (added) +++ branches/cmake-bringup/dll/win32/compstui/compstui.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,21 @@ +; File generated automatically, do not edit! + +LIBRARY compstui.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(CommonPropertySheetUIA,STDCALL,16) +_NAME(CommonPropertySheetUIW,STDCALL,16) +_NAME(GetCPSUIUserData,STDCALL,4) +_NAME(SetCPSUIUserData,STDCALL,8) Propchange: branches/cmake-bringup/dll/win32/compstui/compstui.pdef ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/getunam… ============================================================================== --- branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -3,11 +3,10 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(getuname SHARED getuname.c getuname.rc getuname.def) +add_library(getuname SHARED getuname.c getuname.rc) -if(NOT MSVC) - set_source_files_properties(getuname.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +set_pdef_file(getuname getuname.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/getuname.def) set_module_type(getuname win32dll) Removed: branches/cmake-bringup/dll/win32/getuname/getuname.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/getunam… ============================================================================== --- branches/cmake-bringup/dll/win32/getuname/getuname.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/getuname/getuname.def (removed) @@ -1,5 +1,0 @@ - -LIBRARY getuname.dll - -EXPORTS - GetUName@8 @1 Added: branches/cmake-bringup/dll/win32/getuname/getuname.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/getunam… ============================================================================== --- branches/cmake-bringup/dll/win32/getuname/getuname.pdef (added) +++ branches/cmake-bringup/dll/win32/getuname/getuname.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,18 @@ +; File generated automatically, do not edit! + +LIBRARY getuname.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(GetUName,STDCALL,8) Propchange: branches/cmake-bringup/dll/win32/getuname/getuname.pdef ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/localui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localui… ============================================================================== --- branches/cmake-bringup/dll/win32/localui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/localui/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -2,11 +2,10 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(localui SHARED localui.c localui.rc localui.def) +add_library(localui SHARED localui.c localui.rc) -if(NOT MSVC) - set_source_files_properties(localui.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +set_pdef_file(localui localui.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/localui.def) set_module_type(localui win32dll) Removed: branches/cmake-bringup/dll/win32/localui/localui.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localui… ============================================================================== --- branches/cmake-bringup/dll/win32/localui/localui.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/localui/localui.def (removed) @@ -1,5 +1,0 @@ - -LIBRARY localui.dll - -EXPORTS - InitializePrintMonitorUI@0 @1 Added: branches/cmake-bringup/dll/win32/localui/localui.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localui… ============================================================================== --- branches/cmake-bringup/dll/win32/localui/localui.pdef (added) +++ branches/cmake-bringup/dll/win32/localui/localui.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,18 @@ +; File generated automatically, do not edit! + +LIBRARY localui.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(InitializePrintMonitorUI,STDCALL,0) Propchange: branches/cmake-bringup/dll/win32/localui/localui.pdef ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -4,11 +4,10 @@ add_definitions(-DLANGPACK) include_directories(include) -add_library(lpk SHARED dllmain.c stub.c lpk.rc lpk.def) +add_library(lpk SHARED dllmain.c stub.c lpk.rc) -if(NOT MSVC) - set_source_files_properties(lpk.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +set_pdef_file(lpk lpk.pdef) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/lpk.def) set_module_type(lpk win32dll) Removed: branches/cmake-bringup/dll/win32/lpk/lpk.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/lpk… ============================================================================== --- branches/cmake-bringup/dll/win32/lpk/lpk.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lpk/lpk.def (removed) @@ -1,15 +1,0 @@ - -LIBRARY lpk.dll - -EXPORTS - LpkInitialize@4 @1 - LpkTabbedTextOut@48 @2 - LpkDllInitialize@12 @3 - LpkDrawTextEx@40 @4 - LpkEditControl @5 DATA - LpkExtTextOut@36 @6 - LpkGetCharacterPlacement@28 @7 - LpkGetTextExtentExPoint@36 @8 - LpkPSMTextOut@24 @9 - LpkUseGDIWidthCache@20 @10 - ftsWordBreak@20 @11 Added: branches/cmake-bringup/dll/win32/lpk/lpk.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/lpk… ============================================================================== --- branches/cmake-bringup/dll/win32/lpk/lpk.pdef (added) +++ branches/cmake-bringup/dll/win32/lpk/lpk.pdef [iso-8859-1] Mon Nov 8 22:57:05 2010 @@ -1,0 +1,28 @@ +; File generated automatically, do not edit! + +LIBRARY lpk.dll + +EXPORTS +#define FOOL(x) x +#if defined(__GNUC__) && defined(_X86_) +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#else +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(LpkInitialize,STDCALL,4) +_NAME(LpkTabbedTextOut,STDCALL,48) +_NAME(LpkDllInitialize,STDCALL,12) +_NAME(LpkDrawTextEx,STDCALL,40) +_NAME(LpkEditControl,EXTERN,0) DATA +_NAME(LpkExtTextOut,STDCALL,36) +_NAME(LpkGetCharacterPlacement,STDCALL,28) +_NAME(LpkGetTextExtentExPoint,STDCALL,36) +_NAME(LpkPSMTextOut,STDCALL,24) +_NAME(LpkUseGDIWidthCache,STDCALL,20) +_NAME(ftsWordBreak,STDCALL,20) Propchange: branches/cmake-bringup/dll/win32/lpk/lpk.pdef ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 49536: [CRT] Fix assembly syntax
by tkreuzer＠svn.reactos.org 08 Nov '10

08 Nov '10

Author: tkreuzer Date: Mon Nov 8 19:21:13 2010 New Revision: 49536 URL: http://svn.reactos.org/svn/reactos?rev=49536&view=rev Log: [CRT] Fix assembly syntax Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s [iso-8859-1] Mon Nov 8 19:21:13 2010 @@ -13,6 +13,6 @@ fpatan pop ebp - retn + ret END Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s [iso-8859-1] Mon Nov 8 19:21:13 2010 @@ -24,6 +24,6 @@ fstp st(1) pop ebp - retn + ret END

1 0

[tkreuzer] 49535: [CMAKE] add missing dependency
by tkreuzer＠svn.reactos.org 08 Nov '10

08 Nov '10

Author: tkreuzer Date: Mon Nov 8 19:01:52 2010 New Revision: 49535 URL: http://svn.reactos.org/svn/reactos?rev=49535&view=rev Log: [CMAKE] add missing dependency 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=495… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Nov 8 19:01:52 2010 @@ -175,6 +175,7 @@ pdef2def(${_pdef_file}) get_filename_component(_file ${_pdef_file} NAME_WE) target_link_libraries(${_module} "${CMAKE_CURRENT_BINARY_DIR}/${_file}.def") + add_dependencies(${_module} ${_file}_def) endmacro() #pseh lib, needed with mingw

1 0

[tkreuzer] 49534: [CRT] - Add #pragma function to a number of intrisics that we implement to avoid a compiler error of MSVC - Add a workaround to prevent some functions from being inlined - Move sq...
by tkreuzer＠svn.reactos.org 08 Nov '10

08 Nov '10

Author: tkreuzer Date: Mon Nov 8 18:36:45 2010 New Revision: 49534 URL: http://svn.reactos.org/svn/reactos?rev=49534&view=rev Log: [CRT] - Add #pragma function to a number of intrisics that we implement to avoid a compiler error of MSVC - Add a workaround to prevent some functions from being inlined - Move sqrtf out of i386 directory - Convert a number of inline assembly functions to raw assembly Added: branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s (with props) branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s (with props) branches/cmake-bringup/lib/sdk/crt/math/i386/fmod_asm.s (with props) branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf_asm.s (with props) branches/cmake-bringup/lib/sdk/crt/math/sqrtf.c - copied, changed from r49530, branches/cmake-bringup/lib/sdk/crt/math/i386/sqrtf.c Removed: branches/cmake-bringup/lib/sdk/crt/math/i386/atan2.c branches/cmake-bringup/lib/sdk/crt/math/i386/exp.c branches/cmake-bringup/lib/sdk/crt/math/i386/fmod.c branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf.c branches/cmake-bringup/lib/sdk/crt/math/i386/sqrtf.c Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/math/acos.c branches/cmake-bringup/lib/sdk/crt/math/asin.c branches/cmake-bringup/lib/sdk/crt/math/cosf.c branches/cmake-bringup/lib/sdk/crt/math/cosh.c branches/cmake-bringup/lib/sdk/crt/math/logf.c branches/cmake-bringup/lib/sdk/crt/math/modf.c branches/cmake-bringup/lib/sdk/crt/math/sinf.c branches/cmake-bringup/lib/sdk/crt/math/sinh.c branches/cmake-bringup/lib/sdk/crt/math/tanh.c 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 Nov 8 18:36:45 2010 @@ -56,6 +56,7 @@ math/logf.c math/modf.c math/rand.c + math/sqrtf.c math/s_modf.c math/sinf.c math/sinh.c @@ -327,13 +328,12 @@ math/i386/sin_asm.s math/i386/sqrt_asm.s math/i386/tan_asm.s - math/i386/atan2.c + math/i386/atan2_asm.s math/i386/ci.c - math/i386/exp.c - math/i386/fmod.c - math/i386/fmodf.c + math/i386/exp_asm.s + math/i386/fmod_asm.s + math/i386/fmodf_asm.s math/i386/ldexp.c - math/i386/sqrtf.c mem/i386/memchr_asm.s mem/i386/memmove_asm.s mem/i386/memset_asm.s Modified: branches/cmake-bringup/lib/sdk/crt/math/acos.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/acos.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/acos.c [iso-8859-1] Mon Nov 8 18:36:45 2010 @@ -21,6 +21,9 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(acos) +#endif double acos(double __x) { Modified: branches/cmake-bringup/lib/sdk/crt/math/asin.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/asin.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/asin.c [iso-8859-1] Mon Nov 8 18:36:45 2010 @@ -21,6 +21,9 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(asin) +#endif double asin(double __x) { Modified: branches/cmake-bringup/lib/sdk/crt/math/cosf.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/cosf.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/cosf.c [iso-8859-1] Mon Nov 8 18:36:45 2010 @@ -3,7 +3,9 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ +#define cosf _dummy_cosf #include <math.h> +#undef cosf float cosf(float _X) { Modified: branches/cmake-bringup/lib/sdk/crt/math/cosh.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/cosh.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/cosh.c [iso-8859-1] Mon Nov 8 18:36:45 2010 @@ -1,6 +1,9 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <math.h> +#ifdef _MSC_VER +#pragma function(cosh) +#endif /* * @implemented Removed: branches/cmake-bringup/lib/sdk/crt/math/i386/atan2.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/atan2.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/atan2.c (removed) @@ -1,27 +1,0 @@ - -#include <math.h> - -double atan2 (double __y, double __x); - -/* - * @implemented - */ -double atan2 (double __y, double __x) -{ - register double __val; -#ifdef __GNUC__ - __asm __volatile__ - ("fpatan\n\t" - "fld %%st(0)" - : "=t" (__val) : "0" (__x), "u" (__y)); -#else - __asm - { - fld __y - fld __x - fpatan - fstp __val - } -#endif /*__GNUC__*/ - return __val; -} Added: branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s (added) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s [iso-8859-1] Mon Nov 8 18:36:45 2010 @@ -1,0 +1,18 @@ + +#include <reactos/asm.h> + +PUBLIC _atan2 + +.code +_atan2: + push ebp + mov ebp, esp + + fld qword ptr [ebp + 8] + fld qword ptr [ebp + 16] + fpatan + + pop ebp + retn + +END Propchange: branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/cmake-bringup/lib/sdk/crt/math/i386/exp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/exp.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/exp.c (removed) @@ -1,64 +1,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <math.h> - -double exp (double __x); - -double exp (double __x) -{ -#ifdef __GNUC__ - register double __value, __exponent; - __asm __volatile__ - ("fldl2e # e^x = 2^(x * log2(e))\n\t" - "fmul %%st(1) # x * log2(e)\n\t" - "fst %%st(1)\n\t" - "frndint # int(x * log2(e))\n\t" - "fxch\n\t" - "fsub %%st(1) # fract(x * log2(e))\n\t" - "f2xm1 # 2^(fract(x * log2(e))) - 1\n\t" - : "=t" (__value), "=u" (__exponent) : "0" (__x)); - __value += 1.0; - __asm __volatile__ - ("fscale" - : "=t" (__value) : "0" (__value), "u" (__exponent)); - - return __value; -#else - register double __val; - __asm - { - fld1 // store 1.0 for later use - fld __x - fldl2e // e^x = 2^(x * log2(e)) - fmul st,st(1) // x * log2(e) - fld st(0) - frndint // int(x * log2(e)) - fsub st,st(1) // fract(x * log2(e)) - fxch - f2xm1 // 2^(fract(x * log2(e))) - 1 - fadd st,st(3) // + 1.0 - fscale - fstp __val - } - return __val; -#endif /*__GNUC__*/ -} Added: branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s (added) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s [iso-8859-1] Mon Nov 8 18:36:45 2010 @@ -1,0 +1,29 @@ + +#include <reactos/asm.h> + +PUBLIC _exp + +/* FUNCTIONS ***************************************************************/ +.code + +_exp: + push ebp + mov ebp, esp + + fld qword ptr [ebp + 8] + fldl2e + fmul st, st(1) + fst st(1) + frndint + fxch st(1) + fsub st, st(1) + f2xm1 + fld1 + faddp st(1), st + fscale + fstp st(1) + + pop ebp + retn + +END Propchange: branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/cmake-bringup/lib/sdk/crt/math/i386/fmod.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/fmod.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/fmod.c (removed) @@ -1,49 +1,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <math.h> - -double fmod (double __x, double __y); - -double fmod (double __x, double __y) -{ - register double __val; -#ifdef __GNUC__ - __asm __volatile__ - ("1: fprem\n\t" - "fstsw %%ax\n\t" - "sahf\n\t" - "jp 1b" - : "=t" (__val) : "0" (__x), "u" (__y) : "ax", "cc"); -#else - __asm - { - fld __y - fld __x -L1: fprem1 - fstsw ax - sahf - jp L1 - fstp __val - } -#endif /*__GNUC__*/ - return __val; -} Added: branches/cmake-bringup/lib/sdk/crt/math/i386/fmod_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/fmod_asm.s (added) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/fmod_asm.s [iso-8859-1] Mon Nov 8 18:36:45 2010 @@ -1,0 +1,26 @@ + +#include <reactos/asm.h> + +PUBLIC _fmod + +/* FUNCTIONS ***************************************************************/ +.code + +_fmod: + push ebp + mov ebp, esp + + fld qword ptr [ebp + 8] + fld qword ptr [ebp + 16] + fxch st(1) +l1: + fprem + fstsw ax + sahf + jp l1 + fstp st(1) + + pop ebp + ret + +END Propchange: branches/cmake-bringup/lib/sdk/crt/math/i386/fmod_asm.s ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf.c (removed) @@ -1,28 +1,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -/* - * Written by J.T. Conklin <jtc(a)netbsd.org>. - * Public domain. - * - * Adapted for float type by Danny Smith - * <dannysmith(a)users.sourceforge.net>. - */ - -#include <math.h> - -float -fmodf (float x, float y) -{ - float res = 0.0F; - - asm ("1:\tfprem\n\t" - "fstsw %%ax\n\t" - "sahf\n\t" - "jp 1b\n\t" - "fstp %%st(1)" - : "=t" (res) : "0" (x), "u" (y) : "ax", "st(1)"); - return res; -} Added: branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf_asm.s (added) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf_asm.s [iso-8859-1] Mon Nov 8 18:36:45 2010 @@ -1,0 +1,26 @@ + +#include <reactos/asm.h> + +PUBLIC _fmodf + +/* FUNCTIONS ***************************************************************/ +.code + +_fmodf: + push ebp + mov ebp, esp + + fld dword ptr [esp + 4] + fld dword ptr [esp + 8] + fxch st(1) +l1: + fprem + fstsw ax + sahf + jp l1 + fstp st(1) + + pop ebp + ret + +END Propchange: branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf_asm.s ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/cmake-bringup/lib/sdk/crt/math/i386/sqrtf.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/sqrtf.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/sqrtf.c (removed) @@ -1,12 +1,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#include <math.h> - -float -sqrtf(float x) -{ - return ((float)sqrt((double)x)); -} Modified: branches/cmake-bringup/lib/sdk/crt/math/logf.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/logf.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/logf.c [iso-8859-1] Mon Nov 8 18:36:45 2010 @@ -3,7 +3,9 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ +#define logf _dummy_logf #include <math.h> +#undef logf float logf(float _X) { Modified: branches/cmake-bringup/lib/sdk/crt/math/modf.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/modf.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/modf.c [iso-8859-1] Mon Nov 8 18:36:45 2010 @@ -9,8 +9,9 @@ * is preserved. * ==================================================== */ - +#define modfl _dummy_modfl #include <precomp.h> +#undef modfl //static const double one = 1.0; Modified: branches/cmake-bringup/lib/sdk/crt/math/sinf.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/sinf.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/sinf.c [iso-8859-1] Mon Nov 8 18:36:45 2010 @@ -3,7 +3,9 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ +#define sinf _dummy_sinf #include <math.h> +#undef sinf float sinf(float _X) { Modified: branches/cmake-bringup/lib/sdk/crt/math/sinh.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/sinh.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/sinh.c [iso-8859-1] Mon Nov 8 18:36:45 2010 @@ -1,5 +1,9 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <math.h> + +#ifdef _MSC_VER +#pragma function(sinh) +#endif /* * @implemented Copied: branches/cmake-bringup/lib/sdk/crt/math/sqrtf.c (from r49530, branches/cmake-bringup/lib/sdk/crt/math/i386/sqrtf.c) URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/sqrtf.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/sqrtf.c [iso-8859-1] Mon Nov 8 18:36:45 2010 @@ -6,7 +6,7 @@ #include <math.h> float -sqrtf(float x) +_sqrtf(float x) { return ((float)sqrt((double)x)); } Modified: branches/cmake-bringup/lib/sdk/crt/math/tanh.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/tanh.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/tanh.c [iso-8859-1] Mon Nov 8 18:36:45 2010 @@ -1,6 +1,10 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <math.h> + +#ifdef _MSC_VER +#pragma function(tanh) +#endif /* * @implemented

1 0

[tkreuzer] 49533: [CMAKE] Don't put /M* on the command line
by tkreuzer＠svn.reactos.org 08 Nov '10

08 Nov '10

Author: tkreuzer Date: Mon Nov 8 18:14:26 2010 New Revision: 49533 URL: http://svn.reactos.org/svn/reactos?rev=49533&view=rev Log: [CMAKE] Don't put /M* on the command line Modified: branches/cmake-bringup/cmake/Platform/Windows-cl.cmake Modified: branches/cmake-bringup/cmake/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/Platform/Wi… ============================================================================== --- branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] Mon Nov 8 18:14:26 2010 @@ -158,7 +158,7 @@ STRING(REGEX REPLACE "/" "\\\\" testForFreeVCFile "${testForFreeVCFile}") MESSAGE(STATUS "Check if this is a free VC compiler") EXEC_PROGRAM(${CMAKE_TEST_COMPILER} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp2 - ARGS /nologo /MD /EHsc + ARGS /nologo /EHsc \"${testForFreeVCFile}\" OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT RETURN_VALUE CMAKE_COMPILER_RETURN @@ -209,20 +209,20 @@ IF(ENV{DDKBUILDENV} OR NOT CMAKE_CROSSCOMPILING) SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od") - SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MD /Zi /Ob0 /Od") + SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od") ELSE() - SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1") - SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1") + SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od") + SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od") ENDIF() SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc /GR") - SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG") - SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG") - SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG") + SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") + SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") + SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") SET (CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000") - SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG") - SET (CMAKE_C_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG") - SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG") + SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") + SET (CMAKE_C_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") + SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") SET (CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib ") SET (CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}") ELSE(MSVC_VERSION GREATER 1310) @@ -243,14 +243,14 @@ SET(CMAKE_BUILD_TYPE_INIT Debug) SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /GX /GR") SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /GZ") - SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG") - SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG") - SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG") + SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") + SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") + SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1 /D NDEBUG") SET (CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000") - SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od /GZ") - SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG") - SET (CMAKE_C_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG") - SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG") + SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od /GZ") + SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") + SET (CMAKE_C_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") + SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1 /D NDEBUG") ENDIF(CMAKE_USING_VC_FREE_TOOLS) SET (CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib") ENDIF(MSVC_VERSION GREATER 1310)

1 0

[tkreuzer] 49532: [MSVC] Fix warnings
by tkreuzer＠svn.reactos.org 08 Nov '10

08 Nov '10

Author: tkreuzer Date: Mon Nov 8 13:48:45 2010 New Revision: 49532 URL: http://svn.reactos.org/svn/reactos?rev=49532&view=rev Log: [MSVC] Fix warnings Modified: branches/cmake-bringup/lib/sdk/crt/include/internal/time.h Modified: branches/cmake-bringup/lib/sdk/crt/include/internal/time.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/inclu… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/include/internal/time.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/include/internal/time.h [iso-8859-1] Mon Nov 8 13:48:45 2010 @@ -20,9 +20,9 @@ ULargeInt.HighPart = FileTime->dwHighDateTime; ULargeInt.QuadPart -= DIFFTIME; - time = ULargeInt.QuadPart / 10000000; + time = (time_t)(ULargeInt.QuadPart / 10000000); if (millitm) - *millitm = (ULargeInt.QuadPart % 10000000) / 10000; + *millitm = (USHORT)((ULargeInt.QuadPart % 10000000) / 10000); return time; }

1 0

[tkreuzer] 49531: [CMAKE] Delete the Modules dir.
by tkreuzer＠svn.reactos.org 08 Nov '10

08 Nov '10

Author: tkreuzer Date: Mon Nov 8 13:45:34 2010 New Revision: 49531 URL: http://svn.reactos.org/svn/reactos?rev=49531&view=rev Log: [CMAKE] Delete the Modules dir. Removed: branches/cmake-bringup/cmake/Modules/

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