wine-commits June 2018

wine-commits@winehq.org

1 participants
629 discussions

Józef Kucia : d3d12/tests: Print adapter info.
by Alexandre Julliard 11 Jun '18

11 Jun '18

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

Józef Kucia : d3d12/tests: Add option to use selected adapter.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: b3ba6ea2251ea83eeba8ad7032f8f5180fcb6c44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3ba6ea2251ea83eeba8ad70… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 11 12:05:08 2018 +0200 d3d12/tests: Add option to use selected adapter. 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 | 50 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index c8f17f3..37f5c51 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -70,11 +70,47 @@ static void set_viewport(D3D12_VIEWPORT *vp, float x, float y, vp->MaxDepth = max_depth; } +static BOOL use_warp_adapter; +static unsigned int use_adapter_idx; + +static IDXGIAdapter *create_adapter(void) +{ + IDXGIFactory4 *factory; + IDXGIAdapter *adapter; + HRESULT hr; + + if (!use_warp_adapter && !use_adapter_idx) + return NULL; + + hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + + adapter = NULL; + if (use_warp_adapter) + { + hr = IDXGIFactory4_EnumWarpAdapter(factory, &IID_IDXGIAdapter, (void **)&adapter); + } + else + { + hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, &adapter); + } + IDXGIFactory4_Release(factory); + if (FAILED(hr)) + trace("Failed to get adapter, hr %#x.\n", hr); + return adapter; +} + static ID3D12Device *create_device(void) { + IDXGIAdapter *adapter; ID3D12Device *device; + HRESULT hr; - if (FAILED(D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) + adapter = create_adapter(); + hr = D3D12CreateDevice((IUnknown *)adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); + if (adapter) + IDXGIAdapter_Release(adapter); + if (FAILED(hr)) return NULL; return device; @@ -746,6 +782,18 @@ static void test_swapchain_draw(void) START_TEST(d3d12) { + unsigned int argc, i; + char **argv; + + argc = winetest_get_mainargs(&argv); + for (i = 2; i < argc; ++i) + { + if (!strcmp(argv[i], "--warp")) + use_warp_adapter = TRUE; + else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) + use_adapter_idx = atoi(argv[++i]); + } + test_interfaces(); test_draw(); test_swapchain_draw();

1 0

Józef Kucia : wined3d: Remove hardware level detection hacks.
by Alexandre Julliard 11 Jun '18

11 Jun '18

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

Józef Kucia : wined3d: Execute all CS commands before changing swapchain window.
by Alexandre Julliard 11 Jun '18

11 Jun '18

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

Jacek Caban : wininet: Simplify header string handling in HTTP_HttpSendRequestW.
by Alexandre Julliard 11 Jun '18

11 Jun '18

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

Jacek Caban : jscript: Use jsdisp_define_data_property in Object.getOwnPropertyDescriptor.
by Alexandre Julliard 11 Jun '18

11 Jun '18

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 : winevulkan: Remove unused variable from make_vulkan script.
by Alexandre Julliard 11 Jun '18

11 Jun '18

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

Józef Kucia : winevulkan: Correctly recognize commands belonging to multiple extensions.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: dbb0c9305aa20dbf38ba092a8b6b51929172cb0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbb0c9305aa20dbf38ba092a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 11 12:32:49 2018 +0200 winevulkan: Correctly recognize commands belonging to multiple extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 4 ++++ dlls/winevulkan/make_vulkan | 17 +++++++---------- dlls/winevulkan/winevulkan.spec | 4 ++++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec index 0a4e85e..860b4c8 100644 --- a/dlls/vulkan-1/vulkan-1.spec +++ b/dlls/vulkan-1/vulkan-1.spec @@ -34,6 +34,7 @@ # but only in their entirety and only with respect to the Combined Software. # +@ stub vkAcquireNextImage2KHR @ stdcall vkAcquireNextImageKHR(ptr int64 int64 int64 int64 ptr) winevulkan.wine_vkAcquireNextImageKHR @ stdcall vkAllocateCommandBuffers(ptr ptr ptr) winevulkan.wine_vkAllocateCommandBuffers @ stdcall vkAllocateDescriptorSets(ptr ptr ptr) winevulkan.wine_vkAllocateDescriptorSets @@ -158,6 +159,8 @@ @ stub vkGetBufferMemoryRequirements2 @ stub vkGetDescriptorSetLayoutSupport @ stub vkGetDeviceGroupPeerMemoryFeatures +@ stub vkGetDeviceGroupPresentCapabilitiesKHR +@ stub vkGetDeviceGroupSurfacePresentModesKHR @ stdcall vkGetDeviceMemoryCommitment(ptr int64 ptr) winevulkan.wine_vkGetDeviceMemoryCommitment @ stdcall vkGetDeviceProcAddr(ptr str) winevulkan.wine_vkGetDeviceProcAddr @ stdcall vkGetDeviceQueue(ptr long long ptr) winevulkan.wine_vkGetDeviceQueue @@ -186,6 +189,7 @@ @ stub vkGetPhysicalDeviceImageFormatProperties2 @ stdcall vkGetPhysicalDeviceMemoryProperties(ptr ptr) winevulkan.wine_vkGetPhysicalDeviceMemoryProperties @ stub vkGetPhysicalDeviceMemoryProperties2 +@ stub vkGetPhysicalDevicePresentRectanglesKHR @ stdcall vkGetPhysicalDeviceProperties(ptr ptr) winevulkan.wine_vkGetPhysicalDeviceProperties @ stub vkGetPhysicalDeviceProperties2 @ stdcall vkGetPhysicalDeviceQueueFamilyProperties(ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceQueueFamilyProperties diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ea64c05..47a216e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -113,7 +113,7 @@ BLACKLISTED_EXTENSIONS = [ "VK_KHR_external_semaphore_capabilities", "VK_KHR_shared_presentable_image", # Needs WSI work. "VK_KHR_win32_keyed_mutex", - "VK_NV_external_memory_win32" + "VK_NV_external_memory_win32", ] # The Vulkan loader provides entry-points for core functionality and important @@ -123,7 +123,7 @@ CORE_EXTENSIONS = [ "VK_KHR_display_swapchain", "VK_KHR_surface", "VK_KHR_swapchain", - "VK_KHR_win32_surface" + "VK_KHR_win32_surface", ] # Functions part of our winevulkan graphics driver interface. @@ -377,8 +377,8 @@ class VkEnumValue(object): class VkFunction(object): - def __init__(self, _type=None, name=None, params=[], extension=None, alias=False): - self.extension = extension + def __init__(self, _type=None, name=None, params=[], extensions=[], alias=False): + self.extensions = [] self.name = name self.type = _type self.params = params @@ -448,13 +448,10 @@ class VkFunction(object): Core API as well as several KHR WSI extensions. """ - if self.extension is None: - return True - - if self.extension in CORE_EXTENSIONS: + if not self.extensions: return True - return False + return any(ext in self.extensions for ext in CORE_EXTENSIONS) def is_device_func(self): # If none of the other, it must be a device function @@ -2452,7 +2449,7 @@ class VkRegistry(object): commands = ext.findall("require/command") for command in commands: cmd_name = command.attrib["name"] - self.funcs[cmd_name].extension = ext_name + self.funcs[cmd_name].extensions.append(ext_name) # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index b923c64..f825079 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -36,6 +36,7 @@ @ stdcall vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr @ stdcall vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion +@ stub vkAcquireNextImage2KHR @ stdcall wine_vkAcquireNextImageKHR(ptr int64 int64 int64 int64 ptr) @ stdcall wine_vkAllocateCommandBuffers(ptr ptr ptr) @ stdcall wine_vkAllocateDescriptorSets(ptr ptr ptr) @@ -159,6 +160,8 @@ @ stub vkGetBufferMemoryRequirements2 @ stub vkGetDescriptorSetLayoutSupport @ stub vkGetDeviceGroupPeerMemoryFeatures +@ stub vkGetDeviceGroupPresentCapabilitiesKHR +@ stub vkGetDeviceGroupSurfacePresentModesKHR @ stdcall wine_vkGetDeviceMemoryCommitment(ptr int64 ptr) @ stdcall wine_vkGetDeviceProcAddr(ptr str) @ stdcall wine_vkGetDeviceQueue(ptr long long ptr) @@ -187,6 +190,7 @@ @ stub vkGetPhysicalDeviceImageFormatProperties2 @ stdcall wine_vkGetPhysicalDeviceMemoryProperties(ptr ptr) @ stub vkGetPhysicalDeviceMemoryProperties2 +@ stub vkGetPhysicalDevicePresentRectanglesKHR @ stdcall wine_vkGetPhysicalDeviceProperties(ptr ptr) @ stub vkGetPhysicalDeviceProperties2 @ stdcall wine_vkGetPhysicalDeviceQueueFamilyProperties(ptr ptr ptr)

1 0

Hans Leidekker : winhttp: Store the server certificate context in the request.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: f5ea51d36092b162ca49555c927ba51608f64f92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5ea51d36092b162ca49555c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 11 09:20:35 2018 +0200 winhttp: Store the server certificate context in the request. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 1 - dlls/winhttp/request.c | 11 +++++++++++ dlls/winhttp/session.c | 14 ++++++-------- dlls/winhttp/tests/winhttp.c | 5 +++++ dlls/winhttp/winhttp_private.h | 2 ++ 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index d0d02d5..d577a64 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -47,7 +47,6 @@ #include "windef.h" #include "winbase.h" #include "winhttp.h" -#include "wincrypt.h" #include "schannel.h" #include "winhttp_private.h" diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 96a2c91..56ec910 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1765,6 +1765,10 @@ static BOOL open_connection( request_t *request ) return FALSE; } } + + CertFreeCertificateContext( request->server_cert ); + request->server_cert = NULL; + if (!ensure_cred_handle( connect->session ) || !netconn_secure_connect( netconn, connect->hostname, request->security_flags, &connect->session->cred_handle )) @@ -1787,6 +1791,13 @@ static BOOL open_connection( request_t *request ) request->netconn = netconn; } + if (netconn->secure && !(request->server_cert = netconn_get_certificate( netconn ))) + { + heap_free( addressW ); + netconn_close( netconn ); + return FALSE; + } + done: request->read_pos = request->read_size = 0; request->read_chunked = FALSE; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index e2b91fa..fb81568 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -40,7 +40,6 @@ #include "winsock2.h" #include "ws2ipdef.h" #include "winhttp.h" -#include "wincrypt.h" #include "winreg.h" #define COBJMACROS #include "ole2.h" @@ -597,6 +596,8 @@ static void request_destroy( object_header_t *hdr ) } release_object( &request->connect->hdr ); + CertFreeCertificateContext( request->server_cert ); + destroy_authinfo( request->authinfo ); destroy_authinfo( request->proxy_authinfo ); @@ -759,14 +760,14 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf return FALSE; } - if (!request->netconn || !(cert = netconn_get_certificate( request->netconn ))) return FALSE; + if (!(cert = CertDuplicateCertificateContext( request->server_cert ))) return FALSE; *(CERT_CONTEXT **)buffer = (CERT_CONTEXT *)cert; *buflen = sizeof(cert); return TRUE; } case WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT: { - const CERT_CONTEXT *cert; + const CERT_CONTEXT *cert = request->server_cert; const CRYPT_OID_INFO *oidInfo; WINHTTP_CERTIFICATE_INFO *ci = buffer; @@ -778,16 +779,14 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf set_last_error( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } - if (!request->netconn || !(cert = netconn_get_certificate( request->netconn ))) return FALSE; + if (!cert) return FALSE; ci->ftExpiry = cert->pCertInfo->NotAfter; ci->ftStart = cert->pCertInfo->NotBefore; ci->lpszSubjectInfo = blob_to_str( cert->dwCertEncodingType, &cert->pCertInfo->Subject ); ci->lpszIssuerInfo = blob_to_str( cert->dwCertEncodingType, &cert->pCertInfo->Issuer ); ci->lpszProtocolName = NULL; - oidInfo = CryptFindOIDInfo( CRYPT_OID_INFO_OID_KEY, - cert->pCertInfo->SignatureAlgorithm.pszObjId, - 0 ); + oidInfo = CryptFindOIDInfo( CRYPT_OID_INFO_OID_KEY, cert->pCertInfo->SignatureAlgorithm.pszObjId, 0 ); if (oidInfo) ci->lpszSignatureAlgName = (LPWSTR)oidInfo->pwszName; else @@ -795,7 +794,6 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf ci->lpszEncryptionAlgName = NULL; ci->dwKeySize = request->netconn ? netconn_get_cipher_strength( request->netconn ) : 0; - CertFreeCertificateContext( cert ); *buflen = sizeof(*ci); return TRUE; } diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 302974c..4b4a84c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1107,6 +1107,11 @@ static void test_secure_connection(void) } ok(read_size >= available_size, "read_size = %u, available_size = %u\n", read_size, available_size); + size = sizeof(cert); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert, &size); + ok(ret, "failed to retrieve certificate context %u\n", GetLastError()); + if (ret) CertFreeCertificateContext(cert); + cleanup: WinHttpCloseHandle(req); WinHttpCloseHandle(con); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 0eb0dea..d639a2d 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -46,6 +46,7 @@ #include "ole2.h" #include "sspi.h" +#include "wincrypt.h" static const WCHAR getW[] = {'G','E','T',0}; static const WCHAR postW[] = {'P','O','S','T',0}; @@ -209,6 +210,7 @@ typedef struct DWORD optional_len; netconn_t *netconn; DWORD security_flags; + const CERT_CONTEXT *server_cert; int resolve_timeout; int connect_timeout; int send_timeout;

1 0

Michael Stefaniuc : mshtml/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: 6bc984a600f8610b555e5305686563700625ec4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bc984a600f8610b555e5305… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jun 7 23:44:40 2018 +0200 mshtml/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 59 ++++++++++++++-------------- dlls/mshtml/tests/htmldoc.c | 16 ++++---- dlls/mshtml/tests/htmllocation.c | 4 +- dlls/mshtml/tests/protocol.c | 78 ++++++++++++++++++-------------------- dlls/mshtml/tests/script.c | 4 +- dlls/mshtml/tests/xmlhttprequest.c | 4 +- 6 files changed, 80 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bc984a600f8610b555e…

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2018