November 2021 - Wine-commits

Ivo Ivanov : dinput: Pass buffer byte length to HidD_GetProductString.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 16bc6b053db582d816e4fe4ac77481d1671ae08f URL: https://source.winehq.org/git/wine.git/?a=commit;h=16bc6b053db582d816e4fe4a… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:46 2021 +0100 dinput: Pass buffer byte length to HidD_GetProductString. Instead of then number of WCHAR. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index efb90b4e2e9..a5fbfb81332 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1239,8 +1239,8 @@ static BOOL hid_joystick_device_try_open( UINT32 handle, const WCHAR *path, HAND if (caps->UsagePage != HID_USAGE_PAGE_GENERIC) goto failed; if (caps->Usage != HID_USAGE_GENERIC_GAMEPAD && caps->Usage != HID_USAGE_GENERIC_JOYSTICK) goto failed; - if (!HidD_GetProductString( device_file, instance->tszInstanceName, MAX_PATH )) goto failed; - if (!HidD_GetProductString( device_file, instance->tszProductName, MAX_PATH )) goto failed; + if (!HidD_GetProductString( device_file, instance->tszInstanceName, MAX_PATH * sizeof(WCHAR) )) goto failed; + if (!HidD_GetProductString( device_file, instance->tszProductName, MAX_PATH * sizeof(WCHAR) )) goto failed; instance->guidInstance = hid_joystick_guid; instance->guidInstance.Data1 ^= handle;

1 0

Ivo Ivanov : winebus.sys: Accept whitespaces in strings parsed from uevent.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 57161ff6937e7ce738ce461032f894e9134a68af URL: https://source.winehq.org/git/wine.git/?a=commit;h=57161ff6937e7ce738ce4610… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:47 2021 +0100 winebus.sys: Accept whitespaces in strings parsed from uevent. Fixes the device names appearing with the first words in joy.cpl and probably in games, when the UDEV bus is used in HIDRAW mode. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index dad5344a54c..5ff1719848d 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1121,13 +1121,13 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy if (!strncmp(ptr, "HID_UNIQ=", 9)) { if (desc->serialnumber[0]) continue; - if (sscanf(ptr, "HID_UNIQ=%256s\n", buffer) == 1) + if (sscanf(ptr, "HID_UNIQ=%256[^\n]", buffer) == 1) ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc->serialnumber, ARRAY_SIZE(desc->serialnumber)); } if (!strncmp(ptr, "HID_NAME=", 9)) { if (desc->product[0]) continue; - if (sscanf(ptr, "HID_NAME=%256s\n", buffer) == 1) + if (sscanf(ptr, "HID_NAME=%256[^\n]", buffer) == 1) ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc->product, ARRAY_SIZE(desc->product)); } if (!strncmp(ptr, "HID_PHYS=", 9) || !strncmp(ptr, "PHYS=\"", 6))

1 0

Rémi Bernon : server: Wait for process exit more often and using increasing delay.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: c37a6e8e40e50e96e4e8a5414ce702f0156fde77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c37a6e8e40e50e96e4e8a541… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 10 10:26:45 2021 +0100 server: Wait for process exit more often and using increasing delay. Instead of waiting for 1s before considering it dead, when most of the time the process dies quickly, delaying desktop or wineserver shutdown. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 19 +++++++++++++++---- server/process.h | 1 + 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/server/process.c b/server/process.c index 48b5d6d6dd4..343ad78270c 100644 --- a/server/process.c +++ b/server/process.c @@ -595,10 +595,20 @@ static void process_died( struct process *process ) static void process_sigkill( void *private ) { struct process *process = private; + int signal = 0; - process->sigkill_timeout = NULL; - kill( process->unix_pid, SIGKILL ); - process_died( process ); + process->sigkill_delay *= 2; + if (process->sigkill_delay >= TICKS_PER_SEC / 2) + signal = SIGKILL; + + if (!kill( process->unix_pid, signal ) && !signal) + process->sigkill_timeout = add_timeout_user( -process->sigkill_delay, process_sigkill, process ); + else + { + process->sigkill_delay = TICKS_PER_SEC / 64; + process->sigkill_timeout = NULL; + process_died( process ); + } } /* start the sigkill timer for a process upon exit */ @@ -606,7 +616,7 @@ static void start_sigkill_timer( struct process *process ) { grab_object( process ); if (process->unix_pid != -1) - process->sigkill_timeout = add_timeout_user( -TICKS_PER_SEC, process_sigkill, process ); + process->sigkill_timeout = add_timeout_user( -process->sigkill_delay, process_sigkill, process ); else process_died( process ); } @@ -630,6 +640,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->handles = NULL; process->msg_fd = NULL; process->sigkill_timeout = NULL; + process->sigkill_delay = TICKS_PER_SEC / 64; process->unix_pid = -1; process->exit_code = STILL_ACTIVE; process->running_threads = 0; diff --git a/server/process.h b/server/process.h index 55e4d6dced6..22ee8178368 100644 --- a/server/process.h +++ b/server/process.h @@ -53,6 +53,7 @@ struct process process_id_t group_id; /* group id of the process */ unsigned int session_id; /* session id */ struct timeout_user *sigkill_timeout; /* timeout for final SIGKILL */ + timeout_t sigkill_delay; /* delay before final SIGKILL */ unsigned short machine; /* client machine type */ int unix_pid; /* Unix pid for final SIGKILL */ int exit_code; /* process exit code */

1 0

Rémi Bernon : services: Terminate all service processes on shutdown.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 7f749d58d9cbb0b3d54f2db75dbd88695b20901a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f749d58d9cbb0b3d54f2db7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 10 10:26:46 2021 +0100 services: Terminate all service processes on shutdown. Instead of waiting for wineserver to kill them on shutdown, after a 2s delay. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/services/services.c b/programs/services/services.c index 39cd9ee4ffa..d969cf81ab9 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -520,6 +520,7 @@ static void scmdatabase_wait_terminate(struct scmdatabase *db) { struct process_entry *process = grab_process(LIST_ENTRY(ptr, struct process_entry, entry)); + process_terminate(process); scmdatabase_unlock(db); WaitForSingleObject(process->process, INFINITE); scmdatabase_lock(db);

1 0

Zebediah Figura : winegstreamer: Implement IWMReaderAdvanced::GetMaxStreamSampleSize().
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 639c04a5b4e1ffd1d8328f60af998185a04d0c50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=639c04a5b4e1ffd1d8328f60… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 11 23:43:21 2021 -0600 winegstreamer: Implement IWMReaderAdvanced::GetMaxStreamSampleSize(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 3 + dlls/winegstreamer/quartz_parser.c | 125 +++++++++++++++++++++++++----------- dlls/winegstreamer/wm_asyncreader.c | 11 ++-- dlls/winegstreamer/wm_reader.c | 18 ++++++ dlls/wmvcore/tests/wmvcore.c | 18 +++++- 5 files changed, 133 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=639c04a5b4e1ffd1d832…

1 0

Zebediah Figura : winegstreamer: Add IWMMediaProps to the stream config object.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 769057b9b281eaaba7ee438dedb7f922b0903472 URL: https://source.winehq.org/git/wine.git/?a=commit;h=769057b9b281eaaba7ee438d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 11 23:43:22 2021 -0600 winegstreamer: Add IWMMediaProps to the stream config object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/wmvcore/tests/wmvcore.c | 15 ++++++++++++ 2 files changed, 70 insertions(+) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index bb77ecc5ff3..afebf2a3617 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -292,6 +292,7 @@ static const INSSBufferVtbl buffer_vtbl = struct stream_config { IWMStreamConfig IWMStreamConfig_iface; + IWMMediaProps IWMMediaProps_iface; LONG refcount; const struct wm_stream *stream; @@ -310,6 +311,8 @@ static HRESULT WINAPI stream_config_QueryInterface(IWMStreamConfig *iface, REFII if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IWMStreamConfig)) *out = &config->IWMStreamConfig_iface; + else if (IsEqualGUID(iid, &IID_IWMMediaProps)) + *out = &config->IWMMediaProps_iface; else { *out = NULL; @@ -453,6 +456,57 @@ static const IWMStreamConfigVtbl stream_config_vtbl = stream_config_SetBufferWindow, }; +static struct stream_config *impl_from_IWMMediaProps(IWMMediaProps *iface) +{ + return CONTAINING_RECORD(iface, struct stream_config, IWMMediaProps_iface); +} + +static HRESULT WINAPI stream_props_QueryInterface(IWMMediaProps *iface, REFIID iid, void **out) +{ + struct stream_config *config = impl_from_IWMMediaProps(iface); + return IWMStreamConfig_QueryInterface(&config->IWMStreamConfig_iface, iid, out); +} + +static ULONG WINAPI stream_props_AddRef(IWMMediaProps *iface) +{ + struct stream_config *config = impl_from_IWMMediaProps(iface); + return IWMStreamConfig_AddRef(&config->IWMStreamConfig_iface); +} + +static ULONG WINAPI stream_props_Release(IWMMediaProps *iface) +{ + struct stream_config *config = impl_from_IWMMediaProps(iface); + return IWMStreamConfig_Release(&config->IWMStreamConfig_iface); +} + +static HRESULT WINAPI stream_props_GetType(IWMMediaProps *iface, GUID *major_type) +{ + FIXME("iface %p, major_type %p, stub!\n", iface, major_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_props_GetMediaType(IWMMediaProps *iface, WM_MEDIA_TYPE *mt, DWORD *size) +{ + FIXME("iface %p, mt %p, size %p, stub!\n", iface, mt, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_props_SetMediaType(IWMMediaProps *iface, WM_MEDIA_TYPE *mt) +{ + FIXME("iface %p, mt %p, stub!\n", iface, mt); + return E_NOTIMPL; +} + +static const IWMMediaPropsVtbl stream_props_vtbl = +{ + stream_props_QueryInterface, + stream_props_AddRef, + stream_props_Release, + stream_props_GetType, + stream_props_GetMediaType, + stream_props_SetMediaType, +}; + static DWORD CALLBACK read_thread(void *arg) { struct wm_reader *reader = arg; @@ -687,6 +741,7 @@ static HRESULT WINAPI profile_GetStream(IWMProfile3 *iface, DWORD index, IWMStre } object->IWMStreamConfig_iface.lpVtbl = &stream_config_vtbl; + object->IWMMediaProps_iface.lpVtbl = &stream_props_vtbl; object->refcount = 1; object->stream = &reader->streams[index]; IWMProfile3_AddRef(&reader->IWMProfile3_iface); diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index c979a06fdb0..d6bd331ea91 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1125,6 +1125,17 @@ static void check_audio_type(const WM_MEDIA_TYPE *mt) ok(wave_format->wFormatTag == WAVE_FORMAT_PCM, "Got tag %#x.\n", wave_format->wFormatTag); } +static void test_stream_media_props(IWMStreamConfig *config) +{ + IWMMediaProps *props; + HRESULT hr; + + hr = IWMStreamConfig_QueryInterface(config, &IID_IWMMediaProps, (void **)&props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IWMMediaProps_Release(props); +} + static void test_sync_reader_types(void) { char mt_buffer[2000], mt2_buffer[2000]; @@ -1177,6 +1188,8 @@ static void test_sync_reader_types(void) else ok(IsEqualGUID(&majortype, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&majortype)); + test_stream_media_props(config); + ref = IWMStreamConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -2267,6 +2280,8 @@ static void test_async_reader_types(void) else ok(IsEqualGUID(&majortype, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&majortype)); + test_stream_media_props(config); + ref = IWMStreamConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Zebediah Figura : winegstreamer: Implement IWMMediaProps::GetMediaType() for the stream config object.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: f3624e2d642c4f5c1042d24a70273db4437fcef9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3624e2d642c4f5c1042d24a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 11 23:43:23 2021 -0600 winegstreamer: Implement IWMMediaProps::GetMediaType() for the stream config object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 23 +++++++++++++++++++++-- dlls/wmvcore/tests/wmvcore.c | 29 ++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index afebf2a3617..3a1f1684fdc 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -487,8 +487,27 @@ static HRESULT WINAPI stream_props_GetType(IWMMediaProps *iface, GUID *major_typ static HRESULT WINAPI stream_props_GetMediaType(IWMMediaProps *iface, WM_MEDIA_TYPE *mt, DWORD *size) { - FIXME("iface %p, mt %p, size %p, stub!\n", iface, mt, size); - return E_NOTIMPL; + struct stream_config *config = impl_from_IWMMediaProps(iface); + const DWORD req_size = *size; + AM_MEDIA_TYPE stream_mt; + + TRACE("iface %p, mt %p, size %p.\n", iface, mt, size); + + if (!amt_from_wg_format(&stream_mt, &config->stream->format, true)) + return E_OUTOFMEMORY; + + *size = sizeof(stream_mt) + stream_mt.cbFormat; + if (!mt) + return S_OK; + if (req_size < *size) + return ASF_E_BUFFERTOOSMALL; + + strmbase_dump_media_type(&stream_mt); + + memcpy(mt, &stream_mt, sizeof(*mt)); + memcpy(mt + 1, stream_mt.pbFormat, stream_mt.cbFormat); + mt->pbFormat = (BYTE *)(mt + 1); + return S_OK; } static HRESULT WINAPI stream_props_SetMediaType(IWMMediaProps *iface, WM_MEDIA_TYPE *mt) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index d6bd331ea91..bca611e4208 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1125,14 +1125,37 @@ static void check_audio_type(const WM_MEDIA_TYPE *mt) ok(wave_format->wFormatTag == WAVE_FORMAT_PCM, "Got tag %#x.\n", wave_format->wFormatTag); } -static void test_stream_media_props(IWMStreamConfig *config) +static void test_stream_media_props(IWMStreamConfig *config, const GUID *majortype) { + char mt_buffer[2000]; + WM_MEDIA_TYPE *mt = (WM_MEDIA_TYPE *)mt_buffer; IWMMediaProps *props; + DWORD size, ret_size; HRESULT hr; hr = IWMStreamConfig_QueryInterface(config, &IID_IWMMediaProps, (void **)&props); ok(hr == S_OK, "Got hr %#x.\n", hr); + size = 0xdeadbeef; + hr = IWMMediaProps_GetMediaType(props, NULL, &size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %u.\n", size); + + ret_size = size - 1; + hr = IWMMediaProps_GetMediaType(props, mt, &ret_size); + ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#x.\n", hr); + ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); + + ret_size = sizeof(mt_buffer); + memset(mt_buffer, 0xcc, sizeof(mt_buffer)); + hr = IWMMediaProps_GetMediaType(props, mt, &ret_size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); + ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %u, got %u.\n", + sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); + ok(IsEqualGUID(&mt->majortype, majortype), "Expected major type %s, got %s.\n", + debugstr_guid(majortype), debugstr_guid(&mt->majortype)); + IWMMediaProps_Release(props); } @@ -1188,7 +1211,7 @@ static void test_sync_reader_types(void) else ok(IsEqualGUID(&majortype, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&majortype)); - test_stream_media_props(config); + test_stream_media_props(config, &majortype); ref = IWMStreamConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -2280,7 +2303,7 @@ static void test_async_reader_types(void) else ok(IsEqualGUID(&majortype, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&majortype)); - test_stream_media_props(config); + test_stream_media_props(config, &majortype); ref = IWMStreamConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Zebediah Figura : winegstreamer: Call IWMReaderCallbackAdvanced::OnTime() when using a user clock.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 747905c674d521b61923a6cff1d630c85a74d065 URL: https://source.winehq.org/git/wine.git/?a=commit;h=747905c674d521b61923a6cf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 11 23:43:24 2021 -0600 winegstreamer: Call IWMReaderCallbackAdvanced::OnTime() when using a user clock. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 14 ++++++++++++++ dlls/wmvcore/tests/wmvcore.c | 23 ++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 6549c9052e1..18698a698e2 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -101,6 +101,10 @@ static DWORD WINAPI stream_thread(void *arg) { if (reader->user_clock) { + QWORD user_time = reader->user_time; + + if (pts > user_time && reader->reader.callback_advanced) + IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, user_time, reader->context); while (pts > reader->user_time && reader->running) SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, INFINITE); if (!reader->running) @@ -152,6 +156,16 @@ static DWORD WINAPI stream_thread(void *arg) WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); IWMReaderCallback_OnStatus(callback, WMT_EOF, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); + + if (reader->user_clock && reader->reader.callback_advanced) + { + /* We can only get here if user_time is greater than the PTS + * of all samples, in which case we cannot have sent this + * notification already. */ + IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, + reader->user_time, reader->context); + } + TRACE("Reached end of stream; exiting.\n"); LeaveCriticalSection(&reader->stream_cs); return 0; diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index bca611e4208..e27011f49a0 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1429,6 +1429,9 @@ struct callback bool read_compressed; DWORD max_stream_sample_size[2]; + + QWORD expect_ontime; + HANDLE ontime_event; }; static struct callback *impl_from_IWMReaderCallback(IWMReaderCallback *iface) @@ -1672,12 +1675,15 @@ static HRESULT WINAPI callback_advanced_OnStreamSample(IWMReaderCallbackAdvanced static HRESULT WINAPI callback_advanced_OnTime(IWMReaderCallbackAdvanced *iface, QWORD time, void *context) { + struct callback *callback = impl_from_IWMReaderCallbackAdvanced(iface); + if (winetest_debug > 1) trace("%u: %04x: IWMReaderCallbackAdvanced::OnTime(time %I64u)\n", GetTickCount(), GetCurrentThreadId(), time); - ok(time == 3000 * 10000, "Got time %I64u.\n", time); + ok(time == callback->expect_ontime, "Got time %I64u.\n", time); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); + SetEvent(callback->ontime_event); return S_OK; } @@ -1837,6 +1843,7 @@ static void callback_init(struct callback *callback) callback->got_opened = CreateEventW(NULL, FALSE, FALSE, NULL); callback->got_stopped = CreateEventW(NULL, FALSE, FALSE, NULL); callback->eof_event = CreateEventW(NULL, FALSE, FALSE, NULL); + callback->ontime_event = CreateEventW(NULL, FALSE, FALSE, NULL); } static void callback_cleanup(struct callback *callback) @@ -1844,6 +1851,7 @@ static void callback_cleanup(struct callback *callback) CloseHandle(callback->got_opened); CloseHandle(callback->got_stopped); CloseHandle(callback->eof_event); + CloseHandle(callback->ontime_event); } static void run_async_reader(IWMReader *reader, IWMReaderAdvanced2 *advanced, struct callback *callback) @@ -2197,8 +2205,21 @@ static void test_async_reader_streaming(void) ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); hr = IWMReaderAdvanced2_SetUserProvidedClock(advanced, TRUE); ok(hr == S_OK, "Got hr %#x.\n", hr); + callback.expect_ontime = 0; + hr = IWMReaderAdvanced2_DeliverTime(advanced, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = WaitForSingleObject(callback.ontime_event, 1000); + ok(!ret, "Wait timed out.\n"); + callback.expect_ontime = 1000 * 10000; + hr = IWMReaderAdvanced2_DeliverTime(advanced, 1000 * 10000); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = WaitForSingleObject(callback.ontime_event, 1000); + ok(!ret, "Wait timed out.\n"); + callback.expect_ontime = 3000 * 10000; hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = WaitForSingleObject(callback.ontime_event, 1000); + ok(!ret, "Wait timed out.\n"); ret = WaitForSingleObject(callback.eof_event, 1000); ok(!ret, "Wait timed out.\n");

1 0

Alexandre Julliard : wrc: Support only single directories with the -I option.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 4f0bb2e45fb14d19a5e3d9a10900e6b0036b844d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f0bb2e45fb14d19a5e3d9a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 12 11:39:31 2021 +0100 wrc: Support only single directories with the -I option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 2 +- tools/widl/widl.man.in | 2 +- tools/wrc/wpp.c | 57 ++++++++++++++------------------------------------ tools/wrc/wrc.c | 2 +- tools/wrc/wrc.man.in | 7 +++---- 5 files changed, 22 insertions(+), 48 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 79c92e2f338..325a55fff8d 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -54,7 +54,7 @@ static const char usage[] = " --help Display this help and exit\n" " -h Generate headers\n" " -H file Name of header file (default is infile.h)\n" -" -I path Set include search dir to path (multiple -I allowed)\n" +" -I directory Add directory to the include search path (multiple -I allowed)\n" " --local-stubs=file Write empty stubs for call_as/local methods to file\n" " -m32, -m64 Set the target architecture (Win32 or Win64)\n" " -N Do not preprocess input\n" diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 010b7f04e2d..234f512f962 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -102,7 +102,7 @@ names. The default output filename is \fBdlldata.c\fR. .PP .B Preprocessor options: .IP "\fB-I \fIpath\fR" -Add a header search directory to path. Multiple search +Add a directory to the include search path. Multiple include directories are allowed. .IP "\fB-D \fIid\fR[\fB=\fIval\fR]" Define preprocessor macro \fIid\fR with value \fIval\fR. diff --git a/tools/wrc/wpp.c b/tools/wrc/wpp.c index 18a7b015be0..d8d5052870a 100644 --- a/tools/wrc/wpp.c +++ b/tools/wrc/wpp.c @@ -54,9 +54,9 @@ struct define }; static struct list cmdline_defines = LIST_INIT( cmdline_defines ); +static struct strarray includes; -static char *wpp_lookup(const char *name, int type, const char *parent_name, - char **include_path, int include_path_count) +static char *wpp_lookup(const char *name, int type, const char *parent_name) { char *cpy; char *cptr; @@ -96,9 +96,9 @@ static char *wpp_lookup(const char *name, int type, const char *parent_name, free( path ); } /* Search -I path */ - for(i = 0; i < include_path_count; i++) + for(i = 0; i < includes.count; i++) { - path = strmake("%s/%s", include_path[i], cpy); + path = strmake("%s/%s", includes.str[i], cpy); fd = open( path, O_RDONLY ); if (fd != -1) { @@ -294,51 +294,26 @@ pp_entry_t *pp_add_macro(char *id, char *args[], int nargs, mtext_t *exp) * Include management *------------------------------------------------------------------------- */ -#if defined(_WIN32) || defined(__MSDOS__) -#define INCLUDESEPARATOR ";" -#else -#define INCLUDESEPARATOR ":" -#endif - -static char **includepath; -static int nincludepath = 0; - void wpp_add_include_path(const char *path) { - char *tok; - char *cpy = xstrdup(path); + char *dir = xstrdup(path); + char *cptr; - tok = strtok(cpy, INCLUDESEPARATOR); - while(tok) + for(cptr = dir; *cptr; cptr++) { - if(*tok) { - char *dir; - char *cptr; - - dir = xstrdup(tok); - for(cptr = dir; *cptr; cptr++) - { - /* Convert to forward slash */ - if(*cptr == '\\') - *cptr = '/'; - } - /* Kill eventual trailing '/' */ - if(*(cptr = dir + strlen(dir)-1) == '/') - *cptr = '\0'; - - /* Add to list */ - includepath = xrealloc(includepath, (nincludepath+1) * sizeof(*includepath)); - includepath[nincludepath] = dir; - nincludepath++; - } - tok = strtok(NULL, INCLUDESEPARATOR); + /* Convert to forward slash */ + if(*cptr == '\\') + *cptr = '/'; } - free(cpy); + /* Kill eventual trailing '/' */ + if(*(cptr = dir + strlen(dir)-1) == '/') *cptr = '\0'; + + strarray_add( &includes, dir ); } char *wpp_find_include(const char *name, const char *parent_name) { - return wpp_lookup(name, !!parent_name, parent_name, includepath, nincludepath); + return wpp_lookup(name, !!parent_name, parent_name); } void *pp_open_include(const char *name, int type, const char *parent_name, char **newpath) @@ -346,7 +321,7 @@ void *pp_open_include(const char *name, int type, const char *parent_name, char char *path; void *fp; - if (!(path = wpp_lookup(name, type, parent_name, includepath, nincludepath))) return NULL; + if (!(path = wpp_lookup(name, type, parent_name))) return NULL; fp = fopen(path, "rt"); if (fp) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 56cc2d6e83d..f848b30a0f8 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -51,7 +51,7 @@ static const char usage[] = " -fo FILE Synonym for -o for compatibility with windres\n" " -h, --help Prints this summary\n" " -i, --input=FILE The name of the input file\n" - " -I, --include-dir=PATH Set include search dir to path (multiple -I allowed)\n" + " -I, --include-dir=DIR Add dir to the include search path (multiple -I allowed)\n" " -J, --input-format=FORMAT The input format (either `rc' or `rc16')\n" " -l, --language=LANG Set default language to LANG (default is neutral {0, 0})\n" " -m16 Build a 16-bit resource file\n" diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index 99f555b6f12..807c66ad006 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -46,10 +46,9 @@ will use the first non-option argument as the input file name. If there are no non-option arguments, then \fBwrc\fR will read from standard input. .TP .I \fB\-I\fR, \fB\-\-include\-dir\fR=\fIpath\fR -Add \fIpath\fR to include search directories. \fIpath\fR may contain -multiple directories, separated with ':'. It is allowed to specify -\fB\-I\fR multiple times. Include files are searched in the order in -which the \fB\-I\fR options were specified. +Add \fIpath\fR to the list of directories to search for includes. It +is allowed to specify \fB\-I\fR multiple times. Include files are +searched in the order in which the \fB\-I\fR options were specified. .br The search is compatible with gcc, in which '<>' quoted filenames are searched exclusively via the \fB\-I\fR set path, whereas the '""' quoted

1 0

Cressida Silver : WWN 407
by Jeremy Newman 12 Nov '21

12 Nov '21

Module: website Branch: master Commit: 40618e506a5bf19943e045dc6516930856cefb22 URL: https://source.winehq.org/git/website.git/?a=commit;h=40618e506a5bf19943e04… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri Nov 12 13:16:31 2021 -0600 WWN 407 --- news/en/2021111201.xml | 12 +++++++ wwn/en/wn20211112_407.xml | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) diff --git a/news/en/2021111201.xml b/news/en/2021111201.xml new file mode 100644 index 00000000..07db5faf --- /dev/null +++ b/news/en/2021111201.xml @@ -0,0 +1,12 @@ +<news> + <date>November 12, 2021</date> + <title>World Wine News Issue 407</title> + <body> + <a href="{$root}/wwn/407">WWN Issue 407</a> was released today. + <ul> + <li><a href="{$root}/wwn/407#Musings">Musings</a></li> + <li><a href="{$root}/wwn/407#Wine Adds DWARF 3 and 4 Support">Wine Adds DWARF 3 and 4 Support</a></li> + <li><a href="{$root}/wwn/407#VKD3D-Proton v2.5 Released">VKD3D-Proton v2.5 Released</a></li> + </ul> + </body> +</news> diff --git a/wwn/en/wn20211112_407.xml b/wwn/en/wn20211112_407.xml new file mode 100755 index 00000000..b4e64283 --- /dev/null +++ b/wwn/en/wn20211112_407.xml @@ -0,0 +1,85 @@ +<kc> + <title>Wine Traffic</title> + <author contact="mailto:wwn(a)winehq.org">Cressida Silver</author> + <issue num="407" date="11/12/2021"/> + <intro> + + This is the 407th issue of the World Wine News publication. Its main goal is to inform you of what's going on around Wine. + Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. + Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, + but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> + + </intro> + + <section title="Musings" subject="" archive="" posts=""> + + Let me address the elephant... erm… not in the room. The AppDB/Bugzilla stats. That section was omitted in the last WWN issue. (A finely tuned eye will also notice it is missing from this issue.) There was much discussion on whether honor the tradition of including them, and – for now anyway – the consensus is to omit them. This may change in the future. + + + As always, please feel free to let <a href="mailto:wwn(a)winehq.org">me</a>know what feels you get from what we are doing over here, good or bad. + + + This is a friendly reminder to all you lovely folks out there, Wine 7.0 is on the horizon, so be prepared for the code freeze sometime in December. + + </section> + + <section title="Wine Adds DWARF 3 and 4 Support" subject="" archive="" posts=""> + + Wine is working towards DWARF 4 being the default debug format. DWARF is a debugging file format used by many compilers and debuggers to support source level debugging. Before we get too deep into this, let us discuss the name. According to the <a href="http://wiki.dwarfstd.org/index.php?title=DWARF_FAQ">DWARF Debugging Standard</a> FAQ, the name DWARF was intended as a pun to play off the acronym for the Executable and Linkable Format (ELF) it was developed alongside. + + + Compilers in the Windows space use PDB/CodeView debug information. Compilers in the Linux space use DWARF debug information (e.g., from <a href="https://gcc.gnu.org/">GCC</a> and <a href="https://llvm.org/">LLVM</a>). Though LLVM/Clang does PDB/CodeView as well. Most debuggers in the Windows world, as well as Wine’s debugger (winedbg), rely on dbghelp.dll for access to the debugger information (e.g., symbols, types, or variables). So Wine’s dbghelp.dll implementation covers PDB/CodeView and DWARF while the native dbghelp.dll only overs PDB/CodeView. + + + Linux adopted DWARF 2 in the late 1990s. For at least the last 15 years, Wine has been using DWARF 2. Meanwhile, the DWARF consortium has published three more specifications as follows: + <ul> + <li>DWARF 3 — 2005</li> + <li>DWARF 4 — 2010</li> + <li>DWARF 5 — 2017</li> + </ul> + + + Over the last six months to a year, GCC and most Linux distros have made DWARF 5 their default formats. Wine needs to catch up with the compilers out there, and support for DWARF 2 is likely to dwindle going forward. Thanks to Eric's hard work, Wine's dbghelp.dll now supports the most common DWARF 4 elements, and inline functions for both DWARF and PDB/CodeView. Not to mention that Wine Staging is using DWARF 4. + + + Before DWARF 4 can be Wine's default debug format, <a href="https://www.winehq.org/pipermail/wine-devel/2021-November/199884.html">testing and feedback</a>is needed. Once work on DWARF 4 is finished, work on DWARF 5 can begin, and that is the goal... it is just going to take time. + + </section> + + <section title="VKD3D-Proton v2.5 Released" subject="" archive="" posts=""> + + VKD3D-Proton is a gaming-focused implementation of Direct3D 12 developed for use with... you guessed it, Proton... and on October 18th (it may be old news, but it is news), v2.5 was released. + + + It was a release with a little bit of everything: + <ul> + <li>Significant DXR work</li> + <li>NVIDIA contributed integration APIs that enable DLSS support in D3D12 titles</li> + <li>DXIL translation support to catch up with native drivers</li> + </ul> + + + + It also includes fixes and workarounds to improve the following games: + <ul> + <li>DEATHLOOP</li> + <li>F1 2021</li> + <li>WRC 10</li> + <li>DIRT 5</li> + <li>Diablo II</li> + <li>Psychonauts 2</li> + <li>Far Cry 6</li> + <li>Evil Genius 2: World Domination</li> + <li>Hitman 3</li> + <li>Anno 1800</li> + </ul> + + + + Full VKD3D-Proton v2.5 release notes available <a href="https://github.com/HansKristian-Work/vkd3d-proton/releases/tag/v2.5">here.</a> + + + For all you overachievers out there, if you are looking for some extra credit, take a gander at <a href="https://themaister.net/blog/2021/11/07/my-personal-hell-of-translating-dxil…">this piece</a> written by Hans-Kristian Arntzen. Don't worry, I won't quiz you on it. + + </section> +</kc>

1 0