Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-01 10:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.13][SHELL32] Fix 2 compiler warnings for the rls-cfg 'unused variable'

Browse source 
This fixes the same 2 warnings that we fixed on master by 0.4.15-dev-7676-g a08b83a90b (#6539)
But I ported back only the first commit of (#6539) and left out the 2nd.
The 2 warnings were introduced by 0.4.10-dev-202-g 698cbc6184

binary size of shell32.dll tends to shrink slightly (e.g. in releases/0.4.13),
but is not enough to reach the next lower quantum for most branches:

master          RosBEWin2.2.2 GCC8.4.0 dbg x86               10.550.272 (0.4.15-dev-7715-gbb297bc)
releases/0.4.14 RosBEWin2.2.2 GCC8.4.0 dbg x86  9.316.684 ->  9.316.684
releases/0.4.14 RosBEWin2.1.6 GCC4.7.2 dbg x86  9.345.024 ->  9.345.024
releases/0.4.13 RosBEWin2.1.6 GCC4.7.2 dbg x86  9.200.640 ->  9.199.616
releases/0.4.12 RosBEWin2.1.6 GCC4.7.2 dbg x86  9.146.880 ->  9.146.368
releases/0.4.11 RosBEWin2.1.6 GCC4.7.2 dbg x86  9.077.248 ->  9.077.248
releases/0.4.10 RosBEWin2.1.6 GCC4.7.2 dbg x86  9.069.568 ->  9.069.568

No older branch than releases/0.4.10 was affected.
This commit is contained in:
Joachim Henze 2024-03-04 20:28:25 +01:00
parent 4d645fbeb8
commit 955cb64cad
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/win32/shell32/dialogs/filetypes.cpp
View file

@ -660,12 +660,11 @@ FileTypesDlg_InsertToLV(HWND hListView, LPCWSTR szName, INT iItem, LPCWSTR szFil
}
// add icon to imagelist
INT iLargeImage = -1, iSmallImage = -1;
INT iSmallImage = -1;
if (Entry->hIconLarge && Entry->hIconSmall)
{
iLargeImage = ImageList_AddIcon(himlLarge, Entry->hIconLarge);
ImageList_AddIcon(himlLarge, Entry->hIconLarge);
iSmallImage = ImageList_AddIcon(himlSmall, Entry->hIconSmall);
ASSERT(iLargeImage == iSmallImage);
}
// Do not add excluded entries
@ -1037,9 +1036,8 @@ EditTypeDlg_UpdateEntryIcon(HWND hwndDlg, PEDITTYPE_DIALOG pEditType,
HIMAGELIST himlLarge = ListView_GetImageList(hListView, LVSIL_NORMAL);
HIMAGELIST himlSmall = ListView_GetImageList(hListView, LVSIL_SMALL);
INT iLargeImage = ImageList_AddIcon(himlLarge, pEntry->hIconLarge);
ImageList_AddIcon(himlLarge, pEntry->hIconLarge);
INT iSmallImage = ImageList_AddIcon(himlSmall, pEntry->hIconSmall);
ASSERT(iLargeImage == iSmallImage);
INT iItem = ListView_GetNextItem(hListView, -1, LVNI_SELECTED);
if (iItem != -1)