[SHELL32] Fix some clang warnings (reactos#7845)

whindsaks · web-flow · commit 190782c3e0ac · 2025-03-31T18:59:04.000+02:00
diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp
@@ -518,7 +518,7 @@ class CDefView :
         return wc;
     }
 
-    virtual WNDPROC GetWindowProc()
+    virtual WNDPROC GetWindowProc() override
     {
         return WindowProc;
     }
@@ -1059,7 +1059,7 @@ HRESULT CDefView::GetDetailsByFolderColumn(PCUITEMID_CHILD pidl, UINT FoldCol, S
 {
     // According to learn.microsoft.com/en-us/windows/win32/shell/sfvm-getdetailsof
     // the query order is IShellFolder2, IShellDetails, SFVM_GETDETAILSOF.
-    HRESULT hr;
+    HRESULT hr = E_FAIL;
     if (m_pSF2Parent)
     {
         hr = m_pSF2Parent->GetDetailsOf(pidl, FoldCol, &sd);
@@ -1230,6 +1230,7 @@ void CDefView::ColumnListChanged()
             break;
         HRESULT foldCol = MapListColumnToFolderColumn(listCol);
         assert(SUCCEEDED(foldCol));
+        DBG_UNREFERENCED_LOCAL_VARIABLE(foldCol);
         AppendMenuItem(m_hMenuArrangeModes, MF_STRING,
                        DVIDM_ARRANGESORT_FIRST + listCol, lvc.pszText, listCol);
     }
@@ -3373,7 +3374,7 @@ HRESULT CDefView::LoadViewState()
             m_LoadColumnsList = NULL;
         }
     }
-    m_sortInfo.bLoadedFromViewState = !fallback && m_LoadColumnsList && cvs.SortColId != LISTVIEW_SORT_INFO::UNSPECIFIEDCOLUMN;
+    m_sortInfo.bLoadedFromViewState = !fallback && m_LoadColumnsList && (int)cvs.SortColId != LISTVIEW_SORT_INFO::UNSPECIFIEDCOLUMN;
     m_sortInfo.bColumnIsFolderColumn = TRUE;
     m_sortInfo.Direction = cvs.SortDir > 0 ? 1 : -1;
     m_sortInfo.ListColumn = cvs.SortColId;
diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp
@@ -219,7 +219,7 @@ class CDefaultContextMenu :
         STDMETHOD(GetSite)(REFIID riid, void **ppvSite) override;
 
         // IServiceProvider
-        virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID svc, REFIID riid, void**ppv)
+        STDMETHOD(QueryService)(REFGUID svc, REFIID riid, void**ppv) override
         {
             return IUnknown_QueryService(m_site, svc, riid, ppv);
         }
diff --git a/dll/win32/shell32/CRecycleBinCleaner.cpp b/dll/win32/shell32/CRecycleBinCleaner.cpp
@@ -10,7 +10,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 
-CLSID CLSID_RecycleBinCleaner = { 0x5ef4af3a, 0xf726, 0x11d0, 0xb8, 0xa2, 0x00, 0xc0, 0x4f, 0xc3, 0x09, 0xa4 };
+CLSID CLSID_RecycleBinCleaner = { 0x5ef4af3a, 0xf726, 0x11d0, { 0xb8, 0xa2, 0x00, 0xc0, 0x4f, 0xc3, 0x09, 0xa4 } };
 
 struct CRecycleBinCleaner :
     public CComObjectRootEx<CComSingleThreadModel>,
diff --git a/dll/win32/shell32/debughlp.cpp b/dll/win32/shell32/debughlp.cpp
@@ -452,7 +452,7 @@ const char * shdebugstr_guid( const struct _GUID *id )
         }
 
             return wine_dbg_sprintf( "\n\t{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x} (%s)",
-                 id->Data1, id->Data2, id->Data3,
+                 (UINT)id->Data1, id->Data2, id->Data3,
                  id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3],
                  id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7], name ? name : "unknown" );
 }
diff --git a/dll/win32/shell32/dialogs/drive.cpp b/dll/win32/shell32/dialogs/drive.cpp
@@ -374,7 +374,7 @@ InitializeFormatDriveDlg(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
 {
     WCHAR szDrive[] = { WCHAR(pContext->Drive + 'A'), ':', '\\', '\0' };
     WCHAR szText[120], szFs[30];
-    INT cchText;
+    SIZE_T cchText;
     ULARGE_INTEGER TotalNumberOfBytes;
     DWORD dwIndex, dwDefault;
     UCHAR uMinor, uMajor;
@@ -398,8 +398,6 @@ InitializeFormatDriveDlg(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
     SendMessageW(pContext->hWndTipTrigger, STM_SETICON, (WPARAM)hIco, 0);
 
     cchText = GetWindowTextW(hwndDlg, szText, _countof(szText) - 1);
-    if (cchText < 0)
-        cchText = 0;
     szText[cchText++] = L' ';
     szFs[0] = UNICODE_NULL;
     if (GetVolumeInformationW(szDrive, &szText[cchText], _countof(szText) - cchText, NULL, NULL, NULL, szFs, _countof(szFs)))
diff --git a/dll/win32/shell32/dialogs/filetypes.cpp b/dll/win32/shell32/dialogs/filetypes.cpp
@@ -334,6 +334,7 @@ InitializeDefaultIcons(PFILE_TYPE_GLOBALS pG)
     {
         int idx = ImageList_AddIcon(pG->himlSmall, pG->hDefExtIconSmall);
         ASSERT(idx == 0);
+        DBG_UNREFERENCED_LOCAL_VARIABLE(idx);
     }
 }
 
diff --git a/dll/win32/shell32/dialogs/view.cpp b/dll/win32/shell32/dialogs/view.cpp
@@ -249,7 +249,7 @@ ViewTree_InsertAll(HWND hwndTreeView)
 static BOOL
 ViewTree_LoadTree(HKEY hKey, LPCWSTR pszKeyName, DWORD dwParentID)
 {
-    DWORD dwIndex;
+    DWORD dwIndex = ~0UL;
     WCHAR szKeyName[64], szText[MAX_PATH], *pch;
     DWORD Size, Value;
     PVIEWTREE_ENTRY pAllocated;
diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp
@@ -544,7 +544,7 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject,
             bLinking = TRUE;
     }
 
-    if (SUCCEEDED(pDataObject->QueryGetData(&fmt)))
+    if (SUCCEEDED(hr = pDataObject->QueryGetData(&fmt)))
     {
         hr = pDataObject->GetData(&fmt, &medium);
         TRACE("CFSTR_SHELLIDLIST\n");
@@ -698,11 +698,11 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject,
         _ILFreeaPidl(apidl, lpcida->cidl);
         ReleaseStgMedium(&medium);
     }
-    else if (SUCCEEDED(pDataObject->QueryGetData(&fmt2)))
+    else if (SUCCEEDED(hr = pDataObject->QueryGetData(&fmt2)))
     {
         FORMATETC fmt2;
         InitFormatEtc (fmt2, CF_HDROP, TYMED_HGLOBAL);
-        if (SUCCEEDED(pDataObject->GetData(&fmt2, &medium)) /* && SUCCEEDED(pDataObject->GetData(&fmt2, &medium))*/)
+        if (SUCCEEDED(hr = pDataObject->GetData(&fmt2, &medium)) /* && SUCCEEDED(pDataObject->GetData(&fmt2, &medium))*/)
         {
             WCHAR wszTargetPath[MAX_PATH + 1];
             LPWSTR pszSrcList;
diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp
@@ -186,11 +186,13 @@ static inline LPCWSTR GetItemRecycledFullPath(const BBITEMDATA &Data)
     return (LPCWSTR)((BYTE*)&Data + Data.RecycledPathOffset);
 }
 
+#if 0 // Unused
 static inline LPCWSTR GetItemRecycledFileName(LPCITEMIDLIST pidl, const BBITEMDATA &Data)
 {
     C_ASSERT(BBITEMFILETYPE & PT_FS_UNICODE_FLAG);
     return (LPCWSTR)((LPPIDLDATA)pidl->mkid.abID)->u.file.szNames;
 }
+#endif
 
 static int GetItemDriveNumber(LPCITEMIDLIST pidl)
 {
diff --git a/dll/win32/shell32/shellmenu/CMenuSite.cpp b/dll/win32/shell32/shellmenu/CMenuSite.cpp
@@ -85,7 +85,7 @@ HRESULT STDMETHODCALLTYPE CMenuSite::AddBand(IUnknown * punk)
 
 HRESULT STDMETHODCALLTYPE CMenuSite::EnumBands(UINT uBand, DWORD* pdwBandID)
 {
-    if (uBand == -1ul)
+    if (uBand == UINT(-1))
         return GetBandCount();
 
     if (uBand != 0)
diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.cpp b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.cpp
@@ -559,7 +559,8 @@ RecycleBin5_Create(
     LPWSTR FileName; /* Pointer into BufferName buffer */
     LPCSTR DesktopIniContents = "[.ShellClassInfo]\r\nCLSID={645FF040-5081-101B-9F08-00AA002F954E}\r\n";
     INFO2_HEADER Info2Contents[] = { { 5, 0, 0, 0x320, 0 } };
-    DWORD BytesToWrite, BytesWritten, Needed;
+    DWORD BytesToWrite, BytesWritten;
+    SIZE_T Needed;
     HANDLE hFile = INVALID_HANDLE_VALUE;
     HRESULT hr;
 
@@ -623,7 +624,7 @@ RecycleBin5_Create(
         hr = HRESULT_FROM_WIN32(GetLastError());
         goto cleanup;
     }
-    BytesToWrite = strlen(DesktopIniContents);
+    BytesToWrite = (UINT)strlen(DesktopIniContents);
     if (!WriteFile(hFile, DesktopIniContents, (DWORD)BytesToWrite, &BytesWritten, NULL))
     {
         hr = HRESULT_FROM_WIN32(GetLastError());
diff --git a/dll/win32/shell32/wine/classes.c b/dll/win32/shell32/wine/classes.c
@@ -254,7 +254,7 @@ BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey)
 {
 	char	xriid[50];
     sprintf( xriid, "CLSID\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
-                 riid->Data1, riid->Data2, riid->Data3,
+                 (UINT)riid->Data1, riid->Data2, riid->Data3,
                  riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3],
                  riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7] );
 
diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c
@@ -334,6 +334,7 @@ VOID WINAPI SHGetSetSettings(LPSHELLSTATE lpss, DWORD dwMask, BOOL bSet)
     else
     {
         DWORD read = 0, data, cb, dummy = 0;
+        DBG_UNREFERENCED_LOCAL_VARIABLE(dummy);
         if (SHELL_GlobalCounterChanged(&g_ShellStateCounter, SHELL_GCOUNTER_SHELLSTATE))
             g_CachedSSF = 0;
 
diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c
@@ -633,7 +633,7 @@ INT WINAPI SHStringFromGUIDA(REFGUID guid, LPSTR lpszDest, INT cchMax)
   TRACE("(%s,%p,%d)\n", debugstr_guid(guid), lpszDest, cchMax);
 
   sprintf(xguid, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
-          guid->Data1, guid->Data2, guid->Data3,
+          (UINT)guid->Data1, guid->Data2, guid->Data3,
           guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
           guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]);
 

Original file line number	Diff line number	Diff line change
`@@ -518,7 +518,7 @@ class CDefView :`
`518`	`518`	`return wc;`
`519`	`519`	`}`
`520`	`520`
`521`		`- virtual WNDPROC GetWindowProc()`
	`521`	`+ virtual WNDPROC GetWindowProc() override`
`522`	`522`	`{`
`523`	`523`	`return WindowProc;`
`524`	`524`	`}`
`@@ -1059,7 +1059,7 @@ HRESULT CDefView::GetDetailsByFolderColumn(PCUITEMID_CHILD pidl, UINT FoldCol, S`
`1059`	`1059`	`{`
`1060`	`1060`	`// According to learn.microsoft.com/en-us/windows/win32/shell/sfvm-getdetailsof`
`1061`	`1061`	`// the query order is IShellFolder2, IShellDetails, SFVM_GETDETAILSOF.`
`1062`		`- HRESULT hr;`
	`1062`	`+ HRESULT hr = E_FAIL;`
`1063`	`1063`	`if (m_pSF2Parent)`
`1064`	`1064`	`{`
`1065`	`1065`	`hr = m_pSF2Parent->GetDetailsOf(pidl, FoldCol, &sd);`
`@@ -1230,6 +1230,7 @@ void CDefView::ColumnListChanged()`
`1230`	`1230`	`break;`
`1231`	`1231`	`HRESULT foldCol = MapListColumnToFolderColumn(listCol);`
`1232`	`1232`	`assert(SUCCEEDED(foldCol));`
	`1233`	`+ DBG_UNREFERENCED_LOCAL_VARIABLE(foldCol);`
`1233`	`1234`	`AppendMenuItem(m_hMenuArrangeModes, MF_STRING,`
`1234`	`1235`	`DVIDM_ARRANGESORT_FIRST + listCol, lvc.pszText, listCol);`
`1235`	`1236`	`}`
`@@ -3373,7 +3374,7 @@ HRESULT CDefView::LoadViewState()`
`3373`	`3374`	`m_LoadColumnsList = NULL;`
`3374`	`3375`	`}`
`3375`	`3376`	`}`
`3376`		`- m_sortInfo.bLoadedFromViewState = !fallback && m_LoadColumnsList && cvs.SortColId != LISTVIEW_SORT_INFO::UNSPECIFIEDCOLUMN;`
	`3377`	`+ m_sortInfo.bLoadedFromViewState = !fallback && m_LoadColumnsList && (int)cvs.SortColId != LISTVIEW_SORT_INFO::UNSPECIFIEDCOLUMN;`
`3377`	`3378`	`m_sortInfo.bColumnIsFolderColumn = TRUE;`
`3378`	`3379`	`m_sortInfo.Direction = cvs.SortDir > 0 ? 1 : -1;`
`3379`	`3380`	`m_sortInfo.ListColumn = cvs.SortColId;`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ class CDefaultContextMenu :`
`219`	`219`	`STDMETHOD(GetSite)(REFIID riid, void **ppvSite) override;`
`220`	`220`
`221`	`221`	`// IServiceProvider`
`222`		`- virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID svc, REFIID riid, void**ppv)`
	`222`	`+ STDMETHOD(QueryService)(REFGUID svc, REFIID riid, void**ppv) override`
`223`	`223`	`{`
`224`	`224`	`return IUnknown_QueryService(m_site, svc, riid, ppv);`
`225`	`225`	`}`
Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ const char * shdebugstr_guid( const struct _GUID *id )`
`452`	`452`	`}`
`453`	`453`
`454`	`454`	`return wine_dbg_sprintf( "\n\t{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x} (%s)",`
`455`		`- id->Data1, id->Data2, id->Data3,`
	`455`	`+ (UINT)id->Data1, id->Data2, id->Data3,`
`456`	`456`	`id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3],`
`457`	`457`	`id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7], name ? name : "unknown" );`
`458`	`458`	`}`
Original file line number	Diff line number	Diff line change
`@@ -334,6 +334,7 @@ InitializeDefaultIcons(PFILE_TYPE_GLOBALS pG)`
`334`	`334`	`{`
`335`	`335`	`int idx = ImageList_AddIcon(pG->himlSmall, pG->hDefExtIconSmall);`
`336`	`336`	`ASSERT(idx == 0);`
	`337`	`+ DBG_UNREFERENCED_LOCAL_VARIABLE(idx);`
`337`	`338`	`}`
`338`	`339`	`}`
`339`	`340`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ ViewTree_InsertAll(HWND hwndTreeView)`
`249`	`249`	`static BOOL`
`250`	`250`	`ViewTree_LoadTree(HKEY hKey, LPCWSTR pszKeyName, DWORD dwParentID)`
`251`	`251`	`{`
`252`		`- DWORD dwIndex;`
	`252`	`+ DWORD dwIndex = ~0UL;`
`253`	`253`	`WCHAR szKeyName[64], szText[MAX_PATH], *pch;`
`254`	`254`	`DWORD Size, Value;`
`255`	`255`	`PVIEWTREE_ENTRY pAllocated;`
Original file line number	Diff line number	Diff line change
`@@ -544,7 +544,7 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject,`
`544`	`544`	`bLinking = TRUE;`
`545`	`545`	`}`
`546`	`546`
`547`		`- if (SUCCEEDED(pDataObject->QueryGetData(&fmt)))`
	`547`	`+ if (SUCCEEDED(hr = pDataObject->QueryGetData(&fmt)))`
`548`	`548`	`{`
`549`	`549`	`hr = pDataObject->GetData(&fmt, &medium);`
`550`	`550`	`TRACE("CFSTR_SHELLIDLIST\n");`
`@@ -698,11 +698,11 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject,`
`698`	`698`	`_ILFreeaPidl(apidl, lpcida->cidl);`
`699`	`699`	`ReleaseStgMedium(&medium);`
`700`	`700`	`}`
`701`		`- else if (SUCCEEDED(pDataObject->QueryGetData(&fmt2)))`
	`701`	`+ else if (SUCCEEDED(hr = pDataObject->QueryGetData(&fmt2)))`
`702`	`702`	`{`
`703`	`703`	`FORMATETC fmt2;`
`704`	`704`	`InitFormatEtc (fmt2, CF_HDROP, TYMED_HGLOBAL);`
`705`		`- if (SUCCEEDED(pDataObject->GetData(&fmt2, &medium)) /* && SUCCEEDED(pDataObject->GetData(&fmt2, &medium))*/)`
	`705`	`+ if (SUCCEEDED(hr = pDataObject->GetData(&fmt2, &medium)) /* && SUCCEEDED(pDataObject->GetData(&fmt2, &medium))*/)`
`706`	`706`	`{`
`707`	`707`	`WCHAR wszTargetPath[MAX_PATH + 1];`
`708`	`708`	`LPWSTR pszSrcList;`
Original file line number	Diff line number	Diff line change
`@@ -186,11 +186,13 @@ static inline LPCWSTR GetItemRecycledFullPath(const BBITEMDATA &Data)`
`186`	`186`	`return (LPCWSTR)((BYTE*)&Data + Data.RecycledPathOffset);`
`187`	`187`	`}`
`188`	`188`
	`189`	`+#if 0 // Unused`
`189`	`190`	`static inline LPCWSTR GetItemRecycledFileName(LPCITEMIDLIST pidl, const BBITEMDATA &Data)`
`190`	`191`	`{`
`191`	`192`	`C_ASSERT(BBITEMFILETYPE & PT_FS_UNICODE_FLAG);`
`192`	`193`	`return (LPCWSTR)((LPPIDLDATA)pidl->mkid.abID)->u.file.szNames;`
`193`	`194`	`}`
	`195`	`+#endif`
`194`	`196`
`195`	`197`	`static int GetItemDriveNumber(LPCITEMIDLIST pidl)`
`196`	`198`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ HRESULT STDMETHODCALLTYPE CMenuSite::AddBand(IUnknown * punk)`
`85`	`85`
`86`	`86`	`HRESULT STDMETHODCALLTYPE CMenuSite::EnumBands(UINT uBand, DWORD* pdwBandID)`
`87`	`87`	`{`
`88`		`- if (uBand == -1ul)`
	`88`	`+ if (uBand == UINT(-1))`
`89`	`89`	`return GetBandCount();`
`90`	`90`
`91`	`91`	`if (uBand != 0)`