From e54b4cd7f0c6fd272437e410f17238a6c94b1547 Mon Sep 17 00:00:00 2001
From: Tobias Weimer <wishmaster51@googlemail.com>
Date: Sat, 26 Jul 2014 22:51:26 +0000
Subject: PluginUpdater: -Now the custom URL is remembered when changing the
 update mode in Options -Cleaned up popup Options -Fixed Restart MessageBox
 after silent update -code reordering

git-svn-id: http://svn.miranda-ng.org/main/trunk@9958 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/PluginUpdater/src/Compat/compat.cpp | 101 ++++++++++++++++++++++++++++
 plugins/PluginUpdater/src/Compat/compat.h   |  22 +-----
 2 files changed, 103 insertions(+), 20 deletions(-)
 create mode 100644 plugins/PluginUpdater/src/Compat/compat.cpp

(limited to 'plugins/PluginUpdater/src/Compat')

diff --git a/plugins/PluginUpdater/src/Compat/compat.cpp b/plugins/PluginUpdater/src/Compat/compat.cpp
new file mode 100644
index 0000000000..25fdcf27e0
--- /dev/null
+++ b/plugins/PluginUpdater/src/Compat/compat.cpp
@@ -0,0 +1,101 @@
+/*
+Copyright (C) 2010 Mataes
+
+This is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this file; see the file license.txt. If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
+
+  This file contains some compatibility functions for Miranda IM
+*/
+
+static char szHexTable[] = "0123456789abcdef";
+
+char *bin2hex(const void *pData, size_t len, char *dest)
+{
+	const BYTE *p = (const BYTE*)pData;
+	char *d = dest;
+
+	for (size_t i=0; i < len; i++, p++) {
+		*d++ = szHexTable[*p >> 4];
+		*d++ = szHexTable[*p & 0x0F];
+	}
+	*d = 0;
+
+	return dest;
+}
+
+char *rtrim(char *str)
+{
+	if (str == NULL)
+		return NULL;
+
+	char *p = strchr(str, 0);
+	while (--p >= str) {
+		switch (*p) {
+		case ' ': case '\t': case '\n': case '\r':
+			*p = 0; break;
+		default:
+			return str;
+		}
+	}
+	return str;
+}
+
+void CreatePathToFileT(TCHAR *tszFilePath)
+{
+	TCHAR *pszLastBackslash = _tcsrchr(tszFilePath, '\\');
+	if (pszLastBackslash != NULL){
+		*pszLastBackslash = '\0';
+		CreateDirectoryTreeT(tszFilePath);
+		*pszLastBackslash = '\\';
+	}
+}
+
+int wildcmpit(const WCHAR *name, const WCHAR *mask)
+{
+	if (name == NULL || mask == NULL)
+		return false;
+
+	const WCHAR* last = NULL;
+	for (;; mask++, name++) {
+		if (*mask != '?' && _qtoupper(*mask) != _qtoupper(*name)) break;
+		if (*name == '\0') return ((BOOL)!*mask);
+	}
+	if (*mask != '*') return FALSE;
+	for (;; mask++, name++) {
+		while(*mask == '*') {
+			last = mask++;
+			if (*mask == '\0') return ((BOOL)!*mask);   /* true */
+		}
+		if (*name == '\0') return ((BOOL)!*mask);      /* *mask == EOS */
+		if (*mask != '?' && _qtoupper(*mask)  != _qtoupper(*name)) name -= (size_t)(mask - last) - 1, mask = last;
+	}
+}
+
+
+void __stdcall RestartMe(void*)
+{
+	TCHAR mirandaPath[MAX_PATH], cmdLine[MAX_PATH];
+	GetModuleFileName(NULL, mirandaPath, SIZEOF(mirandaPath));
+
+	TCHAR *profilename = Utils_ReplaceVarsT(_T("%miranda_profilename%"));
+	mir_sntprintf(cmdLine, SIZEOF(cmdLine), _T("\"%s\" /restart:%d /profile=%s"), mirandaPath, GetCurrentProcessId(), profilename);
+	mir_free(profilename);
+
+	CallService("CloseAction", 0, 0);
+
+	PROCESS_INFORMATION pi;
+	STARTUPINFO si = { sizeof(si) };
+	CreateProcess(mirandaPath, cmdLine, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
+}
diff --git a/plugins/PluginUpdater/src/Compat/compat.h b/plugins/PluginUpdater/src/Compat/compat.h
index 6afc901e17..26e807f478 100644
--- a/plugins/PluginUpdater/src/Compat/compat.h
+++ b/plugins/PluginUpdater/src/Compat/compat.h
@@ -76,9 +76,10 @@ __forceinline INT_PTR Options_AddPage(WPARAM wParam, OPTIONSDIALOGPAGE *odp)
 	return CallService("Opt/AddPage", wParam, (LPARAM)odp);
 }
 
-char* bin2hex(const void *pData, size_t len, char *dest);
+char *bin2hex(const void *pData, size_t len, char *dest);
 char *rtrim(char *str);
 int CreatePathToFileT(const TCHAR *ptszPath);
+int wildcmpit(const WCHAR *name, const WCHAR *mask);
 
 #define NEWTSTR_ALLOCA(A) (A == NULL)?NULL:_tcscpy((TCHAR*)alloca((_tcslen(A)+1) *sizeof(TCHAR)), A)
 
@@ -124,23 +125,4 @@ int __forceinline PUDeletePopup(HWND hWndPopup)
 
 #define _qtoupper(_c) (((_c) >= 'a' && (_c) <= 'z')?((_c)-('a'+'A')):(_c))
 
-int __forceinline wildcmpit(const WCHAR *name, const WCHAR *mask)
-{
-	if (name == NULL || mask == NULL)
-		return false;
 
-	const WCHAR* last = NULL;
-	for (;; mask++, name++) {
-		if (*mask != '?' && _qtoupper(*mask) != _qtoupper(*name)) break;
-		if (*name == '\0') return ((BOOL)!*mask);
-	}
-	if (*mask != '*') return FALSE;
-	for (;; mask++, name++) {
-		while(*mask == '*') {
-			last = mask++;
-			if (*mask == '\0') return ((BOOL)!*mask);   /* true */
-		}
-		if (*name == '\0') return ((BOOL)!*mask);      /* *mask == EOS */
-		if (*mask != '?' && _qtoupper(*mask)  != _qtoupper(*name)) name -= (size_t)(mask - last) - 1, mask = last;
-	}
-}
-- 
cgit v1.2.3