wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

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

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

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 : 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 : 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

Vincent Povirk : mscoree: Update Wine Mono to 4.6.2.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 115ad2da7a545434c81222d291d147fa63324dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=115ad2da7a545434c81222d29… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 10:58:39 2016 -0500 mscoree: Update Wine Mono to 4.6.2. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index a39d0fb..8cbc221 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -64,8 +64,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.6.0" -#define MONO_SHA "3a494b5b74fd17adf675a620d46b2dc1d2482424" +#define MONO_VERSION "4.6.2" +#define MONO_SHA "0a5090a3b81b6250a5d7104fc585bd871a9e467d" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7181b4b..033a121 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -675,7 +675,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.6.0"; + static const char* mono_version = "4.6.2"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Nikolay Sivov : usp10: Some spelling fixes.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 9da5adce66d5f6ee895eab96bd861fdd4050cef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da5adce66d5f6ee895eab96b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 5 12:39:23 2016 +0300 usp10: Some spelling fixes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 8 ++++---- dlls/usp10/usp10.c | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 5b39663..613fb05 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1188,7 +1188,7 @@ static void GPOS_convert_design_units_to_device(LPOUTLINETEXTMETRICW lpotm, LPLO *devX = (desX * emHeight) / (double)lpotm->otmEMSquare; *devY = (desY * emHeight) / (double)lpotm->otmEMSquare; if (lplogfont->lfWidth) - FIXME("Font with lfWidth set no handled properly\n"); + FIXME("Font with lfWidth set not handled properly\n"); } static INT GPOS_get_value_record(WORD ValueFormat, const WORD data[], GPOS_ValueRecord *record) @@ -1491,7 +1491,7 @@ static int GPOS_apply_MarkToBase(ScriptCache *psc, const OT_LookupTable *look, c ma = (const GPOS_MarkArray*)((const BYTE*)mbpf1 + offset); if (mark_index > GET_BE_WORD(ma->MarkCount)) { - ERR("Mark index exeeded mark count\n"); + ERR("Mark index exceeded mark count\n"); return -1; } mr = &ma->MarkRecord[mark_index]; @@ -1561,7 +1561,7 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A ma = (const GPOS_MarkArray*)((const BYTE*)mlpf1 + offset); if (mark_index > GET_BE_WORD(ma->MarkCount)) { - ERR("Mark index exeeded mark count\n"); + ERR("Mark index exceeded mark count\n"); return; } mr = &ma->MarkRecord[mark_index]; @@ -1571,7 +1571,7 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A la = (const GPOS_LigatureArray*)((const BYTE*)mlpf1 + offset); if (ligature_index > GET_BE_WORD(la->LigatureCount)) { - ERR("Ligature index exeeded ligature count\n"); + ERR("Ligature index exceeded ligature count\n"); return; } offset = GET_BE_WORD(la->LigatureAttach[ligature_index]); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index baccc2a..622a061 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -300,7 +300,7 @@ static const scriptRange scriptRanges[] = { { SCRIPT_UNDEFINED, 0, 0, 0} }; -/* the must be in order so that the index matches the Script value */ +/* this must be in order so that the index matches the Script value */ const scriptData scriptInformation[] = { {{SCRIPT_UNDEFINED, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_NEUTRAL, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, @@ -741,7 +741,7 @@ static inline BOOL set_cache_font_properties(const HDC hdc, ScriptCache *sc) static const WCHAR chars[4] = {0x0020, 0x200B, 0xF71B, 0x0640}; /* U+0020: numeric space U+200B: zero width space - U+F71B: unknow char found by black box testing + U+F71B: unknown char found by black box testing U+0640: kashida */ WORD gi[4]; @@ -908,7 +908,7 @@ static WORD get_char_script( LPCWSTR str, INT index, INT end, INT *consumed) if (str[index] == 0x2212 || str[index] == 0x2044) return Script_Punctuation; - /* Currency Symboles by Unicode point */ + /* Currency Symbols by Unicode point */ switch (str[index]) { case 0x09f2: @@ -2765,8 +2765,8 @@ static inline int get_cluster_advance(const int* piAdvance, * use piAdvance to find the cluster we are looking at * Find the character that is the first character of the cluster * That is our base piCP - * If the script snaps to cluster boundries (Hebrew, Indic, Thai) then we - * are good Otherwise if the cluster is larger than 1 glyph we need to + * If the script snaps to cluster boundaries (Hebrew, Indic, Thai) then we + * are good. Otherwise if the cluster is larger than 1 glyph we need to * determine how far through the cluster to advance the cursor. */ HRESULT WINAPI ScriptXtoCP(int iX, @@ -2955,7 +2955,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, * * PARAMS * chars [I] Array of characters. - * sa [I] String analysis. + * sa [I] Script analysis. * la [I] Array of logical attribute structures. * * RETURNS @@ -3259,7 +3259,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, * PARAMS * hdc [I] Device context. * psc [I/O] Opaque pointer to a script cache. - * psa [I/O] String analysis. + * psa [I/O] Script analysis. * tagScript [I] The OpenType tag for the Script * tagLangSys [I] The OpenType tag for the Language * rcRangeChars[I] Array of Character counts in each range

1 0

Nikolay Sivov : usp10: Trace RECT arguments in text output functions.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 9aa8b1847f129f3d3bd6773420be7ca1cb7aad09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa8b1847f129f3d3bd677342… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 5 12:39:22 2016 +0300 usp10: Trace RECT arguments in text output functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c746c57..baccc2a 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2292,8 +2292,8 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, int item; HRESULT hr; - TRACE("(%p,%d,%d,0x%1x,%p,%d,%d,%d)\n", - ssa, iX, iY, uOptions, prc, iMinSel, iMaxSel, fDisabled); + TRACE("(%p,%d,%d,0x%08x,%s,%d,%d,%d)\n", + ssa, iX, iY, uOptions, wine_dbgstr_rect(prc), iMinSel, iMaxSel, fDisabled); if (!(analysis = ssa)) return E_INVALIDARG; if (!(analysis->dwFlags & SSA_GLYPHS)) return E_INVALIDARG; @@ -3483,8 +3483,8 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN INT *lpDx; WORD *reordered_glyphs = (WORD *)pwGlyphs; - TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", - hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, + TRACE("(%p, %p, %d, %d, %08x, %s, %p, %p, %d, %p, %d, %p, %p, %p)\n", + hdc, psc, x, y, fuOptions, wine_dbgstr_rect(lprc), psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, piAdvance, piJustify, pGoffset); if (!hdc || !psc) return E_INVALIDARG;

1 0

Stefan Dösinger : d3d11/tests: Port swapchain_flip() to d3d11.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: d028e1978fe4db7b7635990aea2588cd4404d93e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d028e1978fe4db7b7635990ae… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Apr 5 18:24:26 2016 +0200 d3d11/tests: Port swapchain_flip() to d3d11. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 330 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 310 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d028e1978fe4db7b76359…

1 0

Stefan Dösinger : d3d10core/tests: Remove dead code.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 3272e49984ef58435b670143ad94ac2432b7cd77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3272e49984ef58435b670143a… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Apr 5 18:24:25 2016 +0200 d3d10core/tests: Remove dead code. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 45b0fd2..3783da5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5679,7 +5679,6 @@ static void test_swapchain_flip(void) DWORD color; HWND window; HRESULT hr; - UINT count; static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = { @@ -5919,8 +5918,6 @@ static void test_swapchain_flip(void) ID3D10Texture2D_Release(backbuffer_2); IDXGISwapChain_Release(swapchain); - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); - ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(window);

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2016