From b5e1c9a0314f3a3aa597c319540c8f03c6486df1 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 Jun 2012 20:32:34 +0000 Subject: plusified git-svn-id: http://svn.miranda-ng.org/main/trunk@535 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ChangeKeyboardLayout/main.cpp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'plugins/ChangeKeyboardLayout/main.cpp') diff --git a/plugins/ChangeKeyboardLayout/main.cpp b/plugins/ChangeKeyboardLayout/main.cpp index 188813111c..f51977df2c 100644 --- a/plugins/ChangeKeyboardLayout/main.cpp +++ b/plugins/ChangeKeyboardLayout/main.cpp @@ -3,6 +3,16 @@ struct MM_INTERFACE mmi; PLUGINLINK *pluginLink; int hLangpack; +LPTSTR ptszLayStrings[20]; +HANDLE hChangeLayout, hGetLayoutOfText, hChangeTextLayout; +HICON hPopupIcon, hCopyIcon; +HKL hklLayouts[20]; +BYTE bLayNum; +HINSTANCE hInst; +HHOOK kbHook_All; +MainOptions moOptions; +PopupOptions poOptions, poOptionsTemp; +HANDLE hIcoLibIconsChanged; PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), @@ -26,22 +36,18 @@ LPCTSTR ptszSeparators = _T(" \t\n\r"); HANDLE hOptionsInitialize; HANDLE hModulesLoaded; - BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) { hInst = hinstDLL; return TRUE; } - -__declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - dwMirandaVersion = mirandaVersion; return &pluginInfoEx; } - -int __declspec(dllexport) Load(PLUGINLINK *link) +extern "C" __declspec(dllexport) int Load(PLUGINLINK *link) { pluginLink = link; mir_getMMI(&mmi); @@ -55,7 +61,7 @@ int __declspec(dllexport) Load(PLUGINLINK *link) return 0; } -int __declspec(dllexport) Unload(void) +extern "C" __declspec(dllexport) int Unload(void) { DWORD i; @@ -70,6 +76,4 @@ int __declspec(dllexport) Unload(void) DestroyServiceFunction(hChangeTextLayout); UnhookWindowsHookEx(kbHook_All); return 0; -} - - +} \ No newline at end of file -- cgit v1.2.3