gdi32: Handle NULL filename in GetICMProfileA().

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Andrey Melnikov <temnota.am@gmail.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdi32: Handle NULL filename in GetICMProfileA().
d4d304f4 · Andrey Melnikov · Alexandre Julliard · e5d7d69f · d4d304f4 · d4d304f4
Commit d4d304f4 authored Dec 21, 2015 by Andrey Melnikov Committed by Alexandre Julliard Dec 21, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

icm.c dlls/gdi32/icm.c +8 -1

icm.c dlls/gdi32/tests/icm.c +0 -1

No files found.
--- a/dlls/gdi32/icm.c
+++ b/dlls/gdi32/icm.c
@@ -116,11 +116,18 @@ BOOL WINAPI GetICMProfileA(HDC hdc, LPDWORD size, LPSTR filename)

    TRACE("%p, %p, %p\n", hdc, size, filename);

-    if (!hdc || !size || !filename) return FALSE;
+    if (!hdc || !size) return FALSE;

    if (GetICMProfileW(hdc, &buflen, filenameW))
    {
        int len = WideCharToMultiByte(CP_ACP, 0, filenameW, -1, NULL, 0, NULL, NULL);
+
+        if (!filename)
+        {
+            *size = len;
+            return FALSE;
+        }
+
        if (*size >= len)
        {
            WideCharToMultiByte(CP_ACP, 0, filenameW, -1, filename, *size, NULL, NULL);

--- a/dlls/gdi32/tests/icm.c
+++ b/dlls/gdi32/tests/icm.c
@@ -55,7 +55,6 @@ static void test_GetICMProfileA( HDC dc )
    size = 0;
    ret = GetICMProfileA( dc, &size, NULL );
    ok( !ret, "GetICMProfileA succeeded\n" );
-todo_wine
    ok( size > 0, "got %u\n", size );

    size = MAX_PATH;