wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Alistair Leslie-Hughes : wininet: Update session username/password when cached credentials are used.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: 03d19f4be2d8598546b5ce13b5aa32ed1ecdf986 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03d19f4be2d8598546b5ce13… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Sep 15 23:23:26 2019 +0000 wininet: Update session username/password when cached credentials are used. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 20 +++++++++++++++++--- dlls/wininet/tests/http.c | 8 ++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ad01420d45..5844a7c7d6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -853,7 +853,7 @@ static void destroy_authinfo( struct HttpAuthInfo *authinfo ) heap_free(authinfo); } -static UINT retrieve_cached_basic_authorization(const WCHAR *host, const WCHAR *realm, char **auth_data) +static UINT retrieve_cached_basic_authorization(http_request_t *req, const WCHAR *host, const WCHAR *realm, char **auth_data) { basicAuthorizationData *ad; UINT rc = 0; @@ -865,10 +865,24 @@ static UINT retrieve_cached_basic_authorization(const WCHAR *host, const WCHAR * { if (!strcmpiW(host, ad->host) && (!realm || !strcmpW(realm, ad->realm))) { + char *colon; + DWORD length; + TRACE("Authorization found in cache\n"); *auth_data = heap_alloc(ad->authorizationLen); memcpy(*auth_data,ad->authorization,ad->authorizationLen); rc = ad->authorizationLen; + + /* update session username and password to reflect current credentials */ + colon = strchr(ad->authorization, ':'); + length = colon - ad->authorization; + + heap_free(req->session->userName); + heap_free(req->session->password); + + req->session->userName = heap_strndupAtoW(ad->authorization, length, &length); + length++; + req->session->password = heap_strndupAtoW(&ad->authorization[length], ad->authorizationLen - length, &length); break; } } @@ -1144,7 +1158,7 @@ static BOOL HTTP_DoAuthorization( http_request_t *request, LPCWSTR pszAuthValue, if (!domain_and_username) { if (host && szRealm) - auth_data_len = retrieve_cached_basic_authorization(host, szRealm,&auth_data); + auth_data_len = retrieve_cached_basic_authorization(request, host, szRealm,&auth_data); if (auth_data_len == 0) { heap_free(szRealm); @@ -1660,7 +1674,7 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn UINT data_len; char *data; - if ((data_len = retrieve_cached_basic_authorization(host, NULL, &data))) + if ((data_len = retrieve_cached_basic_authorization(request, host, NULL, &data))) { TRACE("Found cached basic authorization for %s\n", debugstr_w(host)); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 80d2aad9f4..b61d5c7030 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4481,15 +4481,15 @@ static void test_basic_auth_credentials_reuse(int port) SetLastError(0xdeadbeef); ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); ok(ret, "unexpected failure %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "user"), "got %s\n", buffer); - todo_wine ok(size == 4, "got %u\n", size); + ok(!strcmp(buffer, "user"), "got %s\n", buffer); + ok(size == 4, "got %u\n", size); size = sizeof(buffer); SetLastError(0xdeadbeef); ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); ok(ret, "unexpected failure %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); - todo_wine ok(size == 3, "got %u\n", size); + ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); + ok(size == 3, "got %u\n", size); status = 0xdeadbeef; size = sizeof(status);

1 0

Alistair Leslie-Hughes : wininet: Pass correct server name when retrieving username information.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: 7d8d703d9b41801b03bd92fcfe78f899b3291d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d8d703d9b41801b03bd92fc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 17 00:14:04 2019 +0000 wininet: Pass correct server name when retrieving username information. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/dialogs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index b4aa49c0eb..5e26c8b7b4 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -216,7 +216,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( { HWND hitem; struct WININET_ErrorDlgParams *params; - WCHAR szRealm[0x80], szServer[0x80]; + WCHAR szRealm[0x80]; if( uMsg == WM_INITDIALOG ) { @@ -237,7 +237,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( hitem = GetDlgItem( hdlg, IDC_PROXY ); SetWindowTextW( hitem, params->req->session->appInfo->proxy ); - WININET_GetSetPassword( hdlg, szServer, szRealm, FALSE ); + WININET_GetSetPassword( hdlg, params->req->session->appInfo->proxy, szRealm, FALSE ); return TRUE; } @@ -291,7 +291,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( { HWND hitem; struct WININET_ErrorDlgParams *params; - WCHAR szRealm[0x80], szServer[0x80]; + WCHAR szRealm[0x80]; if( uMsg == WM_INITDIALOG ) { @@ -312,7 +312,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( hitem = GetDlgItem( hdlg, IDC_SERVER ); SetWindowTextW( hitem, params->req->session->hostName ); - WININET_GetSetPassword( hdlg, szServer, szRealm, FALSE ); + WININET_GetSetPassword( hdlg, params->req->session->hostName, szRealm, FALSE ); return TRUE; }

1 0

Andrew Eikum : winex11.drv: Throttle calls to XResetScreenSaver.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: cb703739e5c138e3beffab321b84edb129156000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb703739e5c138e3beffab32… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 17 08:09:36 2019 -0500 winex11.drv: Throttle calls to XResetScreenSaver. Frequent calls to XResetScreenSaver cause performance problems on some GPU drivers, see https://bugs.freedesktop.org/show_bug.cgi?id=110659 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index fb97ec5a0d..c97cc6a9e0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1793,10 +1793,20 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, switch (msg) { case WM_WINE_NOTIFY_ACTIVITY: - XResetScreenSaver( gdi_display ); - XFlush( gdi_display ); + { + static ULONGLONG last = 0; + ULONGLONG now = GetTickCount64(); + /* calling XResetScreenSaver too often can cause performance + * problems, so throttle it */ + if (now > last + 5000) + { + XResetScreenSaver( gdi_display ); + XFlush( gdi_display ); + last = now; + } break; } + } return desktop_orig_wndproc( hwnd, msg, wp, lp ); }

1 0

Gabriel Ivăncescu : vbscript/tests: Add test for ParseProcedureText with the SCRIPTPROC_ISEXPRESSION flag.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: f05dd8cba518f32e1060615e1920a2e776062f55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f05dd8cba518f32e1060615e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 17 15:54:34 2019 +0300 vbscript/tests: Add test for ParseProcedureText with the SCRIPTPROC_ISEXPRESSION flag. 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/vbscript/tests/run.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 1159daab38..8e51e3c966 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1973,7 +1973,7 @@ static void _parse_htmlscript_a(unsigned line, const char *src) ok_(__FILE__,line)(hres == S_OK, "parse_script failed: %08x\n", hres); } -static IDispatchEx *parse_procedure(IActiveScriptParseProcedure2 *parse_proc, const char *src) +static IDispatchEx *parse_procedure(IActiveScriptParseProcedure2 *parse_proc, const char *src, DWORD flags) { IDispatchEx *dispex; IDispatch *disp; @@ -1984,7 +1984,7 @@ static IDispatchEx *parse_procedure(IActiveScriptParseProcedure2 *parse_proc, co str = a2bstr(src); hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, str, NULL, emptyW, NULL, NULL, delimiterW, 0, 0, - SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp); + SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS|flags, &disp); SysFreeString(str); ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); ok(disp != NULL, "disp = NULL\n"); @@ -2012,12 +2012,20 @@ static void test_procedures(void) hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2 iface: %08x\n", hres); - proc = parse_procedure(parse_proc, "dim x\nif true then x=false"); + proc = parse_procedure(parse_proc, "dim x\nif true then x=false", 0); V_VT(&v) = VT_EMPTY; hres = IDispatchEx_InvokeEx(proc, DISPID_VALUE, 0, DISPATCH_METHOD, &dp, &v, &ei, &caller_sp); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + VariantClear(&v); + IDispatchEx_Release(proc); + proc = parse_procedure(parse_proc, "\"foobar\"", SCRIPTPROC_ISEXPRESSION); + hres = IDispatchEx_InvokeEx(proc, DISPID_VALUE, 0, DISPATCH_METHOD, &dp, &v, &ei, &caller_sp); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + 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))); + VariantClear(&v); IDispatchEx_Release(proc); IActiveScriptParseProcedure2_Release(parse_proc);

1 0

Gabriel Ivăncescu : vbscript: Add support for the SCRIPTPROC_ISEXPRESSION flag in ParseProcedureText.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: ce9ef827f886e1cc3873b4064e9b3a17a29aae34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9ef827f886e1cc3873b406… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 17 15:54:33 2019 +0300 vbscript: Add support for the SCRIPTPROC_ISEXPRESSION flag in ParseProcedureText. 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/vbscript/vbdisp.c | 2 +- include/activscp.idl | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index a907f40bea..0f6209f43e 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -626,7 +626,7 @@ static HRESULT Procedure_invoke(vbdisp_t *This, VARIANT *args, unsigned args_cnt TRACE("\n"); IActiveScriptSite_OnEnterScript(ctx->site); - hres = exec_script(ctx, This->desc->value_func, NULL, NULL, NULL); + hres = exec_script(ctx, This->desc->value_func, NULL, NULL, res); IActiveScriptSite_OnLeaveScript(ctx->site); return hres; diff --git a/include/activscp.idl b/include/activscp.idl index 57179cf52f..97e7f5b6cb 100644 --- a/include/activscp.idl +++ b/include/activscp.idl @@ -113,10 +113,12 @@ cpp_quote(" SCRIPTTEXT_ISVISIBLE | \\") cpp_quote(" SCRIPTTEXT_ISEXPRESSION | \\") cpp_quote(" SCRIPTTEXT_ISPERSISTENT | \\") cpp_quote(" SCRIPTTEXT_HOSTMANAGESSOURCE)") +cpp_quote("#define SCRIPTPROC_ISEXPRESSION 0x00000020") cpp_quote("#define SCRIPTPROC_HOSTMANAGESSOURCE 0x00000080") cpp_quote("#define SCRIPTPROC_IMPLICIT_THIS 0x00000100") cpp_quote("#define SCRIPTPROC_IMPLICIT_PARENTS 0x00000200") -cpp_quote("#define SCRIPTPROC_ALL_FLAGS (SCRIPTPROC_HOSTMANAGESSOURCE | \\") +cpp_quote("#define SCRIPTPROC_ALL_FLAGS (SCRIPTPROC_ISEXPRESSION | \\") +cpp_quote(" SCRIPTPROC_HOSTMANAGESSOURCE | \\") cpp_quote(" SCRIPTPROC_IMPLICIT_THIS | \\") cpp_quote(" SCRIPTPROC_IMPLICIT_PARENTS)") cpp_quote("#define SCRIPTINFO_IUNKNOWN 0x00000001")

1 0

Gabriel Ivăncescu : vbscript/tests: Add tests for ParseScriptText with the SCRIPTTEXT_ISEXPRESSION flag.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: 9dda8ca67a2fd9dfd5abccaaf5f542f16e43ce69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dda8ca67a2fd9dfd5abccaa… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 17 15:54:32 2019 +0300 vbscript/tests: Add tests for ParseScriptText with the SCRIPTTEXT_ISEXPRESSION flag. 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/vbscript/tests/run.c | 151 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 145 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index f10a42bb47..1159daab38 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1792,7 +1792,7 @@ static IActiveScript *create_script(void) return script; } -static IActiveScript *create_and_init_script(DWORD flags) +static IActiveScript *create_and_init_script(DWORD flags, BOOL start) { IActiveScriptParse *parser; IActiveScript *engine; @@ -1817,8 +1817,11 @@ static IActiveScript *create_and_init_script(DWORD flags) SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|flags); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); - hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); - ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + if (start) + { + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + } return engine; } @@ -1843,7 +1846,7 @@ static HRESULT parse_script(DWORD flags, BSTR script_str, const WCHAR *delim) LONG ref; HRESULT hres; - engine = create_and_init_script(flags); + engine = create_and_init_script(flags, TRUE); if(!engine) return S_OK; @@ -1907,7 +1910,7 @@ static void test_parse_context(void) static const WCHAR yW[] = {'y',0}; global_ref = 1; - engine = create_and_init_script(0); + engine = create_and_init_script(0, TRUE); if(!engine) return; @@ -2004,7 +2007,7 @@ static void test_procedures(void) VARIANT v; HRESULT hres; - script = create_and_init_script(0); + script = create_and_init_script(0, TRUE); hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2 iface: %08x\n", hres); @@ -2239,6 +2242,141 @@ static HRESULT test_global_vars_ref(BOOL use_close) return hres; } +static void test_isexpression(void) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + SCRIPTSTATE ss; + HRESULT hres; + VARIANT var; + BSTR str; + + if (!(engine = create_and_init_script(0, FALSE))) + return; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + if (FAILED(hres)) + { + close_script(engine); + return; + } + + /* Expression when script is not started is still executed */ + hres = IActiveScript_GetScriptState(engine, &ss); + ok(hres == S_OK, "GetScriptState failed: %08x\n", hres); + ok(ss == SCRIPTSTATE_INITIALIZED, "Wrong script state %u\n", ss); + + str = a2bstr("13"); + 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_I2, "Expected VT_I2, got %s\n", vt2a(&var)); + ok(V_I2(&var) == 13, "Expected 13, got %d\n", V_I2(&var)); + VariantClear(&var); + SysFreeString(str); + + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + /* Empty expressions */ + V_VT(&var) = VT_I2; + str = a2bstr(""); + 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_EMPTY, "Expected VT_EMPTY, got %s\n", vt2a(&var)); + VariantClear(&var); + SysFreeString(str); + + /* Two expressions fail */ + str = a2bstr("1\n3"); + SET_EXPECT(OnScriptError); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); + ok(FAILED(hres), "ParseScriptText did not fail: %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); + VariantClear(&var); + SysFreeString(str); + + /* Simple numerical expression */ + str = a2bstr("(1 + 7) * 2 - 3"); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + 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_I2, "Expected VT_I2, got %s\n", vt2a(&var)); + ok(V_I2(&var) == 13, "Expected 13, got %d\n", V_I2(&var)); + VariantClear(&var); + SysFreeString(str); + + /* An expression can also refer to a variable, function, class, etc previously set */ + V_VT(&var) = VT_I2; + str = a2bstr("If True Then foo = 42 Else foo = 0\n"); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, &var, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + ok(V_VT(&var) == VT_EMPTY, "Expected VT_EMPTY, got %s\n", vt2a(&var)); + VariantClear(&var); + SysFreeString(str); + + str = a2bstr("foo\n\n"); + 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_I2, "Expected VT_I2, got %s\n", vt2a(&var)); + ok(V_I2(&var) == 42, "Expected 42, got %d\n", V_I2(&var)); + VariantClear(&var); + SysFreeString(str); + + str = a2bstr("foo : "); + SET_EXPECT(OnScriptError); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); + ok(FAILED(hres), "ParseScriptText did not fail: %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); + VariantClear(&var); + SysFreeString(str); + + str = a2bstr("\"foo is \" & CStr(foo) \n \n\n "); + 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))); + VariantClear(&var); + SysFreeString(str); + + str = a2bstr("Function test(x)\n" + " test = x + 0.5\n" + "End Function\n"); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("test(4) * 3\n"); + 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_R8, "Expected VT_R8, got %s\n", vt2a(&var)); + ok(V_R8(&var) == 13.5, "Expected %lf, got %lf\n", 13.5, V_R8(&var)); + VariantClear(&var); + SysFreeString(str); + + str = a2bstr("Class C\n" + " Public x\n" + "End Class\n" + "Set obj = New C\n" + "obj.x = True\n"); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("obj.x"); + 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_BOOL, "Expected VT_BOOL, got %s\n", vt2a(&var)); + ok(V_BOOL(&var) == VARIANT_TRUE, "Expected %x, got %x\n", VARIANT_TRUE, V_BOOL(&var)); + VariantClear(&var); + SysFreeString(str); + + IActiveScriptParse_Release(parser); + close_script(engine); +} + static BSTR get_script_from_file(const char *filename) { DWORD size, len; @@ -2556,6 +2694,7 @@ static void run_tests(void) test_procedures(); test_gc(); test_msgbox(); + test_isexpression(); test_parse_errors(); test_parse_context(); }

1 0

Gabriel Ivăncescu : vbscript: Add support for the SCRIPTTEXT_ISEXPRESSION flag in ParseScriptText.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: 8037b130784f8a2a1d6052c38f72c532c2dcbd32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8037b130784f8a2a1d6052c3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 17 15:54:31 2019 +0300 vbscript: Add support for the SCRIPTTEXT_ISEXPRESSION flag in ParseScriptText. To simplify the amount of special cases both in ParseScriptText and ParseProcedureText, add a new pseudo statement and opcode to return the expression and value at the top of the stack, respectively. Script texts that have this flag will be parsed specially as a single expression with such a statement at the end. 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/vbscript/compile.c | 22 ++++++++++++++++++++-- dlls/vbscript/interp.c | 26 ++++++++++++++++++++++++-- dlls/vbscript/lex.c | 6 ++++++ dlls/vbscript/parse.h | 10 ++++++++-- dlls/vbscript/parser.y | 31 ++++++++++++++++++++++++++++--- dlls/vbscript/vbscript.c | 14 +++++++------- dlls/vbscript/vbscript.h | 3 ++- 7 files changed, 95 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8037b130784f8a2a1d60…

1 0

Alex Henrie : windowscodecs: Avoid dead assignment (scan-build).
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: f3c1123aec2c762c7ed051cd57ecd4da7d26f7d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3c1123aec2c762c7ed051cd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 15 23:40:31 2019 -0600 windowscodecs: Avoid dead assignment (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 0a44c1e5c8..7934042754 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -242,7 +242,6 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc bstr = next_token.u.bstrVal; end++; - p = end; while (*end && *end != '}' && end - start < elem->len) { if (*end == '\\') end++;

1 0

Alexandre Julliard : kernel32: Move some locale functions to kernelbase.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: 7c0032b62a7e744cdd597a44639b6dfd605c034d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0032b62a7e744cdd597a44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 17 18:14:49 2019 +0200 kernel32: Move some locale functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 34 ++--- dlls/kernel32/locale.c | 329 ---------------------------------------- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.spec | 34 ++--- dlls/kernelbase/locale.c | 225 +++++++++++++++++++++++++++ dlls/kernelbase/thread.c | 43 ++++++ 6 files changed, 303 insertions(+), 363 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7c0032b62a7e744cdd59…

1 0

Alexandre Julliard : kernel32: Move some path functions to kernelbase.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: e3e1bede1b326243b63618a27404bc53255c30f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3e1bede1b326243b63618a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 17 16:19:03 2019 +0200 kernel32: Move some path functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 30 +- dlls/kernel32/path.c | 619 ---------------------------------------- dlls/kernelbase/file.c | 556 ++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 30 +- 4 files changed, 586 insertions(+), 649 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e3e1bede1b326243b636…

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
63
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 September 2019