3 files changed, 34 insertions, 34 deletions
diff --git a/plugins/VoiceService/src/frame.cpp b/plugins/VoiceService/src/frame.cpp
index a95f04f886..365a357e15 100644
--- a/plugins/VoiceService/src/frame.cpp
+++ b/plugins/VoiceService/src/frame.cpp
@@ -26,39 +26,10 @@ HWND hwnd_container = NULL;
 
 int frame_id = -1;
 
-static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
-
 #define H_SPACE 2
 
 // Functions //////////////////////////////////////////////////////////////////////////////////////
 
-void InitFrames()
-{
-	if (ServiceExists(MS_CLIST_FRAMES_ADDFRAME)) {
-		hwnd_frame = CreateDialogW(g_plugin.getInst(), MAKEINTRESOURCE(IDD_CALLS), g_clistApi.hwndContactList, FrameWndProc);
-
-		CLISTFrame Frame = {};
-		Frame.cbSize = sizeof(CLISTFrame);
-		Frame.szName.w = TranslateT("Voice Calls");
-		Frame.hWnd = hwnd_frame;
-		Frame.align = alBottom;
-		Frame.Flags = F_VISIBLE | F_NOBORDER | F_LOCKED | F_UNICODE;
-		Frame.height = 0;
-		Frame.hIcon = g_plugin.getIcon(IDI_MAIN, true);
-
-		frame_id = CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&Frame, 0);
-	}
-}
-
-void DeInitFrames()
-{
-	if (ServiceExists(MS_CLIST_FRAMES_REMOVEFRAME) && frame_id != -1)
-		CallService(MS_CLIST_FRAMES_REMOVEFRAME, (WPARAM)frame_id, 0);
-
-	if (hwnd_frame != NULL)
-		DestroyWindow(hwnd_frame);
-}
-
 static int GetMaxLineHeight()
 {
 	return max(ICON_SIZE, font_max_height) + 1;
@@ -259,7 +230,7 @@ static void DrawIconLib(HDC hDC, const RECT &rc, int iconId)
 	IcoLib_ReleaseIcon(hIcon);
 }
 
-static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK FrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	RECT rc;
 
@@ -739,3 +710,32 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 	}
 	return DefWindowProc(hwnd, msg, wParam, lParam);
 }
+
+// Module entry point /////////////////////////////////////////////////////////////////////////////
+
+void InitFrames()
+{
+	if (ServiceExists(MS_CLIST_FRAMES_ADDFRAME)) {
+		hwnd_frame = CreateDialogW(g_plugin.getInst(), MAKEINTRESOURCE(IDD_CALLS), g_clistApi.hwndContactList, FrameWndProc);
+
+		CLISTFrame Frame = {};
+		Frame.cbSize = sizeof(CLISTFrame);
+		Frame.szName.w = TranslateT("Voice Calls");
+		Frame.hWnd = hwnd_frame;
+		Frame.align = alBottom;
+		Frame.Flags = F_VISIBLE | F_NOBORDER | F_LOCKED | F_UNICODE;
+		Frame.height = 0;
+		Frame.hIcon = g_plugin.getIcon(IDI_MAIN, true);
+
+		frame_id = CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&Frame, 0);
+	}
+}
+
+void DeInitFrames()
+{
+	if (ServiceExists(MS_CLIST_FRAMES_REMOVEFRAME) && frame_id != -1)
+		CallService(MS_CLIST_FRAMES_REMOVEFRAME, (WPARAM)frame_id, 0);
+
+	if (hwnd_frame != NULL)
+		DestroyWindow(hwnd_frame);
+}
diff --git a/plugins/VoiceService/src/options.cpp b/plugins/VoiceService/src/options.cpp
index ac5560e863..98a4b868d2 100644
--- a/plugins/VoiceService/src/options.cpp
+++ b/plugins/VoiceService/src/options.cpp
@@ -55,7 +55,7 @@ static OptPageControl popupsControls[] = {
 
 // Functions //////////////////////////////////////////////////////////////////////////////////////
 
-static LRESULT CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	return SaveOptsDlgProc(optionsControls, _countof(optionsControls), MODULE_NAME, hwndDlg, msg, wParam, lParam);
 }
@@ -93,7 +93,7 @@ static void PopupsEnableDisableCtrls(HWND hwndDlg)
 		IsDlgButtonChecked(hwndDlg, IDC_DELAYCUSTOM));
 }
 
-static LRESULT CALLBACK PopupsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK PopupsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	switch (msg) {
 	case WM_INITDIALOG:
@@ -271,7 +271,7 @@ int ImageList_AddIcon_NotShared(HIMAGELIST hIml, int iconId)
 }
 
 
-static LRESULT CALLBACK AutoDlgProc(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam)
+static INT_PTR CALLBACK AutoDlgProc(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam)
 {
 	static HICON hAnswerIcon, hDropIcon;
 
diff --git a/plugins/VoiceService/src/services.cpp b/plugins/VoiceService/src/services.cpp
index cb1cb7fa08..0c8f4c9d3a 100644
--- a/plugins/VoiceService/src/services.cpp
+++ b/plugins/VoiceService/src/services.cpp
@@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA.
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-static LRESULT CALLBACK DlgProcNewCall(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DlgProcNewCall(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	VoiceCall *call = (VoiceCall *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);