Lotus NOtes & Replication

[lawson_whitney at juno.com]

On Sat, 17 Nov 2001, Richard W. Knight wrote:

>
>
> gerard patel wrote:
> >
> >Index: windows/win.c
> >===================================================================
> >RCS file: /home/wine/wine/windows/win.c,v
> >retrieving revision 1.169
> >diff -u -r1.169 win.c
> >--- windows/win.c       2001/11/14 21:28:37     1.169
> >+++ windows/win.c       2001/11/17 12:40:39
> >@@ -1852,10 +1852,10 @@
> >             return 0;
> >         }
> >         /* Special case for dialog window procedure */
> >+
> >+        retvalue = *(LONG *)(((char *)wndPtr->wExtra) + offset);
> >         if ((offset == DWL_DLGPROC) && (wndPtr->flags &
> >WIN_ISDIALOG))

it ^^^ folded in the mail here.

> >             retvalue = (LONG)WINPROC_GetProc( (HWINDOWPROC)retvalue,
> >type );

and ^^ here
> >-        else
> >-            retvalue = *(LONG *)(((char *)wndPtr->wExtra) + offset);
> >         WIN_ReleasePtr( wndPtr );
> >         return retvalue;
> >     }?

And this ^^^^^ looks like garbage.  The line ends with }.
> >
> Gerard, thanks for the patch but, I wasn't able to aply it. When I try
> to, I get the message..
>
> skipping patch.
>  patch: **** malformed patch at line 15: WIN_ISDIALOG))
>
> Any idea why I'm getting this?
>
> Thanks again,
> Rick Knight
> (rick at rlknight.com)

I don't enjoy unfolding patches, so in case you don't either, I've
attached Gerard's patch from wine-patches to try how a mime attachment
will come through.  If it comes through, it should apply clean to the
current CVS.  If not, I'll think up another way.

Lawson
-------------- next part --------------
Index: windows/win.c
===================================================================
RCS file: /home/wine/wine/windows/win.c,v
retrieving revision 1.169
diff -u -r1.169 win.c
--- windows/win.c	2001/11/14 21:28:37	1.169
+++ windows/win.c	2001/11/17 12:40:39
@@ -1852,10 +1852,10 @@
             return 0;
         }
         /* Special case for dialog window procedure */
+
+        retvalue = *(LONG *)(((char *)wndPtr->wExtra) + offset);
         if ((offset == DWL_DLGPROC) && (wndPtr->flags & WIN_ISDIALOG))
             retvalue = (LONG)WINPROC_GetProc( (HWINDOWPROC)retvalue, type );
-        else
-            retvalue = *(LONG *)(((char *)wndPtr->wExtra) + offset);
         WIN_ReleasePtr( wndPtr );
         return retvalue;
     }