From d8967087af559a43f1801e3e89411d570cbb3110 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Sun, 22 Sep 2013 17:14:55 +0000
Subject: plugins cleanup

git-svn-id: http://svn.miranda-ng.org/main/trunk@6185 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/ShellExt/src/main.cpp   |  3 ---
 plugins/ShellExt/src/shlcom.cpp |  6 ++----
 plugins/ShellExt/src/shlext.cpp | 14 +++++++-------
 plugins/ShellExt/src/stdafx.h   |  1 -
 4 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'plugins/ShellExt')

diff --git a/plugins/ShellExt/src/main.cpp b/plugins/ShellExt/src/main.cpp
index e7a80c94a1..e6b87adf42 100644
--- a/plugins/ShellExt/src/main.cpp
+++ b/plugins/ShellExt/src/main.cpp
@@ -28,9 +28,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 
 		hInst = hinstDLL;
 		DisableThreadLibraryCalls(hinstDLL);
-
-		extern bool VistaOrLater;
-		VistaOrLater = GetProcAddress( GetModuleHandleA("kernel32.dll"), "GetProductInfo") != NULL;
 	}
 
 	return TRUE;
diff --git a/plugins/ShellExt/src/shlcom.cpp b/plugins/ShellExt/src/shlcom.cpp
index 24dd32f9c1..ef08c5afcf 100644
--- a/plugins/ShellExt/src/shlcom.cpp
+++ b/plugins/ShellExt/src/shlcom.cpp
@@ -4,8 +4,6 @@
 
 #pragma comment(lib, "rpcrt4.lib")
 
-bool VistaOrLater;
-
 int DllFactoryCount, DllObjectCount;
 
 struct TCMInvokeCommandInfo
@@ -563,7 +561,7 @@ HRESULT RemoveCOMRegistryEntries()
 
 void CheckUnregisterServer()
 {
-	if (VistaOrLater) {
+	if (IsWinVerVistaPlus) {
 		// launches regsvr to remove the dll under admin.
 		TCHAR szFileName[MAX_PATH], szBuf[MAX_PATH * 2];
 		GetModuleFileName(hInst, szFileName, SIZEOF(szFileName));
@@ -591,7 +589,7 @@ void CheckRegisterServer()
 	HKEY hRegKey;
 	if ( !RegOpenKeyExA(HKEY_CLASSES_ROOT, "miranda.shlext", 0, KEY_READ, &hRegKey))
 		RegCloseKey(hRegKey);
-	else if (VistaOrLater) {
+	else if (IsWinVerVistaPlus) {
 		MessageBoxA(0,
 			"Shell context menus requires your permission to register with Windows Explorer (one time only).",
 			"Miranda NG - Shell context menus (shellext.dll)", MB_OK | MB_ICONINFORMATION);
diff --git a/plugins/ShellExt/src/shlext.cpp b/plugins/ShellExt/src/shlext.cpp
index aa59059208..e41f027ce9 100644
--- a/plugins/ShellExt/src/shlext.cpp
+++ b/plugins/ShellExt/src/shlext.cpp
@@ -212,7 +212,7 @@ void DecideMenuItemInfo(TSlotIPC *pct, TGroupNode *pg, MENUITEMINFOA &mii, TEnum
 			mii.dwTypeData = pg->szGroup;
 
 		// For Vista + let the system draw the theme && icons, pct = contact associated data
-		if (VistaOrLater && pct != NULL && psd != NULL) {
+		if (IsWinVerVistaPlus && pct != NULL && psd != NULL) {
 			mii.fMask = MIIM_BITMAP | MIIM_FTYPE | MIIM_ID | MIIM_DATA | MIIM_STRING;
 			// BuildSkinIcons() built an array of bitmaps which we can use here
 			mii.hbmpItem = psd->hStatusBitmap;
@@ -237,7 +237,7 @@ int __stdcall ClearMRUIPC(
 
 void RemoveCheckmarkSpace(HMENU HMENU)
 {
-	if (!VistaOrLater)
+	if (!IsWinVerVistaPlus)
 		return;
 
 	MENUINFO mi;
@@ -473,7 +473,7 @@ static void BuildMenus(TEnumData *lParam)
 	// allocate display info/memory for "Miranda" string
 
 	mii.cbSize = sizeof(MENUITEMINFO);
-	if (VistaOrLater)
+	if (IsWinVerVistaPlus)
 		mii.fMask = MIIM_ID | MIIM_DATA | MIIM_FTYPE | MIIM_SUBMENU | MIIM_STRING | MIIM_BITMAP;
 	else
 		mii.fMask = MIIM_ID | MIIM_DATA | MIIM_TYPE | MIIM_SUBMENU;
@@ -532,7 +532,7 @@ static void BuildMenus(TEnumData *lParam)
 
 static void BuildSkinIcons(TEnumData *lParam)
 {
-	IWICImagingFactory *factory = (VistaOrLater) ? ARGB_GetWorker() : NULL;
+	IWICImagingFactory *factory = (IsWinVerVistaPlus) ? ARGB_GetWorker() : NULL;
 
 	TSlotIPC *pct = lParam->ipch->NewIconsBegin;
 	TShellExt *Self = lParam->Self;
@@ -550,7 +550,7 @@ static void BuildSkinIcons(TEnumData *lParam)
 		// with the shell object.
 
 		for (int j = 0; j < 10; j++) {
-			if (VistaOrLater) {
+			if (IsWinVerVistaPlus) {
 				d->hBitmaps[j] = ARGB_BitmapFromIcon(factory, Self->hMemDC, p->hIcons[j]);
 				d->hIcons[j] = NULL;				
 			}
@@ -654,7 +654,7 @@ HRESULT TShellExt::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT _idCmdFirs
 		}
 
 		// if we're using Vista (or later),  the ownerdraw code will be disabled, because the system draws the icons.
-		if (VistaOrLater)
+		if (IsWinVerVistaPlus)
 			bMF_OWNERDRAW = false;
 
 		HANDLE hMap = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, IPC_PACKET_SIZE, IPC_PACKET_NAME);
@@ -901,7 +901,7 @@ HRESULT TShellExt::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESU
 		MEASUREITEMSTRUCT *msi = (MEASUREITEMSTRUCT*)lParam;
 		TMenuDrawInfo *psd = (TMenuDrawInfo*)msi->itemData;
 		NONCLIENTMETRICS ncm;
-		ncm.cbSize = (VistaOrLater) ? sizeof(ncm) : offsetof(NONCLIENTMETRICS, iPaddedBorderWidth);
+		ncm.cbSize = (IsWinVerVistaPlus) ? sizeof(ncm) : offsetof(NONCLIENTMETRICS, iPaddedBorderWidth);
 		SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0);
 		// create the font used in menus, this font should be cached somewhere really
 		HFONT hFont = CreateFontIndirect(&ncm.lfMenuFont);
diff --git a/plugins/ShellExt/src/stdafx.h b/plugins/ShellExt/src/stdafx.h
index 1a0f2574f0..bf47755b11 100644
--- a/plugins/ShellExt/src/stdafx.h
+++ b/plugins/ShellExt/src/stdafx.h
@@ -47,7 +47,6 @@ HRESULT RemoveCOMRegistryEntries();
 extern  HINSTANCE hInst;
 extern  HANDLE hLogger;
 extern  int DllFactoryCount, DllObjectCount;
-extern  bool VistaOrLater;
 
 int OnOptionsInit(WPARAM wParam, LPARAM lParam);
 
-- 
cgit v1.2.3