- wine-devel - winehq.org

Re: shell32/tests: Move test after return
by Alexandre Julliard 28 Sep '16

28 Sep '16

André Hentschel <nerv(a)dawncrow.de> writes: > diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c > index 1591b7b..1f5dc33 100644 > --- a/dlls/shell32/tests/shlfolder.c > +++ b/dlls/shell32/tests/shlfolder.c > @@ -1588,11 +1588,11 @@ static void test_FolderShortcut(void) { > if (hr != S_OK) return; > > hr = IShellFolder_GetDisplayNameOf(pShellFolder, NULL, SHGDN_FORPARSING, &strret); > - ok(hr == S_OK, "IShellFolder_GetDisplayNameOf(NULL) failed! hr = %08x\n", hr); > if (hr != S_OK) { > IShellFolder_Release(pShellFolder); > return; > } > + ok(hr == S_OK, "IShellFolder_GetDisplayNameOf(NULL) failed! hr = %08x\n", hr); It would be better to check for the expected error instead of disabling the test. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [10/11] kernel32: Implement LCMAP_FULLWIDTH.
by Alexandre Julliard 28 Sep '16

28 Sep '16

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > @@ -3246,6 +3385,24 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW > goto done; > } > > + if (flags & LCMAP_FULLWIDTH) > + { > + len = min(srclen, dstlen); > + buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); > + if (!buffer) > + { > + SetLastError(ERROR_NOT_ENOUGH_MEMORY); > + return 0; > + } > + srclen = map_to_fullwidth(src, srclen, buffer, len); > + if (!srclen) > + { > + HeapFree(GetProcessHeap(), 0, buffer); > + return 0; > + } > + src = buffer; > + } It seems to me that you should be able to do this without allocating an intermediate buffer. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 5/5] wined3d: Call glGetIntegerv() through the gl_info function pointer.
by Józef Kucia 27 Sep '16

27 Sep '16

On Tue, Sep 27, 2016 at 12:04 AM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Fixes a1e718ccabc7c330dd16c7face78022965b03e20. > > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > dlls/wined3d/directx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c > index 7ab68aa..05e04e8 100644 > --- a/dlls/wined3d/directx.c > +++ b/dlls/wined3d/directx.c > @@ -3629,7 +3629,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD > > if (gl_version >= MAKEDWORD_VERSION(3, 2)) > { > - glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &context_profile); > + gl_info->gl_ops.gl.p_glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &context_profile); > checkGLcall("Querying context profile"); > } > if (context_profile & GL_CONTEXT_CORE_PROFILE_BIT) FWIW, there are other places where GL functions aren't called through gl_ops. I've got patches to fix others.

1 0

Re: [PATCH v2 1/5] wined3d: Use round() on core profile.
by Henri Verbeet 27 Sep '16

27 Sep '16

On 27 September 2016 at 00:04, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > v2: Key the use of the round() builtin on the GLSL version used by the > shader. I'm not sure this is exactly what you had in mind but at least > this looks quite a bit nicer to me than v1. > Close enough. I think you can just use shader_glsl_get_version() and "#version %u" in the places you're currently using shader_glsl_get_version_declaration(), but it doesn't matter that much.

1 0

Re: [PATCH] wined3d: Add NVIDIA GTX 675MX to the GPU list.
by Henri Verbeet 26 Sep '16

26 Sep '16

On 24 September 2016 at 00:00, Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> wrote: > - {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 */ > + {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 / 675MX */ It's not wrong, but I don't think this is very useful. In general what's essentially the same GPU is available under many different names and PCI IDs, and the wined3d source code isn't the best place to document those.

2 1

Re: [PATCH] wined3d: Add NVIDIA GTX 980 Ti to the GPU list.
by Henri Verbeet 26 Sep '16

26 Sep '16

On 23 September 2016 at 22:56, Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> wrote: > @@ -2160,6 +2162,7 @@ cards_amd_mesa[] = > cards_nvidia_mesa[] = > { > /* Maxwell */ > + {"NV120", CARD_NVIDIA_GEFORCE_GTX980TI}, /* Titan X */ > {"NV124", CARD_NVIDIA_GEFORCE_GTX970}, > {"NV118", CARD_NVIDIA_GEFORCE_840M}, > {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, Please keep these ordered where possible.

2 1

Ancient Parallel Port PIC Programmer - support under newer versions of Wine?
by Bob Wya 25 Sep '16

25 Sep '16

Can anyone help out with this user question on the WineHQ Forums? forum.winehq.org/viewtopic.php?f=8&t=27503 Since the programmer used to work - with older versions of Wine - I presume that it might still be possible to get it working? Perhaps starting with parallel port device symlinks in "${WINEPREFIX}/dosdevices" ... Any thoughts? -- Thanks, Robert

2 1

Re: [PATCH 1/5] wined3d: Use round() on core profile.
by Henri Verbeet 23 Sep '16

23 Sep '16

On 22 September 2016 at 20:39, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > dlls/wined3d/directx.c | 5 +++++ > dlls/wined3d/glsl_shader.c | 4 ++-- > dlls/wined3d/wined3d_gl.h | 1 + > 3 files changed, 8 insertions(+), 2 deletions(-) > This works, but I'm not sure it really scales beyond one or two instructions. It also seems to me that what you actually want to know is the GLSL version of the current shader, not entirely unlike shader_glsl_get_version().

1 0

Re: [PATCH 5/5] api-ms-win-service-winsvc-l1-1-0: add dll
by Sebastian Lackner 22 Sep '16

22 Sep '16

On 22.09.2016 19:38, Austin English wrote: > +# Generated from /home/austin/win7-SysWOW64/api-ms-win-service-winsvc-l1-1-0.dll by winedump. [...] > +C_SRCS = \ > + api-ms-win-service-winsvc-l1-1-0_main.c Are you sure this is the version you wanted to submit? And where is the main.c file?

1 0

Re: [11/11] kernel32: Implement LCMAP_HALFWIDTH.
by Marvin 22 Sep '16

22 Sep '16

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=25911 Your paranoid android. === w1064 (32 bit locale) === locale.c:2648: Test failed: LCMapStringEx should fail with bad locale name locale.c:2649: Test failed: unexpected error code -559038737 locale.c:2740: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4476: Test failed: IsValidLocaleName should have failed locale.c:4478: Test failed: IsValidLocaleName should have failed locale.c:4861: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4863: Test failed: For id 7, Expected IVC, got '' === w1064 (64 bit locale) === locale.c:2648: Test failed: LCMapStringEx should fail with bad locale name locale.c:2649: Test failed: unexpected error code -559038737 locale.c:2740: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4476: Test failed: IsValidLocaleName should have failed locale.c:4478: Test failed: IsValidLocaleName should have failed locale.c:4861: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4863: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [10/11] kernel32: Implement LCMAP_FULLWIDTH.
by Marvin 22 Sep '16

22 Sep '16

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=25910 Your paranoid android. === w1064 (32 bit locale) === locale.c:2644: Test failed: LCMapStringEx should fail with bad locale name locale.c:2645: Test failed: unexpected error code -559038737 locale.c:2736: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4472: Test failed: IsValidLocaleName should have failed locale.c:4474: Test failed: IsValidLocaleName should have failed locale.c:4857: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4859: Test failed: For id 7, Expected IVC, got '' === w1064 (64 bit locale) === locale.c:2644: Test failed: LCMapStringEx should fail with bad locale name locale.c:2645: Test failed: unexpected error code -559038737 locale.c:2736: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4472: Test failed: IsValidLocaleName should have failed locale.c:4474: Test failed: IsValidLocaleName should have failed locale.c:4857: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4859: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [09/11] kernel32: Implement LCMAP_KATAKANA.
by Marvin 22 Sep '16

22 Sep '16

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=25909 Your paranoid android. === w1064 (32 bit locale) === locale.c:2640: Test failed: LCMapStringEx should fail with bad locale name locale.c:2641: Test failed: unexpected error code -559038737 locale.c:2732: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4468: Test failed: IsValidLocaleName should have failed locale.c:4470: Test failed: IsValidLocaleName should have failed locale.c:4853: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4855: Test failed: For id 7, Expected IVC, got '' === w1064 (64 bit locale) === locale.c:2640: Test failed: LCMapStringEx should fail with bad locale name locale.c:2641: Test failed: unexpected error code -559038737 locale.c:2732: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4468: Test failed: IsValidLocaleName should have failed locale.c:4470: Test failed: IsValidLocaleName should have failed locale.c:4853: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4855: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [08/11] kernel32: Implement LCMAP_HIRAGANA.
by Marvin 22 Sep '16

22 Sep '16

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=25908 Your paranoid android. === w1064 (32 bit locale) === locale.c:2636: Test failed: LCMapStringEx should fail with bad locale name locale.c:2637: Test failed: unexpected error code -559038737 locale.c:2728: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4464: Test failed: IsValidLocaleName should have failed locale.c:4466: Test failed: IsValidLocaleName should have failed locale.c:4849: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4851: Test failed: For id 7, Expected IVC, got '' === w1064 (64 bit locale) === locale.c:2636: Test failed: LCMapStringEx should fail with bad locale name locale.c:2637: Test failed: unexpected error code -559038737 locale.c:2728: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4464: Test failed: IsValidLocaleName should have failed locale.c:4466: Test failed: IsValidLocaleName should have failed locale.c:4849: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4851: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [05/11] kernel32/tests: Add more mapping tests for LCMapString.
by Marvin 22 Sep '16

22 Sep '16

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=25907 Your paranoid android. === w1064 (32 bit locale) === locale.c:2632: Test failed: LCMapStringEx should fail with bad locale name locale.c:2633: Test failed: unexpected error code -559038737 locale.c:2724: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4460: Test failed: IsValidLocaleName should have failed locale.c:4462: Test failed: IsValidLocaleName should have failed locale.c:4845: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4847: Test failed: For id 7, Expected IVC, got '' === w1064 (64 bit locale) === locale.c:2632: Test failed: LCMapStringEx should fail with bad locale name locale.c:2633: Test failed: unexpected error code -559038737 locale.c:2724: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4460: Test failed: IsValidLocaleName should have failed locale.c:4462: Test failed: IsValidLocaleName should have failed locale.c:4845: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4847: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [04/11] kernel32/tests: Add LCMAP_TITLECASE test.
by Marvin 22 Sep '16

22 Sep '16

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=25906 Your paranoid android. === w1064 (32 bit locale) === locale.c:2555: Test failed: LCMapStringEx should fail with bad locale name locale.c:2556: Test failed: unexpected error code -559038737 locale.c:2647: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4383: Test failed: IsValidLocaleName should have failed locale.c:4385: Test failed: IsValidLocaleName should have failed locale.c:4768: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4770: Test failed: For id 7, Expected IVC, got '' === w1064 (64 bit locale) === locale.c:2555: Test failed: LCMapStringEx should fail with bad locale name locale.c:2556: Test failed: unexpected error code -559038737 locale.c:2647: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4383: Test failed: IsValidLocaleName should have failed locale.c:4385: Test failed: IsValidLocaleName should have failed locale.c:4768: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4770: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [03/11] kernel32: Zero is an invalid flag value.
by Marvin 22 Sep '16

22 Sep '16

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=25905 Your paranoid android. === w1064 (32 bit locale) === locale.c:2556: Test failed: LCMapStringEx should fail with bad locale name locale.c:2557: Test failed: unexpected error code -559038737 locale.c:2648: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4384: Test failed: IsValidLocaleName should have failed locale.c:4386: Test failed: IsValidLocaleName should have failed locale.c:4769: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4771: Test failed: For id 7, Expected IVC, got '' === w1064 (64 bit locale) === locale.c:2556: Test failed: LCMapStringEx should fail with bad locale name locale.c:2557: Test failed: unexpected error code -559038737 locale.c:2648: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4384: Test failed: IsValidLocaleName should have failed locale.c:4386: Test failed: IsValidLocaleName should have failed locale.c:4769: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4771: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [02/11] kernel32: Do not allow to combine NORM_IGNORENONSPACE and/or NORM_IGNORESYMBOLS with other LCMAP flags.
by Marvin 22 Sep '16

22 Sep '16

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=25904 Your paranoid android. === w1064 (32 bit locale) === locale.c:2555: Test failed: LCMapStringEx should fail with bad locale name locale.c:2556: Test failed: unexpected error code -559038737 locale.c:2647: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4383: Test failed: IsValidLocaleName should have failed locale.c:4385: Test failed: IsValidLocaleName should have failed locale.c:4768: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4770: Test failed: For id 7, Expected IVC, got '' === w1064 (64 bit locale) === locale.c:2555: Test failed: LCMapStringEx should fail with bad locale name locale.c:2556: Test failed: unexpected error code -559038737 locale.c:2647: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4383: Test failed: IsValidLocaleName should have failed locale.c:4385: Test failed: IsValidLocaleName should have failed locale.c:4768: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4770: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [01/11] kernel32/tests: Consolidate duplicated code for invalid LCMapString flag tests.
by Marvin 22 Sep '16

22 Sep '16

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=25903 Your paranoid android. === w1064 (32 bit locale) === locale.c:2535: Test failed: LCMapStringEx should fail with bad locale name locale.c:2536: Test failed: unexpected error code -559038737 locale.c:2627: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4363: Test failed: IsValidLocaleName should have failed locale.c:4365: Test failed: IsValidLocaleName should have failed locale.c:4748: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4750: Test failed: For id 7, Expected IVC, got '' === w1064 (64 bit locale) === locale.c:2535: Test failed: LCMapStringEx should fail with bad locale name locale.c:2536: Test failed: unexpected error code -559038737 locale.c:2627: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4363: Test failed: IsValidLocaleName should have failed locale.c:4365: Test failed: IsValidLocaleName should have failed locale.c:4748: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4750: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [PATCH v3] winebus.sys: Watch for hid raw device addition and removal
by Sebastian Lackner 21 Sep '16

21 Sep '16

On 19.09.2016 15:35, Aric Stewart wrote: > v2: Correct poll timeout > Style changes > v3: vtable style instead of a callback > > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/winebus.sys/bus.h | 11 +++++- > dlls/winebus.sys/bus_udev.c | 92 ++++++++++++++++++++++++++++++++++++++++++++- > dlls/winebus.sys/main.c | 52 ++++++++++++++++++++++++- > 3 files changed, 152 insertions(+), 3 deletions(-) > Would you mind sharing some of the follow up patches, so that I can check if the vtbl solution really looks better than the previous approach? > > > v3-0004-winebus.sys-Watch-for-hid-raw-device-addition-and-r.txt > > > diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h > index dcb50f2..cf10e80 100644 > --- a/dlls/winebus.sys/bus.h > +++ b/dlls/winebus.sys/bus.h > @@ -19,8 +19,17 @@ > /* Busses */ > NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; > > +/* Native device function table */ > +typedef struct { > + int(*compare_native_device)(DEVICE_OBJECT *device, DEVICE_OBJECT *other); > +} platform_vtbl; > + > +void *get_native_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; > +DEVICE_OBJECT *find_hid_device(const WCHAR* busidW, void *native) DECLSPEC_HIDDEN; > + > /* HID Plug and Play Bus */ > NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; > DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, void *native, WORD vid, > WORD pid, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, > - const GUID *class) DECLSPEC_HIDDEN; > + const GUID *class, platform_vtbl* vtbl) DECLSPEC_HIDDEN; > +void bus_remove_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; > diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c > index 1525861..35b198a 100644 > --- a/dlls/winebus.sys/bus_udev.c > +++ b/dlls/winebus.sys/bus_udev.c > @@ -26,6 +26,11 @@ > #ifdef HAVE_UNISTD_H > # include <unistd.h> > #endif > + > +#ifdef HAVE_SYS_POLL_H > +# include <sys/poll.h> > +#endif > + > #ifdef HAVE_LIBUDEV_H > # include <libudev.h> > #endif > @@ -82,6 +87,17 @@ static WCHAR *get_sysattr_string(struct udev_device *dev, const char *sysattr) > return dst; > } > > +static int compare_native_device(DEVICE_OBJECT *device, DEVICE_OBJECT *other) > +{ > + struct udev_device *dev1 = get_native_device(device); > + struct udev_device *dev2 = get_native_device(other); > + return (strcmp(udev_device_get_syspath(dev1), udev_device_get_syspath(dev2))); > +} > + > +static platform_vtbl hidraw_vtbl = { This should be made const. > + compare_native_device, > +}; > + > static void try_add_device(struct udev_device *dev) > { > DWORD vid = 0, pid = 0, version = 0; > @@ -118,7 +134,7 @@ static void try_add_device(struct udev_device *dev) > if (strcmp(subsystem, "hidraw") == 0) > { > device = bus_create_hid_device(udev_driver_obj, hidraw_busidW, dev, vid, pid, > - version, 0, serial, FALSE, &GUID_DEVCLASS_HIDRAW); > + version, 0, serial, FALSE, &GUID_DEVCLASS_HIDRAW, &hidraw_vtbl); > } > > if (device) > @@ -164,6 +180,77 @@ static void build_initial_deviceset(void) > udev_enumerate_unref(enumerate); > } > > +/* This is our main even loop for reading devices */ > +static DWORD CALLBACK deviceloop_thread(void *args) > +{ > + struct pollfd plfds[1]; > + struct udev_monitor *monitor = NULL; > + > + monitor = udev_monitor_new_from_netlink(udev_context, "udev"); > + if (!monitor) > + { > + WARN("Unable to get udev monitor, device insertion and removal cannot be tracked\n"); > + goto exit; > + } > + if (udev_monitor_filter_add_match_subsystem_devtype(monitor, "hidraw", NULL) < 0) > + { > + WARN("Failed to add 'hidraw' subsystem to monitor\n"); > + goto exit; > + } > + > + if (udev_monitor_enable_receiving(monitor) < 0) > + { > + WARN("Failed to start monitoring\n"); > + goto exit; > + } > + > + plfds[0].fd = udev_monitor_get_fd(monitor); > + plfds[0].events = POLLIN; > + if (plfds[0].fd < 0) > + { > + WARN("Failed to get monitor fd\n"); > + goto exit; > + } > + /* Run the event loop */ > + while (1) > + { > + struct udev_device *dev; > + const char* action; > + > + if (poll(plfds, 1, -1) <= 0) continue; > + > + TRACE("udev reports device changes\n"); > + dev = udev_monitor_receive_device(monitor); > + if (!dev) > + { > + FIXME("Failed to get device that has changed\n"); > + continue; > + } > + action = udev_device_get_action(dev); > + if (!action) > + WARN("No action recieved\n"); > + else if (strcmp(action, "add") == 0) > + try_add_device(dev); > + else if (strcmp(action, "remove") == 0) > + { > + DEVICE_OBJECT *device = find_hid_device(hidraw_busidW, dev); > + if (device) > + { > + struct udev_device *original = get_native_device(device); > + bus_remove_hid_device(device); > + udev_device_unref(original); > + } > + } > + udev_device_unref(dev); > + } > + > +exit: > + TRACE("Monitor thread exiting\n"); > + if (monitor) > + udev_monitor_unref(monitor); > + return 1; > +} > + > NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) > { > TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); > @@ -178,6 +265,9 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry > driver->MajorFunction[IRP_MJ_PNP] = common_pnp_dispatch; > > build_initial_deviceset(); > + > + CreateThread(NULL, 0, deviceloop_thread, NULL, 0, NULL); It would be better to check the result here (at least to print an ERR or something like that). > + > return STATUS_SUCCESS; > } > > diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c > index 1364eab..c7418e3 100644 > --- a/dlls/winebus.sys/main.c > +++ b/dlls/winebus.sys/main.c > @@ -54,6 +54,7 @@ struct device_extension > BOOL is_gamepad; > WCHAR *serial; > const WCHAR *busid; /* Expected to be a static constant */ > + platform_vtbl *vtbl; > }; > > static CRITICAL_SECTION device_list_cs; > @@ -159,7 +160,7 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) > > DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, void *native, WORD vid, > WORD pid, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, > - const GUID *class) > + const GUID *class, platform_vtbl *vtbl) > { > static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e','\\','%','s','#','%','p',0}; > struct device_extension *ext; > @@ -199,6 +200,7 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, > ext->is_gamepad = is_gamepad; > ext->serial = strdupW(serialW); > ext->busid = busidW; > + ext->vtbl = vtbl; > > /* add to list of pnp devices */ > pnp_dev->device = device; > @@ -265,6 +267,54 @@ static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) > return status; > } > > +void *get_native_device(DEVICE_OBJECT *device) > +{ > + struct device_extension *ext = (struct device_extension*)device->DeviceExtension; > + return ext->native; > +} > + > +DEVICE_OBJECT *find_hid_device(const WCHAR* busidW, void *native) > +{ > + struct pnp_device *dev, *ptr; > + DEVICE_OBJECT *ret = NULL; > + > + EnterCriticalSection(&device_list_cs); > + LIST_FOR_EACH_ENTRY_SAFE(dev, ptr, &pnp_devset, struct pnp_device, entry) > + { > + struct device_extension *ext = (struct device_extension*)dev->device->DeviceExtension; > + if ((strcmpW(busidW, ext->busid) == 0) && > + (ext->vtbl->compare_native_device(dev->device, native) == 0)) > + { > + TRACE("Found as device %p\n", dev->device); > + ret = dev->device; > + break; > + } > + } > + LeaveCriticalSection(&device_list_cs); > + return ret; > +} > + > +void bus_remove_hid_device(DEVICE_OBJECT *device) > +{ > + struct pnp_device *dev, *ptr; > + TRACE("Remove hid device %p\n", device); > + EnterCriticalSection(&device_list_cs); > + LIST_FOR_EACH_ENTRY_SAFE(dev, ptr, &pnp_devset, struct pnp_device, entry) > + { > + struct device_extension *ext = (struct device_extension*)dev->device->DeviceExtension; > + if (device == dev->device) > + { > + list_remove(&dev->entry); > + IoInvalidateDeviceRelations(dev->device, RemovalRelations); > + HeapFree(GetProcessHeap(), 0, ext->serial); > + IoDeleteDevice(dev->device); > + HeapFree(GetProcessHeap(), 0, dev); > + break; > + } > + } > + LeaveCriticalSection(&device_list_cs); > +} > + > NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) > { > NTSTATUS status = irp->IoStatus.u.Status; > > >

2 1

Re: [PATCH 3/7] wined3d: Implement the initial texture data upload on top of wined3d_device_update_sub_resource().
by Michael Müller 21 Sep '16

21 Sep '16

Am 20.09.2016 um 11:41 schrieb Henri Verbeet: > - wined3d_texture_upload_data(object, i, context, &addr, data[i].row_pitch, data[i].slice_pitch); > - wined3d_texture_validate_location(object, i, WINED3D_LOCATION_TEXTURE_RGB); > - wined3d_texture_invalidate_location(object, i, ~WINED3D_LOCATION_TEXTURE_RGB); > + wined3d_device_update_sub_resource(device, &object->resource, > + i, NULL, data[i].data, data[i].row_pitch, data[i].slice_pitch); Didn't this break the initial upload for 3d textures as wined3d_device_update_sub_resource only supports buffers and 2d textures?

2 1

Re: d3d9/tests: Allow D3D_OK for lost device present (Win10)
by Marvin 20 Sep '16

20 Sep '16

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=25889 Your paranoid android. === w1064 (32 bit d3d9ex) === d3d9ex.c:2828: Test failed: Got unexpected hr 0, i=0. d3d9ex.c:2830: Test failed: Got unexpected hr 0, i=0. d3d9ex.c:2828: Test failed: Got unexpected hr 0, i=1. d3d9ex.c:2830: Test failed: Got unexpected hr 0, i=1. === w1064 (64 bit d3d9ex) === d3d9ex.c:2828: Test failed: Got unexpected hr 0, i=0. d3d9ex.c:2830: Test failed: Got unexpected hr 0, i=0. d3d9ex.c:2828: Test failed: Got unexpected hr 0, i=1. d3d9ex.c:2830: Test failed: Got unexpected hr 0, i=1.

1 0

Re: [PATCH 2/5] d3dx11: Made texture loader use wined3dformat instead of d3dformat.
by Matteo Bruni 20 Sep '16

20 Sep '16

2016-09-13 22:11 GMT+02:00 Fabian Maurer <dark.shadow4(a)web.de>: > Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> It was already mentioned but, at the cost of being annoying, let me reiterate: d3dx* DLLs can't directly use wined3d data types or APIs. They have to go through the respective d3d* client library functions. I suspect that code sharing between d3dx* versions will eventually happen in a somewhat different fashion and trying to build the "final solution" from the ground up is going to be hard. Porting the various pieces of code to d3d[x]11 as necessary, even at the cost of "duplication" in the short term, is probably a better plan.

2 3

Problems with the tooltip controls.
by John Found 20 Sep '16

20 Sep '16

In my program I have window with several toolbars that have to show tooltips on its buttons. As long as the tooltips are dynamical, I am handling the TTN_NEEDTEXTW following way: 1. Send message TTM_GETCURRENTTOOLW to the tooltip control in NMHDR.hwndFrom reveived. 2. Determine from which toolbar the notification comes by using TOOLINFO.hwnd returned. 3. Generate the tooltip text and set the TOOLTIPTEXTW.lpszText to point to the generated text. 4. Return This procedure works in Windows, but not in WINE. In WINE, TTM_GETCURRENTTOOLW always returns FALSE. And there is no other way to determine which of the toolbars generated this message. (or at least I don't know it). Any ideas about some workaround? -- http://fresh.flatassembler.net http://asm32.info John Found <johnfound(a)asm32.info>

3 6

Re: oleaut32: Handle xbuf_get erroring out in deserialize_param (and avoid uninitialized read).
by Dmitry Timoshkov 20 Sep '16

20 Sep '16

Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > --- a/dlls/oleaut32/tmarshal.c > +++ b/dlls/oleaut32/tmarshal.c > @@ -1078,7 +1078,10 @@ deserialize_param( > if (readit) { > DWORD x; > hres = xbuf_get(buf,(LPBYTE)&x,sizeof(DWORD)); > - if (hres) ERR("Failed to read integer 4 byte\n"); > + if (hres) { > + ERR("Failed to read integer 4 byte\n"); > + x = 0; > + } > memcpy(arg,&x,2); > } > if (debugout) TRACE_(olerelay)("%04x",*arg & 0xffff); > @@ -1088,7 +1091,10 @@ deserialize_param( > if (readit) { > DWORD x; > hres = xbuf_get(buf,(LPBYTE)&x,sizeof(DWORD)); > - if (hres) ERR("Failed to read integer 4 byte\n"); > + if (hres) { > + ERR("Failed to read integer 4 byte\n"); > + x = 0; > + } > memcpy(arg,&x,1); A proper fix would be to avoid a memcpy() if xbuf_get() fails instead of creating bogus input data. -- Dmitry.

1 0

Re: [PATCH 1/5] d3dx11: Copied functions and defines from d3dx_36 related to texture loading
by Nikolay Sivov 20 Sep '16

20 Sep '16

On 13.09.2016 23:11, Fabian Maurer wrote: > +/* temporary defines to not break compilation */ > + > +#define IDirect3DSurface9_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a) > +#define IDirect3DSurface9_LockRect(p,a,b,c) (p)->lpVtbl->LockRect(p,a,b,c) > +#define IDirect3DSurface9_UnlockRect(p) (p)->lpVtbl->UnlockRect(p) > + ... > +#define INTERFACE IDirect3DSurface9 > +DECLARE_INTERFACE_(IDirect3DSurface9,IDirect3DResource9) I don't think this is acceptable. It should be done in a way that doesn't introduce mess like this.

4 5

Getting backtraces from services without crash dialog
by Austin English 20 Sep '16

20 Sep '16

Howdy all, I asked this in #winehackers, but got no reply. I have a program: http://www.cressi.com/software http://www.cressi.com/easyUp/software/CressiPcInterface_2_0_1_37_Installer.… that installs some device drivers that crash when it is starting up. If I have the crash dialog enabled, I can save their backtraces. If I disable it, all I see is something like: wine: Unhandled page fault on write access to 0x0078d000 at address 0x7bc55e7f (thread 00a1), starting debugger... Is there some way for me to get the backtraces to print to a console (either of the first wine process or of the later running programs? If the dialog is enabled, there are several crashes, which makes that inconvenient. Thanks! -- -Austin GPG: 14FB D7EA A041 937B

2 3

Re: [PATCH 1/2] dinput: Fix phase conversion on periodic effects
by Matteo Bruni 20 Sep '16

20 Sep '16

2016-09-14 7:25 GMT+02:00 Bruno Jesus <00cpxxx(a)gmail.com>: > Based on idea by Elias Vanderstuyft. > > Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> > --- > dlls/dinput/effect_linuxinput.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Thanks for giving dinput and force feedback some love and care lately. I'm going to be a nag though... > diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c > index 9205c9c..bb45792 100644 > --- a/dlls/dinput/effect_linuxinput.c > +++ b/dlls/dinput/effect_linuxinput.c > @@ -632,7 +632,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( > > This->effect.u.periodic.magnitude = (tsp->dwMagnitude / 10) * 32; > This->effect.u.periodic.offset = (tsp->lOffset / 10) * 32; > - This->effect.u.periodic.phase = (tsp->dwPhase / 9) * 8; /* == (/ 36 * 32) */ > + /* phase ranges from 0 - 35999 in dinput and 0 - 65535 on linux */ > + This->effect.u.periodic.phase = (tsp->dwPhase / 36) * 65; Probably I'm missing something but... Why don't you actually use 35999 and 65535 in the expression? Relatedly, why not do the multiplication before the division instead of throwing bits of precision away? Maybe phase can go over 35999? If that's the only reason, I'd adjust the phase before doing this computation instead. I guess these points apply to the other effect parameters too. BTW, you didn't change the corresponding piece of code in GetParameters (which, for some reason, uses 33 and 36 as scaling constants...) so that's probably broken now. Or at least more broken than it was before.

2 3

Re: [PATCH 5/5] d3dx11: Implemented D3DX11CompileFromFileW
by Matteo Bruni 20 Sep '16

20 Sep '16

2016-09-13 22:11 GMT+02:00 Fabian Maurer <dark.shadow4(a)web.de>: > Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> > --- > dlls/d3dx11_43/async.c | 24 ++++++++++++++++++++++-- > 1 file changed, 22 insertions(+), 2 deletions(-) > > diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c > index 90c60fa..1e3042b 100644 > --- a/dlls/d3dx11_43/async.c > +++ b/dlls/d3dx11_43/async.c > @@ -1989,16 +1989,36 @@ HRESULT WINAPI D3DX11CompileFromFileA(const char *filename, const D3D10_SHADER_M > return E_NOTIMPL; > } > > + Stray newline. > HRESULT WINAPI D3DX11CompileFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines, > ID3D10Include *include, const char *entry_point, const char *target, UINT sflags, UINT eflags, > ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult) > { > - FIXME("filename %s, defines %p, include %p, entry_point %s, target %s, sflags %#x, " > + void *file_buffer; > + HRESULT hr; > + DWORD file_size; > + LPSTR filename_converted; Please use "char *" instead. > + UINT filename_converted_len; Probably you can call it just "size". > + > + TRACE("filename %s, defines %p, include %p, entry_point %s, target %s, sflags %#x, " > "eflags %#x, pump %p, shader %p, error_messages %p, hresult %p stub.\n", The "stub" part should go away. > debugstr_w(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), > sflags, eflags, pump, shader, error_messages, hresult); > > - return E_NOTIMPL; > + if (FAILED(hr = map_view_of_file(filename, &file_buffer, &file_size))) > + return hr; > + > + filename_converted_len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); > + filename_converted = HeapAlloc(GetProcessHeap(), 0, filename_converted_len); > + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_converted, filename_converted_len, NULL, NULL); > + > + hr = D3DX11CompileFromMemory(file_buffer, file_size, filename_converted, defines, include, entry_point, target, > + sflags, eflags, pump, shader, error_messages, hresult); > + > + HeapFree(GetProcessHeap(), 0, filename_converted); > + UnmapViewOfFile(file_buffer); > + > + return hr; > } This would be okay otherwise but, as mentioned for patch [4/5], maybe it's a good idea to implement and make use of D3DX11CreateAsyncFileLoaderW() here too.

2 2

Re: [PATCH 4/5] d3dx11: Implemented D3DX11CreateShaderResourceViewFromFileW
by Nikolay Sivov 19 Sep '16

19 Sep '16

On 13.09.2016 23:11, Fabian Maurer wrote: > +HRESULT WINAPI D3DX11CreateShaderResourceViewFromFileW(ID3D11Device *iface, > + WCHAR *filename, D3DX11_IMAGE_LOAD_INFO *load_info_original, ID3DX11ThreadPump *pump, ID3D11ShaderResourceView **view, HRESULT *hresult) > +{ > + D3DX11_IMAGE_LOAD_INFO load_info; > + D3D11_SHADER_RESOURCE_VIEW_DESC desc_view; > + D3D11_TEXTURE2D_DESC desc_texture; > + D3D11_SUBRESOURCE_DATA data_texture; > + ID3D11Texture2D *texture; > + enum wined3d_format_id dst_format; > + UINT dst_pitch; > + D3DXIMAGE_INFO image_info; > + void *file_buffer = NULL; > + DWORD file_size; > + void *image_data = NULL; > + RECT rectSize; > + HRESULT hr; > + > + TRACE("iface %p, filename %s, load_info_original %p, pump %p, view %p, hresult %p.\n", > + iface, debugstr_w(filename), load_info_original, pump, view, hresult); > + > + if (pump) > + FIXME("Unimplemented ID3DX11ThreadPump handling.\n"); Personally I think this function should use D3DX11CreateAsyncFileLoaderW() and D3DX11CreateAsyncShaderResourceViewProcessor() internally, for both async and synchronous cases. This will make support for a thread pump trivial, and will consolidate things like map_view_of_file() in one place.

2 1

Re: [PATCH v2] hid: Stub HidP_TranslateUsagesToI8042ScanCodes
by Sebastian Lackner 19 Sep '16

19 Sep '16

On 15.09.2016 14:08, Aric Stewart wrote: > v2: Corrections pointed out by Sebastian Lackner > > Resolves Bug 39447 > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/hid/hid.spec | 2 +- > dlls/hid/hidp.c | 9 +++++++++ > include/ddk/hidpi.h | 29 +++++++++++++++++++++++++++++ > 3 files changed, 39 insertions(+), 1 deletion(-) > > > > 0003-hid-Stub-HidP_TranslateUsagesToI8042ScanCodes.txt > > > diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec > index 4c5e505..2131af2 100644 > --- a/dlls/hid/hid.spec > +++ b/dlls/hid/hid.spec > @@ -39,6 +39,6 @@ > @ stub HidP_SetUsageValue > @ stub HidP_SetUsageValueArray > @ stub HidP_SetUsages > -@ stub HidP_TranslateUsagesToI8042ScanCodes > +@ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) > @ stub HidP_UnsetUsages > @ stub HidP_UsageListDifference > diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c > index 3d7a12e..c7bfb72 100644 > --- a/dlls/hid/hidp.c > +++ b/dlls/hid/hidp.c > @@ -23,6 +23,7 @@ > #include <stdarg.h> > > #define NONAMELESSUNION > +#include "ntstatus.h" > #define WIN32_NO_STATUS > #include "windef.h" > #include "winbase.h" > @@ -519,3 +520,11 @@ ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePag > } > return count; > } > + > +NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, PHIDP_INSERT_SCANCODES InsertCodesProcedure, VOID *InsertCodesContext) It wouldn't really hurt to split this extremely long line. Also please note that VOID should usually be avoided in new Wine source, but I will leave that up to you since its your area. The same also applies to the function declaration. > +{ > + FIXME("stub: %p, %i, %i, %p, %p, %p\n", ChangedUsageList, UsageListLength, > + KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); > + > + return STATUS_NOT_IMPLEMENTED; > +} > diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h > index 4cfac61..833387e 100644 > --- a/include/ddk/hidpi.h > +++ b/include/ddk/hidpi.h > @@ -136,6 +136,34 @@ typedef struct _HIDP_CAPS > USHORT NumberFeatureDataIndices; > } HIDP_CAPS, *PHIDP_CAPS; > > +typedef enum _HIDP_KEYBOARD_DIRECTION { > + HidP_Keyboard_Break, > + HidP_Keyboard_Make > +} HIDP_KEYBOARD_DIRECTION; > + > +typedef struct _HIDP_KEYBOARD_MODIFIER_STATE { > + union { > + struct { > + ULONG LeftControl: 1; > + ULONG LeftShift: 1; > + ULONG LeftAlt: 1; > + ULONG LeftGUI: 1; > + ULONG RightControl: 1; > + ULONG RightShift: 1; > + ULONG RightAlt: 1; > + ULONG RigthGUI: 1; > + ULONG CapsLock: 1; > + ULONG ScollLock: 1; > + ULONG NumLock: 1; > + ULONG Reserved: 21; > + } DUMMYSTRUCTNAME; > + ULONG ul; > + } DUMMYUNIONNAME; It looks like you accidentically used three space indentation here. > +} HIDP_KEYBOARD_MODIFIER_STATE, *PHIDP_KEYBOARD_MODIFIER_STATE; > + > +typedef BOOLEAN NTAPI (*PHIDP_INSERT_SCANCODES) (VOID *Context, CHAR *NewScanCodes, ULONG Length); For GCC it does not seem to matter, but usually the NTAPI should be inside of the brackets. > + > + > NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); > NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities); > NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); > @@ -144,6 +172,7 @@ NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS > NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); > ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData); > NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); > +NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, PHIDP_INSERT_SCANCODES InsertCodesProcedure, VOID *InsertCodesContext); > > #ifndef FACILITY_HID_ERROR_CODE > #define FACILITY_HID_ERROR_CODE 0x11 > > >

1 0

Re: [PATCH] wined3d: Add id for Broadwell Xeon E3 GPU
by Henri Verbeet 19 Sep '16

19 Sep '16

On 16 September 2016 at 15:54, Andrew Kanaber <akanaber(a)chiark.greenend.org.uk> wrote: > "Iris Pro Graphics P6300" on all the Xeon E3-1200v4 chips > (except the E3-1258L v4) This is missing a "Signed-off-by:" line, but seems fine otherwise.

1 0

wine-1.8.5-rc1 Available
by Michael Stefaniuc 17 Sep '16

17 Sep '16

Hello guys, I have pushed wine-1.8.5-rc1 (with tag) to https://github.com/mstefani/wine-stable https://static-winehq.rhcloud.com/stable/ By chance it has the same amount (66) of patches like wine-1.8.4-rc1. Nothing fancy in this release. Maybe noticeable is that I went over the fixed bugs in 1.9.[0-4] and cherry-picked some more from that era. For the release I would follow the same process: one week for feedback followed by another rc if needed with the final release 3-4 days later. And now the interesting parts from the ANNOUNCE file: What's new in this release (see below for details): - Various bug fixes. ---------------------------------------------------------------- Bugs fixed in 1.8.5 (total 59): 16971 Windows Movie Maker 2.x needs ole32.dll.StgOpenPropStg 19538 Microsoft Publisher 2007 and 2010 crash when opening documents/templates (TSF manager 'ITextStoreACPSink' must support QI with 'IID_ITextStoreACPServices') 20896 Use-after-free in DdeClientTransaction in user32 dde tests 23298 Windows utility 'relog.exe' crashes on unimplemented function 'pdh.dll.PdhGetLogFileTypeW' 24645 PDF Factory 3.x/4.x installer fails to install printer drivers (winspool.SetPrinterW lacks support for level 8, global default printer settings) 31693 CAPCOM games using gamepad start with axes X/Y pressed up/left 31913 EasyPal version August 6 2012 crashes on unimplemented function msvcp60.dll.??Dstd@@YA?AV?$complex@N@0@ABNABV10@@Z 32491 dbghelp doesn't support DW_FORM_flag_present 32936 SmartMusic 2012/2014 crashes on startup (Core Audio adapter 'PKEY_DeviceInterface_FriendlyName' property not supported) 33140 Photos opened in Nikon Capture NX 2.4 have inverted red and blue channel for displaying. 33398 Word / Excel 2010: crash when clicked (2nd or 3rd times) on a link 33457 An integer overflow @line 268 of dsa.c ? 34281 PlotSoft PDFill 10 fails on startup, reports 'No Fonts found under: C:\\windows\\Fonts' (at least one font name in registry must contain 'truetype' token) 34286 dinput doesn't report DIDOI_ASPECT* for joystick axes 34504 __unDName doesn't support function pointer with type "P8" 34507 __unDName doesn't support data type "$$B" 34870 Multiple games and applications crash on unimplemented function msvcr100.dll _crt_debugger_hook (ArchiCAD 16, Far Cry 4) 35286 Borderlands (Steam) crashes on unimplemented function msvcr90.dll._crt_debugger_hook 35824 UltraISO 'ISODrive.sys' crashes in entry point (SCM doesn't start SERVICE_FILE_SYSTEM_DRIVER type services with winedevice hosting process) 35892 sdb2xml (.NET 2.0 app) crashes on unimplemented function apphelp.dll.SdbGetAppPatchDir 36625 can't set text background color in richedit 38276 IsDialogMessage(NULL,...) must always return FALSE 38310 Trackbar control (msctls_trackbar32) does not send WM_CTLCOLORSTATIC as it does in Windows 39034 SuperTux 0.3.5a crashes on startup 39074 IXMLDOMDocument::cloneNode crash 39181 "When Monster Strikes", "The Vanishing of Ethan Carter Redux" require msvcr120.dll._set_FMA3_enable 39195 msvcr120.dll.nextafter is needed by Sonkwo 39475 PhysX 9.15.0428 installer does not run ('advapi32.RegOpenCurrentUser' must return a real handle instead of 'HKEY_CURRENT_USER' for user root key) 39677 Zararadio crashes when it has to change from a playlist to another. 39744 No sound with winepulse.drv in multiple applications when PulseAudio fails to allocate full buffer 39792 Saturn PCB Design Toolkit 6.86 fails to load, reporting missing 'SHCore.dll' dependency (import descriptors with empty thunk list must be ignored) 39823 "fixme:nls:CompareStringEx semi-stub behavor for flag(s) 0x10000000" appears thousands of times in terminal when running the Lego Mindstorms EV3 software 39852 3DMark03: Mother Nature test: waterfall has no transparency if AllwaysOffScreen=disabled 39861 Windows utility 'relog.exe' crashes on unimplemented function 'pdh.dll.PdhBindInputDataSourceW' 39874 Alien Shooter crashes often with access violation 39892 UFile crashes with runtime error when rendering certain pages 39950 Cabal II can't be opened, needs msvcp100.dll.?lowest@?$numeric_limits@M@std@@SAMXZ 40034 Linksys usb wireless adapter installer needs wlanapi.dll.WlanEnumInterfaces 40035 VMware shared folders network provider fails loading in MPR 40411 Regedit.exe /e only exports HKLM 40580 TASCAM US-16x08 soundcard controller crashes 40734 Unreal Tournament 3 doesn't quit properly when Pulseaudio is used 40757 GOG Galaxy crashes with unimplemented function api-ms-win-crt-stdio-l1-1-0.dll.__stdio_common_vsnwprintf_s 40758 GOG Galaxy crashes with unimplemented function api-ms-win-crt-runtime-l1-1-0.dll._get_wide_winmain_command_line 40815 comctl32: Leftmost position of trackbar not selectable with mouse, slider initial position wrong 40882 Nvidia GT 740M is not correctly recognized 40905 Multiple applications need api-ms-win-crt-runtime-l1-1-0.dll._get_narrow_winmain_command_line (PCSX2 1.4.0, Battle.Net Launcher) 41010 TVS_TRACKSELECT uses wrong hittest region 41015 comctl32/treeview: Alt-Up/Down keyboard shortcuts don't work 41040 VariantChangeTypeEx lead to error when casting IUnknown(nil) -> IDispatch 41044 Age of Mythology: Extended Edition needs api-ms-win-crt-stdio-l1-1-0.dll.__stdio_common_vswprintf_s 41066 Unhandled page fault in RtlWow64EnableFsRedirectionEx when passed bad *old_value pointer 41079 Hauppauge Capture crashes on unimplemented function cfgmgr32.dll.CM_Get_Version 41094 comctl32/treeview: TVS_FULLROWSELECT style does not work 41103 Fails to parse Extended Properties since it has quotes around its value. 41109 8-bit Armies launches with a very small window 41111 CPU-Z driver needs hal.dll.WRITE_PORT_UCHAR 41165 MiTeC System Information X needs unimplemented function wlanapi.dll.WlanCloseHandle 41182 Don't export QT_QPA_PLATFORM ---------------------------------------------------------------- Changes since 1.8.4: Akihiro Sagawa (1): comctl32: Prevent invalid focus change notifications from LVS_OWNERDATA lists. Alex Henrie (2): ole32: Implement StgCreatePropStg. ole32: Implement StgOpenPropStg. Alistair Leslie-Hughes (1): comctl32/trackbar: Use WM_CTLCOLORSTATIC when painting background. Andrew Church (1): dinput: Report DIDOI_ASPECTPOSITION flag for axes objects. Andrew Eikum (3): winepulse.drv: Buffer data locally when needed. winepulse.drv: Don't hold PA-owned buffer between capture callbacks. mmdevapi: Fix some DEVPKEY definitions. Andrey Melnikov (1): gdi32: Handle NULL filename in GetICMProfileA(). André Hentschel (3): winspool: Implement SetPrinterW for level 8. hal: Add WRITE_PORT_UCHAR stub. msvcrt: Don't continue on demangle failure (Coverity). Austin English (6): pdh: Add PdhGetLogFileTypeA/W stubs. pdh: Add PdhBindInputDataSourceA/W stubs. kernel32: Make CompareStringEx semi-stub flag FIXME only show once. wlanapi: Add a stub for WlanEnumInterfaces. wlanapi: Add WlanCloseHandle() stub. apphelp: Add SdbGetAppPatchDir stub. Benjamin Hodgetts (1): wined3d: Add Nvidia 1XXX range to detection list. Bruno Jesus (1): dinput: Use the correct index to remap the axis. Daniel Lehman (1): ucrtbase: Add some wide functions called on startup. Jacek Caban (2): mshtml: Fixed OnStopBinding if it's called called after we aborted document binding. mshtml: Properly convert VT_NULL to string in get_elem_attr_value_by_dispid. Jeremy Audiger (1): wined3d: Add Nvidia GT 740M to the GPU list. Joerg Schiermeier (1): loader/wine.inf: Correct wrong symlink. Józef Kucia (2): user32/tests: Add more tests for setting window styles. user32: Prevent resetting WS_MINIMIZE through SetWindowLong. Kenneth Haley (1): v4 resend: Riched20: allow setting background text color. Matt Robinson (1): ntdll: Catch page fault in RtlWow64EnableFsRedirectionEx. Nikolay Sivov (21): gdi32: Keep font tables tags defined in one place. gdi32: Support special 'ttcf' tag in GetFontData(). oleaut32: Fix return value when converting from NULL interface pointers. ucrtbase: Added __stdio_common_vsnwprintf_s(). ucrtbase: Added __stdio_common_vswprintf_s(). comctl32/treeview: Handle WM_SYSKEYDOWN. comctl32/treeview: Set hot item when hovering over item, not entire row. ucrtbase: Implement _get_narrow_winmain_command_line/_get_wide_winmain_command_line. comctl32/trackbar: Update thumb on range change. comctl32/trackbar: Fix mouse position to thumb position conversion rounding. dbghelp: Recognize DW_FORM_flag_present. oledb32: Support quoted values in initialisation strings. setupapi: Added CM_Get_Version(). user32: Handle invalid dialog handles in IsDialogMessage(). gdi32: Append "TrueType" suffix to registry key names. advapi32: Make RegOpenCurrentUser() return real key handles for current SID. msxml3: Fix cloneNode() for document nodes. comctl32/treeview: Fix hot-tracking with TVS_FULLROWSELECT. comctl32/treeview: Fill full row for TVS_FULLROWSELECT style. msctf: Make ITextStoreACPSink a part of context object. msctf: Added stub ITextStoreACPServices support for context ITextStoreACPSink. Pierre Schweitzer (1): mpr: Add support for REG_EXPAND_SZ for providers path. Piotr Caban (7): msvcp100: Add numeric_limits<*>::lowest implementation. msvcp60: Export more complex numbers operators. msvcr120: Add _set_FMA3_enable stub. msvcrt: Add support for member function pointers demangling in unDName function. msvcrt: Add support for $$B datatype description format in unDName. msvcp120: Add vtordisp field to classes with virtual base. msvcrt: Add _crt_debugger_hook implementation. Sebastian Lackner (3): kernel32: Do not inherit QT_* environment variables to Windows environment. ntdll: Skip unused import descriptors when loading libraries. services: Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice. Stefan Dösinger (2): d3d8: Don't validate 2D texture lock coordinates. wined3d: Rotate through swapchain buffers. Thomas Faller (1): dde: Fix use-after-free. Xiaoshan Sun (1): comctl32/dsa: Handle overflow in DSA_InsertItem(). YongHao Hu (1): msvcr120: Enable MSVCRT__nextafterf when _MSVCR_VER>=120. -- Michael Stefaniuc mstefani(a)winehq.org

2 1

Re: user32/tests: Add space for the mask data to prevent failures on Win 8 and 10.
by Marvin 16 Sep '16

16 Sep '16

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=25848 Your paranoid android. === w864 (32 bit cursoricon) === cursoricon.c:2625: Test failed: LoadImage() failed with 0. cursoricon.c:2625: Test failed: LoadImage() failed with 0. === w1064 (32 bit cursoricon) === cursoricon.c:2625: Test failed: LoadImage() failed with 0. cursoricon.c:2625: Test failed: LoadImage() failed with 0. === w1064 (64 bit cursoricon) === cursoricon.c:2625: Test failed: LoadImage() failed with 0. cursoricon.c:2625: Test failed: LoadImage() failed with 0.

2 1

Re: [6/6] windowscodecs: Fix 32bppGrayFloat to 8bppGray conversion.
by Dmitry Timoshkov 16 Sep '16

16 Sep '16

Hi Vincent, Vincent Povirk <madewokherd(a)gmail.com> wrote: > From: Vincent Povirk <vincent(a)codeweavers.com> > > Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> I'm not opposed that you're taking my patches from the staging tree, but in this particular case it's not really clear that the bug with converting 32bppGrayFloat to 8bppGray was debugged and found by somebody else. Adding "Spotted by ..." would be enough and appropriate, since for some reason you didn't like the version of the patch in staging and decided to fix the bug in a different way. -- Dmitry.

2 2

Re: libwine: Do not compare strings "ab-c" and a-bc" as equal.
by Marvin 16 Sep '16

16 Sep '16

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=25415 Your paranoid android. === w1064 (32 bit locale) === locale.c:2562: Test failed: LCMapStringEx should fail with bad locale name locale.c:2563: Test failed: unexpected error code -559038737 locale.c:2654: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4384: Test failed: IsValidLocaleName should have failed locale.c:4386: Test failed: IsValidLocaleName should have failed locale.c:4769: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4771: Test failed: For id 7, Expected IVC, got '' === w1064 (64 bit locale) === locale.c:2562: Test failed: LCMapStringEx should fail with bad locale name locale.c:2563: Test failed: unexpected error code -559038737 locale.c:2654: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4384: Test failed: IsValidLocaleName should have failed locale.c:4386: Test failed: IsValidLocaleName should have failed locale.c:4769: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4771: Test failed: For id 7, Expected IVC, got ''

2 1

Re: [PATCH v2] mpr: Implement connected resources enumeration.
by Alexandre Julliard 15 Sep '16

15 Sep '16

Pierre Schweitzer <pierre(a)reactos.org> writes: > @@ -97,7 +99,11 @@ typedef struct _WNetEnumerator > DWORD dwScope; > DWORD dwType; > DWORD dwUsage; > - LPNETRESOURCEW lpNet; > + union > + { > + NETRESOURCEW* net; > + HANDLE* handles; > + }; Please don't use anonymous unions. > @@ -1211,6 +1240,126 @@ static DWORD _enumerateContextW(PWNetEnumerator enumerator, LPDWORD lpcCount, > return ret; > } > > +static DWORD _copyStringToEnumW(WCHAR* source, DWORD* left, void** end) > +{ > + DWORD len; > + void* local = *end; > + > + len = strlenW(source) + 1; > + len *= sizeof(WCHAR); > + if (*left < len) > + return WN_MORE_DATA; > + > + local = (PVOID)((ULONG_PTR)local - len); Please try to use proper pointer arithmetic instead of casting to integer types. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] hid: Stub HidP_TranslateUsagesToI8042ScanCodes
by Sebastian Lackner 15 Sep '16

15 Sep '16

On 14.09.2016 14:05, Aric Stewart wrote: > Resolves Bug 39447 > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/hid/hid.spec | 2 +- > dlls/hid/hidp.c | 9 +++++++++ > include/ddk/hidpi.h | 29 +++++++++++++++++++++++++++++ > 3 files changed, 39 insertions(+), 1 deletion(-) > > > > 0001-hid-Stub-HidP_TranslateUsagesToI8042ScanCodes.txt > > > diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec > index 4c5e505..2131af2 100644 > --- a/dlls/hid/hid.spec > +++ b/dlls/hid/hid.spec > @@ -39,6 +39,6 @@ > @ stub HidP_SetUsageValue > @ stub HidP_SetUsageValueArray > @ stub HidP_SetUsages > -@ stub HidP_TranslateUsagesToI8042ScanCodes > +@ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) > @ stub HidP_UnsetUsages > @ stub HidP_UsageListDifference > diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c > index 3d7a12e..f42482a 100644 > --- a/dlls/hid/hidp.c > +++ b/dlls/hid/hidp.c > @@ -23,6 +23,7 @@ > #include <stdarg.h> > > #define NONAMELESSUNION > +#include "ntstatus.h" > #define WIN32_NO_STATUS > #include "windef.h" > #include "winbase.h" > @@ -519,3 +520,11 @@ ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePag > } > return count; > } > + > +NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, PHIDP_INSERT_SCANCODES InsertCodesProcedure, VOID *InsertCodesContext) > +{ > + ERR("stub: %p %i %i %p, %p, %p\n", ChangedUsageList, UsageListLength, > + KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); Shouldn't this be a FIXME? And why are there only commas between the last three arguments? > + > + return STATUS_NOT_IMPLEMENTED; > +} > diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h > index 4cfac61..853cbac 100644 > --- a/include/ddk/hidpi.h > +++ b/include/ddk/hidpi.h > @@ -136,6 +136,34 @@ typedef struct _HIDP_CAPS > USHORT NumberFeatureDataIndices; > } HIDP_CAPS, *PHIDP_CAPS; > > +typedef enum _HIDP_KEYBOARD_DIRECTION { > + HidP_Keyboard_Break, > + HidP_Keyboard_Make > +} HIDP_KEYBOARD_DIRECTION; > + > +typedef struct _HIDP_KEYBOARD_MODIFIER_STATE { > + union { > + struct { > + ULONG LeftControl: 1; > + ULONG LeftShift: 1; > + ULONG LeftAlt: 1; > + ULONG LeftGUI: 1; > + ULONG RightControl: 1; > + ULONG RightShift: 1; > + ULONG RightAlt: 1; > + ULONG RigthGUI: 1; > + ULONG CapsLock: 1; > + ULONG ScollLock: 1; > + ULONG NumLock: 1; > + ULONG Reserved: 21; > + } DUMMYSTRUCTNAME; > + ULONG ul; > + } DUMMYUNIONNAME; > +} HIDP_KEYBOARD_MODIFIER_STATE, *PHIDP_KEYBOARD_MODIFIER_STATE; > + > +typedef BOOLEAN (*PHIDP_INSERT_SCANCODES) (VOID *Context, CHAR *NewScanCodes, ULONG Length); Are you sure that this isn't a STDCALL callback? > + > + > NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); > NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities); > NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); > @@ -144,6 +172,7 @@ NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS > NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); > ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData); > NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); > +NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, PHIDP_INSERT_SCANCODES InsertCodesProcedure, VOID *InsertCodesContext); > > #ifndef FACILITY_HID_ERROR_CODE > #define FACILITY_HID_ERROR_CODE 0x11 > > >

1 0

Re: [PATCH v4] ntoskrnl.exe: Send PnP and Power IRPs to plug and play devices
by Sebastian Lackner 15 Sep '16

15 Sep '16

On 14.09.2016 20:58, Aric Stewart wrote: > v2: use same helper function as get_device_id > Suggestions from Sebastian Lackner > v3: shift code to ntoskrnl.c > v4: Suggestions from Sebastian Lackner > > The drivers AddDevice function will be well behaved and call > IoAttachDeviceToDeviceStack. The Plug and Play manager will then > proceed to call IRP_MN_START_DEVICE on the top device of the device > stack. Then a IRP_MJ_POWER/IRP_MN_SET_POWER to PowerDeviceD0. > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/ntoskrnl.exe/ntoskrnl.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > > > v4-0001-ntoskrnl.exe-Send-PnP-and-Power-IRPs-to-plug-and-pl.txt > > > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c > index aebb3de..6c4c984 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.c > +++ b/dlls/ntoskrnl.exe/ntoskrnl.c > @@ -2927,6 +2927,42 @@ static BOOL get_driver_for_id( const WCHAR *id, WCHAR *driver ) > } > > > +static NTSTATUS send_pnp_irp( DEVICE_OBJECT *device, UCHAR minor ) > +{ > + IO_STACK_LOCATION *irpsp; > + IO_STATUS_BLOCK irp_status; Did you forget to declare irp here and in the function below? > + > + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status ))) > + return STATUS_NO_MEMORY; > + > + irpsp = IoGetNextIrpStackLocation( irp ); > + irpsp->MinorFunction = minor; > + > + irpsp->Parameters.StartDevice.AllocatedResources = NULL; > + irpsp->Parameters.StartDevice.AllocatedResourcesTranslated = NULL; > + > + return send_device_irp( device, irp, NULL ); > +} > + > + > +static NTSTATUS send_power_irp( DEVICE_OBJECT *device, DEVICE_POWER_STATE power ) > +{ > + IO_STATUS_BLOCK irp_status; > + IO_STACK_LOCATION *irpsp; > + > + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_POWER, device, NULL, 0, NULL, NULL, &irp_status ))) > + return STATUS_NO_MEMORY; > + > + irpsp = IoGetNextIrpStackLocation( irp ); > + irpsp->MinorFunction = IRP_MN_SET_POWER; > + > + irpsp->Parameters.Power.Type = DevicePowerState; > + irpsp->Parameters.Power.State.DeviceState = power; > + > + return send_device_irp( device, irp, NULL ); > +} > + > + > static void handle_bus_relations( DEVICE_OBJECT *device ) > { > static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; > @@ -2990,7 +3026,13 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) > ObDereferenceObject( driver_obj ); > > if (status != STATUS_SUCCESS) > + { > ERR_(plugplay)( "AddDevice failed for driver %s\n", debugstr_w(driver) ); > + return; > + } > + > + send_pnp_irp( device, IRP_MN_START_DEVICE ); > + send_power_irp( device, PowerDeviceD0 ); > } > > > > >

1 0

Re: [PATCH v2] ntoskrnl.exe: Implement DevicePropertyEnumeratorName for IoGetDeviceProperty
by Sebastian Lackner 15 Sep '16

15 Sep '16

On 14.09.2016 18:06, Aric Stewart wrote: > v2: Cleanup and resend > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/ntoskrnl.exe/ntoskrnl.c | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > > > v2-0001-ntoskrnl.exe-Implement-DevicePropertyEnumeratorName.txt > > > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c > index aebb3de..d1b0ee9 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.c > +++ b/dlls/ntoskrnl.exe/ntoskrnl.c > @@ -94,6 +94,8 @@ struct wine_driver > DRIVER_EXTENSION driver_extension; > }; > > +static NTSTATUS get_device_id( DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCHAR **id ); > + > static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) > { > const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); > @@ -1132,6 +1134,34 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP > property_buffer, result_length ); > switch (device_property) > { > + case DevicePropertyEnumeratorName: > + { > + DWORD len; > + WCHAR *id, *ptr; > + status = get_device_id( device, BusQueryInstanceID, &id ); > + if (status != STATUS_SUCCESS) > + { > + ERR( "Failed to get device id\n" ); > + break; > + } > + struprW( id ); > + TRACE( "Device ID %s\n",debugstr_w( id ) ); I am not sure if the TRACE is very useful here. Its not the value returned by get_device_id() and not the result returned by this function. Does it really make sense to dump this intermediate value here? > + ptr = strchrW( id, '\\' ); > + if (ptr) > + len = (ptr - id); It would be easier to replace the '\\' with a null character, and then always use strlenW() to get the length. This also allows to simplify the code below. > + else > + len = strlenW( id ); > + *result_length = sizeof( WCHAR ) * (len + 1); > + if (buffer_length < *result_length) > + { > + status = STATUS_BUFFER_TOO_SMALL; You are leaking the id buffer here and in the return path below. > + break; > + } > + > + lstrcpynW( property_buffer, id, len + 1 ); > + ((WCHAR*)property_buffer)[len] = 0; When the string is properly null terminated you could just use memcpy() here and copy *result_length bytes. > + break; > + } > case DevicePropertyPhysicalDeviceObjectName: > { > ULONG used_len, len = buffer_length + sizeof(OBJECT_NAME_INFORMATION); > > >

1 0

Re: [1/4] gdiplus: Add FIXME for EMF records we need to implement.
by Vincent Povirk 14 Sep '16

14 Sep '16

Please don't commit this for now. I did some testing today that suggests GdipPlayMetafileRecord is the wrong place to handle this.

1 0

Re: ucrtbase: Add __std_type_info_hash implementation
by Huw Davies 14 Sep '16

14 Sep '16

Hi Piotr, On Wed, Sep 14, 2016 at 03:23:04PM +0200, Piotr Caban wrote: > +/****************************************************************** > + * __std_type_info_hash (UCRTBASE.@) > + * > + * TODO: 64-bit version of the function uses different constatns typo: 'constatns'. Huw.

1 0

Re: winmm/tests: Remove a test that can crash on Win 8 and 10.
by Marvin 14 Sep '16

14 Sep '16

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=25794 Your paranoid android. === w8 (32 bit mci) === mci.c:1117: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w864 (32 bit mci) === mci.c:1117: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w1064 (32 bit mci) === mci.c:1117: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w864 (64 bit mci) === mci.c:1117: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w1064 (64 bit mci) === mci.c:1117: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close)

2 1

Re: [PATCH] Moved wined3dformat <-> dxgi_format conversion functions into wined3d
by Henri Verbeet 13 Sep '16

13 Sep '16

On 10 September 2016 at 00:18, Fabian Maurer <dark.shadow4(a)web.de> wrote: > This change is a measure of code-deduplication and to make these functions reusable in other parts. > I'm not sure how valuable that really is, but wined3d shouldn't depend on dxgi or its headers. I may be open to having these as inline helpers somewhere under include/wine/, but right now the two copies of this don't strike me as a big problem.

4 9

Re: [PATCH v8] winebus.sys: Build initial hidraw device set
by Sebastian Lackner 13 Sep '16

13 Sep '16

On 12.09.2016 16:01, Aric Stewart wrote: > v2: style changes > v4: changes required by previous updates > v6: removed disableing busses > v7: Rebased, suggestions from Sebastian Lackner > v8: More suggestions from Sebastian Lackner Because of the size of the patch I've decided to split it. I've already sent an improved version of the first part including my signoff. An improved version of the second part is already in my stash, but first I would like to discuss a few remaining things. > > Includes implementation of common HID_PNP_CreateDevice > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/winebus.sys/Makefile.in | 4 +- > dlls/winebus.sys/bus.h | 1 + > dlls/winebus.sys/bus_udev.c | 135 ++++++++++++++++++++++++++++++++++++++++ > dlls/winebus.sys/main.c | 144 +++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 283 insertions(+), 1 deletion(-) > > > > v8-0001-winebus.sys-Build-initial-hidraw-device-set.txt > > > diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in > index 99ff4d2..9d3a0c2 100644 > --- a/dlls/winebus.sys/Makefile.in > +++ b/dlls/winebus.sys/Makefile.in > @@ -1,5 +1,7 @@ > MODULE = winebus.sys > -IMPORTS = ntoskrnl > +IMPORTS = ntoskrnl setupapi > +EXTRALIBS = $(UDEV_LIBS) > +EXTRAINCL = $(UDEV_CFLAGS) > EXTRADLLFLAGS = -Wb,--subsystem,native > > C_SRCS = \ > diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h > index 3d53a46..47d146e 100644 > --- a/dlls/winebus.sys/bus.h > +++ b/dlls/winebus.sys/bus.h > @@ -21,3 +21,4 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry > > /* HID Plug and Play Bus */ > NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; > +DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, LPVOID native, WORD vid, WORD pid, DWORD version, DWORD uid, const WCHAR *serial, BOOL is_gamepad, const GUID *class) DECLSPEC_HIDDEN; > diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c > index f040e60..792422c 100644 > --- a/dlls/winebus.sys/bus_udev.c > +++ b/dlls/winebus.sys/bus_udev.c > @@ -20,6 +20,19 @@ > > #include "config.h" > #include <stdarg.h> > +#include <unistd.h> > +#include <fcntl.h> > +#include <stdlib.h> > + > +#ifdef HAVE_SYS_IOCTL_H > +# include <sys/ioctl.h> > +#endif > + > +#ifdef HAVE_LIBUDEV_H > +# include <libudev.h> > +#endif > + > +#include <errno.h> > > #define NONAMELESSUNION > > @@ -27,6 +40,7 @@ > #define WIN32_NO_STATUS > #include "windef.h" > #include "winbase.h" > +#include "winnls.h" > #include "winternl.h" > #include "ddk/wdm.h" > #include "wine/debug.h" > @@ -39,6 +53,116 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); > > static DRIVER_OBJECT *udev_driver_obj = NULL; > > +#include "initguid.h" > +DEFINE_GUID(GUID_DEVCLASS_HIDRAW, 0x3def44ad,0x242e,0x46e5,0x82,0x6d,0x70,0x72,0x13,0xf3,0xaa,0x81); I haven't found this definition in header files, so I assume this is Wine specific, right? Does Windows have an equivalent which we could use here? > + > +static const WCHAR hidraw_busidW[] = {'H','I','D','R','A','W',0}; > + > +/* udev based PNP support */ > +static struct udev *udev = NULL; > + > +static int try_add_device(struct udev_device *dev) > +{ > + const char *devnode; > + int fd; > + DWORD vid=0, pid=0, uid=0, version=0; > + WCHAR serial[255] = {'0','0','0','0','0',0}; Here you use a default serial with 5 digits "0", but in bus_create_hid_device() only 4 digits. Which of both makes more sense? > + DEVICE_OBJECT *device = NULL; > + struct udev_device *usbdev; > + const char *subsystem; > + > + devnode = udev_device_get_devnode(dev); > + if (!devnode || ((fd = open(devnode, O_RDWR)) == -1)) > + { > + WARN("Unable to open udev device %s\n", debugstr_a(devnode)); > + return 0; > + } > + close(fd); > + > + TRACE("Got udev device %s\n", debugstr_a(devnode)); > + > + usbdev = udev_device_get_parent_with_subsystem_devtype(dev, "usb", > + "usb_device"); > + if (usbdev) > + { > + char *endptr; > + const char *attr; > + attr = udev_device_get_sysattr_value(usbdev, "idVendor"); > + if (attr) > + vid = strtol(attr, &endptr, 16); > + else > + WARN("Could not get idVendor from usb device\n"); > + attr = udev_device_get_sysattr_value(usbdev, "idProduct"); > + if (attr) > + pid = strtol(attr, &endptr, 16); > + else > + WARN("Could not get idProduct from usb device\n"); > + attr = udev_device_get_sysattr_value(usbdev, "version"); > + if (attr) > + version = strtol(attr, &endptr, 10); > + else > + WARN("Could not get version from usb device\n"); > + attr = udev_device_get_sysattr_value(usbdev, "serial"); > + if (attr) > + MultiByteToWideChar(CP_UNIXCP, 0, attr, -1, serial, 255); > + } > + else > + WARN("Could not get underlying usb device to query VID, PID, Version and Serial\n"); > + > + subsystem = udev_device_get_subsystem(dev); > + > + if (strcmp(subsystem, "hidraw") == 0) > + device = bus_create_hid_device(udev_driver_obj, hidraw_busidW, dev, vid, pid, version, uid, serial, FALSE, &GUID_DEVCLASS_HIDRAW); > + else > + { > + ERR("Device has unknown subsystem %s\n", subsystem); > + return 0; > + } > + > + if (!device) > + { > + ERR("Failed to create device\n"); > + return 0; > + } > + > + return 1; > +} > + > +static void build_initial_deviceset( void ) > +{ > + struct udev_enumerate *enumerate; > + struct udev_list_entry *udevices, *dev_list_entry; > + > + enumerate = udev_enumerate_new(udev); > + if (!enumerate) > + { > + WARN("Unable to start UDEV enumeration\n"); > + return; > + } > + > + if (udev_enumerate_add_match_subsystem(enumerate, "hidraw") != 0) > + WARN("Failed to add subsystem 'hidraw' to enumeration\n"); > + > + if (udev_enumerate_scan_devices(enumerate) != 0) > + WARN("Enumeration scan failed\n"); > + > + udevices = udev_enumerate_get_list_entry(enumerate); > + > + udev_list_entry_foreach(dev_list_entry, udevices) { > + const char *path; > + struct udev_device *dev; > + > + path = udev_list_entry_get_name(dev_list_entry); > + dev = udev_device_new_from_syspath(udev, path); > + if (!dev) > + WARN("Unable to create device %s\n", debugstr_a(path)); > + else if (!try_add_device(dev)) > + udev_device_unref(dev); > + } > + > + udev_enumerate_unref(enumerate); > +} > + > NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) > { > TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); > @@ -46,6 +170,17 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry > udev_driver_obj = driver; > driver->MajorFunction[IRP_MJ_PNP] = common_pnp_dispatch; > > + udev = udev_new(); > + > + if (!udev) > + { > + ERR("Can't create udev\n"); > + return STATUS_UNSUCCESSFUL; > + } > + > + /* PNP Bus initialization */ > + build_initial_deviceset(); > + > return STATUS_SUCCESS; > } > > diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c > index 43de25a..f06d5c3 100644 > --- a/dlls/winebus.sys/main.c > +++ b/dlls/winebus.sys/main.c > @@ -18,6 +18,7 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > > +#include "config.h" > #include <stdarg.h> > > #define NONAMELESSUNION > @@ -26,14 +27,157 @@ > #define WIN32_NO_STATUS > #include "windef.h" > #include "winbase.h" > +#include "winuser.h" > #include "winternl.h" > +#include "winreg.h" > +#include "setupapi.h" > +#include "cfgmgr32.h" > #include "ddk/wdm.h" > #include "wine/debug.h" > +#include "wine/unicode.h" > +#include "wine/list.h" > > #include "bus.h" > > WINE_DEFAULT_DEBUG_CHANNEL(plugplay); > > +static const WCHAR hwidfmtW[] = {'%','s','\\','V','i','d','_','%','0','4','x','&','P','i','d','_','%','0','4','x','&','%','s','\\','%','i','&','%','s','&','%','x',0}; > +static const WCHAR im_fmtW[] = {'I','M','_','%','i',0}; > +static const WCHAR ig_fmtW[] = {'I','G','_','%','i',0}; > + > +typedef struct _pnp_device { > + struct list entry; > + > + DEVICE_OBJECT *device; > +} pnp_device; > + > +typedef struct { > + void *native; /* Must be the first member of the structure */ So far I do not see any code which depends on the fact that native is the first struct member. Is this comment still valid? If you plan to add code which depends on this in following patches, I would suggest to evaluate if there isn't a better solution (like moving the structs to the header file for example). > + > + DWORD vid, pid, version, uid, index; > + BOOL is_gamepad; > + WCHAR serial[255]; > + WCHAR const *busidW; /* Expected to be a static constant */ > +} extension; > + > +static CRITICAL_SECTION device_list_cs; > +static CRITICAL_SECTION_DEBUG critsect_debug = > +{ > + 0, 0, &device_list_cs, > + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, > + 0, 0, { (DWORD_PTR)(__FILE__ ": device_list_cs") } > +}; > +static CRITICAL_SECTION device_list_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; > + > +static struct list pnp_devset = LIST_INIT(pnp_devset); > + > +static void add_device(DEVICE_OBJECT *device) > +{ > + pnp_device *pnp_dev; > + > + pnp_dev = HeapAlloc(GetProcessHeap(), 0, sizeof(*pnp_dev)); > + pnp_dev->device = device; > + EnterCriticalSection(&device_list_cs); > + list_add_tail(&pnp_devset, &pnp_dev->entry); > + LeaveCriticalSection(&device_list_cs); > +} > + > +static INT get_vidpid_index(DEVICE_OBJECT *device) > +{ > + pnp_device *ptr; > + int index = 1; > + extension *ext = (extension*)device->DeviceExtension; > + DWORD vidpid = MAKELONG(ext->vid, ext->pid); > + > + EnterCriticalSection(&device_list_cs); > + LIST_FOR_EACH_ENTRY(ptr, &pnp_devset, pnp_device, entry) > + { > + DWORD device_vidpid; > + > + ext = (extension*)ptr->device->DeviceExtension; > + device_vidpid = MAKELONG(ext->vid, ext->pid); > + > + if (device_vidpid == vidpid) > + index = max(ext->index + 1, index); > + } > + LeaveCriticalSection(&device_list_cs); As mentioned on IRC there is a risk of race-conditions when two threads try to add a device with the same vid/pid. I've already fixed that in my local version, I'm just mentioning it for completeness. > + return index; > +} > + > +static int get_instance_id(DEVICE_OBJECT *device, WCHAR *id) > +{ > + WCHAR index_string[256]; > + extension *ext = (extension*)device->DeviceExtension; > + > + if (ext->is_gamepad) > + sprintfW(index_string, ig_fmtW, ext->index); > + else > + sprintfW(index_string, im_fmtW, ext->index); > + > + return sprintfW(id, hwidfmtW, ext->busidW, ext->vid, ext->pid, index_string, ext->version, ext->serial, ext->uid); Wouldn't it be better to put together the string at once, without intermediate results? > +} > + > +DEVICE_OBJECT* bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, void *native, WORD vid, WORD pid, DWORD version, DWORD uid, const WCHAR *serial, BOOL is_gamepad, const GUID *class) > +{ > + NTSTATUS status; > + DEVICE_OBJECT *device; > + static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e', > + '\\','%','s','#','%','p',0}; > + static const WCHAR zero_serialW[]= {'0','0','0','0',0}; > + WCHAR dev_name[255]; > + UNICODE_STRING nameW; > + HDEVINFO devinfo; > + extension *ext; > + > + TRACE("Create HID bus device for native device %p\n", native); > + > + sprintfW(dev_name, device_name_fmtW, busidW, native); > + RtlInitUnicodeString(&nameW, dev_name); > + status = IoCreateDevice(driver, sizeof(extension), &nameW, 0, 0, FALSE, &device); > + if (status) > + { > + FIXME( "failed to create device error %x\n", status ); > + return NULL; > + } > + > + ext = (extension*)device->DeviceExtension; > + ext->native = native; > + ext->vid = vid; > + ext->pid = pid; > + ext->uid = uid; > + ext->is_gamepad = is_gamepad; > + ext->version = version; > + ext->busidW = busidW; > + ext->index = get_vidpid_index(device); > + if (serial) > + lstrcpyW(ext->serial, serial); > + else > + lstrcpyW(ext->serial, zero_serialW); > + > + add_device(device); > + > + devinfo = SetupDiGetClassDevsW(class, NULL, NULL, DIGCF_DEVICEINTERFACE); > + if (!devinfo) > + FIXME("Failed to get ClassDevs: %x\n", GetLastError()); > + else > + { > + SP_DEVINFO_DATA Data; > + WCHAR id[MAX_DEVICE_ID_LEN]; > + > + get_instance_id(device, id); > + Data.cbSize = sizeof(Data); > + if (!SetupDiCreateDeviceInfoW(devinfo, id, class, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data)) > + FIXME("Failed to create device info: %x\n", GetLastError()); > + else if (!SetupDiRegisterDeviceInfo(devinfo, &Data, 0, NULL, NULL, NULL )) > + FIXME("Failed to Register Device Info: %x\n", GetLastError()); > + SetupDiDestroyDeviceInfoList(devinfo); > + } > + > + IoInvalidateDeviceRelations(device, BusRelations); > + > + return device; > +} > + > NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) > { > NTSTATUS status = irp->IoStatus.u.Status; > > >

2 1

Re: winmm/tests: Add a small Sleep() to prevent a notification test from failing.
by Marvin 13 Sep '16

13 Sep '16

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=25773 Your paranoid android. === w864 (32 bit mci) === mci: unhandled exception c0000005 at 77479E80 === w1064 (32 bit mci) === mci: unhandled exception c0000005 at 7698851A

2 1

Re: [PATCH] mpr: Implement connected resources enumeration.
by Hugh McMaster 13 Sep '16

13 Sep '16

Hi Pierre, Thanks for working on this. Some comments below. Hugh On Tuesday, 13 September 2016 5:53 AM, Pierre Schweitzer wrote: > @@ -73,6 +74,7 @@ typedef struct _WNetProviderTable > #define WNET_ENUMERATOR_TYPE_GLOBAL 1 > #define WNET_ENUMERATOR_TYPE_PROVIDER 2 > #define WNET_ENUMERATOR_TYPE_CONTEXT 3 >+#define WNET_ENUMERATOR_TYPE_CONNECTED 4 Please align all of the #defines using two or four spaces after the definition. > - LPNETRESOURCEW lpNet; > + union > + { > + NETRESOURCEW * net; > + HANDLE * handles; > + }; We prefer the * to sit directly adjacent to the variable name, so NETRESOURCEW *net (i.e. no space before the variable name). > +static PWNetEnumerator _createConnectedEnumerator(DWORD dwScope, DWORD dwType, > + DWORD dwUsage) > +{ > + PWNetEnumerator ret = HeapAlloc(GetProcessHeap(), > + HEAP_ZERO_MEMORY, sizeof(WNetEnumerator)); These lines do not need to be split. > +#define _copyStringToEnumW(s) \ > + len = strlenW(buffer[i].s) + 1; \ > + len *= sizeof(WCHAR); \ > + if (left < len) \ > + { \ > + ret = WN_MORE_DATA; \ > + break; \ > + } \ > + end = (PVOID)((ULONG_PTR)end - len); \ > + curr->s = end; \ > + memcpy(end, buffer[i].s, len); \ > + left -= len; This would be better understood as a helper function. > +static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, DWORD * user_count, > + VOID * user_buffer, DWORD * user_size) Please fix the * position. Also, please align the second line of arguments beneath PWNetEnumerator. 'VOID' should be 'void'. > +{ > + DWORD ret, index, count, size, i, len, left; > + PVOID end; > + LPNETRESOURCEW curr, buffer; > + PHANDLE handles; Avoid LPnnn and Pnnn syntax. Use void *, NETRESOURCEW * and HANDLE * instead. This mistake happens later on in your patch too. > + if (!user_count) > + return WN_BAD_POINTER; > + if (!user_buffer) > + return WN_BAD_POINTER; > + if (!user_size) > + return WN_BAD_POINTER; Unless you plan to change this code in another patch, you can combine these into two lines. > + if (handles[index] == 0) > + { > + ret = providerTable->table[index].openEnum(enumerator->dwScope, > + enumerator->dwType, > + enumerator->dwUsage, > + NULL, &handles[index]); > + if (ret != WN_SUCCESS) > + continue; > + } > + > + ret = providerTable->table[index].enumResource(handles[index], > + &count, > + buffer, > + &size); Line formatting. > + for (index = 0; index < providerTable->numProviders; index++) > + { > + if (providerTable->table[index].dwEnumScopes && handles[index] != 0) > + providerTable->table[index].closeEnum(handles[index]); > + } You can remove the != 0 statement since you don't use it for providerTable->table[index].dwEnumScopes.

1 0

Re: setupapi/tests: Try to delete pre-existing key
by Marvin 12 Sep '16

12 Sep '16

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=25761 Your paranoid android. === w1064 (64 bit devinst) === devinst.c:1142: Test failed: Unexpected path \\?\root#legacy_bogus#0001#{6a55b5a4-3f65-11db-b704-0011955c2bdb} devinst.c:1264: Test failed: Expected key to not exist devinst.c:1370: Test failed: Expected key to not exist

1 0

Re: [PATCH v7] winebus.sys: Build initial hidraw device set
by Sebastian Lackner 12 Sep '16

12 Sep '16

On 08.09.2016 20:07, Aric Stewart wrote: > v2: style changes > v4: changes required by previous updates > v6: removed disableing busses > v7: Rebased, suggestions from Sebastian Lackner > > Includes implementation of common HID_PNP_CreateDevice > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/winebus.sys/Makefile.in | 3 +- > dlls/winebus.sys/bus.h | 2 + > dlls/winebus.sys/bus_udev.c | 117 ++++++++++++++++++++++++++++++++ > dlls/winebus.sys/main.c | 156 +++++++++++++++++++++++++++++++++++++++++++ > loader/wine.inf.in | 15 +++-- > 5 files changed, 288 insertions(+), 5 deletions(-) > > > > v7-0002-winebus.sys-Build-initial-hidraw-device-set.txt > > > diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in > index 99ff4d2..2d29105 100644 > --- a/dlls/winebus.sys/Makefile.in > +++ b/dlls/winebus.sys/Makefile.in > @@ -1,5 +1,6 @@ > MODULE = winebus.sys > -IMPORTS = ntoskrnl > +IMPORTS = ntoskrnl setupapi > +EXTRALIBS = $(UDEV_LIBS) It might be useful to set EXTRAINCL aswell, for example: EXTRAINCL = $(UDEV_CFLAGS) The value is also obtained using pkg-config. In my case its empty but I don't know if thats true for all systems. > EXTRADLLFLAGS = -Wb,--subsystem,native > > C_SRCS = \ > diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h > index 3d53a46..09920dd 100644 > --- a/dlls/winebus.sys/bus.h > +++ b/dlls/winebus.sys/bus.h > @@ -21,3 +21,5 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry > > /* HID Plug and Play Bus */ > NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; > +DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, LPVOID native, WORD vid, WORD pid, DWORD version, DWORD uid, const WCHAR *serial, BOOL is_gamepad, const GUID *class) DECLSPEC_HIDDEN; > +DWORD check_bus_option(UNICODE_STRING *registry_path, const UNICODE_STRING *option) DECLSPEC_HIDDEN; > diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c > index f040e60..e6319cb 100644 > --- a/dlls/winebus.sys/bus_udev.c > +++ b/dlls/winebus.sys/bus_udev.c > @@ -20,6 +20,19 @@ > > #include "config.h" > #include <stdarg.h> > +#include <unistd.h> > +#include <fcntl.h> > +#include <stdlib.h> > + > +#ifdef HAVE_SYS_IOCTL_H > +# include <sys/ioctl.h> > +#endif > + > +#ifdef HAVE_LIBUDEV_H > +# include <libudev.h> > +#endif > + > +#include <errno.h> > > #define NONAMELESSUNION > > @@ -27,6 +40,7 @@ > #define WIN32_NO_STATUS > #include "windef.h" > #include "winbase.h" > +#include "winnls.h" > #include "winternl.h" > #include "ddk/wdm.h" > #include "wine/debug.h" > @@ -39,13 +53,116 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); > > static DRIVER_OBJECT *udev_driver_obj = NULL; > > +#include "initguid.h" > +DEFINE_GUID(GUID_DEVCLASS_HIDRAW, 0x3def44ad,0x242e,0x46e5,0x82,0x6d,0x70,0x72,0x13,0xf3,0xaa,0x81); > + > +static const WCHAR hidraw_busidW[] = {'H','I','D','R','A','W',0}; > + > +/* udev based PNP support */ > +static struct udev *udev = NULL; > + > +static void try_add_device(void *dev) The parameter should have the type "struct udev_device *". > +{ > + const char *devnode; > + int fd; > + DWORD vid=0, pid=0, uid=0, version=0; > + WCHAR serial[255] = {'0','0','0','0','0',0}; > + DEVICE_OBJECT *device = NULL; > + struct udev_device *usbdev; > + const char *subsystem; > + > + devnode = udev_device_get_devnode(dev); According to the documentation this function can also return NULL under specific circumstances: "the device node file name of the udev device, or NULL if no device node exists". > + if ((fd = open(devnode, O_RDWR)) == -1) > + { > + TRACE("Unable to open udev device %s\n",devnode); Please use debugstr_a() for tracing strings of arbitrary length. It also wouldn't hurt to promote it to a WARN() and trace an error description, for example using strerror(). > + return; > + } > + close(fd); > + > + TRACE("Got udev device %s\n", devnode); Similar to above, please use debugstr_a(). > + > + usbdev = udev_device_get_parent_with_subsystem_devtype(dev, "usb", > + "usb_device"); > + if (usbdev) > + { > + char *endptr; > + const char *srl = NULL; > + vid = strtol(udev_device_get_sysattr_value(usbdev,"idVendor"), &endptr, 16); > + pid = strtol(udev_device_get_sysattr_value(usbdev,"idProduct"), &endptr, 16); > + version = strtol(udev_device_get_sysattr_value(usbdev,"version"), &endptr, 10); Those calls could fail: "the content of a sys attribute file, or NULL if there is no sys attribute value.". > + srl = udev_device_get_sysattr_value(usbdev,"serial"); > + if (srl) > + MultiByteToWideChar(CP_UNIXCP, 0, srl, -1, serial, 255); > + } > + > + subsystem = udev_device_get_subsystem(dev); > + > + if (strcmp(subsystem, "hidraw") == 0) > + device = bus_create_hid_device(udev_driver_obj, hidraw_busidW, dev, vid, pid, version, uid, serial, FALSE, &GUID_DEVCLASS_HIDRAW); > + else > + ERR("Device has unknown subsystem %s\n", subsystem); > + > + if (!device) > + ERR("Failed to create device\n"); > +} > + > +static void build_initial_deviceset(void *udev, const char **subsystems) The function takes a parameter "udev", but there is also a global variable with the same name. This seems a bit redundant. Also, I would suggest to remove the subsystems parameter here, and enumerate all types of devices which are supported. You can still filter them in try_add_device if required later. > +{ > + struct udev_enumerate *enumerate; > + struct udev_list_entry *udevices, *dev_list_entry; > + const char **p; > + > + enumerate = udev_enumerate_new(udev); > + p = subsystems; > + while (*p) > + { > + udev_enumerate_add_match_subsystem(enumerate, *p); > + p++; > + } > + udev_enumerate_scan_devices(enumerate); > + udevices = udev_enumerate_get_list_entry(enumerate); > + > + udev_list_entry_foreach(dev_list_entry, udevices) { > + const char *path; > + struct udev_device *dev; > + > + path = udev_list_entry_get_name(dev_list_entry); > + dev = udev_device_new_from_syspath(udev, path); > + try_add_device(dev); According to the documentation some of these udev functions can fail. It would be better to catch errors here, especially for udev_enumerate_new() and udev_device_new_from_syspath(). There are also refcounting issues, udev_device_new_from_syspath creates a new object which must be released when no longer needed (for example if try_add_device fails). > + } > + > + udev_enumerate_unref(enumerate); > +} > + > NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) > { > + static const WCHAR hidraw_disabledW[] = {'D','i','s','a','b','l','e',' ','h','i','d','r','a','w',0}; > + static const UNICODE_STRING hidraw_disabled = {sizeof(hidraw_disabledW) - sizeof(WCHAR), sizeof(hidraw_disabledW), (WCHAR*)hidraw_disabledW}; > + static const char *hidraw = "hidraw"; > + static const char *subsystems[2] = {0, 0}; > + > TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); > > udev_driver_obj = driver; > driver->MajorFunction[IRP_MJ_PNP] = common_pnp_dispatch; > > + if (check_bus_option(registry_path, &hidraw_disabled)) > + TRACE("UDEV hidraw devices disabled in registry\n"); > + else > + subsystems[0] = hidraw; > + > + udev = udev_new(); > + > + if (!udev) > + { > + ERR("Can't create udev\n"); > + return STATUS_UNSUCCESSFUL; > + } > + > + /* PNP Bus initialization */ > + if (subsystems[0]) > + build_initial_deviceset(udev, subsystems); > + > return STATUS_SUCCESS; > } > > diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c > index 43de25a..94f1b4b 100644 > --- a/dlls/winebus.sys/main.c > +++ b/dlls/winebus.sys/main.c > @@ -18,6 +18,7 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > > +#include "config.h" > #include <stdarg.h> > > #define NONAMELESSUNION > @@ -26,14 +27,143 @@ > #define WIN32_NO_STATUS > #include "windef.h" > #include "winbase.h" > +#include "winuser.h" > #include "winternl.h" > +#include "winreg.h" > +#include "setupapi.h" > +#include "cfgmgr32.h" > #include "ddk/wdm.h" > #include "wine/debug.h" > +#include "wine/unicode.h" > +#include "wine/list.h" > > #include "bus.h" > > WINE_DEFAULT_DEBUG_CHANNEL(plugplay); > > +static const WCHAR hwidfmtW[] = {'%','s','\\','V','i','d','_','%','0','4','x','&','P','i','d','_','%','0','4','x','&','%','s','\\','%','i','&','%','s','&','%','p',0}; > +static const WCHAR im_fmtW[] = {'I','M','_','%','i',0}; > +static const WCHAR ig_fmtW[] = {'I','G','_','%','i',0}; > + > +typedef struct _pnp_device { > + struct list entry; > + > + DEVICE_OBJECT *device; > + DWORD vidpid; It would not really be necessary to store the vid/pid information twice. You can also access it using device->DeviceExtension. > +} pnp_device; > + > +typedef struct { > + LPVOID native; /* Must be the first member of the structure */ > + > + DWORD vid, pid, version, uid; > + BOOL is_gamepad; > + WCHAR serial[255]; > + WCHAR const *busidW; /* Expected to be a static constant */ > +} extension; > + > +static struct list pnp_devset = LIST_INIT(pnp_devset); Its up to you if you want to add it now, but sooner or later you will need locking for such a list when it can be accessed by multiple threads. Also, as I saw that you have to convert the list back to a linear array in some of the functions implemented in following patches. Do you think it makes sense to store it as an array from the start? (Lock would still be needed but no conversion). > + > +static void add_device(DEVICE_OBJECT *device, DWORD vidpid) > +{ > + pnp_device *pnp_dev; > + > + pnp_dev = HeapAlloc(GetProcessHeap(), 0, sizeof(*pnp_dev)); > + pnp_dev->device = device; > + pnp_dev->vidpid = vidpid; > + list_add_tail(&pnp_devset, &pnp_dev->entry); > +} > + > +static INT get_vidpid_index(DEVICE_OBJECT *device, DWORD vidpid) > +{ > + pnp_device *ptr; > + int index = 0; > + LIST_FOR_EACH_ENTRY(ptr, &pnp_devset, pnp_device, entry) > + { > + if (ptr->vidpid == vidpid) > + index++; > + if (ptr->device == device) > + return index; > + } > + ERR("Device not found in list\n"); > + return 0; > +} Does this work properly when elements are deleted? You might return the same index for different devices. > + > +static int get_instance_id(DEVICE_OBJECT *device, WCHAR *id) > +{ > + int idx; > + WCHAR index_string[256]; > + > + extension *ext = (extension*)device->DeviceExtension; > + > + idx = get_vidpid_index(device, MAKELONG(ext->vid,ext->pid)); > + > + if (ext->is_gamepad) > + sprintfW(index_string, ig_fmtW, idx); > + else > + sprintfW(index_string, im_fmtW, idx); > + > + return sprintfW(id, hwidfmtW, ext->busidW, ext->vid, ext->pid, index_string, ext->version, ext->serial, ext->uid); It looks like you use %p in the format string, but uid has type DWORD? > +} > + > +DEVICE_OBJECT* bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, LPVOID native, WORD vid, WORD pid, DWORD version, DWORD uid, const WCHAR *serial, BOOL is_gamepad, const GUID *class) > +{ Please note that LPVOID types should be avoided in new wine code. > + NTSTATUS status; > + DEVICE_OBJECT *device; > + static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e', > + '\\','%','s','#','%','p',0}; > + static const WCHAR zero_serialW[]= {'0','0','0','0',0}; > + WCHAR dev_name[255]; > + UNICODE_STRING nameW; > + HDEVINFO devinfo; > + extension *ext; > + > + TRACE("Create HID bus device for native device %p\n", native); > + > + sprintfW(dev_name, device_name_fmtW, busidW, native); > + RtlInitUnicodeString(&nameW, dev_name); > + status = IoCreateDevice(driver, sizeof(extension), &nameW, 0, 0, FALSE, &device); > + if (status) > + { > + FIXME( "failed to create device error %x\n", status ); > + return NULL; > + } > + > + ext = (extension*)device->DeviceExtension; > + ext->native = native; At least for udev the device object has to be released. It looks like the logic is currently missing (also in your draft patches). In order to fix that it will probably be necessary to store additional information in each device object. > + ext->vid = vid; > + ext->pid = pid; > + ext->uid = uid; > + ext->is_gamepad = is_gamepad; > + ext->version = version; > + ext->busidW = busidW; > + if (serial) > + lstrcpyW(ext->serial, serial); > + else > + lstrcpyW(ext->serial, zero_serialW); > + > + add_device(device, MAKELONG(vid, pid)); > + > + devinfo = SetupDiGetClassDevsW(class, NULL, NULL, DIGCF_DEVICEINTERFACE); > + if (!devinfo) > + FIXME( "failed to get ClassDevs %x\n", GetLastError()); > + else > + { > + SP_DEVINFO_DATA Data; > + WCHAR id[MAX_DEVICE_ID_LEN]; > + > + get_instance_id(device, id); > + Data.cbSize = sizeof(Data); > + SetupDiCreateDeviceInfoW(devinfo, id, class, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data); > + if (!SetupDiRegisterDeviceInfo(devinfo, &Data, 0, NULL, NULL, NULL )) > + FIXME( "failed to Register Device Info %x\n", GetLastError()); > + SetupDiDestroyDeviceInfoList(devinfo); How does this correspond to similar code in hidclass.sys/device.c. Do we really need both? Why does hidclass contain a call to SetupDiCreateDeviceInterfaceW but not this version? > + } > + > + IoInvalidateDeviceRelations(device, BusRelations); > + > + return device; > +} > + > NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) > { > NTSTATUS status = irp->IoStatus.u.Status; > @@ -59,6 +189,32 @@ NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) > return status; > } > > +DWORD check_bus_option(UNICODE_STRING *registry_path, const UNICODE_STRING *option) > +{ > + OBJECT_ATTRIBUTES attr; > + HANDLE key; > + DWORD output = 0; > + > + InitializeObjectAttributes(&attr, registry_path, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); > + if (ZwOpenKey(&key, KEY_ALL_ACCESS, &attr) == STATUS_SUCCESS) > + { > + DWORD size; > + char buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])]; > + > + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION*)buffer; > + > + if (ZwQueryValueKey(key, option, KeyValuePartialInformation, info, sizeof(buffer), &size) == STATUS_SUCCESS) > + { > + if (info->Type == REG_DWORD) > + output = *(DWORD*)info->Data; > + } > + > + ZwClose(key); > + } > + > + return output; > +} I think it would be better to add this in a later patch. Currently there is only support for one subsystem, so it would not make much sense to disable it. > + > NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) > { > static const WCHAR udevW[] = {'\\','D','r','i','v','e','r','\\','U','D','E','V',0}; > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 4e29026..a29b99f 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -48,7 +48,8 @@ AddReg=\ > SessionMgr,\ > Tapi,\ > Timezones,\ > - LicenseInformation > + LicenseInformation,\ > + PlatformBus > > [DefaultInstall.NT] > RegisterDlls=RegisterDllsSection > @@ -73,7 +74,8 @@ AddReg=\ > Tapi,\ > Timezones,\ > VersionInfo,\ > - LicenseInformation > + LicenseInformation,\ > + PlatformBus > > [DefaultInstall.ntamd64] > RegisterDlls=RegisterDllsSection > @@ -100,7 +102,8 @@ AddReg=\ > Tapi,\ > Timezones,\ > VersionInfo.ntamd64,\ > - LicenseInformation > + LicenseInformation,\ > + PlatformBus > > [Wow64Install] > RegisterDlls=RegisterDllsSection > @@ -115,7 +118,8 @@ AddReg=\ > Misc,\ > Tapi,\ > VersionInfo.ntamd64,\ > - LicenseInformation > + LicenseInformation,\ > + PlatformBus > > [DefaultInstall.Services] > AddService=BITS,0,BITSService > @@ -3383,3 +3387,6 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Shanghai-EnableGame",0x1 > HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x10001,0x00000001 > HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001 > HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 > + > +[PlatformBus] > +HKLM,System\CurrentControlSet\Services\UDEV,"Disable hidraw",0x10001,0x00000000 It does not make sense to add registry keys for user-defined settings in wine.inf. This would have the disadvantage that they will get reset on each wine prefix update. The correct solution is to assume default settings when registry keys are not present. > > >

2 3

Re: [v3 PATCH] d2d1: Initial implementation of DC render target
by Henri Verbeet 12 Sep '16

12 Sep '16

On 11 September 2016 at 22:49, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > v2: skip test if device creation fails > I think that's fine, but now you're leaking the device on success.

1 0

Wine slow load somewhere after 1.9.16
by Bruno Jesus 12 Sep '16

12 Sep '16

Hi all, for unknown reasons at some point since the past month I get this most of the times I try to start anything in wine: err:ntdll:RtlpWaitForCriticalSection section 0x7bcf4f84 "../../../wine/dlls/ntdll/loader.c: loader_section" wait timed out in thread 001d, blocked by 001e, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x7bcf4f84 "../../../wine/dlls/ntdll/loader.c: loader_section" wait timed out in thread 001c, blocked by 001e, retrying (60 sec) These are always the first 2 lines in the log and it takes some seconds before it goes on. I'll try a regression test but would like to know if I'm the only one affected. Best wishes, Bruno

2 2

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