[PATCH v6 0/5] MR4661: Draft: gdiplus: Implement Gdiplus effects
Implement effect related functions in Gdiplus. This currently a WIP. -- v6: gdiplus: Add GdipGetEffectParameters implementation. gdiplus: Add GdipSetEffectsParameters implementation. gdiplus: Add GdipGetEffectParameterSize implementation. gdiplus: Add GdipCreateEffect implementation. include: Add gdiplus effect parameter structs. https://gitlab.winehq.org/wine/wine/-/merge_requests/4661
From: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/gdipluscolormatrix.h | 1 + include/gdipluseffects.h | 74 ++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/include/gdipluscolormatrix.h b/include/gdipluscolormatrix.h index 44016ff3451..391095ed8fb 100644 --- a/include/gdipluscolormatrix.h +++ b/include/gdipluscolormatrix.h @@ -62,6 +62,7 @@ enum HistogramFormat #ifndef __cplusplus +typedef BYTE ColorChannelLUT[256]; typedef enum ColorAdjustType ColorAdjustType; typedef enum ColorMatrixFlags ColorMatrixFlags; typedef enum HistogramFormat HistogramFormat; diff --git a/include/gdipluseffects.h b/include/gdipluseffects.h index d2d6a0500da..4100647f7a1 100644 --- a/include/gdipluseffects.h +++ b/include/gdipluseffects.h @@ -31,6 +31,80 @@ DEFINE_GUID(ColorBalanceEffectGuid, 0x537e597d, 0x251e, 0x48da, 0x96, DEFINE_GUID(RedEyeCorrectionEffectGuid, 0x74d29d05, 0x69a4, 0x4266, 0x95, 0x49, 0x3c, 0xc5, 0x28, 0x36, 0xb6, 0x32); DEFINE_GUID(ColorCurveEffectGuid, 0xdd6a0022, 0x58e4, 0x4a67, 0x9d, 0x9b, 0xd4, 0x8e, 0xb8, 0x81, 0xa5, 0x3d); +struct BlurParams { + float radius; + BOOL expandEdge; +}; + +struct SharpenParams { + float radius; + float amount; +}; + +struct TintParams { + INT hue; + INT amount; +}; + +struct RedEyeCorrectionParams { + UINT numberOfAreas; + RECT *areas; +}; + +struct ColorLUTParams { + ColorChannelLUT lutB; + ColorChannelLUT lutG; + ColorChannelLUT lutR; + ColorChannelLUT lutA; +}; + +struct BrightnessContrastParams { + INT brightnessLevel; + INT contrastLevel; +}; + +struct HueSaturationLightnessParams { + INT hueLevel; + INT saturationLevel; + INT lightnessLevel; +}; + +struct ColorBalanceParams { + INT cyanRed; + INT magentaGreen; + INT yellowBlue; +}; + +struct LevelsParams { + INT highlight; + INT midtone; + INT shadow; +}; + +typedef enum CurveAdjustments { + AdjustExposure, + AdjustDensity, + AdjustContrast, + AdjustHighlight, + AdjustShadow, + AdjustMidtone, + AdjustWhiteSaturation, + AdjustBlackSaturation +} CurveAdjustments; + +typedef enum CurveChannel { + CurveChannelAll, + CurveChannelRed, + CurveChannelGreen, + CurveChannelBlue +} CurveChannel; + +struct ColorCurveParams { + CurveAdjustments adjustment; + CurveChannel channel; + INT adjustValue; +}; + #ifdef __cplusplus extern "C" { #endif -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4661
From: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/gdiplus/gdiplus_private.h | 22 ++++++++++ dlls/gdiplus/image.c | 73 ++++++++++++++++++++++++++++++---- dlls/gdiplus/tests/image.c | 4 +- 3 files changed, 89 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 6f7e72124c2..e225203337c 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -368,6 +368,28 @@ struct GpAdjustableArrowCap{ REAL width; }; +typedef enum EffectType { + NoneEffect, + BlurEffect, + SharpenEffect, + TintEffect, + RedEyeCorrectionEffect, + ColorMatrixEffect, + ColorLUTEffect, + BrightnessContrastEffect, + HueSaturationLightnessEffect, + ColorBalanceEffect, + LevelsEffect, + ColorCurveEffect, +} EffectType; + +typedef struct GpEffect{ + INT auxdatasize; + void *auxdata; + BOOL useauxdata; + EffectType type; +} GpEffect; + struct GpImage{ IWICBitmapDecoder *decoder; IWICBitmapEncoder *encoder; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 806da0cb696..56269e13123 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5576,14 +5576,71 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi */ GpStatus WINGDIPAPI GdipCreateEffect(const GUID guid, CGpEffect **effect) { - FIXME("(%s, %p): stub\n", debugstr_guid(&guid), effect); + GpEffect *ef = NULL; + GpStatus status = Ok; - if(!effect) + TRACE("(%s, %p)\n", debugstr_guid(&guid), effect); + + if (!effect) return InvalidParameter; - *effect = NULL; + ef = malloc(sizeof(GpEffect)); + ef->auxdatasize = 0; + ef->auxdata = NULL; + ef->useauxdata = FALSE; - return NotImplemented; + if (IsEqualGUID(&guid, &BlurEffectGuid)) + { + ef->type = BlurEffect; + } + else if (IsEqualGUID(&guid, &SharpenEffectGuid)) + { + ef->type = SharpenEffect; + } + else if (IsEqualGUID(&guid, &TintEffectGuid)) + { + ef->type = TintEffect; + } + else if (IsEqualGUID(&guid, &RedEyeCorrectionEffectGuid)) + { + ef->type = RedEyeCorrectionEffect; + } + else if (IsEqualGUID(&guid, &ColorMatrixEffectGuid)) + { + ef->type = ColorMatrixEffect; + } + else if (IsEqualGUID(&guid, &ColorLUTEffectGuid)) + { + ef->type = ColorLUTEffect; + } + else if (IsEqualGUID(&guid, &BrightnessContrastEffectGuid)) + { + ef->type = BrightnessContrastEffect; + } + else if (IsEqualGUID(&guid, &HueSaturationLightnessEffectGuid)) + { + ef->type = HueSaturationLightnessEffect; + } + else if (IsEqualGUID(&guid, &ColorBalanceEffectGuid)) + { + ef->type = ColorBalanceEffect; + } + else if (IsEqualGUID(&guid, &LevelsEffectGuid)) + { + ef->type = LevelsEffect; + } + else if (IsEqualGUID(&guid, &ColorCurveEffectGuid)) + { + ef->type = ColorCurveEffect; + } + else + { + ef->type = NoneEffect; + status = Win32Error; + } + + *effect = (CGpEffect *)ef; + return status; } /***************************************************************************** @@ -5591,10 +5648,10 @@ GpStatus WINGDIPAPI GdipCreateEffect(const GUID guid, CGpEffect **effect) */ GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect *effect) { - FIXME("(%p): stub\n", effect); - /* note: According to Jose Roca's GDI+ Docs, this is not implemented - * in Windows's gdiplus */ - return NotImplemented; + TRACE("(%p)\n", effect); + + free((GpEffect *)effect); + return Ok; } /***************************************************************************** diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 8fc9aa78225..c4a194c14de 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5429,12 +5429,12 @@ static void test_createeffect(void) expect(InvalidParameter, stat); stat = pGdipCreateEffect(noneffect, &effect); - todo_wine expect(Win32Error, stat); + expect(Win32Error, stat); for(i=0; i < ARRAY_SIZE(effectlist); i++) { stat = pGdipCreateEffect(*effectlist[i], &effect); - todo_wine expect(Ok, stat); + expect(Ok, stat); if(stat == Ok) { stat = pGdipDeleteEffect(effect); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4661
From: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/image.c | 49 ++++++++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 55 ++++++++++++++++++++++++++++++++++ include/gdipluseffects.h | 1 + 5 files changed, 107 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/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e225203337c..c3bdbad8416 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -387,6 +387,7 @@ typedef struct GpEffect{ INT auxdatasize; void *auxdata; BOOL useauxdata; + UINT paramsize; EffectType type; } GpEffect; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 56269e13123..71d175c5935 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5588,50 +5588,62 @@ GpStatus WINGDIPAPI GdipCreateEffect(const GUID guid, CGpEffect **effect) ef->auxdatasize = 0; ef->auxdata = NULL; ef->useauxdata = FALSE; + ef->paramsize = 0; if (IsEqualGUID(&guid, &BlurEffectGuid)) { ef->type = BlurEffect; + ef->paramsize = sizeof(struct BlurParams); } else if (IsEqualGUID(&guid, &SharpenEffectGuid)) { ef->type = SharpenEffect; + ef->paramsize = sizeof(struct SharpenParams); } else if (IsEqualGUID(&guid, &TintEffectGuid)) { ef->type = TintEffect; + ef->paramsize = sizeof(struct TintParams); } else if (IsEqualGUID(&guid, &RedEyeCorrectionEffectGuid)) { ef->type = RedEyeCorrectionEffect; + ef->paramsize = sizeof(struct RedEyeCorrectionParams); } else if (IsEqualGUID(&guid, &ColorMatrixEffectGuid)) { ef->type = ColorMatrixEffect; + ef->paramsize = sizeof(ColorMatrix); } else if (IsEqualGUID(&guid, &ColorLUTEffectGuid)) { ef->type = ColorLUTEffect; + ef->paramsize = sizeof(struct ColorLUTParams); } else if (IsEqualGUID(&guid, &BrightnessContrastEffectGuid)) { ef->type = BrightnessContrastEffect; + ef->paramsize = sizeof(struct BrightnessContrastParams); } else if (IsEqualGUID(&guid, &HueSaturationLightnessEffectGuid)) { ef->type = HueSaturationLightnessEffect; + ef->paramsize = sizeof(struct HueSaturationLightnessParams); } else if (IsEqualGUID(&guid, &ColorBalanceEffectGuid)) { ef->type = ColorBalanceEffect; + ef->paramsize = sizeof(struct ColorBalanceParams); } else if (IsEqualGUID(&guid, &LevelsEffectGuid)) { ef->type = LevelsEffect; + ef->paramsize = sizeof(struct LevelsParams); } else if (IsEqualGUID(&guid, &ColorCurveEffectGuid)) { ef->type = ColorCurveEffect; + ef->paramsize = sizeof(struct ColorCurveParams); } else { @@ -5654,6 +5666,43 @@ GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect *effect) return Ok; } +/***************************************************************************** + * GdipGetEffectParameterSize [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetEffectParameterSize(CGpEffect *effect, UINT *size) +{ + GpEffect *ef; + GpStatus status = InvalidParameter; + + TRACE("(%p %p)\n", effect, size); + + if (!effect || !size) + return status; + + ef = (GpEffect *)effect; + *size = ef->paramsize; + switch (ef->type) + { + case BlurEffect: + case SharpenEffect: + case TintEffect: + case RedEyeCorrectionEffect: + case ColorMatrixEffect: + case ColorLUTEffect: + case BrightnessContrastEffect: + case HueSaturationLightnessEffect: + case ColorBalanceEffect: + case LevelsEffect: + case ColorCurveEffect: + status = Ok; + break; + default: + break; + } + + return status; +} + /***************************************************************************** * GdipSetEffectParameters [GDIPLUS.@] */ diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index c4a194c14de..abf8fd98625 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5407,8 +5407,10 @@ 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 stat; CGpEffect *effect; + UINT size, paramsize = 0; HMODULE mod = GetModuleHandleA("gdiplus.dll"); int i; const GUID * const effectlist[] = @@ -5418,6 +5420,7 @@ static void test_createeffect(void) pGdipCreateEffect = (void*)GetProcAddress( mod, "GdipCreateEffect"); pGdipDeleteEffect = (void*)GetProcAddress( mod, "GdipDeleteEffect"); + pGdipGetEffectParameterSize = (void*)GetProcAddress( mod, "GdipGetEffectParameterSize"); if(!pGdipCreateEffect || !pGdipDeleteEffect) { /* GdipCreateEffect/GdipDeleteEffect was introduced in Windows Vista. */ @@ -5428,15 +5431,67 @@ static void test_createeffect(void) stat = pGdipCreateEffect(BlurEffectGuid, NULL); expect(InvalidParameter, stat); + stat = pGdipGetEffectParameterSize(NULL, NULL); + expect(InvalidParameter, stat); + + stat = pGdipGetEffectParameterSize(effect, NULL); + expect(InvalidParameter, stat); + stat = pGdipCreateEffect(noneffect, &effect); expect(Win32Error, stat); + stat = pGdipGetEffectParameterSize(effect, &size); + expect(InvalidParameter, stat); + expect(0, size); + for(i=0; i < ARRAY_SIZE(effectlist); i++) { stat = pGdipCreateEffect(*effectlist[i], &effect); expect(Ok, stat); + if(stat == Ok) { + size = 0; + stat = pGdipGetEffectParameterSize(effect, &size); + expect(Ok, stat); + switch(i) + { + case 0: + paramsize = sizeof(struct BlurParams); + break; + case 1: + paramsize = sizeof(struct SharpenParams); + break; + case 2: + paramsize = sizeof(ColorMatrix); + break; + case 3: + paramsize = sizeof(struct ColorLUTParams); + break; + case 4: + paramsize = sizeof(struct BrightnessContrastParams); + break; + case 5: + paramsize = sizeof(struct HueSaturationLightnessParams); + break; + case 6: + paramsize = sizeof(struct LevelsParams); + break; + case 7: + paramsize = sizeof(struct TintParams); + break; + case 8: + paramsize = sizeof(struct ColorBalanceParams); + break; + case 9: + paramsize = sizeof(struct RedEyeCorrectionParams); + break; + case 10: + paramsize = sizeof(struct ColorCurveParams); + break; + } + expect(paramsize, size); + stat = pGdipDeleteEffect(effect); expect(Ok, stat); } diff --git a/include/gdipluseffects.h b/include/gdipluseffects.h index 4100647f7a1..a58d25cb0e3 100644 --- a/include/gdipluseffects.h +++ b/include/gdipluseffects.h @@ -111,6 +111,7 @@ extern "C" { GpStatus WINGDIPAPI GdipCreateEffect(const GUID guid, CGpEffect **effect); GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect *effect); +GpStatus WINGDIPAPI GdipGetEffectParameterSize(CGpEffect *effect, UINT *size); #ifdef __cplusplus } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4661
From: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/image.c | 75 +++++++++++++++++++++++++-- dlls/gdiplus/tests/image.c | 95 +++++++++++++++++++++++++++++++++- include/gdipluseffects.h | 1 + 4 files changed, 167 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index c3bdbad8416..328df0dcc80 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -388,6 +388,7 @@ typedef struct GpEffect{ void *auxdata; BOOL useauxdata; UINT paramsize; + void *params; EffectType type; } GpEffect; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 71d175c5935..a686ebf80ae 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5709,14 +5709,81 @@ GpStatus WINGDIPAPI GdipGetEffectParameterSize(CGpEffect *effect, UINT *size) GpStatus WINGDIPAPI GdipSetEffectParameters(CGpEffect *effect, const VOID *params, const UINT size) { - static int calls; + GpEffect *ef; + UINT paramsize = 0; TRACE("(%p,%p,%u)\n", effect, params, size); - if(!(calls++)) - FIXME("not implemented\n"); + if (!effect || !params || !size) + return InvalidParameter; - return NotImplemented; + ef = (GpEffect *)effect; + switch (ef->type) + { + case BlurEffect: + paramsize = sizeof(struct BlurParams); + if (paramsize != size) + return InvalidParameter; + break; + case SharpenEffect: + paramsize = sizeof(struct SharpenParams); + if (paramsize != size) + return InvalidParameter; + break; + case TintEffect: + paramsize = sizeof(struct TintParams); + if (paramsize != size) + return InvalidParameter; + break; + case RedEyeCorrectionEffect: + paramsize = sizeof(struct RedEyeCorrectionParams); + if ((size-paramsize <= 0) || (((size-paramsize)%sizeof(RECT)) != 0)) + return InvalidParameter; + break; + case ColorMatrixEffect: + paramsize = sizeof(ColorMatrix); + if (paramsize != size) + return InvalidParameter; + break; + case ColorLUTEffect: + paramsize = sizeof(struct ColorLUTParams); + if (paramsize != size) + return InvalidParameter; + break; + case BrightnessContrastEffect: + paramsize = sizeof(struct BrightnessContrastParams); + if (paramsize != size) + return InvalidParameter; + break; + case HueSaturationLightnessEffect: + paramsize = sizeof(struct HueSaturationLightnessParams); + if (paramsize != size) + return InvalidParameter; + break; + case ColorBalanceEffect: + paramsize = sizeof(struct ColorBalanceParams); + if (paramsize != size) + return InvalidParameter; + break; + case LevelsEffect: + paramsize = sizeof(struct LevelsParams); + if (paramsize != size) + return InvalidParameter; + break; + case ColorCurveEffect: + paramsize = sizeof(struct ColorCurveParams); + if (paramsize != size) + return InvalidParameter; + break; + default: + return InvalidParameter; + } + + ef->paramsize = size; + ef->params = malloc(size); + memcpy(ef->params, params, size); + + return Ok; } /***************************************************************************** diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index abf8fd98625..5690f6bb27e 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5408,19 +5408,34 @@ static void test_createeffect(void) GpStatus (WINAPI *pGdipCreateEffect)( const GUID guid, CGpEffect **effect); GpStatus (WINAPI *pGdipDeleteEffect)( CGpEffect *effect); GpStatus (WINAPI *pGdipGetEffectParameterSize)( CGpEffect *effect, UINT *size); + GpStatus (WINAPI *pGdipSetEffectParameters)( CGpEffect *effect, const VOID *params, const UINT size); GpStatus stat; CGpEffect *effect; UINT size, paramsize = 0; + void *params = NULL; HMODULE mod = GetModuleHandleA("gdiplus.dll"); - int i; + int i, j, k; const GUID * const effectlist[] = {&BlurEffectGuid, &SharpenEffectGuid, &ColorMatrixEffectGuid, &ColorLUTEffectGuid, &BrightnessContrastEffectGuid, &HueSaturationLightnessEffectGuid, &LevelsEffectGuid, &TintEffectGuid, &ColorBalanceEffectGuid, &RedEyeCorrectionEffectGuid, &ColorCurveEffectGuid}; + struct BlurParams blur; + struct SharpenParams sharpen; + ColorMatrix matrix; + struct ColorLUTParams clut; + struct BrightnessContrastParams bc; + struct HueSaturationLightnessParams hsl; + struct LevelsParams lvl; + struct TintParams tint; + struct ColorBalanceParams cbal; + struct RedEyeCorrectionParams redi; + struct ColorCurveParams ccurve; + RECT rects[2]; pGdipCreateEffect = (void*)GetProcAddress( mod, "GdipCreateEffect"); pGdipDeleteEffect = (void*)GetProcAddress( mod, "GdipDeleteEffect"); pGdipGetEffectParameterSize = (void*)GetProcAddress( mod, "GdipGetEffectParameterSize"); + pGdipSetEffectParameters = (void*)GetProcAddress( mod, "GdipSetEffectParameters"); if(!pGdipCreateEffect || !pGdipDeleteEffect) { /* GdipCreateEffect/GdipDeleteEffect was introduced in Windows Vista. */ @@ -5434,15 +5449,27 @@ static void test_createeffect(void) stat = pGdipGetEffectParameterSize(NULL, NULL); expect(InvalidParameter, stat); + stat = pGdipSetEffectParameters(NULL, NULL, 0); + expect(InvalidParameter, stat); + stat = pGdipGetEffectParameterSize(effect, NULL); expect(InvalidParameter, stat); + stat = pGdipSetEffectParameters(effect, params, 0); + expect(InvalidParameter, stat); + stat = pGdipCreateEffect(noneffect, &effect); expect(Win32Error, stat); stat = pGdipGetEffectParameterSize(effect, &size); expect(InvalidParameter, stat); expect(0, size); + stat = pGdipSetEffectParameters(effect, (void *)0xdeadbeef, 0); + expect(InvalidParameter, stat); + stat = pGdipSetEffectParameters(effect, (void *)0xdeadbeef, 8); + expect(InvalidParameter, stat); + stat = pGdipSetEffectParameters(effect, (void *)0xdeadbeef, 5); + expect(InvalidParameter, stat); for(i=0; i < ARRAY_SIZE(effectlist); i++) { @@ -5458,38 +5485,104 @@ static void test_createeffect(void) { case 0: paramsize = sizeof(struct BlurParams); + expect(paramsize, size); + blur.radius = 2.0; + blur.expandEdge = TRUE; + stat = pGdipSetEffectParameters(effect, (void *)&blur, 5); + expect(InvalidParameter, stat); + stat = pGdipSetEffectParameters(effect, (void *)&blur, paramsize); break; case 1: paramsize = sizeof(struct SharpenParams); + expect(paramsize, size); + sharpen.radius = 5.0; + sharpen.amount = 2; + stat = pGdipSetEffectParameters(effect, (void *)&sharpen, paramsize); break; case 2: paramsize = sizeof(ColorMatrix); + expect(paramsize, size); + for (j = 0; j < 5; j++) { + for (k = 0; k < 5; k++) { + matrix.m[j][k] = (float) j+1; + } + } + stat = pGdipSetEffectParameters(effect, (void *)&matrix, paramsize); break; case 3: paramsize = sizeof(struct ColorLUTParams); + expect(paramsize, size); + for (j = 0; j < sizeof(ColorChannelLUT); j++) + { + clut.lutB[j] = j%8; + clut.lutG[j] = j%16; + clut.lutR[j] = j%4; + clut.lutA[j] = 0; + } + stat = pGdipSetEffectParameters(effect, (void *)&clut, paramsize); break; case 4: paramsize = sizeof(struct BrightnessContrastParams); + expect(paramsize, size); + bc.brightnessLevel = 75; + bc.contrastLevel = 50; + stat = pGdipSetEffectParameters(effect, (void *)&bc, paramsize); break; case 5: paramsize = sizeof(struct HueSaturationLightnessParams); + expect(paramsize, size); + hsl.hueLevel = 50; + hsl.saturationLevel = 50; + hsl.lightnessLevel = 50; + stat = pGdipSetEffectParameters(effect, (void *)&hsl, paramsize); break; case 6: paramsize = sizeof(struct LevelsParams); + expect(paramsize, size); + lvl.highlight = 50; + lvl.midtone = 50; + lvl.shadow = 5; + stat = pGdipSetEffectParameters(effect, (void *)&lvl, paramsize); break; case 7: paramsize = sizeof(struct TintParams); + expect(paramsize, size); + tint.hue = 20; + tint.amount = 5; + stat = pGdipSetEffectParameters(effect, (void *)&tint, paramsize); break; case 8: paramsize = sizeof(struct ColorBalanceParams); + expect(paramsize, size); + cbal.cyanRed = 50; + cbal.magentaGreen = 50; + cbal.yellowBlue = 50; + stat = pGdipSetEffectParameters(effect, (void *)&cbal, paramsize); break; case 9: paramsize = sizeof(struct RedEyeCorrectionParams); + expect(paramsize, size); + SetRect(&rects[0], 0, 0, 75, 75); + SetRect(&rects[1], -32, -32, 32, 32); + redi.numberOfAreas = 2; + redi.areas = rects; + stat = pGdipSetEffectParameters(effect, (void *)&redi, paramsize); + expect(InvalidParameter, stat); + paramsize = paramsize + (2*sizeof(RECT)); + stat = pGdipSetEffectParameters(effect, (void *)&redi, paramsize); break; case 10: paramsize = sizeof(struct ColorCurveParams); + expect(paramsize, size); + ccurve.adjustment = AdjustExposure; + ccurve.channel = CurveChannelAll; + ccurve.adjustValue = 5; + stat = pGdipSetEffectParameters(effect, (void *)&ccurve, paramsize); break; } + expect(Ok, stat); + size = 0; + stat = pGdipGetEffectParameterSize(effect, &size); expect(paramsize, size); stat = pGdipDeleteEffect(effect); diff --git a/include/gdipluseffects.h b/include/gdipluseffects.h index a58d25cb0e3..2b94479f7f5 100644 --- a/include/gdipluseffects.h +++ b/include/gdipluseffects.h @@ -112,6 +112,7 @@ extern "C" { GpStatus WINGDIPAPI GdipCreateEffect(const GUID guid, CGpEffect **effect); GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect *effect); GpStatus WINGDIPAPI GdipGetEffectParameterSize(CGpEffect *effect, UINT *size); +GpStatus WINGDIPAPI GdipSetEffectParameters(CGpEffect *effect, const VOID *params, const UINT size); #ifdef __cplusplus } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4661
From: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 18 ++++++++++++++++++ dlls/gdiplus/tests/image.c | 17 +++++++++++++++++ include/gdipluseffects.h | 1 + 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 0f17bb02d4d..ff654558b72 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -613,7 +613,7 @@ 613 stdcall GdipCreateEffect(int128 ptr) 614 stdcall GdipDeleteEffect(ptr) 615 stdcall GdipGetEffectParameterSize(ptr ptr) -616 stub GdipGetEffectParameters +616 stdcall GdipGetEffectParameters(ptr ptr ptr) 617 stdcall GdipSetEffectParameters(ptr ptr long) 618 stdcall GdipInitializePalette(ptr long long long ptr) 619 stdcall GdipBitmapCreateApplyEffect(ptr long ptr ptr ptr ptr long ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a686ebf80ae..0eea5b43cc9 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5703,6 +5703,24 @@ GpStatus WINGDIPAPI GdipGetEffectParameterSize(CGpEffect *effect, UINT *size) return status; } +/***************************************************************************** + * GdipGetEffectParameters [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetEffectParameters(CGpEffect *effect, + UINT *size, VOID *params) +{ + GpEffect *ef; + + TRACE("(%p,%p,%p)\n", effect, size, params); + if (!effect || !params || !size) + return InvalidParameter; + + ef = (GpEffect *)effect; + *size = ef->paramsize; + params = ef->params; + return Ok; +} + /***************************************************************************** * GdipSetEffectParameters [GDIPLUS.@] */ diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 5690f6bb27e..d5788499d94 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5408,6 +5408,7 @@ static void test_createeffect(void) 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, UINT *size, VOID *params); GpStatus (WINAPI *pGdipSetEffectParameters)( CGpEffect *effect, const VOID *params, const UINT size); GpStatus stat; CGpEffect *effect; @@ -5435,6 +5436,7 @@ static void test_createeffect(void) pGdipCreateEffect = (void*)GetProcAddress( mod, "GdipCreateEffect"); pGdipDeleteEffect = (void*)GetProcAddress( mod, "GdipDeleteEffect"); pGdipGetEffectParameterSize = (void*)GetProcAddress( mod, "GdipGetEffectParameterSize"); + pGdipGetEffectParameters = (void*)GetProcAddress( mod, "GdipGetEffectParameters"); pGdipSetEffectParameters = (void*)GetProcAddress( mod, "GdipSetEffectParameters"); if(!pGdipCreateEffect || !pGdipDeleteEffect) { @@ -5452,12 +5454,21 @@ static void test_createeffect(void) stat = pGdipSetEffectParameters(NULL, NULL, 0); expect(InvalidParameter, stat); + stat = pGdipGetEffectParameters(NULL, NULL, NULL); + expect(InvalidParameter, stat); + stat = pGdipGetEffectParameterSize(effect, NULL); expect(InvalidParameter, stat); stat = pGdipSetEffectParameters(effect, params, 0); expect(InvalidParameter, stat); + stat = pGdipGetEffectParameters(effect, &size, NULL); + expect(InvalidParameter, stat); + + stat = pGdipGetEffectParameters(effect, &size, params); + expect(InvalidParameter, stat); + stat = pGdipCreateEffect(noneffect, &effect); expect(Win32Error, stat); @@ -5584,6 +5595,12 @@ static void test_createeffect(void) size = 0; stat = pGdipGetEffectParameterSize(effect, &size); expect(paramsize, size); + size = 0; + params = malloc(paramsize); + stat = pGdipGetEffectParameters(effect, &size, params); + expect(Ok, stat); + expect(paramsize, size); + free(params); stat = pGdipDeleteEffect(effect); expect(Ok, stat); diff --git a/include/gdipluseffects.h b/include/gdipluseffects.h index 2b94479f7f5..17a07726f33 100644 --- a/include/gdipluseffects.h +++ b/include/gdipluseffects.h @@ -112,6 +112,7 @@ extern "C" { GpStatus WINGDIPAPI GdipCreateEffect(const GUID guid, CGpEffect **effect); GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect *effect); GpStatus WINGDIPAPI GdipGetEffectParameterSize(CGpEffect *effect, UINT *size); +GpStatus WINGDIPAPI GdipGetEffectParameters(CGpEffect *effect, UINT *size, VOID *params); GpStatus WINGDIPAPI GdipSetEffectParameters(CGpEffect *effect, const VOID *params, const UINT size); #ifdef __cplusplus -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4661
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=141052 Your paranoid android. === w7u_2qxl (32 bit report) === gdiplus: image.c:5477: Test failed: Expected 0, got 1935874632 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 40, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w7u_adm (32 bit report) === gdiplus: image.c:5477: Test failed: Expected 0, got 1948719688 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 40, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w7u_el (32 bit report) === gdiplus: image.c:5477: Test failed: Expected 0, got 1942690376 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 40, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w8 (32 bit report) === gdiplus: image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 40, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w8adm (32 bit report) === gdiplus: image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 40, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w864 (32 bit report) === gdiplus: image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 40, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w1064v1507 (32 bit report) === gdiplus: image.c:5477: Test failed: Expected 0, got 46772224 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 40, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w1064v1809 (32 bit report) === gdiplus: image.c:5477: Test failed: Expected 0, got 2952 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 40, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w1064_tsign (32 bit report) === gdiplus: image.c:5477: Test failed: Expected 0, got -1184154454 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 40, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w10pro64 (32 bit report) === gdiplus: image.c:5477: Test failed: Expected 0, got -1184154454 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 40, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w10pro64_en_AE_u8 (32 bit report) === gdiplus: image.c:5477: Test failed: Expected 0, got -1184154454 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 40, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w11pro64 (32 bit report) === gdiplus: image.c:5477: Test failed: Expected 0, got 2 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 40, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w7pro64 (64 bit report) === gdiplus: image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 48, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w864 (64 bit report) === gdiplus: image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 48, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w1064v1507 (64 bit report) === gdiplus: image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 48, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w1064v1809 (64 bit report) === gdiplus: image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 48, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w1064_2qxl (64 bit report) === gdiplus: image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 48, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w1064_adm (64 bit report) === gdiplus: image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 48, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w1064_tsign (64 bit report) === gdiplus: image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 48, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w10pro64 (64 bit report) === gdiplus: image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 48, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w10pro64_ar (64 bit report) === gdiplus: image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 48, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w10pro64_ja (64 bit report) === gdiplus: image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 48, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w10pro64_zh_CN (64 bit report) === gdiplus: image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 48, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 === w11pro64_amd (64 bit report) === gdiplus: image.c:5477: Test failed: Expected 0, got 1 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 100, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 1024, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 8, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 48, got 0 image.c:5601: Test failed: Expected 0, got 2 image.c:5602: Test failed: Expected 12, got 0
Esme Povirk (@madewokherd) commented about dlls/gdiplus/gdiplus_private.h:
+ RedEyeCorrectionEffect, + ColorMatrixEffect, + ColorLUTEffect, + BrightnessContrastEffect, + HueSaturationLightnessEffect, + ColorBalanceEffect, + LevelsEffect, + ColorCurveEffect, +} EffectType; + +typedef struct GpEffect{ + INT auxdatasize; + void *auxdata; + BOOL useauxdata; + EffectType type; +} GpEffect; The useauxdata field seems redundant. We could use size == 0 or data == NULL.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/4661#note_55726
Esme Povirk (@madewokherd) commented about dlls/gdiplus/image.c:
+ } + else if (IsEqualGUID(&guid, &LevelsEffectGuid)) + { + ef->type = LevelsEffect; + } + else if (IsEqualGUID(&guid, &ColorCurveEffectGuid)) + { + ef->type = ColorCurveEffect; + } + else + { + ef->type = NoneEffect; + status = Win32Error; + } + + *effect = (CGpEffect *)ef; Why not just define `struct CGpEffect` with our private structure as we do with other types?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/4661#note_55727
Esme Povirk (@madewokherd) commented about dlls/gdiplus/image.c:
+ else if (IsEqualGUID(&guid, &ColorBalanceEffectGuid)) + { + ef->type = ColorBalanceEffect; + } + else if (IsEqualGUID(&guid, &LevelsEffectGuid)) + { + ef->type = LevelsEffect; + } + else if (IsEqualGUID(&guid, &ColorCurveEffectGuid)) + { + ef->type = ColorCurveEffect; + } + else + { + ef->type = NoneEffect; + status = Win32Error; An object shouldn't be returned in case of error.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/4661#note_55728
On Mon Dec 11 18:18:08 2023 +0000, Esme Povirk wrote:
An object shouldn't be returned in case of error. Or, if native really does this, check for it in the tests.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/4661#note_55729
Esme Povirk (@madewokherd) commented about dlls/gdiplus/gdiplus_private.h:
INT auxdatasize; void *auxdata; BOOL useauxdata; + UINT paramsize;
I don't think it makes sense to store this, since it's a function of the type. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4661#note_55730
Esme Povirk (@madewokherd) commented about dlls/gdiplus/tests/image.c:
{ case 0: paramsize = sizeof(struct BlurParams); + expect(paramsize, size); + blur.radius = 2.0; + blur.expandEdge = TRUE; + stat = pGdipSetEffectParameters(effect, (void *)&blur, 5); + expect(InvalidParameter, stat); + stat = pGdipSetEffectParameters(effect, (void *)&blur, paramsize);
A declarative approach would probably make more sense here: declare a struct with the value you want and put that in the test_data structure. Then you also have an easy way to test that reading the data gives you the same result. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4661#note_55731
Esme Povirk (@madewokherd) commented about dlls/gdiplus/gdiplus_private.h:
void *auxdata; BOOL useauxdata; UINT paramsize; + void *params;
I'd suggest a union here so we have some type safety. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4661#note_55732
Esme Povirk (@madewokherd) commented about dlls/gdiplus/image.c:
TRACE("(%p,%p,%u)\n", effect, params, size);
- if(!(calls++)) - FIXME("not implemented\n"); + if (!effect || !params || !size) + return InvalidParameter;
- return NotImplemented; + ef = (GpEffect *)effect; + switch (ef->type) + { + case BlurEffect: + paramsize = sizeof(struct BlurParams); + if (paramsize != size) + return InvalidParameter; + break;
The mapping of type to paramsize shouldn't be duplicated here. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4661#note_55733
Esme Povirk (@madewokherd) commented about dlls/gdiplus/image.c:
+/***************************************************************************** + * GdipGetEffectParameters [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetEffectParameters(CGpEffect *effect, + UINT *size, VOID *params) +{ + GpEffect *ef; + + TRACE("(%p,%p,%p)\n", effect, size, params); + if (!effect || !params || !size) + return InvalidParameter; + + ef = (GpEffect *)effect; + *size = ef->paramsize; + params = ef->params;
This just changes the pointer stored locally in the function's `params` variable, which isn't used afterwards, so it doesn't actually do anything. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4661#note_55734
On Mon Dec 11 18:10:35 2023 +0000, Esme Povirk wrote:
The useauxdata field seems redundant. We could use size == 0 or data == NULL. I thought useauxdata might be useful as it was in the original class definition of Effect, but it actually is not needed for now. May be needed when implementing GdipBitmapApplyEffect. I will remove it.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/4661#note_55741
On Mon Dec 11 18:16:29 2023 +0000, Esme Povirk wrote:
Why not just define `struct CGpEffect` with our private structure as we do with other types? Agreed, this might reduce the pointer conversions.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/4661#note_55742
On Mon Dec 11 18:27:33 2023 +0000, Esme Povirk wrote:
Or, if native really does this, check for it in the tests. I will add a test and check it.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/4661#note_55743
On Mon Dec 11 18:29:00 2023 +0000, Esme Povirk wrote:
I don't think it makes sense to store this, since it's a function of the type. If we make params a union inside the structure, we might not need it. Will work on it.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/4661#note_55744
participants (4)
-
Esme Povirk (＠madewokherd) -
Marvin -
Vijay Kiran Kamuju
-
Vijay Kiran Kamuju (＠infyquest)