January 2017 - Wine-Commits

Bruno Jesus : dinput: Skip events that are not useful currently.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 6bb2c4cdede6266557424f45814de13c09c888ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb2c4cdede6266557424f458… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 25 16:28:57 2017 -0200 dinput: Skip events that are not useful currently. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 911700b..44d72fc 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -902,7 +902,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) break; #endif default: - FIXME("joystick cannot handle type %d event (code %d)\n",ie.type,ie.code); + TRACE("skipping event\n"); break; } if (inst_id >= 0)

1 0

Bruno Jesus : odbc32: Improve some tracing.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 25e495fd3f68e65357f7d44765fb0c82634a7a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e495fd3f68e65357f7d4476… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Jan 13 11:24:48 2017 -0200 odbc32: Improve some tracing. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/proxyodbc.c | 85 +++++++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25e495fd3f68e65357f7d…

1 0

Nikolay Sivov : dwrite: Restructure line wrapping logic, fix the way breaking position is selected.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 82d73733182a489f31508d9f2a97056c84661a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d73733182a489f31508d9f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 07:41:49 2017 +0300 dwrite: Restructure line wrapping logic, fix the way breaking position is selected. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 301 ++++++++++++++++++++++++--------------------- dlls/dwrite/tests/layout.c | 1 - 2 files changed, 161 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82d73733182a489f31508…

1 0

André Hentschel : iphlpapi: Fix GetBestRoute spec file entry.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 5262696e21c4af4c77d692306671a2fa22571962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5262696e21c4af4c77d692306… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 21:11:50 2017 +0100 iphlpapi: Fix GetBestRoute spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 4be42fe..500267c 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -76,7 +76,7 @@ @ stdcall GetBestInterface( long ptr ) @ stdcall GetBestInterfaceEx( ptr ptr ) @ stub GetBestInterfaceFromStack -@ stdcall GetBestRoute( long long long ) +@ stdcall GetBestRoute( long long ptr ) #@ stub GetBestRoute2 @ stub GetBestRouteFromStack #@ stub GetCurrentThreadCompartmentId

1 0

Aric Stewart : hid: Implement HidD_GetNumInputBuffers.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: fbd3525e249b858b3f811499c4b38cdf1f2694f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd3525e249b858b3f811499c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 25 07:04:20 2017 -0600 hid: Implement HidD_GetNumInputBuffers. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index d5dd734..b1b6a35 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -8,7 +8,7 @@ @ stdcall HidD_GetInputReport(long ptr long) @ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor -@ stub HidD_GetNumInputBuffers +@ stdcall HidD_GetNumInputBuffers(long ptr) @ stub HidD_GetPhysicalDescriptor @ stdcall HidD_GetPreparsedData(ptr ptr) @ stdcall HidD_GetProductString(long ptr long) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 99665dd..1161f0c 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -87,6 +87,12 @@ BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); } +BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers) +{ + TRACE("(%p %p)\n", HidDeviceObject, NumberBuffers); + return DeviceIoControl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL, NULL); +} + BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 8b3b5a2..71e50a9 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -38,6 +38,7 @@ BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG void WINAPI HidD_GetHidGuid(LPGUID guid); BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); +BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength);

1 0

Nikolay Sivov : shell32: Fix return value of GetDetailsOf() for unixfs folder.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 8f21b352c25b0078c4cb8a7c554dd8503a9d136f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f21b352c25b0078c4cb8a7c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 22:51:32 2017 +0300 shell32: Fix return value of GetDetailsOf() for unixfs folder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 9df761f..3feef74 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1475,10 +1475,10 @@ static HRESULT WINAPI ShellFolder2_GetDetailsOf(IShellFolder2* iface, LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd) { UnixFolder *This = impl_from_IShellFolder2(iface); - HRESULT hr = E_FAIL; struct passwd *pPasswd; struct group *pGroup; struct stat statItem; + HRESULT hr = S_OK; static const shvheader unixfs_header[SHELLVIEWCOLUMNS] = { {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},

1 0

Andrew Eikum : quartz: Clean up another trace for consistency.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: c6a4811edfa97331939e3b71f34970fcd263b41b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a4811edfa97331939e3b71f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jan 25 15:12:55 2017 -0600 quartz: Clean up another trace for consistency. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 97c049d..2bd08f1 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -730,6 +730,9 @@ static HRESULT WINAPI FilterGraph2_Reconnect(IFilterGraph2 *iface, IPin *ppin) IPin_QueryDirection(ppin, &pindir); hr = IPin_ConnectedTo(ppin, &pConnectedTo); + + TRACE("(%p/%p)->(%p) -- %p\n", This, iface, ppin, pConnectedTo); + if (FAILED(hr)) { TRACE("Querying connected to failed: %x\n", hr); return hr; @@ -743,7 +746,7 @@ static HRESULT WINAPI FilterGraph2_Reconnect(IFilterGraph2 *iface, IPin *ppin) IPin_Release(pConnectedTo); if (FAILED(hr)) WARN("Reconnecting pins failed, pins are not connected now..\n"); - TRACE("(%p->%p) -- %p %p -> %x\n", iface, This, ppin, pConnectedTo, hr); + TRACE("-> %08x\n", hr); return hr; }

1 0

Nikolay Sivov : dwrite: Remove existing effective runs before evaluating them again.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: e9ff71f62beb4841700b1d35185783df9d776354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ff71f62beb4841700b1d351… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 07:41:47 2017 +0300 dwrite: Remove existing effective runs before evaluating them again. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 706ed4e..7ef050e 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1740,6 +1740,8 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) if (!(layout->recompute & RECOMPUTE_LINES)) return S_OK; + free_layout_eruns(layout); + hr = layout_compute(layout); if (FAILED(hr)) return hr;

1 0

Nikolay Sivov : dwrite: Invalidate layout on box changes.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 3871981e3abf0d494e9c3811e2ff1d405535f95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3871981e3abf0d494e9c3811e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 07:41:48 2017 +0300 dwrite: Invalidate layout on box changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 7ef050e..a80c49e 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2833,26 +2833,36 @@ static HRESULT WINAPI dwritetextlayout_GetLocaleName(IDWriteTextLayout3 *iface, static HRESULT WINAPI dwritetextlayout_SetMaxWidth(IDWriteTextLayout3 *iface, FLOAT maxWidth) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); + BOOL changed; TRACE("(%p)->(%.2f)\n", This, maxWidth); if (maxWidth < 0.0f) return E_INVALIDARG; + changed = This->metrics.layoutWidth != maxWidth; This->metrics.layoutWidth = maxWidth; + + if (changed) + This->recompute |= RECOMPUTE_LINES; return S_OK; } static HRESULT WINAPI dwritetextlayout_SetMaxHeight(IDWriteTextLayout3 *iface, FLOAT maxHeight) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); + BOOL changed; TRACE("(%p)->(%.2f)\n", This, maxHeight); if (maxHeight < 0.0f) return E_INVALIDARG; + changed = This->metrics.layoutHeight != maxHeight; This->metrics.layoutHeight = maxHeight; + + if (changed) + This->recompute |= RECOMPUTE_LINES; return S_OK; }

1 0

André Hentschel : hidclass.sys: Fix compilation on systems that don't support nameless structs.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 902b8a2b6d3393c5af52af5b84166634153436a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=902b8a2b6d3393c5af52af5b8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 25 22:14:54 2017 +0100 hidclass.sys: Fix compilation on systems that don't support nameless structs. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index b241016..fe79212 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -22,6 +22,7 @@ #include <stdarg.h> #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "hid.h" #include "wine/unicode.h" #include "winreg.h" @@ -184,7 +185,7 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device entry = RemoveHeadList(&ext->irp_queue); while(entry != &ext->irp_queue) { - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); irp->IoStatus.u.Status = STATUS_DEVICE_REMOVED; IoCompleteRequest(irp, IO_NO_INCREMENT); entry = RemoveHeadList(&ext->irp_queue); @@ -237,7 +238,7 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) while(entry != &ext->irp_queue) { int ptr; - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size); @@ -680,7 +681,7 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) else { TRACE_(hid_report)("Queue irp\n"); - InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry); + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); rc = STATUS_PENDING; } HeapFree(GetProcessHeap(), 0, packet);

1 0