[PATCH 0/2] MR6939: include: Enable format attributes for debug traces in Clang MSVC mode.

[Jacek Caban (＠jacek)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6939

[PATCH 1/2] imagehlp: Cast AddressOfData to size_t in debug traces.

[Jacek Caban]

From: Jacek Caban <jacek(a)codeweavers.com>

Fixes -Wformat warning on Clang.
---
 dlls/imagehlp/modify.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c
index 3cb5dd800fd..dc2b7e19ddd 100644
--- a/dlls/imagehlp/modify.c
+++ b/dlls/imagehlp/modify.c
@@ -118,7 +118,7 @@ BOOL WINAPI BindImageEx(DWORD flags, const char *module, const char *dll_path,
 
                 if (!(name = ImageRvaToVa(image.FileHeader, image.MappedAddress, thunk->u1.AddressOfData, 0)))
                 {
-                    ERR("Failed to get VA for name RVA %#Ix.\n", thunk->u1.AddressOfData);
+                    ERR("Failed to get VA for name RVA %#Ix.\n", (size_t)thunk->u1.AddressOfData);
                     continue;
                 }
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/6939

[PATCH 2/2] include: Enable format attributes for debug traces in Clang MSVC mode.

[Jacek Caban]

From: Jacek Caban <jacek(a)codeweavers.com>

---
 include/wine/debug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wine/debug.h b/include/wine/debug.h
index 1f1dd945c1e..3e0912de801 100644
--- a/include/wine/debug.h
+++ b/include/wine/debug.h
@@ -90,7 +90,7 @@ struct __wine_debug_channel
 #define __WINE_DBG_LOG(...) \
    wine_dbg_log( __dbcl, __dbch, __func__, __VA_ARGS__); } } while(0)
 
-#if defined(__MINGW32__) || (!defined(__WINE_USE_MSVCRT) && (defined(__GNUC__) || defined(__clang__)))
+#if (defined(__GNUC__) || defined(__clang__)) && (defined(__MINGW32__) || defined (_MSC_VER) || !defined(__WINE_USE_MSVCRT))
 #define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args)))
 #else
 #define __WINE_PRINTF_ATTR(fmt,args)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6939