September 2017 - Wine-commits

Zebediah Figura : dsquery: Register CommonQuery coclass.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: 1d311fd4a459c4d904426913e21e1c5e4abcae0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d311fd4a459c4d904426913e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 15 11:41:39 2017 -0500 dsquery: Register CommonQuery coclass. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/dsquery/Makefile.in | 3 +++ dlls/dsquery/dsquery.idl | 23 +++++++++++++++++++++++ include/cmnquery.idl | 12 +++++++++++- 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 47a41cd..18717e8 100755 --- a/configure +++ b/configure @@ -18307,7 +18307,7 @@ wine_fn_config_dll dpwsockx enable_dpwsockx wine_fn_config_dll drmclien enable_drmclien wine_fn_config_dll dsound enable_dsound clean,implib wine_fn_config_test dlls/dsound/tests dsound_test -wine_fn_config_dll dsquery enable_dsquery +wine_fn_config_dll dsquery enable_dsquery clean wine_fn_config_dll dssenh enable_dssenh wine_fn_config_test dlls/dssenh/tests dssenh_test wine_fn_config_dll dswave enable_dswave clean diff --git a/configure.ac b/configure.ac index cd5a50b..f01162b 100644 --- a/configure.ac +++ b/configure.ac @@ -3097,7 +3097,7 @@ WINE_CONFIG_DLL(dpwsockx) WINE_CONFIG_DLL(drmclien) WINE_CONFIG_DLL(dsound,,[clean,implib]) WINE_CONFIG_TEST(dlls/dsound/tests) -WINE_CONFIG_DLL(dsquery) +WINE_CONFIG_DLL(dsquery,,[clean]) WINE_CONFIG_DLL(dssenh) WINE_CONFIG_TEST(dlls/dssenh/tests) WINE_CONFIG_DLL(dswave,,[clean]) diff --git a/dlls/dsquery/Makefile.in b/dlls/dsquery/Makefile.in index 8fbe92d..611e601 100644 --- a/dlls/dsquery/Makefile.in +++ b/dlls/dsquery/Makefile.in @@ -3,3 +3,6 @@ IMPORTS = uuid C_SRCS = \ main.c + +IDL_SRCS = \ + dsquery.idl diff --git a/dlls/dsquery/dsquery.idl b/dlls/dsquery/dsquery.idl new file mode 100644 index 0000000..22300ed --- /dev/null +++ b/dlls/dsquery/dsquery.idl @@ -0,0 +1,23 @@ +/* + * COM Classes for dsquery + * + * Copyright 2017 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +#include "cmnquery.idl" diff --git a/include/cmnquery.idl b/include/cmnquery.idl index 62411fd..2b89f84 100644 --- a/include/cmnquery.idl +++ b/include/cmnquery.idl @@ -18,6 +18,12 @@ import "oaidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ object, uuid(1a3114b8-a62e-11d0-a6c5-00a0c906af45), @@ -76,4 +82,8 @@ interface ICommonQuery : IUnknown HRESULT OpenQueryWindow([in] HWND parent, [in] LPOPENQUERYWINDOW query_window, [out] IDataObject **data_object); } -cpp_quote("DEFINE_GUID(CLSID_CommonQuery, 0x83bc5ec0, 0x6f2a, 0x11d0, 0xa1,0xc4, 0x00,0xaa,0x00,0xc1,0x6e,0x65);") +[ + threading(apartment), + uuid(83bc5ec0-6f2a-11d0-a1c4-00aa00c16e65) +] +coclass CommonQuery { interface ICommonQuery; }

1 0

Alexandre Julliard : Release 2.17.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: bb16263fe1974851f495435fef9a3d57fa2d4aa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb16263fe1974851f495435fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 15 20:09:32 2017 +0200 Release 2.17. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 491 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +-- 3 files changed, 264 insertions(+), 247 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb16263fe1974851f4954…

1 0

Tag wine-2.17 : Alexandre Julliard : Release 2.17
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: refs/tags/wine-2.17 Tag: f723ae27dff8d8669316bcd143b24955d87aa77d URL: http://source.winehq.org/git/wine.git/?a=tag;h=f723ae27dff8d8669316bcd143b2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 15 20:09:32 2017 +0200 Release 2.17

1 0

Zebediah Figura : ieframe: Parse multiple command-line arguments.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: 1068f754a27ccef5b12c2542b6282efe45b468e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1068f754a27ccef5b12c2542b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 15 00:43:06 2017 -0500 ieframe: Parse multiple command-line arguments. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/iexplore.c | 53 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 11b79ad..378f736 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -845,7 +845,7 @@ void released_obj(void) PostQuitMessage(0); } -static BOOL create_ie_window(const WCHAR *cmdline) +static BOOL create_ie_window(BOOL nohome, const WCHAR *cmdline) { InternetExplorer *ie; HRESULT hres; @@ -858,33 +858,27 @@ static BOOL create_ie_window(const WCHAR *cmdline) IWebBrowser2_put_MenuBar(&ie->IWebBrowser2_iface, VARIANT_TRUE); if(!*cmdline) { - IWebBrowser2_GoHome(&ie->IWebBrowser2_iface); + if (nohome) + ie->nohome = TRUE; + else + IWebBrowser2_GoHome(&ie->IWebBrowser2_iface); }else { VARIANT var_url; int cmdlen; - static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e'}; - - while(*cmdline == ' ' || *cmdline == '\t') - cmdline++; cmdlen = strlenW(cmdline); if(cmdlen > 2 && cmdline[0] == '"' && cmdline[cmdlen-1] == '"') { cmdline++; cmdlen -= 2; } - if(cmdlen == sizeof(nohomeW)/sizeof(*nohomeW) && !memcmp(cmdline, nohomeW, sizeof(nohomeW))) { - ie->nohome = TRUE; - }else { - V_VT(&var_url) = VT_BSTR; - - V_BSTR(&var_url) = SysAllocStringLen(cmdline, cmdlen); + V_VT(&var_url) = VT_BSTR; + V_BSTR(&var_url) = SysAllocStringLen(cmdline, cmdlen); - /* navigate to the first page */ - IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &var_url, NULL, NULL, NULL, NULL); + /* navigate to the first page */ + IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &var_url, NULL, NULL, NULL, NULL); - SysFreeString(V_BSTR(&var_url)); - } + SysFreeString(V_BSTR(&var_url)); } IWebBrowser2_Release(&ie->IWebBrowser2_iface); @@ -1042,8 +1036,10 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) { MSG msg; HRESULT hres; + BOOL embedding = FALSE, nohome = FALSE; static const WCHAR embeddingW[] = {'-','e','m','b','e','d','d','i','n','g',0}; + static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e',0}; TRACE("%s %d\n", debugstr_w(cmdline), nShowWindow); @@ -1057,8 +1053,29 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) init_dde(); - if(strcmpiW(cmdline, embeddingW)) { - if(!create_ie_window(cmdline)) { + while (*cmdline) + { + int length = 0; + + while (*cmdline == ' ' || *cmdline == '\t') cmdline++; + if (!*cmdline) break; + + while (cmdline[length] && cmdline[length] != ' ' && cmdline[length] != '\t') length++; + + if (!strncmpiW(cmdline, embeddingW, length)) + embedding = TRUE; + else if (!strncmpiW(cmdline, nohomeW, length)) + nohome = TRUE; + else + break; + + cmdline += length; + } + + if (!embedding) + { + if(!create_ie_window(nohome, cmdline)) + { CoUninitialize(); ExitProcess(1); }

1 0

Nikolay Sivov : d2d1: Use better bezier segment bounds approximation when updating figure bounds.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: dcccaaf7f3517e12e34a81925be59a54a2c9906c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcccaaf7f3517e12e34a81925… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 14 15:10:56 2017 +0300 d2d1: Use better bezier segment bounds approximation when updating figure bounds. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 8c66881..e38ac34 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -503,6 +503,14 @@ static float d2d_point_ccw(const D2D1_POINT_2F *a, const D2D1_POINT_2F *b, const return det_d[det_d_len - 1]; } +static void d2d_rect_union(D2D1_RECT_F *l, const D2D1_RECT_F *r) +{ + l->left = min(l->left, r->left); + l->top = min(l->top, r->top); + l->right = max(l->right, r->right); + l->bottom = max(l->bottom, r->bottom); +} + static BOOL d2d_rect_check_overlap(const D2D_RECT_F *p, const D2D_RECT_F *q) { return p->left < q->right && p->top < q->bottom && p->right > q->left && p->bottom > q->top; @@ -2527,6 +2535,8 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddBeziers(ID2D1GeometrySink *if for (i = 0; i < count; ++i) { + D2D1_RECT_F bezier_bounds; + /* FIXME: This tries to approximate a cubic bezier with a quadratic one. */ p.x = (beziers[i].point1.x + beziers[i].point2.x) * 0.75f; p.y = (beziers[i].point1.y + beziers[i].point2.y) * 0.75f; @@ -2534,6 +2544,9 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddBeziers(ID2D1GeometrySink *if p.y -= (figure->vertices[figure->vertex_count - 1].y + beziers[i].point3.y) * 0.25f; figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_BEZIER; + d2d_rect_get_bezier_bounds(&bezier_bounds, &figure->vertices[figure->vertex_count - 1], + &p, &beziers[i].point3); + if (!d2d_figure_add_bezier_control(figure, &p)) { ERR("Failed to add bezier control.\n"); @@ -2547,6 +2560,8 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddBeziers(ID2D1GeometrySink *if geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR; return; } + + d2d_rect_union(&figure->bounds, &bezier_bounds); } geometry->u.path.segment_count += count;

1 0

Nikolay Sivov : d2d1: Implement GetBounds() for path geometries.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: 00fea0298b26da525c9fbcd1a2b149ed216c823e URL: http://source.winehq.org/git/wine.git/?a=commit;h=00fea0298b26da525c9fbcd1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 14 15:10:57 2017 +0300 d2d1: Implement GetBounds() for path geometries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 + dlls/d2d1/geometry.c | 105 +++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 221 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00fea0298b26da525c9fb…

1 0

Nikolay Sivov : d3d9: Ask for texture GetDC() capability GET_DC based on texture format instead of initial swapchain buffer format.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: 67689049e2608e46761765eb8412e6ec423670c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67689049e2608e46761765eb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 15 08:14:34 2017 +0300 d3d9: Ask for texture GetDC() capability GET_DC based on texture format instead of initial swapchain buffer format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b4cb253..cd42cbc 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -239,8 +239,6 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); swapchain_desc->flags = (present_parameters->Flags & D3DPRESENTFLAGS_MASK) | WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; - if (is_gdi_compat_wined3dformat(swapchain_desc->backbuffer_format)) - swapchain_desc->flags |= WINED3D_SWAPCHAIN_GDI_COMPATIBLE; swapchain_desc->refresh_rate = present_parameters->FullScreen_RefreshRateInHz; swapchain_desc->swap_interval = present_parameters->PresentationInterval; swapchain_desc->auto_restore_display_mode = TRUE; @@ -3922,6 +3920,9 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic if (container_parent == device_parent) container_parent = &device->IDirect3DDevice9Ex_iface; + if (is_gdi_compat_wined3dformat(desc->format)) + texture_flags |= WINED3D_TEXTURE_CREATE_GET_DC; + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1, texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, container_parent, &d3d9_null_wined3d_parent_ops, texture)))

1 0

Zebediah Figura : msi/tests: Add external UI tests for top-level actions.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 042de13cff79e97eda9a3d95ea7d5ed84f11c6d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042de13cff79e97eda9a3d95e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 14 01:03:57 2017 -0500 msi/tests: Add external UI tests for top-level actions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 270 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=042de13cff79e97eda9a3…

1 0

Nikolay Sivov : dwrite/tests: Added a helper to initialize test text source.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 39dbf09b3fe28ac8aaf31bd35ea569ca6478991e URL: http://source.winehq.org/git/wine.git/?a=commit;h=39dbf09b3fe28ac8aaf31bd35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 14 11:40:10 2017 +0300 dwrite/tests: Added a helper to initialize test text source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 2e2a2e9..c5a0b09 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -367,9 +367,18 @@ struct testanalysissource { IDWriteTextAnalysisSource IDWriteTextAnalysisSource_iface; const WCHAR *text; + UINT32 text_length; DWRITE_READING_DIRECTION direction; }; +static void init_textsource(struct testanalysissource *source, const WCHAR *text, + DWRITE_READING_DIRECTION direction) +{ + source->text = text; + source->text_length = lstrlenW(text); + source->direction = direction; +}; + static inline struct testanalysissource *impl_from_IDWriteTextAnalysisSource(IDWriteTextAnalysisSource *iface) { return CONTAINING_RECORD(iface, struct testanalysissource, IDWriteTextAnalysisSource_iface); @@ -380,7 +389,7 @@ static HRESULT WINAPI analysissource_GetTextAtPosition(IDWriteTextAnalysisSource { struct testanalysissource *source = impl_from_IDWriteTextAnalysisSource(iface); - if (position >= lstrlenW(source->text)) + if (position >= source->text_length) { *text = NULL; *text_len = 0; @@ -388,7 +397,7 @@ static HRESULT WINAPI analysissource_GetTextAtPosition(IDWriteTextAnalysisSource else { *text = source->text + position; - *text_len = lstrlenW(source->text) - position; + *text_len = source->text_length - position; } return S_OK; @@ -998,7 +1007,7 @@ static void get_script_analysis(const WCHAR *str, DWRITE_SCRIPT_ANALYSIS *sa) IDWriteTextAnalyzer *analyzer; HRESULT hr; - analysissource.text = str; + init_textsource(&analysissource, str, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1020,7 +1029,7 @@ static void test_AnalyzeScript(void) while (*ptr->string) { - analysissource.text = ptr->string; + init_textsource(&analysissource, ptr->string, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); init_expected_sa(expected_seq, ptr); hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &analysissource.IDWriteTextAnalysisSource_iface, 0, @@ -1122,7 +1131,7 @@ static void test_AnalyzeLineBreakpoints(void) hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); ok(hr == S_OK, "got 0x%08x\n", hr); - analysissource.text = emptyW; + init_textsource(&analysissource, emptyW, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); hr = IDWriteTextAnalyzer_AnalyzeLineBreakpoints(analyzer, &analysissource.IDWriteTextAnalysisSource_iface, 0, 0, &analysissink); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1131,9 +1140,9 @@ static void test_AnalyzeLineBreakpoints(void) { UINT32 len; - analysissource.text = ptr->text; - len = lstrlenW(ptr->text); + init_textsource(&analysissource, ptr->text, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); + len = lstrlenW(ptr->text); if (len > BREAKPOINT_COUNT) { ok(0, "test %u: increase BREAKPOINT_COUNT to at least %u\n", i, len); i++; @@ -2414,10 +2423,9 @@ static void test_AnalyzeBidi(void) { UINT32 len; - analysissource.text = ptr->text; - len = lstrlenW(ptr->text); - analysissource.direction = ptr->direction; + init_textsource(&analysissource, ptr->text, ptr->direction); + len = lstrlenW(ptr->text); if (len > BIDI_LEVELS_COUNT) { ok(0, "test %u: increase BIDI_LEVELS_COUNT to at least %u\n", i, len); i++;

1 0

Alexandre Julliard : kernel32/tests: Avoid some delays in the process test.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 47ddc57571f549128773888cc1c8cb3d7304b920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ddc57571f549128773888cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 14 17:31:55 2017 +0200 kernel32/tests: Avoid some delays in the process test. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c480a27..7e8ef16 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1382,7 +1382,7 @@ static void test_SuspendFlag(void) ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(GetExitCodeThread(info.hThread, &exit_status) && exit_status == STILL_ACTIVE, "thread still running\n"); - Sleep(8000); + Sleep(1000); ok(GetExitCodeThread(info.hThread, &exit_status) && exit_status == STILL_ACTIVE, "thread still running\n"); ok(ResumeThread(info.hThread) == 1, "Resuming thread\n"); @@ -1652,6 +1652,9 @@ static void test_Console(void) ok(ReadFile(hParentIn, buffer, sizeof(buffer), &w, NULL), "Reading from child\n"); ok(strcmp(buffer, msg) == 0, "Should have received '%s'\n", msg); + /* the child may also send the final "n tests executed" string, so read it to avoid a deadlock */ + ReadFile(hParentIn, buffer, sizeof(buffer), &w, NULL); + /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */

1 0