[PATCH 0/2] MR6707: Fix compilation for gcc 4.7

[Fabian Maurer (＠DarkShadow44)]

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

[PATCH 1/2] comdlg32/tests: Fix compilation for gcc 4.7

[Fabian Maurer]

From: Fabian Maurer <dark.shadow4(a)web.de>

---
 dlls/comdlg32/tests/itemdlg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c
index 3048f2a9760..7ab8fa8f148 100644
--- a/dlls/comdlg32/tests/itemdlg.c
+++ b/dlls/comdlg32/tests/itemdlg.c
@@ -1533,7 +1533,7 @@ static void test_filename(void)
     static const WCHAR extdef[] = {'*','.','w','t','e',0};
     static const WCHAR complexext[] = {'*','.','w','t','2',';','*','.','w','t','1',0};
     /* 300 chars, to be longer than MAX_PATH=260 */
-    static const WCHAR *const long_ext = L"*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;";
+    static const WCHAR long_ext[] = L"*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;*.wt2;";
 
     static const COMDLG_FILTERSPEC filterspec[] = {
         { desc1, ext1 }, { desc2, ext2 }, { descdef, extdef }
-- 
GitLab


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

[PATCH 2/2] mf/tests: Fix compilation for gcc 4.7

[Fabian Maurer]

From: Fabian Maurer <dark.shadow4(a)web.de>

---
 dlls/mf/tests/transform.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c
index fa55e04934d..03e085ed9e6 100644
--- a/dlls/mf/tests/transform.c
+++ b/dlls/mf/tests/transform.c
@@ -7780,7 +7780,7 @@ static void test_video_processor(BOOL use_2d_buffer)
 
     static const MFVideoArea actual_aperture = {.Area={82,84}};
     static const DWORD actual_width = 96, actual_height = 96, nv12_aligned_width = 128;
-    static const DWORD extra_width = actual_width + 0x30;
+    static const DWORD extra_width = 96 + 0x30;
     static const DWORD nv12_aligned_extra_width = 192;
     const struct attribute_desc rgb32_with_aperture[] =
     {
-- 
GitLab

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

[Rémi Bernon]

Rémi Bernon (@rbernon) commented about dlls/mf/tests/transform.c:
> static const MFVideoArea actual_aperture = {.Area={82,84}};
>      static const DWORD actual_width = 96, actual_height = 96, nv12_aligned_width = 128;
> -    static const DWORD extra_width = actual_width + 0x30;
> +    static const DWORD extra_width = 96 + 0x30;

Can we remove the statics instead?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6707#note_85595

[Aida Jonikienė]

Aida Jonikienė (@DodoGTA) commented about dlls/mf/tests/transform.c:
> static const MFVideoArea actual_aperture = {.Area={82,84}};
>      static const DWORD actual_width = 96, actual_height = 96, nv12_aligned_width = 128;
> -    static const DWORD extra_width = actual_width + 0x30;
> +    static const DWORD extra_width = 96 + 0x30;

Does the compiler complain about mixing decimal and hex values here? If so then that `0x30` should probably be replaced with its decimal representation

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6707#note_85596