Re: Alexandre Julliard : winex11: Fix handling of property sizes for 64-bit platforms.

[Ken Thomases]

On Apr 7, 2008, at 6:50 AM, Alexandre Julliard wrote:
> Module: wine
> Branch: master
> Commit: 3bfa90eedafc9bd2faf9bc421caa172547e8ddd6
> URL:    http://source.winehq.org/git/wine.git/? 
> a=commit;h=3bfa90eedafc9bd2faf9bc421caa172547e8ddd6
>
> Author: Alexandre Julliard <julliard(a)winehq.org>
> Date:   Mon Apr  7 11:41:54 2008 +0200
>
> winex11: Fix handling of property sizes for 64-bit platforms.
>
> diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/ 
> clipboard.c
> index 2996857..2404a71 100644
> --- a/dlls/winex11.drv/clipboard.c
> +++ b/dlls/winex11.drv/clipboard.c
> @@ -1902,8 +1902,8 @@ static int X11DRV_CLIPBOARD_QueryAvailableData 
> (LPCLIPBOARDINFO lpcbinfo)
>          * The TARGETS property should have returned us a list of  
> atoms
>          * corresponding to each selection target format supported.
>          */
> -       if (atype == XA_ATOM || atype == x11drv_atom(TARGETS))
> -           X11DRV_CLIPBOARD_InsertSelectionProperties(display,  
> targetList, (cSelectionTargets * aformat / (8 * sizeof(Atom))));
> +       if (aformat == 32 && (atype == XA_ATOM || atype ==  
> x11drv_atom(TARGETS)))
> +           X11DRV_CLIPBOARD_InsertSelectionProperties(display,  
> targetList, cSelectionTargets);
>
> /* Free the list of targets */
>         wine_tsx11_lock();

This appears to revert a30327afef7b08d1aac1943ded64ee363a61c537.   
That commit worked around a quartz-wm bug where it responds to the  
TARGETS query with a format of 8.

-Ken

Alexandre Julliard : winex11: Fix handling of property sizes for 64-bit platforms.

[Alexandre Julliard]

Ken Thomases <ken(a)codeweavers.com> writes:
> This appears to revert a30327afef7b08d1aac1943ded64ee363a61c537.   
> That commit worked around a quartz-wm bug where it responds to the  
> TARGETS query with a format of 8.

Yes, that commit is incorrect. I'll put in a better fix.

-- 
Alexandre Julliard
julliard(a)winehq.org