shell32: adjust shell folders to more closely match Windows

[Austin English]

In HKLM\Software\Microsoft\Windows\Explorer\CurrentVersion\Shell
Folders, there is a list of the current shell folders. Wine has a few
directories missing, and the Common Favorites was missing the 'Common'
prefix.

I need this for automated testing, to have a portable way to get those
directories. I'm sure other apps are doing similar things.

-- 
-Austin
-------------- next part --------------
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 44f0750..0f07a85 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -764,6 +764,7 @@ static const WCHAR Common_Administrative_ToolsW[] = {'C','o','m','m','o','n',' '
 static const WCHAR Common_AppDataW[] = {'C','o','m','m','o','n',' ','A','p','p','D','a','t','a','\0'};
 static const WCHAR Common_DesktopW[] = {'C','o','m','m','o','n',' ','D','e','s','k','t','o','p','\0'};
 static const WCHAR Common_DocumentsW[] = {'C','o','m','m','o','n',' ','D','o','c','u','m','e','n','t','s','\0'};
+static const WCHAR Common_FavoritesW[] = {'C','o','m','m','o','n',' ','F','a','v','o','r','i','t','e','s','\0'};
 static const WCHAR CommonFilesDirW[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r','\0'};
 static const WCHAR CommonMusicW[] = {'C','o','m','m','o','n','M','u','s','i','c','\0'};
 static const WCHAR CommonPicturesW[] = {'C','o','m','m','o','n','P','i','c','t','u','r','e','s','\0'};
@@ -981,7 +982,7 @@ static const CSIDL_DATA CSIDL_Data[] =
     },
     { /* 0x1f - CSIDL_COMMON_FAVORITES */
         CSIDL_Type_AllUsers,
-        FavoritesW,
+        Common_FavoritesW,
         MAKEINTRESOURCEW(IDS_FAVORITES)
     },
     { /* 0x20 - CSIDL_INTERNET_CACHE */
@@ -2041,6 +2042,10 @@ static HRESULT _SHRegisterCommonShellFolders(void)
      CSIDL_COMMON_APPDATA,
      CSIDL_COMMON_TEMPLATES,
      CSIDL_COMMON_DOCUMENTS,
+     CSIDL_COMMON_ADMINTOOLS,
+     CSIDL_COMMON_MUSIC,
+     CSIDL_COMMON_PICTURES,
+     CSIDL_COMMON_VIDEO,
     };
     HRESULT hr;