comctl32[2/2]: toolbar: fix the layout of TBUTTON_INFO on Win64

Dmitry Timoshkov dmitry at codeweavers.com
Sat Jan 24 23:00:25 CST 2009


"Mikolaj Zalewski" <mikolaj at zalewski.pl> wrote:

> +/* Note: TOOLBAR_DumpButton assumes the layout of the beginning of the structure
> + * is the same as of TBBUTTON */
> typedef struct
> {
>     INT iBitmap;
> @@ -96,6 +98,9 @@ typedef struct
>     BYTE  fsStyle;
>     BYTE  bHot;
>     BYTE  bDropDownPressed;
> +#ifdef _WIN64
> +    BYTE bReserved64[4];
> +#endif
>     DWORD_PTR dwData;
>     INT_PTR iString;
>     INT nRow;

Then probably it would make sense to make TBBUTTON the first member of the above
structure. That would help in avoiding possible layout problems in future.

-- 
Dmitry.



More information about the wine-devel mailing list