From 4ff54162dd2545d82bfdb2ee13c04ead1d6476ff Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 3 Dec 2010 11:01:21 +0000 Subject: [PATCH] [CMAKE] - More work on import lib targets and improving modules. svn path=/branches/cmake-bringup/; revision=49916 --- dll/win32/comctl32/CMakeLists.txt | 17 +++++---- dll/win32/shdocvw/CMakeLists.txt | 10 ++--- dll/win32/shlwapi/CMakeLists.txt | 10 ++--- dll/win32/t2embed/CMakeLists.txt | 8 +++- dll/win32/user32/CMakeLists.txt | 4 -- dll/win32/user32/user32_stubs.c | 45 ----------------------- drivers/directx/dxgthk/CMakeLists.txt | 6 ++- drivers/wdm/audio/drm/drmk/CMakeLists.txt | 7 +++- drivers/wmi/CMakeLists.txt | 8 +++- 9 files changed, 41 insertions(+), 74 deletions(-) delete mode 100644 dll/win32/user32/user32_stubs.c diff --git a/dll/win32/comctl32/CMakeLists.txt b/dll/win32/comctl32/CMakeLists.txt index f1b310734ac..4413cdbd036 100644 --- a/dll/win32/comctl32/CMakeLists.txt +++ b/dll/win32/comctl32/CMakeLists.txt @@ -1,16 +1,19 @@ set_unicode() -add_definitions(-D__WINESRC__) -add_definitions(-D_WINE) -add_definitions(-D_COMCTL32_) +add_definitions( + -D__WINESRC__ + -D_WINE + -D_COMCTL32_) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) + include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(comctl32.dll comctl32.spec) -add_library(comctl32 SHARED +list(APPEND SOURCE animate.c comboex.c comctl32undoc.c @@ -51,11 +54,11 @@ add_library(comctl32 SHARED rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def) +add_library(comctl32 SHARED ${SOURCE}) + set_module_type(comctl32 win32dll) -target_link_libraries(comctl32 - uuid - wine) +target_link_libraries(comctl32 uuid wine) add_importlibs(comctl32 user32 diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt index 5f99988ad6f..0cee1c4fdde 100644 --- a/dll/win32/shdocvw/CMakeLists.txt +++ b/dll/win32/shdocvw/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(shdocvw.dll shdocvw.spec) -add_library(shdocvw SHARED +list(APPEND SOURCE classinfo.c client.c dochost.c @@ -30,11 +30,11 @@ add_library(shdocvw SHARED shdocvw.rc ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def) +add_library(shdocvw SHARED ${SOURCE}) + set_module_type(shdocvw win32dll) -target_link_libraries(shdocvw - uuid - wine) +target_link_libraries(shdocvw uuid wine) add_importlibs(shdocvw comctl32 @@ -51,6 +51,6 @@ add_importlibs(shdocvw kernel32 ntdll) -add_dependencies(shdocvw shdocvw_v1 shdocvw_def) +add_dependencies(shdocvw shdocvw_v1) add_cab_target(shdocvw 1) add_importlib_target(shdocvw.spec) diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt index b6070544c77..8ad384fea45 100644 --- a/dll/win32/shlwapi/CMakeLists.txt +++ b/dll/win32/shlwapi/CMakeLists.txt @@ -7,7 +7,7 @@ add_definitions(-D_WIN32_WINNT=0x600) spec2def(shlwapi.dll shlwapi.spec) -add_library(shlwapi SHARED +list(APPEND SOURCE assoc.c clist.c istream.c @@ -25,11 +25,11 @@ add_library(shlwapi SHARED shlwapi.rc ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def) +add_library(shlwapi SHARED ${SOURCE}) + set_module_type(shlwapi win32dll) -target_link_libraries(shlwapi - wine - uuid) +target_link_libraries(shlwapi wine uuid) add_importlibs(shlwapi user32 @@ -49,6 +49,6 @@ add_importlibs(shlwapi msvcrt ntdll) - add_cab_target(shlwapi 1) + add_importlib_target(shlwapi.spec) diff --git a/dll/win32/t2embed/CMakeLists.txt b/dll/win32/t2embed/CMakeLists.txt index 66691bf5f34..500f45c0df3 100644 --- a/dll/win32/t2embed/CMakeLists.txt +++ b/dll/win32/t2embed/CMakeLists.txt @@ -5,7 +5,12 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(t2embed.dll t2embed.spec) -add_library(t2embed SHARED t2embed.c t2embed.rc ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def) +list(APPEND SOURCE + t2embed.c + t2embed.rc + ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def) + +add_library(t2embed SHARED ${SOURCE}) set_module_type(t2embed win32dll) @@ -13,5 +18,4 @@ target_link_libraries(t2embed wine) add_importlibs(t2embed gdi32 user32 advapi32 version msvcrt kernel32 ntdll) - add_cab_target(t2embed 1) diff --git a/dll/win32/user32/CMakeLists.txt b/dll/win32/user32/CMakeLists.txt index e61d6cf4c12..1b015fd2ba2 100644 --- a/dll/win32/user32/CMakeLists.txt +++ b/dll/win32/user32/CMakeLists.txt @@ -64,12 +64,9 @@ list(APPEND SOURCE windows/text.c windows/window.c windows/winpos.c - user32_stubs.c user32.rc ${CMAKE_CURRENT_BINARY_DIR}/user32.def) -set_source_files_properties(user32.def PROPERTIES EXTERNAL_OBJECT TRUE) - add_library(user32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/user32_user32.h.gch ${SOURCE}) @@ -85,4 +82,3 @@ add_pch(user32 ${CMAKE_CURRENT_SOURCE_DIR}/include/user32.h ${SOURCE}) add_importlibs(user32 gdi32 advapi32 imm32 msvcrt kernel32 ntdll) add_cab_target(user32 1) add_importlib_target(user32.spec) - diff --git a/dll/win32/user32/user32_stubs.c b/dll/win32/user32/user32_stubs.c deleted file mode 100644 index 51e6aee39ee..00000000000 --- a/dll/win32/user32/user32_stubs.c +++ /dev/null @@ -1,45 +0,0 @@ - -#include -#include "windef.h" -#include "winbase.h" -#include "wine/config.h" -#include "wine/exception.h" - -void __wine_spec_unimplemented_stub( const char *module, const char *function ) -{ - ULONG_PTR args[2]; - - args[0] = (ULONG_PTR)module; - args[1] = (ULONG_PTR)function; - RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); -} - -static const char __wine_spec_file_name[] = "user32.dll"; - -void __wine_stub_user32_dll_22(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "BuildReasonArray"); } -void __wine_stub_user32_dll_23(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CalcMenuBar"); } -void __wine_stub_user32_dll_96(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CreateSystemThreads"); } -void __wine_stub_user32_dll_153(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DestroyReasons"); } -void __wine_stub_user32_dll_155(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeviceEventWorker"); } -void __wine_stub_user32_dll_203(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EnterReaderModeHelper"); } -void __wine_stub_user32_dll_266(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "GetCursorFrameInfo"); } -void __wine_stub_user32_dll_339(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "GetReasonTitleFromReasonCode"); } -void __wine_stub_user32_dll_396(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "InitializeWin32EntryTable"); } -void __wine_stub_user32_dll_424(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "IsProcess16Bit"); } -void __wine_stub_user32_dll_426(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "IsSETEnabled"); } -void __wine_stub_user32_dll_434(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "IsWow64Message"); } -void __wine_stub_user32_dll_451(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "LoadKeyboardLayoutEx"); } -void __wine_stub_user32_dll_484(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "MessageBoxTimeoutA"); } -void __wine_stub_user32_dll_485(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "MessageBoxTimeoutW"); } -void __wine_stub_user32_dll_511(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PaintMenuBar"); } -void __wine_stub_user32_dll_529(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ReasonCodeNeedsBugID"); } -void __wine_stub_user32_dll_530(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ReasonCodeNeedsComment"); } -void __wine_stub_user32_dll_531(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RecordShutdownReason"); } -void __wine_stub_user32_dll_543(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RegisterMessagePumpHook"); } -void __wine_stub_user32_dll_586(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SetConsoleReserveKeys"); } -void __wine_stub_user32_dll_658(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SoftModalMessageBox"); } -void __wine_stub_user32_dll_681(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "TranslateMessageEx"); } -void __wine_stub_user32_dll_693(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "UnregisterMessagePumpHook"); } -void __wine_stub_user32_dll_702(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "UserLpkPSMTextOut"); } -void __wine_stub_user32_dll_703(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "UserLpkTabbedTextOut"); } -void __wine_stub_user32_dll_718(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "Win32PoolAllocationStats"); } diff --git a/drivers/directx/dxgthk/CMakeLists.txt b/drivers/directx/dxgthk/CMakeLists.txt index 99d75585263..3e414315a43 100644 --- a/drivers/directx/dxgthk/CMakeLists.txt +++ b/drivers/directx/dxgthk/CMakeLists.txt @@ -1,14 +1,16 @@ spec2def(dxgthk.sys dxgthk.spec) -add_library(dxgthk SHARED +list(APPEND SOURCE main.c dxgthk.rc ${CMAKE_CURRENT_BINARY_DIR}/dxgthk.def) +add_library(dxgthk SHARED ${SOURCE}) + set_module_type(dxgthk kernelmodedriver) -add_importlibs(dxgthk win32k) +add_importlibs(dxgthk win32k) add_importlib_target(dxgthk.spec) add_cab_target(dxgthk 2) diff --git a/drivers/wdm/audio/drm/drmk/CMakeLists.txt b/drivers/wdm/audio/drm/drmk/CMakeLists.txt index 583fe6ed552..71a05cfc1f4 100644 --- a/drivers/wdm/audio/drm/drmk/CMakeLists.txt +++ b/drivers/wdm/audio/drm/drmk/CMakeLists.txt @@ -3,12 +3,15 @@ add_definitions(-DBUILDING_DRMK) spec2def(drmk.sys drmk.spec) -add_library(drmk SHARED +list(APPEND SOURCE stubs.cpp drmk.rc ${CMAKE_CURRENT_BINARY_DIR}/drmk.def) +add_library(drmk SHARED ${SOURCE}) + set_module_type(drmk kernelmodedriver) add_importlibs(drmk ntoskrnl) +add_importlib_target(drmk.spec) -add_cab_target(drmk 2) \ No newline at end of file +add_cab_target(drmk 2) diff --git a/drivers/wmi/CMakeLists.txt b/drivers/wmi/CMakeLists.txt index b8c6aebf9e0..fc4507e827a 100644 --- a/drivers/wmi/CMakeLists.txt +++ b/drivers/wmi/CMakeLists.txt @@ -1,12 +1,16 @@ spec2def(wmilib.sys wmilib.spec) -add_library(wmilib SHARED +list(APPEND SOURCE wmilib.c wmilib.rc ${CMAKE_CURRENT_BINARY_DIR}/wmilib.def) +add_library(wmilib SHARED ${SOURCE}) + set_module_type(wmilib kernelmodedriver) + add_importlibs(wmilib ntoskrnl) +add_importlib_target(wmilib.spec) -add_cab_target(wmilib 2) \ No newline at end of file +add_cab_target(wmilib 2) -- 2.17.1