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

Re: [PATCH] ucrtbase: Implement _get_narrow_winmain_command_line/_get_wide_winmain_command_line
by Piotr Caban 25 Jul '16

25 Jul '16

On 07/24/16 20:40, Nikolay Sivov wrote: > +/********************************************************************* > + * _get_narrow_winmain_command_line (UCRTBASE.@) > + */ > +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; > +} It will not work in following case (executable name "test ws.exe"): CMD> test" "ws.exe other args or CMD> """test ws.exe" other args Probably there's no real use case for that but it shouldn't be hard to handle this cases as well. Thanks, Piotr

2 1

Re: [v2] ntdll: Keep drive letter size in RtlGetFullPathName_U when full path is specified
by Alexandre Julliard 25 Jul '16

25 Jul '16

Piotr Caban <piotr(a)codeweavers.com> writes: > v2: > - fix cmd test failure Looks like there's another one I missed: ../../../tools/runtest -q -P wine -T ../../.. -M shell32.dll -p shell32_test.exe.so shelllink && touch shelllink.ok shelllink.c:251: Test failed: case doesn't match make: *** [shelllink.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] msxml2: Let msxml3 register Msxml2.DOMDocument
by Alexandre Julliard 25 Jul '16

25 Jul '16

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > When msxml3 is native, msxml2 forwards to msxml3 which then fails > to create an object. On Windows 8.1, Msxml2.DOMDocument > point to Msxml2.DOMDocument.3.0. That should be the case on Wine too. It sounds like there's something broken with your config. Note that mixing native and builtin is not a good idea. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 02/03 v4 ] ntoskrnl.exe: Track drivers created with IoCreateDriver
by Thomas Faber 25 Jul '16

25 Jul '16

> 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

2 1

Re: [PATCH 1/4] dwrite: Implement newer SetLineSpacing/GetLineSpacing
by Marvin 25 Jul '16

25 Jul '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24498 Your paranoid android. === wvistau64 (32 bit layout) === The test timed out

2 1

Re: urlmon: Remove double riid parameter.
by Nikolay Sivov 25 Jul '16

25 Jul '16

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

1 0

Re: [PATCH v2 2/3] shell32: Implement FolderItems_Item.
by Nikolay Sivov 25 Jul '16

25 Jul '16

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.

2 1

Re: [PATCH] ucrtbase: Implement _get_narrow_winmain_command_line/_get_wide_winmain_command_line
by Dmitry Timoshkov 25 Jul '16

25 Jul '16

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.

1 0

Re: [PATCH 1/2] DInput : Add vendor_id and product_id with Linux joystick API
by Bruno Jesus 24 Jul '16

24 Jul '16

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

1 0

[PATCH] dinput : use vendor and product ids to generate product GUID like it's done on Windows - second try
by Corentin Rossignon 23 Jul '16

23 Jul '16

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

2 2