wine-devel September 2019

wine-devel@winehq.org

76 participants
616 discussions

[PATCH] winex11.drv: Throttle calls to XResetScreenSaver
by Andrew Eikum 17 Sep '19

17 Sep '19

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> --- 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 fb97ec5a0d4..c97cc6a9e0b 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 ); } -- 2.23.0

1 0

[PATCH 5/5] wbemprox: Implement Win32_WinSAT.
by Hans Leidekker 17 Sep '19

17 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 49 +++++++++++++++++++++++++++++++- dlls/wbemprox/tests/query.c | 56 +++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 556f149346..9ee7762b5b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -116,6 +116,8 @@ static const WCHAR class_systemenclosureW[] = {'W','i','n','3','2','_','S','y','s','t','e','m','E','n','c','l','o','s','u','r','e',0}; static const WCHAR class_videocontrollerW[] = {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; +static const WCHAR class_winsatW[] = + {'W','i','n','3','2','_','W','i','n','S','A','T',0}; static const WCHAR prop_accountnameW[] = {'A','c','c','o','u','n','t','N','a','m','e',0}; @@ -175,6 +177,8 @@ static const WCHAR prop_configuredclockspeedW[] = {'C','o','n','f','i','g','u','r','e','d','C','l','o','c','k','S','p','e','e','d',0}; static const WCHAR prop_countrycodeW[] = {'C','o','u','n','t','r','y','C','o','d','e',0}; +static const WCHAR prop_cpuscoreW[] = + {'C','P','U','S','c','o','r','e',0}; static const WCHAR prop_cpustatusW[] = {'C','p','u','S','t','a','t','u','s',0}; static const WCHAR prop_csdversionW[] = @@ -197,6 +201,8 @@ static const WCHAR prop_currenttimezoneW[] = {'C','u','r','r','e','n','t','T','i','m','e','Z','o','n','e',0}; static const WCHAR prop_currentverticalresW[] = {'C','u','r','r','e','n','t','V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; +static const WCHAR prop_d3dscoreW[] = + {'D','3','D','S','c','o','r','e',0}; static const WCHAR prop_datawidthW[] = {'D','a','t','a','W','i','d','t','h',0}; static const WCHAR prop_defaultipgatewayW[] = @@ -217,6 +223,8 @@ static const WCHAR prop_dhcpenabledW[] = {'D','H','C','P','E','n','a','b','l','e','d',0}; static const WCHAR prop_directionW[] = {'D','i','r','e','c','t','i','o','n',0}; +static const WCHAR prop_diskscoreW[] = + {'D','i','s','k','S','c','o','r','e',0}; static const WCHAR prop_displaynameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR prop_diskindexW[] = @@ -251,6 +259,8 @@ static const WCHAR prop_freephysicalmemoryW[] = {'F','r','e','e','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; +static const WCHAR prop_graphicsscoreW[] = + {'G','r','a','p','h','i','c','s','S','c','o','r','e',0}; static const WCHAR prop_horizontalresolutionW[] = {'H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_idW[] = @@ -303,6 +313,8 @@ static const WCHAR prop_mediatypeW[] = {'M','e','d','i','a','T','y','p','e',0}; static const WCHAR prop_memberW[] = {'M','e','m','b','e','r',0}; +static const WCHAR prop_memoryscoreW[] = + {'M','e','m','o','r','y','S','c','o','r','e',0}; static const WCHAR prop_memorytypeW[] = {'M','e','m','o','r','y','T','y','p','e',0}; static const WCHAR prop_methodW[] = @@ -413,6 +425,8 @@ static const WCHAR prop_tagW[] = {'T','a','g',0}; static const WCHAR prop_threadcountW[] = {'T','h','r','e','a','d','C','o','u','n','t',0}; +static const WCHAR prop_timetakenW[] = + {'T','i','m','e','T','a','k','e','n',0}; static const WCHAR prop_totalphysicalmemoryW[] = {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR prop_totalvirtualmemorysizeW[] = @@ -445,6 +459,10 @@ static const WCHAR prop_volumenameW[] = {'V','o','l','u','m','e','N','a','m','e',0}; static const WCHAR prop_volumeserialnumberW[] = {'V','o','l','u','m','e','S','e','r','i','a','l','N','u','m','b','e','r',0}; +static const WCHAR prop_winsatassessmentstateW[] = + {'W','i','n','S','A','T','A','s','s','e','s','s','m','e','n','t','S','t','a','t','e',0}; +static const WCHAR prop_winsprlevelW[] = + {'W','i','n','S','P','R','L','e','v','e','l',0}; static const WCHAR prop_workingsetsizeW[] = {'W','o','r','k','i','n','g','S','e','t','S','i','z','e',0}; @@ -802,6 +820,17 @@ static const struct column col_videocontroller[] = { prop_videomodedescriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_videoprocessorW, CIM_STRING|COL_FLAG_DYNAMIC }, }; +static const struct column col_winsat[] = +{ + { prop_cpuscoreW, CIM_REAL32 }, + { prop_d3dscoreW, CIM_REAL32 }, + { prop_diskscoreW, CIM_REAL32 }, + { prop_graphicsscoreW, CIM_REAL32 }, + { prop_memoryscoreW, CIM_REAL32 }, + { prop_timetakenW, CIM_STRING|COL_FLAG_KEY }, + { prop_winsatassessmentstateW, CIM_UINT32, VT_I4 }, + { prop_winsprlevelW, CIM_REAL32 }, +}; static const WCHAR baseboard_manufacturerW[] = {'I','n','t','e','l',' ','C','o','r','p','o','r','a','t','i','o','n',0}; @@ -897,6 +926,8 @@ static const WCHAR videocontroller_driverversionW[] = {'1','.','0',0}; static const WCHAR videocontroller_statusW[] = {'O','K',0}; +static const WCHAR winsat_timetakenW[] = + {'M','o','s','t','R','e','c','e','n','t','A','s','s','e','s','s','m','e','n','t',0}; #include "pshpack1.h" struct record_associator @@ -1252,6 +1283,17 @@ struct record_videocontroller const WCHAR *videomodedescription; const WCHAR *videoprocessor; }; +struct record_winsat +{ + FLOAT cpuscore; + FLOAT d3dscore; + FLOAT diskscrore; + FLOAT graphicsscore; + FLOAT memoryscore; + const WCHAR *timetaken; + UINT32 winsatassessmentstate; + FLOAT winsprlevel; +}; #include "poppack.h" static const struct record_associator data_associator[] = @@ -1325,6 +1367,10 @@ static const struct record_systemsecurity data_systemsecurity[] = { { security_get_sd, security_set_sd } }; +static const struct record_winsat data_winsat[] = +{ + { 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, winsat_timetakenW, 1 /* Valid */, 8.0f }, +}; /* check if row matches condition and update status */ static BOOL match_row( const struct table *table, UINT row, const struct expr *cond, enum fill_status *status ) @@ -4360,7 +4406,8 @@ static struct table builtin_classes[] = { class_stdregprovW, C(col_stdregprov), D(data_stdregprov) }, { class_systemsecurityW, C(col_systemsecurity), D(data_systemsecurity) }, { class_systemenclosureW, C(col_systemenclosure), 0, 0, NULL, fill_systemenclosure }, - { class_videocontrollerW, C(col_videocontroller), 0, 0, NULL, fill_videocontroller } + { class_videocontrollerW, C(col_videocontroller), 0, 0, NULL, fill_videocontroller }, + { class_winsatW, C(col_winsat), D(data_winsat) }, }; #undef C #undef D diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index b1d15c0669..d2fe9dbad8 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -339,6 +339,9 @@ static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *pro case VT_I4: trace( "%s: %d\n", wine_dbgstr_w(prop), V_I4(&val) ); break; + case VT_R4: + trace( "%s: %f\n", wine_dbgstr_w(prop), V_R4(&val) ); + break; default: break; } @@ -1643,6 +1646,58 @@ static void test_Win32_PnPEntity( IWbemServices *services ) IEnumWbemClassObject_Release( enm ); } +static void test_Win32_WinSAT( IWbemServices *services ) +{ + static const WCHAR cpuscoreW[] = + {'C','P','U','S','c','o','r','e',0}; + static const WCHAR d3dscoreW[] = + {'D','3','D','S','c','o','r','e',0}; + static const WCHAR diskscoreW[] = + {'D','i','s','k','S','c','o','r','e',0}; + static const WCHAR graphicsscoreW[] = + {'G','r','a','p','h','i','c','s','S','c','o','r','e',0}; + static const WCHAR memoryscoreW[] = + {'M','e','m','o','r','y','S','c','o','r','e',0}; + static const WCHAR winsatassessmentstateW[] = + {'W','i','n','S','A','T','A','s','s','e','s','s','m','e','n','t','S','t','a','t','e',0}; + static const WCHAR winsprlevelW[] = + {'W','i','n','S','P','R','L','e','v','e','l',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','W','i','n','S','A','T',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK || broken(hr == WBEM_E_INVALID_CLASS) /* win2k8 */, "got %08x\n", hr ); + if (hr == WBEM_E_INVALID_CLASS) + { + win_skip( "class not found\n" ); + return; + } + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, cpuscoreW, VT_R4, CIM_REAL32 ); + check_property( obj, d3dscoreW, VT_R4, CIM_REAL32 ); + check_property( obj, diskscoreW, VT_R4, CIM_REAL32 ); + check_property( obj, graphicsscoreW, VT_R4, CIM_REAL32 ); + check_property( obj, memoryscoreW, VT_R4, CIM_REAL32 ); + check_property( obj, winsatassessmentstateW, VT_I4, CIM_UINT32 ); + check_property( obj, winsprlevelW, VT_R4, CIM_REAL32 ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1693,6 +1748,7 @@ START_TEST(query) test_Win32_Service( services ); test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); + test_Win32_WinSAT( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.20.1

2 1

[PATCH 1/4] vbscript: Add support for the SCRIPTTEXT_ISEXPRESSION flag in ParseScriptText.
by Gabriel Ivăncescu 17 Sep '19

17 Sep '19

To simplify the amount of special cases both in ParseScriptText and ParseProcedureText, a new pseudo statement and opcode have been added 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> --- dlls/vbscript/compile.c | 22 ++++++++++++++++++++-- dlls/vbscript/interp.c | 29 +++++++++++++++++++++++++++-- dlls/vbscript/lex.c | 7 +++++++ dlls/vbscript/parse.h | 11 +++++++++-- dlls/vbscript/parser.y | 37 ++++++++++++++++++++++++++++++++++--- dlls/vbscript/vbscript.c | 14 +++++++------- dlls/vbscript/vbscript.h | 3 ++- 7 files changed, 106 insertions(+), 17 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 1f4a7d3..0527297 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1196,6 +1196,21 @@ static HRESULT compile_onerror_statement(compile_ctx_t *ctx, onerror_statement_t return push_instr_int(ctx, OP_errmode, stat->resume_next); } +static HRESULT compile_retval_statement(compile_ctx_t *ctx, retval_statement_t *stat) +{ + HRESULT hres; + + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + hres = push_instr(ctx, OP_retval); + if(FAILED(hres)) + return hres; + + return S_OK; +} + static HRESULT compile_statement(compile_ctx_t *ctx, statement_ctx_t *stat_ctx, statement_t *stat) { HRESULT hres; @@ -1267,6 +1282,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_ctx_t *stat_ctx, case STAT_WHILELOOP: hres = compile_while_statement(ctx, (while_statement_t*)stat); break; + case STAT_RETVAL: + hres = compile_retval_statement(ctx, (retval_statement_t*)stat); + break; default: FIXME("Unimplemented statement type %d\n", stat->type); hres = E_NOTIMPL; @@ -1795,7 +1813,7 @@ static void release_compiler(compile_ctx_t *ctx) release_vbscode(ctx->code); } -HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, vbscode_t **ret) +HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD flags, vbscode_t **ret) { function_t *new_func; function_decl_t *func_decl; @@ -1804,7 +1822,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli vbscode_t *code; HRESULT hres; - hres = parse_script(&ctx.parser, src, delimiter); + hres = parse_script(&ctx.parser, src, delimiter, flags); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 629e833..26aeab3 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1258,6 +1258,33 @@ static HRESULT interp_ret(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_retval(exec_ctx_t *ctx) +{ + variant_val_t val; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + + if(val.owned) + ctx->ret_val = *val.v; + else { + VARIANT v; + + V_VT(&v) = VT_EMPTY; + hres = VariantCopy(&v, val.v); + if(FAILED(hres)) + return hres; + + ctx->ret_val = v; + } + + return S_OK; +} + static HRESULT interp_stop(exec_ctx_t *ctx) { WARN("\n"); @@ -2179,8 +2206,6 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP } assert(!exec.top); - if(func->type != FUNC_FUNCTION && func->type != FUNC_PROPGET && func->type != FUNC_DEFGET) - assert(V_VT(&exec.ret_val) == VT_EMPTY); if(SUCCEEDED(hres) && res) { *res = exec.ret_val; diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 4bcf810..d527c35 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -493,6 +493,13 @@ int parser_lex(void *lval, parser_ctx_t *ctx) { int ret; + if (ctx->start_token) + { + int tmp = ctx->start_token; + ctx->start_token = 0; + return tmp; + } + while(1) { ret = parse_next_token(lval, ctx); if(ret == '_') { diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 867d45f..174ec91 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -118,7 +118,8 @@ typedef enum { STAT_STOP, STAT_UNTIL, STAT_WHILE, - STAT_WHILELOOP + STAT_WHILELOOP, + STAT_RETVAL } statement_type_t; typedef struct _statement_t { @@ -248,6 +249,11 @@ typedef struct { case_clausule_t *case_clausules; } select_statement_t; +typedef struct { + statement_t stat; + expression_t *expr; +} retval_statement_t; + typedef struct { const WCHAR *code; const WCHAR *ptr; @@ -258,6 +264,7 @@ typedef struct { BOOL is_html; HRESULT hres; + int start_token; int last_token; unsigned last_nl; @@ -268,7 +275,7 @@ typedef struct { heap_pool_t heap; } parser_ctx_t; -HRESULT parse_script(parser_ctx_t*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; +HRESULT parse_script(parser_ctx_t*,const WCHAR*,const WCHAR*,DWORD) DECLSPEC_HIDDEN; void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN; int parser_lex(void*,parser_ctx_t*) DECLSPEC_HIDDEN; void *parser_alloc(parser_ctx_t*,size_t) DECLSPEC_HIDDEN; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index d4f5eb3..91ac0ed 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -28,6 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static int parser_error(parser_ctx_t *,const char*); static void parse_complete(parser_ctx_t*,BOOL); +static void handle_isexpression_script(parser_ctx_t *ctx, expression_t *expr); static void source_add_statement(parser_ctx_t*,statement_t*); static void source_add_class(parser_ctx_t*,class_decl_t*); @@ -81,7 +82,9 @@ static statement_t *link_statements(statement_t*,statement_t*); %lex-param { parser_ctx_t *ctx } %parse-param { parser_ctx_t *ctx } %pure-parser -%start Program +%start Start +%token START_PROGRAM +%token START_EXPRESSION %union { const WCHAR *string; @@ -123,7 +126,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %token <dbl> tDouble %type <statement> Statement SimpleStatement StatementNl StatementsNl StatementsNl_opt BodyStatements IfStatement Else_opt -%type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression +%type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression ExpressionNl_opt %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression %type <expression> ConstExpression NumericLiteralExpression @@ -143,6 +146,10 @@ static statement_t *link_statements(statement_t*,statement_t*); %% +Start + : START_PROGRAM Program + | START_EXPRESSION ExpressionNl_opt tEOF { handle_isexpression_script(ctx, $2); } + Program : OptionExplicit_opt SourceElements tEOF { parse_complete(ctx, $1); } @@ -155,6 +162,10 @@ SourceElements | SourceElements StatementNl { source_add_statement(ctx, $2); } | SourceElements ClassDeclaration { source_add_class(ctx, $2); } +ExpressionNl_opt + : /* empty */ { $$ = NULL; } + | Expression tNL { $$ = $1; } + BodyStatements : /* empty */ { $$ = NULL; } | Statement { $$ = $1; } @@ -553,6 +564,22 @@ static void parse_complete(parser_ctx_t *ctx, BOOL option_explicit) ctx->option_explicit = option_explicit; } +static void handle_isexpression_script(parser_ctx_t *ctx, expression_t *expr) +{ + retval_statement_t *stat; + + ctx->parse_complete = TRUE; + if(!expr) + return; + + stat = new_statement(ctx, STAT_RETVAL, sizeof(*stat)); + if(!stat) + return; + + stat->expr = expr; + ctx->stats = &stat->stat; +} + static void *new_expression(parser_ctx_t *ctx, expression_type_t type, size_t size) { expression_t *expr; @@ -1033,7 +1060,7 @@ void *parser_alloc(parser_ctx_t *ctx, size_t size) return ret; } -HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter) +HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter, DWORD flags) { static const WCHAR html_delimiterW[] = {'<','/','s','c','r','i','p','t','>',0}; @@ -1045,6 +1072,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite ctx->parse_complete = FALSE; ctx->hres = S_OK; + ctx->start_token = START_PROGRAM; ctx->last_token = tNL; ctx->last_nl = 0; ctx->stats = ctx->stats_tail = NULL; @@ -1052,6 +1080,9 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite ctx->option_explicit = FALSE; ctx->is_html = delimiter && !wcsicmp(delimiter, html_delimiterW); + if(flags & SCRIPTTEXT_ISEXPRESSION) + ctx->start_token = START_EXPRESSION; + parser_parse(ctx); if(FAILED(ctx->hres)) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index aa90b94..aa768a5 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -76,14 +76,14 @@ static inline BOOL is_started(VBScript *This) || This->state == SCRIPTSTATE_DISCONNECTED; } -static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code) +static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res) { HRESULT hres; code->pending_exec = FALSE; IActiveScriptSite_OnEnterScript(ctx->site); - hres = exec_script(ctx, &code->main_code, NULL, NULL, NULL); + hres = exec_script(ctx, &code->main_code, NULL, NULL, res); IActiveScriptSite_OnLeaveScript(ctx->site); return hres; @@ -95,7 +95,7 @@ static void exec_queued_code(script_ctx_t *ctx) LIST_FOR_EACH_ENTRY(iter, &ctx->code_list, vbscode_t, entry) { if(iter->pending_exec) - exec_global_code(ctx, iter); + exec_global_code(ctx, iter, NULL); } } @@ -719,19 +719,19 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, } } - hres = compile_script(This->ctx, pstrCode, pstrDelimiter, &code); + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, dwFlags, &code); if(FAILED(hres)) return hres; if(context) IDispatch_AddRef(code->context = context); - if(!is_started(This)) { + if(!(dwFlags & SCRIPTTEXT_ISEXPRESSION) && !is_started(This)) { code->pending_exec = TRUE; return S_OK; } - return exec_global_code(This->ctx, code); + return exec_global_code(This->ctx, code, pvarResult); } static const IActiveScriptParseVtbl VBScriptParseVtbl = { @@ -782,7 +782,7 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, pstrDelimiter, &code); + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, dwFlags, &code); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 2d78d5a..c9018c4 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -270,6 +270,7 @@ typedef enum { X(or, 1, 0, 0) \ X(pop, 1, ARG_UINT, 0) \ X(ret, 0, 0, 0) \ + X(retval, 1, 0, 0) \ X(set_ident, 1, ARG_BSTR, ARG_UINT) \ X(set_member, 1, ARG_BSTR, ARG_UINT) \ X(step, 0, ARG_ADDR, ARG_BSTR) \ @@ -353,7 +354,7 @@ struct _vbscode_t { }; void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; -HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; +HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,vbscode_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; -- 2.21.0

2 5

[PATCH 3/5] wbemprox: Implement more Win32_OperatingSystem properties.
by Hans Leidekker 17 Sep '19

17 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 30 ++++++++++++++++++++++++++---- dlls/wbemprox/tests/query.c | 9 +++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index bb43f8a229..28acc3fc6f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -87,7 +87,7 @@ static const WCHAR class_networkadapterW[] = static const WCHAR class_networkadapterconfigW[] = {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r', 'C','o','n','f','i','g','u','r','a','t','i','o','n',0}; -static const WCHAR class_osW[] = +static const WCHAR class_operatingsystemW[] = {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; static const WCHAR class_paramsW[] = {'_','_','P','A','R','A','M','E','T','E','R','S',0}; @@ -177,6 +177,8 @@ static const WCHAR prop_cpustatusW[] = {'C','p','u','S','t','a','t','u','s',0}; static const WCHAR prop_csdversionW[] = {'C','S','D','V','e','r','s','i','o','n',0}; +static const WCHAR prop_csnameW[] = + {'C','S','N','a','m','e',0}; static const WCHAR prop_currentbitsperpixelW[] = {'C','u','r','r','e','n','t','B','i','t','s','P','e','r','P','i','x','e','l',0}; static const WCHAR prop_currentclockspeedW[] = @@ -189,6 +191,8 @@ static const WCHAR prop_currentrefreshrateW[] = {'C','u','r','r','e','n','t','R','e','f','r','e','s','h','R','a','t','e',0}; static const WCHAR prop_currentscanmodeW[] = {'C','u','r','r','e','n','t','S','c','a','n','M','o','d','e',0}; +static const WCHAR prop_currenttimezoneW[] = + {'C','u','r','r','e','n','t','T','i','m','e','Z','o','n','e',0}; static const WCHAR prop_currentverticalresW[] = {'C','u','r','r','e','n','t','V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_datawidthW[] = @@ -597,18 +601,21 @@ static const struct column col_networkadapterconfig[] = { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_settingidW, CIM_STRING|COL_FLAG_DYNAMIC } }; -static const struct column col_os[] = +static const struct column col_operatingsystem[] = { { prop_buildnumberW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_csdversionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_csnameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_currenttimezoneW, CIM_SINT16 }, { prop_freephysicalmemoryW, CIM_UINT64 }, { prop_installdateW, CIM_DATETIME }, { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_manufacturerW, CIM_STRING }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_operatingsystemskuW, CIM_UINT32, VT_I4 }, { prop_osarchitectureW, CIM_STRING }, @@ -1049,11 +1056,14 @@ struct record_operatingsystem const WCHAR *codeset; const WCHAR *countrycode; const WCHAR *csdversion; + const WCHAR *csname; + INT16 currenttimezone; UINT64 freephysicalmemory; const WCHAR *installdate; const WCHAR *lastbootuptime; const WCHAR *localdatetime; const WCHAR *locale; + const WCHAR *manufacturer; const WCHAR *name; UINT32 operatingsystemsku; const WCHAR *osarchitecture; @@ -3773,9 +3783,18 @@ static DWORD get_operatingsystemsku(void) GetProductInfo( 6, 0, 0, 0, &ret ); return ret; } +static INT16 get_currenttimezone(void) +{ + TIME_ZONE_INFORMATION info; + DWORD status = GetTimeZoneInformation( &info ); + if (status == TIME_ZONE_ID_INVALID) return 0; + if (status == TIME_ZONE_ID_DAYLIGHT) return -(info.Bias + info.DaylightBias); + return -(info.Bias + info.StandardBias); +} -static enum fill_status fill_os( struct table *table, const struct expr *cond ) +static enum fill_status fill_operatingsystem( struct table *table, const struct expr *cond ) { + static const WCHAR wineprojectW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; struct record_operatingsystem *rec; enum fill_status status = FILL_STATUS_UNFILTERED; OSVERSIONINFOEXW ver; @@ -3792,11 +3811,14 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->codeset = get_codeset(); rec->countrycode = get_countrycode(); rec->csdversion = ver.szCSDVersion[0] ? heap_strdupW( ver.szCSDVersion ) : NULL; + rec->csname = get_computername(); + rec->currenttimezone = get_currenttimezone(); rec->freephysicalmemory = get_available_physical_memory() / 1024; rec->installdate = os_installdateW; rec->lastbootuptime = get_lastbootuptime(); rec->localdatetime = get_localdatetime(); rec->locale = get_locale(); + rec->manufacturer = wineprojectW; rec->name = get_osname( rec->caption ); rec->operatingsystemsku = get_operatingsystemsku(); rec->osarchitecture = get_osarchitecture(); @@ -4312,7 +4334,7 @@ static struct table builtin_classes[] = { class_logicaldisktopartitionW, C(col_logicaldisktopartition), 0, 0, NULL, fill_logicaldisktopartition }, { class_networkadapterW, C(col_networkadapter), 0, 0, NULL, fill_networkadapter }, { class_networkadapterconfigW, C(col_networkadapterconfig), 0, 0, NULL, fill_networkadapterconfig }, - { class_osW, C(col_os), 0, 0, NULL, fill_os }, + { class_operatingsystemW, C(col_operatingsystem), 0, 0, NULL, fill_operatingsystem }, { class_paramsW, C(col_param), D(data_param) }, { class_physicalmediaW, C(col_physicalmedia), D(data_physicalmedia) }, { class_physicalmemoryW, C(col_physicalmemory), 0, 0, NULL, fill_physicalmemory }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 23641fc0d3..b1d15c0669 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -333,6 +333,9 @@ static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *pro case VT_BSTR: trace( "%s: %s\n", wine_dbgstr_w(prop), wine_dbgstr_w(V_BSTR(&val)) ); break; + case VT_I2: + trace( "%s: %d\n", wine_dbgstr_w(prop), V_I2(&val) ); + break; case VT_I4: trace( "%s: %d\n", wine_dbgstr_w(prop), V_I4(&val) ); break; @@ -1187,7 +1190,10 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) static const WCHAR buildnumberW[] = {'B','u','i','l','d','N','u','m','b','e','r',0}; static const WCHAR captionW[] = {'C','a','p','t','i','o','n',0}; static const WCHAR csdversionW[] = {'C','S','D','V','e','r','s','i','o','n',0}; + static const WCHAR csnameW[] = {'C','S','N','a','m','e',0}; + static const WCHAR currenttimezoneW[] = {'C','u','r','r','e','n','t','T','i','m','e','Z','o','n','e',0}; static const WCHAR freephysicalmemoryW[] = {'F','r','e','e','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; + static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR nameW[] = {'N','a','m','e',0}; static const WCHAR operatingsystemskuW[] = {'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m','S','K','U',0}; static const WCHAR osproductsuiteW[] = {'O','S','P','r','o','d','u','c','t','S','u','i','t','e',0}; @@ -1262,6 +1268,9 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) trace( "osproductsuite: %d (%08x)\n", V_I4( &val ), V_I4( &val ) ); VariantClear( &val ); + check_property( obj, csnameW, VT_BSTR, CIM_STRING ); + check_property( obj, currenttimezoneW, VT_I2, CIM_SINT16 ); + check_property( obj, manufacturerW, VT_BSTR, CIM_STRING ); check_property( obj, ostypeW, VT_I4, CIM_UINT16 ); check_property( obj, servicepackmajorW, VT_I4, CIM_UINT16 ); check_property( obj, servicepackminorW, VT_I4, CIM_UINT16 ); -- 2.20.1

2 1

[PATCH 2/2] winebus.sys: Stop device report threads to avoid crash on driver unload.
by Piotr Caban 17 Sep '19

17 Sep '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- If WineBus is a proper PnP bus driver all its devices should be removed before DriverUnload is called. dlls/winebus.sys/bus_udev.c | 9 +++++++++ dlls/winebus.sys/main.c | 10 +++++++--- 2 files changed, 16 insertions(+), 3 deletions(-)

1 0

[PATCH 1/2] winebus.sys: Stop deviceloop_thread to avoid crash on driver unload.
by Piotr Caban 17 Sep '19

17 Sep '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 39 ++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-)

1 0

[PATCH 4/5] wbemprox: Implement more Win32_PhysicalMemory properties.
by Hans Leidekker 17 Sep '19

17 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 28acc3fc6f..556f149346 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -171,6 +171,8 @@ static const WCHAR prop_commandlineW[] = {'C','o','m','m','a','n','d','L','i','n','e',0}; static const WCHAR prop_configmanagererrorcodeW[] = {'C','o','n','f','i','g','M','a','n','a','g','e','r','E','r','r','o','r','C','o','d','e',0}; +static const WCHAR prop_configuredclockspeedW[] = + {'C','o','n','f','i','g','u','r','e','d','C','l','o','c','k','S','p','e','e','d',0}; static const WCHAR prop_countrycodeW[] = {'C','o','u','n','t','r','y','C','o','d','e',0}; static const WCHAR prop_cpustatusW[] = @@ -331,6 +333,8 @@ static const WCHAR prop_ostypeW[] = {'O','S','T','y','p','e',0}; static const WCHAR prop_parameterW[] = {'P','a','r','a','m','e','t','e','r',0}; +static const WCHAR prop_partnumberW[] = + {'P','a','r','t','N','u','m','b','e','r',0}; static const WCHAR prop_physicaladapterW[] = {'P','h','y','s','i','c','a','l','A','d','a','p','t','e','r',0}; static const WCHAR prop_pixelsperxlogicalinchW[] = @@ -650,9 +654,11 @@ static const struct column col_physicalmedia[] = }; static const struct column col_physicalmemory[] = { - { prop_capacityW, CIM_UINT64 }, - { prop_devicelocatorW, CIM_STRING }, - { prop_memorytypeW, CIM_UINT16, VT_I4 } + { prop_capacityW, CIM_UINT64 }, + { prop_configuredclockspeedW, CIM_UINT32, VT_I4 }, + { prop_devicelocatorW, CIM_STRING }, + { prop_memorytypeW, CIM_UINT16, VT_I4 }, + { prop_partnumberW, CIM_STRING } }; static const struct column col_pnpentity[] = { @@ -1099,8 +1105,10 @@ struct record_physicalmedia struct record_physicalmemory { UINT64 capacity; + UINT32 configuredclockspeed; const WCHAR *devicelocator; UINT16 memorytype; + const WCHAR *partnumber; }; struct record_pnpentity { @@ -3218,9 +3226,11 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_physicalmemory *)table->data; - rec->capacity = get_total_physical_memory(); - rec->devicelocator = heap_strdupW( dimm0W ); - rec->memorytype = 9; /* RAM */ + rec->capacity = get_total_physical_memory(); + rec->configuredclockspeed = 0; + rec->devicelocator = dimm0W; + rec->memorytype = 9; /* RAM */ + rec->partnumber = NULL; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; -- 2.20.1

1 0

[PATCH 2/5] wbemprox: Implement Win32_BIOS.CurrentLanguage.
by Hans Leidekker 17 Sep '19

17 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8bb5be0aac..bb43f8a229 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -183,6 +183,8 @@ static const WCHAR prop_currentclockspeedW[] = {'C','u','r','r','e','n','t','C','l','o','c','k','S','p','e','e','d',0}; static const WCHAR prop_currenthorizontalresW[] = {'C','u','r','r','e','n','t','H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; +static const WCHAR prop_currentlanguageW[] = + {'C','u','r','r','e','n','t','L','a','n','g','u','a','g','e',0}; static const WCHAR prop_currentrefreshrateW[] = {'C','u','r','r','e','n','t','R','e','f','r','e','s','h','R','a','t','e',0}; static const WCHAR prop_currentscanmodeW[] = @@ -457,6 +459,7 @@ static const struct column col_baseboard[] = }; static const struct column col_bios[] = { + { prop_currentlanguageW, CIM_STRING }, { prop_descriptionW, CIM_STRING }, { prop_identificationcodeW, CIM_STRING }, { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -901,6 +904,7 @@ struct record_baseboard }; struct record_bios { + const WCHAR *currentlanguage; const WCHAR *description; const WCHAR *identificationcode; const WCHAR *manufacturer; @@ -1634,6 +1638,7 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond GetSystemFirmwareTable( RSMB, 0, buf, len ); rec = (struct record_bios *)table->data; + rec->currentlanguage = NULL; rec->description = bios_descriptionW; rec->identificationcode = NULL; rec->manufacturer = get_bios_manufacturer( buf, len ); -- 2.20.1

1 0

[PATCH 1/5] wbemprox: Add support for CIM_REAL32 values.
by Hans Leidekker 17 Sep '19

17 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/table.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 79c7eb13a4..7d531f5ec5 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -67,6 +67,8 @@ UINT get_type_size( CIMTYPE type ) case CIM_REFERENCE: case CIM_STRING: return sizeof(WCHAR *); + case CIM_REAL32: + return sizeof(FLOAT); default: ERR("unhandled type %u\n", type); break; @@ -139,6 +141,9 @@ HRESULT get_value( const struct table *table, UINT row, UINT column, LONGLONG *v case CIM_UINT64: *val = *(const UINT64 *)ptr; break; + case CIM_REAL32: + memcpy( val, ptr, sizeof(FLOAT) ); + break; default: ERR("invalid column type %u\n", table->columns[column].type & COL_TYPE_MASK); *val = 0; -- 2.20.1

1 0

[PATCH] testbot/WineRunTask: Make the GetAgent() parameter more explicit.
by Francois Gouget 17 Sep '19

17 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 432bf51d8..d987df7df 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -411,7 +411,7 @@ if (!$TA->SetTime()) { # Not a fatal error. Try the next port in case the VM runs a privileged # TestAgentd daemon there. - my $PrivilegedTA = $VM->GetAgent(1); + my $PrivilegedTA = $VM->GetAgent("privileged"); if (!$PrivilegedTA->SetTime()) { LogTaskError("Unable to set the VM system time: ". $PrivilegedTA->GetLastError() .". Maybe the TestAgentd process is missing the required privileges.\n"); -- 2.20.1

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
62
Older →

Jump to page:

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-devel September 2019