October 2021 - Wine-Commits

Zebediah Figura : winegstreamer: Move the IWMProfile3 implementation to a separate object.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 2d0dc2d47ca6b2d4090dfe32efdba4f695b197ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d0dc2d47ca6b2d4090dfe32… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 11:09:45 2021 -0500 winegstreamer: Move the IWMProfile3 implementation to a separate object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 3 +- dlls/winegstreamer/gst_private.h | 17 ++ dlls/winegstreamer/main.c | 6 +- dlls/winegstreamer/mfplat.c | 3 +- dlls/winegstreamer/wm_asyncreader.c | 471 +++++++----------------------------- dlls/winegstreamer/wm_reader.c | 308 +++++++++++++++++++++++ dlls/winegstreamer/wm_syncreader.c | 2 - 7 files changed, 418 insertions(+), 392 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d0dc2d47ca6b2d4090d…

1 0

Alexandre Julliard : msgsm32.acm: Use the bundled gsm codec and build with msvcrt.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 0e7fd41af953b2a9fa23cf6920fac229f2dd2e44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e7fd41af953b2a9fa23cf69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 11:46:12 2021 +0200 msgsm32.acm: Use the bundled gsm codec and build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 78 -------------------------------- configure.ac | 12 ----- dlls/msgsm32.acm/Makefile.in | 5 +-- dlls/msgsm32.acm/msgsm32.c | 105 ++++++------------------------------------- include/config.h.in | 9 ---- 5 files changed, 16 insertions(+), 193 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e7fd41af953b2a9fa23…

1 0

Francois Gouget : wrc: Add a trailing linefeed to a couple of error() messages.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: c35b41a3f2133c6f1f88ea4c2a3ccab4fac077b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c35b41a3f2133c6f1f88ea4c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 20 16:40:11 2021 +0200 wrc: Add a trailing linefeed to a couple of error() messages. Unlike most of the other wrc error functions, error() does not append a trailing linefeed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/ppl.l | 2 +- tools/wrc/wpp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wrc/ppl.l b/tools/wrc/ppl.l index d4df76f7950..ee5a4f97a1e 100644 --- a/tools/wrc/ppl.l +++ b/tools/wrc/ppl.l @@ -1192,7 +1192,7 @@ static void push_buffer(pp_entry_t *ppp, char *filename, char *incname, int pop) if(ppy_debug) printf("push_buffer(%d): %p %p %p %d\n", bufferstackidx, ppp, filename, incname, pop); if(bufferstackidx >= MAXBUFFERSTACK) - error("Buffer stack overflow"); + error("Buffer stack overflow\n"); memset(&bufferstack[bufferstackidx], 0, sizeof(bufferstack[0])); bufferstack[bufferstackidx].bufferstate = YY_CURRENT_BUFFER; diff --git a/tools/wrc/wpp.c b/tools/wrc/wpp.c index 9ad09f25da2..18a7b015be0 100644 --- a/tools/wrc/wpp.c +++ b/tools/wrc/wpp.c @@ -421,7 +421,7 @@ static const char * const pp_if_state_str[] = { void pp_push_if(pp_if_state_t s) { if(if_stack_idx >= MAXIFSTACK) - error("#if-stack overflow; #{if,ifdef,ifndef} nested too deeply (> %d)", MAXIFSTACK); + error("#if-stack overflow; #{if,ifdef,ifndef} nested too deeply (> %d)\n", MAXIFSTACK); if(pp_flex_debug) fprintf(stderr, "Push if %s:%d: %s(%d) -> %s(%d)\n", pp_status.input, pp_status.line_number, pp_if_state_str[pp_if_state()], if_stack_idx, pp_if_state_str[s], if_stack_idx+1);

1 0

Francois Gouget : winebus.sys: Add a trailing linefeed to a couple of FIXME()s.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: c4d5010fbf7be17025900b52ce432b9d507136ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4d5010fbf7be17025900b52… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 20 16:37:14 2021 +0200 winebus.sys: Add a trailing linefeed to a couple of FIXME()s. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/bus_udev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index f1c20692b29..403c4821f24 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -629,7 +629,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: - FIXME("not implemented!"); + FIXME("not implemented!\n"); break; } diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 62a70da94e6..c7125520c33 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1090,7 +1090,7 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: - FIXME("not implemented!"); + FIXME("not implemented!\n"); break; }

1 0

Zebediah Figura : wmvcore/tests: Sort interface tests.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: c40613e81c5ffb9207325134e089379373952591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c40613e81c5ffb9207325134… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 11:09:47 2021 -0500 wmvcore/tests: Sort interface tests. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 63509b8c93e..2b36c411262 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -86,30 +86,30 @@ static void test_wmreader_interfaces(void) check_interface(reader, &IID_IWMSyncReader, FALSE); check_interface(reader, &IID_IWMSyncReader2, FALSE); - check_interface(reader, &IID_IWMReader, TRUE); - check_interface(reader, &IID_IWMReaderAdvanced, TRUE); - check_interface(reader, &IID_IWMReaderAdvanced2, TRUE); - check_interface(reader, &IID_IWMReaderAdvanced3, TRUE); - check_interface(reader, &IID_IWMReaderAdvanced4, TRUE); - check_interface(reader, &IID_IWMReaderAdvanced5, TRUE); - check_interface(reader, &IID_IWMReaderAdvanced6, TRUE); + check_interface(reader, &IID_IReferenceClock, TRUE); check_interface(reader, &IID_IWMHeaderInfo, TRUE); check_interface(reader, &IID_IWMHeaderInfo2, TRUE); check_interface(reader, &IID_IWMHeaderInfo3, TRUE); + check_interface(reader, &IID_IWMLanguageList, TRUE); + check_interface(reader, &IID_IWMPacketSize, TRUE); + check_interface(reader, &IID_IWMPacketSize2, TRUE); check_interface(reader, &IID_IWMProfile, TRUE); check_interface(reader, &IID_IWMProfile2, TRUE); check_interface(reader, &IID_IWMProfile3, TRUE); - check_interface(reader, &IID_IWMPacketSize, TRUE); - check_interface(reader, &IID_IWMPacketSize2, TRUE); + check_interface(reader, &IID_IWMReader, TRUE); check_interface(reader, &IID_IWMReaderAccelerator, TRUE); - check_interface(reader, &IID_IWMReaderTimecode, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced2, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced3, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced4, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced5, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced6, TRUE); check_interface(reader, &IID_IWMReaderNetworkConfig, TRUE); check_interface(reader, &IID_IWMReaderNetworkConfig2, TRUE); + check_interface(reader, &IID_IWMReaderPlaylistBurn, TRUE); check_interface(reader, &IID_IWMReaderStreamClock, TRUE); + check_interface(reader, &IID_IWMReaderTimecode, TRUE); check_interface(reader, &IID_IWMReaderTypeNegotiation, TRUE); - check_interface(reader, &IID_IWMReaderPlaylistBurn, TRUE); - check_interface(reader, &IID_IWMLanguageList, TRUE); - check_interface(reader, &IID_IReferenceClock, TRUE); IWMReader_Release(reader); } @@ -127,6 +127,7 @@ static void test_wmsyncreader_interfaces(void) return; } + check_interface(reader, &IID_IReferenceClock, FALSE); check_interface(reader, &IID_IWMDRMReader, FALSE); check_interface(reader, &IID_IWMDRMReader2, FALSE); check_interface(reader, &IID_IWMDRMReader3, FALSE); @@ -142,21 +143,20 @@ static void test_wmsyncreader_interfaces(void) check_interface(reader, &IID_IWMReaderNetworkConfig2, FALSE); check_interface(reader, &IID_IWMReaderStreamClock, FALSE); check_interface(reader, &IID_IWMReaderTypeNegotiation, FALSE); - check_interface(reader, &IID_IReferenceClock, FALSE); - check_interface(reader, &IID_IWMSyncReader, TRUE); - check_interface(reader, &IID_IWMSyncReader2, TRUE); todo_wine check_interface(reader, &IID_IWMHeaderInfo, TRUE); todo_wine check_interface(reader, &IID_IWMHeaderInfo2, TRUE); todo_wine check_interface(reader, &IID_IWMHeaderInfo3, TRUE); + todo_wine check_interface(reader, &IID_IWMLanguageList, TRUE); + todo_wine check_interface(reader, &IID_IWMPacketSize, TRUE); + todo_wine check_interface(reader, &IID_IWMPacketSize2, TRUE); check_interface(reader, &IID_IWMProfile, TRUE); check_interface(reader, &IID_IWMProfile2, TRUE); check_interface(reader, &IID_IWMProfile3, TRUE); - todo_wine check_interface(reader, &IID_IWMPacketSize, TRUE); - todo_wine check_interface(reader, &IID_IWMPacketSize2, TRUE); - todo_wine check_interface(reader, &IID_IWMReaderTimecode, TRUE); todo_wine check_interface(reader, &IID_IWMReaderPlaylistBurn, TRUE); - todo_wine check_interface(reader, &IID_IWMLanguageList, TRUE); + todo_wine check_interface(reader, &IID_IWMReaderTimecode, TRUE); + check_interface(reader, &IID_IWMSyncReader, TRUE); + check_interface(reader, &IID_IWMSyncReader2, TRUE); IWMSyncReader_Release(reader); }

1 0

Zebediah Figura : winegstreamer: Move the IWMLanguageList implementation to the wm_reader object.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 4239f2acf77d9eaa8166628d25c1336c1599df33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4239f2acf77d9eaa8166628d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 11:09:49 2021 -0500 winegstreamer: Move the IWMLanguageList implementation to the wm_reader object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/wm_asyncreader.c | 61 ------------------------------------- dlls/winegstreamer/wm_reader.c | 61 +++++++++++++++++++++++++++++++++++++ dlls/wmvcore/tests/wmvcore.c | 2 +- 4 files changed, 63 insertions(+), 62 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 71d3bb2b509..6dc0ad3e291 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -116,6 +116,7 @@ HRESULT audio_converter_create(REFIID riid, void **ret) DECLSPEC_HIDDEN; struct wm_reader { IWMHeaderInfo3 IWMHeaderInfo3_iface; + IWMLanguageList IWMLanguageList_iface; IWMProfile3 IWMProfile3_iface; LONG refcount; diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 1361b20932f..a36718ef453 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -32,7 +32,6 @@ struct async_reader IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; IWMReaderTimecode IWMReaderTimecode_iface; IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; - IWMLanguageList IWMLanguageList_iface; IReferenceClock IReferenceClock_iface; IWMPacketSize2 IWMPacketSize2_iface; }; @@ -1257,62 +1256,6 @@ static const IWMReaderPlaylistBurnVtbl WMReaderPlaylistBurnVtbl = playlist_EndPlaylistBurn }; -static struct async_reader *impl_from_IWMLanguageList(IWMLanguageList *iface) -{ - return CONTAINING_RECORD(iface, struct async_reader, IWMLanguageList_iface); -} - -static HRESULT WINAPI langlist_QueryInterface(IWMLanguageList *iface, REFIID riid, void **ppv) -{ - struct async_reader *This = impl_from_IWMLanguageList(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI langlist_AddRef(IWMLanguageList *iface) -{ - struct async_reader *This = impl_from_IWMLanguageList(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI langlist_Release(IWMLanguageList *iface) -{ - struct async_reader *This = impl_from_IWMLanguageList(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI langlist_GetLanguageCount(IWMLanguageList *iface, WORD *count) -{ - struct async_reader *This = impl_from_IWMLanguageList(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI langlist_GetLanguageDetails(IWMLanguageList *iface, WORD index, - WCHAR *language, WORD *length) -{ - struct async_reader *This = impl_from_IWMLanguageList(iface); - FIXME("%p, %d, %p, %p\n", This, index, language, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI langlist_AddLanguageByRFC1766String(IWMLanguageList *iface, LPCWSTR_WMSDK_TYPE_SAFE language, - WORD *index) -{ - struct async_reader *This = impl_from_IWMLanguageList(iface); - FIXME("%p, %p, %p\n", This, language, index); - return E_NOTIMPL; -} - -static const IWMLanguageListVtbl WMLanguageListVtbl = -{ - langlist_QueryInterface, - langlist_AddRef, - langlist_Release, - langlist_GetLanguageCount, - langlist_GetLanguageDetails, - langlist_AddLanguageByRFC1766String -}; - static struct async_reader *impl_from_IReferenceClock(IReferenceClock *iface) { return CONTAINING_RECORD(iface, struct async_reader, IReferenceClock_iface); @@ -1455,9 +1398,6 @@ static void *async_reader_query_interface(struct wm_reader *iface, REFIID iid) if (IsEqualIID(iid, &IID_IReferenceClock)) return &reader->IReferenceClock_iface; - if (IsEqualIID(iid, &IID_IWMLanguageList)) - return &reader->IWMLanguageList_iface; - if (IsEqualIID(iid, &IID_IWMPacketSize) || IsEqualIID(iid, &IID_IWMPacketSize2)) return &reader->IWMPacketSize2_iface; @@ -1522,7 +1462,6 @@ HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) wm_reader_init(&object->reader, &async_reader_ops); object->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; - object->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl; object->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; object->IWMReader_iface.lpVtbl = &WMReaderVtbl; object->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 09d5c3bddcc..b72ff98cd18 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -37,6 +37,10 @@ static HRESULT WINAPI profile_QueryInterface(IWMProfile3 *iface, REFIID iid, voi { *out = &reader->IWMHeaderInfo3_iface; } + else if (IsEqualIID(iid, &IID_IWMLanguageList)) + { + *out = &reader->IWMLanguageList_iface; + } else if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IWMProfile) || IsEqualIID(iid, &IID_IWMProfile2) @@ -512,9 +516,66 @@ static const IWMHeaderInfo3Vtbl header_info_vtbl = header_info_AddCodecInfo, }; +static struct wm_reader *impl_from_IWMLanguageList(IWMLanguageList *iface) +{ + return CONTAINING_RECORD(iface, struct wm_reader, IWMLanguageList_iface); +} + +static HRESULT WINAPI language_list_QueryInterface(IWMLanguageList *iface, REFIID iid, void **out) +{ + struct wm_reader *reader = impl_from_IWMLanguageList(iface); + + return IWMProfile3_QueryInterface(&reader->IWMProfile3_iface, iid, out); +} + +static ULONG WINAPI language_list_AddRef(IWMLanguageList *iface) +{ + struct wm_reader *reader = impl_from_IWMLanguageList(iface); + + return IWMProfile3_AddRef(&reader->IWMProfile3_iface); +} + +static ULONG WINAPI language_list_Release(IWMLanguageList *iface) +{ + struct wm_reader *reader = impl_from_IWMLanguageList(iface); + + return IWMProfile3_Release(&reader->IWMProfile3_iface); +} + +static HRESULT WINAPI language_list_GetLanguageCount(IWMLanguageList *iface, WORD *count) +{ + FIXME("iface %p, count %p, stub!\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI language_list_GetLanguageDetails(IWMLanguageList *iface, + WORD index, WCHAR *lang, WORD *len) +{ + FIXME("iface %p, index %u, lang %p, len %p, stub!\n", iface, index, lang, len); + return E_NOTIMPL; +} + +static HRESULT WINAPI language_list_AddLanguageByRFC1766String(IWMLanguageList *iface, + const WCHAR *lang, WORD *index) +{ + FIXME("iface %p, lang %s, index %p, stub!\n", iface, debugstr_w(lang), index); + return E_NOTIMPL; +} + +static const IWMLanguageListVtbl language_list_vtbl = +{ + language_list_QueryInterface, + language_list_AddRef, + language_list_Release, + language_list_GetLanguageCount, + language_list_GetLanguageDetails, + language_list_AddLanguageByRFC1766String, +}; + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; + reader->IWMLanguageList_iface.lpVtbl = &language_list_vtbl; reader->IWMProfile3_iface.lpVtbl = &profile_vtbl; reader->refcount = 1; reader->ops = ops; diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 75d1f9e0c35..9f9c5ed393f 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -147,7 +147,7 @@ static void test_wmsyncreader_interfaces(void) check_interface(reader, &IID_IWMHeaderInfo, TRUE); check_interface(reader, &IID_IWMHeaderInfo2, TRUE); check_interface(reader, &IID_IWMHeaderInfo3, TRUE); - todo_wine check_interface(reader, &IID_IWMLanguageList, TRUE); + check_interface(reader, &IID_IWMLanguageList, TRUE); todo_wine check_interface(reader, &IID_IWMPacketSize, TRUE); todo_wine check_interface(reader, &IID_IWMPacketSize2, TRUE); check_interface(reader, &IID_IWMProfile, TRUE);

1 0

Paul Gofman : ntdll: Fix size comparison in NtQuerySystemInformation(SystemCodeIntegrityInformation).
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: c310c8050debea8677f3e0cb6b62f3d117ccd2fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c310c8050debea8677f3e0cb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Oct 20 20:54:22 2021 +0300 ntdll: Fix size comparison in NtQuerySystemInformation(SystemCodeIntegrityInformation). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c4853568599..c6bbabd85c5 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3064,7 +3064,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, len = sizeof(SYSTEM_CODEINTEGRITY_INFORMATION); - if (size < len) + if (size >= len) integrity_info->CodeIntegrityOptions = CODEINTEGRITY_OPTION_ENABLED; else ret = STATUS_INFO_LENGTH_MISMATCH;

1 0

Alexandre Julliard : wow64win: Add missing syscall entry for NtUserGetObjectInformation().
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 90a0b7c7061b514b4796f26f5679d89e867ac11a URL: https://source.winehq.org/git/wine.git/?a=commit;h=90a0b7c7061b514b4796f26f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 13:18:16 2021 +0200 wow64win: Add missing syscall entry for NtUserGetObjectInformation(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64win/syscall.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 18435b993f0..8cf27d47aad 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -92,6 +92,7 @@ SYSCALL_ENTRY( NtUserCloseWindowStation ) \ SYSCALL_ENTRY( NtUserCreateDesktopEx ) \ SYSCALL_ENTRY( NtUserCreateWindowStation ) \ + SYSCALL_ENTRY( NtUserGetObjectInformation ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ SYSCALL_ENTRY( NtUserOpenDesktop ) \

1 0

Rémi Bernon : dinput: Factor object enumeration checks and offset mapping.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: ec3e51bb10365e8081661531a2bd84ff2f10866a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec3e51bb10365e8081661531… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 20 11:29:29 2021 +0200 dinput: Factor object enumeration checks and offset mapping. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 39 +++++++++++++++++++++++++++++++++------ dlls/dinput/joystick_hid.c | 26 +++++++------------------- dlls/dinput/keyboard.c | 19 ++----------------- dlls/dinput/mouse.c | 20 ++------------------ 4 files changed, 44 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec3e51bb10365e808166…

1 0

Rémi Bernon : dinput: Factor all Poll implementations together.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: aebd03f07087fdff5cd83b1c4d9ecc930658b61c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aebd03f07087fdff5cd83b1c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 20 11:29:30 2021 +0200 dinput: Factor all Poll implementations together. With a new internal poll callback for mouse and keyboard Wine-specific message peeking behavior. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 12 ++++++++---- dlls/dinput/device_private.h | 1 + dlls/dinput/joystick_hid.c | 15 ++------------- dlls/dinput/keyboard.c | 7 +++++++ dlls/dinput/mouse.c | 7 +++++++ 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 2b2c4646e31..c31166b8248 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1661,13 +1661,17 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Escape(LPDIRECTINPUTDEVICE8W iface, LPDI return DI_OK; } -HRESULT WINAPI IDirectInputDevice2WImpl_Poll(LPDIRECTINPUTDEVICE8W iface) +HRESULT WINAPI IDirectInputDevice2WImpl_Poll( IDirectInputDevice8W *iface ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + HRESULT hr = DI_NOEFFECT; - if (!This->acquired) return DIERR_NOTACQUIRED; + EnterCriticalSection( &impl->crit ); + if (!impl->acquired) hr = DIERR_NOTACQUIRED; + LeaveCriticalSection( &impl->crit ); + if (hr != DI_OK) return hr; - check_dinput_events(); + if (impl->vtbl->poll) return impl->vtbl->poll( iface ); return DI_OK; } diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index da1a90fda42..92b0320520b 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -57,6 +57,7 @@ typedef HRESULT dinput_device_read_state( IDirectInputDevice8W *iface ); struct dinput_device_vtbl { + HRESULT (*poll)( IDirectInputDevice8W *iface ); HRESULT (*read)( IDirectInputDevice8W *iface ); HRESULT (*acquire)( IDirectInputDevice8W *iface ); HRESULT (*unacquire)( IDirectInputDevice8W *iface ); diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 5718f02bf47..59e5e4a719f 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1162,18 +1162,6 @@ static HRESULT WINAPI hid_joystick_EnumCreatedEffectObjects( IDirectInputDevice8 return DI_OK; } -static HRESULT WINAPI hid_joystick_Poll( IDirectInputDevice8W *iface ) -{ - struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - HRESULT hr = DI_NOEFFECT; - - EnterCriticalSection( &impl->base.crit ); - if (!impl->base.acquired) hr = DIERR_NOTACQUIRED; - LeaveCriticalSection( &impl->base.crit ); - - return hr; -} - static const IDirectInputDevice8WVtbl hid_joystick_vtbl = { /*** IUnknown methods ***/ @@ -1204,7 +1192,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = hid_joystick_SendForceFeedbackCommand, hid_joystick_EnumCreatedEffectObjects, IDirectInputDevice2WImpl_Escape, - hid_joystick_Poll, + IDirectInputDevice2WImpl_Poll, IDirectInputDevice2WImpl_SendDeviceData, /*** IDirectInputDevice7 methods ***/ IDirectInputDevice7WImpl_EnumEffectsInFile, @@ -1432,6 +1420,7 @@ static HRESULT hid_joystick_internal_enum_objects( IDirectInputDevice8W *iface, static const struct dinput_device_vtbl hid_joystick_internal_vtbl = { + NULL, hid_joystick_internal_read, hid_joystick_internal_acquire, hid_joystick_internal_unacquire, diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index ad91c948fbc..a8f831e7597 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -270,6 +270,12 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W ifac return DI_OK; } +static HRESULT keyboard_internal_poll( IDirectInputDevice8W *iface ) +{ + check_dinput_events(); + return DI_OK; +} + static HRESULT keyboard_internal_acquire( IDirectInputDevice8W *iface ) { return DI_OK; @@ -353,6 +359,7 @@ static HRESULT keyboard_internal_set_property( IDirectInputDevice8W *iface, DWOR static const struct dinput_device_vtbl keyboard_internal_vtbl = { + keyboard_internal_poll, NULL, keyboard_internal_acquire, keyboard_internal_unacquire, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 5b3ec2d1f20..5933d7e5f0f 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -490,6 +490,12 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W iface, return res; } +static HRESULT mouse_internal_poll( IDirectInputDevice8W *iface ) +{ + check_dinput_events(); + return DI_OK; +} + static HRESULT mouse_internal_acquire( IDirectInputDevice8W *iface ) { SysMouseImpl *impl = impl_from_IDirectInputDevice8W( iface ); @@ -683,6 +689,7 @@ static HRESULT mouse_internal_set_property( IDirectInputDevice8W *iface, DWORD p static const struct dinput_device_vtbl mouse_internal_vtbl = { + mouse_internal_poll, NULL, mouse_internal_acquire, mouse_internal_unacquire,

1 0