December 2014 - Wine-commits

Hans Leidekker : winhttp: Convert the async parameter to VT_BOOL if necessary in IWinHttpRequest:: Open.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 647abcafb6e93d4dd0030b687c5d340da12a8742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=647abcafb6e93d4dd0030b687… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:47:00 2014 +0100 winhttp: Convert the async parameter to VT_BOOL if necessary in IWinHttpRequest::Open. --- dlls/winhttp/request.c | 2 +- dlls/winhttp/tests/winhttp.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 75a229d..04e71d9 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2993,7 +2993,7 @@ static HRESULT WINAPI winhttp_request_Open( path[uc.dwUrlPathLength + uc.dwExtraInfoLength] = 0; if (!(verb = strdupW( method ))) goto error; - if (V_VT( &async ) == VT_BOOL && V_BOOL( &async )) flags |= WINHTTP_FLAG_ASYNC; + if (SUCCEEDED( VariantChangeType( &async, &async, 0, VT_BOOL )) && V_BOOL( &async )) flags |= WINHTTP_FLAG_ASYNC; if (!(hsession = WinHttpOpen( user_agentW, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags ))) { err = get_last_error(); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index eda83e4..8a863cb 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2870,6 +2870,23 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_Release( req ); ok( hr == S_OK, "got %08x\n", hr ); + hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); + ok( hr == S_OK, "got %08x\n", hr ); + + V_VT( &async ) = VT_I4; + V_I4( &async ) = 1; + hr = IWinHttpRequest_Open( req, method, url, async ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Send( req, empty ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_WaitForResponse( req, timeout, &succeeded ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Release( req ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( method ); SysFreeString( url ); SysFreeString( username );

1 0

Hans Leidekker : winhttp: Don't report data pending in the socket.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 2b6dacfdbe3f4c902a9243170880757ac2f7f806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6dacfdbe3f4c902a9243170… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:48:26 2014 +0100 winhttp: Don't report data pending in the socket. Some installers make assumptions about the size of the internal buffer. We could exceed that size when there's enough data pending in the socket. --- dlls/winhttp/net.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index b77c706..7213dd9 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -740,16 +740,8 @@ ULONG netconn_query_data_available( netconn_t *conn ) if(!netconn_connected(conn)) return 0; - if(conn->secure) { + if(conn->secure) return conn->peek_len; - }else { -#ifdef FIONREAD - ULONG unread; - - if(!ioctlsocket(conn->socket, FIONREAD, &unread)) - return unread; -#endif - } return 0; }

1 0

Hans Leidekker : winhttp: Double the size of the internal read buffer.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: cd7806b2239baea45355a166a3bc0af3025eb839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7806b2239baea45355a166a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:49:02 2014 +0100 winhttp: Double the size of the internal read buffer. --- dlls/winhttp/winhttp_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 0f7749c..d08d153 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -194,7 +194,7 @@ typedef struct BOOL read_chunked_size; /* chunk size remaining */ DWORD read_pos; /* current read position in read_buf */ DWORD read_size; /* valid data size in read_buf */ - char read_buf[4096]; /* buffer for already read but not returned data */ + char read_buf[8192]; /* buffer for already read but not returned data */ header_t *headers; DWORD num_headers; WCHAR **accept_types;

1 0

Hans Leidekker : winhttp: Check the return value of send_request.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 97cd0291b004a2fe455fbf95758d45ada10a67ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=97cd0291b004a2fe455fbf957… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:49:28 2014 +0100 winhttp: Check the return value of send_request. --- dlls/winhttp/request.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 04e71d9..62ecfee 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2314,22 +2314,17 @@ static BOOL receive_response( request_t *request, BOOL async ) if (!(ret = handle_redirect( request, status ))) break; /* recurse synchronously */ - send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ); - continue; + if ((ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) continue; } else if (status == HTTP_STATUS_DENIED || status == HTTP_STATUS_PROXY_AUTH_REQ) { if (request->hdr.disable_flags & WINHTTP_DISABLE_AUTHENTICATION) break; drain_content( request ); - if (!handle_authorization( request, status )) - { - ret = TRUE; - break; - } + if (!handle_authorization( request, status )) break; + /* recurse synchronously */ - send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ); - continue; + if ((ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) continue; } break; }

1 0

Hans Leidekker : winhttp: Don' t try to read data when the server response is HTTP_STATUS_NO_CONTENT or HTTP_STATUS_NOT_MODIFIED.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 2087a9fbe9ab5282fca8a55575fbc0126c3ac7bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2087a9fbe9ab5282fca8a5557… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:50:07 2014 +0100 winhttp: Don't try to read data when the server response is HTTP_STATUS_NO_CONTENT or HTTP_STATUS_NOT_MODIFIED. Tests based on a patch by Bruno Jesus. --- dlls/winhttp/request.c | 15 ++++++----- dlls/winhttp/tests/winhttp.c | 62 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 62ecfee..61f5439 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1802,14 +1802,15 @@ static BOOL handle_authorization( request_t *request, DWORD status ) } /* set the request content length based on the headers */ -static DWORD set_content_length( request_t *request ) +static DWORD set_content_length( request_t *request, DWORD status ) { WCHAR encoding[20]; - DWORD buflen; + DWORD buflen = sizeof(request->content_length); - buflen = sizeof(request->content_length); - if (!query_headers( request, WINHTTP_QUERY_CONTENT_LENGTH|WINHTTP_QUERY_FLAG_NUMBER, - NULL, &request->content_length, &buflen, NULL )) + if (status == HTTP_STATUS_NO_CONTENT || status == HTTP_STATUS_NOT_MODIFIED) + request->content_length = 0; + else if (!query_headers( request, WINHTTP_QUERY_CONTENT_LENGTH|WINHTTP_QUERY_FLAG_NUMBER, + NULL, &request->content_length, &buflen, NULL )) request->content_length = ~0u; buflen = sizeof(encoding); @@ -2302,7 +2303,7 @@ static BOOL receive_response( request_t *request, BOOL async ) query = WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER; if (!(ret = query_headers( request, query, NULL, &status, &size, NULL ))) break; - set_content_length( request ); + set_content_length( request, status ); if (!(request->hdr.disable_flags & WINHTTP_DISABLE_COOKIES)) record_cookies( request ); @@ -2329,7 +2330,7 @@ static BOOL receive_response( request_t *request, BOOL async ) break; } - if (ret) refill_buffer( request, FALSE ); + if (request->content_length) refill_buffer( request, FALSE ); if (async) { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 8a863cb..7d0167b 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1801,6 +1801,10 @@ static const char nocontentmsg[] = "Server: winetest\r\n" "\r\n"; +static const char notmodified[] = +"HTTP/1.1 304 Not Modified\r\n" +"\r\n"; + static const char noauthmsg[] = "HTTP/1.1 401 Unauthorized\r\n" "Server: winetest\r\n" @@ -1888,6 +1892,11 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, nocontentmsg, sizeof nocontentmsg - 1, 0); } + if (strstr(buffer, "GET /not_modified")) + { + send(c, notmodified, sizeof notmodified - 1, 0); + Sleep(6000); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -2129,7 +2138,7 @@ static void test_no_content(int port) { static const WCHAR no_contentW[] = {'/','n','o','_','c','o','n','t','e','n','t',0}; HINTERNET ses, con, req; - WCHAR buf[128]; + char buf[128]; DWORD size, len = sizeof(buf), bytes_read, status; BOOL ret; @@ -2181,6 +2190,7 @@ static void test_no_content(int port) ok(size == 0, "expected 0, got %d\n", size); ret = WinHttpReadData(req, buf, len, &bytes_read); + ok(ret, "expected success\n"); ok( bytes_read == 0, "expected 0, got %u available\n", bytes_read ); size = 12345; @@ -2202,6 +2212,55 @@ static void test_no_content(int port) WinHttpCloseHandle(ses); } +static void test_not_modified(int port) +{ + static const WCHAR pathW[] = {'/','n','o','t','_','m','o','d','i','f','i','e','d',0}; + static const WCHAR ifmodifiedW[] = {'I','f','-','M','o','d','i','f','i','e','d','-','S','i','n','c','e',':',' '}; + BOOL ret; + HINTERNET session, request, connection; + DWORD status, size, start = GetTickCount(); + SYSTEMTIME st; + WCHAR today[(sizeof(ifmodifiedW) + WINHTTP_TIME_FORMAT_BUFSIZE)/sizeof(WCHAR) + 3]; + + memcpy(today, ifmodifiedW, sizeof(ifmodifiedW)); + GetSystemTime(&st); + WinHttpTimeFromSystemTime(&st, &today[sizeof(ifmodifiedW)/sizeof(WCHAR)]); + + session = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, + WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); + ok(session != NULL, "WinHttpOpen failed: %u\n", GetLastError()); + + connection = WinHttpConnect(session, localhostW, port, 0); + ok(connection != NULL, "WinHttpConnect failed: %u\n", GetLastError()); + + request = WinHttpOpenRequest(connection, NULL, pathW, NULL, WINHTTP_NO_REFERER, + WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); + ok(request != NULL, "WinHttpOpenrequest failed: %u\n", GetLastError()); + + ret = WinHttpSendRequest(request, today, ~0u, NULL, 0, 0, 0); + ok(ret, "WinHttpSendRequest failed: %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(request, NULL); + ok(ret, "WinHttpReceiveResponse failed: %u\n", GetLastError()); + + size = sizeof(status); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, + NULL, &status, &size, NULL); + ok(ret, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(status == HTTP_STATUS_NOT_MODIFIED, "got %u\n", status); + + size = 0xdeadbeef; + ret = WinHttpQueryDataAvailable(request, &size); + ok(ret, "WinHttpQueryDataAvailable failed: %u\n", GetLastError()); + ok(!size, "got %u\n", size); + + WinHttpCloseHandle(request); + WinHttpCloseHandle(connection); + WinHttpCloseHandle(session); + start = GetTickCount() - start; + ok(start <= 2000, "Expected less than 2 seconds for the test, got %u ms\n", start); +} + static void test_bad_header( int port ) { static const WCHAR bad_headerW[] = @@ -3211,6 +3270,7 @@ START_TEST (winhttp) test_basic_request(si.port, NULL, basicW); test_no_headers(si.port); test_no_content(si.port); + test_not_modified(si.port); test_basic_authentication(si.port); test_bad_header(si.port); test_multiple_reads(si.port);

1 0

Hans Leidekker : winhttp/tests: Close the connection immediately after authentication.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: bb89483397985e142304a177090d6ceb928a8fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb89483397985e142304a1770… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:50:41 2014 +0100 winhttp/tests: Close the connection immediately after authentication. --- dlls/winhttp/tests/winhttp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 7d0167b..446cba4 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1812,6 +1812,12 @@ static const char noauthmsg[] = "WWW-Authenticate: Basic realm=\"placebo\"\r\n" "\r\n"; +static const char okauthmsg[] = +"HTTP/1.1 200 OK\r\n" +"Server: winetest\r\n" +"Connection: close\r\n" +"\r\n"; + struct server_info { HANDLE event; @@ -1873,7 +1879,7 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "/auth")) { if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) - send(c, okmsg, sizeof okmsg - 1, 0); + send(c, okauthmsg, sizeof okauthmsg - 1, 0); else send(c, noauthmsg, sizeof noauthmsg - 1, 0); }

1 0

Stefan Dösinger : ddraw/tests: Fix window deactivation in test_coop_level_activateapp.
by Alexandre Julliard 08 Dec '14

08 Dec '14

Module: wine Branch: master Commit: bd91c559ae5fdaac576b548ae6d0a110532697d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd91c559ae5fdaac576b548ae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 4 21:51:47 2014 +0100 ddraw/tests: Fix window deactivation in test_coop_level_activateapp. --- dlls/ddraw/tests/ddraw1.c | 21 ++++++++------------- dlls/ddraw/tests/ddraw2.c | 21 ++++++++------------- dlls/ddraw/tests/ddraw4.c | 21 ++++++++------------- dlls/ddraw/tests/ddraw7.c | 21 ++++++++------------- 4 files changed, 32 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd91c559ae5fdaac576b5…

1 0

Stefan Dösinger : ddraw/tests: Test WM_SYSCOMMAND handling.
by Alexandre Julliard 08 Dec '14

08 Dec '14

Module: wine Branch: master Commit: 262b9cc62e86c6e31ee8bb8fdbbaa5c126a8a505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=262b9cc62e86c6e31ee8bb8fd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 4 21:51:48 2014 +0100 ddraw/tests: Test WM_SYSCOMMAND handling. --- dlls/ddraw/tests/ddraw1.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 168 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=262b9cc62e86c6e31ee8b…

1 0

Stefan Dösinger : wined3d: Filter messages generated by focus handling.
by Alexandre Julliard 08 Dec '14

08 Dec '14

Module: wine Branch: master Commit: 19c860499a12495e8f7a7cb2909fa948e24261d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c860499a12495e8f7a7cb29… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 4 21:51:49 2014 +0100 wined3d: Filter messages generated by focus handling. --- dlls/d3d8/tests/device.c | 2 +- dlls/d3d9/tests/d3d9ex.c | 5 +---- dlls/d3d9/tests/device.c | 13 +++---------- dlls/ddraw/ddraw.c | 3 ++- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 21 ++++++++++++++------- include/wine/wined3d.h | 1 + 7 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 0084272..73970c1 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2688,7 +2688,7 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); - todo_wine ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it.\n"); + ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it.\n"); expect_messages = NULL; /* The window is iconic even though no message was sent. */ diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 49be31e..fef80f4 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2236,10 +2236,7 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); - if (tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES) - ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); - else - todo_wine ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); + ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); expect_messages = NULL; /* The window is iconic even though no message was sent. */ diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 72044a5..3206e57 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3675,10 +3675,7 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); - if (tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES) - ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); - else - todo_wine ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); + ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); expect_messages = NULL; /* The window is iconic even though no message was sent. */ @@ -3730,12 +3727,8 @@ static void test_wndproc(void) ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); /* About 1 in 8 test runs receives WM_WINDOWPOSCHANGED on Vista. */ - if (tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES) - ok(!windowposchanged_received || broken(1), - "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); - else - todo_wine ok(!windowposchanged_received || broken(1), - "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); + ok(!windowposchanged_received || broken(1), + "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); expect_messages = NULL; filter_messages = focus_window; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index fce1c22..f0ebc52 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4850,7 +4850,8 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->numIfaces = 1; ddraw->ref7 = 1; - flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING | WINED3D_RESTORE_MODE_ON_ACTIVATE; + flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING + | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES; if (!(ddraw->wined3d = wined3d_create(flags))) { if (!(ddraw->wined3d = wined3d_create(flags | WINED3D_NO3D))) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ae6600e..89ec00a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4961,7 +4961,7 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) { - if (device->filter_messages) + if (device->filter_messages && message != WM_DISPLAYCHANGE) { TRACE("Filtering message: window %p, message %#x, wparam %#lx, lparam %#lx.\n", window, message, wparam, lparam); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 89f83ea..887143f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1176,14 +1176,19 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) { + struct wined3d_device *device = swapchain->device; + BOOL filter_messages = device->filter_messages; + /* This code is not protected by the wined3d mutex, so it may run while * wined3d_device_reset is active. Testing on Windows shows that changing * focus during resets and resetting during focus change events causes * the application to crash with an invalid memory access. */ + device->filter_messages = !(device->wined3d->flags & WINED3D_FOCUS_MESSAGES); + if (activate) { - if (!(swapchain->device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) + if (!(device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) { /* The d3d versions do not agree on the exact messages here. D3d8 restores * the window but leaves the size untouched, d3d9 sets the size on an @@ -1197,23 +1202,25 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa SWP_NOACTIVATE | SWP_NOZORDER); } - if (swapchain->device->wined3d->flags & WINED3D_RESTORE_MODE_ON_ACTIVATE) + if (device->wined3d->flags & WINED3D_RESTORE_MODE_ON_ACTIVATE) { - if (FAILED(wined3d_set_adapter_display_mode(swapchain->device->wined3d, - swapchain->device->adapter->ordinal, &swapchain->d3d_mode))) + if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, + device->adapter->ordinal, &swapchain->d3d_mode))) ERR("Failed to set display mode.\n"); } } else { - if (FAILED(wined3d_set_adapter_display_mode(swapchain->device->wined3d, - swapchain->device->adapter->ordinal, NULL))) + if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, + device->adapter->ordinal, NULL))) ERR("Failed to set display mode.\n"); swapchain->reapply_mode = TRUE; - if (!(swapchain->device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES) + if (!(device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES) && IsWindowVisible(swapchain->device_window)) ShowWindow(swapchain->device_window, SW_MINIMIZE); } + + device->filter_messages = filter_messages; } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2362cbc..baa102a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1238,6 +1238,7 @@ enum wined3d_display_rotation #define WINED3D_VIDMEM_ACCOUNTING 0x00000004 #define WINED3D_PRESENT_CONVERSION 0x00000008 #define WINED3D_RESTORE_MODE_ON_ACTIVATE 0x00000010 +#define WINED3D_FOCUS_MESSAGES 0x00000020 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Nikolay Sivov : dwrite: Set font style to oblique when oblique simulation, was requested.
by Alexandre Julliard 08 Dec '14

08 Dec '14

Module: wine Branch: master Commit: 517185fcf39356faecfc1e544ed7581b5713b708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=517185fcf39356faecfc1e544… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 8 13:22:01 2014 +0300 dwrite: Set font style to oblique when oblique simulation, was requested. --- dlls/dwrite/font.c | 8 +++++++- dlls/dwrite/tests/font.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index df3d2dd..8b57809 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -87,6 +87,7 @@ struct dwrite_font { IDWriteFontFamily *family; USHORT simulations; + DWRITE_FONT_STYLE style; struct dwrite_font_data *data; }; @@ -738,7 +739,7 @@ static DWRITE_FONT_STYLE WINAPI dwritefont_GetStyle(IDWriteFont2 *iface) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); TRACE("(%p)\n", This); - return This->data->style; + return This->style; } static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont2 *iface) @@ -1001,9 +1002,14 @@ static HRESULT create_font(struct dwrite_font_data *data, IDWriteFontFamily *fam This->family = family; IDWriteFontFamily_AddRef(family); This->simulations = simulations; + This->style = data->style; This->data = data; InterlockedIncrement(&This->data->ref); + /* set oblique style from requested simulation */ + if ((simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) && data->style == DWRITE_FONT_STYLE_NORMAL) + This->style = DWRITE_FONT_STYLE_OBLIQUE; + *font = (IDWriteFont*)&This->IDWriteFont2_iface; return S_OK; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 49e7154..4af8338 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -441,10 +441,10 @@ if (0) ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight); style = IDWriteFont_GetStyle(font); -todo_wine { ok(style == DWRITE_FONT_STYLE_OBLIQUE, "got %d\n", style); +todo_wine ok(otm.otmfsSelection == 1, "got 0x%08x\n", otm.otmfsSelection); -} + ret = IDWriteFont_IsSymbolFont(font); ok(!ret, "got %d\n", ret);

1 0