June 2012 - Wine-commits - list.winehq.org

Francois Gouget : reg: Use the CSTR_XXX macros instead of numeric literals.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: f9c2e21fb1a1425652d3a2b256380be9cc55c0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c2e21fb1a1425652d3a2b25… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 20 23:41:25 2012 +0200 reg: Use the CSTR_XXX macros instead of numeric literals. --- programs/reg/reg.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 8a6ffc4..1b46661 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -80,20 +80,20 @@ static HKEY get_rootkey(LPWSTR key) static const WCHAR szHKCC[] = {'H','K','C','C',0}; static const WCHAR szHKEY_CURRENT_CONFIG[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}; - if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==2 || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,18,szHKEY_LOCAL_MACHINE,18)==2) + if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==CSTR_EQUAL || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,18,szHKEY_LOCAL_MACHINE,18)==CSTR_EQUAL) return HKEY_LOCAL_MACHINE; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==2 || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CURRENT_USER,17)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==CSTR_EQUAL || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CURRENT_USER,17)==CSTR_EQUAL) return HKEY_CURRENT_USER; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==2 || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CLASSES_ROOT,17)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==CSTR_EQUAL || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CLASSES_ROOT,17)==CSTR_EQUAL) return HKEY_CLASSES_ROOT; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==2 || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,10,szHKEY_USERS,10)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==CSTR_EQUAL || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,10,szHKEY_USERS,10)==CSTR_EQUAL) return HKEY_USERS; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==2 || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,19,szHKEY_CURRENT_CONFIG,19)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==CSTR_EQUAL || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,19,szHKEY_CURRENT_CONFIG,19)==CSTR_EQUAL) return HKEY_CURRENT_CONFIG; else return NULL; }

1 0

Alexander Nicolaysen Sørnes : util: Fix errors preventing Xinha from loading when PHP notices are turned on
by Alexander Nicolaysen Sørnes 21 Jun '12

21 Jun '12

Module: appdb Branch: master Commit: 519bbf6aa1dc27fec2ae081b4121269c26988683 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=519bbf6aa1dc27fec2ae081b… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Thu Jun 21 15:05:53 2012 +0000 util: Fix errors preventing Xinha from loading when PHP notices are turned on --- include/util.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/util.php b/include/util.php index 2549b04..3b4f517 100644 --- a/include/util.php +++ b/include/util.php @@ -653,6 +653,7 @@ function SimplifyPath($path) { { array_splice($dirs,$i,1); $i--; + continue; } if($dirs[$i]=="..") @@ -682,7 +683,7 @@ function Simplify($dirs, $idx) // won't work with relative paths like ../xinha function GetSimplifiedPath($relative) { - return "/".SimplifyPath(dirname($_SERVER[PHP_SELF])."/".BASE.$relative); + return "/".SimplifyPath(dirname($_SERVER['PHP_SELF'])."/".BASE.$relative); } function HtmlAreaLoaderScript($aTextareas)

1 0

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetFourCCCodes().
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 0833a639a9056b2302bc5fbfd1fc84162488aab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0833a639a9056b2302bc5fbfd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 20 17:45:17 2012 +0200 ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetFourCCCodes(). --- dlls/ddraw/ddraw.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 6424492..ce3eade 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1513,7 +1513,11 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes TRACE("iface %p, codes_count %p, codes %p.\n", iface, NumCodes, Codes); - wined3d_device_get_display_mode(ddraw->wined3d_device, 0, &mode); + if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) + { + ERR("Failed to get display mode, hr %#x.\n", hr); + return hr; + } outsize = NumCodes && Codes ? *NumCodes : 0;

1 0

Marcus Meissner : kernel32: Fixed read overflow in WriteFile argument.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: b652dcee420be13b1b70c831981bc1c2fad10817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b652dcee420be13b1b70c8319… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jun 20 20:10:12 2012 +0200 kernel32: Fixed read overflow in WriteFile argument. --- dlls/kernel32/tests/pipe.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index bd196fe..923c0e7 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1758,7 +1758,7 @@ static void test_readfileex_pending(void) OVERLAPPED overlapped; char read_buf[1024]; char write_buf[1024]; - const char *test_string = "test"; + const char test_string[] = "test"; int i; server = CreateNamedPipe(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, @@ -1798,9 +1798,9 @@ static void test_readfileex_pending(void) ok(ret == TRUE, "ReadFileEx failed, err=%i\n", GetLastError()); ok(completion_called == 0, "completion routine called before ReadFileEx returned\n"); - ret = WriteFile(client, test_string, sizeof(test_string), &num_bytes, NULL); + ret = WriteFile(client, test_string, strlen(test_string), &num_bytes, NULL); ok(ret == TRUE, "WriteFile failed\n"); - ok(num_bytes == sizeof(test_string), "only %i bytes written\n", num_bytes); + ok(num_bytes == strlen(test_string), "only %i bytes written\n", num_bytes); ok(completion_called == 0, "completion routine called during WriteFile\n"); @@ -1809,9 +1809,9 @@ static void test_readfileex_pending(void) ok(completion_called == 1, "completion not called after writing pipe\n"); ok(completion_errorcode == 0, "completion called with error %x\n", completion_errorcode); - ok(completion_num_bytes == sizeof(test_string), "ReadFileEx returned only %d bytes\n", completion_num_bytes); + ok(completion_num_bytes == strlen(test_string), "ReadFileEx returned only %d bytes\n", completion_num_bytes); ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n"); - ok(!memcmp(test_string, read_buf, sizeof(test_string)), "ReadFileEx read wrong bytes\n"); + ok(!memcmp(test_string, read_buf, strlen(test_string)), "ReadFileEx read wrong bytes\n"); /* Make writes until the pipe is full and the write fails */ memset(write_buf, 0xaa, sizeof(write_buf));

1 0

Jacek Caban : jscript: Use num_set_int where possible.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 1532037bcd2ee318a7f0e90aa55c85cf5cd29a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1532037bcd2ee318a7f0e90aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 20 11:18:59 2012 +0200 jscript: Use num_set_int where possible. --- dlls/jscript/engine.c | 6 ++---- dlls/jscript/error.c | 3 +-- dlls/jscript/function.c | 9 +++------ dlls/jscript/global.c | 18 ++++++------------ dlls/jscript/number.c | 6 ++---- dlls/jscript/regexp.c | 13 +++++-------- dlls/jscript/string.c | 42 ++++++++++++++---------------------------- 7 files changed, 33 insertions(+), 64 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0b97fdd..8117cb5 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2030,16 +2030,14 @@ static HRESULT equal_values(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jse if(V_VT(rval) == VT_BOOL) { VARIANT v; - V_VT(&v) = VT_I4; - V_I4(&v) = V_BOOL(rval) ? 1 : 0; + num_set_int(&v, V_BOOL(rval) ? 1 : 0); return equal_values(ctx, lval, &v, ei, ret); } if(V_VT(lval) == VT_BOOL) { VARIANT v; - V_VT(&v) = VT_I4; - V_I4(&v) = V_BOOL(lval) ? 1 : 0; + num_set_int(&v, V_BOOL(lval) ? 1 : 0); return equal_values(ctx, &v, rval, ei, ret); } diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 00560db..3111714 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -199,8 +199,7 @@ static HRESULT create_error(script_ctx_t *ctx, jsdisp_t *constr, if(FAILED(hres)) return hres; - V_VT(&v) = VT_I4; - V_I4(&v) = number; + num_set_int(&v, number); hres = jsdisp_propput_name(err, numberW, &v, NULL/*FIXME*/); if(FAILED(hres)) { jsdisp_release(err); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 31d3be3..cfd57a7 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -133,8 +133,7 @@ static HRESULT create_arguments(script_ctx_t *ctx, IDispatch *calee, DISPPARAMS } if(SUCCEEDED(hres)) { - V_VT(&var) = VT_I4; - V_I4(&var) = arg_cnt(dp); + num_set_int(&var, arg_cnt(dp)); hres = jsdisp_propput_name(args, lengthW, &var, ei); if(SUCCEEDED(hres)) { @@ -315,8 +314,7 @@ static HRESULT Function_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D switch(flags) { case DISPATCH_PROPERTYGET: - V_VT(retv) = VT_I4; - V_I4(retv) = This->length; + num_set_int(retv, This->length); break; default: FIXME("unimplemented flags %x\n", flags); @@ -635,8 +633,7 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, if(builtin_info) { VARIANT var; - V_VT(&var) = VT_I4; - V_I4(&var) = function->length; + num_set_int(&var, function->length); hres = jsdisp_propput_const(&function->dispex, lengthW, &var); } diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 3732b65..c01b082 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -745,10 +745,8 @@ static HRESULT JSGlobal_ScriptEngineMajorVersion(script_ctx_t *ctx, vdisp_t *jst { TRACE("\n"); - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = JSCRIPT_MAJOR_VERSION; - } + if(retv) + num_set_int(retv, JSCRIPT_MAJOR_VERSION); return S_OK; } @@ -757,10 +755,8 @@ static HRESULT JSGlobal_ScriptEngineMinorVersion(script_ctx_t *ctx, vdisp_t *jst { TRACE("\n"); - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = JSCRIPT_MINOR_VERSION; - } + if(retv) + num_set_int(retv, JSCRIPT_MINOR_VERSION); return S_OK; } @@ -769,10 +765,8 @@ static HRESULT JSGlobal_ScriptEngineBuildVersion(script_ctx_t *ctx, vdisp_t *jst { TRACE("\n"); - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = JSCRIPT_BUILD_VERSION; - } + if(retv) + num_set_int(retv, JSCRIPT_BUILD_VERSION); return S_OK; } diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 8f6eeab..3d2283a 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -554,10 +554,8 @@ static HRESULT NumberConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags switch(flags) { case INVOKE_FUNC: if(!arg_cnt(dp)) { - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = 0; - } + if(retv) + num_set_int(retv, 0); return S_OK; } diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index f5a987e..399635e 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3606,13 +3606,12 @@ static HRESULT create_match_array(script_ctx_t *ctx, BSTR input, const match_res } while(SUCCEEDED(hres)) { - V_VT(&var) = VT_I4; - V_I4(&var) = result->str-input; + num_set_int(&var, result->str-input); hres = jsdisp_propput_name(array, indexW, &var, ei); if(FAILED(hres)) break; - V_I4(&var) = result->str-input+result->len; + num_set_int(&var, result->str-input+result->len); hres = jsdisp_propput_name(array, lastIndexW, &var, ei); if(FAILED(hres)) break; @@ -3862,8 +3861,7 @@ HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, return E_FAIL; } - V_VT(&regexp->last_index_var) = VT_I4; - V_I4(&regexp->last_index_var) = 0; + num_set_int(&regexp->last_index_var, 0); *ret = &regexp->dispex; return S_OK; @@ -3990,13 +3988,12 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, BSTR str, } while(SUCCEEDED(hres)) { - V_VT(&var) = VT_I4; - V_I4(&var) = match_result[match_cnt-1].str-str; + num_set_int(&var, match_result[match_cnt-1].str-str); hres = jsdisp_propput_name(array, indexW, &var, ei); if(FAILED(hres)) break; - V_I4(&var) = match_result[match_cnt-1].str-str+match_result[match_cnt-1].len; + num_set_int(&var, match_result[match_cnt-1].str-str+match_result[match_cnt-1].len); hres = jsdisp_propput_name(array, lastIndexW, &var, ei); if(FAILED(hres)) break; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index d1142ff..2adc605 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -111,8 +111,7 @@ static HRESULT String_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS case DISPATCH_PROPERTYGET: { StringInstance *string = string_from_vdisp(jsthis); - V_VT(retv) = VT_I4; - V_I4(retv) = string->length; + num_set_int(retv, string->length); break; } default: @@ -368,10 +367,8 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, idx = d; } - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = str[idx]; - } + if(retv) + num_set_int(retv, str[idx]); SysFreeString(val_str); return S_OK; @@ -476,10 +473,8 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI return hres; if(!arg_cnt(dp)) { - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = -1; - } + if(retv) + num_set_int(retv, -1); SysFreeString(val_str); return S_OK; } @@ -513,10 +508,8 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI if(FAILED(hres)) return hres; - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = ret; - } + if(retv) + num_set_int(retv, ret); return S_OK; } @@ -544,10 +537,8 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return hres; if(!arg_cnt(dp)) { - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = -1; - } + if(retv) + num_set_int(retv, -1); SysFreeString(val_str); return S_OK; } @@ -586,10 +577,8 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(FAILED(hres)) return hres; - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = ret; - } + if(retv) + num_set_int(retv, ret); return S_OK; } @@ -729,8 +718,7 @@ static HRESULT rep_call(script_ctx_t *ctx, jsdisp_t *func, const WCHAR *str, mat if(SUCCEEDED(hres)) { arg = get_arg(&dp,parens_cnt+1); - V_VT(arg) = VT_I4; - V_I4(arg) = match->str - str; + num_set_int(arg, match->str - str); arg = get_arg(&dp,parens_cnt+2); V_VT(arg) = VT_BSTR; @@ -1046,10 +1034,8 @@ static HRESULT String_search(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS if(FAILED(hres)) return hres; - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = hres == S_OK ? match.str-str : -1; - } + if(retv) + num_set_int(retv, hres == S_OK ? match.str-str : -1); return S_OK; }

1 0

Jacek Caban : jscript: Use INFINITY macro instead of ret_inf() hack.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: c7c8cd780ae74dd4e18bf2a0a644ab542e503271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c8cd780ae74dd4e18bf2a0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 20 11:19:11 2012 +0200 jscript: Use INFINITY macro instead of ret_inf() hack. --- dlls/jscript/jscript.h | 7 ------- dlls/jscript/jsutils.c | 2 +- 2 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 6207bbd..e27b829 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -447,13 +447,6 @@ static inline void num_set_inf(VARIANT *v, BOOL positive) #endif } -static inline DOUBLE ret_inf(void) -{ - VARIANT v; - num_set_inf(&v, TRUE); - return V_R8(&v); -} - static inline void var_set_jsdisp(VARIANT *v, jsdisp_t *jsdisp) { V_VT(v) = VT_DISPATCH; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 6a36613..fbc82e7 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -351,7 +351,7 @@ static HRESULT str_to_number(BSTR str, double *ret) if(*ptr) *ret = NAN; else - *ret = neg ? -ret_inf() : ret_inf(); + *ret = neg ? -INFINITY : INFINITY; return S_OK; }

1 0

Hans Leidekker : wbemprox: Add support for retrieving system properties.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: d444e1ab1a6ae094486858dd889913178b04d640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d444e1ab1a6ae094486858dd8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 20 12:05:59 2012 +0200 wbemprox: Add support for retrieving system properties. --- dlls/wbemprox/query.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++++ include/wbemcli.idl | 6 ++ 2 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 9e03544..afb419c 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -386,12 +386,148 @@ static BOOL is_selected_prop( const struct view *view, const WCHAR *name ) return FALSE; } +static BOOL is_system_prop( const WCHAR *name ) +{ + return (name[0] == '_' && name[1] == '_'); +} + +static BSTR build_servername( const struct view *view ) +{ + WCHAR server[MAX_COMPUTERNAME_LENGTH + 1], *p; + DWORD len = sizeof(server)/sizeof(server[0]); + + if (view->proplist) return NULL; + + if (!(GetComputerNameW( server, &len ))) return NULL; + for (p = server; *p; p++) *p = toupperW( *p ); + return SysAllocString( server ); +} + +static BSTR build_classname( const struct view *view ) +{ + return SysAllocString( view->table->name ); +} + +static BSTR build_namespace( const struct view *view ) +{ + static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; + + if (view->proplist) return NULL; + return SysAllocString( cimv2W ); +} + +static BSTR build_relpath( const struct view *view, UINT index, const WCHAR *name ) +{ + if (view->proplist) return NULL; + return build_classname( view ); /* FIXME: append list of key properties */ +} + +static BSTR build_path( const struct view *view, UINT index, const WCHAR *name ) +{ + static const WCHAR fmtW[] = {'\\','\\','%','s','\\','%','s',':','%','s',0}; + BSTR server, namespace = NULL, relpath = NULL, ret = NULL; + UINT len; + + if (view->proplist) return NULL; + + if (!(server = build_servername( view ))) return NULL; + if (!(namespace = build_namespace( view ))) goto done; + if (!(relpath = build_relpath( view, index, name ))) goto done; + + len = strlenW( fmtW ) + SysStringLen( server ) + SysStringLen( namespace ) + SysStringLen( relpath ); + if (!(ret = SysAllocStringLen( NULL, len ))) goto done; + sprintfW( ret, fmtW, server, namespace, relpath ); + +done: + SysFreeString( server ); + SysFreeString( namespace ); + SysFreeString( relpath ); + return ret; +} + +static UINT count_selected_props( const struct view *view ) +{ + const struct property *prop = view->proplist; + UINT count; + + if (!prop) return view->table->num_cols; + + count = 1; + while ((prop = prop->next)) count++; + return count; +} + +static HRESULT get_system_propval( const struct view *view, UINT index, const WCHAR *name, + VARIANT *ret, CIMTYPE *type ) +{ + static const WCHAR classW[] = {'_','_','C','L','A','S','S',0}; + static const WCHAR genusW[] = {'_','_','G','E','N','U','S',0}; + static const WCHAR pathW[] = {'_','_','P','A','T','H',0}; + static const WCHAR namespaceW[] = {'_','_','N','A','M','E','S','P','A','C','E',0}; + static const WCHAR propcountW[] = {'_','_','P','R','O','P','E','R','T','Y','_','C','O','U','N','T',0}; + static const WCHAR relpathW[] = {'_','_','R','E','L','P','A','T','H',0}; + static const WCHAR serverW[] = {'_','_','S','E','R','V','E','R',0}; + + if (!strcmpiW( name, classW )) + { + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = build_classname( view ); + if (type) *type = CIM_STRING; + return S_OK; + } + if (!strcmpiW( name, genusW )) + { + V_VT( ret ) = VT_INT; + V_INT( ret ) = WBEM_GENUS_INSTANCE; /* FIXME */ + if (type) *type = CIM_SINT32; + return S_OK; + } + else if (!strcmpiW( name, namespaceW )) + { + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = build_namespace( view ); + if (type) *type = CIM_STRING; + return S_OK; + } + else if (!strcmpiW( name, pathW )) + { + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = build_path( view, index, name ); + if (type) *type = CIM_STRING; + return S_OK; + } + if (!strcmpiW( name, propcountW )) + { + V_VT( ret ) = VT_INT; + V_INT( ret ) = count_selected_props( view ); + if (type) *type = CIM_SINT32; + return S_OK; + } + else if (!strcmpiW( name, relpathW )) + { + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = build_relpath( view, index, name ); + if (type) *type = CIM_STRING; + return S_OK; + } + else if (!strcmpiW( name, serverW )) + { + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = build_servername( view ); + if (type) *type = CIM_STRING; + return S_OK; + } + FIXME("system property %s not implemented\n", debugstr_w(name)); + return WBEM_E_NOT_FOUND; +} + HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VARIANT *ret, CIMTYPE *type ) { HRESULT hr; UINT column, row = view->result[index]; INT_PTR val; + if (is_system_prop( name )) return get_system_propval( view, index, name, ret, type ); if (!is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; hr = get_column_index( view->table, name, &column ); diff --git a/include/wbemcli.idl b/include/wbemcli.idl index b2d756b..1cd76eb 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -201,6 +201,12 @@ typedef [v1_enum] enum tag_WBEM_CONDITION_FLAG_TYPE WBEM_MASK_CLASS_CONDITION = 0x300 } WBEM_CONDITION_FLAG_TYPE; +typedef [v1_enum] enum tag_WBEM_GENUS_TYPE +{ + WBEM_GENUS_CLASS = 1, + WBEM_GENUS_INSTANCE = 2 +} WBEM_GENUS_TYPE; + typedef [v1_enum] enum tag_CIMTYPE_ENUMERATION { CIM_ILLEGAL = 0xfff,

1 0

Hans Leidekker : wbemprox: Implement Win32_Process.Handle.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: b39d0c1bdca4a4ef36c34f61e3c3432e287e9925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b39d0c1bdca4a4ef36c34f61e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 20 12:06:17 2012 +0200 wbemprox: Implement Win32_Process.Handle. --- dlls/wbemprox/builtin.c | 8 ++++++++ dlls/wbemprox/wbemprox_private.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index a1ef65e..5c6a4fe 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -48,6 +48,8 @@ static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; +static const WCHAR prop_handleW[] = + {'H','a','n','d','l','e',0}; static const WCHAR prop_manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR prop_modelW[] = @@ -87,6 +89,7 @@ static const struct column col_process[] = { { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_handleW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_pprocessidW, CIM_UINT32 }, { prop_processidW, CIM_UINT32 }, { prop_threadcountW, CIM_UINT32 } @@ -142,6 +145,7 @@ struct record_process { const WCHAR *caption; const WCHAR *description; + const WCHAR *handle; UINT32 pprocess_id; UINT32 process_id; UINT32 thread_count; @@ -167,6 +171,8 @@ static const struct record_processor data_processor[] = static void fill_process( struct table *table ) { + static const WCHAR fmtW[] = {'%','u',0}; + WCHAR handle[11]; struct record_process *rec; PROCESSENTRY32W entry; HANDLE snap; @@ -191,6 +197,8 @@ static void fill_process( struct table *table ) rec = (struct record_process *)(table->data + offset); rec->caption = heap_strdupW( entry.szExeFile ); rec->description = heap_strdupW( entry.szExeFile ); + sprintfW( handle, fmtW, entry.th32ProcessID ); + rec->handle = heap_strdupW( handle ); rec->process_id = entry.th32ProcessID; rec->pprocess_id = entry.th32ParentProcessID; rec->thread_count = entry.cntThreads; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 30aecca..779d43d 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -23,6 +23,7 @@ #define COL_TYPE_MASK 0x0000ffff #define COL_FLAG_DYNAMIC 0x00010000 +#define COL_FLAG_KEY 0x00020000 struct column {

1 0

Hans Leidekker : wbemprox: Append key properties to the class path.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 2ea3258c5467643804803d8b26098c567e036242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea3258c5467643804803d8b2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 20 12:06:40 2012 +0200 wbemprox: Append key properties to the class path. --- dlls/wbemprox/query.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index afb419c..7a2b545 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -118,6 +118,49 @@ static HRESULT get_value( const struct table *table, UINT row, UINT column, INT_ return S_OK; } +static BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) +{ + static const WCHAR fmt_signedW[] = {'%','d',0}; + static const WCHAR fmt_unsignedW[] = {'%','u',0}; + static const WCHAR fmt_strW[] = {'\"','%','s','\"',0}; + INT_PTR val; + BSTR ret; + WCHAR number[12]; + UINT len; + + if (table->columns[column].type & CIM_FLAG_ARRAY) + { + FIXME("array to string conversion not handled\n"); + return NULL; + } + if (get_value( table, row, column, &val ) != S_OK) return NULL; + + switch (table->columns[column].type & COL_TYPE_MASK) + { + case CIM_DATETIME: + case CIM_STRING: + len = strlenW( (const WCHAR *)val ) + 2; + if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; + sprintfW( ret, fmt_strW, (const WCHAR *)val ); + return ret; + + case CIM_SINT16: + case CIM_SINT32: + sprintfW( number, fmt_signedW, val ); + return SysAllocString( number ); + + case CIM_UINT16: + case CIM_UINT32: + sprintfW( number, fmt_unsignedW, val ); + return SysAllocString( number ); + + default: + FIXME("unhandled column type %u\n", table->columns[column].type & COL_TYPE_MASK); + break; + } + return NULL; +} + HRESULT create_view( const struct property *proplist, const WCHAR *class, const struct expr *cond, struct view **ret ) { @@ -416,10 +459,77 @@ static BSTR build_namespace( const struct view *view ) return SysAllocString( cimv2W ); } +static BSTR build_proplist( const struct view *view, UINT index, UINT count, UINT *len ) +{ + static const WCHAR fmtW[] = {'%','s','=','%','s',0}; + UINT i, j, offset, row = view->result[index]; + BSTR *values, ret = NULL; + + if (!(values = heap_alloc( count * sizeof(BSTR) ))) return NULL; + + *len = j = 0; + for (i = 0; i < view->table->num_cols; i++) + { + if (view->table->columns[i].type & COL_FLAG_KEY) + { + const WCHAR *name = view->table->columns[i].name; + + values[j] = get_value_bstr( view->table, row, i ); + *len += strlenW( fmtW ) + strlenW( name ) + strlenW( values[j] ); + j++; + } + } + if ((ret = SysAllocStringLen( NULL, *len ))) + { + offset = j = 0; + for (i = 0; i < view->table->num_cols; i++) + { + if (view->table->columns[i].type & COL_FLAG_KEY) + { + const WCHAR *name = view->table->columns[i].name; + + offset += sprintfW( ret + offset, fmtW, name, values[j] ); + if (j < count - 1) ret[offset++] = ','; + j++; + } + } + } + for (i = 0; i < count; i++) SysFreeString( values[i] ); + heap_free( values ); + return ret; +} + +static UINT count_key_columns( const struct view *view ) +{ + UINT i, num_keys = 0; + + for (i = 0; i < view->table->num_cols; i++) + { + if (view->table->columns[i].type & COL_FLAG_KEY) num_keys++; + } + return num_keys; +} + static BSTR build_relpath( const struct view *view, UINT index, const WCHAR *name ) { + static const WCHAR fmtW[] = {'%','s','.','%','s',0}; + BSTR class, proplist, ret = NULL; + UINT num_keys, len; + if (view->proplist) return NULL; - return build_classname( view ); /* FIXME: append list of key properties */ + + if (!(class = build_classname( view ))) return NULL; + if (!(num_keys = count_key_columns( view ))) return class; + if (!(proplist = build_proplist( view, index, num_keys, &len ))) goto done; + + len += strlenW( fmtW ) + SysStringLen( class ); + if (!(ret = SysAllocStringLen( NULL, len ))) goto done; + sprintfW( ret, fmtW, class, proplist ); + +done: + SysFreeString( class ); + SysFreeString( proplist ); + return ret; } static BSTR build_path( const struct view *view, UINT index, const WCHAR *name )

1 0

Hans Leidekker : wbemprox: Implement Win32_Process. CommandLine for the current process.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 0e184898313181830b89877c3e96dc1238858337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e184898313181830b89877c3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 20 12:07:02 2012 +0200 wbemprox: Implement Win32_Process.CommandLine for the current process. --- dlls/wbemprox/builtin.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5c6a4fe..0c88ad5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -46,6 +46,8 @@ static const WCHAR class_processorW[] = static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; +static const WCHAR prop_commandlineW[] = + {'C','o','m','m','a','n','d','L','i','n','e',0}; static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR prop_handleW[] = @@ -88,6 +90,7 @@ static const struct column col_os[] = static const struct column col_process[] = { { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_commandlineW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_handleW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_pprocessidW, CIM_UINT32 }, @@ -144,6 +147,7 @@ struct record_operatingsystem struct record_process { const WCHAR *caption; + const WCHAR *commandline; const WCHAR *description; const WCHAR *handle; UINT32 pprocess_id; @@ -169,6 +173,12 @@ static const struct record_processor data_processor[] = { processor_manufacturerW } }; +static WCHAR *get_cmdline( DWORD process_id ) +{ + if (process_id == GetCurrentProcessId()) return heap_strdupW( GetCommandLineW() ); + return NULL; /* FIXME handle different process case */ +} + static void fill_process( struct table *table ) { static const WCHAR fmtW[] = {'%','u',0}; @@ -196,6 +206,7 @@ static void fill_process( struct table *table ) } rec = (struct record_process *)(table->data + offset); rec->caption = heap_strdupW( entry.szExeFile ); + rec->commandline = get_cmdline( entry.th32ProcessID ); rec->description = heap_strdupW( entry.szExeFile ); sprintfW( handle, fmtW, entry.th32ProcessID ); rec->handle = heap_strdupW( handle );

1 0