patch for dbeditorpp: C++ support, other improvements

git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@122 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb

1 files changed, 16 insertions, 16 deletions

diff --git a/dbeditorpp/copymodule.cpp b/dbeditorpp/copymodule.cpp
index a58be3c..25489a7 100644
--- a/dbeditorpp/copymodule.cpp
+++ b/dbeditorpp/copymodule.cpp
@@ -41,9 +41,9 @@ void copyModule(char* module, HANDLE hContactFrom, HANDLE hContactTo)
 	FreeModuleSettingLL(&msll);

 }

 

-BOOL CALLBACK copyModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK copyModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	ModuleAndContact *mac = (ModuleAndContact *)GetWindowLong(hwnd,GWL_USERDATA);

+	ModuleAndContact *mac = (ModuleAndContact *)GetWindowLongPtr(hwnd,GWLP_USERDATA);

 	if (msg == WM_INITDIALOG)

 	{

 		int index, loaded;

@@ -52,7 +52,7 @@ BOOL CALLBACK copyModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 

 		while (hContact)

 		{

-			if (GetValue(hContact,"Protocol","p",szProto,sizeof(szProto)))

+			if (GetValue(hContact,"Protocol","p",szProto,SIZEOF(szProto)))

 				loaded = IsProtocolLoaded(szProto);

 			else

 				loaded = 0;

@@ -81,9 +81,9 @@ BOOL CALLBACK copyModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 					if (protoW)

 					{

 						if (Order)

-							mir_snwprintf(nick, SIZEOF(nick),L"(%s) %s %s", protoW, GetContactName(hContact, szProto, 1), L"(UNLOADED)");

+							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)");

+							mir_snwprintf(nick, SIZEOF(nick), L"%s (%s) %s", GetContactName(hContact, szProto, 1), protoW, L"(UNLOADED)");

 					}

 					else

 						wcscpy(nick, nick_unknownW);

@@ -96,8 +96,8 @@ BOOL CALLBACK copyModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 						mir_snwprintf(nick, SIZEOF(nick), L"%s (%s)", GetContactName(hContact, szProto, 1), protoW);

 				}

 

-				index = _SendMessageW(GetDlgItem(hwnd, IDC_CONTACTS), CB_ADDSTRING, 0, (LPARAM)nick);

-				_SendMessageW(GetDlgItem(hwnd, IDC_CONTACTS), CB_SETITEMDATA, index, (LPARAM)hContact);

+				index = SendMessageW(GetDlgItem(hwnd, IDC_CONTACTS), CB_ADDSTRING, 0, (LPARAM)nick);

+				SendMessageW(GetDlgItem(hwnd, IDC_CONTACTS), CB_SETITEMDATA, index, (LPARAM)hContact);

 			}

 			else

 			{

@@ -108,9 +108,9 @@ BOOL CALLBACK copyModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 					if (szProto[0])

 					{

 						if (Order)

-							mir_snprintf(nick, sizeof(nick),"(%s) %s %s", szProto, (char*)GetContactName(hContact, szProto, 0), "(UNLOADED)");

+							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)");

+							mir_snprintf(nick, SIZEOF(nick), "%s (%s) %s", (char*)GetContactName(hContact, szProto, 0), szProto, "(UNLOADED)");

 					}

 					else

 						strcpy(nick, nick_unknown);

@@ -118,9 +118,9 @@ BOOL CALLBACK copyModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				else

 				{

 					if (Order)

-						mir_snprintf(nick, sizeof(nick), "(%s) %s", szProto, (char*)GetContactName(hContact, szProto, 0));

+						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);

+						mir_snprintf(nick, SIZEOF(nick), "%s (%s)", (char*)GetContactName(hContact, szProto, 0), szProto);

 				}

 

 				index = SendMessage(GetDlgItem(hwnd, IDC_CONTACTS), CB_ADDSTRING, 0, (LPARAM)nick);

@@ -134,7 +134,7 @@ BOOL CALLBACK copyModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 		SendMessage(GetDlgItem(hwnd, IDC_CONTACTS), CB_SETITEMDATA, index, (LPARAM)0);

 		SendMessage(GetDlgItem(hwnd, IDC_CONTACTS), CB_SETCURSEL, index, 0);

 

-		SetWindowLong(hwnd,GWL_USERDATA,lParam);

+		SetWindowLongPtr(hwnd,GWLP_USERDATA,lParam);

 		TranslateDialogDefault(hwnd);

 	}

 	else

@@ -167,14 +167,14 @@ BOOL CALLBACK copyModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 

 					SetCursor(LoadCursor(NULL,IDC_ARROW));

 				}

-				safe_free(mac);

+				mir_free(mac);

 				refreshTree(1);

 				DestroyWindow(hwnd);

 			}

 			break;

 			case IDCANCEL:

 				{

-					safe_free(mac);

+					mir_free(mac);

 					DestroyWindow(hwnd);

 				}

 			break;

@@ -186,12 +186,12 @@ BOOL CALLBACK copyModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 void copyModuleMenuItem(char* module, HANDLE hContact)

 {

 	HWND hwnd;

-	ModuleAndContact *mac = (ModuleAndContact *)calloc(sizeof(ModuleAndContact),1);

+	ModuleAndContact *mac = (ModuleAndContact *)mir_calloc(sizeof(ModuleAndContact));

 	mac->hContact = hContact;

 	strncpy(mac->module, module, 255);

 

 	if (UOS)

-		hwnd = _CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_COPY_MOD), 0, copyModDlgProc, (LPARAM)mac);

+		hwnd = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_COPY_MOD), 0, copyModDlgProc, (LPARAM)mac);

 	else

 		hwnd = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_COPY_MOD), 0, copyModDlgProc, (LPARAM)mac);

 }
\ No newline at end of file