Get rid of W->A calls: LoadImageW

Huw D M Davies h.davies1 at physics.ox.ac.uk
Tue Nov 19 15:19:30 CST 2002


On Tue, Nov 19, 2002 at 09:10:31PM +0100, Stefan Leichter wrote:
> Changelog
> ------------
> 	replaced CreateDCA by CreateDCW in LoadImageW to Get rid of W->A calls
> 
> Index: wine/windows/cursoricon.c
> ===================================================================
> RCS file: /home/wine/wine/windows/cursoricon.c,v
> retrieving revision 1.56
> diff -u -r1.56 cursoricon.c
> --- wine/windows/cursoricon.c	13 Nov 2002 19:43:53 -0000	1.56
> +++ wine/windows/cursoricon.c	18 Nov 2002 21:38:42 -0000
> @@ -72,6 +72,8 @@
>  
>  static HDC screen_dc;
>  
> +static WCHAR DISPLAYW[] = {'D','I','S','P','L','A','Y',0};
> +
>  /**********************************************************************
>   * ICONCACHE for cursors/icons loaded with LR_SHARED.
>   *
> @@ -2052,7 +2054,7 @@
>          return BITMAP_Load( hinst, name, loadflags );
>  
>      case IMAGE_ICON:
> -        if (!screen_dc) screen_dc = CreateDCA( "DISPLAY", NULL, NULL, NULL );
> +        if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL );
>          if (screen_dc)
>          {
>              UINT palEnts = GetSystemPaletteEntries(screen_dc, 0, 0, NULL);
> 


I don't see the point of this at all.  Why does it matter that we're
calling CreateDCA here? it's not as if we're losing information by
converting a Unicode to an Ascii string.

Huw.



More information about the wine-devel mailing list