From 0e4b269065cf9eb1f9eab7e072b8b5efcd77c78e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 8 Jul 2012 12:46:22 +0000 Subject: compilation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@846 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CmdLine/MimCmd/MimCmd.cpp | 40 ++- plugins/CmdLine/MimCmd/MimCmd.vcxproj | 37 ++- plugins/CmdLine/MimCmd/MimCmd.vcxproj.filters | 10 +- plugins/CmdLine/MimCmd/commands.cpp | 2 +- plugins/CmdLine/MimCmd/commands.h | 2 - plugins/CmdLine/MimCmd/common.h | 10 +- plugins/CmdLine/MimCmd/langpack.cpp | 377 -------------------------- plugins/CmdLine/MimCmd/langpack.h | 92 ------- 8 files changed, 63 insertions(+), 507 deletions(-) delete mode 100644 plugins/CmdLine/MimCmd/langpack.cpp delete mode 100644 plugins/CmdLine/MimCmd/langpack.h (limited to 'plugins/CmdLine/MimCmd') diff --git a/plugins/CmdLine/MimCmd/MimCmd.cpp b/plugins/CmdLine/MimCmd/MimCmd.cpp index 2709d6c034..cfd0e9b835 100644 --- a/plugins/CmdLine/MimCmd/MimCmd.cpp +++ b/plugins/CmdLine/MimCmd/MimCmd.cpp @@ -19,10 +19,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "common.h" +#include "..\utils.h" +#include "..\version.h" -//why ?? -//Who's using it ? -PLUGINLINK *pluginLink; +int hLangpack = 0; + +int lpprintf(const char *format, ...) +{ + va_list va; + va_start(va, format); + const int MAX_SIZE = 16192; + char buffer[MAX_SIZE] = {0}; + int len = _vsnprintf(buffer, MAX_SIZE - 1, format, va); + buffer[MAX_SIZE - 1] = 0; + va_end(va); + CharToOemBuff(buffer, buffer, len); + printf("%s", buffer); + + return len; +} char *GetProgramName(char *programName, int size) { @@ -36,7 +51,7 @@ char *GetProgramName(char *programName, int size) else{ STRNCPY(programName, name, size); } - + return programName; } @@ -44,7 +59,7 @@ void PrintUsage() { char name[128]; GetProgramName(name, sizeof(name)); - + lpprintf(Translate("%s usage:\n"), name); lpprintf(Translate("%s [ [, ..]]\n"), name); lpprintf(Translate("This will tell Miranda to run the specified command. The commands can have zero, one or more parameters. Use '%s help' to get a list of possible commands.\n"), name); @@ -57,7 +72,7 @@ void ShowVersion() char message[1024]; GetProgramName(name, sizeof(name)); mir_snprintf(message, sizeof(message), Translate("%s version %s"), name, __VERSION_STRING); - + lpprintf("%s\n", message); } @@ -67,14 +82,13 @@ int main(int argc, char *argv[]) if ((argc == 2) && (strcmp(argv[1], "-v") == 0)) { ShowVersion(); - + return 0; } - - if ((InitClient()) || (ConnectToMiranda()) || (GetKnownCommands()) || (LoadLangPackModule(sdCmdLine->mimFolder))) + + if ((InitClient()) || (ConnectToMiranda()) || (GetKnownCommands()) || (LoadLangPackModule())) { - LoadLangPackModule("."); - lpprintf(Translate("Could not create connection with Miranda or could not retrieve list of known commands.\n")); + lpprintf("Could not create connection with Miranda or could not retrieve list of known commands.\n"); error = MIMRES_NOMIRANDA; } else{ @@ -92,14 +106,12 @@ int main(int argc, char *argv[]) else{ lpprintf(Translate("Unknown command '%s'.\n"), argv[1]); } - + DestroyKnownCommands(); DisconnectFromMiranda(); DestroyClient(); - LangPackShutdown(); } } return error; } - diff --git a/plugins/CmdLine/MimCmd/MimCmd.vcxproj b/plugins/CmdLine/MimCmd/MimCmd.vcxproj index f4f14a4859..a5e0a44959 100644 --- a/plugins/CmdLine/MimCmd/MimCmd.vcxproj +++ b/plugins/CmdLine/MimCmd/MimCmd.vcxproj @@ -71,19 +71,22 @@ Disabled - ..\;..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL Level3 EditAndContinue + Use + common.h true - Windows + Console false $(IntDir)$(TargetName).lib + $(SolutionDir)\lib _DEBUG;%(PreprocessorDefinitions) @@ -93,18 +96,21 @@ Disabled - ..\;..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories) WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL Level3 + Use + common.h true - Windows + Console false $(IntDir)$(TargetName).lib + $(SolutionDir)\lib _DEBUG;%(PreprocessorDefinitions) @@ -113,19 +119,22 @@ - ..\;..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 Full Size + Use + common.h true - Windows + Console true true false $(IntDir)$(TargetName).lib + $(SolutionDir)\lib NDEBUG;%(PreprocessorDefinitions) @@ -134,19 +143,22 @@ - ..\;..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 Full Size + Use + common.h true - Windows + Console true true false $(IntDir)$(TargetName).lib + $(SolutionDir)\lib NDEBUG;%(PreprocessorDefinitions) @@ -155,14 +167,17 @@ - - + + Create + Create + Create + Create + - diff --git a/plugins/CmdLine/MimCmd/MimCmd.vcxproj.filters b/plugins/CmdLine/MimCmd/MimCmd.vcxproj.filters index 607cc932f8..11c62edbef 100644 --- a/plugins/CmdLine/MimCmd/MimCmd.vcxproj.filters +++ b/plugins/CmdLine/MimCmd/MimCmd.vcxproj.filters @@ -18,9 +18,6 @@ Source Files - - Source Files - Source Files @@ -32,13 +29,10 @@ Header Files - - Header Files - - + Header Files - + Header Files diff --git a/plugins/CmdLine/MimCmd/commands.cpp b/plugins/CmdLine/MimCmd/commands.cpp index b04b9ba7ba..bae47b089c 100644 --- a/plugins/CmdLine/MimCmd/commands.cpp +++ b/plugins/CmdLine/MimCmd/commands.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commands.h" +#include "common.h" inline char *STRNCPY(char *output, const char *input, size_t size) { diff --git a/plugins/CmdLine/MimCmd/commands.h b/plugins/CmdLine/MimCmd/commands.h index 04cc640f48..4c60b49565 100644 --- a/plugins/CmdLine/MimCmd/commands.h +++ b/plugins/CmdLine/MimCmd/commands.h @@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef M_MIMCMD_COMMANDS_H #define M_MIMCMD_COMMANDS_H -#include "common.h" - extern PCommand knownCommands; extern int cKnownCommands; diff --git a/plugins/CmdLine/MimCmd/common.h b/plugins/CmdLine/MimCmd/common.h index 5a66323778..47ecfc2ec6 100644 --- a/plugins/CmdLine/MimCmd/common.h +++ b/plugins/CmdLine/MimCmd/common.h @@ -18,13 +18,19 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define _CRT_SECURE_NO_WARNINGS + #include #include #include #define NO_MIMCMD_COMMANDS -#include "mimcmd_data.h" +#include +#include +#include + #include "mimcmd_ipc.h" #include "commands.h" -#include "langpack.h" \ No newline at end of file + +int lpprintf(const char *format, ...); diff --git a/plugins/CmdLine/MimCmd/langpack.cpp b/plugins/CmdLine/MimCmd/langpack.cpp deleted file mode 100644 index 096431f95b..0000000000 --- a/plugins/CmdLine/MimCmd/langpack.cpp +++ /dev/null @@ -1,377 +0,0 @@ -/* -CmdLine plugin for Miranda IM - -Copyright © 2007 Cristian Libotean - -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; either version 2 -of the License, or (at your option) any later version. - -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, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -//this code is mostly taken from Miranda's langpack module. - -/* - -Miranda IM: the free IM client for Microsoft* Windows* - -Copyright 2000-2007 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -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; either version 2 -of the License, or (at your option) any later version. - -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, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ -#include "langpack.h" - -static __inline int mir_snprintf(char *buffer, size_t count, const char* fmt, ...) { - va_list va; - int len; - - va_start(va, fmt); - len = _vsnprintf(buffer, count-1, fmt, va); - va_end(va); - buffer[count-1] = 0; - return len; -} - -int lpprintf(const char *format, ...) -{ - va_list va; - va_start(va, format); - const int MAX_SIZE = 16192; - char buffer[MAX_SIZE] = {0}; - int len = _vsnprintf(buffer, MAX_SIZE - 1, format, va); - buffer[MAX_SIZE - 1] = 0; - va_end(va); - CharToOemBuff(buffer, buffer, len); - printf("%s", buffer); - - return len; -} - -static void TrimString(char *str) -{ - int len,start; - len=lstrlenA(str); - while(str[0] && (unsigned char)str[len-1]<=' ') str[--len]=0; - for(start=0;str[start] && (unsigned char)str[start]<=' ';start++); - MoveMemory(str,str+start,len-start+1); -} - -static void TrimStringSimple(char *str) -{ - if (str[lstrlenA(str)-1] == '\n') str[lstrlenA(str)-1] = '\0'; - if (str[lstrlenA(str)-1] == '\r') str[lstrlenA(str)-1] = '\0'; -} - -static int IsEmpty(char *str) -{ - int i = 0; - - while (str[i]) - { - if (str[i]!=' '&&str[i]!='\r'&&str[i]!='\n') - return 0; - i++; - } - return 1; -} - -static void ConvertBackslashes(char *str) -{ - char *pstr; - - for(pstr=str;*pstr;pstr=CharNextA(pstr)) { - if(*pstr=='\\') { - switch(pstr[1]) { -case 'n': *pstr='\n'; break; -case 't': *pstr='\t'; break; -case 'r': *pstr='\r'; break; -default: *pstr=pstr[1]; break; - } - MoveMemory(pstr+1,pstr+2,lstrlenA(pstr+2)+1); - } - } -} - -static DWORD LangPackHash(const char *szStr) -{ -#if defined _M_IX86 && !defined _NUMEGA_BC_FINALCHECK && !defined __GNUC__ - __asm { //this is mediocrely optimised, but I'm sure it's good enough - xor edx,edx - mov esi,szStr - xor cl,cl -lph_top: - xor eax,eax - and cl,31 - mov al,[esi] - inc esi - test al,al - jz lph_end - rol eax,cl - add cl,5 - xor edx,eax - jmp lph_top -lph_end: - mov eax,edx - } -#else - DWORD hash=0; - int i; - int shift=0; - for(i=0;szStr[i];i++) { - hash^=szStr[i]<24) hash^=(szStr[i]>>(32-shift))&0x7F; - shift=(shift+5)&0x1F; - } - return hash; -#endif -} - -static DWORD LangPackHashW(const char *szStr) -{ -#if defined _M_IX86 && !defined _NUMEGA_BC_FINALCHECK && !defined __GNUC__ - __asm { //this is mediocrely optimised, but I'm sure it's good enough - xor edx,edx - mov esi,szStr - xor cl,cl -lph_top: - xor eax,eax - and cl,31 - mov al,[esi] - inc esi - inc esi - test al,al - jz lph_end - rol eax,cl - add cl,5 - xor edx,eax - jmp lph_top -lph_end: - mov eax,edx - } -#else - DWORD hash=0; - int i; - int shift=0; - for(i=0;szStr[i];i+=2) { - hash^=szStr[i]<24) hash^=(szStr[i]>>(32-shift))&0x7F; - shift=(shift+5)&0x1F; - } - return hash; -#endif -} - -static int SortLangPackHashesProc(struct LangPackEntry *arg1,struct LangPackEntry *arg2) -{ - if(arg1->englishHashenglishHash) return -1; - if(arg1->englishHash>arg2->englishHash) return 1; - /* both source strings of the same hash (may not be the same string thou) put - the one that was written first to be found first */ - if(arg1->linePoslinePos) return -1; - if(arg1->linePos>arg2->linePos) return 1; - return 0; -} - - -static int SortLangPackHashesProc2(struct LangPackEntry *arg1,struct LangPackEntry *arg2) -{ - if(arg1->englishHashenglishHash) return -1; - if(arg1->englishHash>arg2->englishHash) return 1; - return 0; -} - -static int LoadLangPack(const TCHAR *szLangPack) -{ - FILE *fp; - char line[4096]; - char *pszColon; - char *pszLine; - int entriesAlloced; - int startOfLine=0; - unsigned int linePos=1; - USHORT langID; - - lstrcpy(langPack.filename,szLangPack); - fp = _tfopen(szLangPack,_T("rt")); - if(fp==NULL) return 1; - fgets(line,SIZEOF(line),fp); - TrimString(line); - if(lstrcmpA(line,"Miranda Language Pack Version 1")) {fclose(fp); return 2;} - //headers - while(!feof(fp)) { - startOfLine=ftell(fp); - if(fgets(line,SIZEOF(line),fp)==NULL) break; - TrimString(line); - if(IsEmpty(line) || line[0]==';' || line[0]==0) continue; - if(line[0]=='[') break; - pszColon=strchr(line,':'); - if(pszColon==NULL) {fclose(fp); return 3;} - *pszColon=0; - if(!lstrcmpA(line,"Language")) {mir_snprintf(langPack.language,sizeof(langPack.language),"%s",pszColon+1); TrimString(langPack.language);} - else if(!lstrcmpA(line,"Last-Modified-Using")) {mir_snprintf(langPack.lastModifiedUsing,sizeof(langPack.lastModifiedUsing),"%s",pszColon+1); TrimString(langPack.lastModifiedUsing);} - else if(!lstrcmpA(line,"Authors")) {mir_snprintf(langPack.authors,sizeof(langPack.authors),"%s",pszColon+1); TrimString(langPack.authors);} - else if(!lstrcmpA(line,"Author-email")) {mir_snprintf(langPack.authorEmail,sizeof(langPack.authorEmail),"%s",pszColon+1); TrimString(langPack.authorEmail);} - else if(!lstrcmpA(line, "Locale")) { - char szBuf[20], *stopped; - - TrimString(pszColon + 1); - langID = (USHORT)strtol(pszColon + 1, &stopped, 16); - langPack.localeID = MAKELCID(langID, 0); - GetLocaleInfoA(langPack.localeID, LOCALE_IDEFAULTANSICODEPAGE, szBuf, 10); - szBuf[5] = 0; // codepages have max. 5 digits - langPack.defaultANSICp = atoi(szBuf); - } - } - //body - fseek(fp,startOfLine,SEEK_SET); - entriesAlloced=0; - while(!feof(fp)) { - if(fgets(line,SIZEOF(line),fp)==NULL) break; - if(IsEmpty(line) || line[0]==';' || line[0]==0) continue; - TrimStringSimple(line); - ConvertBackslashes(line); - if(line[0]=='[' && line[lstrlenA(line)-1]==']') { - if(langPack.entryCount && langPack.entry[langPack.entryCount-1].local==NULL) { - if(langPack.entry[langPack.entryCount-1].english!=NULL) free(langPack.entry[langPack.entryCount-1].english); - langPack.entryCount--; - } - pszLine = line+1; - line[lstrlenA(line)-1]='\0'; - //TrimStringSimple(line); - if(++langPack.entryCount>entriesAlloced) { - entriesAlloced+=128; - langPack.entry=(struct LangPackEntry*)realloc(langPack.entry,sizeof(struct LangPackEntry)*entriesAlloced); - } - langPack.entry[langPack.entryCount-1].english=NULL; - langPack.entry[langPack.entryCount-1].englishHash=LangPackHash(pszLine); - langPack.entry[langPack.entryCount-1].local=NULL; - langPack.entry[langPack.entryCount-1].wlocal = NULL; - langPack.entry[langPack.entryCount-1].linePos=linePos++; - } - else if(langPack.entryCount) { - struct LangPackEntry* E = &langPack.entry[langPack.entryCount-1]; - - if(E->local==NULL) { - E->local=_strdup(line); - { - size_t iNeeded = MultiByteToWideChar(langPack.defaultANSICp, 0, line, -1, 0, 0); - E->wlocal = (wchar_t *)malloc((int) ((iNeeded+1) * sizeof(wchar_t))); - MultiByteToWideChar(langPack.defaultANSICp, 0, line, -1, E->wlocal, (int) iNeeded); - } - } - else { - E->local=(char*)realloc(E->local,lstrlenA(E->local)+lstrlenA(line)+2); - lstrcatA(E->local,"\n"); - lstrcatA(E->local,line); - { - size_t iNeeded = MultiByteToWideChar(langPack.defaultANSICp, 0, line, -1, 0, 0); - size_t iOldLen = wcslen(E->wlocal); - E->wlocal = (wchar_t*)realloc(E->wlocal, ( sizeof(wchar_t) * ( iOldLen + iNeeded + 2))); - wcscat(E->wlocal, L"\n"); - MultiByteToWideChar( langPack.defaultANSICp, 0, line, -1, E->wlocal + iOldLen+1, (int) iNeeded); - } - } - } - } - qsort(langPack.entry,langPack.entryCount,sizeof(struct LangPackEntry),(int(*)(const void*,const void*))SortLangPackHashesProc); - fclose(fp); - return 0; -} - -char *LangPackTranslateString(const char *szEnglish, const int W) -{ - struct LangPackEntry key,*entry; - - if ( langPack.entryCount == 0 || szEnglish == NULL ) return (char*)szEnglish; - - - key.englishHash = W ? LangPackHashW(szEnglish) : LangPackHash(szEnglish); - entry=(struct LangPackEntry*)bsearch(&key,langPack.entry,langPack.entryCount,sizeof(struct LangPackEntry),(int(*)(const void*,const void*))SortLangPackHashesProc2); - if(entry==NULL) return (char*)szEnglish; - while(entry>langPack.entry) - { - entry--; - if(entry->englishHash!=key.englishHash) { - entry++; - return W ? (char *)entry->wlocal : entry->local; - } - } - return W ? (char *)entry->wlocal : entry->local; -} - -int LangPackGetDefaultCodePage() -{ - return (langPack.defaultANSICp == 0) ? CP_ACP : langPack.defaultANSICp; -} - -int LangPackGetDefaultLocale() -{ - return (langPack.localeID == 0) ? LOCALE_USER_DEFAULT : langPack.localeID; -} - -int LangPackShutdown() -{ - int i; - for(i=0;i -#include -#include -#include -#include - - -#define SIZEOF(X) (sizeof(X)/sizeof(X[0])) - -struct LangPackEntry { - unsigned linePos; - DWORD englishHash; - char *english; //not currently used, the hash does everything - char *local; - wchar_t *wlocal; -}; - -struct LangPackStruct { - TCHAR filename[MAX_PATH]; - char language[64]; - char lastModifiedUsing[64]; - char authors[256]; - char authorEmail[128]; - struct LangPackEntry *entry; - int entryCount; - LCID localeID; - DWORD defaultANSICp; -} static langPack = {0}; - -#ifdef Translate -#undef Translate -#define Translate(s) LangPackTranslateString(s, 0) -#endif - -char *LangPackTranslateString(const char *szEnglish, const int W); -int LangPackGetDefaultCodePage(); -int LangPackGetDefaultLocale(); - -int LangPackShutdown(); -int LoadLangPackModule(char *mirandaPath); - -int lpprintf(const char *format, ...); - -#endif \ No newline at end of file -- cgit v1.2.3