From 2840393bf5378c012577c4764dc4cbd162f85d4e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 8 Jun 2012 21:02:06 +0000 Subject: GetWindowLong -> GetWindowLongPtr git-svn-id: http://svn.miranda-ng.org/main/trunk@364 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- .../foo_mlt/foobar2000/helpers/dialog_resize_helper.cpp | 4 ++-- .../players/foo_mlt/foobar2000/helpers/win32_dialog.cpp | 2 +- .../players/foo_mlt/foobar2000/shared/shared.h | 16 ++++++++-------- plugins/ListeningTo/players/winamp_mlt/mlt_winamp.cpp | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'plugins/ListeningTo') diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/dialog_resize_helper.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/dialog_resize_helper.cpp index 02574f721a..5e7fa9a856 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/dialog_resize_helper.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/dialog_resize_helper.cpp @@ -87,8 +87,8 @@ BOOL dialog_resize_helper::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wPa { RECT r; LPMINMAXINFO info = (LPMINMAXINFO) lParam; - DWORD dwStyle = GetWindowLong(hWnd, GWL_STYLE); - DWORD dwExStyle = GetWindowLong(hWnd, GWL_EXSTYLE); + DWORD dwStyle = GetWindowLongPtr(hWnd, GWL_STYLE); + DWORD dwExStyle = GetWindowLongPtr(hWnd, GWL_EXSTYLE); if (max_x && max_y) { r.left = 0; r.right = max_x; diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/win32_dialog.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/win32_dialog.cpp index 1c38be59a4..8cda858b83 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/win32_dialog.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/win32_dialog.cpp @@ -227,7 +227,7 @@ namespace dialog_helper { assert(thisptr->m_status == status_construction); thisptr->m_wnd = wnd; SetWindowLongPtr(wnd,DWLP_USER,lp); - if (GetWindowLong(wnd,GWL_STYLE) & WS_POPUP) { + if (GetWindowLongPtr(wnd,GWL_STYLE) & WS_POPUP) { modeless_dialog_manager::g_add(wnd); } } diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/shared/shared.h b/plugins/ListeningTo/players/foo_mlt/foobar2000/shared/shared.h index ce91ae029c..4f035b945d 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/shared/shared.h +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/shared/shared.h @@ -379,8 +379,8 @@ public: #define uCallWindowProc CallWindowProc #define uDefWindowProc DefWindowProc -#define uGetWindowLong GetWindowLong -#define uSetWindowLong SetWindowLong +#define uGetWindowLong GetWindowLongPtr +#define uSetWindowLong SetWindowLongPtr #define uEndDialog EndDialog #define uDestroyWindow DestroyWindow @@ -720,19 +720,19 @@ public: }; static void uAddWindowStyle(HWND p_wnd,LONG p_style) { - SetWindowLong(p_wnd,GWL_STYLE, GetWindowLong(p_wnd,GWL_STYLE) | p_style); + SetWindowLongPtr(p_wnd,GWL_STYLE, GetWindowLongPtr(p_wnd,GWL_STYLE) | p_style); } static void uRemoveWindowStyle(HWND p_wnd,LONG p_style) { - SetWindowLong(p_wnd,GWL_STYLE, GetWindowLong(p_wnd,GWL_STYLE) & ~p_style); + SetWindowLongPtr(p_wnd,GWL_STYLE, GetWindowLongPtr(p_wnd,GWL_STYLE) & ~p_style); } static void uAddWindowExStyle(HWND p_wnd,LONG p_style) { - SetWindowLong(p_wnd,GWL_EXSTYLE, GetWindowLong(p_wnd,GWL_EXSTYLE) | p_style); + SetWindowLongPtr(p_wnd,GWL_EXSTYLE, GetWindowLongPtr(p_wnd,GWL_EXSTYLE) | p_style); } static void uRemoveWindowExStyle(HWND p_wnd,LONG p_style) { - SetWindowLong(p_wnd,GWL_EXSTYLE, GetWindowLong(p_wnd,GWL_EXSTYLE) & ~p_style); + SetWindowLongPtr(p_wnd,GWL_EXSTYLE, GetWindowLongPtr(p_wnd,GWL_EXSTYLE) & ~p_style); } static unsigned MapDialogWidth(HWND p_dialog,unsigned p_value) { @@ -817,14 +817,14 @@ static bool IsPointInsideControl(const POINT& pt, HWND wnd) { for (;;) { if (walk == NULL) return false; if (walk == wnd) return true; - if (GetWindowLong(walk,GWL_STYLE) & WS_POPUP) return false; + if (GetWindowLongPtr(walk,GWL_STYLE) & WS_POPUP) return false; walk = GetParent(walk); } } static bool IsWindowChildOf(HWND child, HWND parent) { HWND walk = child; - while(walk != parent && walk != NULL && (GetWindowLong(walk,GWL_STYLE) & WS_CHILD) != 0) { + while(walk != parent && walk != NULL && (GetWindowLongPtr(walk,GWL_STYLE) & WS_CHILD) != 0) { walk = GetParent(walk); } return walk == parent; diff --git a/plugins/ListeningTo/players/winamp_mlt/mlt_winamp.cpp b/plugins/ListeningTo/players/winamp_mlt/mlt_winamp.cpp index ac3b14ed17..66a1f5984d 100644 --- a/plugins/ListeningTo/players/winamp_mlt/mlt_winamp.cpp +++ b/plugins/ListeningTo/players/winamp_mlt/mlt_winamp.cpp @@ -442,10 +442,10 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar void quit() { if (oldMainWndProc != NULL) - SetWindowLong(plugin.hwndParent, GWLP_WNDPROC, (LONG) oldMainWndProc); + SetWindowLongPtr(plugin.hwndParent, GWLP_WNDPROC, (LONG) oldMainWndProc); if (oldWndProc != NULL) - SetWindowLong(hPlWnd, GWLP_WNDPROC, (LONG) oldWndProc); + SetWindowLongPtr(hPlWnd, GWLP_WNDPROC, (LONG) oldWndProc); if (FindWindow(MIRANDA_WINDOWCLASS, NULL) != NULL) SendData(L"0\\0Winamp\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0"); @@ -457,10 +457,10 @@ int init() { KillTimer(hMsgWnd, 0); - oldMainWndProc = (WNDPROC)SetWindowLong(plugin.hwndParent, GWLP_WNDPROC, (LONG) MainWndProc); + oldMainWndProc = (WNDPROC)SetWindowLongPtr(plugin.hwndParent, GWLP_WNDPROC, (LONG) MainWndProc); hPlWnd = (HWND) SendMessage(plugin.hwndParent, WM_WA_IPC, IPC_GETWND_PE, IPC_GETWND); - oldWndProc = (WNDPROC) SetWindowLong(hPlWnd, GWLP_WNDPROC, (LONG)WndProc); + oldWndProc = (WNDPROC) SetWindowLongPtr(hPlWnd, GWLP_WNDPROC, (LONG)WndProc); return 0; } -- cgit v1.2.3