January 2017 - Wine-Commits

André Hentschel : user32: Fix DrawMenuBarTemp spec file entry.
by Alexandre Julliard Jan. 27, 2017

Jan. 27, 2017

Module: wine Branch: master Commit: 76793a8e4b10fe8827bdd762f77e6f8632e70020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76793a8e4b10fe8827bdd762f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 26 23:47:12 2017 +0100 user32: Fix DrawMenuBarTemp spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 65a5bfe..c2d43e7 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -191,7 +191,7 @@ @ stdcall DrawIcon(long long long long) @ stdcall DrawIconEx(long long long long long long long long long) @ stdcall DrawMenuBar(long) -@ stdcall DrawMenuBarTemp(long long long long long) +@ stdcall DrawMenuBarTemp(long long ptr long long) @ stdcall DrawStateA(long long ptr long long long long long long long) @ stdcall DrawStateW(long long ptr long long long long long long long) @ stdcall DrawTextA(long str long ptr long)

1 0

André Hentschel : shell32: Fix some spec file entries.
by Alexandre Julliard Jan. 27, 2017

Jan. 27, 2017

Module: wine Branch: master Commit: 1eede2926f5a29237b5b4c4260d2021507d374cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eede2926f5a29237b5b4c426… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 26 23:47:04 2017 +0100 shell32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-shell-shellcom-l1-1-0.spec | 2 +- .../api-ms-win-shell-shellfolders-l1-1-0.spec | 2 +- dlls/shell32/shell32.spec | 44 +++++++++++----------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/api-ms-win-shell-shellcom-l1-1-0/api-ms-win-shell-shellcom-l1-1-0.spec b/dlls/api-ms-win-shell-shellcom-l1-1-0/api-ms-win-shell-shellcom-l1-1-0.spec index bf9f656..0036f17 100644 --- a/dlls/api-ms-win-shell-shellcom-l1-1-0/api-ms-win-shell-shellcom-l1-1-0.spec +++ b/dlls/api-ms-win-shell-shellcom-l1-1-0/api-ms-win-shell-shellcom-l1-1-0.spec @@ -1 +1 @@ -@ stdcall SHCoCreateInstance(wstr ptr long ptr ptr) shell32.SHCoCreateInstance +@ stdcall SHCoCreateInstance(wstr ptr ptr ptr ptr) shell32.SHCoCreateInstance diff --git a/dlls/api-ms-win-shell-shellfolders-l1-1-0/api-ms-win-shell-shellfolders-l1-1-0.spec b/dlls/api-ms-win-shell-shellfolders-l1-1-0/api-ms-win-shell-shellfolders-l1-1-0.spec index 5909c04..5860527 100644 --- a/dlls/api-ms-win-shell-shellfolders-l1-1-0/api-ms-win-shell-shellfolders-l1-1-0.spec +++ b/dlls/api-ms-win-shell-shellfolders-l1-1-0/api-ms-win-shell-shellfolders-l1-1-0.spec @@ -7,7 +7,7 @@ @ stdcall SHGetFolderPathA(long long long long ptr) shell32.SHGetFolderPathA @ stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) shell32.SHGetFolderPathAndSubDirW @ stdcall SHGetFolderPathW(long long long long ptr) shell32.SHGetFolderPathW -@ stdcall SHGetInstanceExplorer(long) shell32.SHGetInstanceExplorer +@ stdcall SHGetInstanceExplorer(ptr) shell32.SHGetInstanceExplorer @ stdcall SHGetKnownFolderPath(ptr long ptr ptr) shell32.SHGetKnownFolderPath @ stdcall SHGetSpecialFolderPathA(long ptr long long) shell32.SHGetSpecialFolderPathA @ stdcall SHGetSpecialFolderPathW(long ptr long long) shell32.SHGetSpecialFolderPathW diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index cd4f24a..0f26a34 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -48,7 +48,7 @@ 50 stdcall -noname PathStripToRoot(ptr) PathStripToRootAW 51 stdcall PathResolve(str long long) PathResolveAW 52 stdcall -noname PathGetArgs(str) PathGetArgsAW - 53 stdcall DoEnvironmentSubst(long long) DoEnvironmentSubstAW + 53 stdcall DoEnvironmentSubst(ptr long) DoEnvironmentSubstAW 54 stub LogoffWindowsDialog 55 stdcall -noname PathQuoteSpaces(ptr) PathQuoteSpacesAW 56 stdcall -noname PathUnquoteSpaces(str) PathUnquoteSpacesAW @@ -56,18 +56,18 @@ 58 stdcall -noname ParseField(str long ptr long) ParseFieldAW 59 stdcall -ordinal RestartDialog(long wstr long) 60 stdcall -noname ExitWindowsDialog(long) - 61 stdcall -noname RunFileDlg(long long long str str long) RunFileDlgAW - 62 stdcall -ordinal PickIconDlg(long long long long) - 63 stdcall -ordinal GetFileNameFromBrowse(long long long long str str str) GetFileNameFromBrowseAW + 61 stdcall -noname RunFileDlg(long long str str str long) RunFileDlgAW + 62 stdcall -ordinal PickIconDlg(long long long ptr) + 63 stdcall -ordinal GetFileNameFromBrowse(long ptr long str str str str) GetFileNameFromBrowseAW 64 stdcall -ordinal DriveType(long) 65 stdcall -noname InvalidateDriveType(long) 66 stdcall -ordinal IsNetDrive(long) 67 stdcall -ordinal Shell_MergeMenus(long long long long long long) 68 stdcall -ordinal SHGetSetSettings(ptr long long) 69 stub -noname SHGetNetResource - 70 stdcall -noname SHCreateDefClassObject(long long long long long) + 70 stdcall -noname SHCreateDefClassObject(long long long ptr long) 71 stdcall -ordinal Shell_GetImageLists(ptr ptr) - 72 stdcall -ordinal Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndexAW + 72 stdcall -ordinal Shell_GetCachedImageIndex(str long long) Shell_GetCachedImageIndexAW 73 stdcall -ordinal SHShellFolderView_Message(long long long) 74 stdcall -ordinal SHCreateStdEnumFmtEtc(long ptr ptr) 75 stdcall -ordinal PathYetAnotherMakeUniqueName(ptr wstr wstr wstr) @@ -89,12 +89,12 @@ 94 stdcall -noname Win32RemoveDirectory(wstr) Win32RemoveDirectoryAW 95 stdcall -noname SHLogILFromFSIL(ptr) 96 stdcall -noname StrRetToStrN(ptr long ptr ptr) StrRetToStrNAW - 97 stdcall -noname SHWaitForFileToOpen (long long long) + 97 stdcall -noname SHWaitForFileToOpen (ptr long long) 98 stdcall -ordinal SHGetRealIDL(ptr ptr ptr) 99 stdcall -noname SetAppStartingCursor(long long) 100 stdcall -ordinal SHRestricted(long) - 102 stdcall -ordinal SHCoCreateInstance(wstr ptr long ptr ptr) + 102 stdcall -ordinal SHCoCreateInstance(wstr ptr ptr ptr ptr) 103 stdcall -ordinal SignalFileOpen(ptr) 104 stdcall -noname FileMenu_DeleteAllItems(long) 105 stdcall -noname FileMenu_DrawItem(long ptr) @@ -126,7 +126,7 @@ 131 stdcall -ordinal DAD_DragEnterEx(long int64) 132 stdcall -ordinal DAD_DragLeave() 134 stdcall -ordinal DAD_DragMove(int64) - 136 stdcall -ordinal DAD_SetDragImage(long long) + 136 stdcall -ordinal DAD_SetDragImage(long ptr) 137 stdcall -ordinal DAD_ShowDragImage(long) 139 stub Desktop_UpdateBriefcaseOnEvent 140 stdcall -noname FileMenu_DeleteItemByIndex(long long) @@ -136,14 +136,14 @@ 144 stdcall -noname FileMenu_GetItemExtent(long long) 145 stdcall -noname PathFindOnPath(ptr ptr) PathFindOnPathAW 146 stdcall -noname RLBuildListOfPaths() - 147 stdcall -ordinal SHCLSIDFromString(long long) SHCLSIDFromStringAW + 147 stdcall -ordinal SHCLSIDFromString(ptr ptr) SHCLSIDFromStringAW 148 stdcall -noname SHMapIDListToImageListIndexAsync(ptr ptr ptr long ptr ptr ptr ptr ptr) 149 stdcall -ordinal SHFind_InitMenuPopup(long long long long) 151 stdcall -noname SHLoadOLE(long) 152 stdcall -ordinal ILGetSize(ptr) 153 stdcall -ordinal ILGetNext(ptr) - 154 stdcall -ordinal ILAppendID(long long long) + 154 stdcall -ordinal ILAppendID(ptr ptr long) 155 stdcall -ordinal ILFree(ptr) 156 stdcall -noname ILGlobalFree(ptr) 157 stdcall -ordinal ILCreateFromPath(ptr) ILCreateFromPathAW @@ -165,15 +165,15 @@ 173 stdcall -ordinal SHValidateUNC(long wstr long) 174 stdcall -ordinal SHCreateShellFolderViewEx(ptr ptr) 175 stdcall -noname SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathAW - 176 stdcall -ordinal SHSetInstanceExplorer(long) + 176 stdcall -ordinal SHSetInstanceExplorer(ptr) 177 stub DAD_SetDragImageFromListView 178 stdcall -ordinal SHObjectProperties(long long wstr wstr) - 179 stdcall -ordinal SHGetNewLinkInfoA(str str ptr long long) - 180 stdcall -ordinal SHGetNewLinkInfoW(wstr wstr ptr long long) + 179 stdcall -ordinal SHGetNewLinkInfoA(str str ptr ptr long) + 180 stdcall -ordinal SHGetNewLinkInfoW(wstr wstr ptr ptr long) 181 stdcall -noname RegisterShellHook(long long) 182 varargs -ordinal ShellMessageBoxW(long long wstr wstr long) 183 varargs -ordinal ShellMessageBoxA(long long str str long) - 184 stdcall -noname ArrangeWindows(long long long long long) + 184 stdcall -noname ArrangeWindows(long long ptr long long) 185 stub SHHandleDiskFull 186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) 187 stub ILGetPseudoNameW @@ -233,7 +233,7 @@ 525 stub RealDriveTypeFlags 526 stdcall SHFlushSFCache() - 640 stdcall -noname NTSHChangeNotifyRegister(long long long long long long) + 640 stdcall -noname NTSHChangeNotifyRegister(long long long long long ptr) 641 stdcall -noname NTSHChangeNotifyDeregister(long) 643 stub SHChangeNotifyReceive @@ -285,8 +285,8 @@ @ stdcall -private DllInstall(long wstr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() -@ stdcall DoEnvironmentSubstA(str str) -@ stdcall DoEnvironmentSubstW(wstr wstr) +@ stdcall DoEnvironmentSubstA(str long) +@ stdcall DoEnvironmentSubstW(wstr long) @ stdcall DragAcceptFiles(long long) @ stdcall DragFinish(long) @ stdcall DragQueryFile(long long ptr long) DragQueryFileA @@ -296,8 +296,8 @@ @ stdcall DragQueryPoint(long ptr) @ stdcall DuplicateIcon(long long) @ stdcall ExtractAssociatedIconA(long str ptr) -@ stdcall ExtractAssociatedIconExA(long str long long) -@ stdcall ExtractAssociatedIconExW(long wstr long long) +@ stdcall ExtractAssociatedIconExA(long str ptr ptr) +@ stdcall ExtractAssociatedIconExW(long wstr ptr ptr) @ stdcall ExtractAssociatedIconW(long wstr ptr) @ stdcall ExtractIconA(long str long) @ stdcall ExtractIconEx(ptr long ptr ptr long) ExtractIconExA @@ -378,7 +378,7 @@ @ stdcall SHGetIconOverlayIndexA(str long) @ stdcall SHGetIconOverlayIndexW(wstr long) @ stdcall SHGetIDListFromObject(ptr ptr) -@ stdcall SHGetInstanceExplorer(long) +@ stdcall SHGetInstanceExplorer(ptr) @ stdcall SHGetItemFromDataObject(ptr long ptr ptr) @ stdcall SHGetItemFromObject(ptr ptr ptr) @ stdcall SHGetKnownFolderIDList(ptr long ptr ptr) @@ -387,7 +387,7 @@ @ stdcall SHGetLocalizedName(wstr ptr long ptr) @ stdcall SHGetMalloc(ptr) @ stdcall SHGetNameFromIDList(ptr long ptr) -@ stdcall SHGetNewLinkInfo(str str ptr long long) SHGetNewLinkInfoA +@ stdcall SHGetNewLinkInfo(str str ptr ptr long) SHGetNewLinkInfoA @ stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDListA @ stdcall SHGetPathFromIDListA(ptr ptr) @ stdcall SHGetPathFromIDListW(ptr ptr)

1 0

André Hentschel : mscms: Fix some spec file entries.
by Alexandre Julliard Jan. 27, 2017

Jan. 27, 2017

Module: wine Branch: master Commit: 321b34d66fc6861d69245965f45495f3fb0a8262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=321b34d66fc6861d69245965f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 26 23:46:59 2017 +0100 mscms: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/mscms.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mscms/mscms.spec b/dlls/mscms/mscms.spec index f728c79..e420dd8 100644 --- a/dlls/mscms/mscms.spec +++ b/dlls/mscms/mscms.spec @@ -18,13 +18,13 @@ @ stdcall EnumColorProfilesW(ptr ptr ptr ptr ptr) @ stdcall GenerateCopyFilePaths(wstr wstr ptr long ptr ptr ptr ptr long) @ stdcall GetCMMInfo(ptr long) -@ stdcall GetColorDirectoryA(ptr ptr long) -@ stdcall GetColorDirectoryW(ptr ptr long) +@ stdcall GetColorDirectoryA(ptr ptr ptr) +@ stdcall GetColorDirectoryW(ptr ptr ptr) @ stdcall GetColorProfileElement(ptr long long ptr ptr ptr) @ stdcall GetColorProfileElementTag(ptr long ptr) @ stdcall GetColorProfileFromHandle(ptr ptr ptr) @ stdcall GetColorProfileHeader(ptr ptr) -@ stdcall GetCountColorProfileElements(ptr long) +@ stdcall GetCountColorProfileElements(ptr ptr) @ stdcall GetNamedProfileInfo(ptr ptr) @ stdcall GetPS2ColorRenderingDictionary(ptr long ptr ptr ptr) @ stdcall GetPS2ColorRenderingIntent(ptr long ptr ptr) @@ -40,7 +40,7 @@ @ stub InternalGetPS2PreviewCRD @ stub InternalSetDeviceConfig @ stdcall IsColorProfileTagPresent(ptr long ptr) -@ stdcall IsColorProfileValid(ptr long) +@ stdcall IsColorProfileValid(ptr ptr) @ stdcall OpenColorProfileA(ptr long long long) @ stdcall OpenColorProfileW(ptr long long long) @ stdcall RegisterCMMA(ptr long ptr)

1 0

Jeremy Newman : moving some of the theme images over to the CDN
by Jeremy Newman Jan. 27, 2017

Jan. 27, 2017

Module: appdb Branch: master Commit: 02c30c6e7d11791f780a588fbe8b3cd35d31da7e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=02c30c6e7d11791f780a588f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Jan 27 12:57:29 2017 -0600 moving some of the theme images over to the CDN --- include/footer.php | 2 +- include/header.php | 6 +++--- styles.css | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/footer.php b/include/footer.php index 1340d41..a64dcad 100644 --- a/include/footer.php +++ b/include/footer.php @@ -6,7 +6,7 @@ <div id="footer"> <a href="https://wiki.winehq.org/WineHQ_Wiki:Privacy_policy">Privacy Policy</a><br><br> Hosted By - <a href="http://www.codeweavers.com/"><img src="https://www.winehq.org/images/cw_logo_sm.png" alt="CodeWeavers" + <a href="http://www.codeweavers.com/"><img src="https://dl.winehq.org/share/images/cw_logo_sm.png" alt="CodeWeavers" title="CodeWeavers - Run Windows applications and games on Mac and Linux"></a> </div> diff --git a/include/header.php b/include/header.php index 516fba0..61aff7b 100644 --- a/include/header.php +++ b/include/header.php @@ -34,7 +34,7 @@ $iJStime = filemtime(BASE."utils.js"); if (!empty($sHeaderCode)) echo " {$sHeaderCode}\n"; ?> - <link rel="shortcut icon" type="image/png" href="<?php echo BASE; ?>images/winehq_logo_16.png"> + <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_16.png"> <link title="AppDB" type="application/opensearchdescription+xml" rel="search" href="<?php echo BASE; ?>opensearch.xml"> </head> <body> @@ -53,8 +53,8 @@ if (!empty($sHeaderCode)) <div class="clear"></div> </nav> -<div id="whq-logo-glass"><a href="https://www.winehq.org/"><img src="https://www.winehq.org/images/winehq_logo_glass.png" alt=""></a></div> -<div id="whq-logo-text"><a href="https://www.winehq.org/"><img src="https://www.winehq.org/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> +<div id="whq-logo-glass"><a href="https://www.winehq.org/"><img src="https://dl.winehq.org/share/images/winehq_logo_glass.png" alt=""></a></div> +<div id="whq-logo-text"><a href="https://www.winehq.org/"><img src="https://dl.winehq.org/share/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> <div id="whq-search_box"> <form action="https://www.winehq.org/search" id="cse-search-box"> diff --git a/styles.css b/styles.css index 725a99a..ee66a10 100644 --- a/styles.css +++ b/styles.css @@ -17,7 +17,7 @@ HTML { BODY { background-color: #000000 !important; color: #000000; - background-image: url('https://www.winehq.org/images/bg.jpg'); + background-image: url('https://dl.winehq.org/share/images/bg.jpg'); background-repeat: no-repeat; background-attachment: fixed; height: 100%;

1 0

Jeremy Newman : moving some of the theme images over to the CDN
by Jeremy Newman Jan. 27, 2017

Jan. 27, 2017

Module: website Branch: master Commit: 8bec4b5030c7a9ca090013e4ca71fcdef61ade39 URL: http://source.winehq.org/git/website.git/?a=commit;h=8bec4b5030c7a9ca090013… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Jan 27 12:54:48 2017 -0600 moving some of the theme images over to the CDN --- css/styles.css | 2 +- templates/en/global/layout/content.template | 8 ++++---- templates/fr/global/layout/content.template | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/css/styles.css b/css/styles.css index 87017f9..ae2481b 100644 --- a/css/styles.css +++ b/css/styles.css @@ -27,7 +27,7 @@ PRE { BODY { background-color: #000000; color: #000000; - background-image: url('../images/bg.jpg'); + background-image: url('https://dl.winehq.org/share/images/bg.jpg'); background-repeat: no-repeat; background-attachment: fixed; } diff --git a/templates/en/global/layout/content.template b/templates/en/global/layout/content.template index 226edc8..dc54550 100644 --- a/templates/en/global/layout/content.template +++ b/templates/en/global/layout/content.template @@ -29,7 +29,7 @@  - <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> + <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_16.png"> {$rss_link} </head> <body class="page-{$page_name}{$page_body_class}"> @@ -46,8 +46,8 @@ </div> <div class="clear"></div> -<div id="whq-logo-glass"><a href="{$root}/"><img src="{$root}/images/winehq_logo_glass.png" alt=""></a></div> -<div id="whq-logo-text"><a href="{$root}/"><img src="{$root}/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> +<div id="whq-logo-glass"><a href="{$root}/"><img src="https://dl.winehq.org/share/images/winehq_logo_glass.png" alt=""></a></div> +<div id="whq-logo-text"><a href="{$root}/"><img src="https://dl.winehq.org/share/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> <div id="whq-search-box"> <form action="{$root}/search" id="cse-search-box"> @@ -70,7 +70,7 @@ <div class="col-xs-6 text-right"> <a href="https://wiki.winehq.org/WineHQ_Wiki:Privacy_policy">Privacy Policy</a><br><br> {trans($hosted_by)} - <a href="https://www.codeweavers.com/"><img src="{$root}/images/cw_logo_sm.png" alt="CodeWeavers" + <a href="https://www.codeweavers.com/"><img src="https://dl.winehq.org/share/images/cw_logo_sm.png" alt="CodeWeavers" title="{trans($hosted_by_alt)}"></a> </div> </div> diff --git a/templates/fr/global/layout/content.template b/templates/fr/global/layout/content.template index fa3ccfd..969dcb6 100644 --- a/templates/fr/global/layout/content.template +++ b/templates/fr/global/layout/content.template @@ -29,7 +29,7 @@  - <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> + <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_16.png"> {$rss_link} </head> <body class="page-{$page_name}{$page_body_class}"> @@ -46,8 +46,8 @@ </div> <div class="clear"></div> -<div id="whq-logo-glass"><a href="{$root}/"><img src="{$root}/images/winehq_logo_glass.png" alt=""></a></div> -<div id="whq-logo-text"><a href="{$root}/"><img src="{$root}/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> +<div id="whq-logo-glass"><a href="{$root}/"><img src="https://dl.winehq.org/share/images/winehq_logo_glass.png" alt=""></a></div> +<div id="whq-logo-text"><a href="{$root}/"><img src="https://dl.winehq.org/share/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> <div id="whq-search-box"> <form action="{$root}/search" id="cse-search-box"> @@ -69,7 +69,7 @@ </div> <div class="col-xs-6 text-right"> {trans($hosted_by)} - <a href="https://www.codeweavers.com/"><img src="{$root}/images/cw_logo_sm.png" alt="CodeWeavers" + <a href="https://www.codeweavers.com/"><img src="https://dl.winehq.org/share/images/cw_logo_sm.png" alt="CodeWeavers" title="{trans($hosted_by_alt)}"></a> </div> </div>

1 0

Lauri Kenttä : msvcrt: Fix space-only inputs in wcstoi64.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 96a48efeeade7359c8c84a8c3a0a9768fb2a6194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a48efeeade7359c8c84a8c3… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jan 25 17:02:26 2017 +0200 msvcrt: Fix space-only inputs in wcstoi64. wcstoi64 sets endpos past the beginning only if some digits are found. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 5 +++++ dlls/msvcrt/wcs.c | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 027df18..a59ed91 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2827,6 +2827,7 @@ static void test__stricmp(void) static void test__wcstoi64(void) { static const WCHAR digit[] = { '9', 0 }; + static const WCHAR space[] = { ' ', 0 }; static const WCHAR stock[] = { 0x3231, 0 }; /* PARENTHESIZED IDEOGRAPH STOCK */ static const WCHAR cjk_1[] = { 0x4e00, 0 }; /* CJK Ideograph, First */ static const WCHAR tamil[] = { 0x0bef, 0 }; /* TAMIL DIGIT NINE */ @@ -2853,6 +2854,8 @@ static void test__wcstoi64(void) res = p_wcstoi64(digit, NULL, 10); ok(res == 9, "res != 9\n"); + res = p_wcstoi64(space, &endpos, 0); + ok(endpos == space, "endpos != space\n"); res = p_wcstoi64(stock, &endpos, 10); ok(res == 0, "res != 0\n"); ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); @@ -2876,6 +2879,8 @@ static void test__wcstoi64(void) ures = p_wcstoui64(digit, NULL, 10); ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(space, &endpos, 0); + ok(endpos == space, "endpos != space\n"); ures = p_wcstoui64(stock, &endpos, 10); ok(ures == 0, "ures != 0\n"); ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 551fb9a..bd7cc20 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2053,7 +2053,7 @@ static int wctoint(WCHAR c, int base) __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, MSVCRT_wchar_t **endptr, int base, MSVCRT__locale_t locale) { - BOOL negative = FALSE; + BOOL negative = FALSE, empty = TRUE; __int64 ret = 0; TRACE("(%s %p %d %p)\n", debugstr_w(nptr), endptr, base, locale); @@ -2062,6 +2062,9 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; if (!MSVCRT_CHECK_PMT(base <= 36)) return 0; + if(endptr) + *endptr = (MSVCRT_wchar_t*)nptr; + while(isspaceW(*nptr)) nptr++; if(*nptr == '-') { @@ -2091,6 +2094,7 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, v = -v; nptr++; + empty = FALSE; if(!negative && (ret>MSVCRT_I64_MAX/base || ret*base>MSVCRT_I64_MAX-v)) { ret = MSVCRT_I64_MAX; @@ -2102,7 +2106,7 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, ret = ret*base + v; } - if(endptr) + if(endptr && !empty) *endptr = (MSVCRT_wchar_t*)nptr; return ret; @@ -2209,7 +2213,7 @@ MSVCRT_longlong __cdecl MSVCRT__wtoll(const MSVCRT_wchar_t *str) unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, MSVCRT_wchar_t **endptr, int base, MSVCRT__locale_t locale) { - BOOL negative = FALSE; + BOOL negative = FALSE, empty = TRUE; unsigned __int64 ret = 0; TRACE("(%s %p %d %p)\n", debugstr_w(nptr), endptr, base, locale); @@ -2218,6 +2222,9 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; if (!MSVCRT_CHECK_PMT(base <= 36)) return 0; + if(endptr) + *endptr = (MSVCRT_wchar_t*)nptr; + while(isspaceW(*nptr)) nptr++; if(*nptr == '-') { @@ -2244,6 +2251,7 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, break; nptr++; + empty = FALSE; if(ret>MSVCRT_UI64_MAX/base || ret*base>MSVCRT_UI64_MAX-v) { ret = MSVCRT_UI64_MAX; @@ -2252,7 +2260,7 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, ret = ret*base + v; } - if(endptr) + if(endptr && !empty) *endptr = (MSVCRT_wchar_t*)nptr; return negative ? -ret : ret;

1 0

Lauri Kenttä : msvcrt/tests: Test wcstoi64 with various Unicode digits.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: b0ccba4b3390a9319854038b1f5c5da795f9a335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ccba4b3390a9319854038b1… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jan 25 17:02:23 2017 +0200 msvcrt/tests: Test wcstoi64 with various Unicode digits. Test all Unicode digits which Windows seems to support. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8e78695..c377abf 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2828,10 +2828,19 @@ static void test__wcstoi64(void) { static const WCHAR digit[] = { '9', 0 }; static const WCHAR stock[] = { 0x3231, 0 }; /* PARENTHESIZED IDEOGRAPH STOCK */ + static const WCHAR cjk_1[] = { 0x4e00, 0 }; /* CJK Ideograph, First */ static const WCHAR tamil[] = { 0x0bef, 0 }; /* TAMIL DIGIT NINE */ static const WCHAR thai[] = { 0x0e59, 0 }; /* THAI DIGIT NINE */ static const WCHAR fullwidth[] = { 0xff19, 0 }; /* FULLWIDTH DIGIT NINE */ + static const WCHAR superscript1[] = { 0xb9, 0 }; /* SUPERSCRIPT ONE */ + static const WCHAR minus_0x91[] = { '-', 0x0e50, 'x', 0xff19, '1', 0 }; + static const WCHAR plus_071[] = { '+', 0x0e50, 0xff17, '1', 0 }; static const WCHAR hex[] = { 0xff19, 'f', 0x0e59, 0xff46, 0 }; + static const WCHAR zeros[] = { + 0x660, 0x6f0, 0x966, 0x9e6, 0xa66, 0xae6, 0xb66, 0xc66, 0xce6, + 0xd66, 0xe50, 0xed0, 0xf20, 0x1040, 0x17e0, 0x1810, 0xff10 + }; + int i; __int64 res; unsigned __int64 ures; @@ -2847,6 +2856,8 @@ static void test__wcstoi64(void) res = p_wcstoi64(stock, &endpos, 10); ok(res == 0, "res != 0\n"); ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + res = p_wcstoi64(cjk_1, NULL, 0); + ok(res == 0, "res != 0\n"); res = p_wcstoi64(tamil, &endpos, 10); ok(res == 0, "res != 0\n"); ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); @@ -2854,8 +2865,14 @@ static void test__wcstoi64(void) todo_wine ok(res == 9, "res != 9\n"); res = p_wcstoi64(fullwidth, NULL, 10); todo_wine ok(res == 9, "res != 9\n"); + res = p_wcstoi64(superscript1, NULL, 10); + ok(res == 0, "res != 0\n"); res = p_wcstoi64(hex, NULL, 16); todo_wine ok(res == 0x9f9, "res != 0x9f9\n"); + res = p_wcstoi64(minus_0x91, NULL, 0); + todo_wine ok(res == -0x91, "res != -0x91\n"); + res = p_wcstoi64(plus_071, NULL, 0); + todo_wine ok(res == 071, "res != 071\n"); ures = p_wcstoui64(digit, NULL, 10); ok(ures == 9, "ures != 9\n"); @@ -2869,8 +2886,22 @@ static void test__wcstoi64(void) todo_wine ok(ures == 9, "ures != 9\n"); ures = p_wcstoui64(fullwidth, NULL, 10); todo_wine ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(superscript1, NULL, 10); + ok(ures == 0, "ures != 0\n"); ures = p_wcstoui64(hex, NULL, 16); todo_wine ok(ures == 0x9f9, "ures != 0x9f9\n"); + ures = p_wcstoui64(plus_071, NULL, 0); + todo_wine ok(ures == 071, "ures != 071\n"); + + /* Test various unicode digits */ + for (i = 0; i < sizeof(zeros) / sizeof(zeros[0]); ++i) { + WCHAR tmp[] = {zeros[i] + 4, zeros[i], zeros[i] + 5, 0}; + res = p_wcstoi64(tmp, NULL, 0); + todo_wine ok(res == 405, "with zero = U+%04X: got %d, expected 405\n", zeros[i], (int)res); + tmp[1] = zeros[i] + 10; + res = p_wcstoi64(tmp, NULL, 16); + todo_wine ok(res == 4, "with zero = U+%04X: got %d, expected 4\n", zeros[i], (int)res); + } return; }

1 0

Lauri Kenttä : msvcrt: Make wcstoi64 support various Unicode digits.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 5b6e1cf2de41542a6170f300a2ce24b5d14ee07c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b6e1cf2de41542a6170f300a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jan 25 17:02:25 2017 +0200 msvcrt: Make wcstoi64 support various Unicode digits. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 22 +++++++++++----------- dlls/msvcrt/wcs.c | 15 +++++++++++++++ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index c377abf..027df18 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2862,17 +2862,17 @@ static void test__wcstoi64(void) ok(res == 0, "res != 0\n"); ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); res = p_wcstoi64(thai, NULL, 10); - todo_wine ok(res == 9, "res != 9\n"); + ok(res == 9, "res != 9\n"); res = p_wcstoi64(fullwidth, NULL, 10); - todo_wine ok(res == 9, "res != 9\n"); + ok(res == 9, "res != 9\n"); res = p_wcstoi64(superscript1, NULL, 10); ok(res == 0, "res != 0\n"); res = p_wcstoi64(hex, NULL, 16); - todo_wine ok(res == 0x9f9, "res != 0x9f9\n"); + ok(res == 0x9f9, "res != 0x9f9\n"); res = p_wcstoi64(minus_0x91, NULL, 0); - todo_wine ok(res == -0x91, "res != -0x91\n"); + ok(res == -0x91, "res != -0x91\n"); res = p_wcstoi64(plus_071, NULL, 0); - todo_wine ok(res == 071, "res != 071\n"); + ok(res == 071, "res != 071\n"); ures = p_wcstoui64(digit, NULL, 10); ok(ures == 9, "ures != 9\n"); @@ -2883,24 +2883,24 @@ static void test__wcstoi64(void) ok(ures == 0, "ures != 0\n"); ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); ures = p_wcstoui64(thai, NULL, 10); - todo_wine ok(ures == 9, "ures != 9\n"); + ok(ures == 9, "ures != 9\n"); ures = p_wcstoui64(fullwidth, NULL, 10); - todo_wine ok(ures == 9, "ures != 9\n"); + ok(ures == 9, "ures != 9\n"); ures = p_wcstoui64(superscript1, NULL, 10); ok(ures == 0, "ures != 0\n"); ures = p_wcstoui64(hex, NULL, 16); - todo_wine ok(ures == 0x9f9, "ures != 0x9f9\n"); + ok(ures == 0x9f9, "ures != 0x9f9\n"); ures = p_wcstoui64(plus_071, NULL, 0); - todo_wine ok(ures == 071, "ures != 071\n"); + ok(ures == 071, "ures != 071\n"); /* Test various unicode digits */ for (i = 0; i < sizeof(zeros) / sizeof(zeros[0]); ++i) { WCHAR tmp[] = {zeros[i] + 4, zeros[i], zeros[i] + 5, 0}; res = p_wcstoi64(tmp, NULL, 0); - todo_wine ok(res == 405, "with zero = U+%04X: got %d, expected 405\n", zeros[i], (int)res); + ok(res == 405, "with zero = U+%04X: got %d, expected 405\n", zeros[i], (int)res); tmp[1] = zeros[i] + 10; res = p_wcstoi64(tmp, NULL, 16); - todo_wine ok(res == 4, "with zero = U+%04X: got %d, expected 4\n", zeros[i], (int)res); + ok(res == 4, "with zero = U+%04X: got %d, expected 4\n", zeros[i], (int)res); } return; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b9603f5..551fb9a 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2027,6 +2027,21 @@ static int wctoint(WCHAR c, int base) v = c - 'A' + 10; else if ('a' <= c && c <= 'z') v = c - 'a' + 10; + else { + /* NOTE: wine_fold_string(MAP_FOLDDIGITS) supports too many things. */ + /* Unicode points that contain digits 0-9; keep this sorted! */ + static const WCHAR zeros[] = { + 0x660, 0x6f0, 0x966, 0x9e6, 0xa66, 0xae6, 0xb66, 0xc66, 0xce6, + 0xd66, 0xe50, 0xed0, 0xf20, 0x1040, 0x17e0, 0x1810, 0xff10 + }; + int i; + for (i = 0; i < sizeof(zeros)/sizeof(zeros[0]) && c >= zeros[i]; ++i) { + if (zeros[i] <= c && c <= zeros[i] + 9) { + v = c - zeros[i]; + break; + } + } + } return v < base ? v : -1; }

1 0

Alex Henrie : shell32: Correct dialog title in error message from " Run File" to "Run".
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

1 0

Lauri Kenttä : msvcrt: Move WCHAR-to-int conversion to a function.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: bdd771dfa7ca3b8c7742c1800e1b00dbcb04fa7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd771dfa7ca3b8c7742c1800… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jan 25 17:02:24 2017 +0200 msvcrt: Move WCHAR-to-int conversion to a function. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 53 +++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c497a10..b9603f5 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2016,6 +2016,21 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, } /********************************************************************* + * wctoint (INTERNAL) + */ +static int wctoint(WCHAR c, int base) +{ + int v = -1; + if ('0' <= c && c <= '9') + v = c - '0'; + else if ('A' <= c && c <= 'Z') + v = c - 'A' + 10; + else if ('a' <= c && c <= 'z') + v = c - 'a' + 10; + return v < base ? v : -1; +} + +/********************************************************************* * _wcstoi64_l (MSVCRT.@) * * FIXME: locale parameter is ignored @@ -2040,31 +2055,22 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, } else if(*nptr == '+') nptr++; - if((base==0 || base==16) && *nptr=='0' && tolowerW(*(nptr+1))=='x') { + if((base==0 || base==16) && wctoint(*nptr, 1)==0 && tolowerW(*(nptr+1))=='x') { base = 16; nptr += 2; } if(base == 0) { - if(*nptr=='0') + if(wctoint(*nptr, 1)==0) base = 8; else base = 10; } while(*nptr) { - MSVCRT_wchar_t cur = tolowerW(*nptr); - int v; - - if(cur>='0' && cur<='9') { - if(cur >= '0'+base) - break; - v = cur-'0'; - } else { - if(cur<'a' || cur>='a'+base-10) - break; - v = cur-'a'+10; - } + int v = wctoint(*nptr, base); + if(v<0) + break; if(negative) v = -v; @@ -2205,31 +2211,22 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, } else if(*nptr == '+') nptr++; - if((base==0 || base==16) && *nptr=='0' && tolowerW(*(nptr+1))=='x') { + if((base==0 || base==16) && wctoint(*nptr, 1)==0 && tolowerW(*(nptr+1))=='x') { base = 16; nptr += 2; } if(base == 0) { - if(*nptr=='0') + if(wctoint(*nptr, 1)==0) base = 8; else base = 10; } while(*nptr) { - MSVCRT_wchar_t cur = tolowerW(*nptr); - int v; - - if(cur>='0' && cur<='9') { - if(cur >= '0'+base) - break; - v = *nptr-'0'; - } else { - if(cur<'a' || cur>='a'+base-10) - break; - v = cur-'a'+10; - } + int v = wctoint(*nptr, base); + if(v<0) + break; nptr++;

1 0