Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 00:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32]

Browse source 
- Formatting. No code changes
- Remove not used shfldr_unixfs.cpp

svn path=/trunk/; revision=54674
This commit is contained in:
Rafal Harabien 2011-12-17 22:53:44 +00:00
parent 7a0ad93bff
commit 60239d4e4c
19 changed files with 1994 additions and 1991 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
reactos/dll/win32/shell32/folders.cpp
View file

@ -215,7 +215,8 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl)
static const WCHAR fmt[] = { 'C', 'L', 'S', 'I', 'D', '\\',
'{', '%', '0', '8', 'l', 'x', '-', '%', '0', '4', 'x', '-', '%', '0', '4', 'x', '-',
'%', '0', '2', 'x', '%', '0', '2', 'x', '-', '%', '0', '2', 'x', '%', '0', '2', 'x',
'%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0 };
'%', '0', '2', 'x', '%', '0', '2', 'x', '%', '0', '2', 'x', '%', '0', '2', 'x', '}', 0
};
WCHAR xriid[50];
swprintf(xriid, fmt,
@ -249,11 +250,21 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl)
{
switch(GetDriveTypeA(sTemp))
{
case DRIVE_REMOVABLE: icon_idx = IDI_SHELL_FLOPPY; break;
case DRIVE_CDROM: icon_idx = IDI_SHELL_CDROM; break;
case DRIVE_REMOTE: icon_idx = IDI_SHELL_NETDRIVE; break;
case DRIVE_RAMDISK: icon_idx = IDI_SHELL_RAMDISK; break;
case DRIVE_NO_ROOT_DIR: icon_idx = IDI_SHELL_CDROM; break;
case DRIVE_REMOVABLE:
icon_idx = IDI_SHELL_FLOPPY;
break;
case DRIVE_CDROM:
icon_idx = IDI_SHELL_CDROM;
break;
case DRIVE_REMOTE:
icon_idx = IDI_SHELL_NETDRIVE;
break;
case DRIVE_RAMDISK:
icon_idx = IDI_SHELL_RAMDISK;
break;
case DRIVE_NO_ROOT_DIR:
icon_idx = IDI_SHELL_CDROM;
break;
}
}

4
reactos/dll/win32/shell32/pidl.h
View file

@ -251,7 +251,9 @@ static BOOL __inline _ILIsEqualSimple (LPCITEMIDLIST pidlA, LPCITEMIDLIST
(!pidlA->mkid.cb && !pidlB->mkid.cb);
}
static
BOOL __inline _ILIsEmpty (LPCITEMIDLIST pidl) { return _ILIsDesktop(pidl); }
BOOL __inline _ILIsEmpty (LPCITEMIDLIST pidl) {
return _ILIsDesktop(pidl);
}
/*
* simple pidls

28
reactos/dll/win32/shell32/regsvr.c
View file

@ -575,7 +575,7 @@ static GUID const CLSID_Shortcut = {
0x00021401, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
static struct regsvr_coclass const coclass_list[] = {
{ &CLSID_Desktop,
/*{ &CLSID_Desktop,
"Desktop",
IDS_DESKTOP,
NULL,
@ -634,7 +634,7 @@ static struct regsvr_coclass const coclass_list[] = {
NULL,
NULL,
IDI_SHELL_MY_NETWORK_PLACES
},
},*/
{ &CLSID_FontsFolderShortcut,
"Fonts",
IDS_FONTS,
@ -648,7 +648,7 @@ static struct regsvr_coclass const coclass_list[] = {
NULL,
IDI_SHELL_FONTS_FOLDER
},
{ &CLSID_AdminFolderShortcut,
/*{ &CLSID_AdminFolderShortcut,
"Administrative Tools",
IDS_ADMINISTRATIVETOOLS,
NULL,
@ -660,8 +660,8 @@ static struct regsvr_coclass const coclass_list[] = {
NULL,
NULL,
IDI_SHELL_ADMINTOOLS //FIXME
},
{ &CLSID_Shortcut,
},*/
/*{ &CLSID_Shortcut,
"Shortcut",
0,
NULL,
@ -737,7 +737,7 @@ static struct regsvr_coclass const coclass_list[] = {
NULL,
"shell32.dll",
"Apartment"
},
},*/
{ NULL } /* list terminator */
};
@ -818,17 +818,17 @@ static struct regsvr_namespace const namespace_extensions_list[] = {
HRESULT WINAPI DoRegisterServer(void)
{
HRESULT hr;
HRESULT hr = S_OK;
TRACE("\n");
hr = register_coclasses(coclass_list);
if (SUCCEEDED(hr))
hr = register_interfaces(interface_list);
if (SUCCEEDED(hr))
hr = SHELL_RegisterShellFolders();
if (SUCCEEDED(hr))
hr = register_namespace_extensions(namespace_extensions_list);
//hr = register_coclasses(coclass_list);
//if (SUCCEEDED(hr))
// hr = register_interfaces(interface_list);
//if (SUCCEEDED(hr))
// hr = SHELL_RegisterShellFolders();
//if (SUCCEEDED(hr))
// hr = register_namespace_extensions(namespace_extensions_list);
return hr;
}

12
reactos/dll/win32/shell32/shfldr_desktop.cpp
View file

@ -91,7 +91,8 @@ static const WCHAR ClassicStartMenuW[] = {'S','O','F','T','W','A','R','E','\\',
'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', '\\', 'W', 'i', 'n', 'd', 'o', 'w', 's', '\\',
'C', 'u', 'r', 'r', 'e', 'n', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\\', 'E', 'x', 'p', 'l', 'o', 'r', 'e', 'r',
'\\', 'H', 'i', 'd', 'e', 'D', 'e', 's', 'k', 't', 'o', 'p', 'I', 'c', 'o', 'n', 's', '\\',
'C','l','a','s','s','i','c','S','t','a','r','t','M','e','n','u','\0' };
'C', 'l', 'a', 's', 's', 'i', 'c', 'S', 't', 'a', 'r', 't', 'M', 'e', 'n', 'u', '\0'
};
INT
IsNamespaceExtensionHidden(WCHAR *iid)
@ -133,7 +134,8 @@ static const WCHAR Desktop_NameSpaceW[] = { 'S','O','F','T','W','A','R','E',
'\\', 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', '\\', 'W', 'i', 'n', 'd', 'o', 'w', 's', '\\',
'C', 'u', 'r', 'r', 'e', 'n', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\\', 'E', 'x', 'p', 'l',
'o', 'r', 'e', 'r', '\\', 'D', 'e', 's', 'k', 't', 'o', 'p', '\\', 'N', 'a', 'm', 'e', 's', 'p',
'a','c','e','\0' };
'a', 'c', 'e', '\0'
};
HRESULT WINAPI CDesktopFolderEnum::Initialize(CDesktopFolder *desktopFolder, HWND hwndOwner, DWORD dwFlags)
{
@ -698,7 +700,8 @@ HRESULT WINAPI CDesktopFolder::GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlag
{ '\\', 's', 'h', 'e', 'l', 'l', 'f', 'o', 'l', 'd', 'e', 'r', 0 };
static const WCHAR wantsForParsingW[] =
{ 'W', 'a', 'n', 't', 's', 'F', 'o', 'r', 'P', 'a', 'r', 's', 'i', 'n',
'g',0 };
'g', 0
};
WCHAR szRegPath[100];
LONG r;
@ -769,7 +772,8 @@ HRESULT WINAPI CDesktopFolder::GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlag
_ILSimpleGetTextW(pidl, pszPath + cLen, MAX_PATH - cLen);
if (!_ILIsFolder(pidl))
SHELL_FS_ProcessDisplayFilename(pszPath, dwFlags);
} }
}
}
}
else
{

12
reactos/dll/win32/shell32/shfldr_fs.cpp
View file

@ -113,7 +113,8 @@ LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path)
{
static WCHAR szfsbc[] = {
'F', 'i', 'l', 'e', ' ', 'S', 'y', 's', 't', 'e', 'm', ' ',
'B','i','n','d',' ','D','a','t','a',0 };
'B', 'i', 'n', 'd', ' ', 'D', 'a', 't', 'a', 0
};
IFileSystemBindData *fsbd = NULL;
LPITEMIDLIST pidl = NULL;
IUnknown *param = NULL;
@ -495,11 +496,14 @@ HRESULT WINAPI CFSFolder::GetUIObjectOf(HWND hwndOwner,
static const WCHAR AdvancedW[] = { 'S', 'O', 'F', 'T', 'W', 'A', 'R', 'E',
'\\', 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', '\\', 'W', 'i', 'n', 'd', 'o', 'w', 's', '\\',
'C', 'u', 'r', 'r', 'e', 'n', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\\', 'E', 'x', 'p', 'l',
'o','r','e','r','\\','A','d','v','a','n','c','e','d',0 };
'o', 'r', 'e', 'r', '\\', 'A', 'd', 'v', 'a', 'n', 'c', 'e', 'd', 0
};
static const WCHAR HideFileExtW[] = { 'H', 'i', 'd', 'e', 'F', 'i', 'l', 'e', 'E', 'x',
't',0 };
't', 0
};
static const WCHAR NeverShowExtW[] = { 'N', 'e', 'v', 'e', 'r', 'S', 'h', 'o', 'w', 'E',
'x','t',0 };
'x', 't', 0
};
/******************************************************************************
* SHELL_FS_HideExtension [Internal]

6
reactos/dll/win32/shell32/shfldr_mycomp.cpp
View file

@ -89,7 +89,8 @@ static const WCHAR MyComputer_NameSpaceW[] = { 'S','O','F','T','W','A','R','E',
'\\', 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', '\\', 'W', 'i', 'n', 'd', 'o', 'w', 's', '\\',
'C', 'u', 'r', 'r', 'e', 'n', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\\', 'E', 'x', 'p', 'l',
'o', 'r', 'e', 'r', '\\', 'M', 'y', 'C', 'o', 'm', 'p', 'u', 't', 'e', 'r', '\\', 'N', 'a', 'm',
'e','s','p','a','c','e','\0' };
'e', 's', 'p', 'a', 'c', 'e', '\0'
};
BOOL CDrivesFolderEnum::CreateMyCompEnumList(DWORD dwFlags)
{
@ -524,7 +525,8 @@ HRESULT WINAPI CDrivesFolder::GetDisplayNameOf (LPCITEMIDLIST pidl, DWORD dwFlag
{ '\\', 's', 'h', 'e', 'l', 'l', 'f', 'o', 'l', 'd', 'e', 'r', 0 };
static const WCHAR wantsForParsingW[] =
{ 'W', 'a', 'n', 't', 's', 'F', 'o', 'r', 'P', 'a', 'r', 's', 'i', 'n',
'g',0 };
'g', 0
};
int bWantsForParsing = FALSE;
WCHAR szRegPath[100];
LONG r;

3
reactos/dll/win32/shell32/shfldr_mydocuments.cpp
View file

@ -464,7 +464,8 @@ HRESULT WINAPI CMyDocsFolder::GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags
{ '\\', 's', 'h', 'e', 'l', 'l', 'f', 'o', 'l', 'd', 'e', 'r', 0 };
static const WCHAR wantsForParsingW[] =
{ 'W', 'a', 'n', 't', 's', 'F', 'o', 'r', 'P', 'a', 'r', 's', 'i', 'n',
'g',0 };
'g', 0
};
WCHAR szRegPath[100];
LONG r;

21
reactos/dll/win32/shell32/shfldr_unixfs.cpp
View file

@ -1,21 +0,0 @@
/*
* UNIXFS - Shell namespace extension for the unix filesystem
*
* Copyright (C) 2005 Michael Jung
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/* Placeholder in ReactOS, we don't need this */