Hans Leidekker : mscms: Accept REG_DWORD values when enumerating registered color profiles.

Alexandre Julliard julliard at winehq.org
Wed Mar 4 09:00:56 CST 2009


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

Author: Hans Leidekker <hans at meelstraat.net>
Date:   Wed Mar  4 12:45:30 2009 +0100

mscms: Accept REG_DWORD values when enumerating registered color profiles.

Fixes test failures on Vista.

---

 dlls/mscms/tests/profile.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c
index e33280a..100c15c 100644
--- a/dlls/mscms/tests/profile.c
+++ b/dlls/mscms/tests/profile.c
@@ -581,9 +581,14 @@ static void check_registry(BOOL *has_space_rgb)
             trace("RegEnumValueA() failed (%d), cannot enumerate profiles\n", res);
             break;
         }
-        ok( dwType == REG_SZ, "RegEnumValueA() returned unexpected value type (%d)\n", dwType );
-        if (dwType != REG_SZ) break;
-        trace(" found '%s' value containing '%s' (%d chars)\n", szName, szData, lstrlenA(szData));
+        ok( dwType == REG_SZ || dwType == REG_DWORD, "RegEnumValueA() returned unexpected value type (%d)\n", dwType );
+
+        if (dwType == REG_SZ)
+            trace(" found string value '%s' containing '%s' (%d chars)\n", szName, szData, lstrlenA(szData));
+        else if (dwType == REG_DWORD)
+            trace(" found DWORD value '%s' containing '%x'\n", szName, *(DWORD *)szData);
+        else
+            break;
     } 
 
     RegCloseKey( hkIcmKey );




More information about the wine-cvs mailing list