March 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : shell32: Pack the appbar data structure to allow crossing 32/64 boundaries.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 3cd9f97149857e07b1a57d1265f05096d730354b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd9f97149857e07b1a57d126… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 20:48:40 2010 +0200 shell32: Pack the appbar data structure to allow crossing 32/64 boundaries. --- dlls/shell32/appbar.c | 37 ++++++++++++++++++------ programs/explorer/appbar.c | 68 ++++++++++++++++++++++++++------------------ 2 files changed, 68 insertions(+), 37 deletions(-) diff --git a/dlls/shell32/appbar.c b/dlls/shell32/appbar.c index 7f89a37..212ee37 100644 --- a/dlls/shell32/appbar.c +++ b/dlls/shell32/appbar.c @@ -36,17 +36,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(appbar); +struct appbar_data_msg /* platform-independent data */ +{ + ULONG hWnd; + UINT uCallbackMessage; + UINT uEdge; + RECT rc; + ULONGLONG lParam; +}; + struct appbar_cmd { - HANDLE return_map; - DWORD return_process; - APPBARDATA abd; + ULONG return_map; + DWORD return_process; + struct appbar_data_msg abd; }; struct appbar_response { - UINT_PTR result; - APPBARDATA abd; + ULONGLONG result; + struct appbar_data_msg abd; }; /************************************************************************* @@ -75,7 +84,11 @@ UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) return FALSE; } - command.abd = *data; + command.abd.hWnd = HandleToLong( data->hWnd ); + command.abd.uCallbackMessage = data->uCallbackMessage; + command.abd.uEdge = data->uEdge; + command.abd.rc = data->rc; + command.abd.lParam = data->lParam; return_map = CreateFileMappingW(INVALID_HANDLE_VALUE, 0, PAGE_READWRITE, 0, sizeof(struct appbar_response), NULL); if (return_map == NULL) @@ -83,7 +96,7 @@ UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) ERR("couldn't create file mapping\n"); return 0; } - command.return_map = return_map; + command.return_map = HandleToUlong( return_map ); command.return_process = GetCurrentProcessId(); @@ -112,8 +125,14 @@ UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) response = return_view; ret = response->result; - *data = response->abd; - + if (ret) + { + data->hWnd = UlongToHandle( response->abd.hWnd ); + data->uCallbackMessage = response->abd.uCallbackMessage; + data->uEdge = response->abd.uEdge; + data->rc = response->abd.rc; + data->lParam = response->abd.lParam; + } UnmapViewOfFile(return_view); CloseHandle(return_map); diff --git a/programs/explorer/appbar.c b/programs/explorer/appbar.c index 2947ccd..ca3698e 100644 --- a/programs/explorer/appbar.c +++ b/programs/explorer/appbar.c @@ -37,17 +37,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(appbar); +struct appbar_data_msg /* platform-independent data */ +{ + LONG hWnd; + UINT uCallbackMessage; + UINT uEdge; + RECT rc; + ULONGLONG lParam; +}; + struct appbar_cmd { - HANDLE return_map; - DWORD return_process; - APPBARDATA abd; + ULONG return_map; + DWORD return_process; + struct appbar_data_msg abd; }; struct appbar_response { - UINT_PTR result; - APPBARDATA abd; + ULONGLONG result; + struct appbar_data_msg abd; }; static HWND appbarmsg_window = NULL; @@ -92,12 +101,12 @@ static void send_poschanged(HWND hwnd) } /* appbar_cliprect: cut out parts of the rectangle that interfere with existing appbars */ -static void appbar_cliprect(PAPPBARDATA abd) +static void appbar_cliprect( HWND hwnd, RECT *rect ) { struct appbar_data* data; LIST_FOR_EACH_ENTRY(data, &appbars, struct appbar_data, entry) { - if (data->hwnd == abd->hWnd) + if (data->hwnd == hwnd) { /* we only care about appbars that were added before this one */ return; @@ -108,30 +117,31 @@ static void appbar_cliprect(PAPPBARDATA abd) switch (data->edge) { case ABE_BOTTOM: - abd->rc.bottom = min(abd->rc.bottom, data->rc.top); + rect->bottom = min(rect->bottom, data->rc.top); break; case ABE_LEFT: - abd->rc.left = max(abd->rc.left, data->rc.right); + rect->left = max(rect->left, data->rc.right); break; case ABE_RIGHT: - abd->rc.right = min(abd->rc.right, data->rc.left); + rect->right = min(rect->right, data->rc.left); break; case ABE_TOP: - abd->rc.top = max(abd->rc.top, data->rc.bottom); + rect->top = max(rect->top, data->rc.bottom); break; } } } } -static UINT_PTR handle_appbarmessage(DWORD msg, PAPPBARDATA abd) +static UINT_PTR handle_appbarmessage(DWORD msg, struct appbar_data_msg *abd) { struct appbar_data* data; + HWND hwnd = LongToHandle( abd->hWnd ); switch (msg) { case ABM_NEW: - if (get_appbar(abd->hWnd)) + if (get_appbar(hwnd)) { /* fail when adding an hwnd the second time */ return FALSE; @@ -143,42 +153,42 @@ static UINT_PTR handle_appbarmessage(DWORD msg, PAPPBARDATA abd) WINE_ERR("out of memory\n"); return FALSE; } - data->hwnd = abd->hWnd; + data->hwnd = hwnd; data->callback_msg = abd->uCallbackMessage; list_add_tail(&appbars, &data->entry); return TRUE; case ABM_REMOVE: - if ((data = get_appbar(abd->hWnd))) + if ((data = get_appbar(hwnd))) { list_remove(&data->entry); - send_poschanged(abd->hWnd); + send_poschanged(hwnd); HeapFree(GetProcessHeap(), 0, data); } else - WINE_WARN("removing hwnd %p not on the list\n", abd->hWnd); + WINE_WARN("removing hwnd %p not on the list\n", hwnd); return TRUE; case ABM_QUERYPOS: if (abd->uEdge > ABE_BOTTOM) - WINE_WARN("invalid edge %i for %p\n", abd->uEdge, abd->hWnd); - appbar_cliprect(abd); + WINE_WARN("invalid edge %i for %p\n", abd->uEdge, hwnd); + appbar_cliprect( hwnd, &abd->rc ); return TRUE; case ABM_SETPOS: if (abd->uEdge > ABE_BOTTOM) { - WINE_WARN("invalid edge %i for %p\n", abd->uEdge, abd->hWnd); + WINE_WARN("invalid edge %i for %p\n", abd->uEdge, hwnd); return TRUE; } - if ((data = get_appbar(abd->hWnd))) + if ((data = get_appbar(hwnd))) { /* calculate acceptable space */ - appbar_cliprect(abd); + appbar_cliprect( hwnd, &abd->rc ); if (!EqualRect(&abd->rc, &data->rc)) - send_poschanged(abd->hWnd); + send_poschanged(hwnd); /* reserve that space for this appbar */ data->edge = abd->uEdge; @@ -187,14 +197,14 @@ static UINT_PTR handle_appbarmessage(DWORD msg, PAPPBARDATA abd) } else { - WINE_WARN("app sent ABM_SETPOS message for %p without ABM_ADD\n", abd->hWnd); + WINE_WARN("app sent ABM_SETPOS message for %p without ABM_ADD\n", hwnd); } return TRUE; case ABM_GETSTATE: WINE_FIXME("SHAppBarMessage(ABM_GETSTATE): stub\n"); return ABS_ALWAYSONTOP | ABS_AUTOHIDE; case ABM_GETTASKBARPOS: - WINE_FIXME("SHAppBarMessage(ABM_GETTASKBARPOS, hwnd=%p): stub\n", abd->hWnd); + WINE_FIXME("SHAppBarMessage(ABM_GETTASKBARPOS, hwnd=%p): stub\n", hwnd); /* Report the taskbar is at the bottom of the screen. */ abd->rc.left = 0; abd->rc.right = GetSystemMetrics(SM_CXSCREEN); @@ -205,10 +215,11 @@ static UINT_PTR handle_appbarmessage(DWORD msg, PAPPBARDATA abd) case ABM_ACTIVATE: return TRUE; case ABM_GETAUTOHIDEBAR: - WINE_FIXME("SHAppBarMessage(ABM_GETAUTOHIDEBAR, hwnd=%p, edge=%x): stub\n", abd->hWnd, abd->uEdge); + WINE_FIXME("SHAppBarMessage(ABM_GETAUTOHIDEBAR, hwnd=%p, edge=%x): stub\n", hwnd, abd->uEdge); return 0; case ABM_SETAUTOHIDEBAR: - WINE_FIXME("SHAppBarMessage(ABM_SETAUTOHIDEBAR, hwnd=%p, edge=%x, lparam=%lx): stub\n", abd->hWnd, abd->uEdge, abd->lParam); + WINE_FIXME("SHAppBarMessage(ABM_SETAUTOHIDEBAR, hwnd=%p, edge=%x, lparam=%s): stub\n", + hwnd, abd->uEdge, wine_dbgstr_longlong(abd->lParam)); return TRUE; case ABM_WINDOWPOSCHANGED: return TRUE; @@ -246,7 +257,8 @@ static LRESULT CALLBACK appbar_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARA return TRUE; } - if (!DuplicateHandle(return_hproc, cmd.return_map, GetCurrentProcess(), &return_map, 0, FALSE, DUPLICATE_SAME_ACCESS)) + if (!DuplicateHandle(return_hproc, UlongToHandle(cmd.return_map), + GetCurrentProcess(), &return_map, 0, FALSE, DUPLICATE_SAME_ACCESS)) { WINE_ERR("couldn't duplicate handle\n"); CloseHandle(return_hproc);

1 0

Alexandre Julliard : user32: Pack the CREATESTRUCTW structure in messages to allow crossing 32/ 64 boundaries.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: fcf8a819047e4ac2bbc02554e94bb233a4607d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf8a819047e4ac2bbc02554e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 20:26:10 2010 +0200 user32: Pack the CREATESTRUCTW structure in messages to allow crossing 32/64 boundaries. --- dlls/user32/message.c | 139 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 116 insertions(+), 23 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index f8e4a43..cab4113 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -56,12 +56,41 @@ WINE_DECLARE_DEBUG_CHANNEL(key); #define SYS_TIMER_RATE 55 /* min. timer rate in ms (actually 54.925)*/ +/* 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; +}; + +/* the structures are unpacked on top of the packed ones, so make sure they fit */ +C_ASSERT( sizeof(struct packed_CREATESTRUCTW) >= sizeof(CREATESTRUCTW) ); + +union packed_structs +{ + struct packed_CREATESTRUCTW cs; +}; + /* description of the data fields that need to be packed along with a sent message */ struct packed_message { - int count; - const void *data[MAX_PACK_COUNT]; - size_t size[MAX_PACK_COUNT]; + union packed_structs ps; + int count; + const void *data[MAX_PACK_COUNT]; + size_t size[MAX_PACK_COUNT]; }; /* info about the message currently being received by the current thread */ @@ -267,6 +296,19 @@ static inline BOOL check_string( LPCWSTR str, size_t size ) return FALSE; } +/* pack a pointer into a 32/64 portable format */ +static inline ULONGLONG pack_ptr( const void *ptr ) +{ + return (ULONG_PTR)ptr; +} + +/* unpack a potentially 64-bit pointer, returning 0 when truncated */ +static inline void *unpack_ptr( ULONGLONG ptr64 ) +{ + if ((ULONG_PTR)ptr64 != ptr64) return 0; + return (void *)(ULONG_PTR)ptr64; +} + /* make sure that there is space for 'size' bytes in buffer, growing it if needed */ static inline void *get_buffer_space( void **buffer, size_t size ) { @@ -544,10 +586,22 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara case WM_CREATE: { CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam; - push_data( data, cs, sizeof(*cs) ); + data->ps.cs.lpCreateParams = pack_ptr( cs->lpCreateParams ); + data->ps.cs.hInstance = pack_ptr( cs->hInstance ); + data->ps.cs.hMenu = wine_server_user_handle( cs->hMenu ); + data->ps.cs.hwndParent = wine_server_user_handle( cs->hwndParent ); + data->ps.cs.cy = cs->cy; + data->ps.cs.cx = cs->cx; + data->ps.cs.y = cs->y; + data->ps.cs.x = cs->x; + data->ps.cs.style = cs->style; + data->ps.cs.dwExStyle = cs->dwExStyle; + data->ps.cs.lpszName = pack_ptr( cs->lpszName ); + data->ps.cs.lpszClass = pack_ptr( cs->lpszClass ); + push_data( data, &data->ps.cs, sizeof(data->ps.cs) ); if (!IS_INTRESOURCE(cs->lpszName)) push_string( data, cs->lpszName ); if (!IS_INTRESOURCE(cs->lpszClass)) push_string( data, cs->lpszClass ); - return sizeof(*cs); + return sizeof(data->ps.cs); } case WM_GETTEXT: case WM_ASKCBFORMATNAME: @@ -774,28 +828,42 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa void **buffer, size_t size ) { size_t minsize = 0; + union packed_structs *ps = *buffer; switch(message) { case WM_NCCREATE: case WM_CREATE: { - CREATESTRUCTW *cs = *buffer; - WCHAR *str = (WCHAR *)(cs + 1); - if (size < sizeof(*cs)) return FALSE; - size -= sizeof(*cs); - if (!IS_INTRESOURCE(cs->lpszName)) + CREATESTRUCTW cs; + WCHAR *str = (WCHAR *)(&ps->cs + 1); + if (size < sizeof(ps->cs)) return FALSE; + size -= sizeof(ps->cs); + cs.lpCreateParams = unpack_ptr( ps->cs.lpCreateParams ); + cs.hInstance = unpack_ptr( ps->cs.hInstance ); + cs.hMenu = wine_server_ptr_handle( ps->cs.hMenu ); + cs.hwndParent = wine_server_ptr_handle( ps->cs.hwndParent ); + cs.cy = ps->cs.cy; + cs.cx = ps->cs.cx; + cs.y = ps->cs.y; + cs.x = ps->cs.x; + cs.style = ps->cs.style; + cs.dwExStyle = ps->cs.dwExStyle; + cs.lpszName = unpack_ptr( ps->cs.lpszName ); + cs.lpszClass = unpack_ptr( ps->cs.lpszClass ); + if (ps->cs.lpszName >> 16) { if (!check_string( str, size )) return FALSE; - cs->lpszName = str; + cs.lpszName = str; size -= (strlenW(str) + 1) * sizeof(WCHAR); str += strlenW(str) + 1; } - if (!IS_INTRESOURCE(cs->lpszClass)) + if (ps->cs.lpszClass >> 16) { if (!check_string( str, size )) return FALSE; - cs->lpszClass = str; + cs.lpszClass = str; } + memcpy( &ps->cs, &cs, sizeof(cs) ); break; } case WM_GETTEXT: @@ -1053,8 +1121,23 @@ static void pack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, { case WM_NCCREATE: case WM_CREATE: - push_data( data, (CREATESTRUCTW *)lparam, sizeof(CREATESTRUCTW) ); + { + CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam; + data->ps.cs.lpCreateParams = (ULONG_PTR)cs->lpCreateParams; + data->ps.cs.hInstance = (ULONG_PTR)cs->hInstance; + data->ps.cs.hMenu = wine_server_user_handle( cs->hMenu ); + data->ps.cs.hwndParent = wine_server_user_handle( cs->hwndParent ); + data->ps.cs.cy = cs->cy; + data->ps.cs.cx = cs->cx; + data->ps.cs.y = cs->y; + data->ps.cs.x = cs->x; + data->ps.cs.style = cs->style; + data->ps.cs.dwExStyle = cs->dwExStyle; + data->ps.cs.lpszName = (ULONG_PTR)cs->lpszName; + data->ps.cs.lpszClass = (ULONG_PTR)cs->lpszClass; + push_data( data, &data->ps.cs, sizeof(data->ps.cs) ); break; + } case WM_GETTEXT: case CB_GETLBTEXT: case LB_GETTEXT: @@ -1132,18 +1215,28 @@ static void pack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, static void unpack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, void *buffer, size_t size ) { + union packed_structs *ps = buffer; + switch(message) { case WM_NCCREATE: case WM_CREATE: - { - CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam; - LPCWSTR name = cs->lpszName, class = cs->lpszClass; - memcpy( cs, buffer, min( sizeof(*cs), size )); - cs->lpszName = name; /* restore the original pointers */ - cs->lpszClass = class; + if (size >= sizeof(ps->cs)) + { + CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam; + cs->lpCreateParams = unpack_ptr( ps->cs.lpCreateParams ); + cs->hInstance = unpack_ptr( ps->cs.hInstance ); + cs->hMenu = wine_server_ptr_handle( ps->cs.hMenu ); + cs->hwndParent = wine_server_ptr_handle( ps->cs.hwndParent ); + cs->cy = ps->cs.cy; + cs->cx = ps->cs.cx; + cs->y = ps->cs.y; + cs->x = ps->cs.x; + cs->style = ps->cs.style; + cs->dwExStyle = ps->cs.dwExStyle; + /* don't allow changing name and class pointers */ + } break; - } case WM_GETTEXT: case WM_ASKCBFORMATNAME: memcpy( (WCHAR *)lparam, buffer, min( wparam*sizeof(WCHAR), size )); @@ -1248,7 +1341,7 @@ static void reply_message( struct received_message_info *info, LRESULT result, B if (info->flags & ISMEX_NOTIFY) return; /* notify messages don't get replies */ if (!remove && replied) return; /* replied already */ - data.count = 0; + memset( &data, 0, sizeof(data) ); info->flags |= ISMEX_REPLIED; if (info->type == MSG_OTHER_PROCESS && !replied) @@ -2315,7 +2408,7 @@ static BOOL put_message_in_queue( const struct send_message_info *info, size_t * timeout = (timeout_t)max( 0, (int)info->timeout ) * -10000; } - data.count = 0; + memset( &data, 0, sizeof(data) ); if (info->type == MSG_OTHER_PROCESS) { *reply_size = pack_message( info->hwnd, info->msg, info->wparam, info->lparam, &data );

1 0

Alexandre Julliard : user32: Pack the low-level hook structure in messages to allow crossing 32/ 64 boundaries.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 2de2222aeca34f88061585646670016f8c65cb82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de2222aeca34f88061585646… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 20:41:13 2010 +0200 user32: Pack the low-level hook structure in messages to allow crossing 32/64 boundaries. --- dlls/user32/message.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 3843709..a2401e4 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -208,6 +208,13 @@ struct packed_MDICREATESTRUCTW ULONGLONG lParam; }; +struct packed_hook_extra_info +{ + user_handle_t handle; + DWORD __pad; + ULONGLONG lparam; +}; + /* 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) ); @@ -221,6 +228,7 @@ C_ASSERT( sizeof(struct packed_NCCALCSIZE_PARAMS) >= sizeof(NCCALCSIZE_PARAMS) + C_ASSERT( sizeof(struct packed_MSG) >= sizeof(MSG) ); C_ASSERT( sizeof(struct packed_MDINEXTMENU) >= sizeof(MDINEXTMENU) ); C_ASSERT( sizeof(struct packed_MDICREATESTRUCTW) >= sizeof(MDICREATESTRUCTW) ); +C_ASSERT( sizeof(struct packed_hook_extra_info) >= sizeof(struct hook_extra_info) ); union packed_structs { @@ -236,6 +244,7 @@ union packed_structs struct packed_MSG msg; struct packed_MDINEXTMENU mnm; struct packed_MDICREATESTRUCTW mcs; + struct packed_hook_extra_info hook; }; /* description of the data fields that need to be packed along with a sent message */ @@ -1012,14 +1021,16 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara case WM_WINE_KEYBOARD_LL_HOOK: { struct hook_extra_info *h_extra = (struct hook_extra_info *)lparam; - push_data( data, h_extra, sizeof(*h_extra) ); + data->ps.hook.handle = wine_server_user_handle( h_extra->handle ); + push_data( data, &data->ps.hook, sizeof(data->ps.hook) ); push_data( data, (LPVOID)h_extra->lparam, sizeof(KBDLLHOOKSTRUCT) ); return 0; } case WM_WINE_MOUSE_LL_HOOK: { struct hook_extra_info *h_extra = (struct hook_extra_info *)lparam; - push_data( data, h_extra, sizeof(*h_extra) ); + data->ps.hook.handle = wine_server_user_handle( h_extra->handle ); + push_data( data, &data->ps.hook, sizeof(data->ps.hook) ); push_data( data, (LPVOID)h_extra->lparam, sizeof(MSLLHOOKSTRUCT) ); return 0; } @@ -1412,13 +1423,14 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa case WM_WINE_KEYBOARD_LL_HOOK: case WM_WINE_MOUSE_LL_HOOK: { - struct hook_extra_info *h_extra = *buffer; - - minsize = sizeof(struct hook_extra_info) + + struct hook_extra_info h_extra; + minsize = sizeof(ps->hook) + (message == WM_WINE_KEYBOARD_LL_HOOK ? sizeof(KBDLLHOOKSTRUCT) : sizeof(MSLLHOOKSTRUCT)); if (size < minsize) return FALSE; - h_extra->lparam = (LPARAM)(h_extra + 1); + h_extra.handle = wine_server_ptr_handle( ps->hook.handle ); + h_extra.lparam = (LPARAM)(&ps->hook + 1); + memcpy( &ps->hook, &h_extra, sizeof(h_extra) ); break; } case WM_NCPAINT:

1 0

Alexandre Julliard : user32: Pack the MDINEXTMENU structure in messages to allow crossing 32/ 64 boundaries.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 99719be4a63ce95cdc1e2df08a315a2209b8d671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99719be4a63ce95cdc1e2df08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 20:39:09 2010 +0200 user32: Pack the MDINEXTMENU structure in messages to allow crossing 32/64 boundaries. --- dlls/user32/message.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 5bee54b..f409b17 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -185,6 +185,16 @@ struct packed_MSG DWORD __pad2; }; +struct packed_MDINEXTMENU +{ + user_handle_t hmenuIn; + DWORD __pad1; + user_handle_t hmenuNext; + DWORD __pad2; + user_handle_t hwndNext; + DWORD __pad3; +}; + /* 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) ); @@ -196,6 +206,7 @@ C_ASSERT( sizeof(struct packed_COPYDATASTRUCT) >= sizeof(COPYDATASTRUCT) ); C_ASSERT( sizeof(struct packed_HELPINFO) >= sizeof(HELPINFO) ); C_ASSERT( sizeof(struct packed_NCCALCSIZE_PARAMS) >= sizeof(NCCALCSIZE_PARAMS) + sizeof(WINDOWPOS) ); C_ASSERT( sizeof(struct packed_MSG) >= sizeof(MSG) ); +C_ASSERT( sizeof(struct packed_MDINEXTMENU) >= sizeof(MDINEXTMENU) ); union packed_structs { @@ -209,6 +220,7 @@ union packed_structs struct packed_HELPINFO hi; struct packed_NCCALCSIZE_PARAMS ncp; struct packed_MSG msg; + struct packed_MDINEXTMENU mnm; }; /* description of the data fields that need to be packed along with a sent message */ @@ -941,8 +953,14 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara case LB_GETSELITEMS: return wparam * sizeof(UINT); case WM_NEXTMENU: - push_data( data, (MDINEXTMENU *)lparam, sizeof(MDINEXTMENU) ); - return sizeof(MDINEXTMENU); + { + MDINEXTMENU *mnm = (MDINEXTMENU *)lparam; + data->ps.mnm.hmenuIn = wine_server_user_handle( mnm->hmenuIn ); + data->ps.mnm.hmenuNext = wine_server_user_handle( mnm->hmenuNext ); + data->ps.mnm.hwndNext = wine_server_user_handle( mnm->hwndNext ); + push_data( data, &data->ps.mnm, sizeof(data->ps.mnm) ); + return sizeof(data->ps.mnm); + } case WM_SIZING: case WM_MOVING: push_data( data, (RECT *)lparam, sizeof(RECT) ); @@ -1315,9 +1333,15 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa if (!get_buffer_space( buffer, *wparam * sizeof(UINT) )) return FALSE; break; case WM_NEXTMENU: - minsize = sizeof(MDINEXTMENU); - if (!get_buffer_space( buffer, sizeof(MDINEXTMENU) )) return FALSE; + { + MDINEXTMENU mnm; + if (size < sizeof(ps->mnm)) return FALSE; + mnm.hmenuIn = wine_server_ptr_handle( ps->mnm.hmenuIn ); + mnm.hmenuNext = wine_server_ptr_handle( ps->mnm.hmenuNext ); + mnm.hwndNext = wine_server_ptr_handle( ps->mnm.hwndNext ); + memcpy( &ps->mnm, &mnm, sizeof(mnm) ); break; + } case WM_SIZING: case WM_MOVING: minsize = sizeof(RECT); @@ -1538,8 +1562,14 @@ static void pack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, if (lparam) push_data( data, (DWORD *)lparam, sizeof(DWORD) ); break; case WM_NEXTMENU: - push_data( data, (MDINEXTMENU *)lparam, sizeof(MDINEXTMENU) ); + { + MDINEXTMENU *mnm = (MDINEXTMENU *)lparam; + data->ps.mnm.hmenuIn = wine_server_user_handle( mnm->hmenuIn ); + data->ps.mnm.hmenuNext = wine_server_user_handle( mnm->hmenuNext ); + data->ps.mnm.hwndNext = wine_server_user_handle( mnm->hwndNext ); + push_data( data, &data->ps.mnm, sizeof(data->ps.mnm) ); break; + } case WM_MDICREATE: push_data( data, (MDICREATESTRUCTW *)lparam, sizeof(MDICREATESTRUCTW) ); break; @@ -1650,7 +1680,13 @@ static void unpack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, memcpy( (WCHAR *)lparam, buffer, size ); break; case WM_NEXTMENU: - memcpy( (MDINEXTMENU *)lparam, buffer, min( sizeof(MDINEXTMENU), size )); + if (size >= sizeof(ps->mnm)) + { + MDINEXTMENU *mnm = (MDINEXTMENU *)lparam; + mnm->hmenuIn = wine_server_ptr_handle( ps->mnm.hmenuIn ); + mnm->hmenuNext = wine_server_ptr_handle( ps->mnm.hmenuNext ); + mnm->hwndNext = wine_server_ptr_handle( ps->mnm.hwndNext ); + } break; case WM_MDIGETACTIVE: if (lparam) memcpy( (BOOL *)lparam, buffer, min( sizeof(BOOL), size ));

1 0

Alexandre Julliard : user32: Pack the MDICREATESTRUCTW structure in messages to allow crossing 32/ 64 boundaries.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 366c5ceea7d7460b871ee803cfb538f3da324b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=366c5ceea7d7460b871ee803c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 20:40:17 2010 +0200 user32: Pack the MDICREATESTRUCTW structure in messages to allow crossing 32/64 boundaries. --- dlls/user32/message.c | 94 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 73 insertions(+), 21 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index f409b17..3843709 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -195,6 +195,19 @@ struct packed_MDINEXTMENU DWORD __pad3; }; +struct packed_MDICREATESTRUCTW +{ + ULONGLONG szClass; + ULONGLONG szTitle; + ULONGLONG hOwner; + INT x; + INT y; + INT cx; + INT cy; + DWORD style; + ULONGLONG lParam; +}; + /* 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) ); @@ -207,6 +220,7 @@ C_ASSERT( sizeof(struct packed_HELPINFO) >= sizeof(HELPINFO) ); C_ASSERT( sizeof(struct packed_NCCALCSIZE_PARAMS) >= sizeof(NCCALCSIZE_PARAMS) + sizeof(WINDOWPOS) ); C_ASSERT( sizeof(struct packed_MSG) >= sizeof(MSG) ); C_ASSERT( sizeof(struct packed_MDINEXTMENU) >= sizeof(MDINEXTMENU) ); +C_ASSERT( sizeof(struct packed_MDICREATESTRUCTW) >= sizeof(MDICREATESTRUCTW) ); union packed_structs { @@ -221,6 +235,7 @@ union packed_structs struct packed_NCCALCSIZE_PARAMS ncp; struct packed_MSG msg; struct packed_MDINEXTMENU mnm; + struct packed_MDICREATESTRUCTW mcs; }; /* description of the data fields that need to be packed along with a sent message */ @@ -967,11 +982,20 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara return sizeof(RECT); case WM_MDICREATE: { - MDICREATESTRUCTW *cs = (MDICREATESTRUCTW *)lparam; - push_data( data, cs, sizeof(*cs) ); - if (!IS_INTRESOURCE(cs->szTitle)) push_string( data, cs->szTitle ); - if (!IS_INTRESOURCE(cs->szClass)) push_string( data, cs->szClass ); - return sizeof(*cs); + MDICREATESTRUCTW *mcs = (MDICREATESTRUCTW *)lparam; + data->ps.mcs.szClass = pack_ptr( mcs->szClass ); + data->ps.mcs.szTitle = pack_ptr( mcs->szTitle ); + data->ps.mcs.hOwner = pack_ptr( mcs->hOwner ); + data->ps.mcs.x = mcs->x; + data->ps.mcs.y = mcs->y; + data->ps.mcs.cx = mcs->cx; + data->ps.mcs.cy = mcs->cy; + data->ps.mcs.style = mcs->style; + data->ps.mcs.lParam = mcs->lParam; + push_data( data, &data->ps.mcs, sizeof(data->ps.mcs) ); + if (!IS_INTRESOURCE(mcs->szClass)) push_string( data, mcs->szClass ); + if (!IS_INTRESOURCE(mcs->szTitle)) push_string( data, mcs->szTitle ); + return sizeof(data->ps.mcs); } case WM_MDIGETACTIVE: if (lparam) return sizeof(BOOL); @@ -1349,22 +1373,33 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa break; case WM_MDICREATE: { - MDICREATESTRUCTW *cs = *buffer; - WCHAR *str = (WCHAR *)(cs + 1); - if (size < sizeof(*cs)) return FALSE; - size -= sizeof(*cs); - if (!IS_INTRESOURCE(cs->szTitle)) + MDICREATESTRUCTW mcs; + WCHAR *str = (WCHAR *)(&ps->mcs + 1); + if (size < sizeof(ps->mcs)) return FALSE; + size -= sizeof(ps->mcs); + + mcs.szClass = unpack_ptr( ps->mcs.szClass ); + mcs.szTitle = unpack_ptr( ps->mcs.szTitle ); + mcs.hOwner = unpack_ptr( ps->mcs.hOwner ); + mcs.x = ps->mcs.x; + mcs.y = ps->mcs.y; + mcs.cx = ps->mcs.cx; + mcs.cy = ps->mcs.cy; + mcs.style = ps->mcs.style; + mcs.lParam = (LPARAM)unpack_ptr( ps->mcs.lParam ); + if (ps->mcs.szClass >> 16) { if (!check_string( str, size )) return FALSE; - cs->szTitle = str; + mcs.szClass = str; size -= (strlenW(str) + 1) * sizeof(WCHAR); str += strlenW(str) + 1; } - if (!IS_INTRESOURCE(cs->szClass)) + if (ps->mcs.szTitle >> 16) { if (!check_string( str, size )) return FALSE; - cs->szClass = str; + mcs.szTitle = str; } + memcpy( &ps->mcs, &mcs, sizeof(mcs) ); break; } case WM_MDIGETACTIVE: @@ -1571,8 +1606,20 @@ static void pack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, break; } case WM_MDICREATE: - push_data( data, (MDICREATESTRUCTW *)lparam, sizeof(MDICREATESTRUCTW) ); + { + MDICREATESTRUCTW *mcs = (MDICREATESTRUCTW *)lparam; + data->ps.mcs.szClass = pack_ptr( mcs->szClass ); + data->ps.mcs.szTitle = pack_ptr( mcs->szTitle ); + data->ps.mcs.hOwner = pack_ptr( mcs->hOwner ); + data->ps.mcs.x = mcs->x; + data->ps.mcs.y = mcs->y; + data->ps.mcs.cx = mcs->cx; + data->ps.mcs.cy = mcs->cy; + data->ps.mcs.style = mcs->style; + data->ps.mcs.lParam = mcs->lParam; + push_data( data, &data->ps.mcs, sizeof(data->ps.mcs) ); break; + } case WM_ASKCBFORMATNAME: push_data( data, (WCHAR *)lparam, (strlenW((WCHAR *)lparam) + 1) * sizeof(WCHAR) ); break; @@ -1722,14 +1769,19 @@ static void unpack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, if (lparam) memcpy( (DWORD *)lparam, buffer, min( sizeof(DWORD), size )); break; case WM_MDICREATE: - { - MDICREATESTRUCTW *cs = (MDICREATESTRUCTW *)lparam; - LPCWSTR title = cs->szTitle, class = cs->szClass; - memcpy( cs, buffer, min( sizeof(*cs), size )); - cs->szTitle = title; /* restore the original pointers */ - cs->szClass = class; + if (size >= sizeof(ps->mcs)) + { + MDICREATESTRUCTW *mcs = (MDICREATESTRUCTW *)lparam; + mcs->hOwner = unpack_ptr( ps->mcs.hOwner ); + mcs->x = ps->mcs.x; + mcs->y = ps->mcs.y; + mcs->cx = ps->mcs.cx; + mcs->cy = ps->mcs.cy; + mcs->style = ps->mcs.style; + mcs->lParam = (LPARAM)unpack_ptr( ps->mcs.lParam ); + /* don't allow changing class and title pointers */ + } break; - } default: ERR( "should not happen: unexpected message %x\n", message ); break;

1 0

Alexandre Julliard : user32: Pack the various owner-draw structures in messages to allow crossing 32/ 64 boundaries.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 9b5b55d9de6d864303f675f343ae4355f6c27304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b5b55d9de6d864303f675f34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 20:28:32 2010 +0200 user32: Pack the various owner-draw structures in messages to allow crossing 32/64 boundaries. --- dlls/user32/message.c | 181 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 170 insertions(+), 11 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index cab4113..6650080 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -76,12 +76,69 @@ struct packed_CREATESTRUCTW 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; +}; + /* 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) ); +C_ASSERT( sizeof(struct packed_MEASUREITEMSTRUCT) >= sizeof(MEASUREITEMSTRUCT) ); +C_ASSERT( sizeof(struct packed_DELETEITEMSTRUCT) >= sizeof(DELETEITEMSTRUCT) ); +C_ASSERT( sizeof(struct packed_COMPAREITEMSTRUCT) >= sizeof(COMPAREITEMSTRUCT) ); union packed_structs { struct packed_CREATESTRUCTW cs; + struct packed_DRAWITEMSTRUCT dis; + struct packed_MEASUREITEMSTRUCT mis; + struct packed_DELETEITEMSTRUCT dls; + struct packed_COMPAREITEMSTRUCT cis; }; /* description of the data fields that need to be packed along with a sent message */ @@ -621,17 +678,57 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara push_data( data, (MINMAXINFO *)lparam, sizeof(MINMAXINFO) ); return sizeof(MINMAXINFO); case WM_DRAWITEM: - push_data( data, (DRAWITEMSTRUCT *)lparam, sizeof(DRAWITEMSTRUCT) ); + { + DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lparam; + data->ps.dis.CtlType = dis->CtlType; + data->ps.dis.CtlID = dis->CtlID; + data->ps.dis.itemID = dis->itemID; + data->ps.dis.itemAction = dis->itemAction; + data->ps.dis.itemState = dis->itemState; + data->ps.dis.hwndItem = wine_server_user_handle( dis->hwndItem ); + data->ps.dis.hDC = wine_server_user_handle( dis->hDC ); /* FIXME */ + data->ps.dis.rcItem = dis->rcItem; + data->ps.dis.itemData = dis->itemData; + push_data( data, &data->ps.dis, sizeof(data->ps.dis) ); return 0; + } case WM_MEASUREITEM: - push_data( data, (MEASUREITEMSTRUCT *)lparam, sizeof(MEASUREITEMSTRUCT) ); - return sizeof(MEASUREITEMSTRUCT); + { + MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lparam; + data->ps.mis.CtlType = mis->CtlType; + data->ps.mis.CtlID = mis->CtlID; + data->ps.mis.itemID = mis->itemID; + data->ps.mis.itemWidth = mis->itemWidth; + data->ps.mis.itemHeight = mis->itemHeight; + data->ps.mis.itemData = mis->itemData; + push_data( data, &data->ps.mis, sizeof(data->ps.mis) ); + return sizeof(data->ps.mis); + } case WM_DELETEITEM: - push_data( data, (DELETEITEMSTRUCT *)lparam, sizeof(DELETEITEMSTRUCT) ); + { + DELETEITEMSTRUCT *dls = (DELETEITEMSTRUCT *)lparam; + data->ps.dls.CtlType = dls->CtlType; + data->ps.dls.CtlID = dls->CtlID; + data->ps.dls.itemID = dls->itemID; + data->ps.dls.hwndItem = wine_server_user_handle( dls->hwndItem ); + data->ps.dls.itemData = dls->itemData; + push_data( data, &data->ps.dls, sizeof(data->ps.dls) ); return 0; + } case WM_COMPAREITEM: - push_data( data, (COMPAREITEMSTRUCT *)lparam, sizeof(COMPAREITEMSTRUCT) ); + { + COMPAREITEMSTRUCT *cis = (COMPAREITEMSTRUCT *)lparam; + data->ps.cis.CtlType = cis->CtlType; + data->ps.cis.CtlID = cis->CtlID; + data->ps.cis.hwndItem = wine_server_user_handle( cis->hwndItem ); + data->ps.cis.itemID1 = cis->itemID1; + data->ps.cis.itemData1 = cis->itemData1; + data->ps.cis.itemID2 = cis->itemID2; + data->ps.cis.itemData2 = cis->itemData2; + data->ps.cis.dwLocaleId = cis->dwLocaleId; + push_data( data, &data->ps.cis, sizeof(data->ps.cis) ); return 0; + } case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: push_data( data, (WINDOWPOS *)lparam, sizeof(WINDOWPOS) ); @@ -885,17 +982,61 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa minsize = sizeof(MINMAXINFO); break; case WM_DRAWITEM: - minsize = sizeof(DRAWITEMSTRUCT); + { + DRAWITEMSTRUCT dis; + if (size < sizeof(ps->dis)) return FALSE; + dis.CtlType = ps->dis.CtlType; + dis.CtlID = ps->dis.CtlID; + dis.itemID = ps->dis.itemID; + dis.itemAction = ps->dis.itemAction; + dis.itemState = ps->dis.itemState; + dis.hwndItem = wine_server_ptr_handle( ps->dis.hwndItem ); + dis.hDC = wine_server_ptr_handle( ps->dis.hDC ); + dis.rcItem = ps->dis.rcItem; + dis.itemData = (ULONG_PTR)unpack_ptr( ps->dis.itemData ); + memcpy( &ps->dis, &dis, sizeof(dis) ); break; + } case WM_MEASUREITEM: - minsize = sizeof(MEASUREITEMSTRUCT); + { + MEASUREITEMSTRUCT mis; + if (size < sizeof(ps->mis)) return FALSE; + mis.CtlType = ps->mis.CtlType; + mis.CtlID = ps->mis.CtlID; + mis.itemID = ps->mis.itemID; + mis.itemWidth = ps->mis.itemWidth; + mis.itemHeight = ps->mis.itemHeight; + mis.itemData = (ULONG_PTR)unpack_ptr( ps->mis.itemData ); + memcpy( &ps->mis, &mis, sizeof(mis) ); break; + } case WM_DELETEITEM: - minsize = sizeof(DELETEITEMSTRUCT); + { + DELETEITEMSTRUCT dls; + if (size < sizeof(ps->dls)) return FALSE; + dls.CtlType = ps->dls.CtlType; + dls.CtlID = ps->dls.CtlID; + dls.itemID = ps->dls.itemID; + dls.hwndItem = wine_server_ptr_handle( ps->dls.hwndItem ); + dls.itemData = (ULONG_PTR)unpack_ptr( ps->dls.itemData ); + memcpy( &ps->dls, &dls, sizeof(dls) ); break; + } case WM_COMPAREITEM: - minsize = sizeof(COMPAREITEMSTRUCT); + { + COMPAREITEMSTRUCT cis; + if (size < sizeof(ps->cis)) return FALSE; + cis.CtlType = ps->cis.CtlType; + cis.CtlID = ps->cis.CtlID; + cis.hwndItem = wine_server_ptr_handle( ps->cis.hwndItem ); + cis.itemID1 = ps->cis.itemID1; + cis.itemData1 = (ULONG_PTR)unpack_ptr( ps->cis.itemData1 ); + cis.itemID2 = ps->cis.itemID2; + cis.itemData2 = (ULONG_PTR)unpack_ptr( ps->cis.itemData2 ); + cis.dwLocaleId = ps->cis.dwLocaleId; + memcpy( &ps->cis, &cis, sizeof(cis) ); break; + } case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: case WM_WINE_SETWINDOWPOS: @@ -1147,8 +1288,17 @@ static void pack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, push_data( data, (MINMAXINFO *)lparam, sizeof(MINMAXINFO) ); break; case WM_MEASUREITEM: - push_data( data, (MEASUREITEMSTRUCT *)lparam, sizeof(MEASUREITEMSTRUCT) ); + { + MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lparam; + data->ps.mis.CtlType = mis->CtlType; + data->ps.mis.CtlID = mis->CtlID; + data->ps.mis.itemID = mis->itemID; + data->ps.mis.itemWidth = mis->itemWidth; + data->ps.mis.itemHeight = mis->itemHeight; + data->ps.mis.itemData = mis->itemData; + push_data( data, &data->ps.mis, sizeof(data->ps.mis) ); break; + } case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: push_data( data, (WINDOWPOS *)lparam, sizeof(WINDOWPOS) ); @@ -1245,7 +1395,16 @@ static void unpack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, memcpy( (MINMAXINFO *)lparam, buffer, min( sizeof(MINMAXINFO), size )); break; case WM_MEASUREITEM: - memcpy( (MEASUREITEMSTRUCT *)lparam, buffer, min( sizeof(MEASUREITEMSTRUCT), size )); + if (size >= sizeof(ps->mis)) + { + MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lparam; + mis->CtlType = ps->mis.CtlType; + mis->CtlID = ps->mis.CtlID; + mis->itemID = ps->mis.itemID; + mis->itemWidth = ps->mis.itemWidth; + mis->itemHeight = ps->mis.itemHeight; + mis->itemData = (ULONG_PTR)unpack_ptr( ps->mis.itemData ); + } break; case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED:

1 0

Alexandre Julliard : user32: Pack the MSG structure in messages to allow crossing 32/64 boundaries.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 3099b08aa21bf64586a6d15e35637c599e7cc7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3099b08aa21bf64586a6d15e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 20:37:40 2010 +0200 user32: Pack the MSG structure in messages to allow crossing 32/64 boundaries. --- dlls/user32/message.c | 69 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 62 insertions(+), 7 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 144cf5a..5bee54b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -173,6 +173,18 @@ struct packed_NCCALCSIZE_PARAMS DWORD __pad4; }; +struct packed_MSG +{ + user_handle_t hwnd; + DWORD __pad1; + UINT message; + ULONGLONG wParam; + ULONGLONG lParam; + DWORD time; + POINT pt; + DWORD __pad2; +}; + /* 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) ); @@ -183,6 +195,7 @@ C_ASSERT( sizeof(struct packed_WINDOWPOS) >= sizeof(WINDOWPOS) ); C_ASSERT( sizeof(struct packed_COPYDATASTRUCT) >= sizeof(COPYDATASTRUCT) ); C_ASSERT( sizeof(struct packed_HELPINFO) >= sizeof(HELPINFO) ); C_ASSERT( sizeof(struct packed_NCCALCSIZE_PARAMS) >= sizeof(NCCALCSIZE_PARAMS) + sizeof(WINDOWPOS) ); +C_ASSERT( sizeof(struct packed_MSG) >= sizeof(MSG) ); union packed_structs { @@ -195,6 +208,7 @@ union packed_structs struct packed_COPYDATASTRUCT cds; struct packed_HELPINFO hi; struct packed_NCCALCSIZE_PARAMS ncp; + struct packed_MSG msg; }; /* description of the data fields that need to be packed along with a sent message */ @@ -851,8 +865,19 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara return sizeof(data->ps.ncp); } case WM_GETDLGCODE: - if (lparam) push_data( data, (MSG *)lparam, sizeof(MSG) ); - return sizeof(MSG); + if (lparam) + { + MSG *msg = (MSG *)lparam; + data->ps.msg.hwnd = wine_server_user_handle( msg->hwnd ); + data->ps.msg.message = msg->message; + data->ps.msg.wParam = msg->wParam; + data->ps.msg.lParam = msg->lParam; + data->ps.msg.time = msg->time; + data->ps.msg.pt = msg->pt; + push_data( data, &data->ps.msg, sizeof(data->ps.msg) ); + return sizeof(data->ps.msg); + } + return 0; case SBM_SETSCROLLINFO: push_data( data, (SCROLLINFO *)lparam, sizeof(SCROLLINFO) ); return 0; @@ -1201,9 +1226,20 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa } break; case WM_GETDLGCODE: - if (!*lparam) return TRUE; - minsize = sizeof(MSG); - break; + if (*lparam) + { + MSG msg; + if (size < sizeof(ps->msg)) return FALSE; + msg.hwnd = wine_server_ptr_handle( ps->msg.hwnd ); + msg.message = ps->msg.message; + msg.wParam = (ULONG_PTR)unpack_ptr( ps->msg.wParam ); + msg.lParam = (ULONG_PTR)unpack_ptr( ps->msg.lParam ); + msg.time = ps->msg.time; + msg.pt = ps->msg.pt; + memcpy( &ps->msg, &msg, sizeof(msg) ); + break; + } + return TRUE; case SBM_SETSCROLLINFO: minsize = sizeof(SCROLLINFO); break; @@ -1442,7 +1478,17 @@ static void pack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, break; } case WM_GETDLGCODE: - if (lparam) push_data( data, (MSG *)lparam, sizeof(MSG) ); + if (lparam) + { + MSG *msg = (MSG *)lparam; + data->ps.msg.hwnd = wine_server_user_handle( msg->hwnd ); + data->ps.msg.message = msg->message; + data->ps.msg.wParam = msg->wParam; + data->ps.msg.lParam = msg->lParam; + data->ps.msg.time = msg->time; + data->ps.msg.pt = msg->pt; + push_data( data, &data->ps.msg, sizeof(data->ps.msg) ); + } break; case SBM_GETSCROLLINFO: push_data( data, (SCROLLINFO *)lparam, sizeof(SCROLLINFO) ); @@ -1568,7 +1614,16 @@ static void unpack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, } break; case WM_GETDLGCODE: - if (lparam) memcpy( (MSG *)lparam, buffer, min( sizeof(MSG), size )); + if (lparam && size >= sizeof(ps->msg)) + { + MSG *msg = (MSG *)lparam; + msg->hwnd = wine_server_ptr_handle( ps->msg.hwnd ); + msg->message = ps->msg.message; + msg->wParam = (ULONG_PTR)unpack_ptr( ps->msg.wParam ); + msg->lParam = (ULONG_PTR)unpack_ptr( ps->msg.lParam ); + msg->time = ps->msg.time; + msg->pt = ps->msg.pt; + } break; case SBM_GETSCROLLINFO: memcpy( (SCROLLINFO *)lparam, buffer, min( sizeof(SCROLLINFO), size ));

1 0

Alexandre Julliard : user32: Pack the NCCALCSIZE_PARAMS structure in messages to allow crossing 32/ 64 boundaries.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: bbdd742a49c4ea78eb2fbafabf145e613e868f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbdd742a49c4ea78eb2fbafab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 20:36:04 2010 +0200 user32: Pack the NCCALCSIZE_PARAMS structure in messages to allow crossing 32/64 boundaries. --- dlls/user32/message.c | 91 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 71 insertions(+), 20 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 78fc72e..144cf5a 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -157,6 +157,22 @@ struct packed_HELPINFO 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; +}; + /* 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) ); @@ -166,6 +182,7 @@ C_ASSERT( sizeof(struct packed_COMPAREITEMSTRUCT) >= sizeof(COMPAREITEMSTRUCT) ) C_ASSERT( sizeof(struct packed_WINDOWPOS) >= sizeof(WINDOWPOS) ); C_ASSERT( sizeof(struct packed_COPYDATASTRUCT) >= sizeof(COPYDATASTRUCT) ); C_ASSERT( sizeof(struct packed_HELPINFO) >= sizeof(HELPINFO) ); +C_ASSERT( sizeof(struct packed_NCCALCSIZE_PARAMS) >= sizeof(NCCALCSIZE_PARAMS) + sizeof(WINDOWPOS) ); union packed_structs { @@ -177,6 +194,7 @@ union packed_structs struct packed_WINDOWPOS wp; struct packed_COPYDATASTRUCT cds; struct packed_HELPINFO hi; + struct packed_NCCALCSIZE_PARAMS ncp; }; /* description of the data fields that need to be packed along with a sent message */ @@ -818,10 +836,19 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara } else { - NCCALCSIZE_PARAMS *nc = (NCCALCSIZE_PARAMS *)lparam; - push_data( data, nc, sizeof(*nc) ); - push_data( data, nc->lppos, sizeof(*nc->lppos) ); - return sizeof(*nc) + sizeof(*nc->lppos); + NCCALCSIZE_PARAMS *ncp = (NCCALCSIZE_PARAMS *)lparam; + data->ps.ncp.rgrc[0] = ncp->rgrc[0]; + data->ps.ncp.rgrc[1] = ncp->rgrc[1]; + data->ps.ncp.rgrc[2] = ncp->rgrc[2]; + data->ps.ncp.hwnd = wine_server_user_handle( ncp->lppos->hwnd ); + data->ps.ncp.hwndInsertAfter = wine_server_user_handle( ncp->lppos->hwndInsertAfter ); + data->ps.ncp.x = ncp->lppos->x; + data->ps.ncp.y = ncp->lppos->y; + data->ps.ncp.cx = ncp->lppos->cx; + data->ps.ncp.cy = ncp->lppos->cy; + data->ps.ncp.flags = ncp->lppos->flags; + push_data( data, &data->ps.ncp, sizeof(data->ps.ncp) ); + return sizeof(data->ps.ncp); } case WM_GETDLGCODE: if (lparam) push_data( data, (MSG *)lparam, sizeof(MSG) ); @@ -1155,9 +1182,22 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa if (!*wparam) minsize = sizeof(RECT); else { - NCCALCSIZE_PARAMS *nc = *buffer; - if (size < sizeof(*nc) + sizeof(*nc->lppos)) return FALSE; - nc->lppos = (WINDOWPOS *)(nc + 1); + NCCALCSIZE_PARAMS ncp; + WINDOWPOS wp; + if (size < sizeof(ps->ncp)) return FALSE; + ncp.rgrc[0] = ps->ncp.rgrc[0]; + ncp.rgrc[1] = ps->ncp.rgrc[1]; + ncp.rgrc[2] = ps->ncp.rgrc[2]; + wp.hwnd = wine_server_ptr_handle( ps->ncp.hwnd ); + wp.hwndInsertAfter = wine_server_ptr_handle( ps->ncp.hwndInsertAfter ); + wp.x = ps->ncp.x; + wp.y = ps->ncp.y; + wp.cx = ps->ncp.cx; + wp.cy = ps->ncp.cy; + wp.flags = ps->ncp.flags; + ncp.lppos = (WINDOWPOS *)((NCCALCSIZE_PARAMS *)&ps->ncp + 1); + memcpy( &ps->ncp, &ncp, sizeof(ncp) ); + *ncp.lppos = wp; } break; case WM_GETDLGCODE: @@ -1431,9 +1471,18 @@ static void pack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, push_data( data, (RECT *)lparam, sizeof(RECT) ); else { - NCCALCSIZE_PARAMS *nc = (NCCALCSIZE_PARAMS *)lparam; - push_data( data, nc, sizeof(*nc) ); - push_data( data, nc->lppos, sizeof(*nc->lppos) ); + NCCALCSIZE_PARAMS *ncp = (NCCALCSIZE_PARAMS *)lparam; + data->ps.ncp.rgrc[0] = ncp->rgrc[0]; + data->ps.ncp.rgrc[1] = ncp->rgrc[1]; + data->ps.ncp.rgrc[2] = ncp->rgrc[2]; + data->ps.ncp.hwnd = wine_server_user_handle( ncp->lppos->hwnd ); + data->ps.ncp.hwndInsertAfter = wine_server_user_handle( ncp->lppos->hwndInsertAfter ); + data->ps.ncp.x = ncp->lppos->x; + data->ps.ncp.y = ncp->lppos->y; + data->ps.ncp.cx = ncp->lppos->cx; + data->ps.ncp.cy = ncp->lppos->cy; + data->ps.ncp.flags = ncp->lppos->flags; + push_data( data, &data->ps.ncp, sizeof(data->ps.ncp) ); } break; case EM_GETSEL: @@ -1554,17 +1603,19 @@ static void unpack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, case WM_NCCALCSIZE: if (!wparam) memcpy( (RECT *)lparam, buffer, min( sizeof(RECT), size )); - else + else if (size >= sizeof(ps->ncp)) { - NCCALCSIZE_PARAMS *nc = (NCCALCSIZE_PARAMS *)lparam; - WINDOWPOS *wp = nc->lppos; - memcpy( nc, buffer, min( sizeof(*nc), size )); - if (size > sizeof(*nc)) - { - size -= sizeof(*nc); - memcpy( wp, (NCCALCSIZE_PARAMS*)buffer + 1, min( sizeof(*wp), size )); - } - nc->lppos = wp; /* restore the original pointer */ + NCCALCSIZE_PARAMS *ncp = (NCCALCSIZE_PARAMS *)lparam; + ncp->rgrc[0] = ps->ncp.rgrc[0]; + ncp->rgrc[1] = ps->ncp.rgrc[1]; + ncp->rgrc[2] = ps->ncp.rgrc[2]; + ncp->lppos->hwnd = wine_server_ptr_handle( ps->ncp.hwnd ); + ncp->lppos->hwndInsertAfter = wine_server_ptr_handle( ps->ncp.hwndInsertAfter ); + ncp->lppos->x = ps->ncp.x; + ncp->lppos->y = ps->ncp.y; + ncp->lppos->cx = ps->ncp.cx; + ncp->lppos->cy = ps->ncp.cy; + ncp->lppos->flags = ps->ncp.flags; } break; case EM_GETSEL:

1 0

Alexandre Julliard : user32: Pack the HELPINFO structure in messages to allow crossing 32/64 boundaries .
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: eba2ec4ab1d2b1dd92309ee1ea0543dadac8f320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba2ec4ab1d2b1dd92309ee1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 20:34:08 2010 +0200 user32: Pack the HELPINFO structure in messages to allow crossing 32/64 boundaries. --- dlls/user32/message.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index ef4c034..78fc72e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -146,6 +146,17 @@ struct packed_COPYDATASTRUCT ULONGLONG lpData; }; +struct packed_HELPINFO +{ + UINT cbSize; + INT iContextType; + INT iCtrlId; + user_handle_t hItemHandle; + DWORD __pad; + ULONGLONG dwContextId; + POINT MousePos; +}; + /* 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) ); @@ -154,6 +165,7 @@ C_ASSERT( sizeof(struct packed_DELETEITEMSTRUCT) >= sizeof(DELETEITEMSTRUCT) ); C_ASSERT( sizeof(struct packed_COMPAREITEMSTRUCT) >= sizeof(COMPAREITEMSTRUCT) ); C_ASSERT( sizeof(struct packed_WINDOWPOS) >= sizeof(WINDOWPOS) ); C_ASSERT( sizeof(struct packed_COPYDATASTRUCT) >= sizeof(COPYDATASTRUCT) ); +C_ASSERT( sizeof(struct packed_HELPINFO) >= sizeof(HELPINFO) ); union packed_structs { @@ -164,6 +176,7 @@ union packed_structs struct packed_COMPAREITEMSTRUCT cis; struct packed_WINDOWPOS wp; struct packed_COPYDATASTRUCT cds; + struct packed_HELPINFO hi; }; /* description of the data fields that need to be packed along with a sent message */ @@ -783,8 +796,16 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara data->count = -1; return 0; case WM_HELP: - push_data( data, (HELPINFO *)lparam, sizeof(HELPINFO) ); + { + HELPINFO *hi = (HELPINFO *)lparam; + data->ps.hi.iContextType = hi->iContextType; + data->ps.hi.iCtrlId = hi->iCtrlId; + data->ps.hi.hItemHandle = wine_server_user_handle( hi->hItemHandle ); + data->ps.hi.dwContextId = hi->dwContextId; + data->ps.hi.MousePos = hi->MousePos; + push_data( data, &data->ps.hi, sizeof(data->ps.hi) ); return 0; + } case WM_STYLECHANGING: case WM_STYLECHANGED: push_data( data, (STYLESTRUCT *)lparam, sizeof(STYLESTRUCT) ); @@ -1114,8 +1135,18 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa /* WM_NOTIFY cannot be sent across processes (MSDN) */ return FALSE; case WM_HELP: - minsize = sizeof(HELPINFO); + { + HELPINFO hi; + if (size < sizeof(ps->hi)) return FALSE; + hi.cbSize = sizeof(hi); + hi.iContextType = ps->hi.iContextType; + hi.iCtrlId = ps->hi.iCtrlId; + hi.hItemHandle = wine_server_ptr_handle( ps->hi.hItemHandle ); + hi.dwContextId = (ULONG_PTR)unpack_ptr( ps->hi.dwContextId ); + hi.MousePos = ps->hi.MousePos; + memcpy( &ps->hi, &hi, sizeof(hi) ); break; + } case WM_STYLECHANGING: case WM_STYLECHANGED: minsize = sizeof(STYLESTRUCT);

1 0

Alexandre Julliard : user32: Pack the WINDOWPOS structure in messages to allow crossing 32/ 64 boundaries.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 5c652698970c6b8cf14a4515e4ebc6251640e5c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c652698970c6b8cf14a4515e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 20:30:50 2010 +0200 user32: Pack the WINDOWPOS structure in messages to allow crossing 32/64 boundaries. --- dlls/user32/message.c | 67 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 6650080..65a8c1d 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -125,12 +125,27 @@ struct packed_COMPAREITEMSTRUCT DWORD __pad2; }; +struct packed_WINDOWPOS +{ + user_handle_t hwnd; + DWORD __pad1; + user_handle_t hwndInsertAfter; + DWORD __pad2; + INT x; + INT y; + INT cx; + INT cy; + UINT flags; + DWORD __pad3; +}; + /* 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) ); C_ASSERT( sizeof(struct packed_MEASUREITEMSTRUCT) >= sizeof(MEASUREITEMSTRUCT) ); C_ASSERT( sizeof(struct packed_DELETEITEMSTRUCT) >= sizeof(DELETEITEMSTRUCT) ); C_ASSERT( sizeof(struct packed_COMPAREITEMSTRUCT) >= sizeof(COMPAREITEMSTRUCT) ); +C_ASSERT( sizeof(struct packed_WINDOWPOS) >= sizeof(WINDOWPOS) ); union packed_structs { @@ -139,6 +154,7 @@ union packed_structs struct packed_MEASUREITEMSTRUCT mis; struct packed_DELETEITEMSTRUCT dls; struct packed_COMPAREITEMSTRUCT cis; + struct packed_WINDOWPOS wp; }; /* description of the data fields that need to be packed along with a sent message */ @@ -731,8 +747,18 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara } case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: - push_data( data, (WINDOWPOS *)lparam, sizeof(WINDOWPOS) ); - return sizeof(WINDOWPOS); + { + WINDOWPOS *wp = (WINDOWPOS *)lparam; + data->ps.wp.hwnd = wine_server_user_handle( wp->hwnd ); + data->ps.wp.hwndInsertAfter = wine_server_user_handle( wp->hwndInsertAfter ); + data->ps.wp.x = wp->x; + data->ps.wp.y = wp->y; + data->ps.wp.cx = wp->cx; + data->ps.wp.cy = wp->cy; + data->ps.wp.flags = wp->flags; + push_data( data, &data->ps.wp, sizeof(data->ps.wp) ); + return sizeof(data->ps.wp); + } case WM_COPYDATA: { COPYDATASTRUCT *cp = (COPYDATASTRUCT *)lparam; @@ -1040,8 +1066,19 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: case WM_WINE_SETWINDOWPOS: - minsize = sizeof(WINDOWPOS); + { + WINDOWPOS wp; + if (size < sizeof(ps->wp)) return FALSE; + wp.hwnd = wine_server_ptr_handle( ps->wp.hwnd ); + wp.hwndInsertAfter = wine_server_ptr_handle( ps->wp.hwndInsertAfter ); + wp.x = ps->wp.x; + wp.y = ps->wp.y; + wp.cx = ps->wp.cx; + wp.cy = ps->wp.cy; + wp.flags = ps->wp.flags; + memcpy( &ps->wp, &wp, sizeof(wp) ); break; + } case WM_COPYDATA: { COPYDATASTRUCT *cp = *buffer; @@ -1301,8 +1338,18 @@ static void pack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, } case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: - push_data( data, (WINDOWPOS *)lparam, sizeof(WINDOWPOS) ); + { + WINDOWPOS *wp = (WINDOWPOS *)lparam; + data->ps.wp.hwnd = wine_server_user_handle( wp->hwnd ); + data->ps.wp.hwndInsertAfter = wine_server_user_handle( wp->hwndInsertAfter ); + data->ps.wp.x = wp->x; + data->ps.wp.y = wp->y; + data->ps.wp.cx = wp->cx; + data->ps.wp.cy = wp->cy; + data->ps.wp.flags = wp->flags; + push_data( data, &data->ps.wp, sizeof(data->ps.wp) ); break; + } case WM_GETDLGCODE: if (lparam) push_data( data, (MSG *)lparam, sizeof(MSG) ); break; @@ -1408,7 +1455,17 @@ static void unpack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, break; case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: - memcpy( (WINDOWPOS *)lparam, buffer, min( sizeof(WINDOWPOS), size )); + if (size >= sizeof(ps->wp)) + { + WINDOWPOS *wp = (WINDOWPOS *)lparam; + wp->hwnd = wine_server_ptr_handle( ps->wp.hwnd ); + wp->hwndInsertAfter = wine_server_ptr_handle( ps->wp.hwndInsertAfter ); + wp->x = ps->wp.x; + wp->y = ps->wp.y; + wp->cx = ps->wp.cx; + wp->cy = ps->wp.cy; + wp->flags = ps->wp.flags; + } break; case WM_GETDLGCODE: if (lparam) memcpy( (MSG *)lparam, buffer, min( sizeof(MSG), size ));

1 0