ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed direct access to the WND struct.

This commit is contained in:
Thuy Nguyen 1999-03-12 17:16:25 +00:00 committed by Alexandre Julliard
parent d3258fc75e
commit 47d98fb9c8
1 changed files with 143 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

290
dlls/comctl32/tab.c
View File

@ -21,24 +21,20 @@
#include "debug.h" #include "debug.h"
#define TAB_GetInfoPtr(wndPtr) ((TAB_INFO *)wndPtr->wExtra[0]) #define TAB_GetInfoPtr(hwnd) ((TAB_INFO *)GetWindowLongA(hwnd,0))
static void TAB_Refresh (WND *wndPtr, HDC hdc);
static void TAB_Refresh (HWND hwnd, HDC hdc);
static BOOL static BOOL
TAB_SendSimpleNotify (WND *wndPtr, UINT code) TAB_SendSimpleNotify (HWND hwnd, UINT code)
{ {
NMHDR nmhdr; NMHDR nmhdr;
nmhdr.hwndFrom = wndPtr->hwndSelf; nmhdr.hwndFrom = hwnd;
nmhdr.idFrom = wndPtr->wIDmenu; nmhdr.idFrom = GetWindowLongA(hwnd, GWL_ID);
nmhdr.code = code; nmhdr.code = code;
return (BOOL) SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY, return (BOOL) SendMessageA (GetParent (hwnd), WM_NOTIFY,
(WPARAM) nmhdr.idFrom, (LPARAM) &nmhdr); (WPARAM) nmhdr.idFrom, (LPARAM) &nmhdr);
} }
@ -63,25 +59,25 @@ TAB_RelayEvent (HWND hwndTip, HWND hwndMsg, UINT uMsg,
static LRESULT static LRESULT
TAB_GetCurSel (WND *wndPtr) TAB_GetCurSel (HWND hwnd)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
return infoPtr->iSelected; return infoPtr->iSelected;
} }
static LRESULT static LRESULT
TAB_GetCurFocus (WND *wndPtr) TAB_GetCurFocus (HWND hwnd)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
return infoPtr->uFocus; return infoPtr->uFocus;
} }
static LRESULT static LRESULT
TAB_GetToolTips (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_GetToolTips (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
if (infoPtr == NULL) return 0; if (infoPtr == NULL) return 0;
return infoPtr->hwndToolTip; return infoPtr->hwndToolTip;
@ -89,9 +85,9 @@ TAB_GetToolTips (WND *wndPtr, WPARAM wParam, LPARAM lParam)
static LRESULT static LRESULT
TAB_SetCurSel (WND *wndPtr,WPARAM wParam) TAB_SetCurSel (HWND hwnd,WPARAM wParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
INT iItem=(INT) wParam; INT iItem=(INT) wParam;
INT prevItem; INT prevItem;
@ -104,25 +100,25 @@ TAB_SetCurSel (WND *wndPtr,WPARAM wParam)
} }
static LRESULT static LRESULT
TAB_SetCurFocus (WND *wndPtr,WPARAM wParam) TAB_SetCurFocus (HWND hwnd,WPARAM wParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
INT iItem=(INT) wParam; INT iItem=(INT) wParam;
HDC hdc; HDC hdc;
if ((iItem < 0) || (iItem > infoPtr->uNumItem)) return 0; if ((iItem < 0) || (iItem > infoPtr->uNumItem)) return 0;
infoPtr->uFocus=iItem; infoPtr->uFocus=iItem;
if (wndPtr->dwStyle & TCS_BUTTONS) { if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BUTTONS) {
FIXME (tab,"Should set input focus\n"); FIXME (tab,"Should set input focus\n");
} else { } else {
if (infoPtr->iSelected != iItem) { if (infoPtr->iSelected != iItem) {
if (TAB_SendSimpleNotify(wndPtr, TCN_SELCHANGING)!=TRUE) { if (TAB_SendSimpleNotify(hwnd, TCN_SELCHANGING)!=TRUE) {
infoPtr->iSelected = iItem; infoPtr->iSelected = iItem;
TAB_SendSimpleNotify(wndPtr, TCN_SELCHANGE); TAB_SendSimpleNotify(hwnd, TCN_SELCHANGE);
hdc = GetDC (wndPtr->hwndSelf); hdc = GetDC (hwnd);
TAB_Refresh (wndPtr, hdc); TAB_Refresh (hwnd, hdc);
ReleaseDC (wndPtr->hwndSelf, hdc); ReleaseDC (hwnd, hdc);
} }
} }
} }
@ -130,9 +126,9 @@ TAB_SetCurFocus (WND *wndPtr,WPARAM wParam)
} }
static LRESULT static LRESULT
TAB_SetToolTips (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_SetToolTips (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
if (infoPtr == NULL) return 0; if (infoPtr == NULL) return 0;
infoPtr->hwndToolTip = (HWND)wParam; infoPtr->hwndToolTip = (HWND)wParam;
@ -156,9 +152,9 @@ static HWND TAB_InternalHitTest (TAB_INFO *infoPtr, POINT pt,
} }
static LRESULT static LRESULT
TAB_HitTest (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_HitTest (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
LPTCHITTESTINFO lptest=(LPTCHITTESTINFO) lParam; LPTCHITTESTINFO lptest=(LPTCHITTESTINFO) lParam;
return TAB_InternalHitTest (infoPtr,lptest->pt,&lptest->flags); return TAB_InternalHitTest (infoPtr,lptest->pt,&lptest->flags);
@ -166,30 +162,30 @@ TAB_HitTest (WND *wndPtr, WPARAM wParam, LPARAM lParam)
static LRESULT static LRESULT
TAB_LButtonDown (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
if (infoPtr->hwndToolTip) if (infoPtr->hwndToolTip)
TAB_RelayEvent (infoPtr->hwndToolTip, wndPtr->hwndSelf, TAB_RelayEvent (infoPtr->hwndToolTip, hwnd,
WM_LBUTTONDOWN, wParam, lParam); WM_LBUTTONDOWN, wParam, lParam);
if (wndPtr->dwStyle & TCS_FOCUSONBUTTONDOWN ) { if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_FOCUSONBUTTONDOWN ) {
SetFocus (wndPtr->hwndSelf); SetFocus (hwnd);
} }
return 0; return 0;
} }
static LRESULT static LRESULT
TAB_LButtonUp (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
POINT pt; POINT pt;
INT newItem,dummy; INT newItem,dummy;
HDC hdc; HDC hdc;
if (infoPtr->hwndToolTip) if (infoPtr->hwndToolTip)
TAB_RelayEvent (infoPtr->hwndToolTip, wndPtr->hwndSelf, TAB_RelayEvent (infoPtr->hwndToolTip, hwnd,
WM_LBUTTONDOWN, wParam, lParam); WM_LBUTTONDOWN, wParam, lParam);
pt.x = (INT)LOWORD(lParam); pt.x = (INT)LOWORD(lParam);
@ -200,39 +196,39 @@ TAB_LButtonUp (WND *wndPtr, WPARAM wParam, LPARAM lParam)
TRACE(tab, "On Tab, item %d\n", newItem); TRACE(tab, "On Tab, item %d\n", newItem);
if (infoPtr->iSelected != newItem) { if (infoPtr->iSelected != newItem) {
if (TAB_SendSimpleNotify(wndPtr, TCN_SELCHANGING)!=TRUE) { if (TAB_SendSimpleNotify(hwnd, TCN_SELCHANGING)!=TRUE) {
infoPtr->iSelected = newItem; infoPtr->iSelected = newItem;
TAB_SendSimpleNotify(wndPtr, TCN_SELCHANGE); TAB_SendSimpleNotify(hwnd, TCN_SELCHANGE);
hdc = GetDC (wndPtr->hwndSelf); hdc = GetDC (hwnd);
TAB_Refresh (wndPtr, hdc); TAB_Refresh (hwnd, hdc);
ReleaseDC (wndPtr->hwndSelf, hdc); ReleaseDC (hwnd, hdc);
} }
} }
TAB_SendSimpleNotify(wndPtr, NM_CLICK); TAB_SendSimpleNotify(hwnd, NM_CLICK);
return 0; return 0;
} }
static LRESULT static LRESULT
TAB_RButtonDown (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_RButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_SendSimpleNotify(wndPtr, NM_RCLICK); TAB_SendSimpleNotify(hwnd, NM_RCLICK);
return 0; return 0;
} }
static LRESULT static LRESULT
TAB_MouseMove (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
if (infoPtr->hwndToolTip) if (infoPtr->hwndToolTip)
TAB_RelayEvent (infoPtr->hwndToolTip, wndPtr->hwndSelf, TAB_RelayEvent (infoPtr->hwndToolTip, hwnd,
WM_LBUTTONDOWN, wParam, lParam); WM_LBUTTONDOWN, wParam, lParam);
return 0; return 0;
} }
static LRESULT static LRESULT
TAB_AdjustRect (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_AdjustRect (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
if (wParam==TRUE) { if (wParam==TRUE) {
@ -245,9 +241,9 @@ TAB_AdjustRect (WND *wndPtr, WPARAM wParam, LPARAM lParam)
} }
static void static void
TAB_SetItemBounds (WND *wndPtr) TAB_SetItemBounds (HWND hwnd)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
RECT rect; RECT rect;
HFONT hFont, hOldFont; HFONT hFont, hOldFont;
INT i, left; INT i, left;
@ -255,10 +251,10 @@ TAB_SetItemBounds (WND *wndPtr)
HDC hdc; HDC hdc;
/* FIXME: Is this needed? */ /* FIXME: Is this needed? */
GetClientRect (wndPtr->hwndSelf, &rect); GetClientRect (hwnd, &rect);
left += (size.cx + 11); left += (size.cx + 11);
hdc = GetDC(wndPtr->hwndSelf); hdc = GetDC(hwnd);
hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT); hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
hOldFont = SelectObject (hdc, hFont); hOldFont = SelectObject (hdc, hFont);
@ -267,7 +263,7 @@ TAB_SetItemBounds (WND *wndPtr)
for (i = 0; i < infoPtr->uNumItem; i++) for (i = 0; i < infoPtr->uNumItem; i++)
{ {
if (wndPtr->dwStyle & TCS_BOTTOM) { if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM) {
infoPtr->items[i].rect.bottom = rect.bottom; infoPtr->items[i].rect.bottom = rect.bottom;
infoPtr->items[i].rect.top = rect.bottom-20; infoPtr->items[i].rect.top = rect.bottom-20;
} else { } else {
@ -290,17 +286,18 @@ TAB_SetItemBounds (WND *wndPtr)
} }
SelectObject (hdc, hOldFont); SelectObject (hdc, hOldFont);
ReleaseDC (wndPtr->hwndSelf, hdc); ReleaseDC (hwnd, hdc);
} }
static void static void
TAB_DrawItem (WND *wndPtr, HDC hdc, INT iItem) TAB_DrawItem (HWND hwnd, HDC hdc, INT iItem)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
TAB_ITEM *pti = &infoPtr->items[iItem]; TAB_ITEM *pti = &infoPtr->items[iItem];
RECT r; RECT r;
INT oldBkMode,cx,cy; INT oldBkMode,cx,cy;
HBRUSH hbr = CreateSolidBrush (COLOR_BACKGROUND); HBRUSH hbr = CreateSolidBrush(RGB(255,255,255));
//HBRUSH hbr = CreateSolidBrush (COLOR_BACKGROUND);
HPEN hwPen = GetSysColorPen (COLOR_3DHILIGHT); HPEN hwPen = GetSysColorPen (COLOR_3DHILIGHT);
HPEN hbPen = GetSysColorPen (COLOR_BTNSHADOW); HPEN hbPen = GetSysColorPen (COLOR_BTNSHADOW);
@ -317,7 +314,7 @@ TAB_DrawItem (WND *wndPtr, HDC hdc, INT iItem)
htmpPen = hwPen; htmpPen = hwPen;
htmpPen = SelectObject (hdc, htmpPen); htmpPen = SelectObject (hdc, htmpPen);
if (wndPtr->dwStyle & TCS_BOTTOM) { if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM) {
MoveToEx (hdc, r.left, r.top, NULL); MoveToEx (hdc, r.left, r.top, NULL);
LineTo (hdc, r.left, r.bottom - 2); LineTo (hdc, r.left, r.bottom - 2);
LineTo (hdc, r.left +2, r.bottom); LineTo (hdc, r.left +2, r.bottom);
@ -361,7 +358,7 @@ TAB_DrawItem (WND *wndPtr, HDC hdc, INT iItem)
} }
static void static void
TAB_DrawBorder (WND *wndPtr, HDC hdc) TAB_DrawBorder (HWND hwnd, HDC hdc)
{ {
HPEN htmPen; HPEN htmPen;
HPEN hwPen = GetSysColorPen (COLOR_3DHILIGHT); HPEN hwPen = GetSysColorPen (COLOR_3DHILIGHT);
@ -371,7 +368,7 @@ TAB_DrawBorder (WND *wndPtr, HDC hdc)
RECT rect; RECT rect;
htmPen = SelectObject (hdc, hwPen); htmPen = SelectObject (hdc, hwPen);
GetClientRect (wndPtr->hwndSelf, &rect); GetClientRect (hwnd, &rect);
MoveToEx (hdc, rect.left, rect.bottom, NULL); MoveToEx (hdc, rect.left, rect.bottom, NULL);
LineTo (hdc, rect.left, rect.top+20); LineTo (hdc, rect.left, rect.top+20);
@ -390,57 +387,58 @@ TAB_DrawBorder (WND *wndPtr, HDC hdc)
static void static void
TAB_Refresh (WND *wndPtr, HDC hdc) TAB_Refresh (HWND hwnd, HDC hdc)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
HFONT hOldFont; HFONT hOldFont;
INT i; INT i;
if (!infoPtr->DoRedraw) return; if (!infoPtr->DoRedraw) return;
TAB_DrawBorder (wndPtr, hdc); TAB_DrawBorder (hwnd, hdc);
hOldFont = SelectObject (hdc, infoPtr->hFont); hOldFont = SelectObject (hdc, infoPtr->hFont);
for (i = 0; i < infoPtr->uNumItem; i++) { for (i = 0; i < infoPtr->uNumItem; i++) {
TAB_DrawItem (wndPtr, hdc, i); TAB_DrawItem (hwnd, hdc, i);
} }
SelectObject (hdc, hOldFont); SelectObject (hdc, hOldFont);
} }
static LRESULT static LRESULT
TAB_SetRedraw (WND *wndPtr, WPARAM wParam) TAB_SetRedraw (HWND hwnd, WPARAM wParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
infoPtr->DoRedraw=(BOOL) wParam; infoPtr->DoRedraw=(BOOL) wParam;
return 0; return 0;
} }
static LRESULT static LRESULT
TAB_Paint (WND *wndPtr, WPARAM wParam) TAB_Paint (HWND hwnd, WPARAM wParam)
{ {
HDC hdc; HDC hdc;
PAINTSTRUCT ps; PAINTSTRUCT ps;
hdc = wParam== 0 ? BeginPaint (wndPtr->hwndSelf, &ps) : (HDC)wParam; hdc = wParam== 0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
TAB_Refresh (wndPtr, hdc); TAB_Refresh (hwnd, hdc);
if(!wParam) if(!wParam)
EndPaint (wndPtr->hwndSelf, &ps); EndPaint (hwnd, &ps);
return 0; return 0;
} }
static LRESULT static LRESULT
TAB_InsertItem (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_InsertItem (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
TCITEMA *pti; TCITEMA *pti;
HDC hdc; HDC hdc;
INT iItem, len; INT iItem, len;
RECT rect; RECT rect;
GetClientRect (wndPtr->hwndSelf, &rect); GetClientRect (hwnd, &rect);
TRACE(tab, "Rect: %x T %i, L %i, B %i, R %i\n", wndPtr->hwndSelf, TRACE(tab, "Rect: %x T %i, L %i, B %i, R %i\n", hwnd,
rect.top, rect.left, rect.bottom, rect.right); rect.top, rect.left, rect.bottom, rect.right);
pti = (TCITEMA *)lParam; pti = (TCITEMA *)lParam;
@ -490,21 +488,21 @@ TAB_InsertItem (WND *wndPtr, WPARAM wParam, LPARAM lParam)
if (pti->mask & TCIF_PARAM) if (pti->mask & TCIF_PARAM)
infoPtr->items[iItem].lParam = pti->lParam; infoPtr->items[iItem].lParam = pti->lParam;
hdc = GetDC (wndPtr->hwndSelf); hdc = GetDC (hwnd);
TAB_Refresh (wndPtr, hdc); TAB_Refresh (hwnd, hdc);
ReleaseDC (wndPtr->hwndSelf, hdc); ReleaseDC (hwnd, hdc);
TRACE(tab, "[%04x]: added item %d '%s'\n", TRACE(tab, "[%04x]: added item %d '%s'\n",
wndPtr->hwndSelf, iItem, infoPtr->items[iItem].pszText); hwnd, iItem, infoPtr->items[iItem].pszText);
TAB_SetItemBounds(wndPtr); TAB_SetItemBounds(hwnd);
return iItem; return iItem;
} }
static LRESULT static LRESULT
TAB_SetItemA (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
TCITEMA *tabItem; TCITEMA *tabItem;
TAB_ITEM *wineItem; TAB_ITEM *wineItem;
INT iItem,len; INT iItem,len;
@ -539,18 +537,18 @@ TAB_SetItemA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
} }
static LRESULT static LRESULT
TAB_GetItemCount (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_GetItemCount (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
return infoPtr->uNumItem; return infoPtr->uNumItem;
} }
static LRESULT static LRESULT
TAB_GetItemA (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_GetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
TCITEMA *tabItem; TCITEMA *tabItem;
TAB_ITEM *wineItem; TAB_ITEM *wineItem;
INT iItem; INT iItem;
@ -581,16 +579,16 @@ TAB_GetItemA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
} }
static LRESULT static LRESULT
TAB_DeleteItem (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_DeleteItem (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
FIXME (tab,"stub \n"); FIXME (tab,"stub \n");
return TRUE; return TRUE;
} }
static LRESULT static LRESULT
TAB_DeleteAllItems (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_DeleteAllItems (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
COMCTL32_Free (infoPtr->items); COMCTL32_Free (infoPtr->items);
infoPtr->uNumItem=0; infoPtr->uNumItem=0;
@ -600,19 +598,19 @@ TAB_DeleteAllItems (WND *wndPtr, WPARAM wParam, LPARAM lParam)
static LRESULT static LRESULT
TAB_GetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_GetFont (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
TRACE (tab,"\n"); TRACE (tab,"\n");
return (LRESULT)infoPtr->hFont; return (LRESULT)infoPtr->hFont;
} }
static LRESULT static LRESULT
TAB_SetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_SetFont (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
TEXTMETRICA tm; TEXTMETRICA tm;
HFONT hFont, hOldFont; HFONT hFont, hOldFont;
HDC hdc; HDC hdc;
@ -629,7 +627,7 @@ TAB_SetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam)
infoPtr->nHeight= tm.tmHeight + tm.tmExternalLeading; infoPtr->nHeight= tm.tmHeight + tm.tmExternalLeading;
SelectObject (hdc, hOldFont); SelectObject (hdc, hOldFont);
if (lParam) TAB_Refresh (wndPtr,hdc); if (lParam) TAB_Refresh (hwnd,hdc);
ReleaseDC (0, hdc); ReleaseDC (0, hdc);
return 0; return 0;
@ -637,18 +635,18 @@ TAB_SetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam)
static LRESULT static LRESULT
TAB_GetImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_GetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
TRACE (tab,"\n"); TRACE (tab,"\n");
return (LRESULT)infoPtr->himl; return (LRESULT)infoPtr->himl;
} }
static LRESULT static LRESULT
TAB_SetImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_SetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
HIMAGELIST himlPrev; HIMAGELIST himlPrev;
TRACE (tab,"\n"); TRACE (tab,"\n");
@ -659,7 +657,7 @@ TAB_SetImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam)
static LRESULT static LRESULT
TAB_Size (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
RECT parent_rect; RECT parent_rect;
@ -669,35 +667,35 @@ TAB_Size (WND *wndPtr, WPARAM wParam, LPARAM lParam)
uPosFlags=0; uPosFlags=0;
if (!wParam) { if (!wParam) {
parent = GetParent (wndPtr->hwndSelf); parent = GetParent (hwnd);
GetClientRect(parent, &parent_rect); GetClientRect(parent, &parent_rect);
cx=LOWORD (lParam); cx=LOWORD (lParam);
cy=HIWORD (lParam); cy=HIWORD (lParam);
if (wndPtr->dwStyle & CCS_NORESIZE) if (GetWindowLongA(hwnd, GWL_STYLE) & CCS_NORESIZE)
uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE); uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
SetWindowPos (wndPtr->hwndSelf, 0, parent_rect.left, parent_rect.top, SetWindowPos (hwnd, 0, parent_rect.left, parent_rect.top,
cx, cy, uPosFlags | SWP_NOZORDER); cx, cy, uPosFlags | SWP_NOZORDER);
} else { } else {
FIXME (tab,"WM_SIZE flag %x %lx not handled\n", wParam, lParam); FIXME (tab,"WM_SIZE flag %x %lx not handled\n", wParam, lParam);
} }
TAB_SetItemBounds (wndPtr); TAB_SetItemBounds (hwnd);
hdc = GetDC (wndPtr->hwndSelf); hdc = GetDC (hwnd);
TAB_Refresh (wndPtr, hdc); TAB_Refresh (hwnd, hdc);
ReleaseDC (wndPtr->hwndSelf, hdc); ReleaseDC (hwnd, hdc);
return 0; return 0;
} }
static LRESULT static LRESULT
TAB_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr; TAB_INFO *infoPtr;
infoPtr = (TAB_INFO *)COMCTL32_Alloc (sizeof(TAB_INFO)); infoPtr = (TAB_INFO *)COMCTL32_Alloc (sizeof(TAB_INFO));
wndPtr->wExtra[0] = (DWORD)infoPtr; SetWindowLongA(hwnd, 0, (DWORD)infoPtr);
infoPtr->uNumItem = 0; infoPtr->uNumItem = 0;
infoPtr->hFont = 0; infoPtr->hFont = 0;
@ -706,26 +704,26 @@ TAB_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
infoPtr->iSelected = -1; infoPtr->iSelected = -1;
infoPtr->hwndToolTip=0; infoPtr->hwndToolTip=0;
TRACE(tab, "Created tab control, hwnd [%04x]\n", wndPtr->hwndSelf); TRACE(tab, "Created tab control, hwnd [%04x]\n", hwnd);
if (wndPtr->dwStyle & TCS_TOOLTIPS) { if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_TOOLTIPS) {
/* Create tooltip control */ /* Create tooltip control */
infoPtr->hwndToolTip = infoPtr->hwndToolTip =
CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0, CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
wndPtr->hwndSelf, 0, 0, 0); hwnd, 0, 0, 0);
/* Send NM_TOOLTIPSCREATED notification */ /* Send NM_TOOLTIPSCREATED notification */
if (infoPtr->hwndToolTip) { if (infoPtr->hwndToolTip) {
NMTOOLTIPSCREATED nmttc; NMTOOLTIPSCREATED nmttc;
nmttc.hdr.hwndFrom = wndPtr->hwndSelf; nmttc.hdr.hwndFrom = hwnd;
nmttc.hdr.idFrom = wndPtr->wIDmenu; nmttc.hdr.idFrom = GetWindowLongA(hwnd, GWL_ID);
nmttc.hdr.code = NM_TOOLTIPSCREATED; nmttc.hdr.code = NM_TOOLTIPSCREATED;
nmttc.hwndToolTips = infoPtr->hwndToolTip; nmttc.hwndToolTips = infoPtr->hwndToolTip;
SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY, SendMessageA (GetParent (hwnd), WM_NOTIFY,
(WPARAM)wndPtr->wIDmenu, (LPARAM)&nmttc); (WPARAM)GetWindowLongA(hwnd, GWL_ID), (LPARAM)&nmttc);
} }
} }
@ -734,9 +732,9 @@ TAB_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
} }
static LRESULT static LRESULT
TAB_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam) TAB_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
INT iItem; INT iItem;
if (infoPtr->items) { if (infoPtr->items) {
@ -757,55 +755,53 @@ TAB_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
LRESULT WINAPI LRESULT WINAPI
TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
WND *wndPtr = WIN_FindWndPtr(hwnd);
switch (uMsg) switch (uMsg)
{ {
case TCM_GETIMAGELIST: case TCM_GETIMAGELIST:
return TAB_GetImageList (wndPtr, wParam, lParam); return TAB_GetImageList (hwnd, wParam, lParam);
case TCM_SETIMAGELIST: case TCM_SETIMAGELIST:
return TAB_SetImageList (wndPtr, wParam, lParam); return TAB_SetImageList (hwnd, wParam, lParam);
case TCM_GETITEMCOUNT: case TCM_GETITEMCOUNT:
return TAB_GetItemCount (wndPtr, wParam, lParam); return TAB_GetItemCount (hwnd, wParam, lParam);
case TCM_GETITEMA: case TCM_GETITEMA:
return TAB_GetItemA (wndPtr, wParam, lParam); return TAB_GetItemA (hwnd, wParam, lParam);
case TCM_GETITEMW: case TCM_GETITEMW:
FIXME (tab, "Unimplemented msg TCM_GETITEM32W\n"); FIXME (tab, "Unimplemented msg TCM_GETITEM32W\n");
return 0; return 0;
case TCM_SETITEMA: case TCM_SETITEMA:
return TAB_SetItemA (wndPtr, wParam, lParam); return TAB_SetItemA (hwnd, wParam, lParam);
case TCM_SETITEMW: case TCM_SETITEMW:
FIXME (tab, "Unimplemented msg TCM_GETITEM32W\n"); FIXME (tab, "Unimplemented msg TCM_GETITEM32W\n");
return 0; return 0;
case TCM_DELETEITEM: case TCM_DELETEITEM:
return TAB_DeleteItem (wndPtr, wParam, lParam); return TAB_DeleteItem (hwnd, wParam, lParam);
case TCM_DELETEALLITEMS: case TCM_DELETEALLITEMS:
return TAB_DeleteAllItems (wndPtr, wParam, lParam); return TAB_DeleteAllItems (hwnd, wParam, lParam);
case TCM_GETITEMRECT: case TCM_GETITEMRECT:
FIXME (tab, "Unimplemented msg TCM_GETITEMRECT\n"); FIXME (tab, "Unimplemented msg TCM_GETITEMRECT\n");
return 0; return 0;
case TCM_GETCURSEL: case TCM_GETCURSEL:
return TAB_GetCurSel (wndPtr); return TAB_GetCurSel (hwnd);
case TCM_HITTEST: case TCM_HITTEST:
return TAB_HitTest (wndPtr, wParam, lParam); return TAB_HitTest (hwnd, wParam, lParam);
case TCM_SETCURSEL: case TCM_SETCURSEL:
return TAB_SetCurSel (wndPtr, wParam); return TAB_SetCurSel (hwnd, wParam);
case TCM_INSERTITEMA: case TCM_INSERTITEMA:
return TAB_InsertItem (wndPtr, wParam, lParam); return TAB_InsertItem (hwnd, wParam, lParam);
case TCM_INSERTITEMW: case TCM_INSERTITEMW:
FIXME (tab, "Unimplemented msg TCM_INSERTITEM32W\n"); FIXME (tab, "Unimplemented msg TCM_INSERTITEM32W\n");
@ -816,7 +812,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return 0; return 0;
case TCM_ADJUSTRECT: case TCM_ADJUSTRECT:
return TAB_AdjustRect (wndPtr, wParam, lParam); return TAB_AdjustRect (hwnd, wParam, lParam);
case TCM_SETITEMSIZE: case TCM_SETITEMSIZE:
FIXME (tab, "Unimplemented msg TCM_SETITEMSIZE\n"); FIXME (tab, "Unimplemented msg TCM_SETITEMSIZE\n");
@ -835,16 +831,16 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return 0; return 0;
case TCM_GETTOOLTIPS: case TCM_GETTOOLTIPS:
return TAB_GetToolTips (wndPtr, wParam, lParam); return TAB_GetToolTips (hwnd, wParam, lParam);
case TCM_SETTOOLTIPS: case TCM_SETTOOLTIPS:
return TAB_SetToolTips (wndPtr, wParam, lParam); return TAB_SetToolTips (hwnd, wParam, lParam);
case TCM_GETCURFOCUS: case TCM_GETCURFOCUS:
return TAB_GetCurFocus (wndPtr); return TAB_GetCurFocus (hwnd);
case TCM_SETCURFOCUS: case TCM_SETCURFOCUS:
return TAB_SetCurFocus (wndPtr, wParam); return TAB_SetCurFocus (hwnd, wParam);
case TCM_SETMINTTABWIDTH: case TCM_SETMINTTABWIDTH:
FIXME (tab, "Unimplemented msg TCM_SETMINTTABWIDTH\n"); FIXME (tab, "Unimplemented msg TCM_SETMINTTABWIDTH\n");
@ -855,39 +851,39 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return 0; return 0;
case WM_GETFONT: case WM_GETFONT:
return TAB_GetFont (wndPtr, wParam, lParam); return TAB_GetFont (hwnd, wParam, lParam);
case WM_SETFONT: case WM_SETFONT:
return TAB_SetFont (wndPtr, wParam, lParam); return TAB_SetFont (hwnd, wParam, lParam);
case WM_CREATE: case WM_CREATE:
return TAB_Create (wndPtr, wParam, lParam); return TAB_Create (hwnd, wParam, lParam);
case WM_DESTROY: case WM_DESTROY:
return TAB_Destroy (wndPtr, wParam, lParam); return TAB_Destroy (hwnd, wParam, lParam);
case WM_GETDLGCODE: case WM_GETDLGCODE:
return DLGC_WANTARROWS | DLGC_WANTCHARS; return DLGC_WANTARROWS | DLGC_WANTCHARS;
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
return TAB_LButtonDown (wndPtr, wParam, lParam); return TAB_LButtonDown (hwnd, wParam, lParam);
case WM_LBUTTONUP: case WM_LBUTTONUP:
return TAB_LButtonUp (wndPtr, wParam, lParam); return TAB_LButtonUp (hwnd, wParam, lParam);
case WM_RBUTTONDOWN: case WM_RBUTTONDOWN:
return TAB_RButtonDown (wndPtr, wParam, lParam); return TAB_RButtonDown (hwnd, wParam, lParam);
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
return TAB_MouseMove (wndPtr, wParam, lParam); return TAB_MouseMove (hwnd, wParam, lParam);
case WM_PAINT: case WM_PAINT:
return TAB_Paint (wndPtr, wParam); return TAB_Paint (hwnd, wParam);
case WM_SIZE: case WM_SIZE:
return TAB_Size (wndPtr, wParam, lParam); return TAB_Size (hwnd, wParam, lParam);
case WM_SETREDRAW: case WM_SETREDRAW:
return TAB_SetRedraw (wndPtr, wParam); return TAB_SetRedraw (hwnd, wParam);
default: default: