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

[Jacek Caban (＠jacek)]

--
  v2: include: Enable format attributes for debug traces in Clang MSVC mode.
      mmdevapi/tests: Use %u format for unsigned int arguments.

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

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

[Jacek Caban]

From: Jacek Caban

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;
                 }

[PATCH v2 2/3] mmdevapi/tests: Use %u format for unsigned int arguments.

[Jacek Caban]

From: Jacek Caban

---
 dlls/mmdevapi/tests/spatialaudio.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/mmdevapi/tests/spatialaudio.c b/dlls/mmdevapi/tests/spatialaudio.c
index 4d8073d49ce..2a7fd041060 100644
--- a/dlls/mmdevapi/tests/spatialaudio.c
+++ b/dlls/mmdevapi/tests/spatialaudio.c
@@ -348,8 +348,8 @@ static void test_audio_object_buffers(void)
         hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length);
         ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08lx\n", hr);
         ok(buffer != NULL, "Expected to get a non-NULL buffer\n");
-        ok(buffer_length == frame_count * format.wBitsPerSample / 8, "Expected buffer length to be sample_size * frame_count = %hu but got %u\n",
-                frame_count * format.wBitsPerSample / 8, buffer_length);
+        ok(buffer_length == frame_count * format.wBitsPerSample / 8, "Expected buffer length to be sample_size * frame_count = %u but got %u\n",
+           frame_count * format.wBitsPerSample / 8, buffer_length);
         ok(is_buffer_zeroed(buffer, buffer_length), "Expected audio object's buffer to be zeroed\n");
     }

@@ -382,7 +382,7 @@ static void test_audio_object_buffers(void)
             ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08lx, i %d\n", hr, i);
             ok(buffer != NULL, "Expected to get a non-NULL buffer\n");
             ok(buffer_length == frame_count * format.wBitsPerSample / 8,
-                    "Expected buffer length to be sample_size * frame_count = %hu but got %u\n",
+                    "Expected buffer length to be sample_size * frame_count = %u but got %u\n",
                     frame_count * format.wBitsPerSample / 8, buffer_length);

/* Enable to hear the test sound. */
@@ -418,7 +418,7 @@ static void test_audio_object_buffers(void)
         hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length);
         ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08lx\n", hr);
         ok(buffer != NULL, "Expected to get a non-NULL buffer\n");
-        ok(buffer_length == frame_count * format.wBitsPerSample / 8, "Expected buffer length to be sample_size * frame_count = %hu but got %u\n",
+        ok(buffer_length == frame_count * format.wBitsPerSample / 8, "Expected buffer length to be sample_size * frame_count = %u but got %u\n",
                 frame_count * format.wBitsPerSample / 8, buffer_length);
         ok(is_buffer_zeroed(buffer, buffer_length), "Expected audio object's buffer to be zeroed\n");
     }

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

[Jacek Caban]

From: Jacek Caban

---
 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)

[Jacek Caban (＠jacek)]

Clang version from CI needs one more fix to mmdevapi tests, newer Clang is less picky about that.