wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionType::GetMemberTypeByName().
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 54b5364988dace512019b91768d7c44c799a97f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b5364988dace512019b9176… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 28 19:47:31 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionType::GetMemberTypeByName(). --- dlls/d3dcompiler_43/reflection.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 7381957..c0ade43 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -817,9 +817,31 @@ static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflect static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByName( ID3D11ShaderReflectionType *iface, LPCSTR name) { - FIXME("iface %p, name %s stub!\n", iface, name); + struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + unsigned int i; - return NULL; + TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + + if (!name) + { + WARN("Invalid argument specified\n"); + return &null_type.ID3D11ShaderReflectionType_iface; + } + + for (i = 0; i < This->desc.Members; ++i) + { + struct d3dcompiler_shader_reflection_type_member *member = &This->members[i]; + + if (!strcmp(member->name, name)) + { + TRACE("Returning ID3D11ShaderReflectionType %p.\n", member->type); + return &member->type->ID3D11ShaderReflectionType_iface; + } + } + + WARN("Invalid name specified\n"); + + return &null_type.ID3D11ShaderReflectionType_iface; } static LPCSTR STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeName(

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionType::GetMemberTypeByIndex().
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 3ca651cce149d3c2d178a1c5ae3cf86e005b3415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca651cce149d3c2d178a1c5a… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 28 19:47:28 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionType::GetMemberTypeByIndex(). --- dlls/d3dcompiler_43/reflection.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 5c063b9..7381957 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -801,9 +801,17 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetDesc( static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByIndex( ID3D11ShaderReflectionType *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); - return NULL; + TRACE("iface %p, index %u\n", iface, index); + + if (index >= This->desc.Members) + { + WARN("Invalid index specified\n"); + return &null_type.ID3D11ShaderReflectionType_iface; + } + + return &This->members[index].type->ID3D11ShaderReflectionType_iface; } static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByName(

1 0

Rico Schüller : d3dcompiler: Parse member types.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: a300481187cb237ea34ca3ec3e4a68b069793d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a300481187cb237ea34ca3ec3… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 28 19:47:24 2011 +0100 d3dcompiler: Parse member types. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 8 +++ dlls/d3dcompiler_43/reflection.c | 94 ++++++++++++++++++++++++++--- 2 files changed, 94 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 4d90def..9a5274b 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -75,6 +75,14 @@ struct d3dcompiler_shader_reflection_type struct d3dcompiler_shader_reflection *reflection; D3D11_SHADER_TYPE_DESC desc; + struct d3dcompiler_shader_reflection_type_member *members; +}; + +struct d3dcompiler_shader_reflection_type_member +{ + char *name; + DWORD offset; + struct d3dcompiler_shader_reflection_type *type; }; struct d3dcompiler_shader_reflection_variable diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 157e791..5c063b9 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -31,6 +31,8 @@ enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7 = 7, }; +static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3dcompiler_shader_reflection *reflection, const char *data, DWORD offset); + const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl; const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl; const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl; @@ -81,17 +83,17 @@ static BOOL copy_value(const char *ptr, void **value, DWORD size) return TRUE; } -void *d3dcompiler_rb_alloc(size_t size) +static void *d3dcompiler_rb_alloc(size_t size) { return HeapAlloc(GetProcessHeap(), 0, size); } -void *d3dcompiler_rb_realloc(void *ptr, size_t size) +static void *d3dcompiler_rb_realloc(void *ptr, size_t size) { return HeapReAlloc(GetProcessHeap(), 0, ptr, size); } -void d3dcompiler_rb_free(void *ptr) +static void d3dcompiler_rb_free(void *ptr) { HeapFree(GetProcessHeap(), 0, ptr); } @@ -104,12 +106,29 @@ static int d3dcompiler_shader_reflection_type_compare(const void *key, const str return *id - t->id; } +static void free_type_member(struct d3dcompiler_shader_reflection_type_member *member) +{ + if (member) + { + HeapFree(GetProcessHeap(), 0, member->name); + } +} + static void d3dcompiler_shader_reflection_type_destroy(struct wine_rb_entry *entry, void *context) { struct d3dcompiler_shader_reflection_type *t = WINE_RB_ENTRY_VALUE(entry, struct d3dcompiler_shader_reflection_type, entry); + unsigned int i; TRACE("reflection type %p.\n", t); + if (t->members) + { + for (i = 0; i < t->desc.Members; ++i) + { + free_type_member(&t->members[i]); + } + } + HeapFree(GetProcessHeap(), 0, t); } @@ -985,12 +1004,45 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c return E_FAIL; } +static HRESULT d3dcompiler_parse_type_members(struct d3dcompiler_shader_reflection *ref, + struct d3dcompiler_shader_reflection_type_member *member, const char *data, const char **ptr) +{ + DWORD offset; + + read_dword(ptr, &offset); + if (!copy_name(data + offset, &member->name)) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } + TRACE("Member name: %s.\n", debugstr_a(member->name)); + + read_dword(ptr, &offset); + TRACE("Member type offset: %x\n", offset); + + member->type = get_reflection_type(ref, data, offset); + if (!member->type) + { + ERR("Failed to get member type\n"); + HeapFree(GetProcessHeap(), 0, member->name); + return E_FAIL; + } + + read_dword(ptr, &member->offset); + TRACE("Member offset %x\n", member->offset); + + return S_OK; +} + static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type *type, const char *data, DWORD offset) { const char *ptr = data + offset; DWORD temp; D3D11_SHADER_TYPE_DESC *desc; unsigned int i; + struct d3dcompiler_shader_reflection_type_member *members; + HRESULT hr; + DWORD member_offset; desc = &type->desc; @@ -1009,19 +1061,45 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type desc->Members = temp >> 16; TRACE("Elements %u, Members %u\n", desc->Elements, desc->Members); - read_dword(&ptr, &temp); - TRACE("Member Offset %u\n", temp); + read_dword(&ptr, &member_offset); + TRACE("Member Offset %u\n", member_offset); if ((type->reflection->target & 0xffff) >= 0x500) skip_dword_unknown(&ptr, 4); - /* todo: Parse type members */ - for (i = 0; i < desc->Members; ++i) + if (desc->Members) { - skip_dword_unknown(&ptr, 3); + const char *ptr2 = data + member_offset; + + members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*members)); + if (!members) + { + ERR("Failed to allocate type memory.\n"); + return E_OUTOFMEMORY; + } + + for (i = 0; i < desc->Members; ++i) + { + hr = d3dcompiler_parse_type_members(type->reflection, &members[i], data, &ptr2); + if (hr != S_OK) + { + FIXME("Failed to parse type members."); + goto err_out; + } + } } + type->members = members; + return S_OK; + +err_out: + for (i = 0; i < desc->Members; ++i) + { + free_type_member(&members[i]); + } + HeapFree(GetProcessHeap(), 0, members); + return hr; } static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3dcompiler_shader_reflection *reflection, const char *data, DWORD offset)

1 0

Alexandre Julliard : server: Don' t pass a thread id to send_hardware_message, determine it from the window.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: bc4afb078677095468d4ee8f9a15c18cbb47bbbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4afb078677095468d4ee8f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 11:54:55 2011 +0100 server: Don't pass a thread id to send_hardware_message, determine it from the window. --- dlls/winex11.drv/keyboard.c | 1 - dlls/winex11.drv/mouse.c | 1 - include/wine/server_protocol.h | 8 +---- server/protocol.def | 6 +---- server/queue.c | 51 ++++++++++++++++----------------------- server/request.h | 12 +++------ server/trace.c | 13 ++-------- 7 files changed, 31 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc4afb078677095468d4e…

1 0

Alexandre Julliard : winex11: Pass a window handle for keyboard hardware messages too.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 8f88d4fe78827f40728f05be2738b40d784bba65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f88d4fe78827f40728f05be2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 11:50:29 2011 +0100 winex11: Pass a window handle for keyboard hardware messages too. --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/keyboard.c | 24 ++++++++++++------------ dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 8a69ecb..0a3977d 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1568,7 +1568,7 @@ UINT CDECL X11DRV_SendInput( UINT count, LPINPUT inputs, int size ) inputs->u.mi.dwExtraInfo, LLMHF_INJECTED ); break; case INPUT_KEYBOARD: - X11DRV_send_keyboard_input( inputs->u.ki.wVk, inputs->u.ki.wScan, inputs->u.ki.dwFlags, + X11DRV_send_keyboard_input( 0, inputs->u.ki.wVk, inputs->u.ki.wScan, inputs->u.ki.dwFlags, inputs->u.ki.time, inputs->u.ki.dwExtraInfo, LLKHF_INJECTED ); break; case INPUT_HARDWARE: diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 901cd71..d8ab4d2 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1150,7 +1150,7 @@ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e) /*********************************************************************** * X11DRV_send_keyboard_input */ -void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD time, +void X11DRV_send_keyboard_input( HWND hwnd, WORD wVk, WORD wScan, DWORD event_flags, DWORD time, DWORD dwExtraInfo, UINT injected_flags ) { UINT message; @@ -1268,7 +1268,7 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD SERVER_START_REQ( send_hardware_message ) { req->id = (injected_flags & LLKHF_INJECTED) ? 0 : GetCurrentThreadId(); - req->win = 0; + req->win = wine_server_user_handle( hwnd ); req->msg = message; req->wparam = wVk; req->lparam = lParam; @@ -1286,7 +1286,7 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD * Updates internal state for <vkey>, depending on key <state> under X * */ -static inline void KEYBOARD_UpdateOneState ( WORD vkey, WORD scan, int state, DWORD time ) +static inline void KEYBOARD_UpdateOneState ( HWND hwnd, WORD vkey, WORD scan, int state, DWORD time ) { /* Do something if internal table state != X state for keycode */ if (((key_state_table[vkey & 0xff] & 0x80)!=0) != state) @@ -1299,7 +1299,7 @@ static inline void KEYBOARD_UpdateOneState ( WORD vkey, WORD scan, int state, DW vkey, key_state_table[vkey & 0xff]); /* Fake key being pressed inside wine */ - X11DRV_send_keyboard_input( vkey & 0xff, scan & 0xff, flags, time, 0, 0 ); + X11DRV_send_keyboard_input( hwnd, vkey & 0xff, scan & 0xff, flags, time, 0, 0 ); TRACE("State after %#.2x\n", key_state_table[vkey & 0xff]); } @@ -1338,21 +1338,21 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) case VK_RCONTROL: case VK_LSHIFT: case VK_RSHIFT: - KEYBOARD_UpdateOneState( vkey, scan, state, time ); + KEYBOARD_UpdateOneState( hwnd, vkey, scan, state, time ); break; } } } } -static void update_lock_state(BYTE vkey, WORD scan, DWORD time) +static void update_lock_state(HWND hwnd, BYTE vkey, WORD scan, DWORD time) { DWORD flags = vkey == VK_NUMLOCK ? KEYEVENTF_EXTENDEDKEY : 0; if (key_state_table[vkey] & 0x80) flags ^= KEYEVENTF_KEYUP; - X11DRV_send_keyboard_input( vkey, scan, flags, time, 0, 0 ); - X11DRV_send_keyboard_input( vkey, scan, flags ^ KEYEVENTF_KEYUP, time, 0, 0 ); + X11DRV_send_keyboard_input( hwnd, vkey, scan, flags, time, 0, 0 ); + X11DRV_send_keyboard_input( hwnd, vkey, scan, flags ^ KEYEVENTF_KEYUP, time, 0, 0 ); } /*********************************************************************** @@ -1461,7 +1461,7 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) vkey != VK_CAPITAL) { TRACE("Adjusting CapsLock state (%#.2x)\n", key_state_table[VK_CAPITAL]); - update_lock_state(VK_CAPITAL, 0x3A, event_time); + update_lock_state( hwnd, VK_CAPITAL, 0x3A, event_time ); } /* Adjust the NUMLOCK state if it has been changed outside wine */ @@ -1469,7 +1469,7 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) (vkey & 0xff) != VK_NUMLOCK) { TRACE("Adjusting NumLock state (%#.2x)\n", key_state_table[VK_NUMLOCK]); - update_lock_state(VK_NUMLOCK, 0x45, event_time); + update_lock_state( hwnd, VK_NUMLOCK, 0x45, event_time ); } /* Adjust the SCROLLLOCK state if it has been changed outside wine */ @@ -1477,13 +1477,13 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) vkey != VK_SCROLL) { TRACE("Adjusting ScrLock state (%#.2x)\n", key_state_table[VK_SCROLL]); - update_lock_state(VK_SCROLL, 0x46, event_time); + update_lock_state( hwnd, VK_SCROLL, 0x46, event_time ); } bScan = keyc2scan[event->keycode] & 0xFF; TRACE_(key)("bScan = 0x%02x.\n", bScan); - X11DRV_send_keyboard_input( vkey & 0xff, bScan, dwFlags, event_time, 0, 0 ); + X11DRV_send_keyboard_input( hwnd, vkey & 0xff, bScan, dwFlags, event_time, 0, 0 ); } /********************************************************************** diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6166755..0728f87 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -804,7 +804,7 @@ extern void set_window_cursor( struct x11drv_win_data *data, HCURSOR handle ); extern void sync_window_cursor( struct x11drv_win_data *data ); extern BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ); extern void X11DRV_InitKeyboard( Display *display ); -extern void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time, +extern void X11DRV_send_keyboard_input( HWND hwnd, WORD wVk, WORD wScan, DWORD dwFlags, DWORD time, DWORD dwExtraInfo, UINT injected_flags ); extern void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, DWORD data, DWORD time, DWORD extra_info, UINT injected_flags );

1 0

Alexandre Julliard : user32: Retrieve the current cursor position from the server.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 39c4e6d1d9572e2015282578c124615128afa45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39c4e6d1d9572e2015282578c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 28 22:50:21 2011 +0100 user32: Retrieve the current cursor position from the server. --- dlls/user32/input.c | 25 +++++++++++++++++++++++-- dlls/winex11.drv/keyboard.c | 2 -- dlls/winex11.drv/mouse.c | 11 ++++++----- dlls/winex11.drv/x11drv.h | 2 -- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 59cc047..455e55a 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -197,8 +197,29 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy, */ BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) { + BOOL ret; + if (!pt) return FALSE; - return USER_Driver->pGetCursorPos( pt ); + + ret = USER_Driver->pGetCursorPos( pt ); + + SERVER_START_REQ( set_cursor ) + { + if (ret) /* update it */ + { + req->flags = SET_CURSOR_POS; + req->x = pt->x; + req->y = pt->y; + } + if ((ret = !wine_server_call( req ))) + { + pt->x = reply->new_x; + pt->y = reply->new_y; + } + } + SERVER_END_REQ; + return ret; + } @@ -245,7 +266,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) } } SERVER_END_REQ; - if (ret) ret = USER_Driver->pSetCursorPos( x, y ); + if (ret) USER_Driver->pSetCursorPos( x, y ); return ret; } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index d99378a..901cd71 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1272,8 +1272,6 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD req->msg = message; req->wparam = wVk; req->lparam = lParam; - req->x = cursor_pos.x; - req->y = cursor_pos.y; req->time = time; req->info = dwExtraInfo; wine_server_call( req ); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index a675bf7..2950246 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -92,7 +92,7 @@ static const UINT button_up_flags[NB_BUTTONS] = MOUSEEVENTF_XUP }; -POINT cursor_pos; +static POINT cursor_pos; static HWND cursor_window; static DWORD last_time_modified; static RECT cursor_clip; /* Cursor clipping rect */ @@ -1042,6 +1042,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) Window root, child; int rootX, rootY, winX, winY; unsigned int xstate; + BOOL ret = FALSE; wine_tsx11_lock(); if ((GetTickCount() - last_time_modified > 100) && @@ -1051,12 +1052,12 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) winX += virtual_screen_rect.left; winY += virtual_screen_rect.top; TRACE("pointer at (%d,%d)\n", winX, winY ); - cursor_pos.x = winX; - cursor_pos.y = winY; + pos->x = winX; + pos->y = winY; + ret = TRUE; } - *pos = cursor_pos; wine_tsx11_unlock(); - return TRUE; + return ret; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8a75f37..6166755 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -609,8 +609,6 @@ extern int alloc_system_colors; extern int xrender_error_base; extern HMODULE x11drv_module; -extern POINT cursor_pos; - /* atoms */ enum x11drv_atoms

1 0

Alexandre Julliard : user32: Retrieve the key state for GetAsyncKeyState from the server.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: a7da164949ecade05842f89e9255c94ba8b3572a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7da164949ecade05842f89e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 28 21:55:01 2011 +0100 user32: Retrieve the key state for GetAsyncKeyState from the server. --- dlls/user32/driver.c | 2 +- dlls/user32/input.c | 25 +++++++++++++++++++++---- dlls/winex11.drv/keyboard.c | 11 ++--------- dlls/winex11.drv/mouse.c | 26 -------------------------- dlls/winex11.drv/x11drv.h | 1 - 5 files changed, 24 insertions(+), 41 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 5d49882..09dec4f 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -168,7 +168,7 @@ static void CDECL nulldrv_Beep(void) static SHORT CDECL nulldrv_GetAsyncKeyState( INT key ) { - return 0; + return -1; } static INT CDECL nulldrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index f19b7e4..59cc047 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -300,11 +300,28 @@ HWND WINAPI GetCapture(void) * bit set to 1 if currently pressed, low-order bit set to 1 if key has * been pressed. */ -SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState(INT nKey) +SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { - if (nKey < 0 || nKey > 256) - return 0; - return USER_Driver->pGetAsyncKeyState( nKey ); + SHORT ret; + + if (key < 0 || key >= 256) return 0; + + if ((ret = USER_Driver->pGetAsyncKeyState( key )) == -1) + { + ret = 0; + SERVER_START_REQ( get_key_state ) + { + req->tid = 0; + req->key = key; + if (!wine_server_call( req )) + { + if (reply->state & 0x40) ret |= 0x0001; + if (reply->state & 0x80) ret |= 0x8000; + } + } + SERVER_END_REQ; + } + return ret; } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 313ff3a..d99378a 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -65,7 +65,7 @@ WINE_DECLARE_DEBUG_CHANNEL(key); 0x40 -> key got pressed since last time 0x01 -> key is toggled */ -BYTE key_state_table[256]; +static BYTE key_state_table[256]; static BYTE TrackSysKey = 0; /* determine whether ALT key up will cause a WM_SYSKEYUP or a WM_KEYUP message */ @@ -1968,16 +1968,9 @@ static BOOL match_x11_keyboard_layout(HKL hkl) */ SHORT CDECL X11DRV_GetAsyncKeyState(INT key) { - SHORT retval; - /* Photoshop livelocks unless mouse events are included here */ X11DRV_MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_KEY | QS_MOUSE, 0 ); - - retval = ((key_state_table[key] & 0x40) ? 0x0001 : 0) | - ((key_state_table[key] & 0x80) ? 0x8000 : 0); - key_state_table[key] &= ~0x40; - TRACE_(key)("(%X) -> %x\n", key, retval); - return retval; + return -1; } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e4a6ab5..a675bf7 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -398,58 +398,32 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, } } if (flags & MOUSEEVENTF_LEFTDOWN) - { - key_state_table[VK_LBUTTON] |= 0xc0; queue_raw_mouse_message( GetSystemMetrics(SM_SWAPBUTTON) ? WM_RBUTTONDOWN : WM_LBUTTONDOWN, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_LEFTUP) - { - key_state_table[VK_LBUTTON] &= ~0x80; queue_raw_mouse_message( GetSystemMetrics(SM_SWAPBUTTON) ? WM_RBUTTONUP : WM_LBUTTONUP, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_RIGHTDOWN) - { - key_state_table[VK_RBUTTON] |= 0xc0; queue_raw_mouse_message( GetSystemMetrics(SM_SWAPBUTTON) ? WM_LBUTTONDOWN : WM_RBUTTONDOWN, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_RIGHTUP) - { - key_state_table[VK_RBUTTON] &= ~0x80; queue_raw_mouse_message( GetSystemMetrics(SM_SWAPBUTTON) ? WM_LBUTTONUP : WM_RBUTTONUP, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_MIDDLEDOWN) - { - key_state_table[VK_MBUTTON] |= 0xc0; queue_raw_mouse_message( WM_MBUTTONDOWN, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_MIDDLEUP) - { - key_state_table[VK_MBUTTON] &= ~0x80; queue_raw_mouse_message( WM_MBUTTONUP, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_WHEEL) - { queue_raw_mouse_message( WM_MOUSEWHEEL, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_XDOWN) - { - key_state_table[VK_XBUTTON1 + data - 1] |= 0xc0; queue_raw_mouse_message( WM_XBUTTONDOWN, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_XUP) - { - key_state_table[VK_XBUTTON1 + data - 1] &= ~0x80; queue_raw_mouse_message( WM_XBUTTONUP, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } } #ifdef SONAME_LIBXCURSOR diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3865078..8a75f37 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -609,7 +609,6 @@ extern int alloc_system_colors; extern int xrender_error_base; extern HMODULE x11drv_module; -extern BYTE key_state_table[256]; extern POINT cursor_pos; /* atoms */

1 0

Alexandre Julliard : server: Maintain the "set since last time" bit for the global keystate.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 22468ec65c494c609e219329ad8283a3d31d2aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22468ec65c494c609e219329a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 28 21:43:44 2011 +0100 server: Maintain the "set since last time" bit for the global keystate. --- server/queue.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/server/queue.c b/server/queue.c index 690687e..3526790 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1106,13 +1106,14 @@ static void set_input_key_state( unsigned char *keystate, unsigned char key, int if (down) { if (!(keystate[key] & 0x80)) keystate[key] ^= 0x01; - keystate[key] |= 0x80; + keystate[key] |= down; } else keystate[key] &= ~0x80; } /* update the input key state for a keyboard message */ -static void update_input_key_state( unsigned char *keystate, const struct message *msg ) +static void update_input_key_state( struct desktop *desktop, unsigned char *keystate, + const struct message *msg ) { unsigned char key; int down = 0; @@ -1120,25 +1121,25 @@ static void update_input_key_state( unsigned char *keystate, const struct messag switch (msg->msg) { case WM_LBUTTONDOWN: - down = 1; + down = (keystate == desktop->keystate) ? 0xc0 : 0x80; /* fall through */ case WM_LBUTTONUP: set_input_key_state( keystate, VK_LBUTTON, down ); break; case WM_MBUTTONDOWN: - down = 1; + down = (keystate == desktop->keystate) ? 0xc0 : 0x80; /* fall through */ case WM_MBUTTONUP: set_input_key_state( keystate, VK_MBUTTON, down ); break; case WM_RBUTTONDOWN: - down = 1; + down = (keystate == desktop->keystate) ? 0xc0 : 0x80; /* fall through */ case WM_RBUTTONUP: set_input_key_state( keystate, VK_RBUTTON, down ); break; case WM_XBUTTONDOWN: - down = 1; + down = (keystate == desktop->keystate) ? 0xc0 : 0x80; /* fall through */ case WM_XBUTTONUP: if (msg->wparam == XBUTTON1) set_input_key_state( keystate, VK_XBUTTON1, down ); @@ -1146,7 +1147,7 @@ static void update_input_key_state( unsigned char *keystate, const struct messag break; case WM_KEYDOWN: case WM_SYSKEYDOWN: - down = 1; + down = (keystate == desktop->keystate) ? 0xc0 : 0x80; /* fall through */ case WM_KEYUP: case WM_SYSKEYUP: @@ -1229,7 +1230,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i } if (remove) { - update_input_key_state( input->keystate, msg ); + update_input_key_state( input->desktop, input->keystate, msg ); list_remove( &msg->entry ); free_message( msg ); } @@ -1280,7 +1281,7 @@ static void queue_hardware_message( struct desktop *desktop, struct thread_input unsigned int msg_code; struct hardware_msg_data *data = msg->data; - update_input_key_state( desktop->keystate, msg ); + update_input_key_state( desktop, desktop->keystate, msg ); last_input_time = get_tick_count(); if (!is_keyboard_msg( msg )) @@ -1300,7 +1301,7 @@ static void queue_hardware_message( struct desktop *desktop, struct thread_input win = find_hardware_message_window( input, msg, &msg_code ); if (!win || !(thread = get_window_thread(win))) { - if (input) update_input_key_state( input->keystate, msg ); + if (input) update_input_key_state( input->desktop, input->keystate, msg ); free( msg ); return; } @@ -1390,7 +1391,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user if (!win || !(win_thread = get_window_thread( win ))) { /* no window at all, remove it */ - update_input_key_state( input->keystate, msg ); + update_input_key_state( input->desktop, input->keystate, msg ); list_remove( &msg->entry ); free_message( msg ); continue; @@ -1406,7 +1407,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user else { /* for another thread input, drop it */ - update_input_key_state( input->keystate, msg ); + update_input_key_state( input->desktop, input->keystate, msg ); list_remove( &msg->entry ); free_message( msg ); } @@ -2117,7 +2118,11 @@ DECL_HANDLER(get_key_state) if (!req->tid) /* get global async key state */ { if (!(desktop = get_thread_desktop( current, 0 ))) return; - if (req->key >= 0) reply->state = desktop->keystate[req->key & 0xff]; + if (req->key >= 0) + { + reply->state = desktop->keystate[req->key & 0xff]; + desktop->keystate[req->key & 0xff] &= ~0x40; + } set_reply_data( desktop->keystate, size ); release_object( desktop ); }

1 0

Alexandre Julliard : server: Fill the key state in mouse events from the server-side state.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: b9e4b5a28ca6178d5988dc63e098c523015b5bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e4b5a28ca6178d5988dc63e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 28 21:37:09 2011 +0100 server: Fill the key state in mouse events from the server-side state. --- dlls/winex11.drv/mouse.c | 42 +----------------------------------------- server/queue.c | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 44 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 4060018..e4a6ab5 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -145,19 +145,6 @@ static inline void clip_point_to_rect( LPCRECT rect, LPPOINT pt ) } /*********************************************************************** - * update_button_state - * - * Update the button state with what X provides us - */ -static inline void update_button_state( unsigned int state ) -{ - key_state_table[VK_LBUTTON] = (state & Button1Mask ? 0x80 : 0); - key_state_table[VK_MBUTTON] = (state & Button2Mask ? 0x80 : 0); - key_state_table[VK_RBUTTON] = (state & Button3Mask ? 0x80 : 0); - /* X-buttons are not reported from XQueryPointer */ -} - -/*********************************************************************** * get_empty_cursor */ static Cursor get_empty_cursor(void) @@ -299,32 +286,6 @@ static HWND update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned /*********************************************************************** - * get_key_state - */ -static WORD get_key_state(void) -{ - WORD ret = 0; - - if (GetSystemMetrics( SM_SWAPBUTTON )) - { - if (key_state_table[VK_RBUTTON] & 0x80) ret |= MK_LBUTTON; - if (key_state_table[VK_LBUTTON] & 0x80) ret |= MK_RBUTTON; - } - else - { - if (key_state_table[VK_LBUTTON] & 0x80) ret |= MK_LBUTTON; - if (key_state_table[VK_RBUTTON] & 0x80) ret |= MK_RBUTTON; - } - if (key_state_table[VK_MBUTTON] & 0x80) ret |= MK_MBUTTON; - if (key_state_table[VK_SHIFT] & 0x80) ret |= MK_SHIFT; - if (key_state_table[VK_CONTROL] & 0x80) ret |= MK_CONTROL; - if (key_state_table[VK_XBUTTON1] & 0x80) ret |= MK_XBUTTON1; - if (key_state_table[VK_XBUTTON2] & 0x80) ret |= MK_XBUTTON2; - return ret; -} - - -/*********************************************************************** * queue_raw_mouse_message */ static void queue_raw_mouse_message( UINT message, HWND hwnd, DWORD x, DWORD y, @@ -348,7 +309,7 @@ static void queue_raw_mouse_message( UINT message, HWND hwnd, DWORD x, DWORD y, req->id = (injected_flags & LLMHF_INJECTED) ? 0 : GetCurrentThreadId(); req->win = wine_server_user_handle( hwnd ); req->msg = message; - req->wparam = MAKEWPARAM( get_key_state(), data ); + req->wparam = MAKEWPARAM( 0, data ); req->lparam = 0; req->x = x; req->y = y; @@ -1113,7 +1074,6 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) XQueryPointer( display, root_window, &root, &child, &rootX, &rootY, &winX, &winY, &xstate )) { - update_button_state( xstate ); winX += virtual_screen_rect.left; winY += virtual_screen_rect.top; TRACE("pointer at (%d,%d)\n", winX, winY ); diff --git a/server/queue.c b/server/queue.c index 281c8bc..690687e 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1280,11 +1280,23 @@ static void queue_hardware_message( struct desktop *desktop, struct thread_input unsigned int msg_code; struct hardware_msg_data *data = msg->data; - if (msg->msg == WM_MOUSEMOVE) set_cursor_pos( desktop, data->x, data->y ); - data->x = desktop->cursor_x; - data->y = desktop->cursor_y; update_input_key_state( desktop->keystate, msg ); last_input_time = get_tick_count(); + + if (!is_keyboard_msg( msg )) + { + if (msg->msg == WM_MOUSEMOVE) set_cursor_pos( desktop, data->x, data->y ); + if (desktop->keystate[VK_LBUTTON] & 0x80) msg->wparam |= MK_LBUTTON; + if (desktop->keystate[VK_MBUTTON] & 0x80) msg->wparam |= MK_MBUTTON; + if (desktop->keystate[VK_RBUTTON] & 0x80) msg->wparam |= MK_RBUTTON; + if (desktop->keystate[VK_SHIFT] & 0x80) msg->wparam |= MK_SHIFT; + if (desktop->keystate[VK_CONTROL] & 0x80) msg->wparam |= MK_CONTROL; + if (desktop->keystate[VK_XBUTTON1] & 0x80) msg->wparam |= MK_XBUTTON1; + if (desktop->keystate[VK_XBUTTON2] & 0x80) msg->wparam |= MK_XBUTTON2; + } + data->x = desktop->cursor_x; + data->y = desktop->cursor_y; + win = find_hardware_message_window( input, msg, &msg_code ); if (!win || !(thread = get_window_thread(win))) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011