Re: [ros-dev] [ros-diffs] [gbrunmar] 29384: Added context menu on right click in treeviews

[Ged]

Have any attempts been made to submit these changes to Wine?
local changes will just cause us grief further down the line.

Ged.

[e-mail] wrote:
> Author: gbrunmar
> Date: Wed Oct  3 23:45:39 2007
> New Revision: 29384
>
> URL: http://svn.reactos.org/svn/reactos?rev=29384&view=rev
> Log:
> Added context menu on right click in treeviews
>
> Modified:
>     trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
>     trunk/reactos/dll/win32/comctl32/treeview.c
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32...
> ==============================================================================
> --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Wed Oct  3 23:45:39 2007
> @@ -172,3 +172,26 @@
>       if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT)
>    infoPtr->cdmode =
>        TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect);
> +@@ -4160,6 +4158,22 @@
> static LRESULT
> TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt)
> {
>
> ++    TVHITTESTINFO ht;
> ++
> ++    ht.pt = *pPt;
> ++
> ++    TREEVIEW_HitTest(infoPtr, &ht);
> ++
> ++    if (ht.hItem)
> ++    {
> ++        /* Change to screen coordinate for WM_CONTEXTMENU */
> ++        ClientToScreen(infoPtr->hwnd, &ht.pt);
> ++
> ++        /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */
> ++        SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU,
> ++            (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y));
> ++    }
> ++
> return 0;
> }
>
> Modified: trunk/reactos/dll/win32/comctl32/treeview.c
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treeview...
> ==============================================================================
> --- trunk/reactos/dll/win32/comctl32/treeview.c (original)
> +++ trunk/reactos/dll/win32/comctl32/treeview.c Wed Oct  3 23:45:39 2007
> @@ -4158,6 +4158,22 @@
>  static LRESULT
>  TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt)
>  {
> TVHITTESTINFO ht;
> ht.pt = *pPt;
> TREEVIEW_HitTest(infoPtr, &ht);
> if (ht.hItem)
> {
>    /* Change to screen coordinate for WM_CONTEXTMENU */
>    ClientToScreen(infoPtr->hwnd, &ht.pt);
>    /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */
>    SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU,
>        (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y));
> }
> return 0;
>
> }

[Zachary Gorden]

I think those changes were taken from Wine.  Since we haven't synced in a
while, ALiENiD did a diff and applied it to our current code.

Z98

On 10/3/07, Ged [e-mail] wrote:
> Have any attempts been made to submit these changes to Wine?
> local changes will just cause us grief further down the line.
>
> Ged.
>
> [e-mail] wrote:
> > Author: gbrunmar
> > Date: Wed Oct  3 23:45:39 2007
> > New Revision: 29384
> >
> > URL: http://svn.reactos.org/svn/reactos?rev=29384&view=rev
> > Log:
> > Added context menu on right click in treeviews
> >
> > Modified:
> >     trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
> >     trunk/reactos/dll/win32/comctl32/treeview.c
> >
> > Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
> > URL:
>
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32...
> >
>
> ==============================================================================
> > --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original)
> > +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Wed Oct  3
>
> 23:45:39 2007
> > @@ -172,3 +172,26 @@
> >       if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT)
> >       infoPtr->cdmode =
> >           TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc,
>
> rect);
> > +@@ -4160,6 +4158,22 @@
> > static LRESULT
> > TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt)
> > {
> >
> > ++    TVHITTESTINFO ht;
> > ++
> > ++    ht.pt = *pPt;
> > ++
> > ++    TREEVIEW_HitTest(infoPtr, &ht);
> > ++
> > ++    if (ht.hItem)
> > ++    {
> > ++        /* Change to screen coordinate for WM_CONTEXTMENU */
> > ++        ClientToScreen(infoPtr->hwnd, &ht.pt);
> > ++
> > ++        /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP
>
> */
> > ++        SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU,
> > ++            (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y));
> > ++    }
> > ++
> > return 0;
> > }
> >
> > Modified: trunk/reactos/dll/win32/comctl32/treeview.c
> > URL:
>
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treeview...
> >
>
> ==============================================================================
> > --- trunk/reactos/dll/win32/comctl32/treeview.c (original)
> > +++ trunk/reactos/dll/win32/comctl32/treeview.c Wed Oct  3 23:45:39 2007
> > @@ -4158,6 +4158,22 @@
> >  static LRESULT
> >  TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt)
> >  {
> > TVHITTESTINFO ht;
> > ht.pt = *pPt;
> > TREEVIEW_HitTest(infoPtr, &ht);
> > if (ht.hItem)
> > {
> >    /* Change to screen coordinate for WM_CONTEXTMENU */
> >    ClientToScreen(infoPtr->hwnd, &ht.pt);
> >    /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP
>
> */
> >    SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU,
> >        (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y));
> > }
> > return 0;
> >
> > }
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

[Ged]

If that's what he did then it's wrong and needs to be reverted.
Wine dll's are autosynched using the tool Herve wrote.
The *_ros.diff files are to hold difference between Wine code and 
modification we needed to make to fix issues with the base code.
Ideally, these files should not exists. In some cases we do need them, 
but they should be a last case senario

Ged.

Zachary Gorden wrote:
> I think those changes were taken from Wine.  Since we haven't synced 
> in a while, ALiENiD did a diff and applied it to our current code.
>
> Z98
>
> On 10/3/07, * Ged* <[e-mail] mailto:[e-mail]> 
> wrote:
> Have any attempts been made to submit these changes to Wine?
> local changes will just cause us grief further down the line.
>
> Ged.
>
> [e-mail] <mailto:[e-mail]> wrote:
> > Author: gbrunmar
> > Date: Wed Oct  3 23:45:39 2007
> > New Revision: 29384
> >
> > URL: http://svn.reactos.org/svn/reactos?rev=29384&view=rev
> <http://svn.reactos.org/svn/reactos?rev=29384&view=rev>
> > Log:
> > Added context menu on right click in treeviews
> >
> > Modified:
> >     trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
> >     trunk/reactos/dll/win32/comctl32/treeview.c
> >
> > Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
> > URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32_ros.diff?rev=29384&r1=29383&r2=29384&view=diff
> <http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32_ros.diff?rev=29384&r1=29383&r2=29384&view=diff>
> >
> ==============================================================================
> > --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original)
> > +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Wed
> Oct  3 23:45:39 2007
> > @@ -172,3 +172,26 @@
> >       if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT)
> >       infoPtr->cdmode =
> >           TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT,
> hdc, rect);
> > +@@ -4160,6 +4158,22 @@
> > + static LRESULT
> > + TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt)
> > + {
> > ++    TVHITTESTINFO ht;
> > ++
> > ++    ht.pt <http://ht.pt> = *pPt;
> > ++
> > ++    TREEVIEW_HitTest(infoPtr, &ht);
> > ++
> > ++    if (ht.hItem)
> > ++    {
> > ++        /* Change to screen coordinate for WM_CONTEXTMENU */
> > ++        ClientToScreen(infoPtr->hwnd, &ht.pt);
> > ++
> > ++        /* Send a WM_CONTEXTMENU message in response to the
> RBUTTONUP */
> > ++        SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU,
> > ++            (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x , ht.pt.y));
> > ++    }
> > ++
> > +     return 0;
> > + }
> > +
> >
> > Modified: trunk/reactos/dll/win32/comctl32/treeview.c
> > URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treeview.c?rev=29384&r1=29383&r2=29384&view=diff
> <http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treeview.c?rev=29384&r1=29383&r2=29384&view=diff>
> >
> ==============================================================================
> > --- trunk/reactos/dll/win32/comctl32/treeview.c (original)
> > +++ trunk/reactos/dll/win32/comctl32/treeview.c Wed Oct  3
> 23:45:39 2007
> > @@ -4158,6 +4158,22 @@
> >  static LRESULT
> >  TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt)
> >  {
> > +    TVHITTESTINFO ht;
> > +
> > +    ht.pt <http://ht.pt> = *pPt;
> > +
> > +    TREEVIEW_HitTest(infoPtr, &ht);
> > +
> > +    if (ht.hItem)
> > +    {
> > +        /* Change to screen coordinate for WM_CONTEXTMENU */
> > +        ClientToScreen(infoPtr->hwnd, &ht.pt);
> > +
> > +        /* Send a WM_CONTEXTMENU message in response to the
> RBUTTONUP */
> > +        SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU,
> > +            (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y));
> > +    }
> > +
> >      return 0;
> >  }
> >
> >
> >
> >
> >
>
> _______________________________________________
> Ros-dev mailing list
> [e-mail] <mailto:[e-mail]>
> http://www.reactos.org/mailman/listinfo/ros-dev
>
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

[Gregor Brunmar]

This is my own code and has not been synced with Wine in any way. I made 
a small effort, but the process was too complicated, so I decided just 
to implement them in ros.

-G

Ged wrote:
> If that's what he did then it's wrong and needs to be reverted.
> Wine dll's are autosynched using the tool Herve wrote.
> The *_ros.diff files are to hold difference between Wine code and 
> modification we needed to make to fix issues with the base code.
> Ideally, these files should not exists. In some cases we do need them, 
> but they should be a last case senario
>
> Ged.
>
> Zachary Gorden wrote:
> > I think those changes were taken from Wine.  Since we haven't synced 
> > in a while, ALiENiD did a diff and applied it to our current code.
> >
> > Z98
> >
> > On 10/3/07, * Ged* <[e-mail] mailto:[e-mail]> 
> > wrote:
> > Have any attempts been made to submit these changes to Wine?
> > local changes will just cause us grief further down the line.
> >
> > Ged.
> >
> > [e-mail] <mailto:[e-mail]> wrote:
> > > Author: gbrunmar
> > > Date: Wed Oct  3 23:45:39 2007
> > > New Revision: 29384
> > >
> > > URL: http://svn.reactos.org/svn/reactos?rev=29384&view=rev
> > <http://svn.reactos.org/svn/reactos?rev=29384&view=rev>
> > > Log:
> > > Added context menu on right click in treeviews
> > >
> > > Modified:
> > >     trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
> > >     trunk/reactos/dll/win32/comctl32/treeview.c
> > >
> > > Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
> > > URL:
> > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32_ros.diff?rev=29384&r1=29383&r2=29384&view=diff
> > <http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32_ros.diff?rev=29384&r1=29383&r2=29384&view=diff>
> > >
> > ==============================================================================
> > > --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original)
> > > +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Wed
> > Oct  3 23:45:39 2007
> > > @@ -172,3 +172,26 @@
> > >       if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT)
> > >       infoPtr->cdmode =
> > >           TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT,
> > hdc, rect);
> > > +@@ -4160,6 +4158,22 @@
> > > + static LRESULT
> > > + TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt)
> > > + {
> > > ++    TVHITTESTINFO ht;
> > > ++
> > > ++    ht.pt <http://ht.pt> = *pPt;
> > > ++
> > > ++    TREEVIEW_HitTest(infoPtr, &ht);
> > > ++
> > > ++    if (ht.hItem)
> > > ++    {
> > > ++        /* Change to screen coordinate for WM_CONTEXTMENU */
> > > ++        ClientToScreen(infoPtr->hwnd, &ht.pt);
> > > ++
> > > ++        /* Send a WM_CONTEXTMENU message in response to the
> > RBUTTONUP */
> > > ++        SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU,
> > > ++            (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x , ht.pt.y));
> > > ++    }
> > > ++
> > > +     return 0;
> > > + }
> > > +
> > >
> > > Modified: trunk/reactos/dll/win32/comctl32/treeview.c
> > > URL:
> > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treeview.c?rev=29384&r1=29383&r2=29384&view=diff
> > <http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treeview.c?rev=29384&r1=29383&r2=29384&view=diff>
> > >
> > ==============================================================================
> > > --- trunk/reactos/dll/win32/comctl32/treeview.c (original)
> > > +++ trunk/reactos/dll/win32/comctl32/treeview.c Wed Oct  3
> > 23:45:39 2007
> > > @@ -4158,6 +4158,22 @@
> > >  static LRESULT
> > >  TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt)
> > >  {
> > > +    TVHITTESTINFO ht;
> > > +
> > > +    ht.pt <http://ht.pt> = *pPt;
> > > +
> > > +    TREEVIEW_HitTest(infoPtr, &ht);
> > > +
> > > +    if (ht.hItem)
> > > +    {
> > > +        /* Change to screen coordinate for WM_CONTEXTMENU */
> > > +        ClientToScreen(infoPtr->hwnd, &ht.pt);
> > > +
> > > +        /* Send a WM_CONTEXTMENU message in response to the
> > RBUTTONUP */
> > > +        SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU,
> > > +            (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y));
> > > +    }
> > > +
> > >      return 0;
> > >  }
> > >
> > >
> > >
> > >
> > >
> >
> > _______________________________________________
> > Ros-dev mailing list
> > [e-mail] <mailto:[e-mail]>
> > http://www.reactos.org/mailman/listinfo/ros-dev
> >
> >
> > Ros-dev mailing list
> > [e-mail]
> > http://www.reactos.org/mailman/listinfo/ros-dev
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

[Ged]

You can't do that, adding our own code to Wine libs is an absolute last 
resort.
This code needs to be reverted and sent to Wine via the correct channels.

Ged.

Gregor Brunmar wrote:
> This is my own code and has not been synced with Wine in any way. I 
> made a small effort, but the process was too complicated, so I decided 
> just to implement them in ros.
>
> -G
>
> Ged wrote:
> > If that's what he did then it's wrong and needs to be reverted.
> > Wine dll's are autosynched using the tool Herve wrote.
> > The *_ros.diff files are to hold difference between Wine code and 
> > modification we needed to make to fix issues with the base code.
> > Ideally, these files should not exists. In some cases we do need them, 
> > but they should be a last case senario
> >
> > Ged.
> >
> > Zachary Gorden wrote:
> > > I think those changes were taken from Wine.  Since we haven't synced 
> > > in a while, ALiENiD did a diff and applied it to our current code.
> > >
> > > Z98
> > >
> > > On 10/3/07, * Ged* <[e-mail] mailto:[e-mail]> 
> > > wrote:
> > > Have any attempts been made to submit these changes to Wine?
> > > local changes will just cause us grief further down the line.
> > >
> > > Ged.
> > >
> > > [e-mail] <mailto:[e-mail]> wrote:
> > > > Author: gbrunmar
> > > > Date: Wed Oct  3 23:45:39 2007
> > > > New Revision: 29384
> > > >
> > > > URL: http://svn.reactos.org/svn/reactos?rev=29384&view=rev
> > > <http://svn.reactos.org/svn/reactos?rev=29384&view=rev>
> > > > Log:
> > > > Added context menu on right click in treeviews
> > > >
> > > > Modified:
> > > >     trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
> > > >     trunk/reactos/dll/win32/comctl32/treeview.c
> > > >
> > > > Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
> > > > URL:
> > > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32_ros.diff?rev=29384&r1=29383&r2=29384&view=diff
> > > <http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32_ros.diff?rev=29384&r1=29383&r2=29384&view=diff>
> > > >
> > > ==============================================================================
> > > > --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original)
> > > > +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Wed
> > > Oct  3 23:45:39 2007
> > > > @@ -172,3 +172,26 @@
> > > >       if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT)
> > > >       infoPtr->cdmode =
> > > >           TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT,
> > > hdc, rect);
> > > > +@@ -4160,6 +4158,22 @@
> > > > + static LRESULT
> > > > + TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt)
> > > > + {
> > > > ++    TVHITTESTINFO ht;
> > > > ++
> > > > ++    ht.pt <http://ht.pt> = *pPt;
> > > > ++
> > > > ++    TREEVIEW_HitTest(infoPtr, &ht);
> > > > ++
> > > > ++    if (ht.hItem)
> > > > ++    {
> > > > ++        /* Change to screen coordinate for WM_CONTEXTMENU */
> > > > ++        ClientToScreen(infoPtr->hwnd, &ht.pt);
> > > > ++
> > > > ++        /* Send a WM_CONTEXTMENU message in response to the
> > > RBUTTONUP */
> > > > ++        SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU,
> > > > ++            (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x , ht.pt.y));
> > > > ++    }
> > > > ++
> > > > +     return 0;
> > > > + }
> > > > +
> > > >
> > > > Modified: trunk/reactos/dll/win32/comctl32/treeview.c
> > > > URL:
> > > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treeview.c?rev=29384&r1=29383&r2=29384&view=diff
> > > <http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treeview.c?rev=29384&r1=29383&r2=29384&view=diff>
> > > >
> > > ==============================================================================
> > > > --- trunk/reactos/dll/win32/comctl32/treeview.c (original)
> > > > +++ trunk/reactos/dll/win32/comctl32/treeview.c Wed Oct  3
> > > 23:45:39 2007
> > > > @@ -4158,6 +4158,22 @@
> > > >  static LRESULT
> > > >  TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt)
> > > >  {
> > > > +    TVHITTESTINFO ht;
> > > > +
> > > > +    ht.pt <http://ht.pt> = *pPt;
> > > > +
> > > > +    TREEVIEW_HitTest(infoPtr, &ht);
> > > > +
> > > > +    if (ht.hItem)
> > > > +    {
> > > > +        /* Change to screen coordinate for WM_CONTEXTMENU */
> > > > +        ClientToScreen(infoPtr->hwnd, &ht.pt);
> > > > +
> > > > +        /* Send a WM_CONTEXTMENU message in response to the
> > > RBUTTONUP */
> > > > +        SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU,
> > > > +            (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y));
> > > > +    }
> > > > +
> > > >      return 0;
> > > >  }
> > > >
> > > >
> > > >
> > > >
> > > >
> > >
> > > _______________________________________________
> > > Ros-dev mailing list
> > > [e-mail] <mailto:[e-mail]>
> > > http://www.reactos.org/mailman/listinfo/ros-dev
> > >
> > >
> > > Ros-dev mailing list
> > > [e-mail]
> > > http://www.reactos.org/mailman/listinfo/ros-dev
> >
> > Ros-dev mailing list
> > [e-mail]
> > http://www.reactos.org/mailman/listinfo/ros-dev
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

[Thomas Weidenmueller]

I absolutely agree. It is going to make future merges very complicated.
ROS-specific changes should be avoided unless absolutely neccessary.

Ged wrote:
> You can't do that, adding our own code to Wine libs is an absolute last 
> resort.
> This code needs to be reverted and sent to Wine via the correct channels.

[Gregor Brunmar]

If someone could help me do that, I would be greatful!

-Gregor

Thomas Weidenmueller wrote:
> I absolutely agree. It is going to make future merges very complicated.
> ROS-specific changes should be avoided unless absolutely neccessary.
>
> Ged wrote:
> > You can't do that, adding our own code to Wine libs is an absolute last 
> > resort.
> > This code needs to be reverted and sent to Wine via the correct channels.
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

[Ged]

Gregor Brunmar wrote:
> If someone could help me do that, I would be greatful!

Create a diff -u file, and send it to wine-patches with a changelog
You will need to supply your real name.

http://www.winehq.org/site/sending_patches

I can revert the shell32 patches if you're unsure about that, but only you
can submit the patch to Wine.

Ged.

This message contains confidential information and is intended only for the individual named. If you are not the named addressee you should not disseminate, distribute or copy this e-mail. Please notify the sender immediately by e-mail if you have received this e-mail by mistake and delete this e-mail from your system. E-mail transmission cannot be guaranteed to be secure or error-free as information could be intercepted, corrupted, lost, destroyed, arrive late or incomplete, or contain viruses. The sender therefore does not accept liability for any errors or omissions in the contents of this message, which arise as a result of e-mail transmission. If verification is required please request a hard-copy version.

Amteus Secure Communications Ltd
57 Cardigan Lane,
Leeds, 
LS4 2LE
t: [phone]
f: [phone]

Registered in England No 4760795

http://www.amteus.com

[Colin Finck]

> Ged wrote:
> I can revert the shell32 patches if you're unsure about that,

Is it still planned to synchronize the shell32.dll with Wine's one?
Some months ago, some things were directly changed there and recently
Johannes added new features to this DLL.

As far as I know, these changes were not submitted to Wine.
I'm also not sure if Wine would be interested in some changes like the newly
added Properties dialogs. I don't think this is a feature they need to
implement, but we need it.
Creating DIFF files here and keeping them up to date can be a pain in the
ass, especially for these big changes.

Regards,

Colin

[Ged Murphy]

I know Johannes is currently attempting a manual sync with Wine's latest
release, and I believe he has it building now.
Perhaps he can update us on the current situation?

However, I think Shell32 is going to become a problem. The implementation we
are going to need in ros is more advanced that Wine actually need.
For example, the new explorer w3seek was working on uses some fancy trickery
with some undocumented COM interfaces, as per the XP explorer.
I doubt Wine will be interested in taking patches for such features. Thomas,
any thoughts on this?

I don't think it's worth considering a complete fork just yet, Wine's
shell32 does still get quite a bit of attention, but I think we need to
consider how to best approach these things.

Ged.

On 10/9/07, Colin Finck [e-mail] wrote:
> > Ged wrote:
> > I can revert the shell32 patches if you're unsure about that,
>
> Is it still planned to synchronize the shell32.dll with Wine's one?
> Some months ago, some things were directly changed there and recently
> Johannes added new features to this DLL.
>
> As far as I know, these changes were not submitted to Wine.
> I'm also not sure if Wine would be interested in some changes like the
> newly
> added Properties dialogs. I don't think this is a feature they need to
> implement, but we need it.
> Creating DIFF files here and keeping them up to date can be a pain in the
> ass, especially for these big changes.
>
> Regards,
>
> Colin
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev