October 2018 - Wine-Commits

Stefan Dösinger : d3d9/tests: Test when the device gets occluded during d3d9ex focus loss.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: c964f1f93a16a959b1e17891a1fa3201990d1a8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c964f1f93a16a959b1e17891… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 13 16:13:55 2018 -0700 d3d9/tests: Test when the device gets occluded during d3d9ex focus loss. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 63b7c5a..bd2687f 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2470,12 +2470,14 @@ struct message enum message_window window; BOOL check_wparam; WPARAM expect_wparam; + HRESULT device_state; WINDOWPOS *store_wp; }; static const struct message *expect_messages; static HWND device_window, focus_window; static LONG windowposchanged_received, syscommand_received; +static IDirect3DDevice9Ex *focus_test_device; struct wndproc_thread_param { @@ -2487,6 +2489,8 @@ struct wndproc_thread_param static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { + HRESULT hr; + if (filter_messages && filter_messages == hwnd) { if (message != WM_DISPLAYCHANGE && message != WM_IME_NOTIFY) @@ -2522,6 +2526,15 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM if (expect_messages->store_wp) *expect_messages->store_wp = *(WINDOWPOS *)lparam; + if (focus_test_device) + { + hr = IDirect3DDevice9Ex_CheckDeviceState(focus_test_device, device_window); + todo_wine_if(message != WM_ACTIVATEAPP && message != WM_DISPLAYCHANGE) + ok(hr == expect_messages->device_state, + "Got device state %#x on message %#x, expected %#x.\n", + hr, message, expect_messages->device_state); + } + ++expect_messages; } } @@ -2610,23 +2623,31 @@ static void test_wndproc(void) * not reliable on X11 WMs. When the window focus follows the * mouse pointer the message is not sent. * {WM_ACTIVATE, FOCUS_WINDOW, TRUE, WA_INACTIVE}, */ - {WM_DISPLAYCHANGE, DEVICE_WINDOW, FALSE, 0}, + + /* The S_PRESENT_MODE_CHANGED state is only there because we change the mode + * before dropping focus. From the base d3d9 tests one might expect d3d9ex to + * pick up the mode change by the time we receive WM_DISPLAYCHANGE, but as + * the tests below show, a present call is needed for that to happen. I don't + * want to call present in a focus loss message handler until we have an app + * that does that. Without the previous change (+present) the state would be + * D3D_OK all the way until the WM_ACTIVATEAPP message. */ + {WM_DISPLAYCHANGE, DEVICE_WINDOW, FALSE, 0, S_PRESENT_MODE_CHANGED}, /* WM_DISPLAYCHANGE is sent to the focus window too, but the order is * not deterministic. */ - {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0, S_PRESENT_MODE_CHANGED}, /* Windows sends WM_ACTIVATE to the device window, indicating that * SW_SHOWMINIMIZED is used instead of SW_MINIMIZE. Yet afterwards * the foreground and focus window are NULL. On Wine SW_SHOWMINIMIZED * leaves the device window active, breaking re-activation in the * lost device test. * {WM_ACTIVATE, DEVICE_WINDOW, TRUE, 0x200000 | WA_ACTIVE}, */ - {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, - {WM_SIZE, DEVICE_WINDOW, TRUE, SIZE_MINIMIZED}, - {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, FALSE}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0, S_PRESENT_MODE_CHANGED}, + {WM_SIZE, DEVICE_WINDOW, TRUE, SIZE_MINIMIZED, S_PRESENT_MODE_CHANGED}, + {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, FALSE, S_PRESENT_OCCLUDED}, /* WM_ACTIVATEAPP is sent to the device window too, but the order is * not deterministic. It may be sent after the focus window handling * or before. */ - {0, 0, FALSE, 0}, + {0, 0, FALSE, 0, 0}, }; static const struct message focus_loss_messages_nowc[] = { @@ -2704,7 +2725,7 @@ static void test_wndproc(void) {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, {WM_SIZE, DEVICE_WINDOW, FALSE, 0}, {WM_SHOWWINDOW, DEVICE_WINDOW, FALSE, 0}, - {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0, &windowpos}, + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0, ~0U, &windowpos}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, /* TODO: WM_DISPLAYCHANGE is sent to the focus window too, but the order is * differs between Wine and Windows. */

1 0

Stefan Dösinger : d3d8/tests: Test when the device goes bad on focus loss.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 9317303bae0b9efc8065096c110d34c9023d5a11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9317303bae0b9efc8065096c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 13 16:13:54 2018 -0700 d3d8/tests: Test when the device goes bad on focus loss. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6bae7836..5c4e5b9 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2435,12 +2435,14 @@ struct message enum message_window window; BOOL check_wparam; WPARAM expect_wparam; + HRESULT device_state; WINDOWPOS *store_wp; }; static const struct message *expect_messages; static HWND device_window, focus_window; static LONG windowposchanged_received, syscommand_received; +static IDirect3DDevice8 *focus_test_device; struct wndproc_thread_param { @@ -2452,6 +2454,8 @@ struct wndproc_thread_param static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { + HRESULT hr; + if (filter_messages && filter_messages == hwnd) { if (message != WM_DISPLAYCHANGE && message != WM_IME_NOTIFY) @@ -2487,6 +2491,18 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM if (expect_messages->store_wp) *expect_messages->store_wp = *(WINDOWPOS *)lparam; + if (focus_test_device) + { + hr = IDirect3DDevice8_TestCooperativeLevel(focus_test_device); + /* Wined3d marks the device lost earlier than Windows (it follows ddraw + * behavior. See test_wndproc before the focus_loss_messages sequence + * about the D3DERR_DEVICENOTRESET behavior, */ + todo_wine_if(message != WM_ACTIVATEAPP || hr == D3D_OK) + ok(hr == expect_messages->device_state, + "Got device state %#x on message %#x, expected %#x.\n", + hr, message, expect_messages->device_state); + } + ++expect_messages; } } @@ -2576,23 +2592,24 @@ static void test_wndproc(void) * not reliable on X11 WMs. When the window focus follows the * mouse pointer the message is not sent. * {WM_ACTIVATE, FOCUS_WINDOW, TRUE, WA_INACTIVE}, */ - {WM_DISPLAYCHANGE, DEVICE_WINDOW, FALSE, 0}, + {WM_DISPLAYCHANGE, DEVICE_WINDOW, FALSE, 0, D3DERR_DEVICENOTRESET}, /* WM_DISPLAYCHANGE is sent to the focus window too, but the order is * not deterministic. */ - {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0, D3DERR_DEVICENOTRESET}, /* Windows sends WM_ACTIVATE to the device window, indicating that * SW_SHOWMINIMIZED is used instead of SW_MINIMIZE. Yet afterwards * the foreground and focus window are NULL. On Wine SW_SHOWMINIMIZED * leaves the device window active, breaking re-activation in the * lost device test. * {WM_ACTIVATE, DEVICE_WINDOW, TRUE, 0x200000 | WA_ACTIVE}, */ - {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, - {WM_SIZE, DEVICE_WINDOW, TRUE, SIZE_MINIMIZED}, - {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, FALSE}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0, D3DERR_DEVICENOTRESET}, + {WM_SIZE, DEVICE_WINDOW, TRUE, SIZE_MINIMIZED, + D3DERR_DEVICENOTRESET}, + {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, FALSE, D3DERR_DEVICELOST}, /* WM_ACTIVATEAPP is sent to the device window too, but the order is * not deterministic. It may be sent after the focus window handling * or before. */ - {0, 0, FALSE, 0}, + {0, 0, FALSE, 0, 0}, }; static const struct message reactivate_messages[] = { @@ -2673,7 +2690,7 @@ static void test_wndproc(void) {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, {WM_SIZE, DEVICE_WINDOW, FALSE, 0}, {WM_SHOWWINDOW, DEVICE_WINDOW, FALSE, 0}, - {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0, &windowpos}, + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0, ~0U, &windowpos}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, /* TODO: WM_DISPLAYCHANGE is sent to the focus window too, but the order is * differs between Wine and Windows. */ @@ -2832,6 +2849,7 @@ static void test_wndproc(void) ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); expect_messages = focus_loss_messages; + focus_test_device = device; /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or * manually changing the focus. It generates the same messages, but the task * bar still shows the previous foreground window as active, and the window has @@ -2844,6 +2862,7 @@ static void test_wndproc(void) tmp = GetFocus(); ok(tmp != device_window, "The device window is active.\n"); ok(tmp != focus_window, "The focus window is active.\n"); + focus_test_device = NULL; /* The Present call is necessary to make native realize the device is lost. */ hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);

1 0

Akihiro Sagawa : kernel32: Fix LCMapString buffer calculation with LCMAP_KATAKANA and LCMAP_HALFWIDTH.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: b02cdd36150d7afc6cac52725e3b659db0ec68f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b02cdd36150d7afc6cac5272… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 16 00:31:23 2018 +0900 kernel32: Fix LCMapString buffer calculation with LCMAP_KATAKANA and LCMAP_HALFWIDTH. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45982 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 10 +++++++++- dlls/kernel32/tests/locale.c | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 0f37027..4d1eac6 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3557,8 +3557,16 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW else if (flags & LCMAP_HALFWIDTH) { for (len = 0; srclen; src++, srclen--, len++) - if (decompose_katakana(*src, NULL, 0) == 2) + { + WCHAR wch = *src; + /* map Hiragana to Katakana before decomposition if needed */ + if ((flags & LCMAP_KATAKANA) && + ((wch >= 0x3041 && wch <= 0x3096) || wch == 0x309D || wch == 0x309E)) + wch += 0x60; + + if (decompose_katakana(wch, NULL, 0) == 2) len++; + } } else len = srclen; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b8ced50..d3eb2ec 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2537,7 +2537,6 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ok(!lstrcmpW(buf, halfwidth_text2), "%s string compare mismatch\n", func_name); ret2 = func_ptr(LCMAP_HALFWIDTH | LCMAP_KATAKANA, japanese_text, -1, NULL, 0); - todo_wine ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret, ret2); /* test buffer overflow */

1 0

Akihiro Sagawa : kernel32/tests: Add LCMapString tests with a voiced consonant Hiragana character.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 96b4a5a3563dfb0ec8e81e471a25ae1dbbcc7380 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b4a5a3563dfb0ec8e81e47… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 16 00:31:21 2018 +0900 kernel32/tests: Add LCMapString tests with a voiced consonant Hiragana character. Use U+3060 (HIRAGANA LETTER DA) in the test. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 85c468d..b8ced50 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2420,20 +2420,29 @@ typedef INT (*lcmapstring_wrapper)(DWORD, LPCWSTR, INT, LPWSTR, INT); static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *func_name) { const static WCHAR japanese_text[] = { - 0x3044, 0x309d, 0x3084, 0x3001, 0x30a4, 0x30fc, 0x30cf, - 0x30c8, 0x30fc, 0x30f4, 0x30a9, 0x306e, 0x2026, 0 + 0x3044, 0x309d, 0x3084, 0x3001, 0x30a4, 0x30fc, 0x30cf, 0x30c8, + 0x30fc, 0x30f4, 0x30a9, 0x306e, 0x91ce, 0x539f, 0x306f, 0x5e83, + 0x3044, 0x3093, 0x3060, 0x3088, 0x3002, 0 }; const static WCHAR hiragana_text[] = { - 0x3044, 0x309d, 0x3084, 0x3001, 0x3044, 0x30fc, 0x306f, - 0x3068, 0x30fc, 0x3094, 0x3049, 0x306e, 0x2026, 0 + 0x3044, 0x309d, 0x3084, 0x3001, 0x3044, 0x30fc, 0x306f, 0x3068, + 0x30fc, 0x3094, 0x3049, 0x306e, 0x91ce, 0x539f, 0x306f, 0x5e83, + 0x3044, 0x3093, 0x3060, 0x3088, 0x3002, 0 }; const static WCHAR katakana_text[] = { - 0x30a4, 0x30fd, 0x30e4, 0x3001, 0x30a4, 0x30fc, 0x30cf, - 0x30c8, 0x30fc, 0x30f4, 0x30a9, 0x30ce, 0x2026, 0 + 0x30a4, 0x30fd, 0x30e4, 0x3001, 0x30a4, 0x30fc, 0x30cf, 0x30c8, + 0x30fc, 0x30f4, 0x30a9, 0x30ce, 0x91ce, 0x539f, 0x30cf, 0x5e83, + 0x30a4, 0x30f3, 0x30c0, 0x30e8, 0x3002, 0 }; const static WCHAR halfwidth_text[] = { - 0x3044, 0x309d, 0x3084, 0xff64, 0xff72, 0xff70, 0xff8a, - 0xff84, 0xff70, 0xff73, 0xff9e, 0xff6b, 0x306e, 0x2026, 0 + 0x3044, 0x309d, 0x3084, 0xff64, 0xff72, 0xff70, 0xff8a, 0xff84, + 0xff70, 0xff73, 0xff9e, 0xff6b, 0x306e, 0x91ce, 0x539f, 0x306f, + 0x5e83, 0x3044, 0x3093, 0x3060, 0x3088, 0xff61, 0 + }; + const static WCHAR halfwidth_text2[] = { + 0xff72, 0x30fd, 0xff94, 0xff64, 0xff72, 0xff70, 0xff8a, 0xff84, + 0xff70, 0xff73, 0xff9e, 0xff6b, 0xff89, 0x91ce, 0x539f, 0xff8a, + 0x5e83, 0xff72, 0xff9d, 0xff80, 0xff9e, 0xff96, 0xff61, 0 }; int ret, ret2, i; WCHAR buf[256], buf2[256]; @@ -2520,6 +2529,17 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ret2 = func_ptr(LCMAP_HALFWIDTH, japanese_text, -1, NULL, 0); ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret, ret2); + /* test LCMAP_HALFWIDTH | LCMAP_KATAKANA + (hiragana character is converted into half-width katakana) */ + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_KATAKANA, japanese_text, -1, buf, ARRAY_SIZE(buf)); + ok(ret == lstrlenW(halfwidth_text2) + 1, "%s ret %d, error %d, expected value %d\n", func_name, + ret, GetLastError(), lstrlenW(halfwidth_text2) + 1); + ok(!lstrcmpW(buf, halfwidth_text2), "%s string compare mismatch\n", func_name); + + ret2 = func_ptr(LCMAP_HALFWIDTH | LCMAP_KATAKANA, japanese_text, -1, NULL, 0); + todo_wine + ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret, ret2); + /* test buffer overflow */ SetLastError(0xdeadbeef); ret = func_ptr(LCMAP_UPPERCASE,

1 0

Andrew Wesie : wined3d: Add sync object after query buffer issue.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 6f5b8265abb42f963fefaa5c3f5326ad6d047ebc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f5b8265abb42f963fefaa5c… Author: Andrew Wesie <awesie(a)gmail.com> Date: Sun Oct 14 13:18:09 2018 -0500 wined3d: Add sync object after query buffer issue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45932 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 26c32b1..4239fc0 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -76,6 +76,7 @@ static void wined3d_query_destroy_buffer_object(struct wined3d_context *context, static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, struct wined3d_query *query, GLuint id) { const struct wined3d_gl_info *gl_info = context->gl_info; + GLsync tmp_sync; if (!gl_info->supported[ARB_QUERY_BUFFER_OBJECT] || !gl_info->supported[ARB_BUFFER_STORAGE]) return FALSE; @@ -104,6 +105,14 @@ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, s GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, 0)); checkGLcall("queue query result"); + /* ARB_buffer_storage requires the client to call FenceSync with + * SYNC_GPU_COMMANDS_COMPLETE after the server does a write. This behavior + * is not enforced by Mesa. + */ + tmp_sync = GL_EXTCALL(glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0)); + GL_EXTCALL(glDeleteSync(tmp_sync)); + checkGLcall("query buffer sync"); + return TRUE; }

1 0

Stefan Dösinger : ddraw/tests: Test destroying ddraw in WM_KILLFOCUS.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 6954e4e2690ddbc287a9a5101c2666ad3d32d63b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6954e4e2690ddbc287a9a510… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 13 16:13:57 2018 -0700 ddraw/tests: Test destroying ddraw in WM_KILLFOCUS. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 216 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index aad7bbf..1f93a97 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11875,6 +11875,59 @@ static void test_find_device(void) IDirectDraw_Release(ddraw); } +static IDirectDraw *killfocus_ddraw; +static IDirectDrawSurface *killfocus_surface; + +static LRESULT CALLBACK killfocus_proc(HWND window, UINT message, WPARAM wparam, LPARAM lparam) +{ + ULONG ref; + + if (message == WM_KILLFOCUS) + { + ref = IDirectDrawSurface_Release(killfocus_surface); + ok(!ref, "Unexpected surface refcount %u.\n", ref); + ref = IDirectDraw_Release(killfocus_ddraw); + ok(!ref, "Unexpected ddraw refcount %u.\n", ref); + killfocus_ddraw = NULL; + } + + return DefWindowProcA(window, message, wparam, lparam); +} + +static void test_killfocus(void) +{ + DDSURFACEDESC surface_desc; + HRESULT hr; + HWND window; + WNDCLASSA wc = {0}; + + wc.lpfnWndProc = killfocus_proc; + wc.lpszClassName = "ddraw_killfocus_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + window = CreateWindowA("ddraw_killfocus_wndproc_wc", "d3d7_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + killfocus_ddraw = create_ddraw(); + ok(!!killfocus_ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw_SetCooperativeLevel(killfocus_ddraw, window, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(killfocus_ddraw, &surface_desc, &killfocus_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + SetForegroundWindow(GetDesktopWindow()); + ok(!killfocus_ddraw, "WM_KILLFOCUS was not received.\n"); + + DestroyWindow(window); + UnregisterClassA("ddraw_killfocus_wndproc_wc", GetModuleHandleA(NULL)); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -11980,4 +12033,5 @@ START_TEST(ddraw1) test_execute_data(); test_viewport(); test_find_device(); + test_killfocus(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 29c3c84..95cdf8b 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13157,6 +13157,59 @@ static void test_find_device(void) IDirectDraw2_Release(ddraw); } +static IDirectDraw2 *killfocus_ddraw; +static IDirectDrawSurface *killfocus_surface; + +static LRESULT CALLBACK killfocus_proc(HWND window, UINT message, WPARAM wparam, LPARAM lparam) +{ + ULONG ref; + + if (message == WM_KILLFOCUS) + { + ref = IDirectDrawSurface_Release(killfocus_surface); + ok(!ref, "Unexpected surface refcount %u.\n", ref); + ref = IDirectDraw2_Release(killfocus_ddraw); + ok(!ref, "Unexpected ddraw refcount %u.\n", ref); + killfocus_ddraw = NULL; + } + + return DefWindowProcA(window, message, wparam, lparam); +} + +static void test_killfocus(void) +{ + DDSURFACEDESC surface_desc; + HRESULT hr; + HWND window; + WNDCLASSA wc = {0}; + + wc.lpfnWndProc = killfocus_proc; + wc.lpszClassName = "ddraw_killfocus_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + window = CreateWindowA("ddraw_killfocus_wndproc_wc", "d3d7_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + killfocus_ddraw = create_ddraw(); + ok(!!killfocus_ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw2_SetCooperativeLevel(killfocus_ddraw, window, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(killfocus_ddraw, &surface_desc, &killfocus_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + SetForegroundWindow(GetDesktopWindow()); + ok(!killfocus_ddraw, "WM_KILLFOCUS was not received.\n"); + + DestroyWindow(window); + UnregisterClassA("ddraw_killfocus_wndproc_wc", GetModuleHandleA(NULL)); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -13270,4 +13323,5 @@ START_TEST(ddraw2) test_enum_surfaces(); test_viewport(); test_find_device(); + test_killfocus(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 3aae425..a62aaf0 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15265,6 +15265,59 @@ static void test_find_device(void) IDirectDraw4_Release(ddraw); } +static IDirectDraw4 *killfocus_ddraw; +static IDirectDrawSurface4 *killfocus_surface; + +static LRESULT CALLBACK killfocus_proc(HWND window, UINT message, WPARAM wparam, LPARAM lparam) +{ + ULONG ref; + + if (message == WM_KILLFOCUS) + { + ref = IDirectDrawSurface4_Release(killfocus_surface); + ok(!ref, "Unexpected surface refcount %u.\n", ref); + ref = IDirectDraw4_Release(killfocus_ddraw); + ok(!ref, "Unexpected ddraw refcount %u.\n", ref); + killfocus_ddraw = NULL; + } + + return DefWindowProcA(window, message, wparam, lparam); +} + +static void test_killfocus(void) +{ + DDSURFACEDESC2 surface_desc; + HRESULT hr; + HWND window; + WNDCLASSA wc = {0}; + + wc.lpfnWndProc = killfocus_proc; + wc.lpszClassName = "ddraw_killfocus_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + window = CreateWindowA("ddraw_killfocus_wndproc_wc", "d3d7_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + killfocus_ddraw = create_ddraw(); + ok(!!killfocus_ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw4_SetCooperativeLevel(killfocus_ddraw, window, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw7_CreateSurface(killfocus_ddraw, &surface_desc, &killfocus_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + SetForegroundWindow(GetDesktopWindow()); + ok(!killfocus_ddraw, "WM_KILLFOCUS was not received.\n"); + + DestroyWindow(window); + UnregisterClassA("ddraw_killfocus_wndproc_wc", GetModuleHandleA(NULL)); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -15392,4 +15445,5 @@ START_TEST(ddraw4) test_enum_surfaces(); test_viewport(); test_find_device(); + test_killfocus(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 4691135..05151b0 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15035,6 +15035,59 @@ static void test_color_vertex(void) DestroyWindow(window); } +static IDirectDraw7 *killfocus_ddraw; +static IDirectDrawSurface7 *killfocus_surface; + +static LRESULT CALLBACK killfocus_proc(HWND window, UINT message, WPARAM wparam, LPARAM lparam) +{ + ULONG ref; + + if (message == WM_KILLFOCUS) + { + ref = IDirectDrawSurface7_Release(killfocus_surface); + ok(!ref, "Unexpected surface refcount %u.\n", ref); + ref = IDirectDraw7_Release(killfocus_ddraw); + ok(!ref, "Unexpected ddraw refcount %u.\n", ref); + killfocus_ddraw = NULL; + } + + return DefWindowProcA(window, message, wparam, lparam); +} + +static void test_killfocus(void) +{ + DDSURFACEDESC2 surface_desc; + HRESULT hr; + HWND window; + WNDCLASSA wc = {0}; + + wc.lpfnWndProc = killfocus_proc; + wc.lpszClassName = "ddraw_killfocus_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + window = CreateWindowA("ddraw_killfocus_wndproc_wc", "d3d7_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + killfocus_ddraw = create_ddraw(); + ok(!!killfocus_ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw7_SetCooperativeLevel(killfocus_ddraw, window, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw7_CreateSurface(killfocus_ddraw, &surface_desc, &killfocus_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + SetForegroundWindow(GetDesktopWindow()); + ok(!killfocus_ddraw, "WM_KILLFOCUS was not received.\n"); + + DestroyWindow(window); + UnregisterClassA("ddraw_killfocus_wndproc_wc", GetModuleHandleA(NULL)); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -15173,4 +15226,5 @@ START_TEST(ddraw7) test_viewport(); test_device_load(); test_color_vertex(); + test_killfocus(); }

1 0

Stefan Dösinger : ddraw/tests: Test when the device goes bad on focus loss.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: d02b4581b5cfbf3cc6d5313d0c4ddc071f93a6a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d02b4581b5cfbf3cc6d5313d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 13 16:13:53 2018 -0700 ddraw/tests: Test when the device goes bad on focus loss. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 38 ++++++++++++++++++++++++++------------ dlls/ddraw/tests/ddraw7.c | 38 ++++++++++++++++++++++++++------------ 2 files changed, 52 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 7cf61ce..3aae425 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -532,12 +532,16 @@ struct message UINT message; BOOL check_wparam; WPARAM expect_wparam; + HRESULT ddraw_state; }; static const struct message *expect_messages; +static IDirectDraw4 *focus_test_ddraw; static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { + HRESULT hr; + if (expect_messages && message == expect_messages->message) { if (expect_messages->check_wparam) @@ -545,6 +549,13 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM "Got unexpected wparam %lx for message %x, expected %lx.\n", wparam, message, expect_messages->expect_wparam); + if (focus_test_ddraw) + { + hr = IDirectDraw4_TestCooperativeLevel(focus_test_ddraw); + ok(hr == expect_messages->ddraw_state, "Got ddraw state %#x on message %#x, expected %#x.\n", + hr, message, expect_messages->ddraw_state); + } + ++expect_messages; } @@ -2712,22 +2723,22 @@ static void test_coop_level_mode_set(void) }; static const struct message exclusive_focus_loss_messages[] = { - {WM_ACTIVATE, TRUE, WA_INACTIVE}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window resize due to mode change. */ - {WM_WINDOWPOSCHANGED, FALSE, 0}, - {WM_SIZE, TRUE, SIZE_RESTORED}, /* Generated by DefWindowProc. */ - {WM_DISPLAYCHANGE, FALSE, 0}, - {WM_KILLFOCUS, FALSE, 0}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window minimized. */ + {WM_ACTIVATE, TRUE, WA_INACTIVE, DD_OK}, + {WM_WINDOWPOSCHANGING, FALSE, 0, DD_OK}, /* Window resize due to mode change. */ + {WM_WINDOWPOSCHANGED, FALSE, 0, DD_OK}, + {WM_SIZE, TRUE, SIZE_RESTORED, DD_OK}, /* Generated by DefWindowProc. */ + {WM_DISPLAYCHANGE, FALSE, 0, DD_OK}, + {WM_KILLFOCUS, FALSE, 0, DDERR_NOEXCLUSIVEMODE}, + {WM_WINDOWPOSCHANGING, FALSE, 0, DDERR_NOEXCLUSIVEMODE}, /* Window minimized. */ /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not * produce the same result in Wine yet. Ignore the difference for now. * {WM_ACTIVATE, TRUE, 0x200000 | WA_ACTIVE}, */ - {WM_WINDOWPOSCHANGED, FALSE, 0}, - {WM_MOVE, FALSE, 0}, - {WM_SIZE, TRUE, SIZE_MINIMIZED}, - {WM_ACTIVATEAPP, TRUE, FALSE}, - {0, FALSE, 0}, + {WM_WINDOWPOSCHANGED, FALSE, 0, DDERR_NOEXCLUSIVEMODE}, + {WM_MOVE, FALSE, 0, DDERR_NOEXCLUSIVEMODE}, + {WM_SIZE, TRUE, SIZE_MINIMIZED, DDERR_NOEXCLUSIVEMODE}, + {WM_ACTIVATEAPP, TRUE, FALSE, DDERR_NOEXCLUSIVEMODE}, + {0, FALSE, 0, 0}, }; static const struct message exclusive_focus_restore_messages[] = { @@ -2912,9 +2923,12 @@ static void test_coop_level_mode_set(void) wine_dbgstr_rect(&r)); expect_messages = exclusive_focus_loss_messages; + focus_test_ddraw = ddraw; ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); + focus_test_ddraw = NULL; + memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 6ae4207..4691135 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -448,12 +448,16 @@ struct message UINT message; BOOL check_wparam; WPARAM expect_wparam; + HRESULT ddraw_state; }; static const struct message *expect_messages; +static IDirectDraw7 *focus_test_ddraw; static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { + HRESULT hr; + if (expect_messages && message == expect_messages->message) { if (expect_messages->check_wparam) @@ -461,6 +465,13 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM "Got unexpected wparam %lx for message %x, expected %lx.\n", wparam, message, expect_messages->expect_wparam); + if (focus_test_ddraw) + { + hr = IDirectDraw7_TestCooperativeLevel(focus_test_ddraw); + ok(hr == expect_messages->ddraw_state, "Got ddraw state %#x on message %#x, expected %#x.\n", + hr, message, expect_messages->ddraw_state); + } + ++expect_messages; } @@ -2441,22 +2452,22 @@ static void test_coop_level_mode_set(void) }; static const struct message exclusive_focus_loss_messages[] = { - {WM_ACTIVATE, TRUE, WA_INACTIVE}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window resize due to mode change. */ - {WM_WINDOWPOSCHANGED, FALSE, 0}, - {WM_SIZE, TRUE, SIZE_RESTORED}, /* Generated by DefWindowProc. */ - {WM_DISPLAYCHANGE, FALSE, 0}, - {WM_KILLFOCUS, FALSE, 0}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window minimized. */ + {WM_ACTIVATE, TRUE, WA_INACTIVE, DD_OK}, + {WM_WINDOWPOSCHANGING, FALSE, 0, DD_OK}, /* Window resize due to mode change. */ + {WM_WINDOWPOSCHANGED, FALSE, 0, DD_OK}, + {WM_SIZE, TRUE, SIZE_RESTORED, DD_OK}, /* Generated by DefWindowProc. */ + {WM_DISPLAYCHANGE, FALSE, 0, DD_OK}, + {WM_KILLFOCUS, FALSE, 0, DDERR_NOEXCLUSIVEMODE}, + {WM_WINDOWPOSCHANGING, FALSE, 0, DDERR_NOEXCLUSIVEMODE}, /* Window minimized. */ /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not * produce the same result in Wine yet. Ignore the difference for now. * {WM_ACTIVATE, TRUE, 0x200000 | WA_ACTIVE}, */ - {WM_WINDOWPOSCHANGED, FALSE, 0}, - {WM_MOVE, FALSE, 0}, - {WM_SIZE, TRUE, SIZE_MINIMIZED}, - {WM_ACTIVATEAPP, TRUE, FALSE}, - {0, FALSE, 0}, + {WM_WINDOWPOSCHANGED, FALSE, 0, DDERR_NOEXCLUSIVEMODE}, + {WM_MOVE, FALSE, 0, DDERR_NOEXCLUSIVEMODE}, + {WM_SIZE, TRUE, SIZE_MINIMIZED, DDERR_NOEXCLUSIVEMODE}, + {WM_ACTIVATEAPP, TRUE, FALSE, DDERR_NOEXCLUSIVEMODE}, + {0, FALSE, 0, 0}, }; static const struct message exclusive_focus_restore_messages[] = { @@ -2641,9 +2652,12 @@ static void test_coop_level_mode_set(void) wine_dbgstr_rect(&r)); expect_messages = exclusive_focus_loss_messages; + focus_test_ddraw = ddraw; ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); + focus_test_ddraw = NULL; + memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode);

1 0

Józef Kucia : winevulkan: Update vk.xml to 1.1.88.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 648bd17b81831e16e4d1466075353ae2637bf840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=648bd17b81831e16e4d14660… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 15 11:40:19 2018 +0200 winevulkan: Update vk.xml to 1.1.88. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 9 +- dlls/winevulkan/vulkan_thunks.c | 46 ++++++++++ dlls/winevulkan/vulkan_thunks.h | 12 +++ include/wine/vulkan.h | 183 ++++++++++++++++++++++++++++------------ 4 files changed, 193 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=648bd17b81831e16e4d1…

1 0

Alexandre Julliard : kernel32: Pass the standard process parameters structure to create_process().
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: ed551282b4121f94f619682ad0d2fcbf982d7f37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed551282b4121f94f619682a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 17:00:31 2018 +0200 kernel32: Pass the standard process parameters structure to create_process(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 135 ++++++++++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed551282b4121f94f619…

1 0

Alexandre Julliard : kernel32: Pass the standard process parameters structure to fork_and_exec().
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 27ba57e80444e2ba25e7f9a59d067bd022b678da URL: https://source.winehq.org/git/wine.git/?a=commit;h=27ba57e80444e2ba25e7f9a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 17:05:31 2018 +0200 kernel32: Pass the standard process parameters structure to fork_and_exec(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 58 +++++++++++-------------------------------------- 1 file changed, 13 insertions(+), 45 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6c9c8cf..f56bb09 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1663,14 +1663,13 @@ static char **build_envp( const WCHAR *envW ) * * Fork and exec a new Unix binary, checking for errors. */ -static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHAR *env, - const char *newdir, DWORD flags, STARTUPINFOW *startup ) +static int fork_and_exec( const RTL_USER_PROCESS_PARAMETERS *params, const char *newdir, DWORD flags ) { int fd[2], stdin_fd = -1, stdout_fd = -1, stderr_fd = -1; int pid, err; - char **argv, **envp; + char *filename, **argv, **envp; - if (!env) env = GetEnvironmentStringsW(); + if (!(filename = wine_get_unix_file_name( params->ImagePathName.Buffer ))) return -1; #ifdef HAVE_PIPE2 if (pipe2( fd, O_CLOEXEC ) == -1) @@ -1679,42 +1678,19 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA if (pipe(fd) == -1) { SetLastError( ERROR_TOO_MANY_OPEN_FILES ); + HeapFree( GetProcessHeap(), 0, filename ); return -1; } fcntl( fd[0], F_SETFD, FD_CLOEXEC ); fcntl( fd[1], F_SETFD, FD_CLOEXEC ); } - if (!(flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS))) - { - HANDLE hstdin, hstdout, hstderr; - - if (startup->dwFlags & STARTF_USESTDHANDLES) - { - hstdin = startup->hStdInput; - hstdout = startup->hStdOutput; - hstderr = startup->hStdError; - } - else - { - hstdin = GetStdHandle(STD_INPUT_HANDLE); - hstdout = GetStdHandle(STD_OUTPUT_HANDLE); - hstderr = GetStdHandle(STD_ERROR_HANDLE); - } + wine_server_handle_to_fd( params->hStdInput, FILE_READ_DATA, &stdin_fd, NULL ); + wine_server_handle_to_fd( params->hStdOutput, FILE_WRITE_DATA, &stdout_fd, NULL ); + wine_server_handle_to_fd( params->hStdError, FILE_WRITE_DATA, &stderr_fd, NULL ); - if (is_console_handle( hstdin )) - hstdin = wine_server_ptr_handle( console_handle_unmap( hstdin )); - if (is_console_handle( hstdout )) - hstdout = wine_server_ptr_handle( console_handle_unmap( hstdout )); - if (is_console_handle( hstderr )) - hstderr = wine_server_ptr_handle( console_handle_unmap( hstderr )); - wine_server_handle_to_fd( hstdin, FILE_READ_DATA, &stdin_fd, NULL ); - wine_server_handle_to_fd( hstdout, FILE_WRITE_DATA, &stdout_fd, NULL ); - wine_server_handle_to_fd( hstderr, FILE_WRITE_DATA, &stderr_fd, NULL ); - } - - argv = build_argv( cmdline, 0 ); - envp = build_envp( env ); + argv = build_argv( params->CommandLine.Buffer, 0 ); + envp = build_envp( params->Environment ); if (!(pid = fork())) /* child */ { @@ -1772,6 +1748,7 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA } HeapFree( GetProcessHeap(), 0, argv ); HeapFree( GetProcessHeap(), 0, envp ); + HeapFree( GetProcessHeap(), 0, filename ); if (stdin_fd != -1) close( stdin_fd ); if (stdout_fd != -1) close( stdout_fd ); if (stderr_fd != -1) close( stderr_fd ); @@ -2743,18 +2720,9 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A } /* fall through */ case BINARY_UNIX_EXE: - { - /* unknown file, try as unix executable */ - char *unix_name; - - TRACE( "starting %s as Unix binary\n", debugstr_w(name) ); - - if ((unix_name = wine_get_unix_file_name( name ))) - { - retv = (fork_and_exec( unix_name, tidy_cmdline, envW, unixdir, flags, startup_info ) != -1); - HeapFree( GetProcessHeap(), 0, unix_name ); - } - } + /* unknown file, try as unix executable */ + TRACE( "starting %s as Unix binary\n", debugstr_w(name) ); + retv = (fork_and_exec( params, unixdir, flags ) != -1); break; } if (hFile) CloseHandle( hFile );

1 0