[PATCH 3/3] glu32: Return GLU_INVALID_ENUM for illegal pixel types.

[Daniel Lehman]

From: Daniel Lehman

---
 dlls/glu32/mipmap.c    | 4 ++--
 dlls/glu32/tests/glu.c | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/glu32/mipmap.c b/dlls/glu32/mipmap.c
index 4a324f45e70..b0854f2fca8 100644
--- a/dlls/glu32/mipmap.c
+++ b/dlls/glu32/mipmap.c
@@ -3448,10 +3448,10 @@ GLint WINAPI gluScaleImage( GLenum format, GLint widthin, GLint heightin, GLenum
    return GLU_INVALID_ENUM;
     }
     if (!isLegalFormatForPackedPixelType(format, typein)) {
-       return GLU_INVALID_OPERATION;
+       return GLU_INVALID_ENUM;
     }
     if (!isLegalFormatForPackedPixelType(format, typeout)) {
-       return GLU_INVALID_OPERATION;
+       return GLU_INVALID_ENUM;
     }
     if (!wglGetCurrentContext()) {
        return GL_OUT_OF_MEMORY; /* windows returns this if no gl context (not glu error) */
diff --git a/dlls/glu32/tests/glu.c b/dlls/glu32/tests/glu.c
index 4e9931141fb..16607a96e51 100644
--- a/dlls/glu32/tests/glu.c
+++ b/dlls/glu32/tests/glu.c
@@ -72,14 +72,12 @@ static void test_gluScaleImage(HDC hdc, HGLRC hglrc)
                         DIMOUT, DIMOUT, ~0, bufout);
     ok(err == GLU_INVALID_ENUM, "got %x\n", err);

-    todo_wine {
     err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE_3_3_2, bufin,
                         DIMOUT, DIMOUT, GL_UNSIGNED_BYTE, bufout);
     ok(err == GLU_INVALID_ENUM, "got %x\n", err);
     err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE, bufin,
                         DIMOUT, DIMOUT, GL_UNSIGNED_BYTE_3_3_2, bufout);
     ok(err == GLU_INVALID_ENUM, "got %x\n", err);
-    }

/* valid arguments */
     memset(bufout, 0, SIZEOUT);