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

Alex Henrie : shell32: Add batch file icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

Module: wine Branch: master Commit: c31f1ace26d1806ad268f7b332136c0ab806f519 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c31f1ace26d1806ad268f7b3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:46 2018 -0600 shell32: Add batch file 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 38de421..fc3e67e 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -651,6 +651,10 @@ IDI_SHELL_CONFIG_FILE ICON resources/document.ico /* @makedep: resources/document.ico */ IDI_SHELL_TEXT_FILE ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/window.ico */ +IDI_SHELL_BATCH_FILE ICON resources/window.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 0dc397f..54ccf57 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -243,6 +243,7 @@ /* 149 - 150 not used on Windows */ #define IDI_SHELL_CONFIG_FILE 151 #define IDI_SHELL_TEXT_FILE 152 +#define IDI_SHELL_BATCH_FILE 153 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Jacek Caban : mshtml: Use generic value checks for IHTMLStyle:: put_fontVariant implementation.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

Module: wine Branch: master Commit: ab2bd77c0869517a5bbe225591df9c2fead796ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab2bd77c0869517a5bbe2255… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 12:44:03 2018 +0200 mshtml: Use generic value checks for IHTMLStyle::put_fontVariant implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index a137b56..b89ffbc 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 capsW[] = {'s','m','a','l','l','-','c','a','p','s',0}; static const WCHAR italicW[] = {'i','t','a','l','i','c',0}; static const WCHAR normalW[] = {'n','o','r','m','a','l',0}; static const WCHAR obliqueW[] = {'o','b','l','i','q','u','e',0}; @@ -218,6 +219,12 @@ static const WCHAR *font_style_values[] = { NULL }; +static const WCHAR *font_variant_values[] = { + capsW, + normalW, + NULL +}; + #define ATTR_FIX_PX 0x0001 #define ATTR_FIX_URL 0x0002 #define ATTR_STR_TO_INT 0x0004 @@ -276,7 +283,7 @@ static const style_tbl_entry_t style_tbl[] = { {font_familyW, DISPID_IHTMLSTYLE_FONTFAMILY}, {font_sizeW, DISPID_IHTMLSTYLE_FONTSIZE, ATTR_FIX_PX}, {font_styleW, DISPID_IHTMLSTYLE_FONTSTYLE, 0, font_style_values}, - {font_variantW, DISPID_IHTMLSTYLE_FONTVARIANT}, + {font_variantW, DISPID_IHTMLSTYLE_FONTVARIANT, 0, font_variant_values}, {font_weightW, DISPID_IHTMLSTYLE_FONTWEIGHT, ATTR_STR_TO_INT}, {heightW, DISPID_IHTMLSTYLE_HEIGHT, ATTR_FIX_PX}, {leftW, DISPID_IHTMLSTYLE_LEFT}, @@ -925,17 +932,10 @@ static HRESULT WINAPI HTMLStyle_get_fontStyle(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_fontVariant(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - static const WCHAR szCaps[] = {'s','m','a','l','l','-','c','a','p','s',0}; TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - /* fontVariant can only be one of the follow values. */ - if(!v || strcmpiW(normalW, v) == 0 || strcmpiW(szCaps, v) == 0) - { - return set_style_property(This, STYLEID_FONT_VARIANT, v); - } - - return E_INVALIDARG; + return set_style_property(This, STYLEID_FONT_VARIANT, v); } static HRESULT WINAPI HTMLStyle_get_fontVariant(IHTMLStyle *iface, BSTR *p)

1 0

Alex Henrie : shell32: Add network folder icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

Module: wine Branch: master Commit: 5e8803ace482757ee583c63722fddfafbcbcd38b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e8803ace482757ee583c637… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:57 2018 -0600 shell32: Add network folder 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 d34555b..047d09d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -693,6 +693,10 @@ IDI_SHELL_DEFRAGMENT ICON resources/drive.ico /* @makedep: resources/menu.ico */ IDI_SHELL_TREEVIEW ICON resources/menu.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NETWORK_FOLDER ICON resources/folder.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 5531240..a785c35 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -259,6 +259,7 @@ #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170 #define IDI_SHELL_TREEVIEW 171 +#define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Alex Henrie : shell32: Add treeview icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

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

Alex Henrie : shell32: Add second run icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

Module: wine Branch: master Commit: 3aa81e84076c8cb3b6c2d6aab516a894cb949863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa81e84076c8cb3b6c2d6aa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:51 2018 -0600 shell32: Add second run icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index fabbd45..db1dc9e 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -671,6 +671,9 @@ IDI_SHELL_TRUETYPE_FONT ICON resources/document.ico /* @makedep: resources/document.ico */ IDI_SHELL_POSTSCRIPT_FONT ICON resources/document.ico +/* @makedep: resources/window.ico */ +IDI_SHELL_RUN2 ICON resources/window.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 2638765..3f526cb 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -248,6 +248,8 @@ #define IDI_SHELL_SYSTEM_FONT 155 #define IDI_SHELL_TRUETYPE_FONT 156 #define IDI_SHELL_POSTSCRIPT_FONT 157 +/* 158 - 159 not used on Windows */ +#define IDI_SHELL_RUN2 160 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add PostScript font icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

Module: wine Branch: master Commit: 1a21156bc9656c2e939f4ef62ad5275784689bd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a21156bc9656c2e939f4ef6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:50 2018 -0600 shell32: Add PostScript font 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 1506256..fabbd45 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -667,6 +667,10 @@ IDI_SHELL_SYSTEM_FONT ICON resources/document.ico /* @makedep: resources/document.ico */ IDI_SHELL_TRUETYPE_FONT ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_POSTSCRIPT_FONT ICON resources/document.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 27fca9d..2638765 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -247,6 +247,7 @@ #define IDI_SHELL_LIBRARY_FILE 154 #define IDI_SHELL_SYSTEM_FONT 155 #define IDI_SHELL_TRUETYPE_FONT 156 +#define IDI_SHELL_POSTSCRIPT_FONT 157 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

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

Aug. 28, 2018

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

Alex Henrie : shell32: Add install icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

Module: wine Branch: master Commit: 04383aed44d68b2790f97740cec5ec46568cdd70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04383aed44d68b2790f97740… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:43 2018 -0600 shell32: Add install icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index efd6f6b..b876cf9 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -640,6 +640,9 @@ IDI_SHELL_FOLDER_OVERWRITE ICON resources/delete.ico /* @makedep: resources/rename.ico */ IDI_SHELL_RENAME_FOLDER ICON resources/rename.ico +/* @makedep: resources/update.ico */ +IDI_SHELL_INSTALL ICON resources/update.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 d94af86..2dc0a0f 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -239,6 +239,7 @@ #define IDI_SHELL_FILE_OVERWRITE 145 #define IDI_SHELL_FOLDER_OVERWRITE 146 #define IDI_SHELL_FOLDER_RENAME 147 +#define IDI_SHELL_INSTALL 148 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add folder rename icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

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

Alex Henrie : shell32: Add rename icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

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