wine-commits September 2022

wine-commits@winehq.org

1 participants
553 discussions

Eric Pouech : msvfw32: Test window creation with filename.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: e9de4ae05cd2ce56302f117cd9755f453ae0a6eb URL: https://gitlab.winehq.org/wine/wine/-/commit/e9de4ae05cd2ce56302f117cd9755f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Sep 4 16:43:56 2022 +0200 msvfw32: Test window creation with filename. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvfw32/tests/mciwnd.c | 146 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 134 insertions(+), 12 deletions(-) diff --git a/dlls/msvfw32/tests/mciwnd.c b/dlls/msvfw32/tests/mciwnd.c index 85006ca95bf..915624b2eeb 100644 --- a/dlls/msvfw32/tests/mciwnd.c +++ b/dlls/msvfw32/tests/mciwnd.c @@ -153,6 +153,114 @@ static BOOL create_avi_file(char *fname) return ret; } +/* expected information for window creation */ +static struct { + /* input */ + const char* expectedA; + const WCHAR* expectedW; + /* output */ + unsigned open_msg; + enum {NO_MATCH, PTR_ANSI_MATCH, PTR_UNICODE_MATCH, ANSI_MATCH, UNICODE_MATCH, TODO_WINE = 0x40} match; +} wnd_creation; + +static WNDPROC old_MCIWndProc; +static LRESULT WINAPI proxy_MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam) +{ + switch (wMsg) + { + case WM_CREATE: + { + CREATESTRUCTW* cs = (CREATESTRUCTW*)lParam; + if (cs->lpCreateParams) + { + if (cs->lpCreateParams == wnd_creation.expectedA) + wnd_creation.match = PTR_ANSI_MATCH; + else if (cs->lpCreateParams == wnd_creation.expectedW) + wnd_creation.match = PTR_UNICODE_MATCH; + else if (!strcmp(cs->lpCreateParams, wnd_creation.expectedA)) + wnd_creation.match = ANSI_MATCH; + else if (!wcscmp(cs->lpCreateParams, wnd_creation.expectedW)) + wnd_creation.match = UNICODE_MATCH; + } + } + break; + case MCIWNDM_OPENA: + case MCIWNDM_OPENW: + wnd_creation.open_msg = wMsg; + break; + default: + break; + } + return old_MCIWndProc(hWnd, wMsg, wParam, lParam); +} + +static LRESULT CALLBACK hook_proc( int code, WPARAM wp, LPARAM lp ) +{ + if (code == HCBT_CREATEWND && lp) + { + CREATESTRUCTW* cs = ((CBT_CREATEWNDW *)lp)->lpcs; + if (cs && ((ULONG_PTR)cs->lpszClass >> 16) && !wcsicmp(cs->lpszClass, L"MCIWndClass")) + { + old_MCIWndProc = (WNDPROC)SetWindowLongPtrW((HWND)wp, GWLP_WNDPROC, (LPARAM)proxy_MCIWndProc); + ok(old_MCIWndProc != NULL, "No wnd proc\n"); + } + } + + return CallNextHookEx( NULL, code, wp, lp ); +} + +static void test_window_create(unsigned line, const char* fname, HWND parent, + BOOL with_mci, BOOL call_ansi, unsigned match) +{ + HMODULE hinst = GetModuleHandleA(NULL); + WCHAR fnameW[MAX_PATH]; + HWND window; + char error[200]; + LRESULT ret; + BOOL expect_ansi = (match & ~TODO_WINE) == PTR_ANSI_MATCH || (match & ~TODO_WINE) == ANSI_MATCH; + + MultiByteToWideChar(CP_ACP, 0, fname, -1, fnameW, ARRAY_SIZE(fnameW)); + + wnd_creation.expectedA = fname; + wnd_creation.expectedW = fnameW; + wnd_creation.open_msg = 0; + wnd_creation.match = NO_MATCH; + + if (call_ansi) + { + if (with_mci) + window = MCIWndCreateA(parent, hinst, MCIWNDF_NOERRORDLG, fname); + else + window = CreateWindowExA(0, "MCIWndClass", NULL, + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | MCIWNDF_NOERRORDLG, + 0, 0, 300, 0, + parent, 0, hinst, expect_ansi ? (LPVOID)fname : (LPVOID)fnameW); + } + else + { + if (with_mci) + window = MCIWndCreateW(parent, hinst, MCIWNDF_NOERRORDLG, fnameW); + else + window = CreateWindowExW(0, L"MCIWndClass", NULL, + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | MCIWNDF_NOERRORDLG, + 0, 0, 300, 0, + parent, 0, hinst, expect_ansi ? (LPVOID)fname : (LPVOID)fnameW); + } + ok_(__FILE__, line)(window != NULL, "Failed to create an MCIWnd window\n"); + ok_(__FILE__, line)(wnd_creation.match == (match & ~TODO_WINE), "unexpected match %u\n", wnd_creation.match); + todo_wine_if(match & TODO_WINE) + ok_(__FILE__, line)((expect_ansi && wnd_creation.open_msg == MCIWNDM_OPENA) || + (!expect_ansi && wnd_creation.open_msg == MCIWNDM_OPENW), + "bad open message %u %s%u\n", match, + wnd_creation.open_msg >= WM_USER ? "WM_USER+" : "", + wnd_creation.open_msg >= WM_USER ? wnd_creation.open_msg - WM_USER : wnd_creation.open_msg); + ret = SendMessageA(window, MCIWNDM_GETERRORA, sizeof(error), (LPARAM)error); + todo_wine_if(match & TODO_WINE) + ok_(__FILE__, line)(!ret || broken(ret == ERROR_INVALID_HANDLE) /* w2003std, w2008s64 */, + "Unexpected error %Id\n", ret); + DestroyWindow(window); +} + static void test_MCIWndCreate(void) { HWND parent, window; @@ -160,32 +268,46 @@ static void test_MCIWndCreate(void) char fname[MAX_PATH]; char invalid_fname[] = "invalid.avi"; char error[200]; + HHOOK hook; LRESULT ret; create_avi_file(fname); - window = MCIWndCreateA(NULL, hinst, MCIWNDF_NOERRORDLG, fname); - ok(window != NULL, "Failed to create an MCIWnd window without parent\n"); + hook = SetWindowsHookExW( WH_CBT, hook_proc, NULL, GetCurrentThreadId() ); - ret = SendMessageA(window, MCIWNDM_GETERRORA, sizeof(error), (LPARAM)error); - ok(!ret || broken(ret == ERROR_INVALID_HANDLE) /* w2003std, w2008s64 */, - "Unexpected error %Id\n", ret); - - DestroyWindow(window); + test_window_create( __LINE__, fname, NULL, TRUE, TRUE, UNICODE_MATCH | TODO_WINE ); + test_window_create( __LINE__, fname, NULL, TRUE, FALSE, PTR_UNICODE_MATCH | TODO_WINE ); + test_window_create( __LINE__, fname, NULL, FALSE, TRUE, PTR_ANSI_MATCH ); + test_window_create( __LINE__, fname, NULL, FALSE, FALSE, PTR_ANSI_MATCH ); parent = CreateWindowExA(0, "static", "msvfw32 test", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); ok(parent != NULL, "Failed to create a window\n"); - window = MCIWndCreateA(parent, hinst, MCIWNDF_NOERRORDLG, fname); - ok(window != NULL, "Failed to create an MCIWnd window\n"); + ok(!IsWindowUnicode(parent), "Expecting ansi parent window\n"); - ret = SendMessageA(window, MCIWNDM_GETERRORA, sizeof(error), (LPARAM)error); - ok(!ret || broken(ret == ERROR_INVALID_HANDLE) /* w2003std, w2008s64 */, - "Unexpected error %Id\n", ret); + test_window_create( __LINE__, fname, parent, TRUE, TRUE, UNICODE_MATCH | TODO_WINE ); + test_window_create( __LINE__, fname, parent, TRUE, FALSE, PTR_UNICODE_MATCH | TODO_WINE ); + test_window_create( __LINE__, fname, parent, FALSE, TRUE, PTR_ANSI_MATCH ); + test_window_create( __LINE__, fname, parent, FALSE, FALSE, PTR_ANSI_MATCH ); DestroyWindow(parent); + parent = CreateWindowExW(0, L"static", L"msvfw32 test", + WS_POPUP, 0, 0, 100, 100, + 0, 0, 0, NULL); + ok(parent != NULL, "Failed to create a window\n"); + ok(IsWindowUnicode(parent), "Expecting unicode parent window\n"); + + test_window_create( __LINE__, fname, parent, TRUE, TRUE, UNICODE_MATCH ); + test_window_create( __LINE__, fname, parent, TRUE, FALSE, PTR_UNICODE_MATCH ); + test_window_create( __LINE__, fname, parent, FALSE, TRUE, PTR_UNICODE_MATCH ); + test_window_create( __LINE__, fname, parent, FALSE, FALSE, PTR_UNICODE_MATCH ); + + DestroyWindow(parent); + + UnhookWindowsHookEx( hook ); + window = MCIWndCreateA(NULL, hinst, MCIWNDF_NOERRORDLG, invalid_fname); ok(window != NULL, "Failed to create an MCIWnd window\n");

1 0

Alexandre Julliard : unicode: Add data for high Unicode planes to the Arabic shaping table.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: aeff5099fb4d7a013ea9400e76a56468a921ca80 URL: https://gitlab.winehq.org/wine/wine/-/commit/aeff5099fb4d7a013ea9400e76a564… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 12:07:59 2022 +0200 unicode: Add data for high Unicode planes to the Arabic shaping table. --- dlls/dwrite/shapers/arabic.c | 5 +- dlls/dwrite/shapers/arabic_table.c | 375 +++++++++++++++++++++++++++---------- tools/make_unicode | 2 +- 3 files changed, 279 insertions(+), 103 deletions(-)

1 0

Alexandre Julliard : unicode: Add data for high Unicode planes to the bidi direction table.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: 24da06789ede7a7fafd8ba9894e5832394f45a4f URL: https://gitlab.winehq.org/wine/wine/-/commit/24da06789ede7a7fafd8ba9894e583… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 12:05:49 2022 +0200 unicode: Add data for high Unicode planes to the bidi direction table. --- dlls/dwrite/bidi.c | 2 +- dlls/dwrite/direction.c | 553 +++++++++++++++++++++++++++++---------- dlls/gdi32/text.c | 6 +- dlls/gdi32/uniscribe/bidi.c | 2 +- dlls/gdi32/uniscribe/direction.c | 553 +++++++++++++++++++++++++++++---------- tools/make_unicode | 4 +- 6 files changed, 835 insertions(+), 285 deletions(-)

1 0

Alexandre Julliard : unicode: Add data for high Unicode planes to the linebreak table.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: ba58338b210bd9bf24d36444eb69d5f3fe92b653 URL: https://gitlab.winehq.org/wine/wine/-/commit/ba58338b210bd9bf24d36444eb69d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 11:57:35 2022 +0200 unicode: Add data for high Unicode planes to the linebreak table. --- dlls/dwrite/analyzer.c | 4 +- dlls/dwrite/linebreak.c | 827 +++++++++++++++++++++++++++------- dlls/gdi32/uniscribe/bidi.c | 4 +- dlls/gdi32/uniscribe/breaking.c | 2 +- dlls/gdi32/uniscribe/linebreak.c | 827 +++++++++++++++++++++++++++------- dlls/gdi32/uniscribe/shape.c | 6 +- dlls/gdi32/uniscribe/usp10.c | 2 +- dlls/gdi32/uniscribe/usp10_internal.h | 7 +- tools/make_unicode | 2 +- 9 files changed, 1358 insertions(+), 323 deletions(-)

1 0

Alexandre Julliard : unicode: Add data for high Unicode planes to the scripts table.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: c848f42aa01c95d0febcbea5c443bafdbbf5fc79 URL: https://gitlab.winehq.org/wine/wine/-/commit/c848f42aa01c95d0febcbea5c443ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 11:52:14 2022 +0200 unicode: Add data for high Unicode planes to the scripts table. --- dlls/dwrite/analyzer.c | 8 +- dlls/dwrite/bidi.c | 4 +- dlls/dwrite/dwrite_private.h | 7 +- dlls/dwrite/opentype.c | 2 +- dlls/dwrite/scripts.c | 950 ++++++++++++++++++++++++++++++++++++------- tools/make_unicode | 4 +- 6 files changed, 812 insertions(+), 163 deletions(-)

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: ecbfb5e134661a62e4f899e88cb7125c686c7e06 URL: https://gitlab.winehq.org/wine/wine/-/commit/ecbfb5e134661a62e4f899e88cb712… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Sep 5 10:50:48 2022 +0200 po: Update German translation. --- po/de.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index 3a9f13e2425..059917dfd5d 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-06-28 13:20+0200\n" +"PO-Revision-Date: 2022-09-05 10:50+0200\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -1334,10 +1334,8 @@ msgid "Options" msgstr "Einstellungen" #: dlls/compstui/compstui.rc:31 -#, fuzzy -#| msgid "Defaults" msgid "Default" -msgstr "Standards" +msgstr "Standard" #: dlls/credui/credui.rc:45 msgid "&User name:"

1 0

Nikolay Sivov : evr/filter: Notify mixer and presenter on state changes.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: 50cd67d06968029e7c4c2c7ac79f1535154f9c03 URL: https://gitlab.winehq.org/wine/wine/-/commit/50cd67d06968029e7c4c2c7ac79f15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 5 12:25:20 2022 +0300 evr/filter: Notify mixer and presenter on state changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 1b2930c500a..67b13cbd5af 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -312,6 +312,38 @@ static HRESULT evr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_ return hr; } +/* FIXME: errors should be propagated from init/start/stop handlers. */ +static void evr_init_stream(struct strmbase_renderer *iface) +{ + struct evr *filter = impl_from_strmbase_renderer(iface); + + if (!filter->mixer) return; + + if (SUCCEEDED(IMFTransform_ProcessMessage(filter->mixer, MFT_MESSAGE_NOTIFY_BEGIN_STREAMING, 0))) + IMFVideoPresenter_ProcessMessage(filter->presenter, MFVP_MESSAGE_BEGINSTREAMING, 0); +} + +static void evr_start_stream(struct strmbase_renderer *iface) +{ + struct evr *filter = impl_from_strmbase_renderer(iface); + + if (filter->mixer) + IMFTransform_ProcessMessage(filter->mixer, MFT_MESSAGE_NOTIFY_START_OF_STREAM, 0); +} + +static void evr_stop_stream(struct strmbase_renderer *iface) +{ + struct evr *filter = impl_from_strmbase_renderer(iface); + + if (!filter->mixer) return; + + if (SUCCEEDED(IMFTransform_ProcessMessage(filter->mixer, MFT_MESSAGE_NOTIFY_END_OF_STREAM, 0))) + { + if (SUCCEEDED(IMFVideoPresenter_ProcessMessage(filter->presenter, MFVP_MESSAGE_ENDSTREAMING, 0))) + IMFTransform_ProcessMessage(filter->mixer, MFT_MESSAGE_NOTIFY_END_STREAMING, 0); + } +} + static const struct strmbase_renderer_ops renderer_ops = { .renderer_query_accept = evr_query_accept, @@ -320,6 +352,9 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_connect = evr_connect, .renderer_disconnect = evr_disconnect, .renderer_destroy = evr_destroy, + .renderer_init_stream = evr_init_stream, + .renderer_start_stream = evr_start_stream, + .renderer_stop_stream = evr_stop_stream, }; static struct evr *impl_from_IEVRFilterConfig(IEVRFilterConfig *iface)

1 0

Francois Gouget : winex11.drv: Use #ifdef to check config.h macros.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: 57d1bad10615b3c283d50a30775de8b7a8e92af2 URL: https://gitlab.winehq.org/wine/wine/-/commit/57d1bad10615b3c283d50a30775de8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 25 12:11:27 2022 +0200 winex11.drv: Use #ifdef to check config.h macros. They are undefined when the feature is missing. --- dlls/winex11.drv/mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d0cc185d96c..96be81df6e3 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -371,7 +371,7 @@ static void disable_xinput2(void) */ static BOOL grab_clipping_window( const RECT *clip ) { -#if HAVE_X11_EXTENSIONS_XINPUT2_H +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; struct x11drv_thread_data *data = x11drv_thread_data(); UNICODE_STRING class_name;

1 0

Eric Pouech : include: Enable ANSI support in console for WINETEST_COLOR.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: f20b892ed9e8a9d8f9459caa55e76ed6142260f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f20b892ed9e8a9d8f9459caa55e76e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 1 11:18:00 2022 +0200 include: Enable ANSI support in console for WINETEST_COLOR. This lets WINETEST_COLOR works under Windows console (at least, on recent versions where ANSI support is available). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/wine/test.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 1690c5613d8..3782c6eeeb6 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -678,7 +678,20 @@ int main( int argc, char **argv ) winetest_platform = "wine"; if (GetEnvironmentVariableA( "WINETEST_COLOR", p, sizeof(p) )) - winetest_color = !strcasecmp(p, "auto") ? isatty(fileno(stdout)) : atoi(p); + { + BOOL automode = !strcasecmp(p, "auto"); + winetest_color = automode ? isatty( fileno( stdout ) ) : atoi(p); + /* enable ANSI support for Windows console */ + if (winetest_color) + { + HANDLE hOutput = (HANDLE)_get_osfhandle( fileno( stdout ) ); + DWORD mode; + if (GetConsoleMode( hOutput, &mode ) && + !SetConsoleMode( hOutput, mode | ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING ) && + automode) + winetest_color = 0; + } + } if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) winetest_report_success = atoi(p);

1 0

Rémi Bernon : mf/tests: Test that IMFMediaSession_SetTopology sets output nodes media types.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: de48020325b80f3c420e51de8a350dbadaabf9b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/de48020325b80f3c420e51de8a350d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 25 15:50:51 2022 +0200 mf/tests: Test that IMFMediaSession_SetTopology sets output nodes media types. --- dlls/mf/tests/mf.c | 357 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 349 insertions(+), 8 deletions(-)

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
56
Older →

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 September 2022