February 2015 - Wine-devel - list.winehq.org

Re: [PATCH] uxtheme: fix colour errors in UXTHEME_StretchBlt
by Nikolay Sivov 18 Feb '15

18 Feb '15

On 18.02.2015 3:59, Mark Harmstone wrote: > + old_stretch_mode = GetStretchBltMode(hdcDst); > + SetStretchBltMode(hdcDst, HALFTONE); This could be reduced to a single line.

1 0

Re: wininet: Include <unistd.h> in case we need off_t for zlib.
by Jacek Caban 18 Feb '15

18 Feb '15

Hi Gerald, On 02/15/15 17:16, Gerald Pfeifer wrote: > After commit 5436fef80722fe7896aed5e659c31fdade4ef5b3 > > Author: Jacek Caban <jacek(a)codeweavers.com> > Date: Fri Feb 13 12:12:29 2015 +0100 > > wininet: Always use winsock sockets. > > FreeBSD not longer builds due to the following change: > > #include "config.h" > -#include "wine/port.h" > > -#if defined(__MINGW32__) || defined (_MSC_VER) > -#include <ws2tcpip.h> > +#ifdef HAVE_ZLIB > +# define Z_SOLO > +# include <zlib.h> > #endif > > zlib.h on FreeBSD 10.x uses off_t, but at this point this is not > defined yet. Including unistd.h before including zlib.h addresses > this. I'd expect zlib.h to handle its dependences, it's probably Z_SOLO that's doesn't work on FreeBSD. Could you try my recent wininet patches? They should fix the build. Thanks, Jacek

2 1

Re: version: Fix wrong length reported when selecting a block. (resend)
by Stefan Dösinger 17 Feb '15

17 Feb '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-02-12 um 20:15 schrieb Mark Jansen: > LPWSTR lpSubBlockW; > + UINT dum = 0; > + if (!puLen) > + puLen = &dum; > > len = MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, NULL, 0); > lpSubBlockW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); > @@ -965,7 +968,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, > > HeapFree(GetProcessHeap(), 0, lpSubBlockW); > > - if (ret && isText) > + if (ret && isText && *puLen) I am afraid I have no idea what this patch is doing. I am not even sure I understand the original function properly :-( . VerQueryValueA seems like an A to W wrapper for VersionInfo32_QueryValue, but with the quirky behavior that it appends the ascii string after the unicode string. Can you elaborate a bit on what exactly goes wrong? What are the input values, and what does VersionInfo32_QueryValue return? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU3dGbAAoJEN0/YqbEcdMwpwEP+wabxLJtbw7O7enIEu21l8ls m6vxZr1PXP5RnTmOs4nk/QmWT4Oa68qY2EBdArZ79WwyVULLI7BjNJ1aLS67dw/Z l6Dk9fh8orxoD4HznH0o7PxYrWNrQ1nJ2jf39k+TO4DbSHMZB/eGXnGUZxVFwKVf H7yNxmoSISC0aWgQP0/QZF+AhtsJ5TLIWtNyJULpmTnZZGu9z94Ukftd9gDL+tZU ezFsqxdDhpy0nirb4ky/Yq77jXQtsCmz/pCNi7ntYuQqY5fEmtJQMAtpfOQhdG5h XP1Py7qFTu/RgqnBsO1Z3INRyKk7NS4BsPvULcLsk4WbDvoTGEqa1WwHwqHY4Dng IDHagE938Xkc8CPiHGzqJG6WDdPPkFiRzqM+2HH87ihJ2uAaVZcK/V46lGiJCx8q jDY+DlcDyZRmw28+fjwzOjPQHZx/jH2X3wLIpkliM5Ja03Ocb27Aaud9DEQ6H0vw 0VbD2Db6oOrPBv3oyDmZhI+NTPgvsUoaH6sNE+3cIEwBWpCKkOJMzoDZ6EiqWVqj jvJklcVcOn7nfUBH0YCfnG5szQokMnfcnZaOZxzkjWnPvwJbfC36eLQyESkbtbKf Y2Z+mvbWslkhdeR0jKAmQNwfDuFcfvZflinem3U9xJAqBKEmicLeqJ0dtwUIJyC7 TnJMMCP14EDaX0DZGHw3 =94Ql -----END PGP SIGNATURE-----

3 4

Re: [resend 1/8] reg: Add system error printing function
by Alexandre Julliard 17 Feb '15

17 Feb '15

Jonathan Vollebregt <jnvsor(a)gmail.com> writes: > +static void reg_print_error(LSTATUS error_code) > +{ > + switch (error_code) > + { > + case ERROR_SUCCESS: > + return; > + case ERROR_BAD_COMMAND: > + reg_message(STRING_INVALID_CMDLINE); > + return; > + default: > + { > + static const WCHAR error_string[] = {'%','0','5','d',':',' ','%','s',0}; > + WCHAR *message = NULL; > + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS, > + NULL, error_code, 0, (WCHAR *)&message, 0, NULL); > + > + reg_message(STRING_ERROR); > + reg_printfW(error_string, error_code, message); > + LocalFree(message); > + return; > + } > + } > +} I don't think that's an improvement. There may be a need for generic Win32 error printing through FormatMessage for unknown codes, but I don't see why you'd want to route all errors through it. In particular, having to make up your own Win32 error codes only to convert them back to string ids is quite ugly. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [PATCH (resend) 1/2] dpvoice/tests: Add GetCompressionTypes tests.
by Alexandre Julliard 17 Feb '15

17 Feb '15

Alex Henrie <alexhenrie24(a)gmail.com> writes: > @@ -343,6 +343,179 @@ static void create_voicetest(void) > } > } > > +static void test_GetCompressionTypes(HRESULT (__stdcall *GetCompressionTypes)(void*,void*,DWORD*,DWORD*,DWORD), > + void *iface, const char *name) These hacks with the void pointers are ugly. You should pass interface pointers and do a proper method call with one or the other, for instance something like this: if (client_iface) IDirectPlayVoiceClient_GetCompressionTypes( client_iface,... ); else IDirectPlayVoiceServer_GetCompressionTypes( server_iface,... ); -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] d3dx9_36: Consistently use 4 space indentation.
by Alexandre Julliard 17 Feb '15

17 Feb '15

Stefan Dösinger <stefan(a)codeweavers.com> writes: > Before the next guy copypastes the bottom code and adds more mess. Could you please stop with this code formatting obsession of yours? As long as the code is readable, it doesn't matter if there's a line here and there with slightly inconsistent formatting. I appreciate your helping with the code reviews, but please let's try to concentrate on the real problems. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/2] ddraw/tests: Port D3D1_ViewportClearTest to ddraw1.c (v2).
by Marvin 17 Feb '15

17 Feb '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=11581 Your paranoid android. === w8 (32 bit visual) === visual.c:1617: Test failed: unexpected colortable on offscreen surface === wvistau64 (32 bit ddraw2) === ddraw2.c:2659: Test failed: Expected message 0x46, but didn't receive it. ddraw2.c:2661: Test failed: Expected screen size 1024x768, got 0x0. ddraw2.c:2667: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2698: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2706: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2733: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2753: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2777: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2804: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2821: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2858: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2869: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2896: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2916: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2933: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2960: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2977: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:3015: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}.

2 1

Re: [2/2] kernel32: force 4096 byte page alignment.
by Tijl Coosemans 17 Feb '15

17 Feb '15

On Mon, 02 Feb 2015 22:20:57 +0200 David Naylor <dbn(a)freebsd.org> wrote: > FreeBSD prefers to use a 0x200000 (super) page alignment however this causes > the image base to be displaced from the requested 0x7b800000. Forcing a > smaller page size ensures FreeBSD can place the image starting at 0x7b800000. Just to clarify, the output of "readelf -l kernel32.dll.so" gives this: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align LOAD 0x000000 0x7b800000 0x7b800000 0x0c9e74 0x0c9e74 R E 0x200000 LOAD 0x0ca000 0x7baca000 0x7baca000 0x1a7eb0 0x1a8550 RW 0x200000 The segments have an alignment of 0x200000 bytes. This places the first segment at 0x7b800000 and the second at 0x7ba00000+Offset. With a MemSiz of 0x1a8550 this pushes the second segment over 0x7bc00000 where ntdll has been mapped already so loading kernel32 at 0x7b800000 fails. The patch forces a smaller alignment so the second segment fits below 0x7bc00000.

3 3

Re: version: partially implement GetFileVersionInfoSizeExA/W using GetFileVersionInfoSizeA/W (1/2)
by Nikolay Sivov 17 Feb '15

17 Feb '15

On 17.02.2015 7:04, Austin English wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=38090 > > -- > -Austin > > > Why not the other way around - moving everything to *Ex, and forwarding to it?

2 1

Re: kernel32/tests: Add tests for job objects (try 3)
by Marvin 17 Feb '15

17 Feb '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=11588 Your paranoid android. === build (build) === Make failed

1 0