[ATL] Retire atlnew
authorMark Jansen <mark.jansen@reactos.org>
Sat, 6 Apr 2019 20:37:13 +0000 (22:37 +0200)
committerMark Jansen <mark.jansen@reactos.org>
Thu, 18 Apr 2019 17:21:37 +0000 (19:21 +0200)
26 files changed:
base/applications/charmap_new/CMakeLists.txt
base/applications/drwtsn32/CMakeLists.txt
base/applications/fltmc/CMakeLists.txt
base/applications/msconfig_new/CMakeLists.txt
base/applications/mspaint/CMakeLists.txt
base/applications/rapps/CMakeLists.txt
base/shell/explorer/CMakeLists.txt
base/shell/rshell/CMakeLists.txt
dll/shellext/acppage/CMakeLists.txt
dll/shellext/netshell/CMakeLists.txt
dll/shellext/ntobjshex/CMakeLists.txt
dll/shellext/stobject/CMakeLists.txt
dll/shellext/zipfldr/CMakeLists.txt
dll/win32/browseui/CMakeLists.txt
dll/win32/browseui/shellbars/CMakeLists.txt
dll/win32/devmgr/CMakeLists.txt
dll/win32/msgina/CMakeLists.txt
dll/win32/shell32/CMakeLists.txt
modules/rosapps/applications/devutils/shlextdbg/CMakeLists.txt
modules/rostests/apitests/atl/CMakeLists.txt
sdk/lib/CMakeLists.txt
sdk/lib/atl/CMakeLists.txt [deleted file]
sdk/lib/atl/atlbase.cpp [deleted file]
sdk/lib/atl/atlbase.h
sdk/lib/atl/atlcore.cpp [deleted file]
sdk/lib/atl/atlcore.h

index 657a5cb..3863bca 100644 (file)
@@ -21,7 +21,7 @@ add_library(charmap MODULE
     charmap.rc)
 
 set_module_type(charmap win32gui UNICODE)
-target_link_libraries(charmap uuid atlnew wine)
+target_link_libraries(charmap uuid wine)
 add_importlibs(charmap advapi32 user32 gdi32 comctl32 version msvcrt kernel32 ole32 uxtheme ntdll)
 add_pch(charmap precomp.h SOURCE)
 add_cd_file(TARGET charmap DESTINATION reactos/system32 FOR all)
index e58b1c0..fbc210b 100644 (file)
@@ -17,6 +17,6 @@ list(APPEND CPP_SOURCE
 add_executable(drwtsn32 ${CPP_SOURCE} drwtsn32.rc)
 add_pch(drwtsn32 precomp.h CPP_SOURCE)
 set_module_type(drwtsn32 win32gui UNICODE)
-target_link_libraries(drwtsn32 atlnew udmihelp)
+target_link_libraries(drwtsn32 udmihelp)
 add_importlibs(drwtsn32 dbghelp psapi advapi32 shell32 shlwapi msvcrt user32 kernel32 ntdll)
 add_cd_file(TARGET drwtsn32 DESTINATION reactos/system32 FOR all)
index 4bd22c0..01bf7a3 100644 (file)
@@ -8,6 +8,5 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl)
 
 add_executable(fltmc fltmc.cpp fltmc.rc)
 set_module_type(fltmc win32cui UNICODE)
-target_link_libraries(fltmc atlnew)
 add_importlibs(fltmc fltlib msvcrt kernel32 advapi32)
 add_cd_file(TARGET fltmc DESTINATION reactos/system32 FOR all)
index c2aad38..0fc32ec 100644 (file)
@@ -35,6 +35,6 @@ add_rc_deps(msconfig.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/msconfig.ico)
 add_executable(msconfig_new ${C_SOURCE} ${CPP_SOURCE} msconfig.rc)
 add_pch(msconfig_new precomp.h CPP_SOURCE)
 set_module_type(msconfig_new win32gui UNICODE)
-target_link_libraries(msconfig_new atlnew comsupp)
+target_link_libraries(msconfig_new comsupp)
 add_importlibs(msconfig_new user32 gdi32 comctl32 comdlg32 advapi32 version ole32 oleaut32 msxml3 shell32 shlwapi msvcrt kernel32)
 add_cd_file(TARGET msconfig_new DESTINATION reactos/system32 FOR all)
index 3f11200..b59a2ee 100644 (file)
@@ -33,7 +33,7 @@ file(GLOB mspaint_rc_deps icons/*.*)
 add_rc_deps(rsrc.rc ${mspaint_rc_deps})
 add_executable(mspaint ${SOURCE} rsrc.rc)
 set_module_type(mspaint win32gui UNICODE)
-target_link_libraries(mspaint atlnew uuid)
+target_link_libraries(mspaint uuid)
 add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 gdiplus advapi32 comctl32 msvcrt kernel32 rpcrt4 shlwapi)
 add_pch(mspaint precomp.h SOURCE)
 add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all)
index ce8ba3a..f3dea22 100644 (file)
@@ -40,7 +40,7 @@ file(GLOB_RECURSE rapps_rc_deps res/*.*)
 add_rc_deps(rapps.rc ${rapps_rc_deps})
 add_executable(rapps ${SOURCE} rapps.rc)
 set_module_type(rapps win32gui UNICODE)
-target_link_libraries(rapps atlnew uuid wine)
+target_link_libraries(rapps uuid wine)
 add_importlibs(rapps advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 setupapi msvcrt kernel32 ntdll)
 add_pch(rapps include/rapps.h SOURCE)
 add_dependencies(rapps rappsmsg)
index fa66d2e..b3f2982 100644 (file)
@@ -30,7 +30,7 @@ list(APPEND SOURCE
 file(GLOB explorer_rc_deps res/*.*)
 add_rc_deps(explorer.rc ${explorer_rc_deps})
 add_executable(explorer ${SOURCE} explorer.rc)
-target_link_libraries(explorer uuid atlnew wine)
+target_link_libraries(explorer uuid wine)
 set_module_type(explorer win32gui UNICODE)
 add_importlibs(explorer advapi32 gdi32 user32 comctl32 ole32 oleaut32 shell32 browseui shlwapi shdocvw version uxtheme msvcrt kernel32 ntdll)
 add_pch(explorer precomp.h SOURCE)
index 4297edb..5d4170d 100644 (file)
@@ -20,7 +20,6 @@ target_link_libraries(rshell
     shellbars
     shellmenu
     shelldesktop
-    atlnew
     uuid
     wine)
 
index 9303c23..f4dc6e1 100644 (file)
@@ -32,7 +32,7 @@ add_library(acppage MODULE
     ${CMAKE_CURRENT_BINARY_DIR}/acppage.def)
 
 set_module_type(acppage win32dll UNICODE)
-target_link_libraries(acppage atlnew wine uuid)
+target_link_libraries(acppage wine uuid)
 add_delay_importlibs(acppage apphelp ole32 oleaut32 shlwapi comctl32 sfc_os)
 add_importlibs(acppage shell32 user32 advapi32 msvcrt kernel32)
 add_pch(acppage precomp.h SOURCE)
index 0a2c0fa..dc4a260 100644 (file)
@@ -39,7 +39,7 @@ add_library(netshell MODULE
     ${CMAKE_CURRENT_BINARY_DIR}/netshell.def)
 
 set_module_type(netshell win32dll UNICODE)
-target_link_libraries(netshell atlnew uuid wine)
+target_link_libraries(netshell uuid wine)
 add_delay_importlibs(netshell ole32 oleaut32 shlwapi shell32)
 add_importlibs(netshell version iphlpapi gdi32 user32 advapi32 setupapi ws2_32 comctl32 msvcrt kernel32 ntdll)
 add_pch(netshell precomp.h SOURCE)
index f8a6e73..854c8a6 100644 (file)
@@ -30,7 +30,7 @@ add_library(ntobjshex MODULE
     ${CMAKE_CURRENT_BINARY_DIR}/ntobjshex.def)
 
 set_module_type(ntobjshex win32dll UNICODE)
-target_link_libraries(ntobjshex uuid wine atlnew)
+target_link_libraries(ntobjshex uuid wine)
 
 add_importlibs(ntobjshex
     advapi32
index 093303f..411dab2 100644 (file)
@@ -34,7 +34,7 @@ add_library(stobject MODULE
     ${CMAKE_CURRENT_BINARY_DIR}/stobject.def)
 
 set_module_type(stobject win32dll UNICODE)
-target_link_libraries(stobject uuid wine atlnew)
+target_link_libraries(stobject uuid wine)
 
 add_importlibs(stobject
     setupapi
index 9ad72cb..3c39dc4 100644 (file)
@@ -45,7 +45,7 @@ add_library(zipfldr MODULE
 
 
 set_module_type(zipfldr win32dll UNICODE)
-target_link_libraries(zipfldr minizip zlib atlnew uuid)
+target_link_libraries(zipfldr minizip zlib uuid)
 add_importlibs(zipfldr oleaut32 ole32 shlwapi comctl32 shell32 user32 advapi32 msvcrt kernel32 ntdll)
 add_pch(zipfldr precomp.h SOURCE)
 add_cd_file(TARGET zipfldr DESTINATION reactos/system32 FOR all)
index 0c68a37..3681a2f 100644 (file)
@@ -46,7 +46,7 @@ add_library(browseui MODULE
     ${CMAKE_CURRENT_BINARY_DIR}/browseui.def)
 
 set_module_type(browseui win32dll UNICODE)
-target_link_libraries(browseui shellbars atlnew uuid wine)
+target_link_libraries(browseui shellbars uuid wine)
 add_importlibs(browseui uxtheme shlwapi shell32 comctl32 gdi32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)
 add_pch(browseui precomp.h SOURCE)
 add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all)
index ec87d6c..64cc9b5 100644 (file)
@@ -23,5 +23,4 @@ if(NOT MSVC)
 endif()
 
 add_pch(shellbars shellbars.h SOURCE)
-target_link_libraries(shellbars atlnew)
 add_dependencies(shellbars xdk)
index 44ba6f4..f427c3a 100644 (file)
@@ -35,7 +35,7 @@ add_library(devmgr MODULE
     ${CMAKE_CURRENT_BINARY_DIR}/devmgr.def)
 
 set_module_type(devmgr win32dll UNICODE)
-target_link_libraries(devmgr uuid atlnew wine)
+target_link_libraries(devmgr uuid wine)
 add_importlibs(devmgr setupapi advapi32 newdev user32 gdi32 comctl32 version msvcrt kernel32 ole32 oleaut32 uxtheme ntdll)
 add_pch(devmgr precomp.h SOURCE)
 add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all)
index 1cfa45f..694481b 100644 (file)
@@ -27,7 +27,7 @@ add_library(msgina MODULE
     ${CMAKE_CURRENT_BINARY_DIR}/msgina.def)
 
 set_module_type(msgina win32dll UNICODE)
-target_link_libraries(msgina atlnew wine uuid ${PSEH_LIB})
+target_link_libraries(msgina wine uuid ${PSEH_LIB})
 add_delay_importlibs(msgina secur32)
 add_importlibs(msgina advapi32 user32 gdi32 powrprof userenv msvcrt kernel32 ntdll)
 add_pch(msgina msgina.h CPP_SOURCE)
index 60d0fc9..ea2fe80 100644 (file)
@@ -117,7 +117,7 @@ add_typelib(shell32_shldisp.idl)
 set_source_files_properties(shell32.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/shell32_shldisp.tlb)
 
 set_module_type(shell32 win32dll UNICODE)
-target_link_libraries(shell32 shellmenu shelldesktop atlnew wine uuid recyclebin)
+target_link_libraries(shell32 shellmenu shelldesktop wine uuid recyclebin)
 add_delay_importlibs(shell32 powrprof shdocvw devmgr winspool.drv winmm mpr uxtheme ole32 oleaut32 userenv browseui version fmifs)
 add_importlibs(shell32 advapi32 gdi32 user32 comctl32 comdlg32 shlwapi msvcrt kernel32 ntdll)
 add_dependencies(shell32 stdole2) # shell32_shldisp.tlb needs stdole2.tlb
index 21f80e7..2322440 100644 (file)
@@ -7,6 +7,6 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl)
 add_executable(shlextdbg shlextdbg.cpp shlextdbg.rc)
 
 set_module_type(shlextdbg win32cui UNICODE)
-target_link_libraries(shlextdbg atlnew uuid)
+target_link_libraries(shlextdbg uuid)
 add_importlibs(shlextdbg ole32 comctl32 shell32 user32 msvcrt kernel32)
 add_cd_file(TARGET shlextdbg DESTINATION reactos/system32 FOR all)
index 2497247..8055fff 100644 (file)
@@ -24,7 +24,7 @@ add_executable(atl_apitest
     testlist.c
     atl_apitest.rc)
 
-target_link_libraries(atl_apitest wine atlnew uuid)
+target_link_libraries(atl_apitest wine uuid)
 set_module_type(atl_apitest win32cui)
 add_importlibs(atl_apitest rpcrt4 ole32 oleaut32 msimg32 gdi32 advapi32 user32 msvcrt kernel32 ntdll)
 add_pch(atl_apitest precomp.h SOURCE)
index e5d2d92..c9f4e39 100644 (file)
@@ -5,7 +5,6 @@ add_subdirectory(inflib)
 if(CMAKE_CROSSCOMPILING)
 
 add_subdirectory(3rdparty)
-add_subdirectory(atl)
 add_subdirectory(comsupp)
 add_subdirectory(conutils)
 add_subdirectory(cportlib)
diff --git a/sdk/lib/atl/CMakeLists.txt b/sdk/lib/atl/CMakeLists.txt
deleted file mode 100644 (file)
index f0177d5..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-
-set_cpp(WITH_RTTI)
-
-add_definitions(
-    -DUNICODE -D_UNICODE
-    -DROS_Headers)
-
-add_library(atlnew atlbase.cpp atlcore.cpp)
-add_dependencies(atlnew psdk)
diff --git a/sdk/lib/atl/atlbase.cpp b/sdk/lib/atl/atlbase.cpp
deleted file mode 100644 (file)
index 85e196b..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * ReactOS ATL
- *
- * Copyright 2009 Andrew Hill <ash77@reactos.org>
- *
- * This 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.
- *
- * This 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 this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "atlbase.h"
-
-namespace ATL
-{
-
-CAtlBaseModule _AtlBaseModule;
-CAtlWinModule _AtlWinModule = CAtlWinModule();
-CAtlComModule _AtlComModule;
-
-};  // namespace ATL
index abd0711..ae4c6ef 100644 (file)
@@ -57,7 +57,6 @@ class CComModule;
 class CAtlComModule;
 __declspec(selectany) CAtlModule *_pAtlModule = NULL;
 __declspec(selectany) CComModule *_pModule = NULL;
-extern CAtlComModule _AtlComModule;
 
 
 struct _ATL_CATMAP_ENTRY
@@ -590,6 +589,9 @@ public:
     }
 };
 
+__declspec(selectany) CAtlComModule _AtlComModule;
+
+
 template <class T>
 HRESULT CAtlModuleT<T>::RegisterServer(BOOL bRegTypeLib, const CLSID *pCLSID)
 {
@@ -983,7 +985,8 @@ public:
     }
 };
 
-extern CAtlWinModule _AtlWinModule;
+__declspec(selectany) CAtlWinModule _AtlWinModule;
+
 
 class CComAllocator
 {
diff --git a/sdk/lib/atl/atlcore.cpp b/sdk/lib/atl/atlcore.cpp
deleted file mode 100644 (file)
index 1b3c73d..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * ReactOS ATL
- *
- * Copyright 2009 Andrew Hill <ash77@reactos.org>
- *
- * This 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.
- *
- * This 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 this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "atlcore.h"
-
-namespace ATL
-{
-
-bool CAtlBaseModule::m_bInitFailed = false;
-
-};  // namespace ATL
index 279fa7f..26f3ced 100644 (file)
@@ -217,7 +217,8 @@ public:
     HINSTANCE GetHInstanceAt(int i);
 };
 
-extern CAtlBaseModule _AtlBaseModule;
+__declspec(selectany) CAtlBaseModule _AtlBaseModule;
+__declspec(selectany) bool CAtlBaseModule::m_bInitFailed = false;
 
 
 ///