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

Jacek Caban : wininet: Don't depend on is_end_of_read_data in HTTPREQ_Read.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 086eb61c846aa591ba5186a173dfea2b7f87159a URL: http://source.winehq.org/git/wine.git/?a=commit;h=086eb61c846aa591ba5186a17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 13:48:00 2011 +0200 wininet: Don't depend on is_end_of_read_data in HTTPREQ_Read. --- dlls/wininet/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bbf86cd..08bdd5a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2681,8 +2681,8 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * WARN("WriteFile failed: %u\n", GetLastError()); } - if(end_of_read_data(req)) - http_release_netconn(req, TRUE); + if(size && !ret_read) + http_release_netconn(req, res == ERROR_SUCCESS); return res; }

1 0

Jacek Caban : wininet: Fixed handling of 204 No Content response.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: a890e3a1442f14a1c1068406f97e2d6200c1eefd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a890e3a1442f14a1c1068406f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 13:48:15 2011 +0200 wininet: Fixed handling of 204 No Content response. --- dlls/wininet/http.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 08bdd5a..19c7e76 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2568,12 +2568,17 @@ static const data_stream_vtbl_t chunked_stream_vtbl = { }; /* set the request content length based on the headers */ -static DWORD set_content_length(http_request_t *request) +static DWORD set_content_length(http_request_t *request, DWORD status_code) { static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; WCHAR encoding[20]; DWORD size; + if(status_code == HTTP_STATUS_NO_CONTENT) { + request->contentLength = request->netconn_stream.content_length = 0; + return ERROR_SUCCESS; + } + size = sizeof(request->contentLength); if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, &request->contentLength, &size, NULL) != ERROR_SUCCESS) @@ -4685,17 +4690,17 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, HTTP_ProcessExpires(request); HTTP_ProcessLastModified(request); - res = set_content_length(request); - if(res != ERROR_SUCCESS) - goto lend; - if(!request->contentLength) - http_release_netconn(request, TRUE); - dwBufferSize = sizeof(dwStatusCode); if (HTTP_HttpQueryInfoW(request,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE, &dwStatusCode,&dwBufferSize,NULL) != ERROR_SUCCESS) dwStatusCode = 0; + res = set_content_length(request, dwStatusCode); + if(res != ERROR_SUCCESS) + goto lend; + if(!request->contentLength) + http_release_netconn(request, TRUE); + if (!(request->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT) && responseLen) { WCHAR *new_url, szNewLocation[INTERNET_MAX_URL_LENGTH]; @@ -4795,7 +4800,7 @@ lend: if (request->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - if (res == ERROR_SUCCESS && request->bytesWritten == request->bytesToWrite) + if (res == ERROR_SUCCESS && request->contentLength && request->bytesWritten == request->bytesToWrite) HTTP_ReceiveRequestData(request, TRUE); else { @@ -4835,6 +4840,7 @@ static void AsyncHttpSendRequestProc(WORKREQUEST *workRequest) static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_PTR dwContext) { INT responseLen; + DWORD dwCode, dwCodeLength; DWORD dwBufferSize; DWORD res = ERROR_SUCCESS; @@ -4854,19 +4860,22 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ HTTP_ProcessExpires(request); HTTP_ProcessLastModified(request); - if ((res = set_content_length( request )) == ERROR_SUCCESS) { + dwCodeLength = sizeof(dwCode); + if (HTTP_HttpQueryInfoW(request,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE, + &dwCode,&dwCodeLength,NULL) != ERROR_SUCCESS) + dwCode = 0; + + if ((res = set_content_length( request, dwCode )) == ERROR_SUCCESS) { if(!request->contentLength) http_release_netconn(request, TRUE); } if (res == ERROR_SUCCESS && !(request->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT)) { - DWORD dwCode,dwCodeLength = sizeof(DWORD); - if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE, &dwCode, &dwCodeLength, NULL) == ERROR_SUCCESS - && (dwCode == HTTP_STATUS_REDIRECT || + if (dwCode == HTTP_STATUS_REDIRECT || dwCode == HTTP_STATUS_MOVED || dwCode == HTTP_STATUS_REDIRECT_METHOD || - dwCode == HTTP_STATUS_REDIRECT_KEEP_VERB)) + dwCode == HTTP_STATUS_REDIRECT_KEEP_VERB) { WCHAR *new_url, szNewLocation[INTERNET_MAX_URL_LENGTH]; dwBufferSize=sizeof(szNewLocation); @@ -4891,7 +4900,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ } } - if (res == ERROR_SUCCESS) { + if (res == ERROR_SUCCESS && request->contentLength) { HTTP_ReceiveRequestData(request, TRUE); }else { INTERNET_ASYNC_RESULT iar = {0, res};

1 0

Jacek Caban : wininet: Clean up closing connection notifications tests.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 3ab297125da177198cf1ce28822ab3792864bc82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab297125da177198cf1ce288… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 13:48:36 2011 +0200 wininet: Clean up closing connection notifications tests. --- dlls/wininet/tests/http.c | 29 ----------------------------- 1 files changed, 0 insertions(+), 29 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 239f7a7..c959e5c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -402,8 +402,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER); if (flags & INTERNET_FLAG_ASYNC) SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); - else - SET_WINE_ALLOW(INTERNET_STATUS_REQUEST_COMPLETE); if(test->flags & TESTF_COMPRESSED) { BOOL b = TRUE; @@ -465,8 +463,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) CHECK_NOTIFIED(INTERNET_STATUS_REDIRECT); if (flags & INTERNET_FLAG_ASYNC) CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); - else - CHECK_NOT_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); /* Sent on WinXP only if first_connection_to_test_url is TRUE, on Win98 always sent */ CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); @@ -597,16 +593,6 @@ abort: Sleep(100); } CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); - if (hor != 0x0) - { - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); - } - else - { - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); - } CloseHandle(hCompleteEvent); first_connection_to_test_url = FALSE; } @@ -860,8 +846,6 @@ static void InternetReadFileExA_test(int flags) inetbuffers.dwOffsetLow = 5678; SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); - SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); - SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); rc = InternetReadFileEx(hor, &inetbuffers, 0, 0xdeadcafe); ok(rc, "InternetReadFileEx failed with error %u\n", GetLastError()); trace("read %i bytes\n", inetbuffers.dwBufferLength); @@ -879,8 +863,6 @@ static void InternetReadFileExA_test(int flags) length = 0; trace("Entering Query loop\n"); - SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); - SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); while (TRUE) { inetbuffers.dwStructSize = sizeof(INTERNET_BUFFERS); @@ -891,8 +873,6 @@ static void InternetReadFileExA_test(int flags) SET_WINE_ALLOW(INTERNET_STATUS_RECEIVING_RESPONSE); SET_WINE_ALLOW(INTERNET_STATUS_RESPONSE_RECEIVED); - SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); - SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); rc = InternetReadFileExA(hor, &inetbuffers, IRF_ASYNC | IRF_USE_CONTEXT, 0xcafebabe); if (!rc) @@ -949,9 +929,6 @@ static void InternetReadFileExA_test(int flags) ok(length > 0, "failed to read any of the document\n"); trace("Finished. Read %d bytes\n", length); - /* WinXP does not send, but Win98 does */ - CLEAR_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); abort: SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); if (hor) { @@ -972,12 +949,6 @@ abort: Sleep(100); CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); } - /* to enable once Wine is fixed to never send it - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); - */ - CLEAR_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CloseHandle(hCompleteEvent); first_connection_to_test_url = FALSE; }

1 0

Jacek Caban : wininet: Better closing async handles in tests.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 188de034974feb31fd67cec0d013257edde533c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=188de034974feb31fd67cec0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 13:48:50 2011 +0200 wininet: Better closing async handles in tests. --- dlls/wininet/tests/http.c | 65 ++++++++++++++------------------------------- 1 files changed, 20 insertions(+), 45 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c959e5c..a754dd7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -178,6 +178,8 @@ static BOOL proxy_active(void) return proxy_enable != 0; } +static int close_handle_cnt; + static VOID WINAPI callback( HINTERNET hInternet, DWORD_PTR dwContext, @@ -276,6 +278,8 @@ static VOID WINAPI callback( trace("%04x:Callback %p 0x%lx INTERNET_STATUS_HANDLE_CLOSING %p %d\n", GetCurrentThreadId(), hInternet, dwContext, *(HINTERNET *)lpvStatusInformation, dwStatusInformationLength); + if(!--close_handle_cnt) + SetEvent(hCompleteEvent); break; case INTERNET_STATUS_REQUEST_COMPLETE: { @@ -309,6 +313,20 @@ static VOID WINAPI callback( } } +static void close_async_handle(HINTERNET handle, HANDLE complete_event, int handle_cnt) +{ + BOOL res; + + close_handle_cnt = handle_cnt; + + SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, handle_cnt); + res = InternetCloseHandle(handle); + ok(res, "InternetCloseHandle failed: %u\n", GetLastError()); + WaitForSingleObject(hCompleteEvent, INFINITE); + CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, handle_cnt); + SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, handle_cnt); +} + static void InternetReadFile_test(int flags, const test_data_t *test) { char *post_data = NULL; @@ -567,32 +585,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) } abort: trace("aborting\n"); - SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); - if (hor != 0x0) { - SetLastError(0xdeadbeef); - trace("closing\n"); - res = InternetCloseHandle(hor); - ok (res, "InternetCloseHandle of handle opened by HttpOpenRequestA failed\n"); - SetLastError(0xdeadbeef); - res = InternetCloseHandle(hor); - ok (!res, "Double close of handle opened by HttpOpenRequestA succeeded\n"); - ok (GetLastError() == ERROR_INVALID_HANDLE, - "Double close of handle should have set ERROR_INVALID_HANDLE instead of %u\n", - GetLastError()); - } - /* We intentionally do not close the handle opened by InternetConnectA as this - * tickles bug #9479: native closes child internet handles when the parent handles - * are closed. This is verified below by checking that the number of - * INTERNET_STATUS_HANDLE_CLOSING notifications matches the number expected. */ - if (hi != 0x0) { - SET_WINE_ALLOW(INTERNET_STATUS_HANDLE_CLOSING); - trace("closing 2\n"); - res = InternetCloseHandle(hi); - ok (res, "InternetCloseHandle of handle opened by InternetOpenA failed\n"); - if (flags & INTERNET_FLAG_ASYNC) - Sleep(100); - } - CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); + close_async_handle(hi, hCompleteEvent, 2); CloseHandle(hCompleteEvent); first_connection_to_test_url = FALSE; } @@ -930,25 +923,7 @@ static void InternetReadFileExA_test(int flags) trace("Finished. Read %d bytes\n", length); abort: - SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); - if (hor) { - rc = InternetCloseHandle(hor); - ok ((rc != 0), "InternetCloseHandle of handle opened by HttpOpenRequestA failed\n"); - rc = InternetCloseHandle(hor); - ok ((rc == 0), "Double close of handle opened by HttpOpenRequestA succeeded\n"); - } - if (hic) { - rc = InternetCloseHandle(hic); - ok ((rc != 0), "InternetCloseHandle of handle opened by InternetConnectA failed\n"); - } - if (hi) { - SET_WINE_ALLOW(INTERNET_STATUS_HANDLE_CLOSING); - rc = InternetCloseHandle(hi); - ok ((rc != 0), "InternetCloseHandle of handle opened by InternetOpenA failed\n"); - if (flags & INTERNET_FLAG_ASYNC) - Sleep(100); - CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); - } + close_async_handle(hi, hCompleteEvent, 2); CloseHandle(hCompleteEvent); first_connection_to_test_url = FALSE; }

1 0

Jörg Höhle : include: Define DRV_MCI_FIRST.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 2e177cb24962f61343aff98eb79eccb9d8237e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e177cb24962f61343aff98eb… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Dec 15 21:18:47 2010 +0100 include: Define DRV_MCI_FIRST. --- include/mmsystem.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/mmsystem.h b/include/mmsystem.h index 4631762..ef74c75 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -200,6 +200,8 @@ typedef struct mmtime_tag { #define DRV_POWER 0x000F #define DRV_RESERVED 0x0800 +#define DRV_MCI_FIRST DRV_RESERVED +#define DRV_MCI_LAST (0xFFF + DRV_MCI_FIRST) #define DRV_USER 0x4000 #define DRVCNF_CANCEL 0x0000

1 0

Alexandre Julliard : winex11: Don' t use raw events for button events so that we get the right coordinates.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: fd4ad5a60433b8314dce684b9d52f43769cd5867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4ad5a60433b8314dce684b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 13 12:40:19 2011 +0200 winex11: Don't use raw events for button events so that we get the right coordinates. --- dlls/winex11.drv/mouse.c | 74 +++++++--------------------------------------- 1 files changed, 11 insertions(+), 63 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5fd7338..6c56b15 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -290,9 +290,6 @@ static void enable_xinput2(void) mask.mask = mask_bits; mask.mask_len = sizeof(mask_bits); memset( mask_bits, 0, sizeof(mask_bits) ); - - XISetMask( mask_bits, XI_RawButtonPress ); - XISetMask( mask_bits, XI_RawButtonRelease ); XISetMask( mask_bits, XI_RawMotion ); for (i = 0; i < count; ++i) @@ -542,11 +539,20 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU input->type = INPUT_MOUSE; - if (!hwnd && window == x11drv_thread_data()->clip_window) + if (!hwnd) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + if (!thread_data->clip_hwnd) return; + if (thread_data->clip_window != window) return; input->u.mi.dx += clip_rect.left; input->u.mi.dy += clip_rect.top; - if (x11drv_thread_data()->xi2_state != xi_enabled) __wine_send_input( hwnd, input ); + if (!(input->u.mi.dwFlags & ~(MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE))) + { + /* motion events are ignored when xinput2 is active */ + if (thread_data->xi2_state == xi_enabled) return; + } + __wine_send_input( hwnd, input ); return; } @@ -1391,56 +1397,6 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H /*********************************************************************** - * X11DRV_RawButtonPress - */ -static void X11DRV_RawButtonPress( XIRawEvent *event ) -{ - int button = event->detail - 1; - INPUT input; - - if (button >= NB_BUTTONS) return; - - TRACE( "button %u\n", button ); - - input.type = INPUT_MOUSE; - input.u.mi.dx = 0; - input.u.mi.dy = 0; - input.u.mi.mouseData = button_down_data[button]; - input.u.mi.dwFlags = button_down_flags[button]; - input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); - input.u.mi.dwExtraInfo = 0; - - update_user_time( event->time ); - input.type = INPUT_MOUSE; - __wine_send_input( 0, &input ); -} - - -/*********************************************************************** - * X11DRV_RawButtonRelease - */ -static void X11DRV_RawButtonRelease( XIRawEvent *event ) -{ - int button = event->detail - 1; - INPUT input; - - if (button >= NB_BUTTONS) return; - - TRACE( "button %u\n", button ); - - input.u.mi.dx = 0; - input.u.mi.dy = 0; - input.u.mi.mouseData = button_up_data[button]; - input.u.mi.dwFlags = button_up_flags[button]; - input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); - input.u.mi.dwExtraInfo = 0; - - input.type = INPUT_MOUSE; - __wine_send_input( 0, &input ); -} - - -/*********************************************************************** * X11DRV_RawMotion */ static void X11DRV_RawMotion( XIRawEvent *event ) @@ -1518,14 +1474,6 @@ void X11DRV_GenericEvent( HWND hwnd, XEvent *xev ) switch (event->evtype) { - case XI_RawButtonPress: - X11DRV_RawButtonPress( event->data ); - break; - - case XI_RawButtonRelease: - X11DRV_RawButtonRelease( event->data ); - break; - case XI_RawMotion: X11DRV_RawMotion( event->data ); break;

1 0

Alexandre Julliard : winex11: Allow MotionNotify events through occasionally while XInput is active.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 8e9b4e0a5c6bee5f72ca2314db26233638f0e1d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9b4e0a5c6bee5f72ca2314d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 13 16:19:45 2011 +0200 winex11: Allow MotionNotify events through occasionally while XInput is active. --- dlls/winex11.drv/event.c | 10 +++++++--- dlls/winex11.drv/mouse.c | 12 +++++++----- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 6ef1e07..f2e2841 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -323,10 +323,14 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) switch (next->type) { case MotionNotify: - if (next->xany.window == x11drv_thread_data()->clip_window) { - TRACE( "ignoring MotionNotify for clip window\n" ); - return MERGE_IGNORE; + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + if (next->xany.window == thread_data->clip_window && + next->xmotion.time - thread_data->last_motion_notify < 1000) + { + TRACE( "ignoring MotionNotify for clip window\n" ); + return MERGE_IGNORE; + } } break; case GenericEvent: diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 6c56b15..70cdd86 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -547,11 +547,6 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU if (thread_data->clip_window != window) return; input->u.mi.dx += clip_rect.left; input->u.mi.dy += clip_rect.top; - if (!(input->u.mi.dwFlags & ~(MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE))) - { - /* motion events are ignored when xinput2 is active */ - if (thread_data->xi2_state == xi_enabled) return; - } __wine_send_input( hwnd, input ); return; } @@ -1366,6 +1361,13 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; + if (!hwnd) + { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + if (event->time - thread_data->last_motion_notify < 1000) return; + thread_data->last_motion_notify = event->time; + } + send_mouse_input( hwnd, event->window, event->state, &input ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ca7a379..a14fa39 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -548,6 +548,7 @@ struct x11drv_thread_data HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ HWND last_xic_hwnd; /* last xic window */ + Time last_motion_notify; /* time of last mouse motion */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ Window clip_window; /* window used for cursor clipping */

1 0

Alexandre Julliard : winex11: Try a little harder to clip the cursor to avoid some race conditions.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: e52e57d13342d1d688126a6d8493219f740c5a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52e57d13342d1d688126a6d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 13 16:44:09 2011 +0200 winex11: Try a little harder to clip the cursor to avoid some race conditions. --- dlls/winex11.drv/mouse.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 70cdd86..d369f6c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -396,14 +396,14 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) return TRUE; } - TRACE( "clipping to %s\n", wine_dbgstr_rect(clip) ); + TRACE( "clipping to %s win %lx\n", wine_dbgstr_rect(clip), clip_window ); wine_tsx11_lock(); if (msg_hwnd) XUnmapWindow( data->display, clip_window ); XMoveResizeWindow( data->display, clip_window, clip->left - virtual_screen_rect.left, clip->top - virtual_screen_rect.top, clip->right - clip->left, clip->bottom - clip->top ); - if (msg_hwnd) XMapWindow( data->display, clip_window ); + XMapWindow( data->display, clip_window ); if (!XGrabPointer( data->display, clip_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime )) @@ -516,7 +516,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) if (!is_window_rect_fullscreen( &data->whole_rect )) return FALSE; if (!(thread_data = x11drv_thread_data())) return FALSE; if (GetTickCount() - thread_data->clip_reset < 1000) return FALSE; - if (!reset && thread_data->clip_hwnd) return FALSE; /* already clipping */ + if (!reset && clipping_cursor && thread_data->clip_hwnd) return FALSE; /* already clipping */ SetRect( &rect, 0, 0, screen_width, screen_height ); if (!grab_fullscreen) {

1 0

Jacek Caban : kernel32: Moved GetMappedFileName[AW] stubs to kernel32.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 772da9baae753bbdfb5c22d6cd9f87ea05ce8327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=772da9baae753bbdfb5c22d6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 11:05:11 2011 +0200 kernel32: Moved GetMappedFileName[AW] stubs to kernel32. --- dlls/kernel32/kernel32.spec | 2 ++ dlls/kernel32/virtual.c | 27 +++++++++++++++++++++++++++ dlls/psapi/psapi.spec | 4 ++-- dlls/psapi/psapi_main.c | 28 ---------------------------- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 31680fe..9edd92e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -772,6 +772,8 @@ @ stdcall K32GetProcessImageFileNameW(long ptr long) @ stdcall K32EnumProcessModules(long ptr long ptr) @ stdcall K32EnumProcesses(ptr long ptr) +@ stdcall K32GetMappedFileNameA(long ptr ptr long) +@ stdcall K32GetMappedFileNameW(long ptr ptr long) @ stdcall K32GetModuleBaseNameA(long long ptr long) @ stdcall K32GetModuleBaseNameW(long long ptr long) @ stdcall K32GetModuleFileNameExA(long long ptr long) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index dcd5b85..a901f85 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -45,6 +45,7 @@ #include "kernel_private.h" WINE_DECLARE_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(file); static unsigned int page_size; @@ -823,3 +824,29 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT max ) __ENDTRY return FALSE; } + +/*********************************************************************** + * K32GetMappedFileNameA (KERNEL32.@) + */ +DWORD WINAPI K32GetMappedFileNameA(HANDLE process, LPVOID lpv, LPSTR file_name, DWORD size) +{ + FIXME_(file)("(%p, %p, %p, %d): stub\n", process, lpv, file_name, size); + + if (file_name && size) + file_name[0] = '\0'; + + return 0; +} + +/*********************************************************************** + * K32GetMappedFileNameW (KERNEL32.@) + */ +DWORD WINAPI K32GetMappedFileNameW(HANDLE process, LPVOID lpv, LPWSTR file_name, DWORD size) +{ + FIXME_(file)("(%p, %p, %p, %d): stub\n", process, lpv, file_name, size); + + if (file_name && size) + file_name[0] = '\0'; + + return 0; +} diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index aaf2931..a53ec04 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -8,8 +8,8 @@ @ stdcall GetDeviceDriverBaseNameW(ptr ptr long) @ stdcall GetDeviceDriverFileNameA(ptr ptr long) @ stdcall GetDeviceDriverFileNameW(ptr ptr long) -@ stdcall GetMappedFileNameA(long ptr ptr long) -@ stdcall GetMappedFileNameW(long ptr ptr long) +@ stdcall GetMappedFileNameA(long ptr ptr long) kernel32.K32GetMappedFileNameA +@ stdcall GetMappedFileNameW(long ptr ptr long) kernel32.K32GetMappedFileNameW @ stdcall GetModuleBaseNameA(long long ptr long) kernel32.K32GetModuleBaseNameA @ stdcall GetModuleBaseNameW(long long ptr long) kernel32.K32GetModuleBaseNameW @ stdcall GetModuleFileNameExA(long long ptr long) kernel32.K32GetModuleFileNameExA diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index b297b7b..8d79892 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -122,34 +122,6 @@ DWORD WINAPI GetDeviceDriverFileNameW(LPVOID ImageBase, LPWSTR lpFilename, } /*********************************************************************** - * GetMappedFileNameA (PSAPI.@) - */ -DWORD WINAPI GetMappedFileNameA(HANDLE hProcess, LPVOID lpv, LPSTR lpFilename, - DWORD nSize) -{ - FIXME("(%p, %p, %p, %d): stub\n", hProcess, lpv, lpFilename, nSize); - - if (lpFilename && nSize) - lpFilename[0] = '\0'; - - return 0; -} - -/*********************************************************************** - * GetMappedFileNameW (PSAPI.@) - */ -DWORD WINAPI GetMappedFileNameW(HANDLE hProcess, LPVOID lpv, LPWSTR lpFilename, - DWORD nSize) -{ - FIXME("(%p, %p, %p, %d): stub\n", hProcess, lpv, lpFilename, nSize); - - if (lpFilename && nSize) - lpFilename[0] = '\0'; - - return 0; -} - -/*********************************************************************** * GetPerformanceInfo (PSAPI.@) */ BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size )

1 0

Nikolay Sivov : comctl32/tests: Test return values in uniform way.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 96c99dc99b272dbbdfa958a9b7a75817e1d1323a URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c99dc99b272dbbdfa958a9b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 12 12:20:42 2011 +0400 comctl32/tests: Test return values in uniform way. --- dlls/comctl32/tests/listview.c | 175 ++++++++++++++++++++-------------------- 1 files changed, 88 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96c99dc99b272dbbdfa95…

1 0