From 6b38bd980c93eb70ce88641ef8c89ad4839940bd Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 9 Mar 2013 14:54:57 +0000 Subject: removed not used headers git-svn-id: http://svn.miranda-ng.org/main/trunk@3941 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SMS/res/resource.rc | 14 +- plugins/SMS/sms_10.vcxproj | 20 +-- plugins/SMS/sms_10.vcxproj.filters | 18 ++- plugins/SMS/sms_11.vcxproj | 26 ++-- plugins/SMS/sms_11.vcxproj.filters | 18 ++- .../SMS/src/AdditionalFunctions/DebugFunctions.h | 101 --------------- .../src/AdditionalFunctions/InterlockedFunctions.h | 8 -- plugins/SMS/src/AdditionalFunctions/ListMT.h | 31 ----- .../SMS/src/AdditionalFunctions/MemoryCompare.h | 4 - .../SMS/src/AdditionalFunctions/MemoryFindByte.h | 4 - plugins/SMS/src/SMSConstans.h | 28 +--- plugins/SMS/src/SMS_svc.cpp | 2 - plugins/SMS/src/Version.h | 12 +- plugins/SMS/src/common.h | 58 +-------- plugins/SMS/src/functions.cpp | 4 - plugins/SMS/src/main.cpp | 144 +-------------------- plugins/SMS/src/options.cpp | 1 + plugins/SMS/src/receive.cpp | 2 - plugins/SMS/src/recvdlg.cpp | 1 - plugins/SMS/src/recvdlg.h | 7 - plugins/SMS/src/send.cpp | 2 - plugins/SMS/src/senddlg.cpp | 2 - plugins/SMS/src/senddlg.h | 5 - 23 files changed, 74 insertions(+), 438 deletions(-) delete mode 100644 plugins/SMS/src/AdditionalFunctions/DebugFunctions.h (limited to 'plugins') diff --git a/plugins/SMS/res/resource.rc b/plugins/SMS/res/resource.rc index 6ed23fbcdf..430840d809 100644 --- a/plugins/SMS/res/resource.rc +++ b/plugins/SMS/res/resource.rc @@ -196,18 +196,6 @@ BEGIN END #endif // APSTUDIO_INVOKED -#endif // Neutral resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// English (U.K.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK -#pragma code_page(1252) -#endif //_WIN32 #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -234,7 +222,7 @@ END #endif // APSTUDIO_INVOKED -#endif // English (U.K.) resources +#endif // Neutral resources ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/SMS/sms_10.vcxproj b/plugins/SMS/sms_10.vcxproj index bbe214275b..acc45c7fda 100644 --- a/plugins/SMS/sms_10.vcxproj +++ b/plugins/SMS/sms_10.vcxproj @@ -20,7 +20,7 @@ SMS - {B5887781-C5FD-4A2C-BC5D-CC98E462ADA6} + {A3EA507E-C77E-4966-9AEE-51442AF96E4D} @@ -73,11 +73,10 @@ Full ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;SMS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Use common.h Level3 - 4996;%(DisableSpecificWarnings) OnlyExplicitInline Size false @@ -102,11 +101,10 @@ Full ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;SMS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Use common.h Level3 - 4996;%(DisableSpecificWarnings) OnlyExplicitInline Size false @@ -131,7 +129,7 @@ Disabled ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;SMS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -139,7 +137,6 @@ common.h Level3 EditAndContinue - 4996;%(DisableSpecificWarnings) false @@ -159,13 +156,12 @@ Disabled ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;SMS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use common.h Level3 - 4996;%(DisableSpecificWarnings) false @@ -195,7 +191,11 @@ - + + + + + diff --git a/plugins/SMS/sms_10.vcxproj.filters b/plugins/SMS/sms_10.vcxproj.filters index 74e4e04223..e6fbbf8372 100644 --- a/plugins/SMS/sms_10.vcxproj.filters +++ b/plugins/SMS/sms_10.vcxproj.filters @@ -50,9 +50,6 @@ Header Files - - Header Files - Header Files @@ -62,6 +59,21 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + diff --git a/plugins/SMS/sms_11.vcxproj b/plugins/SMS/sms_11.vcxproj index 714b048beb..a721e45cd0 100644 --- a/plugins/SMS/sms_11.vcxproj +++ b/plugins/SMS/sms_11.vcxproj @@ -77,11 +77,10 @@ Full ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;SMS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Use common.h Level3 - 4996;%(DisableSpecificWarnings) OnlyExplicitInline Size false @@ -98,7 +97,7 @@ true Windows comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\bin11\lib /PDBALTPATH:%_PDB% @@ -106,11 +105,10 @@ Full ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;SMS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Use common.h Level3 - 4996;%(DisableSpecificWarnings) OnlyExplicitInline Size false @@ -127,7 +125,7 @@ true Windows comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\bin11\lib /PDBALTPATH:%_PDB% @@ -135,7 +133,7 @@ Disabled ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;SMS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -143,7 +141,6 @@ common.h Level3 EditAndContinue - 4996;%(DisableSpecificWarnings) false @@ -156,20 +153,19 @@ $(IntDir)$(TargetName).lib Windows comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\bin11\lib Disabled ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;SMS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use common.h Level3 - 4996;%(DisableSpecificWarnings) false @@ -182,7 +178,7 @@ $(IntDir)$(TargetName).lib Windows comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin10\lib + $(ProfileDir)..\..\bin11\lib @@ -199,7 +195,11 @@ - + + + + + diff --git a/plugins/SMS/sms_11.vcxproj.filters b/plugins/SMS/sms_11.vcxproj.filters index 74e4e04223..e6fbbf8372 100644 --- a/plugins/SMS/sms_11.vcxproj.filters +++ b/plugins/SMS/sms_11.vcxproj.filters @@ -50,9 +50,6 @@ Header Files - - Header Files - Header Files @@ -62,6 +59,21 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + diff --git a/plugins/SMS/src/AdditionalFunctions/DebugFunctions.h b/plugins/SMS/src/AdditionalFunctions/DebugFunctions.h deleted file mode 100644 index 8b21d1bc5a..0000000000 --- a/plugins/SMS/src/AdditionalFunctions/DebugFunctions.h +++ /dev/null @@ -1,101 +0,0 @@ -#if !defined(AFX_DEBUG_FUNCTIONS__H__INCLUDED_) -#define AFX_DEBUG_FUNCTIONS__H__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#ifndef szCRLF -#define szCRLF TEXT("\r\n") -#endif -////////////////////////////////////////////////////////////////////////// -////////////////////////////DebugPrint//////////////////////////////////// -////////////////////////////////////////////////////////////////////////// -// DebugBuildPrint(Helo world); -// Отображение текста в Debug окне во время отладки -#ifdef _DEBUG - #define DebugPrintA(szText) OutputDebugStringA((szText)) - #define DebugPrintW(szText) OutputDebugStringW((szText)) - #define DebugPrintCRLFA(szText) OutputDebugStringA((szText));OutputDebugStringA("\r\n") - #define DebugPrintCRLFW(szText) OutputDebugStringW((szText));OutputDebugStringW(L"\r\n") -#else - #define DebugPrintA(szText) - #define DebugPrintW(szText) - #define DebugPrintCRLFA(szText) - #define DebugPrintCRLFW(szText) -#endif //_DEBUG - - -#ifdef UNICODE - #define DebugPrint DebugPrintW - #define DebugPrintCRLF DebugPrintCRLFW -#else - #define DebugPrint DebugPrintA - #define DebugPrintCRLF DebugPrintCRLFA -#endif -////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////// - - - - -////////////////////////////////////////////////////////////////////////// -////////////////////////////DebugBuildPrint/////////////////////////////// -////////////////////////////////////////////////////////////////////////// -// #pragma DebugBuildPrint(Helo world); -// Отображение сообщений в Build окне во время компиляции -#ifdef _DEBUG - #pragma warning(disable:4081) - #define chSTR2(x) #x - #define chSTR(x) chSTR2(x) - #define DebugBuildPrint(szText) message(__FILE__ "(" chSTR(__LINE__) "): " #szText) - #pragma warning(default:4081) -#else - #define DebugBuildPrint(szText) -#endif //_DEBUG -////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////// - - - - -////////////////////////////////////////////////////////////////////////// -////////////////////////////DebugBufferFill/////////////////////////////// -////////////////////////////////////////////////////////////////////////// -// DebugBufferFill(szString,sizeof(szString)); -// Полностью заполняет переданный буффер символом "A", применяется -// для выходного буффера на входе в функцию. -#ifdef _DEBUG - #define DebugBufferFill(lpBuffer,dwSize) memset(lpBuffer,'A',dwSize) -#else - #define DebugBufferFill(lpBuffer,dwSize) -#endif //_DEBUG -////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////// - - - - -////////////////////////////////////////////////////////////////////////// -////////////////////////////DebugBreak//////////////////////////////////// -////////////////////////////////////////////////////////////////////////// -// DebugBreak(); -// Точка останова, более удобная альтернатива API -#if defined(_DEBUG) && defined(_X86_) - #define DebugBreak() _asm{int 3} -#else - #define DebugBreak() -#endif //_DEBUG -////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////// - - - - - - -#endif // !defined(AFX_DEBUG_FUNCTIONS__H__INCLUDED_) diff --git a/plugins/SMS/src/AdditionalFunctions/InterlockedFunctions.h b/plugins/SMS/src/AdditionalFunctions/InterlockedFunctions.h index 3fb008b216..d0f0dfcbc5 100644 --- a/plugins/SMS/src/AdditionalFunctions/InterlockedFunctions.h +++ b/plugins/SMS/src/AdditionalFunctions/InterlockedFunctions.h @@ -1,14 +1,6 @@ #if !defined(AFX_INTERLOCKED_FUNCTIONS__H__INCLUDED_) #define AFX_INTERLOCKED_FUNCTIONS__H__INCLUDED_ -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - - - - - #ifdef InterlockedCompareExchange #ifndef InterlockedAnd LONG FORCEINLINE InterlockedAnd(LONG volatile *Destination,LONG Value) diff --git a/plugins/SMS/src/AdditionalFunctions/ListMT.h b/plugins/SMS/src/AdditionalFunctions/ListMT.h index 7d7884ec66..76fd432d6d 100644 --- a/plugins/SMS/src/AdditionalFunctions/ListMT.h +++ b/plugins/SMS/src/AdditionalFunctions/ListMT.h @@ -1,23 +1,6 @@ #if !defined(AFX_LIST_MT__H__INCLUDED_) #define AFX_LIST_MT__H__INCLUDED_ -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - - -#include "InterlockedFunctions.h" - -#if defined(_MSC_VER) -#if _MSC_VER >= 800 -#if _MSC_VER >= 1200 -#pragma warning(push) -#endif -#pragma warning(disable:4312) // warning C4312: 'type cast' : conversion from 'LONG' to 'PVOID' of greater size -#endif -#endif - - // структура для работы со списком, элемент списка typedef struct _LIST_MT_ITEM { @@ -311,18 +294,4 @@ __inline DWORD ListMTIteratorGet(PCLIST_MT_ITERATOR pclmtiIterator,PLIST_MT_ITEM return(dwRetErrorCode); } - - -#if defined(_MSC_VER) -#if _MSC_VER >= 800 -#if _MSC_VER >= 1200 -#pragma warning(pop) -#else -#pragma warning(default:4312) // warning C4312: 'type cast' : conversion from 'LONG' to 'PVOID' of greater size -#endif -#endif -#endif - - - #endif // !defined(AFX_LIST_MT__H__INCLUDED_) diff --git a/plugins/SMS/src/AdditionalFunctions/MemoryCompare.h b/plugins/SMS/src/AdditionalFunctions/MemoryCompare.h index 3fdb5e08b3..a357dd1d67 100644 --- a/plugins/SMS/src/AdditionalFunctions/MemoryCompare.h +++ b/plugins/SMS/src/AdditionalFunctions/MemoryCompare.h @@ -1,10 +1,6 @@ #if !defined(AFX_MEMORYCOMPARE__H__INCLUDED_) #define AFX_MEMORYCOMPARE__H__INCLUDED_ -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - __inline DWORD MemoryCompare(LPCVOID lpcSource1,SIZE_T dwSource1Size,LPCVOID lpcSource2,SIZE_T dwSource2Size) { if (dwSource1Size == dwSource2Size) { diff --git a/plugins/SMS/src/AdditionalFunctions/MemoryFindByte.h b/plugins/SMS/src/AdditionalFunctions/MemoryFindByte.h index 83ca9c5468..a0731a0054 100644 --- a/plugins/SMS/src/AdditionalFunctions/MemoryFindByte.h +++ b/plugins/SMS/src/AdditionalFunctions/MemoryFindByte.h @@ -1,10 +1,6 @@ #if !defined(AFX_MEMORYFINDBYTE__H__INCLUDED_) #define AFX_MEMORYFINDBYTE__H__INCLUDED_ -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - __inline LPVOID MemoryFindByte(SIZE_T dwFrom,LPCVOID lpcSource,SIZE_T dwSourceSize,unsigned char chWhatFind) { if (lpcSource && dwSourceSize) diff --git a/plugins/SMS/src/SMSConstans.h b/plugins/SMS/src/SMSConstans.h index 308cfbfdca..06ae75a3ff 100644 --- a/plugins/SMS/src/SMSConstans.h +++ b/plugins/SMS/src/SMSConstans.h @@ -1,38 +1,16 @@ #if !defined(AFX_SMS_CONSTANS_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_) #define AFX_SMS_CONSTANS_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ - - - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - - - - - -#define MIN_MIR_VER_VERSION_DWORD PLUGIN_MAKE_VERSION(0,8,0,0) - - -#define PLUGIN_VERSION_DWORD PLUGIN_MAKE_VERSION(0,2,5,3) #define PROTOCOL_NAMEA "SMSPlugin" -#define PROTOCOL_NAMEW TEXT(PROTOCOL_NAMEA) #define PROTOCOL_NAME_LEN (sizeof(PROTOCOL_NAMEA)-1) #define PROTOCOL_NAME_SIZE sizeof(PROTOCOL_NAMEA) #define PROTOCOL_DISPLAY_NAME_ORIG "SMS" -#define PROTOCOL_DISPLAY_NAME_ORIGW TEXT(PROTOCOL_DISPLAY_NAME_ORIG) - - - #define TIMEOUT_MSGSEND 60000 // send sms timeout #define MIN_SMS_DBEVENT_LEN 4 // для фильтрации событий авторизации от джабер плагина #define MAX_PHONE_LEN MAX_PATH #define PHONES_MIN_COUNT 4 //internal // колличество элементов обязательно проверяемых при извлечении email адреса из инфы юзера - - #define SMS_DEFAULT_ #define SMS_DEFAULT_SIGNATUREPOS FALSE #define SMS_DEFAULT_SHOWACK TRUE @@ -91,6 +69,12 @@ int SendSMSMenuCommand(WPARAM wParam,LPARAM lParam); #define SMS_SEND_STR L"Send &SMS..." #define SMS_SEND_CM_STR L"&SMS Message" +// структура содержащая информацию о сервисах/функциях +struct SERVICE_ITEM +{ + LPSTR lpszName; // имя сервиса, оно же имя в иколибе + LPVOID lpFunc; // функция вызываемая +}; static const SERVICE_ITEM siPluginServices[] = { diff --git a/plugins/SMS/src/SMS_svc.cpp b/plugins/SMS/src/SMS_svc.cpp index ed26834349..cf86f77220 100644 --- a/plugins/SMS/src/SMS_svc.cpp +++ b/plugins/SMS/src/SMS_svc.cpp @@ -1,7 +1,5 @@ #include "common.h" - - int LoadServices(void) { CHAR szServiceFunction[MAX_PATH],*pszServiceFunctionName; diff --git a/plugins/SMS/src/Version.h b/plugins/SMS/src/Version.h index 18c852fa72..9e3d712728 100644 --- a/plugins/SMS/src/Version.h +++ b/plugins/SMS/src/Version.h @@ -4,17 +4,11 @@ #define __BUILD_NUM 3 #define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM -#define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM -#define __STRINGIFY_IMPL(x) #x -#define __STRINGIFY(x) __STRINGIFY_IMPL(x) -#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) - -#define __PLUGIN_NAME "SMS plugin" -#define __INTERNAL_NAME "SMS plugin" -#define __FILENAME "sms.dll" +#define __PLUGIN_NAME "SMS" +#define __FILENAME "SMS.dll" #define __DESCRIPTION "Send SMS text messages to mobile phones through the IM networks." #define __AUTHOR "Richard Hughes, Improved by Ariel Shulman, rewritten by Rozhuk Ivan" #define __AUTHOREMAIL "Rozhuk_I@mail.ru" #define __AUTHORWEB "http://miranda-ng.org/" -#define __COPYRIGHT "© 2001-2 Richard Hughes, 2003 Ariel Shulman, 2007-2009 Rozhuk Ivan (Rozhuk_I@mail.ru)" +#define __COPYRIGHT "© 2001-02 Richard Hughes, 2003 Ariel Shulman, 2007-2009 Rozhuk Ivan (Rozhuk_I@mail.ru)" diff --git a/plugins/SMS/src/common.h b/plugins/SMS/src/common.h index 799d287c9f..495aa6a7ae 100644 --- a/plugins/SMS/src/common.h +++ b/plugins/SMS/src/common.h @@ -7,63 +7,32 @@ #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define VC_EXTRALEAN - -//////#define _USE_32BIT_TIME_T #define _CRT_SECURE_NO_WARNINGS -//#define UNICODE -//#define _UNICODE - -/*#ifdef NDEBUG - #pragma optimize("gsy",on) - #pragma comment(linker,"/subsystem:Windows,5") - #pragma comment(linker,"/version:5") - - #pragma comment(linker,"/nodefaultlib") - //#pragma comment(linker,"/GS") - //#pragma comment(linker,"/merge:.rdata=.text /merge:.data=.text") - //#pragma comment(linker,"/verbose") - //#pragma comment(linker,"/noentry") - #pragma comment(linker,"/ENTRY:DllMain") - -#endif //_DEBUG*/ - - //#pragma comment(linker,"/nodefaultlib") - //#pragma comment(linker,"/noentry") - //#pragma comment(linker,"/ENTRY:DllMain") - -//#define CRTDLL - -#define MIRANDA_VER 0x0A00 - #include #include -#include #include -#include "AdditionalFunctions/ListMT.h" -#include "AdditionalFunctions/DebugFunctions.h" -#include "AdditionalFunctions/MemoryCompare.h" -#include "AdditionalFunctions/MemoryFindByte.h" - #include #include #include #include #include -#include -#include #include #include #include -#include -#include -#include #include #include +#include "AdditionalFunctions/InterlockedFunctions.h" +#include "AdditionalFunctions/ListMT.h" +#include "AdditionalFunctions/MemoryCompare.h" +#include "AdditionalFunctions/MemoryFindByte.h" #include "resource.h" #include "version.h" +#include "recvdlg.h" +#include "SMSConstans.h" +#include "senddlg.h" extern HINSTANCE hInst; @@ -77,19 +46,6 @@ struct GUI_DISPLAY_ITEM }; -// структура содержащая информацию о сервисах/функциях -struct SERVICE_ITEM -{ - LPSTR lpszName; // имя сервиса, оно же имя в иколибе - LPVOID lpFunc; // функция вызываемая -}; - - -#include "SMSConstans.h" -#include "senddlg.h" -#include "recvdlg.h" - - #define MAIN_MENU_ITEMS_COUNT 1 #define CONTACT_MENU_ITEMS_COUNT 1 diff --git a/plugins/SMS/src/functions.cpp b/plugins/SMS/src/functions.cpp index 5d3b9cf68e..4476c40806 100644 --- a/plugins/SMS/src/functions.cpp +++ b/plugins/SMS/src/functions.cpp @@ -1,9 +1,5 @@ #include "common.h" - - - - BOOL DB_GetStaticStringW(HANDLE hContact,LPSTR lpszModule,LPSTR lpszValueName,LPWSTR lpwszRetBuff,SIZE_T dwRetBuffSize,SIZE_T *pdwRetBuffSize) {// sizes in wchars BOOL bRet=FALSE; diff --git a/plugins/SMS/src/main.cpp b/plugins/SMS/src/main.cpp index bf75398a1b..bd13654fb8 100644 --- a/plugins/SMS/src/main.cpp +++ b/plugins/SMS/src/main.cpp @@ -27,121 +27,6 @@ Enjoy the code and use it smartly! #include "common.h" - - - -/* -extern "C" __declspec(naked) void __cdecl _chkstk() -{ - #define _PAGESIZE_ 4096 - - __asm - { - push ecx - - ; Calculate new TOS. - - lea ecx, [esp] + 8 - 4 ; TOS before entering function + size for ret value - sub ecx, eax ; new TOS - - ; Handle allocation size that results in wraparound. - ; Wraparound will result in StackOverflow exception. - - sbb eax, eax ; 0 if CF==0, ~0 if CF==1 - not eax ; ~0 if TOS did not wrapped around, 0 otherwise - and ecx, eax ; set to 0 if wraparound - - mov eax, esp ; current TOS - and eax, not ( _PAGESIZE_ - 1) ; Round down to current page boundary - - cs10: - cmp ecx, eax ; Is new TOS - jb short cs20 ; in probed page? - mov eax, ecx ; yes. - pop ecx - xchg esp, eax ; update esp - mov eax, dword ptr [eax] ; get return address - mov dword ptr [esp], eax ; and put it at new TOS - ret - - ; Find next lower page and probe - cs20: - sub eax, _PAGESIZE_ ; decrease by PAGESIZE - test dword ptr [eax],eax ; probe page. - jmp short cs10 - - } -}// - - -extern "C" void __declspec(naked) __cdecl _aulldiv() -{// http://tamiaode.3322.org/svn/ntldr/trunk/source/ntldr/ia32/x86stub.cpp - __asm - { - push ebx - push esi - - mov eax,[esp + 24] - or eax,eax - jnz short L1 - - mov ecx,[esp + 20] - mov eax,[esp + 16] - xor edx,edx - div ecx - mov ebx,eax - mov eax,[esp + 12] - div ecx - mov edx,ebx - jmp short L2 - - L1: - mov ecx,eax - mov ebx,[esp + 20] - mov edx,[esp + 14] - mov eax,[esp + 12] - - L3: - shr ecx,1 - rcr ebx,1 - shr edx,1 - rcr eax,1 - or ecx,ecx - jnz short L3 - div ebx - mov esi,eax - - mul dword ptr [esp + 24] - mov ecx,eax - mov eax,[esp + 20] - mul esi - add edx,ecx - jc short L4 - - cmp edx,[esp + 16] - ja short L4 - jb short L5 - cmp eax,[esp + 12] - jbe short L5 - L4: - dec esi - L5: - xor edx,edx - mov eax,esi - - L2: - - pop esi - pop ebx - - ret 16 - } -}// - - - -*/ - int hLangpack; HINSTANCE hInst; @@ -158,12 +43,10 @@ PLUGININFOEX pluginInfo = { __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - // {CF97FD5D-B911-47a8-AF03-D21968B5B894} - { 0xcf97fd5d, 0xb911, 0x47a8, { 0xaf, 0x3, 0xd2, 0x19, 0x68, 0xb5, 0xb8, 0x94 } } + // {CF97FD5D-B911-47A8-AF03-D21968B5B894} + {0xcf97fd5d, 0xb911, 0x47a8, {0xaf, 0x3, 0xd2, 0x19, 0x68, 0xb5, 0xb8, 0x94}} }; - - extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { return &pluginInfo; @@ -173,25 +56,9 @@ int OnModulesLoaded (WPARAM wParam,LPARAM lParam); int OnPreShutdown (WPARAM wParam,LPARAM lParam); void VersionConversions(); -BOOL WINAPI DllMain(HINSTANCE hInstance,DWORD dwReason,LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpvReserved) { hInst = hInstance; - - switch(dwReason){ - case DLL_PROCESS_ATTACH: - ZeroMemory(&ssSMSSettings,sizeof(ssSMSSettings)); - ssSMSSettings.hInstance=hInstance; - ssSMSSettings.hHeap=HeapCreate(0,0,0);//GetProcessHeap(); - DisableThreadLibraryCalls((HMODULE)hInstance); - break; - case DLL_PROCESS_DETACH: - HeapDestroy(ssSMSSettings.hHeap); - ssSMSSettings.hHeap=NULL; - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - break; - } - return TRUE; } @@ -220,8 +87,6 @@ extern "C" int __declspec(dllexport) Unload(void) return 0; } - - int OnModulesLoaded(WPARAM wParam,LPARAM lParam) { VersionConversions(); @@ -231,7 +96,6 @@ int OnModulesLoaded(WPARAM wParam,LPARAM lParam) return 0; } - int OnPreShutdown(WPARAM wParam,LPARAM lParam) { UnloadModules(); @@ -243,8 +107,6 @@ int OnPreShutdown(WPARAM wParam,LPARAM lParam) return 0; } - - void VersionConversions() { WCHAR wsztm[MAX_PATH]; diff --git a/plugins/SMS/src/options.cpp b/plugins/SMS/src/options.cpp index 5ebe06f253..e7314b2180 100644 --- a/plugins/SMS/src/options.cpp +++ b/plugins/SMS/src/options.cpp @@ -24,6 +24,7 @@ For any comments, problems, etc. contact me at Miranda-IM forums or E-Mail or IC All the information needed you can find at www.nuke007.tk Enjoy the code and use it smartly! */ + #include "common.h" WORD wSMSSignControlsList[] = { IDC_BEGIN, IDC_END, IDC_SIGNATURE, IDC_SIGNGROUP }; diff --git a/plugins/SMS/src/receive.cpp b/plugins/SMS/src/receive.cpp index f79996259f..b201f82db9 100644 --- a/plugins/SMS/src/receive.cpp +++ b/plugins/SMS/src/receive.cpp @@ -27,8 +27,6 @@ Enjoy the code and use it smartly! #include "common.h" - - //This function handles the ACK received from that hooked. int handleAckSMS(WPARAM wParam,LPARAM lParam) { diff --git a/plugins/SMS/src/recvdlg.cpp b/plugins/SMS/src/recvdlg.cpp index adf33d554d..24464c29bd 100644 --- a/plugins/SMS/src/recvdlg.cpp +++ b/plugins/SMS/src/recvdlg.cpp @@ -26,7 +26,6 @@ Enjoy the code and use it smartly! */ #include "common.h" -#include "recvdlg.h" //Defnition needed to the SMS window list typedef struct diff --git a/plugins/SMS/src/recvdlg.h b/plugins/SMS/src/recvdlg.h index a34231b255..5090dff12e 100644 --- a/plugins/SMS/src/recvdlg.h +++ b/plugins/SMS/src/recvdlg.h @@ -1,13 +1,6 @@ #if !defined(AFX_SMS_RECVDLG_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_) #define AFX_SMS_RECVDLG_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - - - DWORD RecvSMSWindowInitialize (); void RecvSMSWindowDestroy (); HWND RecvSMSWindowAdd (HANDLE hContact,DWORD dwEventType,LPWSTR lpwszPhone,SIZE_T dwPhoneSize,LPSTR lpszMessage,SIZE_T dwMessageSize); diff --git a/plugins/SMS/src/send.cpp b/plugins/SMS/src/send.cpp index fda9c490db..2b8baa84d2 100644 --- a/plugins/SMS/src/send.cpp +++ b/plugins/SMS/src/send.cpp @@ -27,8 +27,6 @@ Enjoy the code and use it smartly! #include "common.h" - - //This function gets HWND of the window, the number, and the message. void StartSmsSend(HWND hWndDlg,SIZE_T dwModuleIndex,LPWSTR lpwszPhone,SIZE_T dwPhoneSize,LPWSTR lpwszMessage,SIZE_T dwMessageSize) { diff --git a/plugins/SMS/src/senddlg.cpp b/plugins/SMS/src/senddlg.cpp index 65b8e2c9ed..df883c440e 100644 --- a/plugins/SMS/src/senddlg.cpp +++ b/plugins/SMS/src/senddlg.cpp @@ -27,8 +27,6 @@ Enjoy the code and use it smartly! #include "common.h" - - #define TIMERID_MSGSEND 0 #define TIMEDOUT_CANCEL 0 #define TIMEDOUT_RETRY 1 diff --git a/plugins/SMS/src/senddlg.h b/plugins/SMS/src/senddlg.h index f17458a7fc..e3ad1d40b5 100644 --- a/plugins/SMS/src/senddlg.h +++ b/plugins/SMS/src/senddlg.h @@ -1,11 +1,6 @@ #if !defined(AFX_SMS_SENDDLG_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_) #define AFX_SMS_SENDDLG_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - DWORD SendSMSWindowInitialize(); void SendSMSWindowDestroy(); -- cgit v1.2.3