September 2018 - Wine-Commits

Nikolay Sivov : shlwapi/tests: Add some tests for memory stream.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: 917b2a36419c949aacb869b63ea4644374ee94b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=917b2a36419c949aacb869b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 7 14:55:59 2018 +0300 shlwapi/tests: Add some tests for memory stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/istream.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 7d0cd61..560a822 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -733,6 +733,43 @@ static void test_SHCreateStreamOnFileEx_CopyTo(void) DeleteFileW( dstFileName ); } +static void test_SHCreateMemStream(void) +{ + static const BYTE initial[10]; + IStream *stream, *stream2; + IUnknown *unk; + char buff[10]; + HRESULT hr; + + stream = SHCreateMemStream(initial, 0); + ok(stream != NULL, "Failed to create a stream.\n"); + IStream_Release(stream); + + stream = SHCreateMemStream(NULL, 10); + ok(stream != NULL, "Failed to create a stream.\n"); + IStream_Release(stream); + + stream = SHCreateMemStream(NULL, 0); + ok(stream != NULL, "Failed to create a stream.\n"); + + hr = IStream_QueryInterface(stream, &IID_ISequentialStream, (void **)&unk); +todo_wine + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* WinXP */, "Failed to QI, hr %#x.\n", hr); + if (unk) + IUnknown_Release(unk); + + hr = IStream_Read(stream, buff, sizeof(buff), NULL); +todo_wine + ok(hr == S_FALSE || broken(hr == S_OK) /* WinXP */, "Unexpected hr %#x.\n", hr); + + hr = IStream_Clone(stream, &stream2); +todo_wine + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* < Win8 */, "Failed to clone a stream, hr %#x.\n", hr); + if (hr == S_OK) + IStream_Release(stream2); + + IStream_Release(stream); +} START_TEST(istream) { @@ -773,4 +810,5 @@ START_TEST(istream) } test_SHCreateStreamOnFileEx_CopyTo(); + test_SHCreateMemStream(); }

1 0

André Hentschel : api-ms-win-core-comm-l1-1-0: Add dll.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: be974da9f6d245c21b0e4c0d35a939360d6fbadb URL: https://source.winehq.org/git/wine.git/?a=commit;h=be974da9f6d245c21b0e4c0d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 7 14:06:38 2018 +0200 api-ms-win-core-comm-l1-1-0: Add dll. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-comm-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-comm-l1-1-0.spec | 18 ++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 23 insertions(+) diff --git a/configure b/configure index b800fd2..c9ab5af 100755 --- a/configure +++ b/configure @@ -911,6 +911,7 @@ enable_api_ms_win_core_bem_l1_1_0 enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_com_l1_1_1 enable_api_ms_win_core_com_private_l1_1_0 +enable_api_ms_win_core_comm_l1_1_0 enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_console_l2_1_0 enable_api_ms_win_core_crt_l1_1_0 @@ -19005,6 +19006,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-bem-l1-1-0 enable_api_ms_win_core_b wine_fn_config_makefile dlls/api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_com_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-com-private-l1-1-0 enable_api_ms_win_core_com_private_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-comm-l1-1-0 enable_api_ms_win_core_comm_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-console-l2-1-0 enable_api_ms_win_core_console_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-crt-l1-1-0 enable_api_ms_win_core_crt_l1_1_0 diff --git a/configure.ac b/configure.ac index d7d5e8e..69f641d 100644 --- a/configure.ac +++ b/configure.ac @@ -2864,6 +2864,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-bem-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-private-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-comm-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-crt-l1-1-0) diff --git a/dlls/api-ms-win-core-comm-l1-1-0/Makefile.in b/dlls/api-ms-win-core-comm-l1-1-0/Makefile.in new file mode 100644 index 0000000..1780e24 --- /dev/null +++ b/dlls/api-ms-win-core-comm-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-comm-l1-1-0.dll diff --git a/dlls/api-ms-win-core-comm-l1-1-0/api-ms-win-core-comm-l1-1-0.spec b/dlls/api-ms-win-core-comm-l1-1-0/api-ms-win-core-comm-l1-1-0.spec new file mode 100644 index 0000000..4842c98 --- /dev/null +++ b/dlls/api-ms-win-core-comm-l1-1-0/api-ms-win-core-comm-l1-1-0.spec @@ -0,0 +1,18 @@ +@ stdcall ClearCommBreak(long) kernel32.ClearCommBreak +@ stdcall ClearCommError(long ptr ptr) kernel32.ClearCommError +@ stdcall EscapeCommFunction(long long) kernel32.EscapeCommFunction +@ stdcall GetCommConfig(long ptr ptr) kernel32.GetCommConfig +@ stdcall GetCommMask(long ptr) kernel32.GetCommMask +@ stdcall GetCommModemStatus(long ptr) kernel32.GetCommModemStatus +@ stdcall GetCommProperties(long ptr) kernel32.GetCommProperties +@ stdcall GetCommState(long ptr) kernel32.GetCommState +@ stdcall GetCommTimeouts(long ptr) kernel32.GetCommTimeouts +@ stdcall PurgeComm(long long) kernel32.PurgeComm +@ stdcall SetCommBreak(long) kernel32.SetCommBreak +@ stdcall SetCommConfig(long ptr long) kernel32.SetCommConfig +@ stdcall SetCommMask(long long) kernel32.SetCommMask +@ stdcall SetCommState(long ptr) kernel32.SetCommState +@ stdcall SetCommTimeouts(long ptr) kernel32.SetCommTimeouts +@ stdcall SetupComm(long long long) kernel32.SetupComm +@ stdcall TransmitCommChar(long long) kernel32.TransmitCommChar +@ stdcall WaitCommEvent(long ptr ptr) kernel32.WaitCommEvent diff --git a/tools/make_specfiles b/tools/make_specfiles index cd3af87..24514fc 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -198,6 +198,7 @@ my @dll_groups = "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-appcompat-l1-1-1", "api-ms-win-core-atoms-l1-1-0", + "api-ms-win-core-comm-l1-1-0", "api-ms-win-core-debug-l1-1-0", "api-ms-win-core-debug-l1-1-1", "api-ms-win-core-delayload-l1-1-0",

1 0

Józef Kucia : dxgi: Fix dxgi_output_QueryInterface().
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: b3d819a1d7a406176e343ebfc9ef74341a2f098b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3d819a1d7a406176e343ebf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:01:54 2018 +0200 dxgi: Fix dxgi_output_QueryInterface(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44655 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/output.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 2b168fb..868a368 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -41,20 +41,24 @@ static inline struct dxgi_output *impl_from_IDXGIOutput4(IDXGIOutput4 *iface) /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, REFIID iid, void **object) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - - if (IsEqualGUID(riid, &IID_IDXGIOutput) - || IsEqualGUID(riid, &IID_IDXGIObject) - || IsEqualGUID(riid, &IID_IUnknown)) + TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + + if (IsEqualGUID(iid, &IID_IDXGIOutput4) + || IsEqualGUID(iid, &IID_IDXGIOutput3) + || IsEqualGUID(iid, &IID_IDXGIOutput2) + || IsEqualGUID(iid, &IID_IDXGIOutput1) + || IsEqualGUID(iid, &IID_IDXGIOutput) + || IsEqualGUID(iid, &IID_IDXGIObject) + || IsEqualGUID(iid, &IID_IUnknown)) { IUnknown_AddRef(iface); *object = iface; return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *object = NULL; return E_NOINTERFACE;

1 0

Józef Kucia : wined3d: Fix initial data for non-GPU buffers.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: 3cd28caf17284af48a57538e06effbce26cefe0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cd28caf17284af48a57538e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:01:58 2018 +0200 wined3d: Fix initial data for non-GPU buffers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44655 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a824d94..639a145 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1230,6 +1230,28 @@ void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_co wined3d_buffer_upload_ranges(buffer, context, data, range.offset, 1, &range); } +static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, + struct wined3d_device *device, const struct wined3d_sub_resource_data *data) +{ + struct wined3d_resource *resource = &buffer->resource; + struct wined3d_bo_address bo; + struct wined3d_box box; + + if (buffer->flags & WINED3D_BUFFER_USE_BO) + { + wined3d_box_set(&box, 0, 0, resource->size, 1, 0, 1); + wined3d_cs_emit_update_sub_resource(device->cs, resource, + 0, &box, data->data, data->row_pitch, data->slice_pitch); + } + else + { + wined3d_buffer_get_memory(buffer, &bo, WINED3D_LOCATION_SYSMEM); + memcpy(bo.addr, data->data, resource->size); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_SYSMEM); + wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_SYSMEM); + } +} + static ULONG buffer_resource_incref(struct wined3d_resource *resource) { return wined3d_buffer_incref(buffer_from_resource(resource)); @@ -1326,7 +1348,6 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device const struct wined3d_format *format = wined3d_get_format(device->adapter, format_id, usage); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_resource *resource = &buffer->resource; - struct wined3d_box box; BOOL dynamic_buffer_ok; HRESULT hr; @@ -1408,11 +1429,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->maps_size = 1; if (data) - { - wined3d_box_set(&box, 0, 0, resource->size, 1, 0, 1); - wined3d_cs_emit_update_sub_resource(device->cs, resource, - 0, &box, data->data, data->row_pitch, data->slice_pitch); - } + wined3d_buffer_init_data(buffer, device, data); return WINED3D_OK; }

1 0

Michael Müller : wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in InternetCrackUrlW.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: bfe8510ec0c7bcef0be1f6990c56ad235d8bccd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfe8510ec0c7bcef0be1f699… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Aug 31 02:29:05 2018 +0000 wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in InternetCrackUrlW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40598 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 21 ++++++++++++++++++--- dlls/wininet/tests/url.c | 6 +++--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6d0d35c..b407e85 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1664,7 +1664,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF if (dwFlags & ICU_DECODE) { - WCHAR *url_tmp; + WCHAR *url_tmp, *buffer; DWORD len = dwUrlLength + 1; BOOL ret; @@ -1673,9 +1673,24 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF SetLastError(ERROR_OUTOFMEMORY); return FALSE; } - ret = InternetCanonicalizeUrlW(url_tmp, url_tmp, &len, ICU_DECODE | ICU_NO_ENCODE); + + buffer = url_tmp; + ret = InternetCanonicalizeUrlW(url_tmp, buffer, &len, ICU_DECODE | ICU_NO_ENCODE); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + buffer = heap_alloc(len * sizeof(WCHAR)); + if (!buffer) + { + SetLastError(ERROR_OUTOFMEMORY); + heap_free(url_tmp); + return FALSE; + } + ret = InternetCanonicalizeUrlW(url_tmp, buffer, &len, ICU_DECODE | ICU_NO_ENCODE); + } if (ret) - ret = InternetCrackUrlW(url_tmp, len, dwFlags & ~ICU_DECODE, lpUC); + ret = InternetCrackUrlW(buffer, len, dwFlags & ~ICU_DECODE, lpUC); + + if (buffer != url_tmp) heap_free(buffer); heap_free(url_tmp); return ret; } diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 18c77b6..19ae7c3 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -816,9 +816,9 @@ static void InternetCrackUrlW_test(void) comp.lpszUrlPath = urlpart; comp.dwUrlPathLength = ARRAY_SIZE(urlpart); r = InternetCrackUrlW(url3, 0, ICU_DECODE, &comp); - todo_wine ok(r, "InternetCrackUrlW failed unexpectedly\n"); - todo_wine ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); - ok(urlpart[0] == 0, "urlpart should be empty\n"); + ok(r, "InternetCrackUrlW failed unexpectedly\n"); + ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); + todo_wine ok(urlpart[0] == 0, "urlpart should be empty\n"); } static void fill_url_components(URL_COMPONENTSA *lpUrlComponents)

1 0

Jacek Caban : mshtml: Added IHTMLCSSStyleDeclaration:: removeProperty implementation.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: 9269cda82bb0105e276441ed20695d8de0b60576 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9269cda82bb0105e276441ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 7 14:50:56 2018 +0200 mshtml: Added IHTMLCSSStyleDeclaration::removeProperty implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index d6ea37d..8cfc6e1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -4766,8 +4766,18 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_getPropertyPriority(IHTMLCSSStyleD static HRESULT WINAPI HTMLCSSStyleDeclaration_removeProperty(IHTMLCSSStyleDeclaration *iface, BSTR bstrPropertyName, BSTR *pbstrPropertyValue) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrPropertyName), pbstrPropertyValue); - return E_NOTIMPL; + const style_tbl_entry_t *style_entry; + nsAString name_str, ret_str; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrPropertyName), pbstrPropertyValue); + + style_entry = lookup_style_tbl(bstrPropertyName); + nsAString_InitDepend(&name_str, style_entry ? style_entry->name : bstrPropertyName); + nsAString_Init(&ret_str, NULL); + nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->nsstyle, &name_str, &ret_str); + nsAString_Finish(&name_str); + return return_nsstr(nsres, &ret_str, pbstrPropertyValue); } static HRESULT WINAPI HTMLCSSStyleDeclaration_setProperty(IHTMLCSSStyleDeclaration *iface, BSTR bstrPropertyName, VARIANT *pvarPropertyValue, VARIANT *pvarPropertyPriority)

1 0

Józef Kucia : d3d11: Pass normalized D3D11_DEPTH_STENCIL_DESC to wine_rb_put().
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: ffe182009edecc35f27edf48208fa8e941edd441 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffe182009edecc35f27edf48… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:01:56 2018 +0200 d3d11: Pass normalized D3D11_DEPTH_STENCIL_DESC to wine_rb_put(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 9848690..c36b87f 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -762,7 +762,7 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP return hr; } - if (wine_rb_put(&device->depthstencil_states, desc, &object->entry) == -1) + if (wine_rb_put(&device->depthstencil_states, &tmp_desc, &object->entry) == -1) { ERR("Failed to insert depthstencil state entry.\n"); d3d_depthstencil_state_cleanup(object);

1 0

André Hentschel : api-ms-win-security-cryptoapi-l1-1-0: Add dll.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: 18461f64f65f79526ee5a9fcc82cdb4ec9b01b6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=18461f64f65f79526ee5a9fc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 7 14:07:29 2018 +0200 api-ms-win-security-cryptoapi-l1-1-0: Add dll. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-security-cryptoapi-l1-1-0.spec | 39 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 44 insertions(+) diff --git a/configure b/configure index 6961193..a3916ee 100755 --- a/configure +++ b/configure @@ -1089,6 +1089,7 @@ enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 enable_api_ms_win_security_base_private_l1_1_1 enable_api_ms_win_security_credentials_l1_1_0 +enable_api_ms_win_security_cryptoapi_l1_1_0 enable_api_ms_win_security_grouppolicy_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_1 @@ -19185,6 +19186,7 @@ wine_fn_config_makefile dlls/api-ms-win-security-base-l1-1-0 enable_api_ms_win_s wine_fn_config_makefile dlls/api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-security-base-private-l1-1-1 enable_api_ms_win_security_base_private_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-security-credentials-l1-1-0 enable_api_ms_win_security_credentials_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-security-cryptoapi-l1-1-0 enable_api_ms_win_security_cryptoapi_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-grouppolicy-l1-1-0 enable_api_ms_win_security_grouppolicy_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 diff --git a/configure.ac b/configure.ac index f8af8a3..006f7d9 100644 --- a/configure.ac +++ b/configure.ac @@ -3042,6 +3042,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-credentials-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-cryptoapi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-grouppolicy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-1) diff --git a/dlls/api-ms-win-security-cryptoapi-l1-1-0/Makefile.in b/dlls/api-ms-win-security-cryptoapi-l1-1-0/Makefile.in new file mode 100644 index 0000000..48c0d82 --- /dev/null +++ b/dlls/api-ms-win-security-cryptoapi-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-cryptoapi-l1-1-0.dll diff --git a/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec b/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec new file mode 100644 index 0000000..357af4c --- /dev/null +++ b/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec @@ -0,0 +1,39 @@ +@ stdcall CryptAcquireContextA(ptr str str long long) advapi32.CryptAcquireContextA +@ stdcall CryptAcquireContextW(ptr wstr wstr long long) advapi32.CryptAcquireContextW +@ stdcall CryptContextAddRef(long ptr long) advapi32.CryptContextAddRef +@ stdcall CryptCreateHash(long long long long ptr) advapi32.CryptCreateHash +@ stdcall CryptDecrypt(long long long long ptr ptr) advapi32.CryptDecrypt +@ stdcall CryptDeriveKey(long long long long ptr) advapi32.CryptDeriveKey +@ stdcall CryptDestroyHash(long) advapi32.CryptDestroyHash +@ stdcall CryptDestroyKey(long) advapi32.CryptDestroyKey +@ stdcall CryptDuplicateHash(long ptr long ptr) advapi32.CryptDuplicateHash +@ stdcall CryptDuplicateKey(long ptr long ptr) advapi32.CryptDuplicateKey +@ stdcall CryptEncrypt(long long long long ptr ptr long) advapi32.CryptEncrypt +@ stdcall CryptEnumProviderTypesA(long ptr long ptr ptr ptr) advapi32.CryptEnumProviderTypesA +@ stdcall CryptEnumProviderTypesW(long ptr long ptr ptr ptr) advapi32.CryptEnumProviderTypesW +@ stdcall CryptEnumProvidersA(long ptr long ptr ptr ptr) advapi32.CryptEnumProvidersA +@ stdcall CryptEnumProvidersW(long ptr long ptr ptr ptr) advapi32.CryptEnumProvidersW +@ stdcall CryptExportKey(long long long long ptr ptr) advapi32.CryptExportKey +@ stdcall CryptGenKey(long long long ptr) advapi32.CryptGenKey +@ stdcall CryptGenRandom(long long ptr) advapi32.CryptGenRandom +@ stdcall CryptGetDefaultProviderA(long ptr long ptr ptr) advapi32.CryptGetDefaultProviderA +@ stdcall CryptGetDefaultProviderW(long ptr long ptr ptr) advapi32.CryptGetDefaultProviderW +@ stdcall CryptGetHashParam(long long ptr ptr long) advapi32.CryptGetHashParam +@ stdcall CryptGetKeyParam(long long ptr ptr long) advapi32.CryptGetKeyParam +@ stdcall CryptGetProvParam(long long ptr ptr long) advapi32.CryptGetProvParam +@ stdcall CryptGetUserKey(long long ptr) advapi32.CryptGetUserKey +@ stdcall CryptHashData(long ptr long long) advapi32.CryptHashData +@ stdcall CryptHashSessionKey(long long long) advapi32.CryptHashSessionKey +@ stdcall CryptImportKey(long ptr long long long ptr) advapi32.CryptImportKey +@ stdcall CryptReleaseContext(long long) advapi32.CryptReleaseContext +@ stdcall CryptSetHashParam(long long ptr long) advapi32.CryptSetHashParam +@ stdcall CryptSetKeyParam(long long ptr long) advapi32.CryptSetKeyParam +@ stdcall CryptSetProvParam(long long ptr long) advapi32.CryptSetProvParam +@ stdcall CryptSetProviderA(str long) advapi32.CryptSetProviderA +@ stdcall CryptSetProviderExA(str long ptr long) advapi32.CryptSetProviderExA +@ stdcall CryptSetProviderExW(wstr long ptr long) advapi32.CryptSetProviderExW +@ stdcall CryptSetProviderW(wstr long) advapi32.CryptSetProviderW +@ stdcall CryptSignHashA(long long str long ptr ptr) advapi32.CryptSignHashA +@ stdcall CryptSignHashW(long long wstr long ptr ptr) advapi32.CryptSignHashW +@ stdcall CryptVerifySignatureA(long ptr long long str long) advapi32.CryptVerifySignatureA +@ stdcall CryptVerifySignatureW(long ptr long long wstr long) advapi32.CryptVerifySignatureW diff --git a/tools/make_specfiles b/tools/make_specfiles index d69563b..7d4a85b 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -137,6 +137,7 @@ my @dll_groups = "api-ms-win-security-base-l1-2-0", "api-ms-win-security-base-private-l1-1-1", "api-ms-win-security-credentials-l1-1-0", + "api-ms-win-security-cryptoapi-l1-1-0", "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-lsalookup-l1-1-1", "api-ms-win-security-lsalookup-l2-1-0",

1 0

Jacek Caban : mshtml: Added IHTMLCSSStyleDeclaration:: cssFloat property implementation.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: 78d0aab45b433ed69a0d6dd6ba46f0240a5ab406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78d0aab45b433ed69a0d6dd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 7 14:44:24 2018 +0200 mshtml: Added IHTMLCSSStyleDeclaration::cssFloat property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 8 ++++---- dlls/mshtml/tests/style.c | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 479c1df..fbdf633 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -7284,15 +7284,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_clipLeft(IHTMLCSSStyleDeclarat static HRESULT WINAPI HTMLCSSStyleDeclaration_put_cssFloat(IHTMLCSSStyleDeclaration *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_FLOAT, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_cssFloat(IHTMLCSSStyleDeclaration *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_FLOAT, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundClip(IHTMLCSSStyleDeclaration *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 9addbcf..ca1909c 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2861,6 +2861,26 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_styleFloat(style, &str); ok(hres == S_OK, "get_styleFloat failed: %08x\n", hres); ok(!strcmp_wa(str, "left"), "styleFloat = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + if(css_style) { + str = NULL; + hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str); + ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres); + ok(!strcmp_wa(str, "left"), "styleFloat = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("right"); + hres = IHTMLCSSStyleDeclaration_put_cssFloat(css_style, str); + ok(hres == S_OK, "put_styleFloat failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str); + ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres); + ok(!strcmp_wa(str, "right"), "styleFloat = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres);

1 0

Alexandre Julliard : user32: Ignore application-specified DPI awareness when DPI scaling is disabled.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: 15059052904910b9efab898b43a264bc91e261f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15059052904910b9efab898b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 7 18:16:10 2018 +0200 user32: Ignore application-specified DPI awareness when DPI scaling is disabled. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 028a0a9..224d2f9 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1460,7 +1460,11 @@ void SYSPARAMS_Init(void) /* FIXME: what do the DpiScalingVer flags mean? */ get_dword_entry( (union sysparam_all_entry *)&entry_DPISCALINGVER, 0, &dpi_scaling, 0 ); - if (!dpi_scaling) default_awareness = DPI_AWARENESS_PER_MONITOR_AWARE; + if (!dpi_scaling) + { + default_awareness = DPI_AWARENESS_PER_MONITOR_AWARE; + if (dpi_awareness) dpi_awareness = 0x10 | default_awareness; + } if (volatile_base_key && dispos == REG_CREATED_NEW_KEY) /* first process, initialize entries */ {

1 0