Removed the gotos from the WndProcs, always use a small wrapper that
locks the window, calls the real wndproc, unlocks the window.
diff --git a/controls/button.c b/controls/button.c
index 45c0dfa..19deeeb 100644
--- a/controls/button.c
+++ b/controls/button.c
@@ -73,15 +73,16 @@
/***********************************************************************
- * ButtonWndProc
+ * ButtonWndProc_locked
+ *
+ * Called with window lock held.
*/
-LRESULT WINAPI ButtonWndProc( HWND hWnd, UINT uMsg,
- WPARAM wParam, LPARAM lParam )
+static inline LRESULT WINAPI ButtonWndProc_locked(WND* wndPtr, UINT uMsg,
+ WPARAM wParam, LPARAM lParam )
{
RECT rect;
- LRESULT retvalue;
+ HWND hWnd = wndPtr->hwndSelf;
POINT pt;
- WND *wndPtr = WIN_FindWndPtr(hWnd);
BUTTONINFO *infoPtr = (BUTTONINFO *)wndPtr->wExtra;
LONG style = wndPtr->dwStyle & 0x0f;
HANDLE oldHbitmap;
@@ -92,7 +93,6 @@
switch (uMsg)
{
case WM_GETDLGCODE:
- WIN_ReleaseWndPtr(wndPtr);
switch(style)
{
case BS_PUSHBUTTON: return DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON;
@@ -123,11 +123,9 @@
infoPtr->state = BUTTON_UNCHECKED;
infoPtr->hFont = 0;
infoPtr->hImage = NULL;
- WIN_ReleaseWndPtr(wndPtr);
return 0;
case WM_ERASEBKGND:
- WIN_ReleaseWndPtr(wndPtr);
return 1;
case WM_PAINT:
@@ -184,7 +182,6 @@
break;
case WM_NCHITTEST:
- WIN_ReleaseWndPtr(wndPtr);
if(style == BS_GROUPBOX) return HTTRANSPARENT;
return DefWindowProcA( hWnd, uMsg, wParam, lParam );
@@ -192,7 +189,6 @@
DEFWND_SetText( wndPtr, (LPCSTR)lParam );
if( wndPtr->dwStyle & WS_VISIBLE )
PAINT_BUTTON( wndPtr, style, ODA_DRAWENTIRE );
- WIN_ReleaseWndPtr(wndPtr);
return 0;
case WM_SETFONT:
@@ -202,16 +198,12 @@
break;
case WM_GETFONT:
- retvalue = infoPtr->hFont;
- WIN_ReleaseWndPtr(wndPtr);
- return retvalue;
+ return infoPtr->hFont;
case WM_SETFOCUS:
infoPtr->state |= BUTTON_HASFOCUS;
if (style == BS_AUTORADIOBUTTON)
- {
SendMessageA( hWnd, BM_SETCHECK, 1, 0 );
- }
PAINT_BUTTON( wndPtr, style, ODA_FOCUS );
break;
@@ -238,19 +230,14 @@
oldHbitmap = infoPtr->hImage;
if(wndPtr->dwStyle & BS_BITMAP)
infoPtr->hImage = (HANDLE) lParam;
- WIN_ReleaseWndPtr(wndPtr);
return oldHbitmap;
case BM_GETIMAGE:
- retvalue = infoPtr->hImage;
- WIN_ReleaseWndPtr(wndPtr);
- return retvalue;
+ return infoPtr->hImage;
case BM_GETCHECK16:
case BM_GETCHECK:
- retvalue = infoPtr->state & 3;
- WIN_ReleaseWndPtr(wndPtr);
- return retvalue;
+ return infoPtr->state & 3;
case BM_SETCHECK16:
case BM_SETCHECK:
@@ -273,9 +260,7 @@
case BM_GETSTATE16:
case BM_GETSTATE:
- retvalue = infoPtr->state;
- WIN_ReleaseWndPtr(wndPtr);
- return retvalue;
+ return infoPtr->state;
case BM_SETSTATE16:
case BM_SETSTATE:
@@ -293,13 +278,28 @@
break;
default:
- WIN_ReleaseWndPtr(wndPtr);
return DefWindowProcA(hWnd, uMsg, wParam, lParam);
}
- WIN_ReleaseWndPtr(wndPtr);
return 0;
}
+/***********************************************************************
+ * ButtonWndProc
+ * 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).
+ */
+LRESULT WINAPI ButtonWndProc( HWND hWnd, UINT uMsg,
+ WPARAM wParam, LPARAM lParam )
+{
+ LRESULT res;
+ WND *wndPtr = WIN_FindWndPtr(hWnd);
+
+ res = ButtonWndProc_locked(wndPtr,uMsg,wParam,lParam);
+
+ WIN_ReleaseWndPtr(wndPtr);
+ return res;
+}
/**********************************************************************
* Push Button Functions
diff --git a/controls/combo.c b/controls/combo.c
index 68108a9..e58fbba 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -1679,19 +1679,16 @@
/***********************************************************************
- * ComboWndProc
+ * ComboWndProc_locked
*
* http://www.microsoft.com/msdn/sdk/platforms/doc/sdk/win32/ctrl/src/combobox_15.htm
*/
-LRESULT WINAPI ComboWndProc( HWND hwnd, UINT message,
+static inline LRESULT WINAPI ComboWndProc_locked( WND* pWnd, UINT message,
WPARAM wParam, LPARAM lParam )
{
- LRESULT retvalue;
- WND* pWnd = WIN_FindWndPtr(hwnd);
-
- if( pWnd )
- {
+ if( pWnd ) {
LPHEADCOMBO lphc = CB_GETPTR(pWnd);
+ HWND hwnd = pWnd->hwndSelf;
TRACE(combo, "[%04x]: msg %s wp %08x lp %08lx\n",
pWnd->hwndSelf, SPY_GetMsgName(message), wParam, lParam );
@@ -1703,15 +1700,13 @@
/* System messages */
case WM_NCCREATE:
- retvalue = COMBO_NCCreate(pWnd, lParam);
- goto END;
+ return COMBO_NCCreate(pWnd, lParam);
case WM_NCDESTROY:
COMBO_NCDestroy(lphc);
- break;
+ break;/* -> DefWindowProc */
case WM_CREATE:
- retvalue = COMBO_Create(lphc, pWnd, lParam);
- goto END;
+ return COMBO_Create(lphc, pWnd, lParam);
case WM_PRINTCLIENT:
if (lParam & PRF_ERASEBKGND)
@@ -1720,50 +1715,39 @@
/* Fallthrough */
case WM_PAINT:
/* wParam may contain a valid HDC! */
- retvalue = COMBO_Paint(lphc, wParam);
- goto END;
+ return COMBO_Paint(lphc, wParam);
case WM_ERASEBKGND:
- retvalue = COMBO_EraseBackground(hwnd, lphc, wParam);
- goto END;
+ return COMBO_EraseBackground(hwnd, lphc, wParam);
case WM_GETDLGCODE:
- retvalue = (LRESULT)(DLGC_WANTARROWS | DLGC_WANTCHARS);
- goto END;
+ return (LRESULT)(DLGC_WANTARROWS | DLGC_WANTCHARS);
case WM_WINDOWPOSCHANGING:
- retvalue = COMBO_WindowPosChanging(hwnd, lphc, (LPWINDOWPOS)lParam);
- goto END;
+ return COMBO_WindowPosChanging(hwnd, lphc, (LPWINDOWPOS)lParam);
case WM_SIZE:
if( lphc->hWndLBox &&
!(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc );
- retvalue = TRUE;
- goto END;
+ return TRUE;
case WM_SETFONT:
COMBO_Font( lphc, (HFONT16)wParam, (BOOL)lParam );
- retvalue = TRUE;
- goto END;
+ return TRUE;
case WM_GETFONT:
- retvalue = (LRESULT)lphc->hFont;
- goto END;
+ return (LRESULT)lphc->hFont;
case WM_SETFOCUS:
if( lphc->wState & CBF_EDIT )
SetFocus( lphc->hWndEdit );
else
COMBO_SetFocus( lphc );
- retvalue = TRUE;
- goto END;
+ return TRUE;
case WM_KILLFOCUS:
#define hwndFocus ((HWND16)wParam)
if( !hwndFocus ||
(hwndFocus != lphc->hWndEdit && hwndFocus != lphc->hWndLBox ))
COMBO_KillFocus( lphc );
#undef hwndFocus
- retvalue = TRUE;
- goto END;
+ return TRUE;
case WM_COMMAND:
- retvalue = COMBO_Command( lphc, wParam, (HWND)lParam );
- goto END;
+ return COMBO_Command( lphc, wParam, (HWND)lParam );
case WM_GETTEXT:
- retvalue = COMBO_GetText( lphc, (UINT)wParam, (LPSTR)lParam );
- goto END;
+ return COMBO_GetText( lphc, (UINT)wParam, (LPSTR)lParam );
case WM_SETTEXT:
case WM_GETTEXTLENGTH:
case WM_CLEAR:
@@ -1771,24 +1755,18 @@
case WM_PASTE:
case WM_COPY:
if( lphc->wState & CBF_EDIT )
- {
- retvalue = SendMessageA( lphc->hWndEdit, message, wParam, lParam );
- goto END;
- }
- retvalue = CB_ERR;
- goto END;
+ return SendMessageA( lphc->hWndEdit, message, wParam, lParam );
+ return CB_ERR;
case WM_DRAWITEM:
case WM_DELETEITEM:
case WM_COMPAREITEM:
case WM_MEASUREITEM:
- retvalue = COMBO_ItemOp( lphc, message, wParam, lParam );
- goto END;
+ return COMBO_ItemOp( lphc, message, wParam, lParam );
case WM_ENABLE:
if( lphc->wState & CBF_EDIT )
EnableWindow( lphc->hWndEdit, (BOOL)wParam );
EnableWindow( lphc->hWndLBox, (BOOL)wParam );
- retvalue = TRUE;
- goto END;
+ return TRUE;
case WM_SETREDRAW:
if( wParam )
lphc->wState &= ~CBF_NOREDRAW;
@@ -1798,123 +1776,95 @@
if( lphc->wState & CBF_EDIT )
SendMessageA( lphc->hWndEdit, message, wParam, lParam );
SendMessageA( lphc->hWndLBox, message, wParam, lParam );
- retvalue = 0;
- goto END;
+ return 0;
case WM_SYSKEYDOWN:
if( KEYDATA_ALT & HIWORD(lParam) )
if( wParam == VK_UP || wParam == VK_DOWN )
COMBO_FlipListbox( lphc, TRUE );
- break;
+ break;/* -> DefWindowProc */
case WM_CHAR:
case WM_KEYDOWN:
if( lphc->wState & CBF_EDIT )
- retvalue = SendMessageA( lphc->hWndEdit, message, wParam, lParam );
+ return SendMessageA( lphc->hWndEdit, message, wParam, lParam );
else
- retvalue = SendMessageA( lphc->hWndLBox, message, wParam, lParam );
- goto END;
+ return SendMessageA( lphc->hWndLBox, message, wParam, lParam );
case WM_LBUTTONDOWN:
if( !(lphc->wState & CBF_FOCUSED) ) SetFocus( lphc->self->hwndSelf );
if( lphc->wState & CBF_FOCUSED ) COMBO_LButtonDown( lphc, lParam );
- retvalue = TRUE;
- goto END;
+ return TRUE;
case WM_LBUTTONUP:
COMBO_LButtonUp( lphc, lParam );
- retvalue = TRUE;
- goto END;
+ return TRUE;
case WM_MOUSEMOVE:
if( lphc->wState & CBF_CAPTURE )
COMBO_MouseMove( lphc, wParam, lParam );
- retvalue = TRUE;
- goto END;
+ return TRUE;
/* Combo messages */
case CB_ADDSTRING16:
if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
case CB_ADDSTRING:
- retvalue = SendMessageA( lphc->hWndLBox, LB_ADDSTRING, 0, lParam);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_ADDSTRING, 0, lParam);
case CB_INSERTSTRING16:
wParam = (INT)(INT16)wParam;
if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
case CB_INSERTSTRING:
- retvalue = SendMessageA( lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam);
case CB_DELETESTRING16:
case CB_DELETESTRING:
- retvalue = SendMessageA( lphc->hWndLBox, LB_DELETESTRING, wParam, 0);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_DELETESTRING, wParam, 0);
case CB_SELECTSTRING16:
wParam = (INT)(INT16)wParam;
if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
case CB_SELECTSTRING:
- retvalue = COMBO_SelectString( lphc, (INT)wParam, (LPSTR)lParam );
- goto END;
+ return COMBO_SelectString( lphc, (INT)wParam, (LPSTR)lParam );
case CB_FINDSTRING16:
wParam = (INT)(INT16)wParam;
if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
case CB_FINDSTRING:
- retvalue = SendMessageA( lphc->hWndLBox, LB_FINDSTRING, wParam, lParam);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_FINDSTRING, wParam, lParam);
case CB_FINDSTRINGEXACT16:
wParam = (INT)(INT16)wParam;
if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
case CB_FINDSTRINGEXACT:
- retvalue = SendMessageA( lphc->hWndLBox, LB_FINDSTRINGEXACT,
+ return SendMessageA( lphc->hWndLBox, LB_FINDSTRINGEXACT,
wParam, lParam );
- goto END;
case CB_SETITEMHEIGHT16:
wParam = (INT)(INT16)wParam; /* signed integer */
case CB_SETITEMHEIGHT:
- retvalue = COMBO_SetItemHeight( lphc, (INT)wParam, (INT)lParam);
- goto END;
+ return COMBO_SetItemHeight( lphc, (INT)wParam, (INT)lParam);
case CB_GETITEMHEIGHT16:
wParam = (INT)(INT16)wParam;
case CB_GETITEMHEIGHT:
if( (INT)wParam >= 0 ) /* listbox item */
- {
- retvalue = SendMessageA( lphc->hWndLBox, LB_GETITEMHEIGHT, wParam, 0);
- goto END;
- }
- retvalue = CBGetTextAreaHeight(hwnd, lphc);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_GETITEMHEIGHT, wParam, 0);
+ return CBGetTextAreaHeight(hwnd, lphc);
case CB_RESETCONTENT16:
case CB_RESETCONTENT:
SendMessageA( lphc->hWndLBox, LB_RESETCONTENT, 0, 0 );
InvalidateRect(CB_HWND(lphc), NULL, TRUE);
- retvalue = TRUE;
- goto END;
+ return TRUE;
case CB_INITSTORAGE:
- retvalue = SendMessageA( lphc->hWndLBox, LB_INITSTORAGE, wParam, lParam);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_INITSTORAGE, wParam, lParam);
case CB_GETHORIZONTALEXTENT:
- retvalue = SendMessageA( lphc->hWndLBox, LB_GETHORIZONTALEXTENT, 0, 0);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_GETHORIZONTALEXTENT, 0, 0);
case CB_SETHORIZONTALEXTENT:
- retvalue = SendMessageA( lphc->hWndLBox, LB_SETHORIZONTALEXTENT, wParam, 0);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_SETHORIZONTALEXTENT, wParam, 0);
case CB_GETTOPINDEX:
- retvalue = SendMessageA( lphc->hWndLBox, LB_GETTOPINDEX, 0, 0);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_GETTOPINDEX, 0, 0);
case CB_GETLOCALE:
- retvalue = SendMessageA( lphc->hWndLBox, LB_GETLOCALE, 0, 0);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_GETLOCALE, 0, 0);
case CB_SETLOCALE:
- retvalue = SendMessageA( lphc->hWndLBox, LB_SETLOCALE, wParam, 0);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_SETLOCALE, wParam, 0);
case CB_GETDROPPEDWIDTH:
if( lphc->droppedWidth )
- {
- retvalue = lphc->droppedWidth;
- goto END;
- }
- retvalue = lphc->droppedRect.right - lphc->droppedRect.left;
- goto END;
+ return lphc->droppedWidth;
+ return lphc->droppedRect.right - lphc->droppedRect.left;
case CB_SETDROPPEDWIDTH:
if( (CB_GETTYPE(lphc) != CBS_SIMPLE) &&
(INT)wParam < 32768 ) lphc->droppedWidth = (INT)wParam;
- retvalue = CB_ERR;
- goto END;
+ return CB_ERR;
case CB_GETDROPPEDCONTROLRECT16:
lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
if( lParam )
@@ -1923,23 +1873,19 @@
CBGetDroppedControlRect( lphc, &r );
CONV_RECT32TO16( &r, (LPRECT16)lParam );
}
- retvalue = CB_OKAY;
- goto END;
+ return CB_OKAY;
case CB_GETDROPPEDCONTROLRECT:
if( lParam ) CBGetDroppedControlRect(lphc, (LPRECT)lParam );
- retvalue = CB_OKAY;
- goto END;
+ return CB_OKAY;
case CB_GETDROPPEDSTATE16:
case CB_GETDROPPEDSTATE:
- retvalue = (lphc->wState & CBF_DROPPED) ? TRUE : FALSE;
- goto END;
+ return (lphc->wState & CBF_DROPPED) ? TRUE : FALSE;
case CB_DIR16:
lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
/* fall through */
case CB_DIR:
- retvalue = COMBO_Directory( lphc, (UINT)wParam,
+ return COMBO_Directory( lphc, (UINT)wParam,
(LPSTR)lParam, (message == CB_DIR));
- goto END;
case CB_SHOWDROPDOWN16:
case CB_SHOWDROPDOWN:
if( CB_GETTYPE(lphc) != CBS_SIMPLE )
@@ -1953,16 +1899,13 @@
if( lphc->wState & CBF_DROPPED )
CBRollUp( lphc, FALSE, TRUE );
}
- retvalue = TRUE;
- goto END;
+ return TRUE;
case CB_GETCOUNT16:
case CB_GETCOUNT:
- retvalue = SendMessageA( lphc->hWndLBox, LB_GETCOUNT, 0, 0);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_GETCOUNT, 0, 0);
case CB_GETCURSEL16:
case CB_GETCURSEL:
- retvalue = SendMessageA( lphc->hWndLBox, LB_GETCURSEL, 0, 0);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_GETCURSEL, 0, 0);
case CB_SETCURSEL16:
wParam = (INT)(INT16)wParam;
case CB_SETCURSEL:
@@ -1973,29 +1916,24 @@
InvalidateRect(CB_HWND(lphc), &lphc->textRect, TRUE);
lphc->wState &= ~CBF_SELCHANGE;
}
- retvalue = lParam;
- goto END;
+ return lParam;
case CB_GETLBTEXT16:
wParam = (INT)(INT16)wParam;
lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
case CB_GETLBTEXT:
- retvalue = SendMessageA( lphc->hWndLBox, LB_GETTEXT, wParam, lParam);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_GETTEXT, wParam, lParam);
case CB_GETLBTEXTLEN16:
wParam = (INT)(INT16)wParam;
case CB_GETLBTEXTLEN:
- retvalue = SendMessageA( lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0);
case CB_GETITEMDATA16:
wParam = (INT)(INT16)wParam;
case CB_GETITEMDATA:
- retvalue = SendMessageA( lphc->hWndLBox, LB_GETITEMDATA, wParam, 0);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_GETITEMDATA, wParam, 0);
case CB_SETITEMDATA16:
wParam = (INT)(INT16)wParam;
case CB_SETITEMDATA:
- retvalue = SendMessageA( lphc->hWndLBox, LB_SETITEMDATA, wParam, lParam);
- goto END;
+ return SendMessageA( lphc->hWndLBox, LB_SETITEMDATA, wParam, lParam);
case CB_GETEDITSEL16:
wParam = lParam = 0; /* just in case */
case CB_GETEDITSEL:
@@ -2003,47 +1941,49 @@
{
INT a, b;
- retvalue = SendMessageA( lphc->hWndEdit, EM_GETSEL,
+ return SendMessageA( lphc->hWndEdit, EM_GETSEL,
(wParam) ? wParam : (WPARAM)&a,
(lParam) ? lParam : (LPARAM)&b );
- goto END;
}
- retvalue = CB_ERR;
- goto END;
+ return CB_ERR;
case CB_SETEDITSEL16:
case CB_SETEDITSEL:
if( lphc->wState & CBF_EDIT )
- {
- retvalue = SendMessageA( lphc->hWndEdit, EM_SETSEL,
+ return SendMessageA( lphc->hWndEdit, EM_SETSEL,
(INT)(INT16)LOWORD(lParam), (INT)(INT16)HIWORD(lParam) );
- goto END;
- }
- retvalue = CB_ERR;
- goto END;
+ return CB_ERR;
case CB_SETEXTENDEDUI16:
case CB_SETEXTENDEDUI:
if( CB_GETTYPE(lphc) == CBS_SIMPLE )
- {
- retvalue = CB_ERR;
- goto END;
- }
+ return CB_ERR;
if( wParam )
lphc->wState |= CBF_EUI;
else lphc->wState &= ~CBF_EUI;
- retvalue = CB_OKAY;
- goto END;
+ return CB_OKAY;
case CB_GETEXTENDEDUI16:
case CB_GETEXTENDEDUI:
- retvalue = (lphc->wState & CBF_EUI) ? TRUE : FALSE;
- goto END;
+ return (lphc->wState & CBF_EUI) ? TRUE : FALSE;
case (WM_USER + 0x1B):
WARN(combo, "[%04x]: undocumented msg!\n", hwnd );
}
- retvalue = DefWindowProcA(hwnd, message, wParam, lParam);
- goto END;
+ return DefWindowProcA(hwnd, message, wParam, lParam);
}
- retvalue = CB_ERR;
-END:
+ return CB_ERR;
+}
+
+/***********************************************************************
+ * ComboWndProc
+ *
+ * This is just a wrapper for the real ComboWndProc which locks/unlocks
+ * window structs.
+ */
+LRESULT WINAPI ComboWndProc( HWND hwnd, UINT message,
+ WPARAM wParam, LPARAM lParam )
+{
+ WND* pWnd = WIN_FindWndPtr(hwnd);
+ LRESULT retvalue = ComboWndProc_locked(pWnd,message,wParam,lParam);
+
+
WIN_ReleaseWndPtr(pWnd);
return retvalue;
}
diff --git a/controls/desktop.c b/controls/desktop.c
index 3df5156..462625f 100644
--- a/controls/desktop.c
+++ b/controls/desktop.c
@@ -194,16 +194,15 @@
/***********************************************************************
- * DesktopWndProc
+ * DesktopWndProc_locked
*
* Window procedure for the desktop window.
*/
-LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message,
+static inline LRESULT WINAPI DesktopWndProc_locked( WND *wndPtr, UINT message,
WPARAM wParam, LPARAM lParam )
{
- LRESULT retvalue;
- WND *wndPtr = WIN_FindWndPtr( hwnd );
DESKTOP *desktopPtr = (DESKTOP *)wndPtr->wExtra;
+ HWND hwnd = wndPtr->hwndSelf;
/* Most messages are ignored (we DON'T call DefWindowProc) */
@@ -216,33 +215,37 @@
desktopPtr->hbitmapWallPaper = 0;
SetDeskPattern();
SetDeskWallPaper( (LPSTR)-1 );
- retvalue = 1;
- goto END;
+ return 1;
case WM_ERASEBKGND:
if(!DESKTOP_IsSingleWindow())
- {
- retvalue = 1;
- goto END;
- }
- retvalue = DESKTOP_DoEraseBkgnd( hwnd, (HDC)wParam, desktopPtr );
- goto END;
+ return 1;
+ return DESKTOP_DoEraseBkgnd( hwnd, (HDC)wParam, desktopPtr );
case WM_SYSCOMMAND:
if ((wParam & 0xfff0) != SC_CLOSE)
- {
- retvalue = 0;
- goto END;
- }
+ return 0;
ExitWindows16( 0, 0 );
case WM_SETCURSOR:
- retvalue = (LRESULT)SetCursor16( LoadCursor16( 0, IDC_ARROW16 ) );
- goto END;
+ return (LRESULT)SetCursor16( LoadCursor16( 0, IDC_ARROW16 ) );
}
- retvalue = 0;
-END:
+ return 0;
+}
+
+/***********************************************************************
+ * DesktopWndProc
+ *
+ * This is just a wrapper for the DesktopWndProc which does windows
+ * locking and unlocking.
+ */
+LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message,
+ WPARAM wParam, LPARAM lParam )
+{
+ WND *wndPtr = WIN_FindWndPtr( hwnd );
+ LRESULT retvalue = DesktopWndProc_locked(wndPtr,message,wParam,lParam);
+
WIN_ReleaseWndPtr(wndPtr);
return retvalue;
}
diff --git a/controls/listbox.c b/controls/listbox.c
index 7f9b58d..50c7be8 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -2130,13 +2130,12 @@
/***********************************************************************
* ListBoxWndProc
*/
-LRESULT WINAPI ListBoxWndProc( HWND hwnd, UINT msg,
- WPARAM wParam, LPARAM lParam )
+static inline LRESULT WINAPI ListBoxWndProc_locked( WND* wnd, UINT msg,
+ WPARAM wParam, LPARAM lParam )
{
LRESULT ret;
LB_DESCR *descr;
- WND *wnd = WIN_FindWndPtr( hwnd );
- LRESULT retvalue;
+ HWND hwnd = wnd->hwndSelf;
if (!wnd) return 0;
if (!(descr = *(LB_DESCR **)wnd->wExtra))
@@ -2144,18 +2143,13 @@
if (msg == WM_CREATE)
{
if (!LISTBOX_Create( wnd, NULL ))
- {
- retvalue = -1;
- goto END;
- }
+ return -1;
TRACE(listbox, "creating wnd=%04x descr=%p\n",
hwnd, *(LB_DESCR **)wnd->wExtra );
- retvalue = 0;
- goto END;
+ return 0;
}
/* Ignore all other messages before we get a WM_CREATE */
- retvalue = DefWindowProcA( hwnd, msg, wParam, lParam );
- goto END;
+ return DefWindowProcA( hwnd, msg, wParam, lParam );
}
TRACE(listbox, "[%04x]: msg %s wp %08x lp %08lx\n",
@@ -2165,112 +2159,88 @@
case LB_RESETCONTENT16:
case LB_RESETCONTENT:
LISTBOX_ResetContent( wnd, descr );
- retvalue = 0;
- goto END;
+ return 0;
case LB_ADDSTRING16:
if (HAS_STRINGS(descr)) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
/* fall through */
case LB_ADDSTRING:
wParam = LISTBOX_FindStringPos( wnd, descr, (LPCSTR)lParam, FALSE );
- retvalue = LISTBOX_InsertString( wnd, descr, wParam, (LPCSTR)lParam );
- goto END;
+ return LISTBOX_InsertString( wnd, descr, wParam, (LPCSTR)lParam );
case LB_INSERTSTRING16:
if (HAS_STRINGS(descr)) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
wParam = (INT)(INT16)wParam;
/* fall through */
case LB_INSERTSTRING:
- retvalue = LISTBOX_InsertString( wnd, descr, wParam, (LPCSTR)lParam );
- goto END;
+ return LISTBOX_InsertString( wnd, descr, wParam, (LPCSTR)lParam );
case LB_ADDFILE16:
if (HAS_STRINGS(descr)) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
/* fall through */
case LB_ADDFILE:
wParam = LISTBOX_FindFileStrPos( wnd, descr, (LPCSTR)lParam );
- retvalue = LISTBOX_InsertString( wnd, descr, wParam, (LPCSTR)lParam );
- goto END;
+ return LISTBOX_InsertString( wnd, descr, wParam, (LPCSTR)lParam );
case LB_DELETESTRING16:
case LB_DELETESTRING:
- retvalue = LISTBOX_RemoveItem( wnd, descr, wParam );
- goto END;
+ return LISTBOX_RemoveItem( wnd, descr, wParam );
case LB_GETITEMDATA16:
case LB_GETITEMDATA:
if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items))
- {
- retvalue = LB_ERR;
- goto END;
- }
- retvalue = descr->items[wParam].data;
- goto END;
+ return LB_ERR;
+ return descr->items[wParam].data;
case LB_SETITEMDATA16:
case LB_SETITEMDATA:
if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items))
- {
- retvalue = LB_ERR;
- goto END;
- }
+ return LB_ERR;
descr->items[wParam].data = (DWORD)lParam;
- retvalue = LB_OKAY;
- goto END;
+ return LB_OKAY;
case LB_GETCOUNT16:
case LB_GETCOUNT:
- retvalue = descr->nb_items;
- goto END;
+ return descr->nb_items;
case LB_GETTEXT16:
lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
/* fall through */
case LB_GETTEXT:
- retvalue = LISTBOX_GetText( wnd, descr, wParam, (LPSTR)lParam );
- goto END;
+ return LISTBOX_GetText( wnd, descr, wParam, (LPSTR)lParam );
case LB_GETTEXTLEN16:
/* fall through */
case LB_GETTEXTLEN:
if (wParam >= descr->nb_items)
- {
- retvalue = LB_ERR;
- goto END;
- }
- retvalue = (HAS_STRINGS(descr) ? strlen(descr->items[wParam].str)
+ return LB_ERR;
+ return (HAS_STRINGS(descr) ? strlen(descr->items[wParam].str)
: sizeof(DWORD));
- goto END;
case LB_GETCURSEL16:
case LB_GETCURSEL:
if (descr->nb_items==0)
- retvalue = LB_ERR;
- else
- {
- retvalue = descr->selected_item;
- if (retvalue == -1) retvalue = descr->focus_item;
- }
+ return LB_ERR;
+ /* else */
+ if (descr->selected_item!=-1)
+ return descr->selected_item;
+ /* else */
+ return descr->focus_item;
/* otherwise, if the user tries to move the selection with the */
/* arrow keys, we will give the application something to choke on */
- goto END;
-
case LB_GETTOPINDEX16:
case LB_GETTOPINDEX:
- retvalue = descr->top_item;
- goto END;
+ return descr->top_item;
case LB_GETITEMHEIGHT16:
case LB_GETITEMHEIGHT:
- retvalue = LISTBOX_GetItemHeight( wnd, descr, wParam );
- goto END;
+ return LISTBOX_GetItemHeight( wnd, descr, wParam );
case LB_SETITEMHEIGHT16:
lParam = LOWORD(lParam);
/* fall through */
case LB_SETITEMHEIGHT:
- retvalue = LISTBOX_SetItemHeight( wnd, descr, wParam, lParam );
- goto END;
+ return LISTBOX_SetItemHeight( wnd, descr, wParam, lParam );
case LB_ITEMFROMPOINT:
{
@@ -2284,30 +2254,25 @@
rect.right = descr->width;
rect.bottom = descr->height;
- retvalue = MAKELONG( LISTBOX_GetItemFromPoint(wnd, descr, pt.x, pt.y),
+ return MAKELONG( LISTBOX_GetItemFromPoint(wnd, descr, pt.x, pt.y),
PtInRect( &rect, pt ) );
- goto END;
}
case LB_SETCARETINDEX16:
case LB_SETCARETINDEX:
- retvalue = LISTBOX_SetCaretIndex( wnd, descr, wParam, !lParam );
- goto END;
+ return LISTBOX_SetCaretIndex( wnd, descr, wParam, !lParam );
case LB_GETCARETINDEX16:
case LB_GETCARETINDEX:
- retvalue = descr->focus_item;
- goto END;
+ return descr->focus_item;
case LB_SETTOPINDEX16:
case LB_SETTOPINDEX:
- retvalue = LISTBOX_SetTopItem( wnd, descr, wParam, TRUE );
- goto END;
+ return LISTBOX_SetTopItem( wnd, descr, wParam, TRUE );
case LB_SETCOLUMNWIDTH16:
case LB_SETCOLUMNWIDTH:
- retvalue = LISTBOX_SetColumnWidth( wnd, descr, wParam );
- goto END;
+ return LISTBOX_SetColumnWidth( wnd, descr, wParam );
case LB_GETITEMRECT16:
{
@@ -2315,28 +2280,24 @@
ret = LISTBOX_GetItemRect( wnd, descr, (INT16)wParam, &rect );
CONV_RECT32TO16( &rect, (RECT16 *)PTR_SEG_TO_LIN(lParam) );
}
- retvalue = ret;
- goto END;
+ return ret;
case LB_GETITEMRECT:
- retvalue = LISTBOX_GetItemRect( wnd, descr, wParam, (RECT *)lParam );
- goto END;
+ return LISTBOX_GetItemRect( wnd, descr, wParam, (RECT *)lParam );
case LB_FINDSTRING16:
wParam = (INT)(INT16)wParam;
if (HAS_STRINGS(descr)) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
/* fall through */
case LB_FINDSTRING:
- retvalue = LISTBOX_FindString( wnd, descr, wParam, (LPCSTR)lParam, FALSE );
- goto END;
+ return LISTBOX_FindString( wnd, descr, wParam, (LPCSTR)lParam, FALSE );
case LB_FINDSTRINGEXACT16:
wParam = (INT)(INT16)wParam;
if (HAS_STRINGS(descr)) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
/* fall through */
case LB_FINDSTRINGEXACT:
- retvalue = LISTBOX_FindString( wnd, descr, wParam, (LPCSTR)lParam, TRUE );
- goto END;
+ return LISTBOX_FindString( wnd, descr, wParam, (LPCSTR)lParam, TRUE );
case LB_SELECTSTRING16:
wParam = (INT)(INT16)wParam;
@@ -2347,13 +2308,9 @@
INT index = LISTBOX_FindString( wnd, descr, wParam,
(LPCSTR)lParam, FALSE );
if (index == LB_ERR)
- {
- retvalue = LB_ERR;
- goto END;
- }
+ return LB_ERR;
LISTBOX_SetSelection( wnd, descr, index, TRUE, FALSE );
- retvalue = index;
- goto END;
+ return index;
}
case LB_GETSEL16:
@@ -2361,171 +2318,129 @@
/* fall through */
case LB_GETSEL:
if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items))
- {
- retvalue = LB_ERR;
- goto END;
- }
- retvalue = descr->items[wParam].selected;
- goto END;
+ return LB_ERR;
+ return descr->items[wParam].selected;
case LB_SETSEL16:
lParam = (INT)(INT16)lParam;
/* fall through */
case LB_SETSEL:
- retvalue = LISTBOX_SetSelection( wnd, descr, lParam, wParam, FALSE );
- goto END;
+ return LISTBOX_SetSelection( wnd, descr, lParam, wParam, FALSE );
case LB_SETCURSEL16:
wParam = (INT)(INT16)wParam;
/* fall through */
case LB_SETCURSEL:
LISTBOX_SetCaretIndex( wnd, descr, wParam, TRUE );
- retvalue = LISTBOX_SetSelection( wnd, descr, wParam, TRUE, FALSE );
- goto END;
+ return LISTBOX_SetSelection( wnd, descr, wParam, TRUE, FALSE );
case LB_GETSELCOUNT16:
case LB_GETSELCOUNT:
- retvalue = LISTBOX_GetSelCount( wnd, descr );
- goto END;
+ return LISTBOX_GetSelCount( wnd, descr );
case LB_GETSELITEMS16:
- retvalue = LISTBOX_GetSelItems16( wnd, descr, wParam,
+ return LISTBOX_GetSelItems16( wnd, descr, wParam,
(LPINT16)PTR_SEG_TO_LIN(lParam) );
- goto END;
case LB_GETSELITEMS:
- retvalue = LISTBOX_GetSelItems( wnd, descr, wParam, (LPINT)lParam );
- goto END;
+ return LISTBOX_GetSelItems( wnd, descr, wParam, (LPINT)lParam );
case LB_SELITEMRANGE16:
case LB_SELITEMRANGE:
if (LOWORD(lParam) <= HIWORD(lParam))
- {
- retvalue = LISTBOX_SelectItemRange( wnd, descr, LOWORD(lParam),
+ return LISTBOX_SelectItemRange( wnd, descr, LOWORD(lParam),
HIWORD(lParam), wParam );
- }
else
- {
- retvalue = LISTBOX_SelectItemRange( wnd, descr, HIWORD(lParam),
+ return LISTBOX_SelectItemRange( wnd, descr, HIWORD(lParam),
LOWORD(lParam), wParam );
- }
- goto END;
case LB_SELITEMRANGEEX16:
case LB_SELITEMRANGEEX:
if ((INT)lParam >= (INT)wParam)
- retvalue = LISTBOX_SelectItemRange( wnd, descr, wParam, lParam, TRUE );
+ return LISTBOX_SelectItemRange( wnd, descr, wParam, lParam, TRUE );
else
- retvalue = LISTBOX_SelectItemRange( wnd, descr, lParam, wParam, FALSE);
- goto END;
+ return LISTBOX_SelectItemRange( wnd, descr, lParam, wParam, FALSE);
case LB_GETHORIZONTALEXTENT16:
case LB_GETHORIZONTALEXTENT:
- retvalue = descr->horz_extent;
- goto END;
+ return descr->horz_extent;
case LB_SETHORIZONTALEXTENT16:
case LB_SETHORIZONTALEXTENT:
- retvalue = LISTBOX_SetHorizontalExtent( wnd, descr, wParam );
- goto END;
+ return LISTBOX_SetHorizontalExtent( wnd, descr, wParam );
case LB_GETANCHORINDEX16:
case LB_GETANCHORINDEX:
- retvalue = descr->anchor_item;
- goto END;
+ return descr->anchor_item;
case LB_SETANCHORINDEX16:
wParam = (INT)(INT16)wParam;
/* fall through */
case LB_SETANCHORINDEX:
if (((INT)wParam < -1) || ((INT)wParam >= descr->nb_items))
- {
- retvalue = LB_ERR;
- goto END;
- }
+ return LB_ERR;
descr->anchor_item = (INT)wParam;
- retvalue = LB_OKAY;
- goto END;
+ return LB_OKAY;
case LB_DIR16:
- retvalue = LISTBOX_Directory( wnd, descr, wParam,
+ return LISTBOX_Directory( wnd, descr, wParam,
(LPCSTR)PTR_SEG_TO_LIN(lParam), FALSE );
- goto END;
case LB_DIR:
- retvalue = LISTBOX_Directory( wnd, descr, wParam, (LPCSTR)lParam, TRUE );
- goto END;
+ return LISTBOX_Directory( wnd, descr, wParam, (LPCSTR)lParam, TRUE );
case LB_GETLOCALE:
- retvalue = descr->locale;
- goto END;
+ return descr->locale;
case LB_SETLOCALE:
descr->locale = (LCID)wParam; /* FIXME: should check for valid lcid */
- retvalue = LB_OKAY;
- goto END;
+ return LB_OKAY;
case LB_INITSTORAGE:
- retvalue = LISTBOX_InitStorage( wnd, descr, wParam, (DWORD)lParam );
- goto END;
+ return LISTBOX_InitStorage( wnd, descr, wParam, (DWORD)lParam );
case LB_SETCOUNT:
- retvalue = LISTBOX_SetCount( wnd, descr, (INT)wParam );
- goto END;
+ return LISTBOX_SetCount( wnd, descr, (INT)wParam );
case LB_SETTABSTOPS16:
- retvalue = LISTBOX_SetTabStops( wnd, descr, (INT)(INT16)wParam,
+ return LISTBOX_SetTabStops( wnd, descr, (INT)(INT16)wParam,
(LPINT)PTR_SEG_TO_LIN(lParam), TRUE );
- goto END;
case LB_SETTABSTOPS:
- retvalue = LISTBOX_SetTabStops( wnd, descr, wParam,
- (LPINT)lParam, FALSE );
- goto END;
+ return LISTBOX_SetTabStops( wnd, descr, wParam, (LPINT)lParam, FALSE );
case LB_CARETON16:
case LB_CARETON:
if (descr->caret_on)
- {
- retvalue = LB_OKAY;
- goto END;
- }
+ return LB_OKAY;
descr->caret_on = TRUE;
if ((descr->focus_item != -1) && (GetFocus() == wnd->hwndSelf))
LISTBOX_RepaintItem( wnd, descr, descr->focus_item, ODA_FOCUS );
- retvalue = LB_OKAY;
- goto END;
+ return LB_OKAY;
case LB_CARETOFF16:
case LB_CARETOFF:
if (!descr->caret_on)
- {
- retvalue = LB_OKAY;
- goto END;
- }
+ return LB_OKAY;
descr->caret_on = FALSE;
if ((descr->focus_item != -1) && (GetFocus() == wnd->hwndSelf))
LISTBOX_RepaintItem( wnd, descr, descr->focus_item, ODA_FOCUS );
- retvalue = LB_OKAY;
- goto END;
+ return LB_OKAY;
case WM_DESTROY:
- retvalue = LISTBOX_Destroy( wnd, descr );
- goto END;
+ return LISTBOX_Destroy( wnd, descr );
case WM_ENABLE:
InvalidateRect( hwnd, NULL, TRUE );
- retvalue = 0;
- goto END;
+ return 0;
case WM_SETREDRAW:
LISTBOX_SetRedraw( wnd, descr, wParam != 0 );
- retvalue = 0;
- goto END;
+ return 0;
case WM_GETDLGCODE:
- retvalue =DLGC_WANTARROWS | DLGC_WANTCHARS;
- goto END;
+ return DLGC_WANTARROWS | DLGC_WANTCHARS;
+
case WM_PAINT:
{
PAINTSTRUCT ps;
@@ -2534,67 +2449,52 @@
ret = LISTBOX_Paint( wnd, descr, hdc );
if( !wParam ) EndPaint( hwnd, &ps );
}
- retvalue =ret;
- goto END;
+ return ret;
case WM_SIZE:
LISTBOX_UpdateSize( wnd, descr );
- retvalue =0;
- goto END;
+ return 0;
case WM_GETFONT:
- retvalue =descr->font;
- goto END;
+ return descr->font;
case WM_SETFONT:
LISTBOX_SetFont( wnd, descr, (HFONT)wParam );
if (lParam) InvalidateRect( wnd->hwndSelf, 0, TRUE );
- retvalue =0;
- goto END;
+ return 0;
case WM_SETFOCUS:
descr->caret_on = TRUE;
if (descr->focus_item != -1)
LISTBOX_RepaintItem( wnd, descr, descr->focus_item, ODA_FOCUS );
SEND_NOTIFICATION( wnd, descr, LBN_SETFOCUS );
- retvalue =0;
- goto END;
+ return 0;
case WM_KILLFOCUS:
if ((descr->focus_item != -1) && descr->caret_on)
LISTBOX_RepaintItem( wnd, descr, descr->focus_item, ODA_FOCUS );
SEND_NOTIFICATION( wnd, descr, LBN_KILLFOCUS );
- retvalue =0;
- goto END;
+ return 0;
case WM_HSCROLL:
- retvalue =LISTBOX_HandleHScroll( wnd, descr, wParam, lParam );
- goto END;
+ return LISTBOX_HandleHScroll( wnd, descr, wParam, lParam );
case WM_VSCROLL:
- retvalue =LISTBOX_HandleVScroll( wnd, descr, wParam, lParam );
- goto END;
+ return LISTBOX_HandleVScroll( wnd, descr, wParam, lParam );
case WM_LBUTTONDOWN:
- retvalue =LISTBOX_HandleLButtonDown( wnd, descr, wParam,
+ return LISTBOX_HandleLButtonDown( wnd, descr, wParam,
(INT16)LOWORD(lParam),
(INT16)HIWORD(lParam) );
- goto END;
case WM_LBUTTONDBLCLK:
if (descr->style & LBS_NOTIFY)
SEND_NOTIFICATION( wnd, descr, LBN_DBLCLK );
- retvalue =0;
- goto END;
+ return 0;
case WM_MOUSEMOVE:
if (GetCapture() == hwnd)
LISTBOX_HandleMouseMove( wnd, descr, (INT16)LOWORD(lParam),
(INT16)HIWORD(lParam) );
- retvalue =0;
- goto END;
+ return 0;
case WM_LBUTTONUP:
- retvalue =LISTBOX_HandleLButtonUp( wnd, descr );
- goto END;
+ return LISTBOX_HandleLButtonUp( wnd, descr );
case WM_KEYDOWN:
- retvalue =LISTBOX_HandleKeyDown( wnd, descr, wParam );
- goto END;
+ return LISTBOX_HandleKeyDown( wnd, descr, wParam );
case WM_CHAR:
- retvalue =LISTBOX_HandleChar( wnd, descr, wParam );
- goto END;
+ return LISTBOX_HandleChar( wnd, descr, wParam );
case WM_SYSTIMER:
- retvalue =LISTBOX_HandleSystemTimer( wnd, descr );
- goto END;
+ return LISTBOX_HandleSystemTimer( wnd, descr );
case WM_ERASEBKGND:
if (IS_OWNERDRAW(descr))
{
@@ -2604,14 +2504,10 @@
GetClientRect(hwnd, &rect);
if (hbrush) FillRect( (HDC)wParam, &rect, hbrush );
}
- retvalue =1;
- goto END;
+ return 1;
case WM_DROPFILES:
if( !descr->lphc )
- {
- retvalue =SendMessageA( descr->owner, msg, wParam, lParam );
- goto END;
- }
+ return SendMessageA( descr->owner, msg, wParam, lParam );
break;
case WM_DROPOBJECT:
@@ -2623,27 +2519,37 @@
LPDRAGINFO dragInfo = (LPDRAGINFO)PTR_SEG_TO_LIN( (SEGPTR)lParam );
dragInfo->l = LISTBOX_GetItemFromPoint( wnd, descr, dragInfo->pt.x,
dragInfo->pt.y );
- retvalue =SendMessageA( descr->owner, msg, wParam, lParam );
- goto END;
+ return SendMessageA( descr->owner, msg, wParam, lParam );
}
break;
case WM_NCCREATE:
if (TWEAK_WineLook > WIN31_LOOK)
wnd->dwExStyle |= WS_EX_CLIENTEDGE;
- retvalue =DefWindowProcA( hwnd, msg, wParam, lParam );
- goto END;
+ return DefWindowProcA( hwnd, msg, wParam, lParam );
default:
if ((msg >= WM_USER) && (msg < 0xc000))
WARN(listbox, "[%04x]: unknown msg %04x wp %08x lp %08lx\n",
hwnd, msg, wParam, lParam );
- retvalue =DefWindowProcA( hwnd, msg, wParam, lParam );
- goto END;
+ return DefWindowProcA( hwnd, msg, wParam, lParam );
}
- retvalue =0;
-END:
- WIN_ReleaseWndPtr(wnd);
- return retvalue;
+ return 0;
+}
+
+/***********************************************************************
+ * ListBoxWndProc
+ *
+ * This is just a wrapper for the real wndproc, it only does window locking
+ * and unlocking.
+ */
+LRESULT WINAPI ListBoxWndProc( HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam )
+{
+ WND* wndPtr = WIN_FindWndPtr( hwnd );
+ LRESULT res = ListBoxWndProc_locked(wndPtr,msg,wParam,lParam);
+
+ WIN_ReleaseWndPtr(wndPtr);
+ return res;
}
/***********************************************************************
@@ -2671,16 +2577,15 @@
}
/***********************************************************************
- * ComboLBWndProc
+ * ComboLBWndProc_locked
*
- * NOTE: in Windows, winproc address of the ComboLBox is the same
- * as that of the Listbox.
+ * The real combo listbox wndproc, but called with locked WND struct.
*/
-LRESULT WINAPI ComboLBWndProc( HWND hwnd, UINT msg,
+static inline LRESULT WINAPI ComboLBWndProc_locked( WND* wnd, UINT msg,
WPARAM wParam, LPARAM lParam )
{
LRESULT lRet = 0;
- WND *wnd = WIN_FindWndPtr( hwnd );
+ HWND hwnd = wnd->hwndSelf;
if (wnd)
{
@@ -2702,20 +2607,16 @@
lphc = (LPHEADCOMBO)(lpcs->lpCreateParams);
#undef lpcs
- lRet =LISTBOX_Create( wnd, lphc );
- goto END;
+ return LISTBOX_Create( wnd, lphc );
case WM_LBUTTONDOWN:
- lRet =LISTBOX_HandleLButtonDown( wnd, descr, wParam,
+ return LISTBOX_HandleLButtonDown( wnd, descr, wParam,
(INT16)LOWORD(lParam), (INT16)HIWORD(lParam));
- goto END;
/* avoid activation at all costs */
case WM_MOUSEACTIVATE:
- lRet =MA_NOACTIVATE;
- goto END;
+ return MA_NOACTIVATE;
case WM_NCACTIVATE:
- lRet =FALSE;
- goto END;
+ return FALSE;
case WM_KEYDOWN:
if( CB_GETTYPE(lphc) != CBS_SIMPLE )
{
@@ -2727,34 +2628,47 @@
&& (wParam == VK_DOWN || wParam == VK_UP)) )
{
COMBO_FlipListbox( lphc, FALSE );
- lRet =0;
- goto END;
+ return 0;
}
}
- lRet =LISTBOX_HandleKeyDown( wnd, descr, wParam );
- goto END;
+ return LISTBOX_HandleKeyDown( wnd, descr, wParam );
case LB_SETCURSEL16:
case LB_SETCURSEL:
lRet = ListBoxWndProc( hwnd, msg, wParam, lParam );
lRet =(lRet == LB_ERR) ? lRet : descr->selected_item;
- goto END;
+ return lRet;
case WM_NCDESTROY:
if( CB_GETTYPE(lphc) != CBS_SIMPLE )
lphc->hWndLBox = 0;
/* fall through */
default:
- lRet =ListBoxWndProc( hwnd, msg, wParam, lParam );
- goto END;
+ return ListBoxWndProc( hwnd, msg, wParam, lParam );
}
}
lRet = DefWindowProcA( hwnd, msg, wParam, lParam );
TRACE(combo,"\t default on msg [%04x]\n", (UINT16)msg );
}
-END:
- WIN_ReleaseWndPtr(wnd);
return lRet;
}
+/***********************************************************************
+ * ComboLBWndProc
+ *
+ * NOTE: in Windows, winproc address of the ComboLBox is the same
+ * as that of the Listbox.
+ *
+ * This is just a wrapper for the real wndproc, it only does window locking
+ * and unlocking.
+ */
+LRESULT WINAPI ComboLBWndProc( HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam )
+{
+ WND *wnd = WIN_FindWndPtr( hwnd );
+ LRESULT res = ComboLBWndProc_locked(wnd,msg,wParam,lParam);
+
+ WIN_ReleaseWndPtr(wnd);
+ return res;
+}
