May 2020 - Wine-commits - list.winehq.org

Jacek Caban : winnt.h: Provide inline NtCurrentTeb implementation for mingw arm builds.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 6a05b84ecaf6fa1f3343011351f9bdd2e4e5eaf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a05b84ecaf6fa1f33430113… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 20:19:04 2020 +0200 winnt.h: Provide inline NtCurrentTeb implementation for mingw arm builds. Based on mingw-w64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index ae9177842b..34951766dd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2675,6 +2675,13 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); } +#elif defined(__arm__) && defined(__MINGW32__) +static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) +{ + struct _TEB *teb; + __asm__("mrc p15, 0, %0, c13, c0, 2" : "=r" (teb)); + return teb; +} #else extern struct _TEB * WINAPI NtCurrentTeb(void); #endif

1 0

Arkadiusz Hiler : user32: Move *RegisterDeviceNotification*() to input.c.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 8091922d9af2ae82bea37c7dbc26776c1407252a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8091922d9af2ae82bea37c7d… Author: Arkadiusz Hiler <arek(a)hiler.eu> Date: Tue May 26 23:01:35 2020 +0300 user32: Move *RegisterDeviceNotification*() to input.c. Signed-off-by: Arkadiusz Hiler <arek(a)hiler.eu> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/misc.c | 69 ----------------------------------------------------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 2f8648f177..1dd43a36a1 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -45,6 +45,7 @@ #include "winerror.h" #include "win.h" #include "user_private.h" +#include "dbt.h" #include "wine/server.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -1298,3 +1299,71 @@ BOOL WINAPI EnableMouseInPointer(BOOL enable) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +static DWORD CALLBACK devnotify_window_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) +{ + SendMessageTimeoutW(handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL); + return 0; +} + +static DWORD CALLBACK devnotify_service_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) +{ + FIXME("Support for service handles is not yet implemented!\n"); + return 0; +} + +struct device_notification_details +{ + DWORD (CALLBACK *cb)(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header); + HANDLE handle; +}; + +extern HDEVNOTIFY WINAPI I_ScRegisterDeviceNotification( struct device_notification_details *details, + void *filter, DWORD flags ); +extern BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle ); + +/*********************************************************************** + * RegisterDeviceNotificationA (USER32.@) + * + * See RegisterDeviceNotificationW. + */ +HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hRecipient, LPVOID pNotificationFilter, DWORD dwFlags) +{ + TRACE("(hwnd=%p, filter=%p,flags=0x%08x)\n", + hRecipient,pNotificationFilter,dwFlags); + if (pNotificationFilter) + FIXME("The notification filter will requires an A->W when filter support is implemented\n"); + return RegisterDeviceNotificationW(hRecipient, pNotificationFilter, dwFlags); +} + +/*********************************************************************** + * RegisterDeviceNotificationW (USER32.@) + */ +HDEVNOTIFY WINAPI RegisterDeviceNotificationW( HANDLE handle, void *filter, DWORD flags ) +{ + struct device_notification_details details; + + TRACE("handle %p, filter %p, flags %#x\n", handle, filter, flags); + + if (flags & ~(DEVICE_NOTIFY_SERVICE_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES)) + FIXME("unhandled flags %#x\n", flags); + + details.handle = handle; + + if (flags & DEVICE_NOTIFY_SERVICE_HANDLE) + details.cb = devnotify_service_callback; + else + details.cb = devnotify_window_callback; + + return I_ScRegisterDeviceNotification( &details, filter, 0 ); +} + +/*********************************************************************** + * UnregisterDeviceNotification (USER32.@) + */ +BOOL WINAPI UnregisterDeviceNotification( HDEVNOTIFY handle ) +{ + TRACE("%p\n", handle); + + return I_ScUnregisterDeviceNotification( handle ); +} diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 41909f9071..59b85baa58 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -31,7 +31,6 @@ #include "wingdi.h" #include "controls.h" #include "user_private.h" -#include "dbt.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -279,74 +278,6 @@ DWORD WINAPI RegisterTasklist (DWORD x) return TRUE; } -static DWORD CALLBACK devnotify_window_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) -{ - SendMessageTimeoutW(handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL); - return 0; -} - -static DWORD CALLBACK devnotify_service_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) -{ - FIXME("Support for service handles is not yet implemented!\n"); - return 0; -} - -struct device_notification_details -{ - DWORD (CALLBACK *cb)(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header); - HANDLE handle; -}; - -extern HDEVNOTIFY WINAPI I_ScRegisterDeviceNotification( struct device_notification_details *details, - void *filter, DWORD flags ); -extern BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle ); - -/*********************************************************************** - * RegisterDeviceNotificationA (USER32.@) - * - * See RegisterDeviceNotificationW. - */ -HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hRecipient, LPVOID pNotificationFilter, DWORD dwFlags) -{ - TRACE("(hwnd=%p, filter=%p,flags=0x%08x)\n", - hRecipient,pNotificationFilter,dwFlags); - if (pNotificationFilter) - FIXME("The notification filter will requires an A->W when filter support is implemented\n"); - return RegisterDeviceNotificationW(hRecipient, pNotificationFilter, dwFlags); -} - -/*********************************************************************** - * RegisterDeviceNotificationW (USER32.@) - */ -HDEVNOTIFY WINAPI RegisterDeviceNotificationW( HANDLE handle, void *filter, DWORD flags ) -{ - struct device_notification_details details; - - TRACE("handle %p, filter %p, flags %#x\n", handle, filter, flags); - - if (flags & ~(DEVICE_NOTIFY_SERVICE_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES)) - FIXME("unhandled flags %#x\n", flags); - - details.handle = handle; - - if (flags & DEVICE_NOTIFY_SERVICE_HANDLE) - details.cb = devnotify_service_callback; - else - details.cb = devnotify_window_callback; - - return I_ScRegisterDeviceNotification( &details, filter, 0 ); -} - -/*********************************************************************** - * UnregisterDeviceNotification (USER32.@) - */ -BOOL WINAPI UnregisterDeviceNotification( HDEVNOTIFY handle ) -{ - TRACE("%p\n", handle); - - return I_ScUnregisterDeviceNotification( handle ); -} - /*********************************************************************** * GetAppCompatFlags (USER32.@) */

1 0

Arkadiusz Hiler : user32: Fix NULL dereference in UnregisterDeviceNotification.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 65e550d265c481ff80d796622258c7177b36d745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65e550d265c481ff80d79662… Author: Arkadiusz Hiler <arek(a)hiler.eu> Date: Tue May 26 23:01:36 2020 +0300 user32: Fix NULL dereference in UnregisterDeviceNotification. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49211 Signed-off-by: Arkadiusz Hiler <arek(a)hiler.eu> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sechost/service.c | 3 +++ dlls/user32/tests/input.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 924a6c9264..68d2b9e78e 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -2109,6 +2109,9 @@ BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle ) TRACE("%p\n", handle); + if (!handle) + return FALSE; + EnterCriticalSection( &service_cs ); list_remove( &registration->entry ); LeaveCriticalSection(&service_cs); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 92b18becd2..913fabfbd8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3004,6 +3004,12 @@ static void test_GetPointerType(void) ok(type == PT_MOUSE, " type %d\n", type ); } +static void test_UnregisterDeviceNotification(void) +{ + BOOL ret = UnregisterDeviceNotification(NULL); + ok(ret == FALSE, "Unregistering NULL Device Notification returned: %d\n", ret); +} + START_TEST(input) { POINT pos; @@ -3050,4 +3056,6 @@ START_TEST(input) test_GetPointerType(); else win_skip("GetPointerType is not available\n"); + + test_UnregisterDeviceNotification(); }

1 0

Gijs Vermeulen : include: Add cfg.h.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 912d5437ea5728fad10c5f7e3c2285f6107ccf04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=912d5437ea5728fad10c5f7e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon May 25 17:17:38 2020 +0200 include: Add cfg.h. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/cfg.h | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 198 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 2f2d94d574..9796dd8e5d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -55,6 +55,7 @@ SOURCES = \ bthsdpdef.h \ cderr.h \ cdosys.idl \ + cfg.h \ cfgmgr32.h \ cguid.h \ chprst.idl \ diff --git a/include/cfg.h b/include/cfg.h new file mode 100644 index 0000000000..30d30b4bee --- /dev/null +++ b/include/cfg.h @@ -0,0 +1,197 @@ +/* + * Copyright 2020 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _CFG_INCLUDED_ +#define _CFG_INCLUDED_ + +typedef enum _PNP_VETO_TYPE { + PNP_VetoTypeUnknown, + PNP_VetoLegacyDevice, + PNP_VetoPendingClose, + PNP_VetoWindowsApp, + PNP_VetoWindowsService, + PNP_VetoOutstandingOpen, + PNP_VetoDevice, + PNP_VetoDriver, + PNP_VetoIllegalDeviceRequest, + PNP_VetoInsufficientPower, + PNP_VetoNonDisableable, + PNP_VetoLegacyDriver, + PNP_VetoInsufficientRights, + PNP_VetoAlreadyRemoved +} PNP_VETO_TYPE, *PPNP_VETO_TYPE; + +#define CM_PROB_NOT_CONFIGURED (0x00000001) +#define CM_PROB_DEVLOADER_FAILED (0x00000002) +#define CM_PROB_OUT_OF_MEMORY (0x00000003) +#define CM_PROB_ENTRY_IS_WRONG_TYPE (0x00000004) +#define CM_PROB_LACKED_ARBITRATOR (0x00000005) +#define CM_PROB_BOOT_CONFIG_CONFLICT (0x00000006) +#define CM_PROB_FAILED_FILTER (0x00000007) +#define CM_PROB_DEVLOADER_NOT_FOUND (0x00000008) +#define CM_PROB_INVALID_DATA (0x00000009) +#define CM_PROB_FAILED_START (0x0000000A) +#define CM_PROB_LIAR (0x0000000B) +#define CM_PROB_NORMAL_CONFLICT (0x0000000C) +#define CM_PROB_NOT_VERIFIED (0x0000000D) +#define CM_PROB_NEED_RESTART (0x0000000E) +#define CM_PROB_REENUMERATION (0x0000000F) +#define CM_PROB_PARTIAL_LOG_CONF (0x00000010) +#define CM_PROB_UNKNOWN_RESOURCE (0x00000011) +#define CM_PROB_REINSTALL (0x00000012) +#define CM_PROB_REGISTRY (0x00000013) +#define CM_PROB_VXDLDR (0x00000014) +#define CM_PROB_WILL_BE_REMOVED (0x00000015) +#define CM_PROB_DISABLED (0x00000016) +#define CM_PROB_DEVLOADER_NOT_READY (0x00000017) +#define CM_PROB_DEVICE_NOT_THERE (0x00000018) +#define CM_PROB_MOVED (0x00000019) +#define CM_PROB_TOO_EARLY (0x0000001A) +#define CM_PROB_NO_VALID_LOG_CONF (0x0000001B) +#define CM_PROB_FAILED_INSTALL (0x0000001C) +#define CM_PROB_HARDWARE_DISABLED (0x0000001D) +#define CM_PROB_CANT_SHARE_IRQ (0x0000001E) +#define CM_PROB_FAILED_ADD (0x0000001F) +#define CM_PROB_DISABLED_SERVICE (0x00000020) +#define CM_PROB_TRANSLATION_FAILED (0x00000021) +#define CM_PROB_NO_SOFTCONFIG (0x00000022) +#define CM_PROB_BIOS_TABLE (0x00000023) +#define CM_PROB_IRQ_TRANSLATION_FAILED (0x00000024) +#define CM_PROB_FAILED_DRIVER_ENTRY (0x00000025) +#define CM_PROB_DRIVER_FAILED_PRIOR_UNLOAD (0x00000026) +#define CM_PROB_DRIVER_FAILED_LOAD (0x00000027) +#define CM_PROB_DRIVER_SERVICE_KEY_INVALID (0x00000028) +#define CM_PROB_LEGACY_SERVICE_NO_DEVICES (0x00000029) +#define CM_PROB_DUPLICATE_DEVICE (0x0000002A) +#define CM_PROB_FAILED_POST_START (0x0000002B) +#define CM_PROB_HALTED (0x0000002C) +#define CM_PROB_PHANTOM (0x0000002D) +#define CM_PROB_SYSTEM_SHUTDOWN (0x0000002E) +#define CM_PROB_HELD_FOR_EJECT (0x0000002F) +#define CM_PROB_DRIVER_BLOCKED (0x00000030) +#define CM_PROB_REGISTRY_TOO_LARGE (0x00000031) +#define CM_PROB_SETPROPERTIES_FAILED (0x00000032) +#define CM_PROB_WAITING_ON_DEPENDENCY (0x00000033) +#define CM_PROB_UNSIGNED_DRIVER (0x00000034) +#define CM_PROB_USED_BY_DEBUGGER (0x00000035) +#define CM_PROB_DEVICE_RESET (0x00000036) +#define CM_PROB_CONSOLE_LOCKED (0x00000037) +#define CM_PROB_NEED_CLASS_CONFIG (0x00000038) +#define CM_PROB_GUEST_ASSIGNMENT_FAILED (0x00000039) + +#define NUM_CM_PROB_V1 (0x00000025) +#define NUM_CM_PROB_V2 (0x00000032) +#define NUM_CM_PROB_V3 (0x00000033) +#define NUM_CM_PROB_V4 (0x00000034) +#define NUM_CM_PROB_V5 (0x00000035) +#define NUM_CM_PROB_V6 (0x00000036) +#define NUM_CM_PROB_V7 (0x00000037) +#define NUM_CM_PROB_V8 (0x00000039) +#define NUM_CM_PROB_V9 (0x0000003A) + +#define NUM_CM_PROB NUM_CM_PROB_V9 + +#define DN_ROOT_ENUMERATED (0x00000001) +#define DN_DRIVER_LOADED (0x00000002) +#define DN_ENUM_LOADED (0x00000004) +#define DN_STARTED (0x00000008) +#define DN_MANUAL (0x00000010) +#define DN_NEED_TO_ENUM (0x00000020) +#define DN_NOT_FIRST_TIME (0x00000040) +#define DN_HARDWARE_ENUM (0x00000080) +#define DN_LIAR (0x00000100) +#define DN_HAS_MARK (0x00000200) +#define DN_HAS_PROBLEM (0x00000400) +#define DN_FILTERED (0x00000800) +#define DN_MOVED (0x00001000) +#define DN_DISABLEABLE (0x00002000) +#define DN_REMOVABLE (0x00004000) +#define DN_PRIVATE_PROBLEM (0x00008000) +#define DN_MF_PARENT (0x00010000) +#define DN_MF_CHILD (0x00020000) +#define DN_WILL_BE_REMOVED (0x00040000) + +#define DN_NOT_FIRST_TIMEE 0x00080000 +#define DN_STOP_FREE_RES 0x00100000 +#define DN_REBAL_CANDIDATE 0x00200000 +#define DN_BAD_PARTIAL 0x00400000 +#define DN_NT_ENUMERATOR 0x00800000 +#define DN_NT_DRIVER 0x01000000 + +#define DN_NEEDS_LOCKING 0x02000000 +#define DN_ARM_WAKEUP 0x04000000 +#define DN_APM_ENUMERATOR 0x08000000 +#define DN_APM_DRIVER 0x10000000 +#define DN_SILENT_INSTALL 0x20000000 +#define DN_NO_SHOW_IN_DM 0x40000000 +#define DN_BOOT_LOG_PROB 0x80000000 + +#define DN_NEED_RESTART DN_LIAR +#define DN_DRIVER_BLOCKED DN_NOT_FIRST_TIME +#define DN_LEGACY_DRIVER DN_MOVED +#define DN_CHILD_WITH_INVALID_ID DN_HAS_MARK +#define DN_DEVICE_DISCONNECTED DN_NEEDS_LOCKING +#define DN_QUERY_REMOVE_PENDING DN_MF_PARENT +#define DN_QUERY_REMOVE_ACTIVE DN_MF_CHILD + +#define DN_CHANGEABLE_FLAGS (DN_NOT_FIRST_TIME+DN_HARDWARE_ENUM+DN_HAS_MARK+DN_DISABLEABLE+DN_REMOVABLE+DN_MF_CHILD+DN_MF_PARENT+DN_NOT_FIRST_TIMEE+DN_STOP_FREE_RES+DN_REBAL_CANDIDATE+DN_NT_ENUMERATOR+DN_NT_DRIVER+DN_SILENT_INSTALL+DN_NO_SHOW_IN_DM) + +#define LCPRI_FORCECONFIG (0x00000000) +#define LCPRI_BOOTCONFIG (0x00000001) +#define LCPRI_DESIRED (0x00002000) +#define LCPRI_NORMAL (0x00003000) +#define LCPRI_LASTBESTCONFIG (0x00003FFF) +#define LCPRI_SUBOPTIMAL (0x00005000) +#define LCPRI_LASTSOFTCONFIG (0x00007FFF) +#define LCPRI_RESTART (0x00008000) +#define LCPRI_REBOOT (0x00009000) +#define LCPRI_POWEROFF (0x0000A000) +#define LCPRI_HARDRECONFIG (0x0000C000) +#define LCPRI_HARDWIRED (0x0000E000) +#define LCPRI_IMPOSSIBLE (0x0000F000) +#define LCPRI_DISABLED (0x0000FFFF) +#define MAX_LCPRI (0x0000FFFF) + +#define CM_DEVICE_PANEL_SIDE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_SIDE_TOP (0x00000001) +#define CM_DEVICE_PANEL_SIDE_BOTTOM (0x00000002) +#define CM_DEVICE_PANEL_SIDE_LEFT (0x00000003) +#define CM_DEVICE_PANEL_SIDE_RIGHT (0x00000004) +#define CM_DEVICE_PANEL_SIDE_FRONT (0x00000005) +#define CM_DEVICE_PANEL_SIDE_BACK (0x00000006) + +#define CM_DEVICE_PANEL_EDGE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_EDGE_TOP (0x00000001) +#define CM_DEVICE_PANEL_EDGE_BOTTOM (0x00000002) +#define CM_DEVICE_PANEL_EDGE_LEFT (0x00000003) +#define CM_DEVICE_PANEL_EDGE_RIGHT (0x00000004) + +#define CM_DEVICE_PANEL_SHAPE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_SHAPE_RECTANGLE (0x00000001) +#define CM_DEVICE_PANEL_SHAPE_OVAL (0x00000002) + +#define CM_DEVICE_PANEL_ORIENTATION_HORIZONTAL (0x00000000) +#define CM_DEVICE_PANEL_ORIENTATION_VERTICAL (0x00000001) + +#define CM_DEVICE_PANEL_JOINT_TYPE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_JOINT_TYPE_PLANAR (0x00000001) +#define CM_DEVICE_PANEL_JOINT_TYPE_HINGE (0x00000002) +#define CM_DEVICE_PANEL_JOINT_TYPE_PIVOT (0x00000003) +#define CM_DEVICE_PANEL_JOINT_TYPE_SWIVEL (0x00000004) + +#endif /* _CFG_INCLUDED_ */

1 0

Zebediah Figura : quartz/vmr9: Fake success from IVMRMixerConrol9::SetMixingPrefs().
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: dc93d5f856cd14eddc2db688248a700c256d17ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc93d5f856cd14eddc2db688… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 27 14:26:22 2020 -0500 quartz/vmr9: Fake success from IVMRMixerConrol9::SetMixingPrefs(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 33 +++++++++++++++++++++++++++++++++ dlls/quartz/vmr9.c | 14 +++++++++++--- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index dfa9dae73e..0a8ae371a6 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3876,6 +3876,38 @@ out: DestroyWindow(window); } +static void test_mixing_prefs(void) +{ + IBaseFilter *filter = create_vmr9(VMR9Mode_Windowed); + IVMRMixerControl9 *mixer_control; + DWORD flags; + HRESULT hr; + ULONG ref; + + set_mixing_mode(filter, 1); + + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRMixerControl9, (void **)&mixer_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRMixerControl9_GetMixingPrefs(mixer_control, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(flags == (MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering + | MixerPref9_RenderTargetRGB), "Got flags %#x.\n", flags); + + hr = IVMRMixerControl9_SetMixingPrefs(mixer_control, MixerPref9_NoDecimation + | MixerPref9_ARAdjustXorY | MixerPref9_PointFiltering | MixerPref9_RenderTargetRGB); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRMixerControl9_GetMixingPrefs(mixer_control, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(flags == (MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_PointFiltering + | MixerPref9_RenderTargetRGB), "Got flags %#x.\n", flags); + + IVMRMixerControl9_Release(mixer_control); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -3910,6 +3942,7 @@ START_TEST(vmr9) test_surface_allocator_notify_refcount(); test_basic_video(); test_windowless_size(); + test_mixing_prefs(); CoUninitialize(); } diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 81e265f104..a716a6e712 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -84,6 +84,7 @@ struct quartz_vmr BOOL allocator_is_ex; DWORD stream_count; + DWORD mixing_prefs; /* * The Video Mixing Renderer supports 3 modes, renderless, windowless and windowed @@ -2227,7 +2228,10 @@ static HRESULT WINAPI mixer_control9_SetMixingPrefs(IVMRMixerControl9 *iface, DW FIXME("filter %p, flags %#x, stub!\n", filter, flags); - return E_NOTIMPL; + EnterCriticalSection(&filter->renderer.filter.csFilter); + filter->mixing_prefs = flags; + LeaveCriticalSection(&filter->renderer.filter.csFilter); + return S_OK; } static HRESULT WINAPI mixer_control9_GetMixingPrefs(IVMRMixerControl9 *iface, DWORD *flags) @@ -2236,8 +2240,9 @@ static HRESULT WINAPI mixer_control9_GetMixingPrefs(IVMRMixerControl9 *iface, DW FIXME("filter %p, flags %p, stub!\n", filter, flags); - *flags = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; - + EnterCriticalSection(&filter->renderer.filter.csFilter); + *flags = filter->mixing_prefs; + LeaveCriticalSection(&filter->renderer.filter.csFilter); return S_OK; } @@ -2500,6 +2505,9 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); + object->mixing_prefs = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY + | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; + TRACE("Created VMR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; return S_OK;

1 0

Zebediah Figura : quartz/vmr9: Use TRACE for some implemented methods.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: f020fe051b02d7bda90a1fdb028a60e2ab7400f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f020fe051b02d7bda90a1fdb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 27 11:47:33 2020 -0500 quartz/vmr9: Use TRACE for some implemented methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 59 +++++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index a716a6e712..7fca3550d1 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1699,17 +1699,18 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessContr return S_OK; } -static HRESULT WINAPI VMR9WindowlessControl_GetVideoPosition(IVMRWindowlessControl9 *iface, RECT *source, RECT *dest) +static HRESULT WINAPI VMR9WindowlessControl_GetVideoPosition(IVMRWindowlessControl9 *iface, RECT *src, RECT *dst) { - struct quartz_vmr *This = impl_from_IVMRWindowlessControl9(iface); + struct quartz_vmr *filter = impl_from_IVMRWindowlessControl9(iface); - if (source) - *source = This->window.src; + TRACE("filter %p, src %p, dst %p.\n", filter, src, dst); - if (dest) - *dest = This->window.dst; + if (src) + *src = filter->window.src; + + if (dst) + *dst = filter->window.dst; - FIXME("(%p/%p)->(%p/%p) stub\n", iface, This, source, dest); return S_OK; } @@ -1955,42 +1956,46 @@ static ULONG WINAPI VMR9SurfaceAllocatorNotify_Release(IVMRSurfaceAllocatorNotif return refcount; } -static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator(IVMRSurfaceAllocatorNotify9 *iface, DWORD_PTR id, IVMRSurfaceAllocator9 *alloc) +static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator( + IVMRSurfaceAllocatorNotify9 *iface, DWORD_PTR cookie, IVMRSurfaceAllocator9 *allocator) { - struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); + struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface); - /* FIXME: This code is not tested!!! */ - FIXME("(%p/%p)->(...) stub\n", iface, This); - This->cookie = id; + TRACE("filter %p, cookie %#Ix, allocator %p.\n", filter, cookie, allocator); - if (This->presenter) + filter->cookie = cookie; + + if (filter->presenter) return VFW_E_WRONG_STATE; - if (FAILED(IVMRSurfaceAllocator9_QueryInterface(alloc, &IID_IVMRImagePresenter9, (void **)&This->presenter))) + if (FAILED(IVMRSurfaceAllocator9_QueryInterface(allocator, &IID_IVMRImagePresenter9, (void **)&filter->presenter))) return E_NOINTERFACE; - if (SUCCEEDED(IVMRSurfaceAllocator9_QueryInterface(alloc, &IID_IVMRSurfaceAllocatorEx9, (void **)&This->allocator))) - This->allocator_is_ex = 1; + if (SUCCEEDED(IVMRSurfaceAllocator9_QueryInterface(allocator, + &IID_IVMRSurfaceAllocatorEx9, (void **)&filter->allocator))) + filter->allocator_is_ex = 1; else { - This->allocator = (IVMRSurfaceAllocatorEx9 *)alloc; - IVMRSurfaceAllocator9_AddRef(alloc); - This->allocator_is_ex = 0; + filter->allocator = (IVMRSurfaceAllocatorEx9 *)allocator; + IVMRSurfaceAllocator9_AddRef(allocator); + filter->allocator_is_ex = 0; } return S_OK; } -static HRESULT WINAPI VMR9SurfaceAllocatorNotify_SetD3DDevice(IVMRSurfaceAllocatorNotify9 *iface, IDirect3DDevice9 *device, HMONITOR monitor) +static HRESULT WINAPI VMR9SurfaceAllocatorNotify_SetD3DDevice(IVMRSurfaceAllocatorNotify9 *iface, + IDirect3DDevice9 *device, HMONITOR monitor) { - struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); + struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface); - FIXME("(%p/%p)->(...) semi-stub\n", iface, This); - if (This->allocator_d3d9_dev) - IDirect3DDevice9_Release(This->allocator_d3d9_dev); - This->allocator_d3d9_dev = device; - IDirect3DDevice9_AddRef(This->allocator_d3d9_dev); - This->allocator_mon = monitor; + TRACE("filter %p, device %p, monitor %p.\n", filter, device, monitor); + + if (filter->allocator_d3d9_dev) + IDirect3DDevice9_Release(filter->allocator_d3d9_dev); + filter->allocator_d3d9_dev = device; + IDirect3DDevice9_AddRef(device); + filter->allocator_mon = monitor; return S_OK; }

1 0

Zebediah Figura : quartz/vmr9: Don't query for IVMRSurfaceAllocatorEx9.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 39489e4d01ace78e90943c066e7e43105cf208a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39489e4d01ace78e90943c06… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 27 11:47:34 2020 -0500 quartz/vmr9: Don't query for IVMRSurfaceAllocatorEx9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 1 + dlls/quartz/vmr9.c | 33 ++++++++++++--------------------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 0a8ae371a6..2921d1aed0 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2852,6 +2852,7 @@ static HRESULT WINAPI allocator_QueryInterface(IVMRSurfaceAllocator9 *iface, REF IVMRImagePresenter9_AddRef(&presenter_iface); return S_OK; } + ok(!IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorEx9), "Unexpected query for IVMRSurfaceAllocatorEx9.\n"); *out = NULL; return E_NOTIMPL; } diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 7fca3550d1..e02b642dbc 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -79,9 +79,8 @@ struct quartz_vmr IOverlay IOverlay_iface; - IVMRSurfaceAllocatorEx9 *allocator; + IVMRSurfaceAllocator9 *allocator; IVMRImagePresenter9 *presenter; - BOOL allocator_is_ex; DWORD stream_count; DWORD mixing_prefs; @@ -345,7 +344,7 @@ static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo * HRESULT hr; DWORD i; - if (FAILED(hr = IVMRSurfaceAllocatorEx9_InitializeDevice(filter->allocator, + if (FAILED(hr = IVMRSurfaceAllocator9_InitializeDevice(filter->allocator, filter->cookie, info, &count))) { WARN("Failed to initialize device (flags %#x), hr %#x.\n", info->dwFlags, hr); @@ -354,13 +353,13 @@ static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo * for (i = 0; i < count; ++i) { - if (FAILED(hr = IVMRSurfaceAllocatorEx9_GetSurface(filter->allocator, + if (FAILED(hr = IVMRSurfaceAllocator9_GetSurface(filter->allocator, filter->cookie, i, 0, &filter->surfaces[i]))) { ERR("Failed to get surface %u, hr %#x.\n", i, hr); while (i--) IDirect3DSurface9_Release(filter->surfaces[i]); - IVMRSurfaceAllocatorEx9_TerminateDevice(filter->allocator, filter->cookie); + IVMRSurfaceAllocator9_TerminateDevice(filter->allocator, filter->cookie); return hr; } } @@ -533,7 +532,7 @@ static HRESULT WINAPI VMR9_BreakConnect(struct strmbase_renderer *This) for (i = 0; i < pVMR9->num_surfaces; ++i) IDirect3DSurface9_Release(pVMR9->surfaces[i]); free(pVMR9->surfaces); - IVMRSurfaceAllocatorEx9_TerminateDevice(pVMR9->allocator, pVMR9->cookie); + IVMRSurfaceAllocator9_TerminateDevice(pVMR9->allocator, pVMR9->cookie); pVMR9->num_surfaces = 0; } return hr; @@ -558,8 +557,8 @@ static void vmr_destroy(struct strmbase_renderer *iface) if (filter->allocator) { - IVMRSurfaceAllocatorEx9_TerminateDevice(filter->allocator, filter->cookie); - IVMRSurfaceAllocatorEx9_Release(filter->allocator); + IVMRSurfaceAllocator9_TerminateDevice(filter->allocator, filter->cookie); + IVMRSurfaceAllocator9_Release(filter->allocator); } if (filter->presenter) IVMRImagePresenter9_Release(filter->presenter); @@ -1353,7 +1352,7 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface } if (This->allocator) - IVMRSurfaceAllocatorEx9_Release(This->allocator); + IVMRSurfaceAllocator9_Release(This->allocator); if (This->presenter) IVMRImagePresenter9_Release(This->presenter); @@ -1364,7 +1363,6 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface { case VMR9Mode_Windowed: case VMR9Mode_Windowless: - This->allocator_is_ex = 0; This->cookie = ~0; hr = VMR9DefaultAllocatorPresenterImpl_create(This, (LPVOID*)&This->presenter); @@ -1378,7 +1376,7 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface This->presenter = NULL; } else - hr = IVMRSurfaceAllocatorEx9_AdviseNotify(This->allocator, &This->IVMRSurfaceAllocatorNotify9_iface); + hr = IVMRSurfaceAllocator9_AdviseNotify(This->allocator, &This->IVMRSurfaceAllocatorNotify9_iface); break; case VMR9Mode_Renderless: break; @@ -1971,15 +1969,8 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator( if (FAILED(IVMRSurfaceAllocator9_QueryInterface(allocator, &IID_IVMRImagePresenter9, (void **)&filter->presenter))) return E_NOINTERFACE; - if (SUCCEEDED(IVMRSurfaceAllocator9_QueryInterface(allocator, - &IID_IVMRSurfaceAllocatorEx9, (void **)&filter->allocator))) - filter->allocator_is_ex = 1; - else - { - filter->allocator = (IVMRSurfaceAllocatorEx9 *)allocator; - IVMRSurfaceAllocator9_AddRef(allocator); - filter->allocator_is_ex = 0; - } + filter->allocator = allocator; + IVMRSurfaceAllocator9_AddRef(allocator); return S_OK; } @@ -2827,7 +2818,7 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation if (FAILED(hr)) { - IVMRSurfaceAllocatorEx9_TerminateDevice(This->pVMR9->allocator, This->pVMR9->cookie); + IVMRSurfaceAllocator9_TerminateDevice(This->pVMR9->allocator, This->pVMR9->cookie); return FALSE; }

1 0

Nikolay Sivov : dwrite: Reference currently used layout table in context.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 3cf308d1b8dd57d0569d796cdfc206eb08e944c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cf308d1b8dd57d0569d796c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 10:14:21 2020 +0300 dwrite: Reference currently used layout table in context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 3 ++ dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 114 +++++++++++++++++++------------------------ 3 files changed, 54 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cf308d1b8dd57d0569d…

1 0

Nikolay Sivov : dwrite: Handle extension substitution (GSUB lookup 7).
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 3abcf68af994780050cbef5e3d2cdd30c1abc681 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3abcf68af994780050cbef5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 10:14:22 2020 +0300 dwrite: Handle extension substitution (GSUB lookup 7). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 255 ++++++++++++++++++++++++++----------------------- 1 file changed, 135 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3abcf68af994780050cb…

1 0

Nikolay Sivov : dwrite: Implement alternate substitution (GSUB lookup 3).
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: d5058fb304b72d6a0a836780ad865c6100d1a4c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5058fb304b72d6a0a836780… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 10:14:23 2020 +0300 dwrite: Implement alternate substitution (GSUB lookup 3). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 81b6aaa229..c815165505 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -569,6 +569,14 @@ struct ot_gsub_singlesubst_format2 UINT16 substitutes[1]; }; +struct ot_gsub_altsubst_format1 +{ + UINT16 format; + UINT16 coverage; + UINT16 count; + UINT16 sets[1]; +}; + struct ot_gsub_chaincontext_subst_format1 { UINT16 format; @@ -3256,6 +3264,23 @@ static inline unsigned int dwrite_popcount(unsigned int x) #endif } +static inline unsigned int dwrite_ctz(unsigned int x) +{ +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) + return __builtin_ctz(x); +#else + unsigned int c = 32; + x &= - (int) x; + if (x) c--; + if (x & 0x0000ffff) c -= 16; + if (x & 0x00ff00ff) c -= 8; + if (x & 0x0f0f0f0f) c -= 4; + if (x & 0x33333333) c -= 2; + if (x & 0x55555555) c -= 1; + return c; +#endif +} + static inline unsigned int dwrite_log2i(unsigned int x) { #if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) @@ -4505,6 +4530,61 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_ return ret; } +static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_context *context, const struct lookup *lookup, + unsigned int subtable_offset) +{ + const struct dwrite_fonttable *gsub = &context->table->table; + UINT16 format, coverage, orig_glyph, glyph; + unsigned int idx, coverage_index, offset; + BOOL ret; + + idx = context->cur; + orig_glyph = glyph = context->u.subst.glyphs[idx]; + + format = table_read_be_word(gsub, subtable_offset); + + if (format == 1) + { + const struct ot_gsub_altsubst_format1 *format1 = table_read_ensure(gsub, subtable_offset, sizeof(*format1)); + unsigned int count, shift, alt_index; + + coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, coverage)); + + coverage_index = opentype_layout_is_glyph_covered(context, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) + return FALSE; + + if (coverage_index >= GET_BE_WORD(format1->count)) + return FALSE; + + offset = table_read_be_word(gsub, subtable_offset + + FIELD_OFFSET(struct ot_gsub_altsubst_format1, sets[coverage_index])); + + count = table_read_be_word(gsub, subtable_offset + offset); + if (!count) + return FALSE; + + shift = dwrite_ctz(lookup->mask); + alt_index = (lookup->mask & context->glyph_infos[idx].mask) >> shift; + + if (alt_index > count || !alt_index) + return FALSE; + + glyph = table_read_be_word(gsub, subtable_offset + offset + sizeof(count) + (alt_index - 1) * sizeof(glyph)); + } + else + WARN("Unexpected alternate substitution format %d.\n", format); + + if ((ret = (glyph != orig_glyph))) + { + context->u.subst.glyphs[idx] = glyph; + opentype_set_subst_glyph_props(context, idx, glyph); + context->cur++; + } + + return ret; +} + #define CHAIN_CONTEXT_MAX_LENGTH 64 static BOOL opentype_layout_context_match_input(struct scriptshaping_context *context, unsigned int subtable_offset, @@ -4785,11 +4865,13 @@ static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont case GSUB_LOOKUP_SINGLE_SUBST: ret = opentype_layout_apply_gsub_single_substitution(context, lookup, subtable_offset); break; + case GSUB_LOOKUP_ALTERNATE_SUBST: + ret = opentype_layout_apply_gsub_alt_substitution(context, lookup, subtable_offset); + break; case GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST: ret = opentype_layout_apply_gsub_chain_context_substitution(context, lookup, subtable_offset); break; case GSUB_LOOKUP_MULTIPLE_SUBST: - case GSUB_LOOKUP_ALTERNATE_SUBST: case GSUB_LOOKUP_LIGATURE_SUBST: case GSUB_LOOKUP_CONTEXTUAL_SUBST: case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST:

1 0