wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Zebediah Figura : ddraw: Retrieve the viewport from the primary stateblock.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 8ac582762cd764e3891b021f6237b6569b5a11f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ac582762cd764e3891b021f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 14:18:43 2020 -0600 ddraw: Retrieve the viewport from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 6603835ef0..240f79b432 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3884,7 +3884,7 @@ static HRESULT WINAPI d3d_device7_GetClipStatus(IDirect3DDevice7 *iface, D3DCLIP FIXME("iface %p, clip_status %p stub.\n", iface, clip_status); - wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + vp = wined3d_stateblock_get_state(device->state)->viewport; clip_status->minx = vp.x; clip_status->maxx = vp.x + vp.width; clip_status->miny = vp.y; @@ -5391,7 +5391,7 @@ static HRESULT d3d_device7_GetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_viewport); + wined3d_viewport = wined3d_stateblock_get_state(device->state)->viewport; wined3d_mutex_unlock(); viewport->dwX = wined3d_viewport.x;

1 0

Zebediah Figura : ddraw: Stop setting the device state in d3d_device7_SetMaterial().
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 356259038364f6f275ea08a8197032f0de1dba47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=356259038364f6f275ea08a8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 14:18:42 2020 -0600 ddraw: Stop setting the device state in d3d_device7_SetMaterial(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index fa79a98777..6603835ef0 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5448,8 +5448,6 @@ static HRESULT d3d_device7_SetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *ma wined3d_mutex_lock(); /* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */ wined3d_stateblock_set_material(device->update_state, (const struct wined3d_material *)material); - if (!device->recording) - wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : ddraw: Retrieve the material from the primary stateblock.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 955512d2087f22c9e792364f5d5bfd7384655fc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=955512d2087f22c9e792364f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 14:18:41 2020 -0600 ddraw: Retrieve the material from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7acc8e0db0..fa79a98777 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5495,7 +5495,7 @@ static HRESULT d3d_device7_GetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *ma wined3d_mutex_lock(); /* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */ - wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material); + memcpy(material, &wined3d_stateblock_get_state(device->state)->material, sizeof(*material)); wined3d_mutex_unlock(); return D3D_OK;

1 0

Jacek Caban : stdio.h: Fix calling convention of variadic inline functions.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: d34ae79dddd750523304a615c8aaaa2745a19adc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d34ae79dddd750523304a615… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:37:00 2020 +0100 stdio.h: Fix calling convention of variadic inline functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48697 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 2 +- include/msvcrt/stdio.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 3951a1c829..c1779fb81a 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -115,7 +115,7 @@ static inline int __cdecl _vsnwprintf_s(wchar_t *buffer, size_t size, size_t cou return ret < 0 ? -1 : ret; } -static inline int __cdecl _snwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, ...) +static inline int WINAPIV _snwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, ...) { int ret; __ms_va_list args; diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index e184704eb9..f2aef46e6f 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -174,7 +174,7 @@ static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count, return ret < 0 ? -1 : ret; } -static inline int __cdecl _snprintf_s(char *buffer, size_t size, size_t count, const char *format, ...) +static inline int WINAPIV _snprintf_s(char *buffer, size_t size, size_t count, const char *format, ...) { int ret; __ms_va_list args;

1 0

Jacek Caban : winegcc: Add support for using clang directly.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: aabfd2dd3abc8b6cf1c42ce0adbd5b6dca6d5db0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aabfd2dd3abc8b6cf1c42ce0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:02:28 2020 +0100 winegcc: Add support for using clang directly. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index f2329e492c..d663103186 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -325,20 +325,23 @@ enum tool static const struct { const char *base; + const char *llvm_base; const char *deflt; } tool_names[] = { - { "gcc", CC }, - { "g++", CXX }, - { "cpp", CPP }, - { "ld", LD }, + { "gcc", "clang --driver-mode=gcc", CC }, + { "g++", "clang --driver-mode=g++", CXX }, + { "cpp", "clang --driver-mode=cpp", CPP }, + { "ld", "ld.lld", LD }, }; static strarray* build_tool_name( struct options *opts, enum tool tool ) { const char *base = tool_names[tool].base; + const char *llvm_base = tool_names[tool].llvm_base; const char *deflt = tool_names[tool].deflt; const char *path; + strarray *ret; char* str; if (opts->target && opts->version) @@ -357,8 +360,28 @@ static strarray* build_tool_name( struct options *opts, enum tool tool ) str = xstrdup(deflt); if ((path = find_binary( opts->prefix, str ))) return strarray_fromstring( path, " " ); - error( "Could not find %s\n", base ); - return NULL; + + if (!opts->version) str = xstrdup( llvm_base ); + else str = strmake( "%s-%s", llvm_base, opts->version ); + path = find_binary( opts->prefix, str ); + if (!path) + { + error( "Could not find %s\n", base ); + return NULL; + } + + ret = strarray_fromstring( path, " " ); + if (!strncmp( llvm_base, "clang", 5 )) + { + if (opts->target) + { + strarray_add( ret, "-target" ); + strarray_add( ret, opts->target ); + } + strarray_add( ret, "-Wno-unused-command-line-argument" ); + strarray_add( ret, "-fuse-ld=lld" ); + } + return ret; } static strarray* get_translator(struct options *opts)

1 0

Jacek Caban : winegcc: Pass tool by id to build_tool_name.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 9a9f35a4df628e9e748fce3a14ae27eafbd52575 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a9f35a4df628e9e748fce3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:02:18 2020 +0100 winegcc: Pass tool by id to build_tool_name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 6bcd157a26..f2329e492c 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -314,8 +314,30 @@ static char* get_temp_file(const char* prefix, const char* suffix) return tmp; } -static strarray* build_tool_name(struct options *opts, const char* base, const char* deflt) +enum tool { + TOOL_CC, + TOOL_CXX, + TOOL_CPP, + TOOL_LD, +}; + +static const struct +{ + const char *base; + const char *deflt; +} tool_names[] = +{ + { "gcc", CC }, + { "g++", CXX }, + { "cpp", CPP }, + { "ld", LD }, +}; + +static strarray* build_tool_name( struct options *opts, enum tool tool ) +{ + const char *base = tool_names[tool].base; + const char *deflt = tool_names[tool].deflt; const char *path; char* str; @@ -341,24 +363,24 @@ static strarray* build_tool_name(struct options *opts, const char* base, const c static strarray* get_translator(struct options *opts) { - strarray *tool; + enum tool tool; switch(opts->processor) { case proc_cpp: - tool = build_tool_name(opts, "cpp", CPP); + tool = TOOL_CPP; break; case proc_cc: case proc_as: - tool = build_tool_name(opts, "gcc", CC); + tool = TOOL_CC; break; case proc_cxx: - tool = build_tool_name(opts, "g++", CXX); + tool = TOOL_CXX; break; default: assert(0); } - return tool; + return build_tool_name( opts, tool ); } static int try_link( const strarray *prefix, const strarray *link_tool, const char *cflags ) @@ -680,8 +702,8 @@ static void compile(struct options* opts, const char* lang) /* mixing different C and C++ compilers isn't supported in configure anyway */ case proc_cc: case proc_cxx: - gcc = build_tool_name(opts, "gcc", CC); - gpp = build_tool_name(opts, "g++", CXX); + gcc = build_tool_name(opts, TOOL_CC); + gpp = build_tool_name(opts, TOOL_CXX); for ( j = 0; !gcc_defs && j < comp_args->size; j++ ) { const char *cc = comp_args->base[j]; @@ -1161,8 +1183,8 @@ static void build(struct options* opts) /* run winebuild to generate the .spec.o file */ spec_args = get_winebuild_args( opts ); - if ((tool = build_tool_name( opts, "gcc", CC ))) strarray_add( spec_args, strmake( "--cc-cmd=%s", strarray_tostring( tool, " " ))); - if (!is_pe && (tool = build_tool_name( opts, "ld", LD ))) strarray_add( spec_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); + if ((tool = build_tool_name( opts, TOOL_CC ))) strarray_add( spec_args, strmake( "--cc-cmd=%s", strarray_tostring( tool, " " ))); + if (!is_pe && (tool = build_tool_name( opts, TOOL_LD ))) strarray_add( spec_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size)

1 0

Jacek Caban : winegcc: Return build_tool_name result as strarray.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 4cfe747772e0ac9d1c35caab5c3d989dc4cb1868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cfe747772e0ac9d1c35caab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:02:08 2020 +0100 winegcc: Return build_tool_name result as strarray. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index f2802e2460..6bcd157a26 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -314,7 +314,7 @@ static char* get_temp_file(const char* prefix, const char* suffix) return tmp; } -static const char* build_tool_name(struct options *opts, const char* base, const char* deflt) +static strarray* build_tool_name(struct options *opts, const char* base, const char* deflt) { const char *path; char* str; @@ -334,31 +334,31 @@ static const char* build_tool_name(struct options *opts, const char* base, const else str = xstrdup(deflt); - if ((path = find_binary( opts->prefix, str ))) return path; + if ((path = find_binary( opts->prefix, str ))) return strarray_fromstring( path, " " ); error( "Could not find %s\n", base ); return NULL; } static strarray* get_translator(struct options *opts) { - const char *str = NULL; + strarray *tool; switch(opts->processor) { case proc_cpp: - str = build_tool_name(opts, "cpp", CPP); + tool = build_tool_name(opts, "cpp", CPP); break; case proc_cc: case proc_as: - str = build_tool_name(opts, "gcc", CC); + tool = build_tool_name(opts, "gcc", CC); break; case proc_cxx: - str = build_tool_name(opts, "g++", CXX); + tool = build_tool_name(opts, "g++", CXX); break; default: assert(0); } - return strarray_fromstring( str, " " ); + return tool; } static int try_link( const strarray *prefix, const strarray *link_tool, const char *cflags ) @@ -680,8 +680,8 @@ static void compile(struct options* opts, const char* lang) /* mixing different C and C++ compilers isn't supported in configure anyway */ case proc_cc: case proc_cxx: - gcc = strarray_fromstring(build_tool_name(opts, "gcc", CC), " "); - gpp = strarray_fromstring(build_tool_name(opts, "g++", CXX), " "); + gcc = build_tool_name(opts, "gcc", CC); + gpp = build_tool_name(opts, "g++", CXX); for ( j = 0; !gcc_defs && j < comp_args->size; j++ ) { const char *cc = comp_args->base[j]; @@ -993,7 +993,7 @@ static void add_library( struct options *opts, strarray *lib_dirs, strarray *fil static void build(struct options* opts) { strarray *lib_dirs, *files; - strarray *spec_args, *link_args; + strarray *spec_args, *link_args, *tool; char *output_file, *output_path; const char *spec_o_name, *libgcc = NULL; const char *output_name, *spec_file, *lang; @@ -1161,8 +1161,8 @@ static void build(struct options* opts) /* run winebuild to generate the .spec.o file */ spec_args = get_winebuild_args( opts ); - strarray_add( spec_args, strmake( "--cc-cmd=%s", build_tool_name( opts, "gcc", CC ))); - if (!is_pe) strarray_add( spec_args, strmake( "--ld-cmd=%s", build_tool_name( opts, "ld", LD ))); + if ((tool = build_tool_name( opts, "gcc", CC ))) strarray_add( spec_args, strmake( "--cc-cmd=%s", strarray_tostring( tool, " " ))); + if (!is_pe && (tool = build_tool_name( opts, "ld", LD ))) strarray_add( spec_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size)

1 0

Jacek Caban : winegcc: Lookup PATH in find_binary and don't try to run binaries that can't be found.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 945c61c32d86fa7b3bac0641840f26897e55f1ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=945c61c32d86fa7b3bac0641… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:01:59 2020 +0100 winegcc: Lookup PATH in find_binary and don't try to run binaries that can't be found. Based on winebuild. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.c | 44 ++++++++++++++++++++++++++++++++++++++------ tools/winegcc/winegcc.c | 7 ++++++- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 52f46c491b..1a9bc0a63c 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -34,6 +34,12 @@ # define min(x,y) (((x) < (y)) ? (x) : (y)) #endif +#if defined(_WIN32) && !defined(__CYGWIN__) +# define PATH_SEPARATOR ';' +#else +# define PATH_SEPARATOR ':' +#endif + int verbose = 0; void error(const char* s, ...) @@ -305,18 +311,44 @@ file_type get_lib_type(enum target_platform platform, strarray* path, const char const char *find_binary( const strarray* prefix, const char *name ) { + char *file_name, *args; + static strarray *path; unsigned int i; - if (!prefix) return name; if (strchr( name, '/' )) return name; - for (i = 0; i < prefix->size; i++) + file_name = xstrdup( name ); + if ((args = strchr( file_name, ' ' ))) *args++ = 0; + + if (prefix) + { + for (i = 0; i < prefix->size; i++) + { + struct stat st; + char *prog = strmake( "%s/%s%s", prefix->base[i], file_name, EXEEXT ); + if (stat( prog, &st ) == 0 && S_ISREG( st.st_mode ) && (st.st_mode & 0111)) + return args ? strmake( "%s %s", prog, args ) : prog; + free( prog ); + } + } + if (!path) { - 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; + path = strarray_alloc(); + + /* then append the PATH directories */ + if (getenv( "PATH" )) + { + char *p = xstrdup( getenv( "PATH" )); + while (*p) + { + strarray_add( path, p ); + while (*p && *p != PATH_SEPARATOR) p++; + if (!*p) break; + *p++ = 0; + } + } } - return name; + return prefix == path ? NULL : find_binary( path, name ); } int spawn(const strarray* prefix, const strarray* args, int ignore_errors) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 20c72ec3c5..f2802e2460 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -316,6 +316,7 @@ static char* get_temp_file(const char* prefix, const char* suffix) static const char* build_tool_name(struct options *opts, const char* base, const char* deflt) { + const char *path; char* str; if (opts->target && opts->version) @@ -332,7 +333,10 @@ static const char* build_tool_name(struct options *opts, const char* base, const } else str = xstrdup(deflt); - return find_binary( opts->prefix, str ); + + if ((path = find_binary( opts->prefix, str ))) return path; + error( "Could not find %s\n", base ); + return NULL; } static strarray* get_translator(struct options *opts) @@ -877,6 +881,7 @@ static strarray *get_winebuild_args(struct options *opts) binary = strmake( "%s/winebuild%s", bindir, EXEEXT ); else binary = find_binary( opts->prefix, "winebuild" ); + if (!binary) error( "Could not find winebuild\n" ); strarray_add( spec_args, binary ); if (verbose) strarray_add( spec_args, "-v" ); if (keep_generated) strarray_add( spec_args, "--save-temps" );

1 0

Jacek Caban : winetest: Build with msvcrt.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: adc34d4a29c9e8a635cccfe4dfad374f7483672b URL: https://source.winehq.org/git/wine.git/?a=commit;h=adc34d4a29c9e8a635cccfe4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:11:10 2020 +0100 winetest: Build with msvcrt. Allows running tests on Windows without ucrtbase.dll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 0322e773c5..699ce7864c 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -1,5 +1,5 @@ MODULE = winetest.exe -IMPORTS = uuid comctl32 version user32 gdi32 advapi32 wsock32 +IMPORTS = uuid comctl32 version user32 gdi32 advapi32 wsock32 msvcrt DELAYIMPORTS = ole32 EXTRADLLFLAGS = -mconsole -mno-cygwin

1 0

Francois Gouget : kernel32/tests: Fix test_Toolhelp()'s nested process lookup.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: e4c15b5bbd567694dbcdb142751e7410e323c691 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4c15b5bbd567694dbcdb142… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 2 18:27:30 2020 +0100 kernel32/tests: Fix test_Toolhelp()'s nested process lookup. On Windows, processes are not reassigned to pid 1 when their parent dies. This means many processes could have the same ppid despite being started by unrelated processes. It also means test_Toolhelp() cannot reliably look up the nested process by its ppid. So look up for the nested process by its pid and only then check its ppid, executable file, etc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48664 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b32560358d..b5ed99062e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1157,6 +1157,7 @@ static void test_Toolhelp(void) STARTUPINFOA startup; PROCESS_INFORMATION info; HANDLE process, thread, snapshot; + DWORD nested_pid; PROCESSENTRY32 pe; THREADENTRY32 te; DWORD ret; @@ -1209,17 +1210,24 @@ static void test_Toolhelp(void) /* The following test fails randomly on some Windows versions, but Gothic 2 depends on it */ ok(i < 20 || broken(i == 20), "process object not released\n"); + /* Look for the nested process by pid */ + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + nested_pid = GetPrivateProfileIntA("Nested", "Pid", 0, resfile); + DeleteFileA(resfile); + snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); memset(&pe, 0, sizeof(pe)); pe.dwSize = sizeof(pe); if (pProcess32First(snapshot, &pe)) { - while (pe.th32ParentProcessID != info.dwProcessId) + while (pe.th32ProcessID != nested_pid) if (!pProcess32Next(snapshot, &pe)) break; } CloseHandle(snapshot); - ok(pe.th32ParentProcessID == info.dwProcessId, "failed to find nested child process\n"); + ok(pe.th32ProcessID == nested_pid, "failed to find nested child process\n"); + ok(pe.th32ParentProcessID == info.dwProcessId, "nested child process has parent %u instead of %u\n", pe.th32ParentProcessID, info.dwProcessId); + ok(stricmp(pe.szExeFile, exename) == 0, "nested executable is %s instead of %s\n", pe.szExeFile, exename); process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, pe.th32ProcessID); ok(process != NULL, "OpenProcess failed %u\n", GetLastError()); @@ -1242,7 +1250,8 @@ static void test_Toolhelp(void) ok(ret == 1, "expected 1, got %u\n", ret); CloseHandle(thread); - ok(WaitForSingleObject(process, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + ret = WaitForSingleObject(process, 30000); + ok(ret == WAIT_OBJECT_0, "Child process termination got %u le=%u\n", ret, GetLastError()); CloseHandle(process); WritePrivateProfileStringA(NULL, NULL, NULL, resfile); @@ -4048,6 +4057,7 @@ START_TEST(process) char buffer[MAX_PATH + 26]; STARTUPINFOA startup; PROCESS_INFORMATION info; + HANDLE hFile; memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -4058,6 +4068,14 @@ START_TEST(process) ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess failed\n"); CloseHandle(info.hProcess); CloseHandle(info.hThread); + + /* The nested process is suspended so we can use the same resource + * file and it's up to the parent to read it before resuming the + * nested process. + */ + hFile = CreateFileA(myARGV[3], GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + childPrintf(hFile, "[Nested]\nPid=%08u\n", info.dwProcessId); + CloseHandle(hFile); return; } else if (!strcmp(myARGV[2], "parent") && myARGC >= 5)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020