July 2012 - Wine-devel - list.winehq.org

Re: msvcrt: Add bsearch_s implementation by reusing code and tests from ntdll (resend)
by Alexandre Julliard 11 Jul '12

11 Jul '12

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -39,10 +44,19 @@ static void init(void) > pmemcpy_s = (void*)GetProcAddress(hmod, "memcpy_s"); > pI10_OUTPUT = (void*)GetProcAddress(hmod, "$I10_OUTPUT"); > pstrerror_s = (void *)GetProcAddress(hmod, "strerror_s"); > + pbsearch_s = (void *)GetProcAddress(hmod, "bsearch_s"); > p_get_doserrno = (void *)GetProcAddress(hmod, "_get_doserrno"); > p_get_errno = (void *)GetProcAddress(hmod, "_get_errno"); > p_set_doserrno = (void *)GetProcAddress(hmod, "_set_doserrno"); > p_set_errno = (void *)GetProcAddress(hmod, "_set_errno"); > + p_set_invalid_parameter_handler = (void *)GetProcAddress(hmod, "_set_invalid_parameter_handler"); set_invalid_parameter_handler is not exported in native so this won't test anything. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [5/5] gdiplus: Add some tests for GdipBitmapLockBits/GdipBitmapUnlockBits.
by Vincent Povirk 11 Jul '12

11 Jul '12

Shouldn't your second LockBits in this loop always use PixelFormat24bppRGB and ImageLockModeRead? As it is, if the LockBits/UnlockBits is writing but not reading, you won't be able to tell. Also, you might want to try flags == 0 in some pixel format other than 24bppRGB. As I understand it, all modes without ImageLockModeUserInputBuf are treated as read+write regardless of flags when the bitmap is locked in its native format, as an optimization. You may simply be running into that optimization. On Wed, Jul 11, 2012 at 2:49 AM, Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > With additional tests for flags set to ImageLockModeUserInputBuf only. > --- > dlls/gdiplus/tests/image.c | 184 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 184 insertions(+) > > diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c > index 29182aa..6ce100d 100644 > --- a/dlls/gdiplus/tests/image.c > +++ b/dlls/gdiplus/tests/image.c > @@ -3342,6 +3342,189 @@ todo_wine > GdipDisposeImage(image); > } > > +static void test_bitmapbits(void) > +{ > + > + static const BYTE pixels_24[24] = {0xff,0xff,0xff, 0,0,0, 0xff,0xff,0xff, 0,0,0, > + 0xff,0xff,0xff, 0,0,0, 0xff,0xff,0xff, 0,0,0}; > + static const BYTE pixels_24_00[24] = {0,0,0, 0,0,0, 0,0,0, 0,0,0, > + 0,0,0, 0,0,0, 0,0,0, 0,0,0}; > + static const BYTE pixels_24_77[32] = {0xff,0xff,0xff, 0,0,0, 0xff,0xff,0xff, 0,0,0,0x77,0x77,0x77,0x77, > + 0xff,0xff,0xff, 0,0,0, 0xff,0xff,0xff, 0,0,0,0x77,0x77,0x77,0x77}; > + static const BYTE pixels_24_88[32] = {0xff,0xff,0xff, 0,0,0, 0xff,0xff,0xff, 0,0,0,0x88,0x88,0x88,0x88, > + 0xff,0xff,0xff, 0,0,0, 0xff,0xff,0xff, 0,0,0,0x88,0x88,0x88,0x88}; > +#if 0 /* FIXME: these tests crash gdiplus in Wine */ > + static const BYTE pixels_8[8] = {0x01,0,0x01,0,0x01,0,0x01,0}; > + static const BYTE pixels_8_00[8] = {0,0,0,0,0,0,0,0}; > + static const BYTE pixels_8_77[32] = {0x01,0,0x01,0,0x77,0x77,0x77,0x77, > + 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77, > + 0x01,0,0x01,0,0x77,0x77,0x77,0x77, > + 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77}; > + static const BYTE pixels_8_88[32] = {0x01,0,0x01,0,0x88,0x88,0x88,0x88, > + 0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x88, > + 0x01,0,0x01,0,0x88,0x88,0x88,0x88, > + 0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x88}; > + static const BYTE pixels_a7[32] = {0xa7,0x77,0x77,0x77,0x77,0x77,0x77,0x77, > + 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77, > + 0xa7,0x77,0x77,0x77,0x77,0x77,0x77,0x77, > + 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77}; > + static const BYTE pixels_1[8] = {0xa0,0,0,0,0xa0,0,0,0}; > +#endif > + static const BYTE pixels_77[32] = {0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77, > + 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77, > + 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77, > + 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77}; > + static const BYTE pixels_88[32] = {0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x88, > + 0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x88, > + 0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x88, > + 0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x88}; > + static const struct test_data > + { > + PixelFormat format; > + ImageLockMode mode; > + UINT width, height, stride, size; > + const BYTE *pixels; > + const BYTE *pixels_unlocked; > + } td[] = > + { > + { PixelFormat24bppRGB, 0xfff0, 4, 2, 12, 24, pixels_24, pixels_24_00 }, > + { PixelFormat24bppRGB, 0, 4, 2, 12, 24, pixels_24, pixels_24_00 }, > + > + { PixelFormat24bppRGB, ImageLockModeRead, 4, 2, 12, 24, pixels_24, pixels_24_00 }, > + { PixelFormat24bppRGB, ImageLockModeWrite, 4, 2, 12, 24, pixels_24, pixels_24_00 }, > + { PixelFormat24bppRGB, ImageLockModeRead|ImageLockModeWrite, 4, 2, 12, 24, pixels_24, pixels_24_00 }, > + { PixelFormat24bppRGB, ImageLockModeRead|ImageLockModeUserInputBuf, 4, 2, 16, 32, pixels_24_77, pixels_24_88 }, > + { PixelFormat24bppRGB, ImageLockModeWrite|ImageLockModeUserInputBuf, 4, 2, 16, 32, pixels_77, pixels_88 }, > + { PixelFormat24bppRGB, ImageLockModeUserInputBuf, 4, 2, 16, 32, pixels_77, pixels_88 }, > +#if 0 /* FIXME: these tests crash gdiplus in Wine */ > + { PixelFormat8bppIndexed, ImageLockModeRead, 4, 2, 4, 8, pixels_8, pixels_8 }, > + { PixelFormat8bppIndexed, ImageLockModeWrite, 4, 2, 4, 8, pixels_8, pixels_8 }, > + { PixelFormat8bppIndexed, ImageLockModeRead|ImageLockModeWrite, 4, 2, 4, 8, pixels_8, pixels_8_00 }, > + { PixelFormat8bppIndexed, ImageLockModeRead|ImageLockModeUserInputBuf, 4, 2, 16, 32, pixels_8_77, pixels_8_88 }, > + { PixelFormat8bppIndexed, ImageLockModeWrite|ImageLockModeUserInputBuf, 4, 2, 16, 32, pixels_77, pixels_88 }, > + { PixelFormat8bppIndexed, ImageLockModeUserInputBuf, 4, 2, 16, 32, pixels_77, pixels_88 }, > + > + { PixelFormat1bppIndexed, ImageLockModeRead, 4, 2, 4, 8, pixels_1, pixels_1 }, > + { PixelFormat1bppIndexed, ImageLockModeWrite, 4, 2, 4, 8, pixels_1, pixels_1 }, > + { PixelFormat1bppIndexed, ImageLockModeRead|ImageLockModeWrite, 4, 2, 4, 8, pixels_1, pixels_1 }, > + { PixelFormat1bppIndexed, ImageLockModeRead|ImageLockModeUserInputBuf, 4, 2, 16, 32, pixels_a7, pixels_a7 }, > +#endif > + }; > + BYTE buf[32]; > + GpStatus status; > + GpBitmap *bitmap; > + UINT i; > + BitmapData data; > + struct > + { > + ColorPalette pal; > + ARGB entries[1]; > + } palette; > + > + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) > + { > + BYTE pixels[sizeof(pixels_24)]; > + memcpy(pixels, pixels_24, sizeof(pixels_24)); > + status = GdipCreateBitmapFromScan0(4, 2, 12, PixelFormat24bppRGB, pixels, &bitmap); > + expect(Ok, status); > + > + /* associate known palette with pixel data */ > + palette.pal.Flags = PaletteFlagsGrayScale; > + palette.pal.Count = 2; > + palette.pal.Entries[0] = 0; > + palette.pal.Entries[1] = 0xffffffff; > + status = GdipSetImagePalette((GpImage *)bitmap, &palette.pal); > + expect(Ok, status); > + > + memset(&data, 0xfe, sizeof(data)); > + if (td[i].mode & ImageLockModeUserInputBuf) > + { > + memset(buf, 0x77, sizeof(buf)); > + data.Scan0 = buf; > + data.Stride = 16; > + } > + status = GdipBitmapLockBits(bitmap, NULL, td[i].mode, td[i].format, &data); > + ok(status == Ok || broken(status == InvalidParameter) /* XP */, "%u: GdipBitmapLockBits error %d\n", i, status); > + if (status != Ok) > + { > + GdipDisposeImage((GpImage *)bitmap); > + continue; > + } > + ok(td[i].width == data.Width, "%u: expected %d, got %d\n", i, td[i].width, data.Width); > + ok(td[i].height == data.Height, "%u: expected %d, got %d\n", i, td[i].height, data.Height); > + ok(td[i].stride == data.Stride, "%u: expected %d, got %d\n", i, td[i].stride, data.Stride); > + ok(td[i].format == data.PixelFormat, "%u: expected %d, got %d\n", i, td[i].format, data.PixelFormat); > + ok(td[i].size == data.Height * data.Stride, "%u: expected %d, got %d\n", i, td[i].size, data.Height * data.Stride); > + if (td[i].mode & ImageLockModeUserInputBuf) > + ok(data.Scan0 == buf, "%u: got wrong buffer\n", i); > + if (td[i].size == data.Height * data.Stride) > + { > + int match = memcmp(data.Scan0, td[i].pixels, td[i].size) == 0; > + if ((td[i].mode & (ImageLockModeRead|ImageLockModeWrite|ImageLockModeUserInputBuf)) == ImageLockModeWrite && td[i].format != PixelFormat24bppRGB) > + ok(!match, "%u: data shouldn't match\n", i); > + else > + { > + /* copying to user buffer is very buggy even in win7 */ > + ok(match || broken(!match && (td[i].mode & ImageLockModeUserInputBuf)), > + "%u: data should match\n", i); > + if (!match) > + { > + UINT j; > + BYTE *bits = data.Scan0; > + printf("%u: data mismatch for format %#x:", i, td[i].format); > + for (j = 0; j < td[i].size; j++) > + printf(" %02x", bits[j]); > + printf("\n"); > + } > + } > + > + memset(data.Scan0, 0, td[i].size); > + } > + > + status = GdipBitmapUnlockBits(bitmap, &data); > + ok(status == Ok, "%u: GdipBitmapUnlockBits error %d\n", i, status); > + > + memset(&data, 0xfe, sizeof(data)); > + if (td[i].mode & ImageLockModeUserInputBuf) > + { > + memset(buf, 0x88, sizeof(buf)); > + data.Scan0 = buf; > + data.Stride = 16; > + } > + status = GdipBitmapLockBits(bitmap, NULL, td[i].mode, td[i].format, &data); > + ok(status == Ok, "%u: GdipBitmapLockBits error %d\n", i, status); > + ok(td[i].width == data.Width, "%u: expected %d, got %d\n", i, td[i].width, data.Width); > + ok(td[i].height == data.Height, "%u: expected %d, got %d\n", i, td[i].height, data.Height); > + ok(td[i].stride == data.Stride, "%u: expected %d, got %d\n", i, td[i].stride, data.Stride); > + ok(td[i].format == data.PixelFormat, "%u: expected %d, got %d\n", i, td[i].format, data.PixelFormat); > + ok(td[i].size == data.Height * data.Stride, "%u: expected %d, got %d\n", i, td[i].size, data.Height * data.Stride); > + if (td[i].mode & ImageLockModeUserInputBuf) > + ok(data.Scan0 == buf, "%u: got wrong buffer\n", i); > + /* copying indexed data without associated palette from BitmapData leads > + to funny effects, that's a design flaw with lock/unlock pixel data */ > + if (td[i].size == data.Height * data.Stride && !(td[i].format & PixelFormatIndexed)) > + { > + int match = memcmp(data.Scan0, td[i].pixels_unlocked, td[i].size) == 0; > + ok(match, "%u: data should match\n", i); > + if (!match) > + { > + UINT j; > + BYTE *bits = data.Scan0; > + printf("%u: data mismatch for format %#x:", i, td[i].format); > + for (j = 0; j < td[i].size; j++) > + printf(" %02x", bits[j]); > + printf("\n"); > + } > + } > + > + status = GdipBitmapUnlockBits(bitmap, &data); > + ok(status == Ok, "%u: GdipBitmapUnlockBits error %d\n", i, status); > + > + status = GdipDisposeImage((GpImage *)bitmap); > + expect(Ok, status); > + } > +} > + > START_TEST(image) > { > struct GdiplusStartupInput gdiplusStartupInput; > @@ -3354,6 +3537,7 @@ START_TEST(image) > > GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); > > + test_bitmapbits(); > test_tiff_palette(); > test_GdipGetAllPropertyItems(); > test_tiff_properties(); > -- > 1.7.11.1 > > >

2 1

Re: [PATCH 4/5] winex11: Simplify X11DRV_XRandR_Init() error handling a bit.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Henri Verbeet <hverbeet(a)codeweavers.com> writes: > @@ -276,18 +274,15 @@ void X11DRV_XRandR_Init(void) > > /* see if Xrandr is available */ > wine_tsx11_lock(); > - ok = pXRRQueryExtension(gdi_display, &xrandr_event, &xrandr_error); > - if (ok) > - { > - X11DRV_expect_error(gdi_display, XRandRErrorHandler, NULL); > - ok = pXRRQueryVersion(gdi_display, &xrandr_major, &xrandr_minor); > - if (X11DRV_check_error()) ok = FALSE; > - } > - if (ok) > - { > - TRACE("Found XRandR - major: %d, minor: %d\n", xrandr_major, xrandr_minor); > - xrandr_init_modes(); > - } > + if (!pXRRQueryExtension( gdi_display, &xrandr_event, &xrandr_error )) goto done; > + X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL ); > + if (!pXRRQueryVersion( gdi_display, &xrandr_major, &xrandr_minor )) goto done; > + if (X11DRV_check_error()) goto done; You have to call X11DRV_check_error after X11DRV_expect_error in all cases. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/2] vbscript: Added UCase implementation
by Marvin 11 Jul '12

11 Jul '12

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=19930 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/2 try2] advapi32: Pass service name as argv[0] to ServiceMain
by Marvin 11 Jul '12

11 Jul '12

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=19931 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: kernel32: implement IsValidLocaleName (as a wrapper around IsValidLocale) (2/2) (try 2)
by Alexandre Julliard 10 Jul '12

10 Jul '12

Austin English <austinenglish(a)gmail.com> writes: > @@ -2202,6 +2202,19 @@ BOOL WINAPI IsValidLocale( LCID lcid, DWORD flags ) > (LPCWSTR)LOCALE_ILANGUAGE, LANGIDFROMLCID(lcid)) != 0; > } > > +/****************************************************************************** > + * IsValidLocaleName (KERNEL32.@) > + * > + * See IsValidLocale(). > + */ > +BOOL WINAPI IsValidLocaleName( LPCWSTR locale ) > +{ > + LCID lcid; > + > + TRACE( "(%s)\n", debugstr_w(locale) ); > + lcid = LocaleNameToLCID( locale, 0 ); > + return IsValidLocale( lcid, 0 ); > +} That's probably not going to do the right thing for invalid names. Some tests would be a good idea. -- Alexandre Julliard julliard(a)winehq.org

1 0

re: Re-enable editing on the forum?
by Dan Kegel 10 Jul '12

10 Jul '12

No objection here. Seems like an obvious thing to do. I'll do it later today if nobody objects.

3 2

Re: [1/2] gdiplus: GdipBitmapLockBits should treat flags == 0 as ImageLockModeRead.
by Vincent Povirk 10 Jul '12

10 Jul '12

I think you might want (!(flags & (ImageLockModeRead|ImageLockModeWrite))), in case someone passes ImageLockModeUserInputBuf On Tue, Jul 10, 2012 at 7:45 AM, Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > --- > dlls/gdiplus/image.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c > index db79eca..45520fd 100644 > --- a/dlls/gdiplus/image.c > +++ b/dlls/gdiplus/image.c > @@ -942,6 +942,8 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, > return WrongState; > } > > + if (!flags) flags = ImageLockModeRead; > + > if (bitmap->bits && bitmap->format == format && !(flags & ImageLockModeUserInputBuf)) > { > /* no conversion is necessary; just use the bits directly */ > -- > 1.7.11.1 > > >

2 1

Re: kernel32: implement IsValidLocaleName (as a wrapper around IsValidLocale)
by Dmitry Timoshkov 10 Jul '12

10 Jul '12

Austin English <austinenglish(a)gmail.com> wrote: > +BOOL WINAPI IsValidLocaleName( LPCWSTR locale ) > +{ > + LCID lcid; > + BOOL ret; > + > + TRACE( "locale: %s\n", debugstr_w(locale) ); > + lcid = LocaleNameToLCID( locale, 0 ); > + ret = IsValidLocale( lcid, 0 ); > + return ret; > +} Avoiding (useless) intermediate variables along with the word 'locale' in the trace would be better IMO. -- Dmitry.

2 1

Re: some patches to read files faster (especially for baldur's gate and infinity engine games)
by Austin English 10 Jul '12

10 Jul '12

On Mon, Jul 9, 2012 at 2:06 PM, Emmanuel Anne <emmanuel.anne(a)gmail.com> wrote: > Hello, I installed baldur's gate lately and noticed it was still slow in > wine, especially if I install a few mods. > See the description of the bug here : > http://bugs.winehq.org/show_bug.cgi?id=17956 > > So after reading the page about case insensitive filesystems there > http://wiki.winehq.org/CaseInsensitiveFilenames > I decided that one possible solution was to have everything in lower case. > So I made a 1st patch (see attachement). > After this, installing a weidu mod in baldur's gate becomes faster, but > loading a savegame is still very slow compared to windows. > > After some more investigation using strace, it's because the program uses > NtQueryDirectoryFile to check if a file is present in the override directory > instead of trying to open it directly, which produces a getdents call in > linux, which is extremely unefficient. So I just added a short cut for this > function : if the filename argument has no wildcard, then just use stat to > return wether the file exists or not. This is in the 2nd patch. > After this, loading savegames was extremely fast, comparable to windows > speed, finally, and there are no more slowdowns in game, it runs smoothly > all the time ! > > Well I am sure you'll find I didn't make them the right way, but I hope the > ideas will be useful to you and that you'll merge them in one form or > another into wine. > Oh yes, after applying them, all the new files created by wine will be in > lower case, but you'll eventually have to convert all the files to lower > case in the wine directories (it's required at least in the baldur's gate 2 > directory). > Also having a wineprefix with mixed lower and upper case characters would > create problems. > But except that, it works excessively well ! :) > So maybe you'll want this enabled only if the user explecitely chooses to > enable it. > For me I know I'll keep it ! > I attach the simple perl script I used to convert everything to lower case. It would be great to document this patch at http://wiki.winehq.org/InterestingPatches. -- -Austin

1 0