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

Gabriel Ivăncescu : msscript.ocx: Implement IScriptError::get_Line.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 00b4d3687db36139ad29c06724de8c14b3dc8dd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00b4d3687db36139ad29c067… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 24 17:56:19 2020 +0300 msscript.ocx: Implement IScriptError::get_Line. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 27 +++++++++++++++++++++++++-- dlls/msscript.ocx/tests/msscript.c | 26 ++++++++++++++++++-------- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 89a18a085b..3bf900913e 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -130,9 +130,11 @@ typedef struct { BSTR desc; BSTR help_file; DWORD help_context; + ULONG line; BOOLEAN info_filled; BOOLEAN text_filled; + BOOLEAN pos_filled; } ScriptError; struct ScriptHost { @@ -2151,6 +2153,23 @@ static void fill_error_text(ScriptError *error) IActiveScriptError_GetSourceLineText(error->object, &error->text); } +static void fill_error_pos(ScriptError *error) +{ + DWORD context; + LONG column; + ULONG line; + + if (error->pos_filled) return; + error->pos_filled = TRUE; + + if (!error->object) + return; + if (FAILED(IActiveScriptError_GetSourcePosition(error->object, &context, &line, &column))) + return; + + error->line = line; +} + static HRESULT WINAPI ScriptError_QueryInterface(IScriptError *iface, REFIID riid, void **ppv) { ScriptError *This = impl_from_IScriptError(iface); @@ -2328,9 +2347,11 @@ static HRESULT WINAPI ScriptError_get_Line(IScriptError *iface, LONG *plLine) { ScriptError *This = impl_from_IScriptError(iface); - FIXME("(%p)->(%p)\n", This, plLine); + TRACE("(%p)->(%p)\n", This, plLine); - return E_NOTIMPL; + fill_error_pos(This); + *plLine = This->line; + return S_OK; } static HRESULT WINAPI ScriptError_get_Column(IScriptError *iface, LONG *plColumn) @@ -2364,9 +2385,11 @@ static HRESULT WINAPI ScriptError_Clear(IScriptError *iface) This->desc = NULL; This->help_file = NULL; This->help_context = 0; + This->line = 0; This->info_filled = FALSE; This->text_filled = FALSE; + This->pos_filled = FALSE; return S_OK; } diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index bcd669fc6e..5e1ae16196 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3351,6 +3351,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_Text(error, &str); ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); ok(str == NULL, "Error Text is not (null), got %s.\n", wine_dbgstr_w(str)); + hr = IScriptError_get_Line(error, &x); + ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); + ok(x == 0, "Error Line is not 0, got %d.\n", x); str = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, str); @@ -3381,6 +3384,9 @@ static void test_IScriptControl_get_Error(void) ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); ok(!lstrcmpW(str, L"this is an invalid line"), "Error Text is wrong, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); + hr = IScriptError_get_Line(error, &x); + ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); + ok(x == 3, "Error Line is not 3, got %d.\n", x); hr = IScriptError_Clear(error); ok(hr == S_OK, "IScriptError_Clear failed: 0x%08x.\n", hr); @@ -3403,6 +3409,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_Text(error, &str); ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); ok(str == NULL, "Error Text is not (null), got %s.\n", wine_dbgstr_w(str)); + hr = IScriptError_get_Line(error, &x); + ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); + ok(x == 0, "Error Line is not 0, got %d.\n", x); hr = IScriptControl_get_Error(sc, &error2); ok(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); @@ -3475,8 +3484,9 @@ static void test_IScriptControl_get_Error(void) SET_EXPECT(GetSourcePosition); hr = IScriptError_get_Line(error, &x); - todo_wine ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); - todo_wine CHECK_CALLED(GetSourcePosition); + ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); + ok(x == 0, "Error Line is not 0, got %d.\n", x); + CHECK_CALLED(GetSourcePosition); hr = IScriptError_get_Column(error, &x); todo_wine ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); @@ -3511,9 +3521,9 @@ static void test_IScriptControl_get_Error(void) SET_EXPECT(GetSourcePosition); hr = IScriptError_get_Line(error, &x); - todo_wine ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); - todo_wine ok(x == 42, "Error Line is not 42, got %d.\n", x); - todo_wine CHECK_CALLED(GetSourcePosition); + ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); + ok(x == 42, "Error Line is not 42, got %d.\n", x); + CHECK_CALLED(GetSourcePosition); hr = IScriptError_get_Column(error, &x); todo_wine ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); todo_wine ok(x == 10, "Error Column is not 10, got %d.\n", x); @@ -3546,9 +3556,9 @@ static void test_IScriptControl_get_Error(void) SET_EXPECT(GetSourcePosition); hr = IScriptError_get_Line(error, &x); - todo_wine ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); - todo_wine ok(x == 42, "Error Line is not 42, got %d.\n", x); - todo_wine CHECK_CALLED(GetSourcePosition); + ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); + ok(x == 42, "Error Line is not 42, got %d.\n", x); + CHECK_CALLED(GetSourcePosition); hr = IScriptError_get_Column(error, &x); todo_wine ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); todo_wine ok(x == 10, "Error Column is not 10, got %d.\n", x);

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptError::get_Column.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: dae6979ee8f7fb7876e9c3f7ba3c972f957855f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dae6979ee8f7fb7876e9c3f7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 24 17:56:20 2020 +0300 msscript.ocx: Implement IScriptError::get_Column. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 9 +++++++-- dlls/msscript.ocx/tests/msscript.c | 20 +++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 3bf900913e..112403a78c 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -131,6 +131,7 @@ typedef struct { BSTR help_file; DWORD help_context; ULONG line; + LONG column; BOOLEAN info_filled; BOOLEAN text_filled; @@ -2168,6 +2169,7 @@ static void fill_error_pos(ScriptError *error) return; error->line = line; + error->column = column; } static HRESULT WINAPI ScriptError_QueryInterface(IScriptError *iface, REFIID riid, void **ppv) @@ -2358,9 +2360,11 @@ static HRESULT WINAPI ScriptError_get_Column(IScriptError *iface, LONG *plColumn { ScriptError *This = impl_from_IScriptError(iface); - FIXME("(%p)->(%p)\n", This, plColumn); + TRACE("(%p)->(%p)\n", This, plColumn); - return E_NOTIMPL; + fill_error_pos(This); + *plColumn = This->column; + return S_OK; } static HRESULT WINAPI ScriptError_Clear(IScriptError *iface) @@ -2386,6 +2390,7 @@ static HRESULT WINAPI ScriptError_Clear(IScriptError *iface) This->help_file = NULL; This->help_context = 0; This->line = 0; + This->column = 0; This->info_filled = FALSE; This->text_filled = FALSE; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 5e1ae16196..5b958633da 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3354,6 +3354,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_Line(error, &x); ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); ok(x == 0, "Error Line is not 0, got %d.\n", x); + hr = IScriptError_get_Column(error, &x); + ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); + ok(x == 0, "Error Column is not 0, got %d.\n", x); str = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, str); @@ -3387,6 +3390,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_Line(error, &x); ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); ok(x == 3, "Error Line is not 3, got %d.\n", x); + hr = IScriptError_get_Column(error, &x); + ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); + ok(x == 5, "Error Column is not 5, got %d.\n", x); hr = IScriptError_Clear(error); ok(hr == S_OK, "IScriptError_Clear failed: 0x%08x.\n", hr); @@ -3412,6 +3418,9 @@ static void test_IScriptControl_get_Error(void) hr = IScriptError_get_Line(error, &x); ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); ok(x == 0, "Error Line is not 0, got %d.\n", x); + hr = IScriptError_get_Column(error, &x); + ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); + ok(x == 0, "Error Column is not 0, got %d.\n", x); hr = IScriptControl_get_Error(sc, &error2); ok(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); @@ -3488,7 +3497,8 @@ static void test_IScriptControl_get_Error(void) ok(x == 0, "Error Line is not 0, got %d.\n", x); CHECK_CALLED(GetSourcePosition); hr = IScriptError_get_Column(error, &x); - todo_wine ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); + ok(x == 0, "Error Column is not 0, got %d.\n", x); /* Check with deferred fill-in */ ActiveScriptError_stage = 1; @@ -3525,8 +3535,8 @@ static void test_IScriptControl_get_Error(void) ok(x == 42, "Error Line is not 42, got %d.\n", x); CHECK_CALLED(GetSourcePosition); hr = IScriptError_get_Column(error, &x); - todo_wine ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); - todo_wine ok(x == 10, "Error Column is not 10, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); + ok(x == 10, "Error Column is not 10, got %d.\n", x); /* Check without deferred fill-in, but using scode */ ActiveScriptError_stage = 2; @@ -3560,8 +3570,8 @@ static void test_IScriptControl_get_Error(void) ok(x == 42, "Error Line is not 42, got %d.\n", x); CHECK_CALLED(GetSourcePosition); hr = IScriptError_get_Column(error, &x); - todo_wine ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); - todo_wine ok(x == 10, "Error Column is not 10, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); + ok(x == 10, "Error Column is not 10, got %d.\n", x); IActiveScriptSite_Release(site);

1 0

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

25 Aug '20

Module: vkd3d Branch: master Commit: 9a0692978ef19fd356e0a6eecd67d1f0528ced52 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9a0692978ef19fd356e0a6e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 24 11:15:12 2020 -0500 vkd3d-shader: Allow structures to be chained in any order. 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/spirv.c | 6 +++--- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 14ff7f4..bb251a4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2241,7 +2241,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader if ((shader_interface = vkd3d_find_struct(compile_info->next, INTERFACE_INFO))) { - compiler->xfb_info = vkd3d_find_struct(shader_interface->next, TRANSFORM_FEEDBACK_INFO); + compiler->xfb_info = vkd3d_find_struct(compile_info->next, TRANSFORM_FEEDBACK_INFO); compiler->shader_interface = *shader_interface; if (shader_interface->push_constant_buffer_count) @@ -9110,7 +9110,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, } int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, - struct vkd3d_shader_code *spirv) + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) { const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; const struct vkd3d_shader_spirv_domain_shader_target_info *ds_info; @@ -9127,7 +9127,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (compiler->shader_type == VKD3D_SHADER_TYPE_DOMAIN) { - if (info && (ds_info = vkd3d_find_struct(info->next, SPIRV_DOMAIN_SHADER_TARGET_INFO))) + if (info && (ds_info = vkd3d_find_struct(compile_info->next, SPIRV_DOMAIN_SHADER_TARGET_INFO))) { vkd3d_dxbc_compiler_emit_tessellator_output_primitive(compiler, ds_info->output_primitive); vkd3d_dxbc_compiler_emit_tessellator_partitioning(compiler, ds_info->partitioning); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 3e7b6cc..e0a04fc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -364,7 +364,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, } if (ret >= 0) - ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, out); + ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, compile_info, out); vkd3d_dxbc_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(&parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 77b07e4..25d6216 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -868,7 +868,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, - struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) DECLSPEC_HIDDEN; void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]) DECLSPEC_HIDDEN;

1 0

Robert Wilhelm : vbscript: Support arrays in TypeName.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 769dd6aed480a764154d8001d2a93396835d14ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=769dd6aed480a764154d8001… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Aug 24 11:57:40 2020 +0200 vbscript: Support arrays in TypeName. 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/global.c | 3 +++ dlls/vbscript/tests/api.vbs | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index d2fadb3422..cdfbdf2215 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2203,6 +2203,9 @@ static HRESULT Global_TypeName(BuiltinDisp *This, VARIANT *arg, unsigned args_cn assert(args_cnt == 1); + if (V_ISARRAY(arg)) + return return_string(res, L"Variant()"); + switch(V_VT(arg)) { case VT_UI1: return return_string(res, ByteW); diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 6add0579e8..4834029183 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1380,6 +1380,8 @@ Call ok(TypeName(CStr(0.5)) = "String", "TypeName(CStr(0.5)) = " & TypeName(CStr Call ok(getVT(TypeName(CStr(0.5))) = "VT_BSTR", "getVT(TypeName(CStr(0.5))) = " & getVT(TypeName(CStr(0.5)))) Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True)) Call ok(getVT(TypeName(True)) = "VT_BSTR", "getVT(TypeName(True)) = " & getVT(TypeName(True))) +Call ok(TypeName(arr) = "Variant()", "TypeName(arr) = " & TypeName(arr)) +Call ok(getVT(TypeName(arr)) = "VT_BSTR", "getVT(TypeName(arr)) = " & getVT(TypeName(arr))) Call ok(VarType(Empty) = vbEmpty, "VarType(Empty) = " & VarType(Empty)) Call ok(getVT(VarType(Empty)) = "VT_I2", "getVT(VarType(Empty)) = " & getVT(VarType(Empty)))

1 0

Nikolay Sivov : combase: Expose ROT access helpers.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 33606dbcc5f59f3da72b925dab7c9b1ecfa50797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33606dbcc5f59f3da72b925d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 24 14:27:59 2020 +0300 combase: Expose ROT access helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 2 +- dlls/combase/combase.spec | 14 +++--- dlls/combase/combase_private.h | 2 +- dlls/combase/irpcss.idl | 1 + dlls/combase/rpc.c | 108 +++++++++++++++++++++++++++++++++-------- 5 files changed, 98 insertions(+), 29 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index df97799fe0..80d6ece266 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2245,7 +2245,7 @@ DWORD WINAPI CoGetCurrentProcess(void) return 0; if (!tlsdata->thread_seqid) - tlsdata->thread_seqid = rpcss_get_next_seqid(); + rpcss_get_next_seqid(&tlsdata->thread_seqid); return tlsdata->thread_seqid; } diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index a88c5d66fe..9038d5fa8b 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -255,13 +255,13 @@ @ stub InternalFillLocalOXIDInfo @ stub InternalFreeObjRef @ stub InternalGetWindowPropInterface -@ stub InternalIrotEnumRunning -@ stub InternalIrotGetObject -@ stub InternalIrotGetTimeOfLastChange -@ stub InternalIrotIsRunning -@ stub InternalIrotNoteChangeTime -@ stub InternalIrotRegister -@ stub InternalIrotRevoke +@ stdcall InternalIrotEnumRunning(ptr) +@ stdcall InternalIrotGetObject(ptr ptr ptr) +@ stdcall InternalIrotGetTimeOfLastChange(ptr ptr) +@ stdcall InternalIrotIsRunning(ptr) +@ stdcall InternalIrotNoteChangeTime(long ptr) +@ stdcall InternalIrotRegister(ptr ptr ptr ptr long ptr ptr) +@ stdcall InternalIrotRevoke(long ptr ptr ptr) @ stub InternalIsApartmentInitialized @ stub InternalIsProcessInitialized @ stub InternalMarshalObjRef diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index e910166fff..7d7583282e 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -90,4 +90,4 @@ static inline struct apartment* com_get_current_apt(void) } /* RpcSs interface */ -DWORD rpcss_get_next_seqid(void) DECLSPEC_HIDDEN; +HRESULT rpcss_get_next_seqid(DWORD *id) DECLSPEC_HIDDEN; diff --git a/dlls/combase/irpcss.idl b/dlls/combase/irpcss.idl index 65078167de..fab69f7310 100644 --- a/dlls/combase/irpcss.idl +++ b/dlls/combase/irpcss.idl @@ -18,4 +18,5 @@ #pragma makedep client +#include "wine/irot.idl" #include "wine/irpcss.idl" diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 2fbccfd740..3b53166172 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -127,29 +127,97 @@ static RPC_BINDING_HANDLE get_irpcss_handle(void) return irpcss_handle; } -DWORD rpcss_get_next_seqid(void) +static RPC_BINDING_HANDLE get_irot_handle(void) { - DWORD id = 0; - HRESULT hr; + static RPC_BINDING_HANDLE irot_handle; - for (;;) + if (!irot_handle) { - __TRY - { - hr = irpcss_get_thread_seq_id(get_irpcss_handle(), &id); - } - __EXCEPT(rpc_filter) - { - hr = HRESULT_FROM_WIN32(GetExceptionCode()); - } - __ENDTRY - if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) - { - if (start_rpcss()) - continue; - } - break; + unsigned short protseq[] = IROT_PROTSEQ; + unsigned short endpoint[] = IROT_ENDPOINT; + + RPC_BINDING_HANDLE new_handle = get_rpc_handle(protseq, endpoint); + if (InterlockedCompareExchangePointer(&irot_handle, new_handle, NULL)) + /* another thread beat us to it */ + RpcBindingFree(&new_handle); } + return irot_handle; +} + +#define RPCSS_CALL_START \ + HRESULT hr; \ + for (;;) { \ + __TRY { + +#define RPCSS_CALL_END \ + } __EXCEPT(rpc_filter) { \ + hr = HRESULT_FROM_WIN32(GetExceptionCode()); \ + } \ + __ENDTRY \ + if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) { \ + if (start_rpcss()) \ + continue; \ + } \ + break; \ + } \ + return hr; + +HRESULT rpcss_get_next_seqid(DWORD *id) +{ + RPCSS_CALL_START + hr = irpcss_get_thread_seq_id(get_irpcss_handle(), id); + RPCSS_CALL_END +} + +HRESULT WINAPI InternalIrotRegister(const MonikerComparisonData *moniker_data, + const InterfaceData *object, const InterfaceData *moniker, + const FILETIME *time, DWORD flags, IrotCookie *cookie, IrotContextHandle *ctxt_handle) +{ + RPCSS_CALL_START + hr = IrotRegister(get_irot_handle(), moniker_data, object, moniker, time, flags, cookie, ctxt_handle); + RPCSS_CALL_END +} + +HRESULT WINAPI InternalIrotIsRunning(const MonikerComparisonData *moniker_data) +{ + RPCSS_CALL_START + hr = IrotIsRunning(get_irot_handle(), moniker_data); + RPCSS_CALL_END +} + +HRESULT WINAPI InternalIrotGetObject(const MonikerComparisonData *moniker_data, PInterfaceData *obj, + IrotCookie *cookie) +{ + RPCSS_CALL_START + hr = IrotGetObject(get_irot_handle(), moniker_data, obj, cookie); + RPCSS_CALL_END +} + +HRESULT WINAPI InternalIrotNoteChangeTime(IrotCookie cookie, const FILETIME *time) +{ + RPCSS_CALL_START + hr = IrotNoteChangeTime(get_irot_handle(), cookie, time); + RPCSS_CALL_END +} - return id; +HRESULT WINAPI InternalIrotGetTimeOfLastChange(const MonikerComparisonData *moniker_data, FILETIME *time) +{ + RPCSS_CALL_START + hr = IrotGetTimeOfLastChange(get_irot_handle(), moniker_data, time); + RPCSS_CALL_END +} + +HRESULT WINAPI InternalIrotEnumRunning(PInterfaceList *list) +{ + RPCSS_CALL_START + hr = IrotEnumRunning(get_irot_handle(), list); + RPCSS_CALL_END +} + +HRESULT WINAPI InternalIrotRevoke(IrotCookie cookie, IrotContextHandle *ctxt_handle, PInterfaceData *object, + PInterfaceData *moniker) +{ + RPCSS_CALL_START + hr = IrotRevoke(get_irot_handle(), cookie, ctxt_handle, object, moniker); + RPCSS_CALL_END }

1 0

Nikolay Sivov : ole32: Use combase for ROT access.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 2105602edf1b11179b1d887035186b38526bf693 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2105602edf1b11179b1d8870… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 24 14:28:00 2020 +0300 ole32: Use combase for ROT access. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/irot.idl | 2 +- dlls/ole32/moniker.c | 254 ++++++--------------------------------------------- 2 files changed, 28 insertions(+), 228 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2105602edf1b11179b1d…

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_SET_MODE.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 5a151b060a08f36d9a667dec8d0e9fbdbe0851f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a151b060a08f36d9a667dec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 24 13:20:53 2020 +0200 conhost: Implement IOCTL_CONDRV_SET_MODE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 31 ++++++++++++++++++++++++------- programs/conhost/conhost.c | 6 ++++++ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b45e707ac8..922a250993 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3945,6 +3945,29 @@ static void test_AllocConsole(void) CloseHandle(pipe_write); } +static void test_pseudo_console_child(HANDLE input) +{ + DWORD mode; + BOOL ret; + + ret = GetConsoleMode(input, &mode); + ok(ret, "GetConsoleMode failed: %u\n", GetLastError()); + ok(mode == (ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | + ENABLE_INSERT_MODE | ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_AUTO_POSITION), + "mode = %x\n", mode); + + ret = SetConsoleMode(input, mode & ~ENABLE_AUTO_POSITION); + ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); + + ret = GetConsoleMode(input, &mode); + ok(ret, "GetConsoleMode failed: %u\n", GetLastError()); + ok(mode == (ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | + ENABLE_INSERT_MODE | ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS), "mode = %x\n", mode); + + ret = SetConsoleMode(input, mode | ENABLE_AUTO_POSITION); + ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); +} + static DWORD WINAPI read_pipe_proc( void *handle ) { char buf[64]; @@ -4118,13 +4141,7 @@ START_TEST(console) if (using_pseudo_console) { - DWORD mode; - - ret = GetConsoleMode(hConIn, &mode); - ok(ret, "GetConsoleMode failed: %u\n", GetLastError()); - ok(mode == (ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | - ENABLE_INSERT_MODE | ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_AUTO_POSITION), - "mode = %x\n", mode); + test_pseudo_console_child(hConIn); return; } diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index dae30d1576..6eedfc9d65 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -67,6 +67,12 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, return STATUS_SUCCESS; } + case IOCTL_CONDRV_SET_MODE: + if (in_size != sizeof(unsigned int) || *out_size) return STATUS_INVALID_PARAMETER; + console->mode = *(unsigned int *)in_data; + TRACE( "set %x mode\n", console->mode ); + return STATUS_SUCCESS; + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_GET_INPUT_INFO.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 0e939eb969d3bd3caab3d5efea4778db07c00c87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e939eb969d3bd3caab3d5ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 24 13:21:06 2020 +0200 conhost: Implement IOCTL_CONDRV_GET_INPUT_INFO. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 6eedfc9d65..8f6217b3e9 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1,5 +1,8 @@ /* + * Copyright 1998 Alexandre Julliard + * Copyright 2001 Eric Pouech * Copyright 2012 Detlef Riekenberg + * Copyright 2020 Jacek Caban * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,6 +26,7 @@ #include <windef.h> #include <winbase.h> #include <winuser.h> +#include <winnls.h> #include <winternl.h> #include "wine/condrv.h" @@ -35,6 +39,14 @@ struct console { HANDLE server; /* console server handle */ unsigned int mode; /* input mode */ + unsigned int recnum; /* number of input records */ + unsigned int history_size; /* number of entries in history array */ + unsigned int history_index; /* number of used entries in history array */ + unsigned int history_mode; /* mode of history (non zero means remove doubled strings */ + unsigned int edition_mode; /* index to edition mode flavors */ + unsigned int input_cp; /* console input codepage */ + unsigned int output_cp; /* console output codepage */ + unsigned int win; /* window handle if backend supports it */ }; static void *ioctl_buffer; @@ -73,6 +85,23 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, TRACE( "set %x mode\n", console->mode ); return STATUS_SUCCESS; + case IOCTL_CONDRV_GET_INPUT_INFO: + { + struct condrv_input_info *info; + TRACE( "get info\n" ); + if (in_size || *out_size != sizeof(*info)) return STATUS_INVALID_PARAMETER; + if (!(info = alloc_ioctl_buffer( sizeof(*info )))) return STATUS_NO_MEMORY; + info->history_mode = console->history_mode; + info->history_size = console->history_size; + info->history_index = console->history_index; + info->edition_mode = console->edition_mode; + info->input_cp = console->input_cp; + info->output_cp = console->output_cp; + info->win = console->win; + info->input_count = console->recnum; + return STATUS_SUCCESS; + } + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED; @@ -187,6 +216,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) console.mode = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_INSERT_MODE | ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_AUTO_POSITION; + console.input_cp = console.output_cp = GetOEMCP(); + console.history_size = 50; for (i = 1; i < argc; i++) {

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_SET_INPUT_INFO.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 6c7f389c5ee3a1e55835a1c25cfc4160e0f214ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c7f389c5ee3a1e55835a1c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 24 13:21:26 2020 +0200 conhost: Implement IOCTL_CONDRV_SET_INPUT_INFO. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 8f6217b3e9..87d3a646d9 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -35,11 +35,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(conhost); +struct history_line +{ + size_t len; + WCHAR text[1]; +}; + struct console { HANDLE server; /* console server handle */ unsigned int mode; /* input mode */ unsigned int recnum; /* number of input records */ + 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 */ unsigned int history_mode; /* mode of history (non zero means remove doubled strings */ @@ -102,6 +109,63 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, return STATUS_SUCCESS; } + case IOCTL_CONDRV_SET_INPUT_INFO: + { + const struct condrv_input_info_params *params = in_data; + TRACE( "set info\n" ); + if (in_size != sizeof(*params) || *out_size) return STATUS_INVALID_PARAMETER; + if (params->mask & SET_CONSOLE_INPUT_INFO_HISTORY_MODE) + { + console->history_mode = params->info.history_mode; + } + if ((params->mask & SET_CONSOLE_INPUT_INFO_HISTORY_SIZE) && + console->history_size != params->info.history_size) + { + struct history_line **mem = NULL; + int i, delta; + + if (params->info.history_size) + { + if (!(mem = malloc( params->info.history_size * sizeof(*mem) ))) + return STATUS_NO_MEMORY; + memset( mem, 0, params->info.history_size * sizeof(*mem) ); + } + + delta = (console->history_index > params->info.history_size) + ? (console->history_index - params->info.history_size) : 0; + + for (i = delta; i < console->history_index; i++) + { + mem[i - delta] = console->history[i]; + console->history[i] = NULL; + } + console->history_index -= delta; + + for (i = 0; i < console->history_size; i++) + free( console->history[i] ); + free( console->history ); + console->history = mem; + console->history_size = params->info.history_size; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_EDITION_MODE) + { + console->edition_mode = params->info.edition_mode; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE) + { + console->input_cp = params->info.input_cp; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE) + { + console->output_cp = params->info.output_cp; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_WIN) + { + console->win = params->info.win; + } + return STATUS_SUCCESS; + } + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED; @@ -218,6 +282,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_AUTO_POSITION; console.input_cp = console.output_cp = GetOEMCP(); console.history_size = 50; + if (!(console.history = calloc( console.history_size, sizeof(*console.history) ))) return 1; for (i = 1; i < argc; i++) {

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_GET_TITLE.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: e40de801b5e757f13e5d699fa22368bf1939d444 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e40de801b5e757f13e5d699f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 24 13:21:43 2020 +0200 conhost: Implement IOCTL_CONDRV_GET_TITLE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 87d3a646d9..7f1978bffb 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -46,6 +46,8 @@ struct console HANDLE server; /* console server handle */ unsigned int mode; /* input mode */ unsigned int recnum; /* number of input records */ + 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 */ @@ -166,6 +168,18 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, return STATUS_SUCCESS; } + case IOCTL_CONDRV_GET_TITLE: + { + 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; + if (*out_size) memcpy( result, console->title, *out_size ); + return STATUS_SUCCESS; + } + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0