Added warning for unicows not found

Fixes for projects

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@584 4f64403b-2f21-0410-a795-97e2b3489a10

4 files changed, 18 insertions, 8 deletions

diff --git a/yapp/common.h b/yapp/common.h
index f3f98c8..2b9c3a7 100644
--- a/yapp/common.h
+++ b/yapp/common.h
@@ -52,6 +52,7 @@
 #include <m_fontservice.h>

 #include <m_avatars.h>

 #include <m_popup.h>

+#include <win2k.h>

 

 #include "sdk/m_updater.h"

 

diff --git a/yapp/popups2.cpp b/yapp/popups2.cpp
index cdd7eea..d95c884 100644
--- a/yapp/popups2.cpp
+++ b/yapp/popups2.cpp
@@ -62,6 +62,12 @@ extern "C" BOOL APIENTRY DllMain( HMODULE hModule, DWORD  ul_reason_for_call, LP
 extern "C" POPUPS2_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

 {

 	pluginInfo.cbSize = sizeof(PLUGININFOEX);

+	if (!IsWinVerNT() && !GetModuleHandle(_T("unicows.dll")))

+	{

+		MessageBox(NULL, _T("The yapp plugin cannot be loaded. It requires unicows.dll."), 

+			_T("Miranda IM"), MB_OK | MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST);

+		return NULL;

+	}

 	return &pluginInfo;

 }

 

diff --git a/yapp/popups2.dsp b/yapp/popups2.dsp
index db8f286..3afcccb 100644
--- a/yapp/popups2.dsp
+++ b/yapp/popups2.dsp
@@ -45,7 +45,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 "yapp_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /Zi /O1 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "POPUPS2_EXPORTS" /Yu"common.h" /FD /c

+# ADD CPP /nologo /MD /W3 /Zi /O1 /I "../../../include" /I "." /I "docs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "POPUPS2_EXPORTS" /FR /Yu"common.h" /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x419 /d "NDEBUG"

@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 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 /dll /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /dll /map /debug /machine:I386 /out:"../../bin/Release/Plugins/yapp.dll" /filealign:512

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /dll /map /debug /machine:I386 /out:"../../bin/Release/Plugins/yapp.dll" /filealign:512

 # SUBTRACT LINK32 /pdb:none /incremental:yes

 

 !ELSEIF  "$(CFG)" == "yapp - Win32 Debug"

@@ -82,7 +82,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 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 /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/Debug/plugins/yapp.dll" /pdbtype:sept

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/Debug/plugins/yapp.dll" /pdbtype:sept

 # SUBTRACT LINK32 /pdb:none /incremental:no

 

 !ELSEIF  "$(CFG)" == "yapp - Win32 Release Unicode"

@@ -102,7 +102,6 @@ LINK32=link.exe
 # ADD BASE CPP /nologo /MD /W3 /GX /Zi /O1 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NO_GZIP" /D "PNG_NO_STDIO" /D "PNG_NO_CONSOLE_IO" /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MD /W3 /O1 /I "../../../include" /I "." /I "docs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "UNICODE" /D "_USRDLL" /D "POPUPS2_EXPORTS" /FR /Yu"common.h" /FD /c

-# SUBTRACT CPP /Z<none>

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x419 /d "NDEBUG"

@@ -140,9 +139,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 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 /dll /debug /machine:I386 /out:"../../bin/Debug/plugins/yapp.dll" /pdbtype:sept

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/Debug/plugins/yapp.dll" /pdbtype:sept

 # SUBTRACT BASE LINK32 /pdb:none /incremental:no

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/Debug Unicode/plugins/yapp.dll" /pdbtype:sept

+# ADD LINK32 unicows.lib kernel32.lib user32.lib gdi32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/Debug Unicode/plugins/yapp.dll" /pdbtype:sept

 # SUBTRACT LINK32 /pdb:none /incremental:no

 

 !ENDIF 

@@ -242,5 +241,9 @@ SOURCE=.\services.h
 SOURCE=.\version.h

 # End Source File

 # End Group

+# Begin Source File

+

+SOURCE=.\PPh2.ico

+# End Source File

 # End Target

 # End Project

diff --git a/yapp/version.h b/yapp/version.h
index 61f1f0f..559d29b 100644
--- a/yapp/version.h
+++ b/yapp/version.h
@@ -4,7 +4,7 @@
 #define __MAJOR_VERSION				0

 #define __MINOR_VERSION				5

 #define __RELEASE_NUM				0

-#define __BUILD_NUM				8

+#define __BUILD_NUM					9

 

 #define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

 #define __FILEVERSION_STRING_DOTS	__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

@@ -13,7 +13,7 @@
 

 #define __DESC				"Yet Another Popup Plugin - Provides popup notification window services (unicode and ansi) to other plugins"

 #define __AUTHOR			"Scott Ellis"

-#define __AUTHOREMAIL			"mail@scottellis.com.au"

+#define __AUTHOREMAIL		"mail@scottellis.com.au"

 #define __COPYRIGHT			"© 2005,2006 Scott Ellis"

 #define __AUTHORWEB			"http://www.scottellis.com.au"