- Wine-Commits - list.winehq.org

Akihiro Sagawa : quartz/tests: Test read position after MPEG splitter connection.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 3547dfc5299214b6fec2682401e82fe56a218311 URL: https://gitlab.winehq.org/wine/wine/-/commit/3547dfc5299214b6fec2682401e82f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 23 21:02:39 2024 +0900 quartz/tests: Test read position after MPEG splitter connection. To demonstrate the difference in behavior, we need a special MPEG program stream that is at least 32kB over in size. --- dlls/quartz/tests/mpegsplit.c | 50 +++++++++++++++++++++++++++++++++++++++++- dlls/quartz/tests/rsrc.rc | 4 ++++ dlls/quartz/tests/test2.mpg | Bin 0 -> 34816 bytes 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 8fd0202c58e..8799c6afb8f 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1084,6 +1084,7 @@ struct testfilter HANDLE eos_event; unsigned int sample_count, eos_count, new_segment_count, byte_count; REFERENCE_TIME segment_start, segment_end_min, segment_end_max, seek_start, seek_end; + LONGLONG read_position; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -1318,7 +1319,9 @@ static HRESULT WINAPI async_reader_SyncReadAligned(IAsyncReader *iface, IMediaSa static HRESULT WINAPI async_reader_SyncRead(IAsyncReader *iface, LONGLONG position, LONG length, BYTE *buffer) { - return IAsyncReader_SyncRead(impl_from_IAsyncReader(iface)->reader, position, length, buffer); + struct testfilter *filter = impl_from_IAsyncReader(iface); + filter->read_position = position + length; + return IAsyncReader_SyncRead(filter->reader, position, length, buffer); } static HRESULT WINAPI async_reader_Length(IAsyncReader *iface, LONGLONG *total, LONGLONG *available) @@ -2148,6 +2151,50 @@ static void test_no_acceptable_type(void) DeleteFileW(filename); } +static void test_video_read_position(void) +{ + IBaseFilter *filter = create_mpeg_splitter(), *reader; + const WCHAR *filename = load_resource(L"test2.mpg"); + struct IFileSourceFilter *filesource; + struct testfilter testsource; + LONGLONG total, avail; + IFilterGraph2 *graph; + IPin *sink, *source; + HRESULT hr; + BOOL ret; + + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + testfilter_init(&testsource); + IFilterGraph2_AddFilter(graph, &testsource.filter.IBaseFilter_iface, L"source"); + IFilterGraph2_AddFilter(graph, filter, L"splitter"); + hr = IBaseFilter_FindPin(filter, L"Input", &sink); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&reader); + IBaseFilter_QueryInterface(reader, &IID_IFileSourceFilter, (void **)&filesource); + IFileSourceFilter_Load(filesource, filename, NULL); + IFileSourceFilter_Release(filesource); + IBaseFilter_FindPin(reader, L"Output", &source); + IPin_QueryInterface(source, &IID_IAsyncReader, (void **)&testsource.reader); + IAsyncReader_Length(testsource.reader, &total, &avail); + IPin_Release(source); + + hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(testsource.read_position == total, "Got 0x%s, expected 0x%s.\n", wine_dbgstr_longlong(testsource.read_position), wine_dbgstr_longlong(total)); + + IAsyncReader_Release(testsource.reader); + IPin_Release(sink); + IFilterGraph2_Release(graph); + IBaseFilter_Release(reader); + IBaseFilter_Release(filter); + IBaseFilter_Release(&testsource.filter.IBaseFilter_iface); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %lu.\n", GetLastError()); +} + START_TEST(mpegsplit) { IBaseFilter *filter; @@ -2176,6 +2223,7 @@ START_TEST(mpegsplit) test_large_file(); test_video_file(); test_no_acceptable_type(); + test_video_read_position(); CoUninitialize(); } diff --git a/dlls/quartz/tests/rsrc.rc b/dlls/quartz/tests/rsrc.rc index 2cc0d789ff0..a16edacf1d1 100644 --- a/dlls/quartz/tests/rsrc.rc +++ b/dlls/quartz/tests/rsrc.rc @@ -35,3 +35,7 @@ test.mp3 RCDATA "test.mp3" /* ffmpeg -f lavfi -i "sine=frequency=600" -t 0.1 -ar 44100 -f wav -acodec pcm_u8 test.wav */ /* @makedep: test.wav */ test.wav RCDATA "test.wav" + +/* ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 2.04 -r 25 -f mpeg -vcodec mpeg1video -vf scale=64x48 -acodec mp2 -ar 32k -ab 96k test2.mpg */ +/* @makedep: test2.mpg */ +test2.mpg RCDATA "test2.mpg" diff --git a/dlls/quartz/tests/test2.mpg b/dlls/quartz/tests/test2.mpg new file mode 100644 index 00000000000..5122b6845a8 Binary files /dev/null and b/dlls/quartz/tests/test2.mpg differ

1 0

Eric Pouech : cmd/tests: Test using %%0-%%9 as loop variables.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 14bdf6e725bf876d93fce25cb30cbdf967c4e001 URL: https://gitlab.winehq.org/wine/wine/-/commit/14bdf6e725bf876d93fce25cb30cbd… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon May 6 11:02:43 2024 +0200 cmd/tests: Test using %%0-%%9 as loop variables. Based on a test case from Dimitry Sokolov. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 2 ++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7517cca343f..3b5fd384b54 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -744,6 +744,8 @@ echo '%~xs1' goto :eof :endEchoFuns +echo --- in digit variables +for %%0 in (a b) do echo %%0 %%1 %%2 echo ------------ Testing parameter zero ------------ call :func parm1 parm2 goto :endParm0 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1365a5c3474..3e5cdbe9942 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -600,6 +600,9 @@ N @drive@ '' '.eh'@or_broken@'' +--- in digit variables +(a)todo_wine@a %1 %2 +(a)todo_wine@b %1 %2 ------------ Testing parameter zero ------------ :func parm1 [:func] [@drive@] [@path@] [test] [.cmd] [@drive@@shortpath(a)test.cmd]

1 0

Eric Pouech : cmd/tests: Test nested loop variables expansion.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 232f282585fc008cef2c65d5d0b08ed569f7bc23 URL: https://gitlab.winehq.org/wine/wine/-/commit/232f282585fc008cef2c65d5d0b08e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon May 6 11:06:07 2024 +0200 cmd/tests: Test nested loop variables expansion. Based on a patch by Dimitry Sokolov. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 12 ++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 2 files changed, 15 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3b5fd384b54..00d87a805d8 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1403,6 +1403,18 @@ goto :endForTestFun2 echo %1 %2 goto :eof :endForTestFun2 +echo --- nested FORs and args tempering +set "WINE_ARGS= -foo=bar -x=y" +:test_for_loop_params_parse +for /F "tokens=1,* delims= " %%a in ("%WINE_ARGS%") do ( + for /F "tokens=1,2 delims==" %%1 in ("%%a") do ( + echo inner argument {%%1, %%2} + ) + set "WINE_ARGS=%%b" + goto :test_for_loop_params_parse +) +set "WINE_ARGS=" + mkdir foobar & cd foobar mkdir foo mkdir bar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 3e5cdbe9942..fab7c8742ec 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1000,6 +1000,9 @@ A C A D B C B D +--- nested FORs and args tempering +(a)todo_wine@inner argument {-foo, bar} +(a)todo_wine@inner argument {-x, y} --- basic wildcards bazbaz --- wildcards in subdirs

1 0

Rémi Bernon : win32u: Remove driver-specific id from struct gdi_gpu.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 0300016ac54502200b37dd9bd8e4a97cfa41cc10 URL: https://gitlab.winehq.org/wine/wine/-/commit/0300016ac54502200b37dd9bd8e4a9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 22 18:16:07 2024 +0200 win32u: Remove driver-specific id from struct gdi_gpu. --- dlls/winemac.drv/display.c | 1 - dlls/winewayland.drv/display.c | 3 +-- dlls/winex11.drv/display.c | 13 ++++++++++--- dlls/winex11.drv/x11drv.h | 13 +++++++++++-- dlls/winex11.drv/xinerama.c | 6 +++--- dlls/winex11.drv/xrandr.c | 14 +++++++------- include/wine/gdi_driver.h | 1 - 7 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index b52bb39c0f6..fc2e680ca88 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1141,7 +1141,6 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage { struct gdi_gpu gdi_gpu = { - .id = gpu->id, .pci_id = { .vendor = gpu->vendor_id, diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index 535a3c80ce3..efe5683d4eb 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -204,8 +204,7 @@ static void wayland_add_device_gpu(const struct gdi_device_manager *device_manag struct gdi_gpu gpu = {0}; lstrcpyW(gpu.name, wayland_gpuW); - TRACE("id=0x%s name=%s\n", - wine_dbgstr_longlong(gpu.id), wine_dbgstr_w(gpu.name)); + TRACE("name=%s\n", wine_dbgstr_w(gpu.name)); device_manager->add_gpu(&gpu, param); } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 3ec20743f66..d64f6bb92d6 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -395,7 +395,7 @@ POINT root_to_virtual_screen(INT x, INT y) RECT get_host_primary_monitor_rect(void) { INT gpu_count, adapter_count, monitor_count; - struct gdi_gpu *gpus = NULL; + struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; struct gdi_monitor *monitors = NULL; RECT rect = {0}; @@ -497,7 +497,7 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage { struct x11drv_adapter *adapters; struct gdi_monitor *monitors; - struct gdi_gpu *gpus; + struct x11drv_gpu *gpus; INT gpu_count, adapter_count, monitor_count; INT gpu, adapter, monitor; DEVMODEW *modes; @@ -514,7 +514,14 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage for (gpu = 0; gpu < gpu_count; gpu++) { - device_manager->add_gpu( &gpus[gpu], param ); + struct gdi_gpu gdi_gpu = + { + .pci_id = gpus[gpu].pci_id, + .vulkan_uuid = gpus[gpu].vulkan_uuid, + .memory_size = gpus[gpu].memory_size, + }; + memcpy( gdi_gpu.name, gpus[gpu].name, sizeof(gdi_gpu.name) ); + device_manager->add_gpu( &gdi_gpu, param ); /* Initialize adapters */ if (!host_handler.get_adapters( gpus[gpu].id, &adapters, &adapter_count )) break; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 384074becad..b4e63f1fbce 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -764,6 +764,15 @@ void init_user_driver(void); /* X11 display device handler. Used to initialize display device registry data */ +struct x11drv_gpu +{ + ULONG_PTR id; + WCHAR name[128]; + struct pci_id pci_id; + GUID vulkan_uuid; + ULONGLONG memory_size; +}; + struct x11drv_adapter { ULONG_PTR id; @@ -782,7 +791,7 @@ struct x11drv_display_device_handler /* get_gpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. * * Return FALSE on failure with parameters unchanged */ - BOOL (*get_gpus)(struct gdi_gpu **gpus, int *count, BOOL get_properties); + BOOL (*get_gpus)(struct x11drv_gpu **gpus, int *count, BOOL get_properties); /* get_adapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. * The first adapter has to be primary if GPU is primary. @@ -797,7 +806,7 @@ struct x11drv_display_device_handler BOOL (*get_monitors)(ULONG_PTR adapter_id, struct gdi_monitor **monitors, int *count); /* free_gpus will be called to free a GPU list from get_gpus */ - void (*free_gpus)(struct gdi_gpu *gpus); + void (*free_gpus)(struct x11drv_gpu *gpus); /* free_adapters will be called to free an adapter list from get_adapters */ void (*free_adapters)(struct x11drv_adapter *adapters); diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index fbf80819204..5f489feb59d 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -190,10 +190,10 @@ done: return ret; } -static BOOL xinerama_get_gpus( struct gdi_gpu **new_gpus, int *count, BOOL get_properties ) +static BOOL xinerama_get_gpus( struct x11drv_gpu **new_gpus, int *count, BOOL get_properties ) { static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; - struct gdi_gpu *gpus; + struct x11drv_gpu *gpus; /* Xinerama has no support for GPU, faking one */ gpus = calloc( 1, sizeof(*gpus) ); @@ -208,7 +208,7 @@ static BOOL xinerama_get_gpus( struct gdi_gpu **new_gpus, int *count, BOOL get_p return TRUE; } -static void xinerama_free_gpus( struct gdi_gpu *gpus ) +static void xinerama_free_gpus( struct x11drv_gpu *gpus ) { free( gpus ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e183501b23f..51b316e71bd 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -627,8 +627,8 @@ static BOOL is_crtc_primary( RECT primary, const XRRCrtcInfo *crtc ) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDisplayKHR) -static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProviderInfo *provider_info, - struct gdi_gpu *prev_gpus, int prev_gpu_count ) +static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRProviderInfo *provider_info, + struct x11drv_gpu *prev_gpus, int prev_gpu_count ) { static const char *extensions[] = { @@ -768,10 +768,10 @@ done: /* Get a list of GPUs reported by XRandR 1.4. Set get_properties to FALSE if GPU properties are * not needed to avoid unnecessary querying */ -static BOOL xrandr14_get_gpus( struct gdi_gpu **new_gpus, int *count, BOOL get_properties ) +static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count, BOOL get_properties ) { static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; - struct gdi_gpu *gpus = NULL; + struct x11drv_gpu *gpus = NULL; XRRScreenResources *screen_resources = NULL; XRRProviderResources *provider_resources = NULL; XRRProviderInfo *provider_info = NULL; @@ -844,7 +844,7 @@ static BOOL xrandr14_get_gpus( struct gdi_gpu **new_gpus, int *count, BOOL get_p /* Make primary GPU the first */ if (primary_provider > 0) { - struct gdi_gpu tmp = gpus[0]; + struct x11drv_gpu tmp = gpus[0]; gpus[0] = gpus[primary_provider]; gpus[primary_provider] = tmp; } @@ -865,7 +865,7 @@ done: return ret; } -static void xrandr14_free_gpus( struct gdi_gpu *gpus ) +static void xrandr14_free_gpus( struct x11drv_gpu *gpus ) { free( gpus ); } @@ -1253,7 +1253,7 @@ static BOOL xrandr14_get_id( const WCHAR *device_name, BOOL is_primary, x11drv_s INT gpu_count, adapter_count, new_current_mode_count = 0; INT gpu_idx, adapter_idx, display_idx; struct x11drv_adapter *adapters; - struct gdi_gpu *gpus; + struct x11drv_gpu *gpus; WCHAR *end; /* Parse \\.\DISPLAY%d */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 447b5a86988..714db83e89c 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -247,7 +247,6 @@ struct pci_id struct gdi_gpu { - ULONG_PTR id; WCHAR name[128]; struct pci_id pci_id; GUID vulkan_uuid; /* Vulkan device UUID */

1 0

Rémi Bernon : win32u: Pass gdi_gpu structure members as add_gpu parameters.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: d525da59075fc4baba95e19125ad23f0d96e6157 URL: https://gitlab.winehq.org/wine/wine/-/commit/d525da59075fc4baba95e19125ad23… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 22 18:27:46 2024 +0200 win32u: Pass gdi_gpu structure members as add_gpu parameters. --- dlls/win32u/sysparams.c | 17 +++++++++-------- dlls/wineandroid.drv/init.c | 4 ++-- dlls/winemac.drv/display.c | 16 ++++++---------- dlls/winewayland.drv/display.c | 8 +++----- dlls/winex11.drv/display.c | 16 +++++----------- dlls/winex11.drv/x11drv.h | 4 ++-- dlls/winex11.drv/xinerama.c | 7 +++---- dlls/winex11.drv/xrandr.c | 16 ++++++---------- include/wine/gdi_driver.h | 10 +--------- 9 files changed, 37 insertions(+), 61 deletions(-)

1 0

Rémi Bernon : win32u: Remove now unnecessary reset_display_manager_ctx.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 79f3573d8feb638c383c4dff4573ccf711d571af URL: https://gitlab.winehq.org/wine/wine/-/commit/79f3573d8feb638c383c4dff4573cc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 22 17:10:22 2024 +0200 win32u: Remove now unnecessary reset_display_manager_ctx. --- dlls/win32u/sysparams.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 3211d4e7d8b..9ebd6e26fc4 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1485,21 +1485,6 @@ static const struct gdi_device_manager device_manager = add_modes, }; -static void reset_display_manager_ctx( struct device_manager_ctx *ctx ) -{ - HANDLE mutex = ctx->mutex; - - if (ctx->source_key) - { - NtClose( ctx->source_key ); - last_query_display_time = 0; - } - if (ctx->gpu_count) cleanup_devices(); - - memset( ctx, 0, sizeof(*ctx) ); - if ((ctx->mutex = mutex)) prepare_devices(); -} - static void release_display_manager_ctx( struct device_manager_ctx *ctx ) { if (ctx->mutex) @@ -1508,7 +1493,13 @@ static void release_display_manager_ctx( struct device_manager_ctx *ctx ) release_display_device_init_mutex( ctx->mutex ); ctx->mutex = 0; } - reset_display_manager_ctx( ctx ); + + if (ctx->source_key) + { + NtClose( ctx->source_key ); + last_query_display_time = 0; + } + if (ctx->gpu_count) cleanup_devices(); } static void clear_display_devices(void)

1 0

Rémi Bernon : winex11: Only request display modes driver data when needed.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: f74900ad1a580eda8fd4923cbd4881b42b042733 URL: https://gitlab.winehq.org/wine/wine/-/commit/f74900ad1a580eda8fd4923cbd4881… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 11 16:02:02 2024 +0200 winex11: Only request display modes driver data when needed. --- dlls/winex11.drv/display.c | 7 +++---- dlls/winex11.drv/x11drv.h | 4 +++- dlls/winex11.drv/xrandr.c | 32 ++++++++++++++++---------------- dlls/winex11.drv/xvidmode.c | 14 +++++++------- 4 files changed, 29 insertions(+), 28 deletions(-)

1 0

Rémi Bernon : win32u: Read / write source modes as a single registry blob.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 64a7ca75475d00af269c203349bc6fe386f16a22 URL: https://gitlab.winehq.org/wine/wine/-/commit/64a7ca75475d00af269c203349bc6f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 11 15:30:53 2024 +0200 win32u: Read / write source modes as a single registry blob. --- dlls/win32u/sysparams.c | 53 ++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index e66ad488486..3211d4e7d8b 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -67,6 +67,7 @@ static const WCHAR device_descW[] = {'D','e','v','i','c','e','D','e','s','c',0}; static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR yesW[] = {'Y','e','s',0}; static const WCHAR noW[] = {'N','o',0}; +static const WCHAR modesW[] = {'M','o','d','e','s',0}; static const WCHAR mode_countW[] = {'M','o','d','e','C','o','u','n','t',0}; static const char guid_devclass_displayA[] = "{4D36E968-E325-11CE-BFC1-08002BE10318}"; @@ -431,10 +432,13 @@ static const char *debugstr_devmodew( const DEVMODEW *devmode ) static BOOL write_source_mode( HKEY hkey, UINT index, const DEVMODEW *mode ) { WCHAR bufferW[MAX_PATH] = {0}; - char buffer[MAX_PATH]; - snprintf( buffer, sizeof(buffer), "Modes\\%08X", index ); - asciiz_to_unicode( bufferW, buffer ); + assert( index == ENUM_CURRENT_SETTINGS || index == ENUM_REGISTRY_SETTINGS ); + + if (index == ENUM_CURRENT_SETTINGS) asciiz_to_unicode( bufferW, "Current" ); + else if (index == ENUM_REGISTRY_SETTINGS) asciiz_to_unicode( bufferW, "Registry" ); + else return FALSE; + return set_reg_value( hkey, bufferW, REG_BINARY, &mode->dmFields, sizeof(*mode) - offsetof(DEVMODEW, dmFields) ); } @@ -442,11 +446,15 @@ static BOOL read_source_mode( HKEY hkey, UINT index, DEVMODEW *mode ) { char value_buf[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(*mode)])]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)value_buf; - char buffer[MAX_PATH]; + const char *key; - snprintf( buffer, sizeof(buffer), "Modes\\%08X", index ); - if (!query_reg_ascii_value( hkey, buffer, value, sizeof(value_buf) )) return FALSE; + assert( index == ENUM_CURRENT_SETTINGS || index == ENUM_REGISTRY_SETTINGS ); + if (index == ENUM_CURRENT_SETTINGS) key = "Current"; + else if (index == ENUM_REGISTRY_SETTINGS) key = "Registry"; + else return FALSE; + + if (!query_reg_ascii_value( hkey, key, value, sizeof(value_buf) )) return FALSE; memcpy( &mode->dmFields, value->Data, sizeof(*mode) - offsetof(DEVMODEW, dmFields) ); return TRUE; } @@ -620,7 +628,6 @@ static BOOL reade_source_from_registry( unsigned int index, struct source *sourc char buffer[4096]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; WCHAR *value_str = (WCHAR *)value->Data; - DEVMODEW *mode; DWORD i, size; HKEY hkey; @@ -646,19 +653,18 @@ static BOOL reade_source_from_registry( unsigned int index, struct source *sourc if (query_reg_ascii_value( hkey, "ModeCount", value, sizeof(buffer) ) && value->Type == REG_DWORD) source->mode_count = *(const DWORD *)value->Data; - /* Modes, allocate an extra mode for easier iteration */ - if ((source->modes = calloc( source->mode_count + 1, sizeof(DEVMODEW) ))) + /* Modes */ + size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data[(source->mode_count + 1) * sizeof(*source->modes)] ); + if (!(value = malloc( size )) || !query_reg_ascii_value( hkey, "Modes", value, size )) free( value ); + else { - for (i = 0, mode = source->modes; i < source->mode_count; i++) - { - mode->dmSize = offsetof(DEVMODEW, dmICMMethod); - if (!read_source_mode( hkey, i, mode )) break; - mode = NEXT_DEVMODEW(mode); - } - source->mode_count = i; - - qsort(source->modes, source->mode_count, sizeof(*source->modes) + source->modes->dmDriverExtra, mode_compare); + source->modes = (DEVMODEW *)value; + source->mode_count = value->DataLength / sizeof(*source->modes); + memmove( source->modes, value->Data, value->DataLength ); + memset( source->modes + source->mode_count, 0, sizeof(*source->modes) ); /* extra empty mode for easier iteration */ + qsort( source->modes, source->mode_count, sizeof(*source->modes), mode_compare ); } + value = (void *)buffer; /* DeviceID */ size = query_reg_ascii_value( hkey, "GPUID", value, sizeof(buffer) ); @@ -1451,7 +1457,6 @@ static void add_monitor( const struct gdi_monitor *gdi_monitor, void *param ) static void add_modes( const DEVMODEW *current, UINT modes_count, const DEVMODEW *modes, void *param ) { struct device_manager_ctx *ctx = param; - const DEVMODEW *mode; DEVMODEW dummy, detached = *current; TRACE( "current %s, modes_count %u, modes %p, param %p\n", debugstr_devmodew( current ), modes_count, modes, param ); @@ -1466,12 +1471,10 @@ static void add_modes( const DEVMODEW *current, UINT modes_count, const DEVMODEW write_source_mode( ctx->source_key, ENUM_REGISTRY_SETTINGS, current ); write_source_mode( ctx->source_key, ENUM_CURRENT_SETTINGS, current ); - for (mode = modes; modes_count; mode = NEXT_DEVMODEW(mode), modes_count--) - { - TRACE( "mode: %s\n", debugstr_devmodew( mode ) ); - if (write_source_mode( ctx->source_key, ctx->source.mode_count, mode )) ctx->source.mode_count++; - } - set_reg_value( ctx->source_key, mode_countW, REG_DWORD, &ctx->source.mode_count, sizeof(ctx->source.mode_count) ); + assert( !modes_count || modes->dmDriverExtra == 0 ); + set_reg_value( ctx->source_key, modesW, REG_BINARY, modes, modes_count * sizeof(*modes) ); + set_reg_value( ctx->source_key, mode_countW, REG_DWORD, &modes_count, sizeof(modes_count) ); + ctx->source.mode_count = modes_count; } static const struct gdi_device_manager device_manager =

1 0

Rémi Bernon : win32u: Use struct pci_id in struct gdi_gpu.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 62c60a9e10cdd73bda2b27eb048f4295bae7babb URL: https://gitlab.winehq.org/wine/wine/-/commit/62c60a9e10cdd73bda2b27eb048f42… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 22 18:16:07 2024 +0200 win32u: Use struct pci_id in struct gdi_gpu. --- dlls/win32u/sysparams.c | 24 +++++------------------- dlls/winemac.drv/display.c | 11 +++++++---- dlls/winex11.drv/xrandr.c | 4 ++-- include/wine/gdi_driver.h | 15 ++++++++++----- 4 files changed, 24 insertions(+), 30 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 9ebd6e26fc4..8bda17f2892 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -85,14 +85,6 @@ static const char guid_devinterface_monitorA[] = "{E6F07B5F-EE97-4A90-B076-33F57 #define NEXT_DEVMODEW(mode) ((DEVMODEW *)((char *)((mode) + 1) + (mode)->dmDriverExtra)) -struct pci_id -{ - UINT16 vendor; - UINT16 device; - UINT16 subsystem; - UINT16 revision; -}; - struct gpu { LONG refcount; @@ -1193,21 +1185,15 @@ static BOOL write_gpu_to_registry( const struct gpu *gpu, const struct pci_id *p static void add_gpu( const struct gdi_gpu *gpu, void *param ) { - const struct pci_id pci_id = - { - .vendor = gpu->vendor_id, - .device = gpu->device_id, - .subsystem = gpu->subsys_id, - .revision = gpu->revision_id, - }; + const struct pci_id *pci_id = &gpu->pci_id; struct device_manager_ctx *ctx = param; char buffer[4096]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; unsigned int i; HKEY hkey, subkey; - TRACE( "%s %04X %04X %08X %02X\n", debugstr_w(gpu->name), - gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id ); + TRACE( "%s %04X %04X %08X %02X\n", debugstr_w( gpu->name ), pci_id->vendor, pci_id->device, + pci_id->subsystem, pci_id->revision ); if (!enum_key && !(enum_key = reg_create_ascii_key( NULL, enum_keyA, 0, NULL ))) return; @@ -1225,7 +1211,7 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) ctx->gpu.vulkan_uuid = gpu->vulkan_uuid; snprintf( ctx->gpu.path, sizeof(ctx->gpu.path), "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X\\%08X", - gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, ctx->gpu.index ); + pci_id->vendor, pci_id->device, pci_id->subsystem, pci_id->revision, ctx->gpu.index ); if (!(hkey = reg_create_ascii_key( enum_key, ctx->gpu.path, 0, NULL ))) return; if ((subkey = reg_create_ascii_key( hkey, "Device Parameters", 0, NULL ))) @@ -1265,7 +1251,7 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) NtClose( hkey ); - if (!write_gpu_to_registry( &ctx->gpu, &pci_id, gpu->memory_size )) + if (!write_gpu_to_registry( &ctx->gpu, pci_id, gpu->memory_size )) WARN( "Failed to write gpu to registry\n" ); else ctx->gpu_count++; diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 5221f4402fa..b52bb39c0f6 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1142,10 +1142,13 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage struct gdi_gpu gdi_gpu = { .id = gpu->id, - .vendor_id = gpu->vendor_id, - .device_id = gpu->device_id, - .subsys_id = gpu->subsys_id, - .revision_id = gpu->revision_id, + .pci_id = + { + .vendor = gpu->vendor_id, + .device = gpu->device_id, + .subsystem = gpu->subsys_id, + .revision = gpu->revision_id, + }, }; RtlUTF8ToUnicodeN(gdi_gpu.name, sizeof(gdi_gpu.name), &len, gpu->name, strlen(gpu->name)); device_manager->add_gpu(&gdi_gpu, param); diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 89ce2a6a263..e183501b23f 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -737,8 +737,8 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid /* Ignore Khronos vendor IDs */ if (properties2.properties.vendorID < 0x10000) { - gpu->vendor_id = properties2.properties.vendorID; - gpu->device_id = properties2.properties.deviceID; + gpu->pci_id.vendor = properties2.properties.vendorID; + gpu->pci_id.device = properties2.properties.deviceID; } RtlUTF8ToUnicodeN( gpu->name, sizeof(gpu->name), &len, properties2.properties.deviceName, strlen( properties2.properties.deviceName ) + 1 ); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 61c9342d50f..447b5a86988 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -237,14 +237,19 @@ static inline ULONG window_surface_release( struct window_surface *surface ) /* display manager interface, used to initialize display device registry data */ +struct pci_id +{ + UINT16 vendor; + UINT16 device; + UINT16 subsystem; + UINT16 revision; +}; + struct gdi_gpu { ULONG_PTR id; - WCHAR name[128]; /* name */ - UINT vendor_id; /* PCI ID */ - UINT device_id; - UINT subsys_id; - UINT revision_id; + WCHAR name[128]; + struct pci_id pci_id; GUID vulkan_uuid; /* Vulkan device UUID */ ULONGLONG memory_size; };

1 0

Alexandre Julliard : widl: Don't generate empty interface registrations.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 6b4ab3be9754ede8cb062313f0018481db3c8805 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b4ab3be9754ede8cb062313f00184… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 5 12:40:44 2024 +0200 widl: Don't generate empty interface registrations. --- tools/widl/register.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index 66a07aeb5c4..02861f3f1d0 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -273,11 +273,14 @@ void write_regscript( const statement_list_t *stmts ) put_str( indent, "HKCR\n" ); put_str( indent++, "{\n" ); - put_str( indent, "NoRemove Interface\n" ); - put_str( indent++, "{\n" ); ps_factory = find_ps_factory( stmts ); - if (ps_factory) write_interfaces( stmts, ps_factory ); - put_str( --indent, "}\n" ); + if (ps_factory) + { + put_str( indent, "NoRemove Interface\n" ); + put_str( indent++, "{\n" ); + write_interfaces( stmts, ps_factory ); + put_str( --indent, "}\n" ); + } put_str( indent, "NoRemove CLSID\n" ); put_str( indent++, "{\n" );

1 0