Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 10:01:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BROWSEUI]

Browse source 
* Implement SHCreateFromDesktop and supporting functions, and move those implementations to their own file.

[SHELL32]
* Handle message 1035 from the desktop window.

[SHLWAPI]
* Fix a bug in SHAllocShared, where source and destination parameters were reversed.

[EXPLORER-NEW]
* Use SHCreateFromDesktop to open the new window.

NOTE: There appears to be some more problems with the SH*Shared implementation, beyond the swapped parameters, which prevent the opening of the new windows. These functions will have to be revised and the corrected implementation sent to WINE.

svn path=/branches/shell-experiments/; revision=64314
This commit is contained in:
David Quintana 2014-09-26 14:47:07 +00:00
parent 1bc1185f8a
commit 1e44d47830
13 changed files with 733 additions and 372 deletions
Download patch file Download diff file Expand all files Collapse all files

2
base/shell/filebrowser/CMakeLists.txt
View file

@ -12,4 +12,4 @@ add_importlibs(filebrowser
msvcrt
kernel32)
add_cd_file(TARGET explorer DESTINATION reactos FOR all)
add_cd_file(TARGET filebrowser DESTINATION reactos FOR all)

111
base/shell/filebrowser/filebrowser.c
View file

@ -23,115 +23,18 @@
#include <windows.h>
#include <shobjidl.h>
#include <shlobj.h>
#include <shlwapi.h>
#include <shlwapi_undoc.h>
#include <stdio.h>
typedef HRESULT (WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14);
int _tmain(int argc, _TCHAR* argv[])
{
WCHAR root[MAX_PATH];
HRESULT hr;
LPSHELLFOLDER pDesktopFolder = NULL;
LPITEMIDLIST pidlRoot = NULL;
typedef HRESULT(WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14);
SH_OPEN_NEW_FRAME SHOpenNewFrame;
EXPLORER_CMDLINE_PARSE_RESULTS parseResults = { 0 };
HMODULE hBrowseui = LoadLibraryW(L"browseui.dll");
if (SHExplorerParseCmdLine(&parseResults))
return SHCreateFromDesktop(&parseResults);
if (!hBrowseui)
return 1;
if (argc < 2)
{
SH_OPEN_NEW_FRAME SHOpenNewFrame = (SH_OPEN_NEW_FRAME) GetProcAddress(hBrowseui, (LPCSTR) 103);
LPITEMIDLIST pidlDrives;
SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlDrives);
SHOpenNewFrame((LPITEMIDLIST) pidlDrives, NULL, 0, 0);
}
else
{
/* A shell is already loaded. Parse the command line arguments
and unless we need to do something specific simply display
the desktop in a separate explorer window */
/* FIXME */
/* Commandline switches:
*
* /n Open a new window, even if an existing one still exists.
* /e Start with the explorer sidebar shown.
* /root,<object> Open a window for the given object path.
* /select,<object> Open a window with the given object selected.
*/
/* FIXME: Do it right */
WCHAR* tmp = wcsstr(argv[1], L"/root,");
if (tmp)
{
WCHAR* tmp2;
tmp += 6; // skip to beginning of path
tmp2 = wcschr(tmp, L',');
if (tmp2)
{
wcsncpy(root, tmp, tmp2 - tmp);
}
else
{
wcscpy(root, tmp);
}
}
else
{
wcscpy(root, argv[1]);
}
if (root[0] == L'"')
{
int len = wcslen(root) - 2;
wcsncpy(root, root + 1, len);
root[len] = 0;
}
if (wcslen(root) > 0)
{
LPITEMIDLIST pidl;
ULONG chEaten;
ULONG dwAttributes;
if (SUCCEEDED(SHGetDesktopFolder(&pDesktopFolder)))
{
hr = pDesktopFolder->lpVtbl->ParseDisplayName(pDesktopFolder,
NULL,
NULL,
root,
&chEaten,
&pidl,
&dwAttributes);
if (SUCCEEDED(hr))
{
pidlRoot = pidl;
}
}
}
if (!pidlRoot)
{
hr = SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlRoot);
if (FAILED(hr))
return 0;
}
SHOpenNewFrame = (SH_OPEN_NEW_FRAME) GetProcAddress(hBrowseui, (LPCSTR) 103);
hr = SHOpenNewFrame(pidlRoot, (IUnknown*) pDesktopFolder, 0, 0);
if (FAILED(hr))
return 0;
}
/* FIXME: we should wait a bit here and see if a window was created. If not we should exit this process. */
Sleep(1000);
ExitThread(0);
return 0;
}