From dbaf14d4a1cd00db6f1e800c9ba569e35d8f3981 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 31 Jan 2026 12:24:52 +0200 Subject: [PATCH] [SHELL32] Reduce diff to wine (indentation) Fixes GCC 13 warnings about misleading indentation. C:/ReactOS/reactos/dll/win32/shell32/wine/classes.c: In function 'HCR_GetIconA': C:/ReactOS/reactos/dll/win32/shell32/wine/classes.c:357:5: error: this 'else' clause does not guard... [-Werror=misleading-indentation] 357 | else | ^~~~ C:/ReactOS/reactos/dll/win32/shell32/wine/classes.c:360:9: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'else' 360 | return ret; | ^~~~~~ C:/ReactOS/reactos/dll/win32/shell32/wine/shellord.c: In function 'SHCreateStdEnumFmtEtc': C:/ReactOS/reactos/dll/win32/shell32/wine/shellord.c:2455:5: error: this 'if' clause does not guard... [-Werror=misleading-indentation] 2455 | if (FAILED(hRes)) | ^~ In file included from C:/ReactOS/reactos/sdk/include/psdk/objbase.h:252, from C:/ReactOS/reactos/sdk/include/psdk/ole2.h:25, from C:/ReactOS/reactos/sdk/include/psdk/shlobj.h:22, from C:/ReactOS/reactos/dll/win32/shell32/wine/shellord.c:32: C:/ReactOS/build-gcc-x86/sdk/include/psdk/objidl.h:9734:37: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 9734 | #define IEnumFORMATETC_AddRef(This) (This)->lpVtbl->AddRef(This) | ^ C:/ReactOS/reactos/dll/win32/shell32/wine/shellord.c:2458:9: note: in expansion of macro 'IEnumFORMATETC_AddRef' 2458 | IEnumFORMATETC_AddRef(pef); | ^~~~~~~~~~~~~~~~~~~~~ --- dll/win32/shell32/wine/classes.c | 8 ++++---- dll/win32/shell32/wine/shellord.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/shell32/wine/classes.c b/dll/win32/shell32/wine/classes.c index e6f23070c2e..76a95cfdbe4 100644 --- a/dll/win32/shell32/wine/classes.c +++ b/dll/win32/shell32/wine/classes.c @@ -352,10 +352,10 @@ BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPCSTR szName, DWORD len, int* p RegCloseKey(hkey); } - if (ret) - TRACE("-- %s %i\n", szDest, *picon_idx); - else - TRACE("-- not found\n"); + if (ret) + TRACE("-- %s %i\n", szDest, *picon_idx); + else + TRACE("-- not found\n"); return ret; } diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c index 376d96e7b16..820da86e6bb 100644 --- a/dll/win32/shell32/wine/shellord.c +++ b/dll/win32/shell32/wine/shellord.c @@ -2443,7 +2443,7 @@ HRESULT WINAPI CIDLData_CreateFromIDArray( * */ HRESULT WINAPI SHCreateStdEnumFmtEtc( - UINT cFormats, + UINT cFormats, const FORMATETC *lpFormats, LPENUMFORMATETC *ppenumFormatetc) { @@ -2451,9 +2451,9 @@ HRESULT WINAPI SHCreateStdEnumFmtEtc( HRESULT hRes; TRACE("cf=%d fe=%p pef=%p\n", cFormats, lpFormats, ppenumFormatetc); - hRes = IEnumFORMATETC_Constructor(cFormats, lpFormats, &pef); - if (FAILED(hRes)) - return hRes; + hRes = IEnumFORMATETC_Constructor(cFormats, lpFormats, &pef); + if (FAILED(hRes)) + return hRes; IEnumFORMATETC_AddRef(pef); hRes = IEnumFORMATETC_QueryInterface(pef, &IID_IEnumFORMATETC, (LPVOID*)ppenumFormatetc);