Thomas Faber : gdiplus/tests: Fix build with MSVC.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Nov 27 08:20:48 CST 2015


Module: wine
Branch: master
Commit: 9b82368c3659e360f12b3dd557abaa65d45486ce
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9b82368c3659e360f12b3dd557abaa65d45486ce

Author: Thomas Faber <thomas.faber at reactos.org>
Date:   Thu Nov 26 17:34:49 2015 +0100

gdiplus/tests: Fix build with MSVC.

VC 2010 can't initialize a structure with a structure.

Signed-off-by: Thomas Faber <thomas.faber at reactos.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/gdiplus/tests/image.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index d3e7202..6be4a5b 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -4699,10 +4699,10 @@ static void test_createeffect(void)
     CGpEffect *effect;
     HMODULE mod = GetModuleHandleA("gdiplus.dll");
     int i;
-    const GUID effectlist[] =
-               {BlurEffectGuid, SharpenEffectGuid, ColorMatrixEffectGuid, ColorLUTEffectGuid,
-                BrightnessContrastEffectGuid, HueSaturationLightnessEffectGuid, LevelsEffectGuid,
-                TintEffectGuid, ColorBalanceEffectGuid, RedEyeCorrectionEffectGuid, ColorCurveEffectGuid};
+    const GUID * const effectlist[] =
+               {&BlurEffectGuid, &SharpenEffectGuid, &ColorMatrixEffectGuid, &ColorLUTEffectGuid,
+                &BrightnessContrastEffectGuid, &HueSaturationLightnessEffectGuid, &LevelsEffectGuid,
+                &TintEffectGuid, &ColorBalanceEffectGuid, &RedEyeCorrectionEffectGuid, &ColorCurveEffectGuid};
 
     pGdipCreateEffect = (void*)GetProcAddress( mod, "GdipCreateEffect");
     pGdipDeleteEffect = (void*)GetProcAddress( mod, "GdipDeleteEffect");
@@ -4719,9 +4719,9 @@ static void test_createeffect(void)
     stat = pGdipCreateEffect(noneffect, &effect);
     todo_wine expect(Win32Error, stat);
 
-    for(i=0; i < sizeof(effectlist) / sizeof(GUID); i++)
+    for(i=0; i < sizeof(effectlist) / sizeof(effectlist[0]); i++)
     {
-        stat = pGdipCreateEffect(effectlist[i], &effect);
+        stat = pGdipCreateEffect(*effectlist[i], &effect);
         todo_wine expect(Ok, stat);
         if(stat == Ok)
         {




More information about the wine-cvs mailing list