August 2018 - Wine-commits - list.winehq.org

Alex Henrie : shell32: Add copy icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 4f5c8253d33de851aab5111a9042612c0aa1878f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f5c8253d33de851aab5111a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:52 2018 -0600 shell32: Add copy icon. Adapted from edit-copy in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/copy.ico | Bin 0 -> 34090 bytes dlls/shell32/resources/copy.svg | 811 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 816 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f5c8253d33de851aab5…

1 0

Alex Henrie : shell32: Add backup icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: bcbfaf0b00a45f2c93ffdc82fac057b23b4faf8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcbfaf0b00a45f2c93ffdc82… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:53 2018 -0600 shell32: Add backup icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index b84a280..3435448 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -677,6 +677,10 @@ IDI_SHELL_RUN2 ICON resources/window.ico /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/copy.ico */ +IDI_SHELL_BACKUP ICON resources/copy.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 2e161dc..b77c5fc 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -251,6 +251,8 @@ /* 158 - 159 not used on Windows */ #define IDI_SHELL_RUN2 160 #define IDI_SHELL_CONFIRM_DELETE 161 +/* 162 - 164 not used on Windows */ +#define IDI_SHELL_BACKUP 165 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170

1 0

Alex Henrie : shell32: Add disk check icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: a7a50c148741e040f61722fb5cdad5d8a5ab0452 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7a50c148741e040f61722fb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:54 2018 -0600 shell32: Add disk check icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 3435448..af65307 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -681,6 +681,10 @@ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico /* @makedep: resources/copy.ico */ IDI_SHELL_BACKUP ICON resources/copy.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/drive.ico */ +IDI_SHELL_DISK_CHECK ICON resources/drive.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index b77c5fc..b401a39 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -253,6 +253,7 @@ #define IDI_SHELL_CONFIRM_DELETE 161 /* 162 - 164 not used on Windows */ #define IDI_SHELL_BACKUP 165 +#define IDI_SHELL_DISK_CHECK 166 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170

1 0

Alex Henrie : shell32: Add defragment icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: ffa4ce525805f956889c0ef6735995ac73c3a326 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffa4ce525805f956889c0ef6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:55 2018 -0600 shell32: Add defragment icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index af65307..9924083 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -685,6 +685,10 @@ IDI_SHELL_BACKUP ICON resources/copy.ico /* @makedep: resources/drive.ico */ IDI_SHELL_DISK_CHECK ICON resources/drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/drive.ico */ +IDI_SHELL_DEFRAGMENT ICON resources/drive.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index b401a39..2810028 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -254,6 +254,7 @@ /* 162 - 164 not used on Windows */ #define IDI_SHELL_BACKUP 165 #define IDI_SHELL_DISK_CHECK 166 +#define IDI_SHELL_DEFRAGMENT 167 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170

1 0

Alex Henrie : shell32: Add treeview icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 4504557787112306ff8361fa181ecd93050af58e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4504557787112306ff8361fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:56 2018 -0600 shell32: Add treeview icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 9924083..d34555b 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -689,6 +689,10 @@ IDI_SHELL_DISK_CHECK ICON resources/drive.ico /* @makedep: resources/drive.ico */ IDI_SHELL_DEFRAGMENT ICON resources/drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/menu.ico */ +IDI_SHELL_TREEVIEW ICON resources/menu.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 2810028..5531240 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -258,6 +258,7 @@ #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170 +#define IDI_SHELL_TREEVIEW 171 #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Jacek Caban : mshtml: Use generic value checks for IHTMLStyle:: put_overflow implementation.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: b79b70f808f518aabc78ca33d675ce4f02d142bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b79b70f808f518aabc78ca33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 12:45:21 2018 +0200 mshtml: Use generic value checks for IHTMLStyle::put_overflow implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index e647220..51e4fbe 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -207,6 +207,7 @@ static const WCHAR word_wrapW[] = static const WCHAR z_indexW[] = {'z','-','i','n','d','e','x',0}; +static const WCHAR autoW[] = {'a','u','t','o',0}; static const WCHAR blinkW[] = {'b','l','i','n','k',0}; static const WCHAR boldW[] = {'b','o','l','d',0}; static const WCHAR bolderW[] = {'b','o','l','d','e','r',0}; @@ -215,6 +216,7 @@ static const WCHAR dashedW[] = {'d','a','s','h','e','d',0}; static const WCHAR dottedW[] = {'d','o','t','t','e','d',0}; static const WCHAR doubleW[] = {'d','o','u','b','l','e',0}; static const WCHAR grooveW[] = {'g','r','o','o','v','e',0}; +static const WCHAR hiddenW[] = {'h','i','d','d','e','n',0}; static const WCHAR insetW[] = {'i','n','s','e','t',0}; static const WCHAR italicW[] = {'i','t','a','l','i','c',0}; static const WCHAR lighterW[] = {'l','i','g','h','t','e','r',0}; @@ -229,8 +231,10 @@ static const WCHAR repeatW[] = {'r','e','p','e','a','t',0}; static const WCHAR repeat_xW[] = {'r','e','p','e','a','t','-','x',0}; static const WCHAR repeat_yW[] = {'r','e','p','e','a','t','-','y',0}; static const WCHAR ridgeW[] = {'r','i','d','g','e',0}; +static const WCHAR scrollW[] = {'s','c','r','o','l','l',0}; static const WCHAR solidW[] = {'s','o','l','i','d',0}; static const WCHAR underlineW[] = {'u','n','d','e','r','l','i','n','e',0}; +static const WCHAR visibleW[] = {'v','i','s','i','b','l','e',0}; static const WCHAR style100W[] = {'1','0','0',0}; static const WCHAR style200W[] = {'2','0','0',0}; @@ -302,6 +306,14 @@ static const WCHAR *border_style_values[] = { NULL }; +static const WCHAR *overflow_values[] = { + autoW, + hiddenW, + scrollW, + visibleW, + NULL +}; + #define ATTR_FIX_PX 0x0001 #define ATTR_FIX_URL 0x0002 #define ATTR_STR_TO_INT 0x0004 @@ -379,7 +391,7 @@ static const style_tbl_entry_t style_tbl[] = { {min_heightW, DISPID_IHTMLSTYLE4_MINHEIGHT}, {min_widthW, DISPID_IHTMLSTYLE5_MINWIDTH, ATTR_FIX_PX}, {outlineW, DISPID_IHTMLSTYLE6_OUTLINE, ATTR_NO_NULL}, - {overflowW, DISPID_IHTMLSTYLE_OVERFLOW}, + {overflowW, DISPID_IHTMLSTYLE_OVERFLOW, 0, overflow_values}, {overflow_xW, DISPID_IHTMLSTYLE2_OVERFLOWX}, {overflow_yW, DISPID_IHTMLSTYLE2_OVERFLOWY}, {paddingW, DISPID_IHTMLSTYLE_PADDING}, @@ -2380,21 +2392,10 @@ static HRESULT WINAPI HTMLStyle_get_zIndex(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_overflow(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - static const WCHAR szVisible[] = {'v','i','s','i','b','l','e',0}; - static const WCHAR szScroll[] = {'s','c','r','o','l','l',0}; - static const WCHAR szHidden[] = {'h','i','d','d','e','n',0}; - static const WCHAR szAuto[] = {'a','u','t','o',0}; TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - /* overflow can only be one of the follow values. */ - if(!v || !*v || strcmpiW(szVisible, v) == 0 || strcmpiW(szScroll, v) == 0 || - strcmpiW(szHidden, v) == 0 || strcmpiW(szAuto, v) == 0) - { - return set_style_property(This, STYLEID_OVERFLOW, v); - } - - return E_INVALIDARG; + return set_style_property(This, STYLEID_OVERFLOW, v); }

1 0

Dmitry Timoshkov : kerberos: Avoid needless conversions between SYSTEMTIME and FILETIME.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 33732facd68dfd1c45ec4f78f6c64be7fc110aa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33732facd68dfd1c45ec4f78… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 28 11:56:42 2018 +0800 kerberos: Avoid needless conversions between SYSTEMTIME and FILETIME. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 70895c9..3827e5c 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -751,12 +751,11 @@ static void trace_gss_status( OM_uint32 major_status, OM_uint32 minor_status ) static void expirytime_gss_to_sspi( OM_uint32 expirytime, TimeStamp *timestamp ) { - SYSTEMTIME time; FILETIME filetime; ULARGE_INTEGER tmp; - GetLocalTime( &time ); - SystemTimeToFileTime( &time, &filetime ); + GetSystemTimeAsFileTime( &filetime ); + FileTimeToLocalFileTime( &filetime, &filetime ); tmp.QuadPart = ((ULONGLONG)filetime.dwLowDateTime | (ULONGLONG)filetime.dwHighDateTime << 32) + expirytime; timestamp->LowPart = tmp.QuadPart; timestamp->HighPart = tmp.QuadPart >> 32;

1 0

Józef Kucia : winevulkan: Trace properties for created devices.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: e3de7f777415579f485091933ba5042062a2d374 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3de7f777415579f48509193… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 28 10:27:12 2018 +0200 winevulkan: Trace properties for created devices. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index a1e970d..89df838 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -60,6 +60,9 @@ static void *wine_vk_get_global_proc_addr(const char *name); static const struct vulkan_funcs *vk_funcs; static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); +void WINAPI wine_vkGetPhysicalDeviceProperties(VkPhysicalDevice physical_device, + VkPhysicalDeviceProperties *properties); + static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) { if (!phys_dev) @@ -600,6 +603,17 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); + if (TRACE_ON(vulkan)) + { + VkPhysicalDeviceProperties properties; + + wine_vkGetPhysicalDeviceProperties(phys_dev, &properties); + + TRACE("Device name: %s.\n", debugstr_a(properties.deviceName)); + TRACE("Vendor ID: %#x, Device ID: %#x.\n", properties.vendorID, properties.deviceID); + TRACE("Driver version: %#x.\n", properties.driverVersion); + } + if (!(object = heap_alloc_zero(sizeof(*object)))) return VK_ERROR_OUT_OF_HOST_MEMORY;

1 0

Alex Henrie : shell32: Add rename icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 01d9dba509d139e7b87518db5c4f0ba503e76672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d9dba509d139e7b87518db… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:41 2018 -0600 shell32: Add rename icon. Adapted from document-save-as.svg in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/rename.ico | Bin 0 -> 30995 bytes dlls/shell32/resources/rename.svg | 419 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 424 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01d9dba509d139e7b875…

1 0

Alex Henrie : shell32: Add folder rename icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 8c42ceea48f1422fcb7a7e4772674416ad48b367 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c42ceea48f1422fcb7a7e47… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:42 2018 -0600 shell32: Add folder rename icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index b6043cf..efd6f6b 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -636,6 +636,10 @@ IDI_SHELL_FILE_OVERWRITE ICON resources/delete.ico /* @makedep: resources/delete.ico */ IDI_SHELL_FOLDER_OVERWRITE ICON resources/delete.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/rename.ico */ +IDI_SHELL_RENAME_FOLDER ICON resources/rename.ico + /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 042991c..d94af86 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -238,6 +238,7 @@ #define IDI_SHELL_TRASH_MIXED 144 #define IDI_SHELL_FILE_OVERWRITE 145 #define IDI_SHELL_FOLDER_OVERWRITE 146 +#define IDI_SHELL_FOLDER_RENAME 147 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0