ChangeSet ID:	13889
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard@wine.codeweavers.com	2004/09/22 14:14:45

Modified files:
	dlls/shell32   : shlview.c shell32_main.c dialogs.c 
	                 autocomplete.c 

Log message:
	Robert Shearman <rob@codeweavers.com>
	GetWindowLong -> GetWindowLongPtr.

Patch: http://cvs.winehq.org/patch.py?id=13889

Old revision  New revision  Changes     Path
 1.103         1.104         +2 -2       wine/dlls/shell32/shlview.c
 1.137         1.138         +1 -1       wine/dlls/shell32/shell32_main.c
 1.20          1.21          +2 -2       wine/dlls/shell32/dialogs.c
 1.9           1.10          +1 -1       wine/dlls/shell32/autocomplete.c

Index: wine/dlls/shell32/shlview.c
diff -u -p wine/dlls/shell32/shlview.c:1.103 wine/dlls/shell32/shlview.c:1.104
--- wine/dlls/shell32/shlview.c:1.103	Sat May 25 04:48:55 2013
+++ wine/dlls/shell32/shlview.c	Sat May 25 04:48:55 2013
@@ -1532,7 +1532,7 @@ static LRESULT ShellView_OnChange(IShell
 
 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_WndPro
 	  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;
 

Index: wine/dlls/shell32/shell32_main.c
diff -u -p wine/dlls/shell32/shell32_main.c:1.137 wine/dlls/shell32/shell32_main.c:1.138
--- wine/dlls/shell32/shell32_main.c:1.137	Sat May 25 04:48:55 2013
+++ wine/dlls/shell32/shell32_main.c	Sat May 25 04:48:55 2013
@@ -854,7 +854,7 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCW
     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;

Index: wine/dlls/shell32/dialogs.c
diff -u -p wine/dlls/shell32/dialogs.c:1.20 wine/dlls/shell32/dialogs.c:1.21
--- wine/dlls/shell32/dialogs.c:1.20	Sat May 25 04:48:55 2013
+++ wine/dlls/shell32/dialogs.c	Sat May 25 04:48:55 2013
@@ -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);
 
 }

Index: wine/dlls/shell32/autocomplete.c
diff -u -p wine/dlls/shell32/autocomplete.c:1.9 wine/dlls/shell32/autocomplete.c:1.10
--- wine/dlls/shell32/autocomplete.c:1.9	Sat May 25 04:48:55 2013
+++ wine/dlls/shell32/autocomplete.c	Sat May 25 04:48:55 2013
@@ -260,7 +260,7 @@ static HRESULT WINAPI IAutoComplete_fnIn
 					    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);