From dab159a4de2e693c0a52b79309bdd667158e613a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Wed, 22 Sep 2004 19:46:52 +0000 Subject: [PATCH] Robert Shearman - GetWindowLong -> GetWindowLongPtr. svn path=/trunk/; revision=10981 --- reactos/lib/shell32/autocomplete.c | 2 +- reactos/lib/shell32/dialogs.c | 4 ++-- reactos/lib/shell32/shell32_main.c | 2 +- reactos/lib/shell32/shlview.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/reactos/lib/shell32/autocomplete.c b/reactos/lib/shell32/autocomplete.c index e26f4ff2f6f..1655c5326f9 100644 --- a/reactos/lib/shell32/autocomplete.c +++ b/reactos/lib/shell32/autocomplete.c @@ -260,7 +260,7 @@ static HRESULT WINAPI IAutoComplete_fnInit( WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hwndParent, NULL, - (HINSTANCE)GetWindowLongA( hwndParent, GWL_HINSTANCE ), NULL); + (HINSTANCE)GetWindowLongPtrW( hwndParent, GWLP_HINSTANCE ), NULL); if (This->hwndListBox) { This->wpOrigLBoxProc = (WNDPROC) SetWindowLongPtrW( This->hwndListBox, GWLP_WNDPROC, (LONG_PTR) ACLBoxSubclassProc); diff --git a/reactos/lib/shell32/dialogs.c b/reactos/lib/shell32/dialogs.c index 5a8e8059ff1..9fb699296ab 100644 --- a/reactos/lib/shell32/dialogs.c +++ b/reactos/lib/shell32/dialogs.c @@ -109,8 +109,8 @@ void WINAPI RunFileDlg( return; } - DialogBoxIndirectParamA((HINSTANCE)GetWindowLongA( hwndOwner, - GWL_HINSTANCE ), + DialogBoxIndirectParamA((HINSTANCE)GetWindowLongPtrW( hwndOwner, + GWLP_HINSTANCE ), template, hwndOwner, RunDlgProc, (LPARAM)&rfdp); } diff --git a/reactos/lib/shell32/shell32_main.c b/reactos/lib/shell32/shell32_main.c index 32161e5f2f5..e1d060c3bb6 100644 --- a/reactos/lib/shell32/shell32_main.c +++ b/reactos/lib/shell32/shell32_main.c @@ -854,7 +854,7 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, SystemParametersInfoW( SPI_GETICONTITLELOGFONT, 0, &logFont, 0 ); info.hFont = CreateFontIndirectW( &logFont ); - bRet = DialogBoxIndirectParamW((HINSTANCE)GetWindowLongW( hWnd, GWL_HINSTANCE ), + bRet = DialogBoxIndirectParamW((HINSTANCE)GetWindowLongPtrW( hWnd, GWLP_HINSTANCE ), template, hWnd, AboutDlgProc, (LPARAM)&info ); DeleteObject(info.hFont); return bRet; diff --git a/reactos/lib/shell32/shlview.c b/reactos/lib/shell32/shlview.c index 84428548de2..23e787a3841 100644 --- a/reactos/lib/shell32/shlview.c +++ b/reactos/lib/shell32/shlview.c @@ -1532,7 +1532,7 @@ static LRESULT ShellView_OnChange(IShellViewImpl * This, LPITEMIDLIST * Pidls, L static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam) { - IShellViewImpl * pThis = (IShellViewImpl*)GetWindowLongA(hWnd, GWL_USERDATA); + IShellViewImpl * pThis = (IShellViewImpl*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); LPCREATESTRUCTA lpcs; TRACE("(hwnd=%p msg=%x wparm=%x lparm=%lx)\n",hWnd, uMessage, wParam, lParam); @@ -1542,7 +1542,7 @@ static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wPara case WM_NCCREATE: lpcs = (LPCREATESTRUCTA)lParam; pThis = (IShellViewImpl*)(lpcs->lpCreateParams); - SetWindowLongA(hWnd, GWL_USERDATA, (LONG)pThis); + SetWindowLongPtrW(hWnd, GWLP_USERDATA, (ULONG_PTR)pThis); pThis->hWnd = hWnd; /*set the window handle*/ break;