diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-12-18 18:24:23 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-12-18 18:24:23 +0000 |
| commit | 380664004b21439985f148faaec988b0f28dc489 (patch) | |
| tree | c25a177a35e0f763d068ac37f7196cbd9cc6e155 /plugins/DbEditorPP/src/moduletree.cpp | |
| parent | 4051b9c5d1ac642751983cc0da7f5f991bbea474 (diff) | |
- crash fix for Win64 builds;
- some unneeded Unicode stuff wiped out
git-svn-id: http://svn.miranda-ng.org/main/trunk@2762 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/DbEditorPP/src/moduletree.cpp')
| -rw-r--r-- | plugins/DbEditorPP/src/moduletree.cpp | 89 |
1 files changed, 26 insertions, 63 deletions
diff --git a/plugins/DbEditorPP/src/moduletree.cpp b/plugins/DbEditorPP/src/moduletree.cpp index fd43be7197..f7667f6f27 100644 --- a/plugins/DbEditorPP/src/moduletree.cpp +++ b/plugins/DbEditorPP/src/moduletree.cpp @@ -57,66 +57,38 @@ int doContacts(HWND hwnd2Tree,HTREEITEM contactsRoot,ModuleSettingLL *modlist, H lParam->type |= EMPTY;
// contacts name
- if (UOS)
- {
- DBVARIANT dbv ={0};
- WCHAR nick[256];
- WCHAR protoW[256]; // unicode proto
+ DBVARIANT dbv ={0};
+ WCHAR nick[256];
+ WCHAR protoW[256]; // unicode proto
- if (szProto)
- a2u(szProto, protoW, SIZEOF(protoW));
- else
- protoW[0] = 0;
+ if (szProto)
+ a2u(szProto, protoW, SIZEOF(protoW));
+ else
+ protoW[0] = 0;
- if (!szProto || !loaded)
- {
- tvi.item.iSelectedImage = (tvi.item.iImage = 4);
+ if (!szProto || !loaded)
+ {
+ tvi.item.iSelectedImage = (tvi.item.iImage = 4);
- if (protoW) {
- if (Order)
- mir_snwprintf(nick, SIZEOF(nick), L"(%s) %s %s", protoW, GetContactName(hContact, szProto, 1), L"(UNLOADED)");
- else
- mir_snwprintf(nick, SIZEOF(nick), L"%s (%s) %s", GetContactName(hContact, szProto, 1), protoW, L"(UNLOADED)");
- }
- else wcscpy(nick, nick_unknownW);
- }
- else {
- tvi.item.iSelectedImage = (tvi.item.iImage = icon); //GetProtoIcon(szProto, 7));
+ if (protoW) {
if (Order)
- mir_snwprintf(nick, SIZEOF(nick), L"(%s) %s", protoW, GetContactName(hContact, szProto, 1));
+ mir_snwprintf(nick, SIZEOF(nick), L"(%s) %s %s", protoW, GetContactName(hContact, szProto, 1), L"(UNLOADED)");
else
- mir_snwprintf(nick, SIZEOF(nick), L"%s (%s)", GetContactName(hContact, szProto, 1), protoW);
+ mir_snwprintf(nick, SIZEOF(nick), L"%s (%s) %s", GetContactName(hContact, szProto, 1), protoW, L"(UNLOADED)");
}
-
- tvi.item.pszText = (char*)nick;
- contact = TreeView_InsertItemW(hwnd2Tree, &tvi);
+ else wcscpy(nick, nick_unknownW);
}
else {
- char nick[256];
-
- if (!szProto[0] || !loaded) {
- tvi.item.iSelectedImage = (tvi.item.iImage = 4);
-
- if (szProto[0]) {
- if (Order)
- mir_snprintf(nick, SIZEOF(nick), "(%s) %s %s", szProto, (char*)GetContactName(hContact, szProto, 0), "(UNLOADED)");
- else
- mir_snprintf(nick, SIZEOF(nick), "%s (%s) %s", (char*)GetContactName(hContact, szProto, 0), szProto, "(UNLOADED)");
- }
- else strcpy(nick, nick_unknown);
- }
- else {
- tvi.item.iSelectedImage = (tvi.item.iImage = icon); //GetProtoIcon(szProto, 7));
- if (Order)
- mir_snprintf(nick, SIZEOF(nick), "(%s) %s", szProto, (char*)GetContactName(hContact, szProto, 0));
- else
- mir_snprintf(nick, SIZEOF(nick), "%s (%s)", (char*)GetContactName(hContact, szProto, 0), szProto);
- }
-
- tvi.item.pszText = nick;
- contact = TreeView_InsertItem(hwnd2Tree, &tvi);
+ tvi.item.iSelectedImage = (tvi.item.iImage = icon); //GetProtoIcon(szProto, 7));
+ if (Order)
+ mir_snwprintf(nick, SIZEOF(nick), L"(%s) %s", protoW, GetContactName(hContact, szProto, 1));
+ else
+ mir_snwprintf(nick, SIZEOF(nick), L"%s (%s)", GetContactName(hContact, szProto, 1), protoW);
}
+ tvi.item.pszText = (char*)nick;
+ contact = TreeView_InsertItemW(hwnd2Tree, &tvi);
+
itemscount++;
if (hSelectedContact == hContact) {
@@ -230,10 +202,7 @@ void doItems(HWND hwnd2Tree,ModuleSettingLL *modlist, int count) }
}
- if (UOS)
- SetWindowText(hwnd, Translate("Database Editor++ (unicode mode)"));
- else
- SetWindowText(hwnd, Translate("Database Editor++ (ansi mode)"));
+ SetWindowText(hwnd, TranslateT("Database Editor++"));
}
int findItemInTree(HWND hwnd2Tree, HANDLE hContact, char* module)
@@ -744,12 +713,9 @@ void moduleListWM_NOTIFY(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)// hwnd }
lvi.iItem = 0;
- lvi.pszText = (char*)GetContactName(hContact,NULL,UOS);
+ lvi.pszText = (char*)GetContactName(hContact, NULL, FALSE);
- if (UOS)
- index = ListView_InsertItemW(hwnd2Settings,&lvi);
- else
- index = ListView_InsertItem(hwnd2Settings,&lvi);
+ index = ListView_InsertItem(hwnd2Settings, &lvi);
mir_snprintf(data, SIZEOF(data), "0x%08X (%ld)", hContact, hContact);
@@ -805,10 +771,7 @@ void moduleListWM_NOTIFY(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)// hwnd TreeView_GetItem(((LPNMHDR)lParam)->hwndFrom,&tvi);
mtis = (ModuleTreeInfoStruct *)ptvdi->item.lParam;
- if (UOS)
- newtext = u2a((WCHAR*)ptvdi->item.pszText);
- else
- newtext = mir_tstrdup(ptvdi->item.pszText);
+ newtext = u2a((WCHAR*)ptvdi->item.pszText);
if (!newtext || // edit control failed
!mtis->type || // its a root item
|