diff --git a/base/shell/explorer/CMakeLists.txt b/base/shell/explorer/CMakeLists.txt index cc61b33841d..92cf6a9d9dd 100644 --- a/base/shell/explorer/CMakeLists.txt +++ b/base/shell/explorer/CMakeLists.txt @@ -66,23 +66,12 @@ target_link_libraries(explorer wine mingw_wmain mingw_common - uuid - -ladvapi32 - -lgdi32 - -luser32 - -lws2_32 - -lmsimg32 - -lcomctl32 - -lole32 - -loleaut32 - -lshell32 - -lnotifyhook - -lmsvcrt - -lkernel32 - -lntdll) + uuid) + +add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 notifyhook msvcrt kernel32 ntdll) set_image_base(explorer 0x00400000) add_dependencies(explorer psdk buildno_header) add_cab_target(explorer 4) -add_cab(${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml 4) \ No newline at end of file +add_cab(${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml 4) diff --git a/base/shell/explorer/notifyhook/CMakeLists.txt b/base/shell/explorer/notifyhook/CMakeLists.txt index 9f08f9daf4e..f54cdb23ed2 100644 --- a/base/shell/explorer/notifyhook/CMakeLists.txt +++ b/base/shell/explorer/notifyhook/CMakeLists.txt @@ -1,13 +1,18 @@ add_definitions(-D_NOTIFYHOOK_IMPL) -add_library(notifyhook SHARED +spec2def(notifyhook.dll notifyhook.spec) + +list(APPEND SOURCE notifyhook.c notifyhook.rc - notifyhook.def) + ${CMAKE_CURRENT_BINARY_DIR}/notifyhook.def) + +add_library(notifyhook SHARED ${SOURCE}) set_module_type(notifyhook win32dll) add_importlibs(notifyhook user32 msvcrt kernel32) +add_importlib_target(notifyhook.spec) add_cab_target(notifyhook 1) diff --git a/base/shell/explorer/notifyhook/notifyhook.def b/base/shell/explorer/notifyhook/notifyhook.def deleted file mode 100644 index 47ddf67e5c9..00000000000 --- a/base/shell/explorer/notifyhook/notifyhook.def +++ /dev/null @@ -1,6 +0,0 @@ -LIBRARY notifyhook.dll -EXPORTS -DeinstallNotifyHook -GetWindowModulePath -GetWindowModulePathCopyData -InstallNotifyHook diff --git a/base/shell/explorer/notifyhook/notifyhook.spec b/base/shell/explorer/notifyhook/notifyhook.spec new file mode 100644 index 00000000000..e27ea751426 --- /dev/null +++ b/base/shell/explorer/notifyhook/notifyhook.spec @@ -0,0 +1,4 @@ +@ cdecl DeinstallNotifyHook() +@ cdecl GetWindowModulePath(ptr) +@ cdecl GetWindowModulePathCopyData(ptr ptr ptr long) +@ cdecl InstallNotifyHook() \ No newline at end of file diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 7b7efd12d71..69262a24a2f 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -60,15 +60,19 @@ list(APPEND SOURCE remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-D_SHELL32_) -add_definitions(-DCOM_NO_WINDOWS_H) -add_definitions(-D_WINE) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -include_directories(${REACTOS_SOURCE_DIR}/lib/recyclebin) -include_directories(${REACTOS_SOURCE_DIR}) +add_definitions( + -D_SHELL32_ + -DCOM_NO_WINDOWS_H + -D_WINE) + +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/lib/recyclebin + ${REACTOS_SOURCE_DIR}) add_pch(shell32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + add_library(shell32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/shell32_precomp.h.gch ${SOURCE}) set_module_type(shell32 win32dll) @@ -94,7 +98,5 @@ add_importlibs(shell32 msvcrt ntdll) - add_cab_target(shell32 1) add_importlib_target(shell32.spec) - diff --git a/importlibs/libadvapi32.a b/importlibs/libadvapi32.a deleted file mode 100644 index 4ef4f9c4269..00000000000 Binary files a/importlibs/libadvapi32.a and /dev/null differ diff --git a/importlibs/libbattc.a b/importlibs/libbattc.a deleted file mode 100644 index e88165566ec..00000000000 Binary files a/importlibs/libbattc.a and /dev/null differ diff --git a/importlibs/libbootvid.a b/importlibs/libbootvid.a deleted file mode 100644 index 36016bd60c9..00000000000 Binary files a/importlibs/libbootvid.a and /dev/null differ diff --git a/importlibs/libcabinet.a b/importlibs/libcabinet.a deleted file mode 100644 index 8f1def019f0..00000000000 Binary files a/importlibs/libcabinet.a and /dev/null differ diff --git a/importlibs/libclass2.a b/importlibs/libclass2.a deleted file mode 100644 index 5b2b6596886..00000000000 Binary files a/importlibs/libclass2.a and /dev/null differ diff --git a/importlibs/libcomctl32.a b/importlibs/libcomctl32.a deleted file mode 100644 index 9ca04c3266e..00000000000 Binary files a/importlibs/libcomctl32.a and /dev/null differ diff --git a/importlibs/libcrypt32.a b/importlibs/libcrypt32.a deleted file mode 100644 index d19258c9dfb..00000000000 Binary files a/importlibs/libcrypt32.a and /dev/null differ diff --git a/importlibs/libcryptui.a b/importlibs/libcryptui.a deleted file mode 100644 index 05faf2912ab..00000000000 Binary files a/importlibs/libcryptui.a and /dev/null differ diff --git a/importlibs/libcsrsrv.a b/importlibs/libcsrsrv.a deleted file mode 100644 index 2d321f7d503..00000000000 Binary files a/importlibs/libcsrsrv.a and /dev/null differ diff --git a/importlibs/libd3d9.a b/importlibs/libd3d9.a deleted file mode 100644 index 7eb22b8de9e..00000000000 Binary files a/importlibs/libd3d9.a and /dev/null differ diff --git a/importlibs/libd3dx9_24.a b/importlibs/libd3dx9_24.a deleted file mode 100644 index 8657f0e6e15..00000000000 Binary files a/importlibs/libd3dx9_24.a and /dev/null differ diff --git a/importlibs/libd3dx9_36.a b/importlibs/libd3dx9_36.a deleted file mode 100644 index 04922d31f64..00000000000 Binary files a/importlibs/libd3dx9_36.a and /dev/null differ diff --git a/importlibs/libdbghelp.a b/importlibs/libdbghelp.a deleted file mode 100644 index 190b308f864..00000000000 Binary files a/importlibs/libdbghelp.a and /dev/null differ diff --git a/importlibs/libdevmgr.a b/importlibs/libdevmgr.a deleted file mode 100644 index 8b7b15ee5aa..00000000000 Binary files a/importlibs/libdevmgr.a and /dev/null differ diff --git a/importlibs/libdhcpcsvc.a b/importlibs/libdhcpcsvc.a deleted file mode 100644 index e2bc4174e90..00000000000 Binary files a/importlibs/libdhcpcsvc.a and /dev/null differ diff --git a/importlibs/libdrmk.a b/importlibs/libdrmk.a deleted file mode 100644 index 07934c6e2dd..00000000000 Binary files a/importlibs/libdrmk.a and /dev/null differ diff --git a/importlibs/libdxgthk.a b/importlibs/libdxgthk.a deleted file mode 100644 index 19d1be81592..00000000000 Binary files a/importlibs/libdxgthk.a and /dev/null differ diff --git a/importlibs/libfmifs.a b/importlibs/libfmifs.a deleted file mode 100644 index c7c98560715..00000000000 Binary files a/importlibs/libfmifs.a and /dev/null differ diff --git a/importlibs/libftfd.a b/importlibs/libftfd.a deleted file mode 100644 index cba1d76cfcd..00000000000 Binary files a/importlibs/libftfd.a and /dev/null differ diff --git a/importlibs/libgdi32.a b/importlibs/libgdi32.a deleted file mode 100644 index 1ea430e6afe..00000000000 Binary files a/importlibs/libgdi32.a and /dev/null differ diff --git a/importlibs/libgdiplus.a b/importlibs/libgdiplus.a deleted file mode 100644 index 84b0fbeff00..00000000000 Binary files a/importlibs/libgdiplus.a and /dev/null differ diff --git a/importlibs/libhal.a b/importlibs/libhal.a deleted file mode 100644 index e71ab30bed9..00000000000 Binary files a/importlibs/libhal.a and /dev/null differ diff --git a/importlibs/libimm32.a b/importlibs/libimm32.a deleted file mode 100644 index 49e42f104cf..00000000000 Binary files a/importlibs/libimm32.a and /dev/null differ diff --git a/importlibs/libkdcom.a b/importlibs/libkdcom.a deleted file mode 100644 index 54aa584a5ed..00000000000 Binary files a/importlibs/libkdcom.a and /dev/null differ diff --git a/importlibs/libkernel32.a b/importlibs/libkernel32.a deleted file mode 100644 index 51d957f3ff6..00000000000 Binary files a/importlibs/libkernel32.a and /dev/null differ diff --git a/importlibs/libks.a b/importlibs/libks.a deleted file mode 100644 index 155290e0aa6..00000000000 Binary files a/importlibs/libks.a and /dev/null differ diff --git a/importlibs/libloadperf.a b/importlibs/libloadperf.a deleted file mode 100644 index c728713814d..00000000000 Binary files a/importlibs/libloadperf.a and /dev/null differ diff --git a/importlibs/liblsasrv.a b/importlibs/liblsasrv.a deleted file mode 100644 index 5b733da2b00..00000000000 Binary files a/importlibs/liblsasrv.a and /dev/null differ diff --git a/importlibs/libmlang.a b/importlibs/libmlang.a deleted file mode 100644 index 4290e038b0e..00000000000 Binary files a/importlibs/libmlang.a and /dev/null differ diff --git a/importlibs/libmpr.a b/importlibs/libmpr.a deleted file mode 100644 index 6bcaaff46e4..00000000000 Binary files a/importlibs/libmpr.a and /dev/null differ diff --git a/importlibs/libmsi.a b/importlibs/libmsi.a deleted file mode 100644 index dc9533243ec..00000000000 Binary files a/importlibs/libmsi.a and /dev/null differ diff --git a/importlibs/libmsimg32.a b/importlibs/libmsimg32.a deleted file mode 100644 index a64b909c6c7..00000000000 Binary files a/importlibs/libmsimg32.a and /dev/null differ diff --git a/importlibs/libmsvcrt.a b/importlibs/libmsvcrt.a deleted file mode 100644 index f44a826ef33..00000000000 Binary files a/importlibs/libmsvcrt.a and /dev/null differ diff --git a/importlibs/libnetapi32.a b/importlibs/libnetapi32.a deleted file mode 100644 index 021ff811a98..00000000000 Binary files a/importlibs/libnetapi32.a and /dev/null differ diff --git a/importlibs/libnotifyhook.a b/importlibs/libnotifyhook.a deleted file mode 100644 index 971e4690b1c..00000000000 Binary files a/importlibs/libnotifyhook.a and /dev/null differ diff --git a/importlibs/libntdll.a b/importlibs/libntdll.a deleted file mode 100644 index 268b798bf24..00000000000 Binary files a/importlibs/libntdll.a and /dev/null differ diff --git a/importlibs/libntoskrnl.a b/importlibs/libntoskrnl.a deleted file mode 100644 index 08f9dfaecfa..00000000000 Binary files a/importlibs/libntoskrnl.a and /dev/null differ diff --git a/importlibs/libole32.a b/importlibs/libole32.a deleted file mode 100644 index 92dbb0d9310..00000000000 Binary files a/importlibs/libole32.a and /dev/null differ diff --git a/importlibs/liboleaut32.a b/importlibs/liboleaut32.a deleted file mode 100644 index de9788f8459..00000000000 Binary files a/importlibs/liboleaut32.a and /dev/null differ diff --git a/importlibs/libpciidex.a b/importlibs/libpciidex.a deleted file mode 100644 index 88abb7ce55b..00000000000 Binary files a/importlibs/libpciidex.a and /dev/null differ diff --git a/importlibs/libriched20.a b/importlibs/libriched20.a deleted file mode 100644 index eb9a5af7b2d..00000000000 Binary files a/importlibs/libriched20.a and /dev/null differ diff --git a/importlibs/librpcrt4.a b/importlibs/librpcrt4.a deleted file mode 100644 index 5eb9e699fcd..00000000000 Binary files a/importlibs/librpcrt4.a and /dev/null differ diff --git a/importlibs/librsaenh.a b/importlibs/librsaenh.a deleted file mode 100644 index 06aeae967b2..00000000000 Binary files a/importlibs/librsaenh.a and /dev/null differ diff --git a/importlibs/libsamlib.a b/importlibs/libsamlib.a deleted file mode 100644 index aef165f7694..00000000000 Binary files a/importlibs/libsamlib.a and /dev/null differ diff --git a/importlibs/libscsiport.a b/importlibs/libscsiport.a deleted file mode 100644 index 04f58c622a2..00000000000 Binary files a/importlibs/libscsiport.a and /dev/null differ diff --git a/importlibs/libsetupapi.a b/importlibs/libsetupapi.a deleted file mode 100644 index 04771472e18..00000000000 Binary files a/importlibs/libsetupapi.a and /dev/null differ diff --git a/importlibs/libshdocvw.a b/importlibs/libshdocvw.a deleted file mode 100644 index 3380025f60e..00000000000 Binary files a/importlibs/libshdocvw.a and /dev/null differ diff --git a/importlibs/libshell32.a b/importlibs/libshell32.a deleted file mode 100644 index 5ec55d7d6ec..00000000000 Binary files a/importlibs/libshell32.a and /dev/null differ diff --git a/importlibs/libshlwapi.a b/importlibs/libshlwapi.a deleted file mode 100644 index 9bc46338a91..00000000000 Binary files a/importlibs/libshlwapi.a and /dev/null differ diff --git a/importlibs/libsmdll.a b/importlibs/libsmdll.a deleted file mode 100644 index 91bab48fef8..00000000000 Binary files a/importlibs/libsmdll.a and /dev/null differ diff --git a/importlibs/libsnmpapi.a b/importlibs/libsnmpapi.a deleted file mode 100644 index 36e78ae1d45..00000000000 Binary files a/importlibs/libsnmpapi.a and /dev/null differ diff --git a/importlibs/libspoolss.a b/importlibs/libspoolss.a deleted file mode 100644 index eae449536ab..00000000000 Binary files a/importlibs/libspoolss.a and /dev/null differ diff --git a/importlibs/liburlmon.a b/importlibs/liburlmon.a deleted file mode 100644 index cb74ce8cf44..00000000000 Binary files a/importlibs/liburlmon.a and /dev/null differ diff --git a/importlibs/libuser32.a b/importlibs/libuser32.a deleted file mode 100644 index de0d0a7e8da..00000000000 Binary files a/importlibs/libuser32.a and /dev/null differ diff --git a/importlibs/libuserenv.a b/importlibs/libuserenv.a deleted file mode 100644 index 5cdfaf1dc8d..00000000000 Binary files a/importlibs/libuserenv.a and /dev/null differ diff --git a/importlibs/libvideoprt.a b/importlibs/libvideoprt.a deleted file mode 100644 index e38ecb95f17..00000000000 Binary files a/importlibs/libvideoprt.a and /dev/null differ diff --git a/importlibs/libwin32k.a b/importlibs/libwin32k.a deleted file mode 100644 index 5336a603d1b..00000000000 Binary files a/importlibs/libwin32k.a and /dev/null differ diff --git a/importlibs/libwindowscodecs.a b/importlibs/libwindowscodecs.a deleted file mode 100644 index 04880e81767..00000000000 Binary files a/importlibs/libwindowscodecs.a and /dev/null differ diff --git a/importlibs/libwined3d.a b/importlibs/libwined3d.a deleted file mode 100644 index c8457faf132..00000000000 Binary files a/importlibs/libwined3d.a and /dev/null differ diff --git a/importlibs/libwinspool.a b/importlibs/libwinspool.a deleted file mode 100644 index 1e2e0ce02d1..00000000000 Binary files a/importlibs/libwinspool.a and /dev/null differ diff --git a/importlibs/libwintrust.a b/importlibs/libwintrust.a deleted file mode 100644 index af3b5a642b9..00000000000 Binary files a/importlibs/libwintrust.a and /dev/null differ diff --git a/importlibs/libwmilib.a b/importlibs/libwmilib.a deleted file mode 100644 index 19898293855..00000000000 Binary files a/importlibs/libwmilib.a and /dev/null differ diff --git a/importlibs/libws2_32.a b/importlibs/libws2_32.a deleted file mode 100644 index bdbf716d360..00000000000 Binary files a/importlibs/libws2_32.a and /dev/null differ diff --git a/importlibs/libws2help.a b/importlibs/libws2help.a deleted file mode 100644 index 43c1aa0b569..00000000000 Binary files a/importlibs/libws2help.a and /dev/null differ