April 2019 - Wine-commits - list.winehq.org

Zebediah Figura : rpcrt4: Write type format strings for complex structs.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: ad2cba9d8427a9543a0cca18267136b45741ba66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad2cba9d8427a9543a0cca18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 23:31:19 2019 -0500 rpcrt4: Write type format strings for complex structs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46378 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 231 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 221 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 3d3d42b..5a4de51 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -355,24 +355,42 @@ static unsigned char get_array_fc(ITypeInfo *typeinfo, TYPEDESC *desc) return FC_BOGUS_ARRAY; } -static size_t write_struct_tfs(ITypeInfo *typeinfo, unsigned char *str, +static BOOL type_is_non_iface_pointer(ITypeInfo *typeinfo, TYPEDESC *desc) +{ + if (desc->vt == VT_PTR) + return !type_pointer_is_iface(typeinfo, desc->lptdesc); + else if (desc->vt == VT_USERDEFINED) + { + ITypeInfo *refinfo; + TYPEATTR *attr; + BOOL ret; + + ITypeInfo_GetRefTypeInfo(typeinfo, desc->hreftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + + if (attr->typekind == TKIND_ALIAS) + ret = type_is_non_iface_pointer(refinfo, &attr->tdescAlias); + else + ret = FALSE; + + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); + + return ret; + } + else + return FALSE; +} + +static void write_struct_members(ITypeInfo *typeinfo, unsigned char *str, size_t *len, TYPEATTR *attr) { - unsigned char fc = get_struct_fc(typeinfo, attr); unsigned int struct_offset = 0; unsigned char basetype; - size_t off = *len; TYPEDESC *tdesc; VARDESC *desc; WORD i; - if (fc != FC_STRUCT) - FIXME("fc %02x not implemented\n", fc); - - WRITE_CHAR (str, *len, FC_STRUCT); - WRITE_CHAR (str, *len, attr->cbAlignment - 1); - WRITE_SHORT(str, *len, attr->cbSizeInstance); - for (i = 0; i < attr->cVars; i++) { ITypeInfo_GetVarDesc(typeinfo, i, &desc); @@ -391,12 +409,205 @@ static size_t write_struct_tfs(ITypeInfo *typeinfo, unsigned char *str, if ((basetype = get_basetype(typeinfo, tdesc))) WRITE_CHAR(str, *len, basetype); + else if (type_is_non_iface_pointer(typeinfo, tdesc)) + WRITE_CHAR(str, *len, FC_POINTER); + else + { + WRITE_CHAR(str, *len, FC_EMBEDDED_COMPLEX); + WRITE_CHAR(str, *len, 0); + WRITE_SHORT(str, *len, 0); + } ITypeInfo_ReleaseVarDesc(typeinfo, desc); } if (!(*len & 1)) WRITE_CHAR (str, *len, FC_PAD); WRITE_CHAR (str, *len, FC_END); +} + +static void write_simple_struct_tfs(ITypeInfo *typeinfo, unsigned char *str, + size_t *len, TYPEATTR *attr) +{ + write_struct_members(typeinfo, str, len, attr); +} + +static BOOL type_needs_pointer_deref(ITypeInfo *typeinfo, TYPEDESC *desc) +{ + if (desc->vt == VT_PTR || desc->vt == VT_UNKNOWN || desc->vt == VT_DISPATCH) + return TRUE; + else if (desc->vt == VT_USERDEFINED) + { + ITypeInfo *refinfo; + BOOL ret = FALSE; + TYPEATTR *attr; + + ITypeInfo_GetRefTypeInfo(typeinfo, desc->hreftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + + if (attr->typekind == TKIND_ALIAS) + ret = type_needs_pointer_deref(refinfo, &attr->tdescAlias); + + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); + + return ret; + } + else + return FALSE; +} + +static void write_complex_struct_pointer_layout(ITypeInfo *typeinfo, + TYPEDESC *desc, unsigned char *str, size_t *len) +{ + unsigned char basetype; + + if (desc->vt == VT_PTR && !type_pointer_is_iface(typeinfo, desc->lptdesc)) + { + WRITE_CHAR(str, *len, FC_UP); + if ((basetype = get_basetype(typeinfo, desc->lptdesc))) + { + WRITE_CHAR(str, *len, FC_SIMPLE_POINTER); + WRITE_CHAR(str, *len, basetype); + WRITE_CHAR(str, *len, FC_PAD); + } + else + { + if (type_needs_pointer_deref(typeinfo, desc->lptdesc)) + WRITE_CHAR(str, *len, FC_POINTER_DEREF); + else + WRITE_CHAR(str, *len, 0); + WRITE_SHORT(str, *len, 0); + } + } + else if (desc->vt == VT_USERDEFINED) + { + ITypeInfo *refinfo; + TYPEATTR *attr; + + ITypeInfo_GetRefTypeInfo(typeinfo, desc->hreftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + + if (attr->typekind == TKIND_ALIAS) + write_complex_struct_pointer_layout(refinfo, &attr->tdescAlias, str, len); + + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); + } +} + +static size_t write_complex_struct_pointer_ref(ITypeInfo *typeinfo, + TYPEDESC *desc, unsigned char *str, size_t *len) +{ + if (desc->vt == VT_PTR && !type_pointer_is_iface(typeinfo, desc->lptdesc) + && !get_basetype(typeinfo, desc->lptdesc)) + { + return write_type_tfs(typeinfo, str, len, desc->lptdesc, FALSE, FALSE); + } + else if (desc->vt == VT_USERDEFINED) + { + ITypeInfo *refinfo; + TYPEATTR *attr; + size_t ret = 0; + + ITypeInfo_GetRefTypeInfo(typeinfo, desc->hreftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + + if (attr->typekind == TKIND_ALIAS) + ret = write_complex_struct_pointer_ref(refinfo, &attr->tdescAlias, str, len); + + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); + + return ret; + } + + return 0; +} + +static void write_complex_struct_tfs(ITypeInfo *typeinfo, unsigned char *str, + size_t *len, TYPEATTR *attr) +{ + size_t pointer_layout_offset, pointer_layout, member_layout, ref; + unsigned int struct_offset = 0; + TYPEDESC *tdesc; + VARDESC *desc; + WORD i; + + WRITE_SHORT(str, *len, 0); /* conformant array description */ + pointer_layout_offset = *len; + WRITE_SHORT(str, *len, 0); /* pointer layout; will be filled in later */ + member_layout = *len; + + /* First pass: write the struct members and pointer layout, but do not yet + * write the offsets for embedded complexes and pointer refs. These must be + * handled after we write the whole struct description, since it must be + * contiguous. */ + + write_struct_members(typeinfo, str, len, attr); + + pointer_layout = *len; + if (str) *((short *)(str + pointer_layout_offset)) = pointer_layout - pointer_layout_offset; + + for (i = 0; i < attr->cVars; i++) + { + ITypeInfo_GetVarDesc(typeinfo, i, &desc); + write_complex_struct_pointer_layout(typeinfo, &desc->elemdescVar.tdesc, str, len); + ITypeInfo_ReleaseVarDesc(typeinfo, desc); + } + + /* Second pass: write types for embedded complexes and non-simple pointers. */ + + struct_offset = 0; + + for (i = 0; i < attr->cVars; i++) + { + ITypeInfo_GetVarDesc(typeinfo, i, &desc); + tdesc = &desc->elemdescVar.tdesc; + + if (struct_offset != desc->oInst) + member_layout++; /* alignment directive */ + struct_offset = desc->oInst + type_memsize(typeinfo, tdesc); + + if (get_basetype(typeinfo, tdesc)) + member_layout++; + else if (type_is_non_iface_pointer(typeinfo, tdesc)) + { + member_layout++; + if ((ref = write_complex_struct_pointer_ref(typeinfo, tdesc, str, len))) + { + if (str) *((short *)(str + pointer_layout + 2)) = ref - (pointer_layout + 2); + } + pointer_layout += 4; + } + else + { + ref = write_type_tfs(typeinfo, str, len, tdesc, FALSE, FALSE); + if (str) *((short *)(str + member_layout + 2)) = ref - (member_layout + 2); + member_layout += 4; + } + + ITypeInfo_ReleaseVarDesc(typeinfo, desc); + } +} + +static size_t write_struct_tfs(ITypeInfo *typeinfo, unsigned char *str, + size_t *len, TYPEATTR *attr) +{ + unsigned char fc = get_struct_fc(typeinfo, attr); + size_t off = *len; + + /* For the sake of simplicity, write pointer structs as complex structs. */ + if (fc == FC_PSTRUCT) + fc = FC_BOGUS_STRUCT; + + WRITE_CHAR (str, *len, fc); + WRITE_CHAR (str, *len, attr->cbAlignment - 1); + WRITE_SHORT(str, *len, attr->cbSizeInstance); + + if (fc == FC_STRUCT) + write_simple_struct_tfs(typeinfo, str, len, attr); + else if (fc == FC_BOGUS_STRUCT) + write_complex_struct_tfs(typeinfo, str, len, attr); return off; }

1 0

Zebediah Figura : oleaut32/tests: Test marshalling of complex structs.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: c299f09e255fdea7f6e06ea2f59c9b799c86a5b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c299f09e255fdea7f6e06ea2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 23:31:20 2019 -0500 oleaut32/tests: Test marshalling of complex structs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 45 ++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 21 ++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 9a7d995..4f84442 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1441,6 +1441,28 @@ static HRESULT WINAPI Widget_rect(IWidget *iface, RECT in, RECT *out, RECT *in_p return S_OK; } +static HRESULT WINAPI Widget_complex_struct(IWidget *iface, struct complex in) +{ + HRESULT hr; + + ok(in.c == 98, "Got char %d.\n", in.c); + ok(in.i == 76543, "Got int %d.\n", in.i); + ok(*in.pi == 2, "Got int pointer %d.\n", *in.pi); + ok(**in.ppi == 10, "Got int double pointer %d.\n", **in.ppi); + hr = ISomethingFromDispatch_anotherfn(in.iface); + ok(hr == 0x01234567, "Got wrong hr %#x.\n", hr); + hr = ISomethingFromDispatch_anotherfn(*in.iface_ptr); + ok(hr == 0x01234567, "Got wrong hr %#x.\n", hr); + ok(!lstrcmpW(in.bstr, test_bstr2), "Got string %s.\n", wine_dbgstr_w(in.bstr)); + ok(V_VT(&in.var) == VT_I4, "Got wrong type %u.\n", V_VT(&in.var)); + ok(V_I4(&in.var) == 123, "Got wrong value %d.\n", V_I4(&in.var)); + ok(!memcmp(&in.mystruct, &test_mystruct1, sizeof(MYSTRUCT)), "Structs didn't match.\n"); + ok(!memcmp(in.arr, test_array1, sizeof(array_t)), "Arrays didn't match.\n"); + ok(in.myint == 456, "Got int %d.\n", in.myint); + + return S_OK; +} + static HRESULT WINAPI Widget_array(IWidget *iface, array_t in, array_t out, array_t in_out) { static const array_t empty = {0}; @@ -1600,6 +1622,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_mystruct_ptr_ptr, Widget_thin_struct, Widget_rect, + Widget_complex_struct, Widget_array, Widget_variant_array, Widget_mystruct_array, @@ -2500,6 +2523,9 @@ static void test_marshal_struct(IWidget *widget, IDispatch *disp) { MYSTRUCT out, in_ptr, in_out, *in_ptr_ptr; RECT rect_out, rect_in_ptr, rect_in_out; + ISomethingFromDispatch *sfd; + struct complex complex; + int i, i2, *pi = &i2; HRESULT hr; memcpy(&out, &test_mystruct2, sizeof(MYSTRUCT)); @@ -2531,6 +2557,25 @@ static void test_marshal_struct(IWidget *widget, IDispatch *disp) ok(EqualRect(&rect_out, &test_rect5), "Rects didn't match.\n"); ok(EqualRect(&rect_in_ptr, &test_rect3), "Rects didn't match.\n"); ok(EqualRect(&rect_in_out, &test_rect7), "Rects didn't match.\n"); + + /* Test complex structs. */ + complex.c = 98; + complex.i = 76543; + i = 2; + complex.pi = &i; + i2 = 10; + complex.ppi = π + complex.iface = create_disp_obj(); + sfd = create_disp_obj(); + complex.iface_ptr = &sfd; + complex.bstr = SysAllocString(test_bstr2); + V_VT(&complex.var) = VT_I4; + V_I4(&complex.var) = 123; + memcpy(&complex.mystruct, &test_mystruct1, sizeof(MYSTRUCT)); + memcpy(complex.arr, test_array1, sizeof(array_t)); + complex.myint = 456; + hr = IWidget_complex_struct(widget, complex); + ok(hr == S_OK, "Got hr %#x.\n", hr); } static void test_marshal_array(IWidget *widget, IDispatch *disp) diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index cdc7dc1..14b80c4 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -65,6 +65,7 @@ enum IWidget_dispids DISPID_TM_STRUCT_PTR_PTR, DISPID_TM_THIN_STRUCT, DISPID_TM_RECT, + DISPID_TM_COMPLEX_STRUCT, DISPID_TM_ARRAY, DISPID_TM_VARIANT_ARRAY, DISPID_TM_STRUCT_ARRAY, @@ -105,6 +106,8 @@ library TestTypelib typedef [public] int myint_t; + typedef int array_t[4]; + coclass ApplicationObject2; [ @@ -335,7 +338,23 @@ library TestTypelib [id(DISPID_TM_RECT)] HRESULT rect([in] RECT in, [out] RECT *out, [in] RECT *in_ptr, [in, out] RECT *in_out); - typedef int array_t[4]; + struct complex + { + char c; + int i; + int *pi; + int **ppi; + ISomethingFromDispatch *iface; + ISomethingFromDispatch **iface_ptr; + BSTR bstr; + VARIANT var; + MYSTRUCT mystruct; + array_t arr; + myint_t myint; + }; + + [id(DISPID_TM_COMPLEX_STRUCT)] + HRESULT complex_struct([in] struct complex in); [id(DISPID_TM_ARRAY)] HRESULT array([in] array_t in, [out] array_t out, [in, out] array_t in_out);

1 0

Henri Verbeet : wined3d: Introduce a Vulkan based adapter implementation.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: 7cf3edcdc85e7a0c9262fa8325ce0bc243e991d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cf3edcdc85e7a0c9262fa83… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 1 17:38:26 2019 +0430 wined3d: Introduce a Vulkan based adapter implementation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/adapter_vk.c | 105 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 3 ++ dlls/wined3d/utils.c | 5 ++ dlls/wined3d/wined3d_main.c | 27 +++++++---- dlls/wined3d/wined3d_private.h | 24 +++++++++- 6 files changed, 156 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 39fed38..7ebd010 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = opengl32 user32 gdi32 advapi32 C_SRCS = \ adapter_gl.c \ + adapter_vk.c \ arb_program_shader.c \ ati_fragment_shader.c \ buffer.c \ diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c new file mode 100644 index 0000000..e2c940d --- /dev/null +++ b/dlls/wined3d/adapter_vk.c @@ -0,0 +1,105 @@ +/* + * Copyright 2018 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" +#include "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d); + +static void adapter_vk_destroy(struct wined3d_adapter *adapter) +{ + wined3d_adapter_cleanup(adapter); + heap_free(adapter); +} + +static BOOL adapter_vk_create_context(struct wined3d_context *context, + struct wined3d_texture *target, const struct wined3d_format *ds_format) +{ + return TRUE; +} + +static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, struct wined3d_caps *caps) +{ +} + +static BOOL adapter_vk_check_format(const struct wined3d_adapter *adapter, + const struct wined3d_format *adapter_format, const struct wined3d_format *rt_format, + const struct wined3d_format *ds_format) +{ + return TRUE; +} + +static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = +{ + adapter_vk_destroy, + adapter_vk_create_context, + adapter_vk_get_wined3d_caps, + adapter_vk_check_format, +}; + +static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, + unsigned int ordinal, unsigned int wined3d_creation_flags) +{ + const struct wined3d_gpu_description *gpu_description; + struct wined3d_adapter *adapter = &adapter_vk->a; + + TRACE("adapter_vk %p, ordinal %u, wined3d_creation_flags %#x.\n", + adapter_vk, ordinal, wined3d_creation_flags); + + if (!wined3d_adapter_init(adapter, ordinal)) + return FALSE; + + if (!(gpu_description = wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA))) + { + ERR("Failed to get GPU description.\n"); + return FALSE; + } + wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); + + if (!wined3d_adapter_vk_init_format_info(adapter)) + return FALSE; + + adapter->vertex_pipe = &none_vertex_pipe; + adapter->fragment_pipe = &none_fragment_pipe; + adapter->shader_backend = &none_shader_backend; + adapter->adapter_ops = &wined3d_adapter_vk_ops; + + adapter->d3d_info.wined3d_creation_flags = wined3d_creation_flags; + + return TRUE; +} + +struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, + unsigned int wined3d_creation_flags) +{ + struct wined3d_adapter_vk *adapter_vk; + + if (!(adapter_vk = heap_alloc_zero(sizeof(*adapter_vk)))) + return NULL; + + if (!wined3d_adapter_vk_init(adapter_vk, ordinal, wined3d_creation_flags)) + { + heap_free(adapter_vk); + return NULL; + } + + TRACE("Created adapter %p.\n", adapter_vk); + + return &adapter_vk->a; +} diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 83fa47a..49e56e0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2314,6 +2314,9 @@ static struct wined3d_adapter *wined3d_adapter_create(unsigned int ordinal, DWOR if (wined3d_creation_flags & WINED3D_NO3D) return wined3d_adapter_no3d_create(ordinal, wined3d_creation_flags); + if (wined3d_settings.renderer == WINED3D_RENDERER_VULKAN) + return wined3d_adapter_vk_create(ordinal, wined3d_creation_flags); + return wined3d_adapter_gl_create(ordinal, wined3d_creation_flags); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a242283..be76dbb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4067,6 +4067,11 @@ fail: return FALSE; } +BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter *adapter) +{ + return wined3d_adapter_init_format_info(adapter, sizeof(struct wined3d_format)); +} + const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *adapter, enum wined3d_format_id format_id, unsigned int bind_flags) { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 5ca58ae..d2e4978 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -89,7 +89,7 @@ struct wined3d_settings wined3d_settings = ~0U, /* No GS shader model limit by default. */ ~0U, /* No PS shader model limit by default. */ ~0u, /* No CS shader model limit by default. */ - FALSE, /* 3D support enabled by default. */ + WINED3D_RENDERER_AUTO, WINED3D_SHADER_BACKEND_AUTO, }; @@ -104,11 +104,10 @@ struct wined3d * CDECL wined3d_create(DWORD flags) return NULL; } - if (wined3d_settings.no_3d) + if (wined3d_settings.renderer == WINED3D_RENDERER_NO3D) flags |= WINED3D_NO3D; - hr = wined3d_init(object, flags); - if (FAILED(hr)) + if (FAILED(hr = wined3d_init(object, flags))) { WARN("Failed to initialize wined3d object, hr %#x.\n", hr); heap_free(object); @@ -327,12 +326,24 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Limiting PS shader model to %u.\n", wined3d_settings.max_sm_ps); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelCS", &wined3d_settings.max_sm_cs)) TRACE("Limiting CS shader model to %u.\n", wined3d_settings.max_sm_cs); - if ((!get_config_key(hkey, appkey, "renderer", buffer, size) + if (!get_config_key(hkey, appkey, "renderer", buffer, size) || !get_config_key(hkey, appkey, "DirectDrawRenderer", buffer, size)) - && !strcmp(buffer, "gdi")) { - TRACE("Disabling 3D support.\n"); - wined3d_settings.no_3d = TRUE; + if (!strcmp(buffer, "vulkan")) + { + ERR_(winediag)("Using the Vulkan renderer.\n"); + wined3d_settings.renderer = WINED3D_RENDERER_VULKAN; + } + else if (!strcmp(buffer, "gl")) + { + ERR_(winediag)("Using the OpenGL renderer.\n"); + wined3d_settings.renderer = WINED3D_RENDERER_OPENGL; + } + else if (!strcmp(buffer, "gdi") || !strcmp(buffer, "no3d")) + { + ERR_(winediag)("Disabling 3D support.\n"); + wined3d_settings.renderer = WINED3D_RENDERER_NO3D; + } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f482bb9..5a455ed 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -379,6 +379,14 @@ static inline void wined3d_pause(void) #define PCI_VENDOR_NONE 0xffff /* e.g. 0x8086 for Intel and 0x10de for Nvidia */ #define PCI_DEVICE_NONE 0xffff /* e.g. 0x14f for a Geforce6200 */ +enum wined3d_renderer +{ + WINED3D_RENDERER_AUTO, + WINED3D_RENDERER_VULKAN, + WINED3D_RENDERER_OPENGL, + WINED3D_RENDERER_NO3D, +}; + enum wined3d_shader_backend { WINED3D_SHADER_BACKEND_AUTO, @@ -409,7 +417,7 @@ struct wined3d_settings unsigned int max_sm_gs; unsigned int max_sm_ps; unsigned int max_sm_cs; - BOOL no_3d; + enum wined3d_renderer renderer; enum wined3d_shader_backend shader_backend; }; @@ -2741,6 +2749,19 @@ struct wined3d_adapter *wined3d_adapter_gl_create(unsigned int ordinal, unsigned BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, struct wined3d_texture *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; +struct wined3d_adapter_vk +{ + struct wined3d_adapter a; +}; + +static inline struct wined3d_adapter_vk *wined3d_adapter_vk(struct wined3d_adapter *adapter) +{ + return CONTAINING_RECORD(adapter, struct wined3d_adapter_vk, a); +} + +struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, + unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; + struct wined3d_caps_gl_ctx { HDC dc; @@ -2757,6 +2778,7 @@ struct wined3d_caps_gl_ctx BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; BOOL wined3d_adapter_no3d_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; +BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcr110: Fix __crtGetShowWindowMode implementation.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: b353ad7db8e013bab8bfd0ffde3610372fa3d644 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b353ad7db8e013bab8bfd0ff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 17:46:07 2019 +0200 msvcr110: Fix __crtGetShowWindowMode implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46928 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/misc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 5a4e77b..21ab9be 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -26,6 +26,7 @@ #include "msvcrt.h" #include "wine/debug.h" #include "ntsecapi.h" +#include "windows.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -517,8 +518,8 @@ int CDECL MSVCR110__crtGetShowWindowMode(void) STARTUPINFOW si; GetStartupInfoW(&si); - TRACE("window=%d\n", si.wShowWindow); - return si.wShowWindow; + TRACE("flags=%x window=%d\n", si.dwFlags, si.wShowWindow); + return si.dwFlags & STARTF_USESHOWWINDOW ? si.wShowWindow : SW_SHOWDEFAULT; } /*********************************************************************

1 0

Francois Gouget : imagehlp/tests: Add a trailing '\n' to some ok() calls.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: cead1ded9a09947a4f8bd5f9eadfc689b10164a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cead1ded9a09947a4f8bd5f9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 1 18:23:50 2019 +0200 imagehlp/tests: Add a trailing '\n' to some ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/tests/integrity.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index a7774ad..4617c71 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -363,20 +363,20 @@ static void test_pe_checksum(void) checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, (char *)nt_header - (char *)modinfo.lpBaseOfDll, &checksum_orig, &checksum_new); - ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p", ret); + ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p\n", ret); ok((checksum_orig == 0) || (checksum_orig == checksum_correct), "Expected %x, got %x\n", checksum_correct, checksum_orig); ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, sizeof(IMAGE_DOS_HEADER), &checksum_orig, &checksum_new); - ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p", ret); + ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p\n", ret); ok((checksum_orig == 0) || (checksum_orig == checksum_correct), "Expected %x, got %x\n", checksum_correct, checksum_orig); ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, 0, &checksum_orig, &checksum_new); - ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p", ret); + ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p\n", ret); ok((checksum_orig == 0xdeadbeef) || (checksum_orig == checksum_correct), "Expected %x, got %x\n", checksum_correct, checksum_orig); todo_wine ok((checksum_new == 0xdeadbeef) || (checksum_new != 0 && checksum_new != 0xdeadbeef), "Got unexpected value %x\n", checksum_new);

1 0

Piotr Caban : version: Don't use strncasecmp.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: 2e2278177c2637d32244bb97088e66b139523595 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e2278177c2637d32244bb97… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 18:50:37 2019 +0200 version: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index bd03b2b..0176713 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -870,7 +870,7 @@ static const VS_VERSION_INFO_STRUCT16 *VersionInfo16_FindChild( const VS_VERSION while ((char *)child < (char *)info + info->wLength ) { - if (!strncasecmp( child->szKey, szKey, cbKey ) && !child->szKey[cbKey]) + if (!_strnicmp( child->szKey, szKey, cbKey ) && !child->szKey[cbKey]) return child; if (!(child->wLength)) return NULL;

1 0

Piotr Caban : ver.dll16: Don't use strncasecmp.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: 267064dcd3bcb26f831fb47ce5d64e6b4bea9886 URL: https://source.winehq.org/git/wine.git/?a=commit;h=267064dcd3bcb26f831fb47c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 18:50:46 2019 +0200 ver.dll16: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ver.dll16/version.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index b2cb9ae..aa7b49b 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -29,6 +29,7 @@ #define NONAMELESSSTRUCT #include "windef.h" #include "wine/winbase16.h" +#include "winternl.h" #include "winver.h" #include "lzexpand.h" #include "wine/unicode.h" @@ -212,7 +213,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, if (!(typeInfo->type_id & 0x8000)) { BYTE *p = resTab + typeInfo->type_id; - if ((*p == len) && !strncasecmp( (char*)p+1, typeid, len )) goto found_type; + if ((*p == len) && !_strnicmp( (char*)p+1, typeid, len )) goto found_type; } typeInfo = (NE_TYPEINFO *)((char *)(typeInfo + 1) + typeInfo->count * sizeof(NE_NAMEINFO)); @@ -242,7 +243,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, { BYTE *p = resTab + nameInfo->id; if (nameInfo->id & 0x8000) continue; - if ((*p == len) && !strncasecmp( (char*)p+1, resid, len )) goto found_name; + if ((*p == len) && !_strnicmp( (char*)p+1, resid, len )) goto found_name; } } else /* numeric resource id */

1 0

Piotr Caban : user.exe16: Don't use strncasecmp.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: 49ce3132d9161e0f28304ae8ce6bc7e21b2d184e URL: https://source.winehq.org/git/wine.git/?a=commit;h=49ce3132d9161e0f28304ae8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 18:50:55 2019 +0200 user.exe16: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/comm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user.exe16/comm.c b/dlls/user.exe16/comm.c index a9141db..a1715c8 100644 --- a/dlls/user.exe16/comm.c +++ b/dlls/user.exe16/comm.c @@ -416,7 +416,7 @@ INT16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb) TRACE("(%s), ptr %p\n", device, lpdcb); - if (strncasecmp(device,"COM",3)) + if (_strnicmp(device,"COM",3)) return -1; port = device[3] - '0'; @@ -457,7 +457,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue) if (port-- == 0) ERR("BUG ! COM0 or LPT0 don't exist !\n"); - if (!strncasecmp(device,"COM",3)) + if (!_strnicmp(device,"COM",3)) { if (COM[port].handle) return IE_OPEN; @@ -508,7 +508,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue) } } else - if (!strncasecmp(device,"LPT",3)) { + if (!_strnicmp(device,"LPT",3)) { if (LPT[port].handle) return IE_OPEN;

1 0

Alexandre Julliard : taskmgr: Use C runtime wchar functions instead of wine/unicode.h.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: 3036649a34d46a68a3655684d7069c9755bc439d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3036649a34d46a68a3655684… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 11:50:11 2019 +0200 taskmgr: Use C runtime wchar functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/affinity.c | 1 - programs/taskmgr/applpage.c | 11 +++-- programs/taskmgr/column.c | 101 ++++++++++++++++++++++---------------------- programs/taskmgr/debug.c | 1 - programs/taskmgr/endproc.c | 1 - programs/taskmgr/graph.c | 11 +++-- programs/taskmgr/perfpage.c | 1 - programs/taskmgr/priority.c | 1 - programs/taskmgr/taskmgr.c | 5 +-- programs/taskmgr/trayicon.c | 1 - 10 files changed, 62 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3036649a34d46a68a365…

1 0

Alexandre Julliard : wordpad: Use C runtime wchar functions instead of wine/unicode.h.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: 83c99c021983dda6f8ac6d4ce4d8c64f594784a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83c99c021983dda6f8ac6d4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 12:41:50 2019 +0200 wordpad: Use C runtime wchar functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 1ced34c..546d0b0 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -36,7 +36,6 @@ #include <math.h> #include <errno.h> -#include "wine/unicode.h" #include "wordpad.h" #ifdef NONAMELESSUNION @@ -1383,7 +1382,7 @@ static void number_with_units(LPWSTR buffer, int number) static const WCHAR fmt[] = {'%','.','2','f',' ','%','s','\0'}; float converted = (float)number / (float)TWIPS_PER_INCH *(float)CENTMM_PER_INCH / 1000.0; - sprintfW(buffer, fmt, converted, units_cmW); + swprintf(buffer, fmt, converted, units_cmW); } static BOOL get_comboexlist_selection(HWND hComboEx, LPWSTR wszBuffer, UINT bufferLength)

1 0