wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Jacek Caban : kernelbase: Close PEB ConsoleHandle in FreeConsole.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: ccaaf6957f525f09ba485377a606ce322ab90792 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccaaf6957f525f09ba485377… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 13 16:00:27 2020 +0200 kernelbase: Close PEB ConsoleHandle in FreeConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 12 ++++++++++++ dlls/kernelbase/console.c | 3 +++ 2 files changed, 15 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 2facdf91fa..32a1275e3e 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3592,9 +3592,15 @@ static void test_FreeConsole(void) HANDLE handle; BOOL ret; + todo_wine + ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); + ret = FreeConsole(); ok(ret, "FreeConsole failed: %u\n", GetLastError()); + ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle == NULL, "ConsoleHandle = %p\n", + RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle); + handle = CreateFileA("CONOUT$", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); ok(handle == INVALID_HANDLE_VALUE && (GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == ERROR_ACCESS_DENIED /* winxp */)), @@ -3719,8 +3725,12 @@ static void test_AttachConsole_child(DWORD console_pid) ok(!res && GetLastError() == ERROR_ACCESS_DENIED, "AttachConsole returned: %x(%u)\n", res, GetLastError()); + todo_wine + ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); res = FreeConsole(); ok(res, "FreeConsole failed: %u\n", GetLastError()); + ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle == NULL, "ConsoleHandle = %p\n", + RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle); SetStdHandle(STD_ERROR_HANDLE, pipe_out); @@ -3728,6 +3738,8 @@ static void test_AttachConsole_child(DWORD console_pid) ok(res, "AttachConsole failed: %u\n", GetLastError()); ok(pipe_out != GetStdHandle(STD_ERROR_HANDLE), "std handle not set to console\n"); + todo_wine + ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); console = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); ok(console != INVALID_HANDLE_VALUE, "Could not open console\n"); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 7f9152d5c5..15153dbb6f 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -509,6 +509,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) RtlEnterCriticalSection( &console_section ); + NtClose( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle ); + RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = NULL; + if (console_flags & CONSOLE_INPUT_HANDLE) NtClose( GetStdHandle( STD_INPUT_HANDLE )); if (console_flags & CONSOLE_OUTPUT_HANDLE) NtClose( GetStdHandle( STD_OUTPUT_HANDLE )); if (console_flags & CONSOLE_ERROR_HANDLE) NtClose( GetStdHandle( STD_ERROR_HANDLE ));

1 0

Huw Davies : scsiport.sys: Reinstate the subsystem native option.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 701b0139d1de1c79bbf5247b404088cf3947bc9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=701b0139d1de1c79bbf5247b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 13 13:13:06 2020 +0100 scsiport.sys: Reinstate the subsystem native option. It was previously being clobbered by the second EXTRADLLFLAGS. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scsiport.sys/Makefile.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/scsiport.sys/Makefile.in b/dlls/scsiport.sys/Makefile.in index e8653dd53e..82509ab032 100644 --- a/dlls/scsiport.sys/Makefile.in +++ b/dlls/scsiport.sys/Makefile.in @@ -1,8 +1,6 @@ MODULE = scsiport.sys IMPORTS = ntoskrnl -EXTRADLLFLAGS = -Wl,--subsystem,native - -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -Wl,--subsystem,native -mno-cygwin C_SRCS = \ scsiport.c

1 0

Huw Davies : ndis.sys: Reinstate the subsystem native option.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: e0bfdb29f2e7f1a62bde34455bfbd32dacb674c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0bfdb29f2e7f1a62bde3445… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 13 13:13:05 2020 +0100 ndis.sys: Reinstate the subsystem native option. It was previously being clobbered by the second EXTRADLLFLAGS. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/Makefile.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ndis.sys/Makefile.in b/dlls/ndis.sys/Makefile.in index cc52260625..fa69910f16 100644 --- a/dlls/ndis.sys/Makefile.in +++ b/dlls/ndis.sys/Makefile.in @@ -1,7 +1,5 @@ MODULE = ndis.sys -EXTRADLLFLAGS = -Wl,--subsystem,native - -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -Wl,--subsystem,native -mno-cygwin C_SRCS = \ main.c

1 0

Zebediah Figura : wined3d: Rename wined3d_sm4_immconst_type to wined3d_sm4_dimension.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 22c3331317db564e210f164b031d186c8663181f URL: https://source.winehq.org/git/wine.git/?a=commit;h=22c3331317db564e210f164b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 12 12:01:08 2020 -0500 wined3d: Rename wined3d_sm4_immconst_type to wined3d_sm4_dimension. These bits are used in all register tokens, not just immediate constants. 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> --- dlls/wined3d/shader_sm4.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index db3297e8e9..443cfe7e4b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -98,8 +98,8 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_SWIZZLE_TYPE_SHIFT 2 #define WINED3D_SM4_SWIZZLE_TYPE_MASK (0x3u << WINED3D_SM4_SWIZZLE_TYPE_SHIFT) -#define WINED3D_SM4_IMMCONST_TYPE_SHIFT 0 -#define WINED3D_SM4_IMMCONST_TYPE_MASK (0x3u << WINED3D_SM4_IMMCONST_TYPE_SHIFT) +#define WINED3D_SM4_DIMENSION_SHIFT 0 +#define WINED3D_SM4_DIMENSION_MASK (0x3u << WINED3D_SM4_DIMENSION_SHIFT) #define WINED3D_SM4_WRITEMASK_SHIFT 4 #define WINED3D_SM4_WRITEMASK_MASK (0xfu << WINED3D_SM4_WRITEMASK_SHIFT) @@ -397,10 +397,10 @@ enum wined3d_sm4_swizzle_type WINED3D_SM4_SWIZZLE_SCALAR = 0x2, }; -enum wined3d_sm4_immconst_type +enum wined3d_sm4_dimension { - WINED3D_SM4_IMMCONST_SCALAR = 0x1, - WINED3D_SM4_IMMCONST_VEC4 = 0x2, + WINED3D_SM4_DIMENSION_SCALAR = 0x1, + WINED3D_SM4_DIMENSION_VEC4 = 0x2, }; enum wined3d_sm4_resource_type @@ -1487,12 +1487,11 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p if (register_type == WINED3D_SM4_RT_IMMCONST) { - enum wined3d_sm4_immconst_type immconst_type = - (token & WINED3D_SM4_IMMCONST_TYPE_MASK) >> WINED3D_SM4_IMMCONST_TYPE_SHIFT; + enum wined3d_sm4_dimension dimension = (token & WINED3D_SM4_DIMENSION_MASK) >> WINED3D_SM4_DIMENSION_SHIFT; - switch (immconst_type) + switch (dimension) { - case WINED3D_SM4_IMMCONST_SCALAR: + case WINED3D_SM4_DIMENSION_SCALAR: param->immconst_type = WINED3D_IMMCONST_SCALAR; if (end - *ptr < 1) { @@ -1503,7 +1502,7 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p *ptr += 1; break; - case WINED3D_SM4_IMMCONST_VEC4: + case WINED3D_SM4_DIMENSION_VEC4: param->immconst_type = WINED3D_IMMCONST_VEC4; if (end - *ptr < 4) { @@ -1515,7 +1514,7 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p break; default: - FIXME("Unhandled immediate constant type %#x.\n", immconst_type); + FIXME("Unhandled dimension %#x.\n", dimension); break; } }

1 0

Gabriel Ivăncescu : msscript.ocx: Implement ScriptProcedure::get_HasReturnValue.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 3273add6550cbdcb8f3d4fdf224d9c82e9446e57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3273add6550cbdcb8f3d4fdf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 12 17:13:44 2020 +0300 msscript.ocx: Implement ScriptProcedure::get_HasReturnValue. 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 | 13 +++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index a510db7022..a339e70e2b 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -98,6 +98,7 @@ typedef struct { BSTR name; USHORT num_args; + VARTYPE ret_type; } ScriptProcedure; struct ScriptProcedureCollection { @@ -901,9 +902,12 @@ static HRESULT WINAPI ScriptProcedure_get_HasReturnValue(IScriptProcedure *iface { ScriptProcedure *This = impl_from_IScriptProcedure(iface); - FIXME("(%p)->(%p)\n", This, pfHasReturnValue); + TRACE("(%p)->(%p)\n", This, pfHasReturnValue); - return E_NOTIMPL; + if (!pfHasReturnValue) return E_POINTER; + + *pfHasReturnValue = (This->ret_type == VT_VOID) ? VARIANT_FALSE : VARIANT_TRUE; + return S_OK; } static const IScriptProcedureVtbl ScriptProcedureVtbl = { @@ -962,6 +966,7 @@ static HRESULT get_script_procedure(ScriptProcedureCollection *procedures, IType proc->hash = hash; proc->name = str; proc->num_args = desc->cParams + desc->cParamsOpt; + proc->ret_type = desc->elemdescFunc.tdesc.vt; list_add_tail(proc_list, &proc->entry); *procedure = &proc->IScriptProcedure_iface; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index ad7e48fcdb..7233af5ee8 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3295,6 +3295,7 @@ static void test_IScriptControl_get_Procedures(void) IScriptProcedureCollection *procs, *procs2; IScriptProcedure *proc, *proc2; IScriptControl *sc; + VARIANT_BOOL vbool; VARIANT var; LONG count; HRESULT hr; @@ -3363,6 +3364,11 @@ static void test_IScriptControl_get_Procedures(void) hr = IScriptProcedure_get_NumArgs(proc, &count); ok(hr == S_OK, "IScriptProcedure_get_NumArgs failed: 0x%08x.\n", hr); ok(count == 2, "Wrong NumArgs, got %d.\n", count); + hr = IScriptProcedure_get_HasReturnValue(proc, NULL); + ok(hr == E_POINTER, "IScriptProcedure_get_HasReturnValue returned: 0x%08x.\n", hr); + hr = IScriptProcedure_get_HasReturnValue(proc, &vbool); + ok(hr == S_OK, "IScriptProcedure_get_HasReturnValue failed: 0x%08x.\n", hr); + ok(vbool == VARIANT_TRUE, "HasReturnValue did not return True, got %x.\n", vbool); IScriptProcedure_Release(proc); V_VT(&var) = VT_BSTR; @@ -3378,6 +3384,9 @@ static void test_IScriptControl_get_Procedures(void) hr = IScriptProcedure_get_NumArgs(proc, &count); ok(hr == S_OK, "IScriptProcedure_get_NumArgs failed: 0x%08x.\n", hr); ok(count == 1, "Wrong NumArgs, got %d.\n", count); + hr = IScriptProcedure_get_HasReturnValue(proc, &vbool); + ok(hr == S_OK, "IScriptProcedure_get_HasReturnValue failed: 0x%08x.\n", hr); + ok(vbool == VARIANT_TRUE, "HasReturnValue did not return True, got %x.\n", vbool); IScriptProcedure_Release(proc); V_VT(&var) = VT_R8; @@ -3584,6 +3593,10 @@ static void test_IScriptControl_get_Procedures(void) ok(hr == S_OK, "get_NumArgs for %s failed: 0x%08x.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); ok(count == custom_engine_funcs[i].num_args + custom_engine_funcs[i].num_opt_args, "NumArgs is not %d, got %d.\n", custom_engine_funcs[i].num_args + custom_engine_funcs[i].num_opt_args, count); + hr = IScriptProcedure_get_HasReturnValue(proc, &vbool); + ok(hr == S_OK, "get_HasReturnValue for %s failed: 0x%08x.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); + ok(vbool == ((custom_engine_funcs[i].ret_type == VT_VOID) ? VARIANT_FALSE : VARIANT_TRUE), + "get_HasReturnValue for %s returned %x.\n", wine_dbgstr_w(custom_engine_funcs[i].name), vbool); IScriptProcedure_Release(proc); }

1 0

Gabriel Ivăncescu : msscript.ocx: Implement ScriptProcedure::get_NumArgs.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: f8de2787ef4c3e8402c67bcaa2c0624a791b167f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8de2787ef4c3e8402c67bca… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 12 17:13:43 2020 +0300 msscript.ocx: Implement ScriptProcedure::get_NumArgs. 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 | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 173e04ab98..a510db7022 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -97,6 +97,7 @@ typedef struct { struct list entry; BSTR name; + USHORT num_args; } ScriptProcedure; struct ScriptProcedureCollection { @@ -888,9 +889,12 @@ static HRESULT WINAPI ScriptProcedure_get_NumArgs(IScriptProcedure *iface, LONG { ScriptProcedure *This = impl_from_IScriptProcedure(iface); - FIXME("(%p)->(%p)\n", This, pcArgs); + TRACE("(%p)->(%p)\n", This, pcArgs); - return E_NOTIMPL; + if (!pcArgs) return E_POINTER; + + *pcArgs = This->num_args; + return S_OK; } static HRESULT WINAPI ScriptProcedure_get_HasReturnValue(IScriptProcedure *iface, VARIANT_BOOL *pfHasReturnValue) @@ -957,6 +961,7 @@ static HRESULT get_script_procedure(ScriptProcedureCollection *procedures, IType proc->ref = 1; proc->hash = hash; proc->name = str; + proc->num_args = desc->cParams + desc->cParamsOpt; list_add_tail(proc_list, &proc->entry); *procedure = &proc->IScriptProcedure_iface; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index d08f30c074..ad7e48fcdb 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3358,6 +3358,11 @@ static void test_IScriptControl_get_Procedures(void) ok(hr == S_OK, "IScriptProcedure_get_Name failed: 0x%08x.\n", hr); ok(!lstrcmpW(str, L"add"), "Wrong name, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); + hr = IScriptProcedure_get_NumArgs(proc, NULL); + ok(hr == E_POINTER, "IScriptProcedure_get_NumArgs returned: 0x%08x.\n", hr); + hr = IScriptProcedure_get_NumArgs(proc, &count); + ok(hr == S_OK, "IScriptProcedure_get_NumArgs failed: 0x%08x.\n", hr); + ok(count == 2, "Wrong NumArgs, got %d.\n", count); IScriptProcedure_Release(proc); V_VT(&var) = VT_BSTR; @@ -3370,6 +3375,9 @@ static void test_IScriptControl_get_Procedures(void) ok(hr == S_OK, "IScriptProcedure_get_Name failed: 0x%08x.\n", hr); ok(!lstrcmpW(str, L"nop"), "Wrong name, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); + hr = IScriptProcedure_get_NumArgs(proc, &count); + ok(hr == S_OK, "IScriptProcedure_get_NumArgs failed: 0x%08x.\n", hr); + ok(count == 1, "Wrong NumArgs, got %d.\n", count); IScriptProcedure_Release(proc); V_VT(&var) = VT_R8; @@ -3380,6 +3388,9 @@ static void test_IScriptControl_get_Procedures(void) ok(hr == S_OK, "IScriptProcedure_get_Name failed: 0x%08x.\n", hr); ok(!lstrcmpW(str, L"muladd"), "Wrong name, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); + hr = IScriptProcedure_get_NumArgs(proc, &count); + ok(hr == S_OK, "IScriptProcedure_get_NumArgs failed: 0x%08x.\n", hr); + ok(count == 3, "Wrong NumArgs, got %d.\n", count); IScriptProcedure_Release(proc); IScriptProcedureCollection_Release(procs); @@ -3569,6 +3580,10 @@ static void test_IScriptControl_get_Procedures(void) ok(!lstrcmpW(str, custom_engine_funcs[i].name), "Name is not %s, got %s.\n", wine_dbgstr_w(custom_engine_funcs[i].name), wine_dbgstr_w(str)); SysFreeString(str); + hr = IScriptProcedure_get_NumArgs(proc, &count); + ok(hr == S_OK, "get_NumArgs for %s failed: 0x%08x.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); + ok(count == custom_engine_funcs[i].num_args + custom_engine_funcs[i].num_opt_args, + "NumArgs is not %d, got %d.\n", custom_engine_funcs[i].num_args + custom_engine_funcs[i].num_opt_args, count); IScriptProcedure_Release(proc); }

1 0

Gabriel Ivăncescu : msscript.ocx: Implement ScriptProcedure::get_Name.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 28228b3914a2f0d084f1eae0fde7857efd6065d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28228b3914a2f0d084f1eae0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 12 17:13:42 2020 +0300 msscript.ocx: Implement ScriptProcedure::get_Name. 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 | 7 +++++-- dlls/msscript.ocx/tests/msscript.c | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index ccdbba43c2..173e04ab98 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -876,9 +876,12 @@ static HRESULT WINAPI ScriptProcedure_get_Name(IScriptProcedure *iface, BSTR *pb { ScriptProcedure *This = impl_from_IScriptProcedure(iface); - FIXME("(%p)->(%p)\n", This, pbstrName); + TRACE("(%p)->(%p)\n", This, pbstrName); - return E_NOTIMPL; + if (!pbstrName) return E_POINTER; + + *pbstrName = SysAllocString(This->name); + return *pbstrName ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI ScriptProcedure_get_NumArgs(IScriptProcedure *iface, LONG *pcArgs) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index c56e2d52a7..d08f30c074 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3352,6 +3352,12 @@ static void test_IScriptControl_get_Procedures(void) IScriptProcedureCollection_AddRef(procs); ok(i == IScriptProcedureCollection_Release(procs), "IScriptProcedureCollection_get_Item should not have added a ref to the collection.\n"); + hr = IScriptProcedure_get_Name(proc, NULL); + ok(hr == E_POINTER, "IScriptProcedure_get_Name returned: 0x%08x.\n", hr); + hr = IScriptProcedure_get_Name(proc, &str); + ok(hr == S_OK, "IScriptProcedure_get_Name failed: 0x%08x.\n", hr); + ok(!lstrcmpW(str, L"add"), "Wrong name, got %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); IScriptProcedure_Release(proc); V_VT(&var) = VT_BSTR; @@ -3360,12 +3366,20 @@ static void test_IScriptControl_get_Procedures(void) ok(hr == S_OK, "IScriptProcedureCollection_get_Item failed: 0x%08x.\n", hr); ok(V_VT(&var) == VT_BSTR, "var type not BSTR, got %d.\n", V_VT(&var)); VariantClear(&var); + hr = IScriptProcedure_get_Name(proc, &str); + ok(hr == S_OK, "IScriptProcedure_get_Name failed: 0x%08x.\n", hr); + ok(!lstrcmpW(str, L"nop"), "Wrong name, got %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); IScriptProcedure_Release(proc); V_VT(&var) = VT_R8; V_R8(&var) = 3.0; hr = IScriptProcedureCollection_get_Item(procs, var, &proc); ok(hr == S_OK, "IScriptProcedureCollection_get_Item failed: 0x%08x.\n", hr); + hr = IScriptProcedure_get_Name(proc, &str); + ok(hr == S_OK, "IScriptProcedure_get_Name failed: 0x%08x.\n", hr); + ok(!lstrcmpW(str, L"muladd"), "Wrong name, got %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); IScriptProcedure_Release(proc); IScriptProcedureCollection_Release(procs); @@ -3548,6 +3562,14 @@ static void test_IScriptControl_get_Procedures(void) CHECK_CALLED(Bind); CHECK_CALLED(GetNames); CHECK_CALLED(ReleaseFuncDesc); + + /* Verify the properties */ + hr = IScriptProcedure_get_Name(proc, &str); + ok(hr == S_OK, "get_Name for %s failed: 0x%08x.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); + ok(!lstrcmpW(str, custom_engine_funcs[i].name), "Name is not %s, got %s.\n", + wine_dbgstr_w(custom_engine_funcs[i].name), wine_dbgstr_w(str)); + SysFreeString(str); + IScriptProcedure_Release(proc); }

1 0

Gabriel Ivăncescu : msscript.ocx: Cache the procedures obtained from the ScriptProcedureCollection.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 19ebaa85fcebc90390eaaa3f34ce23570723e13a URL: https://source.winehq.org/git/wine.git/?a=commit;h=19ebaa85fcebc90390eaaa3f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 12 17:13:41 2020 +0300 msscript.ocx: Cache the procedures obtained from the ScriptProcedureCollection. 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 | 59 ++++++++++++++++++++++++++++++++++++-- dlls/msscript.ocx/tests/msscript.c | 12 ++++++-- 2 files changed, 66 insertions(+), 5 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index df173be3ba..ccdbba43c2 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -93,6 +93,9 @@ typedef struct { IScriptProcedure IScriptProcedure_iface; LONG ref; + ULONG hash; + struct list entry; + BSTR name; } ScriptProcedure; @@ -102,6 +105,7 @@ struct ScriptProcedureCollection { LONG count; ScriptModule *module; + struct list hash_table[43]; }; struct ScriptHost { @@ -800,6 +804,7 @@ static ULONG WINAPI ScriptProcedure_Release(IScriptProcedure *iface) if (!ref) { + list_remove(&This->entry); SysFreeString(This->name); heap_free(This); } @@ -908,9 +913,12 @@ static const IScriptProcedureVtbl ScriptProcedureVtbl = { }; /* This function always releases the FUNCDESC passed in */ -static HRESULT get_script_procedure(ITypeInfo *typeinfo, FUNCDESC *desc, IScriptProcedure **procedure) +static HRESULT get_script_procedure(ScriptProcedureCollection *procedures, ITypeInfo *typeinfo, + FUNCDESC *desc, IScriptProcedure **procedure) { + struct list *proc_list; ScriptProcedure *proc; + ULONG hash; HRESULT hr; BSTR str; UINT len; @@ -918,6 +926,23 @@ static HRESULT get_script_procedure(ITypeInfo *typeinfo, FUNCDESC *desc, IScript hr = ITypeInfo_GetNames(typeinfo, desc->memid, &str, 1, &len); if (FAILED(hr)) goto done; + len = SysStringLen(str); + hash = LHashValOfNameSys(sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32, LOCALE_USER_DEFAULT, str); + proc_list = &procedures->hash_table[hash % ARRAY_SIZE(procedures->hash_table)]; + + /* Try to find it in the hash table */ + LIST_FOR_EACH_ENTRY(proc, proc_list, ScriptProcedure, entry) + { + if (proc->hash == hash && SysStringLen(proc->name) == len && + !memcmp(proc->name, str, len * sizeof(*str))) + { + SysFreeString(str); + IScriptProcedure_AddRef(&proc->IScriptProcedure_iface); + *procedure = &proc->IScriptProcedure_iface; + goto done; + } + } + if (!(proc = heap_alloc(sizeof(*proc)))) { hr = E_OUTOFMEMORY; @@ -927,7 +952,9 @@ static HRESULT get_script_procedure(ITypeInfo *typeinfo, FUNCDESC *desc, IScript proc->IScriptProcedure_iface.lpVtbl = &ScriptProcedureVtbl; proc->ref = 1; + proc->hash = hash; proc->name = str; + list_add_tail(proc_list, &proc->entry); *procedure = &proc->IScriptProcedure_iface; @@ -970,11 +997,16 @@ static ULONG WINAPI ScriptProcedureCollection_Release(IScriptProcedureCollection { ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); LONG ref = InterlockedDecrement(&This->ref); + UINT i; TRACE("(%p) ref=%d\n", This, ref); if (!ref) { + /* Unlink any dangling items from the hash table */ + for (i = 0; i < ARRAY_SIZE(This->hash_table); i++) + list_remove(&This->hash_table[i]); + This->module->procedures = NULL; IScriptModule_Release(&This->module->IScriptModule_iface); heap_free(This); @@ -1073,12 +1105,29 @@ static HRESULT WINAPI ScriptProcedureCollection_get_Item(IScriptProcedureCollect if (V_VT(&index) == VT_BSTR) { + struct list *proc_list; + ScriptProcedure *proc; ITypeComp *comp; BINDPTR bindptr; DESCKIND kind; ULONG hash; + UINT len; + len = SysStringLen(V_BSTR(&index)); hash = LHashValOfNameSys(sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32, LOCALE_USER_DEFAULT, V_BSTR(&index)); + proc_list = &This->hash_table[hash % ARRAY_SIZE(This->hash_table)]; + + /* Try to find it in the hash table */ + LIST_FOR_EACH_ENTRY(proc, proc_list, ScriptProcedure, entry) + { + if (proc->hash == hash && SysStringLen(proc->name) == len && + !memcmp(proc->name, V_BSTR(&index), len * sizeof(WCHAR))) + { + IScriptProcedure_AddRef(&proc->IScriptProcedure_iface); + *ppdispProcedure = &proc->IScriptProcedure_iface; + return S_OK; + } + } hr = get_script_typecomp(This->module, typeinfo, &comp); if (FAILED(hr)) return hr; @@ -1089,7 +1138,7 @@ static HRESULT WINAPI ScriptProcedureCollection_get_Item(IScriptProcedureCollect switch (kind) { case DESCKIND_FUNCDESC: - hr = get_script_procedure(typeinfo, bindptr.lpfuncdesc, ppdispProcedure); + hr = get_script_procedure(This, typeinfo, bindptr.lpfuncdesc, ppdispProcedure); ITypeInfo_Release(typeinfo); return hr; case DESCKIND_IMPLICITAPPOBJ: @@ -1113,7 +1162,7 @@ static HRESULT WINAPI ScriptProcedureCollection_get_Item(IScriptProcedureCollect hr = ITypeInfo_GetFuncDesc(typeinfo, V_INT(&index) - 1, &desc); if (FAILED(hr)) return hr; - return get_script_procedure(typeinfo, desc, ppdispProcedure); + return get_script_procedure(This, typeinfo, desc, ppdispProcedure); } static HRESULT WINAPI ScriptProcedureCollection_get_Count(IScriptProcedureCollection *iface, LONG *plCount) @@ -1343,6 +1392,7 @@ static HRESULT WINAPI ScriptModule_get_Procedures(IScriptModule *iface, IScriptP else { ScriptProcedureCollection *procs; + UINT i; if (!(procs = heap_alloc(sizeof(*procs)))) return E_OUTOFMEMORY; @@ -1351,6 +1401,9 @@ static HRESULT WINAPI ScriptModule_get_Procedures(IScriptModule *iface, IScriptP procs->ref = 1; procs->count = -1; procs->module = This; + for (i = 0; i < ARRAY_SIZE(procs->hash_table); i++) + list_init(&procs->hash_table[i]); + This->procedures = procs; IScriptModule_AddRef(&This->IScriptModule_iface); } diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index ed4d0f8f99..c56e2d52a7 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3293,7 +3293,7 @@ static void test_IScriptControl_get_CodeObject(void) static void test_IScriptControl_get_Procedures(void) { IScriptProcedureCollection *procs, *procs2; - IScriptProcedure *proc; + IScriptProcedure *proc, *proc2; IScriptControl *sc; VARIANT var; LONG count; @@ -3527,10 +3527,18 @@ static void test_IScriptControl_get_Procedures(void) CHECK_CALLED(GetFuncDesc); CHECK_CALLED(GetNames); CHECK_CALLED(ReleaseFuncDesc); - IScriptProcedure_Release(proc); + /* The name is cached and not looked up with Bind anymore */ V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(custom_engine_funcs[i].name); + hr = IScriptProcedureCollection_get_Item(procs, var, &proc2); + ok(hr == S_OK, "get_Item for %s failed: 0x%08x.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); + ok(proc == proc2, "proc and proc2 are not the same for %s and index %u.\n", + wine_dbgstr_w(custom_engine_funcs[i].name), i + 1); + IScriptProcedure_Release(proc); + IScriptProcedure_Release(proc2); + + /* Since both were released, the cache entry is destroyed */ SET_EXPECT(Bind); SET_EXPECT(GetNames); SET_EXPECT(ReleaseFuncDesc);

1 0

Gabriel Ivăncescu : msscript.ocx: Implement ScriptProcedureCollection::get_Item.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: e8348bdbcc6a8cc3dd96d08c1b1f81e18497f369 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8348bdbcc6a8cc3dd96d08c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 12 17:13:40 2020 +0300 msscript.ocx: Implement ScriptProcedureCollection::get_Item. 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 | 266 ++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 64 ++++----- 2 files changed, 296 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e8348bdbcc6a8cc3dd96…

1 0

Gabriel Ivăncescu : msscript.ocx: Uncache the module objects when adding new code.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: d8e89f311952f4fa6bb0fa9da5e50170843d45b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8e89f311952f4fa6bb0fa9d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 12 17:13:39 2020 +0300 msscript.ocx: Uncache the module objects when adding new code. 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 | 23 +++++++++++++++++++---- dlls/msscript.ocx/tests/msscript.c | 10 +++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 4c737e2a54..60b641fbe5 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -277,6 +277,22 @@ static HRESULT get_script_typeinfo(ScriptModule *module, ITypeInfo **typeinfo) return S_OK; } +static void uncache_module_objects(ScriptModule *module) +{ + if (module->script_dispatch) + { + IDispatch_Release(module->script_dispatch); + module->script_dispatch = NULL; + } + if (module->script_typeinfo) + { + ITypeInfo_Release(module->script_typeinfo); + module->script_typeinfo = NULL; + } + if (module->procedures) + module->procedures->count = -1; +} + static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) { HRESULT hr; @@ -339,6 +355,8 @@ static HRESULT parse_script_text(ScriptModule *module, BSTR script_text, DWORD f hr = start_script(module->host); if (FAILED(hr)) return hr; + uncache_module_objects(module); + hr = IActiveScriptParse_ParseScriptText(module->host->parse, script_text, module->name, NULL, NULL, 0, 1, flag, res, &excepinfo); /* FIXME: more error handling */ @@ -949,10 +967,7 @@ static ULONG WINAPI ScriptModule_Release(IScriptModule *iface) { detach_module(This); SysFreeString(This->name); - if (This->script_dispatch) - IDispatch_Release(This->script_dispatch); - if (This->script_typeinfo) - ITypeInfo_Release(This->script_typeinfo); + uncache_module_objects(This); heap_free(This); } diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 9d2e78dc64..dbdb00e122 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3341,7 +3341,7 @@ static void test_IScriptControl_get_Procedures(void) hr = IScriptProcedureCollection_get_Count(procs, &count); ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); - todo_wine ok(count == 3, "count is not 3, got %d.\n", count); + ok(count == 3, "count is not 3, got %d.\n", count); V_VT(&var) = VT_I4; V_I4(&var) = 1; @@ -3454,10 +3454,10 @@ static void test_IScriptControl_get_Procedures(void) hr = IScriptProcedureCollection_get_Count(procs, &count); ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); ok(count == ARRAY_SIZE(custom_engine_funcs), "count is not %u, got %d.\n", TypeInfo_GetTypeAttr_cFuncs, count); - todo_wine CHECK_CALLED(GetScriptDispatch); - todo_wine CHECK_CALLED(GetTypeInfo); - todo_wine CHECK_CALLED(GetTypeAttr); - todo_wine CHECK_CALLED(ReleaseTypeAttr); + CHECK_CALLED(GetScriptDispatch); + CHECK_CALLED(GetTypeInfo); + CHECK_CALLED(GetTypeAttr); + CHECK_CALLED(ReleaseTypeAttr); /* Try without ITypeComp interface */ SET_EXPECT(QI_ITypeComp);

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
70
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2020