- wine-devel - winehq.org

Re: [4/7] msvcirt: Implement ios static locking (resend)
by Piotr Caban 15 Jul '15

15 Jul '15

On 07/13/15 21:39, Iván Matellanes wrote: > > +/* ?x_lockc@ios@@0U_CRT_CRITICAL_SECTION@@A */ > +CRITICAL_SECTION ios_static_lock; > /* ?unsetf@ios@@QAEJJ@Z */ > @@ -1322,6 +1327,12 @@ static void init_io(void *base) > init_streambuf_rtti(base); > init_ios_rtti(base); > #endif > + InitializeCriticalSection(&ios_static_lock); > +} > + > +static void free_io(void) > +{ > + DeleteCriticalSection(&ios_static_lock); > } Please initialize the critical section statically (e.g. MSVCRT_file_cs is initialized that way in dlls/msvcrt/file.c). Thanks, Piotr

1 0

Re: [1/2] gdi32: EnumFontFamilies should enumerate substituted fonts when directly asked for.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > I.e. EnumFontFamilies(NULL) won't enumerate substituted fonts, but > EnumFontFamilies("MS Shell Dlg") will do. > > Part1 of the fix for bug 19289. It breaks the tests here: ../../../tools/runtest -q -P wine -T ../../.. -M gdiplus.dll -p gdiplus_test.exe.so font && touch font.ok font.c:756: Test failed: wrong face name MS Shell Dlg font.c:767: Test failed: wrong face name MS Shell Dlg -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: dwrite: Fix transform matrix usage for pixel snapping
by Marvin 14 Jul '15

14 Jul '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=15314 Your paranoid android. === wvistau64 (64 bit layout) === layout.c:3395: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 === w2008s64 (64 bit layout) === layout.c:3395: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859

1 0

Re: msxml3: Handle NULL parameter in IXMLDOMElement::get_ownerDocument().
by Nikolay Sivov 14 Jul '15

14 Jul '15

On 14.07.2015 15:09, Zhenbo Li wrote: > --- > dlls/msxml3/element.c | 2 ++ > dlls/msxml3/tests/domdoc.c | 3 +++ > 2 files changed, 5 insertions(+) > In principle this is most likely fine, but I'd really prefer to have similar test for all node types that support this method, so we can move a check directly to node_get_owner_doc(). For those additional tests it would be better to add a new test function called test_get_ownerDocument(). Next step would be to make this test run on all document versions (3, 4 and 6), but that should be a separate patch, and I'm not asking you to work on it.

1 0

Re: [1/2] windowscodecs/tests: Add some tests for loading truncated GIF images.
by Vincent Povirk 13 Jul '15

13 Jul '15

Series looks good to me, but I'm not sure what you're trying to pull by putting an obviously correct fix in a patch labeled "tests".

2 1

Re: gdiplus: Move the burden of supporting GIF encoding to the WIC backend.
by Vincent Povirk 13 Jul '15

13 Jul '15

I don't have a strong opinion on this, but committing this before we have support in WIC seems a bit sideways? What we were doing before was broken, but this just makes it broken in a different way. Before, we weren't reporting all formats native does, but now we're reporting formats we can't encode. So, this is just going to break or fix applications at random?

2 1

Re: windowscodecs: Add support for 8bpp grayscale TIFF with 8bpp alpha.
by Vincent Povirk 13 Jul '15

13 Jul '15

Looks good to me, thanks.

1 0

Re: [PATCH 4/5] wined3d: Don't run check_filter() on core contexts.
by Henri Verbeet 13 Jul '15

13 Jul '15

On 10 July 2015 at 00:06, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > The code uses glBegin() / glEnd() and other APIs removed from core > profile. > --- > In theory we could fix check_filter() to work on core profile but it > doesn't seem to be useful there. I probably agree about the limited usefulness of check_filter() on core profiles, but at the same time it seems that most of the functionality needed to make it work there would be needed for other capability tests anyway.

3 3

Re: (resend 2)[2/5]hidclass.sys: Implement a report ring buffer
by Henri Verbeet 13 Jul '15

13 Jul '15

On 10 July 2015 at 21:39, Aric Stewart <aric(a)codeweavers.com> wrote: > +typedef struct __ReportRingBuffer Did you borrow this from somewhere? Identifiers starting with double underscore are reserved. (And using a single underscore instead isn't much better.) The naming is also inconsistent with the existing code. And I have to say that goes for much of the rest of the series as well. There seems to be no consistent style from one patch to the next, and sometimes within the same structure. (E.g. __WINE_ELEMENT, __WINE_HID_REPORT, etc.) And of course most of this patch is unused code until patch 5/5 when RingBuffer_Create() is actually called. > +struct __ReportRingBuffer* RingBuffer_Create(UINT buffer_size) > +{ > + ReportRingBuffer *ring; > + ring = HeapAlloc(GetProcessHeap(), 0, sizeof(*ring)); > + if (!ring) > + return NULL; > + ring->start = ring->end = 0; > + ring->size = 32; > + ring->buffer_size = buffer_size; > + ring->pointer_alloc = 5; > + ring->pointers = HeapAlloc(GetProcessHeap(), 0, sizeof(int) * 5); > + memset(ring->pointers, 0xff, sizeof(int) * 5); > + ring->buffer = HeapAlloc(GetProcessHeap(), 0, buffer_size * ring->size); > + InitializeCriticalSection(&ring->lock); > + ring->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RingBuffer.lock"); > + return ring; > +} Why handle allocation failure for "ring", but not for "ring->pointers" and "ring->buffer"? Why did you pick "5" for the initial size of "ring->pointers"? Seems like an odd choice. > +VOID RingBuffer_Destroy(struct __ReportRingBuffer *ring) Why use "VOID"? Are you concerned "void" may not be available? > + if (size < 2 || size > 256 || size == ring->size) > + return; What's special about 2 and 256? And if this does nothing, why would you ever call the function like that? > + new_buffer = HeapAlloc(GetProcessHeap(), 0, ring->buffer_size * size); > + HeapFree(GetProcessHeap(), 0, ring->buffer); > + ring->buffer = new_buffer; Why bother with "new_buffer" if you're not going to handle failures?

2 2

Re: [PATCH 2/5] rpcrt4: Set CorrDespIncrement to the size of the (non-range) /robust payload.
by Dmitry Timoshkov 13 Jul '15

13 Jul '15

Huw Davies <huw(a)codeweavers.com> wrote: > +static void test_NdrCorrelationInitialize(void) > +{ > + MIDL_STUB_MESSAGE stub_msg; > + BYTE buf[256]; > + > + memset( &stub_msg, 0, sizeof(stub_msg) ); > + memset( buf, 0, sizeof(buf) ); > + > + NdrCorrelationInitialize( &stub_msg, buf, sizeof(buf), 0 ); > + ok( stub_msg.CorrDespIncrement == 2 || > + broken(stub_msg.CorrDespIncrement == 0), /* <= Win 2003 */ > + "got %d\n", stub_msg.CorrDespIncrement ); > + > + stub_msg.CorrDespIncrement = 1; > + NdrCorrelationInitialize( &stub_msg, buf, sizeof(buf), 0 ); > + ok( stub_msg.CorrDespIncrement == 1, "got %d\n", stub_msg.CorrDespIncrement ); > +} Probably having memset() calls before both tests would make it more convincing. -- Dmitry.

2 1

Re: (resend 2)[1/5]hidclass.sys: Implement helper IoCallMinidriver
by Henri Verbeet 13 Jul '15

13 Jul '15

On 10 July 2015 at 21:39, Aric Stewart <aric(a)codeweavers.com> wrote: > +NTSTATUS IoCallMinidriver(ULONG code, DEVICE_OBJECT *device, VOID *in_buff, ULONG in_size, VOID *out_buff, ULONG out_size) DECLSPEC_HIDDEN; This is unused until patch 3/5. It also seems like a really bad idea to name internal helper functions like Windows functions. > + if (out_size) > + { > + buffer = HeapAlloc(GetProcessHeap(), 0, out_size); > + memcpy(buffer, out_buff, out_size); > + } Either out_buff and out_size are really badly named, or this is really suspicious.

2 1

Re: [1/2] gdi32: EnumFontFamilies should enumerate substituted fonts when directly asked for.
by Marvin 13 Jul '15

13 Jul '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=15259 Your paranoid android. === w2000pro (32 bit font) === font.c:4054: Test failed: Times New Roman Baltic should be enumerated font.c:4056: Test failed: Times New Roman Baltic should be enumerated === wvistau64 (32 bit font) === The test timed out === wvistau64 (64 bit font) === The test timed out

1 0

Re: d3drm: Add stubs for IDirect3DRMDevice methods.
by Stefan Dösinger 13 Jul '15

13 Jul '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, You aren't returning the version 1 interface from QueryInterface. Am 2015-07-11 um 14:40 schrieb Aaryaman Vasishta: > if (IsEqualGUID(riid, &IID_IDirect3DRMDevice3)) > *out = (IUnknown*)&object->IDirect3DRMDevice3_iface; > - else > + else if (IsEqualGUID(riid, &IID_IDirect3DRMDevice2)) > *out = (IUnknown*)&object->IDirect3DRMDevice2_iface; > + else > + *out = (IUnknown*)&object->IDirect3DRMDevice_iface; You can call QueryInterface instead of doing GUID checks like this. Just initialize ref = 0, then call QI and you'll return a ref = 1 device. Another option, if you like this better, is to always return e.g. a IDirect3DRMDevice3 from Direct3DRMDevice_create, remove the riid parameter and do the QueryInterface in the caller. In this case init the refcount to 1 and call device3_Release in the caller after calling QI to obtain the right interface. The first 3 patches look good to me. I'll ack them tomorrow. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVok1NAAoJEN0/YqbEcdMwlFcQAJUgHXSjnseG9zIMJuKwiOoU K0IeSIAODnpT/+Mqc307owC7WBnKhTu4XLmZA1F7NxTxqdIcH85BsYx/LdLSeipq Y9KnTOg6dD00bNrujqyoZ5RmFI/pA+BXwhNXrwfbFg+RLr21ecQTpfRuDn3ENmPM VjWPHsfd4QIRqd+0Qo4LHAAS4UDmMm/avLdN+Gh5AOsDvOQYWW6reaerxYz6k61h rlkZwu1gLsSFTsA/PGz4W3nacVZkfcH8JourB80CJ/+bdPj1DfVImCpa2sx/WQ3g KMzwmR4MnS0n8/F2wGsqx/VMIKQ3zBblWVy4ZkZaMao6wA5IOoISSFXWrQlfUZrS GU5sRGwyVlaYK8qCzBOn3TdHhrrNLpg5hHkCqpN2JM1IgNYVaMevjZ+ISJhvaKXO GlQKwxOdB0M/SRWIPQ2261eQG/31lGEYm9ocu7i4USmNkaVZZCKlBt6wqsbmj6hF 7J2eU2KtfUoJwRozZRPaEdcKa0Xdp9AfrOrq4wilvEpIuUBI2leVVpOBQrbDD1c6 Z7/z8I1hmIw8ZPNl9NIIx7IyRrtnV3GBFG8rmWfRkHMMmIlZKqnC7+Yzgj5UF7Ai vr89VCzoAGj1Du/Xr8x5vmciLAdoRVNNTqV6QTPYqOgOQkodyls8RxH/IwM1sH/6 ZHUuK1kI7/vyX2WkYPi1 =1vdj -----END PGP SIGNATURE-----

3 3

Looking at Bugzilla Bug 38665 - Toontown Rewritten Launcher under Wine/FreeBSD gives "ValueError: Empty certificate data"
by Neel Chauhan 12 Jul '15

12 Jul '15

Hi, Can you please look at the Wine Bugzilla Bug 38665. The URL is: https://bugs.winehq.org/show_bug.cgi?id=38665 Thanks, Neel Chauhan

1 0

Re: (resend)[1/5]hidclass.sys: Implement helper IoCallMinidriver
by Dmitry Timoshkov 10 Jul '15

10 Jul '15

Aric Stewart <aric(a)codeweavers.com> wrote: > +HRESULT IoCallMinidriver(ULONG code, PDEVICE_OBJECT device, PVOID in_buff, ULONG in_size, PVOID out_buff, ULONG out_size) What 'HRESULT' is supposed to represent in the kernel space? (Especially when actually an NTSTATUS is being returned). That applies to all patches in the series. Also it would be nice to get rid of all LPJUNK style types used all over the place. -- Dmitry.

3 2

Re: [PATCH 5/5] wined3d: Don't install fog compatibility wrappers in core profile contexts.
by Stefan Dösinger 10 Jul '15

10 Jul '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-07-10 um 00:06 schrieb Matteo Bruni: > - if (!gl_info->supported[EXT_FOG_COORD]) > + if (!gl_info->supported[EXT_FOG_COORD] && gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) Shouldn't that depend on the chosen vertex pipeline implementation rather than the context type? I don't think we need those wrappers in legacy contexts if we're using GLSL for vertex processing. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVn66UAAoJEN0/YqbEcdMwwaMP/1NL3D/IB/tP6Ch1CH/SkwLc LVHe5/NZNTJNXCAj3EH+8yKvDZig3aC3yNemO+KZhu+UKdK4iOeoJeHGAxyu1Fa+ d4Vh8aMyG8QFfKDIiaRG8/qxL18HwBBVnp0KtAq2eOB8847XdL0sXGPW0SHiDaWZ 57oE3W85Ym1hfdn6RhRx0QGMFsLlil5d9vd6IF8yAXluItNNH+SDxdVmBwg2IfrA hpH6f5GcEtqG4VZd8ete6DwgEqEQDtvqdlRlcf/HTUSu8RF0Kr+y0SC00Q1NUfEb /QHboR9Vc1Uwca8MZqm9PgsT9aeZgHv5f7K79AewFUnHqj7ZckGM9ptHuPS2pWzM ChHNghvP22LCnhndKl71WJqFTCobGfjNwmD3+ffedBmu7UNLfl2hKSbQCpr3cCCa NDxKlUATuZWKpqJfGrcMbt10grgGolZfbGM99/ngQdeILZc7uwHXveGQJYlerrCz s89ey8dQydozL/sh9QCllcUI58DVE0DOx7rYlvI4/mZMD1+E131JAdIiqDWQYnS5 EVViK+uBXYWTGlTOg1btU9TK0gpzcBSCu3WEfV+BnjhZdR18jQfOzYD1hvy8c36A wBalWpvI6Iqbe/5f32MniyBFaJA2CCaqqZgd5sVx3Y0Y7mhfMk/kgC0vdc9h4tgh N77kUu44pDmGazZwxmjM =6Cds -----END PGP SIGNATURE-----

2 1

Re: msi/tests: Avoid test failures on win2k3.
by Marvin 10 Jul '15

10 Jul '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=15219 Your paranoid android. === wvistau64 (32 bit install) === The test timed out === w7u (32 bit install) === Failure running script in VM: timed out waiting for the child process

1 0

Re: crossover programs missing from source code
by Theodore Dubois 10 Jul '15

10 Jul '15

I'm not really interested in the source code, I just want to know what the programs do. And yes, I forgot about ntoskrnl, the only dll with an exe extension. I generated that list using ls, grep, and diff, and didn't look over it that carefully. ~Theodore On Jul 05, 2015, at 10:09 AM, Ben Klein <shacklein(a)gmail.com> wrote: In particular, all the cx* programs are Crossover-specific and should not appear in upstream wine at any point. On 6 July 2015 at 02:07, Vincent Povirk <madewokherd(a)gmail.com> wrote: The LGPL doesn't require us to publish the source code of individual .exe.so or .dll.so binaries if we're not basing them on LGPL code. I haven't checked the whole list, but most of these are programs CodeWeavers developed internally and thus controls the copyright on, and they mostly exist for integration with other components of CrossOver. That doesn't mean we can't or shouldn't publish the code, just that we probably haven't considered it. At the very least, I think we want to publish the source code of anything that exists for Windows compatibility. Note that ntoskrnl.exe is actually in the dlls/ directory of the Wine source tree, and it should be there in the CrossOver/Wine source code as well.

3 3

Re: Adding RID_TYPEHID RawInput support to user32
by Aric Stewart 10 Jul '15

10 Jul '15

On 7/6/15 10:53 AM, Nathan Schulte wrote: > On 07/06/2015 07:40 AM, Aric Stewart wrote: >> Hello there, Sorry for the delay I was away on vacation until today. >> >> Yes, RawInput support should go through hid.dll. That is actually part of the reason I am doing the hid work the ways I am doing it. I want to be able to fully and correctly support RawInput as well as dinput, xinput and winmm joysticks. >> >> For wine work, you can have all the user32 stuff using the hid.dll HidD_ and HidP_ functions as they can be considered user land work. If you find there are HidD_ or HidP_ function you need that are not implemented, then that can be done. >> >> Right now the hid.dll work has gotten in but I am just starting to get the underlying hid minidriver work in place. Without the minidriver work hid.dll will not do much. > > I found your recent discussion from April ("Wine Joysticks, seeking a plan"), as well as reviewed your current work to hid.dll. I've been learning about the stack as I go along, but it seems documented enough to get a grasp of. These are the minidrivers you're talking about? > > https://msdn.microsoft.com/en-us/library/windows/hardware/jj131707(v=vs.85)… > > You're thinking of creating one per platform/API (on the hosting side: Linux/evdev, (Unix/Linux?) X11, Unix/Mac *), or mirroring MS's setup? I'm not sure how the loading of those libraries works (I did see the HidRegisterMinidriver routine though), so maybe the question is inaccurate. So the next round of patches have been submitted so you can see my hidclass and minidriver work. The goal is to have all the system native minidriver be in the winehidminidriver.sys so that it can be independent from the graphics driver. Wine's hidclass.sys can handle multiple minidrivers in one service, so we should not need independent minidrivers for every platform. Which should be handy. > > On 07/06/2015 07:40 AM, Aric Stewart wrote: >> Yes all the user32 work will need to be done. >> >> Xinput is on my goal list also. Xinput should also be a client of hid.dll > > Sounds good. I'll try to help where I can. It sounds like I need to become more familiar with the system before I'm really useful. There are 3 places I can really use help. 1) Review patches: I always love good reviews on my patches. Leads to stronger code. 2) Above hid.dll: This is doing the development work on RawInput, Xinput, Dinput and such to become clients of the user level hid.dll functions to access joysticks and gamepads. This should mostly be learning the respective APIs and hooking them into HID. RawInput is probably the easiest as it does not do much with the HID reports other than just pass them on. 3) Linux minidrivers: I have implemented the OS/X minidriver because that is what I am most familiar with. There is work to implement the linux and linuxinput minidrivers. This is for someone familiar with or wants to become familiar with the lower level linux interfaces. -aric

3 7

wine CPU usage and CreateWaitableTimer
by andrea 09 Jul '15

09 Jul '15

Hi, I'm trying to understand why AppleWin uses 100% CPU when running in wine vs ~1% in Windows. my case is wine 1.7.43 vs Windows 7 https://appdb.winehq.org/objectManager.php?sClass=version&iId=29403 https://bugs.winehq.org/show_bug.cgi?id=34945 basically 97% time is spent in a WaitForSingleObject on a semaphore signalled by a DirectSound IReferenceClock via AdvisePeriodic. The timer period is set to 1 millisecond. I have tried an other Windows call to create the timer: CreateWaitableTimer The latter uses about 50% CPU, so it is much better, but still not very good. This is true even on a simple app that does nothing other than waiting for this timer all the time. Does anybody know 1) is this normal? should these waits be almost free like they are in Windows? 2) what is the best implemented timer in wine that can be used for a periodic event (~1ms)? Thanks

3 10

Re: [5/7] ntdll: Implement RtlDecompressFragment.
by Matteo Bruni 09 Jul '15

09 Jul '15

Hi, a bunch of nitpicks which you can take or ignore: 2015-07-09 3:07 GMT+02:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Based on a patch by Michael Müller. > > For https://bugs.winehq.org/show_bug.cgi?id=37449 > > --- > dlls/ntdll/ntdll.spec | 2 > dlls/ntdll/rtl.c | 214 ++++++++++++++++++++++++++++++++++-- > dlls/ntdll/tests/rtl.c | 3 > dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 > 4 files changed, 210 insertions(+), 11 deletions(-) > > diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec > index 75dc647..ca3561d 100644 > --- a/dlls/ntdll/ntdll.spec > +++ b/dlls/ntdll/ntdll.spec > @@ -513,7 +513,7 @@ > @ stdcall RtlDecodePointer(ptr) > # @ stub RtlDecodeSystemPointer > @ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) > -@ stub RtlDecompressFragment > +@ stdcall RtlDecompressFragment(long ptr long ptr long long ptr ptr) > @ stub RtlDefaultNpAcl > @ stub RtlDelete > @ stdcall RtlDeleteAce(ptr long) > diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c > index d9e448a..9a196d2 100644 > --- a/dlls/ntdll/rtl.c > +++ b/dlls/ntdll/rtl.c > @@ -1309,17 +1309,219 @@ NTSTATUS WINAPI RtlCompressBuffer(USHORT format, PUCHAR uncompressed, ULONG unco > } > } > > +/* decompress a single LZNT1 chunk */ > +static PUCHAR lznt1_decompress_chunk(UCHAR *dst, ULONG dst_size, UCHAR *src, ULONG src_size) PUCHAR -> UCHAR * > +{ > + UCHAR *src_cur = src, *src_end = src + src_size; > + UCHAR *dst_cur = dst, *dst_end = dst + dst_size; > + ULONG displacement_bits, length_bits; > + ULONG code_displacement, code_length; > + WORD flags, code; > + > + while (src_cur < src_end && dst_cur < dst_end) > + { > + flags = 0x8000 | *src_cur++; > + while ((flags & 0xFF00) && src_cur < src_end) It looks like we're mostly using lowercase in hex literals. > + { > + if (flags & 1) > + { > + /* backwards reference */ > + if (src_cur + sizeof(WORD) > src_end) > + return NULL; > + > + code = *(WORD *)src_cur; > + src_cur += sizeof(WORD); > + > + /* find length / displacement bits */ > + for (displacement_bits = 12; displacement_bits > 4; displacement_bits--) > + if ((1 << (displacement_bits - 1)) < dst_cur - dst) break; > + > + length_bits = 16 - displacement_bits; > + code_length = (code & ((1 << length_bits) - 1)) + 3; > + code_displacement = (code >> length_bits) + 1; > + > + if (dst_cur < dst + code_displacement) > + return NULL; > + > + /* copy bytes of chunk - we can't use memcpy() > + * since source and dest can be overlapping */ I would also mention that you can't use memmove() either because you actually want to copy any overlapping byte over and over again, as necessary. > + while (code_length--) > + { > + if (dst_cur >= dst_end) return dst_cur; > + *dst_cur = *(dst_cur - code_displacement); > + dst_cur++; > + } > + } > + else > + { > + /* uncompressed data */ > + if (dst_cur >= dst_end) return dst_cur; > + *dst_cur++ = *src_cur++; > + } > + flags >>= 1; > + } > + } > + > + return dst_cur; > +} > + > +/* decompress data encoded with LZNT1 */ > +static NTSTATUS lznt1_decompress(UCHAR *dst, ULONG dst_size, UCHAR *src, ULONG src_size, > + ULONG offset, ULONG *final_size, UCHAR *workspace) > +{ > + UCHAR *src_cur = src, *src_end = src + src_size; > + UCHAR *dst_cur = dst, *dst_end = dst + dst_size; > + ULONG chunk_size, block_size; > + WORD chunk_header; > + UCHAR *ptr; > + > + if (src_cur + sizeof(WCHAR) > src_end) > + return STATUS_BAD_COMPRESSION_BUFFER; > + > + /* skip over chunks which have a distance >= 0x1000 to the destination offset */ > + while (offset >= 0x1000 && src_cur + sizeof(WCHAR) <= src_end) > + { > + chunk_header = *(WORD *)src_cur; > + src_cur += sizeof(WCHAR); Why this mixing of WORD and WCHAR? They do match in practice but still... > + if (!chunk_header) goto out; > + chunk_size = (chunk_header & 0xFFF) + 1; > + > + if (src_cur + chunk_size > src_end) > + return STATUS_BAD_COMPRESSION_BUFFER; > + > + src_cur += chunk_size; > + offset -= 0x1000; > + } > + > + /* check if a chunk is included partially */ > + if (offset && src_cur + sizeof(WCHAR) <= src_end) > + { > + chunk_header = *(WORD *)src_cur; > + src_cur += sizeof(WCHAR); > + if (!chunk_header) goto out; > + chunk_size = (chunk_header & 0xFFF) + 1; > + > + if (src_cur + chunk_size > src_end) > + return STATUS_BAD_COMPRESSION_BUFFER; > + > + if (dst_cur >= dst_end) > + goto out; > + > + if (chunk_header & 0x8000) > + { > + /* compressed chunk */ > + if (!workspace) return STATUS_ACCESS_VIOLATION; > + ptr = lznt1_decompress_chunk(workspace, 0x1000, src_cur, chunk_size); I guess in theory you could avoid decompressing the whole chunk if you need less than the whole chunk to be decompressed. It's not strictly required though so if doing that makes the code too convoluted then ignore it. > + if (!ptr) return STATUS_BAD_COMPRESSION_BUFFER; > + if (ptr - workspace > offset) > + { > + block_size = min((ptr - workspace) - offset, dst_end - dst_cur); > + memcpy(dst_cur, workspace + offset, block_size); > + dst_cur += block_size; > + } > + } > + else > + { > + /* uncompressed chunk */ > + if (chunk_size > offset) > + { > + block_size = min(chunk_size - offset, dst_end - dst_cur); > + memcpy(dst_cur, src_cur + offset, block_size); > + dst_cur += block_size; > + } > + } > + > + src_cur += chunk_size; > + } > + > + /* remaining blocks */ > + while (src_cur + sizeof(WCHAR) <= src_end) > + { > + chunk_header = *(WORD *)src_cur; > + src_cur += sizeof(WCHAR); > + if (!chunk_header) goto out; > + chunk_size = (chunk_header & 0xFFF) + 1; > + > + if (src_cur + chunk_size > src_end) > + return STATUS_BAD_COMPRESSION_BUFFER; > + > + /* fill space with padding */ > + block_size = ((dst_cur - dst) + offset) & 0xFFF; > + if (block_size) > + { > + block_size = 0x1000 - block_size; > + if (dst_cur + block_size >= dst_end) > + goto out; > + memset(dst_cur, 0, block_size); > + dst_cur += block_size; > + } I'm probably dense but I don't follow this padding part. Don't you still need to memset to 0 the "remaining part" even if dst_end <= dst_cur + block_size (obviously stopping at dst_end) and then proceed to decompress the chunk? Unless you're not supposed to decompress the last chunk in that case? > + > + if (dst_cur >= dst_end) > + goto out; > + > + if (chunk_header & 0x8000) > + { > + /* compressed chunk */ > + dst_cur = lznt1_decompress_chunk(dst_cur, dst_end - dst_cur, src_cur, chunk_size); > + if (!dst_cur) return STATUS_BAD_COMPRESSION_BUFFER; > + } > + else > + { > + /* uncompressed chunk */ > + block_size = min(chunk_size, dst_end - dst_cur); > + memcpy(dst_cur, src_cur, block_size); > + dst_cur += block_size; > + } > + > + src_cur += chunk_size; > + } > + > +out: > + if (final_size) > + *final_size = dst_cur - dst; > + > + return STATUS_SUCCESS; > + > +} > + > +/****************************************************************************** > + * RtlDecompressFragment [NTDLL.@] > + */ > +NTSTATUS RtlDecompressFragment(USHORT format, PUCHAR uncompressed, ULONG uncompressed_size, > + PUCHAR compressed, ULONG compressed_size, ULONG offset, > + PULONG final_size, PVOID workspace) > +{ > + TRACE("0x%04x, %p, %u, %p, %u, %u, %p, %p\n", format, uncompressed, > + uncompressed_size, compressed, compressed_size, offset, final_size, workspace); > + > + switch (format & ~COMPRESSION_ENGINE_MAXIMUM) > + { > + case COMPRESSION_FORMAT_LZNT1: > + return lznt1_decompress(uncompressed, uncompressed_size, compressed, > + compressed_size, offset, final_size, workspace); > + > + case COMPRESSION_FORMAT_NONE: > + case COMPRESSION_FORMAT_DEFAULT: > + return STATUS_INVALID_PARAMETER; > + > + default: > + FIXME("format %u not implemented\n", format); > + return STATUS_UNSUPPORTED_COMPRESSION; > + } > +} > + > + > /****************************************************************************** > * RtlDecompressBuffer [NTDLL.@] > */ > -NTSTATUS WINAPI RtlDecompressBuffer(USHORT CompressionFormat, PUCHAR UncompressedBuffer, > - ULONG UncompressedBufferSize, PUCHAR CompressedBuffer, > - ULONG CompressedBufferSize, PULONG FinalUncompressedSize) > +NTSTATUS WINAPI RtlDecompressBuffer(USHORT format, PUCHAR uncompressed, ULONG uncompressed_size, > + PUCHAR compressed, ULONG compressed_size, PULONG final_size) > { > - FIXME("0x%04x, %p, %u, %p, %u, %p :stub\n", CompressionFormat, UncompressedBuffer, UncompressedBufferSize, > - CompressedBuffer, CompressedBufferSize, FinalUncompressedSize); > + TRACE("0x%04x, %p, %u, %p, %u, %p\n", format, uncompressed, > + uncompressed_size, compressed, compressed_size, final_size); > > - return STATUS_NOT_IMPLEMENTED; > + return RtlDecompressFragment(format, uncompressed, uncompressed_size, > + compressed, compressed_size, 0, final_size, NULL); > } > > /*********************************************************************** > diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c > index c6a7023..99fd413 100644 > --- a/dlls/ntdll/tests/rtl.c > +++ b/dlls/ntdll/tests/rtl.c > @@ -1663,11 +1663,8 @@ static void test_RtlCompressBuffer(void) > memset(buf2, 0x11, sizeof(buf2)); > status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf2, sizeof(buf2), > buf1, buf_size, &final_size); > - todo_wine > ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); > - todo_wine > ok(final_size == sizeof(test_buffer), "got wrong final_size %u\n", final_size); > - todo_wine > ok(!memcmp(buf2, test_buffer, sizeof(test_buffer)), "got wrong decoded data\n"); > ok(buf2[sizeof(test_buffer)] == 0x11, "too many bytes written\n"); > > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > index 11d1c62..0bb7d04 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > @@ -977,7 +977,7 @@ > @ stub RtlCustomCPToUnicodeN > @ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) ntdll.RtlDecompressBuffer > @ stub RtlDecompressChunks > -@ stub RtlDecompressFragment > +@ stdcall RtlDecompressFragment(long ptr long ptr long long ptr ptr) ntdll.RtlDecompressFragment > @ stub RtlDelete > @ stdcall RtlDeleteAce(ptr long) ntdll.RtlDeleteAce > @ stdcall RtlDeleteAtomFromAtomTable(ptr long) ntdll.RtlDeleteAtomFromAtomTable > -- > 2.4.5 > >

2 1

Re: gdiplus: GdipConvertToEmfPlus parameter succ is optional
by Nikolay Sivov 09 Jul '15

09 Jul '15

Please add a test for this.

1 0

Re: libwine: Add support for tcc
by Alexandre Julliard 08 Jul '15

08 Jul '15

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -67,7 +67,7 @@ void DECLSPEC_NORETURN wine_switch_to_stack( void (*func)(void *), void *arg, vo > * Switch to the specified stack to call the function and return. > */ > > -#if defined(__i386__) && defined(__GNUC__) > +#if defined(__i386__) && (defined(__GNUC__) || defined(__TINYC__)) Are you planning to do this everywhere __GNUC__ is used? If so, this needs a better approach. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [7/7] msvcirt: Implement ios::unsetf
by Marvin 08 Jul '15

08 Jul '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=15160 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [6/7] msvcirt: Implement ios::setf
by Marvin 08 Jul '15

08 Jul '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=15159 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [5/7] msvcirt: Implement ios::flags
by Marvin 08 Jul '15

08 Jul '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=15158 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [4/7] msvcirt: Implement ios static locking (try 2)
by Marvin 08 Jul '15

08 Jul '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=15157 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [3/7] msvcirt: Implement ios stream locking (try 2)
by Marvin 08 Jul '15

08 Jul '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=15156 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [2/7] msvcirt: Implement ios object locking (try 2)
by Marvin 08 Jul '15

08 Jul '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=15155 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [1/7] msvcirt: Implement ios locking control (try 2)
by Marvin 08 Jul '15

08 Jul '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=15154 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [1/4] msvcirt: Implement ios locking control
by Piotr Caban 08 Jul '15

08 Jul '15

Hi Iván, On 07/07/15 21:00, Iván Matellanes wrote: > + /* locking */ > + ios_obj.do_lock = 1; > + p_ios_clrlock(&ios_obj); > + ok(ios_obj.do_lock == 1, "expected 1 got %d\n", ios_obj.do_lock); > + ios_obj.do_lock = 0; > + p_ios_clrlock(&ios_obj); > + ok(ios_obj.do_lock == 1, "expected 1 got %d\n", ios_obj.do_lock); > + p_ios_setlock(&ios_obj); > + ok(ios_obj.do_lock == 0, "expected 0 got %d\n", ios_obj.do_lock); > + ios_obj.do_lock = -1; > + p_ios_setlock(&ios_obj); > + ok(ios_obj.do_lock == -2, "expected -2 got %d\n", ios_obj.do_lock); Please add a test that shows what happens with this->sb->do_lock value when ios_setlock and ios_clrlock are called (it should also be updated). Thanks, Piotr

2 1

Re: [2/2] server: Add fallback to desktop keystate in get_key_state wineserver call.
by Marvin 08 Jul '15

08 Jul '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=15142 Your paranoid android. === wvistau64 (64 bit input) === input.c:731: Test failed: 0 (a4/0): 10 from 01 -> 00 unexpected input.c:731: Test failed: 0 (a4/0): 11 from 01 -> 00 unexpected input.c:731: Test failed: 0 (a4/0): a0 from 01 -> 00 unexpected input.c:731: Test failed: 0 (a4/0): a2 from 01 -> 00 unexpected

1 0

Re: [PATCH 4/5] wined3d: Add a setting for the maximum OpenGL version to use.
by Henri Verbeet 08 Jul '15

08 Jul '15

On 6 July 2015 at 22:20, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > if (context_debug_output_enabled(gl_info)) > + ctx_flags = WGL_CONTEXT_DEBUG_BIT_ARB; > + ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_MAJOR_VERSION_ARB; > + ctx_attribs[ctx_attrib_idx++] = gl_info->selected_gl_version >> 16; > + ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_MINOR_VERSION_ARB; > + ctx_attribs[ctx_attrib_idx++] = gl_info->selected_gl_version & 0xffff; > + if (gl_info->selected_gl_version >= MAKEDWORD_VERSION(3, 2)) > + ctx_flags |= WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB; > + if (ctx_flags) > { > ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_FLAGS_ARB; > - ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_DEBUG_BIT_ARB; > + ctx_attribs[ctx_attrib_idx++] = ctx_flags; > } > ctx_attribs[ctx_attrib_idx] = 0; > > if (!(ctx = gl_info->p_wglCreateContextAttribsARB(hdc, share_ctx, ctx_attribs))) > { > - ERR("Failed to create a WGL context.\n"); > - context_release(ret); > - goto out; > + if (ctx_flags & WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB) > + { > + ctx_attribs[ctx_attrib_idx - 1] &= ~WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB; > + if (!(ctx = gl_info->p_wglCreateContextAttribsARB(hdc, share_ctx, ctx_attribs))) > + { > + ERR("Failed to create a WGL context.\n"); > + context_release(ret); > + goto out; > + } > + } > } > } I think this is starting to become complex enough that we'd probably benefit from a helper function to be able to share some of this with wined3d_adapter_init(). > + glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &context_profile); > + if (glGetError() != GL_NO_ERROR) > + context_profile = 0; Should this perhaps just check for gl_info->p_wglCreateContextAttribsARB instead of eating errors? > + for (i = 0; i < ARRAY_SIZE(supported_gl_versions); ++i) > + { > + if (supported_gl_versions[i] <= wined3d_settings.max_gl_version) > + { > + if (supported_gl_versions[i] != wined3d_settings.max_gl_version) > + ERR_(winediag)("Requested GL version %u.%u which is unsupported, trying version %u.%u instead.\n", > + wined3d_settings.max_gl_version >> 16, wined3d_settings.max_gl_version & 0xffff, > + supported_gl_versions[i] >> 16, supported_gl_versions[i] & 0xffff); > + break; > + } > + } > + if (i == ARRAY_SIZE(supported_gl_versions)) > + { > + ERR_(winediag)("Requested invalid GL version %u.%u.\n", > + wined3d_settings.max_gl_version >> 16, wined3d_settings.max_gl_version & 0xffff); > + i = ARRAY_SIZE(supported_gl_versions) - 1; > + } This is a bit different than what I had in mind. I think max_gl_version should just be a maximum, and e.g. specifying 4.4 should just result in 3.2 at the moment. I think the winediag message should just happen if the registry setting is set, regardless of its actual value. (Except possibly if it's equal to the default value.) I.e. we also want to know if someone sets e.g. 3.2 while the default is currently 1.0 when reporting a bug. > + if (!get_config_key(hkey, appkey, "MaxGLVersion", buffer, size)) > + { > + unsigned int major, minor; > + > + if (sscanf(buffer, "%u.%u", &major, &minor) == 2) > + wined3d_settings.max_gl_version = MAKEDWORD_VERSION(major, minor); > + else > + ERR_(winediag)("Couldn't parse the requested maximum OpenGL version.\n"); > + } I'd make this a DWORD, if nothing else for consistency with MaxShaderModelVS etc. Perhaps "MaxVersionGL" would also more consistent for the naming, I'm not sure.

2 6

Re: [1/2] user32/tests: Add tests for calling GetKeyState from thread without message queue.
by Sebastian Lackner 08 Jul '15

08 Jul '15

On 08.07.2015 13:31, Sebastian Lackner wrote: > For https://bugs.winehq.org/show_bug.cgi?id=27238 > > The test is marked as broken on VMs > Win2003, but manually testing confirms > that it still works the same way on Windows 7. There must be a difference > between simulated keyboard input and real keyboard input. > > NOTE: SendInput doesn't make a difference. > > --- > dlls/user32/tests/input.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 65 insertions(+) > The test failures on wvistau64 are not caused by my patch. Seems to be "just another random issue". ;) All tests passed on a second attempt: https://newtestbot.winehq.org/JobDetails.pl?Key=15143

1 0

Re: [1/2] user32/tests: Add tests for calling GetKeyState from thread without message queue.
by Marvin 08 Jul '15

08 Jul '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=15141 Your paranoid android. === wvistau64 (32 bit input) === input.c:731: Test failed: 0 (a4/0): 10 from 01 -> 00 unexpected input.c:731: Test failed: 0 (a4/0): 11 from 01 -> 00 unexpected input.c:731: Test failed: 0 (a4/0): a0 from 01 -> 00 unexpected input.c:731: Test failed: 0 (a4/0): a2 from 01 -> 00 unexpected

1 0

Re: [PATCH 3/4] wined3d: Clip blits from / to the front buffer to the GL drawable.
by Henri Verbeet 08 Jul '15

08 Jul '15

On 6 July 2015 at 23:47, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > -void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) > +BOOL surface_clip_drawable_coords(const struct wined3d_surface *surface, HWND window, > + RECT *screen_rect, RECT *other) Can we please call these "src_rect" and "dst_rect" instead of "screen_rect" and "other"? It probably wouldn't hurt to mention "blt" somewhere in the function name either. > + ClientToScreen(window, &offset); ... > - ScreenToClient(window, &offset); > - OffsetRect(rect, offset.x, offset.y); > + /* Finally, translate the screen coordinate rectangle to client coordinates. */ > + OffsetRect(screen_rect, -offset.x, -offset.y); That change seems pretty pointless. > +BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) "src_rect", "dst_rect".

2 2

Re: kernel32/tests: Attempt to avoid timeouts by increasing the baud rate.
by Marvin 08 Jul '15

08 Jul '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=15126 Your paranoid android. === w2000pro (32 bit comm) === comm.c:1552: test_AbortWaitCts timeout 500 handle 00000368 comm.c:1519: Changing CommMask on the fly for handle 00000368 after timeout 500 === w2008s64 (32 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting comm.c:1552: test_AbortWaitCts timeout 500 handle 000000BC comm.c:1519: Changing CommMask on the fly for handle 000000BC after timeout 500

2 1

#include <hidclass.h>
by Aric Stewart 08 Jul '15

08 Jul '15

Hi, So when my patch for include/ddk/hidport.h got included Alexandre add this line to the top: #include <hidclass.h> The problem is that my hidclass.sys work stopped building for me. In file included from ../../../wine-git/dlls/hidclass.sys/hid.h:27: ../../../wine-git/include/ddk/hidport.h:22:10: error: 'hidclass.h' file not found with <angled> include; use "quotes" instead #include <hidclass.h> ^~~~~~~~~~~~ "hidclass.h" 1 error generated. Is this a problem with my build setup or something else? hidclass.h is located in include/ddk/hidclass.h thanks, -aric

2 1

Re: [PATCH 1/5] wined3d: Use the correct texture coordinates in swapchain_blit() in the non-glBlitFramebuffer, NP2 case.
by Henri Verbeet 07 Jul '15

07 Jul '15

On 6 July 2015 at 22:20, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c > index 146f5d6..141abc2 100644 > --- a/dlls/wined3d/swapchain.c > +++ b/dlls/wined3d/swapchain.c > @@ -280,21 +280,21 @@ HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *s > > /* A GL context is provided by the caller */ > static void swapchain_blit(const struct wined3d_swapchain *swapchain, > - struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect) > + struct wined3d_context *context, unsigned int src_w, unsigned int src_h, > + const RECT *src_rect, const RECT *dst_rect) > { > struct wined3d_surface *backbuffer = surface_from_resource( > wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)); > - UINT src_w = src_rect->right - src_rect->left; > - UINT src_h = src_rect->bottom - src_rect->top; > GLenum gl_filter; > const struct wined3d_gl_info *gl_info = context->gl_info; > RECT win_rect; > UINT win_h; > > - TRACE("swapchain %p, context %p, src_rect %s, dst_rect %s.\n", > - swapchain, context, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect)); > + TRACE("swapchain %p, context %p, src_w %u, src_h %u, src_rect %s, dst_rect %s.\n", > + swapchain, context, src_w, src_h, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect)); > > - if (src_w == dst_rect->right - dst_rect->left && src_h == dst_rect->bottom - dst_rect->top) > + if (src_rect->right - src_rect->left == dst_rect->right - dst_rect->left > + && src_rect->bottom - src_rect->top == dst_rect->bottom - dst_rect->top) > gl_filter = GL_NEAREST; > else > gl_filter = GL_LINEAR; > @@ -528,7 +528,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT > if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP && !once++) > FIXME("WINED3D_SWAP_EFFECT_FLIP not implemented.\n"); > > - swapchain_blit(swapchain, context, &src_rect, &dst_rect); > + swapchain_blit(swapchain, context, back_buffer->pow2Width, back_buffer->pow2Height, &src_rect, &dst_rect); > } > > if (swapchain->num_contexts > 1) I may be missing something subtle here, but wouldn't it be better to just replace src_w/wrc_h with backbuffer->pow2Width/backbuffer->powe2Height in the "if (backbuffer->container->flags & WINED3D_TEXTURE_NORMALIZED_COORDS)" block that scales the texture coordinates?

3 3

Re: [PATCH 4/4] wined3d: Always use screen-sized frontbuffers.
by Henri Verbeet 07 Jul '15

07 Jul '15

On 6 July 2015 at 23:47, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > --- > dlls/wined3d/device.c | 6 +++--- > dlls/wined3d/surface.c | 22 +++++++++++++++++----- > dlls/wined3d/swapchain.c | 27 +++++++++++++-------------- > 3 files changed, 33 insertions(+), 22 deletions(-) > Why would we want that?

2 1

Re: [PATCH 5/5] wined3d: Use GLSL 1.50 on core contexts.
by Henri Verbeet 07 Jul '15

07 Jul '15

On 6 July 2015 at 22:20, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > static const char *shader_glsl_get_version(const struct wined3d_gl_info *gl_info, > const struct wined3d_shader_version *version) > { > - if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version->major >= 4) > + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) > + return "#version 150"; > + else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version && version->major >= 4) > return "#version 130"; > else > return "#version 120"; Is GLSL 1.20 unavailable in core contexts? I only glanced over the spec, but didn't immediately see anything that explicitly makes earlier versions unavailable. What's a bit unfortunate about this is that drivers may decide to use different floating point rules (in particular wrt. multiplications by zero) depending on the GLSL version. IIRC at least r600g considered doing that at some point, although I'd have to check if that's currently the case.

2 1

Re: [PATCH 2/2] mshtml: Add IHTMLXMLHttpRequest::send() method implementation. (try 2)
by Marvin 07 Jul '15

07 Jul '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=15123 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/4] d3d8/tests: Add a windowed GetFrontBufferData test.
by Henri Verbeet 07 Jul '15

07 Jul '15

On 6 July 2015 at 23:47, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > +/* Locks a given surface and returns the color at (x,y). It's the caller's > + * responsibility to only pass in lockable surfaces and valid x,y coordinates */ > +static DWORD get_pixel_color_from_surface(IDirect3DSurface8 *surface, UINT x, UINT y) In ddraw this is called get_surface_color(), the equivalent d3d10core function is called get_texture_color().

1 0

odbccp32: Implement SQLGetPrivateProfileString (try 7)
by Hugh McMaster 07 Jul '15

07 Jul '15

On Tuesday, 7 July 2015, 10:31 pm UTC+10, Nikolay Sivov wrote: >On 07.07.2015 11:15, Alistair Leslie-Hughes wrote: > >> + retval = heap_alloc(cbRetBuffer*sizeof(WCHAR)); >> + >> + ret = SQLGetPrivateProfileStringW(sect, entry, string, retval, cbRetBuffer, file); > >cbRetBuffer is A-buffer length, you're still using it as W-buffer length. Unless I'm reading MSDN [1] incorrectly, this should work. cbRetBuffer is the size, in characters, of RetBuffer (i.e. the A-buffer). retval is the W-buffer. Its allocated byte size is double that of RetBuffer, but its size, in characters, is still the same.

2 2

Re: odbccp32: Implement SQLGetPrivateProfileString (try 7)
by Nikolay Sivov 07 Jul '15

07 Jul '15

On 07.07.2015 11:15, Alistair Leslie-Hughes wrote: > + retval = heap_alloc(cbRetBuffer*sizeof(WCHAR)); > + > + ret = SQLGetPrivateProfileStringW(sect, entry, string, retval, cbRetBuffer, file); cbRetBuffer is A-buffer length, you're still using it as W-buffer length.

1 0

Re: msscript.ocx: Added IDispatch functions implementation.
by Dmitry Timoshkov 07 Jul '15

07 Jul '15

Hi Jacek, Jacek Caban <jacek(a)codeweavers.com> wrote: > + case DLL_PROCESS_DETACH: > + release_typelib(); > + break; There should be a check to avoid freeing resources on process termination to avoid possible deadlocks. -- Dmitry.

1 0

Re: shell32/tests: Try harder to close Open With window
by Marvin 07 Jul '15

07 Jul '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=15086 Your paranoid android. === w2000pro (32 bit shlexec) === shlexec.c:2449: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2449: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2449: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2449: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2449: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2449: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 === wxppro (32 bit shlexec) === shlexec.c:1224: Test failed: expected 1 args, got 4 === w2003std (32 bit shlexec) === shlexec.c:1224: Test failed: expected 1 args, got 4

2 1

Re: [PATCH 2/4] d3d8/tests: Add a windowed GetFrontBufferData test.
by Marvin 07 Jul '15

07 Jul '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=15097 Your paranoid android. === w8 (32 bit visual) === visual.c:7637: Test failed: Got color 0xfffff913. visual.c:7639: Test failed: Got color 0xfffff913. visual.c:7641: Test failed: Got color 0xfffff913. visual.c:7643: Test failed: Got color 0xfffff913. visual.c:7646: Test failed: Got color 0xfffffa13. visual.c:7648: Test failed: Got color 0xfffffa13. visual.c:7650: Test failed: Got color 0xfffffa13. visual.c:7652: Test failed: Got color 0xfffefa13. visual.c:7655: Test failed: Got color 0xfffff913. visual.c:7657: Test failed: Got color 0xfffff913. visual.c:7659: Test failed: Got color 0xfffff913. visual.c:7661: Test failed: Got color 0xfffff913. visual.c:7664: Test failed: Got color 0xfffffa13. visual.c:7666: Test failed: Got color 0xfffef913. visual.c:7668: Test failed: Got color 0xfffffa13. visual.c:7670: Test failed: Got color 0xfffef913.

1 0

Re: [PATCH 1/4] d3d9/tests: Add a windowed GetFrontBufferData test.
by Marvin 07 Jul '15

07 Jul '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=15096 Your paranoid android. === w8 (32 bit visual) === visual.c:19339: Test failed: Got color 0xff7170fb. visual.c:19341: Test failed: Got color 0xff7170fb. visual.c:19343: Test failed: Got color 0xff7170fb. visual.c:19345: Test failed: Got color 0xff7170fb. visual.c:19348: Test failed: Got color 0xff71fefb. visual.c:19350: Test failed: Got color 0xff71fefb. visual.c:19352: Test failed: Got color 0xff71fefb. visual.c:19354: Test failed: Got color 0xff71fefb. visual.c:19357: Test failed: Got color 0xff7f70fb. visual.c:19359: Test failed: Got color 0xff7f70fb. visual.c:19361: Test failed: Got color 0xffff70fb. visual.c:19363: Test failed: Got color 0xffff70fb. visual.c:19366: Test failed: Got color 0xff86fefb. visual.c:19368: Test failed: Got color 0xff85fefb. visual.c:19370: Test failed: Got color 0xfffffe90. visual.c:19372: Test failed: Got color 0xfffffe90.

1 0

Re: [1/2] ole32: Add a storage test using a custom ILockBytes.
by Marvin 07 Jul '15

07 Jul '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=15093 Your paranoid android. === w7u (32 bit storage32) === Failure running script in VM: timed out waiting for the child process

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