Re: comctl32: Update the PROPSHEET{HEADER, PAGE} structures and add some PSH_XXX macros.

[Alexandre Julliard]

Francois Gouget  writes:
> @@ -213,6 +247,27 @@ DECL_WINELIB_TYPE_AW(PROPSHEETHEADER)
>  DECL_WINELIB_TYPE_AW(LPPROPSHEETHEADER)
>  DECL_WINELIB_TYPE_AW(LPCPROPSHEETHEADER)
>  DECL_WINELIB_TYPE_AW(LPFNPSPCALLBACK)
> +#ifdef UNICODE
> +typedef PROPSHEETPAGEW_LATEST    PROPSHEETPAGE_LATEST;
> +typedef LPPROPSHEETPAGEW_LATEST  LPPROPSHEETPAGE_LATEST;
> +typedef LPCPROPSHEETPAGEW_LATEST LPCPROPSHEETPAGE_LATEST;
> +#define PROPSHEETPAGE_V1_SIZE    PROPSHEETPAGEW_V1_SIZE
> +#define PROPSHEETPAGE_V2_SIZE    PROPSHEETPAGEW_V2_SIZE
> +#define PROPSHEETPAGE_V3_SIZE    PROPSHEETPAGEW_V3_SIZE
> +#define PROPSHEETPAGE_V4_SIZE    PROPSHEETPAGEW_V4_SIZE
> +#define PROPSHEETHEADER_V1_SIZE  PROPSHEETHEADERW_V1_SIZE
> +#define PROPSHEETHEADER_V2_SIZE  PROPSHEETHEADERW_V2_SIZE
> +#else
> +typedef PROPSHEETPAGEA_LATEST    PROPSHEETPAGE_LATEST;
> +typedef LPPROPSHEETPAGEA_LATEST  LPPROPSHEETPAGE_LATEST;
> +typedef LPCPROPSHEETPAGEA_LATEST LPCPROPSHEETPAGE_LATEST;
> +#define PROPSHEETPAGE_V1_SIZE    PROPSHEETPAGEA_V1_SIZE
> +#define PROPSHEETPAGE_V2_SIZE    PROPSHEETPAGEA_V2_SIZE
> +#define PROPSHEETPAGE_V3_SIZE    PROPSHEETPAGEA_V3_SIZE
> +#define PROPSHEETPAGE_V4_SIZE    PROPSHEETPAGEA_V4_SIZE
> +#define PROPSHEETHEADER_V1_SIZE  PROPSHEETHEADERA_V1_SIZE
> +#define PROPSHEETHEADER_V2_SIZE  PROPSHEETHEADERA_V2_SIZE
> +#endif

Please use the appropriate Winelib macros to define A/W mappings.

comctl32: Update the PROPSHEET{HEADER,PAGE} structures and add some PSH_XXX macros.

[Francois Gouget]

On Tue, 6 Sep 2011, Alexandre Julliard wrote:
[...]
> > +typedef PROPSHEETPAGEA_LATEST    PROPSHEETPAGE_LATEST;
> > +typedef LPPROPSHEETPAGEA_LATEST  LPPROPSHEETPAGE_LATEST;
> > +typedef LPCPROPSHEETPAGEA_LATEST LPCPROPSHEETPAGE_LATEST;
> > +#define PROPSHEETPAGE_V1_SIZE    PROPSHEETPAGEA_V1_SIZE
> > +#define PROPSHEETPAGE_V2_SIZE    PROPSHEETPAGEA_V2_SIZE
> > +#define PROPSHEETPAGE_V3_SIZE    PROPSHEETPAGEA_V3_SIZE
> > +#define PROPSHEETPAGE_V4_SIZE    PROPSHEETPAGEA_V4_SIZE
> > +#define PROPSHEETHEADER_V1_SIZE  PROPSHEETHEADERA_V1_SIZE
> > +#define PROPSHEETHEADER_V2_SIZE  PROPSHEETHEADERA_V2_SIZE
> > +#endif
>
> Please use the appropriate Winelib macros to define A/W mappings.

I can't because they append the A/W suffix whereas here it must be 
inserted in the middle. I could potentially define+undefine a specific 
macro just for this case if you prefer.

comctl32: Update the PROPSHEET{HEADER, PAGE} structures and add some PSH_XXX macros.

[Alexandre Julliard]

Francois Gouget  writes:
> I can't because they append the A/W suffix whereas here it must be 
> inserted in the middle. I could potentially define+undefine a specific 
> macro just for this case if you prefer.

The important thing is that the defines must not be available in Wine
code.