[PATCH v3 0/2] MR4658: gidplus: Add GdipGetEffectParameterSize stub, fix GdipDeleteEffect and update test.

[Bartosz Kosiorek (＠gang65)]

--
  v3: gdiplus/test: Add GdipGetEffectParameterSize test.
      gdiplus: Add GdipGetEffectParameterSize stub and fix GdipDeleteEffect

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

[PATCH v3 1/2] gdiplus: Add GdipGetEffectParameterSize stub and fix GdipDeleteEffect

[Bartosz Kosiorek]

From: Bartosz Kosiorek

---
 dlls/gdiplus/gdiplus.spec |  2 +-
 dlls/gdiplus/image.c      | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index 178592e35d9..0f17bb02d4d 100644
--- a/dlls/gdiplus/gdiplus.spec
+++ b/dlls/gdiplus/gdiplus.spec
@@ -612,7 +612,7 @@
 612 stdcall GdipGetImageItemData(ptr ptr)
 613 stdcall GdipCreateEffect(int128 ptr)
 614 stdcall GdipDeleteEffect(ptr)
-615 stub GdipGetEffectParameterSize
+615 stdcall GdipGetEffectParameterSize(ptr ptr)
 616 stub GdipGetEffectParameters
 617 stdcall GdipSetEffectParameters(ptr ptr long)
 618 stdcall GdipInitializePalette(ptr long long long ptr)
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 806da0cb696..dca27c63f9e 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -5592,11 +5592,26 @@ GpStatus WINGDIPAPI GdipCreateEffect(const GUID guid, CGpEffect **effect)
 GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect *effect)
 {
     FIXME("(%p): stub\n", effect);
+
+    if (!effect)
+        return InvalidParameter;
     /* note: According to Jose Roca's GDI+ Docs, this is not implemented
      * in Windows's gdiplus */
     return NotImplemented;
 }

+/*****************************************************************************
+ * GdipGetEffectParameterSize [GDIPLUS.@]
+ */
+GpStatus WINGDIPAPI GdipGetEffectParameterSize(CGpEffect *effect, UINT *size)
+{
+    FIXME("(%p,%p): stub\n", effect, size);
+
+    if (!effect || !size)
+        return InvalidParameter;
+    return NotImplemented;
+}
+
 /*****************************************************************************
  * GdipSetEffectParameters [GDIPLUS.@]
  */

[PATCH v3 2/2] gdiplus/test: Add GdipGetEffectParameterSize test.

[Bartosz Kosiorek]

From: Bartosz Kosiorek

---
 dlls/gdiplus/tests/image.c | 51 ++++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index 8fc9aa78225..5afc5f2ef27 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -5407,20 +5407,39 @@ static void test_createeffect(void)
     static const GUID noneffect = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } };
     GpStatus (WINAPI *pGdipCreateEffect)( const GUID guid, CGpEffect **effect);
     GpStatus (WINAPI *pGdipDeleteEffect)( CGpEffect *effect);
+    GpStatus (WINAPI *pGdipGetEffectParameterSize)(CGpEffect *effect, UINT *size);
+    GpStatus (WINAPI *pGdipGetEffectParameters)(CGpEffect *effect, const VOID *params, const UINT size);
     GpStatus stat;
     CGpEffect *effect;
     HMODULE mod = GetModuleHandleA("gdiplus.dll");
     int i;
-    const GUID * const effectlist[] =
-               {&BlurEffectGuid, &SharpenEffectGuid, &ColorMatrixEffectGuid, &ColorLUTEffectGuid,
-                &BrightnessContrastEffectGuid, &HueSaturationLightnessEffectGuid, &LevelsEffectGuid,
-                &TintEffectGuid, &ColorBalanceEffectGuid, &RedEyeCorrectionEffectGuid, &ColorCurveEffectGuid};
+    UINT param_size;
+
+    static const struct test_data {
+        const GUID *effect;
+        const UINT parameters_number;
+        const BOOL todo;
+    } td[] =
+    {
+        { &BlurEffectGuid, 8, TRUE },
+        { &BrightnessContrastEffectGuid, 8, TRUE },
+        { &ColorBalanceEffectGuid, 12, TRUE },
+        { &ColorCurveEffectGuid, 12, TRUE },
+        { &ColorLUTEffectGuid, 1024, TRUE },
+        { &ColorMatrixEffectGuid, 100, TRUE },
+        { &HueSaturationLightnessEffectGuid, 12, TRUE },
+        { &LevelsEffectGuid, 12, TRUE },
+        { &SharpenEffectGuid, 8, TRUE },
+        { &TintEffectGuid, 8, TRUE },
+    };

pGdipCreateEffect = (void*)GetProcAddress( mod, "GdipCreateEffect");
     pGdipDeleteEffect = (void*)GetProcAddress( mod, "GdipDeleteEffect");
-    if(!pGdipCreateEffect || !pGdipDeleteEffect)
+    pGdipGetEffectParameterSize = (void*)GetProcAddress( mod, "GdipGetEffectParameterSize");
+    pGdipGetEffectParameters = (void*)GetProcAddress( mod, "GdipGetEffectParameters");
+    if (!pGdipCreateEffect || !pGdipDeleteEffect || !pGdipGetEffectParameterSize || !pGdipGetEffectParameters)
     {
-        /* GdipCreateEffect/GdipDeleteEffect was introduced in Windows Vista. */
+        /* GdipCreateEffect/GdipDeleteEffect/GdipGetEffectParameterSize/GdipGetEffectParameters were introduced in Windows Vista. */
         win_skip("GDIPlus version 1.1 not available\n");
         return;
     }
@@ -5431,16 +5450,28 @@ static void test_createeffect(void)
     stat = pGdipCreateEffect(noneffect, &effect);
     todo_wine expect(Win32Error, stat);

-    for(i=0; i < ARRAY_SIZE(effectlist); i++)
+    param_size = 0;
+    stat = pGdipGetEffectParameterSize(NULL, &param_size);
+    expect(InvalidParameter, stat);
+    expect(0, param_size);
+
+    for (i = 0; i < ARRAY_SIZE(td); i++)
     {
-        stat = pGdipCreateEffect(*effectlist[i], &effect);
-        todo_wine expect(Ok, stat);
-        if(stat == Ok)
+        stat = pGdipCreateEffect(*(td[i].effect), &effect);
+        todo_wine_if(td[i].todo) expect(Ok, stat);
+        if (stat == Ok)
         {
+            stat = pGdipGetEffectParameterSize(effect, &param_size);
+            todo_wine_if(td[i].todo) expect(Ok, stat);
+            todo_wine_if(td[i].todo) expect(td[i].parameters_number, param_size);
+
             stat = pGdipDeleteEffect(effect);
             expect(Ok, stat);
         }
     }
+
+    stat = pGdipDeleteEffect(NULL);
+    expect(InvalidParameter, stat);
 }

static void test_getadjustedpalette(void)

[Bartosz Kosiorek (＠gang65)]

On Sun Dec 10 22:25:56 2023 +0000, Esme Povirk wrote:
> If `GdipCreateEffect` doesn't zero `effect` in case of failure, `effect`
> will be used uninitialized here. This will be a problem when
> `GdipGetEffectParameterSize` is implemented in Wine.

Fixed

[Bartosz Kosiorek (＠gang65)]

On Sun Dec 10 22:36:12 2023 +0000, Esme Povirk wrote:
> There were some failures on testbot: https://testbot.winehq.org/JobDetails.pl?Key=141000#k301

It is failing on Run the 64 bit tests on Windows (32 bit tests are passing).
Do you know how to detect if run is 64 bits?
![image](/uploads/6dfd86c6b19d9728b8d0c137433024f9/image.png)