From cdb263e58841c600f480099c291c312ca2da4718 Mon Sep 17 00:00:00 2001 From: Robert Shearman Date: Wed, 25 Aug 2004 17:33:01 +0000 Subject: [PATCH] Replace GetWindowLong by GetWindowLongPtr. --- dlls/comctl32/animate.c | 10 +++++----- dlls/comctl32/comboex.c | 22 +++++++++++----------- dlls/comctl32/commctrl.c | 24 ++++++++++++------------ dlls/comctl32/datetime.c | 12 ++++++------ dlls/comctl32/flatsb.c | 2 +- dlls/comctl32/header.c | 14 +++++++------- dlls/comctl32/hotkey.c | 6 +++--- dlls/comctl32/ipaddress.c | 18 +++++++++--------- dlls/comctl32/listview.c | 22 +++++++++++----------- dlls/comctl32/monthcal.c | 18 +++++++++--------- dlls/comctl32/nativefont.c | 6 +++--- dlls/comctl32/pager.c | 14 +++++++------- dlls/comctl32/progress.c | 6 +++--- dlls/comctl32/propsheet.c | 38 +++++++++++++++++++------------------- dlls/comctl32/rebar.c | 6 +++--- dlls/comctl32/status.c | 16 ++++++++-------- dlls/comctl32/syslink.c | 8 ++++---- dlls/comctl32/tab.c | 10 +++++----- dlls/comctl32/tooltips.c | 6 +++--- dlls/comctl32/trackbar.c | 10 +++++----- dlls/comctl32/treeview.c | 34 +++++++++++++++++----------------- dlls/comctl32/updown.c | 12 ++++++------ 22 files changed, 157 insertions(+), 157 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index a7c47e14e52..7142a64bc80 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -85,7 +85,7 @@ typedef struct HBITMAP hbmPrevFrame; } ANIMATE_INFO; -#define ANIMATE_GetInfoPtr(hWnd) ((ANIMATE_INFO *)GetWindowLongA(hWnd, 0)) +#define ANIMATE_GetInfoPtr(hWnd) ((ANIMATE_INFO *)GetWindowLongPtrW(hWnd, 0)) #define ANIMATE_COLOR_NONE 0xffffffff static void ANIMATE_Notify(ANIMATE_INFO* infoPtr, UINT notif) @@ -704,7 +704,7 @@ static LRESULT ANIMATE_OpenA(HWND hWnd, WPARAM wParam, LPARAM lParam) } if (!hInstance) - hInstance = (HINSTANCE)GetWindowLongA(hWnd, GWL_HINSTANCE); + hInstance = (HINSTANCE)GetWindowLongPtrW(hWnd, GWLP_HINSTANCE); if (HIWORD(lParam)) { TRACE("(\"%s\");\n", (LPSTR)lParam); @@ -794,13 +794,13 @@ static LRESULT ANIMATE_Create(HWND hWnd, WPARAM wParam, LPARAM lParam) } /* store crossref hWnd <-> info structure */ - SetWindowLongA(hWnd, 0, (DWORD)infoPtr); + SetWindowLongPtrW(hWnd, 0, (DWORD_PTR)infoPtr); infoPtr->hwndSelf = hWnd; infoPtr->hwndNotify = ((LPCREATESTRUCTA)lParam)->hwndParent; infoPtr->transparentColor = ANIMATE_COLOR_NONE; infoPtr->hbmPrevFrame = 0; - TRACE("Animate style=0x%08lx, parent=%08lx\n", GetWindowLongA(hWnd, GWL_STYLE), (DWORD)infoPtr->hwndNotify); + TRACE("Animate style=0x%08lx, parent=%p\n", GetWindowLongA(hWnd, GWL_STYLE), infoPtr->hwndNotify); InitializeCriticalSection(&infoPtr->cs); @@ -818,7 +818,7 @@ static LRESULT ANIMATE_Destroy(HWND hWnd, WPARAM wParam, LPARAM lParam) /* free animate info data */ Free(infoPtr); - SetWindowLongA(hWnd, 0, 0); + SetWindowLongPtrW(hWnd, 0, 0); return 0; } diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 3b7f645d955..3c8c1303fe1 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -122,7 +122,7 @@ typedef struct #define CBE_SEP 4 #define COMBOEX_SUBCLASS_PROP "CCComboEx32SubclassInfo" -#define COMBOEX_GetInfoPtr(hwnd) ((COMBOEX_INFO *)GetWindowLongW (hwnd, 0)) +#define COMBOEX_GetInfoPtr(hwnd) ((COMBOEX_INFO *)GetWindowLongPtrW (hwnd, 0)) /* Things common to the entire DLL */ @@ -943,7 +943,7 @@ static LRESULT COMBOEX_Create (HWND hwnd, LPCREATESTRUCTA cs) } infoPtr->NtfUnicode = (i == NFR_UNICODE); - SetWindowLongW (hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); /* create combo box */ GetWindowRect(hwnd, &wnrc1); @@ -967,8 +967,8 @@ static LRESULT COMBOEX_Create (HWND hwnd, LPCREATESTRUCTA cs) WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED | GetWindowLongW (hwnd, GWL_STYLE), cs->y, cs->x, cs->cx, cs->cy, hwnd, - (HMENU) GetWindowLongW (hwnd, GWL_ID), - (HINSTANCE)GetWindowLongW (hwnd, GWL_HINSTANCE), NULL); + (HMENU) GetWindowLongPtrW (hwnd, GWLP_ID), + (HINSTANCE)GetWindowLongPtrW (hwnd, GWLP_HINSTANCE), NULL); /* * native does the following at this point according to trace: @@ -983,8 +983,8 @@ static LRESULT COMBOEX_Create (HWND hwnd, LPCREATESTRUCTA cs) * data structure. */ SetPropA(infoPtr->hwndCombo, COMBOEX_SUBCLASS_PROP, hwnd); - infoPtr->prevComboWndProc = (WNDPROC)SetWindowLongW(infoPtr->hwndCombo, - GWL_WNDPROC, (LONG)COMBOEX_ComboWndProc); + infoPtr->prevComboWndProc = (WNDPROC)SetWindowLongPtrW(infoPtr->hwndCombo, + GWLP_WNDPROC, (DWORD_PTR)COMBOEX_ComboWndProc); infoPtr->font = (HFONT)SendMessageW (infoPtr->hwndCombo, WM_GETFONT, 0, 0); @@ -997,8 +997,8 @@ static LRESULT COMBOEX_Create (HWND hwnd, LPCREATESTRUCTA cs) WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | ES_AUTOHSCROLL, 0, 0, 0, 0, /* will set later */ infoPtr->hwndCombo, - (HMENU) GetWindowLongW (hwnd, GWL_ID), - (HINSTANCE)GetWindowLongW (hwnd, GWL_HINSTANCE), NULL); + (HMENU) GetWindowLongPtrW (hwnd, GWLP_ID), + (HINSTANCE)GetWindowLongPtrW (hwnd, GWLP_HINSTANCE), NULL); /* native does the following at this point according to trace: * GetWindowThreadProcessId(hwndEdit,0) @@ -1012,8 +1012,8 @@ static LRESULT COMBOEX_Create (HWND hwnd, LPCREATESTRUCTA cs) * data structure. */ SetPropA(infoPtr->hwndEdit, COMBOEX_SUBCLASS_PROP, hwnd); - infoPtr->prevEditWndProc = (WNDPROC)SetWindowLongW(infoPtr->hwndEdit, - GWL_WNDPROC, (LONG)COMBOEX_EditWndProc); + infoPtr->prevEditWndProc = (WNDPROC)SetWindowLongPtrW(infoPtr->hwndEdit, + GWLP_WNDPROC, (DWORD_PTR)COMBOEX_EditWndProc); infoPtr->font = (HFONT)SendMessageW(infoPtr->hwndCombo, WM_GETFONT, 0, 0); } @@ -1546,7 +1546,7 @@ static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) /* free comboex info data */ Free (infoPtr); - SetWindowLongW (infoPtr->hwndSelf, 0, 0); + SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); return 0; } diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index bef1c2167c1..a07b89c6822 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1116,11 +1116,11 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, /* set window procedure to our own and save the current one */ if (IsWindowUnicode (hWnd)) - stack->origproc = (WNDPROC)SetWindowLongW (hWnd, GWL_WNDPROC, - (LONG)COMCTL32_SubclassProc); + stack->origproc = (WNDPROC)SetWindowLongPtrW (hWnd, GWLP_WNDPROC, + (DWORD_PTR)COMCTL32_SubclassProc); else - stack->origproc = (WNDPROC)SetWindowLongA (hWnd, GWL_WNDPROC, - (LONG)COMCTL32_SubclassProc); + stack->origproc = (WNDPROC)SetWindowLongPtrA (hWnd, GWLP_WNDPROC, + (DWORD_PTR)COMCTL32_SubclassProc); } else { /* Check to see if we have called this function with the same uIDSubClass @@ -1140,9 +1140,9 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, if (!proc) { ERR ("Failed to allocate subclass entry in stack\n"); if (IsWindowUnicode (hWnd)) - SetWindowLongW (hWnd, GWL_WNDPROC, (LONG)stack->origproc); + SetWindowLongPtrW (hWnd, GWLP_WNDPROC, (DWORD_PTR)stack->origproc); else - SetWindowLongA (hWnd, GWL_WNDPROC, (LONG)stack->origproc); + SetWindowLongPtrA (hWnd, GWLP_WNDPROC, (DWORD_PTR)stack->origproc); HeapFree (GetProcessHeap (), 0, stack); RemovePropA( hWnd, COMCTL32_aSubclass ); return FALSE; @@ -1255,9 +1255,9 @@ BOOL WINAPI RemoveWindowSubclass(HWND hWnd, SUBCLASSPROC pfnSubclass, UINT_PTR u TRACE("Last Subclass removed, cleaning up\n"); /* clean up our heap and reset the origional window procedure */ if (IsWindowUnicode (hWnd)) - SetWindowLongW (hWnd, GWL_WNDPROC, (LONG)stack->origproc); + SetWindowLongPtrW (hWnd, GWLP_WNDPROC, (DWORD_PTR)stack->origproc); else - SetWindowLongA (hWnd, GWL_WNDPROC, (LONG)stack->origproc); + SetWindowLongPtrA (hWnd, GWLP_WNDPROC, (DWORD_PTR)stack->origproc); HeapFree (GetProcessHeap (), 0, stack); RemovePropA( hWnd, COMCTL32_aSubclass ); } @@ -1297,9 +1297,9 @@ LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARA TRACE("Last Subclass removed, cleaning up\n"); /* clean up our heap and reset the origional window procedure */ if (IsWindowUnicode (hWnd)) - SetWindowLongW (hWnd, GWL_WNDPROC, (LONG)stack->origproc); + SetWindowLongPtrW (hWnd, GWLP_WNDPROC, (DWORD_PTR)stack->origproc); else - SetWindowLongA (hWnd, GWL_WNDPROC, (LONG)stack->origproc); + SetWindowLongPtrA (hWnd, GWLP_WNDPROC, (DWORD_PTR)stack->origproc); HeapFree (GetProcessHeap (), 0, stack); RemovePropA( hWnd, COMCTL32_aSubclass ); } @@ -1387,12 +1387,12 @@ COMCTL32_CreateToolTip(HWND hwndOwner) /* true owner can be different if hwndOwner is a child window */ HWND hwndTrueOwner = GetWindow(hwndToolTip, GW_OWNER); nmttc.hdr.hwndFrom = hwndTrueOwner; - nmttc.hdr.idFrom = GetWindowLongA(hwndTrueOwner, GWL_ID); + nmttc.hdr.idFrom = GetWindowLongPtrW(hwndTrueOwner, GWLP_ID); nmttc.hdr.code = NM_TOOLTIPSCREATED; nmttc.hwndToolTips = hwndToolTip; SendMessageA(GetParent(hwndTrueOwner), WM_NOTIFY, - (WPARAM)GetWindowLongA(hwndTrueOwner, GWL_ID), + (WPARAM)GetWindowLongPtrW(hwndTrueOwner, GWLP_ID), (LPARAM)&nmttc); } diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index aab70245caa..8bf49ce5cbd 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -110,7 +110,7 @@ extern int MONTHCAL_MonthLength(int month, int year); #define DTHT_MCPOPUP 0x300 /* & DTHT_DATEFIELD 0 when DATETIME_KeyDown */ #define DTHT_GOTFOCUS 0x400 /* tests for date-fields */ -#define DATETIME_GetInfoPtr(hwnd) ((DATETIME_INFO *)GetWindowLongA (hwnd, 0)) +#define DATETIME_GetInfoPtr(hwnd) ((DATETIME_INFO *)GetWindowLongPtrW (hwnd, 0)) static BOOL DATETIME_SendSimpleNotify (HWND hwnd, UINT code); static BOOL DATETIME_SendDateTimeChangeNotify (HWND hwnd); @@ -1128,7 +1128,7 @@ DATETIME_SendDateTimeChangeNotify (HWND hwnd) TRACE ("\n"); dtdtc.nmhdr.hwndFrom = hwnd; - dtdtc.nmhdr.idFrom = GetWindowLongA( hwnd, GWL_ID); + dtdtc.nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); dtdtc.nmhdr.code = DTN_DATETIMECHANGE; if ((GetWindowLongA (hwnd, GWL_STYLE) & DTS_SHOWNONE)) @@ -1150,7 +1150,7 @@ DATETIME_SendSimpleNotify (HWND hwnd, UINT code) TRACE("%x\n",code); nmhdr.hwndFrom = hwnd; - nmhdr.idFrom = GetWindowLongA( hwnd, GWL_ID); + nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmhdr.code = code; return (BOOL) SendMessageA (infoPtr->hwndNotify, WM_NOTIFY, @@ -1221,14 +1221,14 @@ DATETIME_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) return 0; } - SetWindowLongA (hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrA (hwnd, 0, (DWORD_PTR)infoPtr); if (dwStyle & DTS_SHOWNONE) { infoPtr->hwndCheckbut=CreateWindowExA (0,"button", 0, WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, 2,2,13,13, hwnd, - 0, (HINSTANCE)GetWindowLongA (hwnd, GWL_HINSTANCE), 0); + 0, (HINSTANCE)GetWindowLongPtrW (hwnd, GWLP_HINSTANCE), 0); SendMessageA (infoPtr->hwndCheckbut, BM_SETCHECK, 1, 0); } @@ -1276,7 +1276,7 @@ DATETIME_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam) infoPtr->hMonthCal = NULL; } Free (infoPtr); - SetWindowLongA( hwnd, 0, 0 ); /* clear infoPtr */ + SetWindowLongPtrA( hwnd, 0, 0 ); /* clear infoPtr */ return 0; } diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c index 0c69a326bbe..a7a1f0063f2 100644 --- a/dlls/comctl32/flatsb.c +++ b/dlls/comctl32/flatsb.c @@ -47,7 +47,7 @@ typedef struct DWORD dwDummy; /* just to keep the compiler happy ;-) */ } FLATSB_INFO, *LPFLATSB_INFO; -#define FlatSB_GetInfoPtr(hwnd) ((FLATSB_INFO*)GetWindowLongA (hwnd, 0)) +#define FlatSB_GetInfoPtr(hwnd) ((FLATSB_INFO*)GetWindowLongPtrW (hwnd, 0)) /*********************************************************************** diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 0d592791075..31be924021f 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -92,7 +92,7 @@ typedef struct #define VERT_BORDER 3 #define DIVIDER_WIDTH 10 -#define HEADER_GetInfoPtr(hwnd) ((HEADER_INFO *)GetWindowLongA(hwnd,0)) +#define HEADER_GetInfoPtr(hwnd) ((HEADER_INFO *)GetWindowLongPtrW(hwnd,0)) inline static LRESULT @@ -190,7 +190,7 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT iItem, BOOL bHotTrack) if (phdi->fmt & HDF_OWNERDRAW) { DRAWITEMSTRUCT dis; dis.CtlType = ODT_HEADER; - dis.CtlID = GetWindowLongA (hwnd, GWL_ID); + dis.CtlID = GetWindowLongPtrW (hwnd, GWLP_ID); dis.itemID = iItem; dis.itemAction = ODA_DRAWENTIRE; dis.itemState = phdi->bDown ? ODS_SELECTED : 0; @@ -542,7 +542,7 @@ HEADER_SendSimpleNotify (HWND hwnd, UINT code) NMHDR nmhdr; nmhdr.hwndFrom = hwnd; - nmhdr.idFrom = GetWindowLongA (hwnd, GWL_ID); + nmhdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); nmhdr.code = code; return (BOOL)SendMessageA (infoPtr->hwndNotify, WM_NOTIFY, @@ -557,7 +557,7 @@ HEADER_SendHeaderNotify (HWND hwnd, UINT code, INT iItem, INT mask) HDITEMA nmitem; nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongA (hwnd, GWL_ID); + nmhdr.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); nmhdr.hdr.code = code; nmhdr.iItem = iItem; nmhdr.iButton = 0; @@ -586,7 +586,7 @@ HEADER_SendClickNotify (HWND hwnd, UINT code, INT iItem) NMHEADERA nmhdr; nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongA (hwnd, GWL_ID); + nmhdr.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); nmhdr.hdr.code = code; nmhdr.iItem = iItem; nmhdr.iButton = 0; @@ -1284,7 +1284,7 @@ HEADER_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) HDC hdc; infoPtr = (HEADER_INFO *)Alloc (sizeof(HEADER_INFO)); - SetWindowLongA (hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrA (hwnd, 0, (DWORD_PTR)infoPtr); infoPtr->hwndNotify = ((LPCREATESTRUCTA)lParam)->hwndParent; infoPtr->uNumItem = 0; @@ -1335,7 +1335,7 @@ HEADER_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam) ImageList_Destroy (infoPtr->himl); Free (infoPtr); - SetWindowLongA (hwnd, 0, 0); + SetWindowLongPtrA (hwnd, 0, 0); return 0; } diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index 1a6b1c754f4..5219cf79c24 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -51,7 +51,7 @@ typedef struct tagHOTKEY_INFO WCHAR strNone[15]; /* hope its long enough ... */ } HOTKEY_INFO; -#define HOTKEY_GetInfoPtr(hwnd) ((HOTKEY_INFO *)GetWindowLongA (hwnd, 0)) +#define HOTKEY_GetInfoPtr(hwnd) ((HOTKEY_INFO *)GetWindowLongPtrA (hwnd, 0)) static const WCHAR HOTKEY_plussep[] = { ' ', '+', ' ' }; @@ -217,7 +217,7 @@ HOTKEY_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) /* allocate memory for info structure */ infoPtr = (HOTKEY_INFO *)Alloc (sizeof(HOTKEY_INFO)); - SetWindowLongW (hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); /* initialize info structure */ infoPtr->HotKey = infoPtr->InvComb = infoPtr->InvMod = infoPtr->CurrMod = 0; @@ -242,7 +242,7 @@ HOTKEY_Destroy (HOTKEY_INFO *infoPtr, WPARAM wParam, LPARAM lParam) HWND hwnd = infoPtr->hwndSelf; /* free hotkey info data */ Free (infoPtr); - SetWindowLongW (hwnd, 0, 0); + SetWindowLongPtrW (hwnd, 0, 0); return 0; } diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index d1d52ce064e..2cb5a115eb3 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -71,7 +71,7 @@ typedef struct #define POS_SELALL 3 #define IP_SUBCLASS_PROP "CCIP32SubclassInfo" -#define IPADDRESS_GetInfoPtr(hwnd) ((IPADDRESS_INFO *)GetWindowLongW (hwnd, 0)) +#define IPADDRESS_GetInfoPtr(hwnd) ((IPADDRESS_INFO *)GetWindowLongPtrW (hwnd, 0)) static LRESULT CALLBACK @@ -84,7 +84,7 @@ static LRESULT IPADDRESS_Notify (IPADDRESS_INFO *infoPtr, UINT command) TRACE("(command=%x)\n", command); return SendMessageW (infoPtr->Notify, WM_COMMAND, - MAKEWPARAM (GetWindowLongW (hwnd, GWL_ID), command), (LPARAM)hwnd); + MAKEWPARAM (GetWindowLongPtrW (hwnd, GWLP_ID), command), (LPARAM)hwnd); } static INT IPADDRESS_IPNotify (IPADDRESS_INFO *infoPtr, INT field, INT value) @@ -94,7 +94,7 @@ static INT IPADDRESS_IPNotify (IPADDRESS_INFO *infoPtr, INT field, INT value) TRACE("(field=%x, value=%d)\n", field, value); nmip.hdr.hwndFrom = infoPtr->Self; - nmip.hdr.idFrom = GetWindowLongW (infoPtr->Self, GWL_ID); + nmip.hdr.idFrom = GetWindowLongPtrW (infoPtr->Self, GWLP_ID); nmip.hdr.code = IPN_FIELDCHANGED; nmip.iField = field; @@ -164,7 +164,7 @@ static LRESULT IPADDRESS_Create (HWND hwnd, LPCREATESTRUCTA lpCreate) infoPtr = (IPADDRESS_INFO *)Alloc (sizeof(IPADDRESS_INFO)); if (!infoPtr) return -1; - SetWindowLongW (hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); GetClientRect (hwnd, &rcClient); @@ -187,11 +187,11 @@ static LRESULT IPADDRESS_Create (HWND hwnd, LPCREATESTRUCTA lpCreate) CreateWindowW (EDIT, NULL, WS_CHILD | WS_VISIBLE | ES_CENTER, edit.left, edit.top, edit.right - edit.left, edit.bottom - edit.top, hwnd, (HMENU) 1, - (HINSTANCE)GetWindowLongW(hwnd, GWL_HINSTANCE), NULL); + (HINSTANCE)GetWindowLongPtrW(hwnd, GWLP_HINSTANCE), NULL); SetPropA(part->EditHwnd, IP_SUBCLASS_PROP, hwnd); part->OrigProc = (WNDPROC) - SetWindowLongW (part->EditHwnd, GWL_WNDPROC, - (LONG)IPADDRESS_SubclassProc); + SetWindowLongPtrW (part->EditHwnd, GWLP_WNDPROC, + (DWORD_PTR)IPADDRESS_SubclassProc); } return 0; @@ -206,10 +206,10 @@ static LRESULT IPADDRESS_Destroy (IPADDRESS_INFO *infoPtr) for (i = 0; i < 4; i++) { IPPART_INFO* part = &infoPtr->Part[i]; - SetWindowLongW (part->EditHwnd, GWL_WNDPROC, (LONG)part->OrigProc); + SetWindowLongPtrW (part->EditHwnd, GWLP_WNDPROC, (DWORD_PTR)part->OrigProc); } - SetWindowLongW (infoPtr->Self, 0, 0); + SetWindowLongPtrW (infoPtr->Self, 0, 0); Free (infoPtr); return 0; } diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bdb21ae665d..7686c4c708b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -716,7 +716,7 @@ static LRESULT notify_hdr(LISTVIEW_INFO *infoPtr, INT code, LPNMHDR pnmh) TRACE("(code=%d)\n", code); pnmh->hwndFrom = infoPtr->hwndSelf; - pnmh->idFrom = GetWindowLongW(infoPtr->hwndSelf, GWL_ID); + pnmh->idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); pnmh->code = code; result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)pnmh->idFrom, (LPARAM)pnmh); @@ -1731,7 +1731,7 @@ static void LISTVIEW_ShowFocusRect(LISTVIEW_INFO *infoPtr, BOOL fShow) ZeroMemory(&dis, sizeof(dis)); dis.CtlType = ODT_LISTVIEW; - dis.CtlID = GetWindowLongW(infoPtr->hwndSelf, GWL_ID); + dis.CtlID = (UINT)GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); dis.itemID = item.iItem; dis.itemAction = ODA_FOCUS; if (fShow) dis.itemState |= ODS_FOCUS; @@ -3689,7 +3689,7 @@ postpaint: */ static void LISTVIEW_RefreshOwnerDraw(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, DWORD cdmode) { - UINT uID = GetWindowLongW(infoPtr->hwndSelf, GWL_ID); + UINT uID = (UINT)GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); DWORD cditemmode = CDRF_DODEFAULT; NMLVCUSTOMDRAW nmlvcd; POINT Origin, Position; @@ -7378,7 +7378,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr = (LISTVIEW_INFO *)Alloc(sizeof(LISTVIEW_INFO)); if (!infoPtr) return -1; - SetWindowLongW(hwnd, 0, (LONG)infoPtr); + SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)infoPtr); infoPtr->hwndSelf = hwnd; infoPtr->dwStyle = lpcs->style; @@ -8180,7 +8180,7 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) if (infoPtr->hDefaultFont) DeleteObject(infoPtr->hDefaultFont); if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); - SetWindowLongW(infoPtr->hwndSelf, 0, 0); + SetWindowLongPtrW(infoPtr->hwndSelf, 0, 0); /* free listview info pointer*/ Free(infoPtr); @@ -8772,7 +8772,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, static LRESULT WINAPI LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0); + LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0); TRACE("(uMsg=%x wParam=%x lParam=%lx)\n", uMsg, wParam, lParam); @@ -9380,7 +9380,7 @@ static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lP */ static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL isW) { - LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(GetParent(hwnd), 0); + LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0); BOOL cancel = FALSE; TRACE("(hwnd=%p, uMsg=%x, wParam=%x, lParam=%lx, isW=%d)\n", @@ -9398,7 +9398,7 @@ static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara { WNDPROC editProc = infoPtr->EditWndProc; infoPtr->EditWndProc = 0; - SetWindowLongW(hwnd, GWL_WNDPROC, (LONG)editProc); + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (DWORD_PTR)editProc); return CallWindowProcT(editProc, hwnd, uMsg, wParam, lParam, isW); } @@ -9499,7 +9499,7 @@ static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, DWORD style, HDC hdc; HDC hOldFont=0; TEXTMETRICW textMetric; - HINSTANCE hinst = (HINSTANCE)GetWindowLongW(infoPtr->hwndSelf, GWL_HINSTANCE); + HINSTANCE hinst = (HINSTANCE)GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_HINSTANCE); TRACE("(text=%s, ..., isW=%d)\n", debugtext_t(text, isW), isW); @@ -9529,8 +9529,8 @@ static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, DWORD style, if (!hedit) return 0; infoPtr->EditWndProc = (WNDPROC) - (isW ? SetWindowLongW(hedit, GWL_WNDPROC, (LONG)EditLblWndProcW) : - SetWindowLongA(hedit, GWL_WNDPROC, (LONG)EditLblWndProcA) ); + (isW ? SetWindowLongPtrW(hedit, GWLP_WNDPROC, (DWORD_PTR)EditLblWndProcW) : + SetWindowLongPtrA(hedit, GWLP_WNDPROC, (DWORD_PTR)EditLblWndProcA) ); SendMessageW(hedit, WM_SETFONT, (WPARAM)infoPtr->hFont, FALSE); diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a7be319a7ba..0a56ac4bc2c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -114,7 +114,7 @@ typedef struct static const int DayOfWeekTable[] = {0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4}; -#define MONTHCAL_GetInfoPtr(hwnd) ((MONTHCAL_INFO *)GetWindowLongA(hwnd, 0)) +#define MONTHCAL_GetInfoPtr(hwnd) ((MONTHCAL_INFO *)GetWindowLongPtrW(hwnd, 0)) /* helper functions */ @@ -1302,7 +1302,7 @@ static void MONTHCAL_GoToNextMonth(HWND hwnd, MONTHCAL_INFO *infoPtr) int i; nmds.nmhdr.hwndFrom = hwnd; - nmds.nmhdr.idFrom = GetWindowLongA(hwnd, GWL_ID); + nmds.nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmds.nmhdr.code = MCN_GETDAYSTATE; nmds.cDayState = infoPtr->monthRange; nmds.prgDayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE)); @@ -1332,7 +1332,7 @@ static void MONTHCAL_GoToPrevMonth(HWND hwnd, MONTHCAL_INFO *infoPtr) int i; nmds.nmhdr.hwndFrom = hwnd; - nmds.nmhdr.idFrom = GetWindowLongA(hwnd, GWL_ID); + nmds.nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmds.nmhdr.code = MCN_GETDAYSTATE; nmds.cDayState = infoPtr->monthRange; nmds.prgDayState = Alloc @@ -1491,7 +1491,7 @@ MONTHCAL_LButtonDown(HWND hwnd, WPARAM wParam, LPARAM lParam) MONTHCAL_SetCurSel(hwnd,0,(LPARAM) &selArray); TRACE("MCHT_CALENDARDATE\n"); nmsc.nmhdr.hwndFrom = hwnd; - nmsc.nmhdr.idFrom = GetWindowLongA(hwnd, GWL_ID); + nmsc.nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmsc.nmhdr.code = MCN_SELCHANGE; MONTHCAL_CopyTime(&infoPtr->minSel,&nmsc.stSelStart); MONTHCAL_CopyTime(&infoPtr->maxSel,&nmsc.stSelEnd); @@ -1559,7 +1559,7 @@ MONTHCAL_LButtonUp(HWND hwnd, WPARAM wParam, LPARAM lParam) return TRUE; } nmhdr.hwndFrom = hwnd; - nmhdr.idFrom = GetWindowLongA( hwnd, GWL_ID); + nmhdr.idFrom = GetWindowLongPtrW( hwnd, GWLP_ID); nmhdr.code = NM_RELEASEDCAPTURE; TRACE("Sent notification from %p to %p\n", hwnd, infoPtr->hwndNotify); @@ -1571,7 +1571,7 @@ MONTHCAL_LButtonUp(HWND hwnd, WPARAM wParam, LPARAM lParam) /* only send MCN_SELECT if currently displayed month's day was selected */ if(hit == MCHT_CALENDARDATE) { nmsc.nmhdr.hwndFrom = hwnd; - nmsc.nmhdr.idFrom = GetWindowLongA(hwnd, GWL_ID); + nmsc.nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmsc.nmhdr.code = MCN_SELECT; MONTHCAL_CopyTime(&infoPtr->minSel, &nmsc.stSelStart); MONTHCAL_CopyTime(&infoPtr->maxSel, &nmsc.stSelEnd); @@ -1877,13 +1877,13 @@ MONTHCAL_Create(HWND hwnd, WPARAM wParam, LPARAM lParam) /* allocate memory for info structure */ infoPtr =(MONTHCAL_INFO*)Alloc(sizeof(MONTHCAL_INFO)); - SetWindowLongA(hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)infoPtr); if(infoPtr == NULL) { ERR( "could not allocate info memory!\n"); return 0; } - if((MONTHCAL_INFO*)GetWindowLongA(hwnd, 0) != infoPtr) { + if((MONTHCAL_INFO*)GetWindowLongPtrW(hwnd, 0) != infoPtr) { ERR( "pointer assignment error!\n"); return 0; } @@ -1934,7 +1934,7 @@ MONTHCAL_Destroy(HWND hwnd, WPARAM wParam, LPARAM lParam) if(infoPtr->monthdayState) Free(infoPtr->monthdayState); Free(infoPtr); - SetWindowLongA(hwnd, 0, 0); + SetWindowLongPtrW(hwnd, 0, 0); return 0; } diff --git a/dlls/comctl32/nativefont.c b/dlls/comctl32/nativefont.c index a8ecff2b3a8..c5bee8b4fd9 100644 --- a/dlls/comctl32/nativefont.c +++ b/dlls/comctl32/nativefont.c @@ -45,7 +45,7 @@ typedef struct DWORD dwDummy; /* just to keep the compiler happy ;-) */ } NATIVEFONT_INFO; -#define NATIVEFONT_GetInfoPtr(hwnd) ((NATIVEFONT_INFO *)GetWindowLongA (hwnd, 0)) +#define NATIVEFONT_GetInfoPtr(hwnd) ((NATIVEFONT_INFO *)GetWindowLongPtrW (hwnd, 0)) static LRESULT @@ -55,7 +55,7 @@ NATIVEFONT_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) /* allocate memory for info structure */ infoPtr = (NATIVEFONT_INFO *)Alloc (sizeof(NATIVEFONT_INFO)); - SetWindowLongA (hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); /* initialize info structure */ @@ -75,7 +75,7 @@ NATIVEFONT_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam) /* free comboex info data */ Free (infoPtr); - SetWindowLongA( hwnd, 0, 0 ); + SetWindowLongPtrW( hwnd, 0, 0 ); return 0; } diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 535d70819c2..191ee5f1793 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -59,7 +59,7 @@ typedef struct INT direction; /* direction of the scroll, (e.g. PGF_SCROLLUP) */ } PAGER_INFO; -#define PAGER_GetInfoPtr(hwnd) ((PAGER_INFO *)GetWindowLongA(hwnd, 0)) +#define PAGER_GetInfoPtr(hwnd) ((PAGER_INFO *)GetWindowLongPtrW(hwnd, 0)) #define PAGER_IsHorizontal(hwnd) ((GetWindowLongA (hwnd, GWL_STYLE) & PGS_HORZ)) #define MIN_ARROW_WIDTH 8 @@ -330,7 +330,7 @@ PAGER_CalcSize (HWND hwnd, INT* size, BOOL getWidth) NMPGCALCSIZE nmpgcs; ZeroMemory (&nmpgcs, sizeof (NMPGCALCSIZE)); nmpgcs.hdr.hwndFrom = hwnd; - nmpgcs.hdr.idFrom = GetWindowLongA (hwnd, GWL_ID); + nmpgcs.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); nmpgcs.hdr.code = PGN_CALCSIZE; nmpgcs.dwFlag = getWidth ? PGF_CALCWIDTH : PGF_CALCHEIGHT; nmpgcs.iWidth = getWidth ? *size : 0; @@ -777,7 +777,7 @@ PAGER_Scroll(HWND hwnd, INT dir) { ZeroMemory (&nmpgScroll, sizeof (NMPGSCROLL)); nmpgScroll.hdr.hwndFrom = hwnd; - nmpgScroll.hdr.idFrom = GetWindowLongA (hwnd, GWL_ID); + nmpgScroll.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); nmpgScroll.hdr.code = PGN_SCROLL; GetWindowRect(hwnd, &rcWnd); @@ -841,7 +841,7 @@ PAGER_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) /* allocate memory for info structure */ infoPtr = (PAGER_INFO *)Alloc (sizeof(PAGER_INFO)); - SetWindowLongA (hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); /* set default settings */ infoPtr->hwndChild = NULL; @@ -882,7 +882,7 @@ PAGER_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam) PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); /* free pager info data */ Free (infoPtr); - SetWindowLongA (hwnd, 0, 0); + SetWindowLongPtrW (hwnd, 0, 0); return 0; } @@ -1178,7 +1178,7 @@ PAGER_MouseLeave (HWND hwnd, WPARAM wParam, LPARAM lParam) NMHDR nmhdr; ZeroMemory (&nmhdr, sizeof (NMHDR)); nmhdr.hwndFrom = hwnd; - nmhdr.idFrom = GetWindowLongA (hwnd, GWL_ID); + nmhdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); nmhdr.code = NM_RELEASEDCAPTURE; SendMessageA (infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); @@ -1268,7 +1268,7 @@ PAGER_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam) NMHDR nmhdr; ZeroMemory (&nmhdr, sizeof (NMHDR)); nmhdr.hwndFrom = hwnd; - nmhdr.idFrom = GetWindowLongA (hwnd, GWL_ID); + nmhdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); nmhdr.code = NM_RELEASEDCAPTURE; SendMessageA (infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index a63f42898a7..bd19b48dcc3 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -499,7 +499,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, TRACE("hwnd=%p msg=%04x wparam=%x lParam=%lx\n", hwnd, message, wParam, lParam); - infoPtr = (PROGRESS_INFO *)GetWindowLongW(hwnd, 0); + infoPtr = (PROGRESS_INFO *)GetWindowLongPtrW(hwnd, 0); if (!infoPtr && message != WM_CREATE) return DefWindowProcW( hwnd, message, wParam, lParam ); @@ -518,7 +518,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, /* allocate memory for info struct */ infoPtr = (PROGRESS_INFO *)Alloc (sizeof(PROGRESS_INFO)); if (!infoPtr) return -1; - SetWindowLongW (hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); /* initialize the info struct */ infoPtr->Self = hwnd; @@ -538,7 +538,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case WM_DESTROY: TRACE("Progress Ctrl destruction, hwnd=%p\n", hwnd); Free (infoPtr); - SetWindowLongW(hwnd, 0, 0); + SetWindowLongPtrW(hwnd, 0, 0); return 0; case WM_GETFONT: diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index ab633ab5056..d0ddf5bcf17 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3244,11 +3244,11 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* * psInfo->hwnd is not being used by WINE code - it exists * for compatibility with "real" Windoze. The same about - * SetWindowLong - WINE is only using the PropSheetInfoStr + * SetWindowLongPtr - WINE is only using the PropSheetInfoStr * property. */ psInfo->hwnd = hwnd; - SetWindowLongW(hwnd,DWL_USER,(LONG)psInfo); + SetWindowLongPtrW(hwnd, DWLP_USER, (DWORD_PTR)psInfo); /* set up the Next and Back buttons by default */ PROPSHEET_SetWizButtons(hwnd, PSWIZB_BACK|PSWIZB_NEXT); @@ -3382,7 +3382,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if(pnmh->code == TCN_SELCHANGING) { BOOL bRet = PROPSHEET_CanSetCurSel(hwnd); - SetWindowLongW(hwnd, DWL_MSGRESULT, !bRet); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, !bRet); return TRUE; } @@ -3398,7 +3398,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (psInfo->activeValid && psInfo->active_page != -1) hwndPage = psInfo->proppage[psInfo->active_page].hwndPage; - SetWindowLongW(hwnd, DWL_MSGRESULT, (LONG)hwndPage); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, (DWORD_PTR)hwndPage); return TRUE; } @@ -3415,7 +3415,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { HWND hwndTabCtrl = GetDlgItem(hwnd, IDC_TABCONTROL); - SetWindowLongW(hwnd, DWL_MSGRESULT, (LONG)hwndTabCtrl); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, (DWORD_PTR)hwndTabCtrl); return TRUE; } @@ -3433,7 +3433,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) (HPROPSHEETPAGE)lParam); } - SetWindowLongW(hwnd, DWL_MSGRESULT, msgResult); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, msgResult); return TRUE; } @@ -3481,7 +3481,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { BOOL msgResult = PROPSHEET_Apply(hwnd, 0); - SetWindowLongW(hwnd, DWL_MSGRESULT, msgResult); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, msgResult); return TRUE; } @@ -3490,7 +3490,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { LRESULT msgResult = PROPSHEET_QuerySiblings(hwnd, wParam, lParam); - SetWindowLongW(hwnd, DWL_MSGRESULT, msgResult); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, msgResult); return TRUE; } @@ -3507,7 +3507,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) BOOL msgResult = PROPSHEET_AddPage(hwnd, (HPROPSHEETPAGE)lParam); - SetWindowLongW(hwnd, DWL_MSGRESULT, msgResult); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, msgResult); return TRUE; } @@ -3519,7 +3519,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case PSM_ISDIALOGMESSAGE: { BOOL msgResult = PROPSHEET_IsDialogMessage(hwnd, (LPMSG)lParam); - SetWindowLongA(hwnd, DWL_MSGRESULT, msgResult); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, msgResult); return TRUE; } @@ -3546,7 +3546,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case PSM_INSERTPAGE: { BOOL msgResult = PROPSHEET_InsertPage(hwnd, (HPROPSHEETPAGE)wParam, (HPROPSHEETPAGE)lParam); - SetWindowLongW(hwnd, DWL_MSGRESULT, msgResult); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, msgResult); return TRUE; } @@ -3569,56 +3569,56 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case PSM_HWNDTOINDEX: { LRESULT msgResult = PROPSHEET_HwndToIndex(hwnd, (HWND)wParam); - SetWindowLongW(hwnd, DWL_MSGRESULT, msgResult); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, msgResult); return TRUE; } case PSM_INDEXTOHWND: { LRESULT msgResult = PROPSHEET_IndexToHwnd(hwnd, (int)wParam); - SetWindowLongW(hwnd, DWL_MSGRESULT, msgResult); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, msgResult); return TRUE; } case PSM_PAGETOINDEX: { LRESULT msgResult = PROPSHEET_PageToIndex(hwnd, (HPROPSHEETPAGE)wParam); - SetWindowLongW(hwnd, DWL_MSGRESULT, msgResult); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, msgResult); return TRUE; } case PSM_INDEXTOPAGE: { LRESULT msgResult = PROPSHEET_IndexToPage(hwnd, (int)wParam); - SetWindowLongW(hwnd, DWL_MSGRESULT, msgResult); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, msgResult); return TRUE; } case PSM_IDTOINDEX: { LRESULT msgResult = PROPSHEET_IdToIndex(hwnd, (int)lParam); - SetWindowLongW(hwnd, DWL_MSGRESULT, msgResult); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, msgResult); return TRUE; } case PSM_INDEXTOID: { LRESULT msgResult = PROPSHEET_IndexToId(hwnd, (int)wParam); - SetWindowLongW(hwnd, DWL_MSGRESULT, msgResult); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, msgResult); return TRUE; } case PSM_GETRESULT: { LRESULT msgResult = PROPSHEET_GetResult(hwnd); - SetWindowLongW(hwnd, DWL_MSGRESULT, msgResult); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, msgResult); return TRUE; } case PSM_RECALCPAGESIZES: { LRESULT msgResult = PROPSHEET_RecalcPageSizes(hwnd); - SetWindowLongW(hwnd, DWL_MSGRESULT, msgResult); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, msgResult); return TRUE; } diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index bd552e1eefd..550399143dd 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -333,7 +333,7 @@ typedef struct else b->rcBand.left += (i); } while(0) -#define REBAR_GetInfoPtr(wndPtr) ((REBAR_INFO *)GetWindowLongA (hwnd, 0)) +#define REBAR_GetInfoPtr(wndPtr) ((REBAR_INFO *)GetWindowLongPtrW (hwnd, 0)) /* "constant values" retrieved when DLL was initialized */ @@ -3841,7 +3841,7 @@ REBAR_Destroy (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) DeleteObject (infoPtr->hcurVert); DeleteObject (infoPtr->hcurDrag); if(infoPtr->hDefaultFont) DeleteObject (infoPtr->hDefaultFont); - SetWindowLongA (infoPtr->hwndSelf, 0, 0); + SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); /* free rebar info data */ Free (infoPtr); @@ -4124,7 +4124,7 @@ REBAR_NCCreate (HWND hwnd, WPARAM wParam, LPARAM lParam) /* allocate memory for info structure */ infoPtr = (REBAR_INFO *)Alloc (sizeof(REBAR_INFO)); - SetWindowLongA (hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); /* initialize info structure - initial values are 0 */ infoPtr->clrBk = CLR_NONE; diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 636021adf2f..a8e86714800 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -91,7 +91,7 @@ typedef struct #define VERT_BORDER 2 #define HORZ_GAP 2 -#define STATUSBAR_GetInfoPtr(hwnd) ((STATUSWINDOWINFO *)GetWindowLongW (hwnd, 0)) +#define STATUSBAR_GetInfoPtr(hwnd) ((STATUSWINDOWINFO *)GetWindowLongPtrW (hwnd, 0)) /* prototype */ static void @@ -165,7 +165,7 @@ STATUSBAR_DrawPart (HDC hdc, const STATUSWINDOWPART *part, const STATUSWINDOWINF { DRAWITEMSTRUCT dis; - dis.CtlID = GetWindowLongW (infoPtr->Self, GWL_ID); + dis.CtlID = GetWindowLongPtrW (infoPtr->Self, GWLP_ID); dis.itemID = itemID; dis.hwndItem = infoPtr->Self; dis.hDC = hdc; @@ -777,7 +777,7 @@ STATUSBAR_Simple (STATUSWINDOWINFO *infoPtr, BOOL simple) /* send notification */ nmhdr.hwndFrom = infoPtr->Self; - nmhdr.idFrom = GetWindowLongW (infoPtr->Self, GWL_ID); + nmhdr.idFrom = GetWindowLongPtrW (infoPtr->Self, GWLP_ID); nmhdr.code = SBN_SIMPLEMODECHANGE; SendMessageW (infoPtr->Notify, WM_NOTIFY, 0, (LPARAM)&nmhdr); InvalidateRect(infoPtr->Self, NULL, FALSE); @@ -807,7 +807,7 @@ STATUSBAR_WMDestroy (STATUSWINDOWINFO *infoPtr) if (infoPtr->hwndToolTip) DestroyWindow (infoPtr->hwndToolTip); - SetWindowLongW(infoPtr->Self, 0, 0); + SetWindowLongPtrW(infoPtr->Self, 0, 0); Free (infoPtr); return 0; } @@ -826,7 +826,7 @@ STATUSBAR_WMCreate (HWND hwnd, LPCREATESTRUCTA lpCreate) TRACE("\n"); infoPtr = (STATUSWINDOWINFO*)Alloc (sizeof(STATUSWINDOWINFO)); if (!infoPtr) goto create_fail; - SetWindowLongW (hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); infoPtr->Self = hwnd; infoPtr->Notify = lpCreate->hwndParent; @@ -908,13 +908,13 @@ STATUSBAR_WMCreate (HWND hwnd, LPCREATESTRUCTA lpCreate) CreateWindowExW (0, TOOLTIPS_CLASSW, NULL, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hwnd, 0, - (HINSTANCE)GetWindowLongW(hwnd, GWL_HINSTANCE), NULL); + (HINSTANCE)GetWindowLongPtrW(hwnd, GWLP_HINSTANCE), NULL); if (infoPtr->hwndToolTip) { NMTOOLTIPSCREATED nmttc; nmttc.hdr.hwndFrom = hwnd; - nmttc.hdr.idFrom = GetWindowLongW (hwnd, GWL_ID); + nmttc.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); nmttc.hdr.code = NM_TOOLTIPSCREATED; nmttc.hwndToolTips = infoPtr->hwndToolTip; @@ -1106,7 +1106,7 @@ STATUSBAR_SendNotify (HWND hwnd, UINT code) TRACE("code %04x\n", code); nmhdr.hwndFrom = hwnd; - nmhdr.idFrom = GetWindowLongW (hwnd, GWL_ID); + nmhdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); nmhdr.code = code; SendMessageW (infoPtr->Notify, WM_NOTIFY, 0, (LPARAM)&nmhdr); return 0; diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index fa396fc977e..2a7a58d07a2 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -1223,7 +1223,7 @@ static LRESULT SYSLINK_SendParentNotify (SYSLINK_INFO *infoPtr, UINT code, PDOC_ NMLINK nml; nml.hdr.hwndFrom = infoPtr->Self; - nml.hdr.idFrom = GetWindowLongW(infoPtr->Self, GWL_ID); + nml.hdr.idFrom = GetWindowLongPtrW(infoPtr->Self, GWLP_ID); nml.hdr.code = code; nml.item.mask = 0; @@ -1465,7 +1465,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, TRACE("hwnd=%p msg=%04x wparam=%x lParam=%lx\n", hwnd, message, wParam, lParam); - infoPtr = (SYSLINK_INFO *)GetWindowLongW(hwnd, 0); + infoPtr = (SYSLINK_INFO *)GetWindowLongPtrW(hwnd, 0); if (!infoPtr && message != WM_CREATE) return DefWindowProcW( hwnd, message, wParam, lParam ); @@ -1618,7 +1618,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, /* allocate memory for info struct */ infoPtr = (SYSLINK_INFO *)SYSLINK_Alloc (sizeof(SYSLINK_INFO)); if (!infoPtr) return -1; - SetWindowLongW (hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); /* initialize the info struct */ infoPtr->Self = hwnd; @@ -1639,7 +1639,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, TRACE("SysLink Ctrl destruction, hwnd=%p\n", hwnd); SYSLINK_ClearDoc(infoPtr); SYSLINK_Free (infoPtr); - SetWindowLongW(hwnd, 0, 0); + SetWindowLongPtrW(hwnd, 0, 0); return 0; default: diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 121b602951c..f8a66d55283 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -112,7 +112,7 @@ typedef struct #define FLAT_BTN_SPACINGX 8 #define DEFAULT_TAB_WIDTH 96 -#define TAB_GetInfoPtr(hwnd) ((TAB_INFO *)GetWindowLongA(hwnd,0)) +#define TAB_GetInfoPtr(hwnd) ((TAB_INFO *)GetWindowLongPtrW(hwnd,0)) /****************************************************************************** * Hot-tracking timer constants @@ -136,7 +136,7 @@ TAB_SendSimpleNotify (HWND hwnd, UINT code) NMHDR nmhdr; nmhdr.hwndFrom = hwnd; - nmhdr.idFrom = GetWindowLongA(hwnd, GWL_ID); + nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmhdr.code = code; return (BOOL) SendMessageA (infoPtr->hwndNotify, WM_NOTIFY, @@ -1648,7 +1648,7 @@ TAB_DrawItemInterior /* * get the control id */ - id = GetWindowLongA( hwnd, GWL_ID ); + id = (UINT)GetWindowLongPtrW( hwnd, GWLP_ID ); /* * put together the DRAWITEMSTRUCT @@ -3130,12 +3130,12 @@ TAB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) NMTOOLTIPSCREATED nmttc; nmttc.hdr.hwndFrom = hwnd; - nmttc.hdr.idFrom = GetWindowLongA(hwnd, GWL_ID); + nmttc.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmttc.hdr.code = NM_TOOLTIPSCREATED; nmttc.hwndToolTips = infoPtr->hwndToolTip; SendMessageA (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)GetWindowLongA(hwnd, GWL_ID), (LPARAM)&nmttc); + (WPARAM)GetWindowLongPtrW(hwnd, GWLP_ID), (LPARAM)&nmttc); } } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 8d38995d897..fb042f449f9 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -129,7 +129,7 @@ typedef struct #define ID_TIMERLEAVE 3 /* tool leave timer */ -#define TOOLTIPS_GetInfoPtr(hWindow) ((TOOLTIPS_INFO *)GetWindowLongA (hWindow, 0)) +#define TOOLTIPS_GetInfoPtr(hWindow) ((TOOLTIPS_INFO *)GetWindowLongPtrW (hWindow, 0)) /* offsets from window edge to start of text */ #define NORMAL_TEXT_MARGIN 2 @@ -2138,7 +2138,7 @@ TOOLTIPS_Create (HWND hwnd, const CREATESTRUCTW *lpcs) /* allocate memory for info structure */ infoPtr = (TOOLTIPS_INFO *)Alloc (sizeof(TOOLTIPS_INFO)); - SetWindowLongA (hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); /* initialize info structure */ infoPtr->bActive = TRUE; @@ -2201,7 +2201,7 @@ TOOLTIPS_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam) /* free tool tips info data */ Free (infoPtr); - SetWindowLongA(hwnd, 0, 0); + SetWindowLongPtrW(hwnd, 0, 0); return 0; } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 01924648d15..2114c593ef6 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -112,7 +112,7 @@ static LRESULT notify_hdr(TRACKBAR_INFO *infoPtr, INT code, LPNMHDR pnmh) TRACE("(code=%d)\n", code); pnmh->hwndFrom = infoPtr->hwndSelf; - pnmh->idFrom = GetWindowLongW(infoPtr->hwndSelf, GWL_ID); + pnmh->idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); pnmh->code = code; result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)pnmh->idFrom, (LPARAM)pnmh); @@ -809,7 +809,7 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) ZeroMemory(&nmcd, sizeof(nmcd)); nmcd.hdr.hwndFrom = infoPtr->hwndSelf; - nmcd.hdr.idFrom = GetWindowLongW (infoPtr->hwndSelf, GWL_ID); + nmcd.hdr.idFrom = GetWindowLongPtrW (infoPtr->hwndSelf, GWLP_ID); nmcd.hdr.code = NM_CUSTOMDRAW; nmcd.hdc = hdc; @@ -1339,7 +1339,7 @@ TRACKBAR_Create (HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr = (TRACKBAR_INFO *)Alloc (sizeof(TRACKBAR_INFO)); if (!infoPtr) return -1; - SetWindowLongW (hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); /* set default values */ infoPtr->hwndSelf = hwnd; @@ -1401,7 +1401,7 @@ TRACKBAR_Destroy (TRACKBAR_INFO *infoPtr) DestroyWindow (infoPtr->hwndToolTip); Free (infoPtr); - SetWindowLongW (infoPtr->hwndSelf, 0, 0); + SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); return 0; } @@ -1635,7 +1635,7 @@ TRACKBAR_KeyUp (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData) static LRESULT WINAPI TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - TRACKBAR_INFO *infoPtr = (TRACKBAR_INFO *)GetWindowLongW (hwnd, 0); + TRACKBAR_INFO *infoPtr = (TRACKBAR_INFO *)GetWindowLongPtrW (hwnd, 0); TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n", hwnd, uMsg, wParam, lParam); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index da9001d1b68..c8c929ea85b 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -225,7 +225,7 @@ static void TREEVIEW_VerifyTree(TREEVIEW_INFO *infoPtr); static TREEVIEW_INFO * TREEVIEW_GetInfoPtr(HWND hwnd) { - return (TREEVIEW_INFO *)GetWindowLongW(hwnd, 0); + return (TREEVIEW_INFO *)GetWindowLongPtrW(hwnd, 0); } /* Don't call this. Nothing wants an item index. */ @@ -458,7 +458,7 @@ TREEVIEW_SendSimpleNotify(TREEVIEW_INFO *infoPtr, UINT code) TRACE("%d\n", code); nmhdr.hwndFrom = hwnd; - nmhdr.idFrom = GetWindowLongW(hwnd, GWL_ID); + nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmhdr.code = get_notifycode(infoPtr, code); return (BOOL)TREEVIEW_SendRealNotify(infoPtr, @@ -513,7 +513,7 @@ TREEVIEW_SendTreeviewNotify(TREEVIEW_INFO *infoPtr, UINT code, UINT action, ZeroMemory(&nmhdr, sizeof(NMTREEVIEWA)); nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongW(hwnd, GWL_ID); + nmhdr.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmhdr.hdr.code = get_notifycode(infoPtr, code); nmhdr.action = action; @@ -547,7 +547,7 @@ TREEVIEW_SendTreeviewDnDNotify(TREEVIEW_INFO *infoPtr, UINT code, TRACE("code:%d dragitem:%p\n", code, dragItem); nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongW(hwnd, GWL_ID); + nmhdr.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmhdr.hdr.code = get_notifycode(infoPtr, code); nmhdr.action = 0; nmhdr.itemNew.mask = TVIF_STATE | TVIF_PARAM | TVIF_HANDLE; @@ -576,7 +576,7 @@ TREEVIEW_SendCustomDrawNotify(TREEVIEW_INFO *infoPtr, DWORD dwDrawStage, nmcd = &nmcdhdr.nmcd; nmcd->hdr.hwndFrom = hwnd; - nmcd->hdr.idFrom = GetWindowLongW(hwnd, GWL_ID); + nmcd->hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmcd->hdr.code = NM_CUSTOMDRAW; nmcd->dwDrawStage = dwDrawStage; nmcd->hdc = hdc; @@ -620,7 +620,7 @@ TREEVIEW_SendCustomDrawItemNotify(TREEVIEW_INFO *infoPtr, HDC hdc, nmcd = &nmcdhdr.nmcd; nmcd->hdr.hwndFrom = hwnd; - nmcd->hdr.idFrom = GetWindowLongW(hwnd, GWL_ID); + nmcd->hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmcd->hdr.code = NM_CUSTOMDRAW; nmcd->dwDrawStage = dwDrawStage; nmcd->hdc = hdc; @@ -653,7 +653,7 @@ TREEVIEW_BeginLabelEditNotify(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *editItem) BOOL ret; tvdi.hdr.hwndFrom = hwnd; - tvdi.hdr.idFrom = GetWindowLongW(hwnd, GWL_ID); + tvdi.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); tvdi.hdr.code = get_notifycode(infoPtr, TVN_BEGINLABELEDITW); TREEVIEW_TVItemFromItem(infoPtr, TVIF_HANDLE | TVIF_STATE | TVIF_PARAM | TVIF_TEXT, @@ -680,7 +680,7 @@ TREEVIEW_UpdateDispInfo(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, if (mask == 0) return; callback.hdr.hwndFrom = hwnd; - callback.hdr.idFrom = GetWindowLongW(hwnd, GWL_ID); + callback.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); callback.hdr.code = get_notifycode(infoPtr, TVN_GETDISPINFOW); /* 'state' always contains valid value, as well as 'lParam'. @@ -3463,7 +3463,7 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) HWND hwndEdit; SIZE sz; TREEVIEW_ITEM *editItem = hItem; - HINSTANCE hinst = (HINSTANCE)GetWindowLongW(hwnd, GWL_HINSTANCE); + HINSTANCE hinst = (HINSTANCE)GetWindowLongPtrW(hwnd, GWLP_HINSTANCE); HDC hdc; HFONT hOldFont=0; TEXTMETRICW textMetric; @@ -3530,8 +3530,8 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) SendMessageW(hwndEdit, WM_SETFONT, (WPARAM)TREEVIEW_FontForItem(infoPtr, editItem), FALSE); - infoPtr->wpEditOrig = (WNDPROC)SetWindowLongW(hwndEdit, GWL_WNDPROC, - (DWORD) + infoPtr->wpEditOrig = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, + (DWORD_PTR) TREEVIEW_Edit_SubclassProc); if (TREEVIEW_BeginLabelEditNotify(infoPtr, editItem)) @@ -3566,7 +3566,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) return FALSE; tvdi.hdr.hwndFrom = hwnd; - tvdi.hdr.idFrom = GetWindowLongW(hwnd, GWL_ID); + tvdi.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); tvdi.hdr.code = get_notifycode(infoPtr, TVN_ENDLABELEDITW); tvdi.item.mask = 0; tvdi.item.hItem = editedItem; @@ -4190,7 +4190,7 @@ static INT TREEVIEW_ProcessLetterKeys( if (!hwnd || !charCode || !keyData) return 0; - infoPtr=(TREEVIEW_INFO*)GetWindowLongW(hwnd, 0); + infoPtr=(TREEVIEW_INFO*)GetWindowLongPtrW(hwnd, 0); if (!infoPtr) return 0; @@ -4647,7 +4647,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) return 0; } - SetWindowLongW(hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)infoPtr); infoPtr->hwnd = hwnd; infoPtr->dwStyle = GetWindowLongW(hwnd, GWL_STYLE); @@ -4785,11 +4785,11 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) /* Restore original wndproc */ if (infoPtr->hwndEdit) - SetWindowLongW(infoPtr->hwndEdit, GWL_WNDPROC, - (LONG)infoPtr->wpEditOrig); + SetWindowLongPtrW(infoPtr->hwndEdit, GWLP_WNDPROC, + (DWORD_PTR)infoPtr->wpEditOrig); /* Deassociate treeview from the window before doing anything drastic. */ - SetWindowLongW(infoPtr->hwnd, 0, (LONG)NULL); + SetWindowLongPtrW(infoPtr->hwnd, 0, (DWORD_PTR)NULL); DeleteObject(infoPtr->hBoldFont); Free(infoPtr); diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 2e26d776760..4a07767c248 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -95,7 +95,7 @@ typedef struct #define BUDDY_UPDOWN_HWND "buddyUpDownHWND" #define BUDDY_SUPERCLASS_WNDPROC "buddySupperClassWndProc" -#define UPDOWN_GetInfoPtr(hwnd) ((UPDOWN_INFO *)GetWindowLongA (hwnd,0)) +#define UPDOWN_GetInfoPtr(hwnd) ((UPDOWN_INFO *)GetWindowLongPtrW (hwnd,0)) #define COUNT_OF(a) (sizeof(a)/sizeof(a[0])) static void UPDOWN_DoAction (UPDOWN_INFO *infoPtr, int delta, int action); @@ -491,7 +491,7 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) when we reset the upDown ctrl buddy to another buddy because it is not good to break the window proc chain. */ if (!GetPropA(bud, BUDDY_SUPERCLASS_WNDPROC)) { - baseWndProc = (WNDPROC)SetWindowLongW(bud, GWL_WNDPROC, (LPARAM)UPDOWN_Buddy_SubclassProc); + baseWndProc = (WNDPROC)SetWindowLongPtrW(bud, GWLP_WNDPROC, (LPARAM)UPDOWN_Buddy_SubclassProc); SetPropA(bud, BUDDY_SUPERCLASS_WNDPROC, (HANDLE)baseWndProc); } } @@ -572,7 +572,7 @@ static void UPDOWN_DoAction (UPDOWN_INFO *infoPtr, int delta, int action) ni.iPos = infoPtr->CurVal; ni.iDelta = delta; ni.hdr.hwndFrom = infoPtr->Self; - ni.hdr.idFrom = GetWindowLongW (infoPtr->Self, GWL_ID); + ni.hdr.idFrom = GetWindowLongPtrW (infoPtr->Self, GWLP_ID); ni.hdr.code = UDN_DELTAPOS; if (!SendMessageW(infoPtr->Notify, WM_NOTIFY, (WPARAM)ni.hdr.idFrom, (LPARAM)&ni)) { /* Parent said: OK to adjust */ @@ -623,7 +623,7 @@ static BOOL UPDOWN_CancelMode (UPDOWN_INFO *infoPtr) if (GetCapture() == infoPtr->Self) { NMHDR hdr; hdr.hwndFrom = infoPtr->Self; - hdr.idFrom = GetWindowLongW (infoPtr->Self, GWL_ID); + hdr.idFrom = GetWindowLongPtrW (infoPtr->Self, GWLP_ID); hdr.code = NM_RELEASEDCAPTURE; SendMessageW(infoPtr->Notify, WM_NOTIFY, hdr.idFrom, (LPARAM)&hdr); ReleaseCapture(); @@ -725,7 +725,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, case WM_CREATE: SetWindowLongW (hwnd, GWL_STYLE, dwStyle & ~WS_BORDER); infoPtr = (UPDOWN_INFO*)Alloc (sizeof(UPDOWN_INFO)); - SetWindowLongW (hwnd, 0, (DWORD)infoPtr); + SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); /* initialize the info struct */ infoPtr->Self = hwnd; @@ -753,7 +753,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, if(infoPtr->Buddy) RemovePropA(infoPtr->Buddy, BUDDY_UPDOWN_HWND); Free (infoPtr); - SetWindowLongW (hwnd, 0, 0); + SetWindowLongPtrW (hwnd, 0, 0); TRACE("UpDown Ctrl destruction, hwnd=%p\n", hwnd); break;