October 2020 - Wine-Commits

Jacek Caban : server: Remove no longer needed server-side screen buffer ioctls.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 2e74000537a947e29c6de9de53bbfb1549649f87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e74000537a947e29c6de9de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:29:34 2020 +0200 server: Remove no longer needed server-side screen buffer ioctls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 694 ------------------------------------------------------- 1 file changed, 694 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2e74000537a947e29c6d…

1 0

Henri Verbeet : wined3d: Avoid accessing NULL depth/stencil state in wined3d_context_vk_update_graphics_pipeline_key().
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 227605569a105c9f6d27ebf2154c71b7c06bf4c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=227605569a105c9f6d27ebf2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 13 17:08:53 2020 +0330 wined3d: Avoid accessing NULL depth/stencil state in wined3d_context_vk_update_graphics_pipeline_key(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index fa5aac28fd..92b8c14e23 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2058,6 +2058,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte { key->ds_desc.depthTestEnable = d->desc.depth; key->ds_desc.depthWriteEnable = d->desc.depth_write; + key->ds_desc.depthCompareOp = vk_compare_op_from_wined3d(d->desc.depth_func); key->ds_desc.stencilTestEnable = state->fb.depth_stencil && d->desc.stencil; if (key->ds_desc.stencilTestEnable) { @@ -2084,9 +2085,9 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte { key->ds_desc.depthTestEnable = VK_TRUE; key->ds_desc.depthWriteEnable = VK_TRUE; + key->ds_desc.depthCompareOp = VK_COMPARE_OP_LESS; key->ds_desc.stencilTestEnable = VK_FALSE; } - key->ds_desc.depthCompareOp = vk_compare_op_from_wined3d(d->desc.depth_func); update = true; }

1 0

Nikolay Sivov : evr/tests: Use wide string literals.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: a1dc382812726be7dea5ba6b46f851e7767826ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1dc382812726be7dea5ba6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 15:26:48 2020 +0300 evr/tests: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index ff17f57b7e..6a69305c9e 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -29,7 +29,7 @@ #include "initguid.h" #include "evr9.h" -static const WCHAR sink_id[] = {'E','V','R',' ','I','n','p','u','t','0',0}; +static const WCHAR sink_id[] = L"EVR Input0"; static void set_rect(MFVideoNormalizedRect *rect, float left, float top, float right, float bottom) {

1 0

Nikolay Sivov : evr/mixer: Keep original media type instances for inputs.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: d6e5fa7bd37ff382b7e357c9bd51f3dfe17e0d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6e5fa7bd37ff382b7e357c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 15:26:47 2020 +0300 evr/mixer: Keep original media type instances for inputs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 6 ++-- dlls/evr/tests/evr.c | 79 +++++++++++++++++++++++++++------------------------- 2 files changed, 45 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6e5fa7bd37ff382b7e3…

1 0

Robert Wilhelm : vbscript: Support class default sub.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 16fe2037fb2b3ddec1e6312b076cc76d88e9240a URL: https://source.winehq.org/git/wine.git/?a=commit;h=16fe2037fb2b3ddec1e6312b… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Oct 13 18:58:21 2020 +0200 vbscript: Support class default sub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35744 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 14 +++++++++++--- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 30 ++++++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 6 ++---- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e9f6361aee..5c298ebe99 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1668,6 +1668,7 @@ static BOOL lookup_class_funcs(class_desc_t *class_desc, const WCHAR *name) static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) { function_decl_t *func_decl, *func_prop_decl; + BOOL is_default, have_default = FALSE; class_desc_t *class_desc; dim_decl_t *prop_decl; unsigned i; @@ -1690,14 +1691,21 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) if(!class_desc->name) return E_OUTOFMEMORY; - class_desc->func_cnt = 1; /* always allocate slot for default getter */ + class_desc->func_cnt = 1; /* always allocate slot for default getter or method */ for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { + is_default = FALSE; for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->is_default) + if(func_prop_decl->is_default) { + if(have_default) { + FIXME("multiple default getters or methods\n"); + return E_FAIL; + } + is_default = have_default = TRUE; break; + } } - if(!func_prop_decl) + if(!is_default) class_desc->func_cnt++; } diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 7e6cc17efd..942e76459c 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -993,7 +993,7 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, BOOL is_default = FALSE; if(storage_flags & STORAGE_IS_DEFAULT) { - if(type == FUNC_PROPGET) { + if(type == FUNC_PROPGET || type == FUNC_FUNCTION || type == FUNC_SUB) { is_default = TRUE; }else { FIXME("Invalid default property\n"); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index fc762450a3..65f8a458cd 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1750,6 +1750,36 @@ call ok(x.getprop.getprop().prop is obj, "x.getprop.getprop().prop is not obj (e ok getVT(x) = "VT_DISPATCH*", "getVT(x) = " & getVT(x) todo_wine_ok getVT(x()) = "VT_BSTR", "getVT(x()) = " & getVT(x()) +funcCalled = "" +class DefaultSubTest1 + Public default Sub init(a) + funcCalled = "init" & a + end sub +end class + +Set obj = New DefaultSubTest1 +obj.init(1) +call ok(funcCalled = "init1","funcCalled=" & funcCalled) +funcCalled = "" +obj(2) +call ok(funcCalled = "init2","funcCalled=" & funcCalled) + +class DefaultSubTest2 + Public Default Function init + funcCalled = "init" + end function +end class + +Set obj = New DefaultSubTest2 +funcCalled = "" +obj.init() +call ok(funcCalled = "init","funcCalled=" & funcCalled) +funcCalled = "" +' todo this is not yet supported +'funcCalled = "" +'obj() +'call ok(funcCalled = "init","funcCalled=" & funcCalled) + with nothing end with diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 1ff1110e56..5f493d420b 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -38,19 +38,17 @@ static BOOL get_func_id(vbdisp_t *This, const WCHAR *name, vbdisp_invoke_type_t { unsigned i; - for(i = invoke_type == VBDISP_ANY ? 0 : 1; i < This->desc->func_cnt; i++) { + for(i = 0; i < This->desc->func_cnt; i++) { if(invoke_type == VBDISP_ANY) { if(!search_private && !This->desc->funcs[i].is_public) continue; - if(!i && !This->desc->funcs[0].name) /* default value may not exist */ - continue; }else { if(!This->desc->funcs[i].entries[invoke_type] || (!search_private && !This->desc->funcs[i].entries[invoke_type]->is_public)) continue; } - if(!wcsicmp(This->desc->funcs[i].name, name)) { + if(This->desc->funcs[i].name && !wcsicmp(This->desc->funcs[i].name, name)) { *id = i; return TRUE; }

1 0

Robert Wilhelm : vbscript: Add is_default flag to function_decl_t.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 54740a5cb8dfb8ccedad988aaf46125893cebd15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54740a5cb8dfb8ccedad988a… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Oct 13 18:58:06 2020 +0200 vbscript: Add is_default flag to function_decl_t. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 6 ++---- dlls/vbscript/interp.c | 2 +- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 4 +++- dlls/vbscript/vbdisp.c | 2 +- dlls/vbscript/vbscript.h | 1 - 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 2e991b0c0a..e9f6361aee 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1468,7 +1468,6 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f case FUNC_PROPGET: case FUNC_PROPLET: case FUNC_PROPSET: - case FUNC_DEFGET: ctx->prop_end_label = alloc_label(ctx); if(!ctx->prop_end_label) return E_OUTOFMEMORY; @@ -1630,7 +1629,6 @@ static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_d case FUNC_FUNCTION: case FUNC_SUB: case FUNC_PROPGET: - case FUNC_DEFGET: invoke_type = VBDISP_CALLGET; break; case FUNC_PROPLET: @@ -1696,7 +1694,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) + if(func_prop_decl->is_default) break; } if(!func_prop_decl) @@ -1710,7 +1708,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) for(func_decl = class_decl->funcs, i=1; func_decl; func_decl = func_decl->next, i++) { for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) { + if(func_prop_decl->is_default) { i--; break; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d58e89b7db..40d1e961cc 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -134,7 +134,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) + if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET) && !wcsicmp(name, ctx->func->name)) { ref->type = REF_VAR; ref->u.v = &ctx->ret_val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index ab81bb3ae4..f5d8a616b9 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -184,6 +184,7 @@ typedef struct _function_decl_t { const WCHAR *name; function_type_t type; BOOL is_public; + BOOL is_default; arg_decl_t *args; statement_t *body; struct _function_decl_t *next; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index cf94bdce46..7e6cc17efd 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -990,10 +990,11 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, unsigned storage_flags, arg_decl_t *arg_decl, statement_t *body) { function_decl_t *decl; + BOOL is_default = FALSE; if(storage_flags & STORAGE_IS_DEFAULT) { if(type == FUNC_PROPGET) { - type = FUNC_DEFGET; + is_default = TRUE; }else { FIXME("Invalid default property\n"); ctx->hres = E_FAIL; @@ -1008,6 +1009,7 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, decl->name = name; decl->type = type; decl->is_public = !(storage_flags & STORAGE_IS_PRIVATE); + decl->is_default = is_default; decl->args = arg_decl; decl->body = body; decl->next = NULL; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 36eba21e27..1ff1110e56 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -177,7 +177,7 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern switch(flags) { case DISPATCH_PROPERTYGET: func = This->desc->funcs[id].entries[VBDISP_CALLGET]; - if(!func || (func->type != FUNC_PROPGET && func->type != FUNC_DEFGET)) { + if(!func || func->type != FUNC_PROPGET) { WARN("no getter\n"); return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 869fb05b6e..afcce5eb9b 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -314,7 +314,6 @@ typedef enum { FUNC_PROPGET, FUNC_PROPLET, FUNC_PROPSET, - FUNC_DEFGET } function_type_t; typedef struct {

1 0

Sven Baars : mmdevapi/tests: Fix some test failures on Windows <= 7.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: a66bb83191381e0614fd0ed27ecce9c8d6dca72d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a66bb83191381e0614fd0ed2… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Oct 11 13:20:22 2020 +0200 mmdevapi/tests: Fix some test failures on Windows <= 7. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/mmdevenum.c | 7 +++++ dlls/mmdevapi/tests/render.c | 60 ++++++++++++++++++++++------------------- 2 files changed, 40 insertions(+), 27 deletions(-) diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 11df1f0229..4708c2fef8 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -218,6 +218,13 @@ static void test_ActivateAudioInterfaceAsync(void) h_mmdev = LoadLibraryA("mmdevapi.dll"); + pActivateAudioInterfaceAsync = (void*)GetProcAddress(h_mmdev, "ActivateAudioInterfaceAsync"); + if (!pActivateAudioInterfaceAsync) + { + win_skip("ActivateAudioInterfaceAsync is not supported on Win <= 7\n"); + return; + } + /* some applications look this up by ordinal */ pActivateAudioInterfaceAsync = (void*)GetProcAddress(h_mmdev, (char *)17); ok(pActivateAudioInterfaceAsync != NULL, "mmdevapi.ActivateAudioInterfaceAsync missing!\n"); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 5800ec5fd6..3ad00eaa2e 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -154,8 +154,11 @@ static void test_audioclient(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient2, CLSCTX_INPROC_SERVER, NULL, (void**)&ac2); - ok(hr == S_OK, "IAudioClient2 Activation failed with %08x\n", hr); - IAudioClient2_Release(ac2); + ok(hr == S_OK || + broken(hr == E_NOINTERFACE) /* win7 */, + "IAudioClient2 Activation failed with %08x\n", hr); + if(hr == S_OK) + IAudioClient2_Release(ac2); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); @@ -262,39 +265,42 @@ static void test_audioclient(void) } hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient2, (void**)&ac2); - ok(hr == S_OK, "Failed to query IAudioClient2 interface: %08x\n", hr); - - hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, NULL); - ok(hr == E_INVALIDARG, "IsOffloadCapable gave wrong error: %08x\n", hr); + if (hr == S_OK) + { + hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, NULL); + ok(hr == E_INVALIDARG, "IsOffloadCapable gave wrong error: %08x\n", hr); - hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, &offload_capable); - ok(hr == S_OK, "IsOffloadCapable failed: %08x\n", hr); + hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, &offload_capable); + ok(hr == S_OK, "IsOffloadCapable failed: %08x\n", hr); - hr = IAudioClient2_SetClientProperties(ac2, NULL); - ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08x\n", hr); + hr = IAudioClient2_SetClientProperties(ac2, NULL); + ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08x\n", hr); - client_props.cbSize = 0; - client_props.bIsOffload = FALSE; - client_props.eCategory = AudioCategory_BackgroundCapableMedia; - client_props.Options = 0; + client_props.cbSize = 0; + client_props.bIsOffload = FALSE; + client_props.eCategory = AudioCategory_BackgroundCapableMedia; + client_props.Options = 0; - hr = IAudioClient2_SetClientProperties(ac2, &client_props); - ok(hr == E_INVALIDARG, "SetClientProperties with invalid cbSize gave wrong error: %08x\n", hr); + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + ok(hr == E_INVALIDARG, "SetClientProperties with invalid cbSize gave wrong error: %08x\n", hr); - client_props.cbSize = sizeof(client_props); - client_props.bIsOffload = TRUE; + client_props.cbSize = sizeof(client_props); + client_props.bIsOffload = TRUE; - hr = IAudioClient2_SetClientProperties(ac2, &client_props); - if(!offload_capable) - ok(hr == AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE, "SetClientProperties(offload) gave wrong error: %08x\n", hr); - else - ok(hr == S_OK, "SetClientProperties(offload) failed: %08x\n", hr); + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + if(!offload_capable) + ok(hr == AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE, "SetClientProperties(offload) gave wrong error: %08x\n", hr); + else + ok(hr == S_OK, "SetClientProperties(offload) failed: %08x\n", hr); - client_props.bIsOffload = FALSE; - hr = IAudioClient2_SetClientProperties(ac2, &client_props); - ok(hr == S_OK, "SetClientProperties failed: %08x\n", hr); + client_props.bIsOffload = FALSE; + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + ok(hr == S_OK, "SetClientProperties failed: %08x\n", hr); - IAudioClient2_Release(ac2); + IAudioClient2_Release(ac2); + } + else + win_skip("IAudioClient2 is not present on Win <= 7\n"); hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient3, (void**)&ac3); ok(hr == S_OK ||

1 0

Jacek Caban : server: Remove no longer needed screen_buffer fields.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: c58802d0f46860572b7c42818cf8681119d4db7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c58802d0f46860572b7c4281… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:30:29 2020 +0200 server: Remove no longer needed screen_buffer fields. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 90 ++------------------------------------------------------ 1 file changed, 2 insertions(+), 88 deletions(-) diff --git a/server/console.c b/server/console.c index 1cb4fd1659..9bcacff2c6 100644 --- a/server/console.c +++ b/server/console.c @@ -258,22 +258,6 @@ struct screen_buffer struct list entry; /* entry in list of all screen buffers */ struct console_input *input; /* associated console input */ unsigned int id; /* buffer id */ - unsigned int mode; /* output mode */ - int cursor_size; /* size of cursor (percentage filled) */ - int cursor_visible;/* cursor visibility flag */ - int cursor_x; /* position of cursor */ - int cursor_y; /* position of cursor */ - int width; /* size (w-h) of the screen buffer */ - int height; - int max_width; /* size (w-h) of the window given font size */ - int max_height; - char_info_t *data; /* the data for each cell - a width x height matrix */ - unsigned short attr; /* default fill attributes (screen colors) */ - unsigned short popup_attr; /* pop-up color attributes */ - unsigned int color_map[16]; /* color table */ - rectangle_t win; /* current visible window on the screen buffer * - * as seen in wineconsole */ - struct font_info font; /* console font information */ struct fd *fd; /* for bare console, attached output fd */ struct async_queue ioctl_q; /* ioctl queue */ }; @@ -412,8 +396,6 @@ static const struct fd_ops console_connection_fd_ops = static struct list screen_buffer_list = LIST_INIT(screen_buffer_list); -static const char_info_t empty_char_info = { ' ', 0x000f }; /* white on black space */ - static struct fd *console_input_get_fd( struct object* obj ) { struct console_input *console_input = (struct console_input*)obj; @@ -649,47 +631,17 @@ static void disconnect_console_server( struct console_server *server ) static void set_active_screen_buffer( struct console_input *console_input, struct screen_buffer *screen_buffer ) { - struct condrv_renderer_event evt; - if (console_input->active == screen_buffer) return; if (console_input->active) release_object( console_input->active ); console_input->active = (struct screen_buffer *)grab_object( screen_buffer ); if (console_input->server) queue_host_ioctl( console_input->server, IOCTL_CONDRV_ACTIVATE, screen_buffer->id, NULL, NULL ); - - evt.event = CONSOLE_RENDERER_SB_RESIZE_EVENT; - evt.u.resize.width = screen_buffer->width; - evt.u.resize.height = screen_buffer->height; - console_input_events_append( console_input, &evt ); - - evt.event = CONSOLE_RENDERER_DISPLAY_EVENT; - evt.u.display.left = screen_buffer->win.left; - evt.u.display.top = screen_buffer->win.top; - evt.u.display.width = screen_buffer->win.right - screen_buffer->win.left + 1; - evt.u.display.height = screen_buffer->win.bottom - screen_buffer->win.top + 1; - console_input_events_append( console_input, &evt ); - - evt.event = CONSOLE_RENDERER_UPDATE_EVENT; - evt.u.update.top = 0; - evt.u.update.bottom = screen_buffer->height - 1; - console_input_events_append( console_input, &evt ); - - evt.event = CONSOLE_RENDERER_CURSOR_GEOM_EVENT; - evt.u.cursor_geom.size = screen_buffer->cursor_size; - evt.u.cursor_geom.visible = screen_buffer->cursor_visible; - console_input_events_append( console_input, &evt ); - - evt.event = CONSOLE_RENDERER_CURSOR_POS_EVENT; - evt.u.cursor_pos.x = screen_buffer->cursor_x; - evt.u.cursor_pos.y = screen_buffer->cursor_y; - console_input_events_append( console_input, &evt ); } static struct object *create_console_output( struct console_input *console_input ) { struct screen_buffer *screen_buffer; - int i; if (console_input->last_id == ~0) { @@ -700,31 +652,8 @@ static struct object *create_console_output( struct console_input *console_input if (!(screen_buffer = alloc_object( &screen_buffer_ops ))) return NULL; - screen_buffer->id = ++console_input->last_id; - screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; - screen_buffer->input = console_input; - screen_buffer->cursor_size = 100; - screen_buffer->cursor_visible = 1; - screen_buffer->width = 80; - screen_buffer->height = 150; - screen_buffer->max_width = 80; - screen_buffer->max_height = 25; - screen_buffer->cursor_x = 0; - screen_buffer->cursor_y = 0; - screen_buffer->attr = 0x0F; - screen_buffer->popup_attr = 0xF5; - screen_buffer->win.left = 0; - screen_buffer->win.right = screen_buffer->max_width - 1; - screen_buffer->win.top = 0; - screen_buffer->win.bottom = screen_buffer->max_height - 1; - screen_buffer->data = NULL; - screen_buffer->font.width = 0; - screen_buffer->font.height = 0; - screen_buffer->font.weight = FW_NORMAL; - screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; - screen_buffer->font.face_name = NULL; - screen_buffer->font.face_len = 0; - memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) ); + screen_buffer->id = ++console_input->last_id; + screen_buffer->input = console_input; init_async_queue( &screen_buffer->ioctl_q ); list_add_head( &screen_buffer_list, &screen_buffer->entry ); @@ -737,19 +666,6 @@ static struct object *create_console_output( struct console_input *console_input } allow_fd_caching(screen_buffer->fd); - if (!(screen_buffer->data = malloc( screen_buffer->width * screen_buffer->height * - sizeof(*screen_buffer->data) ))) - { - release_object( screen_buffer ); - return NULL; - } - /* clear the first row */ - for (i = 0; i < screen_buffer->width; i++) screen_buffer->data[i] = empty_char_info; - /* and copy it to all other rows */ - for (i = 1; i < screen_buffer->height; i++) - memcpy( &screen_buffer->data[i * screen_buffer->width], screen_buffer->data, - screen_buffer->width * sizeof(char_info_t) ); - if (console_input->server) queue_host_ioctl( console_input->server, IOCTL_CONDRV_INIT_OUTPUT, screen_buffer->id, NULL, NULL ); if (!console_input->active) set_active_screen_buffer( console_input, screen_buffer ); @@ -966,8 +882,6 @@ static void screen_buffer_destroy( struct object *obj ) screen_buffer->id, NULL, NULL ); if (screen_buffer->fd) release_object( screen_buffer->fd ); free_async_queue( &screen_buffer->ioctl_q ); - free( screen_buffer->data ); - free( screen_buffer->font.face_name ); } static struct object *screen_buffer_open_file( struct object *obj, unsigned int access,

1 0

Jacek Caban : server: Remove no longer needed console_input fields.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: cf20e80f8d962ab043cae2a46f1be583d0013214 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf20e80f8d962ab043cae2a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:30:16 2020 +0200 server: Remove no longer needed console_input fields. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 43 +++---------------------------------------- 1 file changed, 3 insertions(+), 40 deletions(-) diff --git a/server/console.c b/server/console.c index be730b5a60..1cb4fd1659 100644 --- a/server/console.c +++ b/server/console.c @@ -56,22 +56,9 @@ struct console_input struct object obj; /* object header */ int num_proc; /* number of processes attached to this console */ struct thread *renderer; /* console renderer thread */ - int mode; /* input mode */ struct screen_buffer *active; /* active screen buffer */ - int recnum; /* number of input records */ - INPUT_RECORD *records; /* input records */ struct console_input_events *evt; /* synchronization event with renderer */ struct console_server *server; /* console server object */ - WCHAR *title; /* console title */ - data_size_t title_len; /* length of console title */ - struct history_line **history; /* lines history */ - int history_size; /* number of entries in history array */ - int history_index; /* number of used entries in history array */ - int history_mode; /* mode of history (non zero means remove doubled strings */ - int edition_mode; /* index to edition mode flavors */ - int input_cp; /* console input codepage */ - int output_cp; /* console output codepage */ - user_handle_t win; /* window handle if backend supports it */ unsigned int last_id; /* id of last created console buffer */ struct event *event; /* event to wait on for input queue */ struct fd *fd; /* for bare console, attached input fd */ @@ -572,34 +559,18 @@ static struct object *create_console_input(void) return NULL; console_input->renderer = NULL; - console_input->mode = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | - ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_INSERT_MODE | - ENABLE_EXTENDED_FLAGS; console_input->num_proc = 0; console_input->active = NULL; - console_input->recnum = 0; - console_input->records = NULL; console_input->evt = NULL; console_input->server = NULL; - console_input->title = NULL; - console_input->title_len = 0; - console_input->history_size = 50; - console_input->history = calloc( console_input->history_size, sizeof(*console_input->history) ); - console_input->history_index = 0; - console_input->history_mode = 0; - console_input->edition_mode = 0; - console_input->input_cp = 0; - console_input->output_cp = 0; - console_input->win = 0; console_input->event = create_event( NULL, NULL, 0, 1, 0, NULL ); console_input->fd = NULL; console_input->last_id = 0; init_async_queue( &console_input->ioctl_q ); init_async_queue( &console_input->read_q ); - if (!console_input->history || !console_input->event) + if (!console_input->event) { - console_input->history_size = 0; release_object( console_input ); return NULL; } @@ -899,9 +870,8 @@ static void console_input_dump( struct object *obj, int verbose ) static void console_input_destroy( struct object *obj ) { - struct console_input* console_in = (struct console_input *)obj; - struct screen_buffer* curr; - int i; + struct console_input *console_in = (struct console_input *)obj; + struct screen_buffer *curr; assert( obj->ops == &console_input_ops ); @@ -911,9 +881,6 @@ static void console_input_destroy( struct object *obj ) disconnect_console_server( console_in->server ); } - free( console_in->title ); - free( console_in->records ); - if (console_in->active) release_object( console_in->active ); console_in->active = NULL; @@ -930,10 +897,6 @@ static void console_input_destroy( struct object *obj ) release_object( console_in->event ); if (console_in->fd) release_object( console_in->fd ); - - for (i = 0; i < console_in->history_size; i++) - free( console_in->history[i] ); - free( console_in->history ); } static struct object *create_console_connection( struct console_input *console )

1 0

Jacek Caban : server: Remove no longer needed server-side console input ioctls.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: c2e319ed20d3e0e5b263960edff237702896e1f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2e319ed20d3e0e5b263960e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:29:47 2020 +0200 server: Remove no longer needed server-side console input ioctls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 275 ------------------------------------------------------- 1 file changed, 275 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2e319ed20d3e0e5b263…

1 0

Jacek Caban : server: Remove no longer used console requests.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: dc6f6e9ef3d6f9c99eb743d779174e5759f091e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc6f6e9ef3d6f9c99eb743d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:29:03 2020 +0200 server: Remove no longer used console requests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 92 +------------------------ server/console.c | 153 ----------------------------------------- server/protocol.def | 42 ----------- server/request.h | 31 --------- server/trace.c | 63 ----------------- 5 files changed, 1 insertion(+), 380 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc6f6e9ef3d6f9c99eb7…

1 0

Jacek Caban : kernel32: Always use conhost for ReadConsoleW.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 633b244b1ae7928cafbfd25ef338e4918aac0d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=633b244b1ae7928cafbfd25e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:27:38 2020 +0200 kernel32: Always use conhost for ReadConsoleW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/console.c | 178 +------ dlls/kernel32/console_private.h | 34 -- dlls/kernel32/editline.c | 1044 --------------------------------------- dlls/kernel32/kernel_main.c | 1 - 5 files changed, 9 insertions(+), 1249 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=633b244b1ae7928cafbf…

1 0

Jacek Caban : kernel32: Always use conhost for WriteConsoleW.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 143c210360ab4b3232fc5cdbf5c5c56d8001ace4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=143c210360ab4b3232fc5cdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:27:11 2020 +0200 kernel32: Always use conhost for WriteConsoleW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 207 +++--------------------------------------------- 1 file changed, 10 insertions(+), 197 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index e56a09516d..37e36730a9 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -357,116 +357,6 @@ BOOL WINAPI GetNumberOfConsoleMouseButtons(LPDWORD nrofbuttons) return TRUE; } -/****************************************************************** - * CONSOLE_WriteChars - * - * WriteConsoleOutput helper: hides server call semantics - * writes a string at a given pos with standard attribute - */ -static int CONSOLE_WriteChars(HANDLE handle, const WCHAR *str, size_t length, COORD *coord) -{ - struct condrv_output_params *params; - DWORD written = 0, size; - - if (!length) return 0; - - size = sizeof(*params) + length * sizeof(WCHAR); - if (!(params = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; - params->mode = CHAR_INFO_MODE_TEXTSTDATTR; - params->x = coord->X; - params->y = coord->Y; - params->width = 0; - memcpy( params + 1, str, length * sizeof(*str) ); - if (DeviceIoControl( handle, IOCTL_CONDRV_WRITE_OUTPUT, params, size, - &written, sizeof(written), NULL, NULL )) - coord->X += written; - HeapFree( GetProcessHeap(), 0, params ); - return written; -} - -/****************************************************************** - * next_line - * - * WriteConsoleOutput helper: handles passing to next line (+scrolling if necessary) - * - */ -static BOOL next_line(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi) -{ - SMALL_RECT src; - CHAR_INFO ci; - COORD dst; - - csbi->dwCursorPosition.X = 0; - csbi->dwCursorPosition.Y++; - - if (csbi->dwCursorPosition.Y < csbi->dwSize.Y) return TRUE; - - src.Top = 1; - src.Bottom = csbi->dwSize.Y - 1; - src.Left = 0; - src.Right = csbi->dwSize.X - 1; - - dst.X = 0; - dst.Y = 0; - - ci.Attributes = csbi->wAttributes; - ci.Char.UnicodeChar = ' '; - - csbi->dwCursorPosition.Y--; - if (!ScrollConsoleScreenBufferW(hCon, &src, NULL, dst, &ci)) - return FALSE; - return TRUE; -} - -/****************************************************************** - * write_block - * - * WriteConsoleOutput helper: writes a block of non special characters - * Block can spread on several lines, and wrapping, if needed, is - * handled - * - */ -static BOOL write_block(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi, - DWORD mode, LPCWSTR ptr, int len) -{ - int blk; /* number of chars to write on current line */ - int done; /* number of chars already written */ - - if (len <= 0) return TRUE; - - if (mode & ENABLE_WRAP_AT_EOL_OUTPUT) /* writes remaining on next line */ - { - for (done = 0; done < len; done += blk) - { - blk = min(len - done, csbi->dwSize.X - csbi->dwCursorPosition.X); - - if (CONSOLE_WriteChars(hCon, ptr + done, blk, &csbi->dwCursorPosition) != blk) - return FALSE; - if (csbi->dwCursorPosition.X == csbi->dwSize.X && !next_line(hCon, csbi)) - return FALSE; - } - } - else - { - int pos = csbi->dwCursorPosition.X; - /* FIXME: we could reduce the number of loops - * but, in most cases we wouldn't gain lots of time (it would only - * happen if we're asked to overwrite more than twice the part of the line, - * which is unlikely - */ - for (done = 0; done < len; done += blk) - { - blk = min(len - done, csbi->dwSize.X - csbi->dwCursorPosition.X); - - csbi->dwCursorPosition.X = pos; - if (CONSOLE_WriteChars(hCon, ptr + done, blk, &csbi->dwCursorPosition) != blk) - return FALSE; - } - } - - return TRUE; -} - /*********************************************************************** * WriteConsoleA (KERNEL32.@) @@ -492,95 +382,18 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleA( HANDLE handle, LPCVOID buffer, DWOR /*********************************************************************** * WriteConsoleW (KERNEL32.@) */ -BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumberOfCharsToWrite, - LPDWORD lpNumberOfCharsWritten, LPVOID lpReserved) -{ - DWORD mode; - DWORD nw = 0; - const WCHAR* psz = lpBuffer; - CONSOLE_SCREEN_BUFFER_INFO csbi; - int k, first = 0; - IO_STATUS_BLOCK io; - - TRACE("%p %s %d %p %p\n", - hConsoleOutput, debugstr_wn(lpBuffer, nNumberOfCharsToWrite), - nNumberOfCharsToWrite, lpNumberOfCharsWritten, lpReserved); - - if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = 0; - - if (!NtDeviceIoControlFile(hConsoleOutput, NULL, NULL, NULL, &io, IOCTL_CONDRV_WRITE_CONSOLE, (void *)lpBuffer, - nNumberOfCharsToWrite * sizeof(WCHAR), NULL, 0)) - { - if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = nNumberOfCharsToWrite; - return TRUE; - } - - if (!GetConsoleMode(hConsoleOutput, &mode) || !GetConsoleScreenBufferInfo(hConsoleOutput, &csbi)) - return FALSE; - - if (!nNumberOfCharsToWrite) return TRUE; - - if (mode & ENABLE_PROCESSED_OUTPUT) - { - unsigned int i; - - for (i = 0; i < nNumberOfCharsToWrite; i++) - { - switch (psz[i]) - { - case '\b': case '\t': case '\n': case '\a': case '\r': - /* don't handle here the i-th char... done below */ - if ((k = i - first) > 0) - { - if (!write_block(hConsoleOutput, &csbi, mode, &psz[first], k)) - goto the_end; - nw += k; - } - first = i + 1; - nw++; - } - switch (psz[i]) - { - case '\b': - if (csbi.dwCursorPosition.X > 0) csbi.dwCursorPosition.X--; - break; - case '\t': - { - static const WCHAR tmp[] = {' ',' ',' ',' ',' ',' ',' ',' '}; - if (!write_block(hConsoleOutput, &csbi, mode, tmp, - ((csbi.dwCursorPosition.X + 8) & ~7) - csbi.dwCursorPosition.X)) - goto the_end; - } - break; - case '\n': - next_line(hConsoleOutput, &csbi); - break; - case '\a': - Beep(400, 300); - break; - case '\r': - csbi.dwCursorPosition.X = 0; - break; - default: - break; - } - } - } +BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleW( HANDLE handle, const void *buffer, DWORD length, + DWORD *written, void *reserved ) +{ + BOOL ret; - /* write the remaining block (if any) if processed output is enabled, or the - * entire buffer otherwise - */ - if ((k = nNumberOfCharsToWrite - first) > 0) - { - if (!write_block(hConsoleOutput, &csbi, mode, &psz[first], k)) - goto the_end; - nw += k; - } + TRACE( "(%p,%s,%d,%p,%p)\n", handle, debugstr_wn(buffer, length), length, written, reserved ); - the_end: - SetConsoleCursorPosition(hConsoleOutput, csbi.dwCursorPosition); - if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = nw; - return nw != 0; + ret = DeviceIoControl( handle, IOCTL_CONDRV_WRITE_CONSOLE, (void *)buffer, + length * sizeof(WCHAR), NULL, 0, NULL, NULL ); + if (written) *written = ret ? length : 0; + if (!ret) SetLastError( ERROR_INVALID_HANDLE ); + return ret; }

1 0

Henri Verbeet : wined3d: Do not invalidate STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE).
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 1b192ce4cbd12e2a42fd59cfde73abe332a1f9ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b192ce4cbd12e2a42fd59cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 13 17:08:55 2020 +0330 wined3d: Do not invalidate STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE). This is no longer used internally; two-sided stencil is handled as part of STATE_DEPTH_STENCIL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3381252e75..2f42a41754 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -510,10 +510,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct if (gl_mask & GL_STENCIL_BUFFER_BIT) { if (gl_info->supported[EXT_STENCIL_TWO_SIDE]) - { gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE)); - } gl_info->gl_ops.gl.p_glStencilMask(~0U); context_invalidate_state(context, STATE_DEPTH_STENCIL); } @@ -5389,10 +5386,7 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig if (flags & WINED3DCLEAR_STENCIL) { if (gl_info->supported[EXT_STENCIL_TWO_SIDE]) - { gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE)); - } gl_info->gl_ops.gl.p_glStencilMask(~0u); context_invalidate_state(context, STATE_DEPTH_STENCIL); gl_info->gl_ops.gl.p_glClearStencil(stencil);

1 0

Nikolay Sivov : evr/tests: Add a test for MF_SA_REQUIRED_SAMPLE_COUNT.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 25872a51727d893296633c3734447304c566cc2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=25872a51727d893296633c37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 15:26:46 2020 +0300 evr/tests: Add a test for MF_SA_REQUIRED_SAMPLE_COUNT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 7a51b3c17d..72642110a7 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -658,6 +658,12 @@ todo_wine attributes = NULL; hr = IMFTransform_GetInputStreamAttributes(transform, 0, &attributes); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFAttributes_GetCount(attributes, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected count %u.\n", count); + hr = IMFAttributes_GetUINT32(attributes, &MF_SA_REQUIRED_SAMPLE_COUNT, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected count %u.\n", count); ok(!!attributes, "Unexpected attributes.\n"); attributes2 = NULL;

1 0

Jacek Caban : kernel32: Move ReadConsole and WriteConsole to kernelbase.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 98dcd3a7ead292eee3cdd1825380ccbb8a69dbc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98dcd3a7ead292eee3cdd182… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:27:55 2020 +0200 kernel32: Move ReadConsole and WriteConsole to kernelbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 86 ----------------------------------------- dlls/kernel32/kernel32.spec | 8 ++-- dlls/kernelbase/console.c | 85 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 8 ++-- 4 files changed, 93 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=98dcd3a7ead292eee3cd…

1 0

Nikolay Sivov : mf/evr: Do not use IMFVideoMediaType when setting mixer types.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 4bdaeaeb48a9cd5fd08f7b2cdc17b5c062db787d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bdaeaeb48a9cd5fd08f7b2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 15:26:44 2020 +0300 mf/evr: Do not use IMFVideoMediaType when setting mixer types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index c3548170af..298d320ec0 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -362,35 +362,10 @@ static ULONG WINAPI video_stream_typehandler_Release(IMFMediaTypeHandler *iface) return IMFStreamSink_Release(&stream->IMFStreamSink_iface); } -/* Mixer expects special video media type instance. */ -static HRESULT video_renderer_create_video_type(IMFMediaType *media_type, IMFVideoMediaType **video_type) -{ - GUID subtype; - HRESULT hr; - - *video_type = NULL; - - if (FAILED(hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype))) - return hr; - - if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, video_type))) - return hr; - - hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)*video_type); - if (FAILED(hr)) - { - IMFVideoMediaType_Release(*video_type); - *video_type = NULL; - } - - return hr; -} - static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, IMFMediaType *in_type, IMFMediaType **out_type) { struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); - IMFVideoMediaType *video_type; HRESULT hr; TRACE("%p, %p, %p.\n", iface, in_type, out_type); @@ -401,17 +376,12 @@ static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaType if (!stream->parent) return MF_E_INVALIDMEDIATYPE; - if (FAILED(hr = video_renderer_create_video_type(in_type, &video_type))) - return hr; - - if (SUCCEEDED(hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, + if (SUCCEEDED(hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, in_type, MFT_SET_TYPE_TEST_ONLY))) { if (out_type) *out_type = NULL; } - IMFVideoMediaType_Release(video_type); - return hr; } @@ -438,7 +408,6 @@ static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeH static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *type) { struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); - IMFVideoMediaType *video_type; HRESULT hr; TRACE("%p, %p.\n", iface, type); @@ -449,11 +418,7 @@ static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeH if (!stream->parent) return MF_E_STREAMSINK_REMOVED; - if (FAILED(hr = video_renderer_create_video_type(type, &video_type))) - return hr; - - hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, 0); - IMFVideoMediaType_Release(video_type); + hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, type, 0); return hr; }

1 0

Vijay Kiran Kamuju : hnetcfg: Return S_OK in get_StaticPortMappingCollection.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 5160c30fa75b631354586b528e3be2851a1909c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5160c30fa75b631354586b52… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Oct 10 12:44:44 2020 +0200 hnetcfg: Return S_OK in get_StaticPortMappingCollection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49449 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 2 +- dlls/hnetcfg/tests/policy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index b0821d4b68..fd4ac4977d 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -720,7 +720,7 @@ static HRESULT WINAPI upnpnat_get_StaticPortMappingCollection(IUPnPNAT *iface, I FIXME("%p, %p\n", This, collection); if(collection) *collection = NULL; - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI upnpnat_get_DynamicPortMappingCollection(IUPnPNAT *iface, IDynamicPortMappingCollection **collection) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 8701455841..416049c009 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -180,7 +180,7 @@ static void test_IUPnPNAT(void) ok(hr == E_NOINTERFACE, "got: %08x\n", hr); hr = IUPnPNAT_get_StaticPortMappingCollection(nat, &static_ports); - todo_wine ok(hr == S_OK, "got: %08x\n", hr); + ok(hr == S_OK, "got: %08x\n", hr); if(hr == S_OK && static_ports) IStaticPortMappingCollection_Release(static_ports);

1 0

Huw Davies : riched20: Use paragraph ptrs in FindPixelPos().
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 4366c81f49534b090b19a50285a828aaeb4bbf53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4366c81f49534b090b19a502… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 11:16:35 2020 +0100 riched20: Use paragraph ptrs in FindPixelPos(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 56 +++++++++++++++++++++++++------------------------- dlls/riched20/editor.c | 4 ++++ dlls/riched20/editor.h | 1 + 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index dde0c7faad..1c3f4b1652 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -892,41 +892,41 @@ int ME_GetCursorOfs(const ME_Cursor *cursor) } /* Helper function for ME_FindPixelPos to find paragraph within tables */ -static ME_DisplayItem* ME_FindPixelPosInTableRow(int x, int y, - ME_DisplayItem *para) +static ME_Paragraph *pixel_pos_in_table_row( int x, int y, ME_Paragraph *para ) { ME_DisplayItem *cell, *next_cell; - assert(para->member.para.nFlags & MEPF_ROWSTART); - cell = para->member.para.next_para->member.para.pCell; + + assert( para->nFlags & MEPF_ROWSTART ); + cell = para_next( para )->pCell; assert(cell); /* find the cell we are in */ - while ((next_cell = cell->member.cell.next_cell) != NULL) { + while ((next_cell = cell->member.cell.next_cell) != NULL) + { if (x < next_cell->member.cell.pt.x) { - para = ME_FindItemFwd(cell, diParagraph); + para = &ME_FindItemFwd( cell, diParagraph )->member.para; /* Found the cell, but there might be multiple paragraphs in * the cell, so need to search down the cell for the paragraph. */ - while (cell == para->member.para.pCell) { - if (y < para->member.para.pt.y + para->member.para.nHeight) + while (cell == para->pCell) + { + if (y < para->pt.y + para->nHeight) { - if (para->member.para.nFlags & MEPF_ROWSTART) - return ME_FindPixelPosInTableRow(x, y, para); - else - return para; + if (para->nFlags & MEPF_ROWSTART) return pixel_pos_in_table_row( x, y, para ); + else return para; } - para = para->member.para.next_para; + para = para_next( para ); } /* Past the end of the cell, so go back to the last cell paragraph */ - return para->member.para.prev_para; + return para_prev( para ); } cell = next_cell; } /* Return table row delimiter */ - para = ME_FindItemFwd(cell, diParagraph); - assert(para->member.para.nFlags & MEPF_ROWEND); - assert(para->member.para.fmt.dwMask & PFM_TABLEROWDELIMITER); - assert(para->member.para.fmt.wEffects & PFE_TABLEROWDELIMITER); + para = table_row_end( para ); + assert( para->nFlags & MEPF_ROWEND ); + assert( para->fmt.dwMask & PFM_TABLEROWDELIMITER ); + assert( para->fmt.wEffects & PFE_TABLEROWDELIMITER ); return para; } @@ -986,7 +986,7 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL *is_eol, BOOL final_eop) { - ME_DisplayItem *p = editor->pBuffer->pFirst->member.para.next_para; + ME_Paragraph *para = editor_first_para( editor ); ME_DisplayItem *row = NULL; BOOL isExact = TRUE; @@ -997,19 +997,19 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, *is_eol = FALSE; /* find paragraph */ - for (; p != editor->pBuffer->pLast; p = p->member.para.next_para) + for (; para_next( para ); para = para_next( para )) { - if (y < p->member.para.pt.y + p->member.para.nHeight) + if (y < para->pt.y + para->nHeight) { - if (p->member.para.nFlags & MEPF_ROWSTART) - p = ME_FindPixelPosInTableRow(x, y, p); - y -= p->member.para.pt.y; - row = ME_FindItemFwd(p, diStartRow); + if (para->nFlags & MEPF_ROWSTART) + para = pixel_pos_in_table_row( x, y, para ); + y -= para->pt.y; + row = ME_FindItemFwd( para_get_di( para ), diStartRow); break; } - else if (p->member.para.nFlags & MEPF_ROWSTART) + else if (para->nFlags & MEPF_ROWSTART) { - p = para_get_di( table_row_end( &p->member.para ) ); + para = table_row_end( para ); } } /* find row */ @@ -1029,7 +1029,7 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, * rather than the end of the text, so the x position will be used to * determine the offset closest to the pixel position. */ isExact = FALSE; - row = ME_FindItemBack(p, diStartRow); + row = ME_FindItemBack( para_get_di( para ), diStartRow); } if (row) return ME_FindRunInRow( editor, row, x, result, is_eol ) && isExact; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e7e33c2758..a144137baa 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -280,6 +280,10 @@ static ME_TextBuffer *ME_MakeText(void) { return buf; } +ME_Paragraph *editor_first_para( ME_TextEditor *editor ) +{ + return para_next( &editor->pBuffer->pFirst->member.para ); +} static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStream *stream, ME_Style *style) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6b97a01f82..f61caa6478 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -268,6 +268,7 @@ void ME_StreamInFill(ME_InStream *stream) DECLSPEC_HIDDEN; extern BOOL me_debug DECLSPEC_HIDDEN; void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len) DECLSPEC_HIDDEN; int set_selection( ME_TextEditor *editor, int to, int from ) DECLSPEC_HIDDEN; +ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN;

1 0

Daniel Lehman : tzres: Add Eastern Standard Time (Mexico) Zone.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 0adafcd62c339cbad322aec942d4f289c5b6e671 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0adafcd62c339cbad322aec9… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Oct 12 20:16:07 2020 -0700 tzres: Add Eastern Standard Time (Mexico) Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 11 ++ po/ar.po | 286 +++++++++++++++++++++++++++------------------------ po/ast.po | 286 +++++++++++++++++++++++++++------------------------ po/bg.po | 282 ++++++++++++++++++++++++++------------------------ po/ca.po | 286 +++++++++++++++++++++++++++------------------------ po/cs.po | 286 +++++++++++++++++++++++++++------------------------ po/da.po | 286 +++++++++++++++++++++++++++------------------------ po/de.po | 286 +++++++++++++++++++++++++++------------------------ po/el.po | 282 ++++++++++++++++++++++++++------------------------ po/en.po | 282 ++++++++++++++++++++++++++------------------------ po/en_US.po | 282 ++++++++++++++++++++++++++------------------------ po/eo.po | 286 +++++++++++++++++++++++++++------------------------ po/es.po | 286 +++++++++++++++++++++++++++------------------------ po/fa.po | 284 ++++++++++++++++++++++++++------------------------ po/fi.po | 286 +++++++++++++++++++++++++++------------------------ po/fr.po | 286 +++++++++++++++++++++++++++------------------------ po/he.po | 286 +++++++++++++++++++++++++++------------------------ po/hi.po | 282 ++++++++++++++++++++++++++------------------------ po/hr.po | 286 +++++++++++++++++++++++++++------------------------ po/hu.po | 286 +++++++++++++++++++++++++++------------------------ po/it.po | 286 +++++++++++++++++++++++++++------------------------ po/ja.po | 286 +++++++++++++++++++++++++++------------------------ po/ko.po | 286 +++++++++++++++++++++++++++------------------------ po/lt.po | 286 +++++++++++++++++++++++++++------------------------ po/ml.po | 282 ++++++++++++++++++++++++++------------------------ po/nb_NO.po | 286 +++++++++++++++++++++++++++------------------------ po/nl.po | 286 +++++++++++++++++++++++++++------------------------ po/or.po | 282 ++++++++++++++++++++++++++------------------------ po/pa.po | 282 ++++++++++++++++++++++++++------------------------ po/pl.po | 286 +++++++++++++++++++++++++++------------------------ po/pt_BR.po | 286 +++++++++++++++++++++++++++------------------------ po/pt_PT.po | 286 +++++++++++++++++++++++++++------------------------ po/rm.po | 282 ++++++++++++++++++++++++++------------------------ po/ro.po | 286 +++++++++++++++++++++++++++------------------------ po/ru.po | 282 ++++++++++++++++++++++++++------------------------ po/si.po | 286 +++++++++++++++++++++++++++------------------------ po/sk.po | 286 +++++++++++++++++++++++++++------------------------ po/sl.po | 286 +++++++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 284 ++++++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 284 ++++++++++++++++++++++++++------------------------ po/sv.po | 286 +++++++++++++++++++++++++++------------------------ po/ta.po | 282 ++++++++++++++++++++++++++------------------------ po/te.po | 282 ++++++++++++++++++++++++++------------------------ po/th.po | 284 ++++++++++++++++++++++++++------------------------ po/tr.po | 286 +++++++++++++++++++++++++++------------------------ po/uk.po | 282 ++++++++++++++++++++++++++------------------------ po/wa.po | 284 ++++++++++++++++++++++++++------------------------ po/wine.pot | 282 ++++++++++++++++++++++++++------------------------ po/zh_CN.po | 286 +++++++++++++++++++++++++++------------------------ po/zh_TW.po | 286 +++++++++++++++++++++++++++------------------------ 51 files changed, 7248 insertions(+), 6713 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0adafcd62c339cbad322…

1 0

Matteo Bruni : d3dcompiler/tests: Always expect failure in test_reflection_desc_ps_output() on d3d10.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 4ced409adb110ed5e12e91b0d452029e184c87b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ced409adb110ed5e12e91b0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 13 11:05:37 2020 +0200 d3dcompiler/tests: Always expect failure in test_reflection_desc_ps_output() on d3d10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49950 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 362e070ede..bc802f016a 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1010,22 +1010,21 @@ static void test_reflection_desc_ps_output(void) { const DWORD *blob; D3D11_SIGNATURE_PARAMETER_DESC desc; - BOOL d3d10; } tests[] = { {test_reflection_desc_ps_output_blob_0, - {"SV_Target", 3, 3, D3D_NAME_TARGET, D3D_REGISTER_COMPONENT_FLOAT32, 0xf, 0, 0}, TRUE}, + {"SV_Target", 3, 3, D3D_NAME_TARGET, D3D_REGISTER_COMPONENT_FLOAT32, 0xf, 0, 0}}, {test_reflection_desc_ps_output_blob_1, - {"SV_DepthLessEqual", 0, 0xffffffff, D3D_NAME_DEPTH_LESS_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, FALSE}, + {"SV_DepthLessEqual", 0, 0xffffffff, D3D_NAME_DEPTH_LESS_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, {test_reflection_desc_ps_output_blob_2, - {"SV_DepthGreaterEqual", 0, 0xffffffff, D3D11_NAME_DEPTH_GREATER_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, FALSE}, + {"SV_DepthGreaterEqual", 0, 0xffffffff, D3D11_NAME_DEPTH_GREATER_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, {test_reflection_desc_ps_output_blob_3, - {"sV_DePtH", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, FALSE}, + {"sV_DePtH", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, {test_reflection_desc_ps_output_blob_4, - {"SV_Depth", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, TRUE}, + {"SV_Depth", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, {test_reflection_desc_ps_output_blob_5, - {"SV_COVERAGE", 0, 0xffffffff, D3D_NAME_COVERAGE, D3D_REGISTER_COMPONENT_UINT32, 0x1, 0xe, 0}, FALSE}, + {"SV_COVERAGE", 0, 0xffffffff, D3D_NAME_COVERAGE, D3D_REGISTER_COMPONENT_UINT32, 0x1, 0xe, 0}}, }; HRESULT hr; ULONG count; @@ -1038,7 +1037,7 @@ static void test_reflection_desc_ps_output(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = call_reflect(tests[i].blob, tests[i].blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - if (!D3D_COMPILER_VERSION && !tests[i].d3d10) + if (!D3D_COMPILER_VERSION) { todo_wine ok(hr == E_INVALIDARG, "(%u): got unexpected hr %x.\n", i, hr); if (SUCCEEDED(hr))

1 0

Julian Rüger : documentation: Update German translation.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 48ef770376baece17ff034a6c42c4f18ff102c8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=48ef770376baece17ff034a6… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Oct 13 09:38:46 2020 +0200 documentation: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.de | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 2066bdfd04..fbf63eca22 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -21,6 +21,14 @@ enthält) folgende Befehle auf: ./configure make +Im Anschluss können Sie Wine entweder installieren: + +make install + +Oder direkt aus dem Quellverzeichnis ausführen: + +./wine notepad + Starten Sie Programme mit "wine Programmname". Weitere Informationen und Problemlösungen entnehmen Sie bitte dem Rest dieser Datei, der Man-Page von Wine und insbesondere der Vielzahl an @@ -83,11 +91,9 @@ Optionale Bibliotheken: wurden. Tipps zum Installieren fehlender Pakete finden Sie unter: https://wiki.winehq.org/Recommended_Packages - Unter 64-Bit Plattformen, falls Sie Wine als 32-Bit kompilieren (Standard), - benötigen Sie die 32-Bit-Versionen dieser Bibliotheken; Details unter - https://wiki.winehq.org/WineOn64bit - Für ein reines 64-Bit Wine (oder ein gemischtes 32- und 64-Bit Wine-Setup), - siehe https://wiki.winehq.org/Wine64 + Unter 64-Bit-Plattformen benötigen Sie auch die 32-Bit-Versionen dieser + Bibliotheken. + 4. KOMPILIEREN @@ -105,6 +111,9 @@ unter Unix zu kompilieren und zu verlinken. Mit ./configure --help können Sie sich Konfigurations-Optionen für die Kompilierung anzeigen lassen. +Weitere Informationen finden Sie unter https://wiki.winehq.org/Building_Wine + + 5. SETUP Nachdem Wine korrekt erstellt wurde, können Sie "make install" aufrufen; @@ -115,8 +124,8 @@ Vergessen Sie nicht, zuerst frühere Wine-Installationen zu entfernen, die mit der neuen in Konflikt stehen könnten. Versuchen Sie entweder "dpkg -r wine", "rpm -e wine" oder "make uninstall" vor der Installation auszuführen. -Nach der Installation können Sie das Tool "winecfg" starten. -Konfigurationshinweise finden Sie im Support-Bereich auf https://www.winehq.org/ +Nach der Installation können Sie das Konfigurationswerkzeug "winecfg" starten. +Hinweise dazu finden Sie im Support-Bereich auf https://www.winehq.org/ 6. AUSFÜHREN VON PROGRAMMEN @@ -135,8 +144,8 @@ Beispiel: Um Notepad auszuführen: wine notepad.exe liesmich.txt (Programmaufruf mit Parametern) -Wine ist nicht perfekt, daher können manche Programme abstürzen. -In diesem Fall bekommen Sie einen Log vom Absturz, den Sie beifügen sollten, +Wine ist nicht perfekt, manche Programme könnten abstürzen. +In solchen Fällen bekommen Sie einen Log vom Absturz, den Sie beifügen sollten, wenn Sie den Fehler melden.

1 0

Anton Baskanov : amstream: Implement SSUPDATE_CONTINUOUS flag in IDirectDrawStreamSample::Update.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: aaf461b7d266b584b128d4711f9a72a059b5f537 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf461b7d266b584b128d471… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Oct 10 03:57:54 2020 +0700 amstream: Implement SSUPDATE_CONTINUOUS flag in IDirectDrawStreamSample::Update. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 37 ++++--- dlls/amstream/tests/amstream.c | 224 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 247 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aaf461b7d266b584b128…

1 0

Huw Davies : riched20: Use paragraph and run ptrs in InsertTextFromCursor().
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 468609ae7be64627d2dd78dd94afb6a29b29b604 URL: https://source.winehq.org/git/wine.git/?a=commit;h=468609ae7be64627d2dd78dd… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 11:16:33 2020 +0100 riched20: Use paragraph and run ptrs in InsertTextFromCursor(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 24 ++++++++++++------------ dlls/riched20/editor.h | 1 + dlls/riched20/para.c | 5 +++++ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 69963e6691..2fe057cdbd 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -579,7 +579,8 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, ME_InternalInsertTextFromCursor(editor, nCursor, &tab, 1, style, MERF_TAB); pos++; } else { /* handle EOLs */ - ME_DisplayItem *tp, *end_run, *run, *prev; + ME_Run *end_run, *run, *prev; + ME_Paragraph *new_para; int eol_len = 0; /* Check if new line is allowed for this control */ @@ -619,31 +620,30 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, if (p->nOffset == p->pRun->member.run.len) { - run = ME_FindItemFwd( p->pRun, diRun ); - if (!run) run = p->pRun; + run = run_next( &p->pRun->member.run ); + if (!run) run = &p->pRun->member.run; } else { if (p->nOffset) ME_SplitRunSimple(editor, p); - run = p->pRun; + run = &p->pRun->member.run; } - tp = ME_SplitParagraph(editor, run, style, eol_str, eol_len, 0); - - end_run = ME_FindItemBack(tp, diRun); + new_para = &ME_SplitParagraph( editor, run_get_di( run ), style, eol_str, eol_len, 0 )->member.para; + end_run = para_end_run( para_prev( new_para ) ); /* Move any cursors that were at the end of the previous run to the beginning of the new para */ - prev = ME_FindItemBack( end_run, diRun ); + prev = run_prev( end_run ); if (prev) { int i; for (i = 0; i < editor->nCursors; i++) { - if (editor->pCursors[i].pRun == prev && - editor->pCursors[i].nOffset == prev->member.run.len) + if (editor->pCursors[i].pRun == run_get_di( prev ) && + editor->pCursors[i].nOffset == prev->len) { - editor->pCursors[i].pPara = tp; - editor->pCursors[i].pRun = run; + editor->pCursors[i].pPara = para_get_di( new_para ); + editor->pCursors[i].pRun = run_get_di( run ); editor->pCursors[i].nOffset = 0; } } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6c45a3c6b5..6b97a01f82 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -214,6 +214,7 @@ void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDD ME_Paragraph *para_next( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *para_prev( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; static inline ME_DisplayItem *para_get_di(ME_Paragraph *para) { return (ME_DisplayItem *)((ptrdiff_t)para - offsetof(ME_DisplayItem, member)); diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 0f8b76f76d..1ae7caad61 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -116,6 +116,11 @@ ME_Run *para_first_run( ME_Paragraph *para ) return NULL; } +ME_Run *para_end_run( ME_Paragraph *para ) +{ + return para->eop_run; +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { static const WCHAR cr_lf[] = {'\r','\n',0};

1 0

Huw Davies : riched20: Return a run ptr from the run creation function.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: a37147c083fe627a66b967448e36b8d4f2effd42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37147c083fe627a66b96744… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 11:16:37 2020 +0100 riched20: Return a run ptr from the run creation function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/para.c | 29 ++++++------ dlls/riched20/run.c | 121 +++++++++++++++++++++++++------------------------ 3 files changed, 78 insertions(+), 74 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index de029f5bcb..244010df73 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -120,7 +120,7 @@ ME_DisplayItem *ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) DECLSPEC_H int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; /* run.c */ -ME_DisplayItem *ME_MakeRun(ME_Style *s, int nFlags) DECLSPEC_HIDDEN; +ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; ME_DisplayItem *ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags) DECLSPEC_HIDDEN; void ME_CheckCharOffsets(ME_TextEditor *editor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 1ae7caad61..99ce170663 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -131,7 +131,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) HFONT hf; ME_TextBuffer *text = editor->pBuffer; ME_DisplayItem *para = make_para(editor); - ME_DisplayItem *run; + ME_Run *run; ME_Style *style; int eol_len; @@ -177,15 +177,14 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) eol_len = editor->bEmulateVersion10 ? 2 : 1; para->member.para.text = ME_MakeStringN( cr_lf, eol_len ); - run = ME_MakeRun(style, MERF_ENDPARA); - run->member.run.nCharOfs = 0; - run->member.run.len = eol_len; - run->member.run.para = &para->member.para; - - para->member.para.eop_run = &run->member.run; + run = run_create( style, MERF_ENDPARA ); + run->nCharOfs = 0; + run->len = eol_len; + run->para = &para->member.para; + para->member.para.eop_run = run; ME_InsertBefore(text->pLast, para); - ME_InsertBefore(text->pLast, run); + ME_InsertBefore(text->pLast, run_get_di( run )); para->member.para.prev_para = text->pFirst; para->member.para.next_para = text->pLast; text->pFirst->member.para.next_para = para; @@ -523,7 +522,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME_DisplayItem *next_para = NULL; ME_DisplayItem *run_para = NULL; ME_DisplayItem *new_para = make_para(editor); - ME_DisplayItem *end_run; + ME_Run *end_run; int ofs, i; ME_DisplayItem *pp; int run_flags = MERF_ENDPARA; @@ -549,10 +548,10 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, new_para->member.para.text = ME_VSplitString( run_para->member.para.text, run->member.run.nCharOfs ); - end_run = ME_MakeRun(style, run_flags); - ofs = end_run->member.run.nCharOfs = run->member.run.nCharOfs; - end_run->member.run.len = eol_len; - end_run->member.run.para = run->member.run.para; + end_run = run_create( style, run_flags ); + ofs = end_run->nCharOfs = run->member.run.nCharOfs; + end_run->len = eol_len; + end_run->para = run->member.run.para; ME_AppendString( run_para->member.para.text, eol_str, eol_len ); next_para = run_para->member.para.next_para; assert(next_para == ME_FindItemFwd(run_para, diParagraphOrEnd)); @@ -592,11 +591,11 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, /* insert end run of the old paragraph, and new paragraph, into DI double linked list */ ME_InsertBefore(run, new_para); - ME_InsertBefore(new_para, end_run); + ME_InsertBefore( new_para, run_get_di( end_run )); /* Fix up the paras' eop_run ptrs */ new_para->member.para.eop_run = run_para->member.para.eop_run; - run_para->member.para.eop_run = &end_run->member.run; + run_para->member.para.eop_run = end_run; if (!editor->bEmulateVersion10) { /* v4.1 */ if (paraFlags & (MEPF_ROWSTART|MEPF_CELL)) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index eb5aeff050..84b851039b 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -273,63 +273,67 @@ void run_join( ME_TextEditor *editor, ME_Run *run ) * Does the most basic job of splitting a run into two - it does not * update the positions and extents. */ -ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) +ME_DisplayItem *ME_SplitRunSimple( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_DisplayItem *run = cursor->pRun; - ME_DisplayItem *new_run; - int i; - int nOffset = cursor->nOffset; - - assert(!(run->member.run.nFlags & MERF_NONTEXT)); - - new_run = ME_MakeRun(run->member.run.style, - run->member.run.nFlags & MERF_SPLITMASK); - new_run->member.run.nCharOfs = run->member.run.nCharOfs + nOffset; - new_run->member.run.len = run->member.run.len - nOffset; - new_run->member.run.para = run->member.run.para; - run->member.run.len = nOffset; - cursor->pRun = new_run; - cursor->nOffset = 0; - - ME_InsertBefore(run->next, new_run); - - ME_UpdateRunFlags(editor, &run->member.run); - ME_UpdateRunFlags(editor, &new_run->member.run); - for (i = 0; i < editor->nCursors; i++) { - if (editor->pCursors[i].pRun == run && - editor->pCursors[i].nOffset >= nOffset) { - editor->pCursors[i].pRun = new_run; - editor->pCursors[i].nOffset -= nOffset; + ME_Run *run = &cursor->pRun->member.run, *new_run; + int i; + int nOffset = cursor->nOffset; + + assert( !(run->nFlags & MERF_NONTEXT) ); + + new_run = run_create( run->style, run->nFlags & MERF_SPLITMASK ); + new_run->nCharOfs = run->nCharOfs + nOffset; + new_run->len = run->len - nOffset; + new_run->para = run->para; + run->len = nOffset; + cursor->pRun = run_get_di( new_run ); + cursor->nOffset = 0; + + ME_InsertBefore( run_get_di( run )->next, run_get_di( new_run ) ); + + ME_UpdateRunFlags( editor, run ); + ME_UpdateRunFlags( editor, new_run ); + for (i = 0; i < editor->nCursors; i++) + { + if (editor->pCursors[i].pRun == run_get_di( run ) && + editor->pCursors[i].nOffset >= nOffset) + { + editor->pCursors[i].pRun = run_get_di( new_run ); + editor->pCursors[i].nOffset -= nOffset; + } } - } - para_mark_rewrap( editor, &cursor->pPara->member.para ); - return run; + para_mark_rewrap( editor, run->para ); + return run_get_di( run ); } /****************************************************************************** - * ME_MakeRun + * run_create * * A helper function to create run structures quickly. */ -ME_DisplayItem *ME_MakeRun(ME_Style *s, int nFlags) +ME_Run *run_create( ME_Style *s, int flags ) { - ME_DisplayItem *item = ME_MakeDI(diRun); - item->member.run.style = s; - item->member.run.reobj = NULL; - item->member.run.nFlags = nFlags; - item->member.run.nCharOfs = -1; - item->member.run.len = 0; - item->member.run.para = NULL; - item->member.run.num_glyphs = 0; - item->member.run.max_glyphs = 0; - item->member.run.glyphs = NULL; - item->member.run.vis_attrs = NULL; - item->member.run.advances = NULL; - item->member.run.offsets = NULL; - item->member.run.max_clusters = 0; - item->member.run.clusters = NULL; - ME_AddRefStyle(s); - return item; + ME_DisplayItem *item = ME_MakeDI( diRun ); + ME_Run *run = &item->member.run; + + if (!item) return NULL; + + ME_AddRefStyle( s ); + run->style = s; + run->reobj = NULL; + run->nFlags = flags; + run->nCharOfs = -1; + run->len = 0; + run->para = NULL; + run->num_glyphs = 0; + run->max_glyphs = 0; + run->glyphs = NULL; + run->vis_attrs = NULL; + run->advances = NULL; + run->offsets = NULL; + run->max_clusters = 0; + run->clusters = NULL; + return run; } /****************************************************************************** @@ -343,7 +347,8 @@ ME_DisplayItem * ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags) { - ME_DisplayItem *pDI, *insert_before = cursor->pRun, *prev; + ME_DisplayItem *insert_before = cursor->pRun, *prev; + ME_Run *run; if (cursor->nOffset) { @@ -362,18 +367,18 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, add_undo_delete_run( editor, insert_before->member.run.para->nCharOfs + insert_before->member.run.nCharOfs, len ); - pDI = ME_MakeRun(style, flags); - pDI->member.run.nCharOfs = insert_before->member.run.nCharOfs; - pDI->member.run.len = len; - pDI->member.run.para = insert_before->member.run.para; - ME_InsertString( pDI->member.run.para->text, pDI->member.run.nCharOfs, str, len ); - ME_InsertBefore( insert_before, pDI ); + run = run_create( style, flags ); + run->nCharOfs = insert_before->member.run.nCharOfs; + run->len = len; + run->para = insert_before->member.run.para; + ME_InsertString( run->para->text, run->nCharOfs, str, len ); + ME_InsertBefore( insert_before, run_get_di( run ) ); TRACE("Shift length:%d\n", len); ME_PropagateCharOffset( insert_before, len ); para_mark_rewrap( editor, insert_before->member.run.para ); /* Move any cursors that were at the end of the previous run to the end of the inserted run */ - prev = ME_FindItemBack( pDI, diRun ); + prev = ME_FindItemBack( run_get_di( run ), diRun ); if (prev) { int i; @@ -383,13 +388,13 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, if (editor->pCursors[i].pRun == prev && editor->pCursors[i].nOffset == prev->member.run.len) { - editor->pCursors[i].pRun = pDI; + editor->pCursors[i].pRun = run_get_di( run ); editor->pCursors[i].nOffset = len; } } } - return pDI; + return run_get_di( run ); } static BOOL run_is_splittable( const ME_Run *run )

1 0

Huw Davies : riched20: Use the run and para helpers in the cursor movement functions.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 586e31a1e6e524e593897285a82b90a08303db33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=586e31a1e6e524e593897285… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 11:16:34 2020 +0100 riched20: Use the run and para helpers in the cursor movement functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 121 ++++++++++++++++++++++---------------------------- 1 file changed, 54 insertions(+), 67 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 2fe057cdbd..dde0c7faad 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -671,7 +671,7 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BO { /* new offset in the same paragraph */ do { - cursor->pRun = ME_FindItemBack(cursor->pRun, diRun); + cursor->pRun = run_get_di( run_prev( &cursor->pRun->member.run ) ); } while (cursor->nOffset < cursor->pRun->member.run.nCharOfs); cursor->nOffset -= cursor->pRun->member.run.nCharOfs; return nRelOfs; @@ -688,27 +688,29 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BO /* new offset in a previous paragraph */ do { - cursor->pPara = cursor->pPara->member.para.prev_para; + cursor->pPara = para_get_di( para_prev( &cursor->pPara->member.para ) ); } while (cursor->nOffset < cursor->pPara->member.para.nCharOfs); cursor->nOffset -= cursor->pPara->member.para.nCharOfs; - cursor->pRun = ME_FindItemBack(cursor->pPara->member.para.next_para, diRun); + cursor->pRun = run_get_di( para_end_run( &cursor->pPara->member.para ) ); while (cursor->nOffset < cursor->pRun->member.run.nCharOfs) { - cursor->pRun = ME_FindItemBack(cursor->pRun, diRun); + cursor->pRun = run_get_di( run_prev( &cursor->pRun->member.run ) ); } cursor->nOffset -= cursor->pRun->member.run.nCharOfs; - } else if (cursor->nOffset >= cursor->pRun->member.run.len) { - ME_DisplayItem *next_para; + } + else if (cursor->nOffset >= cursor->pRun->member.run.len) + { + ME_Paragraph *next_para; int new_offset; new_offset = ME_GetCursorOfs(cursor); - next_para = cursor->pPara->member.para.next_para; - if (new_offset < next_para->member.para.nCharOfs) + next_para = para_next( &cursor->pPara->member.para ); + if (new_offset < next_para->nCharOfs) { /* new offset in the same paragraph */ do { cursor->nOffset -= cursor->pRun->member.run.len; - cursor->pRun = ME_FindItemFwd(cursor->pRun, diRun); + cursor->pRun = run_get_di( run_next( &cursor->pRun->member.run ) ); } while (cursor->nOffset >= cursor->pRun->member.run.len); return nRelOfs; } @@ -723,16 +725,16 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BO /* new offset in a following paragraph */ do { - cursor->pPara = next_para; - next_para = next_para->member.para.next_para; - } while (new_offset >= next_para->member.para.nCharOfs); + cursor->pPara = para_get_di( next_para ); + next_para = para_next( next_para ); + } while (new_offset >= next_para->nCharOfs); cursor->nOffset = new_offset - cursor->pPara->member.para.nCharOfs; - cursor->pRun = ME_FindItemFwd(cursor->pPara, diRun); + cursor->pRun = run_get_di( para_first_run( &cursor->pPara->member.para ) ); while (cursor->nOffset >= cursor->pRun->member.run.len) { cursor->nOffset -= cursor->pRun->member.run.len; - cursor->pRun = ME_FindItemFwd(cursor->pRun, diRun); + cursor->pRun = run_get_di( run_next( &cursor->pRun->member.run ) ); } } /* else new offset is in the same run */ return nRelOfs; @@ -742,8 +744,8 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BO BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) { - ME_DisplayItem *pRun = cursor->pRun, *pOtherRun; - ME_DisplayItem *pPara = cursor->pPara; + ME_Run *run = &cursor->pRun->member.run, *other_run; + ME_Paragraph *para = &cursor->pPara->member.para; int nOffset = cursor->nOffset; if (nRelOfs == -1) @@ -751,40 +753,33 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) /* Backward movement */ while (TRUE) { - nOffset = ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), - pRun->member.run.len, nOffset, WB_MOVEWORDLEFT); - if (nOffset) - break; - pOtherRun = ME_FindItemBack(pRun, diRunOrParagraph); - if (pOtherRun->type == diRun) + nOffset = ME_CallWordBreakProc( editor, get_text( run, 0 ), run->len, nOffset, WB_MOVEWORDLEFT ); + if (nOffset) break; + other_run = run_prev( run ); + if (other_run) { - if (ME_CallWordBreakProc(editor, get_text( &pOtherRun->member.run, 0 ), - pOtherRun->member.run.len, - pOtherRun->member.run.len - 1, - WB_ISDELIMITER) - && !(pRun->member.run.nFlags & MERF_ENDPARA) - && !(cursor->pRun == pRun && cursor->nOffset == 0) - && !ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), - pRun->member.run.len, 0, - WB_ISDELIMITER)) + if (ME_CallWordBreakProc( editor, get_text( other_run, 0 ), other_run->len, other_run->len - 1, WB_ISDELIMITER ) + && !(run->nFlags & MERF_ENDPARA) + && !(&cursor->pRun->member.run == run && cursor->nOffset == 0) + && !ME_CallWordBreakProc( editor, get_text( run, 0 ), run->len, 0, WB_ISDELIMITER )) break; - pRun = pOtherRun; - nOffset = pOtherRun->member.run.len; + run = other_run; + nOffset = other_run->len; } - else if (pOtherRun->type == diParagraph) + else { - if (cursor->pRun == pRun && cursor->nOffset == 0) + if (&cursor->pRun->member.run == run && cursor->nOffset == 0) { - pPara = pOtherRun; + para = run->para; /* Skip empty start of table row paragraph */ - if (pPara->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART) - pPara = pPara->member.para.prev_para; + if (para_prev( para )->nFlags & MEPF_ROWSTART) + para = para_prev( para ); /* Paragraph breaks are treated as separate words */ - if (pPara->member.para.prev_para->type == diTextStart) + if (para_get_di( para_prev( para ) )->type == diTextStart) return FALSE; - pRun = ME_FindItemBack(pPara, diRun); - pPara = pPara->member.para.prev_para; + para = para_prev( para ); + run = para_end_run( para ); } break; } @@ -797,43 +792,35 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) while (TRUE) { - if (last_delim && !ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), - pRun->member.run.len, nOffset, WB_ISDELIMITER)) - break; - nOffset = ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), - pRun->member.run.len, nOffset, WB_MOVEWORDRIGHT); - if (nOffset < pRun->member.run.len) + if (last_delim && !ME_CallWordBreakProc( editor, get_text( run, 0 ), run->len, nOffset, WB_ISDELIMITER )) break; - pOtherRun = ME_FindItemFwd(pRun, diRunOrParagraphOrEnd); - if (pOtherRun->type == diRun) + nOffset = ME_CallWordBreakProc( editor, get_text( run, 0 ), run->len, nOffset, WB_MOVEWORDRIGHT ); + if (nOffset < run->len) break; + other_run = run_next( run ); + if (other_run) { - last_delim = ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), - pRun->member.run.len, nOffset - 1, WB_ISDELIMITER); - pRun = pOtherRun; + last_delim = ME_CallWordBreakProc( editor, get_text( run, 0 ), run->len, nOffset - 1, WB_ISDELIMITER ); + run = other_run; nOffset = 0; } - else if (pOtherRun->type == diParagraph) + else { - if (pOtherRun->member.para.nFlags & MEPF_ROWSTART) - pOtherRun = pOtherRun->member.para.next_para; - if (cursor->pRun == pRun) { - pPara = pOtherRun; - pRun = ME_FindItemFwd(pPara, diRun); + para = para_next( para ); + if (para_get_di( para )->type == diTextEnd) + { + if (&cursor->pRun->member.run == run) return FALSE; + nOffset = 0; + break; } - nOffset = 0; - break; - } - else /* diTextEnd */ - { - if (cursor->pRun == pRun) - return FALSE; + if (para->nFlags & MEPF_ROWSTART) para = para_next( para ); + if (&cursor->pRun->member.run == run) run = para_first_run( para ); nOffset = 0; break; } } } - cursor->pPara = pPara; - cursor->pRun = pRun; + cursor->pPara = para_get_di( para ); + cursor->pRun = run_get_di( run ); cursor->nOffset = nOffset; return TRUE; }

1 0

Nikolay Sivov : d3d11/tests: Add some more tests for device context state.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: c6671ac1c717a9f631cc0af12e88c29b0bef524e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6671ac1c717a9f631cc0af1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 15:26:31 2020 +0300 d3d11/tests: Add some more tests for device context state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e1a6dd6159..9fc09a5ec8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6599,11 +6599,14 @@ static void test_device_context_state(void) { ID3DDeviceContextState *context_state, *previous_context_state; ID3D11SamplerState *sampler, *tmp_sampler; + D3D11_DEVICE_CONTEXT_TYPE context_type; ID3D11DeviceContext1 *context = NULL; D3D11_SAMPLER_DESC sampler_desc; D3D_FEATURE_LEVEL feature_level; ID3D11Device *d3d11_device; ID3D11Device1 *device; + struct vec4 constant; + ID3D11Buffer *cb, *tmp_cb; ULONG refcount; HRESULT hr; @@ -6650,6 +6653,36 @@ static void test_device_context_state(void) ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); ID3D11SamplerState_Release(tmp_sampler); + ID3D11DeviceContext1_CSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_CSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + ID3D11DeviceContext1_DSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_DSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + ID3D11DeviceContext1_GSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_GSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + ID3D11DeviceContext1_HSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_HSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_VSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, &IID_ID3D10Device, NULL, &context_state); @@ -6664,6 +6697,47 @@ todo_wine refcount = get_refcount(context_state); ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + context_type = ID3D11DeviceContext1_GetType(context); + ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); + + cb = create_buffer((ID3D11Device *)device, D3D11_BIND_CONSTANT_BUFFER, sizeof(constant), NULL); + + ID3D11DeviceContext1_CSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_CSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + + ID3D11DeviceContext1_PSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_PSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + + ID3D11DeviceContext1_VSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_VSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + + ID3D11DeviceContext1_DSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_DSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + + ID3D11DeviceContext1_GSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_GSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + + ID3D11DeviceContext1_HSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_HSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + /* Enable ID3D10Device behavior. */ previous_context_state = NULL; ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); @@ -6677,6 +6751,58 @@ todo_wine if (!enable_debug_layer) ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); + ID3D11DeviceContext1_CSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_CSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + + ID3D11DeviceContext1_DSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_DSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + + ID3D11DeviceContext1_GSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_GSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + + ID3D11DeviceContext1_HSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_HSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + + ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_VSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + + context_type = ID3D11DeviceContext1_GetType(context); + ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_CSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_PSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_VSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_DSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_GSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_HSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); @@ -6706,6 +6832,7 @@ todo_wine check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11Buffer_Release(cb); ID3D11SamplerState_Release(sampler); ID3D11DeviceContext1_Release(context); refcount = ID3D11Device1_Release(device);

1 0

Huw Davies : riched20: Pass a run ptr to the run joining function.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 3cade70f14aeb12afef4ba53ec14eff3418abbd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cade70f14aeb12afef4ba53… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 11:16:36 2020 +0100 riched20: Pass a run ptr to the run joining function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/run.c | 33 ++++++++++++++++++--------------- dlls/riched20/wrap.c | 2 +- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f61caa6478..de029f5bcb 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -131,7 +131,7 @@ int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest, B int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; -void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) DECLSPEC_HIDDEN; +void run_join( ME_TextEditor *editor, ME_Run *run ) DECLSPEC_HIDDEN; ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index c3bc7f50b3..eb5aeff050 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -237,31 +237,34 @@ void ME_RunOfsFromCharOfs(ME_TextEditor *editor, } /****************************************************************************** - * ME_JoinRuns + * run_join * * Merges two adjacent runs, the one given as a parameter and the next one. */ -void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) +void run_join( ME_TextEditor *editor, ME_Run *run ) { - ME_DisplayItem *pNext = p->next; + ME_Run *next = run_next( run ); int i; - assert(p->type == diRun && pNext->type == diRun); - assert(p->member.run.nCharOfs != -1); - para_mark_rewrap( editor, &ME_GetParagraph( p )->member.para ); + + assert( run ); + assert( run->nCharOfs != -1 ); + para_mark_rewrap( editor, run->para ); /* Update all cursors so that they don't contain the soon deleted run */ - for (i=0; i<editor->nCursors; i++) { - if (editor->pCursors[i].pRun == pNext) { - editor->pCursors[i].pRun = p; - editor->pCursors[i].nOffset += p->member.run.len; + for (i = 0; i < editor->nCursors; i++) + { + if (&editor->pCursors[i].pRun->member.run == next) + { + editor->pCursors[i].pRun = run_get_di( run ); + editor->pCursors[i].nOffset += run->len; } } - p->member.run.len += pNext->member.run.len; - ME_Remove(pNext); - ME_DestroyDisplayItem(pNext); - ME_UpdateRunFlags(editor, &p->member.run); - ME_CheckCharOffsets(editor); + run->len += next->len; + ME_Remove( run_get_di( next ) ); + ME_DestroyDisplayItem( run_get_di( next ) ); + ME_UpdateRunFlags( editor, run ); + ME_CheckCharOffsets( editor ); } /****************************************************************************** diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index c7b99f5ee2..fda1d99557 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -714,7 +714,7 @@ static void ME_PrepareParagraphForWrapping( ME_TextEditor *editor, ME_Context *c if (p->type == diRun) { while (p->next->type == diRun && ME_CanJoinRuns( &p->member.run, &p->next->member.run )) - ME_JoinRuns( c->editor, p ); + run_join( c->editor, &p->member.run ); } } }

1 0

Paul Gofman : ntdll: Always align stack in call_user_apc_dispatcher() on x86_64.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 53f7cb3c0888c852e0b4fdc9366c6ce53a54f433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53f7cb3c0888c852e0b4fdc9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 13 02:52:18 2020 +0300 ntdll: Always align stack in call_user_apc_dispatcher() on x86_64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49860 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index e11b2c70b5..00b07c4270 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2011,6 +2011,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "jrcxz 1f\n\t" "movq 0x98(%rcx),%rax\n\t" /* context_ptr->Rsp */ "leaq -0x5c0(%rax),%rsp\n\t" /* sizeof(CONTEXT) + offsetof(frame,ret_addr) */ + "andq $~15,%rsp\n\t" "jmp 2f\n" "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ "leaq -0x4d0(%rax),%rsp\n\t"

1 0

Robert Wilhelm : jscript: Cc_parser_parse implement '&&' expression.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: f586348deb97e8dea5f78ea3e45db39951ee8d30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f586348deb97e8dea5f78ea3… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Oct 12 22:25:33 2020 +0200 jscript: Cc_parser_parse implement '&&' expression. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49450 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/cc_parser.y | 2 +- dlls/jscript/tests/cc.js | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index 4bc6260f19..dd72f61b03 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -161,7 +161,7 @@ CCLogicalORExpression CCLogicalANDExpression : CCBitwiseORExpression { $$ = $1; } | CCBitwiseANDExpression tAND CCBitwiseORExpression - { FIXME("'&&' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccbool($1) && get_ccbool($3)); } CCBitwiseORExpression : CCBitwiseXORExpression { $$ = $1; } diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 8f45a3dd33..2232d2fb68 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -180,6 +180,23 @@ expect(@test, true); @set @test = (1 >= true-1) expect(@test, true); +(a)set @test = (true && true) +expect(@test, true); + +(a)set @test = (false && true) +expect(@test, false); + +(a)set @test = (true && false) +expect(@test, false); + +(a)set @test = (false && false) +expect(@test, false); + +if(!isWin64) { +(a)set @test = (@_win32&&@_jscript_version>=5) +expect(@test, true); +} + @if (false) this wouldn not parse "@end

1 0

Sven Baars : evr/tests: Fix a test failure on Windows 7.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 109fab2a559ab39cec01fbd0da9074f966414e85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=109fab2a559ab39cec01fbd0… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Oct 12 14:05:05 2020 +0200 evr/tests: Fix a test failure on Windows 7. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5829815988..7a51b3c17d 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1083,7 +1083,7 @@ static void test_default_presenter(void) ok(present_params.hDeviceWindow == GetDesktopWindow(), "Unexpected device window.\n"); ok(present_params.Windowed, "Unexpected windowed mode.\n"); ok(present_params.SwapEffect == D3DSWAPEFFECT_COPY, "Unexpected swap effect.\n"); - ok(present_params.Flags == D3DPRESENTFLAG_VIDEO, "Unexpected flags.\n"); + ok(present_params.Flags & D3DPRESENTFLAG_VIDEO, "Unexpected flags %#x.\n", present_params.Flags); ok(present_params.PresentationInterval == D3DPRESENT_INTERVAL_IMMEDIATE, "Unexpected present interval.\n"); IDirect3DDevice9_Release(d3d_device);

1 0

Michael Stefaniuc : iexplore: Use wide-char string literals.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 845d04a8d39caf0a64c60c1d7cc5cf762684e07b URL: https://source.winehq.org/git/wine.git/?a=commit;h=845d04a8d39caf0a64c60c1d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 23:17:48 2020 +0200 iexplore: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/main.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index 01ad9d02f5..ade9f8c522 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -35,28 +35,18 @@ static BOOL check_native_ie(void) void* buf; BOOL ret = TRUE; LPWORD translation; - - static const WCHAR browseui_dllW[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; - static const WCHAR wineW[] = {'W','i','n','e',0}; - static const WCHAR translationW[] = - {'\\','V','a','r','F','i','l','e','I','n','f','o', - '\\','T','r','a','n','s','l','a','t','i','o','n',0}; - static const WCHAR file_desc_fmtW[] = - {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', - '\\','%','0','4','x','%','0','4','x', - '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; WCHAR file_desc_strW[48]; - size = GetFileVersionInfoSizeW(browseui_dllW, &handle); + size = GetFileVersionInfoSizeW(L"browseui.dll", &handle); if(!size) return TRUE; buf = HeapAlloc(GetProcessHeap(), 0, size); - GetFileVersionInfoW(browseui_dllW, 0, size,buf); - if (VerQueryValueW(buf, translationW, (void **)&translation, &bytes)) + GetFileVersionInfoW(L"browseui.dll", 0, size,buf); + if (VerQueryValueW(buf, L"\\VarFileInfo\\Translation", (void **)&translation, &bytes)) { - wsprintfW(file_desc_strW, file_desc_fmtW, translation[0], translation[1]); - ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !wcsstr(file_desc, wineW); + wsprintfW(file_desc_strW, L"\\StringFileInfo\\%04x%04x\\FileDescription", translation[0], translation[1]); + ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !wcsstr(file_desc, L"Wine"); } HeapFree(GetProcessHeap(), 0, buf); @@ -78,13 +68,10 @@ static DWORD register_iexplore(BOOL doregister) int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE prev, WCHAR *cmdline, int show) { - static const WCHAR regserverW[] = {'r','e','g','s','e','r','v','e','r',0}; - static const WCHAR unregserverW[] = {'u','n','r','e','g','s','e','r','v','e','r',0}; - if(*cmdline == '-' || *cmdline == '/') { - if(!wcsicmp(cmdline+1, regserverW)) + if(!wcsicmp(cmdline+1, L"regserver")) return register_iexplore(TRUE); - if(!wcsicmp(cmdline+1, unregserverW)) + if(!wcsicmp(cmdline+1, L"unregserver")) return register_iexplore(FALSE); }

1 0

Michael Stefaniuc : opcservices: Use wide-char string literals.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 43301cc14b6c20e8837865e486d9b8a23c697614 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43301cc14b6c20e8837865e4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 23:17:49 2020 +0200 opcservices: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/factory.c | 3 +-- dlls/opcservices/package.c | 54 ++++++++++++++++------------------------------ dlls/opcservices/uri.c | 7 +++--- 3 files changed, 22 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43301cc14b6c20e88378…

1 0

Jacek Caban : wineconsole: Reimplement as AllocConsole wrapper.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

1 0

Brendan Shanks : winemac: Remove unused GetCurrentProcess() call.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 863683342ded500d3939f7ff66d2d9c1a4134caf URL: https://source.winehq.org/git/wine.git/?a=commit;h=863683342ded500d3939f7ff… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 6 15:52:18 2020 -0700 winemac: Remove unused GetCurrentProcess() call. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index b4dcbfff47..e296d4b4af 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -19,7 +19,6 @@ */ #import <Carbon/Carbon.h> -#include <dlfcn.h> #import "cocoa_app.h" #import "cocoa_event.h" @@ -1332,8 +1331,6 @@ static NSString* WineLocalizedString(unsigned int stringID) - (BOOL) installEventTap { - ProcessSerialNumber psn; - OSErr err; CGEventMask mask = CGEventMaskBit(kCGEventLeftMouseDown) | CGEventMaskBit(kCGEventLeftMouseUp) | CGEventMaskBit(kCGEventRightMouseDown) | @@ -1346,31 +1343,10 @@ static NSString* WineLocalizedString(unsigned int stringID) CGEventMaskBit(kCGEventOtherMouseDragged) | CGEventMaskBit(kCGEventScrollWheel); CFRunLoopSourceRef source; - void* appServices; - OSErr (*pGetCurrentProcess)(ProcessSerialNumber* PSN); if (cursorClippingEventTap) return TRUE; - // We need to get the Mac GetCurrentProcess() from the ApplicationServices - // framework with dlsym() because the Win32 function of the same name - // obscures it. - appServices = dlopen("/System/Library/Frameworks/ApplicationServices.framework/ApplicationServices", RTLD_LAZY); - if (!appServices) - return FALSE; - - pGetCurrentProcess = dlsym(appServices, "GetCurrentProcess"); - if (!pGetCurrentProcess) - { - dlclose(appServices); - return FALSE; - } - - err = pGetCurrentProcess(&psn); - dlclose(appServices); - if (err != noErr) - return FALSE; - // We create an annotated session event tap rather than a process-specific // event tap because we need to programmatically move the cursor even when // mouse moves are directed to other processes. We disable our tap when

1 0

Hans Leidekker : dssenh: Implement CPDuplicateHash.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: bf83b89dabbd7a2fc612529d26d5552a54a1b147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf83b89dabbd7a2fc612529d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 16:11:09 2020 +0200 dssenh: Implement CPDuplicateHash. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/dssenh.spec | 2 +- dlls/dssenh/main.c | 31 +++++++++++++++++++++++++++ dlls/dssenh/tests/dssenh.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index 2d93a98796..a045a7e04e 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -4,7 +4,7 @@ @ stdcall CPDeriveKey(ptr long ptr long ptr) @ stdcall CPDestroyHash(ptr ptr) @ stdcall CPDestroyKey(ptr ptr) -@ stub CPDuplicateHash +@ stdcall CPDuplicateHash(ptr ptr ptr long ptr) @ stub CPDuplicateKey @ stub CPEncrypt @ stdcall CPExportKey(ptr ptr ptr long long ptr ptr) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index e9b676e735..d40dedf41b 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -563,6 +563,37 @@ BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) return TRUE; } +static struct hash *duplicate_hash( const struct hash *hash ) +{ + struct hash *ret; + + if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + + ret->magic = hash->magic; + ret->len = hash->len; + if (BCryptDuplicateHash( hash->handle, &ret->handle, NULL, 0, 0 )) + { + heap_free( ret ); + return NULL; + } + memcpy( ret->value, hash->value, sizeof(hash->value) ); + ret->finished = hash->finished; + return ret; +} + +BOOL WINAPI CPDuplicateHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD *reserved, DWORD flags, HCRYPTHASH *ret_hash ) +{ + struct hash *hash = (struct hash *)hhash, *ret; + + TRACE( "%p, %p, %p, %08x, %p\n", (void *)hprov, (void *)hhash, reserved, flags, ret_hash ); + + if (hash->magic != MAGIC_HASH) return FALSE; + + if (!(ret = duplicate_hash( hash ))) return FALSE; + *ret_hash = (HCRYPTHASH)ret; + return TRUE; +} + BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DWORD len, DWORD flags ) { struct hash *hash = (struct hash *)hhash; diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index d4a231562e..704b3685c3 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1413,6 +1413,58 @@ static void test_key_exchange(void) ok(result, "Failed to release CSP provider.\n"); } +static void test_duplicate_hash(void) +{ + static const char expected[] = + {0xb9,0x7b,0xed,0xd4,0x7b,0xd8,0xa0,0xcd,0x6c,0xba,0xce,0xe9,0xb1,0x36,0xbb,0x00,0x27,0xe3,0x95,0x21}; + HCRYPTPROV hprov; + HCRYPTHASH hhash, hhash2; + BYTE buf[20]; + DWORD len; + BOOL result; + + result = CryptAcquireContextA(&hprov, NULL, MS_DEF_DSS_PROV_A, PROV_DSS, CRYPT_VERIFYCONTEXT); + ok(result, "got %08x\n", GetLastError()); + + result = CryptCreateHash(hprov, CALG_SHA, 0, 0, &hhash); + ok(result, "got %08x\n", GetLastError()); + + result = CryptHashData(hhash, (const BYTE *)"winetest", sizeof("winetest"), 0); + ok(result, "got %08x\n", GetLastError()); + + len = sizeof(buf); + result = CryptGetHashParam(hhash, HP_HASHVAL, buf, &len, 0); + ok(result, "got %08x\n", GetLastError()); + ok(!memcmp(buf, expected, sizeof(expected)), "wrong data\n"); + + SetLastError(0xdeadbeef); + result = CryptHashData(hhash, (const BYTE *)"winetest", sizeof("winetest"), 0); + ok(!result, "success\n"); + todo_wine ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); + + result = CryptDuplicateHash(hhash, NULL, 0, &hhash2); + ok(result, "got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptHashData(hhash2, (const BYTE *)"winetest", sizeof("winetest"), 0); + ok(!result, "success\n"); + todo_wine ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); + + len = sizeof(buf); + result = CryptGetHashParam(hhash2, HP_HASHVAL, buf, &len, 0); + ok(result, "got %08x\n", GetLastError()); + ok(!memcmp(buf, expected, sizeof(expected)), "wrong data\n"); + + result = CryptDestroyHash(hhash2); + ok(result, "got %08x\n", GetLastError()); + + result = CryptDestroyHash(hhash); + ok(result, "got %08x\n", GetLastError()); + + result = CryptReleaseContext(hprov, 0); + ok(result, "got %08x\n", GetLastError()); +} + START_TEST(dssenh) { test_acquire_context(); @@ -1422,4 +1474,5 @@ START_TEST(dssenh) test_cipher_modes(ciphermode_data, ARRAY_SIZE(ciphermode_data)); test_verify_signature(); test_key_exchange(); + test_duplicate_hash(); }

1 0

Hans Leidekker : dssenh: Implement CPGenRandom.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: c822cb995e0b362460c09d1d1297aef93840ba83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c822cb995e0b362460c09d1d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 16:11:11 2020 +0200 dssenh: Implement CPGenRandom. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/dssenh.spec | 2 +- dlls/dssenh/main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index e74650c9bb..eb9ef06337 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -9,7 +9,7 @@ @ stub CPEncrypt @ stdcall CPExportKey(ptr ptr ptr long long ptr ptr) @ stdcall CPGenKey(ptr long long ptr) -@ stub CPGenRandom +@ stdcall CPGenRandom(ptr long ptr) @ stdcall CPGetHashParam(ptr ptr long ptr ptr long) @ stub CPGetKeyParam @ stdcall CPGetProvParam(ptr long ptr ptr long) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 38ee325b8e..ce7b15f7a6 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -27,6 +27,7 @@ #include "bcrypt.h" #include "objbase.h" #include "rpcproxy.h" +#include "ntsecapi.h" #include "wine/debug.h" #include "wine/heap.h" @@ -498,6 +499,17 @@ BOOL WINAPI CPDuplicateKey( HCRYPTPROV hprov, HCRYPTKEY hkey, DWORD *reserved, D return TRUE; } +BOOL WINAPI CPGenRandom( HCRYPTPROV hprov, DWORD len, BYTE *buffer ) +{ + struct container *container = (struct container *)hprov; + + TRACE( "%p, %u, %p\n", (void *)hprov, len, buffer ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + + return RtlGenRandom( buffer, len ); +} + static struct hash *create_hash( ALG_ID algid ) { struct hash *ret;

1 0

Hans Leidekker : dssenh: Set last error in CPHashData.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 603cb31633e4707aa7652f27f82756e6aa3a58fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=603cb31633e4707aa7652f27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 16:11:12 2020 +0200 dssenh: Set last error in CPHashData. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 8 ++++++-- dlls/dssenh/tests/dssenh.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index ce7b15f7a6..38f249ef04 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -641,8 +641,12 @@ BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DW if (hash->magic != MAGIC_HASH) return FALSE; - if (hash->finished || BCryptHashData( hash->handle, (UCHAR *)data, len, 0 )) return FALSE; - return TRUE; + if (hash->finished) + { + SetLastError( NTE_BAD_HASH_STATE ); + return FALSE; + } + return !BCryptHashData( hash->handle, (UCHAR *)data, len, 0 ); } BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYTE *data, DWORD *len, DWORD flags ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 704b3685c3..6ad1522592 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1440,7 +1440,7 @@ static void test_duplicate_hash(void) SetLastError(0xdeadbeef); result = CryptHashData(hhash, (const BYTE *)"winetest", sizeof("winetest"), 0); ok(!result, "success\n"); - todo_wine ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); + ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); result = CryptDuplicateHash(hhash, NULL, 0, &hhash2); ok(result, "got %08x\n", GetLastError()); @@ -1448,7 +1448,7 @@ static void test_duplicate_hash(void) SetLastError(0xdeadbeef); result = CryptHashData(hhash2, (const BYTE *)"winetest", sizeof("winetest"), 0); ok(!result, "success\n"); - todo_wine ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); + ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); len = sizeof(buf); result = CryptGetHashParam(hhash2, HP_HASHVAL, buf, &len, 0);

1 0

Huw Davies : riched20: Use ME_Paragraph ptrs in InternalDeleteText().
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: a6d41a0391e61beb84c4998d595d36b2458e0281 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d41a0391e61beb84c4998d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 12 13:09:09 2020 +0100 riched20: Use ME_Paragraph ptrs in InternalDeleteText(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index bd533f91ba..69963e6691 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -308,13 +308,13 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nOfs = ME_GetCursorOfs(start), text_len = ME_GetTextLength( editor ); int shift = 0; int totalChars = nChars; - ME_DisplayItem *start_para; + ME_Paragraph *start_para; BOOL delete_all = FALSE; /* Prevent deletion past last end of paragraph run. */ nChars = min(nChars, text_len - nOfs); if (nChars == text_len) delete_all = TRUE; - start_para = c.pPara; + start_para = &c.pPara->member.para; if (!bForce) { @@ -349,19 +349,19 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, run->nCharOfs); if (!editor->bEmulateVersion10) /* v4.1 */ { - ME_DisplayItem *next_para = ME_FindItemFwd(c.pRun, diParagraphOrEnd); - ME_DisplayItem *this_para = next_para->member.para.prev_para; + ME_Paragraph *this_para = run->para; + ME_Paragraph *next_para = para_next( this_para ); /* The end of paragraph before a table row is only deleted if there * is nothing else on the line before it. */ - if (this_para == start_para && - next_para->member.para.nFlags & MEPF_ROWSTART) + if (this_para == start_para && next_para->nFlags & MEPF_ROWSTART) { /* If the paragraph will be empty, then it should be deleted, however * it still might have text right now which would inherit the * MEPF_STARTROW property if we joined it right now. * Instead we will delete it after the preceding text is deleted. */ - if (nOfs > this_para->member.para.nCharOfs) { + if (nOfs > this_para->nCharOfs) + { /* Skip this end of line. */ nChars -= (eollen < nChars) ? eollen : nChars; continue; @@ -383,7 +383,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, c.nOffset -= nCharsToDelete; - para_mark_rewrap( editor, &ME_FindItemBack( c.pRun, diParagraph )->member.para ); + para_mark_rewrap( editor, c.pRun->member.run.para ); cursor = c; /* nChars is the number of characters that should be deleted from the @@ -447,7 +447,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, continue; } } - if (delete_all) ME_SetDefaultParaFormat( editor, &start_para->member.para.fmt ); + if (delete_all) ME_SetDefaultParaFormat( editor, &start_para->fmt ); return TRUE; }

1 0

Jacek Caban : conhost: Import scrolling support from wineconsole.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 1333aebe0b3d7a8654a9c573b3dc24d7aa31c1c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1333aebe0b3d7a8654a9c573… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 12 18:26:34 2020 +0200 conhost: Import scrolling support from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 4b3751e7b5..5ec435a33e 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -2310,6 +2310,72 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp max( HIWORD(lparam) / console->active->font.height, 20 )); break; + case WM_HSCROLL: + { + int win_width = console->active->win.right - console->active->win.left + 1; + int x = console->active->win.left; + + switch (LOWORD(wparam)) + { + case SB_PAGEUP: x -= 8; break; + case SB_PAGEDOWN: x += 8; break; + case SB_LINEUP: x--; break; + case SB_LINEDOWN: x++; break; + case SB_THUMBTRACK: x = HIWORD(wparam); break; + default: break; + } + x = min( max( x, 0 ), console->active->width - win_width ); + if (x != console->active->win.left) + { + console->active->win.left = x; + console->active->win.right = x + win_width - 1; + update_window( console ); + } + break; + } + + case WM_MOUSEWHEEL: + if (console->active->height <= console->active->win.bottom - console->active->win.top + 1) + { + record_mouse_input(console, get_cell(console, lparam), wparam, MOUSE_WHEELED); + break; + } + /* else fallthrough */ + case WM_VSCROLL: + { + int win_height = console->active->win.bottom - console->active->win.top + 1; + int y = console->active->win.top; + + if (msg == WM_MOUSEWHEEL) + { + UINT scroll_lines = 3; + SystemParametersInfoW( SPI_GETWHEELSCROLLLINES, 0, &scroll_lines, 0 ); + scroll_lines *= -GET_WHEEL_DELTA_WPARAM(wparam) / WHEEL_DELTA; + y += scroll_lines; + } + else + { + switch (LOWORD(wparam)) + { + case SB_PAGEUP: y -= 8; break; + case SB_PAGEDOWN: y += 8; break; + case SB_LINEUP: y--; break; + case SB_LINEDOWN: y++; break; + case SB_THUMBTRACK: y = HIWORD(wparam); break; + default: break; + } + } + + y = min( max( y, 0 ), console->active->height - win_height ); + if (y != console->active->win.top) + { + console->active->win.top = y; + console->active->win.bottom = y + win_height - 1; + update_window( console ); + } + break; + } + case WM_SYSCOMMAND: switch (wparam) {

1 0

Jacek Caban : conhost: Set console window title.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 12cc863a4a5e31a01bf4f683d94a7e155feb23ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=12cc863a4a5e31a01bf4f683… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 12 18:26:56 2020 +0200 conhost: Set console window title. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index c917b08dc0..3ed21f5fa7 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2292,6 +2292,8 @@ static NTSTATUS set_console_title( struct console *console, const WCHAR *in_titl tty_write( console, "\x07", 1 ); tty_sync( console ); } + if (console->win) + SetWindowTextW( console->win, console->title ); return STATUS_SUCCESS; } @@ -2755,7 +2757,10 @@ int __cdecl wmain(int argc, WCHAR *argv[]) } else { + STARTUPINFOW si; if (!init_window( &console )) return 1; + GetStartupInfoW( &si ); + set_console_title( &console, si.lpTitle, wcslen( si.lpTitle ) * sizeof(WCHAR) ); ShowWindow( console.win, SW_SHOW ); }

1 0

Jacek Caban : conhost: Support window resizing.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: a3583f05055b5093a3a8822b73fb24281ae62d27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3583f05055b5093a3a8822b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 12 18:26:23 2020 +0200 conhost: Support window resizing. Based on wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 8ab639f329..4b3751e7b5 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -2062,6 +2062,29 @@ static BOOL config_dialog( struct console *console, BOOL current ) return TRUE; } +static void resize_window( struct console *console, int width, int height ) +{ + struct console_config config; + + current_config( console, &config ); + config.win_width = width; + config.win_height = height; + + /* auto size screen-buffer if it's now smaller than window */ + if (config.sb_width < config.win_width) + config.sb_width = config.win_width; + if (config.sb_height < config.win_height) + config.sb_height = config.win_height; + + /* and reset window pos so that we don't display outside of the screen-buffer */ + if (config.win_pos.X + config.win_width > config.sb_width) + config.win_pos.X = config.sb_width - config.win_width; + if (config.win_pos.Y + config.win_height > config.sb_height) + config.win_pos.Y = config.sb_height - config.win_height; + + apply_config( console, &config ); +} + /* grays / ungrays the menu items according to their state */ static void set_menu_details( struct console *console, HMENU menu ) { @@ -2280,6 +2303,13 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp DestroyCaret(); break; + case WM_SIZE: + if (console->window->update_state != UPDATE_BUSY) + resize_window( console, + max( LOWORD(lparam) / console->active->font.width, 20 ), + max( HIWORD(lparam) / console->active->font.height, 20 )); + break; + case WM_SYSCOMMAND: switch (wparam) {

1 0

Jacek Caban : kernelbase: Use conhost in AllocConsole.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 859b526c81a2af841b5b7b28d06f3d782bccdab5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=859b526c81a2af841b5b7b28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 12 18:27:18 2020 +0200 kernelbase: Use conhost in AllocConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 502fbcddaf..0fd832d378 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -326,9 +326,10 @@ BOOL WINAPI AllocConsole(void) { SECURITY_ATTRIBUTES inheritable_attr = { sizeof(inheritable_attr), NULL, TRUE }; STARTUPINFOW app_si, console_si; - WCHAR buffer[1024], cmd[256]; + HANDLE server, console = NULL; + WCHAR buffer[1024], cmd[256], conhost_path[MAX_PATH]; PROCESS_INFORMATION pi; - HANDLE event, console; + void *redir; BOOL ret; TRACE("()\n"); @@ -343,6 +344,8 @@ BOOL WINAPI AllocConsole(void) return FALSE; } + if (!(server = create_console_server()) || !(console = create_console_reference( server ))) goto error; + GetStartupInfoW(&app_si); memset(&console_si, 0, sizeof(console_si)); @@ -372,30 +375,27 @@ BOOL WINAPI AllocConsole(void) console_si.lpTitle = buffer; } - if (!(event = CreateEventW( &inheritable_attr, TRUE, FALSE, NULL ))) goto error; + swprintf( conhost_path, ARRAY_SIZE(conhost_path), L"%s\\conhost.exe", system_dir ); + swprintf( cmd, ARRAY_SIZE(cmd), L"\"%s\" --server 0x%x", conhost_path, condrv_handle( server )); + Wow64DisableWow64FsRedirection( &redir ); + ret = CreateProcessW( conhost_path, cmd, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &console_si, &pi ); + Wow64RevertWow64FsRedirection( redir ); + + if (!ret || !create_console_connection( console)) goto error; + if (!init_console_std_handles( !(app_si.dwFlags & STARTF_USESTDHANDLES) )) goto error; - swprintf( cmd, ARRAY_SIZE(cmd), L"wineconsole --use-event=%ld", (DWORD_PTR)event ); - if ((ret = CreateProcessW( NULL, cmd, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &console_si, &pi ))) - { - HANDLE wait_handles[2] = { event, pi.hProcess }; - ret = WaitForMultipleObjects( ARRAY_SIZE(wait_handles), wait_handles, FALSE, INFINITE ) == WAIT_OBJECT_0; - CloseHandle( pi.hThread ); - CloseHandle( pi.hProcess ); - } - CloseHandle( event ); - if (!ret || !init_console_std_handles( !(app_si.dwFlags & STARTF_USESTDHANDLES) )) goto error; - console = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, 0, NULL, OPEN_EXISTING, 0, 0 ); - if (console == INVALID_HANDLE_VALUE) goto error; RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = console; - TRACE( "Started wineconsole pid=%08x tid=%08x\n", pi.dwProcessId, pi.dwThreadId ); + CloseHandle( server ); RtlLeaveCriticalSection( &console_section ); SetLastError( ERROR_SUCCESS ); return TRUE; error: ERR("Can't allocate console\n"); + NtClose( console ); + NtClose( server ); FreeConsole(); RtlLeaveCriticalSection( &console_section ); return FALSE;

1 0

Henri Verbeet : wined3d: Make adapter_vk_clear_uav() static.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 43dddbae7bf2806ce9202edcc3f9cb96ae657434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43dddbae7bf2806ce9202edc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 12 16:48:35 2020 +0330 wined3d: Make adapter_vk_clear_uav() static. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 6485094404..beda271c32 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1722,7 +1722,7 @@ static void adapter_vk_dispatch_compute(struct wined3d_device *device, context_release(&context_vk->c); } -void adapter_vk_clear_uav(struct wined3d_context *context, +static void adapter_vk_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value));

1 0

Jacek Caban : conhost: Store title as zero terminated string.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: b2487c17eb60424e1cb4a74e4763f057ebbf7f39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2487c17eb60424e1cb4a74e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 12 18:26:43 2020 +0200 conhost: Store title as zero terminated string. To make it usable for Windows functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 19 ++++++++++--------- programs/conhost/conhost.h | 1 - 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 934b0a4ce1..c917b08dc0 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2271,12 +2271,12 @@ static NTSTATUS set_console_title( struct console *console, const WCHAR *in_titl if (size) { - if (!(title = malloc( size ))) return STATUS_NO_MEMORY; + if (!(title = malloc( size + sizeof(WCHAR) ))) return STATUS_NO_MEMORY; memcpy( title, in_title, size ); + title[size / sizeof(WCHAR)] = 0; } free( console->title ); - console->title = title; - console->title_len = size; + console->title = title; if (console->tty_output) { @@ -2284,9 +2284,11 @@ static NTSTATUS set_console_title( struct console *console, const WCHAR *in_titl char *vt; tty_write( console, "\x1b]0;", 4 ); - len = WideCharToMultiByte( get_tty_cp( console ), 0, console->title, size / sizeof(WCHAR), NULL, 0, NULL, NULL); + len = WideCharToMultiByte( get_tty_cp( console ), 0, console->title, size / sizeof(WCHAR), + NULL, 0, NULL, NULL); if ((vt = tty_alloc_buffer( console, len ))) - WideCharToMultiByte( get_tty_cp( console ), 0, console->title, size / sizeof(WCHAR), vt, len, NULL, NULL ); + WideCharToMultiByte( get_tty_cp( console ), 0, console->title, size / sizeof(WCHAR), + vt, len, NULL, NULL ); tty_write( console, "\x07", 1 ); tty_sync( console ); } @@ -2503,10 +2505,9 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, { WCHAR *result; if (in_size) return STATUS_INVALID_PARAMETER; - TRACE( "returning title %s\n", debugstr_wn(console->title, - console->title_len / sizeof(WCHAR)) ); - if (!(result = alloc_ioctl_buffer( *out_size = min( *out_size, console->title_len )))) - return STATUS_NO_MEMORY; + TRACE( "returning title %s\n", debugstr_w(console->title) ); + *out_size = min( *out_size, console->title ? wcslen( console->title ) * sizeof(WCHAR) : 0 ); + if (!(result = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; if (*out_size) memcpy( result, console->title, *out_size ); return STATUS_SUCCESS; } diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 322c677b91..7bc102b0df 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -88,7 +88,6 @@ struct console struct edit_line edit_line; /* edit line context */ struct console_window *window; WCHAR *title; /* console title */ - size_t title_len; /* length of console title */ struct history_line **history; /* lines history */ unsigned int history_size; /* number of entries in history array */ unsigned int history_index; /* number of used entries in history array */

1 0

Hans Leidekker : dssenh: Don't store the algorithm handle for hashes.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: b5e931d83c0518976c29ae7200250214e74ff02c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5e931d83c0518976c29ae72… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 16:11:08 2020 +0200 dssenh: Don't store the algorithm handle for hashes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index f02e04585a..e9b676e735 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -59,7 +59,6 @@ struct container struct hash { DWORD magic; - BCRYPT_ALG_HANDLE alg_handle; BCRYPT_HASH_HANDLE handle; DWORD len; UCHAR value[64]; @@ -475,6 +474,7 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW static struct hash *create_hash( ALG_ID algid ) { struct hash *ret; + BCRYPT_ALG_HANDLE alg_handle; const WCHAR *alg; DWORD len; @@ -492,24 +492,26 @@ static struct hash *create_hash( ALG_ID algid ) default: FIXME( "unhandled algorithm %u\n", algid ); - return 0; + return NULL; } - if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return 0; + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return NULL; ret->magic = MAGIC_HASH; ret->len = len; - if (BCryptOpenAlgorithmProvider( &ret->alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) + if (BCryptOpenAlgorithmProvider( &alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) { heap_free( ret ); - return 0; + return NULL; } - if (BCryptCreateHash( ret->alg_handle, &ret->handle, NULL, 0, NULL, 0, 0 )) + if (BCryptCreateHash( alg_handle, &ret->handle, NULL, 0, NULL, 0, 0 )) { - BCryptCloseAlgorithmProvider( ret->alg_handle, 0 ); + BCryptCloseAlgorithmProvider( alg_handle, 0 ); heap_free( ret ); - return 0; + return NULL; } + + BCryptCloseAlgorithmProvider( alg_handle, 0 ); return ret; } @@ -537,6 +539,14 @@ BOOL WINAPI CPCreateHash( HCRYPTPROV hprov, ALG_ID algid, HCRYPTKEY hkey, DWORD return TRUE; } +static void destroy_hash( struct hash *hash ) +{ + if (!hash) return; + BCryptDestroyHash( hash->handle ); + hash->magic = 0; + heap_free( hash ); +} + BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) { struct hash *hash = (struct hash *)hhash; @@ -549,11 +559,7 @@ BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) return FALSE; } - BCryptDestroyHash( hash->handle ); - BCryptCloseAlgorithmProvider( hash->alg_handle, 0 ); - - hash->magic = 0; - heap_free( hash ); + destroy_hash( hash ); return TRUE; }

1 0

Hans Leidekker : dssenh: Implement CPDuplicateKey.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: e32b29a3fd2d611a1c978bfe9c7630a735e3f201 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32b29a3fd2d611a1c978bfe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 16:11:10 2020 +0200 dssenh: Implement CPDuplicateKey. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/dssenh.spec | 2 +- dlls/dssenh/main.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index a045a7e04e..e74650c9bb 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -5,7 +5,7 @@ @ stdcall CPDestroyHash(ptr ptr) @ stdcall CPDestroyKey(ptr ptr) @ stdcall CPDuplicateHash(ptr ptr ptr long ptr) -@ stub CPDuplicateKey +@ stdcall CPDuplicateKey(ptr ptr ptr long ptr) @ stub CPEncrypt @ stdcall CPExportKey(ptr ptr ptr long long ptr ptr) @ stdcall CPGenKey(ptr long long ptr) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index d40dedf41b..38ee325b8e 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -471,6 +471,33 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW return FALSE; } +static struct key *duplicate_key( const struct key *key ) +{ + struct key *ret; + + if (!(ret = create_key( key->algid, key->flags ))) return NULL; + + if (BCryptDuplicateKey( key->handle, &ret->handle, NULL, 0, 0 )) + { + heap_free( ret ); + return NULL; + } + return ret; +} + +BOOL WINAPI CPDuplicateKey( HCRYPTPROV hprov, HCRYPTKEY hkey, DWORD *reserved, DWORD flags, HCRYPTKEY *ret_key ) +{ + struct key *key = (struct key *)hkey, *ret; + + TRACE( "%p, %p, %p, %08x, %p\n", (void *)hprov, (void *)hkey, reserved, flags, ret_key ); + + if (key->magic != MAGIC_KEY) return FALSE; + + if (!(ret = duplicate_key( key ))) return FALSE; + *ret_key = (HCRYPTKEY)ret; + return TRUE; +} + static struct hash *create_hash( ALG_ID algid ) { struct hash *ret;

1 0

Huw Davies : riched20: Use ME_Paragraph and ME_Run ptrs in GetCursorCoordinates().
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: f648eff16261a569552e1199fa4eb3e9f4f044c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f648eff16261a569552e1199… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 12 13:09:08 2020 +0100 riched20: Use ME_Paragraph and ME_Run ptrs in GetCursorCoordinates(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index e9ea64ed1b..bd533f91ba 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -222,49 +222,38 @@ void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) { ME_DisplayItem *row; - ME_DisplayItem *run = pCursor->pRun; - ME_DisplayItem *para = pCursor->pPara; - ME_DisplayItem *pSizeRun = run; + ME_Run *run = &pCursor->pRun->member.run; + ME_Paragraph *para = &pCursor->pPara->member.para; + ME_Run *size_run = run, *prev; ME_Context c; int run_x; assert(height && x && y); - assert(~para->member.para.nFlags & MEPF_REWRAP); - assert(run && run->type == diRun); - assert(para && para->type == diParagraph); + assert(~para->nFlags & MEPF_REWRAP); - row = ME_FindItemBack(run, diStartRowOrParagraph); + row = ME_FindItemBack( run_get_di( run ), diStartRowOrParagraph ); assert(row && row->type == diStartRow); ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - if (!pCursor->nOffset) - { - ME_DisplayItem *prev = ME_FindItemBack(run, diRunOrParagraph); - assert(prev); - if (prev->type == diRun) - pSizeRun = prev; - } + if (!pCursor->nOffset && (prev = run_prev( run ))) size_run = prev; + if (editor->bCaretAtEnd && !pCursor->nOffset && - run == ME_FindItemFwd(row, diRun)) + run == &ME_FindItemFwd( row, diRun )->member.run) { ME_DisplayItem *tmp = ME_FindItemBack(row, diRunOrParagraph); - assert(tmp); if (tmp->type == diRun) { row = ME_FindItemBack(tmp, diStartRow); - pSizeRun = run = tmp; - assert(run); - assert(run->type == diRun); + size_run = run = &tmp->member.run; } } - run_x = ME_PointFromCharContext( &c, &run->member.run, pCursor->nOffset, TRUE ); + run_x = ME_PointFromCharContext( &c, run, pCursor->nOffset, TRUE ); - *height = pSizeRun->member.run.nAscent + pSizeRun->member.run.nDescent; - *x = c.rcView.left + run->member.run.pt.x + run_x - editor->horz_si.nPos; - *y = c.rcView.top + para->member.para.pt.y + row->member.row.nBaseline - + run->member.run.pt.y - pSizeRun->member.run.nAscent - - editor->vert_si.nPos; + *height = size_run->nAscent + size_run->nDescent; + *x = c.rcView.left + run->pt.x + run_x - editor->horz_si.nPos; + *y = c.rcView.top + para->pt.y + row->member.row.nBaseline + + run->pt.y - size_run->nAscent - editor->vert_si.nPos; ME_DestroyContext(&c); return; }

1 0

Michael Stefaniuc : localui/tests: Use strings instead of arrays of chars.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: e3e6872fe45490746ee82aa971f83c1014f2ea51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3e6872fe45490746ee82aa9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Oct 9 19:20:11 2020 +0200 localui/tests: Use strings instead of arrays of chars. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localui/tests/localui.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index d323dc067b..23be8c779d 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -43,8 +43,6 @@ static PMONITORUI pui; static BOOL (WINAPI *pAddPortUI)(PCWSTR, HWND, PCWSTR, PWSTR *); static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR); static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); -static const CHAR fmt_comA[] = {'C','O','M','%','u',':',0}; -static const CHAR fmt_lptA[] = {'L','P','T','%','u',':',0}; static LPBYTE pi_buffer; static DWORD pi_numports; @@ -304,7 +302,7 @@ START_TEST(localui) /* "LPT1:" - "LPT9:" */ while (((lpt_present == NULL) || (lpt_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, fmt_lptA, id); + sprintf(bufferA, "LPT%u:", id); MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); pi2 = find_portinfo2(bufferW); if (pi2 && (lpt_present == NULL)) lpt_present = pi2; @@ -315,7 +313,7 @@ START_TEST(localui) /* "COM1:" - "COM9:" */ while (((com_present == NULL) || (com_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, fmt_comA, id); + sprintf(bufferA, "COM%u:", id); MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); pi2 = find_portinfo2(bufferW); if (pi2 && (com_present == NULL)) com_present = pi2;

1 0

Nikolay Sivov : kernelbase: Add a name for codepage 708.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: af17fcbc1c4ccb354208d1d45dbb035b16c16ec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af17fcbc1c4ccb354208d1d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 08:14:49 2020 +0300 kernelbase: Add a name for codepage 708. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2cec5f7637..9cfb9f129e 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -106,6 +106,7 @@ static const struct { UINT cp; const WCHAR *name; } codepage_names[] = { 424, L"IBM EBCDIC Hebrew" }, { 437, L"OEM United States" }, { 500, L"IBM EBCDIC International" }, + { 708, L"Arabic ASMO" }, { 737, L"OEM Greek 437G" }, { 775, L"OEM Baltic" }, { 850, L"OEM Multilingual Latin 1" },

1 0

Nikolay Sivov : dbgeng/tests: Use different flags for unsupported options.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 535cf25f46f618367157ccdd7b73cec65a29c617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=535cf25f46f618367157ccdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 11 09:33:08 2020 +0300 dbgeng/tests: Use different flags for unsupported options. Fixes test failures on recent Windows 10 builds, where 0x00800000 option is acceptable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/tests/dbgeng.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 572d96e405..6279717519 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -50,7 +50,7 @@ static void test_engine_options(void) ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#x.\n", options); - hr = control->lpVtbl->AddEngineOptions(control, 0x00800000); + hr = control->lpVtbl->AddEngineOptions(control, 0x01000000); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); options = 0; @@ -58,7 +58,7 @@ static void test_engine_options(void) ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#x.\n", options); - hr = control->lpVtbl->RemoveEngineOptions(control, 0x00800000); + hr = control->lpVtbl->RemoveEngineOptions(control, 0x01000000); ok(hr == S_OK, "Failed to remove options, hr %#x.\n", hr); hr = control->lpVtbl->AddEngineOptions(control, DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION); @@ -86,10 +86,10 @@ static void test_engine_options(void) ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#x.\n", options); - hr = control->lpVtbl->SetEngineOptions(control, 0x00800000); + hr = control->lpVtbl->SetEngineOptions(control, 0x01000000); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = control->lpVtbl->SetEngineOptions(control, 0x00800000 | DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION); + hr = control->lpVtbl->SetEngineOptions(control, 0x01000000 | DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); options = 0;

1 0

Michael Stefaniuc : localui: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 3503fb0eef1a99cf69f958ca6424d4c3058ace1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3503fb0eef1a99cf69f958ca… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Oct 9 19:20:09 2020 +0200 localui: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localui/localui.c | 58 ++++++++++++-------------------------------- dlls/localui/tests/localui.c | 19 ++++++--------- 2 files changed, 23 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3503fb0eef1a99cf69f9…

1 0

Huw Davies : riched20: Use ME_Paragraph ptrs for the update range.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 88cfc04be0a72beffad2e63b34db1d6a46ff56d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88cfc04be0a72beffad2e63b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 12 13:09:06 2020 +0100 riched20: Use ME_Paragraph ptrs for the update range. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 2 +- dlls/riched20/wrap.c | 41 ++++++++++++++++++++--------------------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 910a87c33c..6c45a3c6b5 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -189,7 +189,7 @@ void ME_DestroyContext(ME_Context *c) DECLSPEC_HIDDEN; /* wrap.c */ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_InvalidateParagraphRange(ME_TextEditor *editor, ME_DisplayItem *start_para, ME_DisplayItem *last_para) DECLSPEC_HIDDEN; +void para_range_invalidate( ME_TextEditor *editor, ME_Paragraph *start_para, ME_Paragraph *last_para ) DECLSPEC_HIDDEN; void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; /* para.c */ diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 53583de21c..6187fb74f1 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1356,7 +1356,7 @@ ME_InvalidateSelection(ME_TextEditor *editor) } if (repaint_start) - ME_InvalidateParagraphRange(editor, repaint_start, repaint_end); + para_range_invalidate( editor, &repaint_start->member.para, &repaint_end->member.para ); /* remember the last invalidated position */ ME_GetSelectionOfs(editor, &editor->nLastSelStart, &editor->nLastSelEnd); ME_GetSelectionParas(editor, &editor->pLastSelStartPara, &editor->pLastSelEndPara); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index f864d97a0e..90835905a0 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -905,10 +905,10 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag struct repaint_range { - ME_DisplayItem *start, *end; + ME_Paragraph *start, *end; }; -static void update_repaint( ME_DisplayItem *para, struct repaint_range *repaint ) +static void update_repaint( ME_Paragraph *para, struct repaint_range *repaint ) { if (!repaint->start) repaint->start = para; repaint->end = para; @@ -987,11 +987,11 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran { /* The height of the cells has grown, so invalidate the bottom of * the cells. */ - update_repaint( para_get_di( para ), repaint ); + update_repaint( para, repaint ); cell = ME_FindItemBack( para_get_di( para ), diCell ); while (cell) { - update_repaint( ME_FindItemBack(cell, diParagraph), repaint ); + update_repaint( &ME_FindItemBack(cell, diParagraph)->member.para, repaint ); cell = cell->member.cell.prev_cell; } } @@ -1054,22 +1054,22 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) totalWidth = max(totalWidth, para->nWidth); if (!para->nCharOfs) - update_repaint( para->prev_para, &repaint ); - update_repaint( para_get_di( para ), &repaint ); + update_repaint( para_prev( para ), &repaint ); + update_repaint( para, &repaint ); adjust_para_y( para, &c, &repaint ); - if (para->next_para) + if (para_next( para )) { - if (c.pt.y != para->next_para->member.para.pt.y) + if (c.pt.y != para_next( para )->pt.y) { next = para; - while (next->next_para && &next->marked_entry != next_entry && + while (para_next( next ) && &next->marked_entry != next_entry && next != &editor->pBuffer->pLast->member.para) { - update_repaint( next->next_para, &repaint ); - next->next_para->member.para.pt.y = c.pt.y; - adjust_para_y( &next->next_para->member.para, &c, &repaint ); - next = &next->next_para->member.para; + update_repaint( para_next( next ), &repaint ); + para_next( next )->pt.y = c.pt.y; + adjust_para_y( para_next( next ), &c, &repaint ); + next = para_next( next ); } } } @@ -1086,13 +1086,12 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_DestroyContext(&c); if (repaint.start || editor->nTotalLength < editor->nLastTotalLength) - ME_InvalidateParagraphRange(editor, repaint.start, repaint.end); + para_range_invalidate( editor, repaint.start, repaint.end); return !!repaint.start; } -void ME_InvalidateParagraphRange(ME_TextEditor *editor, - ME_DisplayItem *start_para, - ME_DisplayItem *last_para) +void para_range_invalidate( ME_TextEditor *editor, ME_Paragraph *start_para, + ME_Paragraph *last_para ) { RECT rc; int ofs; @@ -1102,16 +1101,16 @@ void ME_InvalidateParagraphRange(ME_TextEditor *editor, if (start_para) { - start_para = para_get_di( table_outer_para( &start_para->member.para ) ); - last_para = para_get_di( table_outer_para( &last_para->member.para ) ); - rc.top += start_para->member.para.pt.y - ofs; + start_para = table_outer_para( start_para ); + last_para = table_outer_para( last_para ); + rc.top += start_para->pt.y - ofs; } else { rc.top += editor->nTotalLength - ofs; } if (editor->nTotalLength < editor->nLastTotalLength) rc.bottom = editor->rcFormat.top + editor->nLastTotalLength - ofs; else - rc.bottom = editor->rcFormat.top + last_para->member.para.pt.y + last_para->member.para.nHeight - ofs; + rc.bottom = editor->rcFormat.top + last_para->pt.y + last_para->nHeight - ofs; ITextHost_TxInvalidateRect(editor->texthost, &rc, TRUE); }

1 0

Michael Stefaniuc : winmgmt: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 82a7936c02768781aa80035bc44e5b36ad387c22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82a7936c02768781aa80035b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:53 2020 +0200 winmgmt: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winmgmt/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winmgmt/main.c b/programs/winmgmt/main.c index 8b262d00f3..bc7150a08c 100644 --- a/programs/winmgmt/main.c +++ b/programs/winmgmt/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmgmt); -static WCHAR winmgmtW[] = {'W','i','n','m','g','m','t',0}; +static WCHAR winmgmtW[] = L"Winmgmt"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event;

1 0

Huw Davies : riched20: Use the table_row_start/end() helpers.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: bb50c5a8457832870161e00646f588ef68b65483 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb50c5a8457832870161e006… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 12 13:09:07 2020 +0100 riched20: Use the table_row_start/end() helpers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 90835905a0..c7b99f5ee2 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -919,7 +919,7 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran if (para->nFlags & MEPF_ROWSTART) { ME_DisplayItem *cell = ME_FindItemFwd( para_get_di( para ), diCell); - ME_DisplayItem *endRowPara; + ME_Paragraph *end_row_para = table_row_end( para ); int borderWidth = 0; cell->member.cell.pt = c->pt; /* Offset the text by the largest top border width. */ @@ -928,8 +928,6 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran borderWidth = max(borderWidth, cell->member.cell.border.top.width); cell = cell->member.cell.next_cell; } - endRowPara = ME_FindItemFwd(cell, diParagraph); - assert(endRowPara->member.para.nFlags & MEPF_ROWEND); if (borderWidth > 0) { borderWidth = max(ME_twips2pointsY(c, borderWidth), 1); @@ -940,22 +938,21 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran } c->pt.y += borderWidth; } - if (endRowPara->member.para.fmt.dxStartIndent > 0) + if (end_row_para->fmt.dxStartIndent > 0) { - int dxStartIndent = endRowPara->member.para.fmt.dxStartIndent; cell = ME_FindItemFwd( para_get_di( para ), diCell); - cell->member.cell.pt.x += ME_twips2pointsX(c, dxStartIndent); + cell->member.cell.pt.x += ME_twips2pointsX( c, end_row_para->fmt.dxStartIndent ); c->pt.x = cell->member.cell.pt.x; } } else if (para->nFlags & MEPF_ROWEND) { /* Set all the cells to the height of the largest cell */ - ME_DisplayItem *startRowPara; + ME_Paragraph *start_row_para = table_row_start( para ); int prevHeight, nHeight, bottomBorder = 0; ME_DisplayItem *cell = ME_FindItemBack( para_get_di( para ), diCell ); para->nWidth = cell->member.cell.pt.x + cell->member.cell.nWidth; - if (!(para->next_para->member.para.nFlags & MEPF_ROWSTART)) + if (!(para_next( para )->nFlags & MEPF_ROWSTART)) { /* Last row, the bottom border is added to the height. */ cell = cell->member.cell.prev_cell; @@ -979,9 +976,8 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran cell->member.cell.nHeight = nHeight; } /* Also set the height of the start row paragraph */ - startRowPara = ME_FindItemBack(cell, diParagraph); - startRowPara->member.para.nHeight = nHeight; - c->pt.x = startRowPara->member.para.pt.x; + start_row_para->nHeight = nHeight; + c->pt.x = start_row_para->pt.x; c->pt.y = cell->member.cell.pt.y + nHeight; if (prevHeight < nHeight) { @@ -996,7 +992,7 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran } } } - else if (para->pCell && para->pCell != para->next_para->member.para.pCell) + else if (para->pCell && para->pCell != para_next( para )->pCell) { /* The next paragraph is in the next cell in the table row. */ ME_Cell *cell = &para->pCell->member.cell;

1 0

Nikolay Sivov : dxva2/tests: Add a test for GetVideoProcessorDeviceGuids().
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 1829c196872bec9187e5ef2c2cb99683dbe22bb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1829c196872bec9187e5ef2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:19:23 2020 +0300 dxva2/tests: Add a test for GetVideoProcessorDeviceGuids(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/tests/dxva2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index f5b28ed3f8..9dcd3e5bf4 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -92,6 +92,7 @@ static void test_device_manager(void) UINT token, count; IDirect3D9 *d3d; HWND window; + GUID *guids; HRESULT hr; RECT rect; @@ -309,6 +310,11 @@ static void test_device_manager(void) video_desc.SampleHeight = 64; video_desc.Format = D3DFMT_A8R8G8B8; + hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count, "Unexpected format count %u.\n", count); + CoTaskMemFree(guids); + count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, &video_desc, &count, &formats);

1 0

Michael Stefaniuc : presentationfontcache: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: f95a4de5d5579af877d8cdb90626bb7f41d82e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f95a4de5d5579af877d8cdb9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:50 2020 +0200 presentationfontcache: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/presentationfontcache/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/presentationfontcache/main.c b/programs/presentationfontcache/main.c index 694ad792db..ab2d0e2106 100644 --- a/programs/presentationfontcache/main.c +++ b/programs/presentationfontcache/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(fontcache); -static WCHAR fontcacheW[] = {'F','o','n','t','C','a','c','h','e','3','.','0','.','0','.','0',0}; +static WCHAR fontcacheW[] = L"FontCache3.0.0.0"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event;

1 0

Michael Stefaniuc : wer: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 99ebf988158b018148443f5e0e51bac6c24529cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=99ebf988158b018148443f5e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Oct 9 19:20:10 2020 +0200 wer: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wer/main.c | 6 +----- dlls/wer/tests/main.c | 30 +++++++++++++----------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index b40aa1b762..ad57cbdf40 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -48,11 +48,7 @@ static CRITICAL_SECTION report_table_cs = { &report_table_cs_debug, -1, 0, 0, 0, static struct list report_table = LIST_INIT(report_table); -static const WCHAR regpath_exclude[] = - {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','E','r','r','o','r',' ','R','e','p','o','r','t','i','n','g','\\', - 'E','x','c','l','u','d','e','d','A','p','p','l','i','c','a','t','i','o','n','s',0}; +static const WCHAR regpath_exclude[] = L"Software\\Microsoft\\Windows Error Reporting\\ExcludedApplications"; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index 7fa9a8c67f..038b29c25a 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -29,11 +29,7 @@ #include "werapi.h" #include "wine/test.h" - -static const WCHAR appcrash[] = {'A','P','P','C','R','A','S','H',0}; -static const WCHAR backslash[] = {'\\',0}; -static const WCHAR empty[] = {0}; -static const WCHAR winetest_wer[] = {'w','i','n','e','t','e','s','t','_','w','e','r','.','e','x','e',0}; +static const WCHAR winetest_wer[] = L"winetest_wer.exe"; /* ###### */ @@ -51,7 +47,7 @@ static void test_WerAddExcludedApplication(void) hr = WerAddExcludedApplication(NULL, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); - hr = WerAddExcludedApplication(empty, FALSE); + hr = WerAddExcludedApplication(L"", FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); hr = WerAddExcludedApplication(winetest_wer, FALSE); @@ -74,7 +70,7 @@ static void test_WerAddExcludedApplication(void) hr = WerRemoveExcludedApplication(buffer, FALSE); ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); - lstrcatW(buffer, backslash); + lstrcatW(buffer, L"\\"); hr = WerAddExcludedApplication(buffer, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); @@ -106,7 +102,7 @@ static void test_WerRemoveExcludedApplication(void) hr = WerRemoveExcludedApplication(NULL, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); - hr = WerRemoveExcludedApplication(empty, FALSE); + hr = WerRemoveExcludedApplication(L"", FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); hr = WerRemoveExcludedApplication(winetest_wer, FALSE); @@ -130,7 +126,7 @@ static void test_WerRemoveExcludedApplication(void) hr = WerRemoveExcludedApplication(buffer, FALSE); ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); - lstrcatW(buffer, backslash); + lstrcatW(buffer, L"\\"); hr = WerAddExcludedApplication(buffer, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); hr = WerRemoveExcludedApplication(buffer, FALSE); @@ -152,7 +148,7 @@ static void test_WerReportCloseHandle(void) HREPORT report; report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, WerReportCritical, NULL, &report); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, &report); ok(hr == S_OK, "got 0x%x and %p (expected S_OK)\n", hr, report); if (!report) { @@ -183,7 +179,7 @@ static void test_WerReportCreate(void) report = (void *) 0xdeadbeef; /* test a simple valid case */ - hr = WerReportCreate(appcrash, WerReportCritical, NULL, &report); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, &report); ok(hr == S_OK, "got 0x%x and %p (expected S_OK)\n", hr, report); if (!report) { @@ -195,7 +191,7 @@ static void test_WerReportCreate(void) ok(hr == S_OK, "got 0x%x for %p (expected S_OK)\n", hr, report); /* the ptr to store the created handle is always needed */ - hr = WerReportCreate(appcrash, WerReportCritical, NULL, NULL); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, NULL); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); /* the event type must be a valid string */ @@ -204,13 +200,13 @@ static void test_WerReportCreate(void) ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); report = (void *) 0xdeadbeef; - hr = WerReportCreate(empty, WerReportCritical, NULL, &report); + hr = WerReportCreate(L"", WerReportCritical, NULL, &report); ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); /* a valid WER_REPORT_TYPE works */ for (i = 0; i < WerReportInvalid; i++) { report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, i, NULL, &report); + hr = WerReportCreate(L"APPCRASH", i, NULL, &report); ok(hr == S_OK, "%d: got 0x%x and %p (expected S_OK)\n", i, hr, report); hr = WerReportCloseHandle(report); @@ -222,7 +218,7 @@ static void test_WerReportCreate(void) but older windows versions did not check the report type and WerReportCreate always succeeded */ report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, WerReportInvalid, NULL, &report); + hr = WerReportCreate(L"APPCRASH", WerReportInvalid, NULL, &report); ok((hr == E_INVALIDARG) | broken(hr == S_OK), "%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)\n", i, hr, report); if (hr == S_OK) { @@ -231,7 +227,7 @@ static void test_WerReportCreate(void) } report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, 42, NULL, &report); + hr = WerReportCreate(L"APPCRASH", 42, NULL, &report); ok((hr == E_INVALIDARG) | broken(hr == S_OK), "%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)\n", i, hr, report); if (hr == S_OK) { @@ -243,7 +239,7 @@ static void test_WerReportCreate(void) memset(table, 0, sizeof(table)); for (i = 0; i < (ARRAY_SIZE(table) - 1); i++) { report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, WerReportCritical, NULL, &table[i]); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, &table[i]); ok(hr == S_OK, "%02d: got 0x%x and %p (expected S_OK)\n", i, hr, table[i]); }

1 0

Haoyang Chen : gdiplus: Fix texture brush rotation.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 2697b74d6753a4bf528659047c2ce971f39fb6e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2697b74d6753a4bf52865904… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Fri Oct 9 10:24:54 2020 +0800 gdiplus: Fix texture brush rotation. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1615f592d5..190f45d64a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1374,7 +1374,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, { GpPointF point; point.X = draw_points[0].X + x * x_dx + y * y_dx; - point.Y = draw_points[0].Y + y * x_dy + y * y_dy; + point.Y = draw_points[0].Y + x * x_dy + y * y_dy; argb_pixels[x + y*cdwStride] = resample_bitmap_pixel( &src_area, fill->bitmap_bits, bitmap->width, bitmap->height,

1 0

Nikolay Sivov : mfplat/mediatype: Enable IMFVideoMediaType based on major type.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: a6166a5e1aa119dd426c8482e8e66e627488ddbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6166a5e1aa119dd426c8482… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:23 2020 +0300 mfplat/mediatype: Enable IMFVideoMediaType based on major type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 108 ++++++++++++++++++++------------------------- dlls/mfplat/tests/mfplat.c | 53 +++++++++++++++++++++- 2 files changed, 101 insertions(+), 60 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 5eaa4fdd08..0c0d962032 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -96,20 +96,32 @@ static struct presentation_desc *impl_from_IMFPresentationDescriptor(IMFPresenta static HRESULT WINAPI mediatype_QueryInterface(IMFMediaType *iface, REFIID riid, void **out) { + struct media_type *media_type = impl_from_IMFMediaType(iface); + GUID major = { 0 }; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualIID(riid, &IID_IMFMediaType) || + attributes_GetGUID(&media_type->attributes, &MF_MT_MAJOR_TYPE, &major); + + if (IsEqualGUID(&major, &MFMediaType_Video) && IsEqualIID(riid, &IID_IMFVideoMediaType)) + { + *out = &media_type->IMFVideoMediaType_iface; + } + else if (IsEqualIID(riid, &IID_IMFMediaType) || IsEqualIID(riid, &IID_IMFAttributes) || IsEqualIID(riid, &IID_IUnknown)) { - *out = iface; - IMFMediaType_AddRef(iface); - return S_OK; + *out = &media_type->IMFMediaType_iface; + } + else + { + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; } - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *out = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static ULONG WINAPI mediatype_AddRef(IMFMediaType *iface) @@ -613,48 +625,20 @@ static const IMFMediaTypeVtbl mediatypevtbl = static HRESULT WINAPI video_mediatype_QueryInterface(IMFVideoMediaType *iface, REFIID riid, void **out) { - TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); - - if (IsEqualIID(riid, &IID_IMFVideoMediaType) || - IsEqualIID(riid, &IID_IMFMediaType) || - IsEqualIID(riid, &IID_IMFAttributes) || - IsEqualIID(riid, &IID_IUnknown)) - { - *out = iface; - IMFVideoMediaType_AddRef(iface); - return S_OK; - } - - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *out = NULL; - return E_NOINTERFACE; + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + return IMFMediaType_QueryInterface(&media_type->IMFMediaType_iface, riid, out); } static ULONG WINAPI video_mediatype_AddRef(IMFVideoMediaType *iface) { struct media_type *media_type = impl_from_IMFVideoMediaType(iface); - ULONG refcount = InterlockedIncrement(&media_type->attributes.ref); - - TRACE("%p, refcount %u.\n", iface, refcount); - - return refcount; + return IMFMediaType_AddRef(&media_type->IMFMediaType_iface); } static ULONG WINAPI video_mediatype_Release(IMFVideoMediaType *iface) { struct media_type *media_type = impl_from_IMFVideoMediaType(iface); - ULONG refcount = InterlockedDecrement(&media_type->attributes.ref); - - TRACE("%p, refcount %u.\n", iface, refcount); - - if (!refcount) - { - clear_attributes_object(&media_type->attributes); - CoTaskMemFree(media_type->video_format); - heap_free(media_type); - } - - return refcount; + return IMFMediaType_Release(&media_type->IMFMediaType_iface); } static HRESULT WINAPI video_mediatype_GetItem(IMFVideoMediaType *iface, REFGUID key, PROPVARIANT *value) @@ -1039,6 +1023,28 @@ static const IMFVideoMediaTypeVtbl videomediatypevtbl = video_mediatype_GetVideoRepresentation, }; +static HRESULT create_media_type(struct media_type **ret) +{ + struct media_type *object; + HRESULT hr; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + if (FAILED(hr = init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return hr; + } + object->IMFMediaType_iface.lpVtbl = &mediatypevtbl; + object->IMFVideoMediaType_iface.lpVtbl = &videomediatypevtbl; + + *ret = object; + + return S_OK; +} + /*********************************************************************** * MFCreateMediaType (mfplat.@) */ @@ -1052,16 +1058,8 @@ HRESULT WINAPI MFCreateMediaType(IMFMediaType **media_type) if (!media_type) return E_INVALIDARG; - object = heap_alloc(sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - if (FAILED(hr = init_attributes_object(&object->attributes, 0))) - { - heap_free(object); + if (FAILED(hr = create_media_type(&object))) return hr; - } - object->IMFMediaType_iface.lpVtbl = &mediatypevtbl; *media_type = &object->IMFMediaType_iface; @@ -2633,19 +2631,11 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMe if (!media_type) return E_INVALIDARG; - object = heap_alloc(sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - if (FAILED(hr = init_attributes_object(&object->attributes, 0))) - { - heap_free(object); + if (FAILED(hr = create_media_type(&object))) return hr; - } - object->IMFVideoMediaType_iface.lpVtbl = &videomediatypevtbl; - IMFVideoMediaType_SetGUID(&object->IMFVideoMediaType_iface, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); - IMFVideoMediaType_SetGUID(&object->IMFVideoMediaType_iface, &MF_MT_SUBTYPE, subtype); + IMFMediaType_SetGUID(&object->IMFMediaType_iface, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + IMFMediaType_SetGUID(&object->IMFMediaType_iface, &MF_MT_SUBTYPE, subtype); *media_type = &object->IMFVideoMediaType_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 309f7b669a..c355810654 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -763,8 +763,10 @@ static void init_functions(void) static void test_media_type(void) { IMFMediaType *mediatype, *mediatype2; + IMFVideoMediaType *video_type; + IUnknown *unk, *unk2; + DWORD count, flags; BOOL compressed; - DWORD flags; HRESULT hr; GUID guid; @@ -862,6 +864,55 @@ if(0) IMFMediaType_Release(mediatype2); IMFMediaType_Release(mediatype); + + /* IMFVideoMediaType */ + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_QueryInterface(mediatype, &IID_IMFVideoMediaType, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_QueryInterface(mediatype, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(unk == (IUnknown *)mediatype, "Unexpected pointer.\n"); + IUnknown_Release(unk); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set GUID value, hr %#x.\n", hr); + + hr = IMFMediaType_QueryInterface(mediatype, &IID_IMFVideoMediaType, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(unk2 == (IUnknown *)mediatype, "Unexpected pointer.\n"); + IUnknown_Release(unk2); + IUnknown_Release(unk); + + hr = MFCreateVideoMediaTypeFromSubtype(&MFVideoFormat_RGB555, &video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoMediaType_QueryInterface(video_type, &IID_IMFMediaType, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFVideoMediaType_QueryInterface(video_type, &IID_IMFVideoMediaType, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + /* Major and subtype are set on creation. */ + hr = IMFVideoMediaType_GetCount(video_type, &count); + ok(count == 2, "Unexpected attribute count %#x.\n", hr); + + hr = IMFVideoMediaType_DeleteAllItems(video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoMediaType_GetCount(video_type, &count); + ok(!count, "Unexpected attribute count %#x.\n", hr); + + hr = IMFVideoMediaType_QueryInterface(video_type, &IID_IMFVideoMediaType, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + IMFVideoMediaType_Release(video_type); + + IMFMediaType_Release(mediatype); } static void test_MFCreateMediaEvent(void)

1 0

Nikolay Sivov : evr/mixer: Add SetOutputBounds().
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 14d2b044785911ae8e0664167dce0ae40882d4cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=14d2b044785911ae8e066416… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:25 2020 +0300 evr/mixer: Add SetOutputBounds(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 17 +++++++++++++++-- dlls/evr/tests/evr.c | 3 +++ include/basetsd.h | 2 ++ include/mftransform.idl | 3 +++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 54da3a9ce1..631cc796ea 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -79,6 +79,8 @@ struct video_mixer IMFAttributes *attributes; IMFAttributes *internal_attributes; unsigned int mixing_flags; + LONGLONG lower_bound; + LONGLONG upper_bound; CRITICAL_SECTION cs; }; @@ -814,9 +816,18 @@ static HRESULT WINAPI video_mixer_transform_GetOutputStatus(IMFTransform *iface, static HRESULT WINAPI video_mixer_transform_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper) { - FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(lower), wine_dbgstr_longlong(upper)); + struct video_mixer *mixer = impl_from_IMFTransform(iface); - return E_NOTIMPL; + TRACE("%p, %s, %s.\n", iface, wine_dbgstr_longlong(lower), wine_dbgstr_longlong(upper)); + + EnterCriticalSection(&mixer->cs); + + mixer->lower_bound = lower; + mixer->upper_bound = upper; + + LeaveCriticalSection(&mixer->cs); + + return S_OK; } static HRESULT WINAPI video_mixer_transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event) @@ -1879,6 +1890,8 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; object->input_count = 1; + object->lower_bound = MFT_OUTPUT_BOUND_LOWER_UNBOUNDED; + object->upper_bound = MFT_OUTPUT_BOUND_UPPER_UNBOUNDED; video_mixer_init_input(&object->inputs[0]); InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 175c30e818..13a07c42c5 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -531,6 +531,9 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFTransform_SetOutputBounds(transform, 100, 10); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); diff --git a/include/basetsd.h b/include/basetsd.h index c9f5c90e86..7087b592d1 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -265,6 +265,8 @@ typedef ULONG_PTR SIZE_T, *PSIZE_T; typedef ULONG_PTR KAFFINITY, *PKAFFINITY; +#define MINLONGLONG ((LONGLONG)~MAXLONGLONG) + /* Some Wine-specific definitions */ /* Architecture dependent settings. */ diff --git a/include/mftransform.idl b/include/mftransform.idl index 1b402a5cc7..3f4b550020 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -18,6 +18,9 @@ import "mfobjects.idl"; +cpp_quote("#define MFT_OUTPUT_BOUND_LOWER_UNBOUNDED MINLONGLONG") +cpp_quote("#define MFT_OUTPUT_BOUND_UPPER_UNBOUNDED MAXLONGLONG") + typedef [v1_enum] enum _MFT_MESSAGE_TYPE { MFT_MESSAGE_COMMAND_FLUSH = 0x00000000,

1 0

Nikolay Sivov : evr/mixer: Use regular media type interface for the output stream.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 11594f563f13cd0fa7006d56250c16fe624a6129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11594f563f13cd0fa7006d56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:27 2020 +0300 evr/mixer: Use regular media type interface for the output stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index a18df5c4b3..bb76fd8894 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -47,8 +47,8 @@ struct input_stream struct output_stream { - IMFVideoMediaType *media_type; - IMFVideoMediaType **media_types; + IMFMediaType *media_type; + IMFMediaType **media_types; unsigned int type_count; }; @@ -175,11 +175,11 @@ static void video_mixer_clear_types(struct video_mixer *mixer) } for (i = 0; i < mixer->output.type_count; ++i) { - IMFVideoMediaType_Release(mixer->output.media_types[i]); + IMFMediaType_Release(mixer->output.media_types[i]); } heap_free(mixer->output.media_types); if (mixer->output.media_type) - IMFVideoMediaType_Release(mixer->output.media_type); + IMFMediaType_Release(mixer->output.media_type); mixer->output.media_type = NULL; } @@ -662,7 +662,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const for (i = 0; i < count; ++i) { subtype.Data1 = rt_formats[i]; - MFCreateVideoMediaTypeFromSubtype(&subtype, &mixer->output.media_types[i]); + MFCreateVideoMediaTypeFromSubtype(&subtype, (IMFVideoMediaType **)&mixer->output.media_types[i]); } mixer->output.type_count = count; }

1 0

Huw Davies : riched20: Use a structure to hold the repaint range.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: efa45652a9cd8dfdab85f690b3553533b5d8caf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efa45652a9cd8dfdab85f690… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 12 13:09:05 2020 +0100 riched20: Use a structure to hold the repaint range. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index a84f738e92..f864d97a0e 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -903,16 +903,18 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag editor->total_rows += wc.nRow; } -static void ME_MarkRepaintEnd(ME_DisplayItem *para, - ME_DisplayItem **repaint_start, - ME_DisplayItem **repaint_end) +struct repaint_range { - if (!*repaint_start) - *repaint_start = para; - *repaint_end = para; + ME_DisplayItem *start, *end; +}; + +static void update_repaint( ME_DisplayItem *para, struct repaint_range *repaint ) +{ + if (!repaint->start) repaint->start = para; + repaint->end = para; } -static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *repaint_start, ME_DisplayItem *repaint_end) +static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_range *repaint ) { if (para->nFlags & MEPF_ROWSTART) { @@ -985,11 +987,11 @@ static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *rep { /* The height of the cells has grown, so invalidate the bottom of * the cells. */ - ME_MarkRepaintEnd( para_get_di( para ) , &repaint_start, &repaint_end ); + update_repaint( para_get_di( para ), repaint ); cell = ME_FindItemBack( para_get_di( para ), diCell ); while (cell) { - ME_MarkRepaintEnd(ME_FindItemBack(cell, diParagraph), &repaint_start, &repaint_end); + update_repaint( ME_FindItemBack(cell, diParagraph), repaint ); cell = cell->member.cell.prev_cell; } } @@ -1031,7 +1033,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) struct wine_rb_entry *entry, *next_entry; ME_Context c; int totalWidth = editor->nTotalWidth, prev_width; - ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; + struct repaint_range repaint = { NULL, NULL }; if (!editor->marked_paras.root) return FALSE; @@ -1052,9 +1054,9 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) totalWidth = max(totalWidth, para->nWidth); if (!para->nCharOfs) - ME_MarkRepaintEnd( para->prev_para, &repaint_start, &repaint_end ); - ME_MarkRepaintEnd( para_get_di( para ), &repaint_start, &repaint_end ); - adjust_para_y( para, &c, repaint_start, repaint_end ); + update_repaint( para->prev_para, &repaint ); + update_repaint( para_get_di( para ), &repaint ); + adjust_para_y( para, &c, &repaint ); if (para->next_para) { @@ -1064,9 +1066,9 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) while (next->next_para && &next->marked_entry != next_entry && next != &editor->pBuffer->pLast->member.para) { - ME_MarkRepaintEnd(next->next_para, &repaint_start, &repaint_end); + update_repaint( next->next_para, &repaint ); next->next_para->member.para.pt.y = c.pt.y; - adjust_para_y( &next->next_para->member.para, &c, repaint_start, repaint_end ); + adjust_para_y( &next->next_para->member.para, &c, &repaint ); next = &next->next_para->member.para; } } @@ -1083,9 +1085,9 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_DestroyContext(&c); - if (repaint_start || editor->nTotalLength < editor->nLastTotalLength) - ME_InvalidateParagraphRange(editor, repaint_start, repaint_end); - return !!repaint_start; + if (repaint.start || editor->nTotalLength < editor->nLastTotalLength) + ME_InvalidateParagraphRange(editor, repaint.start, repaint.end); + return !!repaint.start; } void ME_InvalidateParagraphRange(ME_TextEditor *editor,

1 0

Nikolay Sivov : evr/mixer: Implement SetOutputType().
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: b8e003c0e0d9904e1279cafbaa034ad5899006e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8e003c0e0d9904e1279cafb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:28 2020 +0300 evr/mixer: Implement SetOutputType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/evr/tests/evr.c | 11 +++++++++-- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index bb76fd8894..7cb35983f7 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -738,9 +738,43 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + const unsigned int equality_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | + MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA; + struct video_mixer *mixer = impl_from_IMFTransform(iface); + HRESULT hr = MF_E_INVALIDMEDIATYPE; + unsigned int i, compare_flags; - return E_NOTIMPL; + TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); + + if (id) + return MF_E_INVALIDSTREAMNUMBER; + + EnterCriticalSection(&mixer->cs); + + for (i = 0; i < mixer->output.type_count; ++i) + { + compare_flags = 0; + if (FAILED(IMFMediaType_IsEqual(type, mixer->output.media_types[i], &compare_flags))) + continue; + + if ((compare_flags & equality_flags) == equality_flags) + { + hr = S_OK; + break; + } + } + + if (SUCCEEDED(hr) && !(flags & MFT_SET_TYPE_TEST_ONLY)) + { + if (mixer->output.media_type) + IMFMediaType_Release(mixer->output.media_type); + mixer->output.media_type = type; + IMFMediaType_AddRef(mixer->output.media_type); + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 13a07c42c5..5829815988 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -958,10 +958,11 @@ todo_wine hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetOutputType(transform, 1, media_type, 0); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFMediaType_Release(media_type); hr = IMFVideoProcessor_GetVideoProcessorMode(processor, &guid); todo_wine @@ -973,6 +974,12 @@ todo_wine if (SUCCEEDED(hr)) CoTaskMemFree(guids); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type == media_type2, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type2); + IMFMediaType_Release(media_type); + IMFVideoProcessor_Release(processor); IMFVideoMediaType_Release(video_type);

1 0

Nikolay Sivov : evr/mixer: Use regular media type interface for input streams.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 7ab646ad482d5a127d320c7c1f16ccb72569b863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ab646ad482d5a127d320c7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:26 2020 +0300 evr/mixer: Use regular media type interface for input streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 631cc796ea..a18df5c4b3 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -40,7 +40,7 @@ struct input_stream { unsigned int id; IMFAttributes *attributes; - IMFVideoMediaType *media_type; + IMFMediaType *media_type; MFVideoNormalizedRect rect; unsigned int zorder; }; @@ -170,7 +170,7 @@ static void video_mixer_clear_types(struct video_mixer *mixer) for (i = 0; i < mixer->input_count; ++i) { if (mixer->inputs[i].media_type) - IMFVideoMediaType_Release(mixer->inputs[i].media_type); + IMFMediaType_Release(mixer->inputs[i].media_type); mixer->inputs[i].media_type = NULL; } for (i = 0; i < mixer->output.type_count; ++i) @@ -714,14 +714,8 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) { - GUID subtype = { 0 }; - - if (FAILED(hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype))) - WARN("Failed to get subtype %#x.\n", hr); - - if (SUCCEEDED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, &mixer->inputs[0].media_type))) + if (SUCCEEDED(hr = MFCreateMediaType(&mixer->inputs[0].media_type))) hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)mixer->inputs[0].media_type); - } CoTaskMemFree(guids); }

1 0

Nikolay Sivov : mfplat/mediatype: Add IMFAudioMediaType stub.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: ad65d03013a3e49dd970bf0a3c9e4fa22c1bca2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad65d03013a3e49dd970bf0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:24 2020 +0300 mfplat/mediatype: Add IMFAudioMediaType stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 394 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 48 ++++++ 2 files changed, 442 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ad65d03013a3e49dd970…

1 0

Akihiro Sagawa : documentation: Update Japanese translation.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: fef92bacc5967c1a45d7bae98af364a5df47981b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef92bacc5967c1a45d7bae9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Oct 11 23:52:19 2020 +0900 documentation: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.ja | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/documentation/README.ja b/documentation/README.ja index 9b44353306..57b35de991 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -19,6 +19,14 @@ READMEというファイル]を含むディレクトリ）から、以下を実 ./configure make +それから次のいずれか、Wineをインストールするか: + +make install + +または、Wineをビルドディレクトリから直接実行してください: + +./wine notepad + "wine program"のようにプログラムを実行してください。更なる情報や問題解決については、このファイルの残りの部分、Wineのmanページや、特にhttps://www.winehq.orgで見つかる豊富な情報を読んでください。

1 0

Zhiyi Zhang : wined3d: Clean up swapchain state on wined3d_swapchain_init() failure paths.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 62fa286edfe1755182e2b266b17fa6d7bd46d55e URL: https://source.winehq.org/git/wine.git/?a=commit;h=62fa286edfe1755182e2b266… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 12 16:41:01 2020 +0800 wined3d: Clean up swapchain state on wined3d_swapchain_init() failure paths. Signed-off-by: Zhiyi Zhang <zzhang(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 | 8 +++++--- dlls/wined3d/wined3d_main.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f821437997..aa56634f3f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -34,7 +34,7 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) TRACE("Destroying swapchain %p.\n", swapchain); - wined3d_swapchain_state_unregister(&swapchain->state); + wined3d_swapchain_state_cleanup(&swapchain->state); wined3d_swapchain_set_gamma_ramp(swapchain, 0, &swapchain->orig_gamma); /* Release the swapchain's draw buffers. Make sure swapchain->back_buffers[0] @@ -1359,7 +1359,8 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d, state_parent))) { ERR("Failed to initialise swapchain state, hr %#x.\n", hr); - goto err; + wined3d_mutex_unlock(); + return hr; } swapchain->swapchain_ops = swapchain_ops; @@ -1565,6 +1566,7 @@ err: wined3d_texture_decref(swapchain->front_buffer); } + wined3d_swapchain_state_cleanup(&swapchain->state); wined3d_mutex_unlock(); return hr; @@ -2290,7 +2292,7 @@ BOOL CDECL wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_st void CDECL wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state) { - wined3d_swapchain_state_unregister(state); + wined3d_swapchain_state_cleanup(state); heap_free(state); } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 001b7dd125..7e96f87468 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -817,7 +817,7 @@ void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, wined3d_wndproc_mutex_unlock(); } -void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) +static void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) { struct wined3d_registered_swapchain_state *state_entry, *last_state_entry; struct wined3d_window_hook *hook, *last_hook; @@ -850,6 +850,11 @@ void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) wined3d_wndproc_mutex_unlock(); } +void wined3d_swapchain_state_cleanup(struct wined3d_swapchain_state *state) +{ + wined3d_swapchain_state_unregister(state); +} + /* At process attach */ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4c2204cd86..901c809d87 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5083,13 +5083,13 @@ struct wined3d_swapchain_state HWND device_window; }; +void wined3d_swapchain_state_cleanup(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, struct wined3d *wined3d) DECLSPEC_HIDDEN; void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, HWND window, int x, int y, int width, int height) DECLSPEC_HIDDEN; -void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; struct wined3d_swapchain_ops {

1 0

Michael Stefaniuc : termsv: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: c5ce35aaf89c8a78e4080f8d2eb9abd06536b6fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5ce35aaf89c8a78e4080f8d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:52 2020 +0200 termsv: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/termsv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/termsv/main.c b/programs/termsv/main.c index eb79d17f00..2ca6d0809d 100644 --- a/programs/termsv/main.c +++ b/programs/termsv/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(termsv); -static WCHAR termserviceW[] = {'T','e','r','m','S','e','r','v','i','c','e',0}; +static WCHAR termserviceW[] = L"TermService"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event;

1 0

Michael Stefaniuc : plugplay: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: d638cca0fe5bcfdca5776d71f6f254437e71fc6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d638cca0fe5bcfdca5776d71… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:49 2020 +0200 plugplay: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/plugplay/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 8e00704842..2c4054de3e 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); -static WCHAR plugplayW[] = {'P','l','u','g','P','l','a','y',0}; +static WCHAR plugplayW[] = L"PlugPlay"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event;

1 0

Michael Stefaniuc : qmgr: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: b0a64a81044bca1ae3f222e7d9976173b317a9bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0a64a81044bca1ae3f222e7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 11 22:05:23 2020 +0200 qmgr: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/file.c | 6 ++---- dlls/qmgr/service.c | 3 +-- dlls/qmgr/tests/enum_files.c | 18 ++++++------------ dlls/qmgr/tests/enum_jobs.c | 12 ++++-------- dlls/qmgr/tests/file.c | 11 ++++------- dlls/qmgr/tests/job.c | 24 +++++++++--------------- dlls/qmgr/tests/qmgr.c | 17 ++++------------- 7 files changed, 30 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0a64a81044bca1ae3f2…

1 0

Michael Stefaniuc : ntdsapi: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: b3a5662c49e54be9c5da9705b32af7f640684d66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3a5662c49e54be9c5da9705… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 11 22:05:24 2020 +0200 ntdsapi: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdsapi/ntdsapi.c | 3 +-- dlls/ntdsapi/tests/ntdsapi.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 8966a679ac..929b994484 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -130,10 +130,9 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, if (inst_port) { - static const WCHAR percentU[] = {'%','u',0}; *p = ':'; p++; - wsprintfW(p, percentU, inst_port); + wsprintfW(p, L"%u", inst_port); p += lstrlenW(p); } diff --git a/dlls/ntdsapi/tests/ntdsapi.c b/dlls/ntdsapi/tests/ntdsapi.c index b6dc1856a4..77dd675fc9 100644 --- a/dlls/ntdsapi/tests/ntdsapi.c +++ b/dlls/ntdsapi/tests/ntdsapi.c @@ -33,15 +33,15 @@ static void test_DsMakeSpn(void) DWORD ret; WCHAR spn[256]; DWORD spn_length; - static const WCHAR wszServiceClass[] = {'c','l','a','s','s',0}; - static const WCHAR wszServiceHost[] = {'h','o','s','t',0}; - static const WCHAR wszInstanceName[] = {'i','n','s','t','a','n','c','e',0}; - static const WCHAR wszReferrer[] = {'r','e','f','e','r','r','e','r',0}; - static const WCHAR wszSpn1[] = {'c','l','a','s','s','/','h','o','s','t',0}; - static const WCHAR wszSpn2[] = {'c','l','a','s','s','/','i','n','s','t','a','n','c','e','/','h','o','s','t',0}; - static const WCHAR wszSpn3[] = {'c','l','a','s','s','/','i','n','s','t','a','n','c','e',':','5','5','5','/','h','o','s','t',0}; - static const WCHAR wszSpn4[] = {'c','l','a','s','s','/','i','n','s','t','a','n','c','e',':','5','5','5','/','h','o','s','t',0}; - static const WCHAR wszSpn5[] = {'c','l','a','s','s','/','h','o','s','t',':','5','5','5',0}; + static const WCHAR wszServiceClass[] = L"class"; + static const WCHAR wszServiceHost[] = L"host"; + static const WCHAR wszInstanceName[] = L"instance"; + static const WCHAR wszReferrer[] = L"referrer"; + static const WCHAR wszSpn1[] = L"class/host"; + static const WCHAR wszSpn2[] = L"class/instance/host"; + static const WCHAR wszSpn3[] = L"class/instance:555/host"; + static const WCHAR wszSpn4[] = L"class/instance:555/host"; + static const WCHAR wszSpn5[] = L"class/host:555"; spn[0] = '\0'; @@ -86,9 +86,9 @@ static void test_DsMakeSpn(void) static void test_DsClientMakeSpnForTargetServer(void) { - static const WCHAR classW[] = {'c','l','a','s','s',0}; - static const WCHAR hostW[] = {'h','o','s','t','.','d','o','m','a','i','n',0}; - static const WCHAR resultW[] = {'c','l','a','s','s','/','h','o','s','t','.','d','o','m','a','i','n',0}; + static const WCHAR classW[] = L"class"; + static const WCHAR hostW[] = L"host.domain"; + static const WCHAR resultW[] = L"class/host.domain"; DWORD ret, len; WCHAR buf[256];

1 0

Michael Stefaniuc : write: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 48964553f0aa3d8e26679fff35ae3dee1c934244 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48964553f0aa3d8e26679fff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:48 2020 +0200 write: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/write/write.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/write/write.c b/programs/write/write.c index 4039af4398..1481e900f7 100644 --- a/programs/write/write.c +++ b/programs/write/write.c @@ -25,17 +25,15 @@ #include <windows.h> #include "resources.h" -static const WCHAR SZ_WORDPAD[] = {'\\','w','o','r','d','p','a','d','.','e','x','e',0}; - int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int res) { WCHAR path[MAX_PATH]; STARTUPINFOW stinf; PROCESS_INFORMATION info; - if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(SZ_WORDPAD))) + if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(L"\\wordpad.exe"))) goto failed; - lstrcatW(path, SZ_WORDPAD); + lstrcatW(path, L"\\wordpad.exe"); stinf.cb = sizeof(STARTUPINFOW); GetStartupInfoW(&stinf);

1 0

Michael Stefaniuc : spoolsv: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 3f20bf4119c931f5d844c22202d127e5c412200c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f20bf4119c931f5d844c222… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:51 2020 +0200 spoolsv: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/spoolsv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/spoolsv/main.c b/programs/spoolsv/main.c index 8fe37f2354..2893fa614a 100644 --- a/programs/spoolsv/main.c +++ b/programs/spoolsv/main.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); -static WCHAR spoolerW[] = {'S','p','o','o','l','e','r',0}; +static WCHAR spoolerW[] = L"Spooler"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event;

1 0

Alexandre Julliard : makefiles: List all possible targets in the stub makefiles.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: aabd2b54b2c538b74d2eb1026c7afdf2f910f253 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aabd2b54b2c538b74d2eb102… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 11 21:35:47 2020 +0200 makefiles: List all possible targets in the stub makefiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index df3805591e..2eed620b42 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4029,6 +4029,7 @@ static void output_stub_makefile( struct makefile *make ) } output_filenames( targets ); + output_filenames( make->clean_files ); output( ":\n" ); output( "\t(a)cd %s && $(MAKE) %s/$@\n", get_relative_path( make->obj_dir, "" ), make->obj_dir ); output( ".PHONY:" );

1 0

Julian Rüger : German translation for release 5.16.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: website Branch: master Commit: 29e7d8480ef2dcd729b7279e8cf95fae3ecd3f87 URL: https://source.winehq.org/git/website.git/?a=commit;h=29e7d8480ef2dcd729b72… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 12 11:07:09 2020 +0200 German translation for release 5.16. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020082801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2020082801.xml b/news/de/2020082801.xml new file mode 100644 index 00000000..a16488a1 --- /dev/null +++ b/news/de/2020082801.xml @@ -0,0 +1,15 @@ +<news> +<date>28. August 2020</date> +<title>Wine 5.16 freigegeben</title> +<body> + Die Entwicklungsversion 5.16 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.16">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von x86 AVX-Registern.</li> + <li>Einige ARM64-Korrekturen für macOS.</li> + <li>Weitere Restrukturierung der Konsolenunterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.16.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.17.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: website Branch: master Commit: 28864993d22d47b5db2c852db31128adf43809e5 URL: https://source.winehq.org/git/website.git/?a=commit;h=28864993d22d47b5db2c8… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 12 11:08:34 2020 +0200 German translation for release 5.17. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020091101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2020091101.xml b/news/de/2020091101.xml new file mode 100644 index 00000000..cb3e5d59 --- /dev/null +++ b/news/de/2020091101.xml @@ -0,0 +1,15 @@ +<news> +<date>11. September 2020</date> +<title>Wine 5.17 freigegeben</title> +<body> + Die Entwicklungsversion 5.17 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.17">Neuerungen (en)</a> in dieser Version: +<ul> + <li>ADVAPI32-Bibliothek nach PE konvertiert.</li> + <li>Anfänge eines NDIS-Netzwerktreibers.</li> + <li>Weitere Restrukturierung der Konsolenunterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.17.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.19.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: website Branch: master Commit: 4276e96426fe0743a617d6304fb6a0756d9190ac URL: https://source.winehq.org/git/website.git/?a=commit;h=4276e96426fe0743a617d… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 12 11:31:29 2020 +0200 German translation for release 5.19. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020100901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2020100901.xml b/news/de/2020100901.xml new file mode 100644 index 00000000..6eb8a4ba --- /dev/null +++ b/news/de/2020100901.xml @@ -0,0 +1,17 @@ +<news> +<date>9. Oktober 2020</date> +<title>Wine 5.19 freigegeben</title> +<body> + Die Entwicklungsversion 5.19 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.19">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Wine-Mono-Engine auf 5.1.1 aktualisiert, inkl. WPF-Textformatierungs-Unterstützung.</li> + <li>KERNEL32-Bibliothek nach PE konvertiert.</li> + <li>DSS-Kryptographieanbieter.</li> + <li>Fenstermodus-Unterstützung im neuen Konsolenhost.</li> + <li>Eine Anzahl an Ausnahmebehandlungs-Korrekturen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.19.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.18.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: website Branch: master Commit: ae3a9c7ed64c29347320b26f5200be0aa5efaff7 URL: https://source.winehq.org/git/website.git/?a=commit;h=ae3a9c7ed64c29347320b… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 12 11:27:19 2020 +0200 German translation for release 5.18. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020092501.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2020092501.xml b/news/de/2020092501.xml new file mode 100644 index 00000000..d1c73778 --- /dev/null +++ b/news/de/2020092501.xml @@ -0,0 +1,18 @@ +<news> +<date>25. September 2020</date> +<title>Wine 5.18 freigegeben</title> +<body> + Die Entwicklungsversion 5.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Vulkan-Shaderkompilation mit der neuen Vkd3d-Shader-Bibliothek.</li> + <li>USER32-Bibliothek nach PE konvertiert.</li> + <li>Die Konsole ist nicht länger auf die Curses-Bibliothek angewiesen.</li> + <li>Unterstützung von Anzeigemodi mit diversen Orientierungen.</li> + <li>Eine Anzahl an Syntaxkorrekturen im WIDL-Compiler.</li> + <li>Nicht-rekursive Makefiles.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.18.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for vkd3d 1.2.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: website Branch: master Commit: 710910ecf8b0112b6209352e526171b25ce97ed7 URL: https://source.winehq.org/git/website.git/?a=commit;h=710910ecf8b0112b62093… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 12 11:17:59 2020 +0200 German translation for vkd3d 1.2. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020092201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2020092201.xml b/news/de/2020092201.xml new file mode 100644 index 00000000..6f8a5a60 --- /dev/null +++ b/news/de/2020092201.xml @@ -0,0 +1,17 @@ +<news> +<date>22. September 2020</date> +<title>Vkd3d 1.2 freigegeben</title> +<body> +Das Wine-Team ist stolz, die Veröffentlichung von Vkd3d 1.2, der Direct3D-zu-Vulkan-Übersetzungsbibliothek, verkünden zu können. + +Dieses Release enthält Verbesserungen, die in den <a href="https://source.winehq.org/git/vkd3d.git/blob_plain/vkd3d-1.2:/ANNOUNCE">Release-Notes (en)</a> aufgeführt sind. +Die Höhepunkte lauten: +<ul> + <li>Verfügbarkeit von libvkd3d-shader als öffentliche Bibliothek.</li> + <li>Unterstützung von Tessellations-Shadern.</li> + <li>Version 1.1 Stammsignaturen.</li> + <li>Stream-Ausgabeunterstützung.</li> +</ul> + +Der Quelltext ist ab sofort <a href="https://dl.winehq.org/vkd3d/source/vkd3d-1.2.tar.xz">verfügbar</a>. +</body></news>

1 0

Zebediah Figura : vkd3d-shader: Don't allocate an initial buffer in vkd3d_string_buffer_init().
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: vkd3d Branch: master Commit: 5fb9bcdd148ed728d90a420f209cdfcc03af24ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5fb9bcdd148ed728d90a420… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 9 01:14:03 2020 -0500 vkd3d-shader: Don't allocate an initial buffer in vkd3d_string_buffer_init(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 6 ++---- libs/vkd3d-shader/trace.c | 6 +----- libs/vkd3d-shader/vkd3d_shader_main.c | 35 ++++++++++---------------------- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 4 files changed, 16 insertions(+), 35 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 3ddca1e..9977d1a 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2781,8 +2781,7 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, memset(root_signature, 0, sizeof(*root_signature)); if (messages) *messages = NULL; - if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) - return VKD3D_ERROR; + vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL); ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, rts0_handler, root_signature); vkd3d_shader_message_context_trace_messages(&message_context); @@ -3346,8 +3345,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro *messages = NULL; memset(&context, 0, sizeof(context)); - if (!vkd3d_shader_message_context_init(&context.message_context, VKD3D_SHADER_LOG_INFO, NULL)) - return VKD3D_ERROR; + vkd3d_shader_message_context_init(&context.message_context, VKD3D_SHADER_LOG_INFO, NULL); if (root_signature->version != VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0 && root_signature->version != VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_1) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index a510f3a..9b49ca1 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1579,11 +1579,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code enum vkd3d_result result = VKD3D_OK; void *code; - if (!vkd3d_string_buffer_init(&buffer)) - { - ERR("Failed to initialize string buffer.\n"); - return VKD3D_ERROR; - } + vkd3d_string_buffer_init(&buffer); shader_sm4_read_header(data, &ptr, &shader_version); shader_addline(&buffer, "%s_%u_%u\n", diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 8d33859..7c3885e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -23,23 +23,9 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); -static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) +void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) { - buffer->buffer[0] = '\0'; - buffer->content_size = 0; -} - -bool vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) -{ - buffer->buffer_size = 32; - if (!(buffer->buffer = vkd3d_malloc(buffer->buffer_size))) - { - ERR("Failed to allocate shader buffer memory.\n"); - return false; - } - - vkd3d_string_buffer_clear(buffer); - return true; + memset(buffer, 0, sizeof(*buffer)); } void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) @@ -52,6 +38,7 @@ static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int r unsigned int new_buffer_size = buffer->buffer_size * 2; char *new_buffer; + new_buffer_size = max(new_buffer_size, 32); while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) new_buffer_size *= 2; if (!(new_buffer = vkd3d_realloc(buffer->buffer, new_buffer_size))) @@ -71,6 +58,9 @@ int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char * va_list a; int rc; + if (!buffer->content_size && !vkd3d_string_buffer_resize(buffer, 32)) + return -1; + for (;;) { rem = buffer->buffer_size - buffer->content_size; @@ -118,7 +108,7 @@ static void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, } } -bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, +void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) { context->log_level = log_level; @@ -126,7 +116,7 @@ bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *cont context->line = 0; context->column = 0; - return vkd3d_string_buffer_init(&context->messages); + vkd3d_string_buffer_init(&context->messages); } void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) @@ -845,8 +835,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) return ret; - if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name)) - return VKD3D_ERROR_OUT_OF_MEMORY; + vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); ret = scan_dxbc(compile_info, &message_context); @@ -947,8 +936,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) return ret; - if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name)) - return VKD3D_ERROR; + vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); switch (compile_info->source_type) { @@ -1050,8 +1038,7 @@ int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, if (messages) *messages = NULL; - if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) - return VKD3D_ERROR; + vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL); ret = shader_parse_input_signature(dxbc->code, dxbc->size, &message_context, signature); vkd3d_shader_message_context_trace_messages(&message_context); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 98b5fbc..5ae5724 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -836,7 +836,7 @@ struct vkd3d_string_buffer enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; -bool vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args) DECLSPEC_HIDDEN; struct vkd3d_shader_message_context @@ -850,7 +850,7 @@ struct vkd3d_shader_message_context void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, char **out) DECLSPEC_HIDDEN; -bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, +void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) DECLSPEC_HIDDEN; void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, const char *function) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : vkd3d-shader: Pass the output pointer to vkd3d_shader_message_context_copy_messages().
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: vkd3d Branch: master Commit: 0072fb213a9b4ee7647b68db760a5b27d89e2abd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0072fb213a9b4ee7647b68d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 9 01:14:01 2020 -0500 vkd3d-shader: Pass the output pointer to vkd3d_shader_message_context_copy_messages(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_main.c | 20 +++++++++++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 93e7eaf..3ddca1e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2786,7 +2786,7 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, rts0_handler, root_signature); vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); @@ -3390,7 +3390,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro done: vkd3d_shader_message_context_trace_messages(&context.message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&context.message_context))) + if (!vkd3d_shader_message_context_copy_messages(&context.message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&context.message_context); return ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index c2fe2c8..d3d86ed 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -140,14 +140,20 @@ void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_mess vkd3d_string_buffer_trace_(&context->messages, function); } -char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) +bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, char **out) { char *messages; - if ((messages = vkd3d_malloc(context->messages.content_size + 1))) - memcpy(messages, context->messages.buffer, context->messages.content_size + 1); + if (!out) + return true; - return messages; + *out = NULL; + + if (!(messages = vkd3d_malloc(context->messages.content_size + 1))) + return false; + memcpy(messages, context->messages.buffer, context->messages.content_size + 1); + *out = messages; + return true; } void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, @@ -842,7 +848,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char ret = scan_dxbc(compile_info, &message_context); vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); return ret; @@ -956,7 +962,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, } vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); return ret; @@ -1046,7 +1052,7 @@ int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, ret = shader_parse_input_signature(dxbc->code, dxbc->size, &message_context, signature); vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f88ea69..98b5fbc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -848,7 +848,8 @@ struct vkd3d_shader_message_context }; void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; -char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; +bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, + char **out) DECLSPEC_HIDDEN; bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) DECLSPEC_HIDDEN; void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context,

1 0

Zebediah Figura : vkd3d-shader: Return NULL from vkd3d_shader_message_context_copy_messages() if there are no messages to copy.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: vkd3d Branch: master Commit: 05cf9a54043eb5138ac503ef205427458435760f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=05cf9a54043eb5138ac503e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 9 01:14:02 2020 -0500 vkd3d-shader: Return NULL from vkd3d_shader_message_context_copy_messages() if there are no messages to copy. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 3 +++ tests/shader_runner_d3d12.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index d3d86ed..8d33859 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -149,6 +149,9 @@ bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_cont *out = NULL; + if (!context->messages.content_size) + return true; + if (!(messages = vkd3d_malloc(context->messages.content_size + 1))) return false; memcpy(messages, context->messages.buffer, context->messages.content_size + 1); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index df7076c..787e90a 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -335,6 +335,8 @@ START_TEST(shader_runner_d3d12) ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ok(!blob, "Expected no compiled shader blob.\n"); ok(!!errors, "Expected non-NULL error blob.\n"); + if (!errors) + return; if (vkd3d_test_state.debug_level) trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors));

1 0

Alexandre Julliard : Wine release 5.19
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: website Branch: master Commit: 2bcb1bd8dba0ffb1e6adbfe2253981df902b3568 URL: https://source.winehq.org/git/website.git/?a=commit;h=2bcb1bd8dba0ffb1e6adb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 9 23:01:02 2020 +0200 Wine release 5.19 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020100901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2020100901.xml b/news/en/2020100901.xml new file mode 100644 index 00000000..75cd37b3 --- /dev/null +++ b/news/en/2020100901.xml @@ -0,0 +1,17 @@ +<news> +<date>October 9, 2020</date> +<title>Wine 5.19 Released</title> +<body> + The Wine development release 5.19 is now available. + <a href="{$root}/announce/5.19">What's new</a> in this release: +<ul> + <li>Wine Mono engine updated to 5.1.1, with WPF text formatting support.</li> + <li>KERNEL32 library converted to PE.</li> + <li>DSS cryptographic provider.</li> + <li>Windowing support in the new console host.</li> + <li>A number of exception handling fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.19.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 5.19.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: f7d815089580cebe2682683345272858def6358c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7d815089580cebe26826833… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 9 22:59:08 2020 +0200 Release 5.19. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 886 +++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 505 insertions(+), 401 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f7d815089580cebe2682…

1 0

Jacek Caban : conhost: Import menu handling from wineconsole.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 83b52b19b5324adf8782cb3b1fd23c9bbe86c8aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=83b52b19b5324adf8782cb3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:28:12 2020 +0200 conhost: Import menu handling from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index a36f0469b9..8ab639f329 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1011,6 +1011,44 @@ static void copy_selection( struct console *console ) CloseClipboard(); } +static void paste_clipboard( struct console *console ) +{ + WCHAR *ptr; + HANDLE h; + + if (!OpenClipboard( console->win )) return; + h = GetClipboardData( CF_UNICODETEXT ); + if (h && (ptr = GlobalLock( h ))) + { + unsigned int i, len = GlobalSize(h) / sizeof(WCHAR); + INPUT_RECORD ir[2]; + SHORT sh; + + ir[0].EventType = KEY_EVENT; + ir[0].Event.KeyEvent.wRepeatCount = 0; + ir[0].Event.KeyEvent.dwControlKeyState = 0; + ir[0].Event.KeyEvent.bKeyDown = TRUE; + + /* generate the corresponding input records */ + for (i = 0; i < len; i++) + { + /* FIXME: the modifying keys are not generated (shift, ctrl...) */ + sh = VkKeyScanW( ptr[i] ); + ir[0].Event.KeyEvent.wVirtualKeyCode = LOBYTE(sh); + ir[0].Event.KeyEvent.wVirtualScanCode = MapVirtualKeyW( LOBYTE(sh), 0 ); + ir[0].Event.KeyEvent.uChar.UnicodeChar = ptr[i]; + + ir[1] = ir[0]; + ir[1].Event.KeyEvent.bKeyDown = FALSE; + + write_console_input( console, ir, 2, i == len - 1 ); + } + GlobalUnlock( h ); + } + + CloseClipboard(); +} + /* handle keys while selecting an area */ static void handle_selection_key( struct console *console, BOOL down, WPARAM wparam, LPARAM lparam ) { @@ -2256,6 +2294,53 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp } break; + case WM_COMMAND: + switch (wparam) + { + case IDS_DEFAULT: + config_dialog( console, FALSE ); + break; + case IDS_PROPERTIES: + config_dialog( console, TRUE ); + break; + case IDS_MARK: + console->window->selection_start.X = console->window->selection_start.Y = 0; + console->window->selection_end.X = console->window->selection_end.Y = 0; + update_selection( console, 0 ); + console->window->in_selection = TRUE; + break; + case IDS_COPY: + if (console->window->in_selection) + { + console->window->in_selection = FALSE; + update_selection( console, 0 ); + copy_selection( console ); + } + break; + case IDS_PASTE: + paste_clipboard( console ); + break; + case IDS_SELECTALL: + console->window->selection_start.X = console->window->selection_start.Y = 0; + console->window->selection_end.X = console->active->width - 1; + console->window->selection_end.Y = console->active->height - 1; + update_selection( console, 0 ); + console->window->in_selection = TRUE; + break; + case IDS_SCROLL: + case IDS_SEARCH: + FIXME( "Unhandled yet command: %lx\n", wparam ); + break; + default: + return DefWindowProcW( hwnd, msg, wparam, lparam ); + } + break; + + case WM_INITMENUPOPUP: + if (!HIWORD(lparam)) return DefWindowProcW( hwnd, msg, wparam, lparam ); + set_menu_details( console, GetSystemMenu(console->win, FALSE) ); + break; + default: return DefWindowProcW( hwnd, msg, wparam, lparam ); }

1 0

Jacek Caban : conhost: Import config dialog from wineconsole.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 627ae12d2de39695d244aead531a91d1a5fbf79d URL: https://source.winehq.org/git/wine.git/?a=commit;h=627ae12d2de39695d244aead… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:28:04 2020 +0200 conhost: Import config dialog from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 348 +++++++++--------- po/ast.po | 328 ++++++++--------- po/bg.po | 348 +++++++++--------- po/ca.po | 328 ++++++++--------- po/cs.po | 328 ++++++++--------- po/da.po | 348 +++++++++--------- po/de.po | 328 ++++++++--------- po/el.po | 344 +++++++++--------- po/en.po | 328 ++++++++--------- po/en_US.po | 328 ++++++++--------- po/eo.po | 348 +++++++++--------- po/es.po | 348 +++++++++--------- po/fa.po | 340 ++++++++--------- po/fi.po | 328 ++++++++--------- po/fr.po | 328 ++++++++--------- po/he.po | 358 +++++++++--------- po/hi.po | 330 ++++++++--------- po/hr.po | 348 +++++++++--------- po/hu.po | 348 +++++++++--------- po/it.po | 348 +++++++++--------- po/ja.po | 328 ++++++++--------- po/ko.po | 328 ++++++++--------- po/lt.po | 328 ++++++++--------- po/ml.po | 330 ++++++++--------- po/nb_NO.po | 328 ++++++++--------- po/nl.po | 348 +++++++++--------- po/or.po | 330 ++++++++--------- po/pa.po | 330 ++++++++--------- po/pl.po | 328 ++++++++--------- po/pt_BR.po | 328 ++++++++--------- po/pt_PT.po | 328 ++++++++--------- po/rm.po | 334 ++++++++--------- po/ro.po | 328 ++++++++--------- po/ru.po | 328 ++++++++--------- po/si.po | 328 ++++++++--------- po/sk.po | 344 +++++++++--------- po/sl.po | 348 +++++++++--------- po/sr_RS(a)cyrillic.po | 362 +++++++++--------- po/sr_RS(a)latin.po | 374 +++++++++---------- po/sv.po | 328 ++++++++--------- po/ta.po | 328 ++++++++--------- po/te.po | 330 ++++++++--------- po/th.po | 342 ++++++++--------- po/tr.po | 328 ++++++++--------- po/uk.po | 328 ++++++++--------- po/wa.po | 346 +++++++++--------- po/wine.pot | 328 ++++++++--------- po/zh_CN.po | 328 ++++++++--------- po/zh_TW.po | 348 +++++++++--------- programs/conhost/Makefile.in | 1 + programs/conhost/conhost.h | 39 ++ programs/conhost/conhost.rc | 82 +++++ programs/conhost/window.c | 849 +++++++++++++++++++++++++++++++++++++++++++ 53 files changed, 9267 insertions(+), 8198 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=627ae12d2de39695d244…

1 0

Tag wine-5.19 : Alexandre Julliard : Release 5.19
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: refs/tags/wine-5.19 Tag: 6467cd3f3a97132b4888a1aa28f8b5752f9d0718 URL: https://source.winehq.org/git/wine.git/?a=tag;h=6467cd3f3a97132b4888a1aa28f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 9 22:59:08 2020 +0200 Release 5.19

1 0

Jacek Caban : conhost: Import mouse event handling from wineconsole.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 91be31b28ad5ae4852d2cc3cc3bcfc3e2ee01895 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91be31b28ad5ae4852d2cc3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:27:48 2020 +0200 conhost: Import mouse event handling from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 863d3e6ee1..b4891fb67d 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -840,6 +840,15 @@ static void update_console_font( struct console *console, const WCHAR *font, ERR( "Couldn't find a decent font" ); } +/* get a cell from a relative coordinate in window (takes into account the scrolling) */ +static COORD get_cell( struct console *console, LPARAM lparam ) +{ + COORD c; + c.X = console->active->win.left + (short)LOWORD(lparam) / console->active->font.width; + c.Y = console->active->win.left + (short)HIWORD(lparam) / console->active->font.height; + return c; +} + /* get the console bit mask equivalent to the VK_ status in key state */ static DWORD get_ctrl_state( BYTE *key_state) { @@ -1091,6 +1100,29 @@ static void record_key_input( struct console *console, BOOL down, WPARAM wparam, write_console_input( console, &ir, 1, TRUE ); } +static void record_mouse_input( struct console *console, COORD c, WPARAM wparam, DWORD event ) +{ + BYTE key_state[256]; + INPUT_RECORD ir; + + /* MOUSE_EVENTs shouldn't be sent unless ENABLE_MOUSE_INPUT is active */ + if (!(console->mode & ENABLE_MOUSE_INPUT)) return; + + ir.EventType = MOUSE_EVENT; + ir.Event.MouseEvent.dwMousePosition = c; + ir.Event.MouseEvent.dwButtonState = 0; + if (wparam & MK_LBUTTON) ir.Event.MouseEvent.dwButtonState |= FROM_LEFT_1ST_BUTTON_PRESSED; + if (wparam & MK_MBUTTON) ir.Event.MouseEvent.dwButtonState |= FROM_LEFT_2ND_BUTTON_PRESSED; + if (wparam & MK_RBUTTON) ir.Event.MouseEvent.dwButtonState |= RIGHTMOST_BUTTON_PRESSED; + if (wparam & MK_CONTROL) ir.Event.MouseEvent.dwButtonState |= LEFT_CTRL_PRESSED; + if (wparam & MK_SHIFT) ir.Event.MouseEvent.dwButtonState |= SHIFT_PRESSED; + if (event == MOUSE_WHEELED) ir.Event.MouseEvent.dwButtonState |= wparam & 0xFFFF0000; + ir.Event.MouseEvent.dwControlKeyState = get_ctrl_state( key_state ); + ir.Event.MouseEvent.dwEventFlags = event; + + write_console_input( console, &ir, 1, TRUE ); +} + static void apply_config( struct console *console, const struct console_config *config ) { if (console->active->width != config->sb_width || console->active->height != config->sb_height) @@ -1157,6 +1189,17 @@ static void apply_config( struct console *console, const struct console_config * update_window( console ); } +/* grays / ungrays the menu items according to their state */ +static void set_menu_details( struct console *console, HMENU menu ) +{ + EnableMenuItem( menu, IDS_COPY, MF_BYCOMMAND | + (console->window->in_selection ? MF_ENABLED : MF_GRAYED) ); + EnableMenuItem( menu, IDS_PASTE, MF_BYCOMMAND | + (IsClipboardFormatAvailable(CF_UNICODETEXT) ? MF_ENABLED : MF_GRAYED) ); + EnableMenuItem( menu, IDS_SCROLL, MF_BYCOMMAND | MF_GRAYED ); + EnableMenuItem( menu, IDS_SEARCH, MF_BYCOMMAND | MF_GRAYED ); +} + static BOOL fill_menu( HMENU menu, BOOL sep ) { HINSTANCE module = GetModuleHandleW( NULL ); @@ -1244,6 +1287,7 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp console->active->win.left * console->active->font.width, console->active->win.top * console->active->font.height, SRCCOPY ); + if (console->window->in_selection) update_selection( console, ps.hdc ); EndPaint( console->win, &ps ); break; } @@ -1261,6 +1305,108 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp record_key_input( console, msg == WM_SYSKEYDOWN, wparam, lparam ); break; + case WM_LBUTTONDOWN: + if (console->window->quick_edit || console->window->in_selection) + { + if (console->window->in_selection) + update_selection( console, 0 ); + + if (console->window->quick_edit && console->window->in_selection) + { + console->window->in_selection = FALSE; + } + else + { + console->window->selection_end = get_cell( console, lparam ); + console->window->selection_start = console->window->selection_end; + SetCapture( console->win ); + update_selection( console, 0 ); + console->window->in_selection = TRUE; + } + } + else + { + record_mouse_input( console, get_cell(console, lparam), wparam, 0 ); + } + break; + + case WM_MOUSEMOVE: + if (console->window->quick_edit || console->window->in_selection) + { + if (GetCapture() == console->win && console->window->in_selection && + (wparam & MK_LBUTTON)) + { + move_selection( console, console->window->selection_start, + get_cell(console, lparam) ); + } + } + else + { + record_mouse_input( console, get_cell(console, lparam), wparam, MOUSE_MOVED ); + } + break; + + case WM_LBUTTONUP: + if (console->window->quick_edit || console->window->in_selection) + { + if (GetCapture() == console->win && console->window->in_selection) + { + move_selection( console, console->window->selection_start, + get_cell(console, lparam) ); + ReleaseCapture(); + } + } + else + { + record_mouse_input( console, get_cell(console, lparam), wparam, 0 ); + } + break; + + case WM_RBUTTONDOWN: + if ((wparam & (MK_CONTROL|MK_SHIFT)) == console->window->menu_mask) + { + POINT pt; + pt.x = (short)LOWORD(lparam); + pt.y = (short)HIWORD(lparam); + ClientToScreen( hwnd, &pt ); + set_menu_details( console, console->window->popup_menu ); + TrackPopupMenu( console->window->popup_menu, TPM_LEFTALIGN|TPM_TOPALIGN|TPM_RIGHTBUTTON, + pt.x, pt.y, 0, hwnd, NULL ); + } + else + { + record_mouse_input( console, get_cell(console, lparam), wparam, 0 ); + } + break; + + case WM_RBUTTONUP: + /* no need to track for rbutton up when opening the popup... the event will be + * swallowed by TrackPopupMenu */ + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + record_mouse_input( console, get_cell(console, lparam), wparam, 0 ); + break; + + case WM_LBUTTONDBLCLK: + case WM_MBUTTONDBLCLK: + case WM_RBUTTONDBLCLK: + record_mouse_input( console, get_cell(console, lparam), wparam, DOUBLE_CLICK ); + break; + + case WM_SETFOCUS: + if (console->active->cursor_visible) + { + CreateCaret( console->win, console->window->cursor_bitmap, + console->active->font.width, console->active->font.height ); + update_window_cursor( console ); + } + break; + + case WM_KILLFOCUS: + if (console->active->cursor_visible) + DestroyCaret(); + break; + default: return DefWindowProcW( hwnd, msg, wparam, lparam ); }

1 0

Jacek Caban : conhost: Import keyboard event handling from wineconsole.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 7148521305b161129c43b806d83c9a46aa42cbca URL: https://source.winehq.org/git/wine.git/?a=commit;h=7148521305b161129c43b806… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:27:39 2020 +0200 conhost: Import keyboard event handling from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 4 +- programs/conhost/conhost.h | 2 + programs/conhost/window.c | 267 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 271 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7148521305b161129c43…

1 0

Jacek Caban : conhost: Import menus from wineconsole.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 6323e36f0f1b85180314027f84cb3c37140bcb70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6323e36f0f1b85180314027f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:27:29 2020 +0200 conhost: Import menus from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 118 +++++++++++++++++++------------------- po/ast.po | 114 +++++++++++++++++++------------------ po/bg.po | 120 ++++++++++++++++++++------------------- po/ca.po | 118 +++++++++++++++++++------------------- po/cs.po | 118 +++++++++++++++++++------------------- po/da.po | 118 +++++++++++++++++++------------------- po/de.po | 116 +++++++++++++++++++------------------- po/el.po | 118 +++++++++++++++++++------------------- po/en.po | 118 +++++++++++++++++++------------------- po/en_US.po | 118 +++++++++++++++++++------------------- po/eo.po | 120 ++++++++++++++++++++------------------- po/es.po | 122 ++++++++++++++++++++-------------------- po/fa.po | 118 +++++++++++++++++++------------------- po/fi.po | 114 +++++++++++++++++++------------------ po/fr.po | 118 +++++++++++++++++++------------------- po/he.po | 120 ++++++++++++++++++++------------------- po/hi.po | 114 +++++++++++++++++++------------------ po/hr.po | 114 +++++++++++++++++++------------------ po/hu.po | 120 ++++++++++++++++++++------------------- po/it.po | 122 ++++++++++++++++++++-------------------- po/ja.po | 114 +++++++++++++++++++------------------ po/ko.po | 114 +++++++++++++++++++------------------ po/lt.po | 116 +++++++++++++++++++------------------- po/ml.po | 114 +++++++++++++++++++------------------ po/nb_NO.po | 116 +++++++++++++++++++------------------- po/nl.po | 118 +++++++++++++++++++------------------- po/or.po | 114 +++++++++++++++++++------------------ po/pa.po | 114 +++++++++++++++++++------------------ po/pl.po | 114 +++++++++++++++++++------------------ po/pt_BR.po | 114 +++++++++++++++++++------------------ po/pt_PT.po | 116 +++++++++++++++++++------------------- po/rm.po | 114 +++++++++++++++++++------------------ po/ro.po | 118 +++++++++++++++++++------------------- po/ru.po | 114 +++++++++++++++++++------------------ po/si.po | 114 +++++++++++++++++++------------------ po/sk.po | 114 +++++++++++++++++++------------------ po/sl.po | 118 +++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 124 ++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 134 ++++++++++++++++++++++---------------------- po/sv.po | 118 +++++++++++++++++++------------------- po/ta.po | 114 +++++++++++++++++++------------------ po/te.po | 114 +++++++++++++++++++------------------ po/th.po | 118 +++++++++++++++++++------------------- po/tr.po | 114 +++++++++++++++++++------------------ po/uk.po | 114 +++++++++++++++++++------------------ po/wa.po | 118 +++++++++++++++++++------------------- po/wine.pot | 114 +++++++++++++++++++------------------ po/zh_CN.po | 114 +++++++++++++++++++------------------ po/zh_TW.po | 118 +++++++++++++++++++------------------- programs/conhost/conhost.h | 21 +++++++ programs/conhost/conhost.rc | 30 ++++++++++ programs/conhost/window.c | 45 +++++++++++++++ 52 files changed, 3009 insertions(+), 2815 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6323e36f0f1b85180314…

1 0

Owen Rudge : wsdapi/tests: Use wide character string literals.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 0c723b7dec7269118236eb20a8922d5e0672ba46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c723b7dec7269118236eb20… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Oct 1 13:13:57 2020 +0100 wsdapi/tests: Use wide character string literals. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/address.c | 25 ++++------ dlls/wsdapi/tests/discovery.c | 98 ++++++++++++-------------------------- dlls/wsdapi/tests/msgparams.c | 6 +-- dlls/wsdapi/tests/xml.c | 106 ++++++++++++++++++------------------------ 4 files changed, 84 insertions(+), 151 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c723b7dec7269118236…

1 0

Owen Rudge : wsdapi: Use wide character string literals.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 683cdf558fe003bfb13061279a5698cd3d8165f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=683cdf558fe003bfb1306127… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Oct 1 13:13:54 2020 +0100 wsdapi: Use wide character string literals. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 137 ++++++++++++++++------------------------------------- dlls/wsdapi/xml.c | 3 +- 2 files changed, 43 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=683cdf558fe003bfb130…

1 0

Zhiyi Zhang : dxgi: Support Alt+Enter for d3d12 swapchains.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: e62b6fa12d33b7d8c79f7ed97c5025afb7c9a634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e62b6fa12d33b7d8c79f7ed9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 9 17:56:42 2020 +0800 dxgi: Support Alt+Enter for d3d12 swapchains. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 32 +++++++++++--- dlls/dxgi/tests/dxgi.c | 1 - dlls/dxgi/utils.c | 2 +- dlls/wined3d/swapchain.c | 19 ++++---- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 99 ++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 5 ++- include/wine/wined3d.h | 4 +- 8 files changed, 95 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e62b6fa12d33b7d8c79f…

1 0

Huw Davies : riched20: Use ME_Paragraph ptrs in a few of the table functions.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 1bda5913fcc709f3500ac29fcbedf0ac9fae5cd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bda5913fcc709f3500ac29f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 12:59:22 2020 +0100 riched20: Use ME_Paragraph ptrs in a few of the table functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 6 +++--- dlls/riched20/editor.h | 8 ++++--- dlls/riched20/paint.c | 4 ++-- dlls/riched20/para.c | 13 ++++++++++++ dlls/riched20/table.c | 57 ++++++++++++++++++++++---------------------------- dlls/riched20/wrap.c | 9 ++++---- dlls/riched20/writer.c | 4 ++-- 7 files changed, 54 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1bda5913fcc709f3500a…

1 0

Huw Davies : riched20: Move the marked paragraph list to a rbtree.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: b466eefbdfffb0b86a394c6568c8f0b4c5d4f520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b466eefbdfffb0b86a394c65… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 12:59:20 2020 +0100 riched20: Move the marked paragraph list to a rbtree. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 1 - dlls/riched20/editstr.h | 5 ++-- dlls/riched20/para.c | 73 +++++++------------------------------------------ dlls/riched20/wrap.c | 39 ++++++++++---------------- 4 files changed, 28 insertions(+), 90 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2fb7e3650d..e7e33c2758 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3062,7 +3062,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->bEmulateVersion10 = bEmulateVersion10; ed->styleFlags = 0; ed->exStyleFlags = 0; - ed->first_marked_para = NULL; ed->total_rows = 0; ITextHost_TxGetPropertyBits(texthost, (TXTBIT_RICHTEXT|TXTBIT_MULTILINE| diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 2c5737f3e9..fd5c9bc3df 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -47,6 +47,7 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" +#include "wine/rbtree.h" #ifdef __ASM_USE_THISCALL_WRAPPER extern const struct ITextHostVtbl itextHostStdcallVtbl DECLSPEC_HIDDEN; @@ -216,7 +217,7 @@ typedef struct tagME_Paragraph struct para_num para_num; ME_Run *eop_run; /* ptr to the end-of-para run */ struct tagME_DisplayItem *prev_para, *next_para; - struct tagME_DisplayItem *prev_marked, *next_marked; + struct wine_rb_entry marked_entry; } ME_Paragraph; typedef struct tagME_Cell /* v4.1 */ @@ -431,7 +432,6 @@ typedef struct tagME_TextEditor int imeStartIndex; DWORD selofs; /* The size of the selection bar on the left side of control */ ME_SelectionType nSelectionType; - ME_DisplayItem *first_marked_para; /* Track previous notified selection */ CHARRANGE notified_cr; @@ -445,6 +445,7 @@ typedef struct tagME_TextEditor int wheel_remain; struct list style_list; struct list reobj_list; + struct wine_rb_tree marked_paras; } ME_TextEditor; typedef struct tagME_Context diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 9d8693ed41..58dcfc8e71 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -35,7 +35,6 @@ static ME_DisplayItem *make_para(ME_TextEditor *editor) ME_SetDefaultParaFormat(editor, &item->member.para.fmt); item->member.para.nFlags = MEPF_REWRAP; - item->member.para.next_marked = item->member.para.prev_marked = NULL; return item; } @@ -74,74 +73,21 @@ int get_total_width(ME_TextEditor *editor) return total_width; } -void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) +static int para_mark_compare( const void *key, const struct wine_rb_entry *entry ) { - ME_DisplayItem *di = para_get_di( para ); - ME_DisplayItem *head = editor->first_marked_para; + ME_Paragraph *para = WINE_RB_ENTRY_VALUE( entry, ME_Paragraph, marked_entry ); - if (!di->member.para.next_marked && !di->member.para.prev_marked) - { - if (di == head) - editor->first_marked_para = NULL; - } - else if (di->member.para.next_marked && di->member.para.prev_marked) - { - di->member.para.prev_marked->member.para.next_marked = di->member.para.next_marked; - di->member.para.next_marked->member.para.prev_marked = di->member.para.prev_marked; - di->member.para.prev_marked = di->member.para.next_marked = NULL; - } - else if (di->member.para.next_marked) - { - assert(di == editor->first_marked_para); - editor->first_marked_para = di->member.para.next_marked; - di->member.para.next_marked->member.para.prev_marked = NULL; - di->member.para.next_marked = NULL; - } - else - { - di->member.para.prev_marked->member.para.next_marked = NULL; - di->member.para.prev_marked = NULL; - } + return *(int *)key - para->nCharOfs; } -void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) +void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) { - ME_DisplayItem *di = para_get_di( para ); - ME_DisplayItem *iter = editor->first_marked_para; + wine_rb_remove_key( &editor->marked_paras, &para->nCharOfs ); +} - if (!iter) - { - editor->first_marked_para = di; - return; - } - while (iter) - { - if (iter == di) - return; - else if (di->member.para.nCharOfs < iter->member.para.nCharOfs) - { - if (iter == editor->first_marked_para) - editor->first_marked_para = di; - di->member.para.next_marked = iter; - iter->member.para.prev_marked = di; - break; - } - else if (di->member.para.nCharOfs >= iter->member.para.nCharOfs) - { - if (!iter->member.para.next_marked || di->member.para.nCharOfs < iter->member.para.next_marked->member.para.nCharOfs) - { - if (iter->member.para.next_marked) - { - di->member.para.next_marked = iter->member.para.next_marked; - iter->member.para.next_marked->member.para.prev_marked = di; - } - di->member.para.prev_marked = iter; - iter->member.para.next_marked = di; - break; - } - } - iter = iter->member.para.next_marked; - } +void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) +{ + wine_rb_put( &editor->marked_paras, &para->nCharOfs, &para->marked_entry ); } ME_Run *para_first_run( ME_Paragraph *para ) @@ -229,6 +175,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) text->pLast->member.para.nCharOfs = editor->bEmulateVersion10 ? 2 : 1; + wine_rb_init( &editor->marked_paras, para_mark_compare ); para_mark_add( editor, &para->member.para ); ME_DestroyContext(&c); } diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index cb17f2963b..819915d4c0 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1029,19 +1029,22 @@ static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *rep BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_Paragraph *para, *next; + struct wine_rb_entry *entry, *next_entry; ME_Context c; - int totalWidth = editor->nTotalWidth, diff = 0, prev_width; + int totalWidth = editor->nTotalWidth, prev_width; ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; - if (!editor->first_marked_para) - return FALSE; + if (!editor->marked_paras.root) return FALSE; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - para = &editor->first_marked_para->member.para; - c.pt = para->pt; - while (para_get_di( para ) != editor->pBuffer->pLast) + entry = wine_rb_head( editor->marked_paras.root ); + while (entry) { + para = WINE_RB_ENTRY_VALUE( entry, ME_Paragraph, marked_entry ); + next_entry = wine_rb_next( entry ); + + c.pt = para->pt; prev_width = para->nWidth; ME_WrapTextParagraph( editor, &c, para ); if (prev_width == totalWidth && para->nWidth < totalWidth) @@ -1056,11 +1059,10 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) if (para->next_para) { - diff = c.pt.y - para->next_para->member.para.pt.y; - if (diff) + if (c.pt.y != para->next_para->member.para.pt.y) { next = para; - while (next->next_para && next != &para->next_marked->member.para && + while (next->next_para && &next->marked_entry != next_entry && next != &editor->pBuffer->pLast->member.para) { ME_MarkRepaintEnd(next->next_para, &repaint_start, &repaint_end); @@ -1070,26 +1072,15 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) } } } - if (para->next_marked) - { - ME_Paragraph *tmp = para; - para = &para->next_marked->member.para; - para_mark_remove( editor, tmp ); - } - else - { - para_mark_remove( editor, para ); - para = &editor->pBuffer->pLast->member.para; - } - c.pt.y = para->pt.y; + entry = next_entry; } + wine_rb_clear( &editor->marked_paras, NULL, NULL ); + editor->sizeWindow.cx = c.rcView.right-c.rcView.left; editor->sizeWindow.cy = c.rcView.bottom-c.rcView.top; - editor->nTotalLength = c.pt.y; + editor->nTotalLength = editor->pBuffer->pLast->member.para.pt.y; editor->nTotalWidth = totalWidth; - editor->pBuffer->pLast->member.para.pt.x = 0; - editor->pBuffer->pLast->member.para.pt.y = c.pt.y; ME_DestroyContext(&c);

1 0

Huw Davies : riched20: Use ME_Paragraph ptrs to iterate in WrapMarkedParagraphs().
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 3a1aaf2655bf5d984b8998e554f418748f8aff0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a1aaf2655bf5d984b8998e5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 12:59:19 2020 +0100 riched20: Use ME_Paragraph ptrs to iterate in WrapMarkedParagraphs(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 98 +++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 51 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index c0c9c8f07e..cb17f2963b 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -913,11 +913,11 @@ static void ME_MarkRepaintEnd(ME_DisplayItem *para, *repaint_end = para; } -static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *repaint_start, ME_DisplayItem *repaint_end) +static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *repaint_start, ME_DisplayItem *repaint_end) { - if (item->member.para.nFlags & MEPF_ROWSTART) + if (para->nFlags & MEPF_ROWSTART) { - ME_DisplayItem *cell = ME_FindItemFwd(item, diCell); + ME_DisplayItem *cell = ME_FindItemFwd( para_get_di( para ), diCell); ME_DisplayItem *endRowPara; int borderWidth = 0; cell->member.cell.pt = c->pt; @@ -942,19 +942,19 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r if (endRowPara->member.para.fmt.dxStartIndent > 0) { int dxStartIndent = endRowPara->member.para.fmt.dxStartIndent; - cell = ME_FindItemFwd(item, diCell); + cell = ME_FindItemFwd( para_get_di( para ), diCell); cell->member.cell.pt.x += ME_twips2pointsX(c, dxStartIndent); c->pt.x = cell->member.cell.pt.x; } } - else if (item->member.para.nFlags & MEPF_ROWEND) + else if (para->nFlags & MEPF_ROWEND) { /* Set all the cells to the height of the largest cell */ ME_DisplayItem *startRowPara; int prevHeight, nHeight, bottomBorder = 0; - ME_DisplayItem *cell = ME_FindItemBack(item, diCell); - item->member.para.nWidth = cell->member.cell.pt.x + cell->member.cell.nWidth; - if (!(item->member.para.next_para->member.para.nFlags & MEPF_ROWSTART)) + ME_DisplayItem *cell = ME_FindItemBack( para_get_di( para ), diCell ); + para->nWidth = cell->member.cell.pt.x + cell->member.cell.nWidth; + if (!(para->next_para->member.para.nFlags & MEPF_ROWSTART)) { /* Last row, the bottom border is added to the height. */ cell = cell->member.cell.prev_cell; @@ -964,12 +964,12 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r cell = cell->member.cell.prev_cell; } bottomBorder = ME_twips2pointsY(c, bottomBorder); - cell = ME_FindItemBack(item, diCell); + cell = ME_FindItemBack( para_get_di( para ), diCell ); } prevHeight = cell->member.cell.nHeight; nHeight = cell->member.cell.prev_cell->member.cell.nHeight + bottomBorder; cell->member.cell.nHeight = nHeight; - item->member.para.nHeight = nHeight; + para->nHeight = nHeight; cell = cell->member.cell.prev_cell; cell->member.cell.nHeight = nHeight; while (cell->member.cell.prev_cell) @@ -986,8 +986,8 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r { /* The height of the cells has grown, so invalidate the bottom of * the cells. */ - ME_MarkRepaintEnd(item, &repaint_start, &repaint_end); - cell = ME_FindItemBack(item, diCell); + ME_MarkRepaintEnd( para_get_di( para ) , &repaint_start, &repaint_end ); + cell = ME_FindItemBack( para_get_di( para ), diCell ); while (cell) { ME_MarkRepaintEnd(ME_FindItemBack(cell, diParagraph), &repaint_start, &repaint_end); @@ -995,12 +995,11 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r } } } - else if (item->member.para.pCell && - item->member.para.pCell != item->member.para.next_para->member.para.pCell) + else if (para->pCell && para->pCell != para->next_para->member.para.pCell) { /* The next paragraph is in the next cell in the table row. */ - ME_Cell *cell = &item->member.para.pCell->member.cell; - cell->nHeight = c->pt.y + item->member.para.nHeight - cell->pt.y; + ME_Cell *cell = &para->pCell->member.cell; + cell->nHeight = c->pt.y + para->nHeight - cell->pt.y; /* Propagate the largest height to the end so that it can be easily * sent back to all the cells at the end of the row. */ @@ -1010,82 +1009,79 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r c->pt.x = cell->pt.x + cell->nWidth; c->pt.y = cell->pt.y; cell->next_cell->member.cell.pt = c->pt; - if (!(item->member.para.next_para->member.para.nFlags & MEPF_ROWEND)) + if (!(para->next_para->member.para.nFlags & MEPF_ROWEND)) c->pt.y += cell->yTextOffset; } else { - if (item->member.para.pCell) + if (para->pCell) { /* Next paragraph in the same cell. */ - c->pt.x = item->member.para.pCell->member.cell.pt.x; + c->pt.x = para->pCell->member.cell.pt.x; } else /* Normal paragraph */ c->pt.x = 0; - c->pt.y += item->member.para.nHeight; + c->pt.y += para->nHeight; } } BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { - ME_DisplayItem *item; + ME_Paragraph *para, *next; ME_Context c; int totalWidth = editor->nTotalWidth, diff = 0, prev_width; ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; - ME_Paragraph *para; if (!editor->first_marked_para) return FALSE; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - item = editor->first_marked_para; - c.pt = item->member.para.pt; - while (item != editor->pBuffer->pLast) + para = &editor->first_marked_para->member.para; + c.pt = para->pt; + while (para_get_di( para ) != editor->pBuffer->pLast) { - assert(item->type == diParagraph); - - prev_width = item->member.para.nWidth; - ME_WrapTextParagraph( editor, &c, &item->member.para ); - if (prev_width == totalWidth && item->member.para.nWidth < totalWidth) + prev_width = para->nWidth; + ME_WrapTextParagraph( editor, &c, para ); + if (prev_width == totalWidth && para->nWidth < totalWidth) totalWidth = get_total_width(editor); else - totalWidth = max(totalWidth, item->member.para.nWidth); + totalWidth = max(totalWidth, para->nWidth); - if (!item->member.para.nCharOfs) - ME_MarkRepaintEnd(item->member.para.prev_para, &repaint_start, &repaint_end); - ME_MarkRepaintEnd(item, &repaint_start, &repaint_end); - adjust_para_y(item, &c, repaint_start, repaint_end); + if (!para->nCharOfs) + ME_MarkRepaintEnd( para->prev_para, &repaint_start, &repaint_end ); + ME_MarkRepaintEnd( para_get_di( para ), &repaint_start, &repaint_end ); + adjust_para_y( para, &c, repaint_start, repaint_end ); - if (item->member.para.next_para) + if (para->next_para) { - diff = c.pt.y - item->member.para.next_para->member.para.pt.y; + diff = c.pt.y - para->next_para->member.para.pt.y; if (diff) { - para = &item->member.para; - while (para->next_para && para != &item->member.para.next_marked->member.para && - para != &editor->pBuffer->pLast->member.para) + next = para; + while (next->next_para && next != &para->next_marked->member.para && + next != &editor->pBuffer->pLast->member.para) { - ME_MarkRepaintEnd(para->next_para, &repaint_start, &repaint_end); - para->next_para->member.para.pt.y = c.pt.y; - adjust_para_y(para->next_para, &c, repaint_start, repaint_end); - para = &para->next_para->member.para; + ME_MarkRepaintEnd(next->next_para, &repaint_start, &repaint_end); + next->next_para->member.para.pt.y = c.pt.y; + adjust_para_y( &next->next_para->member.para, &c, repaint_start, repaint_end ); + next = &next->next_para->member.para; } } } - if (item->member.para.next_marked) + if (para->next_marked) { - ME_DisplayItem *rem = item; - item = item->member.para.next_marked; - para_mark_remove( editor, &rem->member.para ); + ME_Paragraph *tmp = para; + para = &para->next_marked->member.para; + para_mark_remove( editor, tmp ); } else { - para_mark_remove( editor, &item->member.para ); - item = editor->pBuffer->pLast; + para_mark_remove( editor, para ); + para = &editor->pBuffer->pLast->member.para; } - c.pt.y = item->member.para.pt.y; + c.pt.y = para->pt.y; } editor->sizeWindow.cx = c.rcView.right-c.rcView.left; editor->sizeWindow.cy = c.rcView.bottom-c.rcView.top;

1 0

Huw Davies : riched20: Pass a ME_Paragraph ptr to the marking functions.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 02cf14cf439f2100764ec3d3139721b9d0691837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02cf14cf439f2100764ec3d3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 12:59:18 2020 +0100 riched20: Pass a ME_Paragraph ptr to the marking functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 6 +++--- dlls/riched20/para.c | 31 ++++++++++++++++--------------- dlls/riched20/run.c | 8 ++++---- dlls/riched20/undo.c | 2 +- dlls/riched20/wrap.c | 4 ++-- 7 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0ed34372e3..89fd9d7326 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -394,7 +394,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, c.nOffset -= nCharsToDelete; - mark_para_rewrap(editor, ME_FindItemBack(c.pRun, diParagraph)); + para_mark_rewrap( editor, &ME_FindItemBack( c.pRun, diParagraph )->member.para ); cursor = c; /* nChars is the number of characters that should be deleted from the diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index abc4592087..2fb7e3650d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2509,7 +2509,7 @@ static BOOL handle_enter(ME_TextEditor *editor) para = editor->pBuffer->pFirst->member.para.next_para; ME_SetDefaultParaFormat(editor, &para->member.para.fmt); para->member.para.nFlags = 0; - mark_para_rewrap(editor, para); + para_mark_rewrap( editor, &para->member.para ); editor->pCursors[0].pPara = para; editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[1] = editor->pCursors[0]; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 47e822c2d3..e768727251 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -208,9 +208,9 @@ void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_ void para_num_init( ME_Context *c, ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_num_clear( struct para_num *pn ) DECLSPEC_HIDDEN; int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void mark_para_rewrap(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; -void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; -void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; +void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; +void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; +void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; static inline ME_DisplayItem *para_get_di(ME_Paragraph *para) { diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index fb994506be..9d8693ed41 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -23,10 +23,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); -void mark_para_rewrap(ME_TextEditor *editor, ME_DisplayItem *para) +void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) { - para->member.para.nFlags |= MEPF_REWRAP; - add_marked_para(editor, para); + para->nFlags |= MEPF_REWRAP; + para_mark_add( editor, para ); } static ME_DisplayItem *make_para(ME_TextEditor *editor) @@ -52,7 +52,7 @@ void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) editor->total_rows -= item->member.para.nRows; ME_DestroyString(item->member.para.text); para_num_clear( &item->member.para.para_num ); - remove_marked_para(editor, item); + para_mark_remove( editor, &item->member.para ); ME_DestroyDisplayItem(item); } @@ -74,11 +74,11 @@ int get_total_width(ME_TextEditor *editor) return total_width; } -void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) +void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) { + ME_DisplayItem *di = para_get_di( para ); ME_DisplayItem *head = editor->first_marked_para; - assert(di->type == diParagraph); if (!di->member.para.next_marked && !di->member.para.prev_marked) { if (di == head) @@ -104,8 +104,9 @@ void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) } } -void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) +void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) { + ME_DisplayItem *di = para_get_di( para ); ME_DisplayItem *iter = editor->first_marked_para; if (!iter) @@ -228,7 +229,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) text->pLast->member.para.nCharOfs = editor->bEmulateVersion10 ? 2 : 1; - add_marked_para(editor, para); + para_mark_add( editor, &para->member.para ); ME_DestroyContext(&c); } @@ -236,7 +237,7 @@ static void ME_MarkForWrapping(ME_TextEditor *editor, ME_DisplayItem *first, con { while(first != last) { - mark_para_rewrap(editor, first); + para_mark_rewrap( editor, &first->member.para ); first = first->member.para.next_para; } } @@ -462,7 +463,7 @@ static void para_num_clear_list( ME_TextEditor *editor, ME_Paragraph *para, cons { do { - mark_para_rewrap( editor, para_get_di( para ) ); + para_mark_rewrap( editor, para ); para_num_clear( &para->para_num ); if (para->next_para->type != diParagraph) break; para = &para->next_para->member.para; @@ -537,7 +538,7 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_Paragraph *para, const PA if (memcmp(&copy, &para->fmt, sizeof(PARAFORMAT2))) { - mark_para_rewrap( editor, para_get_di( para ) ); + para_mark_rewrap( editor, para ); if (((dwMask & PFM_NUMBERING) && (copy.wNumbering != para->fmt.wNumbering)) || ((dwMask & PFM_NUMBERINGSTART) && (copy.wNumberingStart != para->fmt.wNumberingStart)) || ((dwMask & PFM_NUMBERINGSTYLE) && (copy.wNumberingStyle != para->fmt.wNumberingStyle))) @@ -612,7 +613,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, new_para->member.para.nCharOfs = run_para->member.para.nCharOfs + ofs; new_para->member.para.nCharOfs += eol_len; new_para->member.para.nFlags = 0; - mark_para_rewrap(editor, new_para); + para_mark_rewrap( editor, &new_para->member.para ); /* FIXME initialize format style and call ME_SetParaFormat blah blah */ new_para->member.para.fmt = run_para->member.para.fmt; @@ -679,9 +680,9 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, /* force rewrap of the */ if (run_para->member.para.prev_para->type == diParagraph) - mark_para_rewrap(editor, run_para->member.para.prev_para); + para_mark_rewrap( editor, &run_para->member.para.prev_para->member.para ); - mark_para_rewrap(editor, new_para->member.para.prev_para); + para_mark_rewrap( editor, &new_para->member.para.prev_para->member.para ); /* we've added the end run, so we need to modify nCharOfs in the next paragraphs */ ME_PropagateCharOffset(next_para, eol_len); @@ -816,7 +817,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, ME_CheckCharOffsets(editor); editor->nParagraphs--; - mark_para_rewrap(editor, tp); + para_mark_rewrap( editor, &tp->member.para ); return tp; } diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index f98288a94a..c3bc7f50b3 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -247,7 +247,7 @@ void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) int i; assert(p->type == diRun && pNext->type == diRun); assert(p->member.run.nCharOfs != -1); - mark_para_rewrap(editor, ME_GetParagraph(p)); + para_mark_rewrap( editor, &ME_GetParagraph( p )->member.para ); /* Update all cursors so that they don't contain the soon deleted run */ for (i=0; i<editor->nCursors; i++) { @@ -299,7 +299,7 @@ ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) editor->pCursors[i].nOffset -= nOffset; } } - mark_para_rewrap(editor, cursor->pPara); + para_mark_rewrap( editor, &cursor->pPara->member.para ); return run; } @@ -367,7 +367,7 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, ME_InsertBefore( insert_before, pDI ); TRACE("Shift length:%d\n", len); ME_PropagateCharOffset( insert_before, len ); - mark_para_rewrap( editor, para_get_di( insert_before->member.run.para ) ); + para_mark_rewrap( editor, insert_before->member.run.para ); /* Move any cursors that were at the end of the previous run to the end of the inserted run */ prev = ME_FindItemBack( pDI, diRun ); @@ -787,7 +787,7 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C ME_ReleaseStyle(para->para_num.style); para->para_num.style = NULL; } - mark_para_rewrap( editor, para_get_di( para ) ); + para_mark_rewrap( editor, para ); } } diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 2f18fc78bb..c6b898b2dd 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -341,7 +341,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) add_undo_set_para_fmt( editor, &para->member.para ); para->member.para.fmt = undo->u.set_para_fmt.fmt; para->member.para.border = undo->u.set_para_fmt.border; - mark_para_rewrap(editor, para); + para_mark_rewrap( editor, &para->member.para ); break; } case undo_set_char_fmt: diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 4853eefcab..c0c9c8f07e 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1078,11 +1078,11 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_DisplayItem *rem = item; item = item->member.para.next_marked; - remove_marked_para(editor, rem); + para_mark_remove( editor, &rem->member.para ); } else { - remove_marked_para(editor, item); + para_mark_remove( editor, &item->member.para ); item = editor->pBuffer->pLast; } c.pt.y = item->member.para.pt.y;

1 0

Huw Davies : riched20: Don't create a display context in InvalidateParagraphRange().
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: c3e6cb5b70a99feb863a158104d8db58165079be URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3e6cb5b70a99feb863a1581… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 12:59:21 2020 +0100 riched20: Don't create a display context in InvalidateParagraphRange(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 819915d4c0..5ff9623e33 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1093,28 +1093,25 @@ void ME_InvalidateParagraphRange(ME_TextEditor *editor, ME_DisplayItem *start_para, ME_DisplayItem *last_para) { - ME_Context c; RECT rc; int ofs; - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - rc = c.rcView; + rc = editor->rcFormat; ofs = editor->vert_si.nPos; - if (start_para) { + if (start_para) + { start_para = ME_GetOuterParagraph(start_para); last_para = ME_GetOuterParagraph(last_para); - rc.top = c.rcView.top + start_para->member.para.pt.y - ofs; + rc.top += start_para->member.para.pt.y - ofs; } else { - rc.top = c.rcView.top + editor->nTotalLength - ofs; + rc.top += editor->nTotalLength - ofs; } if (editor->nTotalLength < editor->nLastTotalLength) - rc.bottom = c.rcView.top + editor->nLastTotalLength - ofs; + rc.bottom = editor->rcFormat.top + editor->nLastTotalLength - ofs; else - rc.bottom = c.rcView.top + last_para->member.para.pt.y + last_para->member.para.nHeight - ofs; + rc.bottom = editor->rcFormat.top + last_para->member.para.pt.y + last_para->member.para.nHeight - ofs; ITextHost_TxInvalidateRect(editor->texthost, &rc, TRUE); - - ME_DestroyContext(&c); }

1 0

Zhiyi Zhang : dxgi: Update swapchain containing output after Alt+Enter was used to exit fullscreen.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 9288f310155a0eb5e1d8c56860332fcc4a075699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9288f310155a0eb5e1d8c568… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 9 17:56:53 2020 +0800 dxgi: Update swapchain containing output after Alt+Enter was used to exit fullscreen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/swapchain.c | 16 ++++++++++-- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/swapchain.c | 16 ++++++++++-- dlls/ddraw/ddraw.c | 16 ++++++++++-- dlls/ddraw/ddraw_private.h | 1 + dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 57 +++++++++++++++++++++++++++++++++++++++--- dlls/dxgi/tests/dxgi.c | 13 +++++----- dlls/wined3d/adapter_gl.c | 9 ++++--- dlls/wined3d/adapter_vk.c | 10 +++++--- dlls/wined3d/directx.c | 10 +++++--- dlls/wined3d/swapchain.c | 52 +++++++++++++++++++++++++------------- dlls/wined3d/wined3d.spec | 4 +-- dlls/wined3d/wined3d_private.h | 16 ++++++++---- include/wine/wined3d.h | 20 ++++++++++++--- 16 files changed, 187 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9288f310155a0eb5e1d8…

1 0