September 2022 - Wine-commits

Jacob Czekalla : notepad: Show goto dialog box.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: 377481180e816f5fd01be49d105c2f70602110e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/377481180e816f5fd01be49d105c2f… Author: Jacob Czekalla <jacobczekalla(a)gmail.com> Date: Thu Sep 22 18:52:15 2022 -0400 notepad: Show goto dialog box. --- po/ar.po | 134 ++++++++++++++++++++++++----------------- po/ast.po | 134 ++++++++++++++++++++++++----------------- po/bg.po | 131 +++++++++++++++++++++++----------------- po/ca.po | 134 ++++++++++++++++++++++++----------------- po/cs.po | 134 ++++++++++++++++++++++++----------------- po/da.po | 134 ++++++++++++++++++++++++----------------- po/de.po | 134 ++++++++++++++++++++++++----------------- po/el.po | 130 ++++++++++++++++++++++----------------- po/en.po | 130 ++++++++++++++++++++++----------------- po/en_US.po | 130 ++++++++++++++++++++++----------------- po/eo.po | 132 +++++++++++++++++++++++----------------- po/es.po | 134 ++++++++++++++++++++++++----------------- po/fa.po | 131 +++++++++++++++++++++++----------------- po/fi.po | 134 ++++++++++++++++++++++++----------------- po/fr.po | 134 ++++++++++++++++++++++++----------------- po/he.po | 132 +++++++++++++++++++++++----------------- po/hi.po | 130 ++++++++++++++++++++++----------------- po/hr.po | 134 ++++++++++++++++++++++++----------------- po/hu.po | 134 ++++++++++++++++++++++++----------------- po/it.po | 134 ++++++++++++++++++++++++----------------- po/ja.po | 134 ++++++++++++++++++++++++----------------- po/ko.po | 134 ++++++++++++++++++++++++----------------- po/lt.po | 134 ++++++++++++++++++++++++----------------- po/ml.po | 130 ++++++++++++++++++++++----------------- po/nb_NO.po | 134 ++++++++++++++++++++++++----------------- po/nl.po | 134 ++++++++++++++++++++++++----------------- po/or.po | 130 ++++++++++++++++++++++----------------- po/pa.po | 130 ++++++++++++++++++++++----------------- po/pl.po | 134 ++++++++++++++++++++++++----------------- po/pt_BR.po | 134 ++++++++++++++++++++++++----------------- po/pt_PT.po | 134 ++++++++++++++++++++++++----------------- po/rm.po | 130 ++++++++++++++++++++++----------------- po/ro.po | 134 ++++++++++++++++++++++++----------------- po/ru.po | 134 ++++++++++++++++++++++++----------------- po/si.po | 134 ++++++++++++++++++++++++----------------- po/sk.po | 132 +++++++++++++++++++++++----------------- po/sl.po | 134 ++++++++++++++++++++++++----------------- po/sr_RS(a)cyrillic.po | 131 +++++++++++++++++++++++----------------- po/sr_RS(a)latin.po | 131 +++++++++++++++++++++++----------------- po/sv.po | 134 ++++++++++++++++++++++++----------------- po/ta.po | 130 ++++++++++++++++++++++----------------- po/te.po | 130 ++++++++++++++++++++++----------------- po/th.po | 131 +++++++++++++++++++++++----------------- po/tr.po | 134 ++++++++++++++++++++++++----------------- po/uk.po | 134 ++++++++++++++++++++++++----------------- po/wa.po | 131 +++++++++++++++++++++++----------------- po/wine.pot | 130 ++++++++++++++++++++++----------------- po/zh_CN.po | 134 ++++++++++++++++++++++++----------------- po/zh_TW.po | 134 ++++++++++++++++++++++++----------------- programs/notepad/dialog.c | 46 ++++++++++++++ programs/notepad/dialog.h | 1 + programs/notepad/main.c | 3 +- programs/notepad/main.h | 1 + programs/notepad/notepad.rc | 14 +++++ programs/notepad/notepad_res.h | 3 + 55 files changed, 3919 insertions(+), 2647 deletions(-)

1 0

Rémi Bernon : user32/tests: Cleanup sysparams WM_DISPLAYCHANGE tests.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: 6d5041744d175e9f3ea9e8eab680e6e4d778b9d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d5041744d175e9f3ea9e8eab680e6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 16 20:43:26 2022 +0200 user32/tests: Cleanup sysparams WM_DISPLAYCHANGE tests. --- dlls/user32/tests/sysparams.c | 126 ++++++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 59 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 4f2709094e9..6d630ab1ead 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -30,7 +30,6 @@ #include "winuser.h" #include "winnls.h" -static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID); static BOOL (WINAPI *pIsProcessDPIAware)(void); static BOOL (WINAPI *pSetProcessDPIAware)(void); static BOOL (WINAPI *pSetProcessDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); @@ -2447,78 +2446,88 @@ static void test_SPI_SETWALLPAPER( void ) /* 115 */ static void test_WM_DISPLAYCHANGE(void) { - DEVMODEA mode, startmode; - int start_bpp, last_set_bpp = 0; - int test_bpps[] = {8, 16, 24, 32}, i; - LONG change_ret; - DWORD wait_ret; - - if (!pChangeDisplaySettingsExA) - { - win_skip("ChangeDisplaySettingsExA is not available\n"); - return; - } + UINT test_bpps[] = {8, 16, 24}, default_bpp, i; + DEVMODEW settings; + DWORD res; + BOOL ret; displaychange_test_active = TRUE; + displaychange_sem = CreateSemaphoreW( NULL, 0, 1, NULL ); - memset(&startmode, 0, sizeof(startmode)); - startmode.dmSize = sizeof(startmode); - EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &startmode); - start_bpp = startmode.dmBitsPerPel; + memset( &settings, 0, sizeof(DEVMODEW) ); + settings.dmSize = sizeof(DEVMODEW); + ret = EnumDisplaySettingsW( NULL, ENUM_CURRENT_SETTINGS, &settings ); + ok( ret, "EnumDisplaySettingsW failed, error %#lx\n", GetLastError() ); - displaychange_sem = CreateSemaphoreW(NULL, 0, 1, NULL); + ok( settings.dmFields & DM_BITSPERPEL, "got dmFields %#lx\n", settings.dmFields ); + ok( settings.dmBitsPerPel == 32, "got dmBitsPerPel %lu\n", settings.dmBitsPerPel ); + default_bpp = settings.dmBitsPerPel; - for(i = 0; i < ARRAY_SIZE(test_bpps); i++) { - last_bpp = -1; + /* setting the default mode here sends a WM_DISPLAYCHANGE */ + + last_bpp = -1; + change_counter = 0; + displaychange_ok = TRUE; + res = ChangeDisplaySettingsExW( NULL, &settings, NULL, 0, NULL ); + ok( !res, "ChangeDisplaySettingsExW returned %ld\n", res ); + res = WaitForSingleObject( displaychange_sem, 10000 ); + ok( !res, "WaitForSingleObject returned %#lx\n", res ); + ok( last_bpp == default_bpp, "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); + displaychange_ok = FALSE; + + for (i = 0; i < ARRAY_SIZE(test_bpps); i++) + { + UINT bpp = test_bpps[i]; - memset(&mode, 0, sizeof(mode)); - mode.dmSize = sizeof(mode); - mode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - mode.dmBitsPerPel = test_bpps[i]; - mode.dmPelsWidth = GetSystemMetrics(SM_CXSCREEN); - mode.dmPelsHeight = GetSystemMetrics(SM_CYSCREEN); + winetest_push_context( "bpp %u", bpp ); - change_counter = 0; /* This sends a SETTINGSCHANGE message as well in which we aren't interested */ + settings.dmBitsPerPel = bpp; + settings.dmFields |= DM_BITSPERPEL; + + last_bpp = -1; + change_counter = 0; displaychange_ok = TRUE; - change_ret = pChangeDisplaySettingsExA(NULL, &mode, NULL, 0, NULL); - /* Wait quite long for the message, screen setting changes can take some time */ - if(change_ret == DISP_CHANGE_SUCCESSFUL) { - wait_ret = WaitForSingleObject(displaychange_sem, 10000); - /* we may not get a notification if nothing changed */ - if (wait_ret == WAIT_TIMEOUT && !last_set_bpp && start_bpp == test_bpps[i]) - continue; - ok(wait_ret == WAIT_OBJECT_0, "Waiting for the WM_DISPLAYCHANGE message timed out\n"); + res = ChangeDisplaySettingsExW( NULL, &settings, NULL, 0, NULL ); + if (!res) + { + /* Wait quite long for the message, screen setting changes can take some time */ + res = WaitForSingleObject( displaychange_sem, 10000 ); + ok( !res, "WaitForSingleObject returned %#lx\n", res ); + todo_wine + ok( last_bpp == bpp, "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); } - displaychange_ok = FALSE; - - if(change_ret != DISP_CHANGE_SUCCESSFUL) { - skip("Setting depth %d failed(ret = %ld)\n", test_bpps[i], change_ret); - ok(last_bpp == -1, "WM_DISPLAYCHANGE was sent with wParam %d despite mode change failure\n", last_bpp); - continue; + else + { + todo_wine + win_skip( "ChangeDisplaySettingsExW returned %ld\n", res ); + ok( res == DISP_CHANGE_BADMODE || broken( DISP_CHANGE_FAILED && bpp == 8 ), + "ChangeDisplaySettingsExW returned %ld\n", res ); + ok( last_bpp == -1, "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); } + displaychange_ok = FALSE; - todo_wine_if(start_bpp != test_bpps[i]) { - ok(last_bpp == test_bpps[i], "Set bpp %d, but WM_DISPLAYCHANGE reported bpp %d\n", test_bpps[i], last_bpp); - } - last_set_bpp = test_bpps[i]; + winetest_pop_context(); } - if(start_bpp != last_set_bpp && last_set_bpp != 0) { - memset(&mode, 0, sizeof(mode)); - mode.dmSize = sizeof(mode); - mode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - mode.dmBitsPerPel = start_bpp; - mode.dmPelsWidth = GetSystemMetrics(SM_CXSCREEN); - mode.dmPelsHeight = GetSystemMetrics(SM_CYSCREEN); + /* restoring default mode most of the time doesn't send WM_DISPLAYCHANGE */ - displaychange_ok = TRUE; - change_ret = pChangeDisplaySettingsExA(NULL, &mode, NULL, 0, NULL); - WaitForSingleObject(displaychange_sem, 10000); - displaychange_ok = FALSE; - CloseHandle(displaychange_sem); - displaychange_sem = 0; - } + settings.dmBitsPerPel = default_bpp; + settings.dmFields |= DM_BITSPERPEL; + + last_bpp = -1; + change_counter = 0; + displaychange_ok = TRUE; + res = ChangeDisplaySettingsExW( NULL, &settings, NULL, 0, NULL ); + ok( !res, "ChangeDisplaySettingsExW returned %ld\n", res ); + res = WaitForSingleObject( displaychange_sem, 1000 ); + todo_wine + ok( res == WAIT_TIMEOUT || broken( !res ), "WaitForSingleObject returned %#lx\n", res ); + todo_wine + ok( last_bpp == -1 || broken( last_bpp == default_bpp ), "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); + displaychange_ok = FALSE; + CloseHandle( displaychange_sem ); + displaychange_sem = 0; displaychange_test_active = FALSE; } @@ -4136,7 +4145,6 @@ START_TEST(sysparams) HANDLE hInstance, hdll; hdll = GetModuleHandleA("user32.dll"); - pChangeDisplaySettingsExA = (void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA"); pIsProcessDPIAware = (void*)GetProcAddress(hdll, "IsProcessDPIAware"); pSetProcessDPIAware = (void*)GetProcAddress(hdll, "SetProcessDPIAware"); pGetDpiForSystem = (void*)GetProcAddress(hdll, "GetDpiForSystem");

1 0

Rémi Bernon : win32u: Move enumeration of available modes out of graphics drivers.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: 981d59264f7002ddc445414c42bea2c705f1dbb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/981d59264f7002ddc445414c42bea2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 9 11:48:52 2022 +0200 win32u: Move enumeration of available modes out of graphics drivers. --- dlls/win32u/driver.c | 12 ---- dlls/win32u/sysparams.c | 41 +++++++++-- dlls/wineandroid.drv/init.c | 31 --------- dlls/winemac.drv/display.c | 162 -------------------------------------------- dlls/winemac.drv/gdi.c | 1 - dlls/winemac.drv/macdrv.h | 2 - dlls/winex11.drv/display.c | 99 --------------------------- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/x11drv.h | 2 - include/wine/gdi_driver.h | 1 - 10 files changed, 36 insertions(+), 316 deletions(-)

1 0

Rémi Bernon : winemac.drv: Stop using the cached_modes_mutex for get_default_bpp.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: 3e3beee0b4d3c619e62a1d64b757d0a80c1cc967 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e3beee0b4d3c619e62a1d64b757d0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 9 08:32:43 2022 +0200 winemac.drv: Stop using the cached_modes_mutex for get_default_bpp. --- dlls/winemac.drv/display.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index b981aa12e35..f3d9ef06712 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -51,9 +51,6 @@ static const WCHAR initial_mode_keyW[] = {'I','n','i','t','i','a','l',' ','D','i ' ','M','o','d','e'}; static const WCHAR pixelencodingW[] = {'P','i','x','e','l','E','n','c','o','d','i','n','g',0}; -static int cached_default_mode_bpp; -static pthread_mutex_t cached_modes_mutex = PTHREAD_MUTEX_INITIALIZER; - static BOOL inited_original_display_mode; @@ -400,22 +397,23 @@ static BOOL display_mode_matches_descriptor(CGDisplayModeRef mode, const struct static int get_default_bpp(void) { + static int cached; int ret; - if (!cached_default_mode_bpp) + if (!cached) { CGDisplayModeRef mode = CGDisplayCopyDisplayMode(kCGDirectMainDisplay); if (mode) { - cached_default_mode_bpp = display_mode_bits_per_pixel(mode); + cached = display_mode_bits_per_pixel(mode); CFRelease(mode); } - if (!cached_default_mode_bpp) - cached_default_mode_bpp = 32; + if (!cached) + cached = 32; } - ret = cached_default_mode_bpp; + ret = cached; TRACE(" -> %d\n", ret); return ret; @@ -800,9 +798,7 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, HWND hwnd, DWORD flags, L return DISP_CHANGE_FAILED; } - pthread_mutex_lock(&cached_modes_mutex); bpp = get_default_bpp(); - pthread_mutex_unlock(&cached_modes_mutex); desc = create_original_display_mode_descriptor(macdrv_displays[0].displayID);

1 0

Rémi Bernon : winegstreamer: Query the IWMSyncReader2 interface in the async reader.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: e961e082ab971e6fa2aaa71b057443f4ca17433b URL: https://gitlab.winehq.org/wine/wine/-/commit/e961e082ab971e6fa2aaa71b057443… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 13:42:16 2022 +0200 winegstreamer: Query the IWMSyncReader2 interface in the async reader. --- dlls/winegstreamer/wm_asyncreader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index e74e25228b6..85d417b4152 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -64,6 +64,7 @@ struct async_reader IUnknown *reader_inner; LONG refcount; + IWMSyncReader2 *reader; struct wm_reader *wm_reader; CRITICAL_SECTION cs; @@ -1764,6 +1765,11 @@ HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) if (FAILED(hr = winegstreamer_create_wm_sync_reader((IUnknown *)&object->IWMReader_iface, (void **)&object->reader_inner))) goto failed; + + if (FAILED(hr = IUnknown_QueryInterface(object->reader_inner, &IID_IWMSyncReader2, + (void **)&object->reader))) + goto failed; + IWMReader_Release(&object->IWMReader_iface); object->wm_reader = wm_reader_from_sync_reader_inner(object->reader_inner); InitializeCriticalSection(&object->cs);

1 0

Rémi Bernon : winegstreamer: Implement IWMSyncReader2_GetReadStreamSamples.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: cbd7be3f19c503aec47ebdeaa3b09ad8a085cc4c URL: https://gitlab.winehq.org/wine/wine/-/commit/cbd7be3f19c503aec47ebdeaa3b09a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 10:54:05 2022 +0200 winegstreamer: Implement IWMSyncReader2_GetReadStreamSamples. --- dlls/winegstreamer/wm_reader.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 85332926d49..09745ae2023 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -2348,11 +2348,25 @@ static HRESULT WINAPI reader_GetOutputSetting(IWMSyncReader2 *iface, DWORD outpu return E_NOTIMPL; } -static HRESULT WINAPI reader_GetReadStreamSamples(IWMSyncReader2 *iface, WORD stream_num, BOOL *compressed) +static HRESULT WINAPI reader_GetReadStreamSamples(IWMSyncReader2 *iface, WORD stream_number, BOOL *compressed) { - struct wm_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p): stub!\n", This, stream_num, compressed); - return E_NOTIMPL; + struct wm_reader *reader = impl_from_IWMSyncReader2(iface); + struct wm_stream *stream; + + TRACE("reader %p, stream_number %u, compressed %p.\n", reader, stream_number, compressed); + + EnterCriticalSection(&reader->cs); + + if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number))) + { + LeaveCriticalSection(&reader->cs); + return E_INVALIDARG; + } + + *compressed = stream->read_compressed; + + LeaveCriticalSection(&reader->cs); + return S_OK; } static HRESULT WINAPI reader_GetStreamNumberForOutput(IWMSyncReader2 *iface,

1 0

Rémi Bernon : winegstreamer: Use IWMSyncReader2_GetReadStreamSamples in the async reader.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: b69717e797722e8293b94b119e724b04661f428c URL: https://gitlab.winehq.org/wine/wine/-/commit/b69717e797722e8293b94b119e724b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 18:47:47 2022 +0200 winegstreamer: Use IWMSyncReader2_GetReadStreamSamples in the async reader. --- dlls/winegstreamer/gst_private.h | 2 -- dlls/winegstreamer/wm_asyncreader.c | 6 +++--- dlls/winegstreamer/wm_reader.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index c4d1be54364..6b24a73d5d6 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -196,8 +196,6 @@ HRESULT wm_reader_get_output_format(struct wm_reader *reader, DWORD output, HRESULT wm_reader_get_output_format_count(struct wm_reader *reader, DWORD output, DWORD *count); HRESULT wm_reader_get_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps **props); -struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader, - WORD stream_number); HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackAdvanced *callback_advanced, WORD stream_number, INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number); HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 85d417b4152..a26f03b4cd9 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -138,7 +138,6 @@ static void async_reader_deliver_sample(struct async_reader *reader, struct samp { IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced; IWMReaderCallback *callback = reader->callback; - struct wm_stream *stream; BOOL read_compressed; HRESULT hr; @@ -146,8 +145,9 @@ static void async_reader_deliver_sample(struct async_reader *reader, struct samp reader, sample->stream, debugstr_time(sample->pts), debugstr_time(sample->duration), sample->flags, sample->buffer); - stream = wm_reader_get_stream_by_stream_number(reader->wm_reader, sample->stream); - read_compressed = stream->read_compressed; + if (FAILED(hr = IWMSyncReader2_GetReadStreamSamples(reader->reader, sample->stream, + &read_compressed))) + read_compressed = FALSE; LeaveCriticalSection(&reader->callback_cs); if (read_compressed) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 09745ae2023..44e75a8d0c0 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1580,7 +1580,7 @@ HRESULT wm_reader_close(struct wm_reader *reader) return S_OK; } -struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader, WORD stream_number) +static struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader, WORD stream_number) { if (stream_number && stream_number <= reader->stream_count) return &reader->streams[stream_number - 1];

1 0

Rémi Bernon : winegstreamer: Use IWMSyncReader2_SetReadStreamSamples in the async reader.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: 4a3f170c03dd06c94c239f9cb64cd363120cf469 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a3f170c03dd06c94c239f9cb64cd3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 13:43:09 2022 +0200 winegstreamer: Use IWMSyncReader2_SetReadStreamSamples in the async reader. --- dlls/winegstreamer/gst_private.h | 2 -- dlls/winegstreamer/wm_asyncreader.c | 2 +- dlls/winegstreamer/wm_reader.c | 32 +++++++++++++------------------- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 6b24a73d5d6..32e6555cfe3 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -207,8 +207,6 @@ HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output HRESULT wm_reader_set_allocate_for_stream(struct wm_reader *reader, WORD stream_number, BOOL allocate); HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps *props); -HRESULT wm_reader_set_read_compressed(struct wm_reader *reader, - WORD stream_number, BOOL compressed); HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count, const WORD *stream_numbers, const WMT_STREAM_SELECTION *selections); diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index a26f03b4cd9..48553480515 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -736,7 +736,7 @@ static HRESULT WINAPI WMReaderAdvanced_SetReceiveStreamSamples(IWMReaderAdvanced TRACE("reader %p, stream_number %u, compressed %d.\n", reader, stream_number, compressed); - return wm_reader_set_read_compressed(reader->wm_reader, stream_number, compressed); + return IWMSyncReader2_SetReadStreamSamples(reader->reader, stream_number, compressed); } static HRESULT WINAPI WMReaderAdvanced_GetReceiveStreamSamples(IWMReaderAdvanced6 *iface, WORD stream_num, diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 44e75a8d0c0..1229789b156 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -2103,24 +2103,6 @@ HRESULT wm_reader_set_allocate_for_stream(struct wm_reader *reader, WORD stream_ return S_OK; } -HRESULT wm_reader_set_read_compressed(struct wm_reader *reader, WORD stream_number, BOOL compressed) -{ - struct wm_stream *stream; - - EnterCriticalSection(&reader->cs); - - if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number))) - { - LeaveCriticalSection(&reader->cs); - return E_INVALIDARG; - } - - stream->read_compressed = compressed; - - LeaveCriticalSection(&reader->cs); - return S_OK; -} - HRESULT wm_reader_get_max_stream_size(struct wm_reader *reader, WORD stream_number, DWORD *size) { struct wm_stream *stream; @@ -2468,10 +2450,22 @@ static HRESULT WINAPI reader_SetRangeByFrame(IWMSyncReader2 *iface, WORD stream_ static HRESULT WINAPI reader_SetReadStreamSamples(IWMSyncReader2 *iface, WORD stream_number, BOOL compressed) { struct wm_reader *reader = impl_from_IWMSyncReader2(iface); + struct wm_stream *stream; TRACE("reader %p, stream_index %u, compressed %d.\n", reader, stream_number, compressed); - return wm_reader_set_read_compressed(reader, stream_number, compressed); + EnterCriticalSection(&reader->cs); + + if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number))) + { + LeaveCriticalSection(&reader->cs); + return E_INVALIDARG; + } + + stream->read_compressed = compressed; + + LeaveCriticalSection(&reader->cs); + return S_OK; } static HRESULT WINAPI reader_SetStreamsSelected(IWMSyncReader2 *iface,

1 0

Rémi Bernon : winegstreamer: Use IWMSyncReader2_Close in the async reader.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: 1fab216a3a05893e928394e5b89b0ac74938562c URL: https://gitlab.winehq.org/wine/wine/-/commit/1fab216a3a05893e928394e5b89b0a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 16 07:58:11 2022 +0200 winegstreamer: Use IWMSyncReader2_Close in the async reader. --- dlls/winegstreamer/gst_private.h | 1 - dlls/winegstreamer/wm_asyncreader.c | 8 ++--- dlls/winegstreamer/wm_reader.c | 61 +++++++++++++++++-------------------- 3 files changed, 32 insertions(+), 38 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 32e6555cfe3..04a2f99f154 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -189,7 +189,6 @@ struct wm_reader HRESULT WINAPI winegstreamer_create_wm_sync_reader(IUnknown *outer, void **out); struct wm_reader *wm_reader_from_sync_reader_inner(IUnknown *inner); -HRESULT wm_reader_close(struct wm_reader *reader); HRESULT wm_reader_get_max_stream_size(struct wm_reader *reader, WORD stream_number, DWORD *size); HRESULT wm_reader_get_output_format(struct wm_reader *reader, DWORD output, DWORD index, IWMOutputMediaProps **props); diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 48553480515..8ec782f3056 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -443,7 +443,7 @@ static ULONG WINAPI WMReader_Release(IWMReader *iface) reader->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&reader->cs); - wm_reader_close(reader->wm_reader); + IWMSyncReader2_Close(reader->reader); IUnknown_Release(reader->reader_inner); free(reader); @@ -465,7 +465,7 @@ static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, if (SUCCEEDED(hr = wm_reader_open_file(reader->wm_reader, url)) && FAILED(hr = async_reader_open(reader, callback, context))) - wm_reader_close(reader->wm_reader); + IWMSyncReader2_Close(reader->reader); LeaveCriticalSection(&reader->cs); return hr; @@ -483,7 +483,7 @@ static HRESULT WINAPI WMReader_Close(IWMReader *iface) if (SUCCEEDED(hr = async_reader_queue_op(reader, ASYNC_OP_CLOSE, NULL))) { async_reader_close(reader); - hr = wm_reader_close(reader->wm_reader); + hr = IWMSyncReader2_Close(reader->reader); } LeaveCriticalSection(&reader->cs); @@ -935,7 +935,7 @@ static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface, if (SUCCEEDED(hr = wm_reader_open_stream(reader->wm_reader, stream)) && FAILED(hr = async_reader_open(reader, callback, context))) - wm_reader_close(reader->wm_reader); + IWMSyncReader2_Close(reader->reader); LeaveCriticalSection(&reader->cs); return hr; diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 1229789b156..d42726c04d1 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1549,37 +1549,6 @@ HRESULT wm_reader_open_file(struct wm_reader *reader, const WCHAR *filename) return hr; } -HRESULT wm_reader_close(struct wm_reader *reader) -{ - EnterCriticalSection(&reader->cs); - - if (!reader->wg_parser) - { - LeaveCriticalSection(&reader->cs); - return NS_E_INVALID_REQUEST; - } - - wg_parser_disconnect(reader->wg_parser); - - reader->read_thread_shutdown = true; - WaitForSingleObject(reader->read_thread, INFINITE); - CloseHandle(reader->read_thread); - reader->read_thread = NULL; - - wg_parser_destroy(reader->wg_parser); - reader->wg_parser = NULL; - - if (reader->source_stream) - IStream_Release(reader->source_stream); - reader->source_stream = NULL; - if (reader->file) - CloseHandle(reader->file); - reader->file = NULL; - - LeaveCriticalSection(&reader->cs); - return S_OK; -} - static struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader, WORD stream_number) { if (stream_number && stream_number <= reader->stream_count) @@ -2180,7 +2149,7 @@ static ULONG WINAPI unknown_inner_Release(IUnknown *iface) if (!refcount) { - wm_reader_close(reader); + IWMSyncReader2_Close(&reader->IWMSyncReader2_iface); reader->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&reader->cs); @@ -2227,7 +2196,33 @@ static HRESULT WINAPI reader_Close(IWMSyncReader2 *iface) TRACE("reader %p.\n", reader); - return wm_reader_close(reader); + EnterCriticalSection(&reader->cs); + + if (!reader->wg_parser) + { + LeaveCriticalSection(&reader->cs); + return NS_E_INVALID_REQUEST; + } + + wg_parser_disconnect(reader->wg_parser); + + reader->read_thread_shutdown = true; + WaitForSingleObject(reader->read_thread, INFINITE); + CloseHandle(reader->read_thread); + reader->read_thread = NULL; + + wg_parser_destroy(reader->wg_parser); + reader->wg_parser = NULL; + + if (reader->source_stream) + IStream_Release(reader->source_stream); + reader->source_stream = NULL; + if (reader->file) + CloseHandle(reader->file); + reader->file = NULL; + + LeaveCriticalSection(&reader->cs); + return S_OK; } static HRESULT WINAPI reader_GetMaxOutputSampleSize(IWMSyncReader2 *iface, DWORD output, DWORD *max)

1 0

Rémi Bernon : winegstreamer: Use IWMSyncReader2_Open in the async reader.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: 1b527e8c7f6e24f8c79fc620726b41fc2a15182b URL: https://gitlab.winehq.org/wine/wine/-/commit/1b527e8c7f6e24f8c79fc620726b41… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 16 07:59:22 2022 +0200 winegstreamer: Use IWMSyncReader2_Open in the async reader. --- dlls/winegstreamer/gst_private.h | 1 - dlls/winegstreamer/wm_asyncreader.c | 2 +- dlls/winegstreamer/wm_reader.c | 74 +++++++++++++++++-------------------- 3 files changed, 35 insertions(+), 42 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 04a2f99f154..a16c72c807b 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -199,7 +199,6 @@ HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackA INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number); HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, WORD stream_number, WMT_STREAM_SELECTION *selection); -HRESULT wm_reader_open_file(struct wm_reader *reader, const WCHAR *filename); HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream); void wm_reader_seek(struct wm_reader *reader, QWORD start, LONGLONG duration); HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate); diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 8ec782f3056..825a042b534 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -463,7 +463,7 @@ static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, EnterCriticalSection(&reader->cs); - if (SUCCEEDED(hr = wm_reader_open_file(reader->wm_reader, url)) + if (SUCCEEDED(hr = IWMSyncReader2_Open(reader->reader, url)) && FAILED(hr = async_reader_open(reader, callback, context))) IWMSyncReader2_Close(reader->reader); diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index d42726c04d1..21efac4df66 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1510,45 +1510,6 @@ HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream) return hr; } -HRESULT wm_reader_open_file(struct wm_reader *reader, const WCHAR *filename) -{ - LARGE_INTEGER size; - HANDLE file; - HRESULT hr; - - if ((file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE) - { - ERR("Failed to open %s, error %lu.\n", debugstr_w(filename), GetLastError()); - return HRESULT_FROM_WIN32(GetLastError()); - } - - if (!GetFileSizeEx(file, &size)) - { - ERR("Failed to get the size of %s, error %lu.\n", debugstr_w(filename), GetLastError()); - CloseHandle(file); - return HRESULT_FROM_WIN32(GetLastError()); - } - - EnterCriticalSection(&reader->cs); - - if (reader->wg_parser) - { - LeaveCriticalSection(&reader->cs); - WARN("Stream is already open; returning E_UNEXPECTED.\n"); - CloseHandle(file); - return E_UNEXPECTED; - } - - reader->file = file; - - if (FAILED(hr = init_stream(reader, size.QuadPart))) - reader->file = NULL; - - LeaveCriticalSection(&reader->cs); - return hr; -} - static struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader, WORD stream_number) { if (stream_number && stream_number <= reader->stream_count) @@ -2370,10 +2331,43 @@ static HRESULT WINAPI reader_GetStreamSelected(IWMSyncReader2 *iface, static HRESULT WINAPI reader_Open(IWMSyncReader2 *iface, const WCHAR *filename) { struct wm_reader *reader = impl_from_IWMSyncReader2(iface); + LARGE_INTEGER size; + HANDLE file; + HRESULT hr; TRACE("reader %p, filename %s.\n", reader, debugstr_w(filename)); - return wm_reader_open_file(reader, filename); + if ((file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE) + { + ERR("Failed to open %s, error %lu.\n", debugstr_w(filename), GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + + if (!GetFileSizeEx(file, &size)) + { + ERR("Failed to get the size of %s, error %lu.\n", debugstr_w(filename), GetLastError()); + CloseHandle(file); + return HRESULT_FROM_WIN32(GetLastError()); + } + + EnterCriticalSection(&reader->cs); + + if (reader->wg_parser) + { + LeaveCriticalSection(&reader->cs); + WARN("Stream is already open; returning E_UNEXPECTED.\n"); + CloseHandle(file); + return E_UNEXPECTED; + } + + reader->file = file; + + if (FAILED(hr = init_stream(reader, size.QuadPart))) + reader->file = NULL; + + LeaveCriticalSection(&reader->cs); + return hr; } static HRESULT WINAPI reader_OpenStream(IWMSyncReader2 *iface, IStream *stream)

1 0