From 05f0a228c599e877de4a1e217cebc3e65060be53 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 15 Feb 2011 20:47:09 +0000 Subject: [PATCH 1/9] [KSPROXY] - Fix gcc build - don't pass gcc flags to msvc . mark some exports as private svn path=/branches/cmake-bringup/; revision=50720 --- dll/directx/ksproxy/CMakeLists.txt | 5 ++--- dll/directx/ksproxy/datatype.cpp | 3 ++- dll/directx/ksproxy/input_pin.cpp | 3 ++- dll/directx/ksproxy/ksproxy.spec | 8 ++++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dll/directx/ksproxy/CMakeLists.txt b/dll/directx/ksproxy/CMakeLists.txt index 6b568055928..84090c7b818 100644 --- a/dll/directx/ksproxy/CMakeLists.txt +++ b/dll/directx/ksproxy/CMakeLists.txt @@ -36,11 +36,10 @@ if(MSVC) else() #FIXME : can't build if this is enabled, check if this is needed #set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") + target_link_libraries(ksproxy -lsupc++ -lgcc -lmingw32 -lcoldname) endif(MSVC) -target_link_libraries(ksproxy - stlport -lsupc++ -lgcc -lmingw32 -lcoldname - strmiids) +target_link_libraries(ksproxy stlport strmiids) add_importlibs(ksproxy advapi32 diff --git a/dll/directx/ksproxy/datatype.cpp b/dll/directx/ksproxy/datatype.cpp index dee247e081e..8ad71a5ca8d 100644 --- a/dll/directx/ksproxy/datatype.cpp +++ b/dll/directx/ksproxy/datatype.cpp @@ -11,9 +11,10 @@ /* FIXME guid mess */ #ifndef _MSC_VER const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; +#else +const GUID IID_IKsDataTypeHandler = {0x5FFBAA02L, 0x49A3, 0x11D0, {0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1}}; #endif const GUID IID_IClassFactory = {0x00000001, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; -const GUID IID_IKsDataTypeHandler = {0x5FFBAA02L, 0x49A3, 0x11D0, {0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1}}; class CKsDataTypeHandler : public IKsDataTypeHandler { diff --git a/dll/directx/ksproxy/input_pin.cpp b/dll/directx/ksproxy/input_pin.cpp index 253e4416101..d6b5b5a2fca 100644 --- a/dll/directx/ksproxy/input_pin.cpp +++ b/dll/directx/ksproxy/input_pin.cpp @@ -10,9 +10,10 @@ const GUID IID_IKsPinPipe = {0xe539cd90, 0xa8b4, 0x11d1, {0x81, 0x89, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02}}; const GUID IID_IKsPinEx = {0x7bb38260L, 0xd19c, 0x11d2, {0xb3, 0x8a, 0x00, 0xa0, 0xc9, 0x5e, 0xc2, 0x2e}}; +#ifdef _MSC_VER const GUID IID_IKsPin = {0xb61178d1L, 0xa2d9, 0x11cf, {0x9e, 0x53, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1}}; const GUID IID_IKsInterfaceHandler = {0xD3ABC7E0L, 0x9A61, 0x11D0, {0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; - +#endif #ifndef _MSC_VER const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; diff --git a/dll/directx/ksproxy/ksproxy.spec b/dll/directx/ksproxy/ksproxy.spec index c4caec6845e..2cb7fa91cb6 100644 --- a/dll/directx/ksproxy/ksproxy.spec +++ b/dll/directx/ksproxy/ksproxy.spec @@ -1,7 +1,7 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stdcall KsGetMediaType(long ptr ptr long) @ stdcall KsGetMediaTypeCount(ptr long ptr) @ stdcall KsGetMultiplePinFactoryItems(ptr long long ptr) From a10450250163833f36bfdae5813bd0f1a8237a1c Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Tue, 15 Feb 2011 22:07:05 +0000 Subject: [PATCH 2/9] [CMAKE] Fix dxdiag build. svn path=/branches/cmake-bringup/; revision=50722 --- base/applications/dxdiag/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/dxdiag/CMakeLists.txt b/base/applications/dxdiag/CMakeLists.txt index ad4f120652b..68f57180ec9 100644 --- a/base/applications/dxdiag/CMakeLists.txt +++ b/base/applications/dxdiag/CMakeLists.txt @@ -27,6 +27,6 @@ set_module_type(dxdiag win32gui) target_link_libraries(dxdiag dxguid) -add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32) +add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32 ntdll) add_cab_target(dxdiag 1) From e0b78ef7c332649367494eaa7b97115c6bf09e81 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Wed, 16 Feb 2011 10:21:15 +0000 Subject: [PATCH 3/9] - Fix build svn path=/branches/cmake-bringup/; revision=50724 --- subsystems/win32/csrss/csrsrv/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/subsystems/win32/csrss/csrsrv/CMakeLists.txt b/subsystems/win32/csrss/csrsrv/CMakeLists.txt index e45bf0f7ff9..cf16e3e7c42 100644 --- a/subsystems/win32/csrss/csrsrv/CMakeLists.txt +++ b/subsystems/win32/csrss/csrsrv/CMakeLists.txt @@ -19,6 +19,11 @@ target_link_libraries(csrsrv ${PSEH_LIB}) set_module_type(csrsrv nativedll) +if(MSVC) +set_entrypoint(csrsrv DllMainCRTStartup) +endif() + + add_importlibs(csrsrv ntdll smdll) add_pch(csrsrv ${CMAKE_CURRENT_SOURCE_DIR}/srv.h ${SOURCE}) From 6cf55b5d6d71d9908e12957ae99ba1e6ea5d5851 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Wed, 16 Feb 2011 10:23:07 +0000 Subject: [PATCH 4/9] - Fix linker warnings svn path=/branches/cmake-bringup/; revision=50725 --- drivers/wdm/audio/backpln/portcls/portcls.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/wdm/audio/backpln/portcls/portcls.spec b/drivers/wdm/audio/backpln/portcls/portcls.spec index 1af797cafed..366e6af5b71 100644 --- a/drivers/wdm/audio/backpln/portcls/portcls.spec +++ b/drivers/wdm/audio/backpln/portcls/portcls.spec @@ -1,5 +1,5 @@ -@ stdcall DllInitialize(long) -@ stdcall DllUnload() +@ stdcall -private DllInitialize(long) +@ stdcall -private DllUnload() ; Adapters (adapter.c) @ stdcall PcAddAdapterDevice(ptr ptr ptr long long) From a35e1b6b03c665a111685f869303abe7d2091445 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Wed, 16 Feb 2011 10:38:21 +0000 Subject: [PATCH 5/9] - Fix vbemp build svn path=/branches/cmake-bringup/; revision=50726 --- drivers/video/miniport/vbe/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/video/miniport/vbe/CMakeLists.txt b/drivers/video/miniport/vbe/CMakeLists.txt index b60284e364b..f6717eac842 100644 --- a/drivers/video/miniport/vbe/CMakeLists.txt +++ b/drivers/video/miniport/vbe/CMakeLists.txt @@ -7,4 +7,6 @@ add_library(vbemp SHARED set_module_type(vbemp kernelmodedriver) add_importlibs(vbemp videoprt) +target_link_libraries(vbemp libcntpr) + add_cab_target(vbemp 2) From 81619aef1e64f7472f08e0316435c42a320b02b0 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Wed, 16 Feb 2011 10:43:59 +0000 Subject: [PATCH 6/9] - Fix vgaddi build (msvc) svn path=/branches/cmake-bringup/; revision=50727 --- drivers/video/displays/vga/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/video/displays/vga/CMakeLists.txt b/drivers/video/displays/vga/CMakeLists.txt index 6173c5f6213..811c0d5a171 100644 --- a/drivers/video/displays/vga/CMakeLists.txt +++ b/drivers/video/displays/vga/CMakeLists.txt @@ -20,5 +20,6 @@ set_subsystem(vgaddi native) set_image_base(vgaddi 0x00010000) add_importlibs(vgaddi win32k) +target_link_libraries(vgaddi libcntpr) add_dependencies(vgaddi psdk bugcodes) add_cab_target(vgaddi 1) \ No newline at end of file From 62b0db30821f08562e7ca695516af753d9b86267 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Wed, 16 Feb 2011 10:46:02 +0000 Subject: [PATCH 7/9] - Fix msvc framebuf build svn path=/branches/cmake-bringup/; revision=50728 --- drivers/video/displays/framebuf/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/displays/framebuf/CMakeLists.txt b/drivers/video/displays/framebuf/CMakeLists.txt index 29e27c30128..b002cca9af5 100644 --- a/drivers/video/displays/framebuf/CMakeLists.txt +++ b/drivers/video/displays/framebuf/CMakeLists.txt @@ -13,7 +13,7 @@ add_library(framebuf SHARED set_entrypoint(framebuf DrvEnableDriver@12) set_subsystem(framebuf native) set_image_base(framebuf 0x00010000) - +target_link_libraries(framebuf libcntpr) add_importlibs(framebuf win32k) add_dependencies(framebuf psdk bugcodes) add_cab_target(framebuf 1) From 7d3bc17152d12a51be4675398eda3758fcae547d Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Wed, 16 Feb 2011 10:51:49 +0000 Subject: [PATCH 8/9] - Fix msvc build svn path=/branches/cmake-bringup/; revision=50729 --- dll/win32/wing32/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/wing32/CMakeLists.txt b/dll/win32/wing32/CMakeLists.txt index d0f6b074451..03aedd4f53d 100644 --- a/dll/win32/wing32/CMakeLists.txt +++ b/dll/win32/wing32/CMakeLists.txt @@ -11,6 +11,6 @@ add_library(wing32 SHARED ${SOURCE}) set_entrypoint(wing32 0) -add_importlibs(wing32 user32 gdi32) +add_importlibs(wing32 user32 gdi32 msvcrt) add_dependencies(wing32 psdk) add_cab_target(wing32 1) From e5251147badbf2caac628632df741d46a4ab5646 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Wed, 16 Feb 2011 12:53:21 +0000 Subject: [PATCH 9/9] [WINE] Add math.h for wine code, with NAN and INFINITY as portable constants. svn path=/branches/cmake-bringup/; revision=50731 --- include/reactos/wine/math.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 include/reactos/wine/math.h diff --git a/include/reactos/wine/math.h b/include/reactos/wine/math.h new file mode 100644 index 00000000000..1d86ef9a7df --- /dev/null +++ b/include/reactos/wine/math.h @@ -0,0 +1,26 @@ +#ifndef __WINE_MATH_H_ +#define __WINE_MATH_H_ + +#include + +#ifdef _MSC_VER +__forceinline float _NaN() +{ + unsigned long NaN = 0x7fc00000; + return *(float*)&NaN; +} +#define NAN _NaN() + +__forceinline float _Infinity() +{ + unsigned long Infinity = 0x7f800000; + return *(float*)&Infinity; +} +#define INFINITY _Infinity() + +#else +#define NAN (0.0f / 0.0f) +#define INFINITY (1.0F/0.0F) +#endif + +#endif /* __WINE_MATH_H_ */