March 2016 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Avoid surface_from_resource() in swapchain_gl_frontbuffer_updated().
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: c059191e0fe795e4643e56bb2ab806c9ce994055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c059191e0fe795e4643e56bb2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:16 2016 +0100 wined3d: Avoid surface_from_resource() in swapchain_gl_frontbuffer_updated(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9b8d04c..299a47a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -652,7 +652,7 @@ static void swapchain_gl_frontbuffer_updated(struct wined3d_swapchain *swapchain struct wined3d_surface *surface; struct wined3d_context *context; - surface = surface_from_resource(swapchain->front_buffer->sub_resources[0].resource); + surface = swapchain->front_buffer->sub_resources[0].u.surface; context = context_acquire(swapchain->device, surface); surface_load_location(surface, context, surface->container->resource.draw_binding); context_release(context);

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in wined3d_texture_update_desc().
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: aad8f74cc8b6cf382026bbaf2f929d240f2d326f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad8f74cc8b6cf382026bbaf2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:14 2016 +0100 wined3d: Avoid surface_from_resource() in wined3d_texture_update_desc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a664155..651318c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -631,7 +631,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return WINED3DERR_INVALIDCALL; } - surface = surface_from_resource(texture->sub_resources[0].resource); + surface = texture->sub_resources[0].u.surface; if (surface->resource.map_count || (surface->flags & SFLAG_DCINUSE)) { WARN("Surface is mapped or the DC is in use.\n");

1 0

Aric Stewart : winejoystick.drv: Initialize unhandled dwPOV to JOY_POVCENTERED.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: ae2ead16ce3dfe9d906390a092ebda9d1a3d3354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2ead16ce3dfe9d906390a09… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 2 11:27:52 2016 -0600 winejoystick.drv: Initialize unhandled dwPOV to JOY_POVCENTERED. This is a fix for broken applications that do not bother to check the flags to see if JOY_RETURNPOV is set and instead blindly read dwPOV. The previous value of 0 resulted in the POV appearing to be constantly in the UP position. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index da45450..72552d0 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -715,7 +715,7 @@ LRESULT driver_joyGetPosEx(DWORD_PTR device_id, JOYINFOEX* info) } else { - info->dwPOV = 0; + info->dwPOV = JOY_POVCENTERED; info->dwFlags &= ~JOY_RETURNPOV; } }

1 0

Louis Lenders : ntdll: Add stub for RtlAddAccessAllowedObjectAce and forward to AddAccessAllowedObjectAce in advapi32.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: c63d417222fd9093c3162469ca64feb6c41b6cb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c63d417222fd9093c3162469c… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Mar 1 22:34:05 2016 +0100 ntdll: Add stub for RtlAddAccessAllowedObjectAce and forward to AddAccessAllowedObjectAce in advapi32. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 16 ++++++++++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-2-0.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/sec.c | 17 +++++++++++++++++ include/winternl.h | 1 + 8 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 1058935..bab9997 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -16,7 +16,7 @@ # @ stub AccessCheckByTypeResultListAndAuditAlarmW @ stdcall AddAccessAllowedAce (ptr long long ptr) @ stdcall AddAccessAllowedAceEx (ptr long long long ptr) -# @ stub AddAccessAllowedObjectAce +@ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) @ stdcall AddAccessDeniedAce(ptr long long ptr) @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) # @ stub AddAccessDeniedObjectAce diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 5746218..b74b1a1 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1642,6 +1642,22 @@ BOOL WINAPI AddAccessAllowedAceEx( } /****************************************************************************** + * AddAccessAllowedObjectAce [ADVAPI32.@] + */ +BOOL WINAPI AddAccessAllowedObjectAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAceFlags, + IN DWORD dwAccessMask, + IN GUID* pObjectTypeGuid, + IN GUID* pInheritedObjectTypeGuid, + IN PSID pSid) +{ + return set_ntstatus(RtlAddAccessAllowedObjectAce(pAcl, dwAceRevision, dwAceFlags, dwAccessMask, + pObjectTypeGuid, pInheritedObjectTypeGuid, pSid)); +} + +/****************************************************************************** * AddAccessDeniedAce [ADVAPI32.@] */ BOOL WINAPI AddAccessDeniedAce( diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index e5280b5..5bb0e55 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -7,7 +7,7 @@ @ stub AccessCheckByTypeResultListAndAuditAlarmW @ stdcall AddAccessAllowedAce(ptr long long ptr) advapi32.AddAccessAllowedAce @ stdcall AddAccessAllowedAceEx(ptr long long long ptr) advapi32.AddAccessAllowedAceEx -@ stub AddAccessAllowedObjectAce +@ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessAllowedObjectAce @ stdcall AddAccessDeniedAce(ptr long long ptr) advapi32.AddAccessDeniedAce @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) advapi32.AddAccessDeniedAceEx @ stub AddAccessDeniedObjectAce diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index d1fdff4..1cc6206 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -7,7 +7,7 @@ @ stub AccessCheckByTypeResultListandAuditAlarmW @ stdcall AddAccessAllowedAce(ptr long long ptr) advapi32.AddAccessAllowedAce @ stdcall AddAccessAllowedAceEx(ptr long long long ptr) advapi32.AddAccessAllowedAceEx -@ stub AddAccessAllowedObjectAce +@ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessAllowedObjectAce @ stdcall AddAccessDeniedAce(ptr long long ptr) advapi32.AddAccessDeniedAce @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) advapi32.AddAccessDeniedAceEx @ stub AddAccessDeniedObjectAce diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index 01c7c01..83ecd50 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -7,7 +7,7 @@ @ stub AccessCheckByTypeResultListAndAuditAlarmW @ stdcall AddAccessAllowedAce(ptr long long ptr) advapi32.AddAccessAllowedAce @ stdcall AddAccessAllowedAceEx(ptr long long long ptr) advapi32.AddAccessAllowedAceEx -@ stub AddAccessAllowedObjectAce +@ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessAllowedObjectAce @ stdcall AddAccessDeniedAce(ptr long long ptr) advapi32.AddAccessDeniedAce @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) advapi32.AddAccessDeniedAceEx @ stub AddAccessDeniedObjectAce diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9b64023..bbada48 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -407,7 +407,7 @@ @ stub RtlActivateActivationContextUnsafeFast @ stdcall RtlAddAccessAllowedAce(ptr long long ptr) @ stdcall RtlAddAccessAllowedAceEx(ptr long long long ptr) -# @ stub RtlAddAccessAllowedObjectAce +@ stdcall RtlAddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) @ stdcall RtlAddAccessDeniedAce(ptr long long ptr) @ stdcall RtlAddAccessDeniedAceEx(ptr long long long ptr) # @ stub RtlAddAccessDeniedObjectAce diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 34de33b..d4739d5 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1260,6 +1260,23 @@ NTSTATUS WINAPI RtlAddAccessAllowedAceEx( } /****************************************************************************** + * RtlAddAccessAllowedObjectAce [NTDLL.@] + */ +NTSTATUS WINAPI RtlAddAccessAllowedObjectAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAceFlags, + IN DWORD dwAccessMask, + IN GUID* pObjectTypeGuid, + IN GUID* pInheritedObjectTypeGuid, + IN PSID pSid) +{ + FIXME("%p %x %x %x %p %p %p - stub\n", pAcl, dwAceRevision, dwAceFlags, dwAccessMask, + pObjectTypeGuid, pInheritedObjectTypeGuid, pSid); + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************************** * RtlAddAccessDeniedAce [NTDLL.@] */ NTSTATUS WINAPI RtlAddAccessDeniedAce( diff --git a/include/winternl.h b/include/winternl.h index a861aa7..303f890 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2352,6 +2352,7 @@ NTSYSAPI NTSTATUS WINAPI RtlActivateActivationContext(DWORD,HANDLE,ULONG_PTR*); NTSYSAPI NTSTATUS WINAPI RtlAddAce(PACL,DWORD,DWORD,PACE_HEADER,DWORD); NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedAce(PACL,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); +NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessDeniedAce(PACL,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessDeniedAceEx(PACL,DWORD,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAtomToAtomTable(RTL_ATOM_TABLE,const WCHAR*,RTL_ATOM*);

1 0

Jacek Caban : user32: Removed unused owner argument.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: d75991d80e77ac9d93b85b8369c6fce39bd4fdb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d75991d80e77ac9d93b85b836… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 15:05:10 2016 +0100 user32: Removed unused owner argument. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/dialog.c | 4 ++-- dlls/user.exe16/user_private.h | 2 +- dlls/user32/controls.h | 4 ++-- dlls/user32/dialog.c | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index fead42d..766a468 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -744,7 +744,7 @@ INT16 WINAPI DialogBoxParam16( HINSTANCE16 hInst, LPCSTR template, { HWND owner = WIN_Handle32(owner16); hwnd = DIALOG_CreateIndirect16( hInst, data, owner, dlgProc, param, TRUE ); - if (hwnd) ret = wow_handlers32.dialog_box_loop( hwnd, owner ); + if (hwnd) ret = wow_handlers32.dialog_box_loop( hwnd ); GlobalUnlock16( hmem ); } FreeResource16( hmem ); @@ -764,7 +764,7 @@ INT16 WINAPI DialogBoxIndirectParam16( HINSTANCE16 hInst, HANDLE16 dlgTemplate, if (!(ptr = GlobalLock16( dlgTemplate ))) return -1; hwnd = DIALOG_CreateIndirect16( hInst, ptr, owner, dlgProc, param, TRUE ); GlobalUnlock16( dlgTemplate ); - if (hwnd) return wow_handlers32.dialog_box_loop( hwnd, owner ); + if (hwnd) return wow_handlers32.dialog_box_loop( hwnd ); return -1; } diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 7c91afb..3d97546 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -63,7 +63,7 @@ struct wow_handlers32 HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); - INT (*dialog_box_loop)(HWND,HWND); + INT (*dialog_box_loop)(HWND); ULONG_PTR (*get_icon_param)(HICON); ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 69bc94c..542bf39 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -121,7 +121,7 @@ struct wow_handlers32 HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); - INT (*dialog_box_loop)(HWND,HWND); + INT (*dialog_box_loop)(HWND); ULONG_PTR (*get_icon_param)(HICON); ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; @@ -244,7 +244,7 @@ typedef struct tagDIALOGINFO #define DF_OWNERENABLED 0x0002 extern DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) DECLSPEC_HIDDEN; -extern INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) DECLSPEC_HIDDEN; +extern INT DIALOG_DoDialogBox( HWND hwnd ) DECLSPEC_HIDDEN; HRGN set_control_clipping( HDC hdc, const RECT *rect ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 180ab3d..3ea426d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -769,14 +769,14 @@ HWND WINAPI CreateDialogIndirectParamW( HINSTANCE hInst, LPCDLGTEMPLATEW dlgTemp /*********************************************************************** * DIALOG_DoDialogBox */ -INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) +INT DIALOG_DoDialogBox( HWND hwnd ) { + HWND owner = GetWindow( hwnd, GW_OWNER ); DIALOGINFO * dlgInfo; MSG msg; INT retval; BOOL bFirstEmpty; - owner = GetWindow( hwnd, GW_OWNER ); if (!(dlgInfo = DIALOG_get_info( hwnd, FALSE ))) return -1; bFirstEmpty = TRUE; @@ -842,7 +842,7 @@ INT_PTR WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name, if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd ); return 0; } @@ -860,7 +860,7 @@ INT_PTR WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name, if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd ); return 0; } @@ -873,7 +873,7 @@ INT_PTR WINAPI DialogBoxIndirectParamAorW( HINSTANCE hInstance, LPCVOID template LPARAM param, DWORD flags ) { HWND hwnd = DIALOG_CreateIndirect( hInstance, template, owner, dlgProc, param, !flags, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd ); return -1; }

1 0

Jacek Caban : user32/tests: Added more dialog owner tests.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: ed6614107a443603efdfe2815198d784a4f984c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed6614107a443603efdfe2815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 15:04:56 2016 +0100 user32/tests: Added more dialog owner tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 189 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 186 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bd02c89..47d754f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1394,6 +1394,33 @@ static const struct message WmModalDialogSeq[] = { { WM_NCDESTROY, sent }, { 0 } }; +static const struct message WmModalDialogSeq_2[] = { + { WM_CANCELMODE, sent }, + { HCBT_SETFOCUS, hook }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_KILLFOCUS, sent }, + { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_ENABLE, sent|wparam, 0 }, + { HCBT_CREATEWND, hook }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SETFONT, sent }, + { WM_INITDIALOG, sent }, + { WM_CHANGEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_ENABLE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CHANGEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { HCBT_DESTROYWND, hook }, + { 0x0090, sent|optional }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, + { WM_DESTROY, sent }, + { WM_NCDESTROY, sent }, + { 0 } +}; /* SetMenu for NonVisible windows with size change*/ static const struct message WmSetMenuNonVisibleSizeChangeSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, @@ -4037,6 +4064,36 @@ static INT_PTR CALLBACK TestModalDlgProcA(HWND hwnd, UINT message, WPARAM wParam return 0; } +static INT_PTR CALLBACK TestModalDlgProc2(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct recvd_message msg; + + if (ignore_message( message )) return 0; + + switch (message) + { + /* ignore */ + case WM_MOUSEMOVE: + case WM_NCMOUSEMOVE: + case WM_NCMOUSELEAVE: + case WM_SETCURSOR: + return 0; + case WM_NCHITTEST: + return HTCLIENT; + } + + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "dialog"; + add_message(&msg); + + if (message == WM_INITDIALOG) EndDialog( hwnd, 0 ); + return 0; +} + static void test_hv_scroll_1(HWND hwnd, INT ctl, DWORD clear, DWORD set, INT min, INT max) { DWORD style, exstyle; @@ -12161,7 +12218,7 @@ static const struct message WmCreateDialogParamSeq_4[] = { static void test_dialog_messages(void) { WNDCLASSA cls; - HWND hdlg, hedit1, hedit2, hfocus; + HWND hdlg, hedit1, hedit2, hfocus, parent, child, child2; LRESULT ret; #define set_selection(hctl, start, end) \ @@ -12278,11 +12335,88 @@ static void test_dialog_messages(void) flush_sequence(); UnregisterClassA(cls.lpszClassName, cls.hInstance); + + parent = CreateWindowExA(0, "TestParentClass", "Test parent", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (parent != 0, "Failed to create parent window\n"); + + /* This child has no parent set. We will later call SetParent on it, + * so that it will have a parent set, but no WS_CHILD style. */ + child = CreateWindowExA(0, "TestWindowClass", "Test child", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (child != 0, "Failed to create child window\n"); + + /* This is a regular child window. When used as an owner, the other + * child window will be used. */ + child2 = CreateWindowExA(0, "SimpleWindowClass", "Test child2", + WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CHILD, + 100, 100, 200, 200, child, 0, 0, NULL); + ok (child2 != 0, "Failed to create child window\n"); + + SetParent(child, parent); + SetFocus(child); + + flush_sequence(); + DialogBoxA( 0, "TEST_DIALOG", child2, TestModalDlgProc2 ); + ok_sequence(WmModalDialogSeq_2, "ModalDialog2", TRUE); + + DestroyWindow(child2); + DestroyWindow(child); + DestroyWindow(parent); + flush_sequence(); +} + +static void test_enddialog_seq(HWND dialog, HWND owner) +{ + const struct message seq[] = { + { WM_ENABLE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { HCBT_ACTIVATE, hook|wparam, (WPARAM)owner }, + { WM_NCACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, + { WM_ACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, + /* FIXME: Following two are optional because Wine sends WM_QUERYNEWPALETTE instead of WM_WINDOWPOSCHANGING */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_QUERYNEWPALETTE, sent|optional }, + { WM_NCACTIVATE, sent|wparam|lparam, WA_ACTIVE, (LPARAM)dialog }, + { WM_GETTEXT, sent|optional|defwinproc }, + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, (LPARAM)dialog }, + { HCBT_SETFOCUS, hook|wparam, (WPARAM)owner }, + { WM_KILLFOCUS, sent|wparam, (WPARAM)owner }, + { WM_SETFOCUS, sent|defwinproc|wparam, (WPARAM)dialog }, + { 0 } + }; + + flush_sequence(); + EndDialog(dialog, 0); + ok_sequence(seq, "EndDialog", FALSE); +} + +static void test_enddialog_seq2(HWND dialog, HWND owner) +{ + const struct message seq[] = { + { WM_ENABLE, parent|sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { HCBT_ACTIVATE, hook|wparam, (WPARAM)owner }, + { WM_NCACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, + { WM_ACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, + { WM_WINDOWPOSCHANGING, sent|optional|wparam, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|optional|wparam, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { HCBT_SETFOCUS, hook|wparam, (WPARAM)owner }, + { WM_KILLFOCUS, sent|wparam, (WPARAM)owner }, + { WM_SETFOCUS, sent|parent|defwinproc|wparam, (WPARAM)dialog }, + { 0 } + }; + + flush_sequence(); + EndDialog(dialog, 0); + ok_sequence(seq, "EndDialog2", FALSE); } static void test_EndDialog(void) { - HWND hparent, hother, hactive, hdlg; + HWND hparent, hother, hactive, hdlg, hchild; WNDCLASSA cls; hparent = CreateWindowExA(0, "TestParentClass", "Test parent", @@ -12340,8 +12474,57 @@ static void test_EndDialog(void) DestroyWindow(hdlg); flush_sequence(); - DestroyWindow( hother ); DestroyWindow( hparent ); + + hparent = CreateWindowExA(0, "TestParentClass", "Test parent", + WS_POPUP | WS_VISIBLE | WS_DISABLED, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hparent != 0, "Failed to create parent window\n"); + + hchild = CreateWindowExA(0, "TestWindowClass", "Test child", + WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_DISABLED, + 0, 0, 0, 0, 0, 0, 0, NULL); + ok (hchild != 0, "Failed to create child window\n"); + + SetParent(hchild, hparent); + + flush_sequence(); + SetForegroundWindow(hother); + hactive = GetForegroundWindow(); + ok(hother == hactive, "Wrong foreground window (%p != %p)\n", hother, hactive); + + hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", hchild, test_dlg_proc, 0); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + + SetForegroundWindow(hdlg); + test_enddialog_seq(hdlg, hchild); + + hactive = GetForegroundWindow(); + ok(hactive == hchild, "Wrong foreground window (active: %p, parent: %p, dlg: %p, other: %p child: %p)\n", hactive, hparent, hdlg, hother, hchild); + + DestroyWindow(hdlg); + + /* Now set WS_CHILD style flag so that it's a real child and its parent will be dialog's owner. */ + SetWindowLongW(hchild, GWL_STYLE, GetWindowLongW(hchild, GWL_STYLE) | WS_CHILD); + + SetForegroundWindow(hother); + hactive = GetForegroundWindow(); + ok(hother == hactive, "Wrong foreground window (%p != %p)\n", hother, hactive); + + hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", hchild, test_dlg_proc, 0); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + + SetForegroundWindow(hdlg); + test_enddialog_seq2(hdlg, hparent); + + hactive = GetForegroundWindow(); + ok(hactive == hparent, "Wrong foreground window (active: %p, parent: %p, dlg: %p, other: %p child: %p)\n", hactive, hparent, hdlg, hother, hchild); + DestroyWindow(hdlg); + DestroyWindow(hchild); + DestroyWindow(hparent); + DestroyWindow(hother); + flush_sequence(); + UnregisterClassA(cls.lpszClassName, cls.hInstance); }

1 0

Jacek Caban : user32: Use proper window as dialog owner.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 0d7116b968edae3f5912112bda436df8924911fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7116b968edae3f5912112bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 15:04:24 2016 +0100 user32: Use proper window as dialog owner. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 74 +++++++++++++++++++--------------------------------- 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index f3c8289..180ab3d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -104,43 +104,6 @@ const struct builtin_class_descr DIALOG_builtin_class = /*********************************************************************** - * DIALOG_EnableOwner - * - * Helper function for modal dialogs to enable again the - * owner of the dialog box. - */ -static void DIALOG_EnableOwner( HWND hOwner ) -{ - /* Owner must be a top-level window */ - if (hOwner) - hOwner = GetAncestor( hOwner, GA_ROOT ); - if (!hOwner) return; - EnableWindow( hOwner, TRUE ); -} - - -/*********************************************************************** - * DIALOG_DisableOwner - * - * Helper function for modal dialogs to disable the - * owner of the dialog box. Returns TRUE if owner was enabled. - */ -static BOOL DIALOG_DisableOwner( HWND hOwner ) -{ - /* Owner must be a top-level window */ - if (hOwner) - hOwner = GetAncestor( hOwner, GA_ROOT ); - if (!hOwner) return FALSE; - if (IsWindowEnabled( hOwner )) - { - EnableWindow( hOwner, FALSE ); - return TRUE; - } - else - return FALSE; -} - -/*********************************************************************** * DIALOG_GetControl32 * * Return the class and text of the control pointed to by ptr, @@ -491,7 +454,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, DLG_TEMPLATE template; DIALOGINFO * dlgInfo; DWORD units = GetDialogBaseUnits(); - BOOL ownerEnabled = TRUE; + HWND disabled_owner = NULL; HMENU hMenu = 0; HFONT hUserFont = 0; UINT flags = 0; @@ -621,10 +584,27 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, } } - if (modal) + if (modal && owner) { - ownerEnabled = DIALOG_DisableOwner( owner ); - if (ownerEnabled) flags |= DF_OWNERENABLED; + HWND parent; + disabled_owner = owner; + /* + * Owner needs to be top level window. We need to duplicate the logic from server, + * because we need to disable it before creating dialog window. + */ + while ((GetWindowLongW( disabled_owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) + { + parent = GetParent( disabled_owner ); + if (!parent || parent == GetDesktopWindow()) break; + disabled_owner = parent; + } + if (IsWindowEnabled( disabled_owner )) + { + flags |= DF_OWNERENABLED; + EnableWindow( disabled_owner, FALSE ); + } + else + disabled_owner = NULL; } if (unicode) @@ -665,7 +645,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, { if (hUserFont) DeleteObject( hUserFont ); if (hMenu) DestroyMenu( hMenu ); - if (modal && (flags & DF_OWNERENABLED)) DIALOG_EnableOwner(owner); + if (disabled_owner) EnableWindow( disabled_owner, TRUE ); return 0; } @@ -721,7 +701,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, } return hwnd; } - if (modal && ownerEnabled) DIALOG_EnableOwner(owner); + if (disabled_owner) EnableWindow( disabled_owner, TRUE ); if( IsWindow(hwnd) ) DestroyWindow( hwnd ); return 0; } @@ -794,9 +774,9 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) DIALOGINFO * dlgInfo; MSG msg; INT retval; - HWND ownerMsg = GetAncestor( owner, GA_ROOT ); BOOL bFirstEmpty; + owner = GetWindow( hwnd, GW_OWNER ); if (!(dlgInfo = DIALOG_get_info( hwnd, FALSE ))) return -1; bFirstEmpty = TRUE; @@ -815,7 +795,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) if (!(GetWindowLongW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG)) { /* No message present -> send ENTERIDLE and wait */ - SendMessageW( ownerMsg, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); + SendMessageW( owner, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); } GetMessageW( &msg, 0, 0, 0 ); } @@ -842,7 +822,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) } } } - if (dlgInfo->flags & DF_OWNERENABLED) DIALOG_EnableOwner( owner ); + if (dlgInfo->flags & DF_OWNERENABLED) EnableWindow( owner, TRUE ); retval = dlgInfo->idResult; DestroyWindow( hwnd ); return retval; @@ -936,7 +916,7 @@ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval ) owner = GetWindow( hwnd, GW_OWNER ); if (owner) - DIALOG_EnableOwner( owner ); + EnableWindow( owner, TRUE ); /* Windows sets the focus to the dialog itself in EndDialog */

1 0

Stefan Dösinger : wined3d: Merge surface_remove_pbo() and wined3d_volume_free_pbo().
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 5141c082caabd0f18698fe611b57e885adf25fe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5141c082caabd0f18698fe611… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 2 19:24:21 2016 +0100 wined3d: Merge surface_remove_pbo() and wined3d_volume_free_pbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 19 +------------------ dlls/wined3d/texture.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/volume.c | 22 ---------------------- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 30 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3cd3782..469a493 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -996,19 +996,6 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DW return WINED3D_OK; } -/* Context activation is done by the caller. */ -static void surface_remove_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) -{ - GLuint *buffer_object; - - buffer_object = &surface->container->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object; - GL_EXTCALL(glDeleteBuffers(1, buffer_object)); - checkGLcall("glDeleteBuffers(1, buffer_object)"); - - *buffer_object = 0; - surface_invalidate_location(surface, WINED3D_LOCATION_BUFFER); -} - static ULONG surface_resource_incref(struct wined3d_resource *resource) { struct wined3d_surface *surface = surface_from_resource(resource); @@ -1071,10 +1058,6 @@ static void surface_unload(struct wined3d_resource *resource) surface_invalidate_location(surface, ~surface->resource.map_binding); } - /* Destroy PBOs, but load them into real sysmem before */ - if (surface->container->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object) - surface_remove_pbo(surface, gl_info); - /* Destroy fbo render buffers. This is needed for implicit render targets, for * all application-created targets the application has to release the surface * before calling _Reset @@ -3681,7 +3664,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, surface_prepare_map_memory(surface); surface_load_location(surface, context, surface->resource.map_binding); - surface_remove_pbo(surface, gl_info); + wined3d_texture_remove_buffer_object(texture, surface_get_sub_resource_idx(surface), gl_info); } surface_get_memory(surface, &data, surface->locations); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9846f07..90a3978 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -74,6 +74,23 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3D_OK; } +/* Context activation is done by the caller. */ +void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, + unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) +{ + GLuint *buffer_object; + + buffer_object = &texture->sub_resources[sub_resource_idx].buffer_object; + GL_EXTCALL(glDeleteBuffers(1, buffer_object)); + checkGLcall("glDeleteBuffers"); + texture->texture_ops->texture_sub_resource_invalidate_location( + texture->sub_resources[sub_resource_idx].resource, WINED3D_LOCATION_BUFFER); + *buffer_object = 0; + + TRACE("Deleted buffer object %u for texture %p, sub-resource %u.\n", + *buffer_object, texture, sub_resource_idx); +} + /* A GL context is provided by the caller */ static void gltexture_delete(struct wined3d_device *device, const struct wined3d_gl_info *gl_info, struct gl_texture *tex) @@ -979,6 +996,7 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); UINT sub_count = texture->level_count * texture->layer_count; + struct wined3d_context *context = NULL; UINT i; TRACE("texture %p.\n", texture); @@ -988,7 +1006,16 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) struct wined3d_resource *sub_resource = texture->sub_resources[i].resource; sub_resource->resource_ops->resource_unload(sub_resource); + + if (texture->sub_resources[i].buffer_object) + { + if (!context) + context = context_acquire(texture->resource.device, NULL); + wined3d_texture_remove_buffer_object(texture, i, context->gl_info); + } } + if (context) + context_release(context); wined3d_texture_force_reload(texture); wined3d_texture_unload_gl_texture(texture); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index fcadd39..2d88af6 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -362,19 +362,6 @@ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context * srgb_mode ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB); } -static void wined3d_volume_free_pbo(struct wined3d_volume *volume) -{ - GLuint *buffer_object = &volume->container->sub_resources[volume->texture_level].buffer_object; - struct wined3d_context *context = context_acquire(volume->resource.device, NULL); - const struct wined3d_gl_info *gl_info = context->gl_info; - - TRACE("Deleting PBO %u belonging to volume %p.\n", *buffer_object, volume); - GL_EXTCALL(glDeleteBuffers(1, buffer_object)); - checkGLcall("glDeleteBuffers"); - *buffer_object = 0; - context_release(context); -} - void wined3d_volume_cleanup(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); @@ -407,15 +394,6 @@ static void volume_unload(struct wined3d_resource *resource) wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_DISCARDED); } - if (volume->container->sub_resources[volume->texture_level].buffer_object) - { - /* Should not happen because only dynamic default pool volumes - * have a buffer, and those are not evicted by device_evit_managed_resources - * and must be freed before a non-ex device reset. */ - ERR("Unloading a volume with a buffer\n"); - wined3d_volume_free_pbo(volume); - } - /* The texture name is managed by the container. */ resource_unload(resource); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 28121b7..da36985 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2424,6 +2424,8 @@ void wined3d_texture_prepare_buffer_object(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, + unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Store surface/ volume buffer objects in the sub-resource structure.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: fbe27375370c426c781ba50841ef93ea6ff44502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe27375370c426c781ba5084… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:18 2016 +0100 wined3d: Store surface/volume buffer objects in the sub-resource structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 52 +++++++++++++++++++++------------ dlls/wined3d/texture.c | 4 +-- dlls/wined3d/volume.c | 65 +++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 6 ++-- 4 files changed, 76 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbe27375370c426c781ba…

1 0

Aric Stewart : winejoystick.drv: Gracefully handle polling an unplugged device.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 2281a7bd7ce351551207d3efc51970066488b1a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2281a7bd7ce351551207d3efc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 2 14:49:04 2016 -0600 winejoystick.drv: Gracefully handle polling an unplugged device. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index 72552d0..48c05a0 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -633,6 +633,25 @@ LRESULT driver_joyGetDevCaps(DWORD_PTR device_id, JOYCAPSW* caps, DWORD size) return JOYERR_NOERROR; } +/* + * Helper to get the value from an element + */ +static LRESULT driver_getElementValue(IOHIDDeviceRef device, IOHIDElementRef element, IOHIDValueRef *pValueRef) +{ + IOReturn ret; + ret = IOHIDDeviceGetValue(device, element, pValueRef); + switch (ret) + { + case kIOReturnSuccess: + return JOYERR_NOERROR; + case kIOReturnNotAttached: + return JOYERR_UNPLUGGED; + default: + ERR("IOHIDDeviceGetValue returned 0x%x\n",ret); + return JOYERR_NOCANDO; + } +} + /************************************************************************** * driver_joyGetPosEx */ @@ -655,6 +674,7 @@ LRESULT driver_joyGetPosEx(DWORD_PTR device_id, JOYINFOEX* info) CFIndex i, count; IOHIDValueRef valueRef; long value; + LRESULT rc; if ((joystick = joystick_from_id(device_id)) == NULL) return MMSYSERR_NODRIVER; @@ -673,7 +693,9 @@ LRESULT driver_joyGetPosEx(DWORD_PTR device_id, JOYINFOEX* info) for (i = 0; i < count; i++) { IOHIDElementRef button = (IOHIDElementRef)CFArrayGetValueAtIndex(joystick->buttons, i); - IOHIDDeviceGetValue(device, button, &valueRef); + rc = driver_getElementValue(device, button, &valueRef); + if (rc != JOYERR_NOERROR) + return rc; value = IOHIDValueGetIntegerValue(valueRef); if (value) { @@ -690,7 +712,9 @@ LRESULT driver_joyGetPosEx(DWORD_PTR device_id, JOYINFOEX* info) DWORD* field = (DWORD*)((char*)info + axis_map[i].offset); if (joystick->axes[i].element) { - IOHIDDeviceGetValue(device, joystick->axes[i].element, &valueRef); + rc = driver_getElementValue(device, joystick->axes[i].element, &valueRef); + if (rc != JOYERR_NOERROR) + return rc; value = IOHIDValueGetIntegerValue(valueRef) - joystick->axes[i].min_value; *field = MulDiv(value, 0xFFFF, joystick->axes[i].max_value - joystick->axes[i].min_value); } @@ -706,7 +730,9 @@ LRESULT driver_joyGetPosEx(DWORD_PTR device_id, JOYINFOEX* info) { if (joystick->hatswitch) { - IOHIDDeviceGetValue(device, joystick->hatswitch, &valueRef); + rc = driver_getElementValue(device, joystick->hatswitch, &valueRef); + if (rc != JOYERR_NOERROR) + return rc; value = IOHIDValueGetIntegerValue(valueRef); if (value >= 8) info->dwPOV = JOY_POVCENTERED;

1 0