From 4bde5895768659f0d1dad4dddc700ea44d4f96f8 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10> Date: Tue, 5 Oct 2010 05:26:45 +0000 Subject: Completed split up of Unicode and ANSI version git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@542 4f64403b-2f21-0410-a795-97e2b3489a10 --- tipper/options.cpp | 115 +++++++++++++++++------------------------------------ 1 file changed, 37 insertions(+), 78 deletions(-) (limited to 'tipper/options.cpp') diff --git a/tipper/options.cpp b/tipper/options.cpp index 05b6e0a..4ebe0a2 100644 --- a/tipper/options.cpp +++ b/tipper/options.cpp @@ -142,25 +142,19 @@ void CreateDefaultItems() { bool LoadDS(DisplaySubst *ds, int index) { char setting[512]; DBVARIANT dbv; - mir_snprintf(setting, 512, "Name%d", index); + mir_snprintf(setting, SIZEOF(setting), "Name%d", index); ds->name[0] = 0; - if(!DBGetContactSettingWString(0, MODULE, setting, &dbv)) { - w2t(dbv.pwszVal, ds->name, LABEL_LEN); - DBFreeVariant(&dbv); - } else if(!DBGetContactSettingStringUtf(0, MODULE, setting, &dbv)) { - u2t(dbv.pszVal, ds->name, LABEL_LEN); - DBFreeVariant(&dbv); - } else if(!DBGetContactSetting(0, MODULE, setting, &dbv)) { - if(dbv.type == DBVT_ASCIIZ) a2t(dbv.pszVal, ds->name, LABEL_LEN); + if (!DBGetContactSettingTString(0, MODULE, setting, &dbv)) { + _tcsncpy(ds->name, dbv.ptszVal, SIZEOF(ds->name)); + ds->name[SIZEOF(ds->name) - 1] = 0; DBFreeVariant(&dbv); } else return false; - ds->name[LABEL_LEN - 1] = 0; - mir_snprintf(setting, 512, "Type%d", index); + mir_snprintf(setting, SIZEOF(setting), "Type%d", index); ds->type = (DisplaySubstType)DBGetContactSettingByte(0, MODULE, setting, DVT_PROTODB); - mir_snprintf(setting, 512, "Module%d", index); + mir_snprintf(setting, SIZEOF(setting), "Module%d", index); ds->module_name[0] = 0; if(!DBGetContactSettingString(0, MODULE, setting, &dbv)) { strncpy(ds->module_name, dbv.pszVal, MODULE_NAME_LEN); @@ -189,58 +183,42 @@ bool LoadDS(DisplaySubst *ds, int index) { void SaveDS(DisplaySubst *ds, int index) { char setting[512]; - mir_snprintf(setting, 512, "Name%d", index); - if(DBWriteContactSettingTString(0, MODULE, setting, ds->name)) { - char buff[LABEL_LEN]; - t2a(ds->name, buff, LABEL_LEN); - DBWriteContactSettingString(0, MODULE, setting, buff); - } - mir_snprintf(setting, 512, "Type%d", index); + mir_snprintf(setting, SIZEOF(setting), "Name%d", index); + DBWriteContactSettingTString(0, MODULE, setting, ds->name); + mir_snprintf(setting, SIZEOF(setting), "Type%d", index); DBWriteContactSettingByte(0, MODULE, setting, (BYTE)ds->type); - mir_snprintf(setting, 512, "Module%d", index); + mir_snprintf(setting, SIZEOF(setting), "Module%d", index); DBWriteContactSettingString(0, MODULE, setting, ds->module_name); - mir_snprintf(setting, 512, "Setting%d", index); + mir_snprintf(setting, SIZEOF(setting), "Setting%d", index); DBWriteContactSettingString(0, MODULE, setting, ds->setting_name); - mir_snprintf(setting, 512, "TransFuncId%d", index); + mir_snprintf(setting, SIZEOF(setting), "TransFuncId%d", index); DBWriteContactSettingDword(0, MODULE, setting, (WORD)ds->translate_func_id); } -bool LoadDI(DisplayItem *di, int index) { +bool LoadDI(DisplayItem *di, int index) +{ char setting[512]; DBVARIANT dbv; - mir_snprintf(setting, 512, "DILabel%d", index); + mir_snprintf(setting, SIZEOF(setting), "DILabel%d", index); di->label[0] = 0; - if(!DBGetContactSettingWString(0, MODULE, setting, &dbv)) { - w2t(dbv.pwszVal, di->label, LABEL_LEN); - DBFreeVariant(&dbv); - } else if(!DBGetContactSettingStringUtf(0, MODULE, setting, &dbv)) { - u2t(dbv.pszVal, di->label, LABEL_LEN); - DBFreeVariant(&dbv); - } else if(!DBGetContactSetting(0, MODULE, setting, &dbv)) { - if(dbv.type == DBVT_ASCIIZ) a2t(dbv.pszVal, di->label, LABEL_LEN); + if (!DBGetContactSettingTString(0, MODULE, setting, &dbv)) { + _tcsncpy( di->label, dbv.ptszVal, SIZEOF(di->label)); + di->label[SIZEOF(di->label) - 1] = 0; DBFreeVariant(&dbv); } else return false; - di->label[LABEL_LEN - 1] = 0; - mir_snprintf(setting, 512, "DIValue%d", index); + mir_snprintf(setting, SIZEOF(setting), "DIValue%d", index); di->value[0] = 0; - if(!DBGetContactSettingWString(0, MODULE, setting, &dbv)) { - w2t(dbv.pwszVal, di->value, VALUE_LEN); - DBFreeVariant(&dbv); - } else if(!DBGetContactSettingStringUtf(0, MODULE, setting, &dbv)) { - u2t(dbv.pszVal, di->value, VALUE_LEN); - DBFreeVariant(&dbv); - } else if(!DBGetContactSetting(0, MODULE, setting, &dbv)) { - if(dbv.type == DBVT_ASCIIZ) a2t(dbv.pszVal, di->value, VALUE_LEN); + if(!DBGetContactSettingTString(0, MODULE, setting, &dbv)) { + _tcsncpy(di->value, dbv.ptszVal, SIZEOF(di->value)); + di->value[SIZEOF(di->value) - 1] = 0; DBFreeVariant(&dbv); } - di->value[VALUE_LEN - 1] = 0; - - mir_snprintf(setting, 512, "DILineAbove%d", index); + mir_snprintf(setting, SIZEOF(setting), "DILineAbove%d", index); di->line_above = (DBGetContactSettingByte(0, MODULE, setting, 0) == 1); - mir_snprintf(setting, 512, "DIValNewline%d", index); + mir_snprintf(setting, SIZEOF(setting), "DIValNewline%d", index); di->value_newline = (DBGetContactSettingByte(0, MODULE, setting, 0) == 1); return true; @@ -248,21 +226,13 @@ bool LoadDI(DisplayItem *di, int index) { void SaveDI(DisplayItem *di, int index) { char setting[512]; - mir_snprintf(setting, 512, "DILabel%d", index); - if(DBWriteContactSettingTString(0, MODULE, setting, di->label)) { - char buff[LABEL_LEN]; - t2a(di->label, buff, LABEL_LEN); - DBWriteContactSettingString(0, MODULE, setting, buff); - } - mir_snprintf(setting, 512, "DIValue%d", index); - if(DBWriteContactSettingTString(0, MODULE, setting, di->value)) { - char buff[VALUE_LEN]; - t2a(di->value, buff, VALUE_LEN); - DBWriteContactSettingString(0, MODULE, setting, buff); - } - mir_snprintf(setting, 512, "DILineAbove%d", index); + mir_snprintf(setting, SIZEOF(setting), "DILabel%d", index); + DBWriteContactSettingTString(0, MODULE, setting, di->label); + mir_snprintf(setting, SIZEOF(setting), "DIValue%d", index); + DBWriteContactSettingTString(0, MODULE, setting, di->value); + mir_snprintf(setting, SIZEOF(setting), "DILineAbove%d", index); DBWriteContactSettingByte(0, MODULE, setting, di->line_above ? 1 : 0); - mir_snprintf(setting, 512, "DIValNewline%d", index); + mir_snprintf(setting, SIZEOF(setting), "DIValNewline%d", index); DBWriteContactSettingByte(0, MODULE, setting, di->value_newline ? 1 : 0); } @@ -277,7 +247,7 @@ void SaveOptions() { DBWriteContactSettingByte(0, MODULE, "Animate", (options.animate ? 1 : 0)); DBWriteContactSettingByte(0, MODULE, "TransparentBg", (options.trans_bg ? 1 : 0)); DBWriteContactSettingByte(0, MODULE, "TitleLayout", (BYTE)options.title_layout); - if(ServiceExists(MS_AV_DRAWAVATAR)) + if (ServiceExists(MS_AV_DRAWAVATAR)) DBWriteContactSettingByte(0, MODULE, "AVLayout", (BYTE)options.av_layout); DBWriteContactSettingDword(0, MODULE, "AVSize", options.av_size); DBWriteContactSettingDword(0, MODULE, "TextIndent", options.text_indent); @@ -1169,37 +1139,26 @@ static INT_PTR CALLBACK DlgProcOptLayout(HWND hwndDlg, UINT msg, WPARAM wParam, int OptInit(WPARAM wParam, LPARAM lParam) { OPTIONSDIALOGPAGE odp = { 0 }; - DWORD mirVir = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0); - odp.cbSize = (mirVir >= 0x00060000 ? sizeof(odp) : OPTIONPAGE_OLD_SIZE2); - //odp.cbSize = sizeof(odp); + odp.cbSize = sizeof(odp); odp.flags = ODPF_BOLDGROUPS; - //odp.flags |= ODPF_UNICODE; odp.position = -790000000; odp.hInstance = hInst; - + odp.pszTitle = LPGEN("Tooltips"); + odp.pszGroup = LPGEN("Customize"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_WINDOW); - odp.pszTab = Translate("Window"); - odp.pszTitle = (mirVir >= 0x00060000 ? Translate("Tooltips") : Translate("Tooltips View"));; - odp.pszGroup = Translate("Customize"); - odp.nIDBottomSimpleControl = 0; + odp.pszTab = LPGEN("Window"); odp.pfnDlgProc = DlgProcOptWindow; CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_LAYOUT); - odp.pszTab = Translate("Layout"); - odp.pszTitle = (mirVir >= 0x00060000 ? Translate("Tooltips") : Translate("Tooltips View"));; - odp.pszGroup = Translate("Customize"); - odp.nIDBottomSimpleControl = 0; + odp.pszTab = LPGEN("Layout"); odp.pfnDlgProc = DlgProcOptLayout; CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONTENT); - odp.pszTab = Translate("Content"); - odp.pszTitle = (mirVir >= 0x00060000 ? Translate("Tooltips") : Translate("Tooltips Content"));; - odp.pszGroup = Translate("Customize"); - odp.nIDBottomSimpleControl = 0; + odp.pszTab = LPGEN("Content"); odp.pfnDlgProc = DlgProcOptContent; CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); -- cgit v1.2.3