July 2016 - Wine-Devel - list.winehq.org

Re: [PATCH 3/8] wined3d: Implement SM5 deriv_rtx_coarse instruction.

by Henri Verbeet

On 22 July 2016 at 12:28, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static void shader_glsl_derivative(const struct wined3d_shader_instruction *ins) > +{ > + const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; > + struct wined3d_string_buffer *buffer = ins->ctx->buffer; > + struct glsl_src_param src_param; > + const char *instruction; > + DWORD write_mask; > + > + if (!gl_info->supported[ARB_DERIVATIVE_CONTROL]) > + { > + FIXME("OpenGL implementation does not support ARB_derivative_control.\n"); > + return; > + } > + > + switch (ins->handler_idx) > + { > + case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; > + default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); return; > + } > + > + write_mask = shader_glsl_append_dst(buffer, ins); > + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); > + shader_addline(buffer, "%s(%s));\n", instruction, src_param.param_str); > +} It doesn't matter that much, but is there any reason shader_glsl_map2gl() can't handle these?

July 25, 2016

Re: [PATCH 1/4] dwrite: Implement newer SetLineSpacing/GetLineSpacing

by Nikolay Sivov

On 25.07.2016 11:53, Marvin wrote: > 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=24498 > > Your paranoid android. > > > === wvistau64 (32 bit layout) === > The test timed out > Doesn't fail when run manually http://testbot.winehq.org/JobDetails.pl?Key=24499.

July 25, 2016

Re: [PATCH 1/4] dwrite: Implement newer SetLineSpacing/GetLineSpacing

by Marvin

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=24498 Your paranoid android. === wvistau64 (32 bit layout) === The test timed out

July 25, 2016

Re: urlmon: Remove double riid parameter.

by Nikolay Sivov

> - hres = IServiceProvider_QueryService(This->serv_prov, riid, riid, &ret); > + hres = IServiceProvider_QueryService(This->serv_prov, riid, &ret); This won't build.

July 25, 2016

Re: [PATCH v2 2/3] shell32: Implement FolderItems_Item.

by Alex Henrie

2016-07-22 0:13 GMT-06:00 Nikolay Sivov <bunglehead(a)gmail.com>: > Is it possible we'll need special folder indices here as well? I didn't > check thoroughly. You're right, if the index type is VT_ERROR, FolderItems::Item returns a FolderItem for the containing folder regardless of what the index value is. This special behavior is tested and implemented in v3. > This is assuming you always have VT_I4 on input, but it's obviously > possible to call it with any type. It turns out that FolderItems::Item returns S_OK for VT_I2, V_I4, and V_ERROR, S_FALSE for VT_BSTR, and E_NOTIMPL for everything else. This behavior is tested and implemented in v3. > 'dir' is not necessary VT_BSTR. In v3, Folder::Items returns E_NOTIMPL if dir is VT_I4, the same as Folder::get_Title. -Alex

July 25, 2016

Re: [PATCH] ucrtbase: Implement _get_narrow_winmain_command_line/_get_wide_winmain_command_line

by Dmitry Timoshkov

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +char* CDECL _get_narrow_winmain_command_line(void) > +{ > + static char *narrow_command_line; > + char *s; > + > + if (narrow_command_line) > + return narrow_command_line; > + > + s = GetCommandLineA(); > + if (*s == '"') > + { > + s++; > + while (*s) > + if (*s++ == '"') > + break; > + } > + else > + { > + while (*s && *s != ' ' && *s != '\t') > + s++; > + } > + while (*s == ' ' || *s == '\t') > + s++; > + > + return narrow_command_line = s; > +} Where did you get an idea of sucn an implementation? -- Dmitry.

July 24, 2016

Re: [PATCH 02/03 v4 ] ntoskrnl.exe: Track drivers created with IoCreateDriver

by Thomas Faber

> NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) > { > - DRIVER_OBJECT *driver; > - DRIVER_EXTENSION *extension; > + struct wine_driver *driver; > NTSTATUS status; > > TRACE("(%s, %p)\n", debugstr_us(name), init); > > if (!(driver = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, > - sizeof(*driver) + sizeof(*extension) ))) > + sizeof(*driver) ))) > return STATUS_NO_MEMORY; > > - if ((status = RtlDuplicateUnicodeString( 1, name, &driver->DriverName ))) > + if ((status = RtlDuplicateUnicodeString( 1, name, &driver->driver_obj.DriverName))) Missing space before the closing parenthesis here. ;p > { > RtlFreeHeap( GetProcessHeap(), 0, driver ); > return status; > } > @@ -892,13 +959,18 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) > /*********************************************************************** > * IoDeleteDriver (NTOSKRNL.EXE.@) > */ > -void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver ) > +void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver_object ) > { > - TRACE("(%p)\n", driver); > + TRACE("(%p)\n", driver_object); > + > + EnterCriticalSection( &drivers_cs ); > + if (wine_drivers) > + wine_rb_remove( wine_drivers, &driver_object->DriverName ); > + LeaveCriticalSection( &drivers_cs ); > > - RtlFreeUnicodeString( &driver->DriverName ); > - RtlFreeUnicodeString( &driver->DriverExtension->ServiceKeyName ); > - RtlFreeHeap( GetProcessHeap(), 0, driver ); > + RtlFreeUnicodeString( &driver_object->DriverName ); > + RtlFreeUnicodeString( &driver_object->DriverExtension->ServiceKeyName ); > + RtlFreeHeap( GetProcessHeap(), 0, driver_object ); > } You need to free the wine_driver now rather than the DRIVER_OBJECT, i.e. use CONTAINING_RECORD. Thanks, Thomas

July 24, 2016

Re: [PATCH 2/2] DInput : Use vendor and product ids to generate product GUID like it's done on Windows

by Corentin Rossignon

Done, thanks for taking some times and helping me doing a proper patch. On 07/24/2016 12:03 AM, Bruno Jesus wrote: > On Sat, Jul 23, 2016 at 8:01 AM, Corentin Rossignon <corossig(a)gmail.com> wrote: >> Signed-off-by: Corentin Rossignon <corossig(a)gmail.com> >> --- >> dlls/dinput/joystick_linux.c | 34 +++++++++++++++++++++++++++++++--- >> dlls/dinput/joystick_linuxinput.c | 27 +++++++++++++++++++++++++-- >> 2 files changed, 56 insertions(+), 5 deletions(-) > Formatting problem: > > bruno(a)Note:~/programs/wine$ git apply dinput2 > dinput2:31: trailing whitespace. > /* > dinput2:35: trailing whitespace. > * Data4 seems to be a constant. > dinput2:104: trailing whitespace. > /* > dinput2:108: trailing whitespace. > * Data4 seems to be a constant. > warning: 4 lines add whitespace errors. > >> diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c >> index 90b7280..f8499ca 100644 >> --- a/dlls/dinput/joystick_linux.c >> +++ b/dlls/dinput/joystick_linux.c >> @@ -77,6 +77,7 @@ struct JoyDev >> { >> char device[MAX_PATH]; >> char name[MAX_PATH]; >> + GUID guid_product; >> >> BYTE axis_count; >> BYTE button_count; >> @@ -122,6 +123,21 @@ static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903 >> {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} >> }; >> >> + >> +/* >> + * Construct the GUID in the same way of Windows doing this. >> + * Data1 is concatenation of productid and vendorid. >> + * Data2 and Data3 are NULL. >> + * Data4 seems to be a constant. >> + */ >> +static const GUID DInput_Wine_Joystick_Constant_Part_GUID = { >> + 0x000000000, >> + 0x0000, >> + 0x0000, >> + {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} >> +}; >> + >> + > Please remove all double blank lines in your changes in order to be > more compatible with the surrounding code style.

July 24, 2016

Re: [PATCH 2/2] DInput : Use vendor and product ids to generate product GUID like it's done on Windows

by Bruno Jesus

On Sat, Jul 23, 2016 at 8:01 AM, Corentin Rossignon <corossig(a)gmail.com> wrote: > Signed-off-by: Corentin Rossignon <corossig(a)gmail.com> > --- > dlls/dinput/joystick_linux.c | 34 +++++++++++++++++++++++++++++++--- > dlls/dinput/joystick_linuxinput.c | 27 +++++++++++++++++++++++++-- > 2 files changed, 56 insertions(+), 5 deletions(-) Formatting problem: bruno(a)Note:~/programs/wine$ git apply dinput2 dinput2:31: trailing whitespace. /* dinput2:35: trailing whitespace. * Data4 seems to be a constant. dinput2:104: trailing whitespace. /* dinput2:108: trailing whitespace. * Data4 seems to be a constant. warning: 4 lines add whitespace errors. > diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c > index 90b7280..f8499ca 100644 > --- a/dlls/dinput/joystick_linux.c > +++ b/dlls/dinput/joystick_linux.c > @@ -77,6 +77,7 @@ struct JoyDev > { > char device[MAX_PATH]; > char name[MAX_PATH]; > + GUID guid_product; > > BYTE axis_count; > BYTE button_count; > @@ -122,6 +123,21 @@ static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903 > {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} > }; > > + > +/* > + * Construct the GUID in the same way of Windows doing this. > + * Data1 is concatenation of productid and vendorid. > + * Data2 and Data3 are NULL. > + * Data4 seems to be a constant. > + */ > +static const GUID DInput_Wine_Joystick_Constant_Part_GUID = { > + 0x000000000, > + 0x0000, > + 0x0000, > + {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} > +}; > + > + Please remove all double blank lines in your changes in order to be more compatible with the surrounding code style.

July 23, 2016

Re: [PATCH 1/2] DInput : Add vendor_id and product_id with Linux joystick API

by Bruno Jesus

On Sat, Jul 23, 2016 at 8:01 AM, Corentin Rossignon <corossig(a)gmail.com> wrote: > Signed-off-by: Corentin Rossignon <corossig(a)gmail.com> > --- > dlls/dinput/joystick_linux.c | 35 ++++++++++++++++++++++++++++++++++- > 1 file changed, 34 insertions(+), 1 deletion(-) Thanks for the patch, I just tested and they work with my gamepads. Since you will have to fix the problems below I suggest that you resend the 2 patches with subjects: [PATCH 1/2] dinput: Retrieve vendor ID and product ID in Linux joystick API [PATCH 2/2] dinput: Fix product GUID generation in Linux joystick and event API Formatting problem: bruno(a)Note:~/programs/wine$ git apply dinput1 dinput1:19: trailing whitespace. dinput1:68: trailing whitespace. } warning: 2 lines add whitespace errors. > + /* Find vendor_id and product_id in sysfs */ > + joydev.vendor_id = 0; > + joydev.product_id = 0; > + > + snprintf(sys_path, MAX_PATH, "/sys/class/input/js%d/device/id/vendor", i); > + sys_fd = open(sys_path, O_RDONLY); > + if (sys_path > 0) > + { Wrong variable in the condition. Best Regards, Bruno

July 23, 2016

Re: [PATCH] dinput : use vendor and product ids to generate product GUID like it's done on Windows - second try

by Corentin Rossignon

You're right, I need to do the same for JS device. I submitted a set of two patches, the first one for getting device_id and product_id with JS device, the second one for using these ids to make the product GUID. I also put the constant part in a global GUID and I used MAKELONG for aggregating device_id and product_id. Regards, Corentin. On 07/23/2016 01:30 AM, Bruno Jesus wrote: > On Fri, Jul 22, 2016 at 3:31 AM, Corentin Rossignon <corossig(a)gmail.com> wrote: >> Signed-off-by: Corentin Rossignon <corossig(a)gmail.com> >> --- >> dlls/dinput/joystick_linuxinput.c | 26 ++++++++++++++++++++++++-- >> 1 file changed, 24 insertions(+), 2 deletions(-) > Hi, I just tested in Windows and indeed what you intend seems correct. > The PID/VID matches with what Windows uses: > > //Windows > guidProduct : {68750603-0000-0000-0000-504944564944} --- Generic HID gamepad > guidProduct : {0268054C-0000-0000-0000-504944564944} --- PS2 gamepad + > usb adapter > > //Wine > guidProduct : {9E573ED9-7734-11D2-8D4A-23903FB6BDF7} > guidProduct : {9E573ED9-7734-11D2-8D4A-23903FB6BDF7} > > But this patch does not work for me, my joysticks are detected in > joystick_linux.c not joystick_linuxinput.c. I believe the change is > correct but I can't confirm it, a similar patch for joystick_linux.c > would be needed. > >> diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c >> index 86f12d0..3f9c241 100644 >> --- a/dlls/dinput/joystick_linuxinput.c >> +++ b/dlls/dinput/joystick_linuxinput.c >> @@ -96,6 +96,7 @@ struct JoyDev { >> char *device; >> char *name; >> GUID guid; >> + GUID guid_product; >> >> BOOL has_ff; >> int num_effects; >> @@ -293,11 +294,32 @@ static void find_joydevs(void) >> } >> >> if (ioctl(fd, EVIOCGID, &device_id) == -1) >> + { >> WARN("ioctl(EVIOCGID) failed: %d %s\n", errno, strerror(errno)); >> + joydev.guid_product = DInput_Wine_Joystick_Base_GUID; >> + } >> else >> { >> joydev.vendor_id = device_id.vendor; >> joydev.product_id = device_id.product; >> + >> + /* Construct the GUID in the same way of Windows doing this. >> + Data1 is concatenation of productid and vendorid. >> + Data2 and Data3 are NULL. >> + Data4 seems to be a constant. */ >> + joydev.guid_product.Data1 = (device_id.product << 16) + device_id.vendor; >> + >> + joydev.guid_product.Data2 = 0x0000; >> + joydev.guid_product.Data3 = 0x0000; >> + >> + joydev.guid_product.Data4[0] = 0x00; >> + joydev.guid_product.Data4[1] = 0x00; >> + joydev.guid_product.Data4[2] = 0x50; >> + joydev.guid_product.Data4[3] = 0x49; >> + joydev.guid_product.Data4[4] = 0x44; >> + joydev.guid_product.Data4[5] = 0x56; >> + joydev.guid_product.Data4[6] = 0x49; >> + joydev.guid_product.Data4[7] = 0x44; >> } > I believe it is better to use a local escope static const char and > memcpy instead of setting byte per byte. Or in global escope static > const char near the definition of DInput_Wine_Joystick_Base_GUID > (line 157). > > Best regards, > Bruno

July 23, 2016

Adding binfmt configuration to official Wine packages

by Bruno Jesus

Hi, I would like to please call for attention on bug https://bugs.winehq.org/show_bug.cgi?id=39884 As far as I understand there are only benefits to users if we allow .exe files to run through binfmt, would it pose any kind of problem to add this configuration to our packages? Best wishes, Bruno

July 22, 2016

Re: joy.cpl: Display the correct number of button boxes during test

by DavidL

I noticed this as well - thanks! On Friday, July 22, 2016, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > After testing with an 8 button only joystick I noticed that currently > the program displays 9 buttons. Then I tested with an PS2 + usb > adapter controller and noticed that it is also off by one. I believe > nobody notices this because the gamepads have too many buttons > nowadays and you never test all of them. > > Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com <javascript:;>> >

July 22, 2016

Re: [PATCH] dinput : use vendor and product ids to generate product GUID like it's done on Windows - second try

by Bruno Jesus

On Fri, Jul 22, 2016 at 3:31 AM, Corentin Rossignon <corossig(a)gmail.com> wrote: > Signed-off-by: Corentin Rossignon <corossig(a)gmail.com> > --- > dlls/dinput/joystick_linuxinput.c | 26 ++++++++++++++++++++++++-- > 1 file changed, 24 insertions(+), 2 deletions(-) Hi, I just tested in Windows and indeed what you intend seems correct. The PID/VID matches with what Windows uses: //Windows guidProduct : {68750603-0000-0000-0000-504944564944} --- Generic HID gamepad guidProduct : {0268054C-0000-0000-0000-504944564944} --- PS2 gamepad + usb adapter //Wine guidProduct : {9E573ED9-7734-11D2-8D4A-23903FB6BDF7} guidProduct : {9E573ED9-7734-11D2-8D4A-23903FB6BDF7} But this patch does not work for me, my joysticks are detected in joystick_linux.c not joystick_linuxinput.c. I believe the change is correct but I can't confirm it, a similar patch for joystick_linux.c would be needed. > diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c > index 86f12d0..3f9c241 100644 > --- a/dlls/dinput/joystick_linuxinput.c > +++ b/dlls/dinput/joystick_linuxinput.c > @@ -96,6 +96,7 @@ struct JoyDev { > char *device; > char *name; > GUID guid; > + GUID guid_product; > > BOOL has_ff; > int num_effects; > @@ -293,11 +294,32 @@ static void find_joydevs(void) > } > > if (ioctl(fd, EVIOCGID, &device_id) == -1) > + { > WARN("ioctl(EVIOCGID) failed: %d %s\n", errno, strerror(errno)); > + joydev.guid_product = DInput_Wine_Joystick_Base_GUID; > + } > else > { > joydev.vendor_id = device_id.vendor; > joydev.product_id = device_id.product; > + > + /* Construct the GUID in the same way of Windows doing this. > + Data1 is concatenation of productid and vendorid. > + Data2 and Data3 are NULL. > + Data4 seems to be a constant. */ > + joydev.guid_product.Data1 = (device_id.product << 16) + device_id.vendor; > + > + joydev.guid_product.Data2 = 0x0000; > + joydev.guid_product.Data3 = 0x0000; > + > + joydev.guid_product.Data4[0] = 0x00; > + joydev.guid_product.Data4[1] = 0x00; > + joydev.guid_product.Data4[2] = 0x50; > + joydev.guid_product.Data4[3] = 0x49; > + joydev.guid_product.Data4[4] = 0x44; > + joydev.guid_product.Data4[5] = 0x56; > + joydev.guid_product.Data4[6] = 0x49; > + joydev.guid_product.Data4[7] = 0x44; > } I believe it is better to use a local escope static const char and memcpy instead of setting byte per byte. Or in global escope static const char near the definition of DInput_Wine_Joystick_Base_GUID (line 157). Best regards, Bruno

July 22, 2016

Re: [PATCH] ws2_32: Implement InetNtopW

by Bruno Jesus

On Fri, Jul 22, 2016 at 5:16 PM, Philipp Hoppermann <plata(a)mailbox.org> wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=40999 Thanks, I have written some tests to back your changes and will send soon, I also noticed a mistake in my review of your patch that I'll fix and send a new version.

July 22, 2016

Re: [PATCH 2/2] ws2_32: Fix implementation of InetNtopW.

by Bruno Jesus

On Fri, Jul 22, 2016 at 9:04 AM, Philipp Hoppermann <plata(a)mailbox.org> wrote: > Replaced call to inet_ntop by more elaborate solution. Looks much better, thanks. See the comments below. > Signed-off-by: Philipp Hoppermann <plata(a)mailbox.org> > --- > dlls/ws2_32/socket.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 68 insertions(+), 4 deletions(-) > > diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c > index 0622060..2045163 100644 > --- a/dlls/ws2_32/socket.c > +++ b/dlls/ws2_32/socket.c > @@ -7934,11 +7934,75 @@ INT WINAPI InetPtonW(INT family, PCWSTR addr, PVOID buffer) > } > > /*********************************************************************** > -* InetNtopW (WS2_32.@) > -*/ > -PCWSTR WINAPI InetNtopW(INT family, PVOID addr, PWSTR stringBuf, SIZE_T stringBufSize) > + * InetNtopW (WS2_32.@) > + * > + * Get string representation of IP address. > + * > + * PARAMS > + * family [I] AF_INET or AF_INET6 > + * addr [I] IP address in byte > + * buffer [O] IP address as string > + * buffer_len [O] length of the buffer in characters > + * > + * RETURNS > + * Success: IP address as string > + * Failure: NULL. Use GetLastError() to find the error cause. > + * > + * Error codes: > + * WSAEAFNOSUPPORT > + * - family is not AF_INET or AF_INET6 > + * ERROR_INVALID_PARAMETER > + * - buffer is NULL > + * - buffer_len is 0 > + * - buffer_len is too small > + * (i.e. < 16 for AF_INET or < 46 for AF_INET6) > + * > + */ Usually only overly complex functions need comments, which is not the case here so you can drop them. As you can see in the file most almost no other function has comments like this. > +PCWSTR WINAPI InetNtopW(INT family, PVOID addr, PWSTR buffer, SIZE_T buffer_len) > { > - return inet_ntop(family, addr, stringBuf, stringBufSize); > + char *bufferA; > + > + TRACE("family %d, addr %s, buffer (%p), buffer_len %lu\n", family, debugstr_w(addr), buffer, (unsigned long) buffer_len); WS_inet_ntop traces buffer_len without the cast using %ld, I guess it is better to follow its example and avoid the cast. > + // check family // comments are not allowed, please use /* */. But most of them are obvious like "check if buffer is NULL" so they can be dropped. > + if ((family != AF_INET) && (family != AF_INET6)) > + { > + SetLastError(WSAEAFNOSUPPORT); > + return NULL; > + } > + > + // check if buffer is NULL > + if (buffer == NULL) > + { > + SetLastError(ERROR_INVALID_PARAMETER); > + return NULL; > + } > + > + // check buffer_len > + if ((family == AF_INET && buffer_len < 16) || (family == AF_INET6 && buffer_len < 46)) > + { > + SetLastError(ERROR_INVALID_PARAMETER); > + return NULL; > + } WS_inet_ntop already does some error checking, there is no need to manually test again, also we trust the system inet_ntop call to deal with buffer_len check. > + // allocate memory for the string representation in char > + if (!(bufferA = HeapAlloc(GetProcessHeap(), 0, buffer_len*sizeof(WCHAR)))) > + { > + SetLastError(WSA_NOT_ENOUGH_MEMORY); > + return NULL; > + } You are doubling the required amount of memory, buffer_len should be already in characters, so no need to multiply. > + if (WS_inet_ntop(family, addr, bufferA, buffer_len*sizeof(WCHAR)) != NULL) Again no need to multiply. > + { > + // convert to wchar > + MultiByteToWideChar(CP_ACP, 0, bufferA, buffer_len*sizeof(WCHAR), buffer, buffer_len); Use: MultiByteToWideChar(CP_ACP, 0, bufferA, -1, buffer, buffer_len); > + > + HeapFree(GetProcessHeap(), 0, bufferA); > + return buffer; > + } else > + { > + return NULL; You are leaking bufferA in the else case, use a variable to store the results of WS_inet_ntop and return it instead so you can always HeapFree before the return and then there is no need for else. Best wishes, Bruno

July 22, 2016

Re: [PATCH 1/2] ws2_32: Implement InetNtopW.

by Bruno Jesus

On Fri, Jul 22, 2016 at 9:04 AM, Philipp Hoppermann <plata(a)mailbox.org> wrote: > Fixes "unimplemented function WS2_32.dll.InetNtopW" > > At the moment, this fix just calls inet_ntop It is not necessary to split the patch, specially because this patch is broken because of the char/WCHAR thing. Merge the spec changes in the 2/2 patch and see my other comments there.

July 22, 2016

Re: include: Improve include directive in d3dtypes.h.

by Henri Verbeet

On 22 July 2016 at 15:31, Andrey Gusev <andrey.goosev(a)gmail.com> wrote: > -#include <d3dvec.inl> > +#include "d3dvec.inl" Is that really an improvement? I'd argue these are system headers and angle brackets are correct. Of course in that case there are a couple of places where we'd want to change things in the other direction. Whether that's worth the trouble may be a different question.

July 22, 2016

Re: [v3 1/1] winejoystick.drv: Sort virtual joysticks by name on the Mac

by DavidL

New versions sent! Cheers, David On Thu, Jul 21, 2016 at 10:41 PM, Ken Thomases <ken(a)codeweavers.com> wrote: > Hi, > > On Jul 20, 2016, at 2:15 AM, David Lawrie <david.dljunk(a)gmail.com> wrote: > > > > +static CFStringRef copy_device_name(IOHIDDeviceRef device) > > +{ > > + CFTypeRef ref_name, ref_man; > > + CFStringRef name; > > + long prodID; > > I prefer variables to be declared at the narrowest scope in which they're > used. > > > + > > + if (device) > > + { > > + assert(IOHIDDeviceGetTypeID() == CFGetTypeID(device)); > > + > > + ref_name = IOHIDDeviceGetProperty(device, > CFSTR(kIOHIDProductKey)); > > + > > + if (ref_name && CFStringGetTypeID() == CFGetTypeID(ref_name)) > > + name = CFStringCreateCopy(kCFAllocatorDefault,ref_name); > > + else > > + { > > + ref_man = IOHIDDeviceGetProperty(device, > CFSTR(kIOHIDManufacturerKey)); > > I think it's simpler to use kIOHIDVendorIDKey with > get_device_property_long(). Judging by the HID Calibrator code, > kIOHIDManufacturerKey is not reliably available, but kIOHIDVendorIDKey > should be. It's also pretty fundamental to USB/HID. > > > + prodID = get_device_property_long(device, > CFSTR(kIOHIDProductIDKey)); > > + > > + if(ref_man && CFStringGetTypeID() == CFGetTypeID(ref_man)) > > + name = CFStringCreateWithFormat(kCFAllocatorDefault, > NULL, CFSTR("%@ %lu"), ref_man, prodID); > > Better to format vendor and product IDs using "0x%04lx" since that's how > they are usually represented (e.g. within HID Calibrator windows and System > Profiler). (Yes, I realize that Copy_DeviceName() which I cited previously > formats them as decimal.) > > Thanks for persevering in the face of my picky-ness. :) > :) > > -Ken > >

July 22, 2016

Re: [3/6] msvcirt: Forward signed char exports to char functions directly

by Iván Matellanes

On 21/07/16 12:40, Alexandre Julliard wrote: > "Iván Matellanes" <matellanesivan(a)gmail.com> writes: > >> signed char and char are equivalent in Visual C++, so specific functions for signed char are unnecessary. > > Note that you can't assume that 'char' is signed for the Unix > compiler. If it makes a difference, you'd have to specify signed char > explicitly. Otherwise, you could as well you the same functions for the > unsigned case too. > True. I'll check the unsigned cases as I suspect most of the functions (if not all) can be removed too. Cheers, Iván

July 22, 2016

Re: [v2 PATCH 4/4] hnetcfg: Add initial tests

by Alistair Leslie-Hughes

On 22/07/16 17:50, Marvin wrote: > 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=24452 > > Your paranoid android. > > > === build (build) === > Make failed > > This failed because uuid.lib wasn't rebuild. Best Regards Alistair Leslie-Hughes

July 22, 2016

Re: [v2 PATCH 4/4] hnetcfg: Add initial tests

by Marvin

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=24452 Your paranoid android. === build (build) === Make failed

July 22, 2016

[PATCH] dinput : use vendor and product ids to generate product GUID like it's done on Windows - second try

by Corentin Rossignon

Signed-off-by: Corentin Rossignon <corossig(a)gmail.com> --- dlls/dinput/joystick_linuxinput.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 86f12d0..3f9c241 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -96,6 +96,7 @@ struct JoyDev { char *device; char *name; GUID guid; + GUID guid_product; BOOL has_ff; int num_effects; @@ -293,11 +294,32 @@ static void find_joydevs(void) } if (ioctl(fd, EVIOCGID, &device_id) == -1) + { WARN("ioctl(EVIOCGID) failed: %d %s\n", errno, strerror(errno)); + joydev.guid_product = DInput_Wine_Joystick_Base_GUID; + } else { joydev.vendor_id = device_id.vendor; joydev.product_id = device_id.product; + + /* Construct the GUID in the same way of Windows doing this. + Data1 is concatenation of productid and vendorid. + Data2 and Data3 are NULL. + Data4 seems to be a constant. */ + joydev.guid_product.Data1 = (device_id.product << 16) + device_id.vendor; + + joydev.guid_product.Data2 = 0x0000; + joydev.guid_product.Data3 = 0x0000; + + joydev.guid_product.Data4[0] = 0x00; + joydev.guid_product.Data4[1] = 0x00; + joydev.guid_product.Data4[2] = 0x50; + joydev.guid_product.Data4[3] = 0x49; + joydev.guid_product.Data4[4] = 0x44; + joydev.guid_product.Data4[5] = 0x56; + joydev.guid_product.Data4[6] = 0x49; + joydev.guid_product.Data4[7] = 0x44; } if (!have_joydevs) @@ -327,7 +349,7 @@ static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver lpddi->dwSize = dwSize; lpddi->guidInstance = joydevs[id].guid; - lpddi->guidProduct = DInput_Wine_Joystick_Base_GUID; + lpddi->guidProduct = joydevs[id].guid_product; lpddi->guidFFDriver = GUID_NULL; if (version >= 0x0800) @@ -348,7 +370,7 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver lpddi->dwSize = dwSize; lpddi->guidInstance = joydevs[id].guid; - lpddi->guidProduct = DInput_Wine_Joystick_Base_GUID; + lpddi->guidProduct = joydevs[id].guid_product; lpddi->guidFFDriver = GUID_NULL; if (version >= 0x0800) -- 2.9.0

July 22, 2016

Re: [PATCH v2 2/3] shell32: Implement FolderItems_Item.

by Nikolay Sivov

On 22.07.2016 6:51, Alex Henrie wrote: > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > dlls/shell32/shelldispatch.c | 83 +++++++++++++++++++++++++++++++++++--- > dlls/shell32/tests/shelldispatch.c | 17 +++++--- > 2 files changed, 89 insertions(+), 11 deletions(-) > > diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c > index ac79302..4b4c822 100644 > --- a/dlls/shell32/shelldispatch.c > +++ b/dlls/shell32/shelldispatch.c > @@ -68,6 +68,8 @@ typedef struct { > typedef struct { > FolderItems3 FolderItems3_iface; > LONG ref; > + BSTR *item_paths; > + LONG item_count; > } FolderItemsImpl; > Is it possible we'll need special folder indices here as well? I didn't check thoroughly. > static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, FolderItem **ppid) > { > - FIXME("(%p,%s,%p)\n", iface, debugstr_variant(&index), ppid); > + FolderItemsImpl *This = impl_from_FolderItems(iface); > + VARIANT path; > + > + TRACE("(%p,%s,%p)\n", iface, debugstr_variant(&index), ppid); > > *ppid = NULL; > - return E_NOTIMPL; > + > + if (V_I4(&index) >= This->item_count) > + return S_FALSE; > + > + V_VT(&path) = VT_BSTR; > + V_BSTR(&path) = This->item_paths[V_I4(&index)]; > + > + return FolderItem_Constructor(&path, ppid); > } This is assuming you always have VT_I4 on input, but it's obviously possible to call it with any type. > > static HRESULT WINAPI FolderItemsImpl__NewEnum(FolderItems3 *iface, IUnknown **ppunk) > @@ -1139,9 +1157,17 @@ static const FolderItems3Vtbl FolderItemsImpl_Vtbl = { > FolderItemsImpl_get_Verbs > }; > > -static HRESULT FolderItems_Constructor(FolderItems **ppfi) > +static HRESULT FolderItems_Constructor(VARIANT *dir, FolderItems **ppfi) > { > + static const WCHAR backslash_star[] = {'\\','*',0}; > + static const WCHAR dot[] = {'.',0}; > + static const WCHAR dot_dot[] = {'.','.',0}; > FolderItemsImpl *This; > + WCHAR path[MAX_PATH]; > + HANDLE first_file; > + WIN32_FIND_DATAW file_info; > + BSTR *paths; > + HRESULT ret = S_OK; > > TRACE("\n"); > > @@ -1152,8 +1178,51 @@ static HRESULT FolderItems_Constructor(FolderItems **ppfi) > This->FolderItems3_iface.lpVtbl = &FolderItemsImpl_Vtbl; > This->ref = 1; > > + This->item_paths = HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)); > + if (!This->item_paths) > + { > + HeapFree(GetProcessHeap(), 0, This); > + return E_OUTOFMEMORY; > + } > + This->item_count = 0; > + > + lstrcpyW(path, V_BSTR(dir)); > + lstrcatW(path, backslash_star); > + first_file = FindFirstFileW(path, &file_info); > + if (first_file != INVALID_HANDLE_VALUE) 'dir' is not necessary VT_BSTR.

July 22, 2016

Re: [PATCH] dinput : use vendor and product ids to generate product GUID like it's done on Windows

by Corentin Rossignon

Hi, I will do a new patch with /* */ comment. I am using ditool.exe to display informations about DirectInput device. I found this tool on http://community.pcgamingwiki.com/files/file/588-directinputxinput-games-te… On 07/22/2016 02:06 AM, Bruno Jesus wrote: > On Thu, Jul 21, 2016 at 7:08 PM, Corentin Rossignon <corossig(a)gmail.com> wrote: >> Signed-off-by: Corentin Rossignon <corossig(a)gmail.com> >> --- >> dlls/dinput/joystick_linuxinput.c | 16 ++++++++++++++-- >> 1 file changed, 14 insertions(+), 2 deletions(-) >> >> diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c >> index 86f12d0..e5172b6 100644 >> --- a/dlls/dinput/joystick_linuxinput.c >> +++ b/dlls/dinput/joystick_linuxinput.c >> @@ -321,13 +321,19 @@ static void find_joydevs(void) >> static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) >> { >> DWORD dwSize = lpddi->dwSize; >> + // Data1 is concatenation of productid and vendorid, Data4 seems constant >> + GUID product_guid = { ((joydevs[id].product_id)<<16)+joydevs[id].vendor_id, >> + 0x0000, >> + 0x0000, >> + {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} }; >> + > Hi, I'm not familiar with direct input code but I can say that // > comments are not allowed, please use /* */ and send a try 2. Is there > any easy way to test this patch? Like a simple app that displays such > information so I can help testing in Windows and Wine?

July 22, 2016

Re: [PATCH] dinput : use vendor and product ids to generate product GUID like it's done on Windows

by Corentin Rossignon

Hi, I will do a new patch with /* */ comment. I am using ditool.exe to display informations about DirectInput device. I found this tool on http://community.pcgamingwiki.com/files/file/588-directinputxinput-games-te… On 07/22/2016 02:06 AM, Bruno Jesus wrote: > On Thu, Jul 21, 2016 at 7:08 PM, Corentin Rossignon <corossig(a)gmail.com> wrote: >> Signed-off-by: Corentin Rossignon <corossig(a)gmail.com> >> --- >> dlls/dinput/joystick_linuxinput.c | 16 ++++++++++++++-- >> 1 file changed, 14 insertions(+), 2 deletions(-) >> >> diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c >> index 86f12d0..e5172b6 100644 >> --- a/dlls/dinput/joystick_linuxinput.c >> +++ b/dlls/dinput/joystick_linuxinput.c >> @@ -321,13 +321,19 @@ static void find_joydevs(void) >> static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) >> { >> DWORD dwSize = lpddi->dwSize; >> + // Data1 is concatenation of productid and vendorid, Data4 seems constant >> + GUID product_guid = { ((joydevs[id].product_id)<<16)+joydevs[id].vendor_id, >> + 0x0000, >> + 0x0000, >> + {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} }; >> + > Hi, I'm not familiar with direct input code but I can say that // > comments are not allowed, please use /* */ and send a try 2. Is there > any easy way to test this patch? Like a simple app that displays such > information so I can help testing in Windows and Wine?

July 22, 2016

Re: [v3 1/1] dinput: Sort virtual joysticks by name on the Mac

by Ken Thomases

On Jul 20, 2016, at 2:15 AM, David Lawrie <david.dljunk(a)gmail.com> wrote: > > Tested on OS X 10.10.5. > > Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> > --- > dlls/dinput/joystick_osx.c | 50 +++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 47 insertions(+), 3 deletions(-) Same comments as for the winejoystick version. -Ken

July 22, 2016

Re: [v3 1/1] winejoystick.drv: Sort virtual joysticks by name on the Mac

by Ken Thomases

Hi, On Jul 20, 2016, at 2:15 AM, David Lawrie <david.dljunk(a)gmail.com> wrote: > > +static CFStringRef copy_device_name(IOHIDDeviceRef device) > +{ > + CFTypeRef ref_name, ref_man; > + CFStringRef name; > + long prodID; I prefer variables to be declared at the narrowest scope in which they're used. > + > + if (device) > + { > + assert(IOHIDDeviceGetTypeID() == CFGetTypeID(device)); > + > + ref_name = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey)); > + > + if (ref_name && CFStringGetTypeID() == CFGetTypeID(ref_name)) > + name = CFStringCreateCopy(kCFAllocatorDefault,ref_name); > + else > + { > + ref_man = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDManufacturerKey)); I think it's simpler to use kIOHIDVendorIDKey with get_device_property_long(). Judging by the HID Calibrator code, kIOHIDManufacturerKey is not reliably available, but kIOHIDVendorIDKey should be. It's also pretty fundamental to USB/HID. > + prodID = get_device_property_long(device, CFSTR(kIOHIDProductIDKey)); > + > + if(ref_man && CFStringGetTypeID() == CFGetTypeID(ref_man)) > + name = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%@ %lu"), ref_man, prodID); Better to format vendor and product IDs using "0x%04lx" since that's how they are usually represented (e.g. within HID Calibrator windows and System Profiler). (Yes, I realize that Copy_DeviceName() which I cited previously formats them as decimal.) Thanks for persevering in the face of my picky-ness. :) -Ken

July 22, 2016

i need yor help

by achbarrr＠gmail.com

hello everyone i need your help i want wine for android why because i work in corel and photosop and msoffice but i want to do it on touchly os like android because my finger do best on it please send me an mail or email for that wine for android please

July 22, 2016

Re: [PATCH] dinput : use vendor and product ids to generate product GUID like it's done on Windows

by Bruno Jesus

On Thu, Jul 21, 2016 at 7:08 PM, Corentin Rossignon <corossig(a)gmail.com> wrote: > Signed-off-by: Corentin Rossignon <corossig(a)gmail.com> > --- > dlls/dinput/joystick_linuxinput.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c > index 86f12d0..e5172b6 100644 > --- a/dlls/dinput/joystick_linuxinput.c > +++ b/dlls/dinput/joystick_linuxinput.c > @@ -321,13 +321,19 @@ static void find_joydevs(void) > static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) > { > DWORD dwSize = lpddi->dwSize; > + // Data1 is concatenation of productid and vendorid, Data4 seems constant > + GUID product_guid = { ((joydevs[id].product_id)<<16)+joydevs[id].vendor_id, > + 0x0000, > + 0x0000, > + {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} }; > + Hi, I'm not familiar with direct input code but I can say that // comments are not allowed, please use /* */ and send a try 2. Is there any easy way to test this patch? Like a simple app that displays such information so I can help testing in Windows and Wine?

July 21, 2016

Re: [PATCH 2/2] winex11: track glx windows per thread

by Miklós Máté

On 07/21/2016 12:12 PM, Alexandre Julliard wrote: > Miklós Máté <mtmkls(a)gmail.com> writes: > >> On 07/21/2016 05:39 AM, Alexandre Julliard wrote: >>> Miklós Máté <mtmkls(a)gmail.com> writes: >>> >>>> XCloseDisplay in thread_detach() closes all X windows, but the GLX windows >>>> remain, and become zombies. If a new X window is created with the same XID, >>>> Mesa refuses to attach a GLX window to it because of the zombie. Observed >>>> in the ddraw test. >>> Is there a reason that creating the GLX window on the window thread >>> wouldn't work? >>> >> The problem is that Wine uses XCloseDisplay to destroy all X windows >> created in that thread, but there is no equivalent functionality for >> GLX. If gdi_display = windata->display, it would remove the need for >> XSync, but the problem of zombie GLX windows would remain. I hope I >> understood your question correctly. > The ID should be invalidated once the display connection is closed, > otherwise it's a Mesa bug. Have you tested it? > Hmm, you are right. Mesa does set an XCloseDisplay callback to clean things up for the display connections it encounters. If I use data->display instead of gdi_display for pglXCreateWindow in line 1358 of opengl.c, the tests pass, and no zombie glx windows remain. I don't know if I should dare to take responsibility for this change, though, as I know almost nothing about GDI. Note that the zombies cause set_pixel_format to fail, but the tests treat that as skip, and not fail. I don't know if anything actually fails due to the zombie glx windows. Meanwhile I noticed that patch 1/2 I submitted wasn't the final version. opengl.c line 1430 should be Window old_client_window = None; to avoid the uninitialized variable warning. Should I submit a fixed version? MM

July 21, 2016

Re: [PATCH] ws2_32: Implement InetNtopW.

by Bruno Jesus

On Thu, Jul 21, 2016 at 2:46 PM, Philipp Hoppermann <plata(a)mailbox.org> wrote: > Fixes "unimplemented function WS2_32.dll.InetNtopW" Hi, thanks for the patch. > At the moment, this fix just calls inet_ntop Unfortunately you can't do that. inet_ntop replies in char, not WCHAR. Please see how InetPtonW is implemented [1], by following its example you will be able to implement the function properly using WS_inet_ntop. http://source.winehq.org/git/wine.git/commitdiff/af8c79343ce9eb24e223607ec2… > Signed-off-by: Philipp Hoppermann <plata(a)mailbox.org> > --- > dlls/ws2_32/socket.c | 8 ++++++++ > dlls/ws2_32/ws2_32.spec | 1 + > 2 files changed, 9 insertions(+) > > diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c > index b0af3d7..0622060 100644 > --- a/dlls/ws2_32/socket.c > +++ b/dlls/ws2_32/socket.c > @@ -7934,6 +7934,14 @@ INT WINAPI InetPtonW(INT family, PCWSTR addr, PVOID buffer) > } > > /*********************************************************************** > +* InetNtopW (WS2_32.@) > +*/ > +PCWSTR WINAPI InetNtopW(INT family, PVOID addr, PWSTR stringBuf, SIZE_T stringBufSize) Please change stringBuf to buffer and stringBufSize to buffer_len.

July 21, 2016

Re: ole32: Use debugstr_guid() in TRACE() messages.

by Michael Stefaniuc

Hello Andrey! On 07/21/2016 05:57 PM, Andrey Gusev wrote: > > ole32-Use-debugstr_guid-in-TRACE-messages.txt > > > From d360a701eee8b8cf715059d630163a7a21dc3222 Mon Sep 17 00:00:00 2001 > Message-Id: <d360a701eee8b8cf715059d630163a7a21dc3222.1469116606.git.andrey.goosev(a)gma…> > From: Andrey Gusev <andrey.goosev(a)gmail.com> > Date: Thu, 21 Jul 2016 18:56:32 +0300 > Subject: [PATCH] ole32: Use debugstr_guid() in TRACE() messages. > > Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> > --- > dlls/ole32/classmoniker.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c > index 1bcf58f..00c2f42 100644 > --- a/dlls/ole32/classmoniker.c > +++ b/dlls/ole32/classmoniker.c > @@ -231,7 +231,7 @@ static HRESULT WINAPI ClassMoniker_BindToObject(IMoniker* iface, > IClassActivator *pActivator; > HRESULT hr; > > - TRACE("(%p,%p,%p,%p)\n", pbc, pmkToLeft, riid, ppvResult); > + TRACE("(%p,%p,%s,%p)\n", pbc, pmkToLeft, debugstr_guid(riid), ppvResult); > > bindopts.cbStruct = sizeof(bindopts); > IBindCtx_GetBindOptions(pbc, (BIND_OPTS *)&bindopts); > @@ -264,7 +264,7 @@ static HRESULT WINAPI ClassMoniker_BindToStorage(IMoniker* iface, > REFIID riid, > VOID** ppvResult) > { > - TRACE("(%p,%p,%p,%p)\n",pbc, pmkToLeft, riid, ppvResult); > + TRACE("(%p,%p,%s,%p)\n",pbc, pmkToLeft, debugstr_guid(riid), ppvResult); > return IMoniker_BindToObject(iface, pbc, pmkToLeft, riid, ppvResult); > } > > @@ -586,7 +586,7 @@ static HRESULT WINAPI ClassMonikerROTData_QueryInterface(IROTData *iface,REFIID > > ClassMoniker *This = impl_from_IROTData(iface); > > - TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); > + TRACE("(%p,%s,%p)\n",iface,debugstr_guid(riid),ppvObject); While you work on this please fix also the whitespace issues in those lines: Space after ',' and line length should not exceed around 100 chars. > > return IMoniker_QueryInterface(&This->IMoniker_iface, riid, ppvObject); > } > -- 2.5.5 bye michael

July 21, 2016

Re: [PATCH 4/4] hnetcfg: Add stubbed INetFwPolicy2 interface

by Nikolay Sivov

On 21.07.2016 12:09, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/hnetcfg/apps.c | 1 + > dlls/hnetcfg/hnetcfg.c | 5 + > dlls/hnetcfg/hnetcfg_private.h | 2 + > dlls/hnetcfg/policy.c | 332 +++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 340 insertions(+) > > diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c > index ea6d411..2b8d78c 100644 > --- a/dlls/hnetcfg/apps.c > +++ b/dlls/hnetcfg/apps.c > @@ -111,6 +111,7 @@ static REFIID tid_id[] = > &IID_INetFwOpenPort, > &IID_INetFwOpenPorts, > &IID_INetFwPolicy, > + &IID_INetFwPolicy2, > &IID_INetFwProfile > }; > > diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c > index fadd367..e56dbab 100644 > --- a/dlls/hnetcfg/hnetcfg.c > +++ b/dlls/hnetcfg/hnetcfg.c > @@ -113,6 +113,7 @@ static const struct IClassFactoryVtbl hnetcfg_cf_vtbl = > static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create }; > static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create }; > static hnetcfg_cf fw_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_create }; > +static hnetcfg_cf fw_policy2_cf = { { &hnetcfg_cf_vtbl }, NetFwPolicy2_create }; > > BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) > { > @@ -151,6 +152,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) > { > cf = &fw_openport_cf.IClassFactory_iface; > } > + else if (IsEqualGUID( rclsid, &CLSID_NetFwPolicy2 )) > + { > + cf = &fw_policy2_cf.IClassFactory_iface; > + } > > if (!cf) return CLASS_E_CLASSNOTAVAILABLE; > return IClassFactory_QueryInterface( cf, iid, ppv ); > diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h > index bb3f3aa..812d970 100644 > --- a/dlls/hnetcfg/hnetcfg_private.h > +++ b/dlls/hnetcfg/hnetcfg_private.h > @@ -24,6 +24,7 @@ enum type_id > INetFwOpenPort_tid, > INetFwOpenPorts_tid, > INetFwPolicy_tid, > + INetFwPolicy2_tid, > INetFwProfile_tid, > last_tid > }; > @@ -33,6 +34,7 @@ void release_typelib(void) DECLSPEC_HIDDEN; > > HRESULT NetFwMgr_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; > HRESULT NetFwPolicy_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; > +HRESULT NetFwPolicy2_create(IUnknown *, void **) DECLSPEC_HIDDEN; It makes sense to test first if those two both support INetFwPolicy and INetFwPolicy2.

July 21, 2016

Re: [PATCH 3/4] hnetcfg: Register NetFwPolicy2 interface

by Nikolay Sivov

On 21.07.2016 12:09, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/hnetcfg/hnetcfg.idl | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/dlls/hnetcfg/hnetcfg.idl b/dlls/hnetcfg/hnetcfg.idl > index 9934f6a..763529a 100644 > --- a/dlls/hnetcfg/hnetcfg.idl > +++ b/dlls/hnetcfg/hnetcfg.idl > @@ -43,3 +43,11 @@ coclass NetFwAuthorizedApplication { interface INetFwAuthorizedApplications; } > uuid(0ca545c6-37ad-4a6c-bf92-9f7610067ef5) > ] > coclass NetFwOpenPort { interface INetFwOpenPort; } > + > +[ > + helpstring("HNetCfg.FwPolicy2"), > + progid("HNetCfg.FwPolicy2"), > + threading(both), > + uuid(e2b3c97f-6ae1-41ac-817a-f6f92166d7dd) > +] > +coclass NetFwPolicy2 { interface INetFwPolicy2; } > This doesn't have to be a separate patch.

July 21, 2016

Re: ntdll: Keep drive letter size in RtlGetFullPathName_U when full path is specified

by Alexandre Julliard

Piotr Caban <piotr(a)codeweavers.com> writes: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/ntdll/path.c | 2 +- > dlls/ntdll/tests/path.c | 9 +++++---- > 2 files changed, 6 insertions(+), 5 deletions(-) This is causing a test failure: ../../../tools/runtest -q -P wine -T ../../.. -M cmd.exe -p cmd.exe_test.exe.so batch && touch batch.ok batch.c:313: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 983 (got 'c:\', wanted 'c:\') make[1]: *** [batch.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

July 21, 2016

Re: [2/3] wininet: Start the first chunk as soon as we have some data.

by Hans Leidekker

On Thu, 2016-07-21 at 14:25 +0200, Jacek Caban wrote: > > --- > > dlls/wininet/http.c | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c > > index 2c62d97..c4cf66b 100644 > > --- a/dlls/wininet/http.c > > +++ b/dlls/wininet/http.c > > @@ -2921,6 +2921,7 @@ static DWORD set_content_length(http_request_t *request) > > !strcmpiW(encoding, szChunked)) > > { > > chunked_stream_t *chunked_stream; > > + DWORD res; > > > > chunked_stream = heap_alloc(sizeof(*chunked_stream)); > > if(!chunked_stream) > > @@ -2935,6 +2936,12 @@ static DWORD set_content_length(http_request_t *request) > > memcpy(chunked_stream->buf, request->read_buf+request->read_pos, request->read_size); > > chunked_stream->buf_size = request->read_size; > > request->read_size = request->read_pos = 0; > > + > > + res = start_next_chunk(chunked_stream, request); > > + if (res != ERROR_SUCCESS) { > > + heap_free(chunked_stream); > > + return res; > > + } > > It seems to me that you're fixing a problem is a wrong place. > start_next_chunk should be called by HTTP_ReceiveRequestData via > refill_read_buffer anyway. I'd suggest to investigate why it doesn't > work in your case. This is required to make get_avail_data return the correct number of bytes. Note that the line above sets the read size to 0, so (before my second patch) the next call to get_avail_data would return 0. This may trigger a read beyond available data. It is what happens with Outlook. > Also, see the attached test. We shouldn't need any chunk to complete > requests. It's an existing problem in current Wine, which may be > unrelated to your problem, but having such blocking calls here is not a > step in the right direction. Your test hangs with and without this patch. Why is having a blocking call here a problem? It would happen right after reading the headers, also blocking calls. Reading the header of the first chunk at this point may actually be the right thing to do. This way we can answer a query for available data without potentially blocking.

July 21, 2016

Re: [2/3] wininet: Start the first chunk as soon as we have some data.

by Jacek Caban

Hi Hans, On 19.07.2016 11:27, Hans Leidekker wrote: > Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> > --- > dlls/wininet/http.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c > index 2c62d97..c4cf66b 100644 > --- a/dlls/wininet/http.c > +++ b/dlls/wininet/http.c > @@ -2921,6 +2921,7 @@ static DWORD set_content_length(http_request_t *request) > !strcmpiW(encoding, szChunked)) > { > chunked_stream_t *chunked_stream; > + DWORD res; > > chunked_stream = heap_alloc(sizeof(*chunked_stream)); > if(!chunked_stream) > @@ -2935,6 +2936,12 @@ static DWORD set_content_length(http_request_t *request) > memcpy(chunked_stream->buf, request->read_buf+request->read_pos, request->read_size); > chunked_stream->buf_size = request->read_size; > request->read_size = request->read_pos = 0; > + > + res = start_next_chunk(chunked_stream, request); > + if (res != ERROR_SUCCESS) { > + heap_free(chunked_stream); > + return res; > + } It seems to me that you're fixing a problem is a wrong place. start_next_chunk should be called by HTTP_ReceiveRequestData via refill_read_buffer anyway. I'd suggest to investigate why it doesn't work in your case. Also, see the attached test. We shouldn't need any chunk to complete requests. It's an existing problem in current Wine, which may be unrelated to your problem, but having such blocking calls here is not a step in the right direction. Thanks, Jacek

July 21, 2016

Re: [3/6] msvcirt: Forward signed char exports to char functions directly

by Alexandre Julliard

"Iván Matellanes" <matellanesivan(a)gmail.com> writes: > signed char and char are equivalent in Visual C++, so specific functions for signed char are unnecessary. Note that you can't assume that 'char' is signed for the Unix compiler. If it makes a difference, you'd have to specify signed char explicitly. Otherwise, you could as well you the same functions for the unsigned case too. -- Alexandre Julliard julliard(a)winehq.org

July 21, 2016

Re: [3/6] msvcirt: Forward signed char exports to char functions directly

by Iván Matellanes

Oops, I messed up the numbering, this one should say [3/3]. On 21/07/16 10:56, Iván Matellanes wrote: > signed char and char are equivalent in Visual C++, so specific functions for signed char are unnecessary. > > Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> > --- > dlls/msvcirt/msvcirt.c | 44 ++++++++++++++++---------------------------- > dlls/msvcirt/msvcirt.spec | 24 ++++++++++++------------ > 2 files changed, 28 insertions(+), 40 deletions(-)

July 21, 2016

Re: [PATCH 2/2] winex11: track glx windows per thread

by Alexandre Julliard

Miklós Máté <mtmkls(a)gmail.com> writes: > On 07/21/2016 05:39 AM, Alexandre Julliard wrote: >> Miklós Máté <mtmkls(a)gmail.com> writes: >> >>> XCloseDisplay in thread_detach() closes all X windows, but the GLX windows >>> remain, and become zombies. If a new X window is created with the same XID, >>> Mesa refuses to attach a GLX window to it because of the zombie. Observed >>> in the ddraw test. >> Is there a reason that creating the GLX window on the window thread >> wouldn't work? >> > The problem is that Wine uses XCloseDisplay to destroy all X windows > created in that thread, but there is no equivalent functionality for > GLX. If gdi_display = windata->display, it would remove the need for > XSync, but the problem of zombie GLX windows would remain. I hope I > understood your question correctly. The ID should be invalidated once the display connection is closed, otherwise it's a Mesa bug. Have you tested it? -- Alexandre Julliard julliard(a)winehq.org

July 21, 2016

Re: [PATCH 2/2] winex11: track glx windows per thread

by Miklós Máté

On 07/21/2016 05:39 AM, Alexandre Julliard wrote: > Miklós Máté <mtmkls(a)gmail.com> writes: > >> XCloseDisplay in thread_detach() closes all X windows, but the GLX windows >> remain, and become zombies. If a new X window is created with the same XID, >> Mesa refuses to attach a GLX window to it because of the zombie. Observed >> in the ddraw test. > Is there a reason that creating the GLX window on the window thread > wouldn't work? > The problem is that Wine uses XCloseDisplay to destroy all X windows created in that thread, but there is no equivalent functionality for GLX. If gdi_display = windata->display, it would remove the need for XSync, but the problem of zombie GLX windows would remain. I hope I understood your question correctly. MM

July 21, 2016

Re: [PATCH 2/3] shell32: Implement FolderItems_Item.

by Nikolay Sivov

On 21.07.2016 7:45, Alex Henrie wrote: > static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, FolderItem **ppid) > { > - FIXME("(%p,%s,%p)\n", iface, debugstr_variant(&index), ppid); > + FolderItemsImpl *This = impl_from_FolderItems(iface); > + VARIANT path; > + struct list *node = list_head(&This->items); > + int i; > + > + TRACE("(%p,%s,%p)\n", iface, debugstr_variant(&index), ppid); > > *ppid = NULL; > - return E_NOTIMPL; > + > + if (!node) > + return S_FALSE; > + > + for (i = 0; i < V_I4(&index); i++) > + { > + node = list_next(&This->items, node); > + if (!node) > + return S_FALSE; > + } If it's only using indexed access, list is not a right data type.

July 21, 2016

Re: [PATCH 1/3] shell32/tests: Add more tests for FolderItems.

by Nikolay Sivov

On 21.07.2016 7:45, Alex Henrie wrote: > + for (i = 0; i < sizeof(file_defs)/sizeof(file_defs[0]); i++) > + { > + switch (file_defs[i].type) > + { > + case DIRECTORY: > + r = CreateDirectoryA(file_defs[i].name, NULL); > + ok(r, "file_defs[%d]: CreateDirectory failed: %08x\n", i, GetLastError()); > + break; > + > + case SHORTCUT: > + sl = NULL; > + r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkA, (void**)&sl); > + ok(SUCCEEDED(r), "file_defs[%d]: CoCreateInstance failed: %08x\n", i, r); > + ok(!!sl, "sl is null\n"); > + > + shortcut = NULL; > + r = IShellLinkA_QueryInterface(sl, &IID_IPersistFile, (void**)&shortcut); > + ok(r == S_OK, "file_defs[%d]: IShellLink::QueryInterface failed: %08x\n", i, r); > + ok(!!shortcut, "file_defs[%d]: shortcut is null\n", i); > + > + MultiByteToWideChar(CP_ACP, 0, file_defs[i].name, -1, wstr, sizeof(wstr)/sizeof(WCHAR)); > + r = IPersistFile_Save(shortcut, wstr, FALSE); > + ok(r == S_OK, "file_defs[%d]: IPersistFile::Save failed: %08x\n", i, r); > + > + IPersistFile_Release(shortcut); > + IShellLinkA_Release(sl); If you're only interested in IPersistFile you can request it directly when calling CoCreateInstance(). > + r = FolderItems_QueryInterface(items, &IID_FolderItems2, (void**)&items2); > + ok(r == S_OK || broken(E_NOINTERFACE) /* xp and later */, "FolderItems::QueryInterface failed: %08x\n", r); > + ok(!!items2 || broken(!items2) /* xp and later */, "items2 is null\n"); Second ok() is a bit meaningless, because it's expected to be consistent with previous return value test. I think it could be placed into if (r == S_OK), with broken() removed. > + > + bstr = NULL; > + r = FolderItem_get_Path(item, &bstr); > + ok(r == S_OK, "file_defs[%d]: FolderItem::get_Path failed: %08x\n", i, r); > + ok(!!bstr, "file_defs[%d]: bstr is null\n", i); > + > + bstr2 = NULL; > + r = FolderItem_get_Path(item, &bstr2); > + ok(r == S_OK, "file_defs[%d]: FolderItem::get_Path failed: %08x\n", i, r); > + ok(bstr2 != bstr, "file_defs[%d]: bstr and bstr2 are the same\n", i); > + SysFreeString(bstr2); This is a regular convention for [out] BSTR arguments. It only makes sense to explicitly test it if it differs from expected behavior. > + > + V_I4(&var) = sizeof(file_defs)/sizeof(file_defs[0]); > + item = NULL; > + r = FolderItems_Item(items, var, &item); > +todo_wine > + ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); > + ok(!item, "item is not null\n"); > + > if (0) /* crashes on xp */ > { > r = FolderItems_get_Application(items, NULL); > @@ -422,12 +623,20 @@ todo_wine > ok(r == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", r); > } > > + verbs = (FolderItemVerbs*)0xdeadbeef; > r = FolderItems3_get_Verbs(items3, &verbs); > todo_wine > ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); > ok(!verbs, "verbs is not null\n"); > } > > + for (i = 0; i < sizeof(file_defs)/sizeof(file_defs[0]); i++) > + { > + if (file_defs[i].type == DIRECTORY) > + RemoveDirectoryA(file_defs[i].name); > + else > + DeleteFileA(file_defs[i].name); > + } Could this cleanup be merged with one of the loops you have earlier? >

July 21, 2016

Re: [PATCH 2/2] winex11: track glx windows per thread

by Alexandre Julliard

Miklós Máté <mtmkls(a)gmail.com> writes: > XCloseDisplay in thread_detach() closes all X windows, but the GLX windows > remain, and become zombies. If a new X window is created with the same XID, > Mesa refuses to attach a GLX window to it because of the zombie. Observed > in the ddraw test. Is there a reason that creating the GLX window on the window thread wouldn't work? -- Alexandre Julliard julliard(a)winehq.org

July 20, 2016

Re: [PATCH 3/4] quartz: Try all surfaces when calling GetSurface

by Jan Schmidt

On 21/07/16 01:14, Andrew Eikum wrote: > On Wed, Jul 20, 2016 at 02:37:11PM +1000, Jan Schmidt wrote: >> If the surface we want is refused, cycle through all >> possible ones. Some applications (Silver at least) >> request 2 surfaces, but then refuse to return anything >> other than the first one. >> > > I'm not necessarily opposed to this, but it does seem unlikely that > the application would request two surfaces be used, but only provide > one. > > I noticed that we set num_surfaces to 2 in VMR9_maybe_init. Is this > function calling IVMRSurfaceAllocatorEx9::InitializeDevice on the > application-provided allocator, or on our default implementation? This > seems like where the application should tell us it wants only one > surface. It calls the allocator the app provide earlier in VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator which is then passing it to VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper to do the actual allocation. I think it's just passing the allocation info intact - including the MinBuffers and default buffers=2 value (verified by changing those). I think the app then only stores the first surface though. > If it is calling the application's allocator, then maybe they don't > handle VMR9AllocationInfo::MinBuffers > 1 very well. Why do we set > MinBuffers to 2 here, I wonder. Aric? Since we're asking design questions: It requests surfaces with VMR9AllocFlag_TextureSurface, but D3D doesn't seem to support 24-bit RGB textures. I only have 1 test case for the VMR9 renderer (Silver), and for that the filter graph plugs the GStreamer YUV2RGB component, which outputs 24-bit RGB. I'm using a local patch to output RGBA instead to make things work. My plan is to extend the TransformFilter base class and make the YUV2RGB filter negotiate with the VMR9 filter and do 32-bit anyway, but it seems the VMR9 filter should not advertise 24-bit support at all? J. > > Andrew > >> Signed-off-by: Jan Schmidt <jan(a)centricular.com> >> --- >> dlls/quartz/vmr9.c | 14 ++++++++++++-- >> 1 file changed, 12 insertions(+), 2 deletions(-) >> >> diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c >> index d590a71..8455678 100644 >> --- a/dlls/quartz/vmr9.c >> +++ b/dlls/quartz/vmr9.c >> @@ -292,6 +292,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pS >> REFERENCE_TIME tStart, tStop; >> VMR9PresentationInfo info; >> HRESULT hr; >> + int i; >> >> TRACE("%p %p\n", iface, pSample); >> >> @@ -338,10 +339,19 @@ static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pS >> info.szAspectRatio.cx = This->bmiheader.biWidth; >> info.szAspectRatio.cy = This->bmiheader.biHeight; >> >> - hr = IVMRSurfaceAllocatorEx9_GetSurface(This->allocator, This->cookie, (++This->cur_surface)%This->num_surfaces, 0, &info.lpSurf); >> + /* Sometimes apps refuse to return the surface we request, >> + * so try each and see if any are available if the first fails */ >> + for (i = 0; i < This->num_surfaces; i++) { >> + hr = IVMRSurfaceAllocatorEx9_GetSurface(This->allocator, This->cookie, >> + (++This->cur_surface) % This->num_surfaces, 0, &info.lpSurf); >> + if (SUCCEEDED (hr)) >> + break; >> + } >> >> - if (FAILED(hr)) >> + if (FAILED(hr)) { >> + ERR("Failed to get render surface (%x)\n", hr); >> return hr; >> + } >> >> VMR9_SendSampleData(This, &info, pbSrcStream, cbSrcStream); >> IDirect3DSurface9_Release(info.lpSurf); >> -- >> 2.7.4 >> >> >> -- Jan Schmidt, Centricular Ltd - http://centricular.com/

July 20, 2016

Re: [PATCH 1/5] wined3d: Fix immediate draws when ARB_vertex_array_bgra is not supported.

by Henri Verbeet

On 20 July 2016 at 16:21, Matteo Bruni <matteo.mystral(a)gmail.com> wrote: > It's a bit more convoluted than that. When ARB_vertex_array_bgra is > not supported, FFP draws usually fall back to immediate mode because > of the check in context_update_stream_info(). There is no shader > swizzling in that case [...] Yes, but I'd call that a bug. (As an aside, some of those fall-backs to immediate mode could perhaps be avoided by taking stream_info->swizzle_mask into account. It's probably not worth it because diffuse/specular almost always use D3DCOLOR.) > [...] so we need to swizzle when uploading the > attribute. If ARB_vertex_array_bgra is supported we never need to > swizzle the attribute [...] You do for immediate mode draws. Data is stored in BGRA order, which is expected to be mapped to "zyxw" in shaders. If ARB_vertex_array_bgra is supported, the shader backend assumes this happens on upload, either through GL_BGRA for array draws or through manual swizzling for immediate mode draws. If ARB_vertex_array_bgra is not supported, the shader backend does it by itself. (The decision whether the shader needs to swizzle ultimately happens in context_stream_info_from_declaration() by setting bits in the "swizzle_map".) > [...] so the above change seems at least a fix for > that case (although if ARB_vertex_array_bgra is supported we generally > don't fallback to immediate mode either, so that doesn't matter much > in practice). > context_update_stream_info() only checks for DIFFUSE and SPECULAR > though so I guess if other attributes use D3DCOLOR we're currently > screwed. But D3DCOLOR / WINED3DFMT_B8G8R8A8_UNORM is not valid for a lot of other attributes for fixed function draws. (See also declaration_element_valid_ffp().) I notice it's also allowed for WINED3D_DECL_USAGE_BLEND_WEIGHT though, which may actually get used these days. > The immediate mode check is in the !VS-only branch so it would not > apply to non-FFP draws. Those get the shader swizzle instead and thus > work fine. Yeah, that's the reason this mostly works in practice, but I think it's fragile to depend on that. I also think it makes it a little more confusing when you need to swizzle on upload and when you don't. I.e., the current rule is perhaps somewhat under-documented, but I think it's a good thing it's fairly simple. > I guess there is an exception here too which is instanced > draws when both ARB_vertex_array_bgra and ARB_instanced_arrays are > missing AND one of the instance attributes is D3DCOLOR. You can also end up with immediate mode shader draws when "half_float_conv_needed" is set on the vertex declaration.

July 20, 2016

Re: [PATCH 3/4] quartz: Try all surfaces when calling GetSurface

by Andrew Eikum

On Wed, Jul 20, 2016 at 02:37:11PM +1000, Jan Schmidt wrote: > If the surface we want is refused, cycle through all > possible ones. Some applications (Silver at least) > request 2 surfaces, but then refuse to return anything > other than the first one. > I'm not necessarily opposed to this, but it does seem unlikely that the application would request two surfaces be used, but only provide one. I noticed that we set num_surfaces to 2 in VMR9_maybe_init. Is this function calling IVMRSurfaceAllocatorEx9::InitializeDevice on the application-provided allocator, or on our default implementation? This seems like where the application should tell us it wants only one surface. If it is calling the application's allocator, then maybe they don't handle VMR9AllocationInfo::MinBuffers > 1 very well. Why do we set MinBuffers to 2 here, I wonder. Aric? Andrew > Signed-off-by: Jan Schmidt <jan(a)centricular.com> > --- > dlls/quartz/vmr9.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c > index d590a71..8455678 100644 > --- a/dlls/quartz/vmr9.c > +++ b/dlls/quartz/vmr9.c > @@ -292,6 +292,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pS > REFERENCE_TIME tStart, tStop; > VMR9PresentationInfo info; > HRESULT hr; > + int i; > > TRACE("%p %p\n", iface, pSample); > > @@ -338,10 +339,19 @@ static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pS > info.szAspectRatio.cx = This->bmiheader.biWidth; > info.szAspectRatio.cy = This->bmiheader.biHeight; > > - hr = IVMRSurfaceAllocatorEx9_GetSurface(This->allocator, This->cookie, (++This->cur_surface)%This->num_surfaces, 0, &info.lpSurf); > + /* Sometimes apps refuse to return the surface we request, > + * so try each and see if any are available if the first fails */ > + for (i = 0; i < This->num_surfaces; i++) { > + hr = IVMRSurfaceAllocatorEx9_GetSurface(This->allocator, This->cookie, > + (++This->cur_surface) % This->num_surfaces, 0, &info.lpSurf); > + if (SUCCEEDED (hr)) > + break; > + } > > - if (FAILED(hr)) > + if (FAILED(hr)) { > + ERR("Failed to get render surface (%x)\n", hr); > return hr; > + } > > VMR9_SendSampleData(This, &info, pbSrcStream, cbSrcStream); > IDirect3DSurface9_Release(info.lpSurf); > -- > 2.7.4 > > >

July 20, 2016

Re: [PATCH 1/5] wined3d: Fix immediate draws when ARB_vertex_array_bgra is not supported.

by Matteo Bruni

2016-07-20 10:13 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: > On 20 July 2016 at 00:33, Matteo Bruni <mbruni(a)codeweavers.com> wrote: >> @@ -5848,7 +5850,7 @@ static void wined3d_adapter_init_ffp_attrib_ops(struct wined3d_adapter *adapter) >> ops->generic[WINED3D_FFP_EMIT_FLOAT2] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib2fv; >> ops->generic[WINED3D_FFP_EMIT_FLOAT3] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib3fv; >> ops->generic[WINED3D_FFP_EMIT_FLOAT4] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib4fv; >> - if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) >> + if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) >> ops->generic[WINED3D_FFP_EMIT_D3DCOLOR] = generic_d3dcolor; >> else >> ops->generic[WINED3D_FFP_EMIT_D3DCOLOR] = > This looks wrong. When ARB_vertex_array_bgra is not supported, shaders > swizzle the corresponding input registers (see also > shader_glsl_swizzle_to_str() and shader_arb_get_swizzle()), so the > attribute upload code shouldn't. It's a bit more convoluted than that. When ARB_vertex_array_bgra is not supported, FFP draws usually fall back to immediate mode because of the check in context_update_stream_info(). There is no shader swizzling in that case so we need to swizzle when uploading the attribute. If ARB_vertex_array_bgra is supported we never need to swizzle the attribute so the above change seems at least a fix for that case (although if ARB_vertex_array_bgra is supported we generally don't fallback to immediate mode either, so that doesn't matter much in practice). context_update_stream_info() only checks for DIFFUSE and SPECULAR though so I guess if other attributes use D3DCOLOR we're currently screwed. The immediate mode check is in the !VS-only branch so it would not apply to non-FFP draws. Those get the shader swizzle instead and thus work fine. I guess there is an exception here too which is instanced draws when both ARB_vertex_array_bgra and ARB_instanced_arrays are missing AND one of the instance attributes is D3DCOLOR. Eventually for GL ES (which I think doesn't have anything equivalent to ARB_vertex_array_bgra) we'll need to always handle this in the shader since we can't fallback to immediate mode there. I guess I'll try to write a patch going in that direction since it should also clean things up WRT the above cases on desktop OpenGL.

July 20, 2016

Re: [5/5] msvcirt: Implement istream::getdouble

by Marvin

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=24393 Your paranoid android. === wxppro (32 bit msvcirt) === msvcirt.c:4839: Test failed: Test 48: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 49: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 50: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 51: wrong return, expected 4 got 5 msvcirt.c:4841: Test failed: Test 52: expected 2 got 0 msvcirt.c:4843: Test failed: Test 52: expected 003E601D got 003E601C msvcirt.c:4839: Test failed: Test 54: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 57: wrong return, expected -1 got 0 msvcirt.c:4839: Test failed: Test 58: wrong return, expected -1 got 0 msvcirt.c:4839: Test failed: Test 59: wrong return, expected -1 got 0 msvcirt.c:4839: Test failed: Test 61: wrong return, expected 0 got 1 msvcirt.c:4839: Test failed: Test 62: wrong return, expected 1 got 2 === w2003std (32 bit msvcirt) === msvcirt.c:4839: Test failed: Test 48: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 49: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 50: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 51: wrong return, expected 4 got 5 msvcirt.c:4841: Test failed: Test 52: expected 2 got 0 msvcirt.c:4843: Test failed: Test 52: expected 003D60B5 got 003D60B4 msvcirt.c:4839: Test failed: Test 54: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 57: wrong return, expected -1 got 0 msvcirt.c:4839: Test failed: Test 58: wrong return, expected -1 got 0 msvcirt.c:4839: Test failed: Test 59: wrong return, expected -1 got 0 msvcirt.c:4839: Test failed: Test 61: wrong return, expected 0 got 1 msvcirt.c:4839: Test failed: Test 62: wrong return, expected 1 got 2

July 20, 2016

Re: [PATCH 2/4] quartz: Images in Direct3D surfaces must be top-down

by Jan Schmidt

On 20/07/16 20:23, Henri Verbeet wrote: > On 20 July 2016 at 11:48, Jan Schmidt <jan(a)centricular.com> wrote: >>> If it isn't, it may be better to just flip the image when presenting it. >> >> Do you mean when presenting inside D3D? > I was thinking about VMR9_ImagePresenter_PresentTexture() and > VMR9_ImagePresenter_PresentOffscreenSurface(), but reading up a bit > about vmr9, those wouldn't be used in renderless mode. That also means > this is likely the right way to handle this, although tests are still > a good thing. > Ah, right - yes. J. -- Jan Schmidt, Centricular Ltd - http://centricular.com/

July 20, 2016

Re: [resend PATCH] msscript: Implement SetAdvise/GetAdvise

by Nikolay Sivov

On 20.07.2016 12:42, Jacek Caban wrote: > Hi Nikolay, > > On 19.07.2016 20:42, Nikolay Sivov wrote: >> -static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD advf, IAdviseSink *sink) >> +static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD flags, IAdviseSink *sink) >> { >> ScriptControl *This = impl_from_IViewObjectEx(iface); >> >> - FIXME("(%p)->(%d %d %p)\n", This, aspects, advf, sink); >> + TRACE("(%p)->(%d %#x %p)\n", This, aspects, flags, sink); >> >> - return E_NOTIMPL; >> + if (aspects != DVASPECT_CONTENT) >> + return DV_E_DVASPECT; > > Since only DVASPECT_CONTENT is supported and it's also a default value, > is there a reason to bother storing it in the object? No, no reason. Thanks. > > Thanks, > Jacek > >

July 20, 2016

Re: [PATCH] kernel32: Implement SetConsoleFont

by Hugh McMaster

On Wednesday, 20 July 2016 12:04 AM, Sebastian Lackner wrote: > On 19.07.2016 15:50, Hugh McMaster wrote: > > We decided a while back to only have one font in our font table. I guess that makes > > SetConsoleFont redundant for the moment. If we were to implement support for multiple file > > sizes, I'm not sure where that support would reside. Kernel32 is too low-level, as > > enumerating fonts uses GDI32. Any ideas? > > > > Also note that the Windows font table includes the console raster font and the fonts > > listed in LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Console\TrueTypeFont. > > > > We list nothing in that registry key, and wineconsole supports all fonts that meet > > the fixed width criteria, making this a huge task. > > Not sure if its feasible, but you could probably implement the enumeration in wineconsole. > The table could then (for example) be stored in a temporary registry key (similar to how font > caching in gdi32 works). In general, I think we could just enumerate appropriate font sizes for the active console font. Storing the values (i.e. the font sizes) in a temporary registry key seems to me like a good idea. Those values would be accessible from kernel32 because the registry calls are forwarded to advapi32.

July 20, 2016

Re: [PATCH 2/4] quartz: Images in Direct3D surfaces must be top-down

by Henri Verbeet

On 20 July 2016 at 11:48, Jan Schmidt <jan(a)centricular.com> wrote: >> If it isn't, it may be better to just flip the image when presenting it. > > Do you mean when presenting inside D3D? I was thinking about VMR9_ImagePresenter_PresentTexture() and VMR9_ImagePresenter_PresentOffscreenSurface(), but reading up a bit about vmr9, those wouldn't be used in renderless mode. That also means this is likely the right way to handle this, although tests are still a good thing.

July 20, 2016

Re: [PATCH 2/4] quartz: Images in Direct3D surfaces must be top-down

by Jan Schmidt

On 20/07/16 18:47, Henri Verbeet wrote: > On 20 July 2016 at 06:37, Jan Schmidt <jan(a)centricular.com> wrote: >> Invert images when copying to a Direct3D surface if >> they are provided bottom-up. >> > Is that observable behaviour? I.e., could you write a test that > verifies where the data ends up in the surface? I think one could construct a test. It'd be slightly elaborate - Configure a Quartz VMR9 renderer to use a custom D3D allocator / presenter, feeding a video buffer media sample to it, and then read the D3D surface contents and verify that the received D3D surface is the right way up. I'm not entirely sure how to write that test yet though - I'm a GStreamer dev, and I've only ever looked at Wine code in the last 5 days. > If it isn't, it may be better to just flip the image when presenting it. Do you mean when presenting inside D3D? I think achieving that would be tricky - you'd need to mark the surface as vertically inverted and handle that anywhere the contents might be accessed inside D3D, or when handing out pointers to the data via API like IDirect3DSurface9_LockRect. I'm guessing though - I don't really know much about D3D - I based this patch off https://msdn.microsoft.com/en-us/library/windows/desktop/aa473780(v=vs.85).… which says "any image that is contained in a Direct3D surface must be top-down" - Jan. -- Jan Schmidt, Centricular Ltd - http://centricular.com/

July 20, 2016

Re: [resend PATCH] msscript: Implement SetAdvise/GetAdvise

by Jacek Caban

Hi Nikolay, On 19.07.2016 20:42, Nikolay Sivov wrote: > -static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD advf, IAdviseSink *sink) > +static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD flags, IAdviseSink *sink) > { > ScriptControl *This = impl_from_IViewObjectEx(iface); > > - FIXME("(%p)->(%d %d %p)\n", This, aspects, advf, sink); > + TRACE("(%p)->(%d %#x %p)\n", This, aspects, flags, sink); > > - return E_NOTIMPL; > + if (aspects != DVASPECT_CONTENT) > + return DV_E_DVASPECT; Since only DVASPECT_CONTENT is supported and it's also a default value, is there a reason to bother storing it in the object? Thanks, Jacek

July 20, 2016

Re: hlink/tests: Use wine_dbgstr_guid() to print a REFIID.

by Michael Stefaniuc

On 07/20/2016 10:42 AM, Marvin wrote: > 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=24381 > > Your paranoid android. > > > === w1064 (32 bit hlink) === > hlink.c:414: Test failed: url only: Saved data differs > hlink.c:414: Test failed: url + friendly name: Saved data differs > hlink.c:414: Test failed: url + friendly_name + location: Saved data differs > hlink.c:414: Test failed: url + target frame name: Saved data differs > > === w1064 (64 bit hlink) === > hlink.c:414: Test failed: url only: Saved data differs > hlink.c:414: Test failed: url + friendly name: Saved data differs > hlink.c:414: Test failed: url + friendly_name + location: Saved data differs > hlink.c:414: Test failed: url + target frame name: Saved data differs This are existing test failures. bye michael

July 20, 2016

Re: [PATCH 2/4] quartz: Images in Direct3D surfaces must be top-down

by Henri Verbeet

On 20 July 2016 at 06:37, Jan Schmidt <jan(a)centricular.com> wrote: > Invert images when copying to a Direct3D surface if > they are provided bottom-up. > Is that observable behaviour? I.e., could you write a test that verifies where the data ends up in the surface? If it isn't, it may be better to just flip the image when presenting it.

July 20, 2016

Re: hlink/tests: Use wine_dbgstr_guid() to print a REFIID.

by Marvin

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=24381 Your paranoid android. === w1064 (32 bit hlink) === hlink.c:414: Test failed: url only: Saved data differs hlink.c:414: Test failed: url + friendly name: Saved data differs hlink.c:414: Test failed: url + friendly_name + location: Saved data differs hlink.c:414: Test failed: url + target frame name: Saved data differs === w1064 (64 bit hlink) === hlink.c:414: Test failed: url only: Saved data differs hlink.c:414: Test failed: url + friendly name: Saved data differs hlink.c:414: Test failed: url + friendly_name + location: Saved data differs hlink.c:414: Test failed: url + target frame name: Saved data differs

July 20, 2016

Re: [PATCH 1/5] wined3d: Fix immediate draws when ARB_vertex_array_bgra is not supported.

by Henri Verbeet

On 20 July 2016 at 00:33, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -5848,7 +5850,7 @@ static void wined3d_adapter_init_ffp_attrib_ops(struct wined3d_adapter *adapter) > ops->generic[WINED3D_FFP_EMIT_FLOAT2] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib2fv; > ops->generic[WINED3D_FFP_EMIT_FLOAT3] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib3fv; > ops->generic[WINED3D_FFP_EMIT_FLOAT4] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib4fv; > - if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) > + if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) > ops->generic[WINED3D_FFP_EMIT_D3DCOLOR] = generic_d3dcolor; > else > ops->generic[WINED3D_FFP_EMIT_D3DCOLOR] = This looks wrong. When ARB_vertex_array_bgra is not supported, shaders swizzle the corresponding input registers (see also shader_glsl_swizzle_to_str() and shader_arb_get_swizzle()), so the attribute upload code shouldn't.

July 20, 2016

[v2 PATCH] d3dx10: Add D3DXCpuOptimizations stub

by Andrey Gusev

+#include <d3dx10.h> Please change to "d3dx10.h"

July 20, 2016

[v2 PATCH] d3dx10: Add D3DXCpuOptimizations stub

by Andrey Gusev

+#include <d3dx10.h> Please change to "d3dx10.h"

July 20, 2016

Re: [PATCH] d3dx10: Add D3DXCpuOptimizations stub

by Alistair Leslie-Hughes

On 20/07/16 15:04, Alex Henrie wrote: > + * Copyright (C) 2007 David Adam > + * Copyright (C) 2007 Tony Wasserka > > Did these people actually contribute anything to this patch? No, it was a copy from d3dx9math.h > Also, D3DX_CPU_OPTIMIZATION was already defined in d3dx9_30_main.c. I > would remove the old definition from d3dx9_30_main.c and make it > include d3dx10math.h instead. > To remove the D3DX_CPU_OPTIMIZATION definition would be a separate patch in it's own right. I will have to workout where it should be defined for d3dx9. Including a dx10 header in dx9 seems like a bad idea. Best Regards Alistair Leslie-Hughes

July 20, 2016

Re: [PATCH] d3dx10: Add D3DXCpuOptimizations stub

by Alex Henrie

+ * Copyright (C) 2007 David Adam + * Copyright (C) 2007 Tony Wasserka Did these people actually contribute anything to this patch? +/* This guaud is the same as D3DX9 to prevent double-inclusion */ Did you mean "guard"? Also, D3DX_CPU_OPTIMIZATION was already defined in d3dx9_30_main.c. I would remove the old definition from d3dx9_30_main.c and make it include d3dx10math.h instead. -Alex

July 20, 2016

Re: [PATCH 02/11] mshtml: Use bind_to_tree callback to parse dynamically added scripts.

by Marvin

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=24357 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

July 19, 2016

Re: [PATCH 01/11] mshtml/tests: Use relative URLs in navigation.js.

by Marvin

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=24356 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

July 19, 2016

Re: [PATCH] msscript: Implement SetAdvise/GetAdvise

by Marvin

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

July 19, 2016

Re: [PATCH] kernel32: Implement SetConsoleFont

by Sebastian Lackner

On 19.07.2016 15:50, Hugh McMaster wrote: > On Tuesday, 19 July 2016 10:52 PM, Sebastian Lackner wrote: >> It looks like your code requests the font size from the wineserver (GetConsoleFontSize) >> just to send it back immediately afterwards. Is that intentional?And wouldn't it make >> more sense to implement support for multiple font sizes first? > > SetConsoleFont uses the index to look up the relevant font size from the system font table, > which is undocumented. Calling GetConsoleFontSize is intentional, although we could look > up the font table ourselves, I suppose. > This method might work in the future (when GetConsoleFontSize is properly implemented), but as long as there is only one entry, its basically just a complicated looking stub. ;) Later, when SetConsoleFont() allows changing the font, it will probably also be necessary to queue a notification event such that wineconsole can update accordingly. > We decided a while back to only have one font in our font table. I guess that makes > SetConsoleFont redundant for the moment. If we were to implement support for multiple file > sizes, I'm not sure where that support would reside. Kernel32 is too low-level, as > enumerating fonts uses GDI32. Any ideas? > > Also note that the Windows font table includes the console raster font and the fonts > listed in LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Console\TrueTypeFont. > > We list nothing in that registry key, and wineconsole supports all fonts that meet > the fixed width criteria, making this a huge task. Not sure if its feasible, but you could probably implement the enumeration in wineconsole. The table could then (for example) be stored in a temporary registry key (similar to how font caching in gdi32 works). > >> Also, please note that the GetNumberOfConsoleFonts() check is unnecessary because >> GetConsoleFontSize() already takes care of that. > > True, good point. > > Thanks for the review. >

July 19, 2016

Re: [PATCH] kernel32: Implement SetConsoleFont

by Hugh McMaster

On Tuesday, 19 July 2016 10:52 PM, Sebastian Lackner wrote: > It looks like your code requests the font size from the wineserver (GetConsoleFontSize) > just to send it back immediately afterwards. Is that intentional?And wouldn't it make > more sense to implement support for multiple font sizes first? SetConsoleFont uses the index to look up the relevant font size from the system font table, which is undocumented. Calling GetConsoleFontSize is intentional, although we could look up the font table ourselves, I suppose. We decided a while back to only have one font in our font table. I guess that makes SetConsoleFont redundant for the moment. If we were to implement support for multiple file sizes, I'm not sure where that support would reside. Kernel32 is too low-level, as enumerating fonts uses GDI32. Any ideas? Also note that the Windows font table includes the console raster font and the fonts listed in LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Console\TrueTypeFont. We list nothing in that registry key, and wineconsole supports all fonts that meet the fixed width criteria, making this a huge task. > Also, please note that the GetNumberOfConsoleFonts() check is unnecessary because > GetConsoleFontSize() already takes care of that. True, good point. Thanks for the review.

July 19, 2016

Re: comctl32: Get rid of TOOLTIPS_SetMargin(), it is just a RECT assignment.

by Nikolay Sivov

On 19.07.2016 10:53, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > dlls/comctl32/tooltips.c | 15 ++------------- > 1 file changed, 2 insertions(+), 13 deletions(-) > > diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c > index eed113e..a0c7ade 100644 > --- a/dlls/comctl32/tooltips.c > +++ b/dlls/comctl32/tooltips.c > @@ -1599,18 +1599,6 @@ TOOLTIPS_SetDelayTime (TOOLTIPS_INFO *infoPtr, DWORD duration, INT nTime) > } > > > -static LRESULT > -TOOLTIPS_SetMargin (TOOLTIPS_INFO *infoPtr, const RECT *lpRect) > -{ > - infoPtr->rcMargin.left = lpRect->left; > - infoPtr->rcMargin.right = lpRect->right; > - infoPtr->rcMargin.bottom = lpRect->bottom; > - infoPtr->rcMargin.top = lpRect->top; > - > - return 0; > -} > - > - > static inline LRESULT > TOOLTIPS_SetMaxTipWidth (TOOLTIPS_INFO *infoPtr, INT MaxWidth) > { > @@ -2261,7 +2249,8 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) > return TOOLTIPS_SetDelayTime (infoPtr, (DWORD)wParam, (INT)LOWORD(lParam)); > > case TTM_SETMARGIN: > - return TOOLTIPS_SetMargin (infoPtr, (LPRECT)lParam); > + infoPtr->rcMargin = *(RECT*)lParam; > + return 0; > > case TTM_SETMAXTIPWIDTH: > return TOOLTIPS_SetMaxTipWidth (infoPtr, (INT)lParam); > I think this needs test to see if any rectangle is accepted, for example with negative values. If we need to validate it, it's easier to do in a helper to match the rest of code.

July 19, 2016

Re: [PATCH] kernel32: Implement SetConsoleFont

by Sebastian Lackner

On 19.07.2016 14:34, Hugh McMaster wrote: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/kernel32/console.c | 27 ++++++++++++++++++++++++--- > dlls/kernel32/tests/console.c | 6 +++--- > 2 files changed, 27 insertions(+), 6 deletions(-) > It looks like your code requests the font size from the wineserver (GetConsoleFontSize) just to send it back immediately afterwards. Is that intentional? And wouldn't it make more sense to implement support for multiple font sizes first? Also, please note that the GetNumberOfConsoleFonts() check is unnecessary because GetConsoleFontSize() already takes care of that.

July 19, 2016

Re: [PATCH] kernel32: Implement SetConsoleFont

by Marvin

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=24347 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2884226813 console.c:1445: Test failed: [15] Expected output count to be 0, got 2884226813 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2884226813 console.c:1689: Test failed: [13] Expected output count to be 0, got 2884226813 console.c:1689: Test failed: [15] Expected output count to be 0, got 2884226813 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2884226813 === w864 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 1106048744 console.c:1445: Test failed: [15] Expected output count to be 0, got 1106048744 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1106048744 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 1106048744 console.c:1689: Test failed: [15] Expected output count to be 0, got 1106048744 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1106048744 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 131584522 console.c:1445: Test failed: [15] Expected output count to be 0, got 131584522 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 131584522 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 131584522 console.c:1689: Test failed: [15] Expected output count to be 0, got 131584522 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 131584522 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

July 19, 2016

Re: [1/3] wininet: Don't return available data sizes larger than the read buffer.

by Hans Leidekker

On Tue, 2016-07-19 at 04:38 -0500, Marvin wrote: > 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=24338 > > Your paranoid android. > > > === w864 (64 bit http) === > http.c:5309: Test failed: HttpSendRequest failed: 8 This is a connection failure in test_secure_connection. It didn't occur in the next test run: https://testbot.winehq.org/JobDetails.pl?Key=24339

July 19, 2016

Re: [1/3] wininet: Don't return available data sizes larger than the read buffer.

by Marvin

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=24338 Your paranoid android. === w864 (64 bit http) === http.c:5309: Test failed: HttpSendRequest failed: 8

July 19, 2016

Re: [v2 1/1] dinput: Sort virtual joysticks by name on the Mac

by Ken Thomases

On Jul 19, 2016, at 2:59 AM, DavidL <david.dljunk(a)gmail.com> wrote: > > On Mon, Jul 18, 2016 at 10:59 PM, Ken Thomases <ken(a)codeweavers.com <mailto:ken(a)codeweavers.com>> wrote: > On Jul 18, 2016, at 1:57 AM, David Lawrie <david.dljunk(a)gmail.com <mailto:david.dljunk(a)gmail.com>> wrote: > > > + else if (ref) > > + name = CFCopyDescription(ref); > > + else > > + name = CFStringCreateCopy(kCFAllocatorDefault,CFSTR("(null)")); > > You don't want to fall back to a string based on the vendor and product ID? > > I thought about it, but then I wanted to try to hew as close to the behavior of debugstr_cf as possible since that is the output that the user sees already in trace logs. I don't think it's particularly important that they match to that degree. First, users generally don't see the trace logs. Second, it's good enough that they match when the product property is non-null. There's no strong reason to make them match for the null case. It's fine to have this function return something more useful than that, especially since it's currently used as a sort key and "(null)" is useless for that. > This label "(null)" is how debugstr handles that case. The alternative of course is changing both functions to try to get the venture/product ID - though I think the concern is if it doesn't have aProductKey it may not have a proper productId or vendorID either I have no objection if you want to make debugstr_device() also include the vendor/product ID as a fallback, but I don't think it's especially important. The result from copy_device_name() is not currently logged, so there's no way for a reader of the logs to benefit if the two functions match in that way, nor lose anything if they don't match. > ... also there is a function get_os_x_device_name (in dinput only) which doesn't handle this case at all I don't think. What's your recommendation? I don't know how important it is for get_osx_device_name() to return a non-empty name. It could be changed to call copy_device_name() to get the name and then extract that to the buffer. Mind you, it's currently buggy in how it treats the CFString length vs. the buffer length. The former is in number of UTF-16 code units, the latter in terms of ASCII characters, so they're not directly comparable. (Also, nothing ever checks the function's return value, so returning the supposed required length doesn't achieve anything.) > > @@ -203,7 +227,18 @@ static void copy_set_to_array(const void *value, void *context) > > CFArrayAppendValue(context, value); > > } > > > > -static CFComparisonResult device_location_comparator(const void *val1, const void *val2, void *context) > > +static CFComparisonResult device_name_comparator(IOHIDDeviceRef device1, IOHIDDeviceRef device2) > > +{ > > + CFStringRef name1 = copy_device_name(device1), name2 = copy_device_name(device2); > > + CFComparisonResult result = CFStringCompare(name1, name2, (kCFCompareForcedOrdering | kCFCompareNumerically)); > > + if(name1) > > + CFRelease(name1); > > + if(name2) > > + CFRelease(name2); > > If name1 or name2 might be NULL as these tests imply, then what does the preceding CFStringCompare() call do? Probably crashes. So, either assume/assure that copy_device_name() doesn't return NULL in normal operation or handle the possibility that it might more thoroughly. > > Actually I think it doesn't crash, though I should test it to be sure. Testing isn't appropriate. It could work in some versions of the frameworks and not in others. The authority on the design contract is the documentation (including header comments), with the understanding that if it doesn't explicitly say that NULL is acceptable, then it's not. > However, maybe for completeness/robustness I should include if statements dealing with all the possible name-NULL combinations and return - something like: > > if ((!name1 && !name2) || !name1) > return lessThan; > else if (!name2) > return greaterThan; > > Then it wouldn't matter what CFStringCompare's behavior was if it crashes ... or I could set name equal to an empty string in copy_device_name which would have the same effect as the above few lines. Returning the empty string is probably simplest. If you go the pointer testing route, then surely (!name1 && !name2) implies equal, not less-than. -Ken

July 19, 2016

Re: [PATCH 1/2] msctf: Don't crash on NULL input in EnumLanguageProfiles().

by Michael Stefaniuc

On 07/19/2016 09:56 AM, Marvin wrote: > 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=24335 > > Your paranoid android. > > > === w864 (32 bit inputprocessor) === > inputprocessor.c:834: Test failed: Deactivation came unexpectedly This is an existing failure. bye michael

July 19, 2016

Re: [v2 1/1] dinput: Sort virtual joysticks by name on the Mac

by DavidL

On Mon, Jul 18, 2016 at 10:59 PM, Ken Thomases <ken(a)codeweavers.com> wrote: > On Jul 18, 2016, at 1:57 AM, David Lawrie <david.dljunk(a)gmail.com> wrote: > > > +static CFStringRef copy_device_name(IOHIDDeviceRef device) > > +{ > > + CFTypeRef ref; > > + CFStringRef name = NULL; > > + > > + if(device) > > Maybe didn't notice this in the previous version, but put a space between > "if" and the parenthesis. > will do > > > + { > > + assert(IOHIDDeviceGetTypeID() == CFGetTypeID(device)); > > + > > + ref = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey)); > > + > > + if (ref && CFStringGetTypeID() == CFGetTypeID(ref)) > > + name = CFStringCreateCopy(kCFAllocatorDefault,ref); > > Please use a space after the comma in argument lists in function calls. > will do > > > + else if (ref) > > + name = CFCopyDescription(ref); > > + else > > + name = > CFStringCreateCopy(kCFAllocatorDefault,CFSTR("(null)")); > > You don't want to fall back to a string based on the vendor and product ID? > I thought about it, but then I wanted to try to hew as close to the behavior of debugstr_cf as possible since that is the output that the user sees already in trace logs. This label "(null)" is how debugstr handles that case. The alternative of course is changing both functions to try to get the venture/product ID - though I think the concern is if it doesn't have aProductKey it may not have a proper productId or vendorID either ... also there is a function get_os_x_device_name (in dinput only) which doesn't handle this case at all I don't think. What's your recommendation? > > Also, the same spacing issue as above. > will do > > > + } > > + else > > + ERR("Invalid Device requested %p\n",device); > > At this point, device is known to be NULL, so the log message can say that > rather than the vague "invalid", and doesn't need to include its value. Or > did you mean to be checking something else in the "if"? > Ah right, good point! :) > > > + > > + return name; > > +} > > + > > static long get_device_location_ID(IOHIDDeviceRef device) > > { > > return get_device_property_long(device, CFSTR(kIOHIDLocationIDKey)); > > @@ -203,7 +227,18 @@ static void copy_set_to_array(const void *value, > void *context) > > CFArrayAppendValue(context, value); > > } > > > > -static CFComparisonResult device_location_comparator(const void *val1, > const void *val2, void *context) > > +static CFComparisonResult device_name_comparator(IOHIDDeviceRef > device1, IOHIDDeviceRef device2) > > +{ > > + CFStringRef name1 = copy_device_name(device1), name2 = > copy_device_name(device2); > > + CFComparisonResult result = CFStringCompare(name1, name2, > (kCFCompareForcedOrdering | kCFCompareNumerically)); > > + if(name1) > > + CFRelease(name1); > > + if(name2) > > + CFRelease(name2); > > If name1 or name2 might be NULL as these tests imply, then what does the > preceding CFStringCompare() call do? Probably crashes. So, either > assume/assure that copy_device_name() doesn't return NULL in normal > operation or handle the possibility that it might more thoroughly. > Actually I think it doesn't crash, though I should test it to be sure. However, maybe for completeness/robustness I should include if statements dealing with all the possible name-NULL combinations and return - something like: if ((!name1 && !name2) || !name1) return lessThan; else if (!name2) return greaterThan; Then it wouldn't matter what CFStringCompare's behavior was if it crashes ... or I could set name equal to an empty string in copy_device_name which would have the same effect as the above few lines. > > -Ken > > --David

July 19, 2016

Re: [PATCH 1/2] msctf: Don't crash on NULL input in EnumLanguageProfiles().

by Marvin

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=24335 Your paranoid android. === w864 (32 bit inputprocessor) === inputprocessor.c:834: Test failed: Deactivation came unexpectedly

July 19, 2016

Re: shell32: add SHGetPropertyStoreForWindow stub (try 2)

by Nikolay Sivov

> +HRESULT WINAPI SHGetPropertyStoreForWindow(HWND hwnd, REFIID riid, void **ppv) > +{ > + FIXME("(%p %p %p) stub!\n", hwnd, riid, ppv); > + return E_NOTIMPL; > +} Not very important, but riid could be traced.

July 19, 2016

Re: [PATCH 7/7] d3d11/tests: Add test for bitwise shader instructions.

by Józef Kucia

On Mon, Jul 18, 2016 at 1:27 PM, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + return uint4(~bits[0], ~(bits[0] & ~0u), ~bits[1], ~(bits[1] & ~0u)); This is a mistake. It should read "return uint4(~bits[0], ~(bits[0] ^ ~0u), ~bits[1], ~(bits[1] ^ ~0u));".

July 19, 2016

Re: [v2 1/1] winejoystick.drv: Sort virtual joysticks by name on the Mac

by Ken Thomases

On Jul 18, 2016, at 1:57 AM, David Lawrie <david.dljunk(a)gmail.com> wrote: > > Tested on OS X 10.10.5. > > Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> > --- > dlls/winejoystick.drv/joystick_osx.c | 49 ++++++++++++++++++++++++++++++++---- > 1 file changed, 44 insertions(+), 5 deletions(-) Same comments as for the dinput version. -Ken

July 19, 2016

Re: [v2 1/1] dinput: Sort virtual joysticks by name on the Mac

by Ken Thomases

On Jul 18, 2016, at 1:57 AM, David Lawrie <david.dljunk(a)gmail.com> wrote: > +static CFStringRef copy_device_name(IOHIDDeviceRef device) > +{ > + CFTypeRef ref; > + CFStringRef name = NULL; > + > + if(device) Maybe didn't notice this in the previous version, but put a space between "if" and the parenthesis. > + { > + assert(IOHIDDeviceGetTypeID() == CFGetTypeID(device)); > + > + ref = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey)); > + > + if (ref && CFStringGetTypeID() == CFGetTypeID(ref)) > + name = CFStringCreateCopy(kCFAllocatorDefault,ref); Please use a space after the comma in argument lists in function calls. > + else if (ref) > + name = CFCopyDescription(ref); > + else > + name = CFStringCreateCopy(kCFAllocatorDefault,CFSTR("(null)")); You don't want to fall back to a string based on the vendor and product ID? Also, the same spacing issue as above. > + } > + else > + ERR("Invalid Device requested %p\n",device); At this point, device is known to be NULL, so the log message can say that rather than the vague "invalid", and doesn't need to include its value. Or did you mean to be checking something else in the "if"? > + > + return name; > +} > + > static long get_device_location_ID(IOHIDDeviceRef device) > { > return get_device_property_long(device, CFSTR(kIOHIDLocationIDKey)); > @@ -203,7 +227,18 @@ static void copy_set_to_array(const void *value, void *context) > CFArrayAppendValue(context, value); > } > > -static CFComparisonResult device_location_comparator(const void *val1, const void *val2, void *context) > +static CFComparisonResult device_name_comparator(IOHIDDeviceRef device1, IOHIDDeviceRef device2) > +{ > + CFStringRef name1 = copy_device_name(device1), name2 = copy_device_name(device2); > + CFComparisonResult result = CFStringCompare(name1, name2, (kCFCompareForcedOrdering | kCFCompareNumerically)); > + if(name1) > + CFRelease(name1); > + if(name2) > + CFRelease(name2); If name1 or name2 might be NULL as these tests imply, then what does the preceding CFStringCompare() call do? Probably crashes. So, either assume/assure that copy_device_name() doesn't return NULL in normal operation or handle the possibility that it might more thoroughly. -Ken

July 19, 2016

Re: [3/4] vcomp: Implement 8-bit atomic instructions.

by Alexandre Julliard

Sebastian Lackner <sebastian(a)fds-team.de> writes: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > dlls/vcomp/main.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ > dlls/vcomp/vcomp.spec | 22 ++++---- > dlls/vcomp100/vcomp100.spec | 22 ++++---- > dlls/vcomp110/vcomp110.spec | 22 ++++---- > dlls/vcomp120/vcomp120.spec | 22 ++++---- > dlls/vcomp90/vcomp90.spec | 22 ++++---- > 6 files changed, 164 insertions(+), 55 deletions(-) It doesn't compile here (gcc 5.4.0): gcc -m32 -c -o main.o main.c -I. -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe \ -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers \ -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wvla -Wwrite-strings -Wpointer-arith \ -Wlogical-op -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -Werror -g -O2 -fno-diagnostics-show-caret main.c: Assembler messages: main.c:246: Error: bad register name `%sil' main.c:246: Error: bad register name `%dil' main.c:246: Error: bad register name `%dil' main.c:246: Error: bad register name `%sil' main.c:246: Error: bad register name `%sil' main.c:246: Error: bad register name `%sil' main.c:246: Error: bad register name `%sil' main.c:246: Error: bad register name `%sil' main.c:246: Error: bad register name `%sil' Makefile:163: recipe for target 'main.o' failed make[1]: *** [main.o] Error 1 -- Alexandre Julliard julliard(a)winehq.org

July 18, 2016

Re: shell32: add SHGetPropertyStoreForWindow stub

by Alex Henrie

@ stdcall SHGetPropertyStoreFromParsingName(wstr ptr long ptr ptr) +@ stdcall SHGetPropertyStoreForWindow(long ptr ptr) Switch these two lines to get alphabetical order. -Alex

July 18, 2016

Re: [PATCH] wined3d: Test and enable ARB_gpu_shader5 in shaders.

by Henri Verbeet

On 18 July 2016 at 23:04, Matteo Bruni <matteo.mystral(a)gmail.com> wrote: > 2016-07-18 22:53 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: >> On 18 July 2016 at 21:57, Matteo Bruni <matteo.mystral(a)gmail.com> wrote: >>> 2016-07-18 14:52 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: >>>> On 18 July 2016 at 14:31, Józef Kucia <joseph.kucia(a)gmail.com> wrote: >>>>> As it was already mentioned the plan was to use GLSL 4.30 for shader >>>>> model 5. However, it shouldn't be much of a burden to also support SM5 >>>>> bitwise opcodes with ARB_gpu_shader5. >>>>> >>>> Sure, but is there a reason to? >>> >>> OpenGL 3.2 + GLSL 1.50 + ARB_gpu_shader5 + ARB_tessellation_shader + >>> ARB_texture_view + whatever else is necessary should also work for >>> d3d11 / SM5, no? That would eventually make a bunch of Mesa drivers >>> support d3d11 which otherwise wouldn't (like my AMD REDWOOD which >>> AFAICS will not ever get anything above GL 3.3 / GLSL 3.30 because it >>> doesn't support doubles). >> SM5 has doubles. > > Those are only optional in SM5 though, see > https://msdn.microsoft.com/en-us/library/windows/desktop/ff476876(v=vs.85).… > note 2 and https://msdn.microsoft.com/en-us/library/windows/desktop/ff476124(v=vs.85).…. > I'm pretty sure SM5 games generally don't require doubles. Right, so sure.

July 18, 2016

Re: [PATCH] wined3d: Test and enable ARB_gpu_shader5 in shaders.

by Matteo Bruni

2016-07-18 22:53 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: > On 18 July 2016 at 21:57, Matteo Bruni <matteo.mystral(a)gmail.com> wrote: >> 2016-07-18 14:52 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: >>> On 18 July 2016 at 14:31, Józef Kucia <joseph.kucia(a)gmail.com> wrote: >>>> As it was already mentioned the plan was to use GLSL 4.30 for shader >>>> model 5. However, it shouldn't be much of a burden to also support SM5 >>>> bitwise opcodes with ARB_gpu_shader5. >>>> >>> Sure, but is there a reason to? >> >> OpenGL 3.2 + GLSL 1.50 + ARB_gpu_shader5 + ARB_tessellation_shader + >> ARB_texture_view + whatever else is necessary should also work for >> d3d11 / SM5, no? That would eventually make a bunch of Mesa drivers >> support d3d11 which otherwise wouldn't (like my AMD REDWOOD which >> AFAICS will not ever get anything above GL 3.3 / GLSL 3.30 because it >> doesn't support doubles). > SM5 has doubles. Those are only optional in SM5 though, see https://msdn.microsoft.com/en-us/library/windows/desktop/ff476876(v=vs.85).… note 2 and https://msdn.microsoft.com/en-us/library/windows/desktop/ff476124(v=vs.85).…. I'm pretty sure SM5 games generally don't require doubles.

July 18, 2016

Re: [PATCH] wined3d: Test and enable ARB_gpu_shader5 in shaders.

by Henri Verbeet

On 18 July 2016 at 21:57, Matteo Bruni <matteo.mystral(a)gmail.com> wrote: > 2016-07-18 14:52 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: >> On 18 July 2016 at 14:31, Józef Kucia <joseph.kucia(a)gmail.com> wrote: >>> As it was already mentioned the plan was to use GLSL 4.30 for shader >>> model 5. However, it shouldn't be much of a burden to also support SM5 >>> bitwise opcodes with ARB_gpu_shader5. >>> >> Sure, but is there a reason to? > > OpenGL 3.2 + GLSL 1.50 + ARB_gpu_shader5 + ARB_tessellation_shader + > ARB_texture_view + whatever else is necessary should also work for > d3d11 / SM5, no? That would eventually make a bunch of Mesa drivers > support d3d11 which otherwise wouldn't (like my AMD REDWOOD which > AFAICS will not ever get anything above GL 3.3 / GLSL 3.30 because it > doesn't support doubles). SM5 has doubles.

July 18, 2016

Re: [PATCH] wined3d: Test and enable ARB_gpu_shader5 in shaders.

by Matteo Bruni

2016-07-18 14:52 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: > On 18 July 2016 at 14:31, Józef Kucia <joseph.kucia(a)gmail.com> wrote: >> As it was already mentioned the plan was to use GLSL 4.30 for shader >> model 5. However, it shouldn't be much of a burden to also support SM5 >> bitwise opcodes with ARB_gpu_shader5. >> > Sure, but is there a reason to? OpenGL 3.2 + GLSL 1.50 + ARB_gpu_shader5 + ARB_tessellation_shader + ARB_texture_view + whatever else is necessary should also work for d3d11 / SM5, no? That would eventually make a bunch of Mesa drivers support d3d11 which otherwise wouldn't (like my AMD REDWOOD which AFAICS will not ever get anything above GL 3.3 / GLSL 3.30 because it doesn't support doubles).

July 18, 2016

Re: [PATCH] wined3d: Test and enable ARB_gpu_shader5 in shaders.

by Henri Verbeet

On 18 July 2016 at 14:31, Józef Kucia <joseph.kucia(a)gmail.com> wrote: > As it was already mentioned the plan was to use GLSL 4.30 for shader > model 5. However, it shouldn't be much of a burden to also support SM5 > bitwise opcodes with ARB_gpu_shader5. > Sure, but is there a reason to?

July 18, 2016

Re: [PATCH] wined3d: Test and enable ARB_gpu_shader5 in shaders.

by Józef Kucia

As it was already mentioned the plan was to use GLSL 4.30 for shader model 5. However, it shouldn't be much of a burden to also support SM5 bitwise opcodes with ARB_gpu_shader5. Apart from that the other issue is that adding newer OpenGL extensions is generally blocked by bug 38648 [1]. The main reason is that it cannot be tested in the current version of Wine with drivers which do not support compatibility profiles. On Fri, Jul 15, 2016 at 2:25 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > + if (gl_info->supported[ARB_GPU_SHADER5]) > + shader_addline(buffer, "#extension GL_ARB_gpu_shader5 : enable\n"); > if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) > shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); > if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) These should be sorted alphabetically. I guess the ARB_gpu_shader5 extension should also be added to the "core_extensions" table. [1] - https://bugs.winehq.org/show_bug.cgi?id=38648

July 18, 2016

Re: [PATCH] vcruntime140: Forward set_unexpected

by Piotr Caban

On 07/18/16 12:11, Alistair Leslie-Hughes wrote: > dlls/ucrtbase/ucrtbase.spec | 2 +- > dlls/vcruntime140/vcruntime140.spec | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Please also update api-ms-win-crt-private-l1-1-0.spec file. Thanks, Piotr

July 18, 2016

Re: [PATCH] wined3d: Implement SM5 bfrev opcode in glsl.

by Józef Kucia

On Fri, Jul 15, 2016 at 1:25 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/glsl_shader.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c > index 5e23920..376d110 100644 > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > @@ -3538,6 +3538,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) > case WINED3DSIH_ROUND_Z: instruction = "trunc"; break; > case WINED3DSIH_SQRT: instruction = "sqrt"; break; > case WINED3DSIH_UMAX: instruction = "max"; break; > + case WINED3DSIH_BFREV: instruction = "bitfieldReverse"; break; It looks like this should be in alphabetical order.

July 18, 2016

Re: [PATCH] wined3d: Implement SM5 f32tof16 opcode in glsl.

by Józef Kucia

A test would be nice to have. On Fri, Jul 15, 2016 at 1:37 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/arb_program_shader.c | 1 + > dlls/wined3d/glsl_shader.c | 38 ++++++++++++++++++++++++++++++++++++++ > dlls/wined3d/shader_sm4.c | 2 ++ > dlls/wined3d/wined3d_private.h | 1 + > 4 files changed, 42 insertions(+) > > diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c > index 24c1194..9aa4252 100644 > --- a/dlls/wined3d/arb_program_shader.c > +++ b/dlls/wined3d/arb_program_shader.c > @@ -5286,6 +5286,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL > /* WINED3DSIH_EQ */ NULL, > /* WINED3DSIH_EXP */ shader_hw_scalar_op, > /* WINED3DSIH_EXPP */ shader_hw_scalar_op, > + /* WINED3DSIH_F32TOF16 */ NULL, > /* WINED3DSIH_FRC */ shader_hw_map2gl, > /* WINED3DSIH_FTOI */ NULL, > /* WINED3DSIH_FTOU */ NULL, You need to add WINED3DSIH_F32TOF16 in other places as well, e.g. in shader.c. > + shader_addline(ins->ctx->buffer, "unpackHalf2x16(floatBitsToUint(%s)).x", src_param.param_str); You shouldn't need floatBitsToUint. shader_glsl_add_src_param() takes care about it when you set a proper type for the parameter. > + *dst_mask_ptr++ = dst_masks[i]; > + } else > + shader_addline(ins->ctx->buffer, "0"); > + > + if(i != NB_COMPS - 1) > + shader_addline(ins->ctx->buffer, ","); > + shader_addline(ins->ctx->buffer, "\n"); > + } > + > + *dst_mask_ptr++ = '\0'; You shouldn't need to construct dst_mask manually. > + shader_addline(ins->ctx->buffer, ")%s);\n", dst_mask); > +#undef NB_COMPS > +} > + > static void shader_glsl_else(const struct wined3d_shader_instruction *ins) > { > shader_addline(ins->ctx->buffer, "} else {\n"); > @@ -8704,6 +8741,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB > /* WINED3DSIH_EQ */ shader_glsl_relop, > /* WINED3DSIH_EXP */ shader_glsl_scalar_op, > /* WINED3DSIH_EXPP */ shader_glsl_expp, > + /* WINED3DSIH_F32TOF16 */ shader_glsl_f32tof16, > /* WINED3DSIH_FRC */ shader_glsl_map2gl, > /* WINED3DSIH_FTOI */ shader_glsl_to_int, > /* WINED3DSIH_FTOU */ shader_glsl_to_uint, > diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c > index c8fdb32..6c15751 100644 > --- a/dlls/wined3d/shader_sm4.c > +++ b/dlls/wined3d/shader_sm4.c > @@ -215,6 +215,7 @@ enum wined3d_sm4_opcode > WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, > WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, > WINED3D_SM5_OP_GATHER4_C = 0x7e, > + WINED3D_SM5_OP_F32TOF16 = 0x82, > WINED3D_SM5_OP_BFI = 0x8c, > WINED3D_SM5_OP_BFREV = 0x8d, > WINED3D_SM5_OP_SWAPC = 0x8e, > @@ -811,6 +812,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = > {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, > {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, > {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, > + {WINED3D_SM5_OP_F32TOF16, WINED3DSIH_F32TOF16, "f", "f"}, You should use "u" for the source parameters. Similar comments as to other patches also applies.

July 18, 2016

Re: [PATCH 1/2] wined3d: Implement SM5 bfi opcode in glsl.

by Józef Kucia

On Fri, Jul 15, 2016 at 1:53 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/glsl_shader.c | 72 +++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 71 insertions(+), 1 deletion(-) > > diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c > index d8edfdc..b0d3a91 100644 > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > @@ -4380,6 +4380,76 @@ static void shader_glsl_f32tof16(const struct wined3d_shader_instruction *ins) > #undef NB_COMPS > } This patch requires 124405 so it should be in the same series. > > + > +static void shader_glsl_bitfield_op(const struct wined3d_shader_instruction *ins) > +{ > +#define NB_COMPS 4 > + const DWORD write_masks[NB_COMPS] = { > + WINED3DSP_WRITEMASK_0, > + WINED3DSP_WRITEMASK_1, > + WINED3DSP_WRITEMASK_2, > + WINED3DSP_WRITEMASK_3, > + }; You shouldn't need this array. You can assume that WINED3DSP_WRITE_MASK_i = WINED3DSP_WRITE_MASK_0 << i. > + const char dst_masks[NB_COMPS] = { 'x', 'y', 'z', 'w' }; > + const char *prefix; > + const char *suffix; > + int nb_params; For consistency, this should be named "param_count" and should be unsigned int. > + struct glsl_src_param src_param; > + DWORD write_mask; > + char dst_mask[6]; > + char *dst_mask_ptr = dst_mask; > + > + switch(ins->handler_idx) > + { > + case WINED3DSIH_BFI: > + prefix = "bitfieldInsert("; > + suffix = ")"; > + nb_params = 4; > + break; > + > + default: > + prefix = "<unhandled opcode>"; > + suffix = ""; > + nb_params = 0; > + FIXME("Can't handle opcode %s.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); > + } > + > + write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); > + > + *dst_mask_ptr++ = '.'; > + shader_addline(ins->ctx->buffer, "uvec4(\n"); > + > + for (int i = 0; i < NB_COMPS; i++) This requires C99. > + { > + if (write_mask & write_masks[i]) > + { > + shader_addline(ins->ctx->buffer, "%s", prefix); > + for(int j = nb_params - 1; j >= 0; j--) > + { > + shader_glsl_add_src_param(ins, &ins->src[j], write_masks[i], &src_param); > + if(j <= 1) > + shader_addline(ins->ctx->buffer, "int(%s)", src_param.param_str); You shouldn't need this cast. It's better to adjust the parameter types and let shader_glsl_add_src_param() handle this. > + else > + shader_addline(ins->ctx->buffer, "%s", src_param.param_str); > + > + if(j) > + shader_addline(ins->ctx->buffer, ", "); > + } > + shader_addline(ins->ctx->buffer, "%s", suffix); > + *dst_mask_ptr++ = dst_masks[i]; > + } else > + shader_addline(ins->ctx->buffer, "0"); > + > + if(i != NB_COMPS - 1) > + shader_addline(ins->ctx->buffer, ","); > + shader_addline(ins->ctx->buffer, "\n"); > + } > + > + *dst_mask_ptr++ = '\0'; You shouldn't need to build dst_mask manually. > + shader_addline(ins->ctx->buffer, ")%s);\n", dst_mask); > +#undef NB_COMPS I don't like this duplicated enums. Generally, this implementation seems overly complicated. You should be able to do something similar to: for (i = 0; i < 4; ++i) { write_mask = WINED3DSP_WRITEMASK_0 << i; dst.write_mask = ins->dst[0].write_mask & write_mask; if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst, dst.reg.data_type))) continue; shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &bits); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &offset); shader_glsl_add_src_param(ins, &ins->src[2], write_mask, &insert); shader_glsl_add_src_param(ins, &ins->src[3], write_mask, &base); shader_addline(ins->ctx->buffer, "bitfieldInsert(%s, %s, %s, %s));\n", base.param_str, insert.param_str, offset.param_str, bits.param_str); }

July 18, 2016

Re: [4/5] msvcirt: Implement istream::getline

by Piotr Caban

On 07/18/16 10:13, Iván Matellanes wrote: > DEFINE_THISCALL_WRAPPER(istream_getline, 16) > istream* __thiscall istream_getline(istream *this, char *str, int count, char delim) > { > - FIXME("(%p %p %d %c) stub\n", this, str, count, delim); > - return this; > + this->extract_delim++; > + return istream_get_str_delim(this, str, count, (unsigned char) delim); > } You probably need to call ios_lock before updating extract_delim. Thanks, Piotr

July 18, 2016

Re: [v1 1/1] dinput: Sort virtual joysticks by name on the Mac

by DavidL

Hi Ken, So I wanted to try to hew as close to the behavior of debugstr_cf as possible since that is the output that the user sees already in trace logs. Here's how I decided handle each case: static CFStringRef copy_device_name(IOHIDDeviceRef device) > { > CFTypeRef ref; > CFStringRef name = NULL; > > if(device) > { > assert(IOHIDDeviceGetTypeID() == CFGetTypeID(device)); > ref = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey)); > if (ref && CFStringGetTypeID() == CFGetTypeID(ref)) > name = CFStringCreateCopy(kCFAllocatorDefault,ref); > else if (ref) > name = CFCopyDescription(ref); > else > name = CFStringCreateCopy(kCFAllocatorDefault,CFSTR("(null)")); > } > else > ERR("Invalid Device requested %p\n",device); > > return name; > } > > static CFComparisonResult device_name_comparator(IOHIDDeviceRef device1, > IOHIDDeviceRef device2) > { > CFStringRef name1 = copy_device_name(device1), name2 = > copy_device_name(device2); > CFComparisonResult result = CFStringCompare(name1, name2, > (kCFCompareForcedOrdering | kCFCompareNumerically)); > if(name1) > CFRelease(name1); > if(name2) > CFRelease(name2); > return result; > } What do you think? Cheers, David On Sun, Jul 17, 2016 at 8:20 PM, DavidL <david.dljunk(a)gmail.com> wrote: > Right-o! I was wondering what the CFRelease was doing in the debugstr_cf > function. :) > > Cheers, > David > > On Sun, Jul 17, 2016 at 2:11 PM, Ken Thomases <ken(a)codeweavers.com> wrote: > >> On Jul 17, 2016, at 4:08 PM, Ken Thomases <ken(a)codeweavers.com> wrote: >> > >> > On Jul 16, 2016, at 3:15 AM, David Lawrie <david.dljunk(a)gmail.com> >> wrote: >> >> >> >> +static CFStringRef get_device_name(IOHIDDeviceRef device) >> >> +{ >> >> + CFTypeRef ref; >> >> + CFStringRef name = CFSTR("Default Name"); >> > >> > You can probably do better for a fallback. For example, you can format >> the vendor ID and product ID into a string. For an extreme take on this, >> see the Copy_DeviceName() function in Apple's HID Calibrator sample code: >> > >> https://developer.apple.com/library/mac/samplecode/HID_Calibrator/Listings/… >> >> Oh, and for the case where device is NULL, it's fine to return NULL. It >> should never happen and, if it does, we want a crash to figure out why and >> fix things in a better manner, rather than papering over it with a bogus >> value. >> >> -Ken >> >> >

July 18, 2016

Re: [v1 1/1] dinput: Sort virtual joysticks by name on the Mac

by DavidL

Right-o! I was wondering what the CFRelease was doing in the debugstr_cf function. :) Cheers, David On Sun, Jul 17, 2016 at 2:11 PM, Ken Thomases <ken(a)codeweavers.com> wrote: > On Jul 17, 2016, at 4:08 PM, Ken Thomases <ken(a)codeweavers.com> wrote: > > > > On Jul 16, 2016, at 3:15 AM, David Lawrie <david.dljunk(a)gmail.com> > wrote: > >> > >> +static CFStringRef get_device_name(IOHIDDeviceRef device) > >> +{ > >> + CFTypeRef ref; > >> + CFStringRef name = CFSTR("Default Name"); > > > > You can probably do better for a fallback. For example, you can format > the vendor ID and product ID into a string. For an extreme take on this, > see the Copy_DeviceName() function in Apple's HID Calibrator sample code: > > > https://developer.apple.com/library/mac/samplecode/HID_Calibrator/Listings/… > > Oh, and for the case where device is NULL, it's fine to return NULL. It > should never happen and, if it does, we want a crash to figure out why and > fix things in a better manner, rather than papering over it with a bogus > value. > > -Ken > >

July 17, 2016

Re: [PATCH] winex11.drv: Use XRRSetScreenSize with XRRSetCrtcConfig

by Henri Verbeet

On 16 July 2016 at 00:48, Gabriel Corona <gabriel.corona(a)enst-bretagne.fr> wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=33290 > > The nvidia driver is not so happy about using XRRSetCrtcConfig alone > and generates a panning configuration. We set the screen size > accordingly. Moreover we disable the CRT during the transition. > Updating the screen size isn't necessarily wrong, although avoiding panning is the wrong reason. If you don't want panning, make sure it doesn't get enabled in the first place. The main problem with this patch though, is that it's almost certainly wrong for multi-head configurations.

July 17, 2016

Re: [v1 1/1] dinput: Sort virtual joysticks by name on the Mac

by Ken Thomases

On Jul 17, 2016, at 4:08 PM, Ken Thomases <ken(a)codeweavers.com> wrote: > > On Jul 16, 2016, at 3:15 AM, David Lawrie <david.dljunk(a)gmail.com> wrote: >> >> +static CFStringRef get_device_name(IOHIDDeviceRef device) >> +{ >> + CFTypeRef ref; >> + CFStringRef name = CFSTR("Default Name"); > > You can probably do better for a fallback. For example, you can format the vendor ID and product ID into a string. For an extreme take on this, see the Copy_DeviceName() function in Apple's HID Calibrator sample code: > https://developer.apple.com/library/mac/samplecode/HID_Calibrator/Listings/… Oh, and for the case where device is NULL, it's fine to return NULL. It should never happen and, if it does, we want a crash to figure out why and fix things in a better manner, rather than papering over it with a bogus value. -Ken

July 17, 2016

Re: [v1 1/1] winejoystick.drv: Sort virtual joysticks by name on the Mac

by Ken Thomases

On Jul 16, 2016, at 3:15 AM, David Lawrie <david.dljunk(a)gmail.com> wrote: > > Tested on OS X 10.10.5. > > Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> > --- > dlls/winejoystick.drv/joystick_osx.c | 42 +++++++++++++++++++++++++++++++----- > 1 file changed, 37 insertions(+), 5 deletions(-) Same comments as for the dinput version. -Ken

July 17, 2016