June 2015 - Wine-commits - list.winehq.org

Alexandre Julliard : Wine release 1.7.46
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: website Branch: master Commit: adb858d909fc68ec1ce4ede843399812d62e1a0e URL: http://source.winehq.org/git/website.git/?a=commit;h=adb858d909fc68ec1ce4ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 26 21:12:05 2015 +0900 Wine release 1.7.46 --- news/en/2015062601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2015062601.xml b/news/en/2015062601.xml new file mode 100644 index 0000000..6bc7298 --- /dev/null +++ b/news/en/2015062601.xml @@ -0,0 +1,17 @@ +<news> +<date>June 26, 2015</date> +<title>Wine 1.7.46 Released</title> +<body> + The Wine development release 1.7.46 is now available. + <a href="{$root}/announce/1.7.46">What's new</a> in this release: +<ul> + <li>Improvements in the BITS file transfer service.</li> + <li>Still more progress on DirectWrite implementation.</li> + <li>Support for shared user data on 64-bit.</li> + <li>Various C++ runtime improvements.</li> + <li>Some more support for the 64-bit ARM platform.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.46.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Sebastian Lackner : ntdll: NtMapViewOfSection should fail if both addr_ptr and zero_bits is set.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 7a8470ea945340c523af2d576b37ce168d951a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8470ea945340c523af2d576… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 26 07:46:23 2015 +0200 ntdll: NtMapViewOfSection should fail if both addr_ptr and zero_bits is set. --- dlls/kernel32/tests/virtual.c | 24 ++++++++++++------------ dlls/ntdll/virtual.c | 3 +++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 6082740..008376c 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1093,25 +1093,25 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 12, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); - if (status == STATUS_SUCCESS) - { - status = pNtUnmapViewOfSection( hProcess, ptr2 ); - ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); - } ptr2 = (char *)ptr + 0x1000; size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); - if (status == STATUS_SUCCESS) - { - status = pNtUnmapViewOfSection( hProcess, ptr2 ); - ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); - } + + ptr2 = (char *)ptr + 0x1001; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); + ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + + ptr2 = (char *)ptr + 0x1000; + size = 0; + offset.QuadPart = 1; + status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); + ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); if (sizeof(void *) == sizeof(int) && (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64)) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 72309f6..a010e3b4 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2601,6 +2601,9 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p /* Check parameters */ + if (*addr_ptr && zero_bits) + return STATUS_INVALID_PARAMETER_4; + if ((offset.u.LowPart & mask) || (*addr_ptr && ((UINT_PTR)*addr_ptr & mask))) return STATUS_MAPPED_ALIGNMENT;

1 0

Sebastian Lackner : ntdll: Implement support for AT_ROUND_TO_PAGE flag in NtMapViewOfSection.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: d082ea3eabcbf84144b0ffffc8341153ab8d89ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d082ea3eabcbf84144b0ffffc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 26 07:46:43 2015 +0200 ntdll: Implement support for AT_ROUND_TO_PAGE flag in NtMapViewOfSection. --- dlls/kernel32/tests/virtual.c | 8 -------- dlls/ntdll/virtual.c | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 008376c..244fa9d 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1129,7 +1129,6 @@ static void test_NtMapViewOfSection(void) offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, AT_ROUND_TO_PAGE, PAGE_READWRITE ); - todo_wine ok( status == STATUS_CONFLICTING_ADDRESSES, "NtMapViewOfSection returned %x\n", status ); /* in contrary to regular NtMapViewOfSection, only 4kb align is enforced */ @@ -1138,12 +1137,10 @@ static void test_NtMapViewOfSection(void) offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, AT_ROUND_TO_PAGE, PAGE_READWRITE ); - todo_wine ok( status == STATUS_SUCCESS, "NtMapViewOfSection returned %x\n", status ); ok( (char *)ptr2 == (char *)ptr + 0x1000, "expected address %p, got %p\n", (char *)ptr + 0x1000, ptr2 ); status = pNtUnmapViewOfSection( hProcess, ptr2 ); - todo_wine ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); /* the address is rounded down if not on a page boundary */ @@ -1152,13 +1149,10 @@ static void test_NtMapViewOfSection(void) offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, AT_ROUND_TO_PAGE, PAGE_READWRITE ); - todo_wine ok( status == STATUS_SUCCESS, "NtMapViewOfSection returned %x\n", status ); - todo_wine ok( (char *)ptr2 == (char *)ptr + 0x1000, "expected address %p, got %p\n", (char *)ptr + 0x1000, ptr2 ); status = pNtUnmapViewOfSection( hProcess, ptr2 ); - todo_wine ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); ptr2 = (char *)ptr + 0x2000; @@ -1166,12 +1160,10 @@ static void test_NtMapViewOfSection(void) offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, AT_ROUND_TO_PAGE, PAGE_READWRITE ); - todo_wine ok( status == STATUS_SUCCESS, "NtMapViewOfSection returned %x\n", status ); ok( (char *)ptr2 == (char *)ptr + 0x2000, "expected address %p, got %p\n", (char *)ptr + 0x2000, ptr2 ); status = pNtUnmapViewOfSection( hProcess, ptr2 ); - todo_wine ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); } else diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index a010e3b4..bc3f7cd 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2604,6 +2604,14 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p if (*addr_ptr && zero_bits) return STATUS_INVALID_PARAMETER_4; +#ifndef _WIN64 + if (!is_wow64 && (alloc_type & AT_ROUND_TO_PAGE)) + { + *addr_ptr = ROUND_ADDR( *addr_ptr, page_mask ); + mask = page_mask; + } +#endif + if ((offset.u.LowPart & mask) || (*addr_ptr && ((UINT_PTR)*addr_ptr & mask))) return STATUS_MAPPED_ALIGNMENT;

1 0

Aric Stewart : include: Add ddk/hidclass.h.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 4ba1d8d8ef4f04082e7292e8d6d6d755e7dab607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba1d8d8ef4f04082e7292e8d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 25 10:15:29 2015 -0500 include: Add ddk/hidclass.h. --- include/Makefile.in | 1 + include/ddk/hidclass.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 499c5d4..c02199d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -252,6 +252,7 @@ SRCDIR_INCLUDES = \ ddeml.h \ ddk/compstui.h \ ddk/csq.h \ + ddk/hidclass.h \ ddk/hidsdi.h \ ddk/imm.h \ ddk/mountmgr.h \ diff --git a/include/ddk/hidclass.h b/include/ddk/hidclass.h new file mode 100644 index 0000000..81f892d --- /dev/null +++ b/include/ddk/hidclass.h @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2015 Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __HIDCLASS_H +#define __HIDCLASS_H + +#ifdef __cplusplus +extern "C" { +#endif + +DEFINE_GUID (GUID_DEVINTERFACE_HID, \ + 0x4D1E55B2L, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30); + +#define HID_CTL_CODE(id) \ + CTL_CODE (FILE_DEVICE_KEYBOARD, (id), METHOD_NEITHER, FILE_ANY_ACCESS) +#define HID_BUFFER_CTL_CODE(id) \ + CTL_CODE (FILE_DEVICE_KEYBOARD, (id), METHOD_BUFFERED, FILE_ANY_ACCESS) +#define HID_IN_CTL_CODE(id) \ + CTL_CODE (FILE_DEVICE_KEYBOARD, (id), METHOD_IN_DIRECT, FILE_ANY_ACCESS) +#define HID_OUT_CTL_CODE(id) \ + CTL_CODE (FILE_DEVICE_KEYBOARD, (id), METHOD_OUT_DIRECT, FILE_ANY_ACCESS) + +#define IOCTL_GET_PHYSICAL_DESCRIPTOR HID_OUT_CTL_CODE(102) +#define IOCTL_HID_FLUSH_QUEUE HID_CTL_CODE(101) +#define IOCTL_HID_GET_COLLECTION_DESCRIPTOR HID_CTL_CODE(100) +#define IOCTL_HID_GET_COLLECTION_INFORMATION HID_BUFFER_CTL_CODE(106) +#define IOCTL_HID_GET_FEATURE HID_OUT_CTL_CODE(100) +#define IOCTL_HID_GET_HARDWARE_ID HID_OUT_CTL_CODE(103) +#define IOCTL_HID_GET_INDEXED_STRING HID_OUT_CTL_CODE(120) +#define IOCTL_HID_GET_INPUT_REPORT HID_OUT_CTL_CODE(104) +#define IOCTL_HID_GET_MANUFACTURER_STRING HID_OUT_CTL_CODE(110) +#define IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS HID_BUFFER_CTL_CODE(104) +#define IOCTL_HID_GET_POLL_FREQUENCY_MSEC HID_BUFFER_CTL_CODE(102) +#define IOCTL_HID_GET_PRODUCT_STRING HID_OUT_CTL_CODE(111) +#define IOCTL_HID_GET_SERIALNUMBER_STRING HID_OUT_CTL_CODE(112) +#define IOCTL_HID_SET_FEATURE HID_IN_CTL_CODE(100) +#define IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS HID_BUFFER_CTL_CODE(105) +#define IOCTL_HID_SET_OUTPUT_REPORT HID_IN_CTL_CODE(101) +#define IOCTL_HID_SET_POLL_FREQUENCY_MSEC HID_BUFFER_CTL_CODE(103) + +#define IOCTL_HID_GET_DRIVER_CONFIG HID_BUFFER_CTL_CODE(100) +#define IOCTL_HID_SET_DRIVER_CONFIG HID_BUFFER_CTL_CODE(101) +#define IOCTL_HID_GET_MS_GENRE_DESCRIPTOR HID_OUT_CTL_CODE(121) + +#ifdef __cplusplus +} +#endif + +#endif /* __HIDCLASS_H */

1 0

Aric Stewart : include: Add ddk/hidpi.h.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: ab3300cdda900124d827424861921558c5031222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab3300cdda900124d82742486… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 25 10:15:41 2015 -0500 include: Add ddk/hidpi.h. --- include/Makefile.in | 1 + include/ddk/hidpi.h | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidsdi.h | 2 +- 3 files changed, 169 insertions(+), 1 deletion(-) diff --git a/include/Makefile.in b/include/Makefile.in index c02199d..795642d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -253,6 +253,7 @@ SRCDIR_INCLUDES = \ ddk/compstui.h \ ddk/csq.h \ ddk/hidclass.h \ + ddk/hidpi.h \ ddk/hidsdi.h \ ddk/imm.h \ ddk/mountmgr.h \ diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h new file mode 100644 index 0000000..32f6625 --- /dev/null +++ b/include/ddk/hidpi.h @@ -0,0 +1,167 @@ +/* + * Copyright (C) 2015 Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __HIDPI_H__ +#define __HIDPI_H__ + +typedef enum _HIDP_REPORT_TYPE +{ + HidP_Input, + HidP_Output, + HidP_Feature +} HIDP_REPORT_TYPE; + +typedef struct _HIDP_BUTTON_CAPS +{ + USAGE UsagePage; + UCHAR ReportID; + BOOLEAN IsAlias; + USHORT BitField; + USHORT LinkCollection; + USAGE LinkUsage; + USAGE LinkUsagePage; + + BOOLEAN IsRange; + BOOLEAN IsStringRange; + BOOLEAN IsDesignatorRange; + BOOLEAN IsAbsolute; + ULONG Reserved[10]; + union { + struct { + USAGE UsageMin; + USAGE UsageMax; + USHORT StringMin; + USHORT StringMax; + USHORT DesignatorMin; + USHORT DesignatorMax; + USHORT DataIndexMin; + USHORT DataIndexMax; + } Range; + struct { + USAGE Usage; + USAGE Reserved1; + USHORT StringIndex; + USHORT Reserved2; + USHORT DesignatorIndex; + USHORT Reserved3; + USHORT DataIndex; + USHORT Reserved4; + } NotRange; + } DUMMYUNIONNAME; +} HIDP_BUTTON_CAPS, *PHIDP_BUTTON_CAPS; + +typedef struct _HIDP_VALUE_CAPS +{ + USAGE UsagePage; + UCHAR ReportID; + BOOLEAN IsAlias; + USHORT BitField; + USHORT LinkCollection; + USAGE LinkUsage; + USAGE LinkUsagePage; + + BOOLEAN IsRange; + BOOLEAN IsStringRange; + BOOLEAN IsDesignatorRange; + BOOLEAN IsAbsolute; + BOOLEAN HasNull; + UCHAR Reserved; + USHORT BitSize; + USHORT ReportCount; + USHORT Reserved2[5]; + ULONG UnitsExp; + ULONG Units; + LONG LogicalMin; + LONG LogicalMax; + LONG PhysicalMin; + LONG PhysicalMax; + union { + struct { + USAGE UsageMin; + USAGE UsageMax; + USHORT StringMin; + USHORT StringMax; + USHORT DesignatorMin; + USHORT DesignatorMax; + USHORT DataIndexMin; + USHORT DataIndexMax; + } Range; + struct { + USAGE Usage; + USAGE Reserved1; + USHORT StringIndex; + USHORT Reserved2; + USHORT DesignatorIndex; + USHORT Reserved3; + USHORT DataIndex; + USHORT Reserved4; + } NotRange; + } DUMMYUNIONNAME; +} HIDP_VALUE_CAPS, *PHIDP_VALUE_CAPS; + +typedef struct _HIDP_PREPARSED_DATA * PHIDP_PREPARSED_DATA; + +typedef struct _HIDP_CAPS +{ + USAGE Usage; + USAGE UsagePage; + USHORT InputReportByteLength; + USHORT OutputReportByteLength; + USHORT FeatureReportByteLength; + USHORT Reserved[17]; + USHORT NumberLinkCollectionNodes; + USHORT NumberInputButtonCaps; + USHORT NumberInputValueCaps; + USHORT NumberInputDataIndices; + USHORT NumberOutputButtonCaps; + USHORT NumberOutputValueCaps; + USHORT NumberOutputDataIndices; + USHORT NumberFeatureButtonCaps; + USHORT NumberFeatureValueCaps; + USHORT NumberFeatureDataIndices; +} HIDP_CAPS, *PHIDP_CAPS; + +NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities); + +#ifndef FACILITY_HID_ERROR_CODE +#define FACILITY_HID_ERROR_CODE 0x11 +#endif + +#define HIDP_ERROR_CODES(sev, code) ((NTSTATUS)(((sev) << 28) | (FACILITY_HID_ERROR_CODE << 16) | (code))) + +#define HIDP_STATUS_SUCCESS (HIDP_ERROR_CODES(0x0,0x00)) +#define HIDP_STATUS_NULL (HIDP_ERROR_CODES(0x8,0x01)) +#define HIDP_STATUS_INVALID_PREPARSED_DATA (HIDP_ERROR_CODES(0xc,0x01)) +#define HIDP_STATUS_INVALID_REPORT_TYPE (HIDP_ERROR_CODES(0xc,0x02)) +#define HIDP_STATUS_INVALID_REPORT_LENGTH (HIDP_ERROR_CODES(0xc,0x03)) +#define HIDP_STATUS_USAGE_NOT_FOUND (HIDP_ERROR_CODES(0xc,0x04)) +#define HIDP_STATUS_VALUE_OUT_OF_RANGE (HIDP_ERROR_CODES(0xc,0x05)) +#define HIDP_STATUS_BAD_LOG_PHY_VALUES (HIDP_ERROR_CODES(0xc,0x06)) +#define HIDP_STATUS_BUFFER_TOO_SMALL (HIDP_ERROR_CODES(0xc,0x07)) +#define HIDP_STATUS_INTERNAL_ERROR (HIDP_ERROR_CODES(0xc,0x08)) +#define HIDP_STATUS_I8242_TRANS_UNKNOWN (HIDP_ERROR_CODES(0xc,0x09)) +#define HIDP_STATUS_INCOMPATIBLE_REPORT_ID (HIDP_ERROR_CODES(0xc,0x0a)) +#define HIDP_STATUS_NOT_VALUE_ARRAY (HIDP_ERROR_CODES(0xc,0x0b)) +#define HIDP_STATUS_IS_VALUE_ARRAY (HIDP_ERROR_CODES(0xc,0x0c)) +#define HIDP_STATUS_DATA_INDEX_NOT_FOUND (HIDP_ERROR_CODES(0xc,0x0d)) +#define HIDP_STATUS_DATA_INDEX_OUT_OF_RANGE (HIDP_ERROR_CODES(0xc,0x0e)) +#define HIDP_STATUS_BUTTON_NOT_PRESSED (HIDP_ERROR_CODES(0xc,0x0f)) +#define HIDP_STATUS_REPORT_DOES_NOT_EXIST (HIDP_ERROR_CODES(0xc,0x10)) +#define HIDP_STATUS_NOT_IMPLEMENTED (HIDP_ERROR_CODES(0xc,0x20)) + +#endif /* __HIDPI_H__ */ diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 73f5250..5eb68ff 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -20,7 +20,7 @@ #define __WINE_HIDSDI_H #include "hidusage.h" -/* FIXME: #include "hidpi.h" */ +#include "hidpi.h" #ifndef WINE_NTSTATUS_DECLARED #define WINE_NTSTATUS_DECLARED

1 0

Aric Stewart : hid: Break HidD functions out into their own module.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 5b882003fe6d76362d89338d1b388a513dfd52af URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b882003fe6d76362d89338d1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 25 10:15:33 2015 -0500 hid: Break HidD functions out into their own module. --- dlls/hid/Makefile.in | 1 + dlls/hid/hidd.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/hid/main.c | 38 +----------------------------- 3 files changed, 67 insertions(+), 37 deletions(-) diff --git a/dlls/hid/Makefile.in b/dlls/hid/Makefile.in index af0d7dc..3a115ca 100644 --- a/dlls/hid/Makefile.in +++ b/dlls/hid/Makefile.in @@ -2,6 +2,7 @@ MODULE = hid.dll IMPORTLIB = hid C_SRCS = \ + hidd.c \ main.c RC_SRCS = version.rc diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c new file mode 100644 index 0000000..18a033c --- /dev/null +++ b/dlls/hid/hidd.c @@ -0,0 +1,65 @@ +/* + * Human Input Devices + * + * Copyright (C) 2006 Kevin Koltzau + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "wine/debug.h" + +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" + +#include "ddk/hidclass.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hid); + +BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) +{ + static int count = 0; + if (!count++) + FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength); + return FALSE; +} + +void WINAPI HidD_GetHidGuid(LPGUID guid) +{ + TRACE("(%p)\n", guid); + *guid = GUID_DEVINTERFACE_HID; +} + +BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) +{ + FIXME("(%p %p %u) stub\n", HidDeviceObject, Buffer, BufferLength); + return FALSE; +} + +BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) +{ + FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength); + return FALSE; +} + +BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) +{ + FIXME("(%p %p %u) stub\n", HidDeviceObject, Buffer, BufferLength); + return FALSE; +} diff --git a/dlls/hid/main.c b/dlls/hid/main.c index 927b563..1e38220 100644 --- a/dlls/hid/main.c +++ b/dlls/hid/main.c @@ -24,14 +24,10 @@ #include "windef.h" #include "winbase.h" -#include "ddk/hidsdi.h" #include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(hid); - #include "initguid.h" -DEFINE_GUID(HID_GUID, 0x4D1E55B2, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30); +#include "ddk/hidclass.h" /***********************************************************************/ @@ -47,35 +43,3 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) } return TRUE; } - -BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) -{ - static int count = 0; - if (!count++) - FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return FALSE; -} - -void WINAPI HidD_GetHidGuid(LPGUID guid) -{ - TRACE("(%p)\n", guid); - *guid = HID_GUID; -} - -BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) -{ - FIXME("(%p %p %u) stub\n", HidDeviceObject, Buffer, BufferLength); - return FALSE; -} - -BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) -{ - FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return FALSE; -} - -BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) -{ - FIXME("(%p %p %u) stub\n", HidDeviceObject, Buffer, BufferLength); - return FALSE; -}

1 0

Aric Stewart : hid: Translate HidD_ functions to their IOCTLs.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 4c6507d94cb3b13fc3f4ac18cf02cf72425b46d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6507d94cb3b13fc3f4ac18c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 25 14:26:53 2015 -0500 hid: Translate HidD_ functions to their IOCTLs. --- dlls/hid/hidd.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 18a033c..144e804 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -2,6 +2,7 @@ * Human Input Devices * * Copyright (C) 2006 Kevin Koltzau + * Copyright (C) 2015 Aric Stewart * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,6 +28,9 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" #include "ddk/hidclass.h" @@ -34,10 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { - static int count = 0; - if (!count++) - FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return FALSE; + TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); } void WINAPI HidD_GetHidGuid(LPGUID guid) @@ -48,18 +50,18 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { - FIXME("(%p %p %u) stub\n", HidDeviceObject, Buffer, BufferLength); - return FALSE; + TRACE("(%p %p %u) \n", HidDeviceObject, Buffer, BufferLength); + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); } BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { - FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return FALSE; + TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); + return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); } BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { - FIXME("(%p %p %u) stub\n", HidDeviceObject, Buffer, BufferLength); - return FALSE; + TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); }

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::snextc.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: fac4fdb56fed3b4f63a1b72ebd332af2c816d069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac4fdb56fed3b4f63a1b72eb… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Jun 25 19:02:05 2015 +0200 msvcirt: Add implementation of streambuf::snextc. --- dlls/msvcirt/msvcirt.c | 18 +++++++++++++++ dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 5 files changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 35777e3..77dc089 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -597,6 +597,24 @@ int __thiscall streambuf_sputn(streambuf *this, const char *data, int length) return call_streambuf_xsputn(this, data, length); } +/* ?snextc(a)streambuf@@QAEHXZ */ +/* ?snextc(a)streambuf@@QEAAHXZ */ +DEFINE_THISCALL_WRAPPER(streambuf_snextc, 4) +int __thiscall streambuf_snextc(streambuf *this) +{ + TRACE("(%p)\n", this); + if (this->unbuffered) { + if (this->stored_char == EOF) + call_streambuf_underflow(this); + return this->stored_char = call_streambuf_underflow(this); + } else { + if (this->gptr >= this->egptr) + call_streambuf_underflow(this); + this->gptr++; + return (this->gptr < this->egptr) ? *this->gptr : call_streambuf_underflow(this); + } +} + /****************************************************************** * ??1ios@@UAE(a)XZ (MSVCRTI.@) * class ios & __thiscall ios::-ios<<(void) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 2a65e2f..e49fd53 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -700,8 +700,8 @@ # @ extern ?sh_none(a)filebuf@@2HB # static int const filebuf::sh_none # @ extern ?sh_read(a)filebuf@@2HB # static int const filebuf::sh_read # @ extern ?sh_write(a)filebuf@@2HB # static int const filebuf::sh_write -@ stub -arch=win32 ?snextc(a)streambuf@@QAEHXZ # int __thiscall streambuf::snextc(void) -@ stub -arch=win64 ?snextc(a)streambuf@@QEAAHXZ +@ thiscall -arch=win32 ?snextc(a)streambuf@@QAEHXZ(ptr) streambuf_snextc +@ cdecl -arch=win64 ?snextc(a)streambuf@@QEAAHXZ(ptr) streambuf_snextc @ stub -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z # int __thiscall streambuf::sputbackc(char) @ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z @ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) streambuf_sputc diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index a175531..3d6e6ad 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -62,6 +62,7 @@ static void (*__thiscall p_streambuf_setb)(streambuf*, char*, char*, int); static void (*__thiscall p_streambuf_setlock)(streambuf*); static streambuf* (*__thiscall p_streambuf_setbuf)(streambuf*, char*, int); static int (*__thiscall p_streambuf_sgetc)(streambuf*); +static int (*__thiscall p_streambuf_snextc)(streambuf*); static int (*__thiscall p_streambuf_sputc)(streambuf*, int); static int (*__thiscall p_streambuf_sync)(streambuf*); static void (*__thiscall p_streambuf_unlock)(streambuf*); @@ -150,6 +151,7 @@ static BOOL init(void) SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UEAAPEAV1(a)PEADH@Z"); SET(p_streambuf_setlock, "?setlock(a)streambuf@@QEAAXXZ"); SET(p_streambuf_sgetc, "?sgetc(a)streambuf@@QEAAHXZ"); + SET(p_streambuf_snextc, "?snextc(a)streambuf@@QEAAHXZ"); SET(p_streambuf_sputc, "?sputc(a)streambuf@@QEAAHH(a)Z"); SET(p_streambuf_sync, "?sync(a)streambuf@@UEAAHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QEAAXXZ"); @@ -169,6 +171,7 @@ static BOOL init(void) SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UAEPAV1(a)PADH@Z"); SET(p_streambuf_setlock, "?setlock(a)streambuf@@QAEXXZ"); SET(p_streambuf_sgetc, "?sgetc(a)streambuf@@QAEHXZ"); + SET(p_streambuf_snextc, "?snextc(a)streambuf@@QAEHXZ"); SET(p_streambuf_sputc, "?sputc(a)streambuf@@QAEHH(a)Z"); SET(p_streambuf_sync, "?sync(a)streambuf@@UAEHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QAEXXZ"); @@ -564,6 +567,57 @@ static void test_streambuf(void) ok(sb3.stored_char == 'G', "wrong stored character, expected 'G' got %c\n", sb3.stored_char); ok(overflow_count == 14, "expected 3 calls to overflow, got %d\n", overflow_count - 11); + /* snextc */ + strcpy(sb.eback, "Test"); + ret = (int) call_func1(p_streambuf_snextc, &sb); + ok(ret == 'e', "expected 'e' got '%c'\n", ret); + ok(sb.gptr == sb.eback + 1, "wrong get pointer, expected %p got %p\n", sb.eback + 1, sb.gptr); + test_this = &sb2; + ret = (int) call_func1(p_streambuf_snextc, &sb2); + ok(ret == EOF, "expected EOF got '%c'\n", ret); + ok(sb2.gptr == sb2.egptr + 1, "wrong get pointer, expected %p got %p\n", sb2.egptr + 1, sb2.gptr); + ok(underflow_count == 39, "expected 2 calls to underflow, got %d\n", underflow_count - 37); + sb2.gptr = sb2.egptr - 1; + ret = (int) call_func1(p_streambuf_snextc, &sb2); + ok(ret == EOF, "expected EOF got '%c'\n", ret); + ok(sb2.gptr == sb2.egptr, "wrong get pointer, expected %p got %p\n", sb2.egptr, sb2.gptr); + ok(underflow_count == 40, "expected call to underflow\n"); + get_end = 0; + ret = (int) call_func1(p_streambuf_snextc, &sb2); + ok(ret == 'o', "expected 'o' got '%c'\n", ret); + ok(sb2.gptr == sb2.eback + 1, "wrong get pointer, expected %p got %p\n", sb2.eback + 1, sb2.gptr); + ok(underflow_count == 41, "expected call to underflow\n"); + sb2.gptr = sb2.egptr - 1; + ret = (int) call_func1(p_streambuf_snextc, &sb2); + ok(ret == 'W', "expected 'W' got '%c'\n", ret); + ok(sb2.gptr == sb2.eback, "wrong get pointer, expected %p got %p\n", sb2.eback, sb2.gptr); + ok(underflow_count == 42, "expected call to underflow\n"); + sb2.gptr = sb2.egptr; + test_this = &sb3; + ret = (int) call_func1(p_streambuf_snextc, &sb3); + ok(ret == 'l', "expected 'l' got '%c'\n", ret); + ok(sb3.stored_char == 'l', "wrong stored character, expected 'l' got %c\n", sb3.stored_char); + ok(underflow_count == 43, "expected call to underflow\n"); + buffer_pos = 22; + ret = (int) call_func1(p_streambuf_snextc, &sb3); + ok(ret == 't', "expected 't' got '%c'\n", ret); + ok(sb3.stored_char == 't', "wrong stored character, expected 't' got %c\n", sb3.stored_char); + ok(underflow_count == 44, "expected call to underflow\n"); + ret = (int) call_func1(p_streambuf_snextc, &sb3); + ok(ret == EOF, "expected EOF got '%c'\n", ret); + ok(sb3.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb3.stored_char); + ok(underflow_count == 45, "expected call to underflow\n"); + buffer_pos = 0; + ret = (int) call_func1(p_streambuf_snextc, &sb3); + ok(ret == 'o', "expected 'o' got '%c'\n", ret); + ok(sb3.stored_char == 'o', "wrong stored character, expected 'o' got %c\n", sb3.stored_char); + ok(underflow_count == 47, "expected 2 calls to underflow, got %d\n", underflow_count - 45); + sb3.stored_char = EOF; + ret = (int) call_func1(p_streambuf_snextc, &sb3); + ok(ret == 'p', "expected 'p' got '%c'\n", ret); + ok(sb3.stored_char == 'p', "wrong stored character, expected 'p' got %c\n", sb3.stored_char); + ok(underflow_count == 49, "expected 2 calls to underflow, got %d\n", underflow_count - 47); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 1be499b..5786fc4 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -688,8 +688,8 @@ # @ extern ?sh_none(a)filebuf@@2HB # @ extern ?sh_read(a)filebuf@@2HB # @ extern ?sh_write(a)filebuf@@2HB -@ stub -arch=win32 ?snextc(a)streambuf@@QAEHXZ -@ stub -arch=win64 ?snextc(a)streambuf@@QEAAHXZ +@ thiscall -arch=win32 ?snextc(a)streambuf@@QAEHXZ(ptr) msvcirt.?snextc(a)streambuf@@QAEHXZ +@ cdecl -arch=win64 ?snextc(a)streambuf@@QEAAHXZ(ptr) msvcirt.?snextc(a)streambuf@@QEAAHXZ @ stub -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z @ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z @ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QAEHH(a)Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 94d9035..de6364a 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -760,8 +760,8 @@ # @ extern ?sh_none(a)filebuf@@2HB # @ extern ?sh_read(a)filebuf@@2HB # @ extern ?sh_write(a)filebuf@@2HB -@ stub -arch=win32 ?snextc(a)streambuf@@QAEHXZ -@ stub -arch=win64 ?snextc(a)streambuf@@QEAAHXZ +@ thiscall -arch=win32 ?snextc(a)streambuf@@QAEHXZ(ptr) msvcirt.?snextc(a)streambuf@@QAEHXZ +@ cdecl -arch=win64 ?snextc(a)streambuf@@QEAAHXZ(ptr) msvcirt.?snextc(a)streambuf@@QEAAHXZ @ stub -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z @ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z @ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QAEHH(a)Z

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::sbumpc.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 346a8e1cbf5287b538b7aaaee57550fa0ccc2928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=346a8e1cbf5287b538b7aaaee… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Jun 25 19:02:11 2015 +0200 msvcirt: Add implementation of streambuf::sbumpc. --- dlls/msvcirt/msvcirt.c | 21 +++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 5 files changed, 71 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 77dc089..808237c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -615,6 +615,27 @@ int __thiscall streambuf_snextc(streambuf *this) } } +/* ?sbumpc(a)streambuf@@QAEHXZ */ +/* ?sbumpc(a)streambuf@@QEAAHXZ */ +DEFINE_THISCALL_WRAPPER(streambuf_sbumpc, 4) +int __thiscall streambuf_sbumpc(streambuf *this) +{ + int ret; + + TRACE("(%p)\n", this); + + if (this->unbuffered) { + ret = this->stored_char; + this->stored_char = EOF; + if (ret == EOF) + ret = call_streambuf_underflow(this); + } else { + ret = (this->gptr < this->egptr) ? *this->gptr : call_streambuf_underflow(this); + this->gptr++; + } + return ret; +} + /****************************************************************** * ??1ios@@UAE(a)XZ (MSVCRTI.@) * class ios & __thiscall ios::-ios<<(void) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index e49fd53..b3f592d 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -637,8 +637,8 @@ @ stub -arch=win64 ?read(a)istream@@QEAAAEAV1(a)PEADH@Z @ stub -arch=win32 ?read(a)istream@@QAEAAV1(a)PAEH@Z # class istream & __thiscall istream::read(unsigned char *,int) @ stub -arch=win64 ?read(a)istream@@QEAAAEAV1(a)PEAEH@Z -@ stub -arch=win32 ?sbumpc(a)streambuf@@QAEHXZ # int __thiscall streambuf::sbumpc(void) -@ stub -arch=win64 ?sbumpc(a)streambuf@@QEAAHXZ +@ thiscall -arch=win32 ?sbumpc(a)streambuf@@QAEHXZ(ptr) streambuf_sbumpc +@ cdecl -arch=win64 ?sbumpc(a)streambuf@@QEAAHXZ(ptr) streambuf_sbumpc @ stub -arch=win32 ?seekg(a)istream@@QAEAAV1(a)J@Z # class istream & __thiscall istream::seekg(long) @ stub -arch=win64 ?seekg(a)istream@@QEAAAEAV1(a)J@Z @ stub -arch=win32 ?seekg(a)istream@@QAEAAV1(a)JW4seek_dir@ios@@@Z # class istream & __thiscall istream::seekg(long,enum ios::seek_dir) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 3d6e6ad..8ebf045 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -58,6 +58,7 @@ static int (*__thiscall p_streambuf_doallocate)(streambuf*); static void (*__thiscall p_streambuf_gbump)(streambuf*, int); static void (*__thiscall p_streambuf_lock)(streambuf*); static void (*__thiscall p_streambuf_pbump)(streambuf*, int); +static int (*__thiscall p_streambuf_sbumpc)(streambuf*); static void (*__thiscall p_streambuf_setb)(streambuf*, char*, char*, int); static void (*__thiscall p_streambuf_setlock)(streambuf*); static streambuf* (*__thiscall p_streambuf_setbuf)(streambuf*, char*, int); @@ -147,6 +148,7 @@ static BOOL init(void) SET(p_streambuf_gbump, "?gbump(a)streambuf@@IEAAXH(a)Z"); SET(p_streambuf_lock, "?lock(a)streambuf@@QEAAXXZ"); SET(p_streambuf_pbump, "?pbump(a)streambuf@@IEAAXH(a)Z"); + SET(p_streambuf_sbumpc, "?sbumpc(a)streambuf@@QEAAHXZ"); SET(p_streambuf_setb, "?setb(a)streambuf@@IEAAXPEAD0H(a)Z"); SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UEAAPEAV1(a)PEADH@Z"); SET(p_streambuf_setlock, "?setlock(a)streambuf@@QEAAXXZ"); @@ -167,6 +169,7 @@ static BOOL init(void) SET(p_streambuf_gbump, "?gbump(a)streambuf@@IAEXH(a)Z"); SET(p_streambuf_lock, "?lock(a)streambuf@@QAEXXZ"); SET(p_streambuf_pbump, "?pbump(a)streambuf@@IAEXH(a)Z"); + SET(p_streambuf_sbumpc, "?sbumpc(a)streambuf@@QAEHXZ"); SET(p_streambuf_setb, "?setb(a)streambuf@@IAEXPAD0H(a)Z"); SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UAEPAV1(a)PADH@Z"); SET(p_streambuf_setlock, "?setlock(a)streambuf@@QAEXXZ"); @@ -618,6 +621,47 @@ static void test_streambuf(void) ok(sb3.stored_char == 'p', "wrong stored character, expected 'p' got %c\n", sb3.stored_char); ok(underflow_count == 49, "expected 2 calls to underflow, got %d\n", underflow_count - 47); + /* sbumpc */ + ret = (int) call_func1(p_streambuf_sbumpc, &sb); + ok(ret == 'e', "expected 'e' got '%c'\n", ret); + ok(sb.gptr == sb.eback + 2, "wrong get pointer, expected %p got %p\n", sb.eback + 2, sb.gptr); + test_this = &sb2; + ret = (int) call_func1(p_streambuf_sbumpc, &sb2); + ok(ret == 'W', "expected 'W' got '%c'\n", ret); + ok(sb2.gptr == sb2.eback + 1, "wrong get pointer, expected %p got %p\n", sb2.eback + 1, sb2.gptr); + ok(underflow_count == 50, "expected call to underflow\n"); + sb2.gptr = sb2.egptr - 1; + *sb2.gptr = 't'; + ret = (int) call_func1(p_streambuf_sbumpc, &sb2); + ok(ret == 't', "expected 't' got '%c'\n", ret); + ok(sb2.gptr == sb2.egptr, "wrong get pointer, expected %p got %p\n", sb2.egptr, sb2.gptr); + ok(underflow_count == 50, "no call to underflow expected\n"); + get_end = 1; + ret = (int) call_func1(p_streambuf_sbumpc, &sb2); + ok(ret == EOF, "expected EOF got '%c'\n", ret); + ok(sb2.gptr == sb2.egptr + 1, "wrong get pointer, expected %p got %p\n", sb2.egptr + 1, sb2.gptr); + ok(underflow_count == 51, "expected call to underflow\n"); + sb2.gptr = sb2.egptr; + test_this = &sb3; + ret = (int) call_func1(p_streambuf_sbumpc, &sb3); + ok(ret == 'p', "expected 'p' got '%c'\n", ret); + ok(sb3.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb3.stored_char); + ok(underflow_count == 51, "no call to underflow expected\n"); + ret = (int) call_func1(p_streambuf_sbumpc, &sb3); + ok(ret == 'u', "expected 'u' got '%c'\n", ret); + ok(sb3.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb3.stored_char); + ok(underflow_count == 52, "expected call to underflow\n"); + buffer_pos = 23; + ret = (int) call_func1(p_streambuf_sbumpc, &sb3); + ok(ret == EOF, "expected EOF got '%c'\n", ret); + ok(sb3.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb3.stored_char); + ok(underflow_count == 53, "expected call to underflow\n"); + buffer_pos = 0; + ret = (int) call_func1(p_streambuf_sbumpc, &sb3); + ok(ret == 'C', "expected 'C' got '%c'\n", ret); + ok(sb3.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb3.stored_char); + ok(underflow_count == 54, "expected call to underflow\n"); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 5786fc4..2e4bc16 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -623,8 +623,8 @@ @ stub -arch=win64 ?read(a)istream@@QEAAAEAV1(a)PEADH@Z @ stub -arch=win32 ?read(a)istream@@QAEAAV1(a)PAEH@Z @ stub -arch=win64 ?read(a)istream@@QEAAAEAV1(a)PEAEH@Z -@ stub -arch=win32 ?sbumpc(a)streambuf@@QAEHXZ -@ stub -arch=win64 ?sbumpc(a)streambuf@@QEAAHXZ +@ thiscall -arch=win32 ?sbumpc(a)streambuf@@QAEHXZ(ptr) msvcirt.?sbumpc(a)streambuf@@QAEHXZ +@ cdecl -arch=win64 ?sbumpc(a)streambuf@@QEAAHXZ(ptr) msvcirt.?sbumpc(a)streambuf@@QEAAHXZ @ stub -arch=win32 ?seekg(a)istream@@QAEAAV1(a)J@Z @ stub -arch=win64 ?seekg(a)istream@@QEAAAEAV1(a)J@Z @ stub -arch=win32 ?seekg(a)istream@@QAEAAV1(a)JW4seek_dir@ios@@@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index de6364a..a3cfbdc 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -694,8 +694,8 @@ @ stub -arch=win64 ?read(a)istream@@QEAAAEAV1(a)PEADH@Z @ stub -arch=win32 ?read(a)istream@@QAEAAV1(a)PAEH@Z @ stub -arch=win64 ?read(a)istream@@QEAAAEAV1(a)PEAEH@Z -@ stub -arch=win32 ?sbumpc(a)streambuf@@QAEHXZ -@ stub -arch=win64 ?sbumpc(a)streambuf@@QEAAHXZ +@ thiscall -arch=win32 ?sbumpc(a)streambuf@@QAEHXZ(ptr) msvcirt.?sbumpc(a)streambuf@@QAEHXZ +@ cdecl -arch=win64 ?sbumpc(a)streambuf@@QEAAHXZ(ptr) msvcirt.?sbumpc(a)streambuf@@QEAAHXZ @ stub -arch=win32 ?seekg(a)istream@@QAEAAV1(a)J@Z @ stub -arch=win64 ?seekg(a)istream@@QEAAAEAV1(a)J@Z @ stub -arch=win32 ?seekg(a)istream@@QAEAAV1(a)JW4seek_dir@ios@@@Z

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::stossc.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: d553a0883f21cc6a990688975d54395e90c8c52a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d553a0883f21cc6a990688975… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Jun 25 19:02:17 2015 +0200 msvcirt: Add implementation of streambuf::stossc. --- dlls/msvcirt/msvcirt.c | 19 +++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 27 +++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 5 files changed, 52 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 808237c..66858de 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -636,6 +636,25 @@ int __thiscall streambuf_sbumpc(streambuf *this) return ret; } +/* ?stossc(a)streambuf@@QAEXXZ */ +/* ?stossc(a)streambuf@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(streambuf_stossc, 4) +void __thiscall streambuf_stossc(streambuf *this) +{ + TRACE("(%p)\n", this); + if (this->unbuffered) { + if (this->stored_char == EOF) + call_streambuf_underflow(this); + else + this->stored_char = EOF; + } else { + if (this->gptr >= this->egptr) + call_streambuf_underflow(this); + if (this->gptr < this->egptr) + this->gptr++; + } +} + /****************************************************************** * ??1ios@@UAE(a)XZ (MSVCRTI.@) * class ios & __thiscall ios::-ios<<(void) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index b3f592d..913f186 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -710,8 +710,8 @@ @ cdecl -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z(ptr str long) streambuf_sputn @ stub -arch=win32 ?stdiofile(a)stdiobuf@@QAEPAU_iobuf@@XZ # struct _iobuf * __thiscall stdiobuf::stdiofile(void) @ stub -arch=win64 ?stdiofile(a)stdiobuf@@QEAAPEAU_iobuf@@XZ -@ stub -arch=win32 ?stossc(a)streambuf@@QAEXXZ # void __thiscall streambuf::stossc(void) -@ stub -arch=win64 ?stossc(a)streambuf@@QEAAXXZ +@ thiscall -arch=win32 ?stossc(a)streambuf@@QAEXXZ(ptr) streambuf_stossc +@ cdecl -arch=win64 ?stossc(a)streambuf@@QEAAXXZ(ptr) streambuf_stossc @ stub -arch=win32 ?str(a)istrstream@@QAEPADXZ # char * __thiscall istrstream::str(void) @ stub -arch=win64 ?str(a)istrstream@@QEAAPEADXZ @ stub -arch=win32 ?str(a)ostrstream@@QAEPADXZ # char * __thiscall ostrstream::str(void) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 8ebf045..42c0e3a 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -65,6 +65,7 @@ static streambuf* (*__thiscall p_streambuf_setbuf)(streambuf*, char*, int); static int (*__thiscall p_streambuf_sgetc)(streambuf*); static int (*__thiscall p_streambuf_snextc)(streambuf*); static int (*__thiscall p_streambuf_sputc)(streambuf*, int); +static void (*__thiscall p_streambuf_stossc)(streambuf*); static int (*__thiscall p_streambuf_sync)(streambuf*); static void (*__thiscall p_streambuf_unlock)(streambuf*); static int (*__thiscall p_streambuf_xsgetn)(streambuf*, char*, int); @@ -155,6 +156,7 @@ static BOOL init(void) SET(p_streambuf_sgetc, "?sgetc(a)streambuf@@QEAAHXZ"); SET(p_streambuf_snextc, "?snextc(a)streambuf@@QEAAHXZ"); SET(p_streambuf_sputc, "?sputc(a)streambuf@@QEAAHH(a)Z"); + SET(p_streambuf_stossc, "?stossc(a)streambuf@@QEAAXXZ"); SET(p_streambuf_sync, "?sync(a)streambuf@@UEAAHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QEAAXXZ"); SET(p_streambuf_xsgetn, "?xsgetn(a)streambuf@@UEAAHPEADH(a)Z"); @@ -176,6 +178,7 @@ static BOOL init(void) SET(p_streambuf_sgetc, "?sgetc(a)streambuf@@QAEHXZ"); SET(p_streambuf_snextc, "?snextc(a)streambuf@@QAEHXZ"); SET(p_streambuf_sputc, "?sputc(a)streambuf@@QAEHH(a)Z"); + SET(p_streambuf_stossc, "?stossc(a)streambuf@@QAEXXZ"); SET(p_streambuf_sync, "?sync(a)streambuf@@UAEHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QAEXXZ"); SET(p_streambuf_xsgetn, "?xsgetn(a)streambuf@@UAEHPADH(a)Z"); @@ -662,6 +665,30 @@ static void test_streambuf(void) ok(sb3.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb3.stored_char); ok(underflow_count == 54, "expected call to underflow\n"); + /* stossc */ + call_func1(p_streambuf_stossc, &sb); + ok(sb.gptr == sb.eback + 3, "wrong get pointer, expected %p got %p\n", sb.eback + 3, sb.gptr); + test_this = &sb2; + call_func1(p_streambuf_stossc, &sb2); + ok(sb2.gptr == sb2.egptr, "wrong get pointer, expected %p got %p\n", sb2.egptr, sb2.gptr); + ok(underflow_count == 55, "expected call to underflow\n"); + get_end = 0; + call_func1(p_streambuf_stossc, &sb2); + ok(sb2.gptr == sb2.eback + 1, "wrong get pointer, expected %p got %p\n", sb2.eback + 1, sb2.gptr); + ok(underflow_count == 56, "expected call to underflow\n"); + sb2.gptr = sb2.egptr - 1; + call_func1(p_streambuf_stossc, &sb2); + ok(sb2.gptr == sb2.egptr, "wrong get pointer, expected %p got %p\n", sb2.egptr, sb2.gptr); + ok(underflow_count == 56, "no call to underflow expected\n"); + test_this = &sb3; + call_func1(p_streambuf_stossc, &sb3); + ok(sb3.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb3.stored_char); + ok(underflow_count == 57, "expected call to underflow\n"); + sb3.stored_char = 'a'; + call_func1(p_streambuf_stossc, &sb3); + ok(sb3.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb3.stored_char); + ok(underflow_count == 57, "no call to underflow expected\n"); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 2e4bc16..f37d876 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -698,8 +698,8 @@ @ cdecl -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z(ptr str long) msvcirt.?sputn(a)streambuf@@QEAAHPEBDH(a)Z @ stub -arch=win32 ?stdiofile(a)stdiobuf@@QAEPAU_iobuf@@XZ @ stub -arch=win64 ?stdiofile(a)stdiobuf@@QEAAPEAU_iobuf@@XZ -@ stub -arch=win32 ?stossc(a)streambuf@@QAEXXZ -@ stub -arch=win64 ?stossc(a)streambuf@@QEAAXXZ +@ thiscall -arch=win32 ?stossc(a)streambuf@@QAEXXZ(ptr) msvcirt.?stossc(a)streambuf@@QAEXXZ +@ cdecl -arch=win64 ?stossc(a)streambuf@@QEAAXXZ(ptr) msvcirt.?stossc(a)streambuf@@QEAAXXZ @ stub -arch=win32 ?str(a)istrstream@@QAEPADXZ @ stub -arch=win64 ?str(a)istrstream@@QEAAPEADXZ @ stub -arch=win32 ?str(a)ostrstream@@QAEPADXZ diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index a3cfbdc..9173aef 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -770,8 +770,8 @@ @ cdecl -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z(ptr str long) msvcirt.?sputn(a)streambuf@@QEAAHPEBDH(a)Z @ stub -arch=win32 ?stdiofile(a)stdiobuf@@QAEPAU_iobuf@@XZ @ stub -arch=win64 ?stdiofile(a)stdiobuf@@QEAAPEAU_iobuf@@XZ -@ stub -arch=win32 ?stossc(a)streambuf@@QAEXXZ -@ stub -arch=win64 ?stossc(a)streambuf@@QEAAXXZ +@ thiscall -arch=win32 ?stossc(a)streambuf@@QAEXXZ(ptr) msvcirt.?stossc(a)streambuf@@QAEXXZ +@ cdecl -arch=win64 ?stossc(a)streambuf@@QEAAXXZ(ptr) msvcirt.?stossc(a)streambuf@@QEAAXXZ @ stub -arch=win32 ?str(a)istrstream@@QAEPADXZ @ stub -arch=win64 ?str(a)istrstream@@QEAAPEADXZ @ stub -arch=win32 ?str(a)ostrstream@@QAEPADXZ

1 0