- Wine-Commits - list.winehq.org

Evan Tang : winemac.drv: Give Apple GPUs device IDs.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: wine Branch: master Commit: 731f06d97f810063b7b7c613b26db32a091af8a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/731f06d97f810063b7b7c613b26db3… Author: Evan Tang <etang(a)codeweavers.com> Date: Wed Jun 28 11:50:31 2023 -0500 winemac.drv: Give Apple GPUs device IDs. --- dlls/winemac.drv/cocoa_display.m | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index b5096a39ca4..b2608bafcd0 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -256,6 +256,37 @@ static int macdrv_get_gpu_info_from_registry_id(struct macdrv_gpu* gpu, uint64_t return ret; } +/*********************************************************************** + * macdrv_get_gpu_info_from_mtldevice + * + * Get GPU information from a Metal device that responds to the registryID selector. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_mtldevice(struct macdrv_gpu* gpu, id<MTLDevice> device) +{ + int ret; + if ((ret = macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]))) + return ret; + /* Apple GPUs aren't PCI devices and therefore have no device ID + * Use the Metal GPUFamily as the device ID */ + if (!gpu->device_id && [device respondsToSelector:@selector(supportsFamily:)] && [device supportsFamily:MTLGPUFamilyApple1]) + { + MTLGPUFamily highest = MTLGPUFamilyApple1; + while (1) + { + /* Apple2, etc are all in order */ + MTLGPUFamily next = highest + 1; + if ([device supportsFamily:next]) + highest = next; + else + break; + } + gpu->device_id = highest; + } + return 0; +} + /*********************************************************************** * macdrv_get_gpus_from_metal * @@ -289,7 +320,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) * the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps * using the integrated GPU. This is the behavior of Windows on a Mac. */ primary_device = [MTLCreateSystemDefaultDevice() autorelease]; - if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, primary_device.registryID)) + if (macdrv_get_gpu_info_from_mtldevice(&primary_gpu, primary_device)) goto done; /* Hide the integrated GPU if the system default device is a dedicated GPU */ @@ -301,7 +332,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) for (i = 0; i < devices.count; i++) { - if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], devices[i].registryID)) + if (macdrv_get_gpu_info_from_mtldevice(&gpus[gpu_count], devices[i])) goto done; if (hide_integrated && devices[i].isLowPower)

1 0

Alistair Leslie-Hughes : dsdmo: Add Chorus effect stub.
by Alexandre Julliard June 28, 2023

June 28, 2023

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 June 28, 2023

June 28, 2023

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 June 28, 2023

June 28, 2023

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

Rémi Bernon : explorer: Set virtual desktop primary adapter display settings.
by Alexandre Julliard June 28, 2023

June 28, 2023

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 : mapi32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: wine Branch: master Commit: 746fd6a7f5836187153b6a873a3214653c6a8e17 URL: https://gitlab.winehq.org/wine/wine/-/commit/746fd6a7f5836187153b6a873a3214… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 18:44:52 2023 +1000 mapi32: Remove DECLSPEC_HIDDEN usage. --- dlls/mapi32/mapi32_main.c | 4 ++-- dlls/mapi32/util.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index 3b9d202bf13..2eadad47de9 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -33,8 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mapi); -DECLSPEC_HIDDEN LONG MAPI_ObjectCount = 0; -DECLSPEC_HIDDEN HINSTANCE hInstMAPI32; +LONG MAPI_ObjectCount = 0; +HINSTANCE hInstMAPI32; /*********************************************************************** * DllMain (MAPI32.init) diff --git a/dlls/mapi32/util.h b/dlls/mapi32/util.h index e8a524173f7..0a497d039bc 100644 --- a/dlls/mapi32/util.h +++ b/dlls/mapi32/util.h @@ -25,8 +25,8 @@ #include <mapi.h> #include <mapix.h> -extern void load_mapi_providers(void) DECLSPEC_HIDDEN; -extern void unload_mapi_providers(void) DECLSPEC_HIDDEN; +extern void load_mapi_providers(void); +extern void unload_mapi_providers(void); typedef struct MAPI_FUNCTIONS { LPMAPIADDRESS MAPIAddress; @@ -62,7 +62,7 @@ typedef struct MAPI_FUNCTIONS { HRESULT (WINAPI *WrapCompressedRTFStream) (LPSTREAM, ULONG, LPSTREAM *); } MAPI_FUNCTIONS; -extern MAPI_FUNCTIONS mapiFunctions DECLSPEC_HIDDEN; -extern HINSTANCE hInstMAPI32 DECLSPEC_HIDDEN; +extern MAPI_FUNCTIONS mapiFunctions; +extern HINSTANCE hInstMAPI32; #endif

1 0

Rémi Bernon : explorer: Rename initialize_display_settings local variable.
by Alexandre Julliard June 28, 2023

June 28, 2023

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: Use debugstr_devmodew helper to trace display mode.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: wine Branch: master Commit: 0e5b847f85fcc62cbf655611bddae9dc539e566d URL: https://gitlab.winehq.org/wine/wine/-/commit/0e5b847f85fcc62cbf655611bddae9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 27 10:29:51 2023 +0200 explorer: Use debugstr_devmodew helper to trace display mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55146 --- programs/explorer/desktop.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 9945f689313..51f53630ae6 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -918,29 +918,45 @@ static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid ) return module; } +static const char *debugstr_devmodew( const DEVMODEW *devmode ) +{ + char position[32] = {0}; + + if (devmode->dmFields & DM_POSITION) + { + snprintf( position, sizeof(position), " at (%d,%d)", + (int)devmode->dmPosition.x, (int)devmode->dmPosition.y ); + } + + return wine_dbg_sprintf( "%ux%u %ubits %uHz rotated %u degrees%s", + (unsigned int)devmode->dmPelsWidth, + (unsigned int)devmode->dmPelsHeight, + (unsigned int)devmode->dmBitsPerPel, + (unsigned int)devmode->dmDisplayFrequency, + (unsigned int)devmode->dmDisplayOrientation * 90, + position ); +} + static void initialize_display_settings(void) { DISPLAY_DEVICEW ddW; - DEVMODEW dmW; DWORD i = 0; /* Store current display mode in the registry */ ddW.cb = sizeof(ddW); - memset(&dmW, 0, sizeof(dmW)); - dmW.dmSize = sizeof(dmW); while (EnumDisplayDevicesW( NULL, i++, &ddW, 0 )) { - if (!EnumDisplaySettingsExW( ddW.DeviceName, ENUM_CURRENT_SETTINGS, &dmW, 0)) + DEVMODEW devmode = {.dmSize = sizeof(DEVMODEW)}; + + if (!EnumDisplaySettingsExW( ddW.DeviceName, ENUM_CURRENT_SETTINGS, &devmode, 0)) { ERR( "Failed to query current display settings for %s.\n", debugstr_w(ddW.DeviceName) ); continue; } - TRACE( "Device %s current display mode %lux%lu %luBits %luHz at %ld,%ld.\n", - debugstr_w( ddW.DeviceName ), dmW.dmPelsWidth, dmW.dmPelsHeight, - dmW.dmBitsPerPel, dmW.dmDisplayFrequency, dmW.dmPosition.x, dmW.dmPosition.y ); + TRACE( "Device %s current display mode %s.\n", debugstr_w( ddW.DeviceName ), debugstr_devmodew( &devmode ) ); - if (ChangeDisplaySettingsExW( ddW.DeviceName, &dmW, 0, + if (ChangeDisplaySettingsExW( ddW.DeviceName, &devmode, 0, CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, 0 )) ERR( "Failed to initialize registry display settings for %s.\n", debugstr_w(ddW.DeviceName) ); }

1 0

Alistair Leslie-Hughes : inetcomm: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: wine Branch: master Commit: 8073c6be3fe786f2f39591069c1d4322bf217864 URL: https://gitlab.winehq.org/wine/wine/-/commit/8073c6be3fe786f2f39591069c1d43… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 18:44:52 2023 +1000 inetcomm: Remove DECLSPEC_HIDDEN usage. --- dlls/inetcomm/inetcomm_private.h | 46 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/inetcomm/inetcomm_private.h b/dlls/inetcomm/inetcomm_private.h index b27cbd7bc10..49022de4b4c 100644 --- a/dlls/inetcomm/inetcomm_private.h +++ b/dlls/inetcomm/inetcomm_private.h @@ -50,36 +50,36 @@ struct InternetTransport HWND hwnd; }; -HRESULT InternetTransport_Init(InternetTransport *This) DECLSPEC_HIDDEN; -HRESULT InternetTransport_GetServerInfo(InternetTransport *This, LPINETSERVER pInetServer) DECLSPEC_HIDDEN; +HRESULT InternetTransport_Init(InternetTransport *This); +HRESULT InternetTransport_GetServerInfo(InternetTransport *This, LPINETSERVER pInetServer); HRESULT InternetTransport_InetServerFromAccount(InternetTransport *This, - IImnAccount *pAccount, LPINETSERVER pInetServer) DECLSPEC_HIDDEN; + IImnAccount *pAccount, LPINETSERVER pInetServer); HRESULT InternetTransport_Connect(InternetTransport *This, - LPINETSERVER pInetServer, boolean fAuthenticate, boolean fCommandLogging) DECLSPEC_HIDDEN; -HRESULT InternetTransport_HandsOffCallback(InternetTransport *This) DECLSPEC_HIDDEN; -HRESULT InternetTransport_DropConnection(InternetTransport *This) DECLSPEC_HIDDEN; + LPINETSERVER pInetServer, boolean fAuthenticate, boolean fCommandLogging); +HRESULT InternetTransport_HandsOffCallback(InternetTransport *This); +HRESULT InternetTransport_DropConnection(InternetTransport *This); HRESULT InternetTransport_GetStatus(InternetTransport *This, - IXPSTATUS *pCurrentStatus) DECLSPEC_HIDDEN; -HRESULT InternetTransport_ChangeStatus(InternetTransport *This, IXPSTATUS Status) DECLSPEC_HIDDEN; + IXPSTATUS *pCurrentStatus); +HRESULT InternetTransport_ChangeStatus(InternetTransport *This, IXPSTATUS Status); HRESULT InternetTransport_ReadLine(InternetTransport *This, - INETXPORT_COMPLETION_FUNCTION fnCompletion) DECLSPEC_HIDDEN; + INETXPORT_COMPLETION_FUNCTION fnCompletion); HRESULT InternetTransport_Write(InternetTransport *This, const char *pvData, - int cbSize, INETXPORT_COMPLETION_FUNCTION fnCompletion) DECLSPEC_HIDDEN; + int cbSize, INETXPORT_COMPLETION_FUNCTION fnCompletion); HRESULT InternetTransport_DoCommand(InternetTransport *This, - LPCSTR pszCommand, INETXPORT_COMPLETION_FUNCTION fnCompletion) DECLSPEC_HIDDEN; + LPCSTR pszCommand, INETXPORT_COMPLETION_FUNCTION fnCompletion); -BOOL InternetTransport_RegisterClass(HINSTANCE hInstance) DECLSPEC_HIDDEN; -void InternetTransport_UnregisterClass(HINSTANCE hInstance) DECLSPEC_HIDDEN; +BOOL InternetTransport_RegisterClass(HINSTANCE hInstance); +void InternetTransport_UnregisterClass(HINSTANCE hInstance); -HRESULT MimeBody_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; -HRESULT MimeAllocator_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; -HRESULT MimeMessage_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; -HRESULT MimeSecurity_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; -HRESULT VirtualStream_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; -HRESULT MimeHtmlProtocol_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; +HRESULT MimeBody_create(IUnknown *outer, void **obj); +HRESULT MimeAllocator_create(IUnknown *outer, void **obj); +HRESULT MimeMessage_create(IUnknown *outer, void **obj); +HRESULT MimeSecurity_create(IUnknown *outer, void **obj); +HRESULT VirtualStream_create(IUnknown *outer, void **obj); +HRESULT MimeHtmlProtocol_create(IUnknown *outer, void **obj); -HRESULT MimeInternational_Construct(IMimeInternational **internat) DECLSPEC_HIDDEN; +HRESULT MimeInternational_Construct(IMimeInternational **internat); -HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; -HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; -HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv); +HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv); +HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv);

1 0

Alistair Leslie-Hughes : sapi: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: wine Branch: master Commit: 19659409acceae366c04a96c31f3252c44d7b2cd URL: https://gitlab.winehq.org/wine/wine/-/commit/19659409acceae366c04a96c31f325… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 18:44:52 2023 +1000 sapi: Remove DECLSPEC_HIDDEN usage. --- dlls/sapi/sapi_private.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index d0cd7669623..94046926b2e 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -44,12 +44,12 @@ void async_cancel_queue(struct async_queue *queue); HRESULT async_queue_task(struct async_queue *queue, struct async_task *task); void async_wait_queue_empty(struct async_queue *queue, DWORD timeout); -HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT file_stream_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT resource_manager_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT speech_stream_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT speech_voice_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT mmaudio_out_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; +HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT file_stream_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT resource_manager_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT speech_stream_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT speech_voice_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT mmaudio_out_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT token_create( IUnknown *outer, REFIID iid, void **obj );

1 0