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

[PATCH] regedit: Use an I-beam cursor in the hex edit dialog.
by Zebediah Figura April 19, 2019

April 19, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/regedit/hexedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index 951779bf24..7322a86e1f 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -643,7 +643,7 @@ void HexEdit_Register(void) wndClass.lpfnWndProc = HexEdit_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(HEXEDIT_INFO *); - wndClass.hCursor = NULL; + wndClass.hCursor = LoadCursorW(0, (const WCHAR *)IDC_IBEAM); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.lpszClassName = szHexEditClass; -- 2.21.0

2 1

[PATCH] winex11: The correct way to search the target window for drag&drop operations.
by John Found April 19, 2019

April 19, 2019

-- John Found <johnfound(a)asm32.info>

3 16

[PATCH] kernel32: Add implementation of CAL_SSHORTESTDAYNAME* and other flags
by Vijay Kiran Kamuju April 19, 2019

April 19, 2019

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/kernel32/time.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index c425eb8280..7807f99a6c 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1068,6 +1068,13 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, case CAL_SABBREVMONTHNAME12: case CAL_SABBREVMONTHNAME13: case CAL_SYEARMONTH: + case CAL_SSHORTESTDAYNAME1: + case CAL_SSHORTESTDAYNAME2: + case CAL_SSHORTESTDAYNAME3: + case CAL_SSHORTESTDAYNAME4: + case CAL_SSHORTESTDAYNAME5: + case CAL_SSHORTESTDAYNAME6: + case CAL_SSHORTESTDAYNAME7: return GetLocaleInfoW(Locale, caltype_lctype_map[calinfo] | localeflags, lpCalData, cchData); case CAL_ITWODIGITYEARMAX: if (CalType & CAL_RETURN_NUMBER) @@ -1090,6 +1097,12 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, return 0; } break; + case CAL_SMONTHDAY: + FIXME("Unimplemented caltype %d\n", calinfo); + return 0; + case CAL_SABBREVERASTRING: + FIXME("Unimplemented caltype %d\n", calinfo); + return 0; default: FIXME("Unknown caltype %d\n", calinfo); SetLastError(ERROR_INVALID_FLAGS); -- 2.21.0

1 0

[PATCH v3 1/2] jscript: stub Enumerator object
by Andreas Maier April 19, 2019

April 19, 2019

Enumerator is an MS extension. Its needed to succeed VyChat219.msi installation. Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> --- dlls/jscript/Makefile.in | 1 + dlls/jscript/enumerator.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/global.c | 17 +++-- dlls/jscript/jscript.h | 3 + 4 files changed, 203 insertions(+), 8 deletions(-) create mode 100644 dlls/jscript/enumerator.c diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 34ed193742..1cc58a5ed6 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ decode.c \ dispex.c \ engine.c \ + enumerator.c \ error.c \ function.c \ global.c \ diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c new file mode 100644 index 0000000000..aa7737ac52 --- /dev/null +++ b/dlls/jscript/enumerator.c @@ -0,0 +1,190 @@ +/* + * Copyright 2019 Andreas Maier + * + * 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 <assert.h> + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +typedef struct { + jsdisp_t dispex; +} EnumeratorInstance; + +static const WCHAR atEndW[] = {'a','t','E','n','d',0}; +static const WCHAR itemW[] = {'i','t','e','m',0}; +static const WCHAR moveFirstW[] = {'m','o','v','e','F','i','r','s','t',0}; +static const WCHAR moveNextW[] = {'m','o','v','e','N','e','x','t',0}; + +static void Enumerator_destructor(jsdisp_t *dispex) +{ + TRACE("Enumerator_destructor\n"); + + heap_free(dispex); +} + +HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("Enumerator_atEnd\n"); + + return E_NOTIMPL; +} + +HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("Enumerator_item\n"); + + return E_NOTIMPL; +} + +HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("Enumerator_moveFirst\n"); + + return E_NOTIMPL; +} + +HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + TRACE("Enumerator_moveNext\n"); + + return E_NOTIMPL; +} + +static const builtin_prop_t Enumerator_props[] = { + {atEndW, Enumerator_atEnd, PROPF_METHOD}, + {itemW, Enumerator_item, PROPF_METHOD}, + {moveFirstW, Enumerator_moveFirst, PROPF_METHOD}, + {moveNextW, Enumerator_moveNext, PROPF_METHOD}, +}; + +static const builtin_info_t Enumerator_info = { + JSCLASS_OBJECT, + {NULL, NULL, 0}, + ARRAY_SIZE(Enumerator_props), + Enumerator_props, + NULL, + NULL +}; + +static const builtin_info_t EnumeratorInst_info = { + JSCLASS_OBJECT, + {NULL, NULL, 0, NULL}, + 0, + NULL, + Enumerator_destructor, + NULL +}; + +static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + jsdisp_t *obj; + HRESULT hres; + + TRACE("EnumeratorConstr_value\n"); + + switch(flags) { + case DISPATCH_CONSTRUCT: { + if (argc != 1) + return throw_syntax_error(ctx, JS_E_MISSING_ARG, NULL); + + hres = create_enumerator(ctx, &argv[0], &obj); + if(FAILED(hres)) + return hres; + + *r = jsval_obj(obj); + break; + } + default: + FIXME("unimplemented flags: %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + +static HRESULT alloc_enumerator(script_ctx_t *ctx, jsdisp_t *object_prototype, EnumeratorInstance **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + + enumerator = heap_alloc_zero(sizeof(EnumeratorInstance)); + if(!enumerator) + return E_OUTOFMEMORY; + + if(object_prototype) + hres = init_dispex(&enumerator->dispex, ctx, &Enumerator_info, object_prototype); + else + hres = init_dispex_from_constr(&enumerator->dispex, ctx, &EnumeratorInst_info, + ctx->enumerator_constr); + + if(FAILED(hres)) { + heap_free(enumerator); + return hres; + } + + *ret = enumerator; + return S_OK; +} + +static const builtin_info_t EnumeratorConstr_info = { + JSCLASS_FUNCTION, + DEFAULT_FUNCTION_VALUE, + 0, + NULL, + NULL, + NULL +}; + +HRESULT create_enumerator_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp_t **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + static const WCHAR EnumeratorW[] = {'E','n','u','m','e','r','a','t','o','r',0}; + + hres = alloc_enumerator(ctx, object_prototype, &enumerator); + if(FAILED(hres)) + return hres; + + hres = create_builtin_constructor(ctx, EnumeratorConstr_value, + EnumeratorW, &EnumeratorConstr_info, + PROPF_CONSTR|7, &enumerator->dispex, ret); + jsdisp_release(&enumerator->dispex); + + return hres; +} + +HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + + hres = alloc_enumerator(ctx, NULL, &enumerator); + if(FAILED(hres)) + return hres; + + *ret = &enumerator->dispex; + return S_OK; +} diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 33de641483..92b146c83a 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -113,13 +113,6 @@ static WCHAR int_to_char(int i) return 'A'+i-10; } -static HRESULT JSGlobal_Enumerator(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -942,7 +935,6 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W static const builtin_prop_t JSGlobal_props[] = { {CollectGarbageW, JSGlobal_CollectGarbage, PROPF_METHOD}, - {EnumeratorW, JSGlobal_Enumerator, PROPF_METHOD|7}, {_GetObjectW, JSGlobal_GetObject, PROPF_METHOD|2}, {ScriptEngineW, JSGlobal_ScriptEngine, PROPF_METHOD}, {ScriptEngineBuildVersionW, JSGlobal_ScriptEngineBuildVersion, PROPF_METHOD}, @@ -1019,6 +1011,15 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; + hres = create_enumerator_constr(ctx, object_prototype, &ctx->enumerator_constr); + if(FAILED(hres)) + return hres; + + hres = jsdisp_define_data_property(ctx->global, EnumeratorW, PROPF_WRITABLE, + jsval_obj(ctx->enumerator_constr)); + if(FAILED(hres)) + return hres; + hres = init_error_constr(ctx, object_prototype); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2af5b598bd..baebcc4b6c 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -326,6 +326,7 @@ HRESULT create_bool(script_ctx_t*,BOOL,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_number(script_ctx_t*,double,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_vbarray(script_ctx_t*,SAFEARRAY*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_json(script_ctx_t*,jsdisp_t**) DECLSPEC_HIDDEN; +HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) DECLSPEC_HIDDEN; typedef enum { NO_HINT, @@ -436,6 +437,7 @@ struct _script_ctx_t { jsdisp_t *array_constr; jsdisp_t *bool_constr; jsdisp_t *date_constr; + jsdisp_t *enumerator_constr; jsdisp_t *error_constr; jsdisp_t *eval_error_constr; jsdisp_t *range_error_constr; @@ -468,6 +470,7 @@ HRESULT create_array_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_bool_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_date_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT init_error_constr(script_ctx_t*,jsdisp_t*) DECLSPEC_HIDDEN; +HRESULT create_enumerator_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_number_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_object_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_regexp_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -- 2.11.0

2 3

[PATCH] ntdll: Reuse signal to trap translation for FreeBSD on ARM
by André Hentschel April 19, 2019

April 19, 2019

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/signal_arm.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 5db3c51301f..e01c8ce2193 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -148,7 +148,8 @@ static inline enum arm_trap_code get_trap_code( int signal, const ucontext_t *si enum arm_trap_code trap = TRAP_sig(sigcontext); if (trap) return trap; - /* trap is 0 on arm64 kernel */ +#endif + switch (signal) { case SIGILL: @@ -158,11 +159,8 @@ static inline enum arm_trap_code get_trap_code( int signal, const ucontext_t *si case SIGBUS: return TRAP_ARM_ALIGNFLT; default: - return trap; + return TRAP_ARM_UNKNOWN; } -#else - return TRAP_ARM_UNKNOWN; /* unknown trap code */ -#endif } /*********************************************************************** -- 2.17.1

1 0

[PATCH 5/5] wined3d: Don't bother allocating "free_timestamp_queries" in context_create().
by Henri Verbeet April 19, 2019

April 19, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ab5d9c3ee97..f4179d7d206 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1896,12 +1896,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (!(context = heap_alloc_zero(sizeof(*context)))) return NULL; - context->free_timestamp_query_size = 4; - if (!(context->free_timestamp_queries = heap_calloc(context->free_timestamp_query_size, - sizeof(*context->free_timestamp_queries)))) - goto out; list_init(&context->timestamp_queries); - list_init(&context->occlusion_queries); list_init(&context->fences); list_init(&context->so_statistics_queries); @@ -1982,7 +1977,6 @@ out: wined3d_release_dc(swapchain->win_handle, context->hdc); device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); - heap_free(context->free_timestamp_queries); heap_free(context); return NULL; } -- 2.11.0

1 0

[PATCH 4/5] wined3d: Don't bother allocating "free_occlusion_queries" in context_create().
by Henri Verbeet April 19, 2019

April 19, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 476d96939b8..ab5d9c3ee97 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1902,12 +1902,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; list_init(&context->timestamp_queries); - context->free_occlusion_query_size = 4; - if (!(context->free_occlusion_queries = heap_calloc(context->free_occlusion_query_size, - sizeof(*context->free_occlusion_queries)))) - goto out; list_init(&context->occlusion_queries); - list_init(&context->fences); list_init(&context->so_statistics_queries); list_init(&context->pipeline_statistics_queries); @@ -1987,7 +1982,6 @@ out: wined3d_release_dc(swapchain->win_handle, context->hdc); device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); - heap_free(context->free_occlusion_queries); heap_free(context->free_timestamp_queries); heap_free(context); return NULL; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Don't bother allocating "free_fences" in context_create().
by Henri Verbeet April 19, 2019

April 19, 2019

We use "free_fences" with wined3d_array_reserve(), which handles NULL fine. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 425721aaa23..476d96939b8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1908,13 +1908,8 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; list_init(&context->occlusion_queries); - context->free_fence_size = 4; - if (!(context->free_fences = heap_calloc(context->free_fence_size, sizeof(*context->free_fences)))) - goto out; list_init(&context->fences); - list_init(&context->so_statistics_queries); - list_init(&context->pipeline_statistics_queries); list_init(&context->fbo_list); @@ -1992,7 +1987,6 @@ out: wined3d_release_dc(swapchain->win_handle, context->hdc); device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); - heap_free(context->free_fences); heap_free(context->free_occlusion_queries); heap_free(context->free_timestamp_queries); heap_free(context); -- 2.11.0

1 0

[PATCH 2/5] wined3d: Assign "adapter_ops" in wined3d_adapter_init().
by Henri Verbeet April 19, 2019

April 19, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 3 +-- dlls/wined3d/adapter_vk.c | 3 +-- dlls/wined3d/directx.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index d8414204ea0..0f554e7cf2e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4570,7 +4570,7 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, TRACE("adapter_gl %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_gl, ordinal, wined3d_creation_flags); - if (!wined3d_adapter_init(&adapter_gl->a, ordinal)) + if (!wined3d_adapter_init(&adapter_gl->a, ordinal, &wined3d_adapter_gl_ops)) return FALSE; /* Dynamically load all GL core functions */ @@ -4660,7 +4660,6 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); wined3d_adapter_init_ffp_attrib_ops(&adapter_gl->a); - adapter_gl->a.adapter_ops = &wined3d_adapter_gl_ops; return TRUE; } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4c01fb8fe86..464f7914098 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -648,7 +648,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, TRACE("adapter_vk %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_vk, ordinal, wined3d_creation_flags); - if (!wined3d_adapter_init(adapter, ordinal)) + if (!wined3d_adapter_init(adapter, ordinal, &wined3d_adapter_vk_ops)) return FALSE; if (!wined3d_init_vulkan(vk_info)) @@ -687,7 +687,6 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, 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; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3c89fad7d1a..cacd9ac1849 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2284,7 +2284,7 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); - if (!wined3d_adapter_init(adapter, ordinal)) + if (!wined3d_adapter_init(adapter, ordinal, &wined3d_adapter_no3d_ops)) { heap_free(adapter); return NULL; @@ -2299,7 +2299,6 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, adapter->vertex_pipe = &none_vertex_pipe; adapter->fragment_pipe = &none_fragment_pipe; adapter->shader_backend = &none_shader_backend; - adapter->adapter_ops = &wined3d_adapter_no3d_ops; wined3d_adapter_no3d_init_d3d_info(adapter, wined3d_creation_flags); @@ -2308,7 +2307,8 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, return adapter; } -BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal) +BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, + const struct wined3d_adapter_ops *adapter_ops) { DISPLAY_DEVICEW display_device; @@ -2331,6 +2331,7 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal) memset(&adapter->device_uuid, 0, sizeof(adapter->device_uuid)); adapter->formats = NULL; + adapter->adapter_ops = adapter_ops; return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15876e4f1ed..cf46f808e25 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2730,7 +2730,8 @@ struct wined3d_adapter const struct wined3d_adapter_ops *adapter_ops; }; -BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal) DECLSPEC_HIDDEN; +BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, + const struct wined3d_adapter_ops *adapter_ops) DECLSPEC_HIDDEN; void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; struct wined3d_adapter_gl -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_adapter_gl structure to wined3d_adapter_gl_init().
by Henri Verbeet April 19, 2019

April 19, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 36c29c9a7f5..d8414204ea0 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4554,7 +4554,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_check_format, }; -static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, +static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, unsigned int ordinal, unsigned int wined3d_creation_flags) { static const DWORD supported_gl_versions[] = @@ -4563,19 +4563,16 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, MAKEDWORD_VERSION(3, 2), MAKEDWORD_VERSION(1, 0), }; - struct wined3d_gl_info *gl_info = &adapter->gl_info; + struct wined3d_gl_info *gl_info = &adapter_gl->a.gl_info; struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; - struct wined3d_adapter_gl *adapter_gl; unsigned int i; - TRACE("adapter %p, ordinal %u, wined3d_creation_flags %#x.\n", - adapter, ordinal, wined3d_creation_flags); + TRACE("adapter_gl %p, ordinal %u, wined3d_creation_flags %#x.\n", + adapter_gl, ordinal, wined3d_creation_flags); - if (!wined3d_adapter_init(adapter, ordinal)) + if (!wined3d_adapter_init(&adapter_gl->a, ordinal)) return FALSE; - adapter_gl = wined3d_adapter_gl(adapter); - /* Dynamically load all GL core functions */ #ifdef USE_WIN32_OPENGL { @@ -4601,9 +4598,9 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, glEnableWINE = gl_info->gl_ops.gl.p_glEnable; glDisableWINE = gl_info->gl_ops.gl.p_glDisable; - if (!wined3d_caps_gl_ctx_create(adapter, &caps_gl_ctx)) + if (!wined3d_caps_gl_ctx_create(&adapter_gl->a, &caps_gl_ctx)) { - ERR("Failed to get a GL context for adapter %p.\n", adapter); + ERR("Failed to get a GL context for adapter %p.\n", adapter_gl); return FALSE; } @@ -4630,9 +4627,9 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, supported_gl_versions[i] >> 16, supported_gl_versions[i] & 0xffff); } - if (!wined3d_adapter_init_gl_caps(adapter, &caps_gl_ctx, wined3d_creation_flags)) + if (!wined3d_adapter_init_gl_caps(&adapter_gl->a, &caps_gl_ctx, wined3d_creation_flags)) { - ERR("Failed to initialize GL caps for adapter %p.\n", adapter); + ERR("Failed to initialize GL caps for adapter %p.\n", adapter_gl); wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); return FALSE; } @@ -4652,7 +4649,7 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, return FALSE; } - if (!wined3d_adapter_gl_init_format_info(adapter, &caps_gl_ctx)) + if (!wined3d_adapter_gl_init_format_info(&adapter_gl->a, &caps_gl_ctx)) { ERR("Failed to initialize GL format info.\n"); wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); @@ -4662,8 +4659,8 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); - wined3d_adapter_init_ffp_attrib_ops(adapter); - adapter->adapter_ops = &wined3d_adapter_gl_ops; + wined3d_adapter_init_ffp_attrib_ops(&adapter_gl->a); + adapter_gl->a.adapter_ops = &wined3d_adapter_gl_ops; return TRUE; } @@ -4675,7 +4672,7 @@ struct wined3d_adapter *wined3d_adapter_gl_create(unsigned int ordinal, unsigned if (!(adapter = heap_alloc_zero(sizeof(*adapter)))) return NULL; - if (!wined3d_adapter_gl_init(&adapter->a, ordinal, wined3d_creation_flags)) + if (!wined3d_adapter_gl_init(adapter, ordinal, wined3d_creation_flags)) { heap_free(adapter); return NULL; -- 2.11.0

1 0