November 2021 - Wine-Commits

Nikolay Sivov : mf/session: Implement IsRateSupported().
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: d8bbbfd589c3a766165d54e8389420f80b75c0af URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8bbbfd589c3a766165d54e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 8 11:41:45 2021 +0300 mf/session: Implement IsRateSupported(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e3d77864494..c4dc6419b87 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3537,6 +3537,80 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA return hr; } +static HRESULT session_is_presentation_rate_supported(struct media_session *session, BOOL thin, float rate, + float *nearest_rate) +{ + IMFRateSupport *rate_support; + struct media_source *source; + struct media_sink *sink; + float value = 0.0f, tmp; + unsigned int flags; + HRESULT hr = S_OK; + + if (!nearest_rate) nearest_rate = &tmp; + + if (rate == 0.0f) + { + *nearest_rate = 1.0f; + return S_OK; + } + + EnterCriticalSection(&session->cs); + + if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) + { + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + if (FAILED(hr = MFGetService((IUnknown *)source->source, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, + (void **)&rate_support))) + { + value = 1.0f; + break; + } + + value = rate; + if (FAILED(hr = IMFRateSupport_IsRateSupported(rate_support, thin, rate, &value))) + WARN("Source does not support rate %f, hr %#x.\n", rate, hr); + IMFRateSupport_Release(rate_support); + + /* Only "first" source is considered. */ + break; + } + + if (SUCCEEDED(hr)) + { + /* For sinks only check if rate is supported, ignoring nearest values. */ + LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) + { + flags = 0; + if (FAILED(hr = IMFMediaSink_GetCharacteristics(sink->sink, &flags))) + break; + + if (flags & MEDIASINK_RATELESS) + continue; + + if (FAILED(MFGetService((IUnknown *)sink->sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, + (void **)&rate_support))) + continue; + + hr = IMFRateSupport_IsRateSupported(rate_support, thin, rate, NULL); + IMFRateSupport_Release(rate_support); + if (FAILED(hr)) + { + WARN("Sink %p does not support rate %f, hr %#x.\n", sink->sink, rate, hr); + break; + } + } + } + } + + LeaveCriticalSection(&session->cs); + + *nearest_rate = value; + + return hr; +} + static HRESULT WINAPI session_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate) { @@ -3560,9 +3634,11 @@ static HRESULT WINAPI session_rate_support_GetFastestRate(IMFRateSupport *iface, static HRESULT WINAPI session_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_supported_rate) { - FIXME("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); + struct media_session *session = impl_session_from_IMFRateSupport(iface); - return E_NOTIMPL; + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); + + return session_is_presentation_rate_supported(session, thin, rate, nearest_supported_rate); } static const IMFRateSupportVtbl session_rate_support_vtbl =

1 0

Jinoh Kang : gdi32: Calculate effective number of scan lines and truncate bitmap bits for EMR_SETDIBITSTODEVICE.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: 9301a9e1f89f7b049362b5143f52845bbf9cb341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9301a9e1f89f7b049362b514… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Nov 6 01:37:35 2021 +0900 gdi32: Calculate effective number of scan lines and truncate bitmap bits for EMR_SETDIBITSTODEVICE. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/emfdc.c | 20 ++++++++++++++++++++ dlls/gdi32/tests/metafile.c | 7 ------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 093f2d83737..d0b9033722c 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -1815,6 +1815,7 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt EMRSETDIBITSTODEVICE *emr; BOOL ret; UINT bmi_size, img_size, payload_size, emr_size; + UINT src_height, stride; BITMAPINFOHEADER bih; BITMAPINFO *bi; @@ -1822,6 +1823,25 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt if (!emf_parse_user_bitmapinfo( &bih, &info->bmiHeader, usage, TRUE, &bmi_size, &img_size )) return 0; + if (bih.biHeight >= 0) + { + src_height = (UINT)bih.biHeight; + if (src_height > y_src + height) src_height = y_src + height; + + if (src_height < startscan) lines = 0; + else if (lines > src_height - startscan) lines = src_height - startscan; + + if (!lines) return 0; + + if (bih.biCompression == BI_RGB || bih.biCompression == BI_BITFIELDS) + { + /* truncate image and check for overflows */ + stride = get_dib_stride( bih.biWidth, bih.biBitCount ); + img_size = lines * stride; + if (img_size / stride != lines) return 0; + } + } + /* check for overflows */ payload_size = bmi_size + img_size; if (payload_size < bmi_size) return 0; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 25c851e7384..2df38674c2f 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -7764,13 +7764,6 @@ static void test_emf_SetDIBitsToDevice(void) { winetest_push_context("Test %d", test_idx); - if (tests[test_idx].height != bitmap_height && !strcmp(winetest_platform, "wine")) - { - skip("Wine does not adjust cLines appropriately\n"); - winetest_pop_context(); - continue; - } - memset(&bmi, 0, sizeof(bmi)); if (tests[test_idx].infomode < 2) {

1 0

Rémi Bernon : dinput: Always call the device internal poll callback.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: 53fcfe3834da3c43838cd26bdeb4fdb335542627 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53fcfe3834da3c43838cd26b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 09:34:57 2021 +0100 dinput: Always call the device internal poll callback. We normally should not peek messages here, but because of current winex11.drv design, we have to call MsgWaitForMultipleObjectsEx from time to time to pull keyboard or mouse events. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51956 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 3 +-- dlls/dinput/dinput_main.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d375229e2c0..c79b182bc66 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1535,10 +1535,9 @@ static HRESULT WINAPI dinput_device_Poll( IDirectInputDevice8W *iface ) EnterCriticalSection( &impl->crit ); if (!impl->acquired) hr = DIERR_NOTACQUIRED; LeaveCriticalSection( &impl->crit ); - if (hr != DI_OK) return hr; if (impl->vtbl->poll) return impl->vtbl->poll( iface ); - return DI_OK; + return hr; } static HRESULT WINAPI dinput_device_SendDeviceData( IDirectInputDevice8W *iface, DWORD size, diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 3286e887662..835a8656bd1 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1430,6 +1430,8 @@ void check_dinput_events(void) * (for example Culpa Innata) * - some games only poll the device, and neither keyboard nor mouse * (for example Civilization: Call to Power 2) + * - some games do not explicitly poll for keyboard events + * (for example Morrowind in its key binding page) */ MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0); }

1 0

Rémi Bernon : dinput: Enumerate HID joystick with dinput <= 7 and device type 0.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: 62f5bbf3ed1c42238f56e35095ab88b9bd9697aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=62f5bbf3ed1c42238f56e350… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 09:34:58 2021 +0100 dinput: Enumerate HID joystick with dinput <= 7 and device type 0. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51953 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index d7e64af9928..610a75871f1 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1470,7 +1470,7 @@ HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *in if (instance->dwSize != sizeof(DIDEVICEINSTANCEW)) return S_FALSE; - if (version < 0x0800 && type != DIDEVTYPE_JOYSTICK) + if (version < 0x0800 && type != 0 && type != DIDEVTYPE_JOYSTICK) return S_FALSE; if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_GAMECTRL) return S_FALSE;

1 0

Akihiro Sagawa : gdi32/tests: Test substituted face family name.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: 64c31e63b8bec3170b40d98c1e79884c8bcb484e URL: https://source.winehq.org/git/wine.git/?a=commit;h=64c31e63b8bec3170b40d98c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 4 23:18:22 2021 +0900 gdi32/tests: Test substituted face family name. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f93e5e5e5d0..a8880c263ae 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7786,6 +7786,51 @@ static void test_select_object(void) DeleteObject(hfont); } +static void test_GetOutlineTextMetrics_subst(void) +{ + OUTLINETEXTMETRICA *otm; + LOGFONTA lf; + HFONT hfont, hfont_old; + HDC hdc; + DWORD ret; + char face_name[LF_FACESIZE]; + const char* family_name; + + if (!is_font_installed("MS SHELL DLG")) + { + skip("MS Shell Dlg is not installed\n"); + return; + } + + hdc = GetDC(0); + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "MS SHELL DLG"); + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "failed to create a font\n"); + hfont_old = SelectObject(hdc, hfont); + + /* face name */ + ret = GetTextFaceA(hdc, sizeof(face_name), face_name); + ok(ret, "GetTextFace failed\n"); + ok(!lstrcmpiA(lf.lfFaceName, face_name), "expected %s, got %s\n", lf.lfFaceName, face_name); + + ret = GetOutlineTextMetricsA(hdc, 0, NULL); + otm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ret); + ret = GetOutlineTextMetricsA(hdc, ret, otm); + ok(ret != 0, "GetOutlineTextMetrics failed\n"); + + /* family name */ + family_name = (const char*)otm + (UINT_PTR)otm->otmpFamilyName; + todo_wine ok(lstrcmpiA(lf.lfFaceName, family_name), "expected a real family name (e.g. Tahoma), got %s\n", family_name); + + HeapFree(GetProcessHeap(), 0, otm); + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + + ReleaseDC(0, hdc); +} + START_TEST(font) { static const char *test_names[] = @@ -7818,6 +7863,7 @@ START_TEST(font) test_GetGlyphIndices(); test_GetKerningPairs(); test_GetOutlineTextMetrics(); + test_GetOutlineTextMetrics_subst(); test_SetTextJustification(); test_font_charset(); test_GdiGetCodePage();

1 0

Jinoh Kang : gdi32/tests: Add tests for recording StretchDIBits in EMFs.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: 53617db97ade28b76ccaef952d55c1cd93982084 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53617db97ade28b76ccaef95… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Nov 6 01:37:31 2021 +0900 gdi32/tests: Add tests for recording StretchDIBits in EMFs. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 1432 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1432 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53617db97ade28b76cca…

1 0

Paul Gofman : msiexec: Append .msi extension to file name if file is not found.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: fd5d942a733bf35b7c6b6644d2aed571c185baba URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd5d942a733bf35b7c6b6644… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Nov 5 19:53:40 2021 +0300 msiexec: Append .msi extension to file name if file is not found. Fixes Stellaris failing to install launcher at start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 18 ++++++++++++++++++ programs/msiexec/msiexec.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index eedfcac486d..b42cc90a955 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -64,6 +64,8 @@ static void WINAPIV check_record_(int line, MSIHANDLE rec, UINT count, ...) static void test_msidatabase(void) { MSIHANDLE hdb = 0, hdb2 = 0; + WCHAR path[MAX_PATH]; + DWORD len; UINT res; DeleteFileW(msifileW); @@ -162,6 +164,22 @@ static void test_msidatabase(void) res = MsiCloseHandle( hdb ); ok( res == ERROR_SUCCESS , "Failed to close database\n" ); + res = GetCurrentDirectoryW(ARRAY_SIZE(path), path); + ok ( res, "Got zero res.\n" ); + lstrcatW( path, L"\\"); + lstrcatW( path, msifileW); + len = lstrlenW(path); + path[len - 4] = 0; + + res = MsiOpenDatabaseW( path, MSIDBOPEN_READONLY, &hdb ); + ok( res != ERROR_SUCCESS , "Got unexpected res %u.\n", res ); + + lstrcpyW( path, msifileW ); + path[lstrlenW(path) - 4] = 0; + + res = MsiOpenDatabaseW( path, MSIDBOPEN_READONLY, &hdb ); + ok( res != ERROR_SUCCESS , "Got unexpected res %u.\n", res ); + res = DeleteFileA( msifile2 ); ok( res == TRUE, "Failed to delete database\n" ); diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index e25cc2659e6..e9e74f5c19e 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -588,6 +588,31 @@ static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***parg return ret; } +static WCHAR *get_path_with_extension(const WCHAR *package_name) +{ + static const WCHAR ext[] = L".msi"; + unsigned int p; + WCHAR *path; + + if (!(path = heap_alloc(lstrlenW(package_name) * sizeof(WCHAR) + sizeof(ext)))) + { + WINE_ERR("No memory.\n"); + return NULL; + } + + lstrcpyW(path, package_name); + p = lstrlenW(path); + while (p && path[p] != '.' && path[p] != L'\\' && path[p] != '/') + --p; + if (path[p] == '.') + { + heap_free(path); + return NULL; + } + lstrcatW(path, ext); + return path; +} + int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { int i; @@ -626,6 +651,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine DWORD ReturnCode; int argc; LPWSTR *argvW = NULL; + WCHAR *path; InitCommonControls(); @@ -1040,14 +1066,28 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine if(IsProductCode(PackageName)) ReturnCode = MsiConfigureProductExW(PackageName, 0, INSTALLSTATE_DEFAULT, Properties); else - ReturnCode = MsiInstallProductW(PackageName, Properties); + { + if ((ReturnCode = MsiInstallProductW(PackageName, Properties)) == ERROR_FILE_NOT_FOUND + && (path = get_path_with_extension(PackageName))) + { + ReturnCode = MsiInstallProductW(path, Properties); + heap_free(path); + } + } } else if(FunctionRepair) { if(IsProductCode(PackageName)) WINE_FIXME("Product code treatment not implemented yet\n"); else - ReturnCode = MsiReinstallProductW(PackageName, RepairMode); + { + if ((ReturnCode = MsiReinstallProductW(PackageName, RepairMode)) == ERROR_FILE_NOT_FOUND + && (path = get_path_with_extension(PackageName))) + { + ReturnCode = MsiReinstallProductW(path, RepairMode); + heap_free(path); + } + } } else if(FunctionAdvertise) {

1 0

Nikolay Sivov : mf/session: Get rid of some interface pointers casts.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: f2bb763c9ce866ffda6c645b73ab5d2bcca40650 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2bb763c9ce866ffda6c645b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 8 11:41:46 2021 +0300 mf/session: Get rid of some interface pointers casts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index c4dc6419b87..fe87b3e6584 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -122,7 +122,11 @@ enum media_source_flags struct media_source { struct list entry; - IMFMediaSource *source; + union + { + IMFMediaSource *source; + IUnknown *object; + }; IMFPresentationDescriptor *pd; enum object_state state; unsigned int flags; @@ -131,7 +135,11 @@ struct media_source struct media_sink { struct list entry; - IMFMediaSink *sink; + union + { + IMFMediaSink *sink; + IUnknown *object; + }; IMFMediaSinkPreroll *preroll; IMFMediaEventGenerator *event_generator; BOOL finalized; @@ -861,7 +869,7 @@ static void session_start(struct media_session *session, const GUID *time_format if (!(session->presentation.flags & SESSION_FLAG_SOURCES_SUBSCRIBED)) { if (FAILED(hr = IMFMediaSource_BeginGetEvent(source->source, &session->events_callback, - (IUnknown *)source->source))) + source->object))) { WARN("Failed to subscribe to source events, hr %#x.\n", hr); } @@ -1534,7 +1542,7 @@ static HRESULT session_set_current_topology(struct media_session *session, IMFTo /* Mask unsupported rate caps. */ - caps &= session_get_object_rate_caps((IUnknown *)source->source) + caps &= session_get_object_rate_caps(source->object) | ~(MFSESSIONCAP_RATE_FORWARD | MFSESSIONCAP_RATE_REVERSE); } @@ -1547,7 +1555,7 @@ static HRESULT session_set_current_topology(struct media_session *session, IMFTo if (SUCCEEDED(IMFMediaSink_GetCharacteristics(sink->sink, &object_flags))) { if (!(object_flags & MEDIASINK_RATELESS)) - caps &= session_get_object_rate_caps((IUnknown *)sink->sink) + caps &= session_get_object_rate_caps(sink->object) | ~(MFSESSIONCAP_RATE_FORWARD | MFSESSIONCAP_RATE_REVERSE); } } @@ -2382,7 +2390,7 @@ static void session_set_presentation_clock(struct media_session *session) /* Set clock for all topology nodes. */ LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { - session_set_consumed_clock((IUnknown *)source->source, session->clock); + session_set_consumed_clock(source->object, session->clock); } LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) @@ -2484,7 +2492,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn LIST_FOR_EACH_ENTRY(src, &session->presentation.sources, struct media_source, entry) { - if (object == (IUnknown *)src->source) + if (object == src->object) { changed = src->state != state; src->state = state; @@ -3403,7 +3411,7 @@ static HRESULT WINAPI session_sink_finalizer_callback_Invoke(IMFAsyncCallback *i LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) { - if (state == (IUnknown *)sink->sink) + if (state == sink->object) { if (FAILED(hr = IMFMediaSink_QueryInterface(sink->sink, &IID_IMFFinalizableMediaSink, (void **)&fin_sink))) WARN("Unexpected, missing IMFFinalizableMediaSink, hr %#x.\n", hr); @@ -3515,7 +3523,7 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA { LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { - if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)source->source, direction, thin, fastest, &rate))) + if (FAILED(hr = session_presentation_object_get_rate(source->object, direction, thin, fastest, &rate))) break; } @@ -3523,7 +3531,7 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA { LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) { - if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)sink->sink, direction, thin, fastest, &rate))) + if (FAILED(hr = session_presentation_object_get_rate(sink->object, direction, thin, fastest, &rate))) break; } } @@ -3561,7 +3569,7 @@ static HRESULT session_is_presentation_rate_supported(struct media_session *sess { LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { - if (FAILED(hr = MFGetService((IUnknown *)source->source, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, + if (FAILED(hr = MFGetService(source->object, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support))) { value = 1.0f; @@ -3589,7 +3597,7 @@ static HRESULT session_is_presentation_rate_supported(struct media_session *sess if (flags & MEDIASINK_RATELESS) continue; - if (FAILED(MFGetService((IUnknown *)sink->sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, + if (FAILED(MFGetService(sink->object, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support))) continue;

1 0

Alexandre Julliard : packaging: Remove Fedora 33.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: tools Branch: master Commit: 77b1f955b6b743f84358c91a86e034853ef4648d URL: https://source.winehq.org/git/tools.git/?a=commit;h=77b1f955b6b743f84358c91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 7 13:42:28 2021 +0100 packaging: Remove Fedora 33. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 2 +- packaging/obs/rsync-filter | 1 - packaging/obs/yum.conf | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index b33bbd3..71844e9 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -184,7 +184,7 @@ publish_files () cd $basedir -distros="33 34 35 buster bullseye bookworm bionic focal hirsute impish" +distros="34 35 buster bullseye bookworm bionic focal hirsute impish" dry_run= build=1 diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 8940d8b..8541204 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,5 +1,4 @@ + /fedora -+ /fedora/33 + /fedora/34 + /fedora/35 - /fedora/* diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index 15cb666..6d5a731 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -4,10 +4,6 @@ debuglevel=0 logfile=/var/log/yum.log gpgcheck=1 -[fedora-33] -name = Fedora 33 -baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_33 - [fedora-34] name = Fedora 34 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/…

1 0

Philip Rebohle : vkd3d-shader/spirv: Ignore break instructions outside active blocks.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: vkd3d Branch: master Commit: 45ccf85ae611ad0809c854580cdf77a63a01a9be URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=45ccf85ae611ad0809c8545… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon Nov 8 14:50:19 2021 +0100 vkd3d-shader/spirv: Ignore break instructions outside active blocks. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e5b9ef0..698c305 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7802,8 +7802,10 @@ static int vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_c } else if (breakable_cf_info->current_block == VKD3D_BLOCK_SWITCH) { - assert(breakable_cf_info->inside_block); - vkd3d_spirv_build_op_branch(builder, breakable_cf_info->u.switch_.merge_block_id); + /* The current case block may have already been ended by an + * unconditional continue instruction. */ + if (breakable_cf_info->inside_block) + vkd3d_spirv_build_op_branch(builder, breakable_cf_info->u.switch_.merge_block_id); } cf_info->inside_block = false;

1 0