Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-21 13:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32] Add desktop.ini more to some folders (#2101)

Browse source 
Provides special icons for special folders by adding desktop.ini. CORE-10045
This commit is contained in:
Katayama Hirofumi MZ 2019-11-29 14:40:04 +09:00 committed by GitHub
parent f7ef99fcc8
commit 2c272a9017
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 71 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/win32/shell32/CSendToMenu.cpp
View file

@ -303,7 +303,7 @@ CSendToMenu::QueryContextMenu(HMENU hMenu,
UINT cItems = InsertSendToItems(hSubMenu, idCmdFirst, 0);
CStringW strSendTo(MAKEINTRESOURCEW(IDS_SENDTO));
CStringW strSendTo(MAKEINTRESOURCEW(IDS_SENDTO_MENU));
MENUITEMINFOW mii = { sizeof(mii) };
mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE | MIIM_SUBMENU;

1
dll/win32/shell32/lang/bg-BG.rc
View file

@ -772,6 +772,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"

3
dll/win32/shell32/lang/ca-ES.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favorites"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Recent"
IDS_SENDTO "Se&nd To"
IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "My Music"
IDS_MYVIDEO "My Videos"

3
dll/win32/shell32/lang/cs-CZ.rc
View file

@ -777,6 +777,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Složku '%1' nebylo možné vytvořit"
IDS_CREATEFOLDER_CAPTION "Složku nebylo možné vytvořit"
@ -823,7 +824,7 @@ BEGIN
IDS_FAVORITES "Oblíbené"
IDS_STARTUP "Nabídka Start\\Programy\\Po spuštění"
IDS_RECENT "Poslední dokumenty"
IDS_SENDTO "Se&nd To"
IDS_SENDTO "SendTo"
IDS_STARTMENU "Nabídka Start"
IDS_MYMUSIC "Hudba"
IDS_MYVIDEO "Filmy"

1
dll/win32/shell32/lang/da-DK.rc
View file

@ -777,6 +777,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"

1
dll/win32/shell32/lang/de-DE.rc
View file

@ -772,6 +772,7 @@ BEGIN
IDS_DISCONNECT "Trennen"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED " Der Ordner kann nicht erstellt werden '%1'"
IDS_CREATEFOLDER_CAPTION " Der Ordner kann nicht erstellt werden."

3
dll/win32/shell32/lang/el-GR.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favorites"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Recent"
IDS_SENDTO "Se&nd To"
IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "My Music"
IDS_MYVIDEO "My Videos"

3
dll/win32/shell32/lang/en-GB.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favorites"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Recent"
IDS_SENDTO "Se&nd To"
IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "My Music"
IDS_MYVIDEO "My Videos"

3
dll/win32/shell32/lang/en-US.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favorites"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Recent"
IDS_SENDTO "Se&nd To"
IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "My Music"
IDS_MYVIDEO "My Videos"

1
dll/win32/shell32/lang/es-ES.rc
View file

@ -779,6 +779,7 @@ BEGIN
IDS_DISCONNECT "Desconectar"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "No se pudo crear la carpeta '%1'"
IDS_CREATEFOLDER_CAPTION "No se pudo crear la carpeta"

3
dll/win32/shell32/lang/et-EE.rc
View file

@ -778,6 +778,7 @@ BEGIN
IDS_DISCONNECT "Katkesta ühendus"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Ei saa luua kausta '%1'"
IDS_CREATEFOLDER_CAPTION "Ei saa kausta luua"
@ -824,7 +825,7 @@ BEGIN
IDS_FAVORITES "Lemmikud"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Hiljutised"
IDS_SENDTO "Se&nd To"
IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menüü"
IDS_MYMUSIC "Minu muusika"
IDS_MYVIDEO "Minu videod"

1
dll/win32/shell32/lang/fi-FI.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"

1
dll/win32/shell32/lang/fr-FR.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Déconnecter"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Impossible de créer le dossier '%1'"
IDS_CREATEFOLDER_CAPTION "Impossible de créer un dossier"

1
dll/win32/shell32/lang/he-IL.rc
View file

@ -773,6 +773,7 @@ BEGIN
IDS_DISCONNECT "נתק"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"

1
dll/win32/shell32/lang/hi-IN.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "डिस्कनेक्ट"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "फ़ोल्डर '%1' बनाने में असमर्थ"
IDS_CREATEFOLDER_CAPTION "फ़ोल्डर बनाने में असमर्थ"

3
dll/win32/shell32/lang/hu-HU.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Kedvencek"
IDS_STARTUP "Start Menu\\Programs\\Automatikus indítás" /* MS style: Indítópult */
IDS_RECENT "Recent"
IDS_SENDTO "Se&nd To"
IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "Zenék"
IDS_MYVIDEO "Videók"

1
dll/win32/shell32/lang/id-ID.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Putuskan"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Tidak bisa membuat folder folder '%1'"
IDS_CREATEFOLDER_CAPTION "Tidak bisa membuat folder"

1
dll/win32/shell32/lang/it-IT.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"

3
dll/win32/shell32/lang/ja-JP.rc
View file

@ -768,6 +768,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "フォルダ '%1' を作成できません"
IDS_CREATEFOLDER_CAPTION "フォルダを作成できません"
@ -814,7 +815,7 @@ BEGIN
IDS_FAVORITES "お気に入り"
IDS_STARTUP "スタート メニュー\\プログラム\\スタートアップ"
IDS_RECENT "最近使ったドキュメント"
IDS_SENDTO "送る(&N)"
IDS_SENDTO "送る"
IDS_STARTMENU "スタート メニュー"
IDS_MYMUSIC "マイ ミュージック"
IDS_MYVIDEO "マイ ビデオ"

3
dll/win32/shell32/lang/ko-KR.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favorites"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Recent"
IDS_SENDTO "Se&nd To"
IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "My Music"
IDS_MYVIDEO "My Videos"

3
dll/win32/shell32/lang/nl-NL.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favorites"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Recent"
IDS_SENDTO "Se&nd To"
IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "My Music"
IDS_MYVIDEO "My Videos"

1
dll/win32/shell32/lang/no-NO.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"

1
dll/win32/shell32/lang/pl-PL.rc
View file

@ -776,6 +776,7 @@ BEGIN
IDS_DISCONNECT "Odłącz"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Nie można utworzyć folderu '%1'"
IDS_CREATEFOLDER_CAPTION "Nie można utworzyć folderu"

1
dll/win32/shell32/lang/pt-BR.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"

1
dll/win32/shell32/lang/pt-PT.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Desligar"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Impossivel de criar pasta '%1'"
IDS_CREATEFOLDER_CAPTION "Impossivel de criar pasta"

1
dll/win32/shell32/lang/ro-RO.rc
View file

@ -773,6 +773,7 @@ BEGIN
IDS_DISCONNECT "Deconectea&ză"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Nu poate fi creat un dosar cu numele „%1”"
IDS_CREATEFOLDER_CAPTION "Nu poate fi creat dosar"

1
dll/win32/shell32/lang/ru-RU.rc
View file

@ -778,6 +778,7 @@ BEGIN
IDS_DISCONNECT "Отсоединить"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Невозможно создать папку '%1'"
IDS_CREATEFOLDER_CAPTION "Невозможно создать папку"

1
dll/win32/shell32/lang/sk-SK.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"

3
dll/win32/shell32/lang/sl-SI.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favorites"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Recent"
IDS_SENDTO "Se&nd To"
IDS_SENDTO "SendTo"
IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "My Music"
IDS_MYVIDEO "My Videos"

1
dll/win32/shell32/lang/sq-AL.rc
View file

@ -775,6 +775,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
IDS_CREATEFOLDER_CAPTION "Unable to create folder"

3
dll/win32/shell32/lang/sv-SE.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Kunde inte skapa mappen '%1'"
IDS_CREATEFOLDER_CAPTION "Kunde inte skapa mapp"
@ -817,7 +818,7 @@ BEGIN
IDS_FAVORITES "Favoriter"
IDS_STARTUP "Start-meny\\Program\\Autostart"
IDS_RECENT "Tidigare"
IDS_SENDTO "Se&nd To"
IDS_SENDTO "SendTo"
IDS_STARTMENU "Start-meny"
IDS_MYMUSIC "Min musik"
IDS_MYVIDEO "Mina videoklipp"

1
dll/win32/shell32/lang/tr-TR.rc
View file

@ -773,6 +773,7 @@ BEGIN
IDS_DISCONNECT "Disconnect"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED """%1"" dizini oluşturulamıyor."
IDS_CREATEFOLDER_CAPTION "Dizin Oluşturulamıyor"

1
dll/win32/shell32/lang/uk-UA.rc
View file

@ -771,6 +771,7 @@ BEGIN
IDS_DISCONNECT "Відключити"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "Не вдалося створити папку '%1'"
IDS_CREATEFOLDER_CAPTION "Не вдалося створити папку"

3
dll/win32/shell32/lang/zh-CN.rc
View file

@ -779,6 +779,7 @@ BEGIN
IDS_DISCONNECT "断开"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "无法创建文件夹 '%1'"
IDS_CREATEFOLDER_CAPTION "无法创建文件夹"
@ -827,7 +828,7 @@ BEGIN
IDS_FAVORITES "收藏夹"
IDS_STARTUP "「开始」菜单\\程序\\启动"
IDS_RECENT "Recent"
IDS_SENDTO "Se&nd To"
IDS_SENDTO "SendTo"
IDS_STARTMENU "「开始」菜单"
IDS_MYMUSIC "我的音乐"
IDS_MYVIDEO "我的视频"

3
dll/win32/shell32/lang/zh-TW.rc
View file

@ -780,6 +780,7 @@ BEGIN
IDS_DISCONNECT "中斷"
IDS_OPENFILELOCATION "Open f&ile location"
IDS_DESKLINK "Desktop (Create shortcut)"
IDS_SENDTO_MENU "Se&nd To"
IDS_CREATEFOLDER_DENIED "無法建立資料夾 '%1'"
IDS_CREATEFOLDER_CAPTION "無法建立資料夾"
@ -828,7 +829,7 @@ BEGIN
IDS_FAVORITES "我的最愛"
IDS_STARTUP "「開始」功能表\\程式\\啟動"
IDS_RECENT "Recent"
IDS_SENDTO "Se&nd To"
IDS_SENDTO "SendTo"
IDS_STARTMENU "「開始」功能表"
IDS_MYMUSIC "我的音樂"
IDS_MYVIDEO "我的影片"

1
dll/win32/shell32/shresdef.h
View file

@ -230,6 +230,7 @@
#define IDS_OPENFILELOCATION 341
#define IDS_DESKLINK 342
#define IDS_SENDTO_MENU 343
#define IDS_MENU_EMPTY 34561

35
dll/win32/shell32/wine/shellpath.c
View file

@ -974,7 +974,8 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_ProgramFilesCommonX86,
CSIDL_Type_CurrVer,
CommonFilesDirX86W,
Program_Files_x86_Common_FilesW
Program_Files_x86_Common_FilesW,
-IDI_SHELL_PROGRAMS_FOLDER
},
{ /* 0x2d - CSIDL_COMMON_TEMPLATES */
&FOLDERID_CommonTemplates,
@ -2366,8 +2367,15 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW(
TRACE("Created missing system directory %s\n", debugstr_w(szBuildPath));
end:
if ((nFolder & CSIDL_FLAG_CREATE) && folder == CSIDL_SENDTO)
{
DoCreateSendToFiles(szBuildPath);
}
/* create desktop.ini for custom icon */
if (CSIDL_Data[folder].nShell32IconIndex)
if ((nFolder & CSIDL_FLAG_CREATE) &&
CSIDL_Data[folder].nShell32IconIndex)
{
static const WCHAR s_szFormat[] = L"%%SystemRoot%%\\system32\\shell32.dll,%d";
WCHAR szIconLocation[MAX_PATH];
@ -2397,12 +2405,6 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW(
SetFileAttributesW(szBuildPath, dwAttributes);
}
end:
if (folder == CSIDL_SENDTO)
{
if (PathIsDirectoryEmptyW(szBuildPath))
DoCreateSendToFiles(szBuildPath);
}
TRACE("returning 0x%08x (final path is %s)\n", hr, debugstr_w(szBuildPath));
return hr;
}
@ -2479,16 +2481,21 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken,
szValueName = &buffer[0];
}
if (RegQueryValueExW(hUserKey, szValueName, NULL,
&dwType, (LPBYTE)path, &dwPathLen) || (dwType != REG_SZ &&
dwType != REG_EXPAND_SZ))
if (!RegQueryValueExW(hUserKey, szValueName, NULL,
&dwType, (LPBYTE)path, &dwPathLen) &&
(dwType == REG_SZ || dwType == REG_EXPAND_SZ))
{
hr = SHGetFolderPathW(NULL, folders[i] | CSIDL_FLAG_CREATE,
hToken, SHGFP_TYPE_CURRENT, path);
}
else
{
*path = '\0';
if (CSIDL_Data[folders[i]].type == CSIDL_Type_User)
_SHGetUserProfilePath(hToken, SHGFP_TYPE_DEFAULT, folders[i],
_SHGetUserProfilePath(hToken, SHGFP_TYPE_CURRENT, folders[i],
path);
else if (CSIDL_Data[folders[i]].type == CSIDL_Type_AllUsers)
_SHGetAllUsersProfilePath(SHGFP_TYPE_DEFAULT, folders[i], path);
_SHGetAllUsersProfilePath(SHGFP_TYPE_CURRENT, folders[i], path);
else if (CSIDL_Data[folders[i]].type == CSIDL_Type_WindowsPath)
{
GetWindowsDirectoryW(path, MAX_PATH);
@ -2510,7 +2517,7 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken,
else
{
hr = SHGetFolderPathW(NULL, folders[i] | CSIDL_FLAG_CREATE,
hToken, SHGFP_TYPE_DEFAULT, path);
hToken, SHGFP_TYPE_CURRENT, path);
ret = RegSetValueExW(hKey, szValueName, 0, REG_SZ,
(LPBYTE)path, (strlenW(path) + 1) * sizeof(WCHAR));
if (ret)