Skip to content

V
vlc-2-2
Commit 14039ca1 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Port GlobalHotkeys to the correct SetWindowLongPtr API

parent 3e9c8d1b
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/control/globalhotkeys/win32.c
View file @ 14039ca1
...@@ -162,9 +162,9 @@ static void *Thread( void *p_data ) ...@@ -162,9 +162,9 @@ static void *Thread( void *p_data )
vlc_cond_signal( &p_sys->wait ); vlc_cond_signal( &p_sys->wait );
vlc_mutex_unlock( &p_sys->lock ); vlc_mutex_unlock( &p_sys->lock );
SetWindowLongPtr( p_sys->hotkeyWindow, GWL_WNDPROC, SetWindowLongPtr( p_sys->hotkeyWindow, GWLP_WNDPROC,
(LONG_PTR)WMHOTKEYPROC ); (LONG_PTR)WMHOTKEYPROC );
SetWindowLongPtr( p_sys->hotkeyWindow, GWL_USERDATA, SetWindowLongPtr( p_sys->hotkeyWindow, GWLP_USERDATA,
(LONG_PTR)p_intf ); (LONG_PTR)p_intf );
/* Registering of Hotkeys */ /* Registering of Hotkeys */
...@@ -294,7 +294,7 @@ LRESULT CALLBACK WMHOTKEYPROC( HWND hwnd, UINT uMsg, WPARAM wParam, ...@@ -294,7 +294,7 @@ LRESULT CALLBACK WMHOTKEYPROC( HWND hwnd, UINT uMsg, WPARAM wParam,
char psz_atomName[40]; char psz_atomName[40];
intf_thread_t *p_intf = intf_thread_t *p_intf =
(intf_thread_t*)GetWindowLongPtr( hwnd, GWL_USERDATA ); (intf_thread_t*)GetWindowLongPtr( hwnd, GWLP_USERDATA );
struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys; struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
i = GlobalGetAtomNameA( i = GlobalGetAtomNameA(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment