August 2020 - Wine-devel - list.winehq.org

[PATCH 4/4] conhost: Implement IOCTL_CONDRV_PEEK.
by Jacek Caban 25 Aug '20

25 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

1 0

[PATCH 3/4] conhost: Implement IOCTL_CONDRV_READ_INPUT.
by Jacek Caban 25 Aug '20

25 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 1 + programs/conhost/conhost.c | 53 +++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+)

1 0

[PATCH 2/4] server: Support blocking console host ioctls.
by Jacek Caban 25 Aug '20

25 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 71 +++++++++++++++++++++++++++++++++++++++++---- server/protocol.def | 1 + 2 files changed, 66 insertions(+), 6 deletions(-)

1 0

[PATCH 1/4] conhost: Implement IOCTL_CONDRV_WRITE_INPUT.
by Jacek Caban 25 Aug '20

25 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 54 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-)

1 0

[PATCH vkd3d] vkd3d-shader: Allow structures to be chained in any order.
by Zebediah Figura 25 Aug '20

25 Aug '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 6 +++--- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 14ff7f48..bb251a45 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2241,7 +2241,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader if ((shader_interface = vkd3d_find_struct(compile_info->next, INTERFACE_INFO))) { - compiler->xfb_info = vkd3d_find_struct(shader_interface->next, TRANSFORM_FEEDBACK_INFO); + compiler->xfb_info = vkd3d_find_struct(compile_info->next, TRANSFORM_FEEDBACK_INFO); compiler->shader_interface = *shader_interface; if (shader_interface->push_constant_buffer_count) @@ -9110,7 +9110,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, } int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, - struct vkd3d_shader_code *spirv) + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) { const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; const struct vkd3d_shader_spirv_domain_shader_target_info *ds_info; @@ -9127,7 +9127,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (compiler->shader_type == VKD3D_SHADER_TYPE_DOMAIN) { - if (info && (ds_info = vkd3d_find_struct(info->next, SPIRV_DOMAIN_SHADER_TARGET_INFO))) + if (info && (ds_info = vkd3d_find_struct(compile_info->next, SPIRV_DOMAIN_SHADER_TARGET_INFO))) { vkd3d_dxbc_compiler_emit_tessellator_output_primitive(compiler, ds_info->output_primitive); vkd3d_dxbc_compiler_emit_tessellator_partitioning(compiler, ds_info->partitioning); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index f693f581..179bbdba 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -946,7 +946,7 @@ static int compile_dxbc_to_spirv(const struct vkd3d_shader_compile_info *compile } if (ret >= 0) - ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, out); + ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, compile_info, out); vkd3d_dxbc_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(&parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c5b2f235..b1c193f3 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -909,7 +909,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, - struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) DECLSPEC_HIDDEN; void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]) DECLSPEC_HIDDEN; -- 2.28.0

2 1

[PATCH] msvcrt/math: In _fcvt/_fcvt_s handle locale decimal separator properly
by Fabian Maurer 25 Aug '20

25 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49730 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msvcrt/math.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a75b5512100..15d8fa4be72 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2518,6 +2518,7 @@ char * CDECL MSVCRT__fcvt( double number, int ndigits, int *decpt, int *sign ) int stop, dec1, dec2; char *ptr1, *ptr2, *first; char buf[80]; /* ought to be enough */ + char decimal_separator = get_locinfo()->lconv->decimal_point[0]; if (!data->efcvt_buffer) data->efcvt_buffer = MSVCRT_malloc( 80 ); /* ought to be enough */ @@ -2549,7 +2550,7 @@ char * CDECL MSVCRT__fcvt( double number, int ndigits, int *decpt, int *sign ) } while (*ptr1 == '0') ptr1++; /* Skip leading zeroes */ - while (*ptr1 != '\0' && *ptr1 != '.') { + while (*ptr1 != '\0' && *ptr1 != decimal_separator) { if (!first) first = ptr2; if ((ptr1 - buf) < stop) { *ptr2++ = *ptr1++; @@ -2598,6 +2599,7 @@ int CDECL MSVCRT__fcvt_s(char* outbuffer, MSVCRT_size_t size, double number, int int stop, dec1, dec2; char *ptr1, *ptr2, *first; char buf[80]; /* ought to be enough */ + char decimal_separator = get_locinfo()->lconv->decimal_point[0]; if (!outbuffer || !decpt || !sign || size == 0) { @@ -2632,7 +2634,7 @@ int CDECL MSVCRT__fcvt_s(char* outbuffer, MSVCRT_size_t size, double number, int } while (*ptr1 == '0') ptr1++; /* Skip leading zeroes */ - while (*ptr1 != '\0' && *ptr1 != '.') { + while (*ptr1 != '\0' && *ptr1 != decimal_separator) { if (!first) first = ptr2; if ((ptr1 - buf) < stop) { if (size > 1) { -- 2.28.0

2 1

[PATCH 1/5] ntdll: Set handler_data correctly in arm64 RtlVirtualUnwind
by Martin Storsjo 25 Aug '20

25 Aug '20

This matches what tests show is done on actual windows, in the current testcases; in all currently tested cases, handler_data is reset to NULL when no handler is returned. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/ntdll/signal_arm64.c | 2 ++ dlls/ntdll/tests/exception.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 134e40545f..5521e915a7 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -889,6 +889,8 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG_PTR base, ULONG_PTR pc, TRACE( "type %x pc %lx sp %lx func %lx\n", type, pc, context->Sp, base + func->BeginAddress ); + *handler_data = NULL; + if (func->u.s.Flag) handler = unwind_packed_data( base, pc, func, context, ctx_ptr ); else diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index dd9eb966fc..1e9047383b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4331,6 +4331,10 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) else { ok( handler == NULL, "%u/%u: handler %p instead of NULL\n", testnum, i, handler ); + ok( data == (test->results[i].handler < 0 ? + (void *)0xdeadbeef : NULL), + "%u/%u: handler data set to %p/%p\n", testnum, i, data, + (test->results[i].handler < 0 ? (void *)0xdeadbeef : NULL) ); } ok( context.Pc == test->results[i].pc, "%u/%u: wrong pc %p/%p\n", -- 2.17.1

1 4

[PATCH 01/11] msscript.ocx: Add the ScriptError stub implementation.
by Gabriel Ivăncescu 25 Aug '20

25 Aug '20

The error object has to be separate from the control, as it can be referenced while the control is released. It is also available even without a script host, and in fact the same object will be used (same address) when a host is instantiated. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 240 ++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 39 +++-- 2 files changed, 256 insertions(+), 23 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index d493065..c92a86a 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -119,6 +119,11 @@ struct procedure_enum { ScriptProcedureCollection *procedures; }; +typedef struct { + IScriptError IScriptError_iface; + LONG ref; +} ScriptError; + struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSiteWindow IActiveScriptSiteWindow_iface; @@ -164,12 +169,14 @@ struct ScriptControl { IScriptModuleCollection IScriptModuleCollection_iface; ScriptHost *host; + ScriptError *error; }; static HINSTANCE msscript_instance; typedef enum tid_t { IScriptControl_tid, + IScriptError_tid, IScriptModuleCollection_tid, IScriptModule_tid, IScriptProcedureCollection_tid, @@ -182,6 +189,7 @@ static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { &IID_IScriptControl, + &IID_IScriptError, &IID_IScriptModuleCollection, &IID_IScriptModule, &IID_IScriptProcedureCollection, @@ -516,6 +524,11 @@ static inline ScriptModule *impl_from_IScriptModule(IScriptModule *iface) return CONTAINING_RECORD(iface, ScriptModule, IScriptModule_iface); } +static inline ScriptError *impl_from_IScriptError(IScriptError *iface) +{ + return CONTAINING_RECORD(iface, ScriptError, IScriptError_iface); +} + static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *iface) { return CONTAINING_RECORD(iface, ConnectionPoint, IConnectionPoint_iface); @@ -2086,6 +2099,212 @@ static const IScriptModuleCollectionVtbl ScriptModuleCollectionVtbl = { ScriptModuleCollection_Add }; +static HRESULT WINAPI ScriptError_QueryInterface(IScriptError *iface, REFIID riid, void **ppv) +{ + ScriptError *This = impl_from_IScriptError(iface); + + if (IsEqualGUID(&IID_IDispatch, riid) || IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IScriptError, riid)) + { + *ppv = &This->IScriptError_iface; + } + else + { + WARN("unsupported interface: (%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ScriptError_AddRef(IScriptError *iface) +{ + ScriptError *This = impl_from_IScriptError(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ScriptError_Release(IScriptError *iface) +{ + ScriptError *This = impl_from_IScriptError(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI ScriptError_GetTypeInfoCount(IScriptError *iface, UINT *pctinfo) +{ + ScriptError *This = impl_from_IScriptError(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI ScriptError_GetTypeInfo(IScriptError *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + ScriptError *This = impl_from_IScriptError(iface); + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + return get_typeinfo(IScriptError_tid, ppTInfo); +} + +static HRESULT WINAPI ScriptError_GetIDsOfNames(IScriptError *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ScriptError *This = impl_from_IScriptError(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IScriptError_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptError_Invoke(IScriptError *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ScriptError *This = impl_from_IScriptError(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IScriptError_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptError_get_Number(IScriptError *iface, LONG *plNumber) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, plNumber); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_get_Source(IScriptError *iface, BSTR *pbstrSource) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, pbstrSource); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_get_Description(IScriptError *iface, BSTR *pbstrDescription) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, pbstrDescription); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_get_HelpFile(IScriptError *iface, BSTR *pbstrHelpFile) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, pbstrHelpFile); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_get_HelpContext(IScriptError *iface, LONG *plHelpContext) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, plHelpContext); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_get_Text(IScriptError *iface, BSTR *pbstrText) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, pbstrText); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_get_Line(IScriptError *iface, LONG *plLine) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, plLine); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_get_Column(IScriptError *iface, LONG *plColumn) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, plColumn); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_Clear(IScriptError *iface) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->()\n", This); + + return E_NOTIMPL; +} + +static const IScriptErrorVtbl ScriptErrorVtbl = { + ScriptError_QueryInterface, + ScriptError_AddRef, + ScriptError_Release, + ScriptError_GetTypeInfoCount, + ScriptError_GetTypeInfo, + ScriptError_GetIDsOfNames, + ScriptError_Invoke, + ScriptError_get_Number, + ScriptError_get_Source, + ScriptError_get_Description, + ScriptError_get_HelpFile, + ScriptError_get_HelpContext, + ScriptError_get_Text, + ScriptError_get_Line, + ScriptError_get_Column, + ScriptError_Clear +}; + static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) { IObjectSafety *objsafety; @@ -2233,6 +2452,7 @@ static ULONG WINAPI ScriptControl_Release(IScriptControl *iface) release_modules(This, FALSE); IActiveScriptSite_Release(&This->host->IActiveScriptSite_iface); } + IScriptError_Release(&This->error->IScriptError_iface); heap_free(This); } @@ -2513,8 +2733,14 @@ static HRESULT WINAPI ScriptControl_get_Modules(IScriptControl *iface, IScriptMo static HRESULT WINAPI ScriptControl_get_Error(IScriptControl *iface, IScriptError **p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if (!p) return E_POINTER; + + *p = &This->error->IScriptError_iface; + IScriptError_AddRef(*p); + return S_OK; } static HRESULT WINAPI ScriptControl_get_CodeObject(IScriptControl *iface, IDispatch **p) @@ -3543,6 +3769,13 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow if(!script_control) return E_OUTOFMEMORY; + script_control->error = heap_alloc_zero(sizeof(*script_control->error)); + if(!script_control->error) + { + heap_free(script_control); + return E_OUTOFMEMORY; + } + script_control->IScriptControl_iface.lpVtbl = &ScriptControlVtbl; script_control->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; script_control->IOleObject_iface.lpVtbl = &OleObjectVtbl; @@ -3557,6 +3790,9 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->allow_ui = VARIANT_TRUE; script_control->use_safe_subset = VARIANT_FALSE; + script_control->error->IScriptError_iface.lpVtbl = &ScriptErrorVtbl; + script_control->error->ref = 1; + ConnectionPoint_Init(&script_control->cp_scsource, script_control, &DIID_DScriptControlSource); ConnectionPoint_Init(&script_control->cp_propnotif, script_control, &IID_IPropertyNotifySink); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 085913a..9bbbe4c 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2075,15 +2075,12 @@ static void _check_error(IScriptControl *sc, LONG exp_num, int line) hr = IScriptControl_get_Error(sc, &script_err); ok_(__FILE__,line)(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); - if (SUCCEEDED(hr)) - { - error_num = 0xdeadbeef; - hr = IScriptError_get_Number(script_err, &error_num); - ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); - ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", - error_num, exp_num); - IScriptError_Release(script_err); - } + error_num = 0xdeadbeef; + hr = IScriptError_get_Number(script_err, &error_num); + todo_wine ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); + todo_wine ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", + error_num, exp_num); + IScriptError_Release(script_err); } static void test_IScriptControl_Eval(void) @@ -2112,7 +2109,7 @@ static void test_IScriptControl_Eval(void) ok(hr == E_FAIL, "IScriptControl_Eval returned: 0x%08x.\n", hr); ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); script_str = SysAllocString(L"1 + 1"); V_VT(&var) = VT_NULL; @@ -2160,7 +2157,7 @@ static void test_IScriptControl_Eval(void) ok(V_I4(&var) == 0xdeadbeef || broken(V_I4(&var) == 0) /* after Win8 */, "V_I4(var) = %d.\n", V_I4(&var)); SysFreeString(script_str); - todo_wine CHECK_ERROR(sc, 1004); + CHECK_ERROR(sc, 1004); script_str = SysAllocString(L"var2 = var1 + var2"); V_VT(&var) = VT_NULL; @@ -2287,13 +2284,13 @@ static void test_IScriptControl_AddCode(void) hr = IScriptControl_AddCode(sc, code_str); ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); SysFreeString(code_str); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); code_str = SysAllocString(L"invalid syntax"); hr = IScriptControl_AddCode(sc, code_str); todo_wine ok(hr == 0x800a03ec, "IScriptControl_AddCode returned: 0x%08x.\n", hr); SysFreeString(code_str); - todo_wine CHECK_ERROR(sc, 1004); + CHECK_ERROR(sc, 1004); IScriptControl_Release(sc); @@ -2388,13 +2385,13 @@ static void test_IScriptControl_ExecuteStatement(void) hr = IScriptControl_ExecuteStatement(sc, str); ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08x.\n", hr); SysFreeString(str); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); str = SysAllocString(L"invalid syntax"); hr = IScriptControl_ExecuteStatement(sc, str); todo_wine ok(hr == 0x800a03ec, "IScriptControl_ExecuteStatement returned: 0x%08x.\n", hr); SysFreeString(str); - todo_wine CHECK_ERROR(sc, 1004); + CHECK_ERROR(sc, 1004); IScriptControl_Release(sc); @@ -2500,13 +2497,13 @@ static void test_IScriptControl_Run(void) str = SysAllocString(L"foobar"); hr = IScriptControl_Run(sc, str, &params, &var); ok(hr == DISP_E_UNKNOWNNAME, "IScriptControl_Run failed: 0x%08x.\n", hr); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); SysFreeString(str); str = SysAllocString(L"function subtract(a, b) { return a - b; }\n"); hr = IScriptControl_AddCode(sc, str); ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); SysFreeString(str); str = SysAllocString(L"Subtract"); @@ -2517,12 +2514,12 @@ static void test_IScriptControl_Run(void) str = SysAllocString(L"subtract"); hr = IScriptControl_Run(sc, str, &params, NULL); ok(hr == E_POINTER, "IScriptControl_Run failed: 0x%08x.\n", hr); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); hr = IScriptControl_Run(sc, str, &params, &var); ok(hr == S_OK, "IScriptControl_Run failed: 0x%08x.\n", hr); ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 7), "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); SafeArrayDestroy(params); /* The array's other dimensions are ignored */ @@ -3340,7 +3337,7 @@ static void test_IScriptControl_get_Procedures(void) ); hr = IScriptControl_AddCode(sc, str); ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); SysFreeString(str); hr = IScriptProcedureCollection_get_Count(procs, &count); @@ -3480,7 +3477,7 @@ static void test_IScriptControl_get_Procedures(void) hr = IScriptControl_AddCode(sc, str); ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); SysFreeString(str); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); CHECK_CALLED(ParseScriptText); GetScriptDispatch_expected_name = NULL; -- 2.21.0

2 22

[PATCH 6/6] winex11.drv: Support clipping full screen windows on non-primary monitors.
by Zhiyi Zhang 25 Aug '20

25 Aug '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 15 ++++++++++----- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 7 ------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d78449c2cc7..eb5e6a6c0d4 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -548,7 +548,8 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) { struct x11drv_win_data *data; struct x11drv_thread_data *thread_data; - RECT rect; + MONITORINFO monitor_info; + HMONITOR monitor; DWORD style; BOOL fullscreen; @@ -559,21 +560,25 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) /* maximized windows don't count as full screen */ if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) return FALSE; if (!(data = get_win_data( hwnd ))) return FALSE; - fullscreen = is_window_rect_fullscreen( &data->whole_rect ); + fullscreen = is_window_rect_full_screen( &data->whole_rect ); release_win_data( data ); if (!fullscreen) return FALSE; if (!(thread_data = x11drv_thread_data())) return FALSE; if (GetTickCount() - thread_data->clip_reset < 1000) return FALSE; if (!reset && clipping_cursor && thread_data->clip_hwnd) return FALSE; /* already clipping */ - rect = get_primary_monitor_rect(); + + monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTONEAREST ); + if (!monitor) return FALSE; + monitor_info.cbSize = sizeof(monitor_info); + if (!GetMonitorInfoW( monitor, &monitor_info )) return FALSE; if (!grab_fullscreen) { RECT virtual_rect = get_virtual_screen_rect(); - if (!EqualRect( &rect, &virtual_rect )) return FALSE; + if (!EqualRect( &monitor_info.rcMonitor, &virtual_rect )) return FALSE; if (is_virtual_desktop()) return FALSE; } TRACE( "win %p clipping fullscreen\n", hwnd ); - return grab_clipping_window( &rect ); + return grab_clipping_window( &monitor_info.rcMonitor ); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 6378c9c7650..455957264bc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2460,7 +2460,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags { release_win_data( data ); unmap_window( hwnd ); - if (is_window_rect_fullscreen( &old_window_rect )) reset_clipping_window(); + if (is_window_rect_full_screen( &old_window_rect )) reset_clipping_window(); if (!(data = get_win_data( hwnd ))) return; } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ce00e6c54dd..a92c738a685 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -822,11 +822,4 @@ static inline BOOL is_window_rect_mapped( const RECT *rect ) max( rect->bottom, rect->top + 1 ) > virtual_rect.top); } -static inline BOOL is_window_rect_fullscreen( const RECT *rect ) -{ - RECT primary_rect = get_primary_monitor_rect(); - return (rect->left <= primary_rect.left && rect->right >= primary_rect.right && - rect->top <= primary_rect.top && rect->bottom >= primary_rect.bottom); -} - #endif /* __WINE_X11DRV_H */ -- 2.25.1

1 0

[PATCH 5/6] winex11.drv: Support full screen windows on non-primary monitors.
by Zhiyi Zhang 25 Aug '20

25 Aug '20

A window can be maximized or full screen on non-primary monitors. In this case we need to add _NET_WM_STATE_MAXIMIZED or _NET_WM_STATE_FULLSCREEN hint to the window so that they can be handled correctly by window managers. For example, a full screen window on the secondary monitor needs _NET_WM_STATE_FULLSCREEN so that window managers prevent panels from obscuring it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/window.c | 31 +++++++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 09475d1adb1..6378c9c7650 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -272,9 +272,36 @@ static inline BOOL is_window_resizable( struct x11drv_win_data *data, DWORD styl { if (style & WS_THICKFRAME) return TRUE; /* Metacity needs the window to be resizable to make it fullscreen */ - return is_window_rect_fullscreen( &data->whole_rect ); + return is_window_rect_full_screen( &data->whole_rect ); } +struct monitor_info +{ + const RECT *rect; + BOOL full_screen; +}; + +static BOOL CALLBACK enum_monitor_proc( HMONITOR monitor, HDC hdc, RECT *monitor_rect, LPARAM lparam ) +{ + struct monitor_info *info = (struct monitor_info *)lparam; + + if (info->rect->left <= monitor_rect->left && info->rect->right >= monitor_rect->right && + info->rect->top <= monitor_rect->top && info->rect->bottom >= monitor_rect->bottom) + { + info->full_screen = TRUE; + return FALSE; + } + + return TRUE; +} + +BOOL is_window_rect_full_screen( const RECT *rect ) +{ + struct monitor_info info = {rect, FALSE}; + + EnumDisplayMonitors( NULL, NULL, enum_monitor_proc, (LPARAM)&info ); + return info.full_screen; +} /*********************************************************************** * get_mwm_decorations @@ -945,7 +972,7 @@ void update_net_wm_states( struct x11drv_win_data *data ) style = GetWindowLongW( data->hwnd, GWL_STYLE ); if (style & WS_MINIMIZE) new_state |= data->net_wm_state & ((1 << NET_WM_STATE_FULLSCREEN)|(1 << NET_WM_STATE_MAXIMIZED)); - if (is_window_rect_fullscreen( &data->whole_rect )) + if (is_window_rect_full_screen( &data->whole_rect )) { if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) new_state |= (1 << NET_WM_STATE_MAXIMIZED); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 233891f7b00..ce00e6c54dd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -641,6 +641,7 @@ typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) DECLSPEC_HIDDEN; extern int X11DRV_check_error(void) DECLSPEC_HIDDEN; extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, int x, int y, int cx, int cy ) DECLSPEC_HIDDEN; +extern BOOL is_window_rect_full_screen( const RECT *rect ) DECLSPEC_HIDDEN; extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN; extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; -- 2.25.1

1 0