December 2009 - Wine-Commits

Alexandre Julliard : user32: Split the handling of the 16-bit messages out of the static winproc.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: fb2022647562d96de4f57bf1174f4610c2643711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb2022647562d96de4f57bf11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 20:25:32 2009 +0100 user32: Split the handling of the 16-bit messages out of the static winproc. --- dlls/user32/static.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 6c61db2..80c502d 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -572,9 +572,6 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, case STM_GETIMAGE: return (LRESULT)STATIC_GetImage( hwnd, wParam, full_style ); - case STM_GETICON16: - return HICON_16(STATIC_GetImage( hwnd, IMAGE_ICON, full_style )); - case STM_GETICON: return (LRESULT)STATIC_GetImage( hwnd, IMAGE_ICON, full_style ); @@ -597,9 +594,6 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, STATIC_TryPaintFcn( hwnd, full_style ); break; - case STM_SETICON16: - wParam = (WPARAM)HICON_32( (HICON16)wParam ); - /* fall through */ case STM_SETICON: lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)wParam, full_style ); STATIC_TryPaintFcn( hwnd, full_style ); @@ -613,12 +607,29 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, } /*********************************************************************** + * StaticWndProc_wrapper16 + */ +static LRESULT StaticWndProc_wrapper16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) +{ + switch (msg) + { + case STM_SETICON16: + wParam = (WPARAM)HICON_32( (HICON16)wParam ); + return StaticWndProc_common( hwnd, STM_SETICON, wParam, lParam, FALSE ); + case STM_GETICON16: + return HICON_16( StaticWndProc_common( hwnd, STM_GETICON, wParam, lParam, FALSE )); + default: + return StaticWndProc_common( hwnd, msg, wParam, lParam, unicode ); + } +} + +/*********************************************************************** * StaticWndProcA */ static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; - return StaticWndProc_common(hWnd, uMsg, wParam, lParam, FALSE); + return StaticWndProc_wrapper16(hWnd, uMsg, wParam, lParam, FALSE); } /*********************************************************************** @@ -627,7 +638,7 @@ static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARA static LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; - return StaticWndProc_common(hWnd, uMsg, wParam, lParam, TRUE); + return StaticWndProc_wrapper16(hWnd, uMsg, wParam, lParam, TRUE); } static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style )

1 0

Alexandre Julliard : user32: Move Get/ SetWindowLong16 implementation to wnd16.c.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 9727750c796538eb88726ad77d61381428de02e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9727750c796538eb88726ad77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 13 15:30:35 2009 +0100 user32: Move Get/SetWindowLong16 implementation to wnd16.c. --- dlls/user32/win.c | 82 --------------------------------------------------- dlls/user32/wnd16.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 82 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 46c2388..bb19a4e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2307,55 +2307,6 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B /********************************************************************** - * GetWindowLong (USER.135) - */ -LONG WINAPI GetWindowLong16( HWND16 hwnd, INT16 offset ) -{ - WND *wndPtr; - LONG_PTR retvalue; - BOOL is_winproc = (offset == GWLP_WNDPROC); - - if (offset >= 0) - { - if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) - { - if (offset > (int)(wndPtr->cbWndExtra - sizeof(LONG))) - { - /* - * Some programs try to access last element from 16 bit - * code using illegal offset value. Hopefully this is - * what those programs really expect. - */ - if (wndPtr->cbWndExtra >= 4 && offset == wndPtr->cbWndExtra - sizeof(WORD)) - { - INT offset2 = wndPtr->cbWndExtra - sizeof(LONG); - ERR( "- replaced invalid offset %d with %d\n", offset, offset2 ); - offset = offset2; - } - else - { - WARN("Invalid offset %d\n", offset ); - WIN_ReleasePtr( wndPtr ); - SetLastError( ERROR_INVALID_INDEX ); - return 0; - } - } - is_winproc = ((offset == DWLP_DLGPROC) && (wndPtr->flags & WIN_ISDIALOG)); - WIN_ReleasePtr( wndPtr ); - } - } - retvalue = GetWindowLongA( WIN_Handle32(hwnd), offset ); - if (is_winproc) retvalue = (LONG_PTR)WINPROC_GetProc16( (WNDPROC)retvalue, FALSE ); - return retvalue; -} - - -/********************************************************************** * GetWindowWord (USER32.@) */ WORD WINAPI GetWindowWord( HWND hwnd, INT offset ) @@ -2398,39 +2349,6 @@ LONG WINAPI GetWindowLongW( HWND hwnd, INT offset ) /********************************************************************** - * SetWindowLong (USER.136) - */ -LONG WINAPI SetWindowLong16( HWND16 hwnd, INT16 offset, LONG newval ) -{ - WND *wndPtr; - BOOL is_winproc = (offset == GWLP_WNDPROC); - - if (offset == DWLP_DLGPROC) - { - if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) - { - is_winproc = ((wndPtr->cbWndExtra - sizeof(LONG_PTR) >= DWLP_DLGPROC) && - (wndPtr->flags & WIN_ISDIALOG)); - WIN_ReleasePtr( wndPtr ); - } - } - - if (is_winproc) - { - WNDPROC new_proc = WINPROC_AllocProc16( (WNDPROC16)newval ); - WNDPROC old_proc = (WNDPROC)SetWindowLongPtrA( WIN_Handle32(hwnd), offset, (LONG_PTR)new_proc ); - return (LONG)WINPROC_GetProc16( old_proc, FALSE ); - } - else return SetWindowLongA( WIN_Handle32(hwnd), offset, newval ); -} - - -/********************************************************************** * SetWindowWord (USER32.@) */ WORD WINAPI SetWindowWord( HWND hwnd, INT offset, WORD newval ) diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index 1f7b0b0..f3f7e67 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -719,6 +719,85 @@ WORD WINAPI SetWindowWord16( HWND16 hwnd, INT16 offset, WORD newval ) } +/********************************************************************** + * GetWindowLong (USER.135) + */ +LONG WINAPI GetWindowLong16( HWND16 hwnd, INT16 offset ) +{ + WND *wndPtr; + LONG_PTR retvalue; + BOOL is_winproc = (offset == GWLP_WNDPROC); + + if (offset >= 0) + { + if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) + { + if (offset > (int)(wndPtr->cbWndExtra - sizeof(LONG))) + { + /* + * Some programs try to access last element from 16 bit + * code using illegal offset value. Hopefully this is + * what those programs really expect. + */ + if (wndPtr->cbWndExtra >= 4 && offset == wndPtr->cbWndExtra - sizeof(WORD)) + { + offset = wndPtr->cbWndExtra - sizeof(LONG); + } + else + { + WIN_ReleasePtr( wndPtr ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; + } + } + is_winproc = ((offset == DWLP_DLGPROC) && (wndPtr->flags & WIN_ISDIALOG)); + WIN_ReleasePtr( wndPtr ); + } + } + retvalue = GetWindowLongA( WIN_Handle32(hwnd), offset ); + if (is_winproc) retvalue = (LONG_PTR)WINPROC_GetProc16( (WNDPROC)retvalue, FALSE ); + return retvalue; +} + + +/********************************************************************** + * SetWindowLong (USER.136) + */ +LONG WINAPI SetWindowLong16( HWND16 hwnd, INT16 offset, LONG newval ) +{ + WND *wndPtr; + BOOL is_winproc = (offset == GWLP_WNDPROC); + + if (offset == DWLP_DLGPROC) + { + if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) + { + is_winproc = ((wndPtr->cbWndExtra - sizeof(LONG_PTR) >= DWLP_DLGPROC) && + (wndPtr->flags & WIN_ISDIALOG)); + WIN_ReleasePtr( wndPtr ); + } + } + + if (is_winproc) + { + WNDPROC new_proc = WINPROC_AllocProc16( (WNDPROC16)newval ); + WNDPROC old_proc = (WNDPROC)SetWindowLongPtrA( WIN_Handle32(hwnd), offset, (LONG_PTR)new_proc ); + return (LONG)WINPROC_GetProc16( old_proc, FALSE ); + } + else return SetWindowLongA( WIN_Handle32(hwnd), offset, newval ); +} + + /************************************************************************** * OpenClipboard (USER.137) */

1 0

Alexandre Julliard : user32: Remove the no longer used WINPROC_CallDlgProc16 function.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 2f0bfbac36b36e5b0221b51c4b54ba235e8e3d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0bfbac36b36e5b0221b51c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 13 10:59:31 2009 +0100 user32: Remove the no longer used WINPROC_CallDlgProc16 function. --- dlls/user32/user_private.h | 1 - dlls/user32/winproc.c | 43 ------------------------------------------- 2 files changed, 0 insertions(+), 44 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 67fdbb6..e5db691 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -250,7 +250,6 @@ extern LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ) DECLSPEC_HIDDEN; -extern INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 91eeeb7..d08a59f 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -593,14 +593,6 @@ static LRESULT call_window_proc_AtoW( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, arg, WMCHAR_MAP_CALLWINDOWPROC ); } -/* helper callback for 16->32W conversion */ -static LRESULT call_dialog_proc_AtoW( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, - LRESULT *result, void *arg ) -{ - return WINPROC_CallProcAtoW( call_dialog_proc, hwnd, msg, wp, lp, result, - arg, WMCHAR_MAP_CALLWINDOWPROC ); -} - /********************************************************************** * WINPROC_GetProc16 @@ -2330,41 +2322,6 @@ LRESULT WINAPI CallWindowProcW( WNDPROC func, HWND hwnd, UINT msg, /********************************************************************** - * WINPROC_CallDlgProc16 - */ -INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) -{ - WINDOWPROC *proc; - LRESULT result; - INT_PTR ret; - - if (!func) return 0; - - if (!(proc = handle16_to_proc( (WNDPROC16)func ))) - { - ret = call_dialog_proc16( hwnd, msg, wParam, lParam, &result, func ); - } - else if (proc->procA) - { - ret = WINPROC_CallProc16To32A( call_dialog_proc, hwnd, msg, wParam, lParam, - &result, proc->procA ); - SetWindowLongPtrW( WIN_Handle32(hwnd), DWLP_MSGRESULT, result ); - } - else if (proc->procW) - { - ret = WINPROC_CallProc16To32A( call_dialog_proc_AtoW, hwnd, msg, wParam, lParam, - &result, proc->procW ); - SetWindowLongPtrW( WIN_Handle32(hwnd), DWLP_MSGRESULT, result ); - } - else - { - ret = call_dialog_proc16( hwnd, msg, wParam, lParam, &result, proc->proc16 ); - } - return ret; -} - - -/********************************************************************** * WINPROC_CallDlgProcA */ INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )

1 0

Vincent Povirk : winex11.drv: Use the old method to delete the desktop window.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 6f9533feb112bd89c2b7dd983590682fc2dd4e69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9533feb112bd89c2b7dd983… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 11 11:47:59 2009 -0600 winex11.drv: Use the old method to delete the desktop window. --- dlls/winex11.drv/event.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index e8e4522..32eb64a 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -507,6 +507,14 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (protocol == x11drv_atom(WM_DELETE_WINDOW)) { + if (hwnd == GetDesktopWindow()) + { + /* The desktop window does not have a close button that we can + * pretend to click. Therefore, we simply send it a close command. */ + SendMessageW(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); + return; + } + /* Ignore the delete window request if the window has been disabled * and we are in managed mode. This is to disallow applications from * being closed by the window manager while in a modal state.

1 0

Alexandre Julliard : user32: Split the handling of the 16-bit messages out of the scrollbar winproc.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 11ed5da3fdbdc62ffedc745acadb03938390c71e URL: http://source.winehq.org/git/wine.git/?a=commit;h=11ed5da3fdbdc62ffedc745ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 20:25:28 2009 +0100 user32: Split the handling of the 16-bit messages out of the scrollbar winproc. --- dlls/user32/scroll.c | 51 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 52c350c..6ab1e56 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1519,19 +1519,12 @@ static LRESULT ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM } break; - case SBM_SETPOS16: case SBM_SETPOS: return SetScrollPos( hwnd, SB_CTL, wParam, (BOOL)lParam ); - case SBM_GETPOS16: case SBM_GETPOS: return SCROLL_GetScrollPos(hwnd, SB_CTL); - case SBM_SETRANGE16: - if (wParam) message = SBM_SETRANGEREDRAW; - wParam = LOWORD(lParam); - lParam = HIWORD(lParam); - /* fall through */ case SBM_SETRANGEREDRAW: case SBM_SETRANGE: { @@ -1543,18 +1536,9 @@ static LRESULT ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM } return 0; - case SBM_GETRANGE16: - { - INT min, max; - - SCROLL_GetScrollRange(hwnd, SB_CTL, &min, &max); - return MAKELRESULT(min, max); - } - case SBM_GETRANGE: return SCROLL_GetScrollRange(hwnd, SB_CTL, (LPINT)wParam, (LPINT)lParam); - case SBM_ENABLE_ARROWS16: case SBM_ENABLE_ARROWS: return EnableScrollBar( hwnd, SB_CTL, wParam ); @@ -1592,11 +1576,42 @@ static LRESULT ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM /*********************************************************************** + * ScrollBarWndProc_wrapper16 + */ +static LRESULT ScrollBarWndProc_wrapper16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) +{ + static const UINT msg16_offset = SBM_SETPOS16 - SBM_SETPOS; + + switch (msg) + { + case SBM_SETPOS16: + case SBM_GETPOS16: + case SBM_ENABLE_ARROWS16: + msg -= msg16_offset; + break; + case SBM_SETRANGE16: + msg = wParam ? SBM_SETRANGEREDRAW : SBM_SETRANGE; + wParam = LOWORD(lParam); + lParam = HIWORD(lParam); + break; + case SBM_GETRANGE16: + { + INT min, max; + ScrollBarWndProc( hwnd, SBM_GETRANGE, (WPARAM)&min, (LPARAM)&max, FALSE ); + return MAKELRESULT(min, max); + } + default: + return ScrollBarWndProc( hwnd, msg, wParam, lParam, unicode ); + } + return ScrollBarWndProc( hwnd, msg, wParam, lParam, FALSE ); +} + +/*********************************************************************** * ScrollBarWndProcA */ static LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - return ScrollBarWndProc( hwnd, message, wParam, lParam, FALSE ); + return ScrollBarWndProc_wrapper16( hwnd, message, wParam, lParam, FALSE ); } @@ -1605,7 +1620,7 @@ static LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT message, WPARAM wParam, */ static LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - return ScrollBarWndProc( hwnd, message, wParam, lParam, TRUE ); + return ScrollBarWndProc_wrapper16( hwnd, message, wParam, lParam, TRUE ); }

1 0

Alexandre Julliard : msi/tests: Fix a handle leak.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 8b50188f571c298ff2a99aefe7fa0832a37f51b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b50188f571c298ff2a99aefe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 19:19:27 2009 +0100 msi/tests: Fix a handle leak. --- dlls/msi/tests/record.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 2c8f5bf..369c855 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -604,6 +604,8 @@ static void test_fieldzero(void) r = MsiRecordIsNull(rec, 0); ok(r == FALSE, "Expected FALSE, got %d\n", r); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); MsiCloseHandle(rec); MsiCloseHandle(hdb); DeleteFileA(msifile);

1 0

Alexandre Julliard : user32: Add a thunking mechanism for 16-bit edit word break procedures.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: dcec342b50524562844f64d43d423ed2c83c1f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcec342b50524562844f64d43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 14:52:28 2009 +0100 user32: Add a thunking mechanism for 16-bit edit word break procedures. --- dlls/user32/edit.c | 122 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 88 insertions(+), 34 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index b512aa4..c5a78c7 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -131,7 +131,6 @@ typedef struct and just line width for single line controls */ INT region_posx; /* Position of cursor relative to region: */ INT region_posy; /* -1: to left, 0: within, 1: to right */ - EDITWORDBREAKPROC16 word_break_proc16; void *word_break_proc; /* 32-bit word break proc: ANSI or Unicode */ INT line_count; /* number of lines */ INT y_offset; /* scroll offset in number of lines */ @@ -252,6 +251,90 @@ static HBRUSH EDIT_NotifyCtlColor(EDITSTATE *es, HDC hdc) } +/********************************************************************** + * Support for word break proc thunks + */ + +#define MAX_THUNKS 32 + +#include <pshpack1.h> +static struct word_break_thunk +{ + BYTE popl_eax; /* popl %eax (return address) */ + BYTE pushl_proc16; /* pushl proc16 */ + EDITWORDBREAKPROC16 proc16; + BYTE pushl_eax; /* pushl %eax */ + BYTE jmp; /* ljmp call_word_break_proc16 */ + DWORD callback; +} *word_break_thunks; +#include <poppack.h> + +/********************************************************************** + * call_word_break_proc16 + */ +static INT16 CALLBACK call_word_break_proc16( SEGPTR proc16, LPSTR text, INT index, INT count, INT action ) +{ + SEGPTR segptr; + WORD args[5]; + DWORD result; + + segptr = MapLS( text ); + args[4] = SELECTOROF(segptr); + args[3] = OFFSETOF(segptr); + args[2] = index; + args[1] = count; + args[0] = action; + WOWCallback16Ex( proc16, WCB16_PASCAL, sizeof(args), args, &result ); + UnMapLS( segptr ); + return LOWORD(result); +} + +/****************************************************************** + * add_word_break_thunk + */ +static struct word_break_thunk *add_word_break_thunk( EDITWORDBREAKPROC16 proc16 ) +{ + struct word_break_thunk *thunk; + + if (!word_break_thunks) + { + word_break_thunks = VirtualAlloc( NULL, MAX_THUNKS * sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + if (!word_break_thunks) return NULL; + + for (thunk = word_break_thunks; thunk < &word_break_thunks[MAX_THUNKS]; thunk++) + { + thunk->popl_eax = 0x58; /* popl %eax */ + thunk->pushl_proc16 = 0x68; /* pushl proc16 */ + thunk->pushl_eax = 0x50; /* pushl %eax */ + thunk->jmp = 0xe9; /* jmp call_word_break_proc16 */ + thunk->callback = (char *)call_word_break_proc16 - (char *)(&thunk->callback + 1); + } + } + for (thunk = word_break_thunks; thunk < &word_break_thunks[MAX_THUNKS]; thunk++) + if (thunk->proc16 == proc16) return thunk; + + for (thunk = word_break_thunks; thunk < &word_break_thunks[MAX_THUNKS]; thunk++) + { + if (thunk->proc16) continue; + thunk->proc16 = proc16; + return thunk; + } + FIXME("Out of word break thunks\n"); + return NULL; +} + +/****************************************************************** + * get_word_break_thunk + */ +static EDITWORDBREAKPROC16 get_word_break_thunk( EDITWORDBREAKPROCA proc ) +{ + struct word_break_thunk *thunk = (struct word_break_thunk *)proc; + if (word_break_thunks && thunk >= word_break_thunks && thunk < &word_break_thunks[MAX_THUNKS]) + return thunk->proc16; + return NULL; +} + /********************************************************************* * * EDIT_WordBreakProc @@ -336,28 +419,7 @@ static INT EDIT_CallWordBreakProc(EDITSTATE *es, INT start, INT index, INT count { INT ret; - if (es->word_break_proc16) { - HGLOBAL16 hglob16; - SEGPTR segptr; - INT countA; - WORD args[5]; - DWORD result; - - countA = WideCharToMultiByte(CP_ACP, 0, es->text + start, count, NULL, 0, NULL, NULL); - hglob16 = GlobalAlloc16(GMEM_MOVEABLE | GMEM_ZEROINIT, countA); - segptr = WOWGlobalLock16(hglob16); - WideCharToMultiByte(CP_ACP, 0, es->text + start, count, MapSL(segptr), countA, NULL, NULL); - args[4] = SELECTOROF(segptr); - args[3] = OFFSETOF(segptr); - args[2] = index; - args[1] = countA; - args[0] = action; - WOWCallback16Ex((DWORD)es->word_break_proc16, WCB16_PASCAL, sizeof(args), args, &result); - ret = LOWORD(result); - GlobalUnlock16(hglob16); - GlobalFree16(hglob16); - } - else if (es->word_break_proc) + if (es->word_break_proc) { if(es->is_unicode) { @@ -3091,7 +3153,6 @@ static void EDIT_EM_SetWordBreakProc(EDITSTATE *es, void *wbp) return; es->word_break_proc = wbp; - es->word_break_proc16 = NULL; if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); @@ -3107,15 +3168,8 @@ static void EDIT_EM_SetWordBreakProc(EDITSTATE *es, void *wbp) */ static void EDIT_EM_SetWordBreakProc16(EDITSTATE *es, EDITWORDBREAKPROC16 wbp) { - if (es->word_break_proc16 == wbp) - return; - - es->word_break_proc = NULL; - es->word_break_proc16 = wbp; - if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { - EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); - EDIT_UpdateText(es, NULL, TRUE); - } + struct word_break_thunk *thunk = add_word_break_thunk( wbp ); + if (thunk) EDIT_EM_SetWordBreakProc( es, thunk ); } @@ -5048,7 +5102,7 @@ static LRESULT EditWndProc_common( HWND hwnd, UINT msg, break; case EM_GETWORDBREAKPROC16: - result = (LRESULT)es->word_break_proc16; + result = (LRESULT)get_word_break_thunk( es->word_break_proc ); break; case EM_GETWORDBREAKPROC: result = (LRESULT)es->word_break_proc;

1 0

Alexandre Julliard : user32: Split the handling of the 16-bit messages out of the edit winproc.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 68656c0c3f117c399c5cef81f1304d9ecf04ea05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68656c0c3f117c399c5cef81f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 15:51:34 2009 +0100 user32: Split the handling of the 16-bit messages out of the edit winproc. --- dlls/user32/edit.c | 300 ++++++++++++++++++++++++---------------------------- 1 files changed, 140 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68656c0c3f117c399c5ce…

1 0

Alexandre Julliard : user32: Split the handling of the 16-bit messages out of the button winproc.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 68775d91340ac0fab18c8ac95242d226380ee5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=68775d91340ac0fab18c8ac95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 15:51:34 2009 +0100 user32: Split the handling of the 16-bit messages out of the button winproc. --- dlls/user32/button.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index fbe4c82..9eb731c 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -461,7 +461,6 @@ static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, InvalidateRect( hWnd, NULL, FALSE ); break; - case BM_SETSTYLE16: case BM_SETSTYLE: if ((wParam & 0x0f) >= MAX_BTN_TYPE) break; btn_type = wParam & 0x0f; @@ -499,11 +498,9 @@ static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, case BM_GETIMAGE: return GetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET ); - case BM_GETCHECK16: case BM_GETCHECK: return get_button_state( hWnd ) & 3; - case BM_SETCHECK16: case BM_SETCHECK: if (wParam > maxCheckState[btn_type]) wParam = maxCheckState[btn_type]; state = get_button_state( hWnd ); @@ -522,11 +519,9 @@ static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, BUTTON_CheckAutoRadioButton( hWnd ); break; - case BM_GETSTATE16: case BM_GETSTATE: return get_button_state( hWnd ); - case BM_SETSTATE16: case BM_SETSTATE: state = get_button_state( hWnd ); if (wParam) @@ -553,15 +548,32 @@ static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, } /*********************************************************************** + * ButtonWndProc_wrapper16 + */ +static LRESULT ButtonWndProc_wrapper16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) +{ + static const UINT msg16_offset = BM_GETCHECK16 - BM_GETCHECK; + + switch (msg) + { + case BM_GETCHECK16: + case BM_SETCHECK16: + case BM_GETSTATE16: + case BM_SETSTATE16: + case BM_SETSTYLE16: + return ButtonWndProc_common( hwnd, msg - msg16_offset, wParam, lParam, FALSE ); + default: + return ButtonWndProc_common( hwnd, msg, wParam, lParam, unicode ); + } +} + +/*********************************************************************** * ButtonWndProcW - * The button window procedure. This is just a wrapper which locks - * the passed HWND and calls the real window procedure (with a WND* - * pointer pointing to the locked windowstructure). */ static LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; - return ButtonWndProc_common( hWnd, uMsg, wParam, lParam, TRUE ); + return ButtonWndProc_wrapper16( hWnd, uMsg, wParam, lParam, TRUE ); } @@ -571,7 +583,7 @@ static LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARA static LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; - return ButtonWndProc_common( hWnd, uMsg, wParam, lParam, FALSE ); + return ButtonWndProc_wrapper16( hWnd, uMsg, wParam, lParam, FALSE ); }

1 0

Alexandre Julliard : user32: Split the code that deals with the 16-bit edit buffer handle to separate functions .
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 7e9721f8f2542971eb3cc89b29c949e1cb64c91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e9721f8f2542971eb3cc89b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 17:04:59 2009 +0100 user32: Split the code that deals with the 16-bit edit buffer handle to separate functions. --- dlls/user32/edit.c | 252 +++++++++++++++++++--------------------------------- 1 files changed, 92 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e9721f8f2542971eb3cc…

1 0