From 116d81a67a7c93fbd0041849bc7d1b4a19aa0407 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Sun, 22 Sep 2013 11:05:54 +0000 Subject: more cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@6180 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AVS/src/services.cpp | 4 ++-- plugins/HTTPServer/src/GuiElements.cpp | 4 ++-- plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/plugins/AVS/src/services.cpp b/plugins/AVS/src/services.cpp index 7b776bc28f..7eb7c654ea 100644 --- a/plugins/AVS/src/services.cpp +++ b/plugins/AVS/src/services.cpp @@ -73,7 +73,7 @@ struct OpenFileSubclassData { BYTE setView; }; -BOOL CALLBACK OpenFileSubclass(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +UINT_PTR CALLBACK OpenFileSubclass(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { OpenFileSubclassData *data= (OpenFileSubclassData *)GetWindowLongPtr(hwnd, GWLP_USERDATA); @@ -149,7 +149,7 @@ static INT_PTR avSetAvatar(HANDLE hContact, TCHAR *tszPath) ofn.lpstrDefExt = _T(""); ofn.hInstance = g_hInst; ofn.lpTemplateName = MAKEINTRESOURCE(IDD_OPENSUBCLASS); - ofn.lpfnHook = (LPOFNHOOKPROC)OpenFileSubclass; + ofn.lpfnHook = OpenFileSubclass; locking_request = is_locked; ofn.lCustData = (LPARAM)&locking_request; if (GetOpenFileName(&ofn)) { diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp index c5638b8b0e..67549050fc 100644 --- a/plugins/HTTPServer/src/GuiElements.cpp +++ b/plugins/HTTPServer/src/GuiElements.cpp @@ -243,7 +243,7 @@ string sCreateLink(const char * pszSrvPath) { // Developer : KN, Houdini ///////////////////////////////////////////////////////////////////// -UINT CALLBACK ShareNewFileDialogHook( +UINT_PTR CALLBACK ShareNewFileDialogHook( HWND hDlg, // handle to child dialog box UINT uiMsg, // message identifier WPARAM wParam, // message parameter @@ -456,7 +456,7 @@ bool bShowShareNewFileDlg(HWND hwndOwner, STFileShareInfo * pstNewShare) { ofn.hInstance = hInstance; ofn.lpstrTitle = TranslateT("Specify a file to share"); ofn.lpTemplateName = MAKEINTRESOURCE(IDD_NEW_SHARE_PROPERTIES); - ofn.lpfnHook = (LPOFNHOOKPROC)ShareNewFileDialogHook; + ofn.lpfnHook = ShareNewFileDialogHook; ofn.lCustData = (LPARAM)pstNewShare; if (!GetOpenFileName(&ofn)) { diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp index 02ba385361..b0b3e170a7 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp @@ -168,7 +168,7 @@ static LRESULT CALLBACK PlacesBarSubclassProc(HWND hWnd, UINT uMsg, WPARAM wPara * lParam - message dependend parameter * return: depends on message **/ -static LRESULT CALLBACK OpenSaveFileDialogHook(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +static UINT_PTR CALLBACK OpenSaveFileDialogHook(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { case WM_NOTIFY: @@ -257,7 +257,6 @@ static void InitOpenFileNameStruct(OPENFILENAMEA *pofn, HWND hWndParent, LPCSTR { ZeroMemory(pofn, sizeof(OPENFILENAME)); - pofn->Flags = OFN_NONETWORKBUTTON|OFN_ENABLESIZING; pofn->hwndOwner = hWndParent; pofn->lpstrTitle = pszTitle; pofn->lpstrFilter = pszFilter; @@ -268,8 +267,8 @@ static void InitOpenFileNameStruct(OPENFILENAMEA *pofn, HWND hWndParent, LPCSTR GetInitialDir(pszInitialDir); pofn->lpstrInitialDir = pszInitialDir; pofn->lStructSize = sizeof (OPENFILENAME); - pofn->Flags |= OFN_ENABLEHOOK|OFN_EXPLORER; - pofn->lpfnHook = (LPOFNHOOKPROC)OpenSaveFileDialogHook; + pofn->Flags = OFN_NONETWORKBUTTON|OFN_ENABLESIZING|OFN_ENABLEHOOK|OFN_EXPLORER; + pofn->lpfnHook = OpenSaveFileDialogHook; } -- cgit v1.2.3