September 2019 - Wine-commits

Alexandre Julliard : winegcc: Support the --target option like winebuild does.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: ab871dc4d8e4ae0aa897142305800803a6623b16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab871dc4d8e4ae0aa8971423… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 10 12:14:30 2019 +0200 winegcc: Support the --target option like winebuild does. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 7 +++++++ tools/winegcc/winegcc.man.in | 3 +++ 2 files changed, 10 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index db46cf6d5d..9d5828e612 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1429,6 +1429,7 @@ int main(int argc, char **argv) case '-': next_is_arg = (strcmp("--param", argv[i]) == 0 || strcmp("--sysroot", argv[i]) == 0 || + strcmp("--target", argv[i]) == 0 || strcmp("--lib-suffix", argv[i]) == 0); break; } @@ -1656,6 +1657,12 @@ int main(int argc, char **argv) else opts.sysroot = argv[i + 1]; if (opts.wine_objdir) raw_compiler_arg = raw_linker_arg = 0; } + else if (!strncmp("--target", argv[i], 8)) + { + if (argv[i][8] == '=') parse_target_option( &opts, argv[i] + 9 ); + else parse_target_option( &opts, argv[i + 1] ); + raw_compiler_arg = raw_linker_arg = 0; + } else if (!strncmp("--lib-suffix", argv[i], 12) && opts.wine_objdir) { if (argv[i][12] == '=') opts.lib_suffix = argv[i] + 13; diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index 5bbb2fd58f..3fcd6f95f3 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -35,6 +35,9 @@ enters a special mode for building Wine itself. Developers should avoid prefixes ending with the magic suffix, or if that is not possible, simply express it differently, such as '/tools/winebuild/', to avoid the special behaviour. +.IP "\fB-b,--target \fItarget\fR" +Specify the target architecture triplet for cross-compiling. winegcc +will then invoke \fItarget\fR-gcc instead of gcc. .IP \fB-fno-short-wchar\fR Override the underlying type for wchar_t to be the default for the target, instead of using short unsigned int, which is the default

1 0

Alexandre Julliard : winegcc: Forward the -B options to winebuild.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 13850a3eb8c5792cd75ae4fc32a64552fbf1e032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13850a3eb8c5792cd75ae4fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 10 17:57:19 2019 +0200 winegcc: Forward the -B options to winebuild. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.c | 37 +++++++++++++++++-------------------- tools/winegcc/utils.h | 1 + tools/winegcc/winegcc.c | 18 +++++++++++++----- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index a124ef2d34..3197e46e47 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -297,6 +297,22 @@ file_type get_lib_type(enum target_platform platform, strarray* path, const char return file_na; } +const char *find_binary( const strarray* prefix, const char *name ) +{ + unsigned int i; + + if (!prefix) return name; + if (strchr( name, '/' )) return name; + + for (i = 0; i < prefix->size; i++) + { + struct stat st; + char *prog = strmake( "%s/%s%s", prefix->base[i], name, EXEEXT ); + if (stat( prog, &st ) == 0 && S_ISREG( st.st_mode ) && (st.st_mode & 0111)) return prog; + } + return name; +} + int spawn(const strarray* prefix, const strarray* args, int ignore_errors) { unsigned int i; @@ -307,26 +323,7 @@ int spawn(const strarray* prefix, const strarray* args, int ignore_errors) strarray_add(arr, NULL); argv = arr->base; - - if (prefix) - { - const char *p = strrchr(argv[0], '/'); - if (!p) p = argv[0]; - else p++; - - for (i = 0; i < prefix->size; i++) - { - struct stat st; - - free( prog ); - prog = strmake("%s/%s%s", prefix->base[i], p, EXEEXT); - if (stat(prog, &st) == 0 && S_ISREG(st.st_mode) && (st.st_mode & 0111)) - { - argv[0] = prog; - break; - } - } - } + argv[0] = find_binary( prefix, argv[0] ); if (verbose) { diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 536fb2d2f9..6056ee7258 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -83,6 +83,7 @@ void create_file(const char* name, int mode, const char* fmt, ...); file_type get_file_type(const char* filename); file_type get_lib_type(enum target_platform platform, strarray* path, const char *library, const char *suffix, char** file); +const char *find_binary( const strarray* prefix, const char *name ); int spawn(const strarray* prefix, const strarray* arr, int ignore_errors); extern int verbose; diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 9d5828e612..06771262eb 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -300,7 +300,7 @@ static char* get_temp_file(const char* prefix, const char* suffix) return tmp; } -static char* build_tool_name(struct options *opts, const char* base, const char* deflt) +static const char* build_tool_name(struct options *opts, const char* base, const char* deflt) { char* str; @@ -318,12 +318,12 @@ static char* build_tool_name(struct options *opts, const char* base, const char* } else str = xstrdup(deflt); - return str; + return find_binary( opts->prefix, str ); } static const strarray* get_translator(struct options *opts) { - char *str = NULL; + const char *str = NULL; strarray *ret; switch(opts->processor) @@ -342,7 +342,6 @@ static const strarray* get_translator(struct options *opts) assert(0); } ret = strarray_fromstring( str, " " ); - free(str); if (opts->force_pointer_size) strarray_add( ret, strmake("-m%u", 8 * opts->force_pointer_size )); return ret; @@ -847,9 +846,10 @@ static strarray *get_winebuild_args(struct options *opts) { const char* winebuild = getenv("WINEBUILD"); strarray *spec_args = strarray_alloc(); + unsigned int i; if (!winebuild) winebuild = "winebuild"; - strarray_add( spec_args, winebuild ); + strarray_add( spec_args, find_binary( opts->prefix, winebuild )); if (verbose) strarray_add( spec_args, "-v" ); if (keep_generated) strarray_add( spec_args, "--save-temps" ); if (opts->target) @@ -857,6 +857,14 @@ static strarray *get_winebuild_args(struct options *opts) strarray_add( spec_args, "--target" ); strarray_add( spec_args, opts->target ); } + if (opts->prefix) + { + for (i = 0; i < opts->prefix->size; i++) + { + if (strendswith( opts->prefix->base[i], "/tools/winebuild" )) continue; + strarray_add( spec_args, strmake( "-B%s", opts->prefix->base[i] )); + } + } if (!opts->use_msvcrt) strarray_add( spec_args, "-munix" ); if (opts->unwind_tables) strarray_add( spec_args, "-fasynchronous-unwind-tables" ); else strarray_add( spec_args, "-fno-asynchronous-unwind-tables" );

1 0

Kevin Puetz : objbase.h: Fix StringFromIID declaration.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: ca455c53765a360b66e8cc079af69f0e709c8655 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca455c53765a360b66e8cc07… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Sep 10 13:50:45 2019 +0200 objbase.h: Fix StringFromIID declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/objbase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/objbase.h b/include/objbase.h index 8af7a80b78..a241b71199 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -402,7 +402,7 @@ HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID riid); HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID); INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax); HRESULT WINAPI IIDFromString(LPCOLESTR str, IID *iid); -HRESULT WINAPI StringFromIID(REFIID riid, LPOLESTR str); +HRESULT WINAPI StringFromIID(REFIID riid, LPOLESTR*); /***************************************************************************** * COM Server dll - exports

1 0

Hans Leidekker : wbemprox: Strip curly brackets from path strings.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 05cb6543b067eb81b1882b5719377d75df1df965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05cb6543b067eb81b1882b57… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 10 17:09:08 2019 +0200 wbemprox: Strip curly brackets from path strings. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wql.y | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index a0a9c7b802..99279149ae 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -103,6 +103,12 @@ static WCHAR *get_path( struct parser *parser, const struct string *str ) int len = str->len; WCHAR *ret; + if (p[0] == '{' && p[len - 1] == '}') + { + p++; + len -= 2; + } + if (!(ret = alloc_mem( parser, (len + 1) * sizeof(WCHAR) ))) return NULL; memcpy( ret, p, len * sizeof(WCHAR) ); ret[len] = 0;

1 0

Hans Leidekker : wbemprox: Support evaluating CIM_REFERENCE expressions.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 90b0e94b5b363f591896f704bf69bf264390d1c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90b0e94b5b363f591896f704… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 10 17:09:09 2019 +0200 wbemprox: Support evaluating CIM_REFERENCE expressions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index e00f067e9e..7b194fbabf 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -165,6 +165,35 @@ static HRESULT eval_boolcmp( UINT op, LONGLONG lval, LONGLONG rval, UINT ltype, return S_OK; } +static inline BOOL is_refcmp( const struct complex_expr *expr, UINT ltype, UINT rtype ) +{ + if (ltype == CIM_REFERENCE && expr->left->type == EXPR_PROPVAL && expr->right->type == EXPR_SVAL) return TRUE; + else if (rtype == CIM_REFERENCE && expr->right->type == EXPR_PROPVAL && expr->left->type == EXPR_SVAL) return TRUE; + return FALSE; +} + +static HRESULT eval_refcmp( UINT op, const WCHAR *lstr, const WCHAR *rstr, LONGLONG *val ) +{ + if (!lstr || !rstr) + { + *val = 0; + return S_OK; + } + switch (op) + { + case OP_EQ: + *val = !wcsicmp( lstr, rstr ); + break; + case OP_NE: + *val = wcsicmp( lstr, rstr ); + break; + default: + ERR("unhandled operator %u\n", op); + return WBEM_E_INVALID_QUERY; + } + return S_OK; +} + static UINT resolve_type( UINT left, UINT right ) { switch (left) @@ -200,6 +229,10 @@ static UINT resolve_type( UINT left, UINT right ) if (right == CIM_BOOLEAN) return CIM_BOOLEAN; break; + case CIM_REFERENCE: + if (right == CIM_REFERENCE) return CIM_REFERENCE; + break; + default: break; } @@ -254,9 +287,6 @@ static HRESULT eval_binary( const struct table *table, UINT row, const struct co *type = resolve_type( ltype, rtype ); - if (is_boolcmp( expr, ltype, rtype )) - return eval_boolcmp( expr->op, lval, rval, ltype, rtype, val ); - if (is_strcmp( expr, ltype, rtype )) { const WCHAR *lstr, *rstr; @@ -270,6 +300,15 @@ static HRESULT eval_binary( const struct table *table, UINT row, const struct co return eval_strcmp( expr->op, lstr, rstr, val ); } + if (is_boolcmp( expr, ltype, rtype )) + { + return eval_boolcmp( expr->op, lval, rval, ltype, rtype, val ); + } + if (is_refcmp( expr, ltype, rtype )) + { + return eval_refcmp( expr->op, (const WCHAR *)(INT_PTR)lval, (const WCHAR *)(INT_PTR)rval, val ); + } + switch (expr->op) { case OP_EQ:

1 0

Hans Leidekker : wbemprox: Perform a case insensitive match on path components.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: ce3a0fc2906fa5cbbbbf1c0ed31ad2c1451e256d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce3a0fc2906fa5cbbbbf1c0e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 10 17:09:10 2019 +0200 wbemprox: Perform a case insensitive match on path components. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/services.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index be35c95ec0..0af02a4a1d 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -338,8 +338,7 @@ static HRESULT parse_path( const WCHAR *str, struct path **ret ) if (*p == '\\') { - static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2'}; - + static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; WCHAR server[MAX_COMPUTERNAME_LENGTH+1]; DWORD server_len = ARRAY_SIZE(server); @@ -352,8 +351,7 @@ static HRESULT parse_path( const WCHAR *str, struct path **ret ) if (!*p) return WBEM_E_INVALID_OBJECT_PATH; len = p - q; - if (!GetComputerNameW( server, &server_len ) || server_len != len - || memcmp( q, server, server_len * sizeof(WCHAR) )) + if (!GetComputerNameW( server, &server_len ) || server_len != len || wcsnicmp( q, server, server_len )) return WBEM_E_NOT_SUPPORTED; q = ++p; @@ -361,7 +359,7 @@ static HRESULT parse_path( const WCHAR *str, struct path **ret ) if (!*p) return WBEM_E_INVALID_OBJECT_PATH; len = p - q; - if (len != ARRAY_SIZE(cimv2W) || memcmp( q, cimv2W, sizeof(cimv2W) )) + if (len != ARRAY_SIZE(cimv2W) - 1 || wcsnicmp( q, cimv2W, ARRAY_SIZE(cimv2W) - 1 )) return WBEM_E_INVALID_NAMESPACE; p++; }

1 0

Hans Leidekker : wbemprox: Implement Win32_DiskDriveToDiskPartition.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 08d0449e41d001b121c2b2023630eae3c7049163 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d0449e41d001b121c2b202… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 10 17:09:12 2019 +0200 wbemprox: Implement Win32_DiskDriveToDiskPartition. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 135 ++++++++++++++++++++++++++++++++++++++------ dlls/wbemprox/tests/query.c | 5 +- 2 files changed, 121 insertions(+), 19 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 93d842708f..105a2d3ec2 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -68,6 +68,8 @@ static const WCHAR class_directoryW[] = {'W','i','n','3','2','_','D','i','r','e','c','t','o','r','y',0}; static const WCHAR class_diskdriveW[] = {'W','i','n','3','2','_','D','i','s','k','D','r','i','v','e',0}; +static const WCHAR class_diskdrivetodiskpartitionW[] = + {'W','i','n','3','2','_','D','i','s','k','D','r','i','v','e','T','o','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; static const WCHAR class_diskpartitionW[] = {'W','i','n','3','2','_','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; static const WCHAR class_ip4routetableW[] = @@ -510,6 +512,11 @@ static const struct column col_diskdrive[] = { prop_serialnumberW, CIM_STRING }, { prop_sizeW, CIM_UINT64 } }; +static const struct column col_diskdrivetodiskpartition[] = +{ + { prop_antecedentW, CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_dependentW, CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY } +}; static const struct column col_diskpartition[] = { { prop_bootableW, CIM_BOOLEAN }, @@ -943,6 +950,11 @@ struct record_diskdrive const WCHAR *serialnumber; UINT64 size; }; +struct record_diskdrivetodiskpartition +{ + const WCHAR *antecedent; + const WCHAR *dependent; +}; struct record_diskpartition { int bootable; @@ -2436,6 +2448,110 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * return status; } +struct association +{ + WCHAR *ref; + WCHAR *ref2; +}; + +static void free_assocations( struct association *assoc, UINT count ) +{ + UINT i; + if (!assoc) return; + for (i = 0; i < count; i++) + { + heap_free( assoc[i].ref ); + heap_free( assoc[i].ref2 ); + } + heap_free( assoc ); +} + +static struct association *get_diskdrivetodiskpartition_pairs( UINT *count ) +{ + static const WCHAR pathW[] = + {'_','_','P','A','T','H',0}; + static const WCHAR selectW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'D','i','s','k','D','r','i','v','e',0}; + static const WCHAR select2W[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'D','i','s','k','P','a','r','t','i','t','i','o','n',0}; + struct association *ret = NULL; + struct query *query, *query2 = NULL; + VARIANT val; + HRESULT hr; + UINT i; + + if (!(query = create_query())) return NULL; + if ((hr = parse_query( selectW, &query->view, &query->mem )) != S_OK) goto done; + if ((hr = execute_view( query->view )) != S_OK) goto done; + + if (!(query2 = create_query())) return FALSE; + if ((hr = parse_query( select2W, &query2->view, &query2->mem )) != S_OK) goto done; + if ((hr = execute_view( query2->view )) != S_OK) goto done; + + if (!(ret = heap_alloc_zero( query->view->count * sizeof(*ret) ))) goto done; + + for (i = 0; i < query->view->count; i++) + { + if ((hr = get_propval( query->view, i, pathW, &val, NULL, NULL )) != S_OK) goto done; + if (!(ret[i].ref = heap_strdupW( V_BSTR(&val) ))) goto done; + VariantClear( &val ); + + if ((hr = get_propval( query2->view, i, pathW, &val, NULL, NULL )) != S_OK) goto done; + if (!(ret[i].ref2 = heap_strdupW( V_BSTR(&val) ))) goto done; + VariantClear( &val ); + } + + *count = query->view->count; + +done: + if (!ret) free_assocations( ret, query->view->count ); + free_query( query ); + free_query( query2 ); + return ret; +} + +static enum fill_status fill_diskdrivetodiskpartition( struct table *table, const struct expr *cond ) +{ + struct record_diskdrivetodiskpartition *rec; + UINT i, row = 0, offset = 0, count = 0; + enum fill_status status = FILL_STATUS_UNFILTERED; + struct association *assoc; + + if (!(assoc = get_diskdrivetodiskpartition_pairs( &count ))) return FILL_STATUS_FAILED; + if (!count) + { + free_assocations( assoc, count ); + return FILL_STATUS_UNFILTERED; + } + if (!resize_table( table, count, sizeof(*rec) )) + { + free_assocations( assoc, count ); + return FILL_STATUS_FAILED; + } + + for (i = 0; i < count; i++) + { + rec = (struct record_diskdrivetodiskpartition *)(table->data + offset); + rec->antecedent = assoc[i].ref; + rec->dependent = assoc[i].ref2; + if (!match_row( table, row, cond, &status )) + { + free_row_values( table, row ); + continue; + } + offset += sizeof(*rec); + row++; + } + + heap_free( assoc ); + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + static WCHAR *get_filesystem( const WCHAR *root ) { static const WCHAR ntfsW[] = {'N','T','F','S',0}; @@ -2615,24 +2731,6 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr return status; } -struct association -{ - WCHAR *ref; - WCHAR *ref2; -}; - -static void free_assocations( struct association *assoc, UINT count ) -{ - UINT i; - if (!assoc) return; - for (i = 0; i < count; i++) - { - heap_free( assoc[i].ref ); - heap_free( assoc[i].ref2 ); - } - heap_free( assoc ); -} - static struct association *get_logicaldisktopartition_pairs( UINT *count ) { static const WCHAR pathW[] = @@ -4179,6 +4277,7 @@ static struct table builtin_classes[] = { class_desktopmonitorW, C(col_desktopmonitor), 0, 0, NULL, fill_desktopmonitor }, { class_directoryW, C(col_directory), 0, 0, NULL, fill_directory }, { class_diskdriveW, C(col_diskdrive), 0, 0, NULL, fill_diskdrive }, + { class_diskdrivetodiskpartitionW, C(col_diskdrivetodiskpartition), 0, 0, NULL, fill_diskdrivetodiskpartition }, { class_diskpartitionW, C(col_diskpartition), 0, 0, NULL, fill_diskpartition }, { class_ip4routetableW, C(col_ip4routetable), 0, 0, NULL, fill_ip4routetable }, { class_logicaldiskW, C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 6edb0d0f09..23641fc0d3 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -126,8 +126,11 @@ static void test_select( IWbemServices *services ) static const WCHAR query14[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; + static const WCHAR query15[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'D','i','s','k','D','r','i','v','e','T','o','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9, query10, - query11, query12, query13, query14 }; + query11, query12, query13, query14, query15 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW );

1 0

Hans Leidekker : wbemprox: Implement Win32_LogicalDiskToPartition.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 39bac1e32b3a802ce3f40067fdf63581821092f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39bac1e32b3a802ce3f40067… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 10 17:09:11 2019 +0200 wbemprox: Implement Win32_LogicalDiskToPartition. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 123 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 5 +- 2 files changed, 127 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 299a2edc71..93d842708f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -76,6 +76,8 @@ static const WCHAR class_logicaldiskW[] = {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_logicaldisk2W[] = {'C','I','M','_','L','o','g','i','c','a','l','D','i','s','k',0}; +static const WCHAR class_logicaldisktopartitionW[] = + {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; static const WCHAR class_networkadapterW[] = {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; static const WCHAR class_networkadapterconfigW[] = @@ -129,6 +131,8 @@ static const WCHAR prop_adaptertypeidW[] = {'A','d','a','p','t','e','r','T','y','p','e','I','D',0}; static const WCHAR prop_addresswidthW[] = {'A','d','d','r','e','s','s','W','i','d','t','h',0}; +static const WCHAR prop_antecedentW[] = + {'A','n','t','e','c','e','d','e','n','t',0}; static const WCHAR prop_architectureW[] = {'A','r','c','h','i','t','e','c','t','u','r','e',0}; static const WCHAR prop_attributesW[] = @@ -183,6 +187,8 @@ static const WCHAR prop_defaultipgatewayW[] = {'D','e','f','a','u','l','t','I','P','G','a','t','e','w','a','y',0}; static const WCHAR prop_defaultvalueW[] = {'D','e','f','a','u','l','t','V','a','l','u','e',0}; +static const WCHAR prop_dependentW[] = + {'D','e','p','e','n','d','e','n','t',0}; static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR prop_destinationW[] = @@ -533,6 +539,11 @@ static const struct column col_logicaldisk[] = { prop_volumenameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_volumeserialnumberW, CIM_STRING|COL_FLAG_DYNAMIC } }; +static const struct column col_logicaldisktopartition[] = +{ + { prop_antecedentW, CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_dependentW, CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY } +}; static const struct column col_networkadapter[] = { { prop_adaptertypeW, CIM_STRING }, @@ -961,6 +972,11 @@ struct record_logicaldisk const WCHAR *volumename; const WCHAR *volumeserialnumber; }; +struct record_logicaldisktopartition +{ + const WCHAR *antecedent; + const WCHAR *dependent; +}; struct record_networkadapter { const WCHAR *adaptertype; @@ -2599,6 +2615,112 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr return status; } +struct association +{ + WCHAR *ref; + WCHAR *ref2; +}; + +static void free_assocations( struct association *assoc, UINT count ) +{ + UINT i; + if (!assoc) return; + for (i = 0; i < count; i++) + { + heap_free( assoc[i].ref ); + heap_free( assoc[i].ref2 ); + } + heap_free( assoc ); +} + +static struct association *get_logicaldisktopartition_pairs( UINT *count ) +{ + static const WCHAR pathW[] = + {'_','_','P','A','T','H',0}; + static const WCHAR selectW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'D','i','s','k','P','a','r','t','i','t','i','o','n',0}; + static const WCHAR select2W[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k',' ','W','H','E','R','E',' ', + 'D','r','i','v','e','T','y','p','e','=','2',' ','O','R',' ','D','r','i','v','e','T','y','p','e','=','3',0}; + struct association *ret = NULL; + struct query *query, *query2 = NULL; + VARIANT val; + HRESULT hr; + UINT i; + + if (!(query = create_query())) return NULL; + if ((hr = parse_query( selectW, &query->view, &query->mem )) != S_OK) goto done; + if ((hr = execute_view( query->view )) != S_OK) goto done; + + if (!(query2 = create_query())) return FALSE; + if ((hr = parse_query( select2W, &query2->view, &query2->mem )) != S_OK) goto done; + if ((hr = execute_view( query2->view )) != S_OK) goto done; + + if (!(ret = heap_alloc_zero( query->view->count * sizeof(*ret) ))) goto done; + + /* assume fixed and removable disks are enumerated in the same order as partitions */ + for (i = 0; i < query->view->count; i++) + { + if ((hr = get_propval( query->view, i, pathW, &val, NULL, NULL )) != S_OK) goto done; + if (!(ret[i].ref = heap_strdupW( V_BSTR(&val) ))) goto done; + VariantClear( &val ); + + if ((hr = get_propval( query2->view, i, pathW, &val, NULL, NULL )) != S_OK) goto done; + if (!(ret[i].ref2 = heap_strdupW( V_BSTR(&val) ))) goto done; + VariantClear( &val ); + } + + *count = query->view->count; + +done: + if (!ret) free_assocations( ret, query->view->count ); + free_query( query ); + free_query( query2 ); + return ret; +} + +static enum fill_status fill_logicaldisktopartition( struct table *table, const struct expr *cond ) +{ + struct record_logicaldisktopartition *rec; + UINT i, row = 0, offset = 0, count = 0; + enum fill_status status = FILL_STATUS_UNFILTERED; + struct association *assoc; + + if (!(assoc = get_logicaldisktopartition_pairs( &count ))) return FILL_STATUS_FAILED; + if (!count) + { + free_assocations( assoc, count ); + return FILL_STATUS_UNFILTERED; + } + if (!resize_table( table, count, sizeof(*rec) )) + { + free_assocations( assoc, count ); + return FILL_STATUS_FAILED; + } + + for (i = 0; i < count; i++) + { + rec = (struct record_logicaldisktopartition *)(table->data + offset); + rec->antecedent = assoc[i].ref; + rec->dependent = assoc[i].ref2; + if (!match_row( table, row, cond, &status )) + { + free_row_values( table, row ); + continue; + } + offset += sizeof(*rec); + row++; + } + + heap_free( assoc ); + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + static UINT16 get_connection_status( IF_OPER_STATUS status ) { switch (status) @@ -4061,6 +4183,7 @@ static struct table builtin_classes[] = { class_ip4routetableW, C(col_ip4routetable), 0, 0, NULL, fill_ip4routetable }, { class_logicaldiskW, C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, { class_logicaldisk2W, C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, + { 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 }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index b180cfc92f..6edb0d0f09 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -123,8 +123,11 @@ static void test_select( IWbemServices *services ) static const WCHAR query13[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','I','O','S', ' ','W','H','E','R','E',' ','N','U','L','L',' ','=',' ','N','A','M','E', 0}; + static const WCHAR query14[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9, query10, - query11, query12, query13 }; + query11, query12, query13, query14 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW );

1 0

Hans Leidekker : wbemprox: Fix index in fill_diskdrive and fill_diskpartition.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: c69813bcd0c540a04910647fa19ecacc2aad0675 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c69813bcd0c540a04910647f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 10 17:09:13 2019 +0200 wbemprox: Fix index in fill_diskdrive and fill_diskpartition. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 105a2d3ec2..de793f3f7e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2424,7 +2424,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * rec = (struct record_diskdrive *)(table->data + offset); swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, index ); rec->device_id = heap_strdupW( device_id ); - rec->index = index; + rec->index = index++; rec->interfacetype = diskdrive_interfacetypeW; rec->manufacturer = diskdrive_manufacturerW; rec->mediatype = (type == DRIVE_FIXED) ? diskdrive_mediatype_fixedW : diskdrive_mediatype_removableW; @@ -2439,7 +2439,6 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * continue; } offset += sizeof(*rec); - index++; row++; } } @@ -2591,7 +2590,7 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex rec->bootpartition = (i == 2) ? -1 : 0; swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, index ); rec->device_id = heap_strdupW( device_id ); - rec->diskindex = index; + rec->diskindex = index++; rec->index = 0; rec->pnpdevice_id = heap_strdupW( device_id ); get_freespace( root, &size ); @@ -2605,7 +2604,6 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex } offset += sizeof(*rec); row++; - index++; } } TRACE("created %u rows\n", row);

1 0

Hans Leidekker : wbemprox: Add support for evaluating ASSOCIATORS OF queries.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 8487265f81a2824ae26485db3b7525c3984efca6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8487265f81a2824ae26485db… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 10 17:09:14 2019 +0200 wbemprox: Add support for evaluating ASSOCIATORS OF queries. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 40 ++- dlls/wbemprox/class.c | 36 +-- dlls/wbemprox/query.c | 509 +++++++++++++++++++++++++++++++-------- dlls/wbemprox/services.c | 21 +- dlls/wbemprox/wbemprox_private.h | 36 ++- dlls/wbemprox/wql.y | 10 +- 6 files changed, 496 insertions(+), 156 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8487265f81a2824ae264…

1 0