Robert Shearman <rob@codeweavers.com>

- GetWindowLong -> GetWindowLongPtr.

svn path=/trunk/; revision=10981

diff --git a/reactos/lib/shell32/autocomplete.c b/reactos/lib/shell32/autocomplete.c
index e26f4ff..1655c53 100644 (file)
--- 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 5a8e805..9fb6992 100644 (file)
--- 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 32161e5..e1d060c 100644 (file)
--- 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 8442854..23e787a 100644 (file)
--- 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;