shell32: Limit displayed volume label length to 32.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32: Limit displayed volume label length to 32.
960b5996 · Nikolay Sivov · Alexandre Julliard · 1c86f979 · 960b5996
Commit 960b5996 authored Nov 28, 2016 by Nikolay Sivov Committed by Alexandre Julliard Nov 28, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

shfldr_mycomp.c dlls/shell32/shfldr_mycomp.c +3 -6

No files found.
--- a/dlls/shell32/shfldr_mycomp.c
+++ b/dlls/shell32/shfldr_mycomp.c
@@ -695,15 +695,12 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface,
            /* long view "lw_name (C:)" */
            if (!(dwFlags & SHGDN_FORPARSING))
            {
-                DWORD dwVolumeSerialNumber, dwMaximumComponetLength, dwFileSystemFlags;
-                WCHAR wszDrive[18] = {0};
                static const WCHAR wszOpenBracket[] = {' ','(',0};
                static const WCHAR wszCloseBracket[] = {')',0};
+                WCHAR wszDrive[32 /* label */ + 6 /* ' (C:)'\0 */] = {0};

-                GetVolumeInformationW (pszPath, wszDrive,
-                           sizeof(wszDrive)/sizeof(wszDrive[0]) - 6,
-                           &dwVolumeSerialNumber,
-                           &dwMaximumComponetLength, &dwFileSystemFlags, NULL, 0);
+                GetVolumeInformationW (pszPath, wszDrive, sizeof(wszDrive)/sizeof(wszDrive[0]) - 5,
+                        NULL, NULL, NULL, NULL, 0);
                strcatW (wszDrive, wszOpenBracket);
                lstrcpynW (wszDrive + strlenW(wszDrive), pszPath, 3);
                strcatW (wszDrive, wszCloseBracket);