April 2016 - Wine-commits - list.winehq.org

Aric Stewart : hid: Implement HidD_SetNumInputBuffers.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: fa8eedddd5725d3dc0e8efa8bc82a121f080a8b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8eedddd5725d3dc0e8efa8b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 08:41:19 2016 -0500 hid: Implement HidD_SetNumInputBuffers. 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 e416762..4c5e505 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -16,7 +16,7 @@ @ stub HidD_Hello @ stub HidD_SetConfiguration @ stdcall HidD_SetFeature(long ptr long) -@ stub HidD_SetNumInputBuffers +@ stdcall HidD_SetNumInputBuffers(long long) @ stub HidD_SetOutputReport @ stdcall HidP_GetButtonCaps(long ptr ptr ptr) @ stdcall HidP_GetCaps(ptr ptr) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index c6bdd85..31220ec 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -93,6 +93,12 @@ BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); } +BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffers) +{ + TRACE("(%p %i)\n", HidDeviceObject, NumberBuffers); + return DeviceIoControl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, UlongToPtr(NumberBuffers), sizeof(NumberBuffers), NULL, 0, NULL, NULL); +} + BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index c8a0d73..354076f 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -41,6 +41,7 @@ BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, 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); +BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffers); BOOLEAN WINAPI HidD_GetPreparsedData( HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData); BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData); BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr);

1 0

Aric Stewart : include: Define REGSTR_VAL_MAX_HCID_LEN.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 7b76d61372eb021aa444f5c678c10b937d6a902b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b76d61372eb021aa444f5c67… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 08:45:22 2016 -0500 include: Define REGSTR_VAL_MAX_HCID_LEN. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/regstr.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/regstr.h b/include/regstr.h index 99df694..0be6c9a 100644 --- a/include/regstr.h +++ b/include/regstr.h @@ -23,6 +23,7 @@ #define REGSTR_PATH_UNINSTALL TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall") +#define REGSTR_VAL_MAX_HCID_LEN 1024 /* DisplayName <= 32 chars in Windows (otherwise not displayed for uninstall) */ #define REGSTR_VAL_UNINSTALLER_DISPLAYNAME TEXT("DisplayName")

1 0

Aric Stewart : hidclass.sys: Implement IRP_MN_QUERY_ID for HID devices.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 4b5bed455798569a142cebc77c59e42029d5df2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b5bed455798569a142cebc77… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 08:45:34 2016 -0500 hidclass.sys: Implement IRP_MN_QUERY_ID for HID devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/hid.h | 5 ++++ dlls/hidclass.sys/main.c | 3 ++ dlls/hidclass.sys/pnp.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 0dcc3a6..8d384c6 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -27,6 +27,7 @@ #include "ddk/hidport.h" #include "ddk/hidclass.h" #include "ddk/hidpi.h" +#include "cfgmgr32.h" #include "wine/list.h" #include "parse.h" @@ -47,6 +48,8 @@ typedef struct _BASE_DEVICE_EXTENSTION { ULONG poll_interval; WCHAR *device_name; WCHAR *link_name; + WCHAR device_id[MAX_DEVICE_ID_LEN]; + WCHAR instance_id[MAX_DEVICE_ID_LEN]; struct ReportRingBuffer *ring_buffer; HANDLE halt_event; HANDLE thread; @@ -75,6 +78,7 @@ typedef struct _minidriver PDRIVER_UNLOAD DriverUnload; pAddDevice AddDevice; + PDRIVER_DISPATCH PNPDispatch; } minidriver; NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, void *out_buff, ULONG out_size) DECLSPEC_HIDDEN; @@ -91,6 +95,7 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN NTSTATUS WINAPI HID_Device_write(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_create(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_close(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; +NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; /* Pseudo-Plug and Play support*/ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT* PDO) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index b124218..7fdcd59 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -74,6 +74,9 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) registration->DriverObject->MajorFunction[IRP_MJ_CREATE] = HID_Device_create; registration->DriverObject->MajorFunction[IRP_MJ_CLOSE] = HID_Device_close; + driver->PNPDispatch = registration->DriverObject->MajorFunction[IRP_MJ_PNP]; + registration->DriverObject->MajorFunction[IRP_MJ_PNP] = HID_PNP_Dispatch; + driver->AddDevice = registration->DriverObject->DriverExtension->AddDevice; registration->DriverObject->DriverExtension->AddDevice = PNP_AddDevice; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 5de7522..fe3371f 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -23,12 +23,20 @@ #include <stdarg.h> #include "hid.h" #include "ddk/hidtypes.h" +#include "regstr.h" #include "wine/debug.h" #include "wine/unicode.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(hid); +static const WCHAR device_enumeratorW[] = {'H','I','D',0}; +static const WCHAR device_deviceid_fmtW[] = {'%','s','\\', + 'v','i','d','_','%','0','4','x','&','p','i','d','_','%', '0','4','x'}; +static const WCHAR device_instanceid_fmtW[] = {'%','s','\\', + 'v','i','d','_','%','0','4','x','&','p','i','d','_','%', + '0','4','x','&','%','s','\\','%','i','&','%','s',0}; + typedef struct _NATIVE_DEVICE { struct list entry; @@ -239,6 +247,8 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) sprintfW(interface, ig_fmtW, interface_index); else sprintfW(interface, im_fmtW, interface_index); + sprintfW(ext->instance_id, device_instanceid_fmtW, device_enumeratorW, ext->information.VendorID, ext->information.ProductID, interface, ext->information.VersionNumber, serial); + sprintfW(ext->device_id, device_deviceid_fmtW, device_enumeratorW, ext->information.VendorID, ext->information.ProductID); HID_LinkDevice(device, serial, interface); @@ -269,3 +279,65 @@ void PNP_CleanupPNP(DRIVER_OBJECT *driver) } } } + +NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) +{ + NTSTATUS rc = STATUS_NOT_SUPPORTED; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + + TRACE("%p, %p\n", device, irp); + + switch(irpsp->MinorFunction) + { + case IRP_MN_QUERY_ID: + { + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + ULONG type = irpsp->Parameters.QueryId.IdType; + WCHAR *id = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR)*REGSTR_VAL_MAX_HCID_LEN); + TRACE("IRP_MN_QUERY_ID[%i]\n", type); + switch (type) + { + case BusQueryHardwareIDs: + case BusQueryCompatibleIDs: + { + WCHAR *ptr; + ptr = id; + /* Instance ID */ + strcpyW(ptr, ext->instance_id); + ptr += lstrlenW(ext->instance_id) + 1; + /* Device ID */ + strcpyW(ptr, ext->device_id); + ptr += lstrlenW(ext->device_id) + 1; + /* Bus ID */ + strcpyW(ptr, device_enumeratorW); + ptr += lstrlenW(device_enumeratorW) + 1; + *ptr = 0; + irp->IoStatus.Information = (ULONG_PTR)id; + rc = STATUS_SUCCESS; + break; + } + case BusQueryDeviceID: + strcpyW(id, ext->device_id); + irp->IoStatus.Information = (ULONG_PTR)id; + rc = STATUS_SUCCESS; + break; + case BusQueryInstanceID: + strcpyW(id, ext->instance_id); + irp->IoStatus.Information = (ULONG_PTR)id; + rc = STATUS_SUCCESS; + break; + } + break; + } + default: + { + /* Forward IRP to the minidriver */ + minidriver *minidriver = find_minidriver(device->DriverObject); + return minidriver->PNPDispatch(device, irp); + } + } + + irp->IoStatus.u.Status = rc; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return rc; +}

1 0

Aric Stewart : hidclass.sys: Use the instance id for the device link.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 056425734912ec657bd2595360c82d6dc1c77691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=056425734912ec657bd259536… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 08:45:48 2016 -0500 hidclass.sys: Use the instance id for the device link. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 21 +++++++-------------- dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/pnp.c | 2 +- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index aae4e5f..b137c9b 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -40,12 +40,7 @@ WINE_DECLARE_DEBUG_CHANNEL(hid_report); static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e', '\\','H','I','D','#','%','p','&','%','p',0}; -static const WCHAR device_regname_fmtW[] = {'H','I','D','\\', - 'v','i','d','_','%','0','4','x','&','p','i','d','_','%', - '0','4','x','&','%','s','\\','%','i','&','%','s',0}; -static const WCHAR device_link_fmtW[] = {'\\','?','?','\\','h','i','d','#', - 'v','i','d','_','%','0','4','x','&','p','i','d','_','%', - '0','4','x','&','%','s','#','%','i','&','%','s','#','%','s',0}; +static const WCHAR device_link_fmtW[] = {'\\','?','?','\\','%','s','#','%','s',0}; /* GUID_DEVINTERFACE_HID */ static const WCHAR class_guid[] = {'{','4','D','1','E','5','5','B','2', '-','F','1','6','F','-','1','1','C','F','-','8','8','C','B','-','0','0', @@ -83,10 +78,10 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT return S_OK; } -NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) +NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) { - WCHAR regname[255]; WCHAR dev_link[255]; + WCHAR *ptr; SP_DEVINFO_DATA Data; UNICODE_STRING nameW, linkW; NTSTATUS status; @@ -97,9 +92,9 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) HidD_GetHidGuid(&hidGuid); ext = device->DeviceExtension; - sprintfW(dev_link, device_link_fmtW, ext->information.VendorID, - ext->information.ProductID, index, ext->information.VersionNumber, serial, - class_guid); + sprintfW(dev_link, device_link_fmtW, ext->instance_id, class_guid); + ptr = dev_link + 4; + do { if (*ptr == '\\') *ptr = '#'; } while (*ptr++); struprW(dev_link); RtlInitUnicodeString( &nameW, ext->device_name); @@ -117,8 +112,6 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) return status; } - sprintfW(regname, device_regname_fmtW, ext->information.VendorID, ext->information.ProductID, index, ext->information.VersionNumber, serial); - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_HIDCLASS, NULL, NULL, DIGCF_DEVICEINTERFACE); if (!devinfo) { @@ -126,7 +119,7 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) return GetLastError(); } Data.cbSize = sizeof(Data); - if (!SetupDiCreateDeviceInfoW(devinfo, regname, &GUID_DEVCLASS_HIDCLASS, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data)) + if (!SetupDiCreateDeviceInfoW(devinfo, ext->instance_id, &GUID_DEVCLASS_HIDCLASS, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data)) { if (GetLastError() == ERROR_DEVINST_ALREADY_EXISTS) { diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 8d384c6..2820c9d 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -86,7 +86,7 @@ minidriver* find_minidriver(DRIVER_OBJECT* driver) DECLSPEC_HIDDEN; /* Internal device functions */ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT **device) DECLSPEC_HIDDEN; -NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) DECLSPEC_HIDDEN; +NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index fe3371f..d97184f 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -250,7 +250,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) sprintfW(ext->instance_id, device_instanceid_fmtW, device_enumeratorW, ext->information.VendorID, ext->information.ProductID, interface, ext->information.VersionNumber, serial); sprintfW(ext->device_id, device_deviceid_fmtW, device_enumeratorW, ext->information.VendorID, ext->information.ProductID); - HID_LinkDevice(device, serial, interface); + HID_LinkDevice(device); ext->poll_interval = DEFAULT_POLL_INTERVAL;

1 0

Daniel Lehman : ucrtbase: Add _get_initial_wide_environment.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 46000add48ce5e580651c37d829319c5aaf5ccf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46000add48ce5e580651c37d8… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 4 14:55:43 2016 -0700 ucrtbase: Add _get_initial_wide_environment. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/data.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index cd2c33d..5a41548 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -41,7 +41,7 @@ @ cdecl _get_doserrno(ptr) ucrtbase._get_doserrno @ cdecl _get_errno(ptr) ucrtbase._get_errno @ cdecl _get_initial_narrow_environment() ucrtbase._get_initial_narrow_environment -@ stub _get_initial_wide_environment +@ cdecl _get_initial_wide_environment() ucrtbase._get_initial_wide_environment @ cdecl _get_invalid_parameter_handler() ucrtbase._get_invalid_parameter_handler @ stub _get_narrow_winmain_command_line @ cdecl _get_pgmptr(ptr) ucrtbase._get_pgmptr diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index b665333..1b9ef8c 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -668,6 +668,14 @@ int CDECL _initialize_narrow_environment(void) } /********************************************************************* + * _get_initial_wide_environment (UCRTBASE.@) + */ +MSVCRT_wchar_t** CDECL _get_initial_wide_environment(void) +{ + return MSVCRT___winitenv; +} + +/********************************************************************* * _configure_wide_argv (UCRTBASE.@) */ int CDECL _configure_wide_argv(int mode) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c697eee..1ef5c3b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -366,7 +366,7 @@ @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() @ cdecl _get_initial_narrow_environment() -@ stub _get_initial_wide_environment +@ cdecl _get_initial_wide_environment() @ cdecl _get_invalid_parameter_handler() @ stub _get_narrow_winmain_command_line @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle

1 0

Daniel Lehman : ucrtbase: Return initial env snapshot in _get_initial_narrow_environment.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 2841a05025b169c144d708fac97c6da6c4617af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2841a05025b169c144d708fac… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 4 20:24:21 2016 -0700 ucrtbase: Return initial env snapshot in _get_initial_narrow_environment. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 1b9ef8c..fafbc38 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -646,7 +646,7 @@ void CDECL MSVCRT___set_app_type(int app_type) */ char** CDECL _get_initial_narrow_environment(void) { - return MSVCRT___argv; + return MSVCRT___initenv; } /*********************************************************************

1 0

Huw Davies : oleaut32: Fix VarDateFromStr for the case of a trailing meridiem indicator.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: b4a73f74af5bc4f7b56cbf239dda60eda11bbffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a73f74af5bc4f7b56cbf239… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 6 11:15:08 2016 +0100 oleaut32: Fix VarDateFromStr for the case of a trailing meridiem indicator. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 3 +++ dlls/oleaut32/vartype.c | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 03f43ec..7d50545 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3528,6 +3528,9 @@ static void test_VarDateFromStr(void) DFS("1-2-1970"); EXPECT_DBL(25570.0); DFS("13-1-1970"); EXPECT_DBL(25581.0); DFS("1970-1-13"); EXPECT_DBL(25581.0); + DFS("6/30/2011 01:20:34"); EXPECT_DBL(40724.05594907407); + DFS("6/30/2011 01:20:34 AM"); EXPECT_DBL(40724.05594907407); + DFS("6/30/2011 01:20:34 PM"); EXPECT_DBL(40724.55594907407); /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ /* test a non-english data string */ diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index bf7ebc6..fc5a025 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7668,11 +7668,13 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd /* Parse the string into our structure */ while (*strIn) { - if (dp.dwCount >= 6) - break; - if (isdigitW(*strIn)) { + if (dp.dwCount >= 6) + { + hRet = DISP_E_TYPEMISMATCH; + break; + } dp.dwValues[dp.dwCount] = strtoulW(strIn, &strIn, 10); dp.dwCount++; strIn--; @@ -7688,9 +7690,14 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd { if (i <= 25) { - dp.dwValues[dp.dwCount] = ParseDateMonths[i]; - dp.dwFlags[dp.dwCount] |= (DP_MONTH|DP_DATESEP); - dp.dwCount++; + if (dp.dwCount >= 6) + hRet = DISP_E_TYPEMISMATCH; + else + { + dp.dwValues[dp.dwCount] = ParseDateMonths[i]; + dp.dwFlags[dp.dwCount] |= (DP_MONTH|DP_DATESEP); + dp.dwCount++; + } } else if (i > 39 && i < 42) {

1 0

Hans Leidekker : webservices: Pass exact size in read_type_struct_field.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: d53d073ed6e5f5affb34082d34a396819c38b558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53d073ed6e5f5affb34082d3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 15:55:50 2016 +0200 webservices: Pass exact size in read_type_struct_field. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 19 +++++++++++++------ dlls/webservices/webservices_private.h | 1 - dlls/webservices/writer.c | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index b61c50c..7559da0 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2579,6 +2579,8 @@ static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIEL ULONG item_size, nb_items = 0, nb_allocated = 1, offset = 0; char *buf; + if (size != sizeof(void *)) return E_INVALIDARG; + if (desc->itemRange) FIXME( "ignoring range (%u-%u)\n", desc->itemRange->minItemCount, desc->itemRange->maxItemCount ); @@ -2627,7 +2629,7 @@ static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIEL /* fall through */ case WS_READ_OPTIONAL_POINTER: - if (size < sizeof(void *)) return E_INVALIDARG; + if (size != sizeof(void *)) return E_INVALIDARG; *ret = buf; break; @@ -2686,14 +2688,20 @@ static WS_READ_OPTION map_field_options( WS_TYPE type, ULONG options ) } static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, - WS_HEAP *heap, char *buf, ULONG size ) + WS_HEAP *heap, char *buf ) { char *ptr = buf + desc->offset; WS_READ_OPTION option; + ULONG size; HRESULT hr; if (!(option = map_field_options( desc->type, desc->options ))) return E_INVALIDARG; + if (option == WS_READ_REQUIRED_VALUE) + size = get_type_size( desc->type, desc->typeDescription ); + else + size = sizeof(void *); + switch (desc->mapping) { case WS_ATTRIBUTE_FIELD_MAPPING: @@ -2750,7 +2758,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_STRUCT_DESCRIPTION *desc, WS_READ_OPTION option, WS_HEAP *heap, void *ret, ULONG size ) { - ULONG i, field_size; + ULONG i; HRESULT hr; char *buf; @@ -2766,7 +2774,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, { case WS_READ_REQUIRED_POINTER: case WS_READ_OPTIONAL_POINTER: - if (size < sizeof(void *)) return E_INVALIDARG; + if (size != sizeof(void *)) return E_INVALIDARG; if (!(buf = ws_alloc_zero( heap, desc->size ))) return WS_E_QUOTA_EXCEEDED; break; @@ -2782,8 +2790,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, for (i = 0; i < desc->fieldCount; i++) { - field_size = get_field_size( desc, i ); - if ((hr = read_type_struct_field( reader, desc->fields[i], heap, buf, field_size )) != S_OK) + if ((hr = read_type_struct_field( reader, desc->fields[i], heap, buf )) != S_OK) break; } diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 548da06..c286fd2 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -32,7 +32,6 @@ WS_XML_STRING *alloc_xml_string( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; WS_XML_UTF8_TEXT *alloc_utf8_text( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; -ULONG get_field_size( const WS_STRUCT_DESCRIPTION *, ULONG ) DECLSPEC_HIDDEN; struct node { diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 8f6c6aa..e9ef7b1 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1378,7 +1378,7 @@ static HRESULT write_type_struct_field( struct writer *writer, const WS_FIELD_DE return S_OK; } -ULONG get_field_size( const WS_STRUCT_DESCRIPTION *desc, ULONG index ) +static ULONG get_field_size( const WS_STRUCT_DESCRIPTION *desc, ULONG index ) { if (index < desc->fieldCount - 1) return desc->fields[index + 1]->offset - desc->fields[index]->offset; return desc->size - desc->fields[index]->offset;

1 0

Hans Leidekker : webservices: Add support for item ranges.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 92cb3bc0e24416e8edc3380d687fd1a9d72cd53d URL: http://source.winehq.org/git/wine.git/?a=commit;h=92cb3bc0e24416e8edc3380d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 15:55:51 2016 +0200 webservices: Add support for item ranges. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 27 ++++++--------------------- dlls/webservices/tests/reader.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7559da0..d79c310 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2581,9 +2581,6 @@ static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIEL if (size != sizeof(void *)) return E_INVALIDARG; - if (desc->itemRange) - FIXME( "ignoring range (%u-%u)\n", desc->itemRange->minItemCount, desc->itemRange->maxItemCount ); - /* wrapper element */ if (desc->localName && ((hr = read_node( reader )) != S_OK)) return hr; @@ -2616,29 +2613,17 @@ static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIEL if (desc->localName && ((hr = read_node( reader )) != S_OK)) return hr; - if (!nb_items) + if (desc->itemRange && (nb_items < desc->itemRange->minItemCount || nb_items > desc->itemRange->maxItemCount)) { + TRACE( "number of items %u out of range (%u-%u)\n", nb_items, desc->itemRange->minItemCount, + desc->itemRange->maxItemCount ); ws_free( heap, buf ); - buf = NULL; - } - - switch (option) - { - case WS_READ_REQUIRED_POINTER: - if (!nb_items) return WS_E_INVALID_FORMAT; - /* fall through */ - - case WS_READ_OPTIONAL_POINTER: - if (size != sizeof(void *)) return E_INVALIDARG; - *ret = buf; - break; - - default: - FIXME( "read option %u not supported\n", option ); - return E_NOTIMPL; + return WS_E_INVALID_FORMAT; } *count = nb_items; + *ret = buf; + return S_OK; } diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 755a070..b7ef0ca 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -77,6 +77,9 @@ static const char data12[] = "<service><id>2</id></service>" "</services>"; +static const char data13[] = + "<services></services>"; + static void test_WsCreateError(void) { HRESULT hr; @@ -2659,6 +2662,7 @@ static void test_repeating_element(void) WS_HEAP *heap; WS_STRUCT_DESCRIPTION s, s2; WS_FIELD_DESCRIPTION f, f2, *fields[1], *fields2[1]; + WS_ITEM_RANGE range; struct service { UINT32 id; @@ -2717,6 +2721,18 @@ static void test_repeating_element(void) ok( test->service[0].id == 1, "got %u\n", test->service[0].id ); ok( test->service[1].id == 2, "got %u\n", test->service[1].id ); + prepare_struct_type_test( reader, data13 ); + range.minItemCount = 0; + range.maxItemCount = 1; + f.itemRange = &range; + test = NULL; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test != NULL, "test not set\n" ); + ok( test->service != NULL, "service not set\n" ); + ok( !test->service_count, "got %u\n", test->service_count ); + WsFreeReader( reader ); WsFreeHeap( heap ); }

1 0

Hans Leidekker : webservices: Use addition in read_skip.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: ad2fe7e9a2fda51a242884239d76f3a2c46ee954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2fe7e9a2fda51a242884239… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 15:55:52 2016 +0200 webservices: Use addition in read_skip. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index d79c310..f12c118 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -915,11 +915,8 @@ static inline unsigned int read_utf8_char( struct reader *reader, unsigned int * static inline void read_skip( struct reader *reader, unsigned int count ) { - while (reader->read_pos < reader->read_size && count) - { - reader->read_pos++; - count--; - } + if (reader->read_pos + count > reader->read_size) return; + reader->read_pos += count; } static inline BOOL read_isnamechar( unsigned int ch )

1 0