[zguo] 65656: [DESK.CPL] Check for the correct registry value for the wallpaper. Patch by Ricardo Hanke. CORE-8796

Author: zguo
Date: Sun Dec 14 22:38:45 2014
New Revision: 65656

URL: http://svn.reactos.org/svn/reactos?rev=65656&view=rev
Log:
[DESK.CPL]
Check for the correct registry value for the wallpaper. Patch by Ricardo Hanke.
CORE-8796

Modified:
    trunk/reactos/dll/cpl/desk/background.c

Modified: trunk/reactos/dll/cpl/desk/background.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?r...
==============================================================================
--- trunk/reactos/dll/cpl/desk/background.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/background.c	[iso-8859-1] Sun Dec 14 22:38:45 2014
@@ -78,6 +78,7 @@
     SHFILEINFO sfi;
     HIMAGELIST himl;
     TCHAR wallpaperFilename[MAX_PATH];
+    TCHAR originalWallpaper[MAX_PATH];
     DWORD bufferSize = sizeof(wallpaperFilename);
     TCHAR buffer[MAX_PATH];
     DWORD varType = REG_SZ;
@@ -132,6 +133,27 @@
         result = RegQueryValueEx(regKey, TEXT("Wallpaper"), 0, &varType, (LPBYTE)wallpaperFilename, &bufferSize);
         if ((result == ERROR_SUCCESS) && (_tcslen(wallpaperFilename) > 0))
         {
+            bufferSize = sizeof(originalWallpaper);
+            result = RegQueryValueEx(regKey, TEXT("OriginalWallpaper"), 0, &varType, (LPBYTE)originalWallpaper, &bufferSize);
+
+            /* If Wallpaper and OriginalWallpaper are the same, try to retrieve ConvertedWallpaper and use it instead of Wallpaper */
+            if ((result == ERROR_SUCCESS) && (_tcslen(originalWallpaper) > 0) && (_tcsicmp(wallpaperFilename, originalWallpaper) == 0))
+            {
+                bufferSize = sizeof(originalWallpaper);
+                result = RegQueryValueEx(regKey, TEXT("ConvertedWallpaper"), 0, &varType, (LPBYTE)originalWallpaper, &bufferSize);
+
+                if ((result == ERROR_SUCCESS) && (_tcslen(originalWallpaper) > 0))
+                {
+                    hr = StringCbCopy(wallpaperFilename, sizeof(wallpaperFilename), originalWallpaper);
+                }
+
+                if (FAILED(hr))
+                {
+                    RegCloseKey(regKey);
+                    return;
+                }
+            }
+
             /* Allow environment variables in file name */
             if (ExpandEnvironmentStrings(wallpaperFilename, buffer, MAX_PATH))
             {