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

Evan Tang : winemac.drv: Give Apple GPUs device IDs.
by Alexandre Julliard 28 Jun '23

28 Jun '23

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

Fabian Maurer : windowscodecs: Fake success in SetMetadataByName.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: fca833678f3b2588cc539d04693e7f9d8bca3278 URL: https://gitlab.winehq.org/wine/wine/-/commit/fca833678f3b2588cc539d04693e7f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jun 22 20:25:50 2023 +0200 windowscodecs: Fake success in SetMetadataByName. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55101 --- dlls/windowscodecs/metadataquery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 75da054cd38..730cd23b157 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -843,7 +843,7 @@ static HRESULT WINAPI mqw_SetMetadataByName(IWICMetadataQueryWriter *iface, LPCW { FIXME("iface %p, name %s, value %p stub.\n", iface, debugstr_w(name), value); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI mqw_RemoveMetadataByName(IWICMetadataQueryWriter *iface, LPCWSTR name)

1 0

Alistair Leslie-Hughes : dpnet/tests: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: f934c8879abbacff9c3a9464a2ed24713fb354e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f934c8879abbacff9c3a9464a2ed24… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 18:44:52 2023 +1000 dpnet/tests: Remove DECLSPEC_HIDDEN usage. --- dlls/dpnet/tests/dpnet_test.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dpnet/tests/dpnet_test.h b/dlls/dpnet/tests/dpnet_test.h index 1de25590bdc..aa19c543319 100644 --- a/dlls/dpnet/tests/dpnet_test.h +++ b/dlls/dpnet/tests/dpnet_test.h @@ -24,9 +24,9 @@ enum firewall_op APP_REMOVE }; -extern BOOL is_firewall_enabled(void) DECLSPEC_HIDDEN; -extern BOOL is_process_elevated(void) DECLSPEC_HIDDEN; -extern HRESULT set_firewall( enum firewall_op op ) DECLSPEC_HIDDEN; -extern BOOL is_stub_dll(const char *filename) DECLSPEC_HIDDEN; +extern BOOL is_firewall_enabled(void); +extern BOOL is_process_elevated(void); +extern HRESULT set_firewall( enum firewall_op op ); +extern BOOL is_stub_dll(const char *filename); #endif

1 0

Alistair Leslie-Hughes : msdasql: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 90df243f8e644bccdbd8455417c5838006f2a72f URL: https://gitlab.winehq.org/wine/wine/-/commit/90df243f8e644bccdbd8455417c583… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 18:44:52 2023 +1000 msdasql: Remove DECLSPEC_HIDDEN usage. --- dlls/msdasql/msdasql_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h index 42bb8697030..21b4974cca3 100644 --- a/dlls/msdasql/msdasql_private.h +++ b/dlls/msdasql/msdasql_private.h @@ -16,5 +16,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **unk) DECLSPEC_HIDDEN; -void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) DECLSPEC_HIDDEN; +HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **unk); +void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle);

1 0

Alistair Leslie-Hughes : mfsrcsnk: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 5459f058507abecb22a75c518a91f8b4b9716856 URL: https://gitlab.winehq.org/wine/wine/-/commit/5459f058507abecb22a75c518a91f8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 18:44:52 2023 +1000 mfsrcsnk: Remove DECLSPEC_HIDDEN usage. --- dlls/mfsrcsnk/mfsrcsnk_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfsrcsnk/mfsrcsnk_private.h b/dlls/mfsrcsnk/mfsrcsnk_private.h index 29249d640f8..6654daebbd3 100644 --- a/dlls/mfsrcsnk/mfsrcsnk_private.h +++ b/dlls/mfsrcsnk/mfsrcsnk_private.h @@ -18,4 +18,4 @@ #include "wine/mfinternal.h" -extern HRESULT wave_sink_factory_create(REFIID riid, void **out) DECLSPEC_HIDDEN; +extern HRESULT wave_sink_factory_create(REFIID riid, void **out);

1 0

Alistair Leslie-Hughes : infosoft: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 73c472e5b5f24f4238e734a9df4bda5eff38fd99 URL: https://gitlab.winehq.org/wine/wine/-/commit/73c472e5b5f24f4238e734a9df4bda… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 18:44:52 2023 +1000 infosoft: Remove DECLSPEC_HIDDEN usage. --- dlls/infosoft/infosoft_main.c | 2 +- dlls/infosoft/wordbreaker.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index 04f631d7efc..6a109fafb4c 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(infosoft); -DECLSPEC_HIDDEN extern HRESULT WINAPI wb_Constructor(IUnknown*, REFIID, LPVOID *); +extern HRESULT WINAPI wb_Constructor(IUnknown*, REFIID, LPVOID *); typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown*, REFIID, LPVOID*); diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c index 0b29a6eb2d1..1946bdc6c47 100644 --- a/dlls/infosoft/wordbreaker.c +++ b/dlls/infosoft/wordbreaker.c @@ -181,7 +181,7 @@ static const IWordBreakerVtbl wordbreaker_vtbl = wb_GetLicenseToUse, }; -DECLSPEC_HIDDEN HRESULT WINAPI wb_Constructor(IUnknown* pUnkOuter, REFIID riid, LPVOID *ppvObject) +HRESULT WINAPI wb_Constructor(IUnknown* pUnkOuter, REFIID riid, LPVOID *ppvObject) { wordbreaker_impl *This; IWordBreaker *wb;

1 0

Alistair Leslie-Hughes : mapi32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 28 Jun '23

28 Jun '23

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

Alistair Leslie-Hughes : sapi: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 28 Jun '23

28 Jun '23

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

Alistair Leslie-Hughes : inetcomm: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 28 Jun '23

28 Jun '23

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

Rémi Bernon : explorer: Use debugstr_devmodew helper to trace display mode.
by Alexandre Julliard 28 Jun '23

28 Jun '23

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