wine-commits May 2006

wine-commits@winehq.org

3 participants
863 discussions

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

26 May '06

Module: wine Branch: refs/heads/master Commit: fdc60a122f5fc4b2e9ff2b5ecd36c5be273a3a90 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fdc60a122f5fc4b2e9ff2b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 14:25:18 2006 +0200 user: Added fast 32->16 mapping for the listbox and combobox messages. --- dlls/user/winproc.c | 315 +++++++++++++++++++-------------------------------- 1 files changed, 118 insertions(+), 197 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=fdc60a122f5fc4b2e9f…

1 0

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

26 May '06

Module: wine Branch: refs/heads/master Commit: 19a1dc554b0665ef315e316f955332d71dbb58f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19a1dc554b0665ef315e316… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 14:17:28 2006 +0200 user: Added fast 32->16 mapping for the edit control messages. --- dlls/user/winproc.c | 74 ++++++++++++++++++++++++--------------------------- 1 files changed, 35 insertions(+), 39 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index e53def2..d7b2f49 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -760,39 +760,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h *pwparam16 = (WPARAM16)LOWORD(wParam32); switch(msg32) { - case EM_GETSEL: - case EM_GETRECT: - case EM_SETRECT: - case EM_SETRECTNP: - case EM_SCROLL: - case EM_LINESCROLL: - case EM_SCROLLCARET: - case EM_GETMODIFY: - case EM_SETMODIFY: - case EM_GETLINECOUNT: - case EM_LINEINDEX: - case EM_SETHANDLE: - case EM_GETHANDLE: - case EM_GETTHUMB: - case EM_LINELENGTH: - case EM_REPLACESEL: - case EM_GETLINE: - case EM_LIMITTEXT: - case EM_CANUNDO: - case EM_UNDO: - case EM_FMTLINES: - case EM_LINEFROMCHAR: - case EM_SETTABSTOPS: - case EM_SETPASSWORDCHAR: - case EM_EMPTYUNDOBUFFER: - case EM_GETFIRSTVISIBLELINE: - case EM_SETREADONLY: - case EM_SETWORDBREAKPROC: - case EM_GETWORDBREAKPROC: - case EM_GETPASSWORDCHAR: - *pmsg16 = (UINT16)msg32 + (EM_GETSEL16 - EM_GETSEL); - return 0; - case LB_CARETOFF: case LB_CARETON: case LB_DELETESTRING: @@ -919,12 +886,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h *pmsg16 = CB_GETLBTEXT16; return 1; - case EM_SETSEL: - *pwparam16 = 0; - *plparam = MAKELONG( (INT16)(INT)wParam32, (INT16)*plparam ); - *pmsg16 = EM_SETSEL16; - return 0; - case WM_ACTIVATE: case WM_CHARTOITEM: case WM_COMMAND: @@ -2246,6 +2207,41 @@ LRESULT WINPROC_CallProc32ATo16( winproc case BM_SETSTYLE: ret = callback( HWND_16(hwnd), msg + BM_GETCHECK16 - BM_GETCHECK, wParam, lParam, result, arg ); break; + case EM_GETSEL: + case EM_GETRECT: + case EM_SETRECT: + case EM_SETRECTNP: + case EM_SCROLL: + case EM_LINESCROLL: + case EM_SCROLLCARET: + case EM_GETMODIFY: + case EM_SETMODIFY: + case EM_GETLINECOUNT: + case EM_LINEINDEX: + case EM_SETHANDLE: + case EM_GETHANDLE: + case EM_GETTHUMB: + case EM_LINELENGTH: + case EM_REPLACESEL: + case EM_GETLINE: + case EM_LIMITTEXT: + case EM_CANUNDO: + case EM_UNDO: + case EM_FMTLINES: + case EM_LINEFROMCHAR: + case EM_SETTABSTOPS: + case EM_SETPASSWORDCHAR: + case EM_EMPTYUNDOBUFFER: + case EM_GETFIRSTVISIBLELINE: + case EM_SETREADONLY: + case EM_SETWORDBREAKPROC: + case EM_GETWORDBREAKPROC: + case EM_GETPASSWORDCHAR: + ret = callback( HWND_16(hwnd), msg + EM_GETSEL16 - EM_GETSEL, wParam, lParam, result, arg ); + break; + case EM_SETSEL: + ret = callback( HWND_16(hwnd), EM_SETSEL16, 0, MAKELPARAM( wParam, lParam ), result, arg ); + break; default: { UINT16 msg16;

1 0

Alexandre Julliard : user: Added fast 32-> 16 mapping for button and scrollbar messages.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: refs/heads/master Commit: 8056e2422d9089d17b26bdfc8c531f339c53bb7c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8056e2422d9089d17b26bdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 14:16:00 2006 +0200 user: Added fast 32->16 mapping for button and scrollbar messages. --- dlls/user/winproc.c | 38 +++++++++++++++----------------------- 1 files changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index da6e050..e53def2 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -760,24 +760,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h *pwparam16 = (WPARAM16)LOWORD(wParam32); switch(msg32) { - case SBM_SETRANGE: - *pmsg16 = SBM_SETRANGE16; - *plparam = MAKELPARAM(wParam32, *plparam); - *pwparam16 = 0; - return 0; - - case SBM_GETRANGE: - *pmsg16 = SBM_GETRANGE16; - return 1; - - case BM_GETCHECK: - case BM_SETCHECK: - case BM_GETSTATE: - case BM_SETSTATE: - case BM_SETSTYLE: - *pmsg16 = (UINT16)msg32 + (BM_GETCHECK16 - BM_GETCHECK); - return 0; - case EM_GETSEL: case EM_GETRECT: case EM_SETRECT: @@ -1024,11 +1006,6 @@ static void WINPROC_UnmapMsg32ATo16( HWN { switch(msg) { - case SBM_GETRANGE: - *(LPINT)wParam = LOWORD(*result); - *(LPINT)lParam = HIWORD(*result); - break; - case LB_ADDFILE: case LB_ADDSTRING: case LB_DIR: @@ -2254,6 +2231,21 @@ LRESULT WINPROC_CallProc32ATo16( winproc lParam = convert_handle_32_to_16(lParam, GMEM_DDESHARE); ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); break; /* FIXME don't know how to free allocated memory (handle) !! */ + case SBM_SETRANGE: + ret = callback( HWND_16(hwnd), SBM_SETRANGE16, 0, MAKELPARAM(wParam, lParam), result, arg ); + break; + case SBM_GETRANGE: + ret = callback( HWND_16(hwnd), SBM_GETRANGE16, wParam, lParam, result, arg ); + *(LPINT)wParam = LOWORD(*result); + *(LPINT)lParam = HIWORD(*result); + break; + case BM_GETCHECK: + case BM_SETCHECK: + case BM_GETSTATE: + case BM_SETSTATE: + case BM_SETSTYLE: + ret = callback( HWND_16(hwnd), msg + BM_GETCHECK16 - BM_GETCHECK, wParam, lParam, result, arg ); + break; default: { UINT16 msg16;

1 0

Alexandre Julliard : user: Added fast 32->16 mapping for WM_GETTEXT, WM_SETTEXT and similar messages.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: refs/heads/master Commit: 8e92e5369f986c792443631f45aa1d162c5bae9f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e92e5369f986c792443631… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 14:14:14 2006 +0200 user: Added fast 32->16 mapping for WM_GETTEXT, WM_SETTEXT and similar messages. --- dlls/user/winproc.c | 47 ++++++++++++----------------------------------- 1 files changed, 12 insertions(+), 35 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 28eebb4..da6e050 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -964,16 +964,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h *plparam = MAKELPARAM( (HWND16)*plparam, (WORD)msg32 - WM_CTLCOLORMSGBOX ); return 0; - case WM_GETTEXT: - case WM_ASKCBFORMATNAME: - { - LPARAM *str; /* store LPARAM, then *pwparam16 char space */ - *pwparam16 = (WPARAM16)min( wParam32, 0xff80 ); /* Must be < 64K */ - if (!(str = HeapAlloc( GetProcessHeap(), 0, *pwparam16 + sizeof(LPARAM)))) return -1; - *str++ = *plparam; /* Store the previous lParam */ - *plparam = MapLS( str ); - } - return 1; case WM_MENUSELECT: if(HIWORD(wParam32) & MF_POPUP) { @@ -993,14 +983,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h *plparam = MAKELPARAM( (HWND16)*plparam, HIWORD(wParam32)); /* else nothing to do */ return 0; - case WM_NOTIFY: - *plparam = MapLS( (NMHDR *)*plparam ); /* NMHDR is already 32-bit */ - return 1; - case WM_SETTEXT: - case WM_WININICHANGE: - case WM_DEVMODECHANGE: - *plparam = MapLS( (LPSTR)*plparam ); - return 1; case WM_ACTIVATEAPP: if (*plparam) *plparam = HTASK_16( (HANDLE)*plparam ); return 0; @@ -1062,9 +1044,6 @@ static void WINPROC_UnmapMsg32ATo16( HWN case CB_SELECTSTRING: case CB_DIR: case CB_GETLBTEXT: - case WM_SETTEXT: - case WM_WININICHANGE: - case WM_DEVMODECHANGE: UnMapLS( (SEGPTR)lParam16 ); break; case LB_SETTABSTOPS: @@ -1106,20 +1085,6 @@ static void WINPROC_UnmapMsg32ATo16( HWN if( lParam ) *((PUINT)(lParam)) = HIWORD(*result); /* FIXME: substract 1? */ break; - - case WM_GETTEXT: - case WM_ASKCBFORMATNAME: - { - LPSTR str = MapSL(lParam16); - UnMapLS( lParam16 ); - lParam16 = *((LPARAM *)str - 1); - lstrcpynA( (LPSTR)lParam16, str, wParam16 ); - HeapFree( GetProcessHeap(), 0, (LPARAM *)str - 1 ); - } - break; - case WM_NOTIFY: - UnMapLS(lParam16); - break; } } @@ -2222,6 +2187,18 @@ LRESULT WINPROC_CallProc32ATo16( winproc *result = 0; } break; + case WM_GETTEXT: + case WM_ASKCBFORMATNAME: + wParam = min( wParam, 0xff80 ); /* Must be < 64K */ + /* fall through */ + case WM_NOTIFY: + case WM_SETTEXT: + case WM_WININICHANGE: + case WM_DEVMODECHANGE: + lParam = MapLS( (void *)lParam ); + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + UnMapLS( lParam ); + break; case WM_DDE_INITIATE: case WM_DDE_TERMINATE: case WM_DDE_UNADVISE:

1 0

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

26 May '06

Module: wine Branch: refs/heads/master Commit: 1d2f900444614e5b77e3b8d50bdbf0c6dfee735d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d2f900444614e5b77e3b8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 14:09:26 2006 +0200 user: Added fast 32->16 mapping for the WM_DDE* messages. --- dlls/user/winproc.c | 111 +++++++++++++++++++++++++-------------------------- 1 files changed, 55 insertions(+), 56 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index c6c67a0..28eebb4 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -1026,62 +1026,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h case WM_STYLECHANGING: case WM_STYLECHANGED: return -1; - case WM_DDE_INITIATE: - case WM_DDE_TERMINATE: - case WM_DDE_UNADVISE: - case WM_DDE_REQUEST: - *pwparam16 = HWND_16((HWND)wParam32); - return 0; - case WM_DDE_ADVISE: - case WM_DDE_DATA: - case WM_DDE_POKE: - { - UINT_PTR lo32, hi; - HANDLE16 lo16 = 0; - - *pwparam16 = HWND_16((HWND)wParam32); - UnpackDDElParam(msg32, *plparam, &lo32, &hi); - if (lo32 && !(lo16 = convert_handle_32_to_16(lo32, GMEM_DDESHARE))) - return -1; - *plparam = MAKELPARAM(lo16, hi); - } - return 0; /* FIXME don't know how to free allocated memory (handle) !! */ - case WM_DDE_ACK: - { - UINT_PTR lo, hi; - int flag = 0; - char buf[2]; - - *pwparam16 = HWND_16((HWND)wParam32); - - UnpackDDElParam(msg32, *plparam, &lo, &hi); - - if (GlobalGetAtomNameA((ATOM)hi, buf, sizeof(buf)) > 0) flag |= 1; - if (GlobalSize((HANDLE)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_32_to_16(hi, GMEM_DDESHARE); - break; - } - *plparam = MAKELPARAM(lo, hi); - } - return 0; /* FIXME don't know how to free allocated memory (handle) !! */ - case WM_DDE_EXECUTE: - *plparam = convert_handle_32_to_16(*plparam, GMEM_DDESHARE); - return 0; /* FIXME don't know how to free allocated memory (handle) !! */ default: /* No translation needed */ return 0; } @@ -2278,6 +2222,61 @@ LRESULT WINPROC_CallProc32ATo16( winproc *result = 0; } break; + case WM_DDE_INITIATE: + case WM_DDE_TERMINATE: + case WM_DDE_UNADVISE: + case WM_DDE_REQUEST: + ret = callback( HWND_16(hwnd), msg, HWND_16((HWND)wParam), lParam, result, arg ); + break; + case WM_DDE_ADVISE: + case WM_DDE_DATA: + case WM_DDE_POKE: + { + UINT_PTR lo32, hi; + HANDLE16 lo16 = 0; + + UnpackDDElParam( msg, lParam, &lo32, &hi ); + if (lo32 && !(lo16 = convert_handle_32_to_16(lo32, GMEM_DDESHARE))) break; + ret = callback( HWND_16(hwnd), msg, HWND_16((HWND)wParam), + MAKELPARAM(lo16, hi), result, arg ); + } + break; /* FIXME don't know how to free allocated memory (handle) !! */ + case WM_DDE_ACK: + { + UINT_PTR lo, hi; + int flag = 0; + char buf[2]; + + UnpackDDElParam( msg, lParam, &lo, &hi ); + + if (GlobalGetAtomNameA((ATOM)hi, buf, sizeof(buf)) > 0) flag |= 1; + if (GlobalSize((HANDLE)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_32_to_16(hi, GMEM_DDESHARE); + break; + } + ret = callback( HWND_16(hwnd), msg, HWND_16((HWND)wParam), + MAKELPARAM(lo, hi), result, arg ); + } + break; /* FIXME don't know how to free allocated memory (handle) !! */ + case WM_DDE_EXECUTE: + lParam = convert_handle_32_to_16(lParam, GMEM_DDESHARE); + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + break; /* FIXME don't know how to free allocated memory (handle) !! */ default: { UINT16 msg16;

1 0

Alexandre Julliard : user: Added fast 32->16 mapping for WM_MDIACTIVATE, WM_MDIGETACTIVE and WM_MDISETMENU.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: refs/heads/master Commit: e30c69cc7de38c5d53587e403de616b8bc831136 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e30c69cc7de38c5d53587e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 14:08:09 2006 +0200 user: Added fast 32->16 mapping for WM_MDIACTIVATE, WM_MDIGETACTIVE and WM_MDISETMENU. --- dlls/user/winproc.c | 40 ++++++++++++++++------------------------ 1 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index e603b53..c6c67a0 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -974,13 +974,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h *plparam = MapLS( str ); } return 1; - case WM_MDIGETACTIVE: - return 1; - case WM_MDISETMENU: - *plparam = MAKELPARAM( (HMENU16)LOWORD(wParam32), - (HMENU16)LOWORD(*plparam) ); - *pwparam16 = (*plparam == 0); - return 0; case WM_MENUSELECT: if(HIWORD(wParam32) & MF_POPUP) { @@ -995,19 +988,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h case WM_MENUCHAR: *plparam = MAKELPARAM( HIWORD(wParam32), (HMENU16)*plparam ); return 0; - case WM_MDIACTIVATE: - if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_MDICHILD) - { - *pwparam16 = ((HWND)*plparam == hwnd); - *plparam = MAKELPARAM( (HWND16)LOWORD(*plparam), - (HWND16)LOWORD(wParam32) ); - } - else - { - *pwparam16 = HWND_16( (HWND)wParam32 ); - *plparam = 0; - } - return 0; case WM_PARENTNOTIFY: if ((LOWORD(wParam32)==WM_CREATE) || (LOWORD(wParam32)==WM_DESTROY)) *plparam = MAKELPARAM( (HWND16)*plparam, HIWORD(wParam32)); @@ -1193,10 +1173,6 @@ static void WINPROC_UnmapMsg32ATo16( HWN HeapFree( GetProcessHeap(), 0, (LPARAM *)str - 1 ); } break; - case WM_MDIGETACTIVE: - if (lParam) *(BOOL *)lParam = (BOOL16)HIWORD(*result); - *result = (LRESULT)WIN_Handle32( LOWORD(*result) ); - break; case WM_NOTIFY: UnMapLS(lParam16); break; @@ -2122,6 +2098,22 @@ LRESULT WINPROC_CallProc32ATo16( winproc UnMapLS( cs.szClass ); } break; + case WM_MDIACTIVATE: + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_MDICHILD) + ret = callback( HWND_16(hwnd), msg, ((HWND)lParam == hwnd), + MAKELPARAM( LOWORD(lParam), LOWORD(wParam) ), result, arg ); + else + ret = callback( HWND_16(hwnd), msg, HWND_16( (HWND)wParam ), 0, result, arg ); + break; + case WM_MDIGETACTIVE: + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + if (lParam) *(BOOL *)lParam = (BOOL16)HIWORD(*result); + *result = (LRESULT)WIN_Handle32( LOWORD(*result) ); + break; + case WM_MDISETMENU: + ret = callback( HWND_16(hwnd), msg, (lParam == 0), + MAKELPARAM( LOWORD(wParam), LOWORD(lParam) ), result, arg ); + break; case WM_GETMINMAXINFO: { MINMAXINFO *mmi32 = (MINMAXINFO *)lParam;

1 0

Alexandre Julliard : user: Added fast 32->16 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: dd67e8b674f82e1674d7c7e007e7d8c11e3cd6dd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd67e8b674f82e1674d7c7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 14:03:49 2006 +0200 user: Added fast 32->16 mapping for WM_COPYDATA, WM_GETDLGCODE and WM_NEXTMENU. --- dlls/user/winproc.c | 101 ++++++++++++++++++++++----------------------------- 1 files changed, 43 insertions(+), 58 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index adcd041..e603b53 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -953,16 +953,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h case WM_VSCROLL: *plparam = MAKELPARAM( HIWORD(wParam32), (HWND16)*plparam ); return 0; - case WM_COPYDATA: - { - PCOPYDATASTRUCT pcds32 = (PCOPYDATASTRUCT) *plparam; - PCOPYDATASTRUCT16 pcds = HeapAlloc( GetProcessHeap(), 0, sizeof( *pcds)); - pcds->dwData = pcds32->dwData; - pcds->cbData = pcds32->cbData; - pcds->lpData = MapLS( pcds32->lpData); - *plparam = MapLS( pcds ); - } - return 1; case WM_CTLCOLORMSGBOX: case WM_CTLCOLOREDIT: case WM_CTLCOLORLISTBOX: @@ -1031,33 +1021,9 @@ static INT WINPROC_MapMsg32ATo16( HWND h case WM_DEVMODECHANGE: *plparam = MapLS( (LPSTR)*plparam ); return 1; - case WM_GETDLGCODE: - if (*plparam) { - LPMSG msg32 = (LPMSG) *plparam; - LPMSG16 msg16 = HeapAlloc( GetProcessHeap(), 0, sizeof(MSG16) ); - - if (!msg16) return -1; - msg16->hwnd = HWND_16( msg32->hwnd ); - msg16->message = msg32->message; - msg16->wParam = msg32->wParam; - msg16->lParam = msg32->lParam; - msg16->time = msg32->time; - msg16->pt.x = msg32->pt.x; - msg16->pt.y = msg32->pt.y; - *plparam = MapLS( msg16 ); - return 1; - } - return 0; - case WM_ACTIVATEAPP: if (*plparam) *plparam = HTASK_16( (HANDLE)*plparam ); return 0; - case WM_NEXTMENU: - { - MDINEXTMENU *next = (MDINEXTMENU *)*plparam; - *plparam = (LPARAM)next->hmenuIn; - return 1; - } case WM_PAINT: if (IsIconic( hwnd ) && GetClassLongPtrW( hwnd, GCLP_HICON )) { @@ -1184,14 +1150,6 @@ static void WINPROC_UnmapMsg32ATo16( HWN HeapFree( GetProcessHeap(), 0, ptr ); } break; - case WM_COPYDATA: - { - PCOPYDATASTRUCT16 pcds = MapSL( lParam16 ); - UnMapLS( lParam16 ); - UnMapLS( pcds->lpData ); - HeapFree( GetProcessHeap(), 0, pcds ); - } - break; case CB_GETDROPPEDCONTROLRECT: case LB_GETITEMRECT: { @@ -1242,22 +1200,6 @@ static void WINPROC_UnmapMsg32ATo16( HWN case WM_NOTIFY: UnMapLS(lParam16); break; - case WM_GETDLGCODE: - if (lParam16) - { - LPMSG16 msg16 = MapSL(lParam16); - UnMapLS( lParam16 ); - HeapFree( GetProcessHeap(), 0, msg16 ); - } - break; - case WM_NEXTMENU: - { - MDINEXTMENU *next = (MDINEXTMENU *)lParam; - next->hmenuNext = HMENU_32( LOWORD(*result) ); - next->hwndNext = WIN_Handle32( HIWORD(*result) ); - *result = 0; - } - break; } } @@ -2301,6 +2243,49 @@ LRESULT WINPROC_CallProc32ATo16( winproc mis32->itemHeight = mis.itemHeight; } break; + case WM_COPYDATA: + { + COPYDATASTRUCT *cds32 = (COPYDATASTRUCT *)lParam; + COPYDATASTRUCT16 cds; + + cds.dwData = cds32->dwData; + cds.cbData = cds32->cbData; + cds.lpData = MapLS( cds32->lpData ); + lParam = MapLS( &cds ); + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + UnMapLS( lParam ); + UnMapLS( cds.lpData ); + } + break; + case WM_GETDLGCODE: + if (lParam) + { + MSG *msg32 = (MSG *)lParam; + MSG16 msg16; + + msg16.hwnd = HWND_16( msg32->hwnd ); + msg16.message = msg32->message; + msg16.wParam = msg32->wParam; + msg16.lParam = msg32->lParam; + msg16.time = msg32->time; + msg16.pt.x = msg32->pt.x; + msg16.pt.y = msg32->pt.y; + lParam = MapLS( &msg16 ); + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + UnMapLS( lParam ); + } + else + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + break; + case WM_NEXTMENU: + { + MDINEXTMENU *next = (MDINEXTMENU *)lParam; + ret = callback( HWND_16(hwnd), msg, wParam, (LPARAM)next->hmenuIn, result, arg ); + next->hmenuNext = HMENU_32( LOWORD(*result) ); + next->hwndNext = WIN_Handle32( HIWORD(*result) ); + *result = 0; + } + break; default: { UINT16 msg16;

1 0

Alexandre Julliard : user: Added fast 32->16 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: b00df53d71e3b934b8567ac396ce5999c7248375 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b00df53d71e3b934b8567ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 14:00:36 2006 +0200 user: Added fast 32->16 mapping for WM_GETMINMAXINFO, WM_NCCALCSIZE and WM_WINDOWPOSCHANGING/CHANGED. --- dlls/user/winproc.c | 152 +++++++++++++++++---------------------------------- 1 files changed, 52 insertions(+), 100 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 33ecab6..adcd041 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -974,15 +974,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h *plparam = MAKELPARAM( (HWND16)*plparam, (WORD)msg32 - WM_CTLCOLORMSGBOX ); return 0; - case WM_GETMINMAXINFO: - { - MINMAXINFO16 *mmi = HeapAlloc( GetProcessHeap(), 0, sizeof(*mmi) + sizeof(LPARAM) ); - if (!mmi) return -1; - MINMAXINFO32to16( (MINMAXINFO *)*plparam, mmi ); - *(LPARAM *)(mmi + 1) = *plparam; /* Store the previous lParam */ - *plparam = MapLS( mmi ); - } - return 1; case WM_GETTEXT: case WM_ASKCBFORMATNAME: { @@ -1027,39 +1018,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h *plparam = 0; } return 0; - case WM_NCCALCSIZE: - { - NCCALCSIZE_PARAMS *nc32 = (NCCALCSIZE_PARAMS *)*plparam; - NCCALCSIZE_PARAMS16 *nc = HeapAlloc( GetProcessHeap(), 0, sizeof(*nc) + sizeof(LPARAM)); - if (!nc) return -1; - - nc->rgrc[0].left = nc32->rgrc[0].left; - nc->rgrc[0].top = nc32->rgrc[0].top; - nc->rgrc[0].right = nc32->rgrc[0].right; - nc->rgrc[0].bottom = nc32->rgrc[0].bottom; - if (wParam32) - { - WINDOWPOS16 *wp; - nc->rgrc[1].left = nc32->rgrc[1].left; - nc->rgrc[1].top = nc32->rgrc[1].top; - nc->rgrc[1].right = nc32->rgrc[1].right; - nc->rgrc[1].bottom = nc32->rgrc[1].bottom; - nc->rgrc[2].left = nc32->rgrc[2].left; - nc->rgrc[2].top = nc32->rgrc[2].top; - nc->rgrc[2].right = nc32->rgrc[2].right; - nc->rgrc[2].bottom = nc32->rgrc[2].bottom; - if (!(wp = HeapAlloc( GetProcessHeap(), 0, sizeof(WINDOWPOS16) ))) - { - HeapFree( GetProcessHeap(), 0, nc ); - return -1; - } - WINDOWPOS32to16( nc32->lppos, wp ); - nc->lppos = MapLS( wp ); - } - *(LPARAM *)(nc + 1) = *plparam; /* Store the previous lParam */ - *plparam = MapLS( nc ); - } - return 1; case WM_PARENTNOTIFY: if ((LOWORD(wParam32)==WM_CREATE) || (LOWORD(wParam32)==WM_DESTROY)) *plparam = MAKELPARAM( (HWND16)*plparam, HIWORD(wParam32)); @@ -1073,16 +1031,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h case WM_DEVMODECHANGE: *plparam = MapLS( (LPSTR)*plparam ); return 1; - case WM_WINDOWPOSCHANGING: - case WM_WINDOWPOSCHANGED: - { - WINDOWPOS16 *wp = HeapAlloc( GetProcessHeap(), 0, sizeof(*wp) + sizeof(LPARAM) ); - if (!wp) return -1; - WINDOWPOS32to16( (WINDOWPOS *)*plparam, wp ); - *(LPARAM *)(wp + 1) = *plparam; /* Store the previous lParam */ - *plparam = MapLS( wp ); - } - return 1; case WM_GETDLGCODE: if (*plparam) { LPMSG msg32 = (LPMSG) *plparam; @@ -1277,15 +1225,6 @@ static void WINPROC_UnmapMsg32ATo16( HWN *((PUINT)(lParam)) = HIWORD(*result); /* FIXME: substract 1? */ break; - case WM_GETMINMAXINFO: - { - MINMAXINFO16 *mmi = MapSL(lParam16); - UnMapLS( lParam16 ); - lParam16 = *(LPARAM *)(mmi + 1); - MINMAXINFO16to32( mmi, (MINMAXINFO *)lParam16 ); - HeapFree( GetProcessHeap(), 0, mmi ); - } - break; case WM_GETTEXT: case WM_ASKCBFORMATNAME: { @@ -1300,45 +1239,6 @@ static void WINPROC_UnmapMsg32ATo16( HWN if (lParam) *(BOOL *)lParam = (BOOL16)HIWORD(*result); *result = (LRESULT)WIN_Handle32( LOWORD(*result) ); break; - case WM_NCCALCSIZE: - { - NCCALCSIZE_PARAMS *nc32; - NCCALCSIZE_PARAMS16 *nc = MapSL(lParam16); - UnMapLS( lParam16 ); - lParam16 = *(LPARAM *)(nc + 1); - nc32 = (NCCALCSIZE_PARAMS *)lParam16; - nc32->rgrc[0].left = nc->rgrc[0].left; - nc32->rgrc[0].top = nc->rgrc[0].top; - nc32->rgrc[0].right = nc->rgrc[0].right; - nc32->rgrc[0].bottom = nc->rgrc[0].bottom; - if (wParam16) - { - WINDOWPOS16 *pos = MapSL(nc->lppos); - UnMapLS( nc->lppos ); - nc32->rgrc[1].left = nc->rgrc[1].left; - nc32->rgrc[1].top = nc->rgrc[1].top; - nc32->rgrc[1].right = nc->rgrc[1].right; - nc32->rgrc[1].bottom = nc->rgrc[1].bottom; - nc32->rgrc[2].left = nc->rgrc[2].left; - nc32->rgrc[2].top = nc->rgrc[2].top; - nc32->rgrc[2].right = nc->rgrc[2].right; - nc32->rgrc[2].bottom = nc->rgrc[2].bottom; - WINDOWPOS16to32( pos, nc32->lppos ); - HeapFree( GetProcessHeap(), 0, pos ); - } - HeapFree( GetProcessHeap(), 0, nc ); - } - break; - case WM_WINDOWPOSCHANGING: - case WM_WINDOWPOSCHANGED: - { - WINDOWPOS16 *wp = MapSL(lParam16); - UnMapLS( lParam16 ); - lParam16 = *(LPARAM *)(wp + 1); - WINDOWPOS16to32( wp, (WINDOWPOS *)lParam16 ); - HeapFree( GetProcessHeap(), 0, wp ); - } - break; case WM_NOTIFY: UnMapLS(lParam16); break; @@ -2280,6 +2180,58 @@ LRESULT WINPROC_CallProc32ATo16( winproc UnMapLS( cs.szClass ); } break; + case WM_GETMINMAXINFO: + { + MINMAXINFO *mmi32 = (MINMAXINFO *)lParam; + MINMAXINFO16 mmi; + + MINMAXINFO32to16( mmi32, &mmi ); + lParam = MapLS( &mmi ); + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + UnMapLS( lParam ); + MINMAXINFO16to32( &mmi, mmi32 ); + } + break; + case WM_NCCALCSIZE: + { + NCCALCSIZE_PARAMS *nc32 = (NCCALCSIZE_PARAMS *)lParam; + NCCALCSIZE_PARAMS16 nc; + WINDOWPOS16 winpos; + + RECT32to16( &nc32->rgrc[0], &nc.rgrc[0] ); + if (wParam) + { + RECT32to16( &nc32->rgrc[1], &nc.rgrc[1] ); + RECT32to16( &nc32->rgrc[2], &nc.rgrc[2] ); + WINDOWPOS32to16( nc32->lppos, &winpos ); + nc.lppos = MapLS( &winpos ); + } + lParam = MapLS( &nc ); + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + UnMapLS( lParam ); + RECT16to32( &nc.rgrc[0], &nc32->rgrc[0] ); + if (wParam) + { + RECT16to32( &nc.rgrc[1], &nc32->rgrc[1] ); + RECT16to32( &nc.rgrc[2], &nc32->rgrc[2] ); + WINDOWPOS16to32( &winpos, nc32->lppos ); + UnMapLS( nc.lppos ); + } + } + break; + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + { + WINDOWPOS *winpos32 = (WINDOWPOS *)lParam; + WINDOWPOS16 winpos; + + WINDOWPOS32to16( winpos32, &winpos ); + lParam = MapLS( &winpos ); + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + UnMapLS( lParam ); + WINDOWPOS16to32( &winpos, winpos32 ); + } + break; case WM_COMPAREITEM: { COMPAREITEMSTRUCT *cis32 = (COMPAREITEMSTRUCT *)lParam;

1 0

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

26 May '06

Module: wine Branch: refs/heads/master Commit: fbd368fc9717e8a692501793c609fc1ee7256886 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fbd368fc9717e8a69250179… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 13:54:57 2006 +0200 user: Added fast 32->16 mapping for WM_COMPARE/DELETE/MEASURE/DRAWITEM. --- dlls/user/winproc.c | 146 ++++++++++++++++++++++++--------------------------- 1 files changed, 69 insertions(+), 77 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 5114fe8..33ecab6 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -974,70 +974,6 @@ static INT WINPROC_MapMsg32ATo16( HWND h *plparam = MAKELPARAM( (HWND16)*plparam, (WORD)msg32 - WM_CTLCOLORMSGBOX ); return 0; - case WM_COMPAREITEM: - { - COMPAREITEMSTRUCT *cis32 = (COMPAREITEMSTRUCT *)*plparam; - COMPAREITEMSTRUCT16 *cis = HeapAlloc( GetProcessHeap(), 0, sizeof(COMPAREITEMSTRUCT16)); - if (!cis) return -1; - cis->CtlType = (UINT16)cis32->CtlType; - cis->CtlID = (UINT16)cis32->CtlID; - cis->hwndItem = HWND_16( cis32->hwndItem ); - cis->itemID1 = (UINT16)cis32->itemID1; - cis->itemData1 = cis32->itemData1; - cis->itemID2 = (UINT16)cis32->itemID2; - cis->itemData2 = cis32->itemData2; - *plparam = MapLS( cis ); - } - return 1; - case WM_DELETEITEM: - { - DELETEITEMSTRUCT *dis32 = (DELETEITEMSTRUCT *)*plparam; - DELETEITEMSTRUCT16 *dis = HeapAlloc( GetProcessHeap(), 0, sizeof(DELETEITEMSTRUCT16) ); - if (!dis) return -1; - dis->CtlType = (UINT16)dis32->CtlType; - dis->CtlID = (UINT16)dis32->CtlID; - dis->itemID = (UINT16)dis32->itemID; - dis->hwndItem = (dis->CtlType == ODT_MENU) ? (HWND16)LOWORD(dis32->hwndItem) - : HWND_16( dis32->hwndItem ); - dis->itemData = dis32->itemData; - *plparam = MapLS( dis ); - } - return 1; - case WM_DRAWITEM: - { - DRAWITEMSTRUCT *dis32 = (DRAWITEMSTRUCT *)*plparam; - DRAWITEMSTRUCT16 *dis = HeapAlloc( GetProcessHeap(), 0, sizeof(DRAWITEMSTRUCT16) ); - if (!dis) return -1; - dis->CtlType = (UINT16)dis32->CtlType; - dis->CtlID = (UINT16)dis32->CtlID; - dis->itemID = (UINT16)dis32->itemID; - dis->itemAction = (UINT16)dis32->itemAction; - dis->itemState = (UINT16)dis32->itemState; - dis->hwndItem = HWND_16( dis32->hwndItem ); - dis->hDC = HDC_16(dis32->hDC); - dis->itemData = dis32->itemData; - dis->rcItem.left = dis32->rcItem.left; - dis->rcItem.top = dis32->rcItem.top; - dis->rcItem.right = dis32->rcItem.right; - dis->rcItem.bottom = dis32->rcItem.bottom; - *plparam = MapLS( dis ); - } - return 1; - case WM_MEASUREITEM: - { - MEASUREITEMSTRUCT *mis32 = (MEASUREITEMSTRUCT *)*plparam; - MEASUREITEMSTRUCT16 *mis = HeapAlloc( GetProcessHeap(), 0, sizeof(*mis)+sizeof(LPARAM)); - if (!mis) return -1; - mis->CtlType = (UINT16)mis32->CtlType; - mis->CtlID = (UINT16)mis32->CtlID; - mis->itemID = (UINT16)mis32->itemID; - mis->itemWidth = (UINT16)mis32->itemWidth; - mis->itemHeight = (UINT16)mis32->itemHeight; - mis->itemData = mis32->itemData; - *(LPARAM *)(mis + 1) = *plparam; /* Store the previous lParam */ - *plparam = MapLS( mis ); - } - return 1; case WM_GETMINMAXINFO: { MINMAXINFO16 *mmi = HeapAlloc( GetProcessHeap(), 0, sizeof(*mmi) + sizeof(LPARAM) ); @@ -1294,9 +1230,6 @@ static void WINPROC_UnmapMsg32ATo16( HWN UnMapLS( (SEGPTR)lParam16 ); break; case LB_SETTABSTOPS: - case WM_COMPAREITEM: - case WM_DELETEITEM: - case WM_DRAWITEM: { void *ptr = MapSL( lParam16 ); UnMapLS( lParam16 ); @@ -1344,16 +1277,6 @@ static void WINPROC_UnmapMsg32ATo16( HWN *((PUINT)(lParam)) = HIWORD(*result); /* FIXME: substract 1? */ break; - case WM_MEASUREITEM: - { - MEASUREITEMSTRUCT16 *mis = MapSL(lParam16); - MEASUREITEMSTRUCT *mis32 = *(MEASUREITEMSTRUCT **)(mis + 1); - mis32->itemWidth = mis->itemWidth; - mis32->itemHeight = mis->itemHeight; - UnMapLS( lParam16 ); - HeapFree( GetProcessHeap(), 0, mis ); - } - break; case WM_GETMINMAXINFO: { MINMAXINFO16 *mmi = MapSL(lParam16); @@ -2357,6 +2280,75 @@ LRESULT WINPROC_CallProc32ATo16( winproc UnMapLS( cs.szClass ); } break; + case WM_COMPAREITEM: + { + COMPAREITEMSTRUCT *cis32 = (COMPAREITEMSTRUCT *)lParam; + COMPAREITEMSTRUCT16 cis; + cis.CtlType = cis32->CtlType; + cis.CtlID = cis32->CtlID; + cis.hwndItem = HWND_16( cis32->hwndItem ); + cis.itemID1 = cis32->itemID1; + cis.itemData1 = cis32->itemData1; + cis.itemID2 = cis32->itemID2; + cis.itemData2 = cis32->itemData2; + lParam = MapLS( &cis ); + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + UnMapLS( lParam ); + } + break; + case WM_DELETEITEM: + { + DELETEITEMSTRUCT *dis32 = (DELETEITEMSTRUCT *)lParam; + DELETEITEMSTRUCT16 dis; + dis.CtlType = dis32->CtlType; + dis.CtlID = dis32->CtlID; + dis.itemID = dis32->itemID; + dis.hwndItem = (dis.CtlType == ODT_MENU) ? (HWND16)LOWORD(dis32->hwndItem) + : HWND_16( dis32->hwndItem ); + dis.itemData = dis32->itemData; + lParam = MapLS( &dis ); + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + UnMapLS( lParam ); + } + break; + case WM_DRAWITEM: + { + DRAWITEMSTRUCT *dis32 = (DRAWITEMSTRUCT *)lParam; + DRAWITEMSTRUCT16 dis; + dis.CtlType = dis32->CtlType; + dis.CtlID = dis32->CtlID; + dis.itemID = dis32->itemID; + dis.itemAction = dis32->itemAction; + dis.itemState = dis32->itemState; + dis.hwndItem = HWND_16( dis32->hwndItem ); + dis.hDC = HDC_16(dis32->hDC); + dis.itemData = dis32->itemData; + dis.rcItem.left = dis32->rcItem.left; + dis.rcItem.top = dis32->rcItem.top; + dis.rcItem.right = dis32->rcItem.right; + dis.rcItem.bottom = dis32->rcItem.bottom; + lParam = MapLS( &dis ); + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + UnMapLS( lParam ); + } + break; + case WM_MEASUREITEM: + { + MEASUREITEMSTRUCT *mis32 = (MEASUREITEMSTRUCT *)lParam; + MEASUREITEMSTRUCT16 mis; + mis.CtlType = mis32->CtlType; + mis.CtlID = mis32->CtlID; + mis.itemID = mis32->itemID; + mis.itemWidth = mis32->itemWidth; + mis.itemHeight = mis32->itemHeight; + mis.itemData = mis32->itemData; + lParam = MapLS( &mis ); + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + UnMapLS( lParam ); + mis32->itemWidth = mis.itemWidth; + mis32->itemHeight = mis.itemHeight; + } + break; default: { UINT16 msg16;

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

← Newer
1
...
8
9
10
11
12
13
14
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2006