November 2021 - Wine-commits

Rémi Bernon : dinput: Pretend that DIPROP_AUTOCENTER is supported.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: e04cfc0b0a7c33f2d882b453d0fceda9e4793bef URL: https://source.winehq.org/git/wine.git/?a=commit;h=e04cfc0b0a7c33f2d882b453… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 09:35:00 2021 +0100 dinput: Pretend that DIPROP_AUTOCENTER is supported. Star Wars Episode I Racer will ignore force-feedback joystick devices if we return an error here. 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/dinput8/tests/hid.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c79b182bc66..dff1f3426d3 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1082,7 +1082,8 @@ static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, co EnterCriticalSection( &impl->crit ); if (impl->acquired) hr = DIERR_ACQUIRED; else if (value->dwData > DIPROPAUTOCENTER_ON) hr = DIERR_INVALIDPARAM; - else hr = DIERR_UNSUPPORTED; + else if (!(impl->caps.dwFlags & DIDC_FORCEFEEDBACK)) hr = DIERR_UNSUPPORTED; + else hr = DI_OK; LeaveCriticalSection( &impl->crit ); return hr; } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index af8d48dfc90..a0e202ba804 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -7360,7 +7360,6 @@ static void test_force_feedback_joystick( void ) prop_dword.diph.dwObj = 0; prop_dword.dwData = DIPROPAUTOCENTER_ON; hr = IDirectInputDevice8_SetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "SetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); hr = IDirectInputDevice8_Acquire( device );

1 0

Rémi Bernon : dinput: Check for DIEFFECT_DX6 size when DIEP_STARTDELAY is set.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 869a0ddacadbf85f3849bb7ca2473e307565bdae URL: https://source.winehq.org/git/wine.git/?a=commit;h=869a0ddacadbf85f3849bb7c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 09:35:01 2021 +0100 dinput: Check for DIEFFECT_DX6 size when DIEP_STARTDELAY is set. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 5 +++-- dlls/dinput/joystick_hid.c | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index dff1f3426d3..85392c6b30b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1357,7 +1357,7 @@ static HRESULT WINAPI dinput_device_CreateEffect( IDirectInputDevice8W *iface, c IUnknown *outer ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DWORD flags = DIEP_ALLPARAMS; + DWORD flags; HRESULT hr; TRACE( "iface %p, guid %s, params %p, out %p, outer %p\n", iface, debugstr_guid( guid ), @@ -1372,8 +1372,9 @@ static HRESULT WINAPI dinput_device_CreateEffect( IDirectInputDevice8W *iface, c hr = IDirectInputEffect_Initialize( *out, DINPUT_instance, impl->dinput->dwVersion, guid ); if (FAILED(hr)) goto failed; - if (!params) return DI_OK; + + flags = params->dwSize == sizeof(DIEFFECT_DX6) ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5; if (!impl->acquired || !(impl->dwCoopLevel & DISCL_EXCLUSIVE)) flags |= DIEP_NODOWNLOAD; hr = IDirectInputEffect_SetParameters( *out, params, flags ); if (FAILED(hr)) goto failed; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 610a75871f1..20a10bde6ae 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2149,7 +2149,11 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa if (flags & DIEP_DURATION) params->dwDuration = impl->params.dwDuration; if (flags & DIEP_GAIN) params->dwGain = impl->params.dwGain; if (flags & DIEP_SAMPLEPERIOD) params->dwSamplePeriod = impl->params.dwSamplePeriod; - if (flags & DIEP_STARTDELAY) params->dwStartDelay = impl->params.dwStartDelay; + if (flags & DIEP_STARTDELAY) + { + if (params->dwSize != sizeof(DIEFFECT_DX6)) return DIERR_INVALIDPARAM; + params->dwStartDelay = impl->params.dwStartDelay; + } if (flags & DIEP_TRIGGERREPEATINTERVAL) params->dwTriggerRepeatInterval = impl->params.dwTriggerRepeatInterval; if (flags & DIEP_TRIGGERBUTTON) @@ -2336,6 +2340,7 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa } if (flags & DIEP_STARTDELAY) { + if (params->dwSize != sizeof(DIEFFECT_DX6)) return DIERR_INVALIDPARAM; if (impl->params.dwStartDelay != params->dwStartDelay) impl->modified = TRUE; impl->params.dwStartDelay = params->dwStartDelay; }

1 0

Rémi Bernon : dinput: Support both DIEFFECT_DX5 and DIEFFECT_DX6 parameters.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 67d38c699110a186ff69ecfa9a11e8c0cb3305a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67d38c699110a186ff69ecfa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 09:35:02 2021 +0100 dinput: Support both DIEFFECT_DX5 and DIEFFECT_DX6 parameters. Star Wars Episode I Racer force-feedback doesn't work otherwise as it passes a DIEFFECT_DX5 struct to SetParameters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 20a10bde6ae..541aa26e73b 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2043,7 +2043,7 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa TRACE( "iface %p, params %p, flags %#x.\n", iface, params, flags ); if (!params) return DI_OK; - if (params->dwSize != sizeof(DIEFFECT)) return DIERR_INVALIDPARAM; + if (params->dwSize != sizeof(DIEFFECT_DX6) && params->dwSize != sizeof(DIEFFECT_DX5)) return DIERR_INVALIDPARAM; capacity = params->cAxes; object_flags = params->dwFlags & (DIEFF_OBJECTIDS | DIEFF_OBJECTOFFSETS); direction_flags = params->dwFlags & (DIEFF_CARTESIAN | DIEFF_POLAR | DIEFF_SPHERICAL); @@ -2199,7 +2199,7 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa TRACE( "iface %p, params %p, flags %#x.\n", iface, params, flags ); if (!params) return E_POINTER; - if (params->dwSize != sizeof(DIEFFECT)) return DIERR_INVALIDPARAM; + if (params->dwSize != sizeof(DIEFFECT_DX6) && params->dwSize != sizeof(DIEFFECT_DX5)) return DIERR_INVALIDPARAM; object_flags = params->dwFlags & (DIEFF_OBJECTIDS | DIEFF_OBJECTOFFSETS); direction_flags = params->dwFlags & (DIEFF_CARTESIAN | DIEFF_POLAR | DIEFF_SPHERICAL);

1 0

Nikolay Sivov : mf/session: Implement IsRateSupported().
by Alexandre Julliard 08 Nov '21

08 Nov '21

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

Nikolay Sivov : mf/session: Get rid of some interface pointers casts.
by Alexandre Julliard 08 Nov '21

08 Nov '21

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

Nikolay Sivov : mfplay: Fix leaks on error paths (Coverity).
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: b676f14865e2765729e238ceb8e54e96e63f1da0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b676f14865e2765729e238ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 8 11:43:07 2021 +0300 mfplay: Fix leaks on error paths (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 12ea653b97d..5abee9d7de8 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1024,6 +1024,15 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, IUnknown *object; HRESULT hr; + if (sync && !ret) + return E_POINTER; + + if (!sync && !player->callback) + { + WARN("Asynchronous item creation is not supported without user callback.\n"); + return MF_E_INVALIDREQUEST; + } + if (FAILED(hr = create_media_item(&player->IMFPMediaPlayer_iface, user_data, &item))) return hr; @@ -1035,9 +1044,6 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, if (sync) { - if (!ret) - return E_POINTER; - *ret = NULL; if (SUCCEEDED(hr = IMFSourceResolver_CreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE, @@ -1054,17 +1060,9 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, } IMFPMediaItem_Release(&item->IMFPMediaItem_iface); - - return hr; } else { - if (!player->callback) - { - WARN("Asynchronous item creation is not supported without user callback.\n"); - return MF_E_INVALIDREQUEST; - } - if (ret) *ret = NULL; hr = IMFSourceResolver_BeginCreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE,

1 0

Paul Gofman : msiexec: Append .msi extension to file name if file is not found.
by Alexandre Julliard 08 Nov '21

08 Nov '21

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

Jinoh Kang : win32u: Remove EMFDRV_StretchDIBits and EMFDRV_SetDIBitsToDevice.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 26d4aa8f73656f25ba845368553dcf178de8306b URL: https://source.winehq.org/git/wine.git/?a=commit;h=26d4aa8f73656f25ba845368… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Nov 6 01:37:30 2021 +0900 win32u: Remove EMFDRV_StretchDIBits and EMFDRV_SetDIBitsToDevice. Bound rect updates shall ideally be done via a generic mechanism, not by EMFDRV. 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/win32u/emfdrv.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/win32u/emfdrv.c b/dlls/win32u/emfdrv.c index e05f11d7b9a..59a6ee69328 100644 --- a/dlls/win32u/emfdrv.c +++ b/dlls/win32u/emfdrv.c @@ -402,24 +402,6 @@ static BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD r return TRUE; } -static INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT x_dst, INT y_dst, INT width_dst, - INT height_dst, INT x_src, INT y_src, INT width_src, - INT height_src, const void *bits, BITMAPINFO *info, - UINT wUsage, DWORD dwRop ) -{ - /* FIXME: Update bound rect */ - return height_src; -} - -static INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, - DWORD height, INT x_src, INT y_src, UINT startscan, - UINT lines, const void *bits, BITMAPINFO *info, - UINT usage ) -{ - /* FIXME: Update bound rect */ - return lines; -} - static HBITMAP CDECL EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) { return 0; @@ -528,7 +510,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pSetBoundsRect */ NULL, /* pSetDCBrushColor*/ NULL, /* pSetDCPenColor*/ - EMFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ + NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ EMFDRV_SetPixel, /* pSetPixel */ @@ -536,7 +518,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pStartDoc */ NULL, /* pStartPage */ NULL, /* pStretchBlt */ - EMFDRV_StretchDIBits, /* pStretchDIBits */ + NULL, /* pStretchDIBits */ EMFDRV_StrokeAndFillPath, /* pStrokeAndFillPath */ EMFDRV_StrokePath, /* pStrokePath */ NULL, /* pUnrealizePalette */

1 0

Jinoh Kang : gdi32/tests: Add tests for recording StretchDIBits in EMFs.
by Alexandre Julliard 08 Nov '21

08 Nov '21

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

Jinoh Kang : gdi32/tests: Add tests for recording SetDIBitsToDevice in EMFs.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 3f7df2a5f61f730c65887b124cc411c481ed3f25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f7df2a5f61f730c65887b12… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Nov 6 01:37:32 2021 +0900 gdi32/tests: Add tests for recording SetDIBitsToDevice 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 | 1398 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1398 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f7df2a5f61f730c6588…

1 0