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

[Fabian Maurer (＠DarkShadow44)]

--
  v2: mf/tests: Fix compilation for gcc 4.7
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6707

[PATCH v2 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 v2 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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c
index fa55e04934d..e828f719ffd 100644
--- a/dlls/mf/tests/transform.c
+++ b/dlls/mf/tests/transform.c
@@ -7778,10 +7778,10 @@ static void test_video_processor(BOOL use_2d_buffer)
         {0},
     };
 
-    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 nv12_aligned_extra_width = 192;
+    const MFVideoArea actual_aperture = {.Area={82,84}};
+    const DWORD actual_width = 96, actual_height = 96, nv12_aligned_width = 128;
+    const DWORD extra_width = actual_width + 0x30;
+    const DWORD nv12_aligned_extra_width = 192;
     const struct attribute_desc rgb32_with_aperture[] =
     {
         ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE),
-- 
GitLab

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

[Fabian Maurer (＠DarkShadow44)]

On Mon Oct 21 16:13:10 2024 +0000, Fabian Maurer wrote:
> changed this line in [version 2 of the diff](/wine/wine/-/merge_requests/6707/diffs?diff_id=139178&start_sha=8caab02ebf9641e2cbc4d64d23405eeb6b01582a#edc603511ffb77e62710c687a33e3357cffc13b4_7783_7781)
> Yeah, that works as well - I removed all of them for consistency.

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

[Fabian Maurer (＠DarkShadow44)]

On Mon Oct 21 16:13:10 2024 +0000, Fabian Maurer wrote:
> changed this line in [version 2 of the diff](/wine/wine/-/merge_requests/6707/diffs?diff_id=139178&start_sha=8caab02ebf9641e2cbc4d64d23405eeb6b01582a#edc603511ffb77e62710c687a33e3357cffc13b4_7783_7781)
> No, it's about "initializer element is not constant"

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