summaryrefslogtreecommitdiff
path: root/plugins/MsgPopup/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/MsgPopup/src')
-rw-r--r--plugins/MsgPopup/src/Version.h14
-rw-r--r--plugins/MsgPopup/src/common.h15
-rw-r--r--plugins/MsgPopup/src/main.cpp63
-rw-r--r--plugins/MsgPopup/src/options.cpp18
-rw-r--r--plugins/MsgPopup/src/resource.h27
-rw-r--r--plugins/MsgPopup/src/stdafx.cpp18
6 files changed, 85 insertions, 70 deletions
diff --git a/plugins/MsgPopup/src/Version.h b/plugins/MsgPopup/src/Version.h
new file mode 100644
index 0000000000..33bbd248a7
--- /dev/null
+++ b/plugins/MsgPopup/src/Version.h
@@ -0,0 +1,14 @@
+#define __MAJOR_VERSION 0
+#define __MINOR_VERSION 1
+#define __RELEASE_NUM 1
+#define __BUILD_NUM 3
+
+#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+
+#define __PLUGIN_NAME "Message popup"
+#define __FILENAME "MsgPopup.dll"
+#define __DESCRIPTION "Plugin replaces MessageBoxes [whose have only OK button] into Popups."
+#define __AUTHOR "StDenis"
+#define __AUTHOREMAIL "stdenformiranda@fromru.com"
+#define __AUTHORWEB "http://miranda-ng.org/"
+#define __COPYRIGHT "© 2004 Denis Stanishevskiy"
diff --git a/plugins/MsgPopup/src/common.h b/plugins/MsgPopup/src/common.h
index fbff74293b..2e85b4b5c3 100644
--- a/plugins/MsgPopup/src/common.h
+++ b/plugins/MsgPopup/src/common.h
@@ -24,17 +24,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <tlhelp32.h>
#include <dbghelp.h>
-#include "newpluginapi.h"
-#include "m_system.h"
-#include "m_database.h"
-#include "m_langpack.h"
-#include "m_clist.h"
-#include "m_options.h"
-#include "m_utils.h"
-#include "m_popup.h"
+#include <newpluginapi.h>
+#include <m_database.h>
+#include <m_langpack.h>
+#include <m_options.h>
+#include <m_popup.h>
+#include <win2k.h>
#include "options.h"
#include "resource.h"
+#include "Version.h"
#define SERVICENAME "MessagePopup"
diff --git a/plugins/MsgPopup/src/main.cpp b/plugins/MsgPopup/src/main.cpp
index bed3764b52..ea6c69c0df 100644
--- a/plugins/MsgPopup/src/main.cpp
+++ b/plugins/MsgPopup/src/main.cpp
@@ -35,26 +35,28 @@ MSGBOXOPTIONS options;
PLUGININFOEX pluginInfo={
sizeof(PLUGININFOEX),
- SERVICENAME,
- PLUGIN_MAKE_VERSION( 0,0,0,1 ),
- "This stuff will replace MessageBox'es [whose have only OK button] into Popups",
- "Denis Stanishevskiy // StDenis",
- "stdenformiranda(at)fromru(dot)com",
- "Copyright (c) 2004, Denis Stanishevskiy",
- "",
- 0, 0
+ __PLUGIN_NAME,
+ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+ __DESCRIPTION,
+ __AUTHOR,
+ __AUTHOREMAIL,
+ __COPYRIGHT,
+ __AUTHORWEB,
+ UNICODE_AWARE,
+ // {CF25D645-4DAB-4B0A-B9F1-DE1E86231F9B}
+ {0xcf25d645, 0x4dab, 0x4b0a, {0xb9, 0xf1, 0xde, 0x1e, 0x86, 0x23, 0x1f, 0x9b}}
};
-typedef int (WINAPI *MSGBOXPROC)(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType);
+typedef int (WINAPI *MSGBOXPROC)(HWND hWnd, LPCTSTR lpText, LPCTSTR lpCaption, UINT uType);
-MSGBOXPROC prevMessageBoxA;
+MSGBOXPROC prevMessageBox;
#define OIC_HAND 32513
#define OIC_QUES 32514
#define OIC_BANG 32515
#define OIC_NOTE 32516
-void popupMessage(LPCSTR lpText, LPCSTR lpCaption, UINT uType)
+void popupMessage(LPCTSTR lpText, LPCTSTR lpCaption, UINT uType)
{
POPUPDATAT ppd = {0};
int iIcon;
@@ -85,17 +87,17 @@ void popupMessage(LPCSTR lpText, LPCSTR lpCaption, UINT uType)
ppd.iSeconds = options.Timeout[indx];
ppd.lchIcon = (HICON)LoadImage(NULL, MAKEINTRESOURCE(iIcon), IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED);
- lstrcpy(ppd.lpzContactName, lpCaption);
- lstrcpy(ppd.lpzText, lpText);
+ lstrcpy(ppd.lptzContactName, lpCaption);
+ lstrcpy(ppd.lptzText, lpText);
PUAddPopUpT(&ppd);
if(options.Sound)
MessageBeep(uType);
}
-int WINAPI newMessageBoxA(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType)
+int WINAPI newMessageBox(HWND hWnd, LPCTSTR lpText, LPCTSTR lpCaption, UINT uType)
{
- if(CallService(MS_POPUP_QUERY, PUQS_GETSTATUS, 0) == CALLSERVICE_NOTFOUND || (uType & 0x0F))
- return prevMessageBoxA(hWnd, lpText, lpCaption, uType);
+ if (CallService(MS_POPUP_QUERY, PUQS_GETSTATUS, 0) == CALLSERVICE_NOTFOUND || (uType & 0x0F))
+ return prevMessageBox(hWnd, lpText, lpCaption, uType);
popupMessage(lpText, lpCaption,uType);
return IDOK;
@@ -137,12 +139,11 @@ void HookOnImport(HMODULE hModule, char *lpszImpModName, DWORD lpOrigFunc, DWORD
{
if(!g_HookError)
{
- char buf[200];
+ TCHAR buf[200];
g_HookError = TRUE;
- wsprintf(buf, "VirtualProtect failed. Code %d\n"
- "Try to call the author", GetLastError());
- prevMessageBoxA(0, buf, "MsgBox", MB_OK);
+ mir_sntprintf(buf, SIZEOF(buf), TranslateT("VirtualProtect failed. Code %d\nTry to call the author"), GetLastError());
+ prevMessageBox(0, buf, TranslateT("MsgBox"), MB_OK);
}
}
*(DWORD*)ppfn = lpNewFunc;
@@ -151,9 +152,7 @@ void HookOnImport(HMODULE hModule, char *lpszImpModName, DWORD lpOrigFunc, DWORD
if(!g_HookError2)
{
g_HookError2 = TRUE;
- prevMessageBoxA(0, "Hmm. Something goes wrong. I can't write into the memory.\n"
- "And as u can c, there are no any exception raised..\n"
- "Try to call the author", "MsgBox", MB_OK);
+ prevMessageBox(0, TranslateT("Hmm. Something goes wrong. I can't write into the memory.\nAnd as u can c, there are no any exception raised..\nTry to call the author"), TranslateT("MsgBox"), MB_OK);
}
}
}
@@ -164,10 +163,10 @@ void HookOnImport(HMODULE hModule, char *lpszImpModName, DWORD lpOrigFunc, DWORD
void HookAPI()
{
- DWORD lpMessageBox = (DWORD)GetProcAddress(GetModuleHandle("USER32.DLL"), "MessageBoxA");
- DWORD lpPopupMsgBox = (DWORD)newMessageBoxA;
+ DWORD lpMessageBox = (DWORD)GetProcAddress(GetModuleHandle(_T("USER32.DLL")), "MessageBoxW");
+ DWORD lpPopupMsgBox = (DWORD)newMessageBox;
- prevMessageBoxA = (MSGBOXPROC)lpMessageBox;
+ prevMessageBox = (MSGBOXPROC)lpMessageBox;
BOOL bFound = FALSE;
HANDLE hModuleSnap = NULL;
@@ -203,7 +202,7 @@ int HookedOptions(WPARAM wParam, LPARAM lParam)
OPTIONSDIALOGPAGE odp = {0};
odp.cbSize = sizeof(odp);
odp.hInstance = hInst;
- odp.pszTemplate = MAKEINTRESOURCE(IDD_OPTIONS);
+ odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.ptszTitle = LPGENT("MessagePopup");
odp.ptszGroup = LPGENT("Popups");
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
@@ -215,14 +214,16 @@ int HookedOptions(WPARAM wParam, LPARAM lParam)
void LoadConfig()
{
- char *szNameFG = "FGx";
- char *szNameBG = "BGx";
- char *szNameTO = "TOx";
+ char szNameFG[4];
+ char szNameBG[4];
+ char szNameTO[4];
int indx;
for(indx = 0; indx < 4; indx++)
{
- szNameFG[2] = szNameBG[2] = szNameTO[2] = (char)(indx + '0');
+ mir_snprintf(szNameFG, SIZEOF(szNameFG), "FG%d", indx);
+ mir_snprintf(szNameBG, SIZEOF(szNameBG), "BG%d", indx);
+ mir_snprintf(szNameTO, SIZEOF(szNameTO), "TO%d", indx);
options.FG[indx] = DBGetContactSettingDword(NULL, SERVICENAME, szNameFG, optionsDefault.FG[indx]);
options.BG[indx] = DBGetContactSettingDword(NULL, SERVICENAME, szNameBG, optionsDefault.BG[indx]);
options.Timeout[indx] = DBGetContactSettingDword(NULL, SERVICENAME, szNameTO, (DWORD)optionsDefault.Timeout[indx]);
diff --git a/plugins/MsgPopup/src/options.cpp b/plugins/MsgPopup/src/options.cpp
index b5467dcbe5..2b251b57ae 100644
--- a/plugins/MsgPopup/src/options.cpp
+++ b/plugins/MsgPopup/src/options.cpp
@@ -60,10 +60,10 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
BOOL Translated;
if(LOWORD(wParam) == IDC_PREVIEW)
{
- MessageBoxA(0, Translate("Message with question"), Translate(SERVICENAME " - demo"), MB_ICONQUESTION);
- MessageBoxA(0, Translate("Message with exclamation"), Translate(SERVICENAME " - demo"), MB_ICONEXCLAMATION);
- MessageBoxA(0, Translate("Message with error"), Translate(SERVICENAME " - demo"), MB_ICONSTOP);
- MessageBoxA(0, Translate("Message with asterisk"), Translate(SERVICENAME " - demo"), MB_ICONASTERISK);
+ MessageBox(0, TranslateT("Message with question"), TranslateTS(_T(SERVICENAME) _T(" - demo")), MB_ICONQUESTION);
+ MessageBox(0, TranslateT("Message with exclamation"), TranslateTS(_T(SERVICENAME) _T(" - demo")), MB_ICONEXCLAMATION);
+ MessageBox(0, TranslateT("Message with error"), TranslateTS(_T(SERVICENAME) _T(" - demo")), MB_ICONSTOP);
+ MessageBox(0, TranslateT("Message with asterisk"), TranslateTS(_T(SERVICENAME) _T(" - demo")), MB_ICONASTERISK);
return FALSE;
}
@@ -107,14 +107,16 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
case PSN_APPLY:
{
- char *szNameFG = "FGx";
- char *szNameBG = "BGx";
- char *szNameTO = "TOx";
+ char szNameFG[4];
+ char szNameBG[4];
+ char szNameTO[4];
int indx;
for(indx = 0; indx < 4; indx++)
{
- szNameFG[2] = szNameBG[2] = szNameTO[2] = (char)(indx + '0');
+ mir_snprintf(szNameFG, SIZEOF(szNameFG), "FG%d", indx);
+ mir_snprintf(szNameBG, SIZEOF(szNameBG), "BG%d", indx);
+ mir_snprintf(szNameTO, SIZEOF(szNameTO), "TO%d", indx);
DBWriteContactSettingDwordDef(NULL, SERVICENAME, szNameFG, options.FG[indx], optionsDefault.FG[indx]);
DBWriteContactSettingDwordDef(NULL, SERVICENAME, szNameBG, options.BG[indx], optionsDefault.BG[indx]);
diff --git a/plugins/MsgPopup/src/resource.h b/plugins/MsgPopup/src/resource.h
index 27e128723b..5e5e771a3a 100644
--- a/plugins/MsgPopup/src/resource.h
+++ b/plugins/MsgPopup/src/resource.h
@@ -1,34 +1,15 @@
//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by MsgBox.rc
+// Microsoft Visual C++ generated include file.
+// Used by C:\Temp\Myranda\plugins\MsgPopup\res\MsgPopup.rc
//
-#define IDD_OPTIONS 101
-
-#define IDC_ASTERISK_BG 101
-#define IDC_ERROR_FG 102
-#define IDC_ERROR_BG 103
-#define IDC_EXCLAMATION_FG 104
-#define IDC_EXCLAMATION_BG 105
-#define IDC_QUESTION_FG 106
-#define IDC_QUESTION_BG 107
-#define IDC_ASTERISK_FG 108
-#define IDC_PREVIEW 109
-
-#define IDC_TIMEOUT1 1000
-#define IDC_TIMEOUT2 1001
-#define IDC_TIMEOUT3 1002
-#define IDC_TIMEOUT4 1003
-
-#define IDC_MESSAGEBEEP 1004
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC 1
-#define _APS_NEXT_RESOURCE_VALUE 135
+#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1004
+#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
diff --git a/plugins/MsgPopup/src/stdafx.cpp b/plugins/MsgPopup/src/stdafx.cpp
new file mode 100644
index 0000000000..1976d867da
--- /dev/null
+++ b/plugins/MsgPopup/src/stdafx.cpp
@@ -0,0 +1,18 @@
+/*
+Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+
+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 version 2
+of the License.
+
+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, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "common.h" \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 14:26:22 +0000