[1/5] GetWindowLongPtr: Common Dialogs

Robert Shearman rob at codeweavers.com
Wed Sep 22 12:17:53 CDT 2004


Hi,

Once again, if this patch conflicts with your work just shout and make 
Alexandre drop it for the moment.

Rob

Changelog:
GetWindowLong -> GetWindowLongPtr.
-------------- next part --------------
Index: wine/dlls/commdlg/colordlg16.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/colordlg16.c,v
retrieving revision 1.6
diff -u -p -r1.6 colordlg16.c
--- wine/dlls/commdlg/colordlg16.c	12 Feb 2004 00:35:02 -0000	1.6
+++ wine/dlls/commdlg/colordlg16.c	22 Sep 2004 15:48:15 -0000
@@ -463,7 +463,7 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOL
     }
 
     ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 8);
-    hInst = GetWindowLongA(HWND_32(lpChCol->hwndOwner), GWL_HINSTANCE);
+    hInst = GetWindowLongPtrA(HWND_32(lpChCol->hwndOwner), GWLP_HINSTANCE);
     bRet = DialogBoxIndirectParam16(hInst, hDlgTmpl16, lpChCol->hwndOwner,
                      (DLGPROC16) ptr, (DWORD)lpChCol);
     if (hResource16) FreeResource16(hDlgTmpl16);
Index: wine/dlls/commdlg/filedlg.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/filedlg.c,v
retrieving revision 1.86
diff -u -p -r1.86 filedlg.c
--- wine/dlls/commdlg/filedlg.c	22 Aug 2004 22:26:22 -0000	1.86
+++ wine/dlls/commdlg/filedlg.c	22 Sep 2004 15:48:16 -0000
@@ -3635,7 +3635,7 @@ static BOOL GetFileName31A(LPOPENFILENAM
     lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, &callbacks, (DWORD) FALSE);
     if (lfs)
     {
-        hInst = (HINSTANCE)GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
+        hInst = (HINSTANCE)GetWindowLongPtrA( lpofn->hwndOwner, GWLP_HINSTANCE );
         bRet = DialogBoxIndirectParamA( hInst, lfs->template, lpofn->hwndOwner,
                                         FD32_FileOpenDlgProc, (LPARAM)lfs);
         FD31_DestroyPrivate(lfs);
@@ -3665,7 +3665,7 @@ static BOOL GetFileName31W(LPOPENFILENAM
     lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, &callbacks, (DWORD) FALSE);
     if (lfs)
     {
-        hInst = (HINSTANCE)GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
+        hInst = (HINSTANCE)GetWindowLongPtrW( lpofn->hwndOwner, GWLP_HINSTANCE );
         bRet = DialogBoxIndirectParamW( hInst, lfs->template, lpofn->hwndOwner,
                                         FD32_FileOpenDlgProc, (LPARAM)lfs);
         FD31_DestroyPrivate(lfs);
Index: wine/dlls/commdlg/filedlg16.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/filedlg16.c,v
retrieving revision 1.12
diff -u -p -r1.12 filedlg16.c
--- wine/dlls/commdlg/filedlg16.c	14 Jul 2004 00:39:10 -0000	1.12
+++ wine/dlls/commdlg/filedlg16.c	22 Sep 2004 15:48:16 -0000
@@ -459,7 +459,7 @@ BOOL16 WINAPI GetOpenFileName16(
     if (lfs)
     {
         priv = (PFD16_PRIVATE) lfs->private1632;
-        hInst = GetWindowWord( HWND_32(lpofn->hwndOwner), GWL_HINSTANCE );
+        hInst = GetWindowLongPtrA( HWND_32(lpofn->hwndOwner), GWLP_HINSTANCE );
         ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 6);
         bRet = DialogBoxIndirectParam16( hInst, priv->hDlgTmpl16, lpofn->hwndOwner,
                                          (DLGPROC16) ptr, (LPARAM) lfs);
@@ -501,7 +501,7 @@ BOOL16 WINAPI GetSaveFileName16(
     if (lfs)
     {
         priv = (PFD16_PRIVATE) lfs->private1632;
-        hInst = GetWindowWord( HWND_32(lpofn->hwndOwner), GWL_HINSTANCE );
+        hInst = GetWindowLongPtrA( HWND_32(lpofn->hwndOwner), GWLP_HINSTANCE );
         ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 7);
         bRet = DialogBoxIndirectParam16( hInst, priv->hDlgTmpl16, lpofn->hwndOwner,
                                          (DLGPROC16) ptr, (LPARAM) lfs);
Index: wine/dlls/commdlg/finddlg.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/finddlg.c,v
retrieving revision 1.29
diff -u -p -r1.29 finddlg.c
--- wine/dlls/commdlg/finddlg.c	12 Feb 2004 00:35:02 -0000	1.29
+++ wine/dlls/commdlg/finddlg.c	22 Sep 2004 15:48:16 -0000
@@ -182,7 +182,7 @@ HWND16 WINAPI FindText16( SEGPTR find )
     lfr->find = TRUE;
     if (FINDDLG_Get16BitsTemplate(lfr))
     {
-        hInst = GetWindowLongA( HWND_32(lfr->fr16->hwndOwner), GWL_HINSTANCE);
+        hInst = GetWindowLongPtrA( HWND_32(lfr->fr16->hwndOwner), GWLP_HINSTANCE);
         ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 13);
         ret = CreateDialogIndirectParam16( hInst, lfr->template,
                     lfr->fr16->hwndOwner, (DLGPROC16) ptr, find);
@@ -212,7 +212,7 @@ HWND16 WINAPI ReplaceText16( SEGPTR find
     lfr->find = FALSE;
     if (FINDDLG_Get16BitsTemplate(lfr))
     {
-        hInst = GetWindowLongA( HWND_32(lfr->fr16->hwndOwner), GWL_HINSTANCE);
+        hInst = GetWindowLongPtrA( HWND_32(lfr->fr16->hwndOwner), GWLP_HINSTANCE);
         ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 14);
         ret = CreateDialogIndirectParam16( hInst, lfr->template,
                     lfr->fr16->hwndOwner, (DLGPROC16) ptr, find);
Index: wine/dlls/commdlg/fontdlg16.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/fontdlg16.c,v
retrieving revision 1.12
diff -u -p -r1.12 fontdlg16.c
--- wine/dlls/commdlg/fontdlg16.c	31 Aug 2004 00:02:03 -0000	1.12
+++ wine/dlls/commdlg/fontdlg16.c	22 Sep 2004 15:48:16 -0000
@@ -231,7 +231,7 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT1
     lpChFont->lpTemplateName=(SEGPTR)&cf32a;
 
     ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 16);
-    hInst = GetWindowLongA(HWND_32(lpChFont->hwndOwner), GWL_HINSTANCE);
+    hInst = GetWindowLongPtrA(HWND_32(lpChFont->hwndOwner), GWLP_HINSTANCE);
     bRet = DialogBoxIndirectParam16(hInst, hDlgTmpl16, lpChFont->hwndOwner,
                      (DLGPROC16) ptr, (DWORD)lpChFont);
     if (hResource16) FreeResource16(hDlgTmpl16);
Index: wine/dlls/commdlg/printdlg.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/printdlg.c,v
retrieving revision 1.79
diff -u -p -r1.79 printdlg.c
--- wine/dlls/commdlg/printdlg.c	18 Aug 2004 21:00:05 -0000	1.79
+++ wine/dlls/commdlg/printdlg.c	22 Sep 2004 15:48:17 -0000
@@ -1978,7 +1978,7 @@ BOOL WINAPI PrintDlgA(
 {
     BOOL      bRet = FALSE;
     LPVOID   ptr;
-    HINSTANCE hInst = (HINSTANCE)GetWindowLongA( lppd->hwndOwner, GWL_HINSTANCE );
+    HINSTANCE hInst = (HINSTANCE)GetWindowLongPtrA( lppd->hwndOwner, GWLP_HINSTANCE );
 
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";
@@ -2134,7 +2134,7 @@ BOOL WINAPI PrintDlgW(
 {
     BOOL      bRet = FALSE;
     LPVOID   ptr;
-    HINSTANCE hInst = (HINSTANCE)GetWindowLongW( lppd->hwndOwner, GWL_HINSTANCE );
+    HINSTANCE hInst = (HINSTANCE)GetWindowLongPtrW( lppd->hwndOwner, GWLP_HINSTANCE );
 
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";
Index: wine/dlls/commdlg/printdlg16.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/printdlg16.c,v
retrieving revision 1.8
diff -u -p -r1.8 printdlg16.c
--- wine/dlls/commdlg/printdlg16.c	9 Jan 2004 05:10:35 -0000	1.8
+++ wine/dlls/commdlg/printdlg16.c	22 Sep 2004 15:48:17 -0000
@@ -345,7 +345,7 @@ BOOL16 WINAPI PrintDlg16(
 ) {
     BOOL      bRet = FALSE;
     LPVOID   ptr;
-    HINSTANCE16 hInst = GetWindowWord( HWND_32(lppd->hwndOwner), GWL_HINSTANCE );
+    HINSTANCE16 hInst = GetWindowLongPtrW( HWND_32(lppd->hwndOwner), GWLP_HINSTANCE );
 
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";


More information about the wine-patches mailing list