October 2016 - Wine-commits

Matteo Bruni : wined3d: Recognize a couple of Haswell / Broadwell GPUs on macOS.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: bdc3df38ed1129d6b0dd6a55446322cf64acc138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc3df38ed1129d6b0dd6a554… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 14 00:03:34 2016 +0200 wined3d: Recognize a couple of Haswell / Broadwell GPUs on macOS. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5d324f3..7ceb436 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2035,8 +2035,10 @@ cards_intel[] = {"Iris Pro P6300", CARD_INTEL_IPP6300}, {"Iris Pro 6200", CARD_INTEL_IP6200}, {"Iris 6100", CARD_INTEL_IG6100}, + {"Iris(TM) Graphics 6100", CARD_INTEL_IG6100}, /* MacOS */ /* Haswell */ {"Haswell Mobile", CARD_INTEL_HWM}, + {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ /* Ivybridge */ {"Ivybridge Server", CARD_INTEL_IVBS}, {"Ivybridge Mobile", CARD_INTEL_IVBM},

1 0

Matteo Bruni : wined3d: Add a bunch of Broadwell and Skylake PCI ids and descriptions.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 339321dd2073fea7383378a7cf3212140013a2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=339321dd2073fea7383378a7c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 14 00:03:35 2016 +0200 wined3d: Add a bunch of Broadwell and Skylake PCI ids and descriptions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 32 ++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 24 ++++++++++++++++++++---- 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7ceb436..e16f718 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1408,14 +1408,30 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWD, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_IG6100, "Intel(R) Iris(TM) Graphics 6100", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD5300, "Intel(R) HD Graphics 5300", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD5500, "Intel(R) HD Graphics 5500", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD5600, "Intel(R) HD Graphics 5600", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD6000, "Intel(R) HD Graphics 6000", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_I6100, "Intel(R) Iris(TM) Graphics 6100", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IP6200, "Intel(R) Iris(TM) Pro Graphics 6200", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP6300, "Intel(R) Iris(TM) Pro Graphics P6300", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD520, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD510_1, "Intel(R) HD Graphics 510", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD510_2, "Intel(R) HD Graphics 510", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD510_3, "Intel(R) HD Graphics 510", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD515, "Intel(R) HD Graphics 515", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD520_1, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD520_2, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD530_1, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD530_2, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD540, "Intel(R) Iris(TM) Graphics 540", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_IPP580, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HDP530, "Intel(R) HD Graphics P530", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_I540, "Intel(R) Iris(TM) Graphics 540", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_I550, "Intel(R) Iris(TM) Graphics 550", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_I555, "Intel(R) Iris(TM) Graphics 555", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IP555, "Intel(R) Iris(TM) Graphics P555", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IP580_1, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, @@ -2029,13 +2045,13 @@ cards_amd_binary[] = cards_intel[] = { /* Skylake */ - {"Iris Pro Graphics P580", CARD_INTEL_IPP580}, - {"Skylake", CARD_INTEL_HD520}, + {"Iris Pro Graphics P580", CARD_INTEL_IPP580_1}, + {"Skylake", CARD_INTEL_HD520_1}, /* Broadwell */ {"Iris Pro P6300", CARD_INTEL_IPP6300}, {"Iris Pro 6200", CARD_INTEL_IP6200}, - {"Iris 6100", CARD_INTEL_IG6100}, - {"Iris(TM) Graphics 6100", CARD_INTEL_IG6100}, /* MacOS */ + {"Iris 6100", CARD_INTEL_I6100}, + {"Iris(TM) Graphics 6100", CARD_INTEL_I6100}, /* MacOS */ /* Haswell */ {"Haswell Mobile", CARD_INTEL_HWM}, {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a9800b3..4326bee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2001,14 +2001,30 @@ enum wined3d_pci_device CARD_INTEL_IVBS = 0x015a, CARD_INTEL_HWD = 0x0412, CARD_INTEL_HWM = 0x0416, - CARD_INTEL_IG6100 = 0x162b, + CARD_INTEL_HD5300 = 0x161e, + CARD_INTEL_HD5500 = 0x1616, + CARD_INTEL_HD5600 = 0x1612, + CARD_INTEL_HD6000 = 0x1626, + CARD_INTEL_I6100 = 0x162b, CARD_INTEL_IP6200 = 0x1622, CARD_INTEL_IPP6300 = 0x162a, - CARD_INTEL_HD520 = 0x1916, + CARD_INTEL_HD510_1 = 0x1902, + CARD_INTEL_HD510_2 = 0x1906, + CARD_INTEL_HD510_3 = 0x190b, + CARD_INTEL_HD515 = 0x191e, + CARD_INTEL_HD520_1 = 0x1916, + CARD_INTEL_HD520_2 = 0x1921, CARD_INTEL_HD530_1 = 0x1912, CARD_INTEL_HD530_2 = 0x191b, - CARD_INTEL_HD540 = 0x1926, - CARD_INTEL_IPP580 = 0x193d, + CARD_INTEL_HDP530 = 0x191d, + CARD_INTEL_I540 = 0x1926, + CARD_INTEL_I550 = 0x1927, + CARD_INTEL_I555 = 0x192b, + CARD_INTEL_IP555 = 0x192d, + CARD_INTEL_IP580_1 = 0x1932, + CARD_INTEL_IP580_2 = 0x193b, + CARD_INTEL_IPP580_1 = 0x193a, + CARD_INTEL_IPP580_2 = 0x193d, }; struct wined3d_fbo_ops

1 0

Matteo Bruni : wined3d: Ignore driver model if the requested driver model entry is missing.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: b29e3b4ffac7d1e7c8b7b2de02e390149dfabf07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29e3b4ffac7d1e7c8b7b2de0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 14 00:03:36 2016 +0200 wined3d: Ignore driver model if the requested driver model entry is missing. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e16f718..a8c8c9f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -61,6 +61,7 @@ enum wined3d_display_driver enum wined3d_driver_model { + DRIVER_MODEL_GENERIC, DRIVER_MODEL_WIN9X, DRIVER_MODEL_NT40, DRIVER_MODEL_NT5X, @@ -1444,7 +1445,8 @@ static const struct driver_version_information *get_driver_version_info(enum win { const struct driver_version_information *entry = &driver_version_table[i]; - if (entry->driver == driver && entry->driver_model == driver_model) + if (entry->driver == driver && (driver_model == DRIVER_MODEL_GENERIC + || entry->driver_model == driver_model)) { TRACE("Found driver \"%s\", version %u, subversion %u, build %u.\n", entry->driver_name, entry->version, entry->subversion, entry->build); @@ -1619,8 +1621,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, * This could be an indication that our database is not up to date, so this should be fixed. */ if ((version_info = get_driver_version_info(driver, driver_model)) - || (version_info = get_driver_version_info(driver, DRIVER_MODEL_NT5X)) - || (version_info = get_driver_version_info(driver, DRIVER_MODEL_NT6X))) + || (version_info = get_driver_version_info(driver, DRIVER_MODEL_GENERIC))) { driver_info->name = version_info->driver_name; driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, version_info->version);

1 0

Matteo Bruni : wined3d: Store blit quad texture coordinates in a struct wined3d_vec3 array.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 4382f9235b502365f30e979a9120c5e05799c1ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4382f9235b502365f30e979a9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 14 00:03:37 2016 +0200 wined3d: Store blit quad texture coordinates in a struct wined3d_vec3 array. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 102 ++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4382f9235b502365f30e9…

1 0

Sebastian Lackner : winebus.sys: Add a strdupAtoW implementation.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 66d70e38f5508042a6acf80f216b76e3c6fd8d35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d70e38f5508042a6acf80f2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 14 08:54:33 2016 +0200 winebus.sys: Add a strdupAtoW implementation. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 22ea07d..fd5de70 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -78,6 +78,17 @@ static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *de return (struct platform_private *)get_platform_private(device); } +static inline WCHAR *strdupAtoW(const char *src) +{ + WCHAR *dst; + DWORD len; + if (!src) return NULL; + len = MultiByteToWideChar(CP_UNIXCP, 0, src, -1, NULL, 0); + if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + MultiByteToWideChar(CP_UNIXCP, 0, src, -1, dst, len); + return dst; +} + static DWORD get_sysattr_dword(struct udev_device *dev, const char *sysattr, int base) { const char *attr = udev_device_get_sysattr_value(dev, sysattr); @@ -92,17 +103,12 @@ static DWORD get_sysattr_dword(struct udev_device *dev, const char *sysattr, int static WCHAR *get_sysattr_string(struct udev_device *dev, const char *sysattr) { const char *attr = udev_device_get_sysattr_value(dev, sysattr); - WCHAR *dst; - DWORD len; if (!attr) { WARN("Could not get %s from device\n", sysattr); return NULL; } - len = MultiByteToWideChar(CP_UNIXCP, 0, attr, -1, NULL, 0); - if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) - MultiByteToWideChar(CP_UNIXCP, 0, attr, -1, dst, len); - return dst; + return strdupAtoW(attr); } static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev)

1 0

Aric Stewart : winebus.sys: Implement IOCTL_HID_GET_STRING for hidraw.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: f45cec07ff70488aef5b1a598aaa9fdac9e18e28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45cec07ff70488aef5b1a598… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 14 08:54:52 2016 +0200 winebus.sys: Implement IOCTL_HID_GET_STRING for hidraw. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_udev.c | 73 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/main.c | 11 +++++++ 3 files changed, 85 insertions(+) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 9ab242c..7ce54bf 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -24,6 +24,7 @@ typedef struct { int (*compare_platform_device)(DEVICE_OBJECT *device, void *platform_dev); NTSTATUS (*get_reportdescriptor)(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length); + NTSTATUS (*get_string)(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length); } platform_vtbl; void *get_platform_private(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index fd5de70..243aabb 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -51,7 +51,9 @@ #include "winnls.h" #include "winternl.h" #include "ddk/wdm.h" +#include "ddk/hidtypes.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "bus.h" @@ -150,10 +152,81 @@ static NTSTATUS hidraw_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, #endif } +static NTSTATUS hidraw_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) +{ + struct udev_device *usbdev; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + WCHAR *str = NULL; + + usbdev = udev_device_get_parent_with_subsystem_devtype(private->udev_device, "usb", "usb_device"); + if (usbdev) + { + switch (index) + { + case HID_STRING_ID_IPRODUCT: + str = get_sysattr_string(usbdev, "product"); + break; + case HID_STRING_ID_IMANUFACTURER: + str = get_sysattr_string(usbdev, "manufacturer"); + break; + case HID_STRING_ID_ISERIALNUMBER: + str = get_sysattr_string(usbdev, "serial"); + break; + default: + ERR("Unhandled string index %08x\n", index); + return STATUS_NOT_IMPLEMENTED; + } + } + else + { +#ifdef HAVE_LINUX_HIDRAW_H + switch (index) + { + case HID_STRING_ID_IPRODUCT: + { + char buf[MAX_PATH]; + if (ioctl(private->device_fd, HIDIOCGRAWNAME(MAX_PATH), buf) == -1) + WARN("ioctl(HIDIOCGRAWNAME) failed: %d %s\n", errno, strerror(errno)); + else + str = strdupAtoW(buf); + break; + } + case HID_STRING_ID_IMANUFACTURER: + break; + case HID_STRING_ID_ISERIALNUMBER: + break; + default: + ERR("Unhandled string index %08x\n", index); + return STATUS_NOT_IMPLEMENTED; + } +#else + return STATUS_NOT_IMPLEMENTED; +#endif + } + + if (!str) + { + if (!length) return STATUS_BUFFER_TOO_SMALL; + buffer[0] = 0; + return STATUS_SUCCESS; + } + + if (length <= strlenW(str)) + { + HeapFree(GetProcessHeap(), 0, str); + return STATUS_BUFFER_TOO_SMALL; + } + + strcpyW(buffer, str); + HeapFree(GetProcessHeap(), 0, str); + return STATUS_SUCCESS; +} + static const platform_vtbl hidraw_vtbl = { compare_platform_device, hidraw_get_reportdescriptor, + hidraw_get_string, }; static void try_add_device(struct udev_device *dev) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index ad09ec1..86adbf5 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -421,6 +421,17 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Information = length; break; } + case IOCTL_HID_GET_STRING: + { + DWORD length = irpsp->Parameters.DeviceIoControl.OutputBufferLength / sizeof(WCHAR); + DWORD index = (ULONG_PTR)irpsp->Parameters.DeviceIoControl.Type3InputBuffer; + TRACE("IOCTL_HID_GET_STRING[%08x]\n", index); + + irp->IoStatus.u.Status = status = ext->vtbl->get_string(device, index, (WCHAR *)irp->UserBuffer, length); + if (status == STATUS_SUCCESS) + irp->IoStatus.Information = (strlenW((WCHAR *)irp->UserBuffer) + 1) * sizeof(WCHAR); + break; + } default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode;

1 0

Andrey Gusev : api-ms-win-appmodel-runtime-l1-1-1: Add dll.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 0fdedc6e9589af64f8c83e5fb7b2b310adbf168e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fdedc6e9589af64f8c83e5fb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Oct 14 14:33:43 2016 +0300 api-ms-win-appmodel-runtime-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 +++- configure.ac | 3 ++- .../api-ms-win-appmodel-runtime-l1-1-1/Makefile.in | 1 + .../api-ms-win-appmodel-runtime-l1-1-1.spec | 27 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 34 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 99793b0..ce756df 100755 --- a/configure +++ b/configure @@ -874,6 +874,7 @@ enable_actxprxy enable_advapi32 enable_advpack enable_amstream +enable_api_ms_win_appmodel_runtime_l1_1_1 enable_api_ms_win_core_apiquery_l1_1_0 enable_api_ms_win_core_appcompat_l1_1_1 enable_api_ms_win_core_appinit_l1_1_0 @@ -17562,6 +17563,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll api-ms-win-appmodel-runtime-l1-1-1 enable_api_ms_win_appmodel_runtime_l1_1_1 wine_fn_config_dll api-ms-win-core-apiquery-l1-1-0 enable_api_ms_win_core_apiquery_l1_1_0 wine_fn_config_dll api-ms-win-core-appcompat-l1-1-1 enable_api_ms_win_core_appcompat_l1_1_1 wine_fn_config_dll api-ms-win-core-appinit-l1-1-0 enable_api_ms_win_core_appinit_l1_1_0 @@ -18462,7 +18464,7 @@ wine_fn_config_program lodctr enable_lodctr install wine_fn_config_program mofcomp enable_mofcomp install wine_fn_config_program mshta enable_mshta install wine_fn_config_program msiexec enable_msiexec install,installbin,manpage -wine_fn_config_program msinfo32 enable_msinfo32 install +wine_fn_config_program msinfo32 enable_msinfo32 clean,install wine_fn_config_program net enable_net clean,install wine_fn_config_program netsh enable_netsh install wine_fn_config_program netstat enable_netstat clean,install diff --git a/configure.ac b/configure.ac index ba8fd0f..8b67b2b 100644 --- a/configure.ac +++ b/configure.ac @@ -2651,6 +2651,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(api-ms-win-appmodel-runtime-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-appcompat-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-appinit-l1-1-0) @@ -3551,7 +3552,7 @@ WINE_CONFIG_PROGRAM(lodctr,,[install]) WINE_CONFIG_PROGRAM(mofcomp,,[install]) WINE_CONFIG_PROGRAM(mshta,,[install]) WINE_CONFIG_PROGRAM(msiexec,,[install,installbin,manpage]) -WINE_CONFIG_PROGRAM(msinfo32,,[install]) +WINE_CONFIG_PROGRAM(msinfo32,,[clean,install]) WINE_CONFIG_PROGRAM(net,,[clean,install]) WINE_CONFIG_PROGRAM(netsh,,[install]) WINE_CONFIG_PROGRAM(netstat,,[clean,install]) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in b/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in new file mode 100644 index 0000000..289d96f --- /dev/null +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-appmodel-runtime-l1-1-1.dll diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec new file mode 100644 index 0000000..1eb8327 --- /dev/null +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -0,0 +1,27 @@ +@ stub ClosePackageInfo +@ stub FindPackagesByPackageFamily +@ stub FormatApplicationUserModelId +@ stub GetApplicationUserModelId +@ stub GetCurrentApplicationUserModelId +@ stub GetCurrentPackageFamilyName +@ stub GetCurrentPackageFullName +@ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId +@ stub GetCurrentPackageInfo +@ stub GetCurrentPackagePath +@ stub GetPackageApplicationIds +@ stub GetPackageFamilyName +@ stub GetPackageFullName +@ stub GetPackageId +@ stub GetPackageInfo +@ stub GetPackagePath +@ stub GetPackagePathByFullName +@ stub GetPackagesByPackageFamily +@ stub GetStagedPackageOrigin +@ stub GetStagedPackagePathByFullName +@ stub OpenPackageInfoByFullName +@ stub PackageFamilyNameFromFullName +@ stub PackageFamilyNameFromId +@ stub PackageFullNameFromId +@ stub PackageIdFromFullName +@ stub PackageNameAndPublisherIdFromFamilyName +@ stub ParseApplicationUserModelId diff --git a/tools/make_specfiles b/tools/make_specfiles index f3b5c5e..4a2702f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -137,6 +137,7 @@ my @dll_groups = ], [ "kernel32", + "api-ms-win-appmodel-runtime-l1-1-1", "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-appcompat-l1-1-1",

1 0

Vincent Povirk : gdiplus/tests: Add tests for 0-pixel pens.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: dd5fd46c6361de0ce04095675965d58e25e9c37b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5fd46c6361de0ce04095675… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 13 16:23:15 2016 -0500 gdiplus/tests: Add tests for 0-pixel pens. It turns out that GdipDrawLine behaves differently from GdipDrawPath, only in the case of a 0 pixel pen. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 94 ++++++++++++++++++++++++++++++++++++--- dlls/gdiplus/tests/graphicspath.c | 18 ++++++++ 2 files changed, 105 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index d86f49d..529f1a2 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3899,15 +3899,18 @@ static void test_pen_thickness(void) REAL res_x, res_y, scale; GpUnit pen_unit, page_unit; REAL pen_width; - INT cx, cy; + INT cx, cy, path_cx, path_cy; } td[] = { - { 10.0, 10.0, 1.0, UnitPixel, UnitPixel, 1.0, 1, 1 }, - { 10.0, 10.0, 3.0, UnitPixel, UnitPixel, 2.0, 2, 2 }, - { 10.0, 10.0, 30.0, UnitPixel, UnitInch, 1.0, 1, 1 }, - { 10.0, 10.0, 1.0, UnitWorld, UnitPixel, 1.0, 1, 1 }, - { 10.0, 10.0, 3.0, UnitWorld, UnitPixel, 2.0, 6, 6 }, - { 10.0, 10.0, 2.0, UnitWorld, UnitInch, 1.0, 20, 20 }, + { 10.0, 10.0, 1.0, UnitPixel, UnitPixel, 1.0, 1, 1, 1, 1 }, + { 10.0, 10.0, 1.0, UnitPixel, UnitPixel, 0.0, 0, 0, 1, 1 }, + { 10.0, 10.0, 1.0, UnitPixel, UnitPixel, 0.1, 1, 1, 1, 1 }, + { 10.0, 10.0, 3.0, UnitPixel, UnitPixel, 2.0, 2, 2, 2, 2 }, + { 10.0, 10.0, 30.0, UnitPixel, UnitInch, 1.0, 1, 1, 1, 1 }, + { 10.0, 10.0, 1.0, UnitWorld, UnitPixel, 1.0, 1, 1, 1, 1 }, + { 10.0, 10.0, 1.0, UnitWorld, UnitPixel, 0.0, 1, 1, 1, 1 }, + { 10.0, 10.0, 3.0, UnitWorld, UnitPixel, 2.0, 6, 6, 6, 6 }, + { 10.0, 10.0, 2.0, UnitWorld, UnitInch, 1.0, 20, 20, 20, 20 }, }; GpStatus status; int i, j; @@ -3919,6 +3922,7 @@ static void test_pen_thickness(void) } u; GpPen *pen; GpPointF corner; + GpPath *path; BitmapData bd; INT min, max, size; @@ -4008,6 +4012,82 @@ static void test_pen_thickness(void) status = GdipBitmapUnlockBits(u.bitmap, &bd); expect(Ok, status); + status = GdipGraphicsClear(graphics, 0xff000000); + expect(Ok, status); + + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + + status = GdipAddPathLine(path, corner.X/2, 0, corner.X/2, corner.Y); + expect(Ok, status); + + status = GdipClosePathFigure(path); + expect(Ok, status); + + status = GdipAddPathLine(path, 0, corner.Y/2, corner.X, corner.Y/2); + expect(Ok, status); + + status = GdipDrawPath(graphics, pen, path); + expect(Ok, status); + + GdipDeletePath(path); + + status = GdipBitmapLockBits(u.bitmap, NULL, ImageLockModeRead, PixelFormat24bppRGB, &bd); + expect(Ok, status); + + min = -1; + max = -2; + + for (j=0; j<100; j++) + { + if (((BYTE*)bd.Scan0)[j*3] == 0xff) + { + min = j; + break; + } + } + + for (j=99; j>=0; j--) + { + if (((BYTE*)bd.Scan0)[j*3] == 0xff) + { + max = j; + break; + } + } + + size = max-min+1; + + ok(size == td[i].path_cx, "%u: expected %d, got %d\n", i, td[i].path_cx, size); + + min = -1; + max = -2; + + for (j=0; j<100; j++) + { + if (((BYTE*)bd.Scan0)[bd.Stride*j] == 0xff) + { + min = j; + break; + } + } + + for (j=99; j>=0; j--) + { + if (((BYTE*)bd.Scan0)[bd.Stride*j] == 0xff) + { + max = j; + break; + } + } + + size = max-min+1; + + ok(size == td[i].path_cy, "%u: expected %d, got %d\n", i, td[i].path_cy, size); + + status = GdipBitmapUnlockBits(u.bitmap, &bd); + expect(Ok, status); + GdipDeletePen(pen); GdipDeleteGraphics(graphics); GdipDisposeImage(u.image); diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index c43fb42..c44ed5e 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1071,6 +1071,7 @@ static void test_widen(void) GpPath *path; GpPen *pen; GpMatrix *m; + INT count=-1; status = GdipCreatePath(FillModeAlternate, &path); expect(Ok, status); @@ -1195,6 +1196,23 @@ static void test_widen(void) expect(Ok, status); ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + /* pen width = 0 pixels - native fails to widen but can draw with this pen */ + GdipDeletePen(pen); + status = GdipCreatePen1(0xffffffff, 0.0, UnitPixel, &pen); + expect(Ok, status); + + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 10.0, 50.0, 10.0); + expect(Ok, status); + + status = GdipWidenPath(path, pen, m, 1.0); + expect(Ok, status); + + status = GdipGetPointCount(path, &count); + expect(Ok, status); + todo_wine expect(0, count); + GdipDeleteMatrix(m); GdipDeletePen(pen); GdipDeletePath(path);

1 0

Vincent Povirk : gdiplus: Add non-gdi32 implementation of GdipDrawPath.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 092531df7124f1e076648bd5b2f578d0ce2abfb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=092531df7124f1e076648bd5b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 13 16:23:16 2016 -0500 gdiplus: Add non-gdi32 implementation of GdipDrawPath. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 84 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 69 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c75618c..56faa16 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3375,26 +3375,12 @@ GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics *graphics, GpPen *pen, GDIPCONST return retval; } -GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +GpStatus GDI32_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { INT save_state; GpStatus retval; HRGN hrgn=NULL; - TRACE("(%p, %p, %p)\n", graphics, pen, path); - - if(!pen || !graphics) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - save_state = prepare_dc(graphics, pen); retval = get_clip_hrgn(graphics, &hrgn); @@ -3415,6 +3401,74 @@ end: return retval; } +GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +{ + GpStatus stat; + GpPath *wide_path; + GpMatrix *transform=NULL; + + stat = GdipClonePath(path, &wide_path); + + if (stat != Ok) + return stat; + + if (pen->unit == UnitPixel) + { + /* We have to transform this to device coordinates to get the widths right. */ + stat = GdipCreateMatrix(&transform); + + if (stat == Ok) + stat = get_graphics_transform(graphics, CoordinateSpaceDevice, + CoordinateSpaceWorld, transform); + } + + if (stat == Ok) + stat = GdipWidenPath(wide_path, pen, transform, 1.0); + + if (pen->unit == UnitPixel) + { + /* Transform the path back to world coordinates */ + if (stat == Ok) + stat = GdipInvertMatrix(transform); + + if (stat == Ok) + stat = GdipTransformPath(wide_path, transform); + } + + /* Actually draw the path */ + if (stat == Ok) + stat = GdipFillPath(graphics, pen->brush, wide_path); + + GdipDeleteMatrix(transform); + + GdipDeletePath(wide_path); + + return stat; +} + +GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +{ + GpStatus retval; + + TRACE("(%p, %p, %p)\n", graphics, pen, path); + + if(!pen || !graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + if (path->pathdata.Count == 0) + return Ok; + + if (!graphics->hdc) + retval = SOFTWARE_GdipDrawPath(graphics, pen, path); + else + retval = GDI32_GdipDrawPath(graphics, pen, path); + + return retval; +} + GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) {

1 0

Vincent Povirk : gdiplus: Add a software path for thin line drawing.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 6e054e43c6f7a09c8cbcaa64650a49ca20a0cfb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e054e43c6f7a09c8cbcaa646… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 13 16:23:17 2016 -0500 gdiplus: Add a software path for thin line drawing. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 324 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 324 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e054e43c6f7a09c8cbca…

1 0