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

[PATCH 2/2] vbscript: Don't create script dispatches for items with the SCRIPTITEM_GLOBALMEMBERS flag.
by Jacek Caban 28 Feb '20

28 Feb '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 1 + dlls/vbscript/tests/vbscript.c | 97 ++++++++++++++++++++++++++++++++-- dlls/vbscript/vbscript.c | 7 ++- 3 files changed, 97 insertions(+), 8 deletions(-)

1 0

[PATCH 1/2] vbscript: Lookup host global object in interp_me instead of storing it in script context.
by Jacek Caban 28 Feb '20

28 Feb '20

Inspired by patch by Gabriel Ivăncescu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 19 +++++++++++++------ dlls/vbscript/vbscript.c | 10 ---------- dlls/vbscript/vbscript.h | 2 -- 3 files changed, 13 insertions(+), 18 deletions(-)

1 0

[PATCH v2] dsound: Make GlobalHandle() for the sound buffer failed.
by Akihiro Sagawa 28 Feb '20

28 Feb '20

In v2, remove an unreliable conformance test. It crashes on x64 Windows. I think GlobalHandle() does the right thing here because it should succeed if the buffer is allocated by GlobalAlloc(GMEM_FIXED) or HeapAlloc(). Therefore, dsound needs to be fixed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48635 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dsound/buffer.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)

2 1

[PATCH v2 2/3] msvcrt: Silence wide environment inisialization debug messages.
by Jacek Caban 28 Feb '20

28 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH v3 1/3] ucrtbase: Add exe entry points implementation.
by Jacek Caban 28 Feb '20

28 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v3: Thanks Jeff dlls/msvcrt/crt_main.c | 16 +++++++++++++++- dlls/msvcrt/crt_wmain.c | 16 +++++++++++++++- dlls/ucrtbase/Makefile.in | 5 +++++ 3 files changed, 35 insertions(+), 2 deletions(-)

1 0

[PATCH v2 1/3] ucrtbase: Add exe exntry points implementation.
by Jacek Caban 28 Feb '20

28 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/crt_main.c | 16 +++++++++++++++- dlls/msvcrt/crt_wmain.c | 16 +++++++++++++++- dlls/ucrtbase/Makefile.in | 5 +++++ 3 files changed, 35 insertions(+), 2 deletions(-)

2 1

[PATCH] vbscript/tests: Get rid of strcmp_wa()
by Michael Stefaniuc 28 Feb '20

28 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/tests/createobj.c | 13 +++---------- dlls/vbscript/tests/run.c | 15 ++++----------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index b16be88b85..34a9def89d 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -131,13 +131,6 @@ static BSTR a2bstr(const char *str) return ret; } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), 0, 0); - return lstrcmpA(buf, stra); -} - static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite *iface, REFIID riid, void **ppv) { ok(0, "unexpected call\n"); @@ -286,7 +279,7 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown static HRESULT WINAPI Test_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "reportSuccess")) { + if(!lstrcmpW(bstrName, L"reportSuccess")) { ok(grfdex == fdexNameCaseInsensitive, "grfdex = %x\n", grfdex); *pid = DISPID_TEST_REPORTSUCCESS; return S_OK; @@ -342,7 +335,7 @@ static IDispatchEx testObj = { &testObjVtbl }; static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "ok")) { + if(!lstrcmpW(bstrName, L"ok")) { ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); *pid = DISPID_GLOBAL_OK; return S_OK; @@ -620,7 +613,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC { ok(dwReturnMask == SCRIPTINFO_IUNKNOWN, "unexpected dwReturnMask %x\n", dwReturnMask); ok(!ppti, "ppti != NULL\n"); - ok(!strcmp_wa(pstrName, "test"), "pstrName = %s\n", wine_dbgstr_w(pstrName)); + ok(!lstrcmpW(pstrName, L"test"), "pstrName = %s\n", wine_dbgstr_w(pstrName)); *ppiunkItem = (IUnknown*)&globalObj; return S_OK; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 474fe1d452..6dcd13bf75 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -179,13 +179,6 @@ static BSTR a2bstr(const char *str) return ret; } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), 0, 0); - return lstrcmpA(buf, stra); -} - static const char *vt2a(VARIANT *v) { if(V_VT(v) == (VT_BYREF|VT_VARIANT)) { @@ -1040,7 +1033,7 @@ static IDispatchEx enumDisp = { &enumDispVtbl }; static HRESULT WINAPI collectionObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "reset")) { + if(!lstrcmpW(bstrName, L"reset")) { *pid = DISPID_COLLOBJ_RESET; return S_OK; } @@ -1841,7 +1834,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC ok(dwReturnMask == SCRIPTINFO_IUNKNOWN, "unexpected dwReturnMask %x\n", dwReturnMask); ok(!ppti, "ppti != NULL\n"); - if(strcmp_wa(pstrName, "test")) + if(lstrcmpW(pstrName, L"test")) ok(0, "unexpected pstrName %s\n", wine_dbgstr_w(pstrName)); *ppiunkItem = (IUnknown*)&Global; @@ -2190,7 +2183,7 @@ static void test_procedures(void) CHECK_CALLED(OnEnterScript); CHECK_CALLED(OnLeaveScript); ok(V_VT(&v) == VT_BSTR, "Expected VT_BSTR, got %s\n", vt2a(&v)); - ok(!strcmp_wa(V_BSTR(&v), "foobar"), "Wrong string, got %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"foobar"), "Wrong string, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); IDispatchEx_Release(proc); @@ -2789,7 +2782,7 @@ static void test_isexpression(void) hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); ok(V_VT(&var) == VT_BSTR, "Expected VT_BSTR, got %s\n", vt2a(&var)); - ok(!strcmp_wa(V_BSTR(&var), "foo is 42"), "Wrong string, got %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!lstrcmpW(V_BSTR(&var), L"foo is 42"), "Wrong string, got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); SysFreeString(str); -- 2.24.1

2 1

[PATCH v2 3/3] makedep: Build builtin programs with ucrt.
by Jacek Caban 28 Feb '20

28 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/makedep.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)

2 1

[PATCH 2/2] winegcc: Don't pass ld command to winebuild when building PE file.
by Jacek Caban 28 Feb '20

28 Feb '20

It's not used anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/2] winegcc: Fix passing -delayload argument to linker.
by Jacek Caban 28 Feb '20

28 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0