- wine-devel - winehq.org

Re: [resend 3/4] ddraw: Check for mipmap sublevel through caps in ddraw_surface7_SetColorKey().
by Stefan Dösinger 22 Dec '15

22 Dec '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-12-21 um 18:38 schrieb Riccardo Bortolato: > - wined3d_mutex_lock(); > - if (!surface->wined3d_texture) > - { > - wined3d_mutex_unlock(); > + if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) > return DDERR_NOTONMIPMAPSUBLEVEL; > - } > - wined3d_mutex_unlock(); This doesn't work here: ../../../../../src/wine/tools/runtest -q -P wine -T ../../.. -M ddraw.dll -p ddraw_test.exe.so ddraw7 && touch ddraw7.ok ddraw7.c:1767: Test succeeded inside todo block: Failed to set color key, hr 0. ddraw7.c:1772: Test succeeded inside todo block: Failed to get color key, hr 0. ddraw7.c:1773: Test succeeded inside todo block: Got unexpected value 0x000000ff. ddraw7.c:1775: Test succeeded inside todo block: Got unexpected value 0x000000ff. ddraw7.c:9485: Tests skipped: Overlays or some YUV formats not supported, skipping YUV colorfill tests. I guess you forgot to remove the todo_wine markers in my test. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWeb5HAAoJEN0/YqbEcdMwvQEP/0GfmyB5nebYlCy/Ffbt4lsE M5Nh6BXRnPlVbVwv1nLDEsujyfxWScAb6BHS6jx5QNnsCauv0/cpUDuzR8V4JHdf ltWqqgWBdqDJb0tG6JA89pw1sZwJxa2j92CE46GHSwozlEGX1LsufkeCJQ24XpqD rLD9TyHTTC8xncBr4BfryacbQgL+rp9OEuDLkvUqU1SyHf/OYyFuDRXhIg1rbflO 5PI+IxjFRN45sRKu4v073EcuPTM1BD8iFiAEAInhHcv+EBIHDqTmMcOl+r31w1Sb kWRcM7RMd7f2mLuWtT3UkHhRxo+nGeY3yhpQrYaKmaKJwzFGVPOfsVFPkPajIzLn iu++t1ZVX40m74WWTVJ6xPFFFaQ6CiPeFcUZquwtfaczTTba0lMwIRjpcQxdVC3R nkAZO/wWzVSWHJD4c8jB+I71uyFaE+Aj7AVLQJts8bFyyAwYizGvL2/Xn5Je1RJN PmX2HIobc0elWkL8qOpDzaJ7hRciLHXlWFB8Ce6GKHtJC90H72LgoKMaZBZFILNz EDwdvl7pMbSJJl2XqyiNmBhSVvBZMDzknLWE56qpprGkcGs6eyCSVOYSHswyDgK8 WjaFf81oQzfho+qH9as/tMRiPV/J2GZTs+IWt+47UX4bUVegTAn7wzOJRAh2tDg4 rV+rvEWoQZgm9g8lqKCq =Yx1L -----END PGP SIGNATURE-----

2 1

Re: [PATCH v2] loader: check return values of wld_mprotect and wld_mmap calls
by Sebastian Lackner 22 Dec '15

22 Dec '15

On 22.12.2015 12:22, Paul Gofman wrote: > Fixes loader crash when compiled using Intel compiler (icc 16.0.1 20151021). > > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > loader/preloader.c | 26 +++++++++++++++++--------- > 1 file changed, 17 insertions(+), 9 deletions(-) > Its not my decision, but I don't think its a good idea to add all the (unnecessary) ifs just to make this code compatible with ICC. I assume the compiler doesn't handle inline assembly correctly, but this would mean that there are several more affected places. It would be nice to have a more general solution to fix/workaround this issue. If this is not possible, I would at least suggest to add a workaround to the functions directly, instead of adding checks to all places where they are called.

3 8

Re: mmdevapi: Skip device if GetId fails (Coverity)
by Andrew Eikum 22 Dec '15

22 Dec '15

Here too, please print a WARN. Andrew On Tue, Dec 22, 2015 at 07:35:02PM +0100, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > CID 752979 > > dlls/mmdevapi/devenum.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c > index d50d206..5f0ffba 100644 > --- a/dlls/mmdevapi/devenum.c > +++ b/dlls/mmdevapi/devenum.c > @@ -1065,9 +1065,11 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA > > for (i = 0; i < MMDevice_count; ++i) > { > + HRESULT hr; > WCHAR *str; > dev = &MMDevice_head[i]->IMMDevice_iface; > - IMMDevice_GetId(dev, &str); > + hr = IMMDevice_GetId(dev, &str); > + if (FAILED(hr)) continue; > > if (str && !lstrcmpW(str, name)) > { > -- > 1.9.1 > > > >

1 0

Re: winmm: Respect return value from joyGetPos (Coverity)
by Andrew Eikum 22 Dec '15

22 Dec '15

This section is already consistently using 8-space tabs, I'd rather not break that. Also I think you should print a WARN when joyGetPos returns an error. Andrew On Tue, Dec 22, 2015 at 07:34:59PM +0100, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > CID 1261597 > > dlls/winmm/joystick.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c > index 6ac67f4..fb30ac8 100644 > --- a/dlls/winmm/joystick.c > +++ b/dlls/winmm/joystick.c > @@ -93,7 +93,8 @@ static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi > > if (joy->hCapture != hWnd) continue; > > - joyGetPos(i, &ji); > + if (joyGetPos(i, &ji) != JOYERR_NOERROR) continue; > + > pos = MAKELONG(ji.wXpos, ji.wYpos); > > if (!joy->bChanged || > -- > 1.9.1 > > > >

1 0

Re: [PATCH v3] user32: Add MOUSEHOOKSTRUCTEX to fix mouse wheel support for JA2 1.13 and other apps which use it
by André Hentschel 22 Dec '15

22 Dec '15

Am 22.12.2015 um 16:34 schrieb Kira Backes: > Hi, Welcome to Wine development! Some suggestions: I would maybe call the inner struct "mouse". What about "user32: Use MOUSEHOOKSTRUCTEX to improve mouse wheel support" as subject/title?

1 0

Help with configure.ac rule wanted
by Uwe Bonnes 22 Dec '15

22 Dec '15

Hello, for some special hardware, e.g the STLink from ST Microelectronic for debugging an programming Arm microprocessors, I have translation dlls that translates the hardware access to libusb calls. To detect libusb, until recently I added the libusb detection code from ftp://ftp.etersoft.ru/pub/people/amorozov/usb/ However recenty Alexandre did some work around the configuration area and things no longer work. I would appreciate if anybody can help me with coming up with a libusb detection rule for wine. Thanks -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 1623569 ------- Fax. 06151 1623305 ---------

3 3

Re: ws2_32: Implement automatic broadcast for UDP sockets on sendto()
by Hans Leidekker 22 Dec '15

22 Dec '15

Hi Bruno, >+ if (wsa->addr->sa_family == WS_AF_INET) >+ { >+ /* When the target IPv4 address ends in 255 we must always send it as >+ * a broadcast. Trying to send the packet without setting SO_BROADCAST >+ * results in EACCES, to avoid that we will manually enable the flag >+ * and send the packet, after that we will restore the disabled flag >+ * behavior. This is the most common estimate as the broadcast address >+ * should actually be calculated using the netmask for the interface. */ It should really be calculated using the netmask, sending a broadcast packet here is wrong if the user is not in a /24 network.

2 2

Re: ws2_32: Add WSAPoll() implementation (resend)
by Marvin 22 Dec '15

22 Dec '15

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 https://testbot.winehq.org/JobDetails.pl?Key=19092 Your paranoid android. === w7u (32 bit sock) === sock.c:640: Test failed: oob_server (ae0): not at the OOB mark: 1

1 0

Re: [PATCH 1/2] winhlp32: fix table formatting
by Nikolay Sivov 22 Dec '15

22 Dec '15

On 21.12.2015 22:59, Jean-Christophe Cardot wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=20977 > Fixes https://bugs.winehq.org/show_bug.cgi?id=14288 > > Fix bugs in the handling of the hlp values in order to generate correct > rtf tables; Read the DPI from the registry (instead of hardcoded 72); > Use font scaling (depends on the version) to compute the rtf values > so that the columns width are correct and precise (compared with MS > winhlp32.exe); Add some comments and DEFINES tu make the code easier > to understand. > This is a first step into making wine's winhlp much better at handling > hlp files and - when time permits - mvp files. > > Tested on Linux (Mageia 5) > Hi, Jean-Christophe. Thanks for working on this. Please try to split this one to several patches, for example one to introduce symbols for magic numbers, one for HLPFILE_ReadFont changes, one for DPI changes etc. It will make it much easier to read. > +#define DEFDPI 96 > +static const WCHAR logpixels_reg[] = > {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','H','a','r','d','w','a','r','e',' > ','P','r','o','f','i','l','e','s','\\','C','u','r','r','e','n','t','\\','S','o','f','t','w','a','r','e','\\','F','o','n','t','s',0}; > +static const WCHAR logpixels[] = {'L','o','g','P','i','x','e','l','s',0}; You sure you need this? Won't it work with GetDevicesCaps() on desktop HDC? Also your mail client wrapped your patch, so it can't be applied. You need to fix the way it sends inline patches, send it as attachment, or use git-send-email to do the job for you.

1 0

Re: [PATCH v3] msvcrt: Rename __libm_sse2_* functions to fix compilation, when using Intel compiler.
by Piotr Caban 22 Dec '15

22 Dec '15

> diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c > index 2459bf5..270bcda 100644 > --- a/dlls/msvcrt/math.c > +++ b/dlls/msvcrt/math.c > @@ -1980,7 +1980,7 @@ void _safe_fprem1(void) > /*********************************************************************** > * __libm_sse2_acos (MSVCRT.@) > */ The patch is still not applying cleanly. For some reason in your diff there are 8 spaces before __libm_sse2_acos while in math.c there are 2 tabs. Thanks, Piotr

2 1

Re: [PATCH v2] msvcrt: Rename __libm_sse2_* functions to fix compilation when using Intel compiler.
by Piotr Caban 22 Dec '15

22 Dec '15

On 12/22/15 11:23, Paul Gofman wrote: > +void __cdecl MSVCRT___libm_sse2_atan2(void) > { > double d1, d2; > __asm__ __volatile__( "movq %%xmm0,%0; movq %%xmm1,%1 " : "=m" > (d1), "=m" (d2) ); > @@ -2046,7 +2046,7 @@ void __cdecl __libm_sse2_atan2(void) Your mail client wraps the lines: Applying: msvcrt: Rename __libm_sse2_* functions to fix compilation when using Intel compiler. fatal: patch fragment without header at line 394: @@ -2046,7 +2046,7 @@ void __cdecl __libm_sse2_atan2(void) Thanks, Piotr

2 1

Re: [PATCH] msvcrt: change __libm_sse2_... functions internal names (exported names preserved) msvcr80, msvcr90, msvcr100, msvcr110, msvcr120: update spec file
by Piotr Caban 22 Dec '15

22 Dec '15

On 12/22/15 10:54, Paul Gofman wrote: > -void __cdecl __libm_sse2_acos(void) > +void __cdecl l__libm_sse2_acos(void) In other places where we need to rename functions "MSVCRT_" prefix is added to function name. Could you please change the function names this way? Also it will be nicer to change the commit message to something like: msvcrt: Rename __libm_sse2_* functions to fix compilation when using Intel compiler. Thanks, Piotr

2 1

Re: [PATCH 2/2] oledb32: GetConversionSize shouldn't fail for null variants. (try 2)
by Huw Davies 22 Dec '15

22 Dec '15

On Tue, Dec 22, 2015 at 09:09:46PM +1100, Alistair Leslie-Hughes wrote: > diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c > index a785457..ac2f6be 100644 > --- a/dlls/oledb32/tests/convert.c > +++ b/dlls/oledb32/tests/convert.c > @@ -2627,6 +2627,33 @@ static void test_getconversionsize(void) > ok(hr == S_OK, "got 0x%08x\n", hr); > VariantClear(&var); > > + dst_len = 78; > + V_VT(&var) = VT_NULL; > + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, NULL, &dst_len, &var); > + ok(hr == S_OK, "got 0x%08x\n", hr); > + > + dst_len = 0; > + src_len = 20; > + V_VT(&var) = VT_BSTR; > + V_BSTR(&var) = SysAllocString(strW); > + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_STR, &src_len, &dst_len, &var); > + ok(hr == S_OK, "got 0x%08x\n", hr); > + ok(dst_len == 5, "%ld\n", dst_len); > + VariantClear(&var); > + > + dst_len = 0; > + src_len = 20; > + V_VT(&var) = VT_I4; > + V_I4(&var) = 4; > + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_STR, &src_len, &dst_len, &var); > + ok(hr == S_OK, "got 0x%08x\n", hr); > + VariantClear(&var); > + > + /* On Windows dst_len will get a value of 110 but we aren't testing this parameter. */ > + V_VT(&var) = VT_NULL; > + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_STR, NULL, &dst_len, &var); > + ok(hr == S_OK, "got 0x%08x\n", hr); > + Why did you put the comment on the 2nd VT_NULL conversion rather than the first? Same goes for the unneeded dst_len initiailization (which also applies in the VT_I4 case). If would probably make more sense to group these three together, i.e. move the VT_BSTR case to the top, then have the comment, then the three tests (all of which do not need the dst_len init). Huw.

1 0

Re: [PATCH 2/2] oledb32: GetConversionSize shouldn't fail for null variants.
by Huw Davies 22 Dec '15

22 Dec '15

On Tue, Dec 22, 2015 at 06:32:04PM +1100, Alistair Leslie-Hughes wrote: > diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c > index a785457..55539f9 100644 > --- a/dlls/oledb32/tests/convert.c > +++ b/dlls/oledb32/tests/convert.c > @@ -2627,6 +2627,33 @@ static void test_getconversionsize(void) > ok(hr == S_OK, "got 0x%08x\n", hr); > VariantClear(&var); > > + dst_len = 78; > + V_VT(&var) = VT_NULL; > + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, NULL, &dst_len, &var); > + ok(hr == S_OK, "got 0x%08x\n", hr); You should test dst_len after return. Likewise below. Huw.

4 7

build Wine using Intel compiler (win32)
by Paul Gofman 22 Dec '15

22 Dec '15

Dear all, I compiled Wine with icc and found 2 issues, which I managed to fix in the code. The issues are: 1. Crash in Wine loader (at least with using Intel compiler) Checking return values from all the calls to wld_mprotect in loader/preloader.c solved the issue (apparently syscall was optimized out when return value was not used, which is likely a compiler problem) 2. msvcrt/math.c has a number of trigonometrical functions implementations named __libm_sse2_... (e. g., __libm_sse2_cos). icc substitutes these names for some of trigonometrical functions (e. g., tan is replaced internally by __libm_sse2_tan). This results in endless recursion and stack overflow both in __lib_sse2_tan and the ordinary tan function in msvcrt (which is get aliased to __libm_sse2_tan). I solved this by renaming these functions in the code but keeping the original export name through spec files. Is there any chance for such changes to find the way upstream? If yes, could you please advice how is it best to proceed: create a bug first, or just send a patch (probably 2 separate patches) to wine-patches for review? Thanks, Paul.

2 1

Re: [PATCH 1/2] oledb32: Convert to a BSTR to work out it size
by Huw Davies 22 Dec '15

22 Dec '15

On Tue, Dec 22, 2015 at 06:32:03PM +1100, Alistair Leslie-Hughes wrote: > This makes code for handling variants with DBTYPE_STR and DBTYPE_WSTR > types consistent. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/oledb32/convert.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c > index 72714d3..a87cf18 100644 > --- a/dlls/oledb32/convert.c > +++ b/dlls/oledb32/convert.c > @@ -1372,10 +1372,22 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, > switch (src_type) > { > case DBTYPE_VARIANT: > - if(V_VT((VARIANT*)src) == VT_BSTR) > - *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))+1) * sizeof(WCHAR); > + { > + VARIANT v; > + > + VariantInit(&v); > + if ((hr = VariantChangeType(&v, (VARIANT*)src, 0, VT_BSTR)) == S_OK) > + { > + *dst_len = (SysStringLen(V_BSTR(&v))+1) * sizeof(WCHAR); > + VariantClear(&v); > + } > else > + { > WARN("DBTYPE_VARIANT(%d)->DBTYPE_WSTR unimplemented\n", V_VT((VARIANT*)src)); This WARN should go away, then it will actually be consistent with the DBTYPE_STR case. Huw.

1 0

EnableShell registry key
by Ruslan Kabatsayev 22 Dec '15

22 Dec '15

Hello, Wine 1.8 announcement mentions EnableShell key: > There is an optional Start Menu in desktop mode, that can be enabled > on a per-desktop basis by setting "EnableShell" to "Y" under > HKCU\Software\Wine\Explorer\Desktops\<name>. But when I tried to use it, I failed with "Y" string key (i.e. only desktop with special name "shell" got the start button). After reading the sources that key appears to be a DWORD, so it has to be created as a DWORD with value of "1". Also, the key isn't listed @ http://wiki.winehq.org/UsefulRegistryKeys . What's it supposed to be — a string or a dword? Is it a bug in implementation, or is it a misdocumentation? And should it also be listed @ UsefulRegistryKeys? Regards, Ruslan

2 1

Re: user32: Set correct caret state in the server in SetCaretPos (try 2)
by Sebastian Lackner 21 Dec '15

21 Dec '15

On 20.12.2015 19:42, Anton Baskanov wrote: > Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> > > The code in SetCaretPos doesn't change the caret state if it's position is unchanged. > Reflect this at the server side to avoid caret corruption. > > try2: > - fixed incorrect if statement in the server > --- > dlls/user32/caret.c | 2 +- > server/protocol.def | 3 ++- > server/queue.c | 5 +++++ > 3 files changed, 8 insertions(+), 2 deletions(-) After playing around a bit more I can confirm that this is the right way to fix it. I was already about to send my sign-off, but then I noticed that it breaks ./tools/make_requests, which doesn't seem to like multiline comments in protocol.def. $ ./tools/make_requests Unrecognized syntax * -2=on if the position differs, unchanged otherwise) */ at ./tools/make_requests line 257, <PROTOCOL> line 2981. Please resend after fixing this issue (probably just make the comment a bit smaller), then I'll add my signoff. ;) Best regards, Sebastian

1 0

Re: [PATCH] d3drm/tests: Add tests for IDirect3DRM*::LoadTexture (try 3).
by Stefan Dösinger 21 Dec '15

21 Dec '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-12-18 um 14:43 schrieb Aaryaman Vasishta: > +static char *create_bitmap(const char *filename, const int w, const int h, const int type) Just fyi: The const on parameters that are passed by value (non-pointers) doesn't really do much, so we usually leave it out. Feel free to keep it though. > + /* Type 1 bitmaps are 8 bpp whereas type 2 bitmaps are 24bpp. */ > + const int bpp = type == 1 ? 8 : 24; Urk. Why not just pass the bpp? Or a "BOOL palettized"? > + unsigned char *buffer = NULL; > + DWORD written, size; > + int i, j; > + > + /* Calculate size of the BITMAPINFO header */ > + /* Space for 256 color palette would need to be allocated if the bitmap is 8bpp */ > + size = sizeof(BITMAPINFOHEADER); > + if (type == 1) > + size += sizeof(RGBQUAD)* 256; > + > + ZeroMemory(&file_header, sizeof(BITMAPFILEHEADER)); Please use memset. Applies to other places as well. > + file_header.bfType = 0x4d42; Other places in Wine add a /* "BM" */ comment to show what the magic number is. dlls/comctl32/imagelist.c uses (('M' << 8) | 'B'). > + buffer[i] = (i + rand()) % 255; Generally it is a bad idea to use random numbers in tests. It encourages random test failures :-) . I guess you want some kind of irregular pattern. You could e.g. use i % 251 (the highest prime < 256). > +static BOOL test_bitmap_data(const unsigned char *buffer1, const unsigned char *buffer2, const D3DRMIMAGE *img, const int depth, const int version) "BOOL upside_down" would be more explanatory than "version" IMO. That the upside down property is related to the version can easily be seen by checking who calls test_bitmap_data with that parameter. > + /* d3drm aligns the 24bpp texture to 4 bytes in the buffer, with one bype padding from 24bpp texture. */ > + /* The image is palettized if the total number of colors used is <= 256. */ Unless I am missing something the first comment isn't really of a concern in this codepath. > + for (i = 0; i < h; i++) > + { > + offset = version == 1 ? (w * i * 3) : (w * (h - i - 1) * 3); > + for (j = 0; j < w; j++) > + { > + val1 = buffer1[k] == buffer2[offset]; > + val2 = buffer1[k + 1] == buffer2[offset + 1]; > + val3 = buffer1[k + 2] == buffer2[offset + 2]; > + if (!(val1 && val2 && val3)) > + return FALSE; > + k += 4; > + offset += 3; > + } The 24bpp -> 32bpp comment would fit well above this code though. > + /* Test if image information matches that from the header by loading the bitmap seperately. */ "separately", according to my Thunderbird's dictionary. > + ok(check, "Cannot delete image stored in %s (error = %x).\n", file, GetLastError()); The way you're writing GetLastError values is inconsistent (%x vs %d). > +static void test_load_texture1(void) > ... > + file = create_bitmap("8bpp.bmp", 100, 100, 1); > ... > +static void test_load_texture2(void) > ... > + file = create_bitmap("palette.bmp", 3, 39, 2); > ... > +static void test_load_texture3(void) > ... > + file = create_bitmap("24bpp.bmp", 100, 100, 2); - From this it isn't obvious if e.g. the upside down reading of v2 and v3 are a property of the interface version or the input format. Please test all formats with all versions. Also consider testing what happens if a texture is created as IDirect3DRMTexture3 and QI'd to IDirect3DRMTexture1. Does it return upside down image data? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWeF7GAAoJEN0/YqbEcdMwnDsP/2rjF3YySneqr0EW+MURA7po RkUAhNBdtaLUo/iUgbAmaddv5yIm6dt0kkh02o1Ci/+iwOR+GpQ9d11B8s1R2sre T7Sg/WhObJcCVWxiUVOOppH+5Kf5HRs9SznOqPJU7K1ZhdF0+JzAAIR3+ujIb71N +YdCdS+VW1T0YoiJMFbzoO0jX0z9B/fT8DfGWFhiusWa6Be7hyXx6+N0hXh6r1BC hDTxLs91lHcPEUAkGlJVJUMwjlB2L+0YuVpZCoDF6nzrBZuOuf7oByUYgz3st5B/ nSFIc2OuW3r7U5oaGk2B/7U8fA1QJpKECJaerj1ki2LdmMplH+3Pecngizmmq4QY C8ns/DXt7szHNItM+sWTB8nvlI3lIppDV6jGJH1B/cBQDrXM5NC8V2DTqySucToV RNqCiLhiU7EDQ4TJycJJmfOonRix51qzt5fjbbrxQH53TI8mU2T9DtwklLRY3TT8 gV0SL17uiyoL3cexargXnIeov+BTOxmUYzgUpkOG4L1oPGht2ikhIQW/I5ZCs4x/ PJ3fLtMaF5lpyuXBjoThbhOzGc0TC/mXRValVvgePADNSRHbHnRnIRk12ZH7EwRI v38AtVTo83hsTZlAtgHoALy4TUkZU4wH8BPhLgC9+BRJVJ9qa+TRnugQZJYZGVDr j8860n5H0A790o6rbURT =7NBX -----END PGP SIGNATURE-----

1 0

Re: ntdll: Fix NtQueryDirectoryFile behavior on short file names on case insensitive file systems (try2)
by Ken Thomases 21 Dec '15

21 Dec '15

On Dec 21, 2015, at 11:42 AM, Piotr Caban <piotr(a)codeweavers.com> wrote: > > @@ -2214,11 +2205,7 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer > } > else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; > } > - else if ((errno == ENOENT || errno == ENOTDIR) && !get_dir_case_sensitivity(".")) > - { > - io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; > - ret = 0; > - } > + else ret = -1; Setting ret to -1 here is redundant. It will already be -1 if getattrlist() failed. Other than that, looks good to me. > } > else ret = -1; > -Ken

1 0

Re: user32: Set correct caret state in the server in SetCaretPos (try 2)
by Sebastian Lackner 21 Dec '15

21 Dec '15

On 21.12.2015 07:04, Anton Baskanov wrote: > You are right, this would fix the issue, but the Windows behavior is > different. The caret remains in it's current state if it's position is > unchanged. > I've attached a simple test application that demonstrates this. It calls > SetCaretPos on mouse button press with different positions for left and > right buttons. Thanks for providing the testcase. I didn't have time to test it on a Windows machine yet (will do that later), but under the assumption that it works as expected, your approach is indeed more correct. Nevertheless, another possible theory would be that SetCaretPos should leave the state untouched. Could you please check that, too?

1 0

Re: [PATCH 1/7] kernel32/tests: Add path tests for the unusual ./../foo case.
by Sebastian Lackner 21 Dec '15

21 Dec '15

On 21.12.2015 17:51, Jeremy White wrote: > Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> > --- > This patch series address issues found in GetLongPathName and GetShortPathName > as reported in bug https://bugs.winehq.org/show_bug.cgi?id=36859. > Thanks to Dmitry for pointing out GetShortPathName should be checked as well > and for the suggestion to use CheckNameLegalDOS8Dot3W. > --- > dlls/kernel32/tests/path.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c > index 85c4ec3..4504603 100644 > --- a/dlls/kernel32/tests/path.c > +++ b/dlls/kernel32/tests/path.c > @@ -2136,6 +2136,15 @@ static void test_relative_path(void) > ok(ret, "GetShortPathName error %d\n", GetLastError()); > ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); > > + strcpy(buf, "deadbeef"); > + ret = pGetLongPathNameA(".\\..\\foo\\file", buf, MAX_PATH); > + ok(ret, "GetLongPathName error %d\n", GetLastError()); > + ok(!strcmp(buf, ".\\..\\foo\\file"), "expected .\\..\\foo\\file, got %s\n", buf); > + strcpy(buf, "deadbeef"); > + ret = GetShortPathNameA(".\\..\\foo\\file", buf, MAX_PATH); > + ok(ret, "GetShortPathName error %d\n", GetLastError()); > + ok(!strcmp(buf, ".\\..\\foo\\file"), "expected .\\..\\foo\\file, got %s\n", buf); > + > SetCurrentDirectoryA(".."); > DeleteFileA("foo\\file"); > RemoveDirectoryA("foo"); > The patch causes test failures here: ../../../tools/runtest -q -P wine -T ../../.. -M kernel32.dll -p kernel32_test.exe.so path && touch path.ok path.c:2141: Test failed: GetLongPathName error 2 path.c:2142: Test failed: expected .\..\foo\file, got deadbeef [...] After applying all patches those are gone. Is todo_wine missing maybe?

1 0

Plans
by Alexandre Julliard 21 Dec '15

21 Dec '15

Folks, Wine 1.8 is released, congratulations to everybody! The development branch is now open for business, you can resend patches that had been deferred. However, I expect that things will be slow in the next couple of weeks, since many developers are leaving on vacation. I won't be around a whole lot myself either, so it may take a while before we are caught up. I will try to make a 1.9.0 release this Friday. Michael Stefaniuc is now in charge of maintaining the 1.8 stable branch. Please see http://wiki.winehq.org/StableRules for details. Happy holidays! -- Alexandre Julliard julliard(a)winehq.org

5 6

Re: [resend 2/4] ddraw7/tests: Test GetPriority() on cubemap surfaces.
by Marvin 21 Dec '15

21 Dec '15

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 https://testbot.winehq.org/JobDetails.pl?Key=19070 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2253: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. The test timed out

1 0

Re: ntdll: Fix NtQueryDirectoryFile behavior on short file names on case insensitive file systems
by Marvin 21 Dec '15

21 Dec '15

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 https://testbot.winehq.org/JobDetails.pl?Key=19069 Your paranoid android. === w1064 (32 bit directory) === directory.c:302: Test failed: incorrect long file name: L"longfilename.tmp\7434,"

1 0

Re: kernel32/tests: Add test for process object destruction.
by Marvin 21 Dec '15

21 Dec '15

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 https://testbot.winehq.org/JobDetails.pl?Key=19056 Your paranoid android. === wvistau64 (32 bit process) === process.c:2791: Test failed: WaitForSingleObject returned 258 === wvistau64 (64 bit process) === prporocess: process1 tests executed (0 marked .c:2791: Test failed: Waias todotForSingleObject ret, 0 failures), 0urned 258

2 1

Re: [PATCH] user32/tests: One more activation context test for interthread SendMessage
by Marvin 21 Dec '15

21 Dec '15

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 https://testbot.winehq.org/JobDetails.pl?Key=19044 Your paranoid android. === wvistau64 (32 bit msg) === msg.c:10623: Test failed: expected PeekMessage to return FALSE, got 1 === w1064 (32 bit msg) === msg.c:6095: Test failed: Update region shouldn't be empty msg.c:6329: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6331: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6101: Test failed: Regions are different msg.c:6101: Test failed: Regions are different msg.c:6101: Test failed: Regions are different

2 1

Re: services: Consistently use debug functions with WINE_ prefix.
by Michael Stefaniuc 21 Dec '15

21 Dec '15

On 12/21/2015 05:55 AM, Sebastian Lackner wrote: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- > > Similar mistakes exist in many of the other programs. Is this > something we want to fix for consistency reasons? I did that but the other way around aka consistently use the un-prefixed versions. > > programs/services/rpc.c | 2 +- programs/services/services.c > | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/programs/services/rpc.c b/programs/services/rpc.c > index 89a8c91..591d7d1 100644 --- a/programs/services/rpc.c +++ > b/programs/services/rpc.c @@ -1434,7 +1434,7 @@ DWORD __cdecl > svcctl_EnumServicesStatusExW( needed, returned, > wine_dbgstr_w(group)); > > if (resume_handle) - FIXME("resume handle not > supported\n"); + WINE_FIXME("resume handle not > supported\n"); > > if (!type || !state) return ERROR_INVALID_PARAMETER; diff --git > a/programs/services/services.c b/programs/services/services.c index > 1335837..2ec465e 100644 --- a/programs/services/services.c +++ > b/programs/services/services.c @@ -684,7 +684,7 @@ static DWORD > get_service_binary_path(const struct service_entry *service_entry, > strcatW( redirected, &(*path)[len] ); HeapFree( GetProcessHeap(), > 0, *path ); *path = redirected; - TRACE("redirected to > %s\n", debugstr_w(redirected)); + WINE_TRACE("redirected to > %s\n", debugstr_w(redirected)); } > > return ERROR_SUCCESS; > bye michael

1 0

Re: [PATCH] user32: Implement MOUSEHOOKSTRUCTEX
by Nikolay Sivov 21 Dec '15

21 Dec '15

On 21.12.2015 14:14, Kira Backes wrote: > - Fixes out-of-bounds access for programs which cast to MOUSEHOOKSTRUCTEX > - Fixes mouse wheel support for those programs > - Fixes Bug 38314 > > Signed-off-by: Kira Backes <kira.backes(a)nrwsoft.de> > --- > dlls/user32/message.c | 28 ++++++++++++++++------------ > include/winuser.h | 6 ++++++ > tools/winapi/tests.dat | 3 +++ > 3 files changed, 25 insertions(+), 12 deletions(-) > > diff --git a/dlls/user32/message.c b/dlls/user32/message.c > index 96e7f2e..c1fc45d 100644 > --- a/dlls/user32/message.c > +++ b/dlls/user32/message.c > @@ -2488,7 +2488,7 @@ static BOOL process_mouse_message( MSG *msg, > UINT hw_id, ULONG_PTR extra_info, H > INT hittest; > EVENTMSG event; > GUITHREADINFO info; > - MOUSEHOOKSTRUCT hook; > + MOUSEHOOKSTRUCTEX hookEx; > BOOL eatMsg; > Hi, Kira. Please keep variable name as it is, and resend using git-send-email or as an attachment - your mail client wrapped patch lines breaking a patch.

1 0

Re: [3/4 resend] riched20/tests: Add multibyte character tests for selection.
by Huw Davies 21 Dec '15

21 Dec '15

> diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c > index 6c4195c..7c7200b 100644 > --- a/dlls/riched20/tests/editor.c > +++ b/dlls/riched20/tests/editor.c > @@ -4577,6 +4577,28 @@ static void test_EM_EXSETSEL(void) > + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); > + /* 012345 6 78901 */ > + /* 10 */ I find this second comment line confusing. I assume you're trying to show that 'j' is at index 10. Either shift the '1' one place to the right so it's underneath the '0' and lose the '0' in this line, or better still just remove the second comment line completely (most people can figure out that zero after nine means ten). This obviously applies to similar lines in this patch and the next. Huw.

1 0

Re: user32: Set correct caret state in the server in SetCaretPos (try 2)
by Sebastian Lackner 20 Dec '15

20 Dec '15

On 20.12.2015 19:42, Anton Baskanov wrote: > Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> > > The code in SetCaretPos doesn't change the caret state if it's position is unchanged. > Reflect this at the server side to avoid caret corruption. > > try2: > - fixed incorrect if statement in the server > --- > dlls/user32/caret.c | 2 +- > server/protocol.def | 3 ++- > server/queue.c | 5 +++++ > 3 files changed, 8 insertions(+), 2 deletions(-) > I assume the "corruption" you mean is that the state could get out of sync between wineserver and child process. However, is there a specific reason (for example testcase) which shows that this is the right way to fix it? A different (and much easier) possibility would be: - if (ret && !hidden && (x != r.left || y != r.top)) + if (ret && !hidden && (x != r.left || y != r.top || !old_state)) Regards, Sebastian

1 0

Re: user32: Set correct caret state in the server in SetCaretPos
by Dmitry Timoshkov 20 Dec '15

20 Dec '15

Anton Baskanov <baskanov(a)gmail.com> wrote: > @@ -3040,6 +3040,10 @@ DECL_HANDLER(set_caret_info) > if (req->flags & SET_CARET_STATE) > { > if (req->state == -1) input->caret_state = !input->caret_state; > + else if (req->state == -2 && > + (req->x != reply->old_rect.left || > + req->y != reply->old_rect.top)) > + input->caret_state = 1; > else input->caret_state = !!req->state; > } If state == -2 but the additional logic won't match this would fall into unexpected 3rd case. -- Dmitry.

2 1

Re: Wine release 1.8
by Ken Thomases 19 Dec '15

19 Dec '15

On Dec 19, 2015, at 10:05 AM, Alexandre Julliard <julliard(a)winehq.org> wrote: > > The Wine team is proud to announce that the stable release Wine 1.8 > is now available. Congratulations, all! Cheers, Ken

3 2

Calling convention (__stdcall/__cdecl) mismatches between windef.h and crtdefs.h
by Bob Ha 19 Dec '15

19 Dec '15

Hi, It seems crtdefs.h uses older #ifdef checks.Depending on the inclusion order, crtdefs.h's one is being used, e.g. for msvcp*.dll's windef.h # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) crtdefs.h# ifdef __APPLE__ /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */ Is this something needed to be modified? Cheers ! Bob

2 1

Re: user32/tests: Use 'start' and 'end' variables in test comparisons
by Dmitry Timoshkov 17 Dec '15

17 Dec '15

Hugh McMaster <hugh.mcmaster(a)outlook.com> wrote: > - INT start,end; > + unsigned short start, end; This can't work. -- Dmitry.

2 4

Re: user32: Select/deselect edit field text when a combo box gets/loses focus
by Dmitry Timoshkov 17 Dec '15

17 Dec '15

Hugh McMaster <hugh.mcmaster(a)outlook.com> wrote: > --- a/dlls/user32/combo.c > +++ b/dlls/user32/combo.c > @@ -1215,7 +1215,7 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd ) > case (EN_SETFOCUS >> 8): > > TRACE("[%p]: edit [%p] got focus\n", lphc->self, lphc->hWndEdit ); > - > + SendMessageW( lphc->hWndEdit, EM_SETSEL, 0, -1 ); > COMBO_SetFocus( lphc ); > break; > > @@ -1228,7 +1228,7 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd ) > * notification (only when it happens to be a part of > * the combo). ?? - AK. > */ > - > + SendMessageW( lphc->hWndEdit, EM_SETSEL, -1, 0 ); > COMBO_KillFocus( lphc ); > break; These changes require tests to confirm their correctness, and the tests need to cover the cases when a control is part of a dialog and when it's not. -- Dmitry.

2 2

Re: [PATCH 2/2] user32/tests: Add tests for WM_DEVICECHANGE message. (try 2)
by Marvin 17 Dec '15

17 Dec '15

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 https://testbot.winehq.org/JobDetails.pl?Key=19005 Your paranoid android. === w1064 (32 bit msg) === msg.c:6139: Test failed: Update region shouldn't be empty msg.c:6373: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6375: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6145: Test failed: Regions are different msg.c:6145: Test failed: Regions are different msg.c:6145: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:4644: Test failed: ShowWindow(SW_RESTORE):overlapped: 18: the msg sequence is not complete: expected 0000 - actual 001a

1 0

Re: [PATCH 2/2] user32/tests: Add tests for WM_DEVICECHANGE message.
by Marvin 17 Dec '15

17 Dec '15

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 https://testbot.winehq.org/JobDetails.pl?Key=19004 Your paranoid android. === w1064 (32 bit msg) === msg.c:6135: Test failed: Update region shouldn't be empty msg.c:6369: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6371: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6141: Test failed: Regions are different msg.c:6141: Test failed: Regions are different msg.c:6141: Test failed: Regions are different

1 0

Re: [PATCH] d3drm/tests: Add tests for IDirect3DRM*::LoadTexture.
by Stefan Dösinger 16 Dec '15

16 Dec '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, Cool to see that you're still working on this :-) . Am 2015-12-15 um 16:41 schrieb Aaryaman Vasishta: > + * Copyright 2015 Aaryaman Vasishta I think you can make this 2014-2015. > +static char *create_testbitmap(const char *filename, LPCSTR resource) LPCSTR -> const char * is better IMO. > +{ > + static char path[MAX_PATH]; > + DWORD written; > + HANDLE file; > + HRSRC res; > + void *ptr; > + > + GetTempPathA(sizeof(path)/sizeof(WCHAR), path); Why sizeof(WCHAR)? > + lstrcatA(path, filename); > + > + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); > + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, > + GetLastError()); > + > + res = FindResourceA(GetModuleHandleA(NULL), resource, (LPCSTR)RT_RCDATA); const char * > + ok( res != 0, "couldn't find resource\n" ); > + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); > + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); > + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); > + CloseHandle( file ); You have inconsistent style here. ok(foo, "bar\n"); vs ok( foo, "bar\n" ); > +static BOOL test_bitmap_data1(unsigned char *buffer1, unsigned char *buffer2, D3DRMIMAGE *img, int w, int h, int depth) afaics you can make buffer1 and buffer2 const, probably applies to img as well. > + if (img->palette) > + { > + if (depth == 8) > + { > + for (i = 0; i < size; i++) > + { > + if (buffer1[i] != buffer2[i]) > + return FALSE; > + } > + } > + else > + { > + /* d3drm aligns the 24bpp texture to 4 bytes in the buffer, with one bype padding from 24bpp texture. */ > + /* The image is palettized if the total number of colors used is < 256. */ Does this ever happen? A palettized image with != 8 bpp? > + for (i = 0, j = 0; i < w * h; i += 3, j++) > + { > + val1 = img->palette[buffer1[j]].blue == buffer2[i]; > + val2 = img->palette[buffer1[j]].green == buffer2[i + 1]; > + val3 = img->palette[buffer1[j]].red == buffer2[i + 2]; > + if (!(val1 && val2 && val3)) > + return FALSE; > + } > + } Your indentation is wrong here. > + for (i = 0, j = 0; i < w * h; i += 4, j += 3) > + { > + val1 = buffer1[i] == buffer2[j]; > + val2 = buffer1[i + 1] == buffer2[j + 1]; > + val3 = buffer1[i + 2] == buffer2[j + 2]; > + if (!(val1 && val2 && val3)) > + return FALSE; > + } I think you're supposed to use img->bytes_per_line to advance from one line to another. See e.g. how lPitch is handled in ddraw tests. > +static void test_load_texture1(void) > +{ > + HRESULT hr; > + IDirect3DRM *d3drm1 = NULL; > + IDirect3DRMTexture *texture1 = NULL; > + D3DRMIMAGE *d3drm_img = NULL; > + HWND window; > + HBITMAP hbm = NULL; > + BITMAP bm; > + BITMAPFILEHEADER *bmp_header = NULL; > + BITMAPINFO *bmp_info = NULL; > + HANDLE hfile, hmapping = NULL; > + BOOL check; > + DWORD size; > + char *file = NULL; > + unsigned char *buffer = NULL, *buffer1 = NULL, *buffer2 = NULL; > + HDC mem_dc = NULL; > + > + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); > + file = create_testbitmap("8bpp.bmp", (LPCSTR)MAKEINTRESOURCE(IDD_BITMAPDATA_8BPP)); > + > + hbm = LoadImageA(NULL, file, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); > + ok(hbm != NULL, "Cannot load image %s (error = %x).\n", file, GetLastError()); > + > + mem_dc = CreateCompatibleDC(NULL); > + ok(mem_dc != NULL, "Cannot create memory device context.\n"); > + > + SelectObject(mem_dc, hbm); > + GetObjectA(hbm, sizeof(bm), &bm); > + > + > + /* Test if image information matches that from the header by loading the bitmap seperately. */ Two newlines. > + hfile = CreateFileA(file, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); > + ok(file != INVALID_HANDLE_VALUE, "Failed to open file at %s, error %d\n", file, > + GetLastError()); > + if (hfile == INVALID_HANDLE_VALUE) > + goto cleanup; > + > + size = GetFileSize(hfile, NULL); > + ok(size != INVALID_FILE_SIZE, "Failed to get file size, error %d\n", GetLastError()); > + if (size == INVALID_FILE_SIZE) > + goto cleanup; > + > + hmapping = CreateFileMappingA(hfile, NULL, PAGE_READONLY, 0, 0, NULL); > + ok(hmapping != NULL, "Cannot create file mapping (error = %x).\n", GetLastError()); > + if (hmapping == NULL) > + goto cleanup; > + > + buffer = MapViewOfFile(hmapping, FILE_MAP_READ, 0, 0, 0); > + ok(buffer != NULL, "Cannot create map view of file (error = %x).\n", GetLastError()); > + if (buffer == NULL) > + goto cleanup; > + > + bmp_header = (BITMAPFILEHEADER *)buffer; > + bmp_info = (BITMAPINFO *)((unsigned char *)buffer + sizeof(BITMAPFILEHEADER)); > + buffer1 = ((unsigned char *)buffer + bmp_header->bfOffBits); This seems a bit unelegant to me, but I don't have a better solution available right now. I guess something along the lines of copying the image into a DIB section with BitBlt may work. > + hr = Direct3DRMCreate(&d3drm1); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); > + > + hr = IDirect3DRM_LoadTexture(d3drm1, file, &texture1); > + ok(SUCCEEDED(hr), "Failed to load texture (hr = %x).\n", hr); > + d3drm_img = IDirect3DRMTexture_GetImage(texture1); > + todo_wine ok(d3drm_img != NULL, "Could not get a D3DRMIMAGE struct from texture.\n"); > + if (d3drm_img == NULL) > + goto cleanup; > + ok(bmp_info->bmiHeader.biWidth == d3drm_img->width, "Expected texture width == %d, got %d.\n", bmp_info->bmiHeader.biWidth, d3drm_img->width); > + ok(bmp_info->bmiHeader.biHeight == d3drm_img->height, "Expected texture height == %d, got %d.\n", bmp_info->bmiHeader.biHeight, d3drm_img->height); > + buffer2 = (unsigned char *)d3drm_img->buffer1; > + check = test_bitmap_data1(buffer2, buffer1, d3drm_img, bm.bmWidth, bm.bmHeight, bmp_info->bmiHeader.biBitCount); > + ok(check, "Buffer contents do not match that of bitmap.\n"); > + > +cleanup: > + UnmapViewOfFile(buffer); > + CloseHandle(hmapping); > + CloseHandle(hfile); > + DeleteDC(mem_dc); > + DeleteObject(hbm); > + IDirect3DRMTexture_Release(texture1); > + IDirect3DRM_Release(d3drm1); > + check = DeleteFileA(file); > + ok(check, "Cannot delete image stored in %s (error = %x).\n", file, GetLastError()); > + DestroyWindow(window); > +} > + > +static BOOL test_bitmap_data2(unsigned char *buffer1, unsigned char *buffer2, D3DRMIMAGE *img, int w, int h, int depth) If I understand it right and remember it properly from our chat, the difference is that version 2 is upside down. I think that can be handled via a parameter and without duplicating the function. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWcIZjAAoJEN0/YqbEcdMw2ZcP/3h4HmIjK2ENd0nhkj4Zae34 XgMQe9gXTRtdmsjIHgcFRDwIfxbjA0XX5CazCFAsL0cz58zzNtMUuugXBeraDzeR 7CTUNPdivsHzVm3V8hRjCDWuGSGZmVHiBNJE2OL0GKVdzYOmRWC3FOMy5ICD/ZdR GDrut5zr59vTieRZieov0Mx3jfAtWkeHLU/MVEFFljCBcUVRj1FIvClrGZDXk3Xn DW82LQrv8QXRtPh8ruLySFgeBDG0iTZ+4N6iIJwWPvd6qbg5Ku0MQOx3K8VsnQi8 7OlcQ8wzIvX8QxXsu1zBQwVNbJBQCup3zC8rqeqg27EoEYPZvQLwIAL/U7xd83Ul s8tFatOV9WD/sBmSa4XY4A1hMkgDqyhNIWrcOd6mm4hUaAbLac60NwNG6cAPtj0w fxlhIegqJ9B7Cs7xhGjFtsO5TqIeLUd0f5k6IWsgEAKv4KVz6pVYKGlrB5PM9jLw Xv8b3usjk9c3eoB5KExb/VhU6ea+sacc6XBGkEJEyu2b5r4gFNfrBRrxvOzKHJ1x xkvle6mmHSn3lxZXmvuEKHZBZPvRNDszvLX4BCuGPRRCpU4JNLY3/aF1kXpX3ks1 RwHYJU/ufJgDvLtYRnBeQOjK4cNdkZyhbH0lrkkcBig38F4xPcjjym+jdPro0X1N voYrN8i/7cKq/ASKNWAD =3KSr -----END PGP SIGNATURE-----

2 1

Re: [PATCH] d3drm/tests: Add tests for IDirect3DRM*::LoadTexture.
by Henri Verbeet 16 Dec '15

16 Dec '15

On 15 December 2015 at 17:41, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > dlls/d3drm/tests/24bpp.bmp | Bin 0 -> 195894 bytes > dlls/d3drm/tests/8bpp.bmp | Bin 0 -> 2142 bytes > dlls/d3drm/tests/Makefile.in | 4 +- > dlls/d3drm/tests/d3drm.c | 400 +++++++++++++++++++++++++++++++++++++++++++ > dlls/d3drm/tests/d3drmrs.rc | 28 +++ > dlls/d3drm/tests/palette.bmp | Bin 0 -> 30054 bytes > dlls/d3drm/tests/resources.h | 26 +++ > 7 files changed, 457 insertions(+), 1 deletion(-) > create mode 100644 dlls/d3drm/tests/24bpp.bmp > create mode 100644 dlls/d3drm/tests/8bpp.bmp > create mode 100644 dlls/d3drm/tests/d3drmrs.rc > create mode 100644 dlls/d3drm/tests/palette.bmp > create mode 100644 dlls/d3drm/tests/resources.h > I suppose I'm missing something subtle, but these bitmaps look like it would take considerably less bytes to just generate them in the test.

2 1

Re: [PATCH 2/5] wined3d: Limit the number of multisample levels reported by wined3d_check_device_multisample_type().
by Henri Verbeet 15 Dec '15

15 Dec '15

On 14 December 2015 at 23:37, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -4426,7 +4428,7 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 > if (quality_levels) > { > if (multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) > - *quality_levels = gl_info->limits.samples; > + *quality_levels = wined3d_log2i(gl_info->limits.samples); > else > *quality_levels = 1; > } I'm not sure this really makes sense. It may make sense to limit the number of non-maskable quality levels to 8, similar to how we limit e.g. shader constants and render targets for d3d9, although that would need a test and a comment. I don't see how you can justify the wined3d_log2i(). As an aside, note that we don't actually support maskable multi-sampling and would need ARB_texture_multisample for that, although applications don't seem to do a lot of masking in practice. D3d10+ only has maskable multi-sampling.

2 2

Re: [PATCH 2/2] d3dx9_36: Make DDS header the same as native. (try 5)
by Matteo Bruni 15 Dec '15

15 Dec '15

2015-12-15 9:13 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > From: Christian Costa <titan.costa(a)gmail.com> > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> The subject isn't quite right given that the caps field is still different from native. Something like "d3dx9: Improve generated DDS file header." would be better. Again, just deferring until the release, looks good enough otherwise.

1 0

Re: [PATCH 1/2] d3dx9_36/tests: Add D3DXSaveSurfaceToFileInMemory D3DXIFF_DDS tests (try 5)
by Matteo Bruni 15 Dec '15

15 Dec '15

2015-12-15 9:13 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: With the summary changed to "d3dx9/tests: Add D3DXSaveSurfaceToFileInMemory DDS header tests." or something like that this would be fine to me. Not signing off just because of the code freeze, please resend after the 1.8 release.

1 0

Re: Fwd: Patch for https://bugs.winehq.org/show_bug.cgi?id=39759 (Add support for Nvidia GTX TITAN Black card)
by Nikolay Sivov 15 Dec '15

15 Dec '15

On 15.12.2015 20:23, SpinFlo wrote: > Hi > > As said in https://bugs.winehq.org/show_bug.cgi?id=39759#c5 > > here a patch to add Support for Nvidia GTX TITAN Black card in wine, > this patch include 3 modifications: > > - Add the info for Nividia GTX TITAN Black card > - Remove a ',' in a Vram column in NVIDIA GeForce4 Ti 4200 (none of > all cards have this ',', then, i think is a typo) > - Add some spaces between columns, because the string > 'CARD_NVIDIA_GEFORCE_GTXTITANBLACK},' is too long and breaks the > look&feel code. some other intel cards have a similar problem in their > descriptions, then apply spaces un all cards to keep the equality > I can't speak for the maintainer, but it looks easier to use a shorter name than rearranging everything. > Greetings >

2 1

Bored waiting for Wine 1.8?
by Jeremy White 15 Dec '15

15 Dec '15

Have I just got the thing for you! We are *this* close to having what I consider a rational set of Windows VMs running the tests cleanly: https://www.winehq.org/~jwhite/latest.html (As a reminder, that just scrapes all the testbot vms, excludes win2k, win8 and win10, and reports any ones that are not consistently green). We have a record low of 12 failures. Woohoo! I want to remind Andrew, Francois, Jacek, Aric, Bruno, Hans, Stefan and Jacek that they agreed to work on items on this list... And for anyone looking for a new failure, we have two: http://test.winehq.org/data/ca9001d6bda3084ab9bc80baa7d6e5533252c797/win7_n… http://test.winehq.org/data/e69d9ec3c4e8829c5c18cea7d8348171d51dcd76/vista_… Act now, bugs are going fast! <grin> Cheers, Jeremy

1 0

d3d software cursor test
by Stefan Dösinger 15 Dec '15

15 Dec '15

Hi, I've written a test for d3d9 software cursors, but I'll need some help testing it on Windows. The behavior on Windows 10 is different from the one I remember from Windows 7. It doesn't affect the visual appearance of the cursor, but it does change how the test can verify the output. Please give the attached test a try on Windows. I am without my test machines right now (except for one with Win10 on it), so my abilities are somewhat limited at the moment. What I am interested in is the trace() line it writes at the end. It says if the test could read back the cursor with GetDC and/or GetFrontBufferData. Thanks, Stefan

3 3

Re: [PATCH 3/5] wined3d: Add a real implementation of wined3d_check_device_multisample_type().
by Henri Verbeet 15 Dec '15

15 Dec '15

On 14 December 2015 at 23:37, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 70857c9..f798f1d 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -185,6 +185,7 @@ void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN; > #define MAX_SAMPLER_OBJECTS 16 > #define MAX_SHADER_RESOURCE_VIEWS 128 > #define MAX_VERTEX_BLENDS 4 > +#define MAX_MULTISAMPLE_TYPES 8 > > struct min_lookup > { > @@ -3242,6 +3243,8 @@ struct wined3d_format > GLint glFormat; > GLint glType; > UINT conv_byte_count; > + GLint multisample_types_count; > + GLint multisample_types[MAX_MULTISAMPLE_TYPES]; I guess this is easy when initializing the data, but it seems a bit wasteful. Wouldn't it be nicer to store this as a 32-bit mask? It would be nice to have some basic tests for d3d10 and d3d11 as well. (See also ID3D11Device::CheckMultisampleQualityLevels())

1 0

Re: [PATCH 5/5] d3d8/tests: Port test_checkdevicemultisampletype() to d3d8.
by Marvin 14 Dec '15

14 Dec '15

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 https://testbot.winehq.org/JobDetails.pl?Key=18979 Your paranoid android. === w1064 (32 bit device) === device.c:2659: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2664: Test failed: The focus window is active. device.c:2672: Test failed: Got unexpected hr 0x88760869. device.c:2678: Test failed: Got unexpect screen size 800x600. device.c:2693: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2702: Test failed: Got unexpect screen size 800x600. device.c:2715: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2723: Test failed: Got unexpect width 640. device.c:2724: Test failed: Got unexpect height 480.

1 0

Re: ddraw/tests: Rename mips to mipmaps
by Henri Verbeet 14 Dec '15

14 Dec '15

On 13 December 2015 at 22:33, André Hentschel <nerv(a)dawncrow.de> wrote: > GCC for mips defines mips to 1, thus this file won't build with a mips compiler without this patch > I think -std=c90 should help with that, although there may be some instances of e.g. "inline" and "typeof" we'd need to fix. Still, I like "mipmaps" better than "mips", even though it's supposed to be called "mipmap_count".

1 0

Re: ddraw/tests: Rename mips to mipmaps
by Marvin 13 Dec '15

13 Dec '15

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 https://testbot.winehq.org/JobDetails.pl?Key=18975 Your paranoid android. === w1064 (32 bit dsurface) === dsurface.c:296: Test failed: Destination data after blitting is not correct dsurface.c:330: Test failed: Destination data after blitting is not correct dsurface.c:509: Test failed: Surface data after srckey blit does not match dsurface.c:534: Test failed: Surface data after src override key blit does not match dsurface.c:588: Test failed: Surface data after dest key blit does not match dsurface.c:614: Test failed: Surface data after dest key override blit does not match dsurface.c:676: Test failed: Surface data with src key and dest key blit does not match

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel