October 2016 - Wine-Commits

Aric Stewart : winebus.sys: Implement IOCTL_HID_GET_DEVICE_DESCRIPTOR for hidraw.
by Alexandre Julliard Oct. 11, 2016

Oct. 11, 2016

Module: wine Branch: master Commit: eac738b95f8b26b9e5f59e0e51d33ecb5eb91594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eac738b95f8b26b9e5f59e0e5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 11 14:09:35 2016 +0200 winebus.sys: Implement IOCTL_HID_GET_DEVICE_DESCRIPTOR for hidraw. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_udev.c | 53 ++++++++++++++++++++++++++++++++++++++++++--- dlls/winebus.sys/main.c | 46 ++++++++++++++++++++++++++++++++++----- include/config.h.in | 3 +++ 6 files changed, 96 insertions(+), 9 deletions(-) diff --git a/configure b/configure index e3181e0..bd0a1b9 100755 --- a/configure +++ b/configure @@ -6805,6 +6805,7 @@ for ac_header in \ linux/compiler.h \ linux/filter.h \ linux/hdreg.h \ + linux/hidraw.h \ linux/input.h \ linux/ioctl.h \ linux/joystick.h \ diff --git a/configure.ac b/configure.ac index 741a4ef..eb328a0 100644 --- a/configure.ac +++ b/configure.ac @@ -426,6 +426,7 @@ AC_CHECK_HEADERS(\ linux/compiler.h \ linux/filter.h \ linux/hdreg.h \ + linux/hidraw.h \ linux/input.h \ linux/ioctl.h \ linux/joystick.h \ diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 342a66b..9ab242c 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -23,6 +23,7 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry typedef struct { int (*compare_platform_device)(DEVICE_OBJECT *device, void *platform_dev); + NTSTATUS (*get_reportdescriptor)(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length); } platform_vtbl; void *get_platform_private(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index a01d88e..22ea07d 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -35,6 +35,12 @@ #ifdef HAVE_LIBUDEV_H # include <libudev.h> #endif +#ifdef HAVE_LINUX_HIDRAW_H +# include <linux/hidraw.h> +#endif +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif #define NONAMELESSUNION @@ -64,6 +70,7 @@ DEFINE_GUID(GUID_DEVCLASS_HIDRAW, 0x3def44ad,0x242e,0x46e5,0x82,0x6d,0x70,0x72,0 struct platform_private { struct udev_device *udev_device; + int device_fd; }; static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *device) @@ -105,9 +112,42 @@ static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) return strcmp(udev_device_get_syspath(dev1), udev_device_get_syspath(dev2)); } +static NTSTATUS hidraw_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) +{ +#ifdef HAVE_LINUX_HIDRAW_H + struct hidraw_report_descriptor descriptor; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + + if (ioctl(private->device_fd, HIDIOCGRDESCSIZE, &descriptor.size) == -1) + { + WARN("ioctl(HIDIOCGRDESCSIZE) failed: %d %s\n", errno, strerror(errno)); + return STATUS_UNSUCCESSFUL; + } + + *out_length = descriptor.size; + + if (length < descriptor.size) + return STATUS_BUFFER_TOO_SMALL; + if (!descriptor.size) + return STATUS_SUCCESS; + + if (ioctl(private->device_fd, HIDIOCGRDESC, &descriptor) == -1) + { + WARN("ioctl(HIDIOCGRDESC) failed: %d %s\n", errno, strerror(errno)); + return STATUS_UNSUCCESSFUL; + } + + memcpy(buffer, descriptor.value, descriptor.size); + return STATUS_SUCCESS; +#else + return STATUS_NOT_IMPLEMENTED; +#endif +} + static const platform_vtbl hidraw_vtbl = { compare_platform_device, + hidraw_get_reportdescriptor, }; static void try_add_device(struct udev_device *dev) @@ -128,7 +168,6 @@ static void try_add_device(struct udev_device *dev) WARN("Unable to open udev device %s: %s\n", debugstr_a(devnode), strerror(errno)); return; } - close(fd); usbdev = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_device"); if (usbdev) @@ -151,11 +190,16 @@ static void try_add_device(struct udev_device *dev) if (device) { - impl_from_DEVICE_OBJECT(device)->udev_device = udev_device_ref(dev); + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + private->udev_device = udev_device_ref(dev); + private->device_fd = fd; IoInvalidateDeviceRelations(device, BusRelations); } else + { WARN("Ignoring device %s with subsystem %s\n", debugstr_a(devnode), subsystem); + close(fd); + } HeapFree(GetProcessHeap(), 0, serial); } @@ -163,9 +207,12 @@ static void try_add_device(struct udev_device *dev) static void try_remove_device(struct udev_device *dev) { DEVICE_OBJECT *device = bus_find_hid_device(&hidraw_vtbl, dev); + struct platform_private *private; if (!device) return; - dev = impl_from_DEVICE_OBJECT(device)->udev_device; + private = impl_from_DEVICE_OBJECT(device); + dev = private->udev_device; + close(private->device_fd); bus_remove_hid_device(device); udev_device_unref(dev); } diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index eaa0b93..bf7071d 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -352,7 +352,7 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { NTSTATUS status = irp->IoStatus.u.Status; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); - struct device_extension *extension = (struct device_extension *)device->DeviceExtension; + struct device_extension *ext = (struct device_extension *)device->DeviceExtension; TRACE("(%p, %p)\n", device, irp); @@ -370,12 +370,46 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) } memset(attr, 0, sizeof(*attr)); - attr->Size = sizeof(HID_DEVICE_ATTRIBUTES); - attr->VendorID = extension->vid; - attr->ProductID = extension->pid; - attr->VersionNumber = extension->version; + attr->Size = sizeof(*attr); + attr->VendorID = ext->vid; + attr->ProductID = ext->pid; + attr->VersionNumber = ext->version; + + irp->IoStatus.u.Status = status = STATUS_SUCCESS; + irp->IoStatus.Information = sizeof(*attr); + break; + } + case IOCTL_HID_GET_DEVICE_DESCRIPTOR: + { + HID_DESCRIPTOR *descriptor = (HID_DESCRIPTOR *)irp->UserBuffer; + DWORD length; + TRACE("IOCTL_HID_GET_DEVICE_DESCRIPTOR\n"); + + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(*descriptor)) + { + irp->IoStatus.u.Status = status = STATUS_BUFFER_TOO_SMALL; + break; + } + + status = ext->vtbl->get_reportdescriptor(device, NULL, 0, &length); + if (status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL) + { + WARN("Failed to get platform report descriptor length\n"); + irp->IoStatus.u.Status = status; + break; + } + + memset(descriptor, 0, sizeof(*descriptor)); + descriptor->bLength = sizeof(*descriptor); + descriptor->bDescriptorType = HID_HID_DESCRIPTOR_TYPE; + descriptor->bcdHID = HID_REVISION; + descriptor->bCountry = 0; + descriptor->bNumDescriptors = 1; + descriptor->DescriptorList[0].bReportType = HID_REPORT_DESCRIPTOR_TYPE; + descriptor->DescriptorList[0].wReportLength = length; + irp->IoStatus.u.Status = status = STATUS_SUCCESS; - irp->IoStatus.Information = sizeof(HID_DEVICE_ATTRIBUTES); + irp->IoStatus.Information = sizeof(*descriptor); break; } default: diff --git a/include/config.h.in b/include/config.h.in index bcee452..40909fe 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -435,6 +435,9 @@ /* Define to 1 if you have the <linux/hdreg.h> header file. */ #undef HAVE_LINUX_HDREG_H +/* Define to 1 if you have the <linux/hidraw.h> header file. */ +#undef HAVE_LINUX_HIDRAW_H + /* Define to 1 if you have the <linux/input.h> header file. */ #undef HAVE_LINUX_INPUT_H

1 0

Sebastian Lackner : user32/tests: Fix test failures on 64-bit testbot VMs.
by Alexandre Julliard Oct. 11, 2016

Oct. 11, 2016

Module: wine Branch: master Commit: cf0f7fcfd53d57cd5aa5fed09dd14890144a034c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf0f7fcfd53d57cd5aa5fed09… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 11 18:11:19 2016 +0200 user32/tests: Fix test failures on 64-bit testbot VMs. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 69bdba8..17fc028 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1737,7 +1737,10 @@ static void test_handles( HWND hwnd ) h = SetClipboardData( 0xdeadbeef, hfixed ); ok( h == hfixed, "got %p\n", h ); ok( is_fixed( h ), "expected fixed mem %p\n", h ); +#ifndef _WIN64 + /* testing if hfixed2 is freed triggers an exception on Win64 */ ok( is_freed( hfixed2 ) || broken( !is_freed( hfixed2 )) /* < Vista */, "expected freed mem %p\n", hfixed2 ); +#endif r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() );

1 0

Dmitry Timoshkov : include/d2d1.idl: Remove duplicate typedefs.
by Alexandre Julliard Oct. 11, 2016

Oct. 11, 2016

Module: wine Branch: master Commit: 53943a4c31bb290e5793ba0f33cccc35817017e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53943a4c31bb290e5793ba0f3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 11 09:30:03 2016 +0800 include/d2d1.idl: Remove duplicate typedefs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1.idl | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index 0e944e1..6d39e88 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -42,12 +42,10 @@ cpp_quote("#ifndef __dwrite_h__") typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_RUN; cpp_quote("#endif /* __dwrite_h__ */") -typedef D2D_POINT_2F D2D1_POINT_2F; typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; typedef D2D_RECT_F D2D1_RECT_F; typedef D2D_SIZE_F D2D1_SIZE_F; typedef UINT64 D2D1_TAG; -typedef D2D_SIZE_U D2D1_SIZE_U; typedef D2D_POINT_2U D2D1_POINT_2U; typedef D2D_RECT_U D2D1_RECT_U; typedef D2D_COLOR_F D2D1_COLOR_F;

1 0

Huw Davies : riched20: Add a helper to add a font to the font table.
by Alexandre Julliard Oct. 11, 2016

Oct. 11, 2016

Module: wine Branch: master Commit: 6ee979c7e6c0d32aedae638f432f51ee97077d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee979c7e6c0d32aedae638f4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:04:02 2016 +0100 riched20: Add a helper to add a font to the font table. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index a2ec8f8..b448f43 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -213,6 +213,29 @@ ME_StreamOutRTFHeader(ME_OutStream *pStream, int dwFormat) return TRUE; } +static void add_font_to_fonttbl( ME_OutStream *stream, ME_Style *style ) +{ + ME_FontTableItem *table = stream->fonttbl; + CHARFORMAT2W *fmt = &style->fmt; + WCHAR *face = fmt->szFaceName; + BYTE charset = (fmt->dwMask & CFM_CHARSET) ? fmt->bCharSet : DEFAULT_CHARSET; + int i; + + if (fmt->dwMask & CFM_FACE) + { + for (i = 0; i < stream->nFontTblLen; i++) + if (table[i].bCharSet == charset + && (table[i].szFaceName == face || !lstrcmpW(table[i].szFaceName, face))) + break; + + if (i == stream->nFontTblLen && i < STREAMOUT_FONTTBL_SIZE) + { + table[i].bCharSet = charset; + table[i].szFaceName = face; + stream->nFontTblLen++; + } + } +} static BOOL ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, @@ -223,26 +246,13 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, unsigned int i; ME_DisplayItem *pLastPara = ME_GetParagraph(pLastRun); ME_DisplayItem *pCell = NULL; - + do { CHARFORMAT2W *fmt = &item->member.run.style->fmt; COLORREF crColor; - if (fmt->dwMask & CFM_FACE) { - WCHAR *face = fmt->szFaceName; - BYTE bCharSet = (fmt->dwMask & CFM_CHARSET) ? fmt->bCharSet : DEFAULT_CHARSET; - - for (i = 0; i < pStream->nFontTblLen; i++) - if (table[i].bCharSet == bCharSet - && (table[i].szFaceName == face || !lstrcmpW(table[i].szFaceName, face))) - break; - if (i == pStream->nFontTblLen && i < STREAMOUT_FONTTBL_SIZE) { - table[i].bCharSet = bCharSet; - table[i].szFaceName = face; - pStream->nFontTblLen++; - } - } - + add_font_to_fonttbl( pStream, item->member.run.style ); + if (fmt->dwMask & CFM_COLOR && !(fmt->dwEffects & CFE_AUTOCOLOR)) { crColor = fmt->crTextColor; for (i = 1; i < pStream->nColorTblLen; i++)

1 0

Huw Davies : riched20: Don't emit default values.
by Alexandre Julliard Oct. 11, 2016

Oct. 11, 2016

Module: wine Branch: master Commit: 1e1ee175f08b8ae88a5098c206bc69e2710d4e68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1ee175f08b8ae88a5098c20… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:04:01 2016 +0100 riched20: Don't emit default values. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 27e07b1..a2ec8f8 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -549,11 +549,11 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, if (!(editor->bEmulateVersion10 && /* v1.0 - 3.0 */ fmt->dwMask & PFM_TABLE && fmt->wEffects & PFE_TABLE)) { - if (fmt->dwMask & PFM_OFFSET) + if (fmt->dxOffset) sprintf(props + strlen(props), "\\li%d", fmt->dxOffset); - if (fmt->dwMask & PFM_OFFSETINDENT || fmt->dwMask & PFM_STARTINDENT) + if (fmt->dxStartIndent) sprintf(props + strlen(props), "\\fi%d", fmt->dxStartIndent); - if (fmt->dwMask & PFM_RIGHTINDENT) + if (fmt->dxRightIndent) sprintf(props + strlen(props), "\\ri%d", fmt->dxRightIndent); if (fmt->dwMask & PFM_TABSTOPS) { static const char * const leader[6] = { "", "\\tldot", "\\tlhyph", "\\tlul", "\\tlth", "\\tleq" }; @@ -579,11 +579,11 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, } } } - if (fmt->dwMask & PFM_SPACEAFTER) + if (fmt->dySpaceAfter) sprintf(props + strlen(props), "\\sa%d", fmt->dySpaceAfter); - if (fmt->dwMask & PFM_SPACEBEFORE) + if (fmt->dySpaceBefore) sprintf(props + strlen(props), "\\sb%d", fmt->dySpaceBefore); - if (fmt->dwMask & PFM_STYLE) + if (fmt->sStyle != -1) sprintf(props + strlen(props), "\\s%d", fmt->sStyle); if (fmt->dwMask & PFM_SHADING) {

1 0

Huw Davies : wordpad: Keep the list indentation aligned when the margins are changed.
by Alexandre Julliard Oct. 11, 2016

Oct. 11, 2016

Module: wine Branch: master Commit: 9a1cc45edd8d1db98fbcf78697f4100ddb329b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a1cc45edd8d1db98fbcf7869… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:01:12 2016 +0100 wordpad: Keep the list indentation aligned when the margins are changed. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 8d07d7b..f0a7d14 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1579,8 +1579,15 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, int index; float num; int ret = 0; - PARAFORMAT pf; + PARAFORMAT2 pf; UNIT unit; + BOOL in_list = FALSE; + + pf.cbSize = sizeof(pf); + pf.dwMask = PFM_NUMBERING; + SendMessageW(hEditorWnd, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + if ((pf.dwMask & PFM_NUMBERING) && pf.wNumbering) + in_list = TRUE; index = SendMessageW(hListWnd, CB_GETCURSEL, 0, 0); pf.wAlignment = ALIGNMENT_VALUES[index]; @@ -1630,6 +1637,12 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, pf.cbSize = sizeof(pf); pf.dwMask = PFM_ALIGNMENT | PFM_OFFSET | PFM_RIGHTINDENT | PFM_STARTINDENT; + if (in_list) + { + pf.wNumberingTab = max(pf.dxOffset, 0); + pf.dwMask |= PFM_NUMBERINGTAB; + } + SendMessageW(hEditorWnd, EM_SETPARAFORMAT, 0, (LPARAM)&pf); } }

1 0

Carlo Bramini : winefile: Use StrFormatByteSizeW.
by Alexandre Julliard Oct. 11, 2016

Oct. 11, 2016

Module: wine Branch: master Commit: 0e5eed109dc0e2171d6db16c8a6e307057122b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5eed109dc0e2171d6db16c8… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sun Oct 9 13:05:19 2016 +0200 winefile: Use StrFormatByteSizeW. Signed-off-by: Carlo Bramini <carlo_bramini(a)users.sourceforge.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 73 +++++++++++++++++-------------------------- po/bg.po | 73 +++++++++++++++++-------------------------- po/ca.po | 73 +++++++++++++++++-------------------------- po/cs.po | 73 +++++++++++++++++-------------------------- po/da.po | 73 +++++++++++++++++-------------------------- po/de.po | 73 +++++++++++++++++-------------------------- po/el.po | 73 +++++++++++++++++-------------------------- po/en.po | 73 +++++++++++++++++-------------------------- po/en_US.po | 73 +++++++++++++++++-------------------------- po/eo.po | 73 +++++++++++++++++-------------------------- po/es.po | 73 +++++++++++++++++-------------------------- po/fa.po | 73 +++++++++++++++++-------------------------- po/fi.po | 73 +++++++++++++++++-------------------------- po/fr.po | 73 +++++++++++++++++-------------------------- po/he.po | 73 +++++++++++++++++-------------------------- po/hi.po | 73 +++++++++++++++++-------------------------- po/hr.po | 73 +++++++++++++++++-------------------------- po/hu.po | 73 +++++++++++++++++-------------------------- po/it.po | 73 +++++++++++++++++-------------------------- po/ja.po | 73 +++++++++++++++++-------------------------- po/ko.po | 73 +++++++++++++++++-------------------------- po/lt.po | 73 +++++++++++++++++-------------------------- po/ml.po | 73 +++++++++++++++++-------------------------- po/nb_NO.po | 73 +++++++++++++++++-------------------------- po/nl.po | 73 +++++++++++++++++-------------------------- po/or.po | 73 +++++++++++++++++-------------------------- po/pa.po | 73 +++++++++++++++++-------------------------- po/pl.po | 73 +++++++++++++++++-------------------------- po/pt_BR.po | 73 +++++++++++++++++-------------------------- po/pt_PT.po | 73 +++++++++++++++++-------------------------- po/rm.po | 73 +++++++++++++++++-------------------------- po/ro.po | 73 +++++++++++++++++-------------------------- po/ru.po | 73 +++++++++++++++++-------------------------- po/sk.po | 73 +++++++++++++++++-------------------------- po/sl.po | 73 +++++++++++++++++-------------------------- po/sr_RS(a)cyrillic.po | 73 +++++++++++++++++-------------------------- po/sr_RS(a)latin.po | 73 +++++++++++++++++-------------------------- po/sv.po | 73 +++++++++++++++++-------------------------- po/te.po | 73 +++++++++++++++++-------------------------- po/th.po | 73 +++++++++++++++++-------------------------- po/tr.po | 73 +++++++++++++++++-------------------------- po/uk.po | 73 +++++++++++++++++-------------------------- po/wa.po | 73 +++++++++++++++++-------------------------- po/wine.pot | 73 +++++++++++++++++-------------------------- po/zh_CN.po | 73 +++++++++++++++++-------------------------- po/zh_TW.po | 73 +++++++++++++++++-------------------------- programs/winefile/Makefile.in | 2 +- programs/winefile/resource.h | 3 -- programs/winefile/winefile.c | 41 +++--------------------- programs/winefile/winefile.h | 1 + programs/winefile/winefile.rc | 3 -- 51 files changed, 1340 insertions(+), 2068 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e5eed109dc0e2171d6db…

1 0

Huw Davies : riched20: Move the check for cell border colours into the same loop as the other colours.
by Alexandre Julliard Oct. 11, 2016

Oct. 11, 2016

Module: wine Branch: master Commit: a06dcd46bb87bc84552e23ce997c3b8eef969363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06dcd46bb87bc84552e23ce9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:04:04 2016 +0100 riched20: Move the check for cell border colours into the same loop as the other colours. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index e79aacf..fe8c797 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -259,8 +259,8 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, ME_DisplayItem *item = pFirstRun; ME_FontTableItem *table = pStream->fonttbl; unsigned int i; - ME_DisplayItem *pLastPara = ME_GetParagraph(pLastRun); ME_DisplayItem *pCell = NULL; + ME_Paragraph *prev_para = NULL; do { CHARFORMAT2W *fmt = &item->member.run.style->fmt; @@ -272,14 +272,10 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, if (fmt->dwMask & CFM_BACKCOLOR && !(fmt->dwEffects & CFE_AUTOBACKCOLOR)) add_color_to_colortbl( pStream, fmt->crBackColor ); - if (item == pLastRun) - break; - item = ME_FindItemFwd(item, diRun); - } while (item); - item = ME_GetParagraph(pFirstRun); - do { - if ((pCell = item->member.para.pCell)) + if (item->member.run.para != prev_para) { + if ((pCell = item->member.para.pCell)) + { ME_Border* borders[4] = { &pCell->member.cell.border.top, &pCell->member.cell.border.left, &pCell->member.cell.border.bottom, @@ -287,12 +283,16 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, for (i = 0; i < 4; i++) if (borders[i]->width > 0) add_color_to_colortbl( pStream, borders[i]->colorRef ); + } + + prev_para = item->member.run.para; } - if (item == pLastPara) + + if (item == pLastRun) break; - item = item->member.para.next_para; + item = ME_FindItemFwd(item, diRun); } while (item); - + if (!ME_StreamOutPrint(pStream, "{\\fonttbl")) return FALSE;

1 0

Huw Davies : riched20: Add a helper to add a colour to the colour table.
by Alexandre Julliard Oct. 11, 2016

Oct. 11, 2016

Module: wine Branch: master Commit: b8e55779fe26846bebd034744a5a02fa40b98ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e55779fe26846bebd034744… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:04:03 2016 +0100 riched20: Add a helper to add a colour to the colour table. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 54 +++++++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index b448f43..e79aacf 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -237,6 +237,21 @@ static void add_font_to_fonttbl( ME_OutStream *stream, ME_Style *style ) } } +static void add_color_to_colortbl( ME_OutStream *stream, COLORREF color ) +{ + int i; + + for (i = 1; i < stream->nColorTblLen; i++) + if (stream->colortbl[i] == color) + break; + + if (i == stream->nColorTblLen && i < STREAMOUT_COLORTBL_SIZE) + { + stream->colortbl[i] = color; + stream->nColorTblLen++; + } +} + static BOOL ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, ME_DisplayItem *pLastRun) @@ -249,30 +264,13 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, do { CHARFORMAT2W *fmt = &item->member.run.style->fmt; - COLORREF crColor; add_font_to_fonttbl( pStream, item->member.run.style ); - if (fmt->dwMask & CFM_COLOR && !(fmt->dwEffects & CFE_AUTOCOLOR)) { - crColor = fmt->crTextColor; - for (i = 1; i < pStream->nColorTblLen; i++) - if (pStream->colortbl[i] == crColor) - break; - if (i == pStream->nColorTblLen && i < STREAMOUT_COLORTBL_SIZE) { - pStream->colortbl[i] = crColor; - pStream->nColorTblLen++; - } - } - if (fmt->dwMask & CFM_BACKCOLOR && !(fmt->dwEffects & CFE_AUTOBACKCOLOR)) { - crColor = fmt->crBackColor; - for (i = 1; i < pStream->nColorTblLen; i++) - if (pStream->colortbl[i] == crColor) - break; - if (i == pStream->nColorTblLen && i < STREAMOUT_COLORTBL_SIZE) { - pStream->colortbl[i] = crColor; - pStream->nColorTblLen++; - } - } + if (fmt->dwMask & CFM_COLOR && !(fmt->dwEffects & CFE_AUTOCOLOR)) + add_color_to_colortbl( pStream, fmt->crTextColor ); + if (fmt->dwMask & CFM_BACKCOLOR && !(fmt->dwEffects & CFE_AUTOBACKCOLOR)) + add_color_to_colortbl( pStream, fmt->crBackColor ); if (item == pLastRun) break; @@ -287,20 +285,8 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, &pCell->member.cell.border.bottom, &pCell->member.cell.border.right }; for (i = 0; i < 4; i++) - { if (borders[i]->width > 0) - { - unsigned int j; - COLORREF crColor = borders[i]->colorRef; - for (j = 1; j < pStream->nColorTblLen; j++) - if (pStream->colortbl[j] == crColor) - break; - if (j == pStream->nColorTblLen && j < STREAMOUT_COLORTBL_SIZE) { - pStream->colortbl[j] = crColor; - pStream->nColorTblLen++; - } - } - } + add_color_to_colortbl( pStream, borders[i]->colorRef ); } if (item == pLastPara) break;

1 0

Huw Davies : riched20: Don't emit paragraph props if they' re the same as the previous paragraph's.
by Alexandre Julliard Oct. 11, 2016

Oct. 11, 2016

Module: wine Branch: master Commit: 8739f450cea348b4d68f44477c24609e81c34d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8739f450cea348b4d68f44477… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:04:00 2016 +0100 riched20: Don't emit paragraph props if they're the same as the previous paragraph's. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 0204215..27e07b1 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -429,6 +429,10 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, PARAFORMAT2 *fmt = &para->member.para.fmt; char props[STREAMOUT_BUFFER_SIZE] = ""; int i; + ME_Paragraph *prev_para = NULL; + + if (para->member.para.prev_para->type == diParagraph) + prev_para = &para->member.para.prev_para->member.para; if (!editor->bEmulateVersion10) { /* v4.1 */ if (para->member.para.nFlags & MEPF_ROWSTART) { @@ -462,7 +466,9 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, } } - /* TODO: Don't emit anything if the last PARAFORMAT2 is inherited */ + if (prev_para && !memcmp( fmt, &prev_para->fmt, sizeof(*fmt) )) + return TRUE; + if (!ME_StreamOutPrint(pStream, "\\pard")) return FALSE;

1 0