Jacek Caban : win32u: Don't use designated initializers for lazy_load_driver.
Alexandre Julliard
julliard at winehq.org
Fri Mar 18 16:39:54 CDT 2022
Module: wine
Branch: master
Commit: 8345d21b3a650bbc279989e05803b067db40ca55
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8345d21b3a650bbc279989e05803b067db40ca55
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Mar 18 14:29:44 2022 +0100
win32u: Don't use designated initializers for lazy_load_driver.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/win32u/driver.c | 86 +++++++++++++++++++++++++++-------------------------
1 file changed, 45 insertions(+), 41 deletions(-)
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index 4f77d1eb731..d1062cb5f3a 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -1171,56 +1171,60 @@ static const struct vulkan_funcs * CDECL loaderdrv_wine_get_vulkan_driver( UINT
static const struct user_driver_funcs lazy_load_driver =
{
+ { NULL },
/* keyboard functions */
- .pActivateKeyboardLayout = loaderdrv_ActivateKeyboardLayout,
- .pBeep = loaderdrv_Beep,
- .pGetKeyNameText = loaderdrv_GetKeyNameText,
- .pGetKeyboardLayoutList = loaderdrv_GetKeyboardLayoutList,
- .pMapVirtualKeyEx = loaderdrv_MapVirtualKeyEx,
- .pToUnicodeEx = loaderdrv_ToUnicodeEx,
- .pRegisterHotKey = loaderdrv_RegisterHotKey,
- .pUnregisterHotKey = loaderdrv_UnregisterHotKey,
- .pVkKeyScanEx = loaderdrv_VkKeyScanEx,
+ loaderdrv_ActivateKeyboardLayout,
+ loaderdrv_Beep,
+ loaderdrv_GetKeyNameText,
+ loaderdrv_GetKeyboardLayoutList,
+ loaderdrv_MapVirtualKeyEx,
+ loaderdrv_RegisterHotKey,
+ loaderdrv_ToUnicodeEx,
+ loaderdrv_UnregisterHotKey,
+ loaderdrv_VkKeyScanEx,
/* cursor/icon functions */
- .pDestroyCursorIcon = nulldrv_DestroyCursorIcon,
- .pSetCursor = loaderdrv_SetCursor,
- .pGetCursorPos = loaderdrv_GetCursorPos,
- .pSetCursorPos = loaderdrv_SetCursorPos,
- .pClipCursor = loaderdrv_ClipCursor,
+ nulldrv_DestroyCursorIcon,
+ loaderdrv_SetCursor,
+ loaderdrv_GetCursorPos,
+ loaderdrv_SetCursorPos,
+ loaderdrv_ClipCursor,
/* clipboard functions */
- .pUpdateClipboard = loaderdrv_UpdateClipboard,
+ loaderdrv_UpdateClipboard,
/* display modes */
- .pChangeDisplaySettingsEx = loaderdrv_ChangeDisplaySettingsEx,
- .pEnumDisplaySettingsEx = loaderdrv_EnumDisplaySettingsEx,
- .pUpdateDisplayDevices = loaderdrv_UpdateDisplayDevices,
+ loaderdrv_ChangeDisplaySettingsEx,
+ loaderdrv_EnumDisplaySettingsEx,
+ loaderdrv_UpdateDisplayDevices,
/* windowing functions */
- .pCreateDesktopWindow = loaderdrv_CreateDesktopWindow,
- .pCreateWindow = loaderdrv_CreateWindow,
- .pDestroyWindow = nulldrv_DestroyWindow,
- .pFlashWindowEx = loaderdrv_FlashWindowEx,
- .pGetDC = loaderdrv_GetDC,
- .pSetCapture = nulldrv_SetCapture,
- .pSetLayeredWindowAttributes = loaderdrv_SetLayeredWindowAttributes,
- .pSetParent = nulldrv_SetParent,
- .pSetWindowRgn = loaderdrv_SetWindowRgn,
- .pSetWindowStyle = nulldrv_SetWindowStyle,
- .pMsgWaitForMultipleObjectsEx = nulldrv_MsgWaitForMultipleObjectsEx,
- .pReleaseDC = nulldrv_ReleaseDC,
- .pScrollDC = nulldrv_ScrollDC,
- .pSetFocus = nulldrv_SetFocus,
- .pShowWindow = nulldrv_ShowWindow,
- .pUpdateLayeredWindow = loaderdrv_UpdateLayeredWindow,
- .pWindowMessage = nulldrv_WindowMessage,
- .pWindowPosChanging = nulldrv_WindowPosChanging,
- .pWindowPosChanged = nulldrv_WindowPosChanged,
+ loaderdrv_CreateDesktopWindow,
+ loaderdrv_CreateWindow,
+ nulldrv_DestroyWindow,
+ loaderdrv_FlashWindowEx,
+ loaderdrv_GetDC,
+ nulldrv_MsgWaitForMultipleObjectsEx,
+ nulldrv_ReleaseDC,
+ nulldrv_ScrollDC,
+ nulldrv_SetCapture,
+ nulldrv_SetFocus,
+ loaderdrv_SetLayeredWindowAttributes,
+ nulldrv_SetParent,
+ loaderdrv_SetWindowRgn,
+ nulldrv_SetWindowIcon,
+ nulldrv_SetWindowStyle,
+ nulldrv_SetWindowText,
+ nulldrv_ShowWindow,
+ nulldrv_SysCommand,
+ loaderdrv_UpdateLayeredWindow,
+ nulldrv_WindowMessage,
+ nulldrv_WindowPosChanging,
+ nulldrv_WindowPosChanged,
/* system parameters */
- .pSystemParametersInfo = nulldrv_SystemParametersInfo,
+ nulldrv_SystemParametersInfo,
/* vulkan support */
- .pwine_get_vulkan_driver = loaderdrv_wine_get_vulkan_driver,
+ loaderdrv_wine_get_vulkan_driver,
/* opengl support */
- .pwine_get_wgl_driver = nulldrv_wine_get_wgl_driver,
+ nulldrv_wine_get_wgl_driver,
/* thread management */
- .pThreadDetach = nulldrv_ThreadDetach,
+ nulldrv_ThreadDetach,
};
const struct user_driver_funcs *user_driver = &lazy_load_driver;
More information about the wine-cvs
mailing list