From 15bf2cf24be3def5c7f57d5966c74637c8ba18be Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Tue, 18 Sep 2012 19:12:03 +0000 Subject: project changed to Unicode git-svn-id: http://svn.miranda-ng.org/main/trunk@1602 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Restart/Restart.vcxproj | 127 ++++++++-------------------------------- plugins/Restart/src/restart.cpp | 26 ++++---- 2 files changed, 38 insertions(+), 115 deletions(-) (limited to 'plugins') diff --git a/plugins/Restart/Restart.vcxproj b/plugins/Restart/Restart.vcxproj index ce6707e513..b46d54cbf5 100644 --- a/plugins/Restart/Restart.vcxproj +++ b/plugins/Restart/Restart.vcxproj @@ -25,225 +25,148 @@ DynamicLibrary - false - MultiByte + Unicode true DynamicLibrary - false - MultiByte + Unicode true DynamicLibrary - false - MultiByte + Unicode DynamicLibrary - false - MultiByte + Unicode - - - - - - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - true - - - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - false - - - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - false + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + true MultiThreadedDebugDLL - Default false Disabled - true Level3 true EditAndContinue ..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;RESTART_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks - - true - _DEBUG;%(PreprocessorDefinitions) - .\Debug\Restart.tlb - true - Win32 - - 0x0409 _DEBUG;%(PreprocessorDefinitions) ..\..\include\msapi - - true - $(IntDir)$(TargetName).bsc - - true true true Windows $(IntDir)$(TargetName).lib - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\lib + false MultiThreadedDebugDLL - Default false Disabled - true Level3 - ProgramDatabase ..\..\include;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;RESTART_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks - - true - _DEBUG;%(PreprocessorDefinitions) - .\Debug\Restart.tlb - true - - 0x0409 _DEBUG;%(PreprocessorDefinitions) ..\..\include\msapi - - true - $(IntDir)$(TargetName).bsc - - true true true Windows $(IntDir)$(TargetName).lib - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\lib + false - MultiThreadedDLL OnlyExplicitInline true true - MaxSpeed - true + Full Level3 ..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;RESTART_EXPORTS;%(PreprocessorDefinitions) - true + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Size - - true - NDEBUG;%(PreprocessorDefinitions) - .\Release\Restart.tlb - true - Win32 - - 0x0409 NDEBUG;%(PreprocessorDefinitions) ..\..\include\msapi - - true - $(IntDir)$(TargetName).bsc - - true true Windows $(IntDir)$(TargetName).lib - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\lib true true true + false - MultiThreadedDLL OnlyExplicitInline true true - MaxSpeed - true + Full Level3 ..\..\include;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;RESTART_EXPORTS;%(PreprocessorDefinitions) - true + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Size - - true - NDEBUG;%(PreprocessorDefinitions) - .\Release\Restart.tlb - true - - 0x0409 NDEBUG;%(PreprocessorDefinitions) ..\..\include\msapi - - true - $(IntDir)$(TargetName).bsc - - true true Windows $(IntDir)$(TargetName).lib - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\lib true true true + false diff --git a/plugins/Restart/src/restart.cpp b/plugins/Restart/src/restart.cpp index be7bf4aacd..b368522786 100644 --- a/plugins/Restart/src/restart.cpp +++ b/plugins/Restart/src/restart.cpp @@ -25,15 +25,15 @@ PLUGININFOEX pluginInfo={ 0x61bedf3a, 0xcc2, 0x41a3, { 0xb9, 0x80, 0xbb, 0x93, 0x93, 0x36, 0x89, 0x35 } // {61BEDF3A-0CC2-41a3-B980-BB9393368935} }; -BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { hInst = hinstDLL; return TRUE; } -static INT_PTR RestartMenuCommand(WPARAM wParam,LPARAM lParam) +static INT_PTR RestartMenuCommand(WPARAM wParam, LPARAM lParam) { - CallService("Miranda/System/Restart",0,0); + CallService("Miranda/System/Restart", 0, 0); return 0; } @@ -42,7 +42,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfo; } -int __declspec(dllexport) Load(void) +extern "C" __declspec(dllexport) int Load(void) { SKINICONDESC sid = {0}; CLISTMENUITEM mi = {0}; @@ -50,30 +50,30 @@ int __declspec(dllexport) Load(void) // IcoLib support GetModuleFileName(hInst, szFile, MAX_PATH); - sid.pszDefaultFile = szFile; + sid.ptszDefaultFile = szFile; sid.cbSize = sizeof(sid); + sid.flags = SIDF_ALL_TCHAR; - sid.pszSection = "Restart Plugin"; - sid.pszDescription = "Restart"; + sid.ptszSection = _T("Restart Plugin"); + sid.ptszDescription = _T("Restart"); sid.pszName = "rst_restart_icon"; sid.iDefaultIndex = -IDI_RESTARTICON; hIconHandle = Skin_AddIcon(&sid); - CreateServiceFunction("RestartPlug/MenuCommand",RestartMenuCommand); + CreateServiceFunction("RestartPlug/MenuCommand", RestartMenuCommand); mi.cbSize = sizeof(mi); mi.position = -0x7FFFFFFF; - mi.flags = CMIF_ICONFROMICOLIB; + mi.flags = CMIF_ICONFROMICOLIB | CMIF_TCHAR; mi.icolibItem = hIconHandle; - mi.pszName="Restart"; - mi.pszService="RestartPlug/MenuCommand"; + mi.ptszName = _T("Restart"); + mi.pszService = "RestartPlug/MenuCommand"; Menu_AddMainMenuItem(&mi); Menu_AddTrayMenuItem(&mi); return 0; } - -int __declspec(dllexport) Unload(void) +extern "C" __declspec(dllexport) int Unload(void) { return 0; } \ No newline at end of file -- cgit v1.2.3