April 2019 - Wine-devel - list.winehq.org

[PATCH 1/2] hid: Implement HidD_GetIndexedString().
by Zebediah Figura 08 Apr '19

08 Apr '19

Mentioned in https://bugs.winehq.org/show_bug.cgi?id=46711. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- 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 e4d4202314..5bf391378b 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -4,7 +4,7 @@ @ stub HidD_GetConfiguration @ stdcall HidD_GetFeature(long ptr long) @ stdcall HidD_GetHidGuid(ptr) -@ stub HidD_GetIndexedString +@ stdcall HidD_GetIndexedString(ptr long ptr long) @ stdcall HidD_GetInputReport(long ptr long) @ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index ca14c4f571..e313ccb713 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -157,3 +157,9 @@ BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0); } + +BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULONG length) +{ + TRACE("file %p, index %u, buffer %p, length %u.\n", file, index, buffer, length); + return sync_ioctl(file, IOCTL_HID_GET_INDEXED_STRING, &index, sizeof(index), buffer, length); +} diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 71e50a9084..e57a968d5a 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -36,6 +36,7 @@ typedef struct _HIDD_ATTRIBUTES { BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); void WINAPI HidD_GetHidGuid(LPGUID guid); +BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULONG length); 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); -- 2.20.1

2 3

[PATCH 4/4] [v6 resend] user32: Implement EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 08 Apr '19

08 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 37 ++++++++++++++++++++++++++++++++++--- dlls/user32/tests/edit.c | 4 ++-- 2 files changed, 36 insertions(+), 5 deletions(-)

2 1

[PATCH 1/6] ntoskrnl.exe: Don't add device to the list if IoCreateDevice fails.
by Jacek Caban 08 Apr '19

08 Apr '19

Spotted by Zebediah Figura. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

2 1

[PATCH 3/4] [v6 resend] user32/tests: Use calculated EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 08 Apr '19

08 Apr '19

In v6, use Gdi32.GetCharWidthInfo. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-)

1 0

[PATCH 2/4] [resend] gdi32/tests: Add tests for GetCharWidthInfo().
by Akihiro Sagawa 08 Apr '19

08 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+)

1 0

[PATCH 4/4] [v6] user32: Implement EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 08 Apr '19

08 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 37 ++++++++++++++++++++++++++++++++++--- dlls/user32/tests/edit.c | 4 ++-- 2 files changed, 36 insertions(+), 5 deletions(-)

2 1

[PATCH 1/4] gdi32: Implement GetCharWidthInfo().
by Akihiro Sagawa 08 Apr '19

08 Apr '19

2 1

[PATCH 3/4] [v6] user32/tests: Use calculated EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 08 Apr '19

08 Apr '19

In v6, use Gdi32.GetCharWidthInfo. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-)

1 0

[PATCH 2/4] gdi32/tests: Add tests for GetCharWidthInfo().
by Akihiro Sagawa 08 Apr '19

08 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+)

1 0

[PATCH] msg711.acm: Remove useless casts to self
by Michael Stefaniuc 08 Apr '19

08 Apr '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msg711.acm/msg711.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index d20c89bfaf..9c44c65b29 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -542,8 +542,7 @@ static inline unsigned char ulaw2alaw(unsigned char uval) { uval &= 0xff; - return (unsigned char) ((uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) : - (unsigned char) (0x55 ^ (_u2a[0x7F ^ uval] - 1))); + return (uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) : (0x55 ^ (_u2a[0x7F ^ uval] - 1)); } /* -------------------------------------------------------------------------------*/ -- 2.20.1

2 1