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

Alexandre Julliard : user: Added fast 16-> 32 mapping for the WM_DDE* messages.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: refs/heads/master Commit: 8b4281a7c8eddb198add492536c14fa5913755e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b4281a7c8eddb198add492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 13:42:00 2006 +0200 user: Added fast 16->32 mapping for the WM_DDE* messages. --- dlls/user/winproc.c | 111 ++++++++++++++++++++++++--------------------------- 1 files changed, 52 insertions(+), 59 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index c52273b..d36f192 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -802,65 +802,6 @@ static INT WINPROC_MapMsg16To32A( HWND h case WM_SIZECLIPBOARD: FIXME_(msg)("message %04x needs translation\n",msg16 ); return -1; - case WM_DDE_INITIATE: - case WM_DDE_TERMINATE: - case WM_DDE_UNADVISE: - case WM_DDE_REQUEST: - *pwparam32 = (WPARAM)WIN_Handle32(wParam16); - return 0; - case WM_DDE_ADVISE: - case WM_DDE_DATA: - case WM_DDE_POKE: - { - HANDLE16 lo16; - ATOM hi; - UINT lo32 = 0; - - *pwparam32 = (WPARAM)WIN_Handle32(wParam16); - lo16 = LOWORD(*plparam); - hi = HIWORD(*plparam); - if (lo16 && !(lo32 = convert_handle_16_to_32(lo16, GMEM_DDESHARE))) - return -1; - *plparam = PackDDElParam(msg16, lo32, hi); - } - return 0; /* FIXME don't know how to free allocated memory (handle) !! */ - case WM_DDE_ACK: - { - UINT lo, hi; - int flag = 0; - char buf[2]; - - *pwparam32 = (WPARAM)WIN_Handle32(wParam16); - - lo = LOWORD(*plparam); - hi = HIWORD(*plparam); - - if (GlobalGetAtomNameA(hi, buf, 2) > 0) flag |= 1; - if (GlobalSize16(hi) != 0) flag |= 2; - switch (flag) - { - case 0: - if (hi) - { - MESSAGE("DDE_ACK: neither atom nor handle!!!\n"); - hi = 0; - } - break; - case 1: - break; /* atom, nothing to do */ - case 3: - MESSAGE("DDE_ACK: %x both atom and handle... choosing handle\n", hi); - /* fall thru */ - case 2: - hi = convert_handle_16_to_32(hi, GMEM_DDESHARE); - break; - } - *plparam = PackDDElParam(WM_DDE_ACK, lo, hi); - } - return 0; /* FIXME don't know how to free allocated memory (handle) !! */ - case WM_DDE_EXECUTE: - *plparam = convert_handle_16_to_32(*plparam, GMEM_DDESHARE); - return 0; /* FIXME don't know how to free allocated memory (handle) !! */ default: /* No translation needed */ return 0; } @@ -2366,6 +2307,58 @@ LRESULT WINPROC_CallProc16To32A( winproc *result = MAKELONG( HMENU_16(next.hmenuNext), HWND_16(next.hwndNext) ); } break; + case WM_DDE_INITIATE: + case WM_DDE_TERMINATE: + case WM_DDE_UNADVISE: + case WM_DDE_REQUEST: + ret = callback( hwnd32, msg, (WPARAM)WIN_Handle32(wParam), lParam, result, arg ); + break; + case WM_DDE_ADVISE: + case WM_DDE_DATA: + case WM_DDE_POKE: + { + HANDLE16 lo16 = LOWORD(lParam); + UINT lo32 = 0; + if (lo16 && !(lo32 = convert_handle_16_to_32(lo16, GMEM_DDESHARE))) break; + lParam = PackDDElParam( msg, lo32, HIWORD(lParam) ); + ret = callback( hwnd32, msg, (WPARAM)WIN_Handle32(wParam), lParam, result, arg ); + } + break; /* FIXME don't know how to free allocated memory (handle) !! */ + case WM_DDE_ACK: + { + UINT lo = LOWORD(lParam); + UINT hi = HIWORD(lParam); + int flag = 0; + char buf[2]; + + if (GlobalGetAtomNameA(hi, buf, 2) > 0) flag |= 1; + if (GlobalSize16(hi) != 0) flag |= 2; + switch (flag) + { + case 0: + if (hi) + { + MESSAGE("DDE_ACK: neither atom nor handle!!!\n"); + hi = 0; + } + break; + case 1: + break; /* atom, nothing to do */ + case 3: + MESSAGE("DDE_ACK: %x both atom and handle... choosing handle\n", hi); + /* fall thru */ + case 2: + hi = convert_handle_16_to_32(hi, GMEM_DDESHARE); + break; + } + lParam = PackDDElParam( WM_DDE_ACK, lo, hi ); + ret = callback( hwnd32, msg, (WPARAM)WIN_Handle32(wParam), lParam, result, arg ); + } + break; /* FIXME don't know how to free allocated memory (handle) !! */ + case WM_DDE_EXECUTE: + lParam = convert_handle_16_to_32( lParam, GMEM_DDESHARE ); + ret = callback( hwnd32, msg, wParam, lParam, result, arg ); + break; /* FIXME don't know how to free allocated memory (handle) !! */ default: { UINT msg32;

1 0

Alexandre Julliard : user: Added fast 16-> 32 mapping for the remaining messages.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: refs/heads/master Commit: 2ea3f3d293dbdee65fdfa6eae9218749e9f651bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2ea3f3d293dbdee65fdfa6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 13:44:57 2006 +0200 user: Added fast 16->32 mapping for the remaining messages. --- dlls/user/winproc.c | 146 +++++++++++++++++++++------------------------------ 1 files changed, 59 insertions(+), 87 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index d36f192..64a5a7c 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -729,85 +729,6 @@ static UINT convert_handle_16_to_32(HAND return (UINT)dst; } -/********************************************************************** - * WINPROC_MapMsg16To32A - * - * Map a message from 16- to 32-bit Ansi. - * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed. - */ -static INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pmsg32, - WPARAM *pwparam32, LPARAM *plparam ) -{ - *pmsg32 = (UINT)msg16; - *pwparam32 = (WPARAM)wParam16; - switch(msg16) - { - case WM_ACTIVATE: - case WM_CHARTOITEM: - case WM_COMMAND: - case WM_VKEYTOITEM: - *pwparam32 = MAKEWPARAM( wParam16, HIWORD(*plparam) ); - *plparam = (LPARAM)WIN_Handle32( LOWORD(*plparam) ); - return 0; - case WM_HSCROLL: - case WM_VSCROLL: - *pwparam32 = MAKEWPARAM( wParam16, LOWORD(*plparam) ); - *plparam = (LPARAM)WIN_Handle32( HIWORD(*plparam) ); - return 0; - case WM_CTLCOLOR: - if ( HIWORD(*plparam) > CTLCOLOR_STATIC ) return -1; - *pmsg32 = WM_CTLCOLORMSGBOX + HIWORD(*plparam); - *pwparam32 = (WPARAM)HDC_32(wParam16); - *plparam = (LPARAM)WIN_Handle32( LOWORD(*plparam) ); - return 0; - case WM_GETTEXT: - case WM_SETTEXT: - case WM_WININICHANGE: - case WM_DEVMODECHANGE: - case WM_ASKCBFORMATNAME: - *plparam = (LPARAM)MapSL(*plparam); - return 0; - case WM_MENUCHAR: - *pwparam32 = MAKEWPARAM( wParam16, LOWORD(*plparam) ); - *plparam = (LPARAM)HMENU_32(HIWORD(*plparam)); - return 0; - case WM_MENUSELECT: - if((LOWORD(*plparam) & MF_POPUP) && (LOWORD(*plparam) != 0xFFFF)) - { - HMENU hmenu=HMENU_32(HIWORD(*plparam)); - UINT Pos=MENU_FindSubMenu( &hmenu, HMENU_32(wParam16)); - if(Pos==0xFFFF) Pos=0; /* NO_SELECTED_ITEM */ - *pwparam32 = MAKEWPARAM( Pos, LOWORD(*plparam) ); - } - else *pwparam32 = MAKEWPARAM( wParam16, LOWORD(*plparam) ); - *plparam = (LPARAM)HMENU_32(HIWORD(*plparam)); - return 0; - case WM_PARENTNOTIFY: - if ((wParam16 == WM_CREATE) || (wParam16 == WM_DESTROY)) - { - *pwparam32 = MAKEWPARAM( wParam16, HIWORD(*plparam) ); - *plparam = (LPARAM)WIN_Handle32( LOWORD(*plparam) ); - } - return 0; - case WM_NOTIFY: - *plparam = (LPARAM)MapSL(*plparam); - return 0; - case WM_ACTIVATEAPP: - /* We need this when SetActiveWindow sends a Sendmessage16() to - * a 32bit window. Might be superflous with 32bit interprocess - * message queues. */ - if (*plparam) *plparam = HTASK_32( *plparam ); - return 0; - case WM_PAINTCLIPBOARD: - case WM_SIZECLIPBOARD: - FIXME_(msg)("message %04x needs translation\n",msg16 ); - return -1; - default: /* No translation needed */ - return 0; - } -} - - static HANDLE16 convert_handle_32_to_16(UINT src, unsigned int flags) { HANDLE16 dst; @@ -2307,6 +2228,60 @@ LRESULT WINPROC_CallProc16To32A( winproc *result = MAKELONG( HMENU_16(next.hmenuNext), HWND_16(next.hwndNext) ); } break; + case WM_ACTIVATE: + case WM_CHARTOITEM: + case WM_COMMAND: + case WM_VKEYTOITEM: + ret = callback( hwnd32, msg, MAKEWPARAM( wParam, HIWORD(lParam) ), + (LPARAM)WIN_Handle32( LOWORD(lParam) ), result, arg ); + break; + case WM_HSCROLL: + case WM_VSCROLL: + ret = callback( hwnd32, msg, MAKEWPARAM( wParam, LOWORD(lParam) ), + (LPARAM)WIN_Handle32( HIWORD(lParam) ), result, arg ); + break; + case WM_CTLCOLOR: + if (HIWORD(lParam) <= CTLCOLOR_STATIC) + ret = callback( hwnd32, WM_CTLCOLORMSGBOX + HIWORD(lParam), + (WPARAM)HDC_32(wParam), (LPARAM)WIN_Handle32( LOWORD(lParam) ), + result, arg ); + break; + case WM_GETTEXT: + case WM_SETTEXT: + case WM_WININICHANGE: + case WM_DEVMODECHANGE: + case WM_ASKCBFORMATNAME: + case WM_NOTIFY: + ret = callback( hwnd32, msg, wParam, (LPARAM)MapSL(lParam), result, arg ); + break; + case WM_MENUCHAR: + ret = callback( hwnd32, msg, MAKEWPARAM( wParam, LOWORD(lParam) ), + (LPARAM)HMENU_32(HIWORD(lParam)), result, arg ); + break; + case WM_MENUSELECT: + if((LOWORD(lParam) & MF_POPUP) && (LOWORD(lParam) != 0xFFFF)) + { + HMENU hmenu = HMENU_32(HIWORD(lParam)); + UINT pos = MENU_FindSubMenu( &hmenu, HMENU_32(wParam) ); + if (pos == 0xffff) pos = 0; /* NO_SELECTED_ITEM */ + wParam = pos; + } + ret = callback( hwnd32, msg, MAKEWPARAM( wParam, LOWORD(lParam) ), + (LPARAM)HMENU_32(HIWORD(lParam)), result, arg ); + break; + case WM_PARENTNOTIFY: + if ((wParam == WM_CREATE) || (wParam == WM_DESTROY)) + ret = callback( hwnd32, msg, MAKEWPARAM( wParam, HIWORD(lParam) ), + (LPARAM)WIN_Handle32( LOWORD(lParam) ), result, arg ); + else + ret = callback( hwnd32, msg, wParam, lParam, result, arg ); + break; + case WM_ACTIVATEAPP: + /* We need this when SetActiveWindow sends a Sendmessage16() to + * a 32bit window. Might be superflous with 32bit interprocess + * message queues. */ + ret = callback( hwnd32, msg, wParam, HTASK_32(lParam), result, arg ); + break; case WM_DDE_INITIATE: case WM_DDE_TERMINATE: case WM_DDE_UNADVISE: @@ -2359,15 +2334,12 @@ LRESULT WINPROC_CallProc16To32A( winproc lParam = convert_handle_16_to_32( lParam, GMEM_DDESHARE ); ret = callback( hwnd32, msg, wParam, lParam, result, arg ); break; /* FIXME don't know how to free allocated memory (handle) !! */ + case WM_PAINTCLIPBOARD: + case WM_SIZECLIPBOARD: + FIXME_(msg)( "message %04x needs translation\n", msg ); + break; default: - { - UINT msg32; - WPARAM wParam32; - if (WINPROC_MapMsg16To32A( hwnd32, msg, wParam, &msg32, &wParam32, &lParam ) != -1) - { - ret = callback( hwnd32, msg32, wParam32, lParam, result, arg ); - } - } + ret = callback( hwnd32, msg, wParam, lParam, result, arg ); break; } return ret;

1 0

Alexandre Julliard : user: Added fast 32->16 mapping for WM_CREATE, WM_NCCREATE and WM_MDICREATE.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: refs/heads/master Commit: 611722a3255d6e693d0360630df7ba963c7cacff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=611722a3255d6e693d03606… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 13:53:15 2006 +0200 user: Added fast 32->16 mapping for WM_CREATE, WM_NCCREATE and WM_MDICREATE. --- dlls/user/winproc.c | 141 +++++++++++++++++++++++---------------------------- 1 files changed, 64 insertions(+), 77 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 64a5a7c..5114fe8 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -1057,18 +1057,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h *plparam = MapLS( str ); } return 1; - case WM_MDICREATE: - { - MDICREATESTRUCT16 *cs; - MDICREATESTRUCTA *cs32 = (MDICREATESTRUCTA *)*plparam; - - if (!(cs = HeapAlloc( GetProcessHeap(), 0, sizeof(MDICREATESTRUCT16) ))) return -1; - MDICREATESTRUCT32Ato16( cs32, cs ); - cs->szTitle = MapLS( cs32->szTitle ); - cs->szClass = MapLS( cs32->szClass ); - *plparam = MapLS( cs ); - } - return 1; case WM_MDIGETACTIVE: return 1; case WM_MDISETMENU: @@ -1136,35 +1124,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h *plparam = MapLS( nc ); } return 1; - case WM_NCCREATE: - case WM_CREATE: - { - CREATESTRUCT16 *cs; - CREATESTRUCTA *cs32 = (CREATESTRUCTA *)*plparam; - - if (!(cs = HeapAlloc( GetProcessHeap(), 0, sizeof(CREATESTRUCT16) ))) return -1; - CREATESTRUCT32Ato16( cs32, cs ); - cs->lpszName = MapLS( cs32->lpszName ); - cs->lpszClass = MapLS( cs32->lpszClass ); - - if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) - { - MDICREATESTRUCT16 *mdi_cs16; - MDICREATESTRUCTA *mdi_cs = (MDICREATESTRUCTA *)cs32->lpCreateParams; - mdi_cs16 = HeapAlloc(GetProcessHeap(), 0, sizeof(*mdi_cs16)); - if (!mdi_cs16) - { - HeapFree(GetProcessHeap(), 0, cs); - return -1; - } - MDICREATESTRUCT32Ato16(mdi_cs, mdi_cs16); - mdi_cs16->szTitle = MapLS( mdi_cs->szTitle ); - mdi_cs16->szClass = MapLS( mdi_cs->szClass ); - cs->lpCreateParams = MapLS( mdi_cs16 ); - } - *plparam = MapLS( cs ); - } - return 1; case WM_PARENTNOTIFY: if ((LOWORD(wParam32)==WM_CREATE) || (LOWORD(wParam32)==WM_DESTROY)) *plparam = MAKELPARAM( (HWND16)*plparam, HIWORD(wParam32)); @@ -1414,15 +1373,6 @@ static void WINPROC_UnmapMsg32ATo16( HWN HeapFree( GetProcessHeap(), 0, (LPARAM *)str - 1 ); } break; - case WM_MDICREATE: - { - MDICREATESTRUCT16 *cs = MapSL(lParam16); - UnMapLS( cs->szTitle ); - UnMapLS( cs->szClass ); - UnMapLS( lParam16 ); - HeapFree( GetProcessHeap(), 0, cs ); - } - break; case WM_MDIGETACTIVE: if (lParam) *(BOOL *)lParam = (BOOL16)HIWORD(*result); *result = (LRESULT)WIN_Handle32( LOWORD(*result) ); @@ -1456,24 +1406,6 @@ static void WINPROC_UnmapMsg32ATo16( HWN HeapFree( GetProcessHeap(), 0, nc ); } break; - case WM_NCCREATE: - case WM_CREATE: - { - CREATESTRUCT16 *cs = MapSL(lParam16); - UnMapLS( lParam16 ); - UnMapLS( cs->lpszName ); - UnMapLS( cs->lpszClass ); - if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) - { - MDICREATESTRUCT16 *mdi_cs16 = (MDICREATESTRUCT16 *)MapSL(cs->lpCreateParams); - UnMapLS( cs->lpCreateParams ); - UnMapLS( mdi_cs16->szTitle ); - UnMapLS( mdi_cs16->szClass ); - HeapFree(GetProcessHeap(), 0, mdi_cs16); - } - HeapFree( GetProcessHeap(), 0, cs ); - } - break; case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: { @@ -2370,19 +2302,74 @@ LRESULT WINAPI __wine_call_wndproc( HWND LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ) { - LRESULT ret; - UINT16 msg16; - WPARAM16 wParam16; - LPARAM lParam16; + LRESULT ret = 0; TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam); - lParam16 = lParam; - if (WINPROC_MapMsg32ATo16( hwnd, msg, wParam, &msg16, &wParam16, &lParam16 ) == -1) - return 0; - ret = callback( HWND_16(hwnd), msg16, wParam16, lParam16, result, arg ); - WINPROC_UnmapMsg32ATo16( hwnd, msg, wParam, lParam, wParam16, lParam16, result ); + switch(msg) + { + case WM_NCCREATE: + case WM_CREATE: + { + CREATESTRUCTA *cs32 = (CREATESTRUCTA *)lParam; + CREATESTRUCT16 cs; + MDICREATESTRUCT16 mdi_cs16; + BOOL mdi_child = (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD); + + CREATESTRUCT32Ato16( cs32, &cs ); + cs.lpszName = MapLS( cs32->lpszName ); + cs.lpszClass = MapLS( cs32->lpszClass ); + + if (mdi_child) + { + MDICREATESTRUCTA *mdi_cs = (MDICREATESTRUCTA *)cs32->lpCreateParams; + MDICREATESTRUCT32Ato16( mdi_cs, &mdi_cs16 ); + mdi_cs16.szTitle = MapLS( mdi_cs->szTitle ); + mdi_cs16.szClass = MapLS( mdi_cs->szClass ); + cs.lpCreateParams = MapLS( &mdi_cs16 ); + } + lParam = MapLS( &cs ); + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + UnMapLS( lParam ); + UnMapLS( cs.lpszName ); + UnMapLS( cs.lpszClass ); + if (mdi_child) + { + UnMapLS( cs.lpCreateParams ); + UnMapLS( mdi_cs16.szTitle ); + UnMapLS( mdi_cs16.szClass ); + } + } + break; + case WM_MDICREATE: + { + MDICREATESTRUCTA *cs32 = (MDICREATESTRUCTA *)lParam; + MDICREATESTRUCT16 cs; + + MDICREATESTRUCT32Ato16( cs32, &cs ); + cs.szTitle = MapLS( cs32->szTitle ); + cs.szClass = MapLS( cs32->szClass ); + lParam = MapLS( &cs ); + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + UnMapLS( lParam ); + UnMapLS( cs.szTitle ); + UnMapLS( cs.szClass ); + } + break; + default: + { + UINT16 msg16; + WPARAM16 wParam16; + LPARAM lParam16 = lParam; + if (WINPROC_MapMsg32ATo16( hwnd, msg, wParam, &msg16, &wParam16, &lParam16 ) != -1) + { + ret = callback( HWND_16(hwnd), msg16, wParam16, lParam16, result, arg ); + WINPROC_UnmapMsg32ATo16( hwnd, msg, wParam, lParam, wParam16, lParam16, result ); + } + } + break; + } return ret; }

1 0

Alexandre Julliard : user: Added fast 16->32 mapping for WM_CREATE, WM_NCCREATE and WM_MDICREATE.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: refs/heads/master Commit: 246f6d11059c616f98076c4a11e14ec4c5dcafe9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=246f6d11059c616f98076c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 13:21:31 2006 +0200 user: Added fast 16->32 mapping for WM_CREATE, WM_NCCREATE and WM_MDICREATE. --- dlls/user/winproc.c | 116 ++++++++++++++++++++------------------------------- 1 files changed, 46 insertions(+), 70 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 9b658ed..63985d7 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -367,6 +367,8 @@ static void CREATESTRUCT16to32A( const C to->x = from->x; to->style = from->style; to->dwExStyle = from->dwExStyle; + to->lpszName = MapSL(from->lpszName); + to->lpszClass = MapSL(from->lpszClass); } /* The strings are not copied */ @@ -390,6 +392,8 @@ static void MDICREATESTRUCT16to32A( cons to->cy = from->cy; to->style = from->style; to->lParam = from->lParam; + to->szTitle = MapSL(from->szTitle); + to->szClass = MapSL(from->szClass); } static WPARAM map_wparam_char_AtoW( WPARAM wParam, DWORD len ) @@ -832,18 +836,6 @@ static INT WINPROC_MapMsg16To32A( HWND h case WM_ASKCBFORMATNAME: *plparam = (LPARAM)MapSL(*plparam); return 0; - case WM_MDICREATE: - { - MDICREATESTRUCT16 *cs16 = MapSL(*plparam); - MDICREATESTRUCTA *cs = HeapAlloc( GetProcessHeap(), 0, sizeof(*cs) + sizeof(LPARAM) ); - if (!cs) return -1; - MDICREATESTRUCT16to32A( cs16, cs ); - cs->szTitle = MapSL(cs16->szTitle); - cs->szClass = MapSL(cs16->szClass); - *(LPARAM *)(cs + 1) = *plparam; /* Store the previous lParam */ - *plparam = (LPARAM)cs; - } - return 1; case WM_MDIGETACTIVE: *plparam = (LPARAM)HeapAlloc( GetProcessHeap(), 0, sizeof(BOOL) ); *(BOOL*)(*plparam) = 0; @@ -906,36 +898,6 @@ static INT WINPROC_MapMsg16To32A( HWND h *plparam = (LPARAM)nc; } return 1; - case WM_NCCREATE: - case WM_CREATE: - { - CREATESTRUCT16 *cs16 = MapSL(*plparam); - CREATESTRUCTA *cs = HeapAlloc( GetProcessHeap(), 0, sizeof(*cs) + sizeof(LPARAM) ); - if (!cs) return -1; - CREATESTRUCT16to32A( cs16, cs ); - cs->lpszName = MapSL(cs16->lpszName); - cs->lpszClass = MapSL(cs16->lpszClass); - - if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) - { - MDICREATESTRUCT16 *mdi_cs16; - MDICREATESTRUCTA *mdi_cs = HeapAlloc(GetProcessHeap(), 0, sizeof(*mdi_cs)); - if (!mdi_cs) - { - HeapFree(GetProcessHeap(), 0, cs); - return -1; - } - mdi_cs16 = (MDICREATESTRUCT16 *)MapSL(cs16->lpCreateParams); - MDICREATESTRUCT16to32A(mdi_cs16, mdi_cs); - mdi_cs->szTitle = MapSL(mdi_cs16->szTitle); - mdi_cs->szClass = MapSL(mdi_cs16->szClass); - - cs->lpCreateParams = mdi_cs; - } - *(LPARAM *)(cs + 1) = *plparam; /* Store the previous lParam */ - *plparam = (LPARAM)cs; - } - return 1; case WM_PARENTNOTIFY: if ((wParam16 == WM_CREATE) || (wParam16 == WM_DESTROY)) { @@ -1094,14 +1056,6 @@ static LRESULT WINPROC_UnmapMsg16To32A( HeapFree( GetProcessHeap(), 0, mmi ); } break; - case WM_MDICREATE: - { - MDICREATESTRUCTA *cs = (MDICREATESTRUCTA *)lParam; - lParam = *(LPARAM *)(cs + 1); - MDICREATESTRUCT32Ato16( cs, MapSL(lParam) ); - HeapFree( GetProcessHeap(), 0, cs ); - } - break; case WM_MDIGETACTIVE: result = MAKELONG( LOWORD(result), (BOOL16)(*(BOOL *)lParam) ); HeapFree( GetProcessHeap(), 0, (BOOL *)lParam ); @@ -1135,19 +1089,6 @@ static LRESULT WINPROC_UnmapMsg16To32A( HeapFree( GetProcessHeap(), 0, nc ); } break; - case WM_NCCREATE: - case WM_CREATE: - { - CREATESTRUCTA *cs = (CREATESTRUCTA *)lParam; - lParam = *(LPARAM *)(cs + 1); - CREATESTRUCT32Ato16( cs, MapSL(lParam) ); - - if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) - HeapFree(GetProcessHeap(), 0, cs->lpCreateParams); - - HeapFree( GetProcessHeap(), 0, cs ); - } - break; case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: { @@ -2477,19 +2418,54 @@ static LRESULT WINPROC_CallProcWtoA( win LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg ) { - LRESULT ret; - UINT msg32; - WPARAM wParam32; + LRESULT ret = 0; HWND hwnd32 = WIN_Handle32( hwnd ); TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", hwnd32, SPY_GetMsgName(msg, hwnd32), wParam, lParam); - if (WINPROC_MapMsg16To32A( hwnd32, msg, wParam, &msg32, &wParam32, &lParam ) == -1) - return 0; + switch(msg) + { + case WM_NCCREATE: + case WM_CREATE: + { + CREATESTRUCT16 *cs16 = MapSL(lParam); + CREATESTRUCTA cs; + MDICREATESTRUCTA mdi_cs; - ret = callback( hwnd32, msg32, wParam32, lParam, result, arg ); - *result = WINPROC_UnmapMsg16To32A( hwnd32, msg32, wParam32, lParam, *result ); + CREATESTRUCT16to32A( cs16, &cs ); + if (GetWindowLongW(hwnd32, GWL_EXSTYLE) & WS_EX_MDICHILD) + { + MDICREATESTRUCT16 *mdi_cs16 = MapSL(cs16->lpCreateParams); + MDICREATESTRUCT16to32A(mdi_cs16, &mdi_cs); + cs.lpCreateParams = &mdi_cs; + } + ret = callback( hwnd32, msg, wParam, (LPARAM)&cs, result, arg ); + CREATESTRUCT32Ato16( &cs, cs16 ); + } + break; + case WM_MDICREATE: + { + MDICREATESTRUCT16 *cs16 = MapSL(lParam); + MDICREATESTRUCTA cs; + + MDICREATESTRUCT16to32A( cs16, &cs ); + ret = callback( hwnd32, msg, wParam, (LPARAM)&cs, result, arg ); + MDICREATESTRUCT32Ato16( &cs, cs16 ); + } + break; + default: + { + UINT msg32; + WPARAM wParam32; + if (WINPROC_MapMsg16To32A( hwnd32, msg, wParam, &msg32, &wParam32, &lParam ) != -1) + { + ret = callback( hwnd32, msg32, wParam32, lParam, result, arg ); + *result = WINPROC_UnmapMsg16To32A( hwnd32, msg32, wParam32, lParam, *result ); + } + } + break; + } return ret; }

1 0

Alexandre Julliard : user: Added fast 16->32 mapping for WM_COMPARE/DELETE/ MEASURE/DRAWITEM.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: refs/heads/master Commit: b4d68ff9aaa25378c4211ad54f7576b8fcb5205f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4d68ff9aaa25378c4211ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 13:24:47 2006 +0200 user: Added fast 16->32 mapping for WM_COMPARE/DELETE/MEASURE/DRAWITEM. --- dlls/user/winproc.c | 140 ++++++++++++++++++++++----------------------------- 1 files changed, 61 insertions(+), 79 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 63985d7..59a6785 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -745,22 +745,6 @@ static INT WINPROC_MapMsg16To32A( HWND h *pwparam32 = (WPARAM)HDC_32(wParam16); *plparam = (LPARAM)WIN_Handle32( LOWORD(*plparam) ); return 0; - case WM_COMPAREITEM: - { - COMPAREITEMSTRUCT16* cis16 = MapSL(*plparam); - COMPAREITEMSTRUCT *cis = HeapAlloc(GetProcessHeap(), 0, sizeof(*cis)); - if (!cis) return -1; - cis->CtlType = cis16->CtlType; - cis->CtlID = cis16->CtlID; - cis->hwndItem = WIN_Handle32( cis16->hwndItem ); - cis->itemID1 = cis16->itemID1; - cis->itemData1 = cis16->itemData1; - cis->itemID2 = cis16->itemID2; - cis->itemData2 = cis16->itemData2; - cis->dwLocaleId = 0; /* FIXME */ - *plparam = (LPARAM)cis; - } - return 1; case WM_COPYDATA: { PCOPYDATASTRUCT16 pcds16 = MapSL(*plparam); @@ -771,55 +755,6 @@ static INT WINPROC_MapMsg16To32A( HWND h *plparam = (LPARAM)pcds; } return 1; - case WM_DELETEITEM: - { - DELETEITEMSTRUCT16* dis16 = MapSL(*plparam); - DELETEITEMSTRUCT *dis = HeapAlloc(GetProcessHeap(), 0, sizeof(*dis)); - if (!dis) return -1; - dis->CtlType = dis16->CtlType; - dis->CtlID = dis16->CtlID; - dis->hwndItem = WIN_Handle32( dis16->hwndItem ); - dis->itemData = dis16->itemData; - *plparam = (LPARAM)dis; - } - return 1; - case WM_MEASUREITEM: - { - MEASUREITEMSTRUCT16* mis16 = MapSL(*plparam); - MEASUREITEMSTRUCT *mis = HeapAlloc(GetProcessHeap(), 0, - sizeof(*mis) + sizeof(LPARAM)); - if (!mis) return -1; - mis->CtlType = mis16->CtlType; - mis->CtlID = mis16->CtlID; - mis->itemID = mis16->itemID; - mis->itemWidth = mis16->itemWidth; - mis->itemHeight = mis16->itemHeight; - mis->itemData = mis16->itemData; - *(LPARAM *)(mis + 1) = *plparam; /* Store the previous lParam */ - *plparam = (LPARAM)mis; - } - return 1; - case WM_DRAWITEM: - { - DRAWITEMSTRUCT16* dis16 = MapSL(*plparam); - DRAWITEMSTRUCT *dis = HeapAlloc(GetProcessHeap(), 0, sizeof(*dis)); - if (!dis) return -1; - dis->CtlType = dis16->CtlType; - dis->CtlID = dis16->CtlID; - dis->itemID = dis16->itemID; - dis->itemAction = dis16->itemAction; - dis->itemState = dis16->itemState; - dis->hwndItem = (dis->CtlType == ODT_MENU) ? (HWND)HMENU_32(dis16->hwndItem) - : WIN_Handle32( dis16->hwndItem ); - dis->hDC = HDC_32(dis16->hDC); - dis->itemData = dis16->itemData; - dis->rcItem.left = dis16->rcItem.left; - dis->rcItem.top = dis16->rcItem.top; - dis->rcItem.right = dis16->rcItem.right; - dis->rcItem.bottom = dis16->rcItem.bottom; - *plparam = (LPARAM)dis; - } - return 1; case WM_GETMINMAXINFO: { MINMAXINFO *mmi = HeapAlloc( GetProcessHeap(), 0, sizeof(*mmi) + sizeof(LPARAM)); @@ -1031,23 +966,9 @@ static LRESULT WINPROC_UnmapMsg16To32A( { switch(msg) { - case WM_COMPAREITEM: - case WM_DELETEITEM: - case WM_DRAWITEM: case WM_COPYDATA: HeapFree( GetProcessHeap(), 0, (LPVOID)lParam ); break; - case WM_MEASUREITEM: - { - MEASUREITEMSTRUCT16 *mis16; - MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lParam; - lParam = *(LPARAM *)(mis + 1); - mis16 = MapSL(lParam); - mis16->itemWidth = (UINT16)mis->itemWidth; - mis16->itemHeight = (UINT16)mis->itemHeight; - HeapFree( GetProcessHeap(), 0, mis ); - } - break; case WM_GETMINMAXINFO: { MINMAXINFO *mmi = (MINMAXINFO *)lParam; @@ -2454,6 +2375,67 @@ LRESULT WINPROC_CallProc16To32A( winproc MDICREATESTRUCT32Ato16( &cs, cs16 ); } break; + case WM_COMPAREITEM: + { + COMPAREITEMSTRUCT16* cis16 = MapSL(lParam); + COMPAREITEMSTRUCT cis; + cis.CtlType = cis16->CtlType; + cis.CtlID = cis16->CtlID; + cis.hwndItem = WIN_Handle32( cis16->hwndItem ); + cis.itemID1 = cis16->itemID1; + cis.itemData1 = cis16->itemData1; + cis.itemID2 = cis16->itemID2; + cis.itemData2 = cis16->itemData2; + cis.dwLocaleId = 0; /* FIXME */ + ret = callback( hwnd32, msg, wParam, (LPARAM)&cis, result, arg ); + } + break; + case WM_DELETEITEM: + { + DELETEITEMSTRUCT16* dis16 = MapSL(lParam); + DELETEITEMSTRUCT dis; + dis.CtlType = dis16->CtlType; + dis.CtlID = dis16->CtlID; + dis.hwndItem = WIN_Handle32( dis16->hwndItem ); + dis.itemData = dis16->itemData; + ret = callback( hwnd32, msg, wParam, (LPARAM)&dis, result, arg ); + } + break; + case WM_MEASUREITEM: + { + MEASUREITEMSTRUCT16* mis16 = MapSL(lParam); + MEASUREITEMSTRUCT mis; + mis.CtlType = mis16->CtlType; + mis.CtlID = mis16->CtlID; + mis.itemID = mis16->itemID; + mis.itemWidth = mis16->itemWidth; + mis.itemHeight = mis16->itemHeight; + mis.itemData = mis16->itemData; + ret = callback( hwnd32, msg, wParam, (LPARAM)&mis, result, arg ); + mis16->itemWidth = (UINT16)mis.itemWidth; + mis16->itemHeight = (UINT16)mis.itemHeight; + } + break; + case WM_DRAWITEM: + { + DRAWITEMSTRUCT16* dis16 = MapSL(lParam); + DRAWITEMSTRUCT dis; + dis.CtlType = dis16->CtlType; + dis.CtlID = dis16->CtlID; + dis.itemID = dis16->itemID; + dis.itemAction = dis16->itemAction; + dis.itemState = dis16->itemState; + dis.hwndItem = (dis.CtlType == ODT_MENU) ? (HWND)HMENU_32(dis16->hwndItem) + : WIN_Handle32( dis16->hwndItem ); + dis.hDC = HDC_32(dis16->hDC); + dis.itemData = dis16->itemData; + dis.rcItem.left = dis16->rcItem.left; + dis.rcItem.top = dis16->rcItem.top; + dis.rcItem.right = dis16->rcItem.right; + dis.rcItem.bottom = dis16->rcItem.bottom; + ret = callback( hwnd32, msg, wParam, (LPARAM)&dis, result, arg ); + } + break; default: { UINT msg32;

1 0

Alexandre Julliard : user: Added fast 16->32 mapping for WM_GETMINMAXINFO, WM_NCCALCSIZE and WM_WINDOWPOSCHANGING/CHANGED.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: refs/heads/master Commit: 5940fb8c003b592610ad286e684a6f46c1a2b1c9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5940fb8c003b592610ad286… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 13:31:55 2006 +0200 user: Added fast 16->32 mapping for WM_GETMINMAXINFO, WM_NCCALCSIZE and WM_WINDOWPOSCHANGING/CHANGED. --- dlls/user/winproc.c | 154 ++++++++++++++++++++------------------------------- 1 files changed, 60 insertions(+), 94 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 59a6785..39e7306 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -287,6 +287,21 @@ static inline LRESULT WINPROC_wrapper( W } #endif /* __i386__ */ +static void RECT16to32( const RECT16 *from, RECT *to ) +{ + to->left = from->left; + to->top = from->top; + to->right = from->right; + to->bottom = from->bottom; +} + +static void RECT32to16( const RECT *from, RECT16 *to ) +{ + to->left = from->left; + to->top = from->top; + to->right = from->right; + to->bottom = from->bottom; +} static void MINMAXINFO32to16( const MINMAXINFO *from, MINMAXINFO16 *to ) { @@ -755,15 +770,6 @@ static INT WINPROC_MapMsg16To32A( HWND h *plparam = (LPARAM)pcds; } return 1; - case WM_GETMINMAXINFO: - { - MINMAXINFO *mmi = HeapAlloc( GetProcessHeap(), 0, sizeof(*mmi) + sizeof(LPARAM)); - if (!mmi) return -1; - MINMAXINFO16to32( MapSL(*plparam), mmi ); - *(LPARAM *)(mmi + 1) = *plparam; /* Store the previous lParam */ - *plparam = (LPARAM)mmi; - } - return 1; case WM_GETTEXT: case WM_SETTEXT: case WM_WININICHANGE: @@ -804,35 +810,6 @@ static INT WINPROC_MapMsg16To32A( HWND h else /* message sent to MDI client */ *pwparam32 = wParam16; return 0; - case WM_NCCALCSIZE: - { - NCCALCSIZE_PARAMS16 *nc16; - NCCALCSIZE_PARAMS *nc; - - nc = HeapAlloc( GetProcessHeap(), 0, sizeof(*nc) + sizeof(LPARAM) ); - if (!nc) return -1; - nc16 = MapSL(*plparam); - nc->rgrc[0].left = nc16->rgrc[0].left; - nc->rgrc[0].top = nc16->rgrc[0].top; - nc->rgrc[0].right = nc16->rgrc[0].right; - nc->rgrc[0].bottom = nc16->rgrc[0].bottom; - if (wParam16) - { - nc->lppos = HeapAlloc( GetProcessHeap(), 0, sizeof(*nc->lppos) ); - nc->rgrc[1].left = nc16->rgrc[1].left; - nc->rgrc[1].top = nc16->rgrc[1].top; - nc->rgrc[1].right = nc16->rgrc[1].right; - nc->rgrc[1].bottom = nc16->rgrc[1].bottom; - nc->rgrc[2].left = nc16->rgrc[2].left; - nc->rgrc[2].top = nc16->rgrc[2].top; - nc->rgrc[2].right = nc16->rgrc[2].right; - nc->rgrc[2].bottom = nc16->rgrc[2].bottom; - if (nc->lppos) WINDOWPOS16to32( MapSL(nc16->lppos), nc->lppos ); - } - *(LPARAM *)(nc + 1) = *plparam; /* Store the previous lParam */ - *plparam = (LPARAM)nc; - } - return 1; case WM_PARENTNOTIFY: if ((wParam16 == WM_CREATE) || (wParam16 == WM_DESTROY)) { @@ -840,16 +817,6 @@ static INT WINPROC_MapMsg16To32A( HWND h *plparam = (LPARAM)WIN_Handle32( LOWORD(*plparam) ); } return 0; - case WM_WINDOWPOSCHANGING: - case WM_WINDOWPOSCHANGED: - { - WINDOWPOS *wp = HeapAlloc( GetProcessHeap(), 0, sizeof(*wp) + sizeof(LPARAM) ); - if (!wp) return -1; - WINDOWPOS16to32( MapSL(*plparam), wp ); - *(LPARAM *)(wp + 1) = *plparam; /* Store the previous lParam */ - *plparam = (LPARAM)wp; - } - return 1; case WM_GETDLGCODE: if (*plparam) { @@ -969,56 +936,10 @@ static LRESULT WINPROC_UnmapMsg16To32A( case WM_COPYDATA: HeapFree( GetProcessHeap(), 0, (LPVOID)lParam ); break; - case WM_GETMINMAXINFO: - { - MINMAXINFO *mmi = (MINMAXINFO *)lParam; - lParam = *(LPARAM *)(mmi + 1); - MINMAXINFO32to16( mmi, MapSL(lParam)); - HeapFree( GetProcessHeap(), 0, mmi ); - } - break; case WM_MDIGETACTIVE: result = MAKELONG( LOWORD(result), (BOOL16)(*(BOOL *)lParam) ); HeapFree( GetProcessHeap(), 0, (BOOL *)lParam ); break; - case WM_NCCALCSIZE: - { - NCCALCSIZE_PARAMS16 *nc16; - NCCALCSIZE_PARAMS *nc = (NCCALCSIZE_PARAMS *)lParam; - lParam = *(LPARAM *)(nc + 1); - nc16 = MapSL(lParam); - nc16->rgrc[0].left = nc->rgrc[0].left; - nc16->rgrc[0].top = nc->rgrc[0].top; - nc16->rgrc[0].right = nc->rgrc[0].right; - nc16->rgrc[0].bottom = nc->rgrc[0].bottom; - if (wParam) - { - nc16->rgrc[1].left = nc->rgrc[1].left; - nc16->rgrc[1].top = nc->rgrc[1].top; - nc16->rgrc[1].right = nc->rgrc[1].right; - nc16->rgrc[1].bottom = nc->rgrc[1].bottom; - nc16->rgrc[2].left = nc->rgrc[2].left; - nc16->rgrc[2].top = nc->rgrc[2].top; - nc16->rgrc[2].right = nc->rgrc[2].right; - nc16->rgrc[2].bottom = nc->rgrc[2].bottom; - if (nc->lppos) - { - WINDOWPOS32to16( nc->lppos, MapSL(nc16->lppos)); - HeapFree( GetProcessHeap(), 0, nc->lppos ); - } - } - HeapFree( GetProcessHeap(), 0, nc ); - } - break; - case WM_WINDOWPOSCHANGING: - case WM_WINDOWPOSCHANGED: - { - WINDOWPOS *wp = (WINDOWPOS *)lParam; - lParam = *(LPARAM *)(wp + 1); - WINDOWPOS32to16(wp, MapSL(lParam)); - HeapFree( GetProcessHeap(), 0, wp ); - } - break; case WM_GETDLGCODE: if (lParam) { @@ -2375,6 +2296,51 @@ LRESULT WINPROC_CallProc16To32A( winproc MDICREATESTRUCT32Ato16( &cs, cs16 ); } break; + case WM_GETMINMAXINFO: + { + MINMAXINFO16 *mmi16 = MapSL(lParam); + MINMAXINFO mmi; + + MINMAXINFO16to32( mmi16, &mmi ); + ret = callback( hwnd32, msg, wParam, (LPARAM)&mmi, result, arg ); + MINMAXINFO32to16( &mmi, mmi16 ); + } + break; + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + { + WINDOWPOS16 *winpos16 = MapSL(lParam); + WINDOWPOS winpos; + + WINDOWPOS16to32( winpos16, &winpos ); + ret = callback( hwnd32, msg, wParam, (LPARAM)&winpos, result, arg ); + WINDOWPOS32to16( &winpos, winpos16 ); + } + break; + case WM_NCCALCSIZE: + { + NCCALCSIZE_PARAMS16 *nc16 = MapSL(lParam); + NCCALCSIZE_PARAMS nc; + WINDOWPOS winpos; + + RECT16to32( &nc16->rgrc[0], &nc.rgrc[0] ); + if (wParam) + { + RECT16to32( &nc16->rgrc[1], &nc.rgrc[1] ); + RECT16to32( &nc16->rgrc[2], &nc.rgrc[2] ); + WINDOWPOS16to32( MapSL(nc16->lppos), &winpos ); + nc.lppos = &winpos; + } + ret = callback( hwnd32, msg, wParam, (LPARAM)&nc, result, arg ); + RECT32to16( &nc.rgrc[0], &nc16->rgrc[0] ); + if (wParam) + { + RECT32to16( &nc.rgrc[1], &nc16->rgrc[1] ); + RECT32to16( &nc.rgrc[2], &nc16->rgrc[2] ); + WINDOWPOS32to16( &winpos, MapSL(nc16->lppos) ); + } + } + break; case WM_COMPAREITEM: { COMPAREITEMSTRUCT16* cis16 = MapSL(lParam);

1 0

Alexandre Julliard : user: Added fast 16->32 mapping for WM_COPYDATA, WM_GETDLGCODE and WM_NEXTMENU.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: refs/heads/master Commit: 67a633b3e783c609a88fd00f312ee9a101f4c3cb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=67a633b3e783c609a88fd00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 13:36:57 2006 +0200 user: Added fast 16->32 mapping for WM_COPYDATA, WM_GETDLGCODE and WM_NEXTMENU. --- dlls/user/winproc.c | 92 +++++++++++++++++++++------------------------------ 1 files changed, 37 insertions(+), 55 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 39e7306..3488e0a 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -760,16 +760,6 @@ static INT WINPROC_MapMsg16To32A( HWND h *pwparam32 = (WPARAM)HDC_32(wParam16); *plparam = (LPARAM)WIN_Handle32( LOWORD(*plparam) ); return 0; - case WM_COPYDATA: - { - PCOPYDATASTRUCT16 pcds16 = MapSL(*plparam); - PCOPYDATASTRUCT pcds = HeapAlloc ( GetProcessHeap(), 0, sizeof(*pcds)); - pcds->dwData = pcds16->dwData; - pcds->cbData = pcds16->cbData; - pcds->lpData = MapSL( pcds16->lpData); - *plparam = (LPARAM)pcds; - } - return 1; case WM_GETTEXT: case WM_SETTEXT: case WM_WININICHANGE: @@ -817,24 +807,6 @@ static INT WINPROC_MapMsg16To32A( HWND h *plparam = (LPARAM)WIN_Handle32( LOWORD(*plparam) ); } return 0; - case WM_GETDLGCODE: - if (*plparam) - { - LPMSG16 msg16 = MapSL(*plparam); - LPMSG msg32 = HeapAlloc( GetProcessHeap(), 0, sizeof(MSG) ); - - if (!msg32) return -1; - msg32->hwnd = WIN_Handle32( msg16->hwnd ); - msg32->message = msg16->message; - msg32->wParam = msg16->wParam; - msg32->lParam = msg16->lParam; - msg32->time = msg16->time; - msg32->pt.x = msg16->pt.x; - msg32->pt.y = msg16->pt.y; - *plparam = (LPARAM)msg32; - return 1; - } - else return 0; case WM_NOTIFY: *plparam = (LPARAM)MapSL(*plparam); return 0; @@ -844,16 +816,6 @@ static INT WINPROC_MapMsg16To32A( HWND h * message queues. */ if (*plparam) *plparam = HTASK_32( *plparam ); return 0; - case WM_NEXTMENU: - { - MDINEXTMENU *next = HeapAlloc( GetProcessHeap(), 0, sizeof(*next) ); - if (!next) return -1; - next->hmenuIn = (HMENU)*plparam; - next->hmenuNext = 0; - next->hwndNext = 0; - *plparam = (LPARAM)next; - return 1; - } case WM_PAINTCLIPBOARD: case WM_SIZECLIPBOARD: FIXME_(msg)("message %04x needs translation\n",msg16 ); @@ -933,27 +895,10 @@ static LRESULT WINPROC_UnmapMsg16To32A( { switch(msg) { - case WM_COPYDATA: - HeapFree( GetProcessHeap(), 0, (LPVOID)lParam ); - break; case WM_MDIGETACTIVE: result = MAKELONG( LOWORD(result), (BOOL16)(*(BOOL *)lParam) ); HeapFree( GetProcessHeap(), 0, (BOOL *)lParam ); break; - case WM_GETDLGCODE: - if (lParam) - { - LPMSG msg32 = (LPMSG)lParam; - HeapFree( GetProcessHeap(), 0, msg32 ); - } - break; - case WM_NEXTMENU: - { - MDINEXTMENU *next = (MDINEXTMENU *)lParam; - result = MAKELONG( HMENU_16(next->hmenuNext), HWND_16(next->hwndNext) ); - HeapFree( GetProcessHeap(), 0, next ); - } - break; } return result; } @@ -2402,6 +2347,43 @@ LRESULT WINPROC_CallProc16To32A( winproc ret = callback( hwnd32, msg, wParam, (LPARAM)&dis, result, arg ); } break; + case WM_COPYDATA: + { + COPYDATASTRUCT16 *cds16 = MapSL(lParam); + COPYDATASTRUCT cds; + cds.dwData = cds16->dwData; + cds.cbData = cds16->cbData; + cds.lpData = MapSL(cds16->lpData); + ret = callback( hwnd32, msg, wParam, (LPARAM)&cds, result, arg ); + } + break; + case WM_GETDLGCODE: + if (lParam) + { + MSG16 *msg16 = MapSL(lParam); + MSG msg32; + msg32.hwnd = WIN_Handle32( msg16->hwnd ); + msg32.message = msg16->message; + msg32.wParam = msg16->wParam; + msg32.lParam = msg16->lParam; + msg32.time = msg16->time; + msg32.pt.x = msg16->pt.x; + msg32.pt.y = msg16->pt.y; + ret = callback( hwnd32, msg, wParam, (LPARAM)&msg32, result, arg ); + } + else + ret = callback( hwnd32, msg, wParam, lParam, result, arg ); + break; + case WM_NEXTMENU: + { + MDINEXTMENU next; + next.hmenuIn = (HMENU)lParam; + next.hmenuNext = 0; + next.hwndNext = 0; + ret = callback( hwnd32, msg, wParam, (LPARAM)&next, result, arg ); + *result = MAKELONG( HMENU_16(next.hmenuNext), HWND_16(next.hwndNext) ); + } + break; default: { UINT msg32;

1 0

Alexandre Julliard : wine_unicode: Add prototypes for inline functions ( from a patch by Andrew Talbot).
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: master Commit: 5de2eabacec541d4a227c48aacdcaa116488a03b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5de2eabacec541d4a227c48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 12:09:12 2006 +0200 wine_unicode: Add prototypes for inline functions (from a patch by Andrew Talbot). --- include/wine/unicode.h | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 704d88a..7f723b0 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -99,17 +99,20 @@ extern int snprintfW( WCHAR *str, size_t extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); extern int vsnprintfW( WCHAR *str, size_t len, const WCHAR *format, va_list valist ); +extern inline int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ); extern inline int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ) { return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]); } +extern inline WCHAR tolowerW( WCHAR ch ); extern inline WCHAR tolowerW( WCHAR ch ) { extern WINE_UNICODE_API const WCHAR wine_casemap_lower[]; return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; } +extern inline WCHAR toupperW( WCHAR ch ); extern inline WCHAR toupperW( WCHAR ch ) { extern WINE_UNICODE_API const WCHAR wine_casemap_upper[]; @@ -118,62 +121,74 @@ extern inline WCHAR toupperW( WCHAR ch ) /* the character type contains the C1_* flags in the low 12 bits */ /* and the C2_* type in the high 4 bits */ +extern inline unsigned short get_char_typeW( WCHAR ch ); extern inline unsigned short get_char_typeW( WCHAR ch ) { extern WINE_UNICODE_API const unsigned short wine_wctype_table[]; return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; } +extern inline int iscntrlW( WCHAR wc ); extern inline int iscntrlW( WCHAR wc ) { return get_char_typeW(wc) & C1_CNTRL; } +extern inline int ispunctW( WCHAR wc ); extern inline int ispunctW( WCHAR wc ) { return get_char_typeW(wc) & C1_PUNCT; } +extern inline int isspaceW( WCHAR wc ); extern inline int isspaceW( WCHAR wc ) { return get_char_typeW(wc) & C1_SPACE; } +extern inline int isdigitW( WCHAR wc ); extern inline int isdigitW( WCHAR wc ) { return get_char_typeW(wc) & C1_DIGIT; } +extern inline int isxdigitW( WCHAR wc ); extern inline int isxdigitW( WCHAR wc ) { return get_char_typeW(wc) & C1_XDIGIT; } +extern inline int islowerW( WCHAR wc ); extern inline int islowerW( WCHAR wc ) { return get_char_typeW(wc) & C1_LOWER; } +extern inline int isupperW( WCHAR wc ); extern inline int isupperW( WCHAR wc ) { return get_char_typeW(wc) & C1_UPPER; } +extern inline int isalnumW( WCHAR wc ); extern inline int isalnumW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_DIGIT|C1_LOWER|C1_UPPER); } +extern inline int isalphaW( WCHAR wc ); extern inline int isalphaW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_LOWER|C1_UPPER); } +extern inline int isgraphW( WCHAR wc ); extern inline int isgraphW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); } +extern inline int isprintW( WCHAR wc ); extern inline int isprintW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_BLANK|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); @@ -181,6 +196,7 @@ extern inline int isprintW( WCHAR wc ) /* some useful string manipulation routines */ +extern inline unsigned int strlenW( const WCHAR *str ); extern inline unsigned int strlenW( const WCHAR *str ) { const WCHAR *s = str; @@ -188,6 +204,7 @@ extern inline unsigned int strlenW( cons return s - str; } +extern inline WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ); extern inline WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) { WCHAR *p = dst; @@ -198,12 +215,14 @@ extern inline WCHAR *strcpyW( WCHAR *dst /* strncpy doesn't do what you think, don't use it */ #define strncpyW(d,s,n) error do_not_use_strncpyW_use_lstrcpynW_or_memcpy_instead +extern inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ); extern inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) { while (*str1 && (*str1 == *str2)) { str1++; str2++; } return *str1 - *str2; } +extern inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ); extern inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) { if (n <= 0) return 0; @@ -211,18 +230,21 @@ extern inline int strncmpW( const WCHAR return *str1 - *str2; } +extern inline WCHAR *strcatW( WCHAR *dst, const WCHAR *src ); extern inline WCHAR *strcatW( WCHAR *dst, const WCHAR *src ) { strcpyW( dst + strlenW(dst), src ); return dst; } +extern inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ); extern inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) { do { if (*str == ch) return (WCHAR *)str; } while (*str++); return NULL; } +extern inline WCHAR *strrchrW( const WCHAR *str, WCHAR ch ); extern inline WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) { WCHAR *ret = NULL; @@ -230,12 +252,14 @@ extern inline WCHAR *strrchrW( const WCH return ret; } +extern inline WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ); extern inline WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) { for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)str; return NULL; } +extern inline size_t strspnW( const WCHAR *str, const WCHAR *accept ); extern inline size_t strspnW( const WCHAR *str, const WCHAR *accept ) { const WCHAR *ptr; @@ -243,6 +267,7 @@ extern inline size_t strspnW( const WCHA return ptr - str; } +extern inline size_t strcspnW( const WCHAR *str, const WCHAR *reject ); extern inline size_t strcspnW( const WCHAR *str, const WCHAR *reject ) { const WCHAR *ptr; @@ -250,6 +275,7 @@ extern inline size_t strcspnW( const WCH return ptr - str; } +extern inline WCHAR *strlwrW( WCHAR *str ); extern inline WCHAR *strlwrW( WCHAR *str ) { WCHAR *ret = str; @@ -257,6 +283,7 @@ extern inline WCHAR *strlwrW( WCHAR *str return ret; } +extern inline WCHAR *struprW( WCHAR *str ); extern inline WCHAR *struprW( WCHAR *str ) { WCHAR *ret = str; @@ -264,6 +291,7 @@ extern inline WCHAR *struprW( WCHAR *str return ret; } +extern inline WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ); extern inline WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { const WCHAR *end; @@ -271,6 +299,7 @@ extern inline WCHAR *memchrW( const WCHA return NULL; } +extern inline WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ); extern inline WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { const WCHAR *end, *ret = NULL; @@ -278,11 +307,13 @@ extern inline WCHAR *memrchrW( const WCH return (WCHAR *)ret; } +extern inline long int atolW( const WCHAR *str ); extern inline long int atolW( const WCHAR *str ) { return strtolW( str, (WCHAR **)0, 10 ); } +extern inline int atoiW( const WCHAR *str ); extern inline int atoiW( const WCHAR *str ) { return (int)atolW( str );

1 0

Pierre d'Herbemont : wineprefixcreate: Obtain wine and wineserver from the bindir, instead of relaying on the PATH.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: master Commit: 6997ce7c9d4c2f3b8304b3fbdbc0476b2b2d4cee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6997ce7c9d4c2f3b8304b3f… Author: Pierre d'Herbemont <stegefin(a)free.fr> Date: Thu May 25 15:20:59 2006 +0200 wineprefixcreate: Obtain wine and wineserver from the bindir, instead of relaying on the PATH. --- tools/wineprefixcreate.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index 7898456..7ac5c8c 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -168,13 +168,13 @@ # Copy the .inf script and run it cp "$datadir/wine.inf" "$CROOT/windows/inf/wine.inf" export WINEPREFIX -"${WINELOADER:-wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf +"${WINELOADER:-$bindir/wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf # Wait for the wineserver to finish if [ $do_wait = 1 ] then - "${WINESERVER:-wineserver}" -w + "${WINESERVER:-$bindir/wineserver}" -w fi if [ $quiet = 0 ]

1 0

Mikołaj Zalewski : comctl32: header: Draw the drag image and hot dividers while dragging an item.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: master Commit: 7ab41112ae49ba10a4f9f07fe5e4b4c0521f713c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ab41112ae49ba10a4f9f07… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu May 25 23:53:24 2006 +0200 comctl32: header: Draw the drag image and hot dividers while dragging an item. --- dlls/comctl32/header.c | 108 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 83 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 3242bbd..dccc6a2 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -32,6 +32,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include <string.h> #include "windef.h" @@ -77,7 +78,9 @@ typedef struct HCURSOR hcurDivopen; /* handle to a cursor (used over dividers) <-||-> */ BOOL bCaptured; /* Is the mouse captured? */ BOOL bPressed; /* Is a header item pressed (down)? */ + BOOL bDragging; /* Are we dragging an item? */ BOOL bTracking; /* Is in tracking mode? */ + POINT ptLButtonDown; /* The point where the left button was pressed */ INT iMoveItem; /* index of tracked item. (Tracking mode) */ INT xTrackOffset; /* distance between the right side of the tracked item and the cursor */ INT xOldTrack; /* track offset (see above) after the last WM_MOUSEMOVE */ @@ -512,6 +515,9 @@ HEADER_Refresh (HWND hwnd, HDC hdc) /* get rect for the bar, adjusted for the border */ GetClientRect (hwnd, &rect); + + if (infoPtr->bDragging) + ImageList_DragShowNolock(FALSE); hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT); hOldFont = SelectObject (hdc, hFont); @@ -546,6 +552,9 @@ HEADER_Refresh (HWND hwnd, HDC hdc) if (infoPtr->iHotDivider != -1) HEADER_DrawHotDivider(hwnd, hdc); + + if (infoPtr->bDragging) + ImageList_DragShowNolock(TRUE); SelectObject (hdc, hOldFont); } @@ -1556,6 +1565,16 @@ HEADER_GetFont (HWND hwnd) } +static BOOL +HEADER_IsDragDistance(HEADER_INFO *infoPtr, POINT *pt) +{ + /* Windows allows for a mouse movement before starting the drag. We use the + * SM_CXDOUBLECLICK/SM_CYDOUBLECLICK as that distance. + */ + return (abs(infoPtr->ptLButtonDown.x - pt->x)>GetSystemMetrics(SM_CXDOUBLECLK) || + abs(infoPtr->ptLButtonDown.y - pt->y)>GetSystemMetrics(SM_CYDOUBLECLK)); +} + static LRESULT HEADER_LButtonDblClk (HWND hwnd, WPARAM wParam, LPARAM lParam) { @@ -1594,7 +1613,9 @@ HEADER_LButtonDown (HWND hwnd, WPARAM wP SetCapture (hwnd); infoPtr->bCaptured = TRUE; infoPtr->bPressed = TRUE; + infoPtr->bDragging = FALSE; infoPtr->iMoveItem = nItem; + infoPtr->ptLButtonDown = pt; infoPtr->items[nItem].bDown = TRUE; @@ -1644,7 +1665,37 @@ HEADER_LButtonUp (HWND hwnd, WPARAM wPar HEADER_InternalHitTest (hwnd, &pt, &flags, &nItem); if (infoPtr->bPressed) { - if ((nItem == infoPtr->iMoveItem) && (flags == HHT_ONHEADER)) { + if (infoPtr->bDragging) + { + ImageList_DragShowNolock(FALSE); + ImageList_EndDrag(); + infoPtr->items[infoPtr->iMoveItem].bDown=FALSE; + /* FIXME: the new order field should be sent, not the old one */ + if (!HEADER_SendHeaderNotifyT(hwnd, HDN_ENDDRAG, infoPtr->iMoveItem, HDI_ORDER, NULL)) + { + HEADER_ITEM *lpItem; + INT newindex = HEADER_IndexToOrder(hwnd,nItem); + INT oldindex = HEADER_IndexToOrder(hwnd,infoPtr->iMoveItem); + + TRACE("Exchanging [index:order] [%d:%d] [%d:%d]\n", + infoPtr->iMoveItem,oldindex,nItem,newindex); + lpItem= &infoPtr->items[nItem]; + lpItem->iOrder=oldindex; + + lpItem= &infoPtr->items[infoPtr->iMoveItem]; + lpItem->iOrder = newindex; + + infoPtr->order[oldindex] = nItem; + infoPtr->order[newindex] = infoPtr->iMoveItem; + + infoPtr->bRectsValid = FALSE; + InvalidateRect(hwnd, NULL, FALSE); + } + else + InvalidateRect(hwnd, &infoPtr->items[infoPtr->iMoveItem].rect, FALSE); + } + else if (!(dwStyle&HDS_DRAGDROP) || !HEADER_IsDragDistance(infoPtr, &pt)) + { infoPtr->items[infoPtr->iMoveItem].bDown = FALSE; hdc = GetDC (hwnd); HEADER_RefreshItem (hwnd, hdc, infoPtr->iMoveItem); @@ -1652,27 +1703,6 @@ HEADER_LButtonUp (HWND hwnd, WPARAM wPar HEADER_SendClickNotify (hwnd, HDN_ITEMCLICKA, infoPtr->iMoveItem); } - else if (flags == HHT_ONHEADER) - { - HEADER_ITEM *lpItem; - INT newindex = HEADER_IndexToOrder(hwnd,nItem); - INT oldindex = HEADER_IndexToOrder(hwnd,infoPtr->iMoveItem); - - TRACE("Exchanging [index:order] [%d:%d] [%d:%d]\n", - infoPtr->iMoveItem,oldindex,nItem,newindex); - lpItem= &infoPtr->items[nItem]; - lpItem->iOrder=oldindex; - - lpItem= &infoPtr->items[infoPtr->iMoveItem]; - lpItem->iOrder = newindex; - - infoPtr->order[oldindex] = nItem; - infoPtr->order[newindex] = infoPtr->iMoveItem; - - infoPtr->bRectsValid = FALSE; - InvalidateRect(hwnd, NULL, FALSE); - /* FIXME: Should some WM_NOTIFY be sent */ - } TRACE("Released item %d!\n", infoPtr->iMoveItem); infoPtr->bPressed = FALSE; @@ -1735,7 +1765,6 @@ HEADER_NotifyFormat (HWND hwnd, WPARAM w return 0; } - static LRESULT HEADER_MouseLeave (HWND hwnd, WPARAM wParam, LPARAM lParam) { @@ -1779,7 +1808,36 @@ HEADER_MouseMove (HWND hwnd, WPARAM wPar } if (infoPtr->bCaptured) { - if (infoPtr->bPressed) { + /* check if we should drag the header */ + if (infoPtr->bPressed && !infoPtr->bDragging && dwStyle&HDS_DRAGDROP + && HEADER_IsDragDistance(infoPtr, &pt)) + { + if (!HEADER_SendHeaderNotifyT(hwnd, HDN_BEGINDRAG, infoPtr->iMoveItem, 0, NULL)) + { + HIMAGELIST hDragItem = (HIMAGELIST)HEADER_CreateDragImage(hwnd, infoPtr->iMoveItem); + if (hDragItem != NULL) + { + HEADER_ITEM *lpItem = &infoPtr->items[infoPtr->iMoveItem]; + TRACE("Starting item drag\n"); + ImageList_BeginDrag(hDragItem, 0, pt.x - lpItem->rect.left, 0); + ImageList_DragShowNolock(TRUE); + ImageList_Destroy(hDragItem); + infoPtr->bDragging = TRUE; + } + } + } + + if (infoPtr->bDragging) + { + POINT drag; + drag.x = pt.x; + drag.y = 0; + ClientToScreen(hwnd, &drag); + ImageList_DragMove(drag.x, drag.y); + HEADER_SetHotDivider(hwnd, TRUE, lParam); + } + + if (infoPtr->bPressed && !infoPtr->bDragging) { BOOL oldState = infoPtr->items[infoPtr->iMoveItem].bDown; if ((nItem == infoPtr->iMoveItem) && (flags == HHT_ONHEADER)) infoPtr->items[infoPtr->iMoveItem].bDown = TRUE; @@ -1836,7 +1894,7 @@ HEADER_MouseMove (HWND hwnd, WPARAM wPar if (hotTrackEnabled) { TRACKMOUSEEVENT tme; - if (oldHotItem != infoPtr->iHotItem) { + if (oldHotItem != infoPtr->iHotItem && !infoPtr->bDragging) { hdc = GetDC (hwnd); if (oldHotItem != -1) HEADER_RefreshItem (hwnd, hdc, oldHotItem); if (infoPtr->iHotItem != -1) HEADER_RefreshItem (hwnd, hdc, infoPtr->iHotItem);

1 0