December 2014 - Wine-Commits

Hans Leidekker : winhttp: Fill the read buffer first in drain_content.
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

Module: wine Branch: master Commit: 4ac817b6c0c300fbf3f30a3ba2fe78651b8ab88c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac817b6c0c300fbf3f30a3ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:46:23 2014 +0100 winhttp: Fill the read buffer first in drain_content. --- dlls/winhttp/request.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 62e9c75..75a229d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2148,6 +2148,7 @@ static void drain_content( request_t *request ) DWORD bytes_read; char buffer[2048]; + refill_buffer( request, FALSE ); for (;;) { if (!read_data( request, buffer, sizeof(buffer), &bytes_read, FALSE ) || !bytes_read) return;

1 0

Hans Leidekker : winhttp: Enable automatic authentication by default in the request object.
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

Module: wine Branch: master Commit: 1eb86e1fca71f634b54bf105703c1247d87b39ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb86e1fca71f634b54bf1057… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:45:46 2014 +0100 winhttp: Enable automatic authentication by default in the request object. --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d497d7a..62e9c75 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2932,7 +2932,7 @@ static void initialize_request( struct winhttp_request *request ) request->bytes_read = 0; request->error = ERROR_SUCCESS; request->logon_policy = WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM; - request->disable_feature = WINHTTP_DISABLE_AUTHENTICATION; + request->disable_feature = 0; request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL;

1 0

Hans Leidekker : winhttp: Double the size of the internal read buffer.
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

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: Convert the async parameter to VT_BOOL if necessary in IWinHttpRequest:: Open.
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

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 : cryptnet: Add support for base64 encoded certificates, CRLs and CTLs in CryptRetrieveObjectByUrl.
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

Module: wine Branch: master Commit: 5e6490a835fff0d2ebe5ee78e04276757143f0b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6490a835fff0d2ebe5ee78e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:44:00 2014 +0100 cryptnet: Add support for base64 encoded certificates, CRLs and CTLs in CryptRetrieveObjectByUrl. --- dlls/cryptnet/cryptnet_main.c | 53 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index df9eb49..90057d9 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1184,10 +1184,27 @@ static BOOL WINAPI CRYPT_CreateBlob(LPCSTR pszObjectOid, typedef BOOL (WINAPI *AddContextToStore)(HCERTSTORE hCertStore, const void *pContext, DWORD dwAddDisposition, const void **ppStoreContext); +static BOOL decode_base64_blob( const CRYPT_DATA_BLOB *in, CRYPT_DATA_BLOB *out ) +{ + BOOL ret; + DWORD len = in->cbData; + + while (len && !in->pbData[len - 1]) len--; + if (!CryptStringToBinaryA( (char *)in->pbData, len, CRYPT_STRING_BASE64_ANY, + NULL, &out->cbData, NULL, NULL )) return FALSE; + + if (!(out->pbData = CryptMemAlloc( out->cbData ))) return FALSE; + ret = CryptStringToBinaryA( (char *)in->pbData, len, CRYPT_STRING_BASE64_ANY, + out->pbData, &out->cbData, NULL, NULL ); + if (!ret) CryptMemFree( out->pbData ); + return ret; +} + static BOOL CRYPT_CreateContext(const CRYPT_BLOB_ARRAY *pObject, DWORD dwExpectedContentTypeFlags, AddContextToStore addFunc, void **ppvContext) { BOOL ret = TRUE; + CRYPT_DATA_BLOB blob; if (!pObject->cBlob) { @@ -1197,9 +1214,20 @@ static BOOL CRYPT_CreateContext(const CRYPT_BLOB_ARRAY *pObject, } else if (pObject->cBlob == 1) { - if (!CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &pObject->rgBlob[0], - dwExpectedContentTypeFlags, CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, - NULL, NULL, NULL, NULL, (const void **)ppvContext)) + if (decode_base64_blob(&pObject->rgBlob[0], &blob)) + { + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + dwExpectedContentTypeFlags, CERT_QUERY_FORMAT_FLAG_BINARY, 0, + NULL, NULL, NULL, NULL, NULL, (const void **)ppvContext); + CryptMemFree(blob.pbData); + } + else + { + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &pObject->rgBlob[0], + dwExpectedContentTypeFlags, CERT_QUERY_FORMAT_FLAG_BINARY, 0, + NULL, NULL, NULL, NULL, NULL, (const void **)ppvContext); + } + if (!ret) { SetLastError(CRYPT_E_NO_MATCH); ret = FALSE; @@ -1217,10 +1245,21 @@ static BOOL CRYPT_CreateContext(const CRYPT_BLOB_ARRAY *pObject, for (i = 0; i < pObject->cBlob; i++) { - if (CryptQueryObject(CERT_QUERY_OBJECT_BLOB, - &pObject->rgBlob[i], dwExpectedContentTypeFlags, - CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, - NULL, &context)) + if (decode_base64_blob(&pObject->rgBlob[i], &blob)) + { + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + dwExpectedContentTypeFlags, CERT_QUERY_FORMAT_FLAG_BINARY, + 0, NULL, NULL, NULL, NULL, NULL, &context); + CryptMemFree(blob.pbData); + } + else + { + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, + &pObject->rgBlob[i], dwExpectedContentTypeFlags, + CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, + NULL, &context); + } + if (ret) { if (!addFunc(store, context, CERT_STORE_ADD_ALWAYS, NULL)) ret = FALSE;

1 0

Hans Leidekker : winhttp: Check the return value of send_request.
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

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

Martin Storsjo : msvcr120: Implement more C99 math functions.
by Alexandre Julliard Dec. 8, 2014

Dec. 8, 2014

Module: wine Branch: master Commit: 547ba7a10b640fb793a70b995a05f7ce42cddacd URL: http://source.winehq.org/git/wine.git/?a=commit;h=547ba7a10b640fb793a70b995… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 8 14:35:25 2014 +0200 msvcr120: Implement more C99 math functions. --- configure | 36 ++++- configure.ac | 25 +++- dlls/msvcr120/msvcr120.spec | 60 ++++----- dlls/msvcrt/math.c | 321 ++++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 60 +++++++++ 5 files changed, 468 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=547ba7a10b640fb793a70…

1 0

Stefan Dösinger : wined3d: Filter messages generated by focus handling.
by Alexandre Julliard Dec. 8, 2014

Dec. 8, 2014

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

Stefan Dösinger : ddraw/tests: Test WM_SYSCOMMAND handling.
by Alexandre Julliard Dec. 8, 2014

Dec. 8, 2014

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

Jacek Caban : mshtml: Allow setting fontWeight to empty string.
by Alexandre Julliard Dec. 8, 2014

Dec. 8, 2014

Module: wine Branch: master Commit: 7eddb864b36d159fa6e6807f65e117ca0a81485c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eddb864b36d159fa6e6807f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 8 13:39:47 2014 +0100 mshtml: Allow setting fontWeight to empty string. --- dlls/mshtml/htmlstyle.c | 18 ++++++------------ dlls/mshtml/tests/style.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 45e5b9a..0e74899 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -935,19 +935,13 @@ static HRESULT WINAPI HTMLStyle_put_fontWeight(IHTMLStyle *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); /* fontWeight can only be one of the following */ - if(!v || strcmpiW(szNormal, v) == 0 || strcmpiW(styleBold, v) == 0 || - strcmpiW(styleBolder, v) == 0 || strcmpiW(styleLighter, v) == 0 || - strcmpiW(style100, v) == 0 || strcmpiW(style200, v) == 0 || - strcmpiW(style300, v) == 0 || strcmpiW(style400, v) == 0 || - strcmpiW(style500, v) == 0 || strcmpiW(style600, v) == 0 || - strcmpiW(style700, v) == 0 || strcmpiW(style800, v) == 0 || - strcmpiW(style900, v) == 0 - ) - { - return set_nsstyle_attr(This->nsstyle, STYLEID_FONT_WEIGHT, v, 0); - } + if(v && *v && strcmpiW(szNormal, v) && strcmpiW(styleBold, v) && strcmpiW(styleBolder, v) + && strcmpiW(styleLighter, v) && strcmpiW(style100, v) && strcmpiW(style200, v) + && strcmpiW(style300, v) && strcmpiW(style400, v) && strcmpiW(style500, v) && strcmpiW(style600, v) + && strcmpiW(style700, v) && strcmpiW(style800, v) && strcmpiW(style900, v)) + return E_INVALIDARG; - return E_INVALIDARG; + return set_nsstyle_attr(This->nsstyle, STYLEID_FONT_WEIGHT, v, 0); } static HRESULT WINAPI HTMLStyle_get_fontWeight(IHTMLStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index ec66a71..0eea1c5 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -823,6 +823,16 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(str, "900"), "str != style900\n"); SysFreeString(str); + str = a2bstr(""); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_fontWeight(style, &str); + ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); + ok(!str, "str != NULL\n"); + SysFreeString(str); + hres = IHTMLStyle_put_fontWeight(style, sDefault); ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); SysFreeString(sDefault);

1 0