November 2014 - Wine-Devel - list.winehq.org

Re: [PATCH 1/5] ddraw/tests: Rename modes and rectangles in test_coop_level_mode_set.
by Henri Verbeet Nov. 11, 2014

Nov. 11, 2014

On 10 November 2014 23:08, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > ddraw = create_ddraw(); > ok(!!ddraw, "Failed to create a ddraw object.\n"); > > + memset(&param, 0, sizeof(param)); > + hr = IDirectDraw7_EnumDisplayModes(ddraw, 0, NULL, &param, test_coop_level_mode_set_enum_cb); > + ok(SUCCEEDED(hr), "Failed to enumerate display mode, hr %#x.\n", hr); > + ref = IDirectDraw7_Release(ddraw); > + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); ... > + ddraw = create_ddraw(); > + ok(!!ddraw, "Failed to create a ddraw object.\n"); This seems odd, why do you recreate the ddraw object?

1 0

Re: [PATCH 4/5] d3d8/tests: Fix some wndproc comparison error messages.
by Marvin Nov. 11, 2014

Nov. 11, 2014

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=10175 Your paranoid android. === w8 (32 bit device) === device.c:1173: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1218: Test failed: Reset failed, hr 0x88760868. device.c:1220: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1224: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1231: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1232: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1233: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1234: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1235: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1236: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1241: Test failed: Screen width is 640, expected 800. device.c:1242: Test failed: Screen height is 480, expected 600. device.c:1248: Test failed: Back buffer width is 640, expected 800. device.c:1250: Test failed: Back buffer height is 480, expected 600. device.c:1280: Test failed: Screen width is 640, expected 1024. device.c:1281: Test failed: Screen height is 480, expected 768. device.c:2439: Test failed: Expected foreground window 000701B2, got 0002004C. device.c:2808: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2812: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2834: Test failed: Failed to reset device, hr 0x88760868. device.c:2838: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2842: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3209: Test failed: Failed to reset device. device.c:3216: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3224: Test failed: Expected wndproc != 0x412eb0.

1 0

Re: avifil32: Simplify comparing two unsigned ints (PVS-Studio) (try 2)
by Ken Thomases Nov. 10, 2014

Nov. 10, 2014

On Nov 10, 2014, at 4:56 PM, André Hentschel <nerv(a)dawncrow.de> wrote: > try 2: added the missing +1 thanks to a hint by ken on irc > --- > dlls/avifil32/avifile.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c > index 6295c7b..3d90e20 100644 > --- a/dlls/avifil32/avifile.c > +++ b/dlls/avifil32/avifile.c > @@ -466,9 +466,9 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, LO > /* ... so delete it now */ > HeapFree(GetProcessHeap(), 0, This->ppStreams[nStream]); > > - if (This->fInfo.dwStreams - nStream > 0) > - memcpy(This->ppStreams + nStream, This->ppStreams + nStream + 1, > - (This->fInfo.dwStreams - nStream) * sizeof(IAVIStreamImpl*)); > + if (nStream < This->fInfo.dwStreams) > + memcpy(&This->ppStreams[nStream], &This->ppStreams[nStream + 1], > + (This->fInfo.dwStreams - nStream) * sizeof(This->ppStreams[0])); > > This->ppStreams[This->fInfo.dwStreams] = NULL; > This->fInfo.dwStreams--; This is a more faithful refactoring of the original logic. However, looking at it some more, it looks like the original logic was wrong. It's removing an entry from the array and shifting the following entries up to fill the gap. There are This->fInfo.dwStreams - nStream entries from the nStream'th one to the end. There are only This->fInfo.dwStreams - (nStream + 1) entries that actually _follow_ the nStream'th one. The original logic read past the end of the array and this logic still does. -Ken

1 1

Wine Mono 4.5.4 Release
by Vincent Povirk Nov. 10, 2014

Nov. 10, 2014

I have published version 4.5.4 of Wine Mono on sourceforge. Once again, it's been about a year since the last release. I really am trying to make these more frequent, but for various reasons it hasn't worked out that way. Due to some odd behavior in msi (or so I'm assuming, unfortunately I haven't had a chance to investigate in any detail), it is necessary to run 'wine64 msiexec /i wine-mono-4.5.4.msi' to install in a 64-bit prefix. Installing without the wine64 uses the 32-bit version of msiexec which somehow installs it alongside the default Wine Mono install instead of upgrading it. Any testing with .NET software (in particular .NET software that has been known to work before, if anyone knows of such a thing) would be appreciated. The source tarball is at https://sourceforge.net/projects/wine/files/Wine%20Mono/4.5.4/wine-mono-4.5… The binary is at https://sourceforge.net/projects/wine/files/Wine%20Mono/4.5.4/wine-mono-4.5… For developers, the source repository is at https://github.com/madewokherd/wine-mono Changes since 4.5.2: * Removed MonoGame. It was problematic because MG didn't have binary compatibility with XNA as a goal, I didn't have time to update from upstream, and the MS version of XNA was used anyway if it was installed, which it usually is. I may consider including a real XNA binary replacement if one appears, but for now I think it's better to work on making the MS implementation work. * It's no longer necessary to have gmcs installed to build from a tarball. Tarballs now include a build of Monolite for bootstrapping the compiler, which is the same thing the Mono project does with their tarballs. This was to avoid problems with old Mono versions not being able to bootstrap the current compiler. * A -l switch was added to build-winemono.sh, which fetches an official Monolite build and uses that to bootstrap the compiler. This is only useful if you are building from Git and don't have a sufficiently new gmcs to make this work. * The build will now abort if -t is specified and any tests fail to build. * The libmono build now specifies strict Dwarf2 debugging symbols, to keep it compatible with winedbg. * The libmono build now specifies static libgcc, to avoid linking errors on recent mingw. * We now use dllmap configuration to find MonoPosixHelper, which eliminates some diffs from upstream and will remove the need for Wine to mess with the PATH of .NET applications. * Added a Wine-specific implementation of System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeInterfaceAsObject and GetRuntimeInterfaceAsIntPtr. * Updated Mono to the master branch as of October 31, bringing in many changes including the following: * Fixed use of RVA fields pointing to zeroed static data that isn't physically in the PE file (improves managed C++ compatibility). * Added support for service processes using ServiceBase.Run. * It's now possible to change how debug output is printed via the embedding API, which will make possible a future change to Wine to send the output to the Unix stderr stream. * Beginnings of a System.Management implementation.

1 0

Re: [PATCH 3/3] mshtml: Added script element readyState and onreadystatechange tests.
by Marvin Nov. 10, 2014

Nov. 10, 2014

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=10164 Your paranoid android. === w8 (32 bit script) === script.c:632: Test failed: L"extern_res_script_rs = loaded0,eval,complete1, expected eval,complete1,"

1 0

Re: [PATCH 1/3] mshtml: Ignore query and hash parts in res protocol handler.
by Marvin Nov. 10, 2014

Nov. 10, 2014

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=10163 Your paranoid android. === w2000pro (32 bit protocol) === protocol.c:144: Test failed: expected: 00000000 got: 80070716 protocol.c:255: Test failed: Start failed: 80070716 protocol.c:258: Test failed: expected ReportProgress protocol.c:259: Test failed: expected ReportData protocol.c:280: Test failed: Read failed: 80004005 protocol.c:144: Test failed: expected: 00000000 got: 80070716 protocol.c:255: Test failed: Start failed: 80070716 protocol.c:258: Test failed: expected ReportProgress protocol.c:259: Test failed: expected ReportData protocol.c:280: Test failed: Read failed: 80004005

1 0

Sourceforge says 1.5.22 is the latest version
by Rosanne DiMesio Nov. 10, 2014

Nov. 10, 2014

Not really sure whose bug this is, but a user just pointed out that http://sourceforge.net/projects/wine/files/Source/ (which the source link at the bottom of our Downloads page leads to) has a line stating "Looking for the latest version? Download wine-1.5.22.tar.bz2 (21.2 MB)." The main project page, http://sourceforge.net/projects/wine/, also has a big green Download button for 1.5.22.tar.bz2.

4 3

Re: kernel32: add TRUST_E_NOSIGNATURE resource definition
by Alexandre Julliard Nov. 10, 2014

Nov. 10, 2014

Austin English <austinenglish(a)gmail.com> writes: > @@ -281,8 +281,8 @@ msg : msgid sevfacsym { test_id($1); } bodies { $$ = complete_msg($4, $1); } > ; > > msgid : tMSGID '=' id { > - if($3 & (~0xffff)) > - xyyerror("Message ID value out of range (0x%08x > 0xffff)\n", $3); > + if($3 & (~0xffffffff)) > + xyyerror("Message ID value out of range (0x%08x > 0xffffffff)\n", $3); There shouldn't be any need to change the message compiler, there are severity/facility message options. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: user32: Move IME Window Procedure to user32
by Piotr Caban Nov. 10, 2014

Nov. 10, 2014

Hi, could you please give me any hints related to this patch? The way how imm32 is loaded or not is quite strange in it. It's generally matching native behavior but I'm not sure if it's needed here. I also don't see a nice way of testing it inside wine test suite. Thank you, Piotr

2 4

Re: [PATCH] reg.exe: Modernise print functions
by Jonathan Vollebregt Nov. 10, 2014

Nov. 10, 2014

> WCHAR msg_buffer[1024]; No easy way to get the expected size and dynamically allocate the output I take it? I looked into it before but besides _vscprintf (In msvcrt, which we're not allowed to use) there doesn't seem to be a way to get the expected output size besides perhaps growing the buffer over and over again until it fits (Which seems inefficient for a simple printing function)

1 0

RE: [PATCH v3 04/10] reg: Add sane_path function to do preliniary key validation
by Hugh McMaster Nov. 10, 2014

Nov. 10, 2014

On Saturday, 8 Nov 2014 11:26:45 +0100, Jonathan Vollebregt wrote: >+static LSTATUS sane_path(const WCHAR *key) >+{ >+ if (key[0] == '\\' && key[1] == '\\' && key[2] != '\\') >+ return ERROR_NO_REMOTE; >+ >+ return ERROR_SUCCESS; >+}Where are you handling (invalid) keys beginning with backslashes, e.g.: \\HKEY_CURRENT_USER\\Console? Windows only allows two consecutive backslashes at the beginning of a key. >+ if (key[0] == '\\' && key[1] == '\\' && key[2] != '\\') HKEY... --> ERROR_SUCCESS \HKEY... --> ERROR_SUCCESS !!! \\HKEY... --> ERROR_NO_REMOTE \\\HKEY... --> ERROR_SUCCESS !!! Those two marked with !!! need to be handled. Do you do this in a later patch? -- Hugh McMaster

2 2

Re: [PATCH 2/2] user32/tests: Test exception handling for timer callbacks. (try 2)
by Marvin Nov. 10, 2014

Nov. 10, 2014

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=10156 Your paranoid android. === w7u (32 bit msg) === msg.c:12189: Test failed: unexpected hwnd 0018014A

1 0

Re: [2/2] wined3d: Take abs() of vertex z coordinate as FFP fog coordinate (try 5)
by Matteo Bruni Nov. 9, 2014

Nov. 9, 2014

2014-11-06 21:51 GMT+01:00 Joachim Priesner <joachim.priesner(a)web.de>: > Take the absolute value of vertex.z as fog coordinate instead of just > the z coordinate. This fixes e.g. fog for applications that use > right-handed projection matrices. > > Also test the clamp behavior of the oFog vertex shader output. > > Tested on openSuse 13.1 and Windows 8.1 (VMware Player). > > Try 5 that fixes a test failure I overlooked. > --- > dlls/d3d8/tests/visual.c | 296 +++++++++++++++++++++++++++++++++++++ > dlls/d3d9/tests/visual.c | 360 +++++++++++++++++++++++++++++++++++++++++++++ > dlls/ddraw/tests/ddraw7.c | 161 ++++++++++++++++++++ > dlls/wined3d/glsl_shader.c | 2 +- > 4 files changed, 818 insertions(+), 1 deletion(-) > > diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c > index 163110c..a1eabcd 100644 > --- a/dlls/d3d8/tests/visual.c > +++ b/dlls/d3d8/tests/visual.c > @@ -696,6 +696,301 @@ done: > DestroyWindow(window); > } > > +/* This test tests fog in combination with negative vertex z coordinates. */ > +static void fog_negative_z_test(void) > +{ > + enum > + { > + C_ALPHA_0x00 = 0x00000000, > + C_CLEAR = 0xffff00ff, > + C_FOGGED = 0x0000ff00, > + C_HALF_FOGGED = 0x00808000, > + C_UNFOGGED = 0x00ff0000, > + C_CLAMPED_FOG = 0xdeadbeef /* triggers special codepath when used as middle_color */ > + }; > + > + /* Fill the null-shader entry with the FVF (SetVertexShader is "overloaded" on d3d8). */ > + DWORD vertex_shader[3] = {D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, 0, 0}; > + DWORD pixel_shader[2] = {0, 0}; > + IDirect3D8 *d3d; > + IDirect3DDevice8 *device; > + BOOL has_vs_support, has_ps_support, has_table_fog_support; > + unsigned int i, ps, y; > + D3DCOLOR color, expected_middle_color; > + ULONG refcount; > + D3DCAPS8 caps; > + HWND window; > + HRESULT hr; > + > + /* Basic vertex shader without fog computation ("non foggy") */ > + static const DWORD vertex_shader_code1[] = > + { > + 0xfffe0100, /* vs_1_0 */ > + /* output.Pos.z = input.Pos.z * 0.5 + 0.5 */ > + 0x00000005, 0x80010000, 0x90aa0000, 0xa0000000, /* mul r0.x, v0.z, c0.x */ > + 0x00000002, 0xc0040000, 0x80000000, 0xa0000000, /* add oPos.z, r0.x c0.x */ > + /* output.Pos.xyw = input.Pos.xyw */ > + 0x00000001, 0xc00b0000, 0x90e40000, /* mov oPos.xyw, v0 */ > + /* output.Color = input.Color */ > + 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ > + 0x0000ffff, /* END */ > + }; Where are you setting the value of c0 in the d3d8 test?

3 3

Re: [PATCH v3 08/10] reg: Add wchar/raw data conversion functions
by Stefan Dösinger Nov. 9, 2014

Nov. 9, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, The first 7 patches look worthy of Alexandre's review. Don't resend this yet, I'd suggest to wait for Alexandre's opinion first. Am 2014-11-08 11:26, schrieb Jonathan Vollebregt: > + static const WCHAR empty = 0; You could make this on the global scope, call it empty_wchar (or empty_string or something similar) and use it to replace the RegDeleteKeyA with RegDeleteKeyW. That's only a minor style suggestion though, not a requriement. > + FIXME("Check for integer overflow.\n"); Print this only if i == UINT_MAX. If i is smaller you know no overflow has happened. > + if (0) > + return ERROR_ARITHMETIC_OVERFLOW; > ... > + case ERROR_NOT_NUMBER: > + reg_message(STRING_NOT_INT_OR_NEG); > + return; > + case ERROR_ARITHMETIC_OVERFLOW: > + reg_message(STRING_ERANGE); > + return; I don't like the dead code. It also seems that native prints the same error message in both cases, so you don't need to separate between underflows, overflows and strings that are not numbers. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUXiejAAoJEN0/YqbEcdMwWTsP/2HaBgIt6J3EqvC+jpj42MPs tgHXaZ/lhLxUTtHCcnSzsrVt5zmVN7AOnET54KQFHjbY2OoEcT9PpDDjW/9LVGTc dj0ciXNpOLuo6MdYWbjmTMtIFVBPMISSYJks2FxvZ1peYa5g+dQQZ6blHWzlcA1k dLK7UHPeh5kyHACgbr3i0wdL9CNeQ9pafWCUtpnZwxHbXVWlOB1XRZZumKg7snz8 QyLDJylKzYZEJ6CBjU5YxZKl/NXrCoiHplhkF8Tddl8Xmh+AqpWnvMwsWBbiFgXC ZybdSnHY0vvCojJPb9dYpscbY2uy2Xjap2t8a61xlI288/Tz+8tvnm3qkd99i13w S9Tf2TGmhHKN1DG/ljnvALRh9JTYH20jFf/lvgZOApew4iyuHWHsLKdjp9LvpwGW ogIpBHT+kpNPSHuPgbHm9lK/k2OAYBGUZqbH2c0bznQdVWUqEABdR/cMM/wVjYbs LpUdstKs2oLbhr2gxvLkX0C3f4zdowetYnlnynuL1S+krcAKeQgPxE14MtwKeX49 rYeT931uOvhYi9Dh8a0DU8FTVfI9DKAbRfcBRt81AgJ6zymDC050s2MkELZTyDod WhPrkpXV/FUOsn2Sef0yxI78XtgbaaGEUIdBz9rThVvJNy4Wrw7zA2MICUhgEQe1 S5rqOajVwtKqqjX0JeJJ =CJwM -----END PGP SIGNATURE-----

2 2

Re: [PATCH] vbscript: Implemented String(try 4)
by Marvin Nov. 9, 2014

Nov. 9, 2014

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=10122 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

2 1

Ideas for simplifying tabular UTF-7 tests?
by Alex Henrie Nov. 8, 2014

Nov. 8, 2014

Hi, I have two patches for adding tabular UTF-7 tests at https://github.com/alexhenrie/wine/commits/master However, before I submit them to wine-patches, I'd like to ask for wider feedback. Sebastian Lackner has commented: * too many values for each test, difficult to maintain, and looks redundant * initializing big structures on the stack should be avoided The problem is that I don't see a good way to simplify this any further: * The chars_written variable (number of characters actually written) cannot be eliminated and determined implicitly from the len and dstlen variables alone. See the second-to-last encoding test case, where len is 0 and dstlen is 4, but chars_written is 3. * The dst variable (destination buffer) is almost always set to the output variable, but one test requires dst to be NULL. * These are just tests, so I'm not worried about complicating the code in order to improve performance. I've tried replacing chars_written and dst with a set of flags (ONE_NOT_WRITTEN and NULL_DST) and corresponding if statements, but this looks ugly to me. Furthermore, removing the output variable from the table obscures the reason why dstlen is usually set to sizeof(output) - 1. All in all, I think that writing out all the parameters explicitly is the most intuitive way to go. What do the rest of you think? How would you write this code? -Alex

1 1

Re: msvcp90: Add std_Ctraits::Isnan implementation.
by Nikolay Sivov Nov. 8, 2014

Nov. 8, 2014

On 11/4/2014 11:22, YongHao Hu wrote: > --- > dlls/msvcp90/math.c | 9 +++++++++ > dlls/msvcp90/msvcp90.spec | 6 +++--- > dlls/msvcp90/tests/misc.c | 48 > +++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 60 insertions(+), 3 deletions(-) > > > > You need to update msvcp80.spec too.

2 1

Re: [PATCH v2 6/8] reg: Add wchar/raw data conversion functions
by Stefan Dösinger Nov. 7, 2014

Nov. 7, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-07 17:29, schrieb Jonathan Vollebregt: > + if (input[0] == '0' && (input[1] == 'x' || input[1] == 'X')) > + i = strtoulW(input, &temp, 16); > + else > + i = strtoulW(input, &temp, 10); > + > + if (input[0] == '-' || temp[0] || temp == input) > + return ERROR_NOT_INT_OR_NEG; Please add tests for a valid DWORD value >= 0x80000000 and a test with a value > 0xffffffff. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUXTDPAAoJEN0/YqbEcdMw02oP/1mjnMjeqJQY3jUE6KpOUJ2c xi6mFcxcP1p9j6UfpAqVr2Ho+7Qdc3t+JR0++TYqONZw5u8PXMMYBCTbP5DcGnRq 3BuE0a9XKj+0WBsUqqfi3RDz/VXdmlHpRk28NTKtzQETnEJ9h+au6Afhivz/j23v q/SkQrrElU3DEuaYE++0nChLseLnzc2W9LoU6ltNxCEOgvWB5jNz2pQdPg1c9USp AFvkXCJbLe8H70wkRlK3soSBA1i0fB6aZShA1rnAg93VnIeprQJH38j4Aua4CBmA iZ+1mrxn2rTBxPJnyceJ68pcxT8XV8EPqRmuK9DXneMYJfW1xHS37ehOvMIKmOQ3 RjsLfZ1pV/+QPVKEWHIrNY1YIY88e1wzJmrZatygzmw0OEIzk4FP52rSrEDEhudD Ue9iddJ6gvfFl8oRT33/mJ8ss9ITr56QU9wwXo8AtnQwP1gK4GSu9tfUkgbQHfbX rrF/MaVAFNRSspxR3uO41Gr4X9zwtW0ghSFrEUDNkG0ijZ8VvOgVczmGS7x45Mh6 6TAtS1qe1+zzGhORa8VJI/VvgeD7wuLS+f+BSwB/ONp51RDJaWvPs8lGRXp5Bqzz 1FXowdYyXqX+8iaEBNzlawvbIYHKWYsdeAR2big9dXIpYSFJKgBugTeOkT1v2FA2 OxLaUmdTYdK3/ItWvsPR =yNQY -----END PGP SIGNATURE-----

1 0

Rocksmith ALSA patches test
by Luke A. Guest Nov. 7, 2014

Nov. 7, 2014

Hi, I just built 1.7.29 on Gentoo with all 6 patches. I ran the game from the start, new profile, beginner, etc. So far, it seems stable, but there is a lot of noise when the guitar is not in use. Also, tuning is difficult, as the game is not responding as quickly as it should, pluck then wait until the tuner moves. This is also a problem when doing that first "Aerosmith" riff at the start. If there is anything you want me to test, I can, just email me. Thanks for the hard work, Luke (and future users of said work :D)

1 0

Re: [PATCH 4/5] mmdevapi: add property for device path
by Bruno Jesus Nov. 7, 2014

Nov. 7, 2014

On Fri, Nov 7, 2014 at 12:58 PM, Mark Harmstone <hellas(a)burntcomma.com> wrote: > --- > dlls/mmdevapi/devenum.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 54 insertions(+) Hi, I can't tell if your patch is right or wrong, what I can say is that you are using C++ comments in this patch, they are not allowed in wine, please switch to /* */. Best regards, Bruno

1 0

Re: [PATCH] winealsa: fix input sound distortion and heap corruption
by Andrew Eikum Nov. 7, 2014

Nov. 7, 2014

On Fri, Nov 07, 2014 at 04:06:55AM +0000, Mark Harmstone wrote: > At present, winealsa attempts to call map_channels when a capture > device is opened. If a microphone can be opened in either stereo or > mono mode, and mono is requested, Wine will still return stereo > data. Not only does this result in distorted in audio, it also very > frequently results in heap corruption when snd_pcm_readi overruns > the buffer allocated by the program. > Thanks for fixing this. The patch doesn't apply because it got mangled in transit: http://source.winehq.org/patches/data/107529 The idea look OK to me, but don't we want to disable channel remapping for _all_ capture devices? Your patch only disables it if the application is using WAVE_FORMAT_EXTENSIBLE I don't think we can do capture channel remapping reliably without switching to the new ALSA channel mapping API. So it makes sense to disable it entirely for now. Andrew > I don't have a copy of World of Warcraft to test this on, but this > may also fix bug 31684. It's the same symptoms, at least. > > --- > dlls/winealsa.drv/mmdevdrv.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c > index a4c02bf..91fba2f 100644 > --- a/dlls/winealsa.drv/mmdevdrv.c > +++ b/dlls/winealsa.drv/mmdevdrv.c > @@ -1164,7 +1164,7 @@ static DWORD get_channel_mask(unsigned int channels) > > static HRESULT map_channels(ACImpl *This, const WAVEFORMATEX *fmt) > { > - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE || fmt->nChannels > 2){ > + if( (This->dataflow != eCapture && fmt->wFormatTag == > WAVE_FORMAT_EXTENSIBLE) || fmt->nChannels > 2){ > WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; > DWORD mask, flag = SPEAKER_FRONT_LEFT; > UINT i = 0; > -- > 2.0.4 > >

2 2

Re: [PATCH 6/8] reg: Add wchar/raw data conversion functions
by Stefan Dösinger Nov. 7, 2014

Nov. 7, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-06 22:17, schrieb Jonathan Vollebregt: > +static LSTATUS wchar_get_data( const WCHAR *input, const DWORD type, > + const WCHAR separator, DWORD *size_out, BYTE **out) This whitespace use is a bit weird. Is there a precedent for it? > + ** (DWORD **) out = i; The space between ** and ( is a bit odd too. > + /* If it's the first character or the previous one was a separator */ > + if (!p || temp[p - 1] == 0) > + { > + HeapFree(GetProcessHeap(), 0, temp); > + return ERROR_BAD_COMMAND; > + } What does advapi32 do if you have empty substrings? (I.e., the same question as with the trailing backslashes: Does this code belong into reg.exe or advapi32.dll?) If advapi32 returns an error you can probably use it instead of the internal ERROR_NOT_INT_OR_NEG. > + *out = HeapReAlloc(GetProcessHeap(), 0, temp, p * sizeof(WCHAR)); Technically this could fail. But I don't think it is necessary - the compiled code for the HeapReAlloc invocation takes probably more space than the few bytes you're freeing a little bit earlier. > + return ERROR_SUCCESS; > + } > + case REG_BINARY: > + { > + BYTE * temp = HeapAlloc(GetProcessHeap(), 0, strlenW(input)); Inconsistent style. > + case REG_BINARY: > ... > + return ERROR_BAD_COMMAND; Does native write different error messages for a negative DWORD, improperly separated REG_MULTI_SZ and invalid REG_BINARY? > + *out = HeapReAlloc(GetProcessHeap(), 0, temp-odd, p); MSDN says the third parameter has to be a pointer returned by HeapAlloc or HeapReAlloc. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUXLpiAAoJEN0/YqbEcdMwEB4P/R4usEhK7b6woRAHZWXh3oSg UfhpgUpQQELq0nw2WMQrVtkhwvcJywSAkaI/MPyB0vDR6DScqTrcDe2j78yIyMiY DWJ24q+Xfix84fiOfSKbMWJZMAcZnCfn0pliwN/TjfzjOLdAZc6B0fO84wEJfHLL DstJzYgzANg1u3FZJtNpAgex2PpU8MpyATXqbvoZdPhJO3MCwuD9KVzqHgoGupbI A1BIfLWTE3ZHj+x8ygGOQcG4uhcsxWJQu+ygKvoDxGkjfQcQ1gEa9KOmWENDUj+Y 8eT+Ghzn+B7Ekl6RjgKGtNJKgVycwPqWJwR0JgWKRVlkeGrAfl6RNerAPwTODHj0 S+vmYeo6ZtrmHluagnP/hk2SB0yr6DmUITdhfE7LpMKAGutQ32PN1n5eDKpGHrez LWcvJ1beLCEVZk2fJe1r7pqZtMWPIu1wJmla+NyS/7UOuagHcskINm3cSsqNApRn ujMNALDGYozDhMl5/QJi9TJaqcwB2iRocDppkB75XnpcgLuKIION3KNi3jEhsBF8 DMIIF6/cPPFMSqvsoMcaFgm1CIz+AP5yo0LSfR/Rb2RGh+nhWFmBcNyLO6/bIWih D2ebrfCfq+SEzS/bqm3zoAXwShw3464xNuU/m9N8eF7erwUY8o2TDn+XwtXaoOlF kBkaNk8deBwwhIjLG6Pm =wFNB -----END PGP SIGNATURE-----

2 1

Re: [PATCH 8/8] reg: Clean up reg_delete
by Stefan Dösinger Nov. 7, 2014

Nov. 7, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-06 22:17, schrieb Jonathan Vollebregt: > + FIXME("Trying to delete a root key is a bad > idea.\n"); I'd phrase this as FIXME("Deleting root keys is not implemented\n"); or similar. That makes it clear that there's something in our code that needs improvement. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUXMIXAAoJEN0/YqbEcdMwId4P/iDoiGb5zkUHmHICCUGtgQRY h1xl20pabBDu6CVqGfvGxEVAPvWiRU3NHGv/ZmhH7TIv/1bjiFQjPjGlHoxOQmQY +FJspMCbaYfc63pCUh0Z0ogAUImef3yDf+DPYG4ybNgm5mqn8dR8hqpuUeyw2IIa NINo8JvZAd3markcKo8nOnGtrPukAGMbROOBvbkszWJSAiFU4jLMNyGpRcnwmuer ks2Y6sx2GyAAcuIGhIk4LUQegMzltIU+pEpEqffMNqbpqJ9nCd40PNcXCa2Wu9F6 o5ld2Pxfjp5kn/3t0V2zOVfkpRWZJw8+tba9eVUSN3MheV/DNKnbwdF46au8dLsQ shvfFyPugamA0zOKIbY3RJynlUSo8Gj8rLlT9rMX/qrF7WVIVQcFj0/pywmMUN3z fg7CnYDQSglHMVueXUmeHIZrvA9cXJHcDAs31wZbxs72EWnpa4lDnHOgMto5GydB 6cCw/2dw1DHE4BY/xsQNXFJKN+w5fRjkZXgXAEig7R0CTceGHPXjx4xAx/L7L83E 3z/HIv+K/oZ18wCg4y9R/X3fEnLyVR1d5EWcYQjpJ3KbvUloBUEbjeJi+pC9EBHN ilt2/KD3EUW9FAz072VlGcnYCQ1gx2h+II8q2SE3vwTQqyM458c708URJXnnnAyG RKG8p5SmURsRIQ1hiXjc =SPe6 -----END PGP SIGNATURE-----

1 0

Re: [PATCH 5/8] reg: Add wchar/type conversion functions
by Stefan Dösinger Nov. 7, 2014

Nov. 7, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Am 2014-11-06 22:17, schrieb Jonathan Vollebregt: > + {REG_NONE, type_none}, An idea for a future test: Test if REG_NONE does anything useful. That's not a blocker for this patch though. > +static DWORD wchar_get_type(const WCHAR *type_name) > { > ... > + for (i = 0; i < ARRAY_SIZE(type_rels); i++) > + { > + if (!strcmpiW(type_rels[i].name, type_name)) > + return type_rels[i].type; > + } > > return -1; > } > ... > if (reg_type == -1) Dmitry shout at me, but ~0u would be better since DWORD is unsigned. If REG_NONE doesn't do anything useful you could use REG_NONE for this purpose. That's just a suggestion though, ~0u is fine for me. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUXLWtAAoJEN0/YqbEcdMwfVEP/Ap54MfEFnTiDeM9g7/ps9Gf 41SSLz0IJLgNf+UZlifdS1jajIL7lYM6jo91skiJXPfu36kdQeGvOEwJJhCmrPH3 lvdDMetjOKj6Zx7eoawYIi1ZhUSavp6ZMeLT0zBjdzHN14fHZHlccVnw/Jmb/Gd6 zq04scw0wRenWHobb69eW6dAQXy1N9bz9o9wavA6wvVKWo+k5EMSfJB+F3wGMJHN M8/eENJLBbZcpig2Rrlu8xUG1qVHjT01rjmwEJKAl83nj0cfrvWsudm6addZFL/H mLRjJfvZcLe9qBs8gUNtzgdDNqRCjuRjHHcV7qhn7TV/VsHLr68vuvLmLrbDX/vE G9x6jbA9C/Ob8L1QyMTeJyE2aCfVklHGuGpiS8NmzLNT974tllWTnXgA9tkeXQNC xt/hEoHXlTW9o+Dv70XLbdf6Y2Cw6rrDFGRDvUUAjTGPyRG6R8zTv1Jex4KkxJiH 8/cgm552PU2SIoqNneXbQswbJ7OOGwgi64J24YzfD8x2IpT4FaIqpXqZ0dGh00iO Y/XbA57yA8gi9hRrP2xC8WODHJBctRizhW9JCRKZp4jDb3/gKoK35WWSNY3jlku5 8/fTCv94gHv+K08GH4XdJ+Zm5nSjSLhjCkx0R3KwKuf5ansmPzmSysjEqfjQs8es RcGjE3c16jM532UVuHa8 =Cjz7 -----END PGP SIGNATURE-----

1 0

Re: [PATCH 2/8] reg: Add sane_path function to do preliniary key validation
by Stefan Dösinger Nov. 7, 2014

Nov. 7, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-06 22:17, schrieb Jonathan Vollebregt: > diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c > index f93df55..57e0108 100644 > --- a/programs/reg/tests/reg.c > +++ b/programs/reg/tests/reg.c > @@ -129,10 +129,10 @@ static void test_add(void) > ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", r); > > run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest2\\\\ /f", &r); > - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), > + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), > "got exit code %u\n", r); > err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest2"); > - todo_wine ok(err == ERROR_FILE_NOT_FOUND || broken(err == ERROR_SUCCESS /* WinXP */), > + ok(err == ERROR_FILE_NOT_FOUND || broken(err == ERROR_SUCCESS /* WinXP */), > "got exit code %d\n", r); > > run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest3\\ /f", &r); I think this part should be moved into the next patch. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUXK9OAAoJEN0/YqbEcdMwonwP/j9INboZdEyYIP9ShVkn3W/U vK0kn4R+dzlMsoHrxyQI8037A8SnppqFj6QcvaPBmgj682srl0NdWKlPZPYPYOp5 DVmio9kN4w3KtZ9Oezs+mMXEUTHJ4sSE1fHOkn3TujqCLqKT3Ek6ANl8yFuTUWYz 27Usan0HPlW3oMGgyhTgdltE/v0Q3ObHXMvhoKsYI9lWSHEA1stjtk0CSUMe6mdG hE2ftJb2+nhVoFckNf9IcFMaIj6Ctizi7+oLU6bUNwl4zYN5sClyQto/YwPG6n1x zRARhrDYE+2g8N7dgkdBv8v98sCe8F8O6rMIz98BcE75sof3sNxCeiHqKqhFGkMP KWe6OHungsXxNy/tA/RzB6mKTL334KBwFrGz+qsdHB/ikj0mD8ykrY0aWnPmAw4K GqxpFFMl2AFe3p65cTzZP9TQ2QpiMZt5nkZbqdSABP4nqrUsYEhnact95KrBu8R0 Lcq9ahxgs1R76BRWnfu1VoNVPKyJK6iTiXoKmUbvS8CMhq/CW9rZs5GCKzso/oSY c1wt5Lgc5ZBFUaBMhK3fdSQbfw33iTpCqLbrERarrvD0SMUvvKrN4sBYE/4pFaEU JkGnNb02YB1SrLKOE7TkMZOc9npfk/aLPEfH7q0UCmYqN2wKidMaEk9rdINm5l0S i8KHvSnvIWXixdOcN00z =a//X -----END PGP SIGNATURE-----

1 0

Re: [PATCH 1/8] reg: Add system error printing function
by Stefan Dösinger Nov. 7, 2014

Nov. 7, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-06 22:17, schrieb Jonathan Vollebregt: > +static int reg_print_error(LSTATUS error_code) As mentioned yesterday this doesn't need a return value. > + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, > + error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (WCHAR *)&message, 0, NULL); > + > + reg_message(STRING_ERROR); > + reg_printfW(error_string, error_code, message); > + HeapFree(GetProcessHeap(), 0, message); http://msdn.microsoft.com/en-us/library/windows/desktop/ms679351(v=vs.85).a… says FormatMessage uses LocalAlloc to allocate the buffer. You need to free it with LocalFree. I don't know if we have any rule for checking the return value for FormatMessage here. You are already in an error printing codepath, and if you print an error every time printing an error fails you'll never stop. Otoh it seems questionable not to check the return value. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUXK8aAAoJEN0/YqbEcdMwxuoP/RGyxXJoVN5h8Quj3L5HFGb+ Fg3xah51LzRJzQFirZ7yF13OVoZiGg7om4eAlo/eSAy1Ae/jzGxodg7PKEU7DXX/ 3s2TYE9TrkPJClt2hFq1asGoAI1uezNDJybwSXBxEgRAkUzBBhBh+9XEKffZz3iE OWpyHyCOQBwHPBq3krLP+joADngT13UfEvvrccNobvYb47WMBddJ70UdD+sYeF/i fbbYMdnhIKowbe26xCVwSDN5huXMq1f9zYuqkJwL6BRmkgD5FiwYdo8zXu2BvpEq ZkFwxUjCXFRJ7nwLAly5lNSCA1MMFD/Whwd5PxbMmVCwWK3nhqknxQdJJJIy95vd e2JeSwk/4ELavjXubMGAH5D7QfTnveO/ji/kZCWB2buN30ht5ORRH6bjupL/zIr4 hhh4HJ/6EdHhWJfffenmM9uGxN8zNO6HmVSHVnXn90QnSousjuNkFymfr9RkWycr kmjPJQw8inoEl0zmeMiDdu+Kxo9MHX7SAwAHi9OzYeU2aka8LTOASn0mmKM+GBeO 9uaJbQAa/ILzWkFaYY/C+lgnyJgjgY6+fFj1O+DFlXh4DnaZ1DXMrn4+3WrUDWQk 3cFD0/6ehVBuUouEY8dF0yDiWPO9cwTEe7S5G9u03rS72H6mRfRP8mJVI6ZVPwbU 7wj5TGWDXCcDiRHd46UI =abxe -----END PGP SIGNATURE-----

1 0

Re: [PATCH] vbscript: Implemented String(try 3)
by Piotr Caban Nov. 7, 2014

Nov. 7, 2014

On 11/07/14 04:36, Shuai Meng wrote: > used mod other than division when the second argument(length of > string) is grater than 256; Your test was already showing that it doesn't work this way. You will probably need to use MultiByteToWideChar function here. + case VT_ARRAY|VT_BYREF|VT_VARIANT: + return DISP_E_TYPEMISMATCH; + default: + hres = to_short(arg + 1, &tmp); There's no need to handle VT_ARRAY|VT_BYREF|VT_VARIANT case separately. It will be done by to_short function. Thanks, Piotr

1 0

Re: shell32: Simplify check for empty string (PVS-Studio)
by Alistair Leslie-Hughes Nov. 7, 2014

Nov. 7, 2014

On 07/11/14 20:22, Michael Stefaniuc wrote: > --- > dlls/shell32/shellord.c | 2 +- > dlls/shell32/tests/ebrowser.c | 2 +- > dlls/shell32/tests/shlfolder.c | 14 +++++++------- > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c > index 56c9fe9..914dc5a 100644 > --- a/dlls/shell32/shellord.c > +++ b/dlls/shell32/shellord.c > @@ -947,7 +947,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) > /* buffer size looks good */ > ptr += 12; /* get to string */ > len = bufused - (ptr-buffer); /* get length of buf remaining */ > - if ((lstrlenA(ptr) > 0) && (lstrlenA(ptr) <= len-1)) { > + if (ptr[0] && (lstrlenA(ptr) <= len-1)) { You are changing tabs to spaces here. Best Regards Alistair Leslie-Hughes

2 1

Re: [PATCH] vbscript: Implemented String(try 3)
by Marvin Nov. 7, 2014

Nov. 7, 2014

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=10094 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/4] d3d8/tests: The device restores the mode settings from the registry (v5).
by Marvin Nov. 7, 2014

Nov. 7, 2014

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=10090 Your paranoid android. === w8 (32 bit device) === device.c:1173: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1218: Test failed: Reset failed, hr 0x88760868. device.c:1220: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1224: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1231: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1232: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1233: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1234: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1235: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1236: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1241: Test failed: Screen width is 640, expected 800. device.c:1242: Test failed: Screen height is 480, expected 600. device.c:1248: Test failed: Back buffer width is 640, expected 800. device.c:1250: Test failed: Back buffer height is 480, expected 600. device.c:1280: Test failed: Screen width is 640, expected 1024. device.c:1281: Test failed: Screen height is 480, expected 768. device.c:2441: Test failed: Expected foreground window 000B00F8, got 0002004C. device.c:2813: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2817: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2839: Test failed: Failed to reset device, hr 0x88760868. device.c:2843: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2847: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3215: Test failed: Failed to reset device. device.c:3222: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3230: Test failed: Expected wndproc 0x412ed0, got 0x412ed0.

1 0

Re: [PATCH 1/8] reg: Add system error printing function
by Stefan Dösinger Nov. 6, 2014

Nov. 6, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-06 22:17, schrieb Jonathan Vollebregt: > +static int reg_print_error(LSTATUS error_code) +{ As mentioned on IRC, this can "return" void. I'll look at this more closely tomorrow. Wait with the resend a bit until I've checked all the patches, so far I've only spotted small issues, nothing that will turn everything upside down. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUW+eWAAoJEN0/YqbEcdMwaJcP+wZqn1PerYCBMWcv9JEvllGk WPaSG5ETP0cVEFq2D0Y07e/eOrbfRHvg20/BLp/KxszHQjOMGNK7r2EyPlERIF4Q EqIfgR9Yirf25fP2fC9a99UOkg6H0PTWZbHjVDhWZjeUNrHW6jJgKry1IjmvOm9h wkHFXR/IKQFcgTJVEB2wIi2vfdMqDjWRb9zK4Ft+FyLmzlmi144aErd5QD6iidim urbDbHeIbPA8uvndEVpTXoL7DeE0gJldf861UKWh4WBMboPzoZ9v4Ws4BvPQFSlV ufMzLFJIXHb7VGn2aj04FPkEicJ481KvjllcVHnnFaLWqSb76QLRqsEG6Y3ION9r Zh60OYs9gq3VN5YTAIuN0W7vRMrVXNTIHgsL1MD71vzMz655kTQeeaCBACZoSMXS thzAOuhWrtzAzUxzaw9VwIuYIwTtw557M5OGGruNCeYe+I/+L7gsr0OEQLcUovTW bX0enl+65tjGBMFttFxjdmCa4Mlsh7jpU/Md+71D5yo77nrqGAZWANYkipJczxaU KCpDz0wccR3T1S4VW6p9r1HuhuUOrhSG9XR4DT3dqaO8gl2c8rnPRtlMVpTMiL51 1AhbviV6tiHQR/M0ksu0bDtexHHmXmBdMDK7qfP4mIAtTJ6MVPNBrWwSwMXnPmNG d1o2xWea1bfFPTj9hMNm =dhm6 -----END PGP SIGNATURE-----

1 0

Re: [2/2] wined3d: Take abs() of vertex z coordinate as FFP fog coordinate (try 4)
by Marvin Nov. 6, 2014

Nov. 6, 2014

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=10078 Your paranoid android. === w8 (32 bit visual) === visual.c:880: Test failed: CreateVertexShader failed (0x8876086c) visual.c:882: Test failed: CreateVertexShader failed (0x8876086c)

1 0

Re: [PATCH] advapi32/tests: Test RegDeleteKey with empty string parameter
by Stefan Dösinger Nov. 6, 2014

Nov. 6, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Content-wise this looks ok to me. But please mark a resubmission of a patch in the subject line and preferably say something like "This supersedes patch XXXXXX" in the patch desciption and add a small explanation what changed. (No need to resend this one. Just keep it in mind for the future.) Stefan Am 2014-11-06 19:18, schrieb Jonathan Vollebregt: > --- > dlls/advapi32/tests/registry.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c > index 23eafab..55a74f6 100644 > --- a/dlls/advapi32/tests/registry.c > +++ b/dlls/advapi32/tests/registry.c > @@ -1372,6 +1372,7 @@ static void test_reg_close_key(void) > static void test_reg_delete_key(void) > { > DWORD ret; > + HKEY key; > > ret = RegDeleteKeyA(hkey_main, NULL); > > @@ -1390,6 +1391,15 @@ static void test_reg_delete_key(void) > ret == ERROR_ACCESS_DENIED || > ret == ERROR_BADKEY, /* Win95 */ > "ret=%d\n", ret); > + > + ret = RegCreateKeyA(hkey_main, "deleteme", &key); > + ok(ret == ERROR_SUCCESS, "Could not create key, got %d\n", ret); > + ret = RegDeleteKeyA(key, ""); > + ok(ret == ERROR_SUCCESS, "RegDeleteKeyA failed, got %d\n", ret); > + RegCloseKey(key); > + ret = RegOpenKeyA(hkey_main, "deleteme", &key); > + ok(ret == ERROR_FILE_NOT_FOUND, "Key was not deleted, got %d\n", ret); > + RegCloseKey(key); > } > > static void test_reg_save_key(void) > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUW8qZAAoJEN0/YqbEcdMwE+AP/3ZkydOTA8XW2U0Dx5NlNTeZ d6tNj1fcVyY7XZs/+/LSBUjUsS1STy+UN6PInVp2rvYVJ057PP28768pghzzDRiP ZC98QHls3nx8qXtIhjUTUDWDZFFFJlScf81qkm1QKhc/zQ4+KWX1ndUOgNJsc6F5 T7x7OaQP5uniOodw1D0OZmqpbAFMxa9jMX3M4StNzGvrO+WPj7anriuA56Fb/tWW oQxItSe0r7uSX6+1Xj0nWYK+Wv1q73GicVP98t85IOA2FgyBWEyTlaw3A/LeyENh LxW/b5qN2VfTMfs5I5kBKbC7QhOzNHZo0cjKBgkN2xKi2K6+1v+F0UI3+Dajvjg6 Sez4NphgMMMRSaZlqo8G9SX8gjgIVhyfo0RyqU85YoFvHXL97nw3C0Xhz5Iqbf7Y TZcpGxLVOYcl/jqITPVQYrwpyds5eT/vxvBfE32/eMwEi8lH5qGTYQkykditOX+a 5/nVXUAasyRmBq/nb4oDFdTXFX2saxcM9QpeptIc5sKwWYHe9bQ+w44fIAC9hCSP nZyDCUTymjuofS1EqD8ZzOebUf+0/Dfujm6odn7pUHg6ZdKqS9aX4BXfSJfJTg6M Quh3F+bX8lTe60wXyQQ9UbVpYEIOkCBJMQoPlM+qHLVRgR1oJK6fpXLvFYp8o2sV b68XSbGXriHFUMhKcPkz =tXkF -----END PGP SIGNATURE-----

1 0

Re: [2/2] wined3d: Take abs() of vertex z coordinate as FFP fog coordinate (try 3)
by Stefan Dösinger Nov. 6, 2014

Nov. 6, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-03 19:55, schrieb Joachim Priesner: > + static const DWORD vertex_shader_code1[] = > + { > + 0xfffe0100, /* vs_1_0 */ > + /* output.Pos = mul(Projection, input.Pos) */ > + 0x00000005, 0x800f0000, 0x90000000, 0xa0e40000, /* mul r0, v0.x, c0 */ > + 0x00000005, 0x800f0001, 0x90550000, 0xa0e40001, /* mul r1, v0.y, c1 */ > + 0x00000002, 0x800f0000, 0x80e40000, 0x80e40001, /* add r0, r0, r1 */ > + 0x00000005, 0x800f0001, 0x90aa0000, 0xa0e40002, /* mul r1, v0.z, c2 */ > + 0x00000002, 0x800f0000, 0x80e40000, 0x80e40001, /* add r0, r0, r1 */ > + 0x00000005, 0x800f0001, 0x90ff0000, 0xa0e40003, /* mul r1, v0.w, c3 */ > + 0x00000002, 0xc00f0000, 0x80e40000, 0x80e40001, /* add oPos, r0, r1 */ > + /* output.Color = input.Color */ > + 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ > + 0x0000ffff, /* END */ > + }; I asked Henri about the status of this patch on IRC today, and he reiterated that he wants the matrix multiplication removed from the shader and replaced with z = z * 0.5 + 0.5. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUW7xNAAoJEN0/YqbEcdMwtjoP/2Jfv+6KmJ23vWa7v3NvSYv0 KFx2z6d+omGCjhGjbjRNfv/l2YmbPGtDJW2lVMA6FPU+Nguz6GjNFGAuDjzvUYlH RyxpJi4tUOM0HM7dMqAZSIgSc1hr/kXYTowbm4gxwt8LfrvgPBfaB120RRQ9n4Q0 EF8LOxUYFErPQ96Xum0E2mIgVm0Cehax7gPJXrszYwCOK8ApIlvc3zRGantrG85g WtgjTwe9/uVe2xIrWl6dyDtC+CZSeFnROhPdEP9vr5im/5uJJTH1YOkeZv6lwieV Z6W2v730OsDqcBIj2+Dx6Ytb6Mr+Q0b/UFae09/23wOSuxW7yMYU12FwvfWUoRiI T5BvvShShQRIvsvojdUnJOzL3MBTvXzqu98vIrrrJ47sjawt0ovmD3Ofz02+BBuU sZh9HgsTiAu1e5fVau7GxhqOMzd1ou6jer+YgGriJ8kwkUIkFXdaQDuY7gx+xICu i70H25mSprHPccRAPe8TcoJC1ClUjAF8UoKk9uham0uOTM9TsbQyYUzS+3gqhuv5 ZIQtk/YfPtWeXl/W/qPczo0/oAcJE9Al5831vA/6kZ8Z2xrzKW6uBOa0mGPqyUyr pZOkyYiWPwPbA6jo7y9oNpY/XbuB4Xjis7lm49fWJr6TiEnRRyvzju3U5Ea8qvBo +qUVGAE5iofmM94IONgi =iwvO -----END PGP SIGNATURE-----

1 0

Re: [PATCH 1/3] advapi32/tests: Add trailing slashes tests for RegOpen/CreateKey
by Stefan Dösinger Nov. 6, 2014

Nov. 6, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fyi, I asked for these tests to be added to demonstrate that rejecting trailing backslashes is the behavior of reg.exe and not the advapi32 functions. Patch 1 and 2 look good to me, and I made Jonathan aware of the unchecked ret assign in patch 3 on IRC. Am 2014-11-06 19:03, schrieb Jonathan Vollebregt: > --- > dlls/advapi32/tests/registry.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c > index 382d8cc..3aff541 100644 > --- a/dlls/advapi32/tests/registry.c > +++ b/dlls/advapi32/tests/registry.c > @@ -953,6 +953,11 @@ static void test_reg_open_key(void) > ok(hkResult != NULL, "hkResult != NULL\n"); > RegCloseKey(hkResult); > > + /* trailing slashes */ > + ret = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test\\\\", &hkResult); > + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); > + RegCloseKey(hkResult); > + > /* open nonexistent key > * check that hkResult is set to NULL > */ > @@ -1218,6 +1223,12 @@ static void test_reg_create_key(void) > RegCloseKey(hkey1); > } > > + /* trailing backslash characters */ > + ret = RegCreateKeyExA(hkey_main, "Subkey4\\\\", 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL); > + ok(ret == ERROR_SUCCESS, "RegCreateKeyExA failed with error %d\n", ret); > + RegDeleteKeyA(hkey1, ""); > + RegCloseKey(hkey1); > + > /* WOW64 flags - open an existing key */ > hkey1 = NULL; > ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &hkey1, NULL); > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUW7s2AAoJEN0/YqbEcdMw3coP/1o0qah4t2dTpAHVXUB08UIZ IzII9m1g8uGrqffTJWFJqzDR3jDZjanxxCxvsEYO493WX57YZebsTk1jLbL/BYHi yzuGaukeDhOf0dtPD4xbjjnkg0JMJ5L+8T7SSTVeEj8TEFLwCOABZfAEiwo4O0PP ISvNF2BQFBULuq2kWVZ4K8piw/LFD+y3Mcodw3uCydsBS0bQ2Xp5YiLOImAqITmi YxxR+VOQWZ2SFLUUE79Ct7mmWTUkufCaAcj/6HPpgcfsgqUt/VqwEG0oAPrTwnKc EfmtRrkgLgSQadzKjSbjAnFQghGAUVcAWCXZ09UMCzLiNKf+UvDh/298XYlRvf5Z Tey30k4Jj6/K+RZfJNQTUIQNImbOvUWWHQFbJ4pIfOGRJi5dH+vig20lHDUB+lE5 cLmEpVhMc3bjb0yyeDeqL1j5p/isedeJCFcj9R2giNQRGRswduiTH5xtV4xUk+oB Cu716ppFZyUXVMIhL73+P6PiHM/GyDlKAvkTQVN0FMW8v9vtoVmElIIrkmqmnLLz OcyGRIhd+0YMnZTyvio2nPI23yu+IroKTDiVXjTJEZl0dVPBD4jK6t8RPpfQfY54 USzUa5k2wUKNIWejbK6GkIIA/+TF+UvcRumqo1NTtZ3ZHn7ds4soxhlwdKhOUkLy 0mgdtIWV6Aa2mQoTcNLT =76OW -----END PGP SIGNATURE-----

1 0

Re: [PATCH 3/7] reg: Add path/key conversion functions
by Stefan Dösinger Nov. 6, 2014

Nov. 6, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-04 21:15, schrieb Jonathan Vollebregt: > +typedef struct > +{ > + HKEY key; > + const WCHAR *short_name; > + const WCHAR *long_name; > +} hkey_rel; Style suggestion: you can make this an anonymous structure: struct { HKEY key; const WCHAR *short_name; const WCHAR *long_name; } root_rels[] = { {HKEY_LOCAL_MACHINE, short_hklm, long_hklm}, {HKEY_CURRENT_USER, short_hkcu, long_hkcu}, {HKEY_CLASSES_ROOT, short_hkcr, long_hkcr}, {HKEY_USERS, short_hku, long_hku}, {HKEY_CURRENT_CONFIG, short_hkcc, long_hkcc}, }; Unless of course you need the structure definition elsewhere. > +static LSTATUS path_get_rootkey(const WCHAR *path, HKEY *out) Since you're only returning two possible values (ERROR_SUCCESS or ERROR_BADKEY) you can make this return a HKEY *. > +static LSTATUS path_get_key(const WCHAR *path, HKEY *out) > +{ > + HKEY k; > + LONG err = path_get_rootkey(path, &k); > + if (err != ERROR_SUCCESS) > + return err; > + > + path = strchrW(path, '\\'); > + if (path) > + path++; > + > + err = RegOpenKeyW(k, path, &k); > + if (err != ERROR_SUCCESS) > + return err; > + > + *out = k; > + return ERROR_SUCCESS; > } What do you think about this: static LSTATUS path_get_key(const WCHAR *path, HKEY *out) { *out = path_get_rootkey(path); path = strchrW(path, '\\'); if (path) path++; return RegOpenKeyW(*out, path, out); } If my understanding of RegOpenKeyW is right this will give you ERROR_INVALID_HANDLE (winnt+) or ERROR_BADKEY (win9x) if the root key is invalid, ERROR_PATH_NOT_FOUND if the path is invalid, and ERROR_SUCCESS otherwise. So pretty much the behavior of your code in 1/3rd of the lines of code. I think path_open would be a better name for this function. You could also consider an additional BOOL create parameter to call RegCreateKeyW instead of RegOpenKeyW so you can reuse this code in reg_add. > + err = path_get_key(key_name, &subkey); > + if (err != ERROR_SUCCESS) > { > - reg_message(STRING_INVALID_KEY); > - return 1; > - } > - p++; > - > - root = get_rootkey(key_name); > - if (!root) > - { > - reg_message(STRING_INVALID_KEY); > + reg_print_error(err); > return 1; > } > > @@ -306,21 +341,19 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, > /* Delete subtree only if no /v* option is given */ > if (!value_name && !value_empty && !value_all) > { > - if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) > + HKEY root; > + err = path_get_rootkey(key_name, &root); > + err = RegDeleteTreeW(root, strchrW(key_name, '\\') + 1); My reading comprehension may be lacking again, but can't you just call RegDeleteTree(subkey, NULL)? You're also assuming the caller isn't trying to nuke HKEY_LOCAL_MACHINE :-) . -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUWUmSAAoJEN0/YqbEcdMwjmQP/iuYzlfloARtQOxq6zCyHAsT bBFIHVwZoiB3/e4UvDcnRvcdJGvTM/LNu2LBczsFhOEfidSGsMYbbPAm2bEP5cJE FAcy2bMTpiaPJx957dbimhEQuSreRx1OOdzH6jK74g+d/WJ3fHy0RHh9QXY0Rpe+ JLsPDOpau2gDs6HoKNvF9yVPM32sa/BWJGtLqGFhQngmzIye9WmBEVMX+c6w9q9N gxc7uiDBYXMSi4D2rGE5HwQJq3AM6InTOKkyAkDZv6EObvUeZ0JQKtFlC6tW3z0x aXTzs9RjvzS2er5ULPyxYV3QxBynRzI80VoWq5p3Z4M34dIaSsJeuWlhTWiIktzl U+M7G1Ukk3owmmXtYC0nBOIBq2IEzRzL28nXwbz3h8EUp1kYzwsZ9VpP6NitOP+6 E2yywBEDIrJL22RNSt79GLKlnLKpBNitWq5xCoWdXE625pBDSEH4cKlE5Afwi7j7 /jNGjxRv4Rre6+PcgrPLq3JSaEDHAs+tKuBvkJWgCKCc45KkaGiiwS5Tp32odqdA Q75F+8Epolx00aA948PwJ827VMtMT6U6z79ypluI5tgHuldhS73pmg9PvLtVfYG6 TlexSFUC1eq0FJWwS8yxY2HO20ZbQpOjpmrxR0mu2ACcFfdH8Ut6dspB5g2ttrGU XgXrPCumoV8HxXzwDcMu =B2eH -----END PGP SIGNATURE-----

2 4

Re: user32/tests: Add tests for MsgWaitForMultipleObjectsEx.
by Marvin Nov. 6, 2014

Nov. 6, 2014

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=10062 Your paranoid android. === w7u (32 bit msg) === msg.c:12147: Test failed: unexpected hwnd 0014013C msg.c:12169: Test failed: bad time 308c6/308d6

1 0

Re: [PATCH 1/5] d3d10core/tests: Port alpha_test() to d3d10core.
by Marvin Nov. 6, 2014

Nov. 6, 2014

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=10061 Your paranoid android. === wvistau64 (32 bit device) === device.c:2175: Test failed: Failed to create input layout, hr 0x80070057. device.c:2210: Test failed: Failed to create texture, hr 0x80070057. device.c:2212: Test failed: Failed to create rendertarget view, hr 0x80070057. device.c:2260: Test failed: Got unexpected color 0x800000ff. device.c:2262: Test failed: Got unexpected color 0x800000ff. device: unhandled exception c0000005 at 7306CBBD === w2008s64 (32 bit device) === device.c:2175: Test failed: Failed to create input layout, hr 0x80070057. device.c:2210: Test failed: Failed to create texture, hr 0x80070057. device.c:2212: Test failed: Failed to create rendertarget view, hr 0x80070057. device.c:2260: Test failed: Got unexpected color 0x800000ff. device.c:2262: Test failed: Got unexpected color 0x800000ff. device: unhandled exception c0000005 at 744ACBBD === w8 (32 bit device) === device.c:2175: Test failed: Failed to create input layout, hr 0x80070057. device.c:2210: Test failed: Failed to create texture, hr 0x80070057. device.c:2212: Test failed: Failed to create rendertarget view, hr 0x80070057. device.c:2260: Test failed: Got unexpected color 0x800000ff. device.c:2262: Test failed: Got unexpected color 0x800000ff. device: unhandled exception c0000005 at 0040155D === wvistau64 (64 bit device) === device.c:2175: Test failed: Failed to create input layout, hr 0x80070057. device.c:2210: Test failed: Failed to create texture, hr 0x80070057. device.c:2212: Test failed: Failed to create rendertarget view, hr 0x80070057. device.c:2260: Test failed: Got unexpected color 0x800000ff. device.c:2262: Test failed: Got unexpected color 0x800000ff. device: unhandled exception c0000005 at 00000000745122BF === w2008s64 (64 bit device) === device.c:2175: Test failed: Failed to create input layout, hr 0x80070057. device.c:2210: Test failed: Failed to create texture, hr 0x80070057. device.c:2212: Test failed: Failed to create rendertarget view, hr 0x80070057. device.c:2260: Test failed: Got unexpected color 0x800000ff. device.c:2262: Test failed: Got unexpected color 0x800000ff. device: unhandled exception c0000005 at 00000000746C22BF

1 0

Re: [PATCH 1/5] d3d10core/tests: Port alpha_test() to d3d10core.
by Marvin Nov. 6, 2014

Nov. 6, 2014

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=10060 Your paranoid android. === w8 (32 bit visual) === visual.c:2635: Test failed: unexpected colortable on offscreen surface

1 0

Re: [PATCH 1/2] kernel32/tests: Add UTF-7 non-encoded surrounding characters tests.
by Alexandre Julliard Nov. 6, 2014

Nov. 6, 2014

Alex Henrie <alexhenrie24(a)gmail.com> writes: > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, input, 4, output, sizeof(output) - 1, NULL, NULL); > + ok(GetLastError() == 0xdeadbeef, > + "i=0x%04x: expected error=0xdeadbeef, got error=0x%x\n", i, GetLastError()); Testing last error on success is not useful and should be avoided. -- Alexandre Julliard julliard(a)winehq.org

2 3

WineHQ Downloads page needs a disclaimer
by Rosanne DiMesio Nov. 6, 2014

Nov. 6, 2014

A good example of why: https://bugs.winehq.org/show_bug.cgi?id=36964#c15 Our Downloads page doesn't directly say that the binary packages listed are officially endorsed, but it does give that impression: only a few distros are listed, the very top of the page says "Supported Wine" in big letters, and while the 3rd Party Tools section explicitly says those aren't supported, the Binary Downloads section gives no such warning. Users who assume that the packages listed on that page have the "WineHQ seal of approval" aren't being unreasonable. This isn't just an issue with the Fedora packges. The Ubuntu packages with winepulse and changes to dsound have long been a problem (plus https://bugs.winehq.org/show_bug.cgi?id=34299) and the CentOS/RHEL 7 packages are 64 bit only. I have stickies on the forum about all these things, but not everyone comes through the forum. The Downloads page needs to make it much clearer to users that the distro packages listed are not "official" WineHQ packages. The wording could be something like "Binary packages are built and maintained by the distros, and may contain patches that are not supported here. The links below are provided solely as a convenience to users and do not represent an endorsement." (Posting here because that's what I've been told to do for such issues.) -- Rosanne DiMesio <dimesio(a)earthlink.net>

3 2

Re: [1/2] d3dx9_36: Implement D3DXCreatePolygon. (try 5)
by Matteo Bruni Nov. 5, 2014

Nov. 5, 2014

2014-11-05 18:47 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Argh, head->wall - accidentially made the changes to v2 instead of v3. ;) > Again replace ~0 -> ~0U. Yeah, I noticed that but it wasn't a showstopper of course, no need to bang your head to the wall :D I confirm my approval (as much as it might matter), including patch 107477. > > Based on a patch by David Adam. > --- > dlls/d3dx9_36/d3dx9_36.spec | 2 +- > dlls/d3dx9_36/mesh.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ > include/d3dx9shape.h | 2 ++ > 3 files changed, 91 insertions(+), 1 deletion(-) > > >

1 0

Re: [2/2] d3dx9_36/tests: Add tests for D3DXCreatePolygon. (try 4)
by Matteo Bruni Nov. 5, 2014

Nov. 5, 2014

2014-11-05 18:25 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Changes in try 4: > * Use smaller buffer > * Fix typo > * Remove error checking & goto > > Changes in try 3: > * Replace ~0 -> ~0U. > > Changes in try 2: > * Lot of style cleanups - hopefully I didn't miss anything. > * Fix condition for 'sides' argument (should be >= 3, not just != 0) > * Added test to check if *mesh is cleared on error - tests show that this is not the case. > I only kept a single test for that to avoid making the test code too ugly. > > Based on a patch by David Adam. > --- > dlls/d3dx9_36/tests/mesh.c | 155 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 155 insertions(+) FWIW, series looks good to me.

1 0

Re: [2/2] d3dx9_36/tests: Add tests for D3DXCreatePolygon. (try 3)
by Matteo Bruni Nov. 5, 2014

Nov. 5, 2014

2014-11-04 19:57 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Based on a patch by David Adam. > --- > dlls/d3dx9_36/tests/mesh.c | 163 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 163 insertions(+) Hi Sebastian, first of all, let me say I'm okay with these patches going in as they are. IMHO there is still room for improvement though: +static void test_polygon(IDirect3DDevice9 *device, float length, unsigned int sides) +{ + HRESULT hr; + ID3DXMesh *polygon; + struct mesh mesh; + char name[256]; No need to use such a big array there. + hr = D3DXCreatePolygon(device, length, sides, &polygon, NULL); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + if (hr != D3D_OK) + { + skip("Couldn't create box\n"); Copy-paste typo. FWIW, we usually prefer a '.' at the end of trace messages. + adjacency = NULL; + hr = D3DXCreatePolygon(device, 3.0f, 11, &polygon, &adjacency); + ok(hr == D3D_OK, "Expected D3D_OK, received %#x\n", hr); + + if (FAILED(hr)) + { + skip("D3DXCreatePolygon failed\n"); + goto end; + } That D3DXCreatePolygon() call is not expected to ever fail, so no need for the "if". + if (adjacency) + ID3DXBuffer_Release(adjacency); If you remove the previous "if" you won't need the "end" label and this one becomes always true. Then I'd put this Release() right after the loop checking the adjacency. Again, I don't care about those details, this is still good enough for me. It's mostly about any future patch you'd want to send in.

2 2

Re: advapi32/tests: Avoid a crash on some linux hosts.
by Marvin Nov. 5, 2014

Nov. 5, 2014

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=10035 Your paranoid android. === w7u (32 bit service) === The test timed out

1 0

Re: msi: Simplify check for an empty string (PVS-Studio)
by Marvin Nov. 5, 2014

Nov. 5, 2014

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=10031 Your paranoid android. === w2000pro (32 bit action) === The test timed out === wxppro (32 bit action) === The test timed out === wvistau64 (32 bit action) === The test timed out === w7u (32 bit action) === The test timed out === w8 (32 bit action) === The test timed out === wvistau64 (64 bit action) === Failure running script in VM: timed out waiting for the child process

2 1

Re: imm: Fix switching to Chinese IEM after typing some English will fail
by Aric Stewart Nov. 5, 2014

Nov. 5, 2014

On 11/3/14, 8:52 PM, 黄巍 wrote: > Bug 35896 - Switching to Chinese input method after typing some English will fail. > https://bugs.winehq.org/show_bug.cgi?id=35896 > > --- > dlls/imm32/imm.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c > index 7ed1fe6..47c7ea8 100644 > --- a/dlls/imm32/imm.c > +++ b/dlls/imm32/imm.c > @@ -2901,6 +2901,8 @@ BOOL WINAPI ImmProcessKey(HWND hwnd, HKL hKL, UINT vKey, LPARAM lKeyData, DWORD > else > return FALSE; > > + data->immKbd = IMM_GetImmHkl(hKL); > + > if (!data->immKbd->hIME || !data->immKbd->pImeProcessKey) > return FALSE; > > I recently made a fix to this area of a bug very similar to the one your reported. Have you tested with the most recent development build without your patch to see if it was already fixed? I feel like your change should be unnecessary after my modification. -aric

2 1

Re: [PATCH 7/7] reg: Clean up reg_delete
by Stefan Dösinger Nov. 4, 2014

Nov. 4, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-04 21:15, schrieb Jonathan Vollebregt: > +#define MAX_VALUE_NAME 16384 This is ugly. Why not use lpcMaxValueNameLen from RegQueryInfoKey like the old code does? > +#define ERROR_NO_DELETE_ROOTKEY 20003 Ah, here we have the case I raised in patch 3 :-) . This seems like another error case that advapi32 should be able to handle for you. It needs tests in reg.exe and advapi32.dll. That's assuming the call is really supposed to fail - if it succeeds we obviously don't want to test it and destroy the Windows installation in the process. Before you test this on the testbot ask fgouget if it is safe to test. I believe it is since the VMs are restored from read-only snapshots after every test run. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIbBAEBAgAGBQJUWVxsAAoJEN0/YqbEcdMwQhQP92zeYVEhBb4RXRMhtNsrtU6R jHPf1hGDtMM484wNhpHv97C/2sQ5RUq4bEAanyNNxdLZEFUJ7vT3LVNcEOmPqVI+ jKR5G9h0tXtqaGlee6fHiMPN6ZfRZjxqCNrNICXcCO13f/eErT+uCRPqLAh5b8YY Tpo5CsOJgS9tGh2UHBFbRt+ZAa/M0Mu4N/6253140HxQfVVgJ2Q3j3fERJ5TacJI o26uQpWD0Olu+pv64Ej3eehnGJ5cmHld9wBdbIJjRwvQ8knukzPC6tdhAlZrVoTN KI3F8r+LIlNQm/VF/E3cQWo/vTXDJsQ5tArOMyQfWvLBzpHOZ3Lye4fF2wwvgVFG VOfcui1eFmGYR/4f+r/mxbespuyYYBBD+rR2kDnhXgrxqegDIpyfPFN3cQQDSHJD FVoEb8mb4nxkqckywWw4tDBp7TM0dOJsUKeLIyjmT4sl+LH8YWCuINL0eN7i9AlV XhK7wjF02vVmXrRiJDycJkAAoS4yxY5tyEPM0Ua/M68cLQ5SJNx1oOXWTJSu5W+b XNAgc4MCGhtNOsaNE7SQdyETYfoqeStv1BxEb0eTFb+z+uia0lDpxFuytbSkTqWH xEJJe+bmNnhDqkmOUOz8ShfWoGVmvwGg99t+2XBWmRaveFBHXvJkb2D4XXjfCK7D CxvCYItQ7xN6Ub9vKMc= =deiq -----END PGP SIGNATURE-----

1 0

Re: [PATCH 5/7] reg: Add wchar/raw data conversion functions
by Stefan Dösinger Nov. 4, 2014

Nov. 4, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-04 21:15, schrieb Jonathan Vollebregt: > +static LSTATUS wchar_get_data( const WCHAR *input, const DWORD type, > + const WCHAR separator, DWORD *size_out, BYTE **out) > +{ > + DWORD i; > > - switch (reg_type) > + if (!input) > + return data_default(type, size_out, out); > + > + switch (type) > { > case REG_SZ: > + case REG_EXPAND_SZ: Another option to consider instead of the switch construct: Add conversion function pointers to struct type_rel. In this case you cannot use an anonymous structure. wchar_get_type would return a const struct type_rel *, and you can get the REG_* DWORD from it and call the data conversion function. The same can be done in the opposite direction. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUWVgQAAoJEN0/YqbEcdMwfBUP/1IEsXZU+GuDO/fyjUGeRcke TBPRvRdgWpDtGc9Bm35dimRPXX8nw/Sk/2KLRRpqnWKQp76LuwYCkB7exWaJLWDP jxb/MP3QdWKkxxmkJDwerviB2ouoW6TWgatksCO+MOmxzQcwrJj2l88LefgQeD0Y w3T/kv5oWsKpIuZVJjtg4Jw8FNo1Q7PQI1bJaoa16t+Hb1KPUwn0U5/bVqD30B8H OqCEdv1jlqSYEMXP4yD3QXpapyDu8R//gCqcIdFml1MO9XdOR5sSnkdUqQipSNjZ 0UyBDtUVp/3KsI+cz4Uk3HqgaHnXFhESyG0CBMySM/we3ofWGvya5lOmPBP4+Tzo pI0xlzI2eapf9Pr9ROrz5qELdUTFc2ahF1EqVOvltLJxpVgBgNhMe7PaG11gJTsE FvK0BgAbvUOfRyiWI6MiyQcU6cwznXM19i0rGHj3hO1IgwcMZazn5weus3qrm+jM /vS2Ul6eUoB7kdWZgrKG2ehBLMLrQZRe0G4ra3B3AcCl7Ol05Sxm0F6Wntm0sZZg 2CTbyX3SwXeGSax4DH+MzFG3u31h6dNArtKLlKU0NzW9t7pGxW8L8QIFxQaMAvBS pzNwB1icU0Vc49ETx1fK6SmMZTuDU6mPRrEqxpdBfn+YGW6acnZMFq4qKe1rxgyy aXvXsCnlBCn90b0wefPI =S2A4 -----END PGP SIGNATURE-----

1 0

Re: [PATCH 5/7] reg: Add wchar/raw data conversion functions
by Stefan Dösinger Nov. 4, 2014

Nov. 4, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-04 21:15, schrieb Jonathan Vollebregt: > +#define ERROR_NAN 20002 ERROR_NEGATIVE_VALUE would be a better name since NAN is a floating point thing. > +static LSTATUS data_default(const DWORD type, DWORD *size_out, BYTE **out) I think the old behavior of passing NULL to RegSetValueExW if no data is specified with /d was nicer. That's assuming it does the right thing for all data types. This may need tests in advapi32/tests/registry.c The bottom line of this suggestion and things like passing a NULL HKEY to RegOpenKey in patch 3, or trailing backslashes in patch 2 is to leave as much error handling to the advapi32 functions as possible. I think reg.exe should be a fairly minimal string parsing program that blindly forwards everything to advapi32 and doesn't do much checking on its own. The exception are kinda of errors that are not possible in advapi32 by design, like a negative REG_DWORD. You're welcome to prove me wrong with tests that show advapi32 and reg.exe error handling differ :-) Another possibility is that native assumes a default value string of "" if /d is not specified, which then produces behavior like an empty REG_SZ and fails to convert into a DWORD. > { > - LPBYTE out_data = NULL; > - *reg_count = 0; > + switch (type) > + { > ... > + case REG_DWORD: > + case REG_DWORD_BIG_ENDIAN: > + { > + return ERROR_NAN; > + } It's odd that there isn't a default value for REG_DWORD, 0 would be a logical choice. But the tests confirm this... But I don't see why you haven't removed the todo_wine from the according test. > + default: > + return ERROR_UNSUPPORTED_TYPE; I think this is a bad place to catch unsupported data types. "type" comes from one of your own functions, namely wchar_get_type(). If reg.exe shouldn't support any of the data types not explicitly handled here then wchar_get_type should already return an error in this case. Otherwise you can make this a FIXME("Add support for type %u\n" type); -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUWVSuAAoJEN0/YqbEcdMwd9IP/A2J8L9/QJxCHc+g+rOFI/GB y+NA9dQJ2MXnCC7DeGU0myblOeRlTkFRqA3R/isM21IBSmOPLseLqSexzuvf8fwf y1cSEZ49z3yLI7rrVt0VEhX8p9dqkczU+W3GWE2M9jOkP88pxNSPsm5vIO+VtJRi 1GqGp3Snz4NQ6jCQGHn30M4vwgxRXS0gxkmGj1iEcA772vEWpNuAOptDQ9j0fGan aXzdmQMF8VDJMeGR6uI+8JuM2ERAjt9EE/2PGLjH0b9zpPR8V7Z+ECqPJh9kTJv6 wxM1wCHzsGXDQYlqQzQjaoWNIchrEybqgnaar0KS4H0+Hz8DKOz1StDB5bfQ2bHi lBiQ5a4T6AXOlNOH49RiLcPLrHUoUcmvFd+Cr4HngySeu0WkFvtsfdFjppJW+nrw aXMuKoZpje0+5EjTgI255Oi6vZnx+piy1hRn1zSTE5xq9lnyEPVaemtus77x4rOL 82/TChrSaeYg/uXrFNWFZG9fb38L2EIyeIQSLZwTYIHrE6p2IGp1AnMPkDcM4TcC rMQXEW3IPdmR2EXf2gZ0PuU3Sab4M9dWuMsJ/E4H6vOu/d9/BfnGle1TR6hP6Pqu XlZrjrm0Ifh/fnWec75Yc6rpj1Ueen4C1/dAxjDe3sn509qAvfREUtUH3psBLGXQ uCkQoWInlbV4UmVjl1Gg =hZLk -----END PGP SIGNATURE-----

1 0

Re: [PATCH 4/7] reg: Add wchar/type conversion functions
by Stefan Dösinger Nov. 4, 2014

Nov. 4, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-04 21:15, schrieb Jonathan Vollebregt: > +#define ERROR_INVALID_TYPE 20001 What does RegSetValueEx return if you pass an invalid type? The API makes this error condition possible, so there's likely a return value for it. (Yeah, I know, it's not your fault advapi32/tests has no test for this. If I understand server/registry.c correctly such a call succeeds and creates a blob with an undefined type. Still needs tests) ERROR_INVALID_DATATYPE may be a candidate. > +typedef struct > +{ > + DWORD type; > + const WCHAR *name; > +} type_rel; You can make this anonymous too. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUWU1cAAoJEN0/YqbEcdMwBWcQAID2xh321Jci/xtp6ZJMY7cV 6bzXGGBfyBiDaCzyWiUdcZrLaGmPm6ehuV655FylMEAQvY8XGOoifdF1F6rdlqok fwGLfdwWns6EUpdINipGbBrPFn2bKdJyP3ZECY0owEYM8H76CoJDwcgCiIrIM1T1 0uejd152KmVs/4p4kg/XYvWbJqSQc4VceHs2HPW2QG+LZ7prLEK/Cwj7PVu/sIq7 KZKrDEx6UGEkvYCr24ldWcd4qTzicnzipjnbqR8rH0F3Y0ZAL2EaQqrCfSdxj14O Yy8YIn+QQTBa732yahs9hJrVeFYhgLboVrLavTb+AtoLeq5/TnBLwB5Gl1+EqIah HRVK9VBNE1hlIjj84+GdUx4hicNwBwUe0a/cODC6b0LwsBh9aalawWuhOAs8R38/ xt4RNHc/1VUxC3XWNz8s0NuPjIooPLu5z4rnbyl2LM99w5mteac9wqH8mhmJE1qa INB1yBbCGv9dccSZwzRtkyw1Lpj4762uKM6Vxk01ii2lN2uP/mWN91M9o7blga3h +6QTL+TiiUzwVMirkjX2TxLSTDZxHXkYRadKMgerN9V//ztGmie2cIara4J4kLzm PWDpXNguQC4WrcLzAbi7zDY3UOcxvXY4XQSCOBcIAQj254ZfTH+oBgtosWt5x9km dsLZ0QNRy5GmHGm52ine =10ha -----END PGP SIGNATURE-----

1 0

Re: [PATCH 2/7] reg: Check key paths in main
by Stefan Dösinger Nov. 4, 2014

Nov. 4, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-11-04 21:15, schrieb Jonathan Vollebregt: > +static BOOL sane_path(const WCHAR *key) > +{ > + int i = strlenW(key); > + > + if (i < 3 || (key[i - 1] == '\\' && key[i - 2] == '\\')) > + { > + reg_print_error(ERROR_BADKEY); > + return FALSE; > + } I think I have asked this a few times, please forgive me if I forgot the answer: Did you test if RegAddKey and friends handle this for you? dlls/advapi32/tests/registry.c would profit from some tests for the error cases you have in programs/reg/tests/reg.c . > + if (!sane_path(key_name)) > + return 1; > + > for (i = 1; i < argc; i++) > { > if (!lstrcmpiW(argvW[i], slashVW)) > @@ -471,6 +485,9 @@ int wmain(int argc, WCHAR *argvW[]) > } > > key_name = argvW[2]; > + if (!sane_path(key_name)) > + return 1; > + > for (i = 1; i < argc; i++) > { > if (!lstrcmpiW(argvW[i], slashVW)) > @@ -502,6 +519,9 @@ int wmain(int argc, WCHAR *argvW[]) > } > > key_name = argvW[2]; > + if (!sane_path(key_name)) > + return 1; > + The helper function is a good idea if the answer to the above question is "no", but what's the advantage of calling it from main 3 times instead of reg_add, reg_delete and reg_query? All the other validation is done in reg_* . For consistency with the other functions it would be a good idea to return ERROR_BADKEY / ERROR_NO_REMOTE here and call reg_print_error in the caller. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUWUE0AAoJEN0/YqbEcdMwNIUP/0bcqgtH0ZPZ3DXmSVYRGq2I mUZmHxZHuGYdfWuiFKt6TjbcVUw/WNNuWn/1hTiSQC4A1wZvnvvT5w6dpKpyd1mP x48OXBPWg1hBALFvqxpK+x9CLUB745ms62wblfsltmJDei/EBnWTXy0jZn4rEshc jqTWesiieev/iaet+QbChMd+28RJmr3MoOaJkYOihi4SnLo6nXD0pcPL+tc3vtpW R0JA0GxmWNUVlqKuvqYvSIEMHoI6XwqL/Zlbr5PP11NtAmEzIEFfMUZ4uXQVY3vy C4qWcQctvQ8Akg+chmpoyZMYJ6+s3udpedzA2RhcKSymFgDRTXwdYnVFTK6BA1Pt jODRZ1RAOG9ShZMzIRNaIK7sBxYbK+wYxQpUvw5Xd5AuDnd2PUNJXnnvNMqW0c3x ZP5NxOpHucmgUgdSxPc0kwTLyC3Dg7KU1npUsxDnpZqgS9nSWZo/ZRp3kuNac6Z3 MSb3gLpvKDK/0mK09dGwJwCNHsIFfg67hjRVcswM4h/9O4gxWQ9tUzW/dwgT343+ iLaso6+Icvq4OFtXnZbZX8yPpK7j7oJgC/YFn94ib1Wz8PwMGb97OEPYF2IEsKWi xBLLDA976QeNKhb7Uxyg3Mr1ER3K4gaCHe0DCG5p4gfdGv5XhlaSOCGAdw/1UFFE IbSp8XZrbY+ZX0Psx/QW =FiSK -----END PGP SIGNATURE-----

1 0

Re: [PATCH 1/7] reg: Add system error printing function
by Stefan Dösinger Nov. 4, 2014

Nov. 4, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I conceptually like this function. Am 2014-11-04 21:15, schrieb Jonathan Vollebregt: > +static int reg_print_error(LONG error_code) You are mixing LSTATUS and LONG in your code. It seems like this is ultimately Microsoft's fault since it defines LSTATUS in reg.h but puts error values from winerror.h into it. Since LSTATUS is defined as LONG it is not a big deal, but please pick one and try to be consistent. My choice would be LSTATUS since it is returned from the registry functions, but if you have a reason to choose LONG that's OK with me. > + case ERROR_FILE_NOT_FOUND: > + return reg_message(STRING_CANNOT_FIND); > + case ERROR_BADKEY: > + return reg_message(STRING_INVALID_KEY); These are dead code, please add them in the patches that call them. > + STRING_ERROR, "Error: " Wouldn't "Unexpected error" be a better fit? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUWT4tAAoJEN0/YqbEcdMw3bwP/1//Ah6I2lrHnd0SnJ8m83IM yyrD6D1hL3njOFPCLFykdEbrjf+yDkz1Qi596L/qUbvkK9rbVEo4EtUgtHeJ/D+/ UF7Jr0oB8RWDQZh5ePt+Ns0x9BYUwqbi/fyOda+Xtz0P+Vl3FUH5K3U3OO5cYtlB S52bruK/Bv69FsRQwFwN9vYRX+JnJJq3NJ9Q2xoywBN26iypgTa+SDdKxA9gcDK1 xIfvSDqYsqR5Rq6UnRzroknG0j0aeuDWgHwY5pF1/DxGTbir5wCs6UOVPstIQeqk VxjrInXjGXo4LmJHz+6KPVc3+WuKr5QsmQr9Z/NgZBLN7xJXJ4DY19keFhUQfsLB AjAvf+mJy8GRwoaCihboze9ltQywoM0jZe2zLRxYiiXmD79EDN2huKi9D8g+ur58 0OE37veRYh6IUhjzQvfTxdNZvkNnPxvvP+S51qVEQu6GWPjITe375mQf8HIV3AZO z+NV3TWgsiz/tMqQK5YCPq9oR8vuXzu7H4RBjdUUpKy5yTzEcXSw6ehqj2Qehz5I MTC7QBQVNxHD3MFHGCoPA7Oeb8J2IEDGgZlj9cq9TSLTfy9XOlPQ8Abth29I/fjl GW/9Z10VGQ9F+KQ7E5E0V+Sci93l486Dv2gf579ZYmCa8sfPI7BVj1SQmkOY3bQP i3Ekbq0hR2Yk1FQcciYG =iN7/ -----END PGP SIGNATURE-----

1 0

Re: [PATCH 2/4] d3d9/tests: The device restores the mode settings from the registry (v3).
by Alexandre Julliard Nov. 4, 2014

Nov. 4, 2014

Stefan Dösinger <stefan(a)codeweavers.com> writes: > Version 3: Simplify the mode selection code and hardcode > D3DFMT_X8R8G8B8. Retain the test for mode reset when the device was > originally created with the registry size. > > Version 2: Make sure the mode set with ChangeDisplaySettings is bigger > than the device's mode. Otherwise Windows shrinks the window to the new > mode + 12 pixels. Testing this behavior is not the purpose of this test. > > Implementing this behavior is complicated because ddraw destroys and > recreates swapchains in SetCooperativeLevel. > --- > dlls/d3d9/tests/device.c | 153 ++++++++++++++++++++++++++++++++++++----------- > 1 file changed, 117 insertions(+), 36 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M d3d9.dll -p d3d9_test.exe.so device && touch device.ok device.c:4034: Test succeeded inside todo block: Got unexpect width 1920, expected 1920. device.c:5516: Tests skipped: This GPU supports SM3, skipping unsupported shader test. device.c:5928: Tests skipped: D3DFMT_A32B32G32R32F supports filtering, skipping tests. device.c:7229: Tests skipped: Dynamic D3DFMT_YUY2 textures not supported, skipping mipmap test. device.c:7229: Tests skipped: Dynamic D3DFMT_UYVY textures not supported, skipping mipmap test. make: *** [device.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [1/2] d3dx9_36: Implement D3DXCreatePolygon.
by Matteo Bruni Nov. 4, 2014

Nov. 4, 2014

2014-11-03 6:35 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Based on a patch by David Adam. > > For bug 13632. > > --- > dlls/d3dx9_36/d3dx9_36.spec | 2 +- > dlls/d3dx9_36/mesh.c | 89 +++++++++++++++++++++++++++++++++++++++++++++ > include/d3dx9shape.h | 2 + > 3 files changed, 92 insertions(+), 1 deletion(-) > Hi Sebastian, I have a few nitpicks: + TRACE("(%p, %f, %u, %p, %p)\n", device, length, sides, mesh, adjacency); Generally you want that to be something like: TRACE("device %p, length %f, sides %u, mesh %p, adjacency %p.\n", device, length, sides, mesh, adjacency); + if (!device || length < 0.0f || sides == 0 || !mesh) Probably "!sides" is more in the usual Wine d3d* style. Also, no need to use brackets for single-line branches. + if (FAILED(hr = D3DXCreateMeshFVF(sides, sides + 1, D3DXMESH_MANAGED, + D3DFVF_XYZ | D3DFVF_NORMAL,device, &polygon))) Line continuation should be indented by 8 blanks. Also, missing whitespace after a comma. + scale = 0.5f * length / sin(D3DX_PI / sides); You probably want to use sinf() here. Same below. + for (i = 0; i < sides; i++) Not important, but the current wined3d style wants "++i" here. + for (i = 0; i < sides; i++) + { + adjacency_buf[i][0] = i - 1; + adjacency_buf[i][1] = -1; + adjacency_buf[i][2] = i + 1; + } Really a detail, but adjacency_buf and i are both defined as unsigned int, so either defining them as plain, signed int or using ~0 instead of -1 would be nicer. I haven't seen the test yet but in some other D3DX9 functions the "out" pointers are set to NULL on error. If this function has the same behavior you should probably add a "*mesh = NULL;" in the first few lines of the function.

3 2

Re: [PATCH 3/4] d3d8/tests: Check if the current display settings match the registry settings.
by Marvin Nov. 4, 2014

Nov. 4, 2014

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=9978 Your paranoid android. === w8 (32 bit device) === device.c:1173: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1218: Test failed: Reset failed, hr 0x88760868. device.c:1220: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1224: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1231: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1232: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1233: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1234: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1235: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1236: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1241: Test failed: Screen width is 640, expected 800. device.c:1242: Test failed: Screen height is 480, expected 600. device.c:1248: Test failed: Back buffer width is 640, expected 800. device.c:1250: Test failed: Back buffer height is 480, expected 600. device.c:1280: Test failed: Screen width is 640, expected 1024. device.c:1281: Test failed: Screen height is 480, expected 768. device.c:2441: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:2813: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2817: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2839: Test failed: Failed to reset device, hr 0x88760868. device.c:2843: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2847: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3056: Test failed: Got unexpect width 640. device.c:3057: Test failed: Got unexpect height 480. device.c:3068: Test failed: Got unexpect width 640. device.c:3069: Test failed: Got unexpect height 480. device.c:3131: Test failed: Failed to reset device. device.c:3138: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3146: Test failed: Expected wndproc 0x412ed0, got 0x412ed0.

2 1

Re: advapi32/tests: Simplify empty string check (PVS-Studio).
by Marvin Nov. 4, 2014

Nov. 4, 2014

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=9984 Your paranoid android. === w7u (32 bit service) === The test timed out

2 1

Re: [2/2] kernel32/tests: Add tests for FindFirstFileExW level FindExInfoBasic.
by Marvin Nov. 4, 2014

Nov. 4, 2014

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=9994 Your paranoid android. === wvistau64 (32 bit file) === file.c:367: Test failed: attributes of file "testfile.xxx" are 0x0820 === wvistau64 (64 bit file) === file.c:367: Test failed: attributes of file "testfile.xxx" are 0x0820

1 0

[PATCH] iphlpapi: call SetLastError in NotifyAddrChange/NotifyRouteChange(try 2)
by Hao Peng Nov. 4, 2014

Nov. 4, 2014

call SetLastError in NotifyAddrChange/NotifyRouteChange, to make apps can get WSA_IO_PENDING error code after async operation through GetLastError. Thanks to Sebastian Lackner for comments. superseded patch 107390. --- dlls/iphlpapi/iphlpapi_main.c | 18 ++++++++++++++++-- dlls/iphlpapi/tests/iphlpapi.c | 39 +++++++++++++++++++++++---------------- 2 files changed, 39 insertions(+), 18 deletions(-)

1 0

Re: [PATCH 6/6] d3d8/tests: Add an ATI1N entry to the test_volume_blocks test.
by Marvin Nov. 4, 2014

Nov. 4, 2014

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=9983 Your paranoid android. === w8 (32 bit device) === device.c:1174: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1219: Test failed: Reset failed, hr 0x88760868. device.c:1221: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1225: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1232: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1233: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1234: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1235: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1236: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1237: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1242: Test failed: Screen width is 640, expected 800. device.c:1243: Test failed: Screen height is 480, expected 600. device.c:1249: Test failed: Back buffer width is 640, expected 800. device.c:1251: Test failed: Back buffer height is 480, expected 600. device.c:1281: Test failed: Screen width is 640, expected 1024. device.c:1282: Test failed: Screen height is 480, expected 768. device.c:2437: Test failed: Expected foreground window 000500F6, got 0002004C. device.c:2808: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2812: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2834: Test failed: Failed to reset device, hr 0x88760868. device.c:2838: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2842: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3051: Test failed: Got unexpect width 640. device.c:3052: Test failed: Got unexpect height 480. device.c:3063: Test failed: Got unexpect width 640. device.c:3064: Test failed: Got unexpect height 480. device.c:3126: Test failed: Failed to reset device. device.c:3133: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3141: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

1 0

Re: [PATCH 4/6] d3d8/tests: Add a test for ATI1N and ATI2N texture formats.
by Marvin Nov. 4, 2014

Nov. 4, 2014

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=9981 Your paranoid android. === w8 (32 bit device) === device.c:1174: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1219: Test failed: Reset failed, hr 0x88760868. device.c:1221: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1225: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1232: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1233: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1234: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1235: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1236: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1237: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1242: Test failed: Screen width is 640, expected 800. device.c:1243: Test failed: Screen height is 480, expected 600. device.c:1249: Test failed: Back buffer width is 640, expected 800. device.c:1251: Test failed: Back buffer height is 480, expected 600. device.c:1281: Test failed: Screen width is 640, expected 1024. device.c:1282: Test failed: Screen height is 480, expected 768. device.c:2437: Test failed: Expected foreground window 000301E2, got 0002004C. device.c:2808: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2812: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2834: Test failed: Failed to reset device, hr 0x88760868. device.c:2838: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2842: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3051: Test failed: Got unexpect width 640. device.c:3052: Test failed: Got unexpect height 480. device.c:3063: Test failed: Got unexpect width 640. device.c:3064: Test failed: Got unexpect height 480. device.c:3126: Test failed: Failed to reset device. device.c:3133: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3141: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

1 0

Re: [PATCH 4/4] d3d8/tests: The device restores the mode settings from the registry (v4).
by Marvin Nov. 4, 2014

Nov. 4, 2014

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=9979 Your paranoid android. === w8 (32 bit device) === device.c:1173: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1218: Test failed: Reset failed, hr 0x88760868. device.c:1220: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1224: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1231: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1232: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1233: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1234: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1235: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1236: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1241: Test failed: Screen width is 640, expected 800. device.c:1242: Test failed: Screen height is 480, expected 600. device.c:1248: Test failed: Back buffer width is 640, expected 800. device.c:1250: Test failed: Back buffer height is 480, expected 600. device.c:1280: Test failed: Screen width is 640, expected 1024. device.c:1281: Test failed: Screen height is 480, expected 768. device.c:2441: Test failed: Expected foreground window 000701E6, got 0002004C. device.c:2813: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2817: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2839: Test failed: Failed to reset device, hr 0x88760868. device.c:2843: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2847: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3216: Test failed: Failed to reset device. device.c:3223: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3231: Test failed: Expected wndproc 0x412ed0, got 0x412ed0.

1 0

Re: ws2_32: Add tests and implement inet_pton
by Marvin Nov. 3, 2014

Nov. 3, 2014

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=9974 Your paranoid android. === wxppro (32 bit sock) === sock.c:610: Test failed: oob_server (184): unexpectedly at the OOB mark: 0

1 0

Re: [2/2] d3dx9_36/tests: Add tests for D3DXCreatePolygon.
by Matteo Bruni Nov. 3, 2014

Nov. 3, 2014

2014-11-03 6:35 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Based on a patch by David Adam. > > --- > dlls/d3dx9_36/tests/mesh.c | 154 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 154 insertions(+) More nitpicks... +static BOOL compute_polygon(struct mesh *mesh, float length, UINT sides) I'd prefer a plain unsigned int there. The various comments I made for the implementation patch obviously apply to the body of compute_polygon() too. + IDirect3D9* d3d; + IDirect3DDevice9* device; + D3DPRESENT_PARAMETERS d3dpp; + ID3DXMesh* polygon; + ID3DXBuffer* ppBuffer; Watch out for the '*' placement. Also, no hungarian notation please. + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); Not sure we care but the other tests in mesh.c use D3DCREATE_SOFTWARE_VERTEXPROCESSING. + ok(buffer_size == 33 * sizeof(DWORD), "expected size %d, received %d\n", + 33 * sizeof(DWORD), buffer_size); I think it's usually better not to print sizeof() results. + ok(buffer[i][1] == -1, "wrong adjacency[%d][1] = %d\n", i, buffer[i][1]); I'd prefer ~0 here. Also, unsigned int should be printed with "%u". + if (ppBuffer) ID3DXBuffer_Release(ppBuffer); Please put the "if" body on a separate line. I'd like to see an additional test to check whether the ID3DXMesh pointer is set to NULL on D3DXCreatePolygon() failure. Probably you could simply modify (at least) one of the failure tests at the beginning for that.

2 2

Wine Gecko 2.34 released
by Jacek Caban Nov. 3, 2014

Nov. 3, 2014

Hi all, Wine Gecko 2.34 is finally released and relevant commit is in Wine. There is one important note to distro packages and everyone willing to build it himself: it's important to use very recent mingw-w64 version. See [1] for details. Cheers, Jacek https://bugzilla.mozilla.org/show_bug.cgi?id=1088848

1 0

Re: [2/2] wined3d: wined3d: Take abs() of vertex z coordinate as FFP fog coordinate (try 2)
by Henri Verbeet Nov. 3, 2014

Nov. 3, 2014

On 29 October 2014 23:35, Joachim Priesner <joachim.priesner(a)web.de> wrote: > + /* Basic vertex shader without fog computation ("non foggy") */ > + static const DWORD vertex_shader_code1[] = > + { > + 0xfffe0100, /* vs_1_0 */ > + /* output.Pos = mul(input.Pos, Projection) */ > + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ > + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ > + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ > + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ > + /* output.Color = input.Color */ > + 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ > + 0x0000ffff, /* END */ > + }; ... > + static const D3DMATRIX proj_mat = > + {{{ > + 1.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 1.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.5f, 0.0f, > + 0.0f, 0.0f, 0.5f, 1.0f > + }}}; > + /* Transposed version of proj_mat to pass to the vertex shaders. */ > + static const D3DMATRIX proj_mat_transposed = > + {{{ > + 1.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 1.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.5f, 0.5f, > + 0.0f, 0.0f, 0.0f, 1.0f > + }}}; Instead of transposing the matrix, you can just change the multiplication in the shader. I.e., using "mul(Projection, input.Pos)" instead of "mul(input.Pos, Projection)". That would then give you a mul/mad/mad/mad sequence instead of 4 dp4's. But of course that's all just a complicated way to do "output.Pos = input.Pos * 0.5 + 0.5;". > + /* start=0.0f, end=1.0f should be the default values, set them anyway to be sure. > + * These values do not affect the tests with foggy vertex shader, as the fog > + * intensity is computed directly by the shader. */ > + start.f = 0.0f; > + end.f = 1.0f; > + > + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGSTART, start.i); > + ok(SUCCEEDED(hr), "Setting fog start failed (%#x)\n", hr); > + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, end.i); > + ok(SUCCEEDED(hr), "Setting fog end failed (%#x)\n", hr); > + You don't need this. > + static const struct test_data_t > + { > + int vshader; > + D3DFOGMODE vfog; > + D3DFOGMODE tfog; > + DWORD color_left; > + DWORD color_middle_top; > + DWORD color_middle_bottom; > + DWORD color_right; > + } The _t suffix is reserved by POSIX, so you shouldn't use it for your own type names. In this specific case, you don't need the structure to be named at all, and you can just use an anonymous structure instead.

1 0

Re: [PATCH 2/2] user32/tests: Test exception handling for timer callbacks.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Qian Hong <qhong(a)codeweavers.com> writes: > +static void test_timers_exception(DWORD code) > +{ > + UINT_PTR id; > + MSG msg; > + > + exception = code; > + count = 0; > + id = SetTimer(NULL, 0, 300, callback_exception); > + ok(id != 0, "did not get id from SetTimer.\n"); > + > + Sleep(150); > + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); > + ok(count == 0, "did not get zero count as expected (%i).\n", count); > + Sleep(200); > + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); > + ok(count == 1, "did not get one count as expected (%i).\n", count); > + KillTimer(NULL, id); > + Sleep(350); > + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); > + ok(count == 1, "killing timer did not work (%i).\n", count); > +} You should find a way to test this without all these sleeps, the user32 tests already take a long time as it is. -- Alexandre Julliard julliard(a)winehq.org

2 1

[PATCH] iphlpapi: call WSASetLastError in NotifyAddrChange/NotifyRouteChange
by Hao Peng Nov. 3, 2014

Nov. 3, 2014

call WSASetLastError in NotifyAddrChange/NotifyRouteChange to make following DEMO code working. void main() { OVERLAPPED overlap; DWORD ret; HANDLE hand = NULL; overlap.hEvent = WSACreateEvent(); ret = NotifyAddrChange(&hand, &overlap); if (ret != NO_ERROR) { if (WSAGetLastError() != WSA_IO_PENDING) { printf("NotifyAddrChange error...%d\n", WSAGetLastError()); return; } } if ( WaitForSingleObject(overlap.hEvent, INFINITE) == WAIT_OBJECT_0 ) printf("IP Address table changed..\n"); } --- dlls/iphlpapi/iphlpapi_main.c | 57 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 12 deletions(-)

2 1

Re: [4/6] msvcrt: Added _fread_nolock_s implementation
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

"Iván Matellanes" <matellanesivan(a)gmail.com> writes: > { > + MSVCRT_size_t ret; > + > + MSVCRT__lock_file(stream); > + ret = MSVCRT__fread_nolock_s(buf, buf_size, elem_size, count, stream); > + MSVCRT__unlock_file(stream); The parameter validation has to be done before locking the file. -- Alexandre Julliard julliard(a)winehq.org

2 2

[PATCH] Mystery hang reduction -- clear new allocations
by mtewoodbury＠gmail.com Nov. 2, 2014

Nov. 2, 2014

From: Max TenEyck Woodbury <max+git(a)mtew.isa-geek.net> I was getting mystery frozen processes that cleared when a total screen redraw was forced. This has been reported numerous times over several years. It came and went with various releases. I have been getting it consistantly recently. I had an idea that it might have something to do with partially uninitialized drawing data structures, so I started adding HEAP_ZERO_MEMORY flags in various places. This particular set cleared the problem, at least for now... diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index cf5378c..cf1c814 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -178,7 +178,8 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara declaration->parent = parent; declaration->parent_ops = parent_ops; declaration->device = device; - declaration->elements = HeapAlloc(GetProcessHeap(), 0, sizeof(*declaration->elements) * element_count); + declaration->elements = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(*declaration->elements) * element_count); if (!declaration->elements) { ERR("Failed to allocate elements memory.\n"); @@ -316,7 +317,7 @@ static unsigned int convert_fvf_to_declaration(const struct wined3d_gl_info *gl_ has_psize + has_diffuse + has_specular + num_textures; state.gl_info = gl_info; - state.elements = HeapAlloc(GetProcessHeap(), 0, size * sizeof(*state.elements)); + state.elements = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size * sizeof(*state.elements)); if (!state.elements) return ~0U; state.offset = 0; state.idx = 0; -- 1.8.0.rc0.18.gf84667d

2 1

Re: [PATCH] vbscript: Implemented String(try 2)
by Piotr Caban Nov. 2, 2014

Nov. 2, 2014

Hi, Some of the tests are not working on windows: E:\>vbscript_crosstest.exe run run.c:1043: Test failed: api.vbs: L"String(1, 564) = 4" run.c:1043: Test failed: api.vbs: L"String(1, 16895.49) = \00ff" run.c:1043: Test failed: api.vbs: L"String(1, CSng(16895.5)) = " run.c:1043: Test failed: api.vbs: L"755826670, w: Err.number = 0" run: 26885 tests executed (0 marked as todo, 4 failures), 0 skipped. On 10/25/14 10:10, Shuai Meng wrote: > +Call ok(String(1, 65.5) = "B", "String(1, 65.5) = " & String(1, 65.5)) > +Call ok(getVT(String(1, 65.5)) = "VT_BSTR", "getVT(String(1, 65.5)) = " & getVT(String(1, 65.5))) > +Call ok(String(1, 66.5) = "B", "String(1, 66.5) = " & String(1, 66.5)) > +Call ok(getVT(String(1, 66.5)) = "VT_BSTR", "getVT(String(1, 66.5)) = " & getVT(String(1, 66.5))) You have added exactly the same test twice. > +Call testStringError(2147483648, "w", 6) > +Call testStringError(2147483647, "w", 5) > +Call testStringError(1073741824, "w", 5) > +Call testStringError(1073741823, "w", 14) > +Call testStringError(755826670, "w", 14) > +Call testStringError(755826669, "w", 0) You can't assume it's possible to allocate ~700mb of memory in tests. The function never returns E_OUTOFMEMORY. You can't test it in wine tests suite but you can see it by calling the function in loop until system runs out of memory and then checking the error. You should simply try to allocate the string and if it fails return VBSE_OUT_OF_STRING_SPACE. Cheers, Piotr

3 3

Re: [1/2] ddraw: add dsurface dimension tests, try 12
by Stefan Dösinger Nov. 2, 2014

Nov. 2, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, First of all, thanks for your endurance with this. I know our pickiness can be exhausting. Am 2014-10-30 19:39, schrieb Patrick Rudolph: > + ddcaps.dwSize = sizeof(DDCAPS); > + hr = IDirectDraw_GetCaps(ddraw, &ddcaps, NULL); > + ok(SUCCEEDED(hr), "IDirectDraw_GetCaps failed, hr %#x.\n", hr); You are never reading ddcaps. I suspect it is a leftover from the now-removed out of (video)memory tests. > + surfacedesc.dwFlags = tests[i].flags | DDSD_PIXELFORMAT; You are already setting DDSD_PIXELFORMAT in all of tests[i].flags, there's no need to set it twice. Remove one of them, preferably the one in tests[].flags. You can move DDSD_CAPS as well. Henri mentioned the same issue in his feedback. The rest are some minor style issues, but please fix them as well: > + DWORD i,j; I'd prefer unsigned int i, j, but that's not a strong opinion. > + todo_wine ok(hr == tests[i].hr || broken(hr == DDERR_INVALIDPARAMS), "Pixelformat %s, test %d returned %08x\n", formats[j].name, i, hr); i is unsigned, print it with %u. > + hr = IDirectDraw_CreateSurface(ddraw, &surfacedesc, &surface, NULL); > + ok(SUCCEEDED(hr), "CreateSurface returned %08x\n", hr); > + > + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surfacedesc); > + ok(SUCCEEDED(hr), "GetSurfaceDesc returned %x\n", hr); Please be consistent with the format you use. Tests added in recent years use %#x, I recommend to use this. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUVkaEAAoJEN0/YqbEcdMwPVoQAJTppEl15dBZ6uVCBmOYEzbg W5GYcDfdjv9/j4S6cVyHh0wKQF7eoHBdVelF8IvE47rBGBoe63YZnOuozEN1JPNL 7buCVNBof+1WytRAZacIyu9O4Vbs2bLXgGlGqo4T0baQbQMKoH/gQnyEXcxmJR6s egElATCH1RvInllwuIPbtSr+RcmH+m8Tk9LRzHNU6gKcXNwdNv1iicQaD+wF3S2F +iG7va1Sy6ubeDHEX8CE3EMhHyFmcZZlsqk2G6AVJcj914+I8VNua69XVCujkdaH atkZQ1bS8HQ9nzfrc+X7G5CI6ZsGfO2UA8mtjl1rf8OzoCgCZ8lZmjdhgD40iQVX boFXmsFGMZAYDVxu/aUX2qD4NtBkE4TlF9JVy8UA0QMWd1DN1SyjO77lp6197VGV bAaDhjID8bUyaTc6m314eOiKMuM+2Nyt6aGwT87uyTffKCM2Eyt692tB3xWH6IqT nJpctMa724qOoAmRL5jca99uDTrn6iKkUa7m8hMXgRQEjyQvd9fm+wbNmRrxGfmA 59IwxFHF5IKTsQVbkDaLvXfU2n9ubvA0cyXRFAP1YLI9pDKq1/I3ORmToYIJ0D6O k7AqX0/7nrnu0uJEDhP3/AsTMs2Ldvh1MavNxUIWOcDK4PCc/Ga9PBc6ubX4FQGI i3iQC8eR0aQrlYAr5lvj =6YE6 -----END PGP SIGNATURE-----

1 0

Re: [PATCH] cmd/tests: Add tests for 'del' (Fixes bug 35970)
by Marvin Nov. 2, 2014

Nov. 2, 2014

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=9945 Your paranoid android. === wxppro (32 bit) === batch.c:312: Test failed: unexpected char 0x47 position 0 in line 689 (got 'Got unexpected result: "C:\Documents"', wanted 'Plain directory enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 690 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 691 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 692 (got 'Got unexpected result: "C:\Documents"', wanted 'Mixed enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 693 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted 'Mixed enumeration from provided root') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 694 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted 'With duplicates enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 695 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted 'Strip missing wildcards, keep unwildcarded names') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 696 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted 'for /R passed') batch.c:312: Test failed: unexpected char 0x50 position 0 in line 697 (got 'Plain directory enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 698 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 699 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 700 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 701 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 702 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 703 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 704 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 705 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 706 (got 'File enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 707 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 708 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 709 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 710 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 711 (got 'File enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 712 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 713 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 714 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 715 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 716 (got 'Mixed enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 717 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 718 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 719 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 720 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 721 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 722 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 723 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 724 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 725 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 726 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 727 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 728 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 729 (got 'Mixed enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 730 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 731 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 732 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 733 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 734 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 735 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 736 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 737 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 738 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 739 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 740 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 741 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 742 (got 'With duplicates enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 743 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 744 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 745 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 746 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 747 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 748 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 749 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 750 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 751 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 752 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 753 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 754 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 755 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 756 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 757 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 758 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 759 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 760 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 761 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 762 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 763 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 764 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 765 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 766 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 767 (got 'Strip missing wildcards, keep unwildcarded names', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 768 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 769 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 770 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 771 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 772 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 773 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 774 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 775 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 776 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 777 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 778 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 779 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x66 position 0 in line 780 (got 'for /R passed', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1368 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1369 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1370 (got 'C:\Documents and Settings\winetest\My Documents\foobar\foodir2', wanted '@drive@@path(a)foobar\foodir3') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1371 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1372 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1373 (got '--- Extra endlocal in called batch', wanted '@drive@@path(a)foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1374 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1375 (got '--- Extra endlocal in called batch', wanted '@drive@@path(a)foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1377 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1380 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1381 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted '@drive@@path(a)foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1382 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1383 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1384 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path(a)foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1385 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1386 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path(a)foobar') === wvistau64 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'') === w8 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--------'', wanted ''--a------'@or_broken@'%~ai'') === wvistau64 (64 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'')

2 1

Re: [2/2] oleaut32: Implement TLB dependencies lookup in resources (resend 3 - last submit before abandon)
by Guillaume Charifi Nov. 1, 2014

Nov. 1, 2014

Thanks a lot for your reply, I have nothing to add, so I'm about to submit just your fixed version.Thanks to Alexander and Andrew too.

1 0

Re: [2/2] oleaut32: Implement TLB dependencies lookup in resources (resend 3 - last submit before abandon)
by Sebastian Lackner Nov. 1, 2014

Nov. 1, 2014

I had this patch on my list for a couple of weeks, and finally had time to take a closer look. There were still a lot of issues. I've listed them below, and have also added a fixed version to our staging tree: https://github.com/wine-compholio/wine-staging/blob/master/patches/oleaut32… Feel free to integrate my changes and resubmit if you like. On 27.09.2014 20:10, Guillaume Charifi wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=34184 > > This is the last time without a review before I give up. > > --- dlls/oleaut32/tests/typelib.c | 2 +- > dlls/oleaut32/typelib.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- > 2 files changed, 103 insertions(+), 10 deletions(-) > > >diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c >index cb5bc23..99e2aedd 100644 >--- a/dlls/oleaut32/tests/typelib.c >+++ b/dlls/oleaut32/tests/typelib.c >@@ -5595,7 +5595,7 @@ static void test_dep(void) { > ok(hr == S_OK, "got: %x\n", hr); > > hr = ITypeInfo_GetRefTypeInfo(ptInfo, refType, &ptInfoExt); >- todo_wine ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); >+ ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); > > ITypeInfo_Release(ptInfo); > if(ptInfoExt) >diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c >index 48b171b..d895696 100644 >--- a/dlls/oleaut32/typelib.c >+++ b/dlls/oleaut32/typelib.c >@@ -7572,6 +7572,84 @@ static HRESULT ITypeInfoImpl_GetDispatchRefTypeInfo( ITypeInfo *iface, > return E_FAIL; > } > >+struct search_res_tlb_param { >+ GUID *guid; GUID should be const. >+ ITypeLib *pTLib; >+ HRESULT result; >+}; There is no need to store 'result' here. If the lookup fails the result is not used anyway. Comparing pTlib != NULL should be sufficient. >+ >+static BOOL CALLBACK search_res_tlb(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszIntName, LONG_PTR lParam) >+{ >+ struct search_res_tlb_param *This = (LPVOID)lParam; >+ >+ HRESULT ret; >+ >+ static WCHAR resFormatStrW[] = {'\\','%','d',0}; Should be const. >+ WCHAR szPath[MAX_PATH]; >+ WCHAR szTLBPath[MAX_PATH]; >+ WCHAR szStringName[12]; >+ LPVOID pBase = NULL; >+ DWORD dwTLBLength = 0; >+ IUnknown *pFile = NULL; >+ ITypeLib2 *pTLib = NULL; >+ RPC_STATUS rpc_stat; >+ >+ This->pTLib = NULL; >+ This->result = E_FAIL; >+ >+ if(IS_INTRESOURCE(lpszIntName) == FALSE) >+ return TRUE; >+ >+ GetModuleFileNameW(hModule, szPath, MAX_PATH); Missing error checks. >+ >+ strcpyW(szTLBPath, szPath); >+ snprintfW(szStringName, sizeof(szStringName)/sizeof(WCHAR), resFormatStrW, PtrToInt(lpszIntName)); >+ strcatW(szTLBPath, szStringName); Here also missing error checks. Moreover copying the data all the time is a bit ugly. >+ >+ ret = TLB_PEFile_Open(szPath, PtrToInt(lpszIntName), &pBase, &dwTLBLength, &pFile); >+ if (ret == TYPE_E_CANTLOADLIBRARY) >+ ret = TLB_NEFile_Open(szPath, PtrToInt(lpszIntName), &pBase, &dwTLBLength, &pFile); >+ if (ret == TYPE_E_CANTLOADLIBRARY) >+ ret = TLB_Mapping_Open(szPath, &pBase, &dwTLBLength, &pFile); >+ if (SUCCEEDED(ret)) >+ { >+ if (dwTLBLength >= 4) >+ { >+ DWORD dwSignature = FromLEDWord(*((DWORD*) pBase)); >+ if (dwSignature == MSFT_SIGNATURE) >+ pTLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength); >+ else if (dwSignature == SLTG_SIGNATURE) >+ pTLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength); >+ else >+ { >+ FIXME("Header type magic 0x%08x not supported.\n", dwSignature); >+ ret = E_FAIL; >+ } >+ } >+ else >+ ret = E_FAIL; >+ IUnknown_Release(pFile); >+ } As already pointed out by Alexandre, this whole block is duplicated, although that is not really necessary. You can just call existing functions to load the typelib, SearchPathW will have no influence when its an absolute path. >+ >+ if(pTLib) { >+ ITypeLibImpl *impl = impl_from_ITypeLib2(pTLib); >+ ret = UuidEqual((UUID *)This->guid, (UUID *)TLB_get_guid_null(impl->guid), &rpc_stat); Why casting and using this API? The rest of the file uses IsEqualGUID. This also allows to get rid of the dummy rpc_stat variable. Moreover you are storing a BOOL value in a HRESULT variable. >+ ITypeLib_Release((ITypeLib *)pTLib); >+ >+ ret = (ret == TRUE) ? LoadTypeLibEx(szTLBPath, REGKIND_NONE, (ITypeLib **)&pTLib) : E_FAIL; That is especially ugly, because you free the library, just to load it again immediately afterwards. I don't think there is any good reason to do that, correct me if I'm wrong. >+ } >+ >+ This->result = ret; >+ >+ if(SUCCEEDED(ret)) { >+ /* If found, stop to enumerate */ >+ This->pTLib = (ITypeLib *)pTLib; >+ return FALSE; >+ } >+ >+ return TRUE; >+} >+ > /* ITypeInfo::GetRefTypeInfo > * > * If a type description references other type descriptions, it retrieves >@@ -7665,20 +7743,35 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( > ITypeLib_AddRef(pTLib); > result = S_OK; > } else { >+ static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; >+ struct search_res_tlb_param param; > BSTR libnam; > > TRACE("typeinfo in imported typelib that isn't already loaded\n"); > >- result = query_typelib_path(TLB_get_guid_null(ref_type->pImpTLInfo->guid), >- ref_type->pImpTLInfo->wVersionMajor, >- ref_type->pImpTLInfo->wVersionMinor, >- This->pTypeLib->syskind, >- ref_type->pImpTLInfo->lcid, &libnam, TRUE); >- if(FAILED(result)) >- libnam = SysAllocString(ref_type->pImpTLInfo->name); >+ /* Search in resource table */ >+ param.guid = (GUID *)TLB_get_guid_null(ref_type->pImpTLInfo->guid); You are casting away the const here. Normally there is no cast required at all. >+ param.pTLib = NULL; >+ param.result = E_FAIL; >+ >+ EnumResourceNamesW(NULL, TYPELIBW, search_res_tlb, (LONG_PTR)&param); >+ >+ pTLib = param.pTLib; >+ result = param.result; > >- result = LoadTypeLib(libnam, &pTLib); >- SysFreeString(libnam); >+ /* Search on disk */ >+ if(FAILED(result)) { >+ result = query_typelib_path(TLB_get_guid_null(ref_type->pImpTLInfo->guid), >+ ref_type->pImpTLInfo->wVersionMajor, >+ ref_type->pImpTLInfo->wVersionMinor, >+ This->pTypeLib->syskind, >+ ref_type->pImpTLInfo->lcid, &libnam, TRUE); >+ if(FAILED(result)) >+ libnam = SysAllocString(ref_type->pImpTLInfo->name); >+ >+ result = LoadTypeLib(libnam, &pTLib); >+ SysFreeString(libnam); >+ } > > if(SUCCEEDED(result)) { > ref_type->pImpTLInfo->pImpTypeLib = impl_from_ITypeLib(pTLib);

1 0