Janitorial W->A cleanup objects/metafile.c dlls/gdi/mfdrv/init.c

[Huw D M Davies]

On Sun, Mar 23, 2003 at 05:43:39PM -0700, Tony Lambregts wrote:
> This one was required more that a mop and pail. In the end what I had to do 
> is convert MF_CreateMetaHeaderDisk to unicode.
> 
> One burning question I have at this point is the relative merits of using 
> RtlCreateUnicodeStringFromAsciiz vs MultiByteToWideChar
> 
> Change Log: convert MF_CreateMetaHeaderDisk to unicode and W->A clean up
> 
> Files Changed: objects/metafile.c dlls/gdi/mfdrv/init.c
> 
> -- 
> 
> Tony Lambregts

> Index: objects/metafile.c
> ===================================================================
> RCS file: /home/wine/wine/objects/metafile.c,v
> retrieving revision 1.57
> diff -u -r1.57 metafile.c
> --- objects/metafile.c	27 Feb 2003 21:09:45 -0000	1.57
> +++ objects/metafile.c	24 Mar 2003 00:49:27 -0000
> @@ -54,6 +54,9 @@
>  #include "global.h"
>  #include "wownt32.h"
>  #include "wine/debug.h"
> +#include "file.h"
> +#include "winternl.h"
> +#include "wine/unicode.h"
>  
>  WINE_DEFAULT_DEBUG_CHANNEL(metafile);
>  
> @@ -62,7 +65,7 @@
>  {
>      DWORD dw1, dw2, dw3;
>      WORD w4;
> -    CHAR filename[0x100];
> +    WCHAR filename[MAX_PATHNAME_LEN];
>  } METAHEADERDISK;
>  #include "poppack.h"


This will break compatibility with 16bit metafiles where the mf handle
is a global memory handle to the above structure.  See the comment at
the top of the file (hint, that's why this structure has elements
dw1,2,3)

Now you could create a new struct for 32bit only use if you want...

Huw.
-- 
Huw Davies
huw at codeweavers.com