September 2019 - Wine-Commits

Hans Leidekker : wbemprox: Fix index in fill_diskdrive and fill_diskpartition.
by Alexandre Julliard Sept. 10, 2019

Sept. 10, 2019

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

Alexandre Julliard : winegcc: Fix handling of the --sysroot flag when not building inside the Wine tree.
by Alexandre Julliard Sept. 10, 2019

Sept. 10, 2019

Module: wine Branch: master Commit: 0c2cc9bb05815b88286422e714825929d40ec2ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c2cc9bb05815b88286422e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 10 12:07:01 2019 +0200 winegcc: Fix handling of the --sysroot flag when not building inside the Wine tree. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a7476dd19d..db46cf6d5d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -213,6 +213,8 @@ struct options const char* output_name; const char* image_base; const char* section_align; + const char* sysroot; + const char* isysroot; const char* lib_suffix; const char* subsystem; const char* prelink; @@ -567,6 +569,7 @@ static char *get_lib_dir( struct options *opts ) static const char *stdlibpath[] = { LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; static const char libwine[] = "/libwine.so"; const char *bit_suffix, *other_bit_suffix, *build_multiarch, *target_multiarch; + const char *root = opts->sysroot ? opts->sysroot : ""; unsigned int i; size_t build_len, target_len; @@ -579,8 +582,10 @@ static char *get_lib_dir( struct options *opts ) for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++) { - char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); - strcpy( buffer, stdlibpath[i] ); + char *p, *buffer = xmalloc( strlen(root) + strlen(stdlibpath[i]) + + strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); + strcpy( buffer, root ); + strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; strcpy( p, libwine ); @@ -598,7 +603,8 @@ static char *get_lib_dir( struct options *opts ) strcat( p, libwine ); if (check_platform( opts, buffer )) goto found; - strcpy( buffer, stdlibpath[i] ); + strcpy( buffer, root ); + strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; strcpy( p, libwine ); @@ -646,7 +652,7 @@ static char *get_lib_dir( struct options *opts ) buffer[strlen(buffer) - strlen(libwine)] = 0; return buffer; } - return xstrdup( LIBDIR ); + return strmake( "%s%s", root, LIBDIR ); } static void compile(struct options* opts, const char* lang) @@ -798,13 +804,16 @@ no_compat_defines: /* standard includes come last in the include search path */ if (!opts->wine_objdir && !opts->nostdinc) { + const char *root = opts->isysroot ? opts->isysroot : opts->sysroot ? opts->sysroot : ""; if (opts->use_msvcrt) { - strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/msvcrt" : "-I" INCLUDEDIR "/wine/msvcrt" ); + strarray_add(comp_args, strmake( "%s%s%s/wine/msvcrt", + gcc_defs ? "-isystem" : "-I", root, INCLUDEDIR )); strarray_add(comp_args, "-D__MSVCRT__"); } - strarray_add(comp_args, "-I" INCLUDEDIR ); - strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/windows" : "-I" INCLUDEDIR "/wine/windows" ); + strarray_add(comp_args, strmake( "-I%s%s", root, INCLUDEDIR )); + strarray_add(comp_args, strmake( "%s%s%s/wine/windows", + gcc_defs ? "-isystem" : "-I", root, INCLUDEDIR )); } else if (opts->wine_objdir) strarray_add(comp_args, strmake("-I%s/include", opts->wine_objdir) ); @@ -1418,8 +1427,9 @@ int main(int argc, char **argv) next_is_arg = 1; break; case '-': - if (strcmp("--param", argv[i]) == 0) - next_is_arg = 1; + next_is_arg = (strcmp("--param", argv[i]) == 0 || + strcmp("--sysroot", argv[i]) == 0 || + strcmp("--lib-suffix", argv[i]) == 0); break; } if (next_is_arg) @@ -1496,6 +1506,9 @@ int main(int argc, char **argv) else if (!strcmp("-fno-PIC", argv[i]) || !strcmp("-fno-pic", argv[i])) opts.pic = 0; break; + case 'i': + if (!strcmp( "-isysroot", argv[i] )) opts.isysroot = argv[i + 1]; + break; case 'l': strarray_add(opts.files, strmake("-l%s", option_arg)); break; @@ -1637,16 +1650,16 @@ int main(int argc, char **argv) case '-': if (strcmp("-static", argv[i]+1) == 0) linking = -1; - else if (!strncmp("--sysroot", argv[i], 9) && opts.wine_objdir) + else if (!strncmp("--sysroot", argv[i], 9)) { - if (argv[i][9] == '=') opts.wine_objdir = argv[i] + 10; - else opts.wine_objdir = argv[++i]; - raw_compiler_arg = raw_linker_arg = 0; + if (argv[i][9] == '=') opts.sysroot = argv[i] + 10; + else opts.sysroot = argv[i + 1]; + if (opts.wine_objdir) 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; - else opts.lib_suffix = argv[++i]; + else opts.lib_suffix = argv[i + 1]; raw_compiler_arg = raw_linker_arg = 0; } break; @@ -1675,6 +1688,7 @@ int main(int argc, char **argv) } } + if (opts.wine_objdir && opts.sysroot) opts.wine_objdir = opts.sysroot; if (opts.processor == proc_cpp) linking = 0; if (linking == -1) error("Static linking is not supported\n");

1 0

Alexandre Julliard : winebuild: Add support for the -B option.
by Alexandre Julliard Sept. 10, 2019

Sept. 10, 2019

Module: wine Branch: master Commit: 6ba101b22965d9b9ef66d54c0d12c253db0f4569 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ba101b22965d9b9ef66d54c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 10 17:53:19 2019 +0200 winebuild: Add support for the -B option. Based on a patch by Kevin Puetz. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 7 ++- tools/winebuild/utils.c | 123 ++++++++++++++++++++++----------------- tools/winebuild/winebuild.man.in | 4 ++ 4 files changed, 80 insertions(+), 55 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index bde322cef3..2b67d305e8 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -369,6 +369,7 @@ extern FILE *output_file; extern const char *output_file_name; extern struct strarray lib_path; +extern struct strarray tools_path; extern struct strarray as_command; extern struct strarray cc_command; extern struct strarray ld_command; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 7d54395860..f4abb55081 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -83,6 +83,7 @@ const char *output_file_name = NULL; static int fake_module; struct strarray lib_path = { 0 }; +struct strarray tools_path = { 0 }; struct strarray as_command = { 0 }; struct strarray cc_command = { 0 }; struct strarray ld_command = { 0 }; @@ -257,6 +258,7 @@ static const char usage_str[] = "Options:\n" " --as-cmd=AS Command to use for assembling (default: as)\n" " -b, --target=TARGET Specify target CPU and platform for cross-compiling\n" +" -B PREFIX Look for build tools in the PREFIX directory\n" " --cc-cmd=CC C compiler to use for assembling (default: fall back to --as-cmd)\n" " -d, --delay-lib=LIB Import the specified library in delayed mode\n" " -D SYM Ignored for C flags compatibility\n" @@ -316,7 +318,7 @@ enum long_options_values LONG_OPT_VERSION }; -static const char short_options[] = "C:D:E:F:H:I:K:L:M:N:b:d:e:f:hkl:m:o:r:u:vw"; +static const char short_options[] = "B:C:D:E:F:H:I:K:L:M:N:b:d:e:f:hkl:m:o:r:u:vw"; static const struct option long_options[] = { @@ -389,6 +391,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) { switch(optc) { + case 'B': + strarray_add( &tools_path, xstrdup( optarg ), NULL ); + break; case 'D': /* ignored */ break; diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index fe82ad75e9..a73f520ccc 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -281,11 +281,72 @@ int output( const char *format, ... ) return ret; } +static struct strarray get_tools_path(void) +{ + static int done; + static struct strarray dirs; + + if (!done) + { + dirs = strarray_copy( tools_path ); + + /* then append the PATH directories */ + if (getenv( "PATH" )) + { + char *p = xstrdup( getenv( "PATH" )); + while (*p) + { + strarray_add_one( &dirs, p ); + while (*p && *p != PATH_SEPARATOR) p++; + if (!*p) break; + *p++ = 0; + } + } + done = 1; + } + return dirs; +} + +/* find a binary in the path */ +static const char *find_binary( const char *prefix, const char *name ) +{ + struct strarray dirs = get_tools_path(); + unsigned int i, maxlen = 0; + struct stat st; + char *p, *file; + + if (strchr( name, '/' )) return name; + if (!prefix) prefix = ""; + for (i = 0; i < dirs.count; i++) maxlen = max( maxlen, strlen(dirs.str[i]) + 2 ); + file = xmalloc( maxlen + strlen(prefix) + strlen(name) + sizeof(EXEEXT) + 1 ); + + for (i = 0; i < dirs.count; i++) + { + strcpy( file, dirs.str[i] ); + p = file + strlen(file); + if (p == file) *p++ = '.'; + if (p[-1] != '/') *p++ = '/'; + if (*prefix) + { + strcpy( p, prefix ); + p += strlen(p); + *p++ = '-'; + } + strcpy( p, name ); + strcat( p, EXEEXT ); + if (!stat( file, &st ) && S_ISREG(st.st_mode) && (st.st_mode & 0111)) return file; + } + free( file ); + return NULL; +} + void spawn( struct strarray args ) { unsigned int i; int status; + const char *argv0 = find_binary( NULL, args.str[0] ); + if (argv0) args.str[0] = argv0; strarray_add_one( &args, NULL ); if (verbose) for (i = 0; args.str[i]; i++) @@ -302,35 +363,8 @@ void spawn( struct strarray args ) /* find a build tool in the path, trying the various names */ struct strarray find_tool( const char *name, const char * const *names ) { - static char **dirs; - static unsigned int count, maxlen; - - char *p, *file; + const char *file; const char *alt_names[2]; - unsigned int i, len; - struct stat st; - - if (!dirs) - { - char *path; - - /* split the path in directories */ - - if (!getenv( "PATH" )) fatal_error( "PATH not set, cannot find required tools\n" ); - path = xstrdup( getenv( "PATH" )); - for (p = path, count = 2; *p; p++) if (*p == PATH_SEPARATOR) count++; - dirs = xmalloc( count * sizeof(*dirs) ); - count = 0; - dirs[count++] = p = path; - while (*p) - { - while (*p && *p != PATH_SEPARATOR) p++; - if (!*p) break; - *p++ = 0; - dirs[count++] = p; - } - for (i = 0; i < count; i++) maxlen = max( maxlen, strlen(dirs[i])+2 ); - } if (!names) { @@ -341,34 +375,12 @@ struct strarray find_tool( const char *name, const char * const *names ) while (*names) { - len = strlen(*names) + sizeof(EXEEXT) + 1; - if (target_alias) - len += strlen(target_alias) + 1; - file = xmalloc( maxlen + len ); - - for (i = 0; i < count; i++) + if ((file = find_binary( target_alias, *names ))) { - strcpy( file, dirs[i] ); - p = file + strlen(file); - if (p == file) *p++ = '.'; - if (p[-1] != '/') *p++ = '/'; - if (target_alias) - { - strcpy( p, target_alias ); - p += strlen(p); - *p++ = '-'; - } - strcpy( p, *names ); - strcat( p, EXEEXT ); - - if (!stat( file, &st ) && S_ISREG(st.st_mode) && (st.st_mode & 0111)) - { - struct strarray ret = empty_strarray; - strarray_add_one( &ret, file ); - return ret; - } + struct strarray ret = empty_strarray; + strarray_add_one( &ret, file ); + return ret; } - free( file ); names++; } fatal_error( "cannot find the '%s' tool\n", name ); @@ -377,6 +389,7 @@ struct strarray find_tool( const char *name, const char * const *names ) struct strarray get_as_command(void) { struct strarray args; + unsigned int i; if (cc_command.count) { @@ -387,6 +400,8 @@ struct strarray get_as_command(void) if (cpu_option) strarray_add_one( &args, strmake("-mcpu=%s", cpu_option) ); if (fpu_option) strarray_add_one( &args, strmake("-mfpu=%s", fpu_option) ); if (arch_option) strarray_add_one( &args, strmake("-march=%s", arch_option) ); + for (i = 0; i < tools_path.count; i++) + strarray_add_one( &args, strmake("-B%s", tools_path.str[i] )); return args; } diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 1b9b1b088b..12bafd72d3 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -68,6 +68,10 @@ Specify the target CPU and platform on which the generated code will be built. The target specification is in the standard autoconf format as returned by config.sub. .TP +.BI \-B\ directory +Add the directory to the search path for the various binutils tools +like \fBas\fR, \fBnm\fR and \fBld\fR. +.TP .BI \--cc-cmd= cc-command Specify the C compiler to use to compile assembly files; the default is to instead use the assembler specified with \fB--as-cmd\fR.

1 0

Alexandre Julliard : winegcc: Forward the -B options to winebuild.
by Alexandre Julliard Sept. 10, 2019

Sept. 10, 2019

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

Andrew Eikum : mmdevapi: Avoid reporting odd numbers of channels.
by Alexandre Julliard Sept. 10, 2019

Sept. 10, 2019

Module: wine Branch: master Commit: b56d19d3a0a69d17da220c5f1535a313e7874969 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b56d19d3a0a69d17da220c5f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 10 10:55:16 2019 -0500 mmdevapi: Avoid reporting odd numbers of channels. Fixes sound in Touhou Luna Nights with some surround sound configurations. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 16 ++++ dlls/winecoreaudio.drv/mmdevdrv.c | 195 +++++++++++++++++++++++++++++++++----- dlls/wineoss.drv/mmdevdrv.c | 16 ++++ dlls/winepulse.drv/mmdevdrv.c | 97 +++++++++++++++++-- 4 files changed, 295 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b56d19d3a0a69d17da22…

1 0

Hans Leidekker : wbemprox: Strip curly brackets from path strings.
by Alexandre Julliard Sept. 10, 2019

Sept. 10, 2019

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 Sept. 10, 2019

Sept. 10, 2019

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 Sept. 10, 2019

Sept. 10, 2019

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 Sept. 10, 2019

Sept. 10, 2019

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 Sept. 10, 2019

Sept. 10, 2019

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