September 2011 - Wine-devel

gdiplus/tests: Don't fail if Microsoft Sans Serif and Times New Roman are not installed.
by Francois Gouget 08 Sep '11

08 Sep '11

In Wine, accept their fallbacks if the native fonts are not installed. --- This is an alternative patch which is more strict as it only allows the hardcoded fallbacks, and only if running in Wine. diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 323461a..9c261d9 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -34,6 +34,7 @@ static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; +static const WCHAR LiberationSerif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0}; static void test_createfont(void) { @@ -289,42 +290,52 @@ static void test_getgenerics (void) GpStatus stat; GpFontFamily* family; WCHAR familyName[LF_FACESIZE]; + int has_native; ZeroMemory(familyName, sizeof(familyName)/sizeof(WCHAR)); + stat = GdipCreateFontFamilyFromName(MicrosoftSansSerif, NULL, &family); + has_native = (stat != FontFamilyNotFound); + if (!has_native) + skip("Microsoft Sans Serif is missing\n"); stat = GdipGetGenericFontFamilySansSerif (&family); - if (stat == FontFamilyNotFound) + expect (Ok, stat); + if (stat != FontFamilyNotFound) { - skip("Microsoft Sans Serif not installed\n"); - goto serif; + stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); + expect (Ok, stat); + /* Wine uses Tahoma as a fallback if Microsoft Sans Serif is missing */ + ok (lstrcmpiW(familyName, MicrosoftSansSerif) == 0 || + (strcmp(winetest_platform, "wine") == 0 && !has_native && + lstrcmpiW(familyName, Tahoma) == 0), + "Expected Microsoft Sans Serif or a fallback, got %s\n", wine_dbgstr_w(familyName)); + stat = GdipDeleteFontFamily (family); + expect (Ok, stat); } - expect (Ok, stat); - stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); - expect (Ok, stat); - if (!lstrcmpiW(familyName, Tahoma)) - todo_wine ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0), - "Expected Microsoft Sans Serif, got Tahoma\n"); - else - ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0), - "Expected Microsoft Sans Serif, got %s\n", wine_dbgstr_w(familyName)); - stat = GdipDeleteFontFamily (family); - expect (Ok, stat); -serif: + /* First check that Times New Roman is installed because if not + * Wine substitutes another serif font. + */ + stat = GdipCreateFontFamilyFromName(TimesNewRoman, NULL, &family); + has_native = (stat != FontFamilyNotFound); + if (!has_native) + skip("Times New Roman is missing\n"); stat = GdipGetGenericFontFamilySerif (&family); - if (stat == FontFamilyNotFound) + expect (Ok, stat); + if (stat != FontFamilyNotFound) { - skip("Times New Roman not installed\n"); - goto monospace; + stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); + expect (Ok, stat); + /* Wine uses Liberation Serif as a fallback if Times New Roman + * is missing + */ + ok (lstrcmpiW(familyName, TimesNewRoman) == 0 || + (strcmp(winetest_platform, "wine") == 0 && !has_native && + lstrcmpiW(familyName, LiberationSerif) == 0), + "Expected Times New Roman or a fallback, got %s\n", wine_dbgstr_w(familyName)); + stat = GdipDeleteFontFamily (family); + expect (Ok, stat); } - expect (Ok, stat); - stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); - expect (Ok, stat); - ok (lstrcmpiW(familyName, TimesNewRoman) == 0, - "Expected Times New Roman, got %s\n", wine_dbgstr_w(familyName)); - stat = GdipDeleteFontFamily (family); - expect (Ok, stat); -monospace: stat = GdipGetGenericFontFamilyMonospace (&family); if (stat == FontFamilyNotFound) { -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ If you think the whole world revolves around you, quit staring at the GPS display while driving.

1 0

Re: [PATCH 1/2] mmdevapi: IsFormatSupported fills closest match iff it returns S_FALSE.
by Andrew Eikum 08 Sep '11

08 Sep '11

It would be nice to have tests for this, and a fix for coreaudio if needed. Likewise for patch 2/2. Are these part of the tests you're planning on submitting after you get the fixes in? Andrew On Thu, Sep 08, 2011 at 04:09:37PM +0200, Joerg-Cyril.Hoehle(a)t-systems.com wrote: > Hi, > > Wine is currently leaking memory because of this bug. > My tests show that S_FALSE indicates a format suggestion, > otherwise the out pointer is NULL. > I think MSDN says that, but it's not particularly clear. > > Regards, > Jörg Höhle >

1 0

Re: dinput: Remove an unused debug channel.
by Lucas Zawacki 08 Sep '11

08 Sep '11

err.. I know there's no debugging going on right now, but I'm planning on submiting a couple more patches to this file and I'll print some debug info then. 2011/9/8 Francois Gouget <fgouget(a)free.fr>: > --- > dlls/dinput/config.c | 2 -- > 1 files changed, 0 insertions(+), 2 deletions(-) > > diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c > index 1c6da6c..aedaa0e 100644 > --- a/dlls/dinput/config.c > +++ b/dlls/dinput/config.c > @@ -16,14 +16,12 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > > -#include "wine/debug.h" > #include "wine/unicode.h" > #include "objbase.h" > #include "dinput_private.h" > #include "device_private.h" > #include "resource.h" > > -WINE_DEFAULT_DEBUG_CHANNEL(dinput); > > typedef struct { > int nobjects; > -- > 1.7.5.4 > > > >

1 0

Re: cmd/tests: Add tests for combined CALLs/GOTOs
by Marvin 08 Sep '11

08 Sep '11

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=14056 Your paranoid android. === WVISTAADM (32 bit) === Failure running script in VM: The specified guest user must be logged in interactively to perform this operation

1 0

Re: comctl32: Fix the wizard and property sheet dialog styles.
by Marvin 07 Sep '11

07 Sep '11

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=14049 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [2/3] msxml3: Register XML Parser interfaces (try 2)
by Nikolay Sivov 07 Sep '11

07 Sep '11

On Wed, Sep 7, 2011 at 2:04 PM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Hi, > > > Changelog: > msxml3: Register XML Parser interfaces > Do you really need this? I think existing coclasses are registered with .idl in /msxml3. Maybe just add new .idl in it?

3 2

Re: ntdll: check for string and stringlength in _wcslwr and _wcsupr
by Octavian Voicu 07 Sep '11

07 Sep '11

2011/9/7 André Hentschel <nerv(a)dawncrow.de>: > + if (!str || !*str) return NULL; > return strlwrW( str ); >+ if (!str || !*str) return NULL; > return struprW( str ); It seems strange to return NULL when called with an empty, non-NULL string. Maybe it should be `return str' instead (so it covers both the NULL and empty cases sensibly), though strlwrW/struprW seems to be able to cope with zero-length strings as the NULL char is mapped to NULL. Octavian

1 0

Re: ntdll: check for string and stringlength in _wcslwr and _wcsupr
by Nikolay Sivov 07 Sep '11

07 Sep '11

2011/9/7 André Hentschel <nerv(a)dawncrow.de>: > Fixes http://bugs.winehq.org/show_bug.cgi?id=28303 (str="") > --- > dlls/ntdll/wcstring.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c > index 7f0035d..d75f10e 100644 > --- a/dlls/ntdll/wcstring.c > +++ b/dlls/ntdll/wcstring.c > @@ -47,6 +47,7 @@ INT __cdecl NTDLL__wcsicmp( LPCWSTR str1, LPCWSTR str2 ) > */ > LPWSTR __cdecl NTDLL__wcslwr( LPWSTR str ) > { > + if (!str || !*str) return NULL; > return strlwrW( str ); > } > > @@ -65,6 +66,7 @@ INT __cdecl NTDLL__wcsnicmp( LPCWSTR str1, LPCWSTR str2, INT n ) > */ > LPWSTR __cdecl NTDLL__wcsupr( LPWSTR str ) > { > + if (!str || !*str) return NULL; > return struprW( str ); > } > Please add tests for that.

1 0

Re: [3/3] msxml3: Support creating IXMLParser Interface (try 2)
by Nikolay Sivov 07 Sep '11

07 Sep '11

On Wed, Sep 7, 2011 at 2:05 PM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Hi, > > Use a skip if we cannot create the control. > > Changelog: > msxml3: Support creating IXMLParser Interface > > > Best Regards > Alistair Leslie-Hughes > > (not related to patch contents) First time I saw this on a list I thought - god dammit, another parser interface. But looking at methods list it's probably a first candidate to be independent from libxml2 without any loss in functionality or big overhead like XPath or XSL things. We'll see. Is it mentioned as obsolete by any chance? Seems to be a kind of low level parser.

3 3

Re: ntdll: Fix two buffer overflow conditions in RtlDosPathNameToNtPathName_U.
by Vitaliy Margolen 07 Sep '11

07 Sep '11

On 09/06/2011 06:23 AM, Octavian Voicu wrote: > First one is an off-by-one error: RtlGetFullPathName_U, on success, returns > the number of bytes written, without counting the terminating NULL. The > allocated size for ntpath->Buffer didn't account for that NULL byte, so > for UNC paths the NULL byte would be overflown. > > Second one is caused by an USHORT overflow in ntpath->MaximumLength. > Calling the function with a path longer than 65535-8 bytes would allocate > a much shorter buffer and lead to a buffer overflow. > > -- > Steps to reproduce second issue are described here: > http://packetstormsecurity.org/files/view/76170/wine-overflow.txt > > Funny fact: Windows had the same USHORT overflow bug: > http://www.securityfocus.com/archive/1/323508 > --- > dlls/ntdll/path.c | 8 +++++++- > 1 files changed, 7 insertions(+), 1 deletions(-) > > diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c > index 3207720..6138fa8 100644 > --- a/dlls/ntdll/path.c > +++ b/dlls/ntdll/path.c > @@ -383,8 +383,14 @@ BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR dos_path, > if (!(ptr = RtlAllocateHeap(GetProcessHeap(), 0, sz))) return FALSE; > sz = RtlGetFullPathName_U(dos_path, sz, ptr, file_part); > } > + sz += (1 /* NUL */ + 4 /* unc\ */ + 4 /* \??\ */) * sizeof(WCHAR); > + if (sz> MAXWORD) > + { > + if (ptr != local) RtlFreeHeap(GetProcessHeap(), 0, ptr); > + return FALSE; > + } > > - ntpath->MaximumLength = sz + (4 /* unc\ */ + 4 /* \??\ */) * sizeof(WCHAR); > + ntpath->MaximumLength = sz; > ntpath->Buffer = RtlAllocateHeap(GetProcessHeap(), 0, ntpath->MaximumLength); > if (!ntpath->Buffer) > { The fix is not entirely correct. UNICODE_STRING does not have to have a terminating \0 character. The code should not use str* functions on not zero-terminated strings. Vitaliy

2 2