Includes [4] shlwapi

Juan Lang juan_lang at yahoo.com
Tue Dec 7 11:36:03 CST 2004


Jon, are you sure about removing the winnls.h includes?  This patch looks
suspect:

> diff -ur wine/dlls/shlwapi/url.c wine-develop/dlls/shlwapi/url.c
> --- wine/dlls/shlwapi/url.c	2004-12-03 23:27:08.000000000 -0500
> +++ wine-develop/dlls/shlwapi/url.c	2004-12-06 15:42:34.000000000 -0500
> @@ -25,8 +25,6 @@
>  #include <stdlib.h>
>  #include "windef.h"
>  #include "winbase.h"
> -#include "winnls.h"
> -#include "winerror.h"
>  #include "wine/unicode.h"
>  #include "wininet.h"
>  #include "winreg.h"
> @@ -1416,7 +1414,7 @@
>     * return the same digests for the same URL.
>     */
>    WideCharToMultiByte(0, 0, pszUrl, -1, szUrl, MAX_PATH, 0, 0);
> -  HashData((PBYTE)szUrl, (int)strlen(szUrl), lpDest, nDestLen);
> +  HashData((const BYTE*)szUrl, (int)strlen(szUrl), lpDest, nDestLen);
>    return S_OK;
>  }

winnls.h declares WideCharToMultiByte, and we just saw a compilation error
on some systems because it was missing [1].  I haven't checked others, but
this caught my eye.

[1] http://www.winehq.org/hypermail/wine-cvs/2004/12/0091.html

--Juan


		
__________________________________ 
Do you Yahoo!? 
Yahoo! Mail - Find what you need with new enhanced search.
http://info.mail.yahoo.com/mail_250



More information about the wine-devel mailing list