From 531eee06daca570868671069487c9ef0562cefc1 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Fri, 14 Jun 2013 17:23:14 +0300 Subject: [PATCH] Remove DisableThreadLibraryCalls.h By default, VC++ links in a stub entry point, which already calls DisableThreadLibraryCalls(). See: %VS110COMNTOOLS%..\..\VC\crt\src\dllmain.c --- Library/DisableThreadLibraryCalls.h | 50 ------------------- Library/Library.vcxproj | 1 - Library/Library.vcxproj.filters | 3 -- Library/Rainmeter.cpp | 2 - Plugins/PluginAdvancedCPU/AdvancedCPU.cpp | 1 - Plugins/PluginCoreTemp/PluginCoreTemp.cpp | 1 - Plugins/PluginFolderInfo/FolderInfoPlugin.cpp | 1 - Plugins/PluginMediaKey/PluginMediaKey.cpp | 1 - Plugins/PluginPerfMon/PerfData.cpp | 1 - Plugins/PluginPower/PowerPlugin.cpp | 1 - Plugins/PluginProcess/PluginProcess.cpp | 1 - Plugins/PluginQuote/Quote.cpp | 1 - Plugins/PluginResMon/ResMon.cpp | 1 - Plugins/PluginSpeedFan/SpeedFanPlugin.cpp | 2 - Plugins/PluginSysInfo/SysInfo.cpp | 1 - .../PluginVirtualDesktops/VirtualDesktops.cpp | 2 - Plugins/PluginWebParser/WebParser.cpp | 1 - Plugins/PluginWifiStatus/WifiStatus.cpp | 1 - Plugins/PluginWin7Audio/Win7AudioPlugin.cpp | 1 - .../WindowMessagePlugin.cpp | 1 - Plugins/PluginiTunes/iTunesPlugin.cpp | 2 - 21 files changed, 76 deletions(-) delete mode 100644 Library/DisableThreadLibraryCalls.h diff --git a/Library/DisableThreadLibraryCalls.h b/Library/DisableThreadLibraryCalls.h deleted file mode 100644 index 934ef148..00000000 --- a/Library/DisableThreadLibraryCalls.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - Copyright (C) 2011 spx - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ - -#ifndef __DISABLETHREADLIBRARYCALLS_H__ -#define __DISABLETHREADLIBRARYCALLS_H__ - -// DisableThreadLibraryCalls Function -// http://msdn.microsoft.com/en-us/library/ms682579.aspx -// -// Note: Do not call "DisableThreadLibraryCalls" in a DLL which is statically linked to the CRT -// http://support.microsoft.com/kb/555563/en-us - -#if defined(_DLL) /* /MD */ - -/* -** DllMain -** -** Disables the DLL_THREAD_ATTACH and DLL_THREAD_DETACH notification calls. -** -*/ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - -#endif - -#endif diff --git a/Library/Library.vcxproj b/Library/Library.vcxproj index e8a14a52..007e4772 100644 --- a/Library/Library.vcxproj +++ b/Library/Library.vcxproj @@ -310,7 +310,6 @@ - diff --git a/Library/Library.vcxproj.filters b/Library/Library.vcxproj.filters index 0986765f..1595f546 100644 --- a/Library/Library.vcxproj.filters +++ b/Library/Library.vcxproj.filters @@ -386,9 +386,6 @@ Header Files - - Header Files - Header Files diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp index b80c4f54..4671265a 100644 --- a/Library/Rainmeter.cpp +++ b/Library/Rainmeter.cpp @@ -32,8 +32,6 @@ #include "UpdateCheck.h" #include "../Version.h" -#include "DisableThreadLibraryCalls.h" // contains DllMain entry point - using namespace Gdiplus; enum TIMER diff --git a/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp b/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp index 3f6aec77..e442ee61 100644 --- a/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp +++ b/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp @@ -26,7 +26,6 @@ #include "../PluginPerfMon/ObjInst.h" #include "../API/RainmeterAPI.h" #include "../../Common/RawString.h" -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point struct MeasureData { diff --git a/Plugins/PluginCoreTemp/PluginCoreTemp.cpp b/Plugins/PluginCoreTemp/PluginCoreTemp.cpp index 4c4fb22b..f571d01a 100644 --- a/Plugins/PluginCoreTemp/PluginCoreTemp.cpp +++ b/Plugins/PluginCoreTemp/PluginCoreTemp.cpp @@ -20,7 +20,6 @@ #include #include "CoreTempProxy.h" #include "../../Library/Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point typedef enum eMeasureType { diff --git a/Plugins/PluginFolderInfo/FolderInfoPlugin.cpp b/Plugins/PluginFolderInfo/FolderInfoPlugin.cpp index 4963a615..a20fa8b3 100644 --- a/Plugins/PluginFolderInfo/FolderInfoPlugin.cpp +++ b/Plugins/PluginFolderInfo/FolderInfoPlugin.cpp @@ -21,7 +21,6 @@ #include #include "FolderInfo.h" #include "../API/RainmeterAPI.h" -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point enum MeasureType { diff --git a/Plugins/PluginMediaKey/PluginMediaKey.cpp b/Plugins/PluginMediaKey/PluginMediaKey.cpp index ce50e74a..8f7d5974 100644 --- a/Plugins/PluginMediaKey/PluginMediaKey.cpp +++ b/Plugins/PluginMediaKey/PluginMediaKey.cpp @@ -18,7 +18,6 @@ #include #include "../../Library/Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point void SendKey(WORD key) { diff --git a/Plugins/PluginPerfMon/PerfData.cpp b/Plugins/PluginPerfMon/PerfData.cpp index f910a861..c4caa197 100644 --- a/Plugins/PluginPerfMon/PerfData.cpp +++ b/Plugins/PluginPerfMon/PerfData.cpp @@ -26,7 +26,6 @@ #include "ObjInst.h" #include "../API/RainmeterAPI.h" #include "../../Common/RawString.h" -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point struct MeasureData { diff --git a/Plugins/PluginPower/PowerPlugin.cpp b/Plugins/PluginPower/PowerPlugin.cpp index 6566f92e..e9ba1297 100644 --- a/Plugins/PluginPower/PowerPlugin.cpp +++ b/Plugins/PluginPower/PowerPlugin.cpp @@ -23,7 +23,6 @@ #include #include "../../Common/RawString.h" #include "../../Library/Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point typedef struct _PROCESSOR_POWER_INFORMATION { diff --git a/Plugins/PluginProcess/PluginProcess.cpp b/Plugins/PluginProcess/PluginProcess.cpp index e6833ae3..3059d4a5 100644 --- a/Plugins/PluginProcess/PluginProcess.cpp +++ b/Plugins/PluginProcess/PluginProcess.cpp @@ -22,7 +22,6 @@ #include #include "../../Common/RawString.h" #include "../../Library/Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point struct MeasureData { diff --git a/Plugins/PluginQuote/Quote.cpp b/Plugins/PluginQuote/Quote.cpp index e8b4a6ad..995907a7 100644 --- a/Plugins/PluginQuote/Quote.cpp +++ b/Plugins/PluginQuote/Quote.cpp @@ -22,7 +22,6 @@ #include #include #include "../API/RainmeterAPI.h" -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point #include "../../Common/StringUtil.h" #define BUFFER_SIZE 4096 diff --git a/Plugins/PluginResMon/ResMon.cpp b/Plugins/PluginResMon/ResMon.cpp index 69ee5935..e720c359 100644 --- a/Plugins/PluginResMon/ResMon.cpp +++ b/Plugins/PluginResMon/ResMon.cpp @@ -28,7 +28,6 @@ #include #include "../../Common/RawString.h" #include "../../Library/Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point // system resources that can be counted enum MEASURETYPE diff --git a/Plugins/PluginSpeedFan/SpeedFanPlugin.cpp b/Plugins/PluginSpeedFan/SpeedFanPlugin.cpp index 54dc66f6..83ddfb2d 100644 --- a/Plugins/PluginSpeedFan/SpeedFanPlugin.cpp +++ b/Plugins/PluginSpeedFan/SpeedFanPlugin.cpp @@ -20,8 +20,6 @@ #include #include "../../Library/Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point - #pragma pack(push, 1) struct SpeedFanData diff --git a/Plugins/PluginSysInfo/SysInfo.cpp b/Plugins/PluginSysInfo/SysInfo.cpp index dd189d9a..362ebdf7 100644 --- a/Plugins/PluginSysInfo/SysInfo.cpp +++ b/Plugins/PluginSysInfo/SysInfo.cpp @@ -23,7 +23,6 @@ #include #include "../API/RainmeterAPI.h" #include "../../Library/Export.h" -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point typedef struct { diff --git a/Plugins/PluginVirtualDesktops/VirtualDesktops.cpp b/Plugins/PluginVirtualDesktops/VirtualDesktops.cpp index 387e4548..c2555577 100644 --- a/Plugins/PluginVirtualDesktops/VirtualDesktops.cpp +++ b/Plugins/PluginVirtualDesktops/VirtualDesktops.cpp @@ -72,8 +72,6 @@ #include "../../Library/Export.h" -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point - extern "C" { __declspec(dllexport) UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id); diff --git a/Plugins/PluginWebParser/WebParser.cpp b/Plugins/PluginWebParser/WebParser.cpp index 0a11fd81..4c85cb06 100644 --- a/Plugins/PluginWebParser/WebParser.cpp +++ b/Plugins/PluginWebParser/WebParser.cpp @@ -26,7 +26,6 @@ #include #include "../../Library/pcre-8.10/config.h" #include "../../Library/pcre-8.10/pcre.h" -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point #include "../../Common/StringUtil.h" #include "../API/RainmeterAPI.h" diff --git a/Plugins/PluginWifiStatus/WifiStatus.cpp b/Plugins/PluginWifiStatus/WifiStatus.cpp index 3398fb3d..68d6c3fb 100644 --- a/Plugins/PluginWifiStatus/WifiStatus.cpp +++ b/Plugins/PluginWifiStatus/WifiStatus.cpp @@ -20,7 +20,6 @@ #include #include #include "../API/RainmeterAPI.h" -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point enum MEASURETYPE { diff --git a/Plugins/PluginWin7Audio/Win7AudioPlugin.cpp b/Plugins/PluginWin7Audio/Win7AudioPlugin.cpp index 5e3a6ef6..036ec763 100644 --- a/Plugins/PluginWin7Audio/Win7AudioPlugin.cpp +++ b/Plugins/PluginWin7Audio/Win7AudioPlugin.cpp @@ -24,7 +24,6 @@ #include #include "PolicyConfig.h" #include "../API/RainmeterAPI.h" -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point #define SAFE_RELEASE(punk) \ if ((punk) != nullptr) { (punk)->Release(); (punk) = nullptr; } diff --git a/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp b/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp index 90b08dab..31004380 100644 --- a/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp +++ b/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp @@ -20,7 +20,6 @@ #include #include "../../Common/RawString.h" #include "../../Library/Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point struct MeasureData { diff --git a/Plugins/PluginiTunes/iTunesPlugin.cpp b/Plugins/PluginiTunes/iTunesPlugin.cpp index 2b6e8fd6..3ba46cdb 100644 --- a/Plugins/PluginiTunes/iTunesPlugin.cpp +++ b/Plugins/PluginiTunes/iTunesPlugin.cpp @@ -23,8 +23,6 @@ #include #include -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point - const int VOLUME_STEP = 5; /* The exported functions */