June 2018 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 3.10
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: website Branch: master Commit: 39105f61a0d3e3bab8808a50909cd57d362851bb URL: https://source.winehq.org/git/website.git/?a=commit;h=39105f61a0d3e3bab8808… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 11 20:11:08 2018 +0200 Wine release 3.10 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018061101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018061101.xml b/news/en/2018061101.xml new file mode 100644 index 0000000..6562c86 --- /dev/null +++ b/news/en/2018061101.xml @@ -0,0 +1,16 @@ +<news> +<date>June 11, 2018</date> +<title>Wine 3.10 Released</title> +<body> + The Wine development release 3.10 is now available. + <a href="{$root}/announce/3.10">What's new</a> in this release: +<ul> + <li>Swapchain support in Direct 3D 12.</li> + <li>Vulkan support updated to the latest spec.</li> + <li>Debugger support for Wow64 processes.</li> + <li>Still more support for the Task Scheduler.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.10.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-3.10 : Alexandre Julliard : Release 3.10
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: refs/tags/wine-3.10 Tag: 8baf65325b5611fe0793094a380e7dc18d73ab95 URL: https://source.winehq.org/git/wine.git/?a=tag;h=8baf65325b5611fe0793094a380… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 11 20:08:39 2018 +0200 Release 3.10

1 0

Alexandre Julliard : Release 3.10.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: e470221dcaaadf10f222551997ff837f1e7557de URL: https://source.winehq.org/git/wine.git/?a=commit;h=e470221dcaaadf10f2225519… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 11 20:08:39 2018 +0200 Release 3.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 690 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 371 insertions(+), 341 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e470221dcaaadf10f222…

1 0

Józef Kucia : winevulkan: Remove unused variable from make_vulkan script.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: e45e675b731679639b3054a086a40d1cbb8c0174 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e45e675b731679639b3054a0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 11 12:32:50 2018 +0200 winevulkan: Remove unused variable from make_vulkan script. Fixes a333c2ef07d3 ("winevulkan: Add copyright headers to files generated from vk.xml.") Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 47a216e..c32d9ed 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1891,7 +1891,6 @@ class VkGenerator(object): self.host_structs.append(conv.struct) def _generate_copyright(self, f, spec_file=False): - c = "# " if spec_file else " * " f.write("# " if spec_file else "/* ") f.write("Automatically generated from Vulkan vk.xml; DO NOT EDIT!\n") lines = ["", "This file is generated from Vulkan vk.xml file covered",

1 0

Jacek Caban : wininet: Simplify header string handling in HTTP_HttpSendRequestW.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: 54b414b1216fba5a0e3b41f7e2ced1af48ec5797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54b414b1216fba5a0e3b41f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 16:46:05 2018 +0200 wininet: Simplify header string handling in HTTP_HttpSendRequestW. Spotted by Mark Jansen, avoids potential double-free. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f28f7c5..b91dbdf 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4853,7 +4853,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, DWORD dwContentLength, BOOL bEndRequest) { BOOL redirected = FALSE, secure_proxy_connect = FALSE, loop_next; - LPWSTR requestString = NULL; + WCHAR *request_header = NULL; INT responseLen, cnt; DWORD res; @@ -4963,12 +4963,12 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (HTTP_GetCustomHeaderIndex(request, szContent_Length, 0, TRUE) >= 0) set_content_length_header(request, 0, HTTP_ADDREQ_FLAG_REPLACE); - requestString = build_request_header(request, connectW, target, g_szHttp1_1, TRUE); + request_header = build_request_header(request, connectW, target, g_szHttp1_1, TRUE); } else if (request->proxy && !(request->hdr.dwFlags & INTERNET_FLAG_SECURE)) { WCHAR *url = build_proxy_path_url(request); - requestString = build_request_header(request, request->verb, url, request->version, TRUE); + request_header = build_request_header(request, request->verb, url, request->version, TRUE); heap_free(url); } else @@ -4976,16 +4976,17 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (request->proxy && HTTP_GetCustomHeaderIndex(request, szContent_Length, 0, TRUE) >= 0) set_content_length_header(request, dwContentLength, HTTP_ADDREQ_FLAG_REPLACE); - requestString = build_request_header(request, request->verb, request->path, request->version, TRUE); + request_header = build_request_header(request, request->verb, request->path, request->version, TRUE); } - TRACE("Request header -> %s\n", debugstr_w(requestString) ); + TRACE("Request header -> %s\n", debugstr_w(request_header) ); /* send the request as ASCII, tack on the optional data */ if (!lpOptional || redirected || secure_proxy_connect) data_len = 0; - ascii_req = build_ascii_request( requestString, lpOptional, data_len, &len ); + ascii_req = build_ascii_request(request_header, lpOptional, data_len, &len); + heap_free(request_header); TRACE("full request -> %s\n", debugstr_a(ascii_req) ); INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, @@ -5068,10 +5069,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, http_release_netconn(request, drain_content(request, FALSE) == ERROR_SUCCESS); res = HTTP_HandleRedirect(request, new_url); heap_free(new_url); - if (res == ERROR_SUCCESS) { - heap_free(requestString); + if (res == ERROR_SUCCESS) loop_next = TRUE; - } redirected = TRUE; } } @@ -5090,7 +5089,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->session->userName, request->session->password, host)) { - heap_free(requestString); if (drain_content(request, TRUE) != ERROR_SUCCESS) { FIXME("Could not drain content\n"); @@ -5119,7 +5117,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->session->appInfo->proxyPassword, NULL)) { - heap_free(requestString); if (drain_content(request, TRUE) != ERROR_SUCCESS) { FIXME("Could not drain content\n"); @@ -5162,8 +5159,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, while (loop_next); lend: - heap_free(requestString); - /* TODO: send notification for P3P header */ if(res == ERROR_SUCCESS)

1 0

Józef Kucia : wined3d: Execute all CS commands before changing swapchain window.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: 49da19e51ba5623a5e169a59fe3de1414b80ebba URL: https://source.winehq.org/git/wine.git/?a=commit;h=49da19e51ba5623a5e169a59… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 11 12:05:06 2018 +0200 wined3d: Execute all CS commands before changing swapchain window. Fixes a race condition. 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/swapchain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7a3f1ff..9df40ab 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -135,6 +135,8 @@ void * CDECL wined3d_swapchain_get_parent(const struct wined3d_swapchain *swapch void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window) { + struct wined3d_device *device = swapchain->device; + if (!window) window = swapchain->device_window; if (window == swapchain->win_handle) @@ -142,6 +144,9 @@ void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWN TRACE("Setting swapchain %p window from %p to %p.\n", swapchain, swapchain->win_handle, window); + + device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + swapchain->win_handle = window; }

1 0

Józef Kucia : d3d12/tests: Print adapter info.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: befe3aa568d5d3ddbf29bda22335fe1942b51229 URL: https://source.winehq.org/git/wine.git/?a=commit;h=befe3aa568d5d3ddbf29bda2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 11 12:05:09 2018 +0200 d3d12/tests: Print adapter info. 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/d3d12/tests/d3d12.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 37f5c51..51967a0 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -116,6 +116,37 @@ static ID3D12Device *create_device(void) return device; } +static void print_adapter_info(void) +{ + DXGI_ADAPTER_DESC adapter_desc; + IDXGIFactory4 *factory; + IDXGIAdapter *adapter; + ID3D12Device *device; + HRESULT hr; + LUID luid; + + if (!(device = create_device())) + return; + luid = ID3D12Device_GetAdapterLuid(device); + ID3D12Device_Release(device); + + hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + hr = IDXGIFactory4_EnumAdapterByLuid(factory, luid, &IID_IDXGIAdapter, (void **)&adapter); + todo_wine ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); + IDXGIFactory4_Release(factory); + + if (FAILED(hr)) + return; + + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + trace("Adapter: %s, %04x:%04x.\n", wine_dbgstr_w(adapter_desc.Description), + adapter_desc.VendorId, adapter_desc.DeviceId); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -794,6 +825,8 @@ START_TEST(d3d12) use_adapter_idx = atoi(argv[++i]); } + print_adapter_info(); + test_interfaces(); test_draw(); test_swapchain_draw();

1 0

Jacek Caban : jscript: Use jsdisp_define_data_property in Object.getOwnPropertyDescriptor.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: b0cce16c7a390c3ce5e3f800a8c50f34425e9072 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0cce16c7a390c3ce5e3f800… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 15:54:26 2018 +0200 jscript: Use jsdisp_define_data_property in Object.getOwnPropertyDescriptor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.h | 6 ++++-- dlls/jscript/object.c | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 5a7be8e..1cb6d15 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -90,10 +90,12 @@ extern HINSTANCE jscript_hinstance DECLSPEC_HIDDEN; #define PROPF_ARGMASK 0x00ff #define PROPF_METHOD 0x0100 -#define PROPF_ENUMERABLE 0x0200 -#define PROPF_CONSTR 0x0400 +#define PROPF_CONSTR 0x0200 + +#define PROPF_ENUMERABLE 0x0400 #define PROPF_WRITABLE 0x0800 #define PROPF_CONFIGURABLE 0x1000 +#define PROPF_ALL (PROPF_ENUMERABLE | PROPF_WRITABLE | PROPF_CONFIGURABLE) #define PROPF_VERSION_MASK 0x01ff0000 #define PROPF_VERSION_SHIFT 16 diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index d18f1c9..9428931 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -493,23 +493,23 @@ static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, vdisp_t *jsthi return hres; if(prop_desc.explicit_getter || prop_desc.explicit_setter) { - hres = jsdisp_propput_name(desc_obj, getW, prop_desc.getter - ? jsval_obj(prop_desc.getter) : jsval_undefined()); + hres = jsdisp_define_data_property(desc_obj, getW, PROPF_ALL, + prop_desc.getter ? jsval_obj(prop_desc.getter) : jsval_undefined()); if(SUCCEEDED(hres)) - hres = jsdisp_propput_name(desc_obj, setW, prop_desc.setter - ? jsval_obj(prop_desc.setter) : jsval_undefined()); + hres = jsdisp_define_data_property(desc_obj, setW, PROPF_ALL, + prop_desc.setter ? jsval_obj(prop_desc.setter) : jsval_undefined()); }else { hres = jsdisp_propput_name(desc_obj, valueW, prop_desc.value); if(SUCCEEDED(hres)) - hres = jsdisp_propput_name(desc_obj, writableW, - jsval_bool(!!(prop_desc.flags & PROPF_WRITABLE))); + hres = jsdisp_define_data_property(desc_obj, writableW, PROPF_ALL, + jsval_bool(!!(prop_desc.flags & PROPF_WRITABLE))); } if(SUCCEEDED(hres)) - hres = jsdisp_propput_name(desc_obj, enumerableW, - jsval_bool(!!(prop_desc.flags & PROPF_ENUMERABLE))); + hres = jsdisp_define_data_property(desc_obj, enumerableW, PROPF_ALL, + jsval_bool(!!(prop_desc.flags & PROPF_ENUMERABLE))); if(SUCCEEDED(hres)) - hres = jsdisp_propput_name(desc_obj, configurableW, - jsval_bool(!!(prop_desc.flags & PROPF_CONFIGURABLE))); + hres = jsdisp_define_data_property(desc_obj, configurableW, PROPF_ALL, + jsval_bool(!!(prop_desc.flags & PROPF_CONFIGURABLE))); release_property_descriptor(&prop_desc); if(SUCCEEDED(hres) && r)

1 0

Józef Kucia : wined3d: Remove hardware level detection hacks.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: 4ef04c7ebc2f0e05c061fe0c7025005b869f85e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ef04c7ebc2f0e05c061fe0c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 11 12:05:07 2018 +0200 wined3d: Remove hardware level detection hacks. Core contexts are enabled by default since 0db4d1c251d293333e2721a78d6156008a90ff6f. 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/directx.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index afb9718..9bc9c31 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1857,22 +1857,15 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s return HW_VENDOR_NVIDIA; } -static enum wined3d_d3d_level d3d_level_from_caps(const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps, DWORD glsl_version) +static enum wined3d_d3d_level d3d_level_from_caps(const struct shader_caps *shader_caps, + const struct fragment_caps *fragment_caps) { if (shader_caps->vs_version >= 5) return WINED3D_D3D_LEVEL_11; if (shader_caps->vs_version == 4) return WINED3D_D3D_LEVEL_10; if (shader_caps->vs_version == 3) - { - /* wined3d with default settings at the moment doesn't expose SM4+ on - * Mesa drivers. */ - if (glsl_version >= MAKEDWORD_VERSION(4, 30)) - return WINED3D_D3D_LEVEL_11; - if (glsl_version >= MAKEDWORD_VERSION(1, 30)) - return WINED3D_D3D_LEVEL_10; return WINED3D_D3D_LEVEL_9_SM3; - } if (shader_caps->vs_version == 2) return WINED3D_D3D_LEVEL_9_SM2; if (shader_caps->vs_version == 1) @@ -2562,9 +2555,9 @@ static enum wined3d_pci_device wined3d_guess_card(const struct shader_caps *shad * memory behind our backs if really needed. Note that the amount of video * memory can be overruled using a registry setting. */ - unsigned int i; - enum wined3d_d3d_level d3d_level = d3d_level_from_caps(shader_caps, fragment_caps, glsl_version); + enum wined3d_d3d_level d3d_level = d3d_level_from_caps(shader_caps, fragment_caps); enum wined3d_pci_device device; + unsigned int i; for (i = 0; i < ARRAY_SIZE(card_vendor_table); ++i) {

1 0

Jacek Caban : mshtml/tests: Silence noisy traces.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: dac8036fb601581d36f44400990756d7f56ce988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dac8036fb601581d36f44400… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 17:08:12 2018 +0200 mshtml/tests: Silence noisy traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 1f40fed..3729fc3 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -906,7 +906,7 @@ static HRESULT WINAPI NewWindowManager_QueryInterface(INewWindowManager *iface, return S_OK; } - trace("NewWindowManager_QueryInterface %s\n", wine_dbgstr_guid(riid)); + if(winetest_debug > 1) trace("NewWindowManager_QueryInterface %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -1248,7 +1248,7 @@ static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void return E_NOINTERFACE; } - trace("Binding::QI(%s)\n", wine_dbgstr_guid(riid)); + if(winetest_debug > 1) trace("Binding::QI(%s)\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -2727,7 +2727,7 @@ static HRESULT WINAPI CustomDocHostUIHandler_QueryInterface(IDocHostUIHandler2 * if(IsEqualGUID(&IID_IDocHostShowUI, riid)) return E_NOINTERFACE; /* TODO */ - trace("CustomDocHostUIHandler::QI(%s)\n", wine_dbgstr_guid(riid)); + if(winetest_debug > 1) trace("CustomDocHostUIHandler::QI(%s)\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -5328,7 +5328,7 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) return E_NOINTERFACE; /* IE10 */ else if(IsEqualGUID(&IID_IDocHostUIHandlerPriv, riid)) return E_NOINTERFACE; /* ? */ - else + else if(winetest_debug > 1) trace("QI(%s)\n", wine_dbgstr_guid(riid)); if(*ppv)

1 0