diff options
author | (no author) <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10> | 2010-05-29 16:27:30 +0000 |
---|---|---|
committer | (no author) <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10> | 2010-05-29 16:27:30 +0000 |
commit | af8c7f0486c6b5275a53a994d6a55841594d42ae (patch) | |
tree | 599bdbbe61ea7a15439d07fc7556b9e7028c5e41 | |
parent | 9fb8fc3300b71abc543774f08f9150aac1670eb5 (diff) |
Fixed resource leaks
git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@521 4f64403b-2f21-0410-a795-97e2b3489a10
-rw-r--r-- | worldtime/WorldTime.dsp | 9 | ||||
-rw-r--r-- | worldtime/WorldTime.plg | 81 | ||||
-rw-r--r-- | worldtime/WorldTime_9.vcproj | 151 | ||||
-rw-r--r-- | worldtime/plugwin.cpp | 20 | ||||
-rw-r--r-- | worldtime/plugwin.h | 2 |
5 files changed, 80 insertions, 183 deletions
diff --git a/worldtime/WorldTime.dsp b/worldtime/WorldTime.dsp index 8e66c7a..c23e625 100644 --- a/worldtime/WorldTime.dsp +++ b/worldtime/WorldTime.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WORLDTIME_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WORLDTIME_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WORLDTIME_EXPORTS" /YX"common.h" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0xc09 /d "NDEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WORLDTIME_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WORLDTIME_EXPORTS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX- /ZI /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WORLDTIME_EXPORTS" /D "_WINDLL" /D "_AFXDLL" /YX"common.h" /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0xc09 /d "_DEBUG"
@@ -100,11 +100,6 @@ SOURCE=.\plugwin.cpp # End Source File
# Begin Source File
-SOURCE=.\StdAfx.cpp
-# ADD CPP /Yc"stdafx.h"
-# End Source File
-# Begin Source File
-
SOURCE=.\time_convert.cpp
# End Source File
# Begin Source File
diff --git a/worldtime/WorldTime.plg b/worldtime/WorldTime.plg deleted file mode 100644 index 1fd4a90..0000000 --- a/worldtime/WorldTime.plg +++ /dev/null @@ -1,81 +0,0 @@ -<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: WorldTime - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\sje\LOCALS~1\Temp\RSP8E.tmp" with contents
-[
-/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WORLDTIME_EXPORTS" /Fp"Release/WorldTime.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c
-"C:\Documents and Settings\sje\My Documents\MyProjects\miranda\plugins\WorldTime\options.cpp"
-"C:\Documents and Settings\sje\My Documents\MyProjects\miranda\plugins\WorldTime\plugwin.cpp"
-"C:\Documents and Settings\sje\My Documents\MyProjects\miranda\plugins\WorldTime\WorldTime.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\sje\LOCALS~1\Temp\RSP8E.tmp"
-Creating temporary file "C:\DOCUME~1\sje\LOCALS~1\Temp\RSP8F.tmp" with contents
-[
-comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x22070000" /dll /incremental:no /pdb:"Release/WorldTime.pdb" /machine:I386 /out:"../../bin/release/plugins/WorldTime.dll" /implib:"Release/WorldTime.lib"
-".\Release\options.obj"
-".\Release\plugwin.obj"
-".\Release\StdAfx.obj"
-".\Release\time_convert.obj"
-".\Release\timezone.obj"
-".\Release\WorldTime.obj"
-".\Release\WorldTime.res"
-]
-Creating command line "link.exe @C:\DOCUME~1\sje\LOCALS~1\Temp\RSP8F.tmp"
-<h3>Output Window</h3>
-Compiling...
-options.cpp
-plugwin.cpp
-WorldTime.cpp
-Generating Code...
-Linking...
- Creating library Release/WorldTime.lib and object Release/WorldTime.exp
-
-
-
-<h3>Results</h3>
-WorldTime.dll - 0 error(s), 0 warning(s)
-<h3>
---------------------Configuration: WorldTime - Win32 Debug--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\sje\LOCALS~1\Temp\RSP93.tmp" with contents
-[
-/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WORLDTIME_EXPORTS" /D "_WINDLL" /D "_AFXDLL" /Fp"Debug/WorldTime.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
-"C:\Documents and Settings\sje\My Documents\MyProjects\miranda\plugins\WorldTime\options.cpp"
-"C:\Documents and Settings\sje\My Documents\MyProjects\miranda\plugins\WorldTime\plugwin.cpp"
-"C:\Documents and Settings\sje\My Documents\MyProjects\miranda\plugins\WorldTime\WorldTime.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\sje\LOCALS~1\Temp\RSP93.tmp"
-Creating temporary file "C:\DOCUME~1\sje\LOCALS~1\Temp\RSP94.tmp" with contents
-[
-user32.lib gdi32.lib shell32.lib advapi32.lib comctl32.lib /nologo /dll /incremental:yes /pdb:"Debug/WorldTime.pdb" /debug /machine:I386 /out:"../../bin/debug/plugins/WorldTime.dll" /implib:"Debug/WorldTime.lib" /pdbtype:sept
-".\Debug\options.obj"
-".\Debug\plugwin.obj"
-".\Debug\StdAfx.obj"
-".\Debug\time_convert.obj"
-".\Debug\timezone.obj"
-".\Debug\WorldTime.obj"
-".\Debug\WorldTime.res"
-]
-Creating command line "link.exe @C:\DOCUME~1\sje\LOCALS~1\Temp\RSP94.tmp"
-<h3>Output Window</h3>
-Compiling...
-WorldTime.cpp
-Generating Code...
-Skipping... (no relevant changes detected)
-options.cpp
-plugwin.cpp
-Linking...
-
-
-
-<h3>Results</h3>
-WorldTime.dll - 0 error(s), 0 warning(s)
-</pre>
-</body>
-</html>
diff --git a/worldtime/WorldTime_9.vcproj b/worldtime/WorldTime_9.vcproj index 12cf731..50d537d 100644 --- a/worldtime/WorldTime_9.vcproj +++ b/worldtime/WorldTime_9.vcproj @@ -21,13 +21,14 @@ <Configurations>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -57,8 +58,8 @@ EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="2"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="../../include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WORLDTIME_EXPORTS"
+ AdditionalIncludeDirectories="../../../include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WORLDTIME_EXPORTS;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="2"
@@ -118,14 +119,15 @@ />
</Configuration>
<Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)64"
+ IntermediateDirectory="$(ConfigurationName)64"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="2"
+ UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -141,37 +143,40 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Debug/WorldTime.tlb"
+ TargetEnvironment="3"
+ TypeLibraryName=".\Release/WorldTime.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WORLDTIME_EXPORTS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ Optimization="1"
+ InlineFunctionExpansion="1"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="2"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="../../../include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WORLDTIME_EXPORTS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
+ StringPooling="true"
+ ExceptionHandling="0"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ RuntimeTypeInfo="false"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="common.h"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="3081"
/>
<Tool
@@ -179,15 +184,14 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="user32.lib gdi32.lib shell32.lib advapi32.lib comctl32.lib"
- LinkIncremental="2"
+ AdditionalDependencies="comctl32.lib"
+ LinkIncremental="1"
SuppressStartupBanner="true"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/WorldTime.pdb"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ BaseAddress="0x22070000"
RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(IntDir)/$(TargetName).lib"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -201,7 +205,7 @@ <Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\Debug/WorldTime.bsc"
+ OutputFile=".\Release/WorldTime.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -214,15 +218,14 @@ />
</Configuration>
<Configuration
- Name="Release|x64"
- OutputDirectory="$(ConfigurationName)64"
- IntermediateDirectory="$(ConfigurationName)64"
+ Name="Debug|Win32"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
+ UseOfMFC="2"
ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- WholeProgramOptimization="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -238,40 +241,37 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="3"
- TypeLibraryName=".\Release/WorldTime.tlb"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Debug/WorldTime.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="1"
- InlineFunctionExpansion="1"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="2"
- WholeProgramOptimization="true"
+ Optimization="0"
AdditionalIncludeDirectories="../../../include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WORLDTIME_EXPORTS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
- StringPooling="true"
- ExceptionHandling="0"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- FloatingPointModel="2"
- RuntimeTypeInfo="false"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WORLDTIME_EXPORTS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="common.h"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
WarningLevel="3"
SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="3081"
/>
<Tool
@@ -279,14 +279,15 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="comctl32.lib"
- LinkIncremental="1"
+ AdditionalDependencies="user32.lib gdi32.lib shell32.lib advapi32.lib comctl32.lib"
+ LinkIncremental="2"
SuppressStartupBanner="true"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- BaseAddress="0x22070000"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\Debug/WorldTime.pdb"
RandomizedBaseAddress="1"
- TargetMachine="17"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(IntDir)/$(TargetName).lib"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -300,7 +301,7 @@ <Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\Release/WorldTime.bsc"
+ OutputFile=".\Debug/WorldTime.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -346,7 +347,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WORLDTIME_EXPORTS;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -428,7 +429,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -436,7 +437,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -464,7 +465,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -472,7 +473,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -500,7 +501,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -508,7 +509,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -536,7 +537,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -544,7 +545,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -573,7 +574,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -582,7 +583,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -694,7 +695,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCResourceCompilerTool"
@@ -702,7 +703,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|Win32"
>
<Tool
Name="VCResourceCompilerTool"
diff --git a/worldtime/plugwin.cpp b/worldtime/plugwin.cpp index e20030d..ac87a31 100644 --- a/worldtime/plugwin.cpp +++ b/worldtime/plugwin.cpp @@ -26,16 +26,11 @@ HWND label; HWND pluginwind = 0, hwnd_clist = 0;
-static CRITICAL_SECTION cs2;
-
bool hook_window_behaviour_to_clist = true;
bool set_format = false;
bool show_icons = true;
bool hide_menu = false;
-HANDLE status_update_thread = 0;
-
-static HMODULE hUserDll;
BOOL (WINAPI *MySetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD);
BOOL (WINAPI *MyAnimateWindow)(HWND hWnd,DWORD dwTime,DWORD dwFlags);
@@ -329,7 +324,6 @@ LRESULT CALLBACK mypluginwindow1proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM }
SetBkMode(dis->hDC, TRANSPARENT);
- EnterCriticalSection(&cs2);
pItemData = &listbox_items[dis->itemID];
{
@@ -356,7 +350,6 @@ LRESULT CALLBACK mypluginwindow1proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM }
}
- LeaveCriticalSection(&cs2);
SetBkMode(dis->hDC, OPAQUE);
SelectObject(dis->hDC, oldFont);
} else {
@@ -388,7 +381,6 @@ LRESULT CALLBACK mypluginwindow1proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM TCHAR buf[512], buf2[512];
MyGetSystemTime(&st);
- EnterCriticalSection(&cs2);
for(int i = 0; i < listbox_items.getCount(); i++) {
TIME_ZONE_INFORMATION tzi;
tzi.Bias = timezone_list[listbox_items[i].timezone_list_index].TZI.Bias;
@@ -427,7 +419,6 @@ LRESULT CALLBACK mypluginwindow1proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM listbox_items[i].icon = (HICON)hIcon;
}
}
- LeaveCriticalSection(&cs2);
if(need_repaint)
InvalidateRect(label, 0, FALSE);
}
@@ -736,14 +727,10 @@ int FillList(WPARAM wParam, LPARAM lParam) { SendMessage(label, LB_RESETCONTENT, 0, 0);
- EnterCriticalSection(&cs2);
-
for(int i = 0; i < listbox_items.getCount(); i++) {
SendMessage(label, LB_INSERTSTRING, (WPARAM)-1, (LPARAM)listbox_items[i].pszText);
}
- LeaveCriticalSection(&cs2);
-
InvalidateRect(label, 0, TRUE);
return 0;
}
@@ -921,7 +908,7 @@ int addmypluginwindow1(HWND parent) HookEvent(ME_SKIN_SERVICESCREATED, SkinReload);
}
- hUserDll = GetModuleHandleA("user32");
+ HMODULE hUserDll = GetModuleHandleA("user32");
if (hUserDll) {
MySetLayeredWindowAttributes = (BOOL (WINAPI *)(HWND,COLORREF,BYTE,DWORD))GetProcAddress(hUserDll, "SetLayeredWindowAttributes");
MyAnimateWindow=(BOOL (WINAPI*)(HWND,DWORD,DWORD))GetProcAddress(hUserDll,"AnimateWindow");
@@ -929,8 +916,6 @@ int addmypluginwindow1(HWND parent) hwnd_clist = parent;
- InitializeCriticalSection(&cs2);
-
hook_window_behaviour_to_clist = (DBGetContactSettingByte(NULL, "WorldTime", "MinMax", DEFAULT_MINMAX ? 1 : 0) == 1);
set_format = (DBGetContactSettingByte(NULL, "WorldTime", "EnableTimeFormat", 0) == 1);
show_icons = (DBGetContactSettingByte(NULL, "WorldTime", "ShowIcons", 1) == 1);
@@ -1099,7 +1084,6 @@ void plugwin_cleanup() { //KillTimer(pluginwind, TIMER_ID2);
DestroyWindow(pluginwind);
- DeleteCriticalSection(&cs2);
-
DeleteObject(ContactFont);
+ DeleteObject(TitleBarFont);
}
\ No newline at end of file diff --git a/worldtime/plugwin.h b/worldtime/plugwin.h index 24196a9..42cdc95 100644 --- a/worldtime/plugwin.h +++ b/worldtime/plugwin.h @@ -40,8 +40,6 @@ extern HICON upIcon, downIcon; extern ITEMLIST listbox_items;
-extern HANDLE mainThread;
-
extern TCHAR format_string[];
int addmypluginwindow1(HWND parent);
|