- wine-devel - winehq.org

Re: [PATCH 2/6] wined3d: Minimize device windows on focus loss (v3).
by Henri Verbeet 13 Nov '14

13 Nov '14

On 12 November 2014 22:15, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > +void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) > +{ > + if (!activate && !(swapchain->device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) > + ShowWindow(swapchain->device_window, SW_MINIMIZE); > +} This patch is mostly just blocked by the tests failing, but I'd also have to wonder if the window proc should be installed in the first place if the device is created with NOWINDOWCHANGES.

2 1

Re: [5/5] windowscodecs: Implement ComponentFactory_CreateMetadataReaderFromContainer.
by Alexandre Julliard 13 Nov '14

13 Nov '14

Vincent Povirk <madewokherd(a)gmail.com> writes: > From a3735fa76b9dc568f32561eda4617e216af82138 Mon Sep 17 00:00:00 2001 > From: Vincent Povirk <vincent(a)codeweavers.com> > Date: Wed, 12 Nov 2014 15:51:09 -0600 > Subject: [PATCH 5/7] windowscodecs: Implement > ComponentFactory_CreateMetadataReaderFromContainer. > > --- > dlls/windowscodecs/imgfactory.c | 101 +++++++++++++++++++++++++++++++++++- > dlls/windowscodecs/tests/metadata.c | 25 +++++---- > 2 files changed, 115 insertions(+), 11 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M windowscodecs.dll -p windowscodecs_test.exe.so metadata && touch metadata.ok metadata.c:953: Test succeeded inside todo block: unexpected count 1 make[1]: *** [metadata.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ntdll/tests: Get rid of "defined but not used" warnings on non-x86(_64) platforms
by Marvin 13 Nov '14

13 Nov '14

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=10227 Your paranoid android. === w2000pro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:484: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:484: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00340000/00340001 exception: unhandled exception 80000004 at 00340000 exception.c:484: Test failed: 42: Wrong exception address 7751ED97/00340001 === w2008s64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002C0000/002C0001 exception: unhandled exception 80000004 at 002C0000 exception.c:484: Test failed: 42: Wrong exception address 77E5ED97/002C0001 === w7u (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003D0000/003D0001 exception: unhandled exception 80000004 at 003D0000 exception.c:484: Test failed: 42: Wrong exception address 77CDE34F/003D0001 === w8 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003E0000/003E0001 exception: unhandled exception 80000004 at 003E0000 exception.c:484: Test failed: 42: Wrong exception address 77174D17/003E0001

1 0

Re: [PATCH 6/6] ddraw/tests: Test focus loss style changes.
by Marvin 13 Nov '14

13 Nov '14

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=10223 Your paranoid android. === w8 (32 bit ddraw2) === ddraw2: unhandled exception c0000005 at 7256F329 === w8 (32 bit ddraw1) === ddraw1: unhandled exception c0000005 at 7256F329 === w8 (32 bit ddraw7) === ddraw7: unhandled exception c0000005 at 7256F329 === w8 (32 bit ddraw4) === ddraw4: unhandled exception c0000005 at 7256F329

1 0

Re: [PATCH 5/6] ddraw/tests: Test messages on focus loss.
by Marvin 13 Nov '14

13 Nov '14

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=10222 Your paranoid android. === w8 (32 bit ddraw2) === ddraw2: unhandled exception c0000005 at 7256F329 === w8 (32 bit ddraw1) === ddraw1: unhandled exception c0000005 at 7256F329 === w8 (32 bit ddraw7) === ddraw7: unhandled exception c0000005 at 7256F329 === w8 (32 bit ddraw4) === ddraw4: unhandled exception c0000005 at 7256F329

1 0

Re: [PATCH 4/6] d3d9/tests: Test style changes on focus loss.
by Marvin 12 Nov '14

12 Nov '14

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=10221 Your paranoid android. === w8 (32 bit d3d9ex) === d3d9ex.c:2354: Test failed: Expected device window style 0x4cf0000, got 0x14cf0000, i=2. d3d9ex.c:2358: Test failed: Expected device window extended style 0x100, got 0x108, i=2. d3d9ex.c:2358: Test failed: Expected device window extended style 0x100, got 0x108, i=3. d3d9ex.c:2385: Test failed: Expected device window style 0x14cf0000, got 0x34cf0000, i=3.

1 0

How to loop all server objects of type = socket?
by Bruno Jesus 12 Nov '14

12 Nov '14

Hi all, I'm wondering how to do some sort of loop to be able to check all currently opened sockets. If possible knowing the process which they belong to. Any hints are welcome. Best regards, Bruno

2 2

Re: [PATCH 2/6] wined3d: Minimize device windows on focus loss (v3).
by Stefan Dösinger 12 Nov '14

12 Nov '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 The attached archives contains follow-up patches that implement resolution changes and add tests for CreateAdditionalSwapchain. I expect that many more small fixes will be needed for some games, similar in nature to patch 19. There are also problems in some window managers (read: those forked from Metacity)for which I haven't filed bugs yet. Am 2014-11-12 22:15, schrieb Stefan Dösinger: > Tests for d3d8 will follow after 107631 has been committed. > > v3: Check for D3DCREATE_NOWINDOWCHANGES. > > v2: Move to wined3d. The different behavior in d3d9ex was due to a > hidden window and not a difference how d3d9ex handles focus loss. See > patch 7. > > Another patch will add an action (resize the window to match the > backbuffer size) on window activation. For this reason the swapchain > helper function is called on both activation and deactivation. > --- > dlls/wined3d/device.c | 5 +++++ > dlls/wined3d/swapchain.c | 6 ++++++ > dlls/wined3d/wined3d_private.h | 1 + > 3 files changed, 12 insertions(+) > > diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c > index ee3636e..0de444b 100644 > --- a/dlls/wined3d/device.c > +++ b/dlls/wined3d/device.c > @@ -4983,6 +4983,11 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL > } > else if (message == WM_ACTIVATEAPP) > { > + UINT i; > + > + for (i = 0; i < device->swapchain_count; i++) > + wined3d_swapchain_activate(device->swapchains[i], wparam); > + > device->device_parent->ops->activate(device->device_parent, wparam); > } > > diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c > index 25e2107..4c0948f 100644 > --- a/dlls/wined3d/swapchain.c > +++ b/dlls/wined3d/swapchain.c > @@ -1175,3 +1175,9 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) > wined3d_resource_update_draw_binding(&swapchain->back_buffers[i]->resource); > } > } > + > +void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) > +{ > + if (!activate && !(swapchain->device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) > + ShowWindow(swapchain->device_window, SW_MINIMIZE); > +} > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 0f302c4..5f90e9a 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -2701,6 +2701,7 @@ struct wined3d_swapchain > > void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) DECLSPEC_HIDDEN; > > +void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; > struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; > void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; > HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUY883AAoJEN0/YqbEcdMwU/EP/2AAyRwHeT/rJJt1ocC3EgSq ttCBQSjH0plrsm1y+zIfFJ6+iNFfXooO1ub3qC980Ub32v5EV7p9yUxbbvfpRt1T aF7kh5WDfbPvpkGdAKmSo7C3gCzHratuPxLokDIiHAKnqhsknFmIr6dwVfaYKqmd 1eoJghdpuapyQ5TiTblU54b6tuTLyWmyZlxDNHFUSQaBCLvC7pR5eXo7nvARwYLK ahP87S7htMA+rqudvctwkPNWEa7F3dSayWyLoOp6qW3abBwfpbBAWS9KEfCztc6i zAE6LOuVy9IWewmZ5j87DNZJmKSJj/tgMHhdJ5BHxEcyJALjdg4qSsgp9olFBkpm 0DXjc0qlqdrdFiNMPG2y5i6N5vMuT9srVgDEjFAW40dnu3aEPSqHmPqKhDVrAs8s Ci3G9mV4uDK4JNI/sWJd632yWaDHGNZSdZYETof3DaR6a6K8IMktG0vqBKrapZ2K RzWz8DEonbIx5W1mKQROr5Wj+0Qs5+AkeQoWbWFEYuubtU0oisp3evRCPtjCLXjB GSwObVGohUNdwiVonYCAXtu3C80HNYwMGObcoB7p9ok3RQc60e6gOb1RdshfTcvF e4oEWOHOdqmbtj8gqLftx1qsnwPmK4gHc6ho2KfXaAZTnQdkdeUw6VG+pkNUxwJb zj94p5A5sSlJEUTmCnyx =LNWo -----END PGP SIGNATURE-----

1 0

Re: d3d8/tests: Allow passing a resolution to reset_device (v2).
by Marvin 12 Nov '14

12 Nov '14

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=10211 Your paranoid android. === w8 (32 bit device) === device.c:1181: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1226: Test failed: Reset failed, hr 0x88760868. device.c:1228: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1232: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1239: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1240: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1241: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1242: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1243: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1244: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1249: Test failed: Screen width is 640, expected 800. device.c:1250: Test failed: Screen height is 480, expected 600. device.c:1256: Test failed: Back buffer width is 640, expected 800. device.c:1258: Test failed: Back buffer height is 480, expected 600. device.c:1288: Test failed: Screen width is 640, expected 1024. device.c:1289: Test failed: Screen height is 480, expected 768. device.c:2447: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:2822: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2826: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2849: Test failed: Failed to reset device, hr 0x88760868. device.c:2853: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2857: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3225: Test failed: Failed to reset device. device.c:3232: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3240: Test failed: Expected wndproc != 0x412e90.

1 0

Re: dinput: Fix device type dump
by Michael Stefaniuc 12 Nov '14

12 Nov '14

Bruno, On 11/12/2014 02:06 AM, Bruno Jesus wrote: > Related to bug https://bugs.winehq.org/show_bug.cgi?id=35954 > > using a switch statement instead of the ?: chain of death looks IMHO nicer. You can even use a macro like the popular #define X(x) case (x): return #x to make it more concise and avoid copy and paste errors. > > diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index > 0d61f57..2931832 100644 --- a/dlls/dinput/joystick.c +++ > b/dlls/dinput/joystick.c @@ -402,14 +402,30 @@ HRESULT WINAPI > JoystickAGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, REF > > void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) { + int type > = GET_DIDEVICE_TYPE(lpDIDevCaps->dwDevType); TRACE("dwSize: %d\n", > lpDIDevCaps->dwSize); TRACE("dwFlags: %08x\n", > lpDIDevCaps->dwFlags); TRACE("dwDevType: %08x %s\n", > lpDIDevCaps->dwDevType, - lpDIDevCaps->dwDevType == > DIDEVTYPE_DEVICE ? "DIDEVTYPE_DEVICE" : - > lpDIDevCaps->dwDevType == DIDEVTYPE_MOUSE ? "DIDEVTYPE_MOUSE" : - > lpDIDevCaps->dwDevType == DIDEVTYPE_KEYBOARD ? "DIDEVTYPE_KEYBOARD" > : - lpDIDevCaps->dwDevType == DIDEVTYPE_JOYSTICK ? > "DIDEVTYPE_JOYSTICK" : - lpDIDevCaps->dwDevType == > DIDEVTYPE_HID ? "DIDEVTYPE_HID" : "UNKNOWN"); + /* Directx > <= 7 definitions */ + type == DIDEVTYPE_DEVICE ? > "DIDEVTYPE_DEVICE" : + type == DIDEVTYPE_MOUSE ? > "DIDEVTYPE_MOUSE" : + type == DIDEVTYPE_KEYBOARD ? > "DIDEVTYPE_KEYBOARD" : + type == DIDEVTYPE_JOYSTICK ? > "DIDEVTYPE_JOYSTICK" : + type == DIDEVTYPE_HID ? > "DIDEVTYPE_HID" : + /* Directx >= 8 definitions */ + > type == DI8DEVTYPE_DEVICE ? "DI8DEVTYPE_DEVICE" : + type > == DI8DEVTYPE_MOUSE ? "DI8DEVTYPE_MOUSE" : + type == > DI8DEVTYPE_KEYBOARD ? "DI8DEVTYPE_KEYBOARD" : + type == > DI8DEVTYPE_JOYSTICK ? "DI8DEVTYPE_JOYSTICK" : + type == > DI8DEVTYPE_GAMEPAD ? "DI8DEVTYPE_GAMEPAD" : + type == > DI8DEVTYPE_DRIVING ? "DI8DEVTYPE_DRIVING" : + type == > DI8DEVTYPE_FLIGHT ? "DI8DEVTYPE_FLIGHT" : + type == > DI8DEVTYPE_1STPERSON ? "DI8DEVTYPE_1STPERSON" : + type == > DI8DEVTYPE_DEVICECTRL ? "DI8DEVTYPE_DEVICECTRL" : + type > == DI8DEVTYPE_SCREENPOINTER ? "DI8DEVTYPE_SCREENPOINTER" : + > type == DI8DEVTYPE_REMOTE ? "DI8DEVTYPE_REMOTE" : + type > == DI8DEVTYPE_SUPPLEMENTAL ? "DI8DEVTYPE_SUPPLEMENTAL" : + > "UNKNOWN"); TRACE("dwAxes: %d\n", lpDIDevCaps->dwAxes); > TRACE("dwButtons: %d\n", lpDIDevCaps->dwButtons); TRACE("dwPOVs: > %d\n", lpDIDevCaps->dwPOVs); bye michael

1 0

Re: [PATCH 5/5] d3d8/tests: Allow passing a resolution to reset_device.
by Henri Verbeet 12 Nov '14

12 Nov '14

On 12 November 2014 00:18, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -2830,7 +2844,8 @@ static void test_window_style(void) > focus_rect.left, focus_rect.top, focus_rect.right, focus_rect.bottom, > r.left, r.top, r.right, r.bottom); > · > - hr = reset_device(device, device_window, TRUE); > + device_desc.flags = 0;· You have a whitespace error here.

1 0

Re: [PATCH 5/5] d3d8/tests: Allow passing a resolution to reset_device.
by Marvin 12 Nov '14

12 Nov '14

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=10199 Your paranoid android. === w8 (32 bit device) === device.c:1181: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1226: Test failed: Reset failed, hr 0x88760868. device.c:1228: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1232: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1239: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1240: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1241: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1242: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1243: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1244: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1249: Test failed: Screen width is 640, expected 800. device.c:1250: Test failed: Screen height is 480, expected 600. device.c:1256: Test failed: Back buffer width is 640, expected 800. device.c:1258: Test failed: Back buffer height is 480, expected 600. device.c:1288: Test failed: Screen width is 640, expected 1024. device.c:1289: Test failed: Screen height is 480, expected 768. device.c:2447: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:2822: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2826: Test failed: Expected device window extended style 0x108, got 0x100. device.c:2849: Test failed: Failed to reset device, hr 0x88760868. device.c:2853: Test failed: Expected device window style 0x14cf0000, got 0x4cf0000. device.c:2857: Test failed: Expected device window extended style 0x108, got 0x100. device.c:3225: Test failed: Failed to reset device. device.c:3232: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 512, 384}. device.c:3240: Test failed: Expected wndproc != 0x412e90.

1 0

Re: [PATCH 2/2] mshtml: Added script element readyState and onreadystatechange tests.
by Marvin 11 Nov '14

11 Nov '14

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=10188 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 v2] cmd/tests: Add tests for 'del' (Fixes bug 35970)
by Marvin 11 Nov '14

11 Nov '14

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=10186 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 1367 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1368 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1369 (got 'C:\Documents and Settings\winetest\My Documents\foobar\foodir2', wanted '@drive@@path@foobar\foodir3') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1370 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1371 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1372 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1373 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1374 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1376 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1379 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1380 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1381 (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 1382 (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 1383 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar\foodir2') 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 'value1') 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 '@drive@@path@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'')

1 0

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

11 Nov '14

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 11 Nov '14

11 Nov '14

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 10 Nov '14

10 Nov '14

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 10 Nov '14

10 Nov '14

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 10 Nov '14

10 Nov '14

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 10 Nov '14

10 Nov '14

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 10 Nov '14

10 Nov '14

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 10 Nov '14

10 Nov '14

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 10 Nov '14

10 Nov '14

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 10 Nov '14

10 Nov '14

> 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 10 Nov '14

10 Nov '14

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 10 Nov '14

10 Nov '14

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 09 Nov '14

09 Nov '14

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 09 Nov '14

09 Nov '14

-----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 09 Nov '14

09 Nov '14

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 08 Nov '14

08 Nov '14

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 08 Nov '14

08 Nov '14

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 07 Nov '14

07 Nov '14

-----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 07 Nov '14

07 Nov '14

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 07 Nov '14

07 Nov '14

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 07 Nov '14

07 Nov '14

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 07 Nov '14

07 Nov '14

-----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 07 Nov '14

07 Nov '14

-----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 07 Nov '14

07 Nov '14

-----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 07 Nov '14

07 Nov '14

-----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 07 Nov '14

07 Nov '14

-----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 07 Nov '14

07 Nov '14

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 07 Nov '14

07 Nov '14

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 07 Nov '14

07 Nov '14

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 07 Nov '14

07 Nov '14

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 06 Nov '14

06 Nov '14

-----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 06 Nov '14

06 Nov '14

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 06 Nov '14

06 Nov '14

-----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 06 Nov '14

06 Nov '14

-----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 06 Nov '14

06 Nov '14

-----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 06 Nov '14

06 Nov '14

-----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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel