[ros-diffs] [reactos] 01/01: [WINETESTS] Fix warnings when compiling comctl32_winetest (#7316)

[Justin Miller]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=770adbc8a3f50de5c0553…

commit 770adbc8a3f50de5c055374ed72e3fb9601de288
Author:     Justin Miller <justin.miller(a)reactos.org>
AuthorDate: Mon Oct 14 14:14:56 2024 -0700
Commit:     GitHub <noreply(a)github.com>
CommitDate: Mon Oct 14 14:14:56 2024 -0700

    [WINETESTS] Fix warnings when compiling comctl32_winetest (#7316)
    
    fix warnings when compiling comctl32_winetest
    the comctl32 winetest just does a few things so properly mark the ros diff.
---
 modules/rostests/winetests/comctl32/CMakeLists.txt | 5 +++++
 modules/rostests/winetests/comctl32/rebar.c        | 4 ++++
 modules/rostests/winetests/comctl32/static.c       | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/modules/rostests/winetests/comctl32/CMakeLists.txt
b/modules/rostests/winetests/comctl32/CMakeLists.txt
index 9fa7c45621d..e2ff22ecdf5 100644
--- a/modules/rostests/winetests/comctl32/CMakeLists.txt
+++ b/modules/rostests/winetests/comctl32/CMakeLists.txt
@@ -47,6 +47,11 @@ if(MSVC AND ARCH STREQUAL "amd64")
     target_compile_options(comctl32_winetest PRIVATE /wd4334)
 endif()
 
+if(MSVC)
+    #  warning C4045: 'large_truncated_80_w': array bounds overflow
+    target_compile_options(comctl32_winetest PRIVATE /wd4045)
+endif()
+
 target_compile_options(comctl32_winetest PRIVATE
$<$<NOT:$<C_COMPILER_ID:MSVC>>:-Wno-format>)
 
 set_module_type(comctl32_winetest win32cui)
diff --git a/modules/rostests/winetests/comctl32/rebar.c
b/modules/rostests/winetests/comctl32/rebar.c
index 6c82295d40b..de8a295189e 100644
--- a/modules/rostests/winetests/comctl32/rebar.c
+++ b/modules/rostests/winetests/comctl32/rebar.c
@@ -18,6 +18,10 @@
  */
 
 /* make sure the structures work with a comctl32 v5.x */
+#ifdef __REACTOS__
+#undef _WIN32_WINNT
+#undef _WIN32_IE
+#endif
 #define _WIN32_WINNT 0x500
 #define _WIN32_IE 0x500
 
diff --git a/modules/rostests/winetests/comctl32/static.c
b/modules/rostests/winetests/comctl32/static.c
index a65e3527282..1cc7e8a01df 100644
--- a/modules/rostests/winetests/comctl32/static.c
+++ b/modules/rostests/winetests/comctl32/static.c
@@ -20,7 +20,9 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#ifndef __REACTOS__
 #define STRICT
+#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include "commctrl.h"