June 2023 - Wine-commits - list.winehq.org

Rémi Bernon : explorer: Rename initialize_display_settings local variable.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 99ef2dc4e1754054535c89e07df8eb41d8bdc70d URL: https://gitlab.winehq.org/wine/wine/-/commit/99ef2dc4e1754054535c89e07df8eb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 27 13:40:03 2023 +0200 explorer: Rename initialize_display_settings local variable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55146 --- programs/explorer/desktop.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 51f53630ae6..49141f1c9cf 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -939,26 +939,25 @@ static const char *debugstr_devmodew( const DEVMODEW *devmode ) static void initialize_display_settings(void) { - DISPLAY_DEVICEW ddW; + DISPLAY_DEVICEW device = {.cb = sizeof(DISPLAY_DEVICEW)}; DWORD i = 0; /* Store current display mode in the registry */ - ddW.cb = sizeof(ddW); - while (EnumDisplayDevicesW( NULL, i++, &ddW, 0 )) + while (EnumDisplayDevicesW( NULL, i++, &device, 0 )) { DEVMODEW devmode = {.dmSize = sizeof(DEVMODEW)}; - if (!EnumDisplaySettingsExW( ddW.DeviceName, ENUM_CURRENT_SETTINGS, &devmode, 0)) + if (!EnumDisplaySettingsExW( device.DeviceName, ENUM_CURRENT_SETTINGS, &devmode, 0)) { - ERR( "Failed to query current display settings for %s.\n", debugstr_w(ddW.DeviceName) ); + ERR( "Failed to query current display settings for %s.\n", debugstr_w( device.DeviceName ) ); continue; } - TRACE( "Device %s current display mode %s.\n", debugstr_w( ddW.DeviceName ), debugstr_devmodew( &devmode ) ); + TRACE( "Device %s current display mode %s.\n", debugstr_w( device.DeviceName ), debugstr_devmodew( &devmode ) ); - if (ChangeDisplaySettingsExW( ddW.DeviceName, &devmode, 0, + if (ChangeDisplaySettingsExW( device.DeviceName, &devmode, 0, CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, 0 )) - ERR( "Failed to initialize registry display settings for %s.\n", debugstr_w(ddW.DeviceName) ); + ERR( "Failed to initialize registry display settings for %s.\n", debugstr_w( device.DeviceName ) ); } }

1 0

Rémi Bernon : explorer: Set virtual desktop primary adapter display settings.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 7255f63a6530f8b2daee03aadd178ef4141f30c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/7255f63a6530f8b2daee03aadd178e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 27 13:38:09 2023 +0200 explorer: Set virtual desktop primary adapter display settings. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55146 --- programs/explorer/desktop.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 49141f1c9cf..0af8d4c8e3c 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -937,10 +937,10 @@ static const char *debugstr_devmodew( const DEVMODEW *devmode ) position ); } -static void initialize_display_settings(void) +static void initialize_display_settings( unsigned int width, unsigned int height ) { DISPLAY_DEVICEW device = {.cb = sizeof(DISPLAY_DEVICEW)}; - DWORD i = 0; + DWORD i = 0, flags = CDS_GLOBAL | CDS_UPDATEREGISTRY; /* Store current display mode in the registry */ while (EnumDisplayDevicesW( NULL, i++, &device, 0 )) @@ -955,10 +955,24 @@ static void initialize_display_settings(void) TRACE( "Device %s current display mode %s.\n", debugstr_w( device.DeviceName ), debugstr_devmodew( &devmode ) ); - if (ChangeDisplaySettingsExW( device.DeviceName, &devmode, 0, - CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, 0 )) + if (ChangeDisplaySettingsExW( device.DeviceName, &devmode, 0, flags | CDS_NORESET, 0 )) ERR( "Failed to initialize registry display settings for %s.\n", debugstr_w( device.DeviceName ) ); } + + if (!using_root) + { + DEVMODEW devmode = + { + .dmSize = sizeof(DEVMODEW), + .dmFields = DM_PELSWIDTH | DM_PELSHEIGHT, + .dmPelsWidth = width, + .dmPelsHeight = height, + }; + + /* in virtual desktop mode, set the primary display settings to match desktop size */ + if (ChangeDisplaySettingsExW( NULL, &devmode, 0, flags, NULL )) + ERR( "Failed to set primary display settings.\n" ); + } } static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) @@ -1085,7 +1099,7 @@ void manage_desktop( WCHAR *arg ) if (thread) CloseHandle( thread ); SystemParametersInfoW( SPI_SETDESKWALLPAPER, 0, NULL, FALSE ); ClipCursor( NULL ); - initialize_display_settings(); + initialize_display_settings( width, height ); initialize_appbar(); if (using_root) enable_shell = FALSE;

1 0

Alistair Leslie-Hughes : dsdmo: Add Chorus effect stub.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: e2258279e0b65ebef87bcac6f862a6f27f76af3f URL: https://gitlab.winehq.org/wine/wine/-/commit/e2258279e0b65ebef87bcac6f862a6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 26 12:31:56 2023 +1000 dsdmo: Add Chorus effect stub. --- dlls/dsdmo/dsdmo.idl | 8 ++++ dlls/dsdmo/main.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsdmo/tests/dsdmo.c | 7 +++- 3 files changed, 108 insertions(+), 2 deletions(-) diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl index 3922b4d6778..2eba0a4936e 100644 --- a/dlls/dsdmo/dsdmo.idl +++ b/dlls/dsdmo/dsdmo.idl @@ -57,3 +57,11 @@ coclass DirectSoundEchoDMO {} vi_progid("Microsoft.DirectSoundCompressorDMO") ] coclass DirectSoundCompressorDMO {} + +[ + uuid(efe6629c-81f7-4281-bd91-c9d604a95af6), + threading(both), + progid("Microsoft.DirectSoundChorusDMO.1"), + vi_progid("Microsoft.DirectSoundChorusDMO") +] +coclass DirectSoundChorusDMO {} diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index bb19b7b7e2e..90e5ee9eb07 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -1139,6 +1139,100 @@ static HRESULT compressor_create(IUnknown *outer, IUnknown **out) return S_OK; } +struct dmochorusfx +{ + struct effect effect; + IDirectSoundFXChorus IDirectSoundFXChorus_iface; +}; + +static inline struct dmochorusfx *impl_from_IDirectSoundFXChorus(IDirectSoundFXChorus *iface) +{ + return CONTAINING_RECORD(iface, struct dmochorusfx, IDirectSoundFXChorus_iface); +} + +static HRESULT WINAPI chorusfx_QueryInterface(IDirectSoundFXChorus *iface, REFIID iid, void **out) +{ + struct dmochorusfx *effect = impl_from_IDirectSoundFXChorus(iface); + return IUnknown_QueryInterface(effect->effect.outer_unk, iid, out); +} + +static ULONG WINAPI chorusfx_AddRef(IDirectSoundFXChorus *iface) +{ + struct dmochorusfx *effect = impl_from_IDirectSoundFXChorus(iface); + return IUnknown_AddRef(effect->effect.outer_unk); +} + +static ULONG WINAPI chorusfx_Release(IDirectSoundFXChorus *iface) +{ + struct dmochorusfx *effect = impl_from_IDirectSoundFXChorus(iface); + return IUnknown_Release(effect->effect.outer_unk); +} + +static HRESULT WINAPI chorusfx_SetAllParameters(IDirectSoundFXChorus *iface, const DSFXChorus *compressor) +{ + struct dmochorusfx *This = impl_from_IDirectSoundFXChorus(iface); + FIXME("(%p) %p\n", This, compressor); + return E_NOTIMPL; +} + +static HRESULT WINAPI chorusfx_GetAllParameters(IDirectSoundFXChorus *iface, DSFXChorus *compressor) +{ + struct dmochorusfx *This = impl_from_IDirectSoundFXChorus(iface); + FIXME("(%p) %p\n", This, compressor); + return E_NOTIMPL; +} + +static const struct IDirectSoundFXChorusVtbl chorus_vtbl = +{ + chorusfx_QueryInterface, + chorusfx_AddRef, + chorusfx_Release, + chorusfx_SetAllParameters, + chorusfx_GetAllParameters +}; + +static struct dmochorusfx *implchorus_from_effect(struct effect *iface) +{ + return CONTAINING_RECORD(iface, struct dmochorusfx, effect); +} + +static void *chorus_query_interface(struct effect *iface, REFIID iid) +{ + struct dmochorusfx *effect = implchorus_from_effect(iface); + + if (IsEqualGUID(iid, &IID_IDirectSoundFXChorus)) + return &effect->IDirectSoundFXChorus_iface; + return NULL; +} + +static void chorus_destroy(struct effect *iface) +{ + struct dmochorusfx *effect = implchorus_from_effect(iface); + + free(effect); +} + +static const struct effect_ops chorus_ops = +{ + .destroy = chorus_destroy, + .query_interface = chorus_query_interface, +}; + +static HRESULT chorus_create(IUnknown *outer, IUnknown **out) +{ + struct dmochorusfx *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + effect_init(&object->effect, outer, &chorus_ops); + object->IDirectSoundFXChorus_iface.lpVtbl = &chorus_vtbl; + + TRACE("Created chorus effect %p.\n", object); + *out = &object->effect.IUnknown_inner; + return S_OK; +} + struct class_factory { IClassFactory IClassFactory_iface; @@ -1225,6 +1319,7 @@ class_factories[] = {&GUID_DSFX_WAVES_REVERB, {{&class_factory_vtbl}, waves_reverb_create}}, {&GUID_DSFX_STANDARD_ECHO, {{&class_factory_vtbl}, echo_create}}, {&GUID_DSFX_STANDARD_COMPRESSOR, {{&class_factory_vtbl}, compressor_create}}, + {&GUID_DSFX_STANDARD_CHORUS, {{&class_factory_vtbl}, chorus_create}}, }; HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index 9296ad29168..9eb43c884c3 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -308,11 +308,14 @@ static void test_chorus_parameters(void) hr = CoCreateInstance(&GUID_DSFX_STANDARD_CHORUS, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFXChorus, (void **)&chorus); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr != S_OK) return; hr = IDirectSoundFXChorus_GetAllParameters(chorus, &params); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (hr != S_OK) + return; ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(params.fWetDryMix == 50.0f, "Got wetness %.8e%%.\n", params.fWetDryMix); ok(params.fDepth == 10.0f, "Got depth %.8e.\n", params.fDepth); @@ -544,7 +547,7 @@ START_TEST(dsdmo) } tests[] = { - {&GUID_DSFX_STANDARD_CHORUS, &IID_IDirectSoundFXChorus, TRUE}, + {&GUID_DSFX_STANDARD_CHORUS, &IID_IDirectSoundFXChorus}, {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor}, {&GUID_DSFX_STANDARD_DISTORTION, &IID_IDirectSoundFXDistortion, TRUE}, {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho},

1 0

Alistair Leslie-Hughes : dsdmo: Add Flanger effect stub.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 654b970be10cdab808ea7a5b7f231edc3667d46c URL: https://gitlab.winehq.org/wine/wine/-/commit/654b970be10cdab808ea7a5b7f231e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 26 16:04:23 2023 +1000 dsdmo: Add Flanger effect stub. --- dlls/dsdmo/dsdmo.idl | 8 ++++ dlls/dsdmo/main.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsdmo/tests/dsdmo.c | 7 +++- 3 files changed, 108 insertions(+), 2 deletions(-) diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl index 2eba0a4936e..30c54d0f889 100644 --- a/dlls/dsdmo/dsdmo.idl +++ b/dlls/dsdmo/dsdmo.idl @@ -65,3 +65,11 @@ coclass DirectSoundCompressorDMO {} vi_progid("Microsoft.DirectSoundChorusDMO") ] coclass DirectSoundChorusDMO {} + +[ + uuid(efca3d92-dfd8-4672-a603-7420894bad98), + threading(both), + progid("Microsoft.DirectSoundFlangerDMO.1"), + vi_progid("Microsoft.DirectSoundFlangerDMO") +] +coclass DirectSoundFlangerDMO {} diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 90e5ee9eb07..2393b92185e 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -1233,6 +1233,100 @@ static HRESULT chorus_create(IUnknown *outer, IUnknown **out) return S_OK; } +struct dmo_flangerfx +{ + struct effect effect; + IDirectSoundFXFlanger IDirectSoundFXFlanger_iface; +}; + +static inline struct dmo_flangerfx *impl_from_IDirectSoundFXFlanger(IDirectSoundFXFlanger *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_flangerfx, IDirectSoundFXFlanger_iface); +} + +static HRESULT WINAPI flangerfx_QueryInterface(IDirectSoundFXFlanger *iface, REFIID iid, void **out) +{ + struct dmo_flangerfx *effect = impl_from_IDirectSoundFXFlanger(iface); + return IUnknown_QueryInterface(effect->effect.outer_unk, iid, out); +} + +static ULONG WINAPI flangerfx_AddRef(IDirectSoundFXFlanger *iface) +{ + struct dmo_flangerfx *effect = impl_from_IDirectSoundFXFlanger(iface); + return IUnknown_AddRef(effect->effect.outer_unk); +} + +static ULONG WINAPI flangerfx_Release(IDirectSoundFXFlanger *iface) +{ + struct dmo_flangerfx *effect = impl_from_IDirectSoundFXFlanger(iface); + return IUnknown_Release(effect->effect.outer_unk); +} + +static HRESULT WINAPI flangerfx_SetAllParameters(IDirectSoundFXFlanger *iface, const DSFXFlanger *flanger) +{ + struct dmo_flangerfx *This = impl_from_IDirectSoundFXFlanger(iface); + FIXME("(%p) %p\n", This, flanger); + return E_NOTIMPL; +} + +static HRESULT WINAPI flangerfx_GetAllParameters(IDirectSoundFXFlanger *iface, DSFXFlanger *flanger) +{ + struct dmo_flangerfx *This = impl_from_IDirectSoundFXFlanger(iface); + FIXME("(%p) %p\n", This, flanger); + return E_NOTIMPL; +} + +static const struct IDirectSoundFXFlangerVtbl flanger_vtbl = +{ + flangerfx_QueryInterface, + flangerfx_AddRef, + flangerfx_Release, + flangerfx_SetAllParameters, + flangerfx_GetAllParameters +}; + +static struct dmo_flangerfx *impl_flanger_from_effect(struct effect *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_flangerfx, effect); +} + +static void *flanger_query_interface(struct effect *iface, REFIID iid) +{ + struct dmo_flangerfx *effect = impl_flanger_from_effect(iface); + + if (IsEqualGUID(iid, &IID_IDirectSoundFXFlanger)) + return &effect->IDirectSoundFXFlanger_iface; + return NULL; +} + +static void flanger_destroy(struct effect *iface) +{ + struct dmo_flangerfx *effect = impl_flanger_from_effect(iface); + + free(effect); +} + +static const struct effect_ops flanger_ops = +{ + .destroy = flanger_destroy, + .query_interface = flanger_query_interface, +}; + +static HRESULT flanger_create(IUnknown *outer, IUnknown **out) +{ + struct dmo_flangerfx *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + effect_init(&object->effect, outer, &flanger_ops); + object->IDirectSoundFXFlanger_iface.lpVtbl = &flanger_vtbl; + + TRACE("Created flanger effect %p.\n", object); + *out = &object->effect.IUnknown_inner; + return S_OK; +} + struct class_factory { IClassFactory IClassFactory_iface; @@ -1320,6 +1414,7 @@ class_factories[] = {&GUID_DSFX_STANDARD_ECHO, {{&class_factory_vtbl}, echo_create}}, {&GUID_DSFX_STANDARD_COMPRESSOR, {{&class_factory_vtbl}, compressor_create}}, {&GUID_DSFX_STANDARD_CHORUS, {{&class_factory_vtbl}, chorus_create}}, + {&GUID_DSFX_STANDARD_FLANGER, {{&class_factory_vtbl}, flanger_create}}, }; HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index 9eb43c884c3..369e02aeaa4 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -415,11 +415,14 @@ static void test_flanger_parameters(void) hr = CoCreateInstance(&GUID_DSFX_STANDARD_FLANGER, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFXFlanger, (void **)&flanger); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr != S_OK) return; hr = IDirectSoundFXFlanger_GetAllParameters(flanger, &params); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (hr != S_OK) + return; ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(params.fWetDryMix == 50.0f, "Got %.8e%% wetness.\n", params.fWetDryMix); ok(params.fDepth == 100.0f, "Got %.8e * 0.01%% depth.\n", params.fDepth); @@ -551,7 +554,7 @@ START_TEST(dsdmo) {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor}, {&GUID_DSFX_STANDARD_DISTORTION, &IID_IDirectSoundFXDistortion, TRUE}, {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho}, - {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger, TRUE}, + {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger}, {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle, TRUE}, {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb}, {&GUID_DSFX_STANDARD_PARAMEQ, &IID_IDirectSoundFXParamEq},

1 0

Alex Henrie : winegstreamer: Fix double free on error path in media_source_constructor (scan-build).
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: aec014fe8fa70eacec6ec2112d8af6f92d0b407f URL: https://gitlab.winehq.org/wine/wine/-/commit/aec014fe8fa70eacec6ec2112d8af6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 7 22:05:55 2023 -0600 winegstreamer: Fix double free on error path in media_source_constructor (scan-build). --- dlls/winegstreamer/media_source.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 891961a6ccd..55b1cd6e98d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1591,7 +1591,6 @@ static HRESULT media_source_create(IMFByteStream *bytestream, IMFMediaSource **o if (!(object->descriptors = calloc(stream_count, sizeof(*object->descriptors))) || !(object->streams = calloc(stream_count, sizeof(*object->streams)))) { - free(object->descriptors); hr = E_OUTOFMEMORY; goto fail; }

1 0

Hans Leidekker : winscard: Map only the reader name in map_states_inA/W().
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 88f4dabc2772aa83b4d8157e6fd1676a8fdc905e URL: https://gitlab.winehq.org/wine/wine/-/commit/88f4dabc2772aa83b4d8157e6fd167… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 27 10:33:19 2023 +0200 winscard: Map only the reader name in map_states_inA/W(). --- dlls/winscard/tests/winscard.c | 4 +++- dlls/winscard/winscard.c | 10 ++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/winscard/tests/winscard.c b/dlls/winscard/tests/winscard.c index e6a58c5e46b..d596f9ca400 100644 --- a/dlls/winscard/tests/winscard.c +++ b/dlls/winscard/tests/winscard.c @@ -109,12 +109,14 @@ static void test_SCardEstablishContext(void) memset( states, 0, sizeof(states) ); states[0].szReader = "\\\\?PnP?\\Notification"; states[1].szReader = readers; + states[1].cbAtr = sizeof(states[1].rgbAtr) + 1; ret = SCardGetStatusChangeA( context, 1000, states, 2 ); ok( ret == SCARD_S_SUCCESS, "got %lx\n", ret ); + ok( states[1].cbAtr <= sizeof(states[1].rgbAtr), "got %lu\n", states[1].cbAtr ); states[1].dwCurrentState = states[1].dwEventState & ~SCARD_STATE_CHANGED; ret = SCardGetStatusChangeA( context, 1000, states, 2 ); - todo_wine ok( ret == SCARD_S_SUCCESS, "got %lx\n", ret ); + ok( ret == SCARD_S_SUCCESS, "got %lx\n", ret ); ret = SCardConnectA( context, readers, SCARD_SHARE_SHARED, SCARD_PROTOCOL_Tx, &connect, NULL ); if (ret == SCARD_E_READER_UNAVAILABLE) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 026a17295d4..9555aa4ed80 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -569,14 +569,11 @@ done: static LONG map_states_inA( const SCARD_READERSTATEA *src, struct reader_state *dst, DWORD count ) { DWORD i; + memset( dst, 0, sizeof(*dst) * count ); for (i = 0; i < count; i++) { if (src[i].szReader && ansi_to_utf8( src[i].szReader, (char **)&dst[i].reader ) < 0) return SCARD_E_NO_MEMORY; - dst[i].current_state = src[i].dwCurrentState; - dst[i].event_state = src[i].dwEventState; - dst[i].atr_size = src[i].cbAtr; - memcpy( dst[i].atr, src[i].rgbAtr, src[i].cbAtr ); } return SCARD_S_SUCCESS; } @@ -635,14 +632,11 @@ LONG WINAPI SCardGetStatusChangeA( SCARDCONTEXT context, DWORD timeout, SCARD_RE static LONG map_states_inW( SCARD_READERSTATEW *src, struct reader_state *dst, DWORD count ) { DWORD i; + memset( dst, 0, sizeof(*dst) * count ); for (i = 0; i < count; i++) { if (src[i].szReader && utf16_to_utf8( src[i].szReader, (char **)&dst[i].reader ) < 0) return SCARD_E_NO_MEMORY; - dst[i].current_state = src[i].dwCurrentState; - dst[i].event_state = src[i].dwEventState; - dst[i].atr_size = src[i].cbAtr; - memcpy( dst[i].atr, src[i].rgbAtr, src[i].cbAtr ); } return SCARD_S_SUCCESS; }

1 0

Hans Leidekker : bcrypt: Add RC4 algorithm stub.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 9742fe8996625c6e9a5876a732de7dd794408987 URL: https://gitlab.winehq.org/wine/wine/-/commit/9742fe8996625c6e9a5876a732de7d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 28 15:48:53 2023 +0200 bcrypt: Add RC4 algorithm stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55160 --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 32 +++++++++++++++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 98223e90ac6..5dc21484ccb 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -117,6 +117,7 @@ enum alg_id /* cipher */ ALG_ID_3DES, ALG_ID_AES, + ALG_ID_RC4, /* hash */ ALG_ID_SHA256, diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index ca5b934a8d5..2c09f03db9a 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -104,6 +104,7 @@ builtin_algorithms[] = { { BCRYPT_3DES_ALGORITHM, BCRYPT_CIPHER_INTERFACE, 522, 0, 0 }, { BCRYPT_AES_ALGORITHM, BCRYPT_CIPHER_INTERFACE, 654, 0, 0 }, + { BCRYPT_RC4_ALGORITHM, BCRYPT_CIPHER_INTERFACE, 654, 0, 0 }, { BCRYPT_SHA256_ALGORITHM, BCRYPT_HASH_INTERFACE, 286, 32, 512 }, { BCRYPT_SHA384_ALGORITHM, BCRYPT_HASH_INTERFACE, 382, 48, 1024 }, { BCRYPT_SHA512_ALGORITHM, BCRYPT_HASH_INTERFACE, 382, 64, 1024 }, @@ -202,7 +203,7 @@ static const struct algorithm pseudo_algorithms[] = {{ MAGIC_ALG }, ALG_ID_SHA256 }, {{ MAGIC_ALG }, ALG_ID_SHA384 }, {{ MAGIC_ALG }, ALG_ID_SHA512 }, - {{ 0 }}, /* RC4 */ + {{ MAGIC_ALG }, ALG_ID_RC4 }, {{ MAGIC_ALG }, ALG_ID_RNG }, {{ MAGIC_ALG }, ALG_ID_MD5, 0, BCRYPT_ALG_HANDLE_HMAC_FLAG }, {{ MAGIC_ALG }, ALG_ID_SHA1, 0, BCRYPT_ALG_HANDLE_HMAC_FLAG }, @@ -568,6 +569,7 @@ struct hash struct hash_impl inner; }; +#define BLOCK_LENGTH_RC4 1 #define BLOCK_LENGTH_3DES 8 #define BLOCK_LENGTH_AES 16 @@ -708,6 +710,20 @@ static NTSTATUS get_aes_property( enum chain_mode mode, const WCHAR *prop, UCHAR return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS get_rc4_property( enum chain_mode mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + if (!wcscmp( prop, BCRYPT_BLOCK_LENGTH )) + { + *ret_size = sizeof(ULONG); + if (size < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL; + if (buf) *(ULONG *)buf = BLOCK_LENGTH_RC4; + return STATUS_SUCCESS; + } + + FIXME( "unsupported property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS get_rsa_property( enum chain_mode mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { if (!wcscmp( prop, BCRYPT_PADDING_SCHEMES )) @@ -746,6 +762,9 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop case ALG_ID_AES: return get_aes_property( alg->mode, prop, buf, size, ret_size ); + case ALG_ID_RC4: + return get_rc4_property( alg->mode, prop, buf, size, ret_size ); + case ALG_ID_RSA: return get_rsa_property( alg->mode, prop, buf, size, ret_size ); @@ -813,6 +832,17 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA FIXME( "unsupported aes algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; + case ALG_ID_RC4: + if (!wcscmp( prop, BCRYPT_CHAINING_MODE )) + { + if (!wcscmp( (WCHAR *)value, BCRYPT_CHAIN_MODE_NA )) return STATUS_SUCCESS; + + FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); + return STATUS_NOT_IMPLEMENTED; + } + FIXME( "unsupported rc4 algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + default: FIXME( "unsupported algorithm %u\n", alg->id ); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 4d7277c3152..f58df8bcbbd 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -3561,6 +3561,35 @@ static void test_SecretAgreement(void) ok(status == STATUS_SUCCESS, "got %#lx\n", status); } +static void test_RC4(void) +{ + BCRYPT_ALG_HANDLE alg; + NTSTATUS status; + ULONG len, size; + + status = BCryptOpenAlgorithmProvider(&alg, BCRYPT_RC4_ALGORITHM, NULL, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + + len = size = 0; + status = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + ok(len, "expected non-zero len\n"); + ok(size == sizeof(len), "got %lu\n", size); + + len = size = 0; + status = BCryptGetProperty(alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + ok(len == 1, "got %lu\n", len); + ok(size == sizeof(len), "got %lu\n", size); + + size = sizeof(BCRYPT_CHAIN_MODE_NA); + status = BCryptSetProperty(alg, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_NA, size, 0); + ok(!status, "got %#lx\n", status); + + status = BCryptCloseAlgorithmProvider(alg, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); +} + START_TEST(bcrypt) { HMODULE module; @@ -3597,6 +3626,7 @@ START_TEST(bcrypt) test_DSA(); test_SecretAgreement(); test_rsa_encrypt(); + test_RC4(); FreeLibrary(module); }

1 0

Rémi Bernon : winegstreamer: Remove unused props from create_object_context.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 32c748e1c8bcb199e1a8f098431c84387a10e0c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/32c748e1c8bcb199e1a8f098431c84… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 6 14:29:27 2023 +0200 winegstreamer: Remove unused props from create_object_context. --- dlls/winegstreamer/media_source.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 9e75e82063d..985aab8e434 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1778,7 +1778,6 @@ struct create_object_context IUnknown IUnknown_iface; LONG refcount; - IPropertyStore *props; IMFByteStream *stream; WCHAR *url; DWORD flags; @@ -1824,8 +1823,6 @@ static ULONG WINAPI create_object_context_Release(IUnknown *iface) if (!refcount) { - if (context->props) - IPropertyStore_Release(context->props); if (context->stream) IMFByteStream_Release(context->stream); free(context->url); @@ -1866,9 +1863,6 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa context->IUnknown_iface.lpVtbl = &create_object_context_vtbl; context->refcount = 1; - context->props = props; - if (context->props) - IPropertyStore_AddRef(context->props); context->flags = flags; context->stream = stream; if (context->stream) @@ -1991,9 +1985,9 @@ static HRESULT WINAPI stream_handler_callback_GetParameters(IMFAsyncCallback *if } static HRESULT stream_handler_create_object(struct stream_handler *handler, WCHAR *url, IMFByteStream *stream, DWORD flags, - IPropertyStore *props, IUnknown **out_object, MF_OBJECT_TYPE *out_obj_type) + IUnknown **out_object, MF_OBJECT_TYPE *out_obj_type) { - TRACE("%p, %s, %p, %#lx, %p, %p, %p.\n", handler, debugstr_w(url), stream, flags, props, out_object, out_obj_type); + TRACE("%p, %s, %p, %#lx, %p, %p.\n", handler, debugstr_w(url), stream, flags, out_object, out_obj_type); if (flags & MF_RESOLUTION_MEDIASOURCE) { @@ -2038,7 +2032,7 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM context = impl_from_IUnknown(context_object); if (FAILED(hr = stream_handler_create_object(handler, context->url, context->stream, - context->flags, context->props, &object, &obj_type))) + context->flags, &object, &obj_type))) WARN("Failed to create object, hr %#lx\n", hr); else {

1 0

Rémi Bernon : winegstreamer: Return early if no byte stream was provided.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 929889ac8d4fb079d2d6b7c94b7d693fb62fc986 URL: https://gitlab.winehq.org/wine/wine/-/commit/929889ac8d4fb079d2d6b7c94b7d69… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 6 14:30:39 2023 +0200 winegstreamer: Return early if no byte stream was provided. --- dlls/winegstreamer/media_source.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 985aab8e434..a5423411096 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1823,8 +1823,7 @@ static ULONG WINAPI create_object_context_Release(IUnknown *iface) if (!refcount) { - if (context->stream) - IMFByteStream_Release(context->stream); + IMFByteStream_Release(context->stream); free(context->url); free(context); } @@ -1852,6 +1851,8 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa if (cancel_cookie) *cancel_cookie = NULL; + if (!stream) + return E_INVALIDARG; if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &caller))) return hr; @@ -1865,16 +1866,9 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa context->refcount = 1; context->flags = flags; context->stream = stream; - if (context->stream) - IMFByteStream_AddRef(context->stream); + IMFByteStream_AddRef(context->stream); if (url) context->url = wcsdup(url); - if (!context->stream) - { - IMFAsyncResult_Release(caller); - IUnknown_Release(&context->IUnknown_iface); - return E_OUTOFMEMORY; - } hr = MFCreateAsyncResult(&context->IUnknown_iface, &handler->IMFAsyncCallback_iface, (IUnknown *)caller, &item); IUnknown_Release(&context->IUnknown_iface);

1 0

Rémi Bernon : winegstreamer: Simplify media source creation flags handling.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: cdecf17dd0de27171312408320fb3685a6e22665 URL: https://gitlab.winehq.org/wine/wine/-/commit/cdecf17dd0de27171312408320fb36… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 28 09:50:27 2023 +0200 winegstreamer: Simplify media source creation flags handling. --- dlls/winegstreamer/media_source.c | 40 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index a5423411096..0fb41c0e8db 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1780,7 +1780,6 @@ struct create_object_context IMFByteStream *stream; WCHAR *url; - DWORD flags; }; static struct create_object_context *impl_from_IUnknown(IUnknown *iface) @@ -1853,6 +1852,9 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa if (!stream) return E_INVALIDARG; + if (flags != MF_RESOLUTION_MEDIASOURCE) + FIXME("Unimplemented flags %#lx\n", flags); + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &caller))) return hr; @@ -1864,7 +1866,6 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa context->IUnknown_iface.lpVtbl = &create_object_context_vtbl; context->refcount = 1; - context->flags = flags; context->stream = stream; IMFByteStream_AddRef(context->stream); if (url) @@ -1978,37 +1979,27 @@ static HRESULT WINAPI stream_handler_callback_GetParameters(IMFAsyncCallback *if return E_NOTIMPL; } -static HRESULT stream_handler_create_object(struct stream_handler *handler, WCHAR *url, IMFByteStream *stream, DWORD flags, - IUnknown **out_object, MF_OBJECT_TYPE *out_obj_type) +static HRESULT stream_handler_create_object(struct stream_handler *handler, WCHAR *url, IMFByteStream *stream, + IUnknown **out_object) { - TRACE("%p, %s, %p, %#lx, %p, %p.\n", handler, debugstr_w(url), stream, flags, out_object, out_obj_type); + HRESULT hr; + struct media_source *new_source; - if (flags & MF_RESOLUTION_MEDIASOURCE) - { - HRESULT hr; - struct media_source *new_source; + TRACE("%p, %s, %p, %p.\n", handler, debugstr_w(url), stream, out_object); - if (FAILED(hr = media_source_constructor(stream, &new_source))) - return hr; + if (FAILED(hr = media_source_constructor(stream, &new_source))) + return hr; - TRACE("->(%p)\n", new_source); + TRACE("->(%p)\n", new_source); - *out_object = (IUnknown*)&new_source->IMFMediaSource_iface; - *out_obj_type = MF_OBJECT_MEDIASOURCE; + *out_object = (IUnknown*)&new_source->IMFMediaSource_iface; - return S_OK; - } - else - { - FIXME("Unhandled flags %#lx.\n", flags); - return E_NOTIMPL; - } + return S_OK; } static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct stream_handler *handler = impl_from_IMFAsyncCallback(iface); - MF_OBJECT_TYPE obj_type = MF_OBJECT_INVALID; IUnknown *object = NULL, *context_object; struct create_object_context *context; struct result_entry *entry; @@ -2025,12 +2016,11 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM context = impl_from_IUnknown(context_object); - if (FAILED(hr = stream_handler_create_object(handler, context->url, context->stream, - context->flags, &object, &obj_type))) + if (FAILED(hr = stream_handler_create_object(handler, context->url, context->stream, &object))) WARN("Failed to create object, hr %#lx\n", hr); else { - if (FAILED(hr = result_entry_create(caller, obj_type, object, &entry))) + if (FAILED(hr = result_entry_create(caller, MF_OBJECT_MEDIASOURCE, object, &entry))) WARN("Failed to create handler result, hr %#lx\n", hr); else {

1 0