March 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : user32: Export a Wine-specific function to send hardware input from the graphics driver .
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: ae895a1f100682fdee679bad1b5cadda8e00ddef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae895a1f100682fdee679bad1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 19:43:53 2011 +0100 user32: Export a Wine-specific function to send hardware input from the graphics driver. --- dlls/user32/input.c | 13 +++++++++++++ dlls/user32/message.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 8 ++++++++ dlls/user32/user_private.h | 1 + dlls/winex11.drv/keyboard.c | 23 +++++++++-------------- dlls/winex11.drv/mouse.c | 24 ++++++++++-------------- include/winuser.h | 4 ++++ 7 files changed, 88 insertions(+), 28 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 455e55a..c30a195 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -115,6 +115,19 @@ BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) /*********************************************************************** + * __wine_send_input (USER32.@) + * + * Internal SendInput function to allow the graphics driver to inject real events. + */ +BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, BOOL injected ) +{ + NTSTATUS status = send_hardware_message( hwnd, input, injected ? SEND_HWMSG_INJECTED : 0 ); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; +} + + +/*********************************************************************** * SendInput (USER32.@) */ UINT WINAPI SendInput( UINT count, LPINPUT inputs, int size ) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 93a90ea..0095af3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -25,6 +25,8 @@ #include <assert.h> #include <stdarg.h> +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -3066,6 +3068,47 @@ static BOOL send_message( struct send_message_info *info, DWORD_PTR *res_ptr, BO /*********************************************************************** + * send_hardware_message + */ +NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) +{ + NTSTATUS ret; + + SERVER_START_REQ( send_hardware_message ) + { + req->win = wine_server_user_handle( hwnd ); + req->flags = flags; + req->input.type = input->type; + switch (input->type) + { + case INPUT_MOUSE: + req->input.mouse.x = input->u.mi.dx; + req->input.mouse.y = input->u.mi.dy; + req->input.mouse.data = input->u.mi.mouseData; + req->input.mouse.flags = input->u.mi.dwFlags; + req->input.mouse.time = input->u.mi.time; + req->input.mouse.info = input->u.mi.dwExtraInfo; + break; + case INPUT_KEYBOARD: + req->input.kbd.vkey = input->u.ki.wVk; + req->input.kbd.scan = input->u.ki.wScan; + req->input.kbd.flags = input->u.ki.dwFlags; + req->input.kbd.time = input->u.ki.time; + req->input.kbd.info = input->u.ki.dwExtraInfo; + break; + case INPUT_HARDWARE: + req->input.hw.msg = input->u.hi.uMsg; + req->input.hw.lparam = MAKELONG( input->u.hi.wParamL, input->u.hi.wParamH ); + break; + } + ret = wine_server_call( req ); + } + SERVER_END_REQ; + return ret; +} + + +/*********************************************************************** * MSG_SendInternalMessageTimeout * * Same as SendMessageTimeoutW but sends the message to a specific thread diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 5eb7154..63aff08 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -774,6 +774,14 @@ @ stdcall wvsprintfW(ptr wstr ptr) ################################################################ +# Wine internal extensions +# +# All functions must be prefixed with '__wine_' (for internal functions) +# or 'wine_' (for user-visible functions) to avoid namespace conflicts. +# +@ cdecl __wine_send_input(long ptr long) + +################################################################ # Wine dll separation hacks, these will go away, don't use them # @ cdecl HOOK_CallHooks(long long long long long) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 23b4269..afd948b 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -213,6 +213,7 @@ extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module ); extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; +extern NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) DECLSPEC_HIDDEN; extern LRESULT MSG_SendInternalMessageTimeout( DWORD dest_pid, DWORD dest_tid, UINT msg, WPARAM wparam, LPARAM lparam, UINT flags, UINT timeout, PDWORD_PTR res_ptr ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 04d7371..6fc7bb0 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1154,6 +1154,7 @@ void X11DRV_send_keyboard_input( HWND hwnd, WORD wVk, WORD wScan, DWORD event_fl DWORD dwExtraInfo, UINT injected_flags ) { UINT message; + INPUT input; KBDLLHOOKSTRUCT hook; WORD flags, wVkStripped, wVkL, wVkR, vk_hook = wVk; @@ -1234,6 +1235,13 @@ void X11DRV_send_keyboard_input( HWND hwnd, WORD wVk, WORD wScan, DWORD event_fl hook.dwExtraInfo = dwExtraInfo; if (HOOK_CallHooks( WH_KEYBOARD_LL, HC_ACTION, message, (LPARAM)&hook, TRUE )) return; + input.type = INPUT_KEYBOARD; + input.u.ki.wVk = vk_hook; + input.u.ki.wScan = wScan; + input.u.ki.dwFlags = event_flags; + input.u.ki.time = time; + input.u.ki.dwExtraInfo = dwExtraInfo; + if (!(event_flags & KEYEVENTF_UNICODE)) { if (event_flags & KEYEVENTF_KEYUP) @@ -1252,20 +1260,7 @@ void X11DRV_send_keyboard_input( HWND hwnd, WORD wVk, WORD wScan, DWORD event_fl TRACE_(key)("message=0x%04x wParam=0x%04x InputKeyState=0x%x\n", message, wVk, key_state_table[wVk]); - SERVER_START_REQ( send_hardware_message ) - { - req->win = wine_server_user_handle( hwnd ); - req->msg = message; - req->input.type = INPUT_KEYBOARD; - req->input.kbd.vkey = vk_hook; - req->input.kbd.scan = wScan; - req->input.kbd.flags = event_flags; - req->input.kbd.time = time; - req->input.kbd.info = dwExtraInfo; - if (injected_flags & LLKHF_INJECTED) req->flags = SEND_HWMSG_INJECTED; - wine_server_call( req ); - } - SERVER_END_REQ; + __wine_send_input( hwnd, &input, (injected_flags & LLKHF_INJECTED) != 0 ); } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 236ba75..2d71be5 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -292,6 +292,7 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, DWORD data, DWORD time, DWORD extra_info, UINT injected_flags ) { POINT pt; + INPUT input; MSLLHOOKSTRUCT hook; if (!time) time = GetTickCount(); @@ -414,20 +415,15 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, if (HOOK_CallHooks( WH_MOUSE_LL, HC_ACTION, WM_XBUTTONUP, (LPARAM)&hook, TRUE )) return; } - SERVER_START_REQ( send_hardware_message ) - { - req->win = wine_server_user_handle( hwnd ); - req->input.type = INPUT_MOUSE; - req->input.mouse.x = pt.x; - req->input.mouse.y = pt.y; - req->input.mouse.data = data; - req->input.mouse.flags = flags | MOUSEEVENTF_ABSOLUTE; - req->input.mouse.time = time; - req->input.mouse.info = extra_info; - if (injected_flags & LLMHF_INJECTED) req->flags = SEND_HWMSG_INJECTED; - wine_server_call( req ); - } - SERVER_END_REQ; + input.type = INPUT_MOUSE; + input.u.mi.dx = pt.x; + input.u.mi.dy = pt.y; + input.u.mi.mouseData = data; + input.u.mi.dwFlags = flags | MOUSEEVENTF_ABSOLUTE; + input.u.mi.time = time; + input.u.mi.dwExtraInfo = extra_info; + + __wine_send_input( hwnd, &input, (injected_flags & LLMHF_INJECTED) != 0 ); } #ifdef SONAME_LIBXCURSOR diff --git a/include/winuser.h b/include/winuser.h index d95bfea..bd35803 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -5136,6 +5136,10 @@ WINUSERAPI INT WINAPI wvsprintfW(LPWSTR,LPCWSTR,__ms_va_list); /* NOTE: This is SYSTEM.3, not USER.182, which is also named KillSystemTimer */ WORD WINAPI SYSTEM_KillSystemTimer( WORD ); +#ifdef __WINESRC__ +WINUSERAPI BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, BOOL injected ); +#endif + #ifdef __cplusplus } #endif

1 0

Alexandre Julliard : server: Invoke low-level hardware hooks directly from the server side.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: c7efa293f0b35bdb86f2b472f5b7cef2a6ebcea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7efa293f0b35bdb86f2b472f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 19:53:03 2011 +0100 server: Invoke low-level hardware hooks directly from the server side. --- dlls/user32/message.c | 48 +++++++++++++ dlls/winex11.drv/keyboard.c | 9 --- dlls/winex11.drv/mouse.c | 105 ++++++---------------------- include/wine/server_protocol.h | 11 ++- server/hook.c | 11 +++ server/protocol.def | 8 ++- server/queue.c | 150 +++++++++++++++++++++++++++++----------- server/request.h | 3 +- server/trace.c | 8 ++- server/user.h | 1 + 10 files changed, 211 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7efa293f0b35bdb86f2b…

1 0

Alexandre Julliard : user32: Handle input injected through SendInput entirely in user32.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: f1a348006872825b1fe4bb583f9019f2c0880672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1a348006872825b1fe4bb583… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 21:29:17 2011 +0100 user32: Handle input injected through SendInput entirely in user32. --- dlls/user32/driver.c | 13 ----- dlls/user32/input.c | 105 ++++++++++++++++++++++++++++++------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 1 - dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/mouse.c | 2 +- include/winuser.h | 2 +- 7 files changed, 78 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1a348006872825b1fe4b…

1 0

Alexandre Julliard : winex11: Get rid of the ClipCursor and SendInput entry points.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: f46bd50a806e3d3707bab3ed3649e107adca3630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46bd50a806e3d3707bab3ed3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 16:28:23 2011 +0100 winex11: Get rid of the ClipCursor and SendInput entry points. --- dlls/winex11.drv/event.c | 29 --------- dlls/winex11.drv/keyboard.c | 126 ++++-------------------------------- dlls/winex11.drv/mouse.c | 116 ++++------------------------------ dlls/winex11.drv/winex11.drv.spec | 2 - dlls/winex11.drv/x11drv.h | 4 - 5 files changed, 26 insertions(+), 251 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f46bd50a806e3d3707bab…

1 0

Alexandre Julliard : winex11: Merge updating the mouse state and sending the input into a single helper function .
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: e047a20627ebbb70fb97c31b2969c9556c0234a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e047a20627ebbb70fb97c31b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 3 17:47:08 2011 +0100 winex11: Merge updating the mouse state and sending the input into a single helper function. --- dlls/winex11.drv/mouse.c | 73 ++++++++++++++++------------------------------ 1 files changed, 25 insertions(+), 48 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d7fa124..7778203 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -211,15 +211,18 @@ void sync_window_cursor( struct x11drv_win_data *data ) } /*********************************************************************** - * update_mouse_state + * send_mouse_input * * Update the various window states on a mouse event. */ -static HWND update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned int state, POINT *pt ) +static void send_mouse_input( HWND hwnd, UINT flags, Window window, int x, int y, + unsigned int state, DWORD mouse_data, Time time ) { struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + POINT pt; + INPUT input; - if (!data) return 0; + if (!data) return; if (window == data->whole_window) { @@ -231,11 +234,11 @@ static HWND update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned x += virtual_screen_rect.left; y += virtual_screen_rect.top; } - pt->x = x; - pt->y = y; + pt.x = x; + pt.y = y; if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) - pt->x = data->client_rect.right - data->client_rect.left - 1 - pt->x; - MapWindowPoints( hwnd, 0, pt, 1 ); + pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; + MapWindowPoints( hwnd, 0, &pt, 1 ); if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || GetTickCount() - last_time_modified > 100) @@ -243,6 +246,8 @@ static HWND update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned cursor_window = hwnd; sync_window_cursor( data ); } + last_time_modified = GetTickCount(); + if (hwnd != GetDesktopWindow()) hwnd = GetAncestor( hwnd, GA_ROOT ); /* update the wine server Z-order */ @@ -252,7 +257,7 @@ static HWND update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned !(state & (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask|Button6Mask|Button7Mask))) { RECT rect; - SetRect( &rect, pt->x, pt->y, pt->x + 1, pt->y + 1 ); + SetRect( &rect, pt.x, pt.y, pt.x + 1, pt.y + 1 ); MapWindowPoints( 0, hwnd, (POINT *)&rect, 2 ); SERVER_START_REQ( update_window_zorder ) @@ -266,25 +271,13 @@ static HWND update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned } SERVER_END_REQ; } - return hwnd; -} - - -/*********************************************************************** - * X11DRV_send_mouse_input - */ -static void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, int x, int y, DWORD data, DWORD time ) -{ - INPUT input; - - last_time_modified = GetTickCount(); input.type = INPUT_MOUSE; - input.u.mi.dx = x; - input.u.mi.dy = y; - input.u.mi.mouseData = data; + input.u.mi.dx = pt.x; + input.u.mi.dy = pt.y; + input.u.mi.mouseData = mouse_data; input.u.mi.dwFlags = flags; - input.u.mi.time = time; + input.u.mi.time = EVENT_x11_time_to_win32_time( time ); input.u.mi.dwExtraInfo = 0; __wine_send_input( hwnd, &input ); @@ -927,7 +920,6 @@ void X11DRV_ButtonPress( HWND hwnd, XEvent *xev ) XButtonEvent *event = &xev->xbutton; int buttonNum = event->button - 1; WORD wData = 0; - POINT pt; if (buttonNum >= NB_BUTTONS) return; @@ -954,11 +946,8 @@ void X11DRV_ButtonPress( HWND hwnd, XEvent *xev ) } update_user_time( event->time ); - hwnd = update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt ); - if (!hwnd) return; - - X11DRV_send_mouse_input( hwnd, button_down_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, - pt.x, pt.y, wData, EVENT_x11_time_to_win32_time(event->time) ); + send_mouse_input( hwnd, button_down_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, + event->window, event->x, event->y, event->state, wData, event->time ); } @@ -970,7 +959,6 @@ void X11DRV_ButtonRelease( HWND hwnd, XEvent *xev ) XButtonEvent *event = &xev->xbutton; int buttonNum = event->button - 1; WORD wData = 0; - POINT pt; if (buttonNum >= NB_BUTTONS || !button_up_flags[buttonNum]) return; @@ -990,11 +978,8 @@ void X11DRV_ButtonRelease( HWND hwnd, XEvent *xev ) break; } - hwnd = update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt ); - if (!hwnd) return; - - X11DRV_send_mouse_input( hwnd, button_up_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, - pt.x, pt.y, wData, EVENT_x11_time_to_win32_time(event->time) ); + send_mouse_input( hwnd, button_up_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, + event->window, event->x, event->y, event->state, wData, event->time ); } @@ -1004,15 +989,11 @@ void X11DRV_ButtonRelease( HWND hwnd, XEvent *xev ) void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) { XMotionEvent *event = &xev->xmotion; - POINT pt; TRACE("hwnd %p, event->is_hint %d\n", hwnd, event->is_hint); - hwnd = update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt ); - if (!hwnd) return; - - X11DRV_send_mouse_input( hwnd, MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE, - pt.x, pt.y, 0, EVENT_x11_time_to_win32_time(event->time) ); + send_mouse_input( hwnd, MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE, + event->window, event->x, event->y, event->state, 0, event->time ); } @@ -1022,7 +1003,6 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) { XCrossingEvent *event = &xev->xcrossing; - POINT pt; TRACE("hwnd %p, event->detail %d\n", hwnd, event->detail); @@ -1030,9 +1010,6 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) if (event->window == x11drv_thread_data()->grab_window) return; /* simulate a mouse motion event */ - hwnd = update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt ); - if (!hwnd) return; - - X11DRV_send_mouse_input( hwnd, MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE, - pt.x, pt.y, 0, EVENT_x11_time_to_win32_time(event->time) ); + send_mouse_input( hwnd, MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE, + event->window, event->x, event->y, event->state, 0, event->time ); }

1 0

Jacek Caban : mshtml: Added more attribute object tests.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: eaa6a9fdcf54b0d2c3e75f86cbc7b9c0c2b3aef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa6a9fdcf54b0d2c3e75f86c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 23:10:11 2011 +0100 mshtml: Added more attribute object tests. --- dlls/mshtml/tests/dom.c | 82 +++++++++++++++++++++++++++++++--------------- 1 files changed, 55 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 88d8790..ec6c7e8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -56,7 +56,7 @@ static const char elem_test_str[] = "</body></html>"; static const char elem_test2_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" - "<body><div id=\"divid\" emptyattr=""></div></body>" + "<body><div id=\"divid\" emptyattr=\"\" onclick=\"parseInt();\"></div></body>" "</html>"; static const char indent_test_str[] = @@ -462,6 +462,17 @@ static IHTMLDocument2 *create_document(void) return doc; } +#define get_dispex_iface(u) _get_dispex_iface(__LINE__,u) +static IDispatchEx *_get_dispex_iface(unsigned line, IUnknown *unk) +{ + IDispatchEx *dispex; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex); + ok_(__FILE__,line) (hres == S_OK, "Could not get IDispatchEx: %08x\n", hres); + return dispex; +} + #define test_ifaces(i,ids) _test_ifaces(__LINE__,i,ids) static void _test_ifaces(unsigned line, IUnknown *iface, REFIID *iids) { @@ -492,17 +503,12 @@ static void _test_no_iface(unsigned line, IUnknown *iface, REFIID iid) #define test_get_dispid(u,id) _test_get_dispid(__LINE__,u,id) static BOOL _test_get_dispid(unsigned line, IUnknown *unk, IID *iid) { - IDispatchEx *dispex; + IDispatchEx *dispex = _get_dispex_iface(line, unk); ITypeInfo *typeinfo; BOOL ret = FALSE; UINT ticnt; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex); - ok_(__FILE__,line) (hres == S_OK, "Could not get IDispatchEx: %08x\n", hres); - if(FAILED(hres)) - return FALSE; - ticnt = 0xdeadbeef; hres = IDispatchEx_GetTypeInfoCount(dispex, &ticnt); ok_(__FILE__,line) (hres == S_OK, "GetTypeInfoCount failed: %08x\n", hres); @@ -532,17 +538,12 @@ static BOOL _test_get_dispid(unsigned line, IUnknown *unk, IID *iid) #define test_disp_value(u) _test_disp_value(__LINE__,u,v) static void _test_disp_value(unsigned line, IUnknown *unk, const char *val) { + IDispatchEx *dispex = _get_dispex_iface(line, unk); DISPPARAMS dp = {NULL,NULL,0,0}; - IDispatchEx *dispex; EXCEPINFO ei; VARIANT var; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex); - ok_(__FILE__,line)(hres == S_OK, "Could not get IDispatchEx interface: %08x\n", hres); - if(FAILED(hres)) - return; - hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, 0, DISPATCH_PROPERTYGET, &dp, &var, &ei, NULL); IDispatchEx_Release(dispex); ok_(__FILE__,line)(hres == S_OK, "InvokeEx(DISPID_VALUE) returned: %08x\n", hres); @@ -577,6 +578,27 @@ static void _test_disp2(unsigned line, IUnknown *unk, const IID *diid, const IID _test_disp_value(line, unk, val); } +#define set_dispex_value(a,b,c) _set_dispex_value(__LINE__,a,b,c) +static void _set_dispex_value(unsigned line, IUnknown *unk, const char *name, VARIANT *val) +{ + IDispatchEx *dispex = _get_dispex_iface(line, unk); + DISPPARAMS dp = {val, NULL, 1, 0}; + EXCEPINFO ei; + DISPID id; + BSTR str; + HRESULT hres; + + str = a2bstr(name); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameEnsure|fdexNameCaseInsensitive, &id); + SysFreeString(str); + ok_(__FILE__,line)(hres == S_OK, "GetDispID failed: %08x\n", hres); + + memset(&ei, 0, sizeof(ei)); + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, INVOKE_PROPERTYPUT, &dp, NULL, &ei, NULL); + ok_(__FILE__,line)(hres == S_OK, "InvokeEx failed: %08x\n", hres); + +} + #define get_elem_iface(u) _get_elem_iface(__LINE__,u) static IHTMLElement *_get_elem_iface(unsigned line, IUnknown *unk) { @@ -2897,21 +2919,14 @@ static IHTMLDOMAttribute *_get_elem_attr_node(unsigned line, IUnknown *unk, cons return attr; } -#define test_attr_node_value(a,b) _test_attr_node_value(__LINE__,a,b) -static void _test_attr_node_value(unsigned line, IHTMLDOMAttribute *attr, const char *exval) +#define get_attr_node_value(a,b,c) _get_attr_node_value(__LINE__,a,b,c) +static void _get_attr_node_value(unsigned line, IHTMLDOMAttribute *attr, VARIANT *v, VARTYPE vt) { - VARIANT var; HRESULT hres; - hres = IHTMLDOMAttribute_get_nodeValue(attr, &var); + hres = IHTMLDOMAttribute_get_nodeValue(attr, v); ok_(__FILE__,line) (hres == S_OK, "get_nodeValue failed: %08x, expected VT_BSTR\n", hres); - ok_(__FILE__,line) (V_VT(&var) == VT_BSTR, "vt=%d\n", V_VT(&var)); - if(exval) - ok_(__FILE__,line) (!strcmp_wa(V_BSTR(&var), exval), "unexpected value %s\n", wine_dbgstr_w(V_BSTR(&var))); - else - ok_(__FILE__,line) (!V_BSTR(&var), "nodeValue = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(&var))); - - VariantClear(&var); + ok_(__FILE__,line) (V_VT(v) == vt, "vt=%d, expected %d\n", V_VT(v), vt); } #define get_window_doc(e) _get_window_doc(__LINE__,e) @@ -6802,6 +6817,7 @@ static void test_elems(IHTMLDocument2 *doc) static void test_attr(IHTMLElement *elem) { IHTMLDOMAttribute *attr, *attr2; + VARIANT v; get_elem_attr_node((IUnknown*)elem, "noattr", FALSE); @@ -6815,12 +6831,24 @@ static void test_attr(IHTMLElement *elem) ok(iface_cmp((IUnknown*)attr, (IUnknown*)attr2), "attr != attr2\n"); IHTMLDOMAttribute_Release(attr2); - test_attr_node_value(attr, "divid"); + get_attr_node_value(attr, &v, VT_BSTR); + ok(!strcmp_wa(V_BSTR(&v), "divid"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); IHTMLDOMAttribute_Release(attr); attr = get_elem_attr_node((IUnknown*)elem, "emptyattr", TRUE); - test_attr_node_value(attr, NULL); + get_attr_node_value(attr, &v, VT_BSTR); + ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IHTMLDOMAttribute_Release(attr); + + V_VT(&v) = VT_I4; + V_I4(&v) = 100; + set_dispex_value((IUnknown*)elem, "dispprop", &v); + attr = get_elem_attr_node((IUnknown*)elem, "dispprop", TRUE); + get_attr_node_value(attr, &v, VT_I4); + ok(V_I4(&v) == 100, "V_I4(v) = %d\n", V_I4(&v)); IHTMLDOMAttribute_Release(attr); } @@ -7529,10 +7557,10 @@ START_TEST(dom) run_domtest(range_test2_str, test_txtrange2); if (winetest_interactive || ! is_ie_hardened()) { run_domtest(elem_test_str, test_elems); + run_domtest(elem_test2_str, test_elems2); }else { skip("IE running in Enhanced Security Configuration\n"); } - run_domtest(elem_test2_str, test_elems2); run_domtest(doc_blank, test_create_elems); run_domtest(doc_blank, test_defaults); run_domtest(doc_blank, test_null_write);

1 0

Jacek Caban : mshtml: Fixed use after free in HTMLElement_destructor.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: 873619e9bd402e1b77dba81e434abbb08e6bad7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=873619e9bd402e1b77dba81e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 23:10:22 2011 +0100 mshtml: Fixed use after free in HTMLElement_destructor. --- dlls/mshtml/htmlelem.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index c4d5607..bf54739 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1649,7 +1649,10 @@ void HTMLElement_destructor(HTMLDOMNode *iface) HTMLElement *This = impl_from_HTMLDOMNode(iface); HTMLDOMAttribute *attr; - LIST_FOR_EACH_ENTRY(attr, &This->attrs, HTMLDOMAttribute, entry) { + while(!list_empty(&This->attrs)) { + attr = LIST_ENTRY(list_head(&This->attrs), HTMLDOMAttribute, entry); + + list_remove(&attr->entry); attr->elem = NULL; IHTMLDOMAttribute_Release(&attr->IHTMLDOMAttribute_iface); }

1 0

Nikolay Sivov : msxml3: Fail on certain node types in insertBefore() for attributes, remove broken tests.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: d04fd1d067c375f8536576531690f3309f836d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04fd1d067c375f8536576531… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 3 03:50:04 2011 +0300 msxml3: Fail on certain node types in insertBefore() for attributes, remove broken tests. --- dlls/msxml3/attribute.c | 25 ++++- dlls/msxml3/tests/domdoc.c | 245 ++++++++++++++++++++++++++------------------ 2 files changed, 167 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d04fd1d067c375f853657…

1 0

Nikolay Sivov : msxml3: Link dom attribute with parent interface pointer.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: 59f7b8899bf355dfc18164b1bdc40414a8e56eb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f7b8899bf355dfc18164b1b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 3 03:57:01 2011 +0300 msxml3: Link dom attribute with parent interface pointer. --- dlls/msxml3/element.c | 16 ++++++++++++++++ dlls/msxml3/msxml_private.h | 5 +++-- dlls/msxml3/node.c | 1 + dlls/msxml3/tests/domdoc.c | 23 +++++++++++++++++------ 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index b1de8df..f2c5bbb 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1182,6 +1182,7 @@ static HRESULT WINAPI domelem_setAttributeNode( static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; xmlChar *name, *value; BSTR nameW, prefix; + xmlnode *attr_node; xmlAttrPtr attr; VARIANT valueW; HRESULT hr; @@ -1190,6 +1191,19 @@ static HRESULT WINAPI domelem_setAttributeNode( if (!attribute) return E_INVALIDARG; + attr_node = get_node_obj((IXMLDOMNode*)attribute); + if (!attr_node) + { + FIXME("att_node is not our node implementation\n"); + return E_FAIL; + } + + if (attr_node->parent) + { + WARN("attempt to add already used attribute\n"); + return E_FAIL; + } + hr = IXMLDOMAttribute_get_nodeName(attribute, &nameW); if (hr != S_OK) return hr; @@ -1231,6 +1245,8 @@ static HRESULT WINAPI domelem_setAttributeNode( } attr = xmlSetNsProp(get_element(This), NULL, name, value); + if (attr) + attr_node->parent = (IXMLDOMNode*)iface; SysFreeString(nameW); VariantClear(&valueW); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index ab7820f..72de7ba 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -233,9 +233,10 @@ extern void set_xpathmode(xmlDocPtr doc, BOOL xpath); /* IXMLDOMNode Internal Structure */ typedef struct _xmlnode { - DispatchEx dispex; + DispatchEx dispex; IXMLDOMNode *iface; - xmlNodePtr node; + IXMLDOMNode *parent; + xmlNodePtr node; } xmlnode; extern void init_xmlnode(xmlnode*,xmlNodePtr,IXMLDOMNode*,dispex_static_data_t*); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index a952ac0..71b95a8 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1106,6 +1106,7 @@ void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispe This->node = node; This->iface = node_iface; + This->parent = NULL; if(dispex_data) init_dispex(&This->dispex, (IUnknown*)This->iface, dispex_data); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c154860..82961f0 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7213,7 +7213,7 @@ static void test_get_ownerDocument(void) static void test_setAttributeNode(void) { IXMLDOMDocument *doc, *doc2; - IXMLDOMElement *elem; + IXMLDOMElement *elem, *elem2; IXMLDOMAttribute *attr, *attr2, *ret_attr; VARIANT_BOOL b; HRESULT hr; @@ -7233,6 +7233,10 @@ static void test_setAttributeNode(void) hr = IXMLDOMDocument_get_documentElement(doc, &elem); ok( hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_get_documentElement(doc, &elem2); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok( elem2 != elem, "got same instance\n"); + ret_attr = (void*)0xdeadbeef; hr = IXMLDOMElement_setAttributeNode(elem, NULL, &ret_attr); ok( hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -7259,16 +7263,23 @@ static void test_setAttributeNode(void) ok( hr == S_OK, "got 0x%08x\n", hr); ok(b == VARIANT_TRUE, "got %d\n", b); + b = VARIANT_FALSE; + hr = IXMLDOMElement_hasChildNodes(elem2, &b); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + IXMLDOMElement_Release(elem2); + attr2 = NULL; hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("attr"), &attr2); ok( hr == S_OK, "got 0x%08x\n", hr); + ok( attr2 != attr, "got same instance %p\n", attr2); IXMLDOMAttribute_Release(attr2); /* try to add it another time */ ret_attr = (void*)0xdeadbeef; hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr); - todo_wine ok( hr == E_FAIL, "got 0x%08x\n", hr); - todo_wine ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); + ok( hr == E_FAIL, "got 0x%08x\n", hr); + ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); IXMLDOMElement_Release(elem); @@ -7277,8 +7288,8 @@ static void test_setAttributeNode(void) ok( hr == S_OK, "got 0x%08x\n", hr); ret_attr = (void*)0xdeadbeef; hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr); - todo_wine ok( hr == E_FAIL, "got 0x%08x\n", hr); - todo_wine ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); + ok( hr == E_FAIL, "got 0x%08x\n", hr); + ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); IXMLDOMElement_Release(elem); /* add attribute already attached to another document */ @@ -7293,7 +7304,7 @@ static void test_setAttributeNode(void) hr = IXMLDOMDocument_get_documentElement(doc2, &elem); ok( hr == S_OK, "got 0x%08x\n", hr); hr = IXMLDOMElement_setAttributeNode(elem, attr, NULL); - todo_wine ok( hr == E_FAIL, "got 0x%08x\n", hr); + ok( hr == E_FAIL, "got 0x%08x\n", hr); IXMLDOMElement_Release(elem); IXMLDOMAttribute_Release(attr);

1 0

Henri Verbeet : wined3d: Retrieve the GL texture through a function.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: 09c3537ad06c48791fd4a8cca2fecf1f210272ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=09c3537ad06c48791fd4a8cca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 3 09:24:08 2011 +0100 wined3d: Retrieve the GL texture through a function. --- dlls/wined3d/basetexture.c | 10 ++-------- dlls/wined3d/context.c | 13 +++++-------- dlls/wined3d/cubetexture.c | 9 +++++---- dlls/wined3d/texture.c | 9 +++++---- dlls/wined3d/wined3d_private.h | 5 +++++ 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 20685e4..09e9ff3 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -248,10 +248,7 @@ HRESULT basetexture_bind(IWineD3DBaseTextureImpl *texture, BOOL srgb, BOOL *set_ TRACE("texture %p, srgb %#x, set_surface_desc %p.\n", texture, srgb, set_surface_desc); texture->baseTexture.is_srgb = srgb; /* SRGB mode cache for PreLoad calls outside drawprim */ - if (srgb) - gl_tex = &texture->baseTexture.texture_srgb; - else - gl_tex = &texture->baseTexture.texture_rgb; + gl_tex = basetexture_get_gl_texture(texture, srgb); textureDimensions = texture->baseTexture.target; @@ -377,10 +374,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTextureImpl *texture, TRACE("texture %p, samplerStates %p\n", texture, samplerStates); - if (texture->baseTexture.is_srgb) - gl_tex = &texture->baseTexture.texture_srgb; - else - gl_tex = &texture->baseTexture.texture_rgb; + gl_tex = basetexture_get_gl_texture(texture, texture->baseTexture.is_srgb); /* This function relies on the correct texture being bound and loaded. */ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9ace3b2..4f3cd67 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -117,7 +117,7 @@ static void context_apply_attachment_filter_states(IWineD3DSurfaceImpl *surface, /* Update base texture states array */ if (surface->container.type == WINED3D_CONTAINER_TEXTURE) { - IWineD3DBaseTextureImpl *texture_impl = surface->container.u.texture; + IWineD3DBaseTextureImpl *texture = surface->container.u.texture; IWineD3DDeviceImpl *device = surface->resource.device; BOOL update_minfilter = FALSE; BOOL update_magfilter = FALSE; @@ -126,16 +126,13 @@ static void context_apply_attachment_filter_states(IWineD3DSurfaceImpl *surface, switch (location) { case SFLAG_INTEXTURE: - gl_tex = &texture_impl->baseTexture.texture_rgb; - break; - case SFLAG_INSRGBTEX: - gl_tex = &texture_impl->baseTexture.texture_srgb; + gl_tex = basetexture_get_gl_texture(texture, location == SFLAG_INSRGBTEX); break; default: ERR("Unsupported location %s (%#x).\n", debug_surflocation(location), location); - IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture_impl); + IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture); return; } @@ -153,10 +150,10 @@ static void context_apply_attachment_filter_states(IWineD3DSurfaceImpl *surface, update_magfilter = TRUE; } - if (texture_impl->baseTexture.bindCount) + if (texture->baseTexture.bindCount) { WARN("Render targets should not be bound to a sampler\n"); - IWineD3DDeviceImpl_MarkStateDirty(device, STATE_SAMPLER(texture_impl->baseTexture.sampler)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_SAMPLER(texture->baseTexture.sampler)); } if (update_minfilter || update_magfilter) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 47dcc2b..0d6d20e 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -61,8 +61,8 @@ static void cubetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3DSR UINT sub_count = texture->baseTexture.level_count * texture->baseTexture.layer_count; IWineD3DDeviceImpl *device = texture->resource.device; struct wined3d_context *context = NULL; + struct gl_texture *gl_tex; BOOL srgb_mode; - BOOL *dirty; UINT i; TRACE("texture %p, srgb %#x.\n", texture, srgb); @@ -85,7 +85,8 @@ static void cubetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3DSR srgb_mode = texture->baseTexture.is_srgb; break; } - dirty = srgb_mode ? &texture->baseTexture.texture_srgb.dirty : &texture->baseTexture.texture_rgb.dirty; + + gl_tex = basetexture_get_gl_texture(texture, srgb_mode); /* We only have to activate a context for gl when we're not drawing. * In most cases PreLoad will be called during draw and a context was @@ -118,7 +119,7 @@ static void cubetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3DSR /* If the texture is marked dirty or the srgb sampler setting has changed * since the last load then reload the surfaces. */ - if (*dirty) + if (gl_tex->dirty) { for (i = 0; i < sub_count; ++i) { @@ -131,7 +132,7 @@ static void cubetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3DSR } /* No longer dirty. */ - *dirty = FALSE; + gl_tex->dirty = FALSE; if (context) context_release(context); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 32ff66b..c575e2b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -90,9 +90,9 @@ static void texture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3DSRGB s { IWineD3DDeviceImpl *device = texture->resource.device; struct wined3d_context *context = NULL; + struct gl_texture *gl_tex; unsigned int i; BOOL srgb_mode; - BOOL *dirty; TRACE("texture %p, srgb %#x.\n", texture, srgb); @@ -114,7 +114,8 @@ static void texture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3DSRGB s srgb_mode = texture->baseTexture.is_srgb; break; } - dirty = srgb_mode ? &texture->baseTexture.texture_srgb.dirty : &texture->baseTexture.texture_rgb.dirty; + + gl_tex = basetexture_get_gl_texture(texture, srgb_mode); if (!device->isInDraw) { @@ -142,7 +143,7 @@ static void texture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3DSRGB s /* If the texture is marked dirty or the srgb sampler setting has changed * since the last load then reload the surfaces. */ - if (*dirty) + if (gl_tex->dirty) { for (i = 0; i < texture->baseTexture.level_count; ++i) { @@ -157,7 +158,7 @@ static void texture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3DSRGB s if (context) context_release(context); /* No longer dirty. */ - *dirty = FALSE; + gl_tex->dirty = FALSE; } /* Do not call while under the GL lock. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 32a2189..87d5c48 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1908,6 +1908,11 @@ static inline IWineD3DBaseTextureImpl *basetexture_from_resource(struct wined3d_ return CONTAINING_RECORD(resource, IWineD3DBaseTextureImpl, resource); } +static inline struct gl_texture *basetexture_get_gl_texture(IWineD3DBaseTextureImpl *texture, BOOL srgb) +{ + return srgb ? &texture->baseTexture.texture_srgb : &texture->baseTexture.texture_rgb; +} + void basetexture_apply_state_changes(IWineD3DBaseTextureImpl *texture, const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0