Module: wine Branch: master Commit: 99f0d3d790dec274f94ebb29e5714d066f13ea79 URL: https://gitlab.winehq.org/wine/wine/-/commit/99f0d3d790dec274f94ebb29e5714d0...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Jul 31 16:00:45 2023 +0200
win32u: Move packed structures declaration from ntuser.h.
---
dlls/win32u/message.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 163 -------------------------------------------------- 2 files changed, 163 insertions(+), 163 deletions(-)
diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 6cf507f5bee..9ca3eab23b6 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -66,6 +66,169 @@ struct packed_hook_extra_info ULONGLONG lparam; };
+/* the various structures that can be sent in messages, in platform-independent layout */ +struct packed_CREATESTRUCTW +{ + ULONGLONG lpCreateParams; + ULONGLONG hInstance; + user_handle_t hMenu; + DWORD __pad1; + user_handle_t hwndParent; + DWORD __pad2; + INT cy; + INT cx; + INT y; + INT x; + LONG style; + ULONGLONG lpszName; + ULONGLONG lpszClass; + DWORD dwExStyle; + DWORD __pad3; +}; + +struct packed_DRAWITEMSTRUCT +{ + UINT CtlType; + UINT CtlID; + UINT itemID; + UINT itemAction; + UINT itemState; + user_handle_t hwndItem; + DWORD __pad1; + user_handle_t hDC; + DWORD __pad2; + RECT rcItem; + ULONGLONG itemData; +}; + +struct packed_MEASUREITEMSTRUCT +{ + UINT CtlType; + UINT CtlID; + UINT itemID; + UINT itemWidth; + UINT itemHeight; + ULONGLONG itemData; +}; + +struct packed_DELETEITEMSTRUCT +{ + UINT CtlType; + UINT CtlID; + UINT itemID; + user_handle_t hwndItem; + DWORD __pad; + ULONGLONG itemData; +}; + +struct packed_COMPAREITEMSTRUCT +{ + UINT CtlType; + UINT CtlID; + user_handle_t hwndItem; + DWORD __pad1; + UINT itemID1; + ULONGLONG itemData1; + UINT itemID2; + ULONGLONG itemData2; + DWORD dwLocaleId; + DWORD __pad2; +}; + +struct packed_WINDOWPOS +{ + UINT hwnd; + DWORD __pad1; + user_handle_t hwndInsertAfter; + DWORD __pad2; + INT x; + INT y; + INT cx; + INT cy; + UINT flags; + DWORD __pad3; +}; + +struct packed_COPYDATASTRUCT +{ + ULONGLONG dwData; + DWORD cbData; + ULONGLONG lpData; +}; + +struct packed_HELPINFO +{ + UINT cbSize; + INT iContextType; + INT iCtrlId; + user_handle_t hItemHandle; + DWORD __pad; + ULONGLONG dwContextId; + POINT MousePos; +}; + +struct packed_NCCALCSIZE_PARAMS +{ + RECT rgrc[3]; + ULONGLONG __pad1; + user_handle_t hwnd; + DWORD __pad2; + user_handle_t hwndInsertAfter; + DWORD __pad3; + INT x; + INT y; + INT cx; + INT cy; + UINT flags; + DWORD __pad4; +}; + +struct packed_MSG +{ + user_handle_t hwnd; + DWORD __pad1; + UINT message; + ULONGLONG wParam; + ULONGLONG lParam; + DWORD time; + POINT pt; + DWORD __pad2; +}; + +struct packed_MDINEXTMENU +{ + user_handle_t hmenuIn; + DWORD __pad1; + user_handle_t hmenuNext; + DWORD __pad2; + user_handle_t hwndNext; + DWORD __pad3; +}; + +struct packed_MDICREATESTRUCTW +{ + ULONGLONG szClass; + ULONGLONG szTitle; + ULONGLONG hOwner; + INT x; + INT y; + INT cx; + INT cy; + DWORD style; + ULONGLONG lParam; +}; + +struct packed_COMBOBOXINFO +{ + DWORD cbSize; + RECT rcItem; + RECT rcButton; + DWORD stateButton; + ULONGLONG hwndCombo; + ULONGLONG hwndItem; + ULONGLONG hwndList; +}; + /* the structures are unpacked on top of the packed ones, so make sure they fit */ C_ASSERT( sizeof(struct packed_CREATESTRUCTW) >= sizeof(CREATESTRUCTW) ); C_ASSERT( sizeof(struct packed_DRAWITEMSTRUCT) >= sizeof(DRAWITEMSTRUCT) ); diff --git a/include/ntuser.h b/include/ntuser.h index 7d679e9ede1..9077ebbb589 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -515,169 +515,6 @@ struct ime_driver_call_params
#define WM_SYSTIMER 0x0118
-/* the various structures that can be sent in messages, in platform-independent layout */ -struct packed_CREATESTRUCTW -{ - ULONGLONG lpCreateParams; - ULONGLONG hInstance; - UINT hMenu; - DWORD __pad1; - UINT hwndParent; - DWORD __pad2; - INT cy; - INT cx; - INT y; - INT x; - LONG style; - ULONGLONG lpszName; - ULONGLONG lpszClass; - DWORD dwExStyle; - DWORD __pad3; -}; - -struct packed_DRAWITEMSTRUCT -{ - UINT CtlType; - UINT CtlID; - UINT itemID; - UINT itemAction; - UINT itemState; - UINT hwndItem; - DWORD __pad1; - UINT hDC; - DWORD __pad2; - RECT rcItem; - ULONGLONG itemData; -}; - -struct packed_MEASUREITEMSTRUCT -{ - UINT CtlType; - UINT CtlID; - UINT itemID; - UINT itemWidth; - UINT itemHeight; - ULONGLONG itemData; -}; - -struct packed_DELETEITEMSTRUCT -{ - UINT CtlType; - UINT CtlID; - UINT itemID; - UINT hwndItem; - DWORD __pad; - ULONGLONG itemData; -}; - -struct packed_COMPAREITEMSTRUCT -{ - UINT CtlType; - UINT CtlID; - UINT hwndItem; - DWORD __pad1; - UINT itemID1; - ULONGLONG itemData1; - UINT itemID2; - ULONGLONG itemData2; - DWORD dwLocaleId; - DWORD __pad2; -}; - -struct packed_WINDOWPOS -{ - UINT hwnd; - DWORD __pad1; - UINT hwndInsertAfter; - DWORD __pad2; - INT x; - INT y; - INT cx; - INT cy; - UINT flags; - DWORD __pad3; -}; - -struct packed_COPYDATASTRUCT -{ - ULONGLONG dwData; - DWORD cbData; - ULONGLONG lpData; -}; - -struct packed_HELPINFO -{ - UINT cbSize; - INT iContextType; - INT iCtrlId; - UINT hItemHandle; - DWORD __pad; - ULONGLONG dwContextId; - POINT MousePos; -}; - -struct packed_NCCALCSIZE_PARAMS -{ - RECT rgrc[3]; - ULONGLONG __pad1; - UINT hwnd; - DWORD __pad2; - UINT hwndInsertAfter; - DWORD __pad3; - INT x; - INT y; - INT cx; - INT cy; - UINT flags; - DWORD __pad4; -}; - -struct packed_MSG -{ - UINT hwnd; - DWORD __pad1; - UINT message; - ULONGLONG wParam; - ULONGLONG lParam; - DWORD time; - POINT pt; - DWORD __pad2; -}; - -struct packed_MDINEXTMENU -{ - UINT hmenuIn; - DWORD __pad1; - UINT hmenuNext; - DWORD __pad2; - UINT hwndNext; - DWORD __pad3; -}; - -struct packed_MDICREATESTRUCTW -{ - ULONGLONG szClass; - ULONGLONG szTitle; - ULONGLONG hOwner; - INT x; - INT y; - INT cx; - INT cy; - DWORD style; - ULONGLONG lParam; -}; - -struct packed_COMBOBOXINFO -{ - DWORD cbSize; - RECT rcItem; - RECT rcButton; - DWORD stateButton; - ULONGLONG hwndCombo; - ULONGLONG hwndItem; - ULONGLONG hwndList; -}; -
HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ); BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd );