Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 65205: [DISK] Add a hack to forcibly set sector size in case of weird input. This is noisy on purpose. Also, be more informative in case of read rejection. Are we reading beyond parti...
by pschweitzer＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: pschweitzer Date: Sun Nov 2 23:11:22 2014 New Revision: 65205 URL: http://svn.reactos.org/svn/reactos?rev=65205&view=rev Log: [DISK] Add a hack to forcibly set sector size in case of weird input. This is noisy on purpose. Also, be more informative in case of read rejection. Are we reading beyond partition or do we have invalid sector size? With the hack, the invalid sector size should disappear. This is to help debugging the recent errors with the removal of IopParseDevice() hack Modified: trunk/reactos/drivers/storage/class/disk/disk.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Sun Nov 2 23:11:22 2014 @@ -1515,6 +1515,15 @@ LARGE_INTEGER startingOffset; // + // HACK: How can we end here with null sector size?! + // + + if (deviceExtension->DiskGeometry->Geometry.BytesPerSector == 0) { + DPRINT1("Hack! Received invalid sector size\n"); + deviceExtension->DiskGeometry->Geometry.BytesPerSector = 512; + } + + // // Verify parameters of this request. // Check that ending sector is within partition and // that number of bytes to transfer is a multiple of @@ -1550,7 +1559,18 @@ Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; } - DPRINT1("STATUS_INVALID_PARAMETER\n"); + if (startingOffset.QuadPart > deviceExtension->PartitionLength.QuadPart) { + DPRINT1("Reading beyond partition end! startingOffset: %I64d, PartitionLength: %I64d\n", startingOffset.QuadPart, deviceExtension->PartitionLength.QuadPart); + } + + if (transferByteCount & (deviceExtension->DiskGeometry->Geometry.BytesPerSector - 1)) { + DPRINT1("Not reading sectors! TransferByteCount: %lu, BytesPerSector: %lu\n", transferByteCount, deviceExtension->DiskGeometry->Geometry.BytesPerSector); + } + + if (Irp->IoStatus.Status == STATUS_DEVICE_NOT_READY) { + DPRINT1("Failing due to device not ready!\n"); + } + return STATUS_INVALID_PARAMETER; }

1 0

[hpoussin] 65204: [NTFS] Implement IRP_MJ_QUERY_INFORMATION/FileNetworkOpenInformation: We are now able to execute some binaries on a NTFS partition.
by hpoussin＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: hpoussin Date: Sun Nov 2 22:56:53 2014 New Revision: 65204 URL: http://svn.reactos.org/svn/reactos?rev=65204&view=rev Log: [NTFS] Implement IRP_MJ_QUERY_INFORMATION/FileNetworkOpenInformation: We are now able to execute some binaries on a NTFS partition. Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Sun Nov 2 22:56:53 2014 @@ -204,6 +204,31 @@ return STATUS_SUCCESS; } +static +NTSTATUS +NtfsGetNetworkOpenInformation(PNTFS_FCB Fcb, + PDEVICE_EXTENSION DeviceExt, + PFILE_NETWORK_OPEN_INFORMATION NetworkInfo, + PULONG BufferLength) +{ + PFILENAME_ATTRIBUTE FileName = &Fcb->Entry; + + if (*BufferLength < sizeof(FILE_NETWORK_OPEN_INFORMATION)) + return(STATUS_BUFFER_OVERFLOW); + + NetworkInfo->CreationTime.QuadPart = FileName->CreationTime; + NetworkInfo->LastAccessTime.QuadPart = FileName->LastAccessTime; + NetworkInfo->LastWriteTime.QuadPart = FileName->LastWriteTime; + NetworkInfo->ChangeTime.QuadPart = FileName->ChangeTime; + + NetworkInfo->EndOfFile.QuadPart = FileName->AllocatedSize; + NetworkInfo->AllocationSize.QuadPart = ROUND_UP(FileName->AllocatedSize, DeviceExt->NtfsInfo.BytesPerCluster); + + NtfsFileFlagsToAttributes(FileName->FileAttributes, &NetworkInfo->FileAttributes); + + *BufferLength -= sizeof(FILE_NETWORK_OPEN_INFORMATION); + return STATUS_SUCCESS; +} /* * FUNCTION: Retrieve the specified file information @@ -268,6 +293,13 @@ &BufferLength); break; + case FileNetworkOpenInformation: + Status = NtfsGetNetworkOpenInformation(Fcb, + DeviceObject->DeviceExtension, + SystemBuffer, + &BufferLength); + break; + case FileAlternateNameInformation: case FileAllInformation: Status = STATUS_NOT_IMPLEMENTED;

1 0

[hpoussin] 65203: [NTFS] Fix IRP_MJ_QUERY_INFORMATION/FileNameInformation, which should handle buffers not big enough
by hpoussin＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: hpoussin Date: Sun Nov 2 22:56:47 2014 New Revision: 65203 URL: http://svn.reactos.org/svn/reactos?rev=65203&view=rev Log: [NTFS] Fix IRP_MJ_QUERY_INFORMATION/FileNameInformation, which should handle buffers not big enough Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Sun Nov 2 22:56:47 2014 @@ -143,7 +143,7 @@ PFILE_NAME_INFORMATION NameInfo, PULONG BufferLength) { - ULONG NameLength; + ULONG BytesToCopy; UNREFERENCED_PARAMETER(FileObject); UNREFERENCED_PARAMETER(DeviceObject); @@ -153,18 +153,30 @@ ASSERT(NameInfo != NULL); ASSERT(Fcb != NULL); - NameLength = wcslen(Fcb->PathName) * sizeof(WCHAR); -// NameLength = 2; - if (*BufferLength < sizeof(FILE_NAME_INFORMATION) + NameLength) - return STATUS_BUFFER_OVERFLOW; - - NameInfo->FileNameLength = NameLength; - memcpy(NameInfo->FileName, - Fcb->PathName, - NameLength + sizeof(WCHAR)); -// wcscpy(NameInfo->FileName, L"\\"); - - *BufferLength -= (sizeof(FILE_NAME_INFORMATION) + NameLength + sizeof(WCHAR)); + /* If buffer can't hold at least the file name length, bail out */ + if (*BufferLength < (ULONG)FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) + return STATUS_BUFFER_OVERFLOW; + + /* Save file name length, and as much file len, as buffer length allows */ + NameInfo->FileNameLength = wcslen(Fcb->PathName) * sizeof(WCHAR); + + /* Calculate amount of bytes to copy not to overflow the buffer */ + BytesToCopy = min(NameInfo->FileNameLength, + *BufferLength - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])); + + /* Fill in the bytes */ + RtlCopyMemory(NameInfo->FileName, Fcb->PathName, BytesToCopy); + + /* Check if we could write more but are not able to */ + if (*BufferLength < NameInfo->FileNameLength + (ULONG)FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) + { + /* Return number of bytes written */ + *BufferLength -= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + BytesToCopy; + return STATUS_BUFFER_OVERFLOW; + } + + /* We filled up as many bytes, as needed */ + *BufferLength -= (FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + NameInfo->FileNameLength); return STATUS_SUCCESS; }

1 0

[hpoussin] 65202: [NTFS] Update headers
by hpoussin＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: hpoussin Date: Sun Nov 2 22:56:38 2014 New Revision: 65202 URL: http://svn.reactos.org/svn/reactos?rev=65202&view=rev Log: [NTFS] Update headers Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/finfo.c trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/a… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Sun Nov 2 22:56:38 2014 @@ -20,8 +20,9 @@ * PROJECT: ReactOS kernel * FILE: drivers/filesystem/ntfs/attrib.c * PURPOSE: NTFS filesystem driver - * PROGRAMMER: Eric Kohl - * Updated by Valentin Verkhovsky 2003/09/12 + * PROGRAMMERS: Eric Kohl + * Valentin Verkhovsky + * HervÃ© Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Nov 2 22:56:38 2014 @@ -22,6 +22,7 @@ * PURPOSE: NTFS filesystem driver * PROGRAMMERS: Eric Kohl * Pierre Schweitzer (pierre(a)reactos.org) + * HervÃ© Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sun Nov 2 22:56:38 2014 @@ -22,6 +22,7 @@ * PURPOSE: NTFS filesystem driver * PROGRAMMERS: Eric Kohl * Pierre Schweitzer (pierre(a)reactos.org) + * HervÃ© Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Sun Nov 2 22:56:38 2014 @@ -20,7 +20,8 @@ * PROJECT: ReactOS kernel * FILE: drivers/filesystem/ntfs/dirctl.c * PURPOSE: NTFS filesystem driver - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl + * HervÃ© Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sun Nov 2 22:56:38 2014 @@ -23,6 +23,7 @@ * PROGRAMMERS: Eric Kohl * Valentin Verkhovsky * Pierre Schweitzer (pierre(a)reactos.org) + * HervÃ© Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES *****************************************************************/

1 0

[gadamopoulos] 65201: [SHELL32] - Remove authors.cpp
by gadamopoulos＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: gadamopoulos Date: Sun Nov 2 22:52:49 2014 New Revision: 65201 URL: http://svn.reactos.org/svn/reactos?rev=65201&view=rev Log: [SHELL32] - Remove authors.cpp Removed: branches/shell-experiments/dll/win32/shell32/authors.cpp Removed: branches/shell-experiments/dll/win32/shell32/authors.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/authors.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/authors.cpp (removed) @@ -1 +0,0 @@ -const char * const SHELL_Authors[] = { "Copyright 1993-2012 WINE team", "Copyright 1998-2012 ReactOS Team", 0 };

1 0

[dquintana] 65200: [EXPLORER-NEW] * Refactor startmnu.cpp into three separate files. startctxmnu.cpp contains the context menu handler for the start button, and startmnusite.cpp contains the former...
by dquintana＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: dquintana Date: Sun Nov 2 22:26:44 2014 New Revision: 65200 URL: http://svn.reactos.org/svn/reactos?rev=65200&view=rev Log: [EXPLORER-NEW] * Refactor startmnu.cpp into three separate files. startctxmnu.cpp contains the context menu handler for the start button, and startmnusite.cpp contains the former IStartMenuSiteImpl, renamed to CStartMenuSite. Added: branches/shell-experiments/base/shell/explorer-new/startctxmnu.cpp - copied, changed from r65199, branches/shell-experiments/base/shell/explorer-new/startmnu.cpp branches/shell-experiments/base/shell/explorer-new/startmnusite.cpp - copied, changed from r65199, branches/shell-experiments/base/shell/explorer-new/startmnu.cpp Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt branches/shell-experiments/base/shell/explorer-new/precomp.h branches/shell-experiments/base/shell/explorer-new/startmnu.cpp Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Sun Nov 2 22:26:44 2014 @@ -11,7 +11,9 @@ rshell.cpp settings.cpp shellservice.cpp + startctxmnu.cpp startmnu.cpp + startmnusite.cpp startup.cpp taskband.cpp taskswnd.cpp Modified: branches/shell-experiments/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/precomp.h [iso-8859-1] Sun Nov 2 22:26:44 2014 @@ -243,7 +243,7 @@ IN DWORD dwValue); /* - * startup.c + * startup.cpp */ int @@ -257,7 +257,7 @@ DisplayTrayProperties(IN HWND hwndOwner); /* - * desktop.c + * desktop.cpp */ HANDLE DesktopCreateWindow(IN OUT ITrayWindow *Tray); @@ -266,7 +266,7 @@ DesktopDestroyShellWindow(IN HANDLE hDesktop); /* - * taskband.c + * taskband.cpp */ /* Internal Task Band CLSID */ @@ -297,7 +297,7 @@ CreateTaskBand(IN OUT ITrayWindow *Tray); /* - * tbsite.c + * tbsite.cpp */ #define INTERFACE ITrayBandSite @@ -339,7 +339,7 @@ OUT HWND *phWndTaskSwitch); /* - * startmnu.c + * startmnu.cpp */ extern const TRAYWINDOW_CTXMENU StartMenuBtnCtxMenu; @@ -375,6 +375,13 @@ IN BOOL bSmallIcons); /* +* startmnusite.cpp +*/ + +HRESULT +CreateStartMenuSite(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv); + +/* * trayntfy.c */ Copied: branches/shell-experiments/base/shell/explorer-new/startctxmnu.cpp (from r65199, branches/shell-experiments/base/shell/explorer-new/startmnu.cpp) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/startmnu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/startctxmnu.cpp [iso-8859-1] Sun Nov 2 22:26:44 2014 @@ -23,6 +23,8 @@ /* * Start menu button context menu */ + +// TODO: Convert into an IContextMenu typedef struct _STARTMNU_CTMENU_CTX { @@ -56,7 +58,7 @@ HRESULT hRet; HMENU hPopup; - hRet = psf->GetUIObjectOf(hWndOwner, 1, (LPCITEMIDLIST *)&pidl, IID_NULL_PPV_ARG(IContextMenu, &pcm)); + hRet = psf->GetUIObjectOf(hWndOwner, 1, (LPCITEMIDLIST *) &pidl, IID_NULL_PPV_ARG(IContextMenu, &pcm)); if (SUCCEEDED(hRet)) { hPopup = CreatePopupMenu(); @@ -64,11 +66,11 @@ if (hPopup != NULL) { hRet = pcm->QueryContextMenu( - hPopup, - 0, - ID_SHELL_CMD_FIRST, - ID_SHELL_CMD_LAST, - CMF_VERBSONLY); + hPopup, + 0, + ID_SHELL_CMD_FIRST, + ID_SHELL_CMD_LAST, + CMF_VERBSONLY); if (SUCCEEDED(hRet)) { @@ -95,18 +97,18 @@ { if ((uiCmdId >= ID_SHELL_CMD_FIRST) && (uiCmdId <= ID_SHELL_CMD_LAST)) { - CMINVOKECOMMANDINFO cmici = {0}; + CMINVOKECOMMANDINFO cmici = { 0 }; CHAR szDir[MAX_PATH]; /* Setup and invoke the shell command */ cmici.cbSize = sizeof(cmici); cmici.hwnd = hWndOwner; - cmici.lpVerb = (LPCSTR)MAKEINTRESOURCE(uiCmdId - ID_SHELL_CMD_FIRST); + cmici.lpVerb = (LPCSTR) MAKEINTRESOURCE(uiCmdId - ID_SHELL_CMD_FIRST); cmici.nShow = SW_NORMAL; /* FIXME: Support Unicode!!! */ if (SHGetPathFromIDListA(psmcmc->pidl, - szDir)) + szDir)) { cmici.lpDirectory = szDir; } @@ -126,17 +128,16 @@ } static VOID -AddStartContextMenuItems(IN HWND hWndOwner, - IN HMENU hPopup) +AddStartContextMenuItems(IN HWND hWndOwner, IN HMENU hPopup) { WCHAR szBuf[MAX_PATH]; HRESULT hRet; /* Add the "Open All Users" menu item */ if (LoadString(hExplorerInstance, - IDS_PROPERTIES, - szBuf, - sizeof(szBuf) / sizeof(szBuf[0]))) + IDS_PROPERTIES, + szBuf, + sizeof(szBuf) / sizeof(szBuf[0]))) { AppendMenu(hPopup, MF_STRING, @@ -167,9 +168,9 @@ /* Add the "Open All Users" menu item */ if (LoadString(hExplorerInstance, - IDS_OPEN_ALL_USERS, - szBuf, - sizeof(szBuf) / sizeof(szBuf[0]))) + IDS_OPEN_ALL_USERS, + szBuf, + sizeof(szBuf) / sizeof(szBuf[0]))) { AppendMenu(hPopup, MF_STRING, @@ -179,9 +180,9 @@ /* Add the "Explore All Users" menu item */ if (LoadString(hExplorerInstance, - IDS_EXPLORE_ALL_USERS, - szBuf, - sizeof(szBuf) / sizeof(szBuf[0]))) + IDS_EXPLORE_ALL_USERS, + szBuf, + sizeof(szBuf) / sizeof(szBuf[0]))) { AppendMenu(hPopup, MF_STRING, @@ -260,537 +261,3 @@ return NULL; } - -/***************************************************************************** - ** IStartMenuSite *********************************************************** - *****************************************************************************/ - -class IStartMenuSiteImpl : - public CComCoClass<IStartMenuSiteImpl>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IStartMenuSite, - public IServiceProvider, - public ITrayPriv, - public IOleCommandTarget, - public IMenuPopup -{ - CComPtr<ITrayWindow> Tray; - CComPtr<IMenuPopup> StartMenuPopup; - -public: - IStartMenuSiteImpl() - { - } - - virtual ~IStartMenuSiteImpl() { } - - /*******************************************************************/ - - virtual HRESULT STDMETHODCALLTYPE QueryService( - IN REFGUID guidService, - IN REFIID riid, - OUT PVOID *ppvObject) - { - if (IsEqualGUID(guidService, SID_SMenuPopup)) - { - return QueryInterface(riid, ppvObject); - } - - return E_NOINTERFACE; - } - - /*******************************************************************/ - - virtual HRESULT STDMETHODCALLTYPE GetWindow( - OUT HWND *phwnd) - { - TRACE("ITrayPriv::GetWindow\n"); - - *phwnd = Tray->GetHWND(); - if (*phwnd != NULL) - return S_OK; - - return E_FAIL; - } - - virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp( - IN BOOL fEnterMode) - { - TRACE("ITrayPriv::ContextSensitiveHelp\n"); - return E_NOTIMPL; - } - - virtual HRESULT STDMETHODCALLTYPE Execute( - IN IShellFolder *pShellFolder, - IN LPCITEMIDLIST pidl) - { - HMODULE hShlwapi; - HRESULT ret = S_FALSE; - - TRACE("ITrayPriv::Execute\n"); - - hShlwapi = GetModuleHandle(TEXT("SHLWAPI.DLL")); - if (hShlwapi != NULL) - { - SHINVDEFCMD SHInvokeDefCmd; - - /* SHInvokeDefaultCommand */ - SHInvokeDefCmd = (SHINVDEFCMD) GetProcAddress(hShlwapi, - (LPCSTR) ((LONG) 279)); - if (SHInvokeDefCmd != NULL) - { - ret = SHInvokeDefCmd(Tray->GetHWND(), - pShellFolder, - pidl); - } - } - - return ret; - } - - virtual HRESULT STDMETHODCALLTYPE Unknown( - IN PVOID Unknown1, - IN PVOID Unknown2, - IN PVOID Unknown3, - IN PVOID Unknown4) - { - TRACE("ITrayPriv::Unknown(0x%p,0x%p,0x%p,0x%p)\n", Unknown1, Unknown2, Unknown3, Unknown4); - return E_NOTIMPL; - } - - virtual BOOL - ShowUndockMenuItem(VOID) - { - TRACE("ShowUndockMenuItem() not implemented!\n"); - /* FIXME: How do we detect this?! */ - return FALSE; - } - - virtual BOOL - ShowSynchronizeMenuItem(VOID) - { - TRACE("ShowSynchronizeMenuItem() not implemented!\n"); - /* FIXME: How do we detect this?! */ - return FALSE; - } - - virtual HRESULT STDMETHODCALLTYPE AppendMenu( - OUT HMENU* phMenu) - { - HMENU hMenu, hSettingsMenu; - DWORD dwLogoff; - BOOL bWantLogoff; - UINT uLastItemsCount = 5; /* 5 menu items below the last separator */ - WCHAR szUser[128]; - - TRACE("ITrayPriv::AppendMenu\n"); - - hMenu = LoadPopupMenu(hExplorerInstance, - MAKEINTRESOURCE(IDM_STARTMENU)); - *phMenu = hMenu; - if (hMenu == NULL) - return E_FAIL; - - /* Remove menu items that don't apply */ - - dwLogoff = SHRestricted(REST_STARTMENULOGOFF); - bWantLogoff = (dwLogoff == 2 || - SHRestricted(REST_FORCESTARTMENULOGOFF) || - GetExplorerRegValueSet(HKEY_CURRENT_USER, - TEXT("Advanced"), - TEXT("StartMenuLogoff"))); - - /* Favorites */ - if (!GetExplorerRegValueSet(HKEY_CURRENT_USER, - TEXT("Advanced"), - TEXT("StartMenuFavorites"))) - { - DeleteMenu(hMenu, - IDM_FAVORITES, - MF_BYCOMMAND); - } - - /* Documents */ - if (SHRestricted(REST_NORECENTDOCSMENU)) - { - DeleteMenu(hMenu, - IDM_DOCUMENTS, - MF_BYCOMMAND); - } - - /* Settings */ - hSettingsMenu = FindSubMenu(hMenu, - IDM_SETTINGS, - FALSE); - if (hSettingsMenu != NULL) - { - if (SHRestricted(REST_NOSETFOLDERS)) - { - /* Control Panel */ - if (SHRestricted(REST_NOCONTROLPANEL)) - { - DeleteMenu(hSettingsMenu, - IDM_CONTROLPANEL, - MF_BYCOMMAND); - - /* Delete the separator below it */ - DeleteMenu(hSettingsMenu, - 0, - MF_BYPOSITION); - } - - /* Network Connections */ - if (SHRestricted(REST_NONETWORKCONNECTIONS)) - { - DeleteMenu(hSettingsMenu, - IDM_NETWORKCONNECTIONS, - MF_BYCOMMAND); - } - - /* Printers and Faxes */ - DeleteMenu(hSettingsMenu, - IDM_PRINTERSANDFAXES, - MF_BYCOMMAND); - } - - /* Security */ - if (GetSystemMetrics(SM_REMOTECONTROL) == 0 || - SHRestricted(REST_NOSECURITY)) - { - DeleteMenu(hSettingsMenu, - IDM_SECURITY, - MF_BYCOMMAND); - } - - if (GetMenuItemCount(hSettingsMenu) == 0) - { - DeleteMenu(hMenu, - IDM_SETTINGS, - MF_BYCOMMAND); - } - } - - /* Search */ - /* FIXME: Enable after implementing */ - /* if (SHRestricted(REST_NOFIND)) */ - { - DeleteMenu(hMenu, - IDM_SEARCH, - MF_BYCOMMAND); - } - - /* FIXME: Help */ - - /* Run */ - if (SHRestricted(REST_NORUN)) - { - DeleteMenu(hMenu, - IDM_RUN, - MF_BYCOMMAND); - } - - /* Synchronize */ - if (!ShowSynchronizeMenuItem()) - { - DeleteMenu(hMenu, - IDM_SYNCHRONIZE, - MF_BYCOMMAND); - uLastItemsCount--; - } - - /* Log off */ - if (dwLogoff != 1 && bWantLogoff) - { - /* FIXME: We need a more sophisticated way to determine whether to show - or hide it, it might be hidden in too many cases!!! */ - - /* Update Log Off menu item */ - if (!GetCurrentLoggedOnUserName(szUser, - sizeof(szUser) / sizeof(szUser[0]))) - { - szUser[0] = _T('\0'); - } - - if (!FormatMenuString(hMenu, - IDM_LOGOFF, - MF_BYCOMMAND, - szUser)) - { - /* We couldn't update the menu item, delete it... */ - DeleteMenu(hMenu, - IDM_LOGOFF, - MF_BYCOMMAND); - } - } - else - { - DeleteMenu(hMenu, - IDM_LOGOFF, - MF_BYCOMMAND); - uLastItemsCount--; - } - - - /* Disconnect */ - if (GetSystemMetrics(SM_REMOTECONTROL) == 0) - { - DeleteMenu(hMenu, - IDM_DISCONNECT, - MF_BYCOMMAND); - uLastItemsCount--; - } - - /* Undock computer */ - if (!ShowUndockMenuItem()) - { - DeleteMenu(hMenu, - IDM_UNDOCKCOMPUTER, - MF_BYCOMMAND); - uLastItemsCount--; - } - - /* Shut down */ - if (SHRestricted(REST_NOCLOSE)) - { - DeleteMenu(hMenu, - IDM_SHUTDOWN, - MF_BYCOMMAND); - uLastItemsCount--; - } - - if (uLastItemsCount == 0) - { - /* Remove the separator at the end of the menu */ - DeleteMenu(hMenu, - IDM_LASTSTARTMENU_SEPARATOR, - MF_BYCOMMAND); - } - - return S_OK; - } - - /*******************************************************************/ - - virtual HRESULT STDMETHODCALLTYPE QueryStatus( - IN const GUID *pguidCmdGroup OPTIONAL, - IN ULONG cCmds, - IN OUT OLECMD *prgCmds, - IN OUT OLECMDTEXT *pCmdText OPTIONAL) - { - return E_NOTIMPL; - } - - virtual HRESULT STDMETHODCALLTYPE Exec( - IN const GUID *pguidCmdGroup OPTIONAL, - IN DWORD nCmdID, - IN DWORD nCmdExecOpt, - IN VARIANTARG *pvaIn OPTIONAL, - IN VARIANTARG *pvaOut OPTIONAL) - { - return E_NOTIMPL; - } - - /*******************************************************************/ - - virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient) - { - return E_NOTIMPL; - } - - virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown ** ppunkClient) - { - return E_NOTIMPL; - } - - virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(RECT *prc) - { - return E_NOTIMPL; - } - - virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags) - { - return E_NOTIMPL; - } - - virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType) - { - return E_NOTIMPL; - } - - virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet) - { - if (!fSet) - { - return Tray_OnStartMenuDismissed(); - } - - return S_OK; - } - - /*******************************************************************/ - - HRESULT Initialize(IN ITrayWindow *tray) - { - Tray = tray; - return S_OK; - } - - DECLARE_NOT_AGGREGATABLE(IStartMenuSiteImpl) - - DECLARE_PROTECT_FINAL_CONSTRUCT() - BEGIN_COM_MAP(IStartMenuSiteImpl) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) - COM_INTERFACE_ENTRY_IID(IID_ITrayPriv, ITrayPriv) - COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) - COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup) - COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) - END_COM_MAP() -}; - -HRESULT CreateStartMenuSite(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv) -{ - return ShellObjectCreatorInit<IStartMenuSiteImpl>(Tray, riid, ppv); -} - -HRESULT -UpdateStartMenu(IN OUT IMenuPopup *pMenuPopup, - IN HBITMAP hbmBanner OPTIONAL, - IN BOOL bSmallIcons) -{ - CComPtr<IBanneredBar> pbb; - HRESULT hRet; - - hRet = pMenuPopup->QueryInterface(IID_PPV_ARG(IBanneredBar, &pbb)); - if (SUCCEEDED(hRet)) - { - hRet = pbb->SetBitmap( hbmBanner); - - /* Update the icon size */ - hRet = pbb->SetIconSize(bSmallIcons ? BMICON_SMALL : BMICON_LARGE); - } - - return hRet; -} - -IMenuPopup * -CreateStartMenu(IN ITrayWindow *Tray, - OUT IMenuBand **ppMenuBand, - IN HBITMAP hbmBanner OPTIONAL, - IN BOOL bSmallIcons) -{ - HRESULT hr; - IObjectWithSite *pOws = NULL; - IMenuPopup *pMp = NULL; - IUnknown *pSms = NULL; - IMenuBand *pMb = NULL; - IInitializeObject *pIo; - IUnknown *pUnk = NULL; - IBandSite *pBs = NULL; - DWORD dwBandId = 0; - - hr = CreateStartMenuSite(Tray, IID_PPV_ARG(IUnknown, &pSms)); - if (FAILED_UNEXPECTEDLY(hr)) - return NULL; - -#if 0 - hr = CoCreateInstance(&CLSID_StartMenu, - NULL, - CLSCTX_INPROC_SERVER, - &IID_IMenuPopup, - (PVOID *)&pMp); -#else - hr = _CStartMenu_Constructor(IID_PPV_ARG(IMenuPopup, &pMp)); -#endif - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("CoCreateInstance failed: %x\n", hr); - goto cleanup; - } - - hr = pMp->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pOws)); - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IMenuPopup_QueryInterface failed: %x\n", hr); - goto cleanup; - } - - /* Set the menu site so we can handle messages */ - hr = pOws->SetSite(pSms); - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IObjectWithSite_SetSite failed: %x\n", hr); - goto cleanup; - } - - /* Initialize the menu object */ - hr = pMp->QueryInterface(IID_PPV_ARG(IInitializeObject, &pIo)); - if (SUCCEEDED(hr)) - { - hr = pIo->Initialize(); - pIo->Release(); - } - else - hr = S_OK; - - /* Everything is initialized now. Let's get the IMenuBand interface. */ - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IMenuPopup_QueryInterface failed: %x\n", hr); - goto cleanup; - } - - hr = pMp->GetClient( &pUnk); - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IMenuPopup_GetClient failed: %x\n", hr); - goto cleanup; - } - - hr = pUnk->QueryInterface(IID_PPV_ARG(IBandSite, &pBs)); - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IUnknown_QueryInterface pBs failed: %x\n", hr); - goto cleanup; - } - - /* Finally we have the IBandSite interface, there's only one - band in it that apparently provides the IMenuBand interface */ - hr = pBs->EnumBands( 0, &dwBandId); - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IBandSite_EnumBands failed: %x\n", hr); - goto cleanup; - } - - hr = pBs->GetBandObject( dwBandId, IID_PPV_ARG(IMenuBand, &pMb)); - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IBandSite_GetBandObject failed: %x\n", hr); - goto cleanup; - } - - UpdateStartMenu(pMp, - hbmBanner, - bSmallIcons); - -cleanup: - if (SUCCEEDED(hr)) - *ppMenuBand = pMb; - else if (pMb != NULL) - pMb->Release(); - - if (pBs != NULL) - pBs->Release(); - if (pUnk != NULL) - pUnk->Release(); - if (pOws != NULL) - pOws->Release(); - if (pMp != NULL) - pMp->Release(); - if (pSms != NULL) - pSms->Release(); - - if (FAILED_UNEXPECTEDLY(hr)) - return NULL; - return pMp; -} Modified: branches/shell-experiments/base/shell/explorer-new/startmnu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/startmnu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/startmnu.cpp [iso-8859-1] Sun Nov 2 22:26:44 2014 @@ -20,638 +20,6 @@ #include "precomp.h" -/* - * Start menu button context menu - */ - -typedef struct _STARTMNU_CTMENU_CTX -{ - IContextMenu *pcm; - LPITEMIDLIST pidl; -} STARTMNU_CTMENU_CTX, *PSTARTMNU_CTMENU_CTX; - -static HMENU -CreateStartContextMenu(IN HWND hWndOwner, - IN PVOID *ppcmContext, - IN PVOID Context OPTIONAL); - -static VOID -OnStartContextMenuCommand(IN HWND hWndOwner, - IN UINT uiCmdId, - IN PVOID pcmContext OPTIONAL, - IN PVOID Context OPTIONAL); - -const TRAYWINDOW_CTXMENU StartMenuBtnCtxMenu = { - CreateStartContextMenu, - OnStartContextMenuCommand -}; - -static HMENU -CreateContextMenuFromShellFolderPidl(IN HWND hWndOwner, - IN OUT IShellFolder *psf, - IN OUT LPITEMIDLIST pidl, - OUT IContextMenu **ppcm) -{ - CComPtr<IContextMenu> pcm; - HRESULT hRet; - HMENU hPopup; - - hRet = psf->GetUIObjectOf(hWndOwner, 1, (LPCITEMIDLIST *)&pidl, IID_NULL_PPV_ARG(IContextMenu, &pcm)); - if (SUCCEEDED(hRet)) - { - hPopup = CreatePopupMenu(); - - if (hPopup != NULL) - { - hRet = pcm->QueryContextMenu( - hPopup, - 0, - ID_SHELL_CMD_FIRST, - ID_SHELL_CMD_LAST, - CMF_VERBSONLY); - - if (SUCCEEDED(hRet)) - { - *ppcm = pcm; - return hPopup; - } - - DestroyMenu(hPopup); - } - } - - return NULL; -} - -static VOID -OnStartContextMenuCommand(IN HWND hWndOwner, - IN UINT uiCmdId, - IN PVOID pcmContext OPTIONAL, - IN PVOID Context OPTIONAL) -{ - PSTARTMNU_CTMENU_CTX psmcmc = (PSTARTMNU_CTMENU_CTX) pcmContext; - - if (uiCmdId != 0) - { - if ((uiCmdId >= ID_SHELL_CMD_FIRST) && (uiCmdId <= ID_SHELL_CMD_LAST)) - { - CMINVOKECOMMANDINFO cmici = {0}; - CHAR szDir[MAX_PATH]; - - /* Setup and invoke the shell command */ - cmici.cbSize = sizeof(cmici); - cmici.hwnd = hWndOwner; - cmici.lpVerb = (LPCSTR)MAKEINTRESOURCE(uiCmdId - ID_SHELL_CMD_FIRST); - cmici.nShow = SW_NORMAL; - - /* FIXME: Support Unicode!!! */ - if (SHGetPathFromIDListA(psmcmc->pidl, - szDir)) - { - cmici.lpDirectory = szDir; - } - - psmcmc->pcm->InvokeCommand(&cmici); - } - else - { - ITrayWindow * TrayWnd = (ITrayWindow *) Context; - TrayWnd->ExecContextMenuCmd(uiCmdId); - } - } - - psmcmc->pcm->Release(); - - HeapFree(hProcessHeap, 0, psmcmc); -} - -static VOID -AddStartContextMenuItems(IN HWND hWndOwner, - IN HMENU hPopup) -{ - WCHAR szBuf[MAX_PATH]; - HRESULT hRet; - - /* Add the "Open All Users" menu item */ - if (LoadString(hExplorerInstance, - IDS_PROPERTIES, - szBuf, - sizeof(szBuf) / sizeof(szBuf[0]))) - { - AppendMenu(hPopup, - MF_STRING, - ID_SHELL_CMD_PROPERTIES, - szBuf); - } - - if (!SHRestricted(REST_NOCOMMONGROUPS)) - { - /* Check if we should add menu items for the common start menu */ - hRet = SHGetFolderPath(hWndOwner, - CSIDL_COMMON_STARTMENU, - NULL, - SHGFP_TYPE_CURRENT, - szBuf); - if (SUCCEEDED(hRet) && hRet != S_FALSE) - { - /* The directory exists, but only show the items if the - user can actually make any changes to the common start - menu. This is most likely only the case if the user - has administrative rights! */ - if (IsUserAnAdmin()) - { - AppendMenu(hPopup, - MF_SEPARATOR, - 0, - NULL); - - /* Add the "Open All Users" menu item */ - if (LoadString(hExplorerInstance, - IDS_OPEN_ALL_USERS, - szBuf, - sizeof(szBuf) / sizeof(szBuf[0]))) - { - AppendMenu(hPopup, - MF_STRING, - ID_SHELL_CMD_OPEN_ALL_USERS, - szBuf); - } - - /* Add the "Explore All Users" menu item */ - if (LoadString(hExplorerInstance, - IDS_EXPLORE_ALL_USERS, - szBuf, - sizeof(szBuf) / sizeof(szBuf[0]))) - { - AppendMenu(hPopup, - MF_STRING, - ID_SHELL_CMD_EXPLORE_ALL_USERS, - szBuf); - } - } - } - } -} - -static HMENU -CreateStartContextMenu(IN HWND hWndOwner, - IN PVOID *ppcmContext, - IN PVOID Context OPTIONAL) -{ - LPITEMIDLIST pidlStart, pidlLast; - CComPtr<IShellFolder> psfStart; - CComPtr<IShellFolder> psfDesktop; - CComPtr<IContextMenu> pcm; - HRESULT hRet; - HMENU hPopup; - - pidlStart = SHCloneSpecialIDList(hWndOwner, - CSIDL_STARTMENU, - TRUE); - - if (pidlStart != NULL) - { - pidlLast = ILClone(ILFindLastID(pidlStart)); - ILRemoveLastID(pidlStart); - - if (pidlLast != NULL) - { - hRet = SHGetDesktopFolder(&psfDesktop); - if (SUCCEEDED(hRet)) - { - hRet = psfDesktop->BindToObject(pidlStart, NULL, IID_PPV_ARG(IShellFolder, &psfStart)); - if (SUCCEEDED(hRet)) - { - hPopup = CreateContextMenuFromShellFolderPidl(hWndOwner, - psfStart, - pidlLast, - &pcm); - - if (hPopup != NULL) - { - PSTARTMNU_CTMENU_CTX psmcmc; - - psmcmc = (PSTARTMNU_CTMENU_CTX) HeapAlloc(hProcessHeap, 0, sizeof(*psmcmc)); - if (psmcmc != NULL) - { - psmcmc->pcm = pcm; - psmcmc->pidl = pidlLast; - - AddStartContextMenuItems(hWndOwner, - hPopup); - - *ppcmContext = psmcmc; - return hPopup; - } - else - { - DestroyMenu(hPopup); - hPopup = NULL; - } - } - } - } - - ILFree(pidlLast); - } - - ILFree(pidlStart); - } - - return NULL; -} - -/***************************************************************************** - ** IStartMenuSite *********************************************************** - *****************************************************************************/ - -class IStartMenuSiteImpl : - public CComCoClass<IStartMenuSiteImpl>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IStartMenuSite, - public IServiceProvider, - public ITrayPriv, - public IOleCommandTarget, - public IMenuPopup -{ - CComPtr<ITrayWindow> Tray; - CComPtr<IMenuPopup> StartMenuPopup; - -public: - IStartMenuSiteImpl() - { - } - - virtual ~IStartMenuSiteImpl() { } - - /*******************************************************************/ - - virtual HRESULT STDMETHODCALLTYPE QueryService( - IN REFGUID guidService, - IN REFIID riid, - OUT PVOID *ppvObject) - { - if (IsEqualGUID(guidService, SID_SMenuPopup)) - { - return QueryInterface(riid, ppvObject); - } - - return E_NOINTERFACE; - } - - /*******************************************************************/ - - virtual HRESULT STDMETHODCALLTYPE GetWindow( - OUT HWND *phwnd) - { - TRACE("ITrayPriv::GetWindow\n"); - - *phwnd = Tray->GetHWND(); - if (*phwnd != NULL) - return S_OK; - - return E_FAIL; - } - - virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp( - IN BOOL fEnterMode) - { - TRACE("ITrayPriv::ContextSensitiveHelp\n"); - return E_NOTIMPL; - } - - virtual HRESULT STDMETHODCALLTYPE Execute( - IN IShellFolder *pShellFolder, - IN LPCITEMIDLIST pidl) - { - HMODULE hShlwapi; - HRESULT ret = S_FALSE; - - TRACE("ITrayPriv::Execute\n"); - - hShlwapi = GetModuleHandle(TEXT("SHLWAPI.DLL")); - if (hShlwapi != NULL) - { - SHINVDEFCMD SHInvokeDefCmd; - - /* SHInvokeDefaultCommand */ - SHInvokeDefCmd = (SHINVDEFCMD) GetProcAddress(hShlwapi, - (LPCSTR) ((LONG) 279)); - if (SHInvokeDefCmd != NULL) - { - ret = SHInvokeDefCmd(Tray->GetHWND(), - pShellFolder, - pidl); - } - } - - return ret; - } - - virtual HRESULT STDMETHODCALLTYPE Unknown( - IN PVOID Unknown1, - IN PVOID Unknown2, - IN PVOID Unknown3, - IN PVOID Unknown4) - { - TRACE("ITrayPriv::Unknown(0x%p,0x%p,0x%p,0x%p)\n", Unknown1, Unknown2, Unknown3, Unknown4); - return E_NOTIMPL; - } - - virtual BOOL - ShowUndockMenuItem(VOID) - { - TRACE("ShowUndockMenuItem() not implemented!\n"); - /* FIXME: How do we detect this?! */ - return FALSE; - } - - virtual BOOL - ShowSynchronizeMenuItem(VOID) - { - TRACE("ShowSynchronizeMenuItem() not implemented!\n"); - /* FIXME: How do we detect this?! */ - return FALSE; - } - - virtual HRESULT STDMETHODCALLTYPE AppendMenu( - OUT HMENU* phMenu) - { - HMENU hMenu, hSettingsMenu; - DWORD dwLogoff; - BOOL bWantLogoff; - UINT uLastItemsCount = 5; /* 5 menu items below the last separator */ - WCHAR szUser[128]; - - TRACE("ITrayPriv::AppendMenu\n"); - - hMenu = LoadPopupMenu(hExplorerInstance, - MAKEINTRESOURCE(IDM_STARTMENU)); - *phMenu = hMenu; - if (hMenu == NULL) - return E_FAIL; - - /* Remove menu items that don't apply */ - - dwLogoff = SHRestricted(REST_STARTMENULOGOFF); - bWantLogoff = (dwLogoff == 2 || - SHRestricted(REST_FORCESTARTMENULOGOFF) || - GetExplorerRegValueSet(HKEY_CURRENT_USER, - TEXT("Advanced"), - TEXT("StartMenuLogoff"))); - - /* Favorites */ - if (!GetExplorerRegValueSet(HKEY_CURRENT_USER, - TEXT("Advanced"), - TEXT("StartMenuFavorites"))) - { - DeleteMenu(hMenu, - IDM_FAVORITES, - MF_BYCOMMAND); - } - - /* Documents */ - if (SHRestricted(REST_NORECENTDOCSMENU)) - { - DeleteMenu(hMenu, - IDM_DOCUMENTS, - MF_BYCOMMAND); - } - - /* Settings */ - hSettingsMenu = FindSubMenu(hMenu, - IDM_SETTINGS, - FALSE); - if (hSettingsMenu != NULL) - { - if (SHRestricted(REST_NOSETFOLDERS)) - { - /* Control Panel */ - if (SHRestricted(REST_NOCONTROLPANEL)) - { - DeleteMenu(hSettingsMenu, - IDM_CONTROLPANEL, - MF_BYCOMMAND); - - /* Delete the separator below it */ - DeleteMenu(hSettingsMenu, - 0, - MF_BYPOSITION); - } - - /* Network Connections */ - if (SHRestricted(REST_NONETWORKCONNECTIONS)) - { - DeleteMenu(hSettingsMenu, - IDM_NETWORKCONNECTIONS, - MF_BYCOMMAND); - } - - /* Printers and Faxes */ - DeleteMenu(hSettingsMenu, - IDM_PRINTERSANDFAXES, - MF_BYCOMMAND); - } - - /* Security */ - if (GetSystemMetrics(SM_REMOTECONTROL) == 0 || - SHRestricted(REST_NOSECURITY)) - { - DeleteMenu(hSettingsMenu, - IDM_SECURITY, - MF_BYCOMMAND); - } - - if (GetMenuItemCount(hSettingsMenu) == 0) - { - DeleteMenu(hMenu, - IDM_SETTINGS, - MF_BYCOMMAND); - } - } - - /* Search */ - /* FIXME: Enable after implementing */ - /* if (SHRestricted(REST_NOFIND)) */ - { - DeleteMenu(hMenu, - IDM_SEARCH, - MF_BYCOMMAND); - } - - /* FIXME: Help */ - - /* Run */ - if (SHRestricted(REST_NORUN)) - { - DeleteMenu(hMenu, - IDM_RUN, - MF_BYCOMMAND); - } - - /* Synchronize */ - if (!ShowSynchronizeMenuItem()) - { - DeleteMenu(hMenu, - IDM_SYNCHRONIZE, - MF_BYCOMMAND); - uLastItemsCount--; - } - - /* Log off */ - if (dwLogoff != 1 && bWantLogoff) - { - /* FIXME: We need a more sophisticated way to determine whether to show - or hide it, it might be hidden in too many cases!!! */ - - /* Update Log Off menu item */ - if (!GetCurrentLoggedOnUserName(szUser, - sizeof(szUser) / sizeof(szUser[0]))) - { - szUser[0] = _T('\0'); - } - - if (!FormatMenuString(hMenu, - IDM_LOGOFF, - MF_BYCOMMAND, - szUser)) - { - /* We couldn't update the menu item, delete it... */ - DeleteMenu(hMenu, - IDM_LOGOFF, - MF_BYCOMMAND); - } - } - else - { - DeleteMenu(hMenu, - IDM_LOGOFF, - MF_BYCOMMAND); - uLastItemsCount--; - } - - - /* Disconnect */ - if (GetSystemMetrics(SM_REMOTECONTROL) == 0) - { - DeleteMenu(hMenu, - IDM_DISCONNECT, - MF_BYCOMMAND); - uLastItemsCount--; - } - - /* Undock computer */ - if (!ShowUndockMenuItem()) - { - DeleteMenu(hMenu, - IDM_UNDOCKCOMPUTER, - MF_BYCOMMAND); - uLastItemsCount--; - } - - /* Shut down */ - if (SHRestricted(REST_NOCLOSE)) - { - DeleteMenu(hMenu, - IDM_SHUTDOWN, - MF_BYCOMMAND); - uLastItemsCount--; - } - - if (uLastItemsCount == 0) - { - /* Remove the separator at the end of the menu */ - DeleteMenu(hMenu, - IDM_LASTSTARTMENU_SEPARATOR, - MF_BYCOMMAND); - } - - return S_OK; - } - - /*******************************************************************/ - - virtual HRESULT STDMETHODCALLTYPE QueryStatus( - IN const GUID *pguidCmdGroup OPTIONAL, - IN ULONG cCmds, - IN OUT OLECMD *prgCmds, - IN OUT OLECMDTEXT *pCmdText OPTIONAL) - { - return E_NOTIMPL; - } - - virtual HRESULT STDMETHODCALLTYPE Exec( - IN const GUID *pguidCmdGroup OPTIONAL, - IN DWORD nCmdID, - IN DWORD nCmdExecOpt, - IN VARIANTARG *pvaIn OPTIONAL, - IN VARIANTARG *pvaOut OPTIONAL) - { - return E_NOTIMPL; - } - - /*******************************************************************/ - - virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient) - { - return E_NOTIMPL; - } - - virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown ** ppunkClient) - { - return E_NOTIMPL; - } - - virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(RECT *prc) - { - return E_NOTIMPL; - } - - virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags) - { - return E_NOTIMPL; - } - - virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType) - { - return E_NOTIMPL; - } - - virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet) - { - if (!fSet) - { - return Tray_OnStartMenuDismissed(); - } - - return S_OK; - } - - /*******************************************************************/ - - HRESULT Initialize(IN ITrayWindow *tray) - { - Tray = tray; - return S_OK; - } - - DECLARE_NOT_AGGREGATABLE(IStartMenuSiteImpl) - - DECLARE_PROTECT_FINAL_CONSTRUCT() - BEGIN_COM_MAP(IStartMenuSiteImpl) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) - COM_INTERFACE_ENTRY_IID(IID_ITrayPriv, ITrayPriv) - COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) - COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup) - COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) - END_COM_MAP() -}; - -HRESULT CreateStartMenuSite(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv) -{ - return ShellObjectCreatorInit<IStartMenuSiteImpl>(Tray, riid, ppv); -} - HRESULT UpdateStartMenu(IN OUT IMenuPopup *pMenuPopup, IN HBITMAP hbmBanner OPTIONAL, @@ -663,7 +31,7 @@ hRet = pMenuPopup->QueryInterface(IID_PPV_ARG(IBanneredBar, &pbb)); if (SUCCEEDED(hRet)) { - hRet = pbb->SetBitmap( hbmBanner); + hRet = pbb->SetBitmap(hbmBanner); /* Update the icon size */ hRet = pbb->SetIconSize(bSmallIcons ? BMICON_SMALL : BMICON_LARGE); @@ -739,7 +107,7 @@ goto cleanup; } - hr = pMp->GetClient( &pUnk); + hr = pMp->GetClient(&pUnk); if (FAILED_UNEXPECTEDLY(hr)) { TRACE("IMenuPopup_GetClient failed: %x\n", hr); @@ -755,14 +123,14 @@ /* Finally we have the IBandSite interface, there's only one band in it that apparently provides the IMenuBand interface */ - hr = pBs->EnumBands( 0, &dwBandId); + hr = pBs->EnumBands(0, &dwBandId); if (FAILED_UNEXPECTEDLY(hr)) { TRACE("IBandSite_EnumBands failed: %x\n", hr); goto cleanup; } - hr = pBs->GetBandObject( dwBandId, IID_PPV_ARG(IMenuBand, &pMb)); + hr = pBs->GetBandObject(dwBandId, IID_PPV_ARG(IMenuBand, &pMb)); if (FAILED_UNEXPECTEDLY(hr)) { TRACE("IBandSite_GetBandObject failed: %x\n", hr); Copied: branches/shell-experiments/base/shell/explorer-new/startmnusite.cpp (from r65199, branches/shell-experiments/base/shell/explorer-new/startmnu.cpp) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/startmnu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/startmnusite.cpp [iso-8859-1] Sun Nov 2 22:26:44 2014 @@ -20,253 +20,12 @@ #include "precomp.h" -/* - * Start menu button context menu - */ - -typedef struct _STARTMNU_CTMENU_CTX -{ - IContextMenu *pcm; - LPITEMIDLIST pidl; -} STARTMNU_CTMENU_CTX, *PSTARTMNU_CTMENU_CTX; - -static HMENU -CreateStartContextMenu(IN HWND hWndOwner, - IN PVOID *ppcmContext, - IN PVOID Context OPTIONAL); - -static VOID -OnStartContextMenuCommand(IN HWND hWndOwner, - IN UINT uiCmdId, - IN PVOID pcmContext OPTIONAL, - IN PVOID Context OPTIONAL); - -const TRAYWINDOW_CTXMENU StartMenuBtnCtxMenu = { - CreateStartContextMenu, - OnStartContextMenuCommand -}; - -static HMENU -CreateContextMenuFromShellFolderPidl(IN HWND hWndOwner, - IN OUT IShellFolder *psf, - IN OUT LPITEMIDLIST pidl, - OUT IContextMenu **ppcm) -{ - CComPtr<IContextMenu> pcm; - HRESULT hRet; - HMENU hPopup; - - hRet = psf->GetUIObjectOf(hWndOwner, 1, (LPCITEMIDLIST *)&pidl, IID_NULL_PPV_ARG(IContextMenu, &pcm)); - if (SUCCEEDED(hRet)) - { - hPopup = CreatePopupMenu(); - - if (hPopup != NULL) - { - hRet = pcm->QueryContextMenu( - hPopup, - 0, - ID_SHELL_CMD_FIRST, - ID_SHELL_CMD_LAST, - CMF_VERBSONLY); - - if (SUCCEEDED(hRet)) - { - *ppcm = pcm; - return hPopup; - } - - DestroyMenu(hPopup); - } - } - - return NULL; -} - -static VOID -OnStartContextMenuCommand(IN HWND hWndOwner, - IN UINT uiCmdId, - IN PVOID pcmContext OPTIONAL, - IN PVOID Context OPTIONAL) -{ - PSTARTMNU_CTMENU_CTX psmcmc = (PSTARTMNU_CTMENU_CTX) pcmContext; - - if (uiCmdId != 0) - { - if ((uiCmdId >= ID_SHELL_CMD_FIRST) && (uiCmdId <= ID_SHELL_CMD_LAST)) - { - CMINVOKECOMMANDINFO cmici = {0}; - CHAR szDir[MAX_PATH]; - - /* Setup and invoke the shell command */ - cmici.cbSize = sizeof(cmici); - cmici.hwnd = hWndOwner; - cmici.lpVerb = (LPCSTR)MAKEINTRESOURCE(uiCmdId - ID_SHELL_CMD_FIRST); - cmici.nShow = SW_NORMAL; - - /* FIXME: Support Unicode!!! */ - if (SHGetPathFromIDListA(psmcmc->pidl, - szDir)) - { - cmici.lpDirectory = szDir; - } - - psmcmc->pcm->InvokeCommand(&cmici); - } - else - { - ITrayWindow * TrayWnd = (ITrayWindow *) Context; - TrayWnd->ExecContextMenuCmd(uiCmdId); - } - } - - psmcmc->pcm->Release(); - - HeapFree(hProcessHeap, 0, psmcmc); -} - -static VOID -AddStartContextMenuItems(IN HWND hWndOwner, - IN HMENU hPopup) -{ - WCHAR szBuf[MAX_PATH]; - HRESULT hRet; - - /* Add the "Open All Users" menu item */ - if (LoadString(hExplorerInstance, - IDS_PROPERTIES, - szBuf, - sizeof(szBuf) / sizeof(szBuf[0]))) - { - AppendMenu(hPopup, - MF_STRING, - ID_SHELL_CMD_PROPERTIES, - szBuf); - } - - if (!SHRestricted(REST_NOCOMMONGROUPS)) - { - /* Check if we should add menu items for the common start menu */ - hRet = SHGetFolderPath(hWndOwner, - CSIDL_COMMON_STARTMENU, - NULL, - SHGFP_TYPE_CURRENT, - szBuf); - if (SUCCEEDED(hRet) && hRet != S_FALSE) - { - /* The directory exists, but only show the items if the - user can actually make any changes to the common start - menu. This is most likely only the case if the user - has administrative rights! */ - if (IsUserAnAdmin()) - { - AppendMenu(hPopup, - MF_SEPARATOR, - 0, - NULL); - - /* Add the "Open All Users" menu item */ - if (LoadString(hExplorerInstance, - IDS_OPEN_ALL_USERS, - szBuf, - sizeof(szBuf) / sizeof(szBuf[0]))) - { - AppendMenu(hPopup, - MF_STRING, - ID_SHELL_CMD_OPEN_ALL_USERS, - szBuf); - } - - /* Add the "Explore All Users" menu item */ - if (LoadString(hExplorerInstance, - IDS_EXPLORE_ALL_USERS, - szBuf, - sizeof(szBuf) / sizeof(szBuf[0]))) - { - AppendMenu(hPopup, - MF_STRING, - ID_SHELL_CMD_EXPLORE_ALL_USERS, - szBuf); - } - } - } - } -} - -static HMENU -CreateStartContextMenu(IN HWND hWndOwner, - IN PVOID *ppcmContext, - IN PVOID Context OPTIONAL) -{ - LPITEMIDLIST pidlStart, pidlLast; - CComPtr<IShellFolder> psfStart; - CComPtr<IShellFolder> psfDesktop; - CComPtr<IContextMenu> pcm; - HRESULT hRet; - HMENU hPopup; - - pidlStart = SHCloneSpecialIDList(hWndOwner, - CSIDL_STARTMENU, - TRUE); - - if (pidlStart != NULL) - { - pidlLast = ILClone(ILFindLastID(pidlStart)); - ILRemoveLastID(pidlStart); - - if (pidlLast != NULL) - { - hRet = SHGetDesktopFolder(&psfDesktop); - if (SUCCEEDED(hRet)) - { - hRet = psfDesktop->BindToObject(pidlStart, NULL, IID_PPV_ARG(IShellFolder, &psfStart)); - if (SUCCEEDED(hRet)) - { - hPopup = CreateContextMenuFromShellFolderPidl(hWndOwner, - psfStart, - pidlLast, - &pcm); - - if (hPopup != NULL) - { - PSTARTMNU_CTMENU_CTX psmcmc; - - psmcmc = (PSTARTMNU_CTMENU_CTX) HeapAlloc(hProcessHeap, 0, sizeof(*psmcmc)); - if (psmcmc != NULL) - { - psmcmc->pcm = pcm; - psmcmc->pidl = pidlLast; - - AddStartContextMenuItems(hWndOwner, - hPopup); - - *ppcmContext = psmcmc; - return hPopup; - } - else - { - DestroyMenu(hPopup); - hPopup = NULL; - } - } - } - } - - ILFree(pidlLast); - } - - ILFree(pidlStart); - } - - return NULL; -} - /***************************************************************************** ** IStartMenuSite *********************************************************** *****************************************************************************/ -class IStartMenuSiteImpl : - public CComCoClass<IStartMenuSiteImpl>, +class CStartMenuSite : + public CComCoClass<CStartMenuSite>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IStartMenuSite, public IServiceProvider, @@ -278,11 +37,11 @@ CComPtr<IMenuPopup> StartMenuPopup; public: - IStartMenuSiteImpl() - { - } - - virtual ~IStartMenuSiteImpl() { } + CStartMenuSite() + { + } + + virtual ~CStartMenuSite() {} /*******************************************************************/ @@ -336,12 +95,12 @@ /* SHInvokeDefaultCommand */ SHInvokeDefCmd = (SHINVDEFCMD) GetProcAddress(hShlwapi, - (LPCSTR) ((LONG) 279)); + (LPCSTR) ((LONG) 279)); if (SHInvokeDefCmd != NULL) { ret = SHInvokeDefCmd(Tray->GetHWND(), - pShellFolder, - pidl); + pShellFolder, + pidl); } } @@ -386,7 +145,7 @@ TRACE("ITrayPriv::AppendMenu\n"); hMenu = LoadPopupMenu(hExplorerInstance, - MAKEINTRESOURCE(IDM_STARTMENU)); + MAKEINTRESOURCE(IDM_STARTMENU)); *phMenu = hMenu; if (hMenu == NULL) return E_FAIL; @@ -395,10 +154,10 @@ dwLogoff = SHRestricted(REST_STARTMENULOGOFF); bWantLogoff = (dwLogoff == 2 || - SHRestricted(REST_FORCESTARTMENULOGOFF) || - GetExplorerRegValueSet(HKEY_CURRENT_USER, - TEXT("Advanced"), - TEXT("StartMenuLogoff"))); + SHRestricted(REST_FORCESTARTMENULOGOFF) || + GetExplorerRegValueSet(HKEY_CURRENT_USER, + TEXT("Advanced"), + TEXT("StartMenuLogoff"))); /* Favorites */ if (!GetExplorerRegValueSet(HKEY_CURRENT_USER, @@ -406,22 +165,22 @@ TEXT("StartMenuFavorites"))) { DeleteMenu(hMenu, - IDM_FAVORITES, - MF_BYCOMMAND); + IDM_FAVORITES, + MF_BYCOMMAND); } /* Documents */ if (SHRestricted(REST_NORECENTDOCSMENU)) { DeleteMenu(hMenu, - IDM_DOCUMENTS, - MF_BYCOMMAND); + IDM_DOCUMENTS, + MF_BYCOMMAND); } /* Settings */ hSettingsMenu = FindSubMenu(hMenu, - IDM_SETTINGS, - FALSE); + IDM_SETTINGS, + FALSE); if (hSettingsMenu != NULL) { if (SHRestricted(REST_NOSETFOLDERS)) @@ -430,27 +189,27 @@ if (SHRestricted(REST_NOCONTROLPANEL)) { DeleteMenu(hSettingsMenu, - IDM_CONTROLPANEL, - MF_BYCOMMAND); + IDM_CONTROLPANEL, + MF_BYCOMMAND); /* Delete the separator below it */ DeleteMenu(hSettingsMenu, - 0, - MF_BYPOSITION); + 0, + MF_BYPOSITION); } /* Network Connections */ if (SHRestricted(REST_NONETWORKCONNECTIONS)) { DeleteMenu(hSettingsMenu, - IDM_NETWORKCONNECTIONS, - MF_BYCOMMAND); + IDM_NETWORKCONNECTIONS, + MF_BYCOMMAND); } /* Printers and Faxes */ DeleteMenu(hSettingsMenu, - IDM_PRINTERSANDFAXES, - MF_BYCOMMAND); + IDM_PRINTERSANDFAXES, + MF_BYCOMMAND); } /* Security */ @@ -458,15 +217,15 @@ SHRestricted(REST_NOSECURITY)) { DeleteMenu(hSettingsMenu, - IDM_SECURITY, - MF_BYCOMMAND); + IDM_SECURITY, + MF_BYCOMMAND); } if (GetMenuItemCount(hSettingsMenu) == 0) { DeleteMenu(hMenu, - IDM_SETTINGS, - MF_BYCOMMAND); + IDM_SETTINGS, + MF_BYCOMMAND); } } @@ -475,8 +234,8 @@ /* if (SHRestricted(REST_NOFIND)) */ { DeleteMenu(hMenu, - IDM_SEARCH, - MF_BYCOMMAND); + IDM_SEARCH, + MF_BYCOMMAND); } /* FIXME: Help */ @@ -485,16 +244,16 @@ if (SHRestricted(REST_NORUN)) { DeleteMenu(hMenu, - IDM_RUN, - MF_BYCOMMAND); + IDM_RUN, + MF_BYCOMMAND); } /* Synchronize */ if (!ShowSynchronizeMenuItem()) { DeleteMenu(hMenu, - IDM_SYNCHRONIZE, - MF_BYCOMMAND); + IDM_SYNCHRONIZE, + MF_BYCOMMAND); uLastItemsCount--; } @@ -518,15 +277,15 @@ { /* We couldn't update the menu item, delete it... */ DeleteMenu(hMenu, - IDM_LOGOFF, - MF_BYCOMMAND); + IDM_LOGOFF, + MF_BYCOMMAND); } } else { DeleteMenu(hMenu, - IDM_LOGOFF, - MF_BYCOMMAND); + IDM_LOGOFF, + MF_BYCOMMAND); uLastItemsCount--; } @@ -535,8 +294,8 @@ if (GetSystemMetrics(SM_REMOTECONTROL) == 0) { DeleteMenu(hMenu, - IDM_DISCONNECT, - MF_BYCOMMAND); + IDM_DISCONNECT, + MF_BYCOMMAND); uLastItemsCount--; } @@ -544,8 +303,8 @@ if (!ShowUndockMenuItem()) { DeleteMenu(hMenu, - IDM_UNDOCKCOMPUTER, - MF_BYCOMMAND); + IDM_UNDOCKCOMPUTER, + MF_BYCOMMAND); uLastItemsCount--; } @@ -553,8 +312,8 @@ if (SHRestricted(REST_NOCLOSE)) { DeleteMenu(hMenu, - IDM_SHUTDOWN, - MF_BYCOMMAND); + IDM_SHUTDOWN, + MF_BYCOMMAND); uLastItemsCount--; } @@ -562,8 +321,8 @@ { /* Remove the separator at the end of the menu */ DeleteMenu(hMenu, - IDM_LASTSTARTMENU_SEPARATOR, - MF_BYCOMMAND); + IDM_LASTSTARTMENU_SEPARATOR, + MF_BYCOMMAND); } return S_OK; @@ -635,10 +394,10 @@ return S_OK; } - DECLARE_NOT_AGGREGATABLE(IStartMenuSiteImpl) + DECLARE_NOT_AGGREGATABLE(CStartMenuSite) DECLARE_PROTECT_FINAL_CONSTRUCT() - BEGIN_COM_MAP(IStartMenuSiteImpl) + BEGIN_COM_MAP(CStartMenuSite) COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) COM_INTERFACE_ENTRY_IID(IID_ITrayPriv, ITrayPriv) COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) @@ -649,148 +408,5 @@ HRESULT CreateStartMenuSite(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv) { - return ShellObjectCreatorInit<IStartMenuSiteImpl>(Tray, riid, ppv); + return ShellObjectCreatorInit<CStartMenuSite>(Tray, riid, ppv); } - -HRESULT -UpdateStartMenu(IN OUT IMenuPopup *pMenuPopup, - IN HBITMAP hbmBanner OPTIONAL, - IN BOOL bSmallIcons) -{ - CComPtr<IBanneredBar> pbb; - HRESULT hRet; - - hRet = pMenuPopup->QueryInterface(IID_PPV_ARG(IBanneredBar, &pbb)); - if (SUCCEEDED(hRet)) - { - hRet = pbb->SetBitmap( hbmBanner); - - /* Update the icon size */ - hRet = pbb->SetIconSize(bSmallIcons ? BMICON_SMALL : BMICON_LARGE); - } - - return hRet; -} - -IMenuPopup * -CreateStartMenu(IN ITrayWindow *Tray, - OUT IMenuBand **ppMenuBand, - IN HBITMAP hbmBanner OPTIONAL, - IN BOOL bSmallIcons) -{ - HRESULT hr; - IObjectWithSite *pOws = NULL; - IMenuPopup *pMp = NULL; - IUnknown *pSms = NULL; - IMenuBand *pMb = NULL; - IInitializeObject *pIo; - IUnknown *pUnk = NULL; - IBandSite *pBs = NULL; - DWORD dwBandId = 0; - - hr = CreateStartMenuSite(Tray, IID_PPV_ARG(IUnknown, &pSms)); - if (FAILED_UNEXPECTEDLY(hr)) - return NULL; - -#if 0 - hr = CoCreateInstance(&CLSID_StartMenu, - NULL, - CLSCTX_INPROC_SERVER, - &IID_IMenuPopup, - (PVOID *)&pMp); -#else - hr = _CStartMenu_Constructor(IID_PPV_ARG(IMenuPopup, &pMp)); -#endif - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("CoCreateInstance failed: %x\n", hr); - goto cleanup; - } - - hr = pMp->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pOws)); - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IMenuPopup_QueryInterface failed: %x\n", hr); - goto cleanup; - } - - /* Set the menu site so we can handle messages */ - hr = pOws->SetSite(pSms); - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IObjectWithSite_SetSite failed: %x\n", hr); - goto cleanup; - } - - /* Initialize the menu object */ - hr = pMp->QueryInterface(IID_PPV_ARG(IInitializeObject, &pIo)); - if (SUCCEEDED(hr)) - { - hr = pIo->Initialize(); - pIo->Release(); - } - else - hr = S_OK; - - /* Everything is initialized now. Let's get the IMenuBand interface. */ - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IMenuPopup_QueryInterface failed: %x\n", hr); - goto cleanup; - } - - hr = pMp->GetClient( &pUnk); - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IMenuPopup_GetClient failed: %x\n", hr); - goto cleanup; - } - - hr = pUnk->QueryInterface(IID_PPV_ARG(IBandSite, &pBs)); - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IUnknown_QueryInterface pBs failed: %x\n", hr); - goto cleanup; - } - - /* Finally we have the IBandSite interface, there's only one - band in it that apparently provides the IMenuBand interface */ - hr = pBs->EnumBands( 0, &dwBandId); - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IBandSite_EnumBands failed: %x\n", hr); - goto cleanup; - } - - hr = pBs->GetBandObject( dwBandId, IID_PPV_ARG(IMenuBand, &pMb)); - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IBandSite_GetBandObject failed: %x\n", hr); - goto cleanup; - } - - UpdateStartMenu(pMp, - hbmBanner, - bSmallIcons); - -cleanup: - if (SUCCEEDED(hr)) - *ppMenuBand = pMb; - else if (pMb != NULL) - pMb->Release(); - - if (pBs != NULL) - pBs->Release(); - if (pUnk != NULL) - pUnk->Release(); - if (pOws != NULL) - pOws->Release(); - if (pMp != NULL) - pMp->Release(); - if (pSms != NULL) - pSms->Release(); - - if (FAILED_UNEXPECTEDLY(hr)) - return NULL; - return pMp; -}

1 0

[dquintana] 65199: [EXPLORER-NEW] * Refactor the desktop thread/creation code.
by dquintana＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: dquintana Date: Sun Nov 2 21:52:54 2014 New Revision: 65199 URL: http://svn.reactos.org/svn/reactos?rev=65199&view=rev Log: [EXPLORER-NEW] * Refactor the desktop thread/creation code. Modified: branches/shell-experiments/base/shell/explorer-new/desktop.cpp Modified: branches/shell-experiments/base/shell/explorer-new/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/desktop.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/desktop.cpp [iso-8859-1] Sun Nov 2 21:52:54 2014 @@ -20,112 +20,125 @@ #include "precomp.h" -typedef struct _DESKCREATEINFO -{ - HANDLE hEvent; - ITrayWindow *Tray; - HANDLE hDesktop; -} DESKCREATEINFO, *PDESKCREATEINFO; - HANDLE WINAPI _SHCreateDesktop(IShellDesktopTray *ShellDesk); BOOL WINAPI _SHDesktopMessageLoop(HANDLE hDesktop); -static DWORD CALLBACK -DesktopThreadProc(IN OUT LPVOID lpParameter) +class CDesktopThread { - volatile DESKCREATEINFO *DeskCreateInfo = (volatile DESKCREATEINFO *)lpParameter; - CComPtr<IShellDesktopTray> pSdt; + HANDLE hEvent; HANDLE hDesktop; - HRESULT hRet; + CComPtr<ITrayWindow> Tray; - OleInitialize(NULL); + DWORD DesktopThreadProc() + { + CComPtr<IShellDesktopTray> pSdt; + HANDLE hDesktop; + HRESULT hRet; - hRet = DeskCreateInfo->Tray->QueryInterface(IID_PPV_ARG(IShellDesktopTray, &pSdt)); - if (!SUCCEEDED(hRet)) - return 1; + OleInitialize(NULL); - hDesktop = _SHCreateDesktop(pSdt); + hRet = Tray->QueryInterface(IID_PPV_ARG(IShellDesktopTray, &pSdt)); + if (!SUCCEEDED(hRet)) + return 1; - if (hDesktop == NULL) - return 1; + hDesktop = _SHCreateDesktop(pSdt); + if (hDesktop == NULL) + return 1; - (void)InterlockedExchangePointer(&DeskCreateInfo->hDesktop, hDesktop); + if (!SetEvent(hEvent)) + { + /* Failed to notify that we initialized successfully, kill ourselves + to make the main thread wake up! */ + return 1; + } - if (!SetEvent(DeskCreateInfo->hEvent)) - { - /* Failed to notify that we initialized successfully, kill ourselves - to make the main thread wake up! */ - return 1; + _SHDesktopMessageLoop(hDesktop); + + /* FIXME: Properly rundown the main thread! */ + ExitProcess(0); + + return 0; } - _SHDesktopMessageLoop(hDesktop); + static DWORD CALLBACK s_DesktopThreadProc(IN OUT LPVOID lpParameter) + { + return reinterpret_cast<CDesktopThread*>(lpParameter)->DesktopThreadProc(); + } - /* FIXME: Properly rundown the main thread! */ - ExitProcess(0); +public: + CDesktopThread() : + hEvent(NULL), + hDesktop(NULL), + Tray(NULL) + { + } - return 0; -} + HANDLE Initialize(IN OUT ITrayWindow *pTray) + { + HANDLE hThread; + HANDLE Handles[2]; + + Tray = pTray; + + hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + if (!hEvent) + return NULL; + + hThread = CreateThread(NULL, 0, s_DesktopThreadProc, (PVOID)this, 0, NULL); + if (!hThread) + { + CloseHandle(hEvent); + return NULL; + } + + Handles[0] = hThread; + Handles[1] = hEvent; + + for (;;) + { + DWORD WaitResult = MsgWaitForMultipleObjects(_countof(Handles), Handles, FALSE, INFINITE, QS_ALLEVENTS); + if (WaitResult == WAIT_OBJECT_0 + _countof(Handles)) + { + TrayProcessMessages(Tray); + } + else if (WaitResult != WAIT_FAILED && WaitResult != WAIT_OBJECT_0) + { + break; + } + } + + CloseHandle(hThread); + CloseHandle(hEvent); + + return hDesktop; + } + + void Destroy() + { + return; + } + +} * g_pDesktopWindowInstance; HANDLE DesktopCreateWindow(IN OUT ITrayWindow *Tray) { - HANDLE hThread; - HANDLE hEvent; - DWORD DesktopThreadId; - HANDLE hDesktop = NULL; - HANDLE Handles[2]; - DWORD WaitResult; + if (!g_pDesktopWindowInstance) + { + g_pDesktopWindowInstance = new CDesktopThread(); + } + + if (!g_pDesktopWindowInstance) + return NULL; - hEvent = CreateEvent(NULL, - FALSE, - FALSE, - NULL); - if (hEvent != NULL) - { - volatile DESKCREATEINFO DeskCreateInfo; - - DeskCreateInfo.hEvent = hEvent; - DeskCreateInfo.Tray = Tray; - DeskCreateInfo.hDesktop = NULL; - - hThread = CreateThread(NULL, - 0, - DesktopThreadProc, - (PVOID)&DeskCreateInfo, - 0, - &DesktopThreadId); - if (hThread != NULL) - { - Handles[0] = hThread; - Handles[1] = hEvent; - - for (;;) - { - WaitResult = MsgWaitForMultipleObjects(sizeof(Handles) / sizeof(Handles[0]), - Handles, - FALSE, - INFINITE, - QS_ALLEVENTS); - if (WaitResult == WAIT_OBJECT_0 + (sizeof(Handles) / sizeof(Handles[0]))) - TrayProcessMessages(Tray); - else if (WaitResult != WAIT_FAILED && WaitResult != WAIT_OBJECT_0) - { - hDesktop = DeskCreateInfo.hDesktop; - break; - } - } - - CloseHandle(hThread); - } - - CloseHandle(hEvent); - } - - return hDesktop; + return g_pDesktopWindowInstance->Initialize(Tray); } VOID DesktopDestroyShellWindow(IN HANDLE hDesktop) { - return; + if (g_pDesktopWindowInstance) + { + g_pDesktopWindowInstance->Destroy(); + } }

1 0

[pschweitzer] 65198: [NTFS] Update headers. Hervé, feel free to copy :-P
by pschweitzer＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: pschweitzer Date: Sun Nov 2 21:50:40 2014 New Revision: 65198 URL: http://svn.reactos.org/svn/reactos?rev=65198&view=rev Log: [NTFS] Update headers. Hervé, feel free to copy :-P Modified: trunk/reactos/drivers/filesystems/ntfs/create.c trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/misc.c trunk/reactos/drivers/filesystems/ntfs/rw.c trunk/reactos/drivers/filesystems/ntfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Sun Nov 2 21:50:40 2014 @@ -1,6 +1,6 @@ /* * ReactOS kernel - * Copyright (C) 2002 ReactOS Team + * Copyright (C) 2002, 2014 ReactOS Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,8 @@ * PROJECT: ReactOS kernel * FILE: drivers/filesystem/ntfs/create.c * PURPOSE: NTFS filesystem driver - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl + * Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Nov 2 21:50:40 2014 @@ -1,6 +1,6 @@ /* * ReactOS kernel - * Copyright (C) 2002,2003 ReactOS Team + * Copyright (C) 2002, 2003, 2014 ReactOS Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,8 @@ * PROJECT: ReactOS kernel * FILE: drivers/filesystem/ntfs/dirctl.c * PURPOSE: NTFS filesystem driver - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl + * Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sun Nov 2 21:50:40 2014 @@ -1,6 +1,6 @@ /* * ReactOS kernel - * Copyright (C) 2002 ReactOS Team + * Copyright (C) 2002, 2014 ReactOS Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,8 @@ * PROJECT: ReactOS kernel * FILE: drivers/filesystem/ntfs/fcb.c * PURPOSE: NTFS filesystem driver - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl + * Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sun Nov 2 21:50:40 2014 @@ -1,6 +1,6 @@ /* * ReactOS kernel - * Copyright (C) 2002 ReactOS Team + * Copyright (C) 2002, 2014 ReactOS Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,8 +20,9 @@ * PROJECT: ReactOS kernel * FILE: drivers/filesystem/ntfs/mft.c * PURPOSE: NTFS filesystem driver - * PROGRAMMER: Eric Kohl - * Updated by Valentin Verkhovsky 2003/09/12 + * PROGRAMMERS: Eric Kohl + * Valentin Verkhovsky + * Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] Sun Nov 2 21:50:40 2014 @@ -1,6 +1,6 @@ /* * ReactOS kernel - * Copyright (C) 2008 ReactOS Team + * Copyright (C) 2008, 2014 ReactOS Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Sun Nov 2 21:50:40 2014 @@ -1,6 +1,6 @@ /* * ReactOS kernel - * Copyright (C) 2002 ReactOS Team + * Copyright (C) 2002, 2014 ReactOS Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,8 +20,8 @@ * PROJECT: ReactOS kernel * FILE: drivers/filesystem/ntfs/rw.c * PURPOSE: NTFS filesystem driver - * PROGRAMMER: Art Yerkes - * UPDATE HISTORY: + * PROGRAMMERS: Art Yerkes + * Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] Sun Nov 2 21:50:40 2014 @@ -1,6 +1,6 @@ /* * ReactOS kernel - * Copyright (C) 2002 ReactOS Team + * Copyright (C) 2002, 2014 ReactOS Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,8 @@ * PROJECT: ReactOS kernel * FILE: drivers/filesystem/ntfs/volume.c * PURPOSE: NTFS filesystem driver - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl + * Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES *****************************************************************/

1 0

[dquintana] 65197: [EXPLORER-NEW] * Convert codebase to C++ and make use of C++ classes for the COM objects.
by dquintana＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: dquintana Date: Sun Nov 2 20:18:54 2014 New Revision: 65197 URL: http://svn.reactos.org/svn/reactos?rev=65197&view=rev Log: [EXPLORER-NEW] * Convert codebase to C++ and make use of C++ classes for the COM objects. Added: branches/shell-experiments/base/shell/explorer-new/desktop.cpp - copied, changed from r65192, branches/shell-experiments/base/shell/explorer-new/desktop.c branches/shell-experiments/base/shell/explorer-new/dragdrop.cpp - copied, changed from r64404, branches/shell-experiments/base/shell/explorer-new/dragdrop.c branches/shell-experiments/base/shell/explorer-new/explorer.cpp - copied, changed from r64404, branches/shell-experiments/base/shell/explorer-new/explorer.c branches/shell-experiments/base/shell/explorer-new/rshell.cpp - copied, changed from r64404, branches/shell-experiments/base/shell/explorer-new/rshell.c branches/shell-experiments/base/shell/explorer-new/settings.cpp - copied, changed from r64404, branches/shell-experiments/base/shell/explorer-new/settings.c branches/shell-experiments/base/shell/explorer-new/shellservice.cpp - copied, changed from r64404, branches/shell-experiments/base/shell/explorer-new/shellservice.c branches/shell-experiments/base/shell/explorer-new/startmnu.cpp - copied, changed from r64404, branches/shell-experiments/base/shell/explorer-new/startmnu.c branches/shell-experiments/base/shell/explorer-new/startup.cpp - copied, changed from r64404, branches/shell-experiments/base/shell/explorer-new/startup.c branches/shell-experiments/base/shell/explorer-new/taskband.cpp - copied, changed from r64404, branches/shell-experiments/base/shell/explorer-new/taskband.c branches/shell-experiments/base/shell/explorer-new/taskswnd.cpp - copied, changed from r64404, branches/shell-experiments/base/shell/explorer-new/taskswnd.c branches/shell-experiments/base/shell/explorer-new/tbsite.cpp - copied, changed from r64404, branches/shell-experiments/base/shell/explorer-new/tbsite.c branches/shell-experiments/base/shell/explorer-new/trayntfy.cpp - copied, changed from r64404, branches/shell-experiments/base/shell/explorer-new/trayntfy.c branches/shell-experiments/base/shell/explorer-new/trayprop.cpp - copied, changed from r64404, branches/shell-experiments/base/shell/explorer-new/trayprop.c branches/shell-experiments/base/shell/explorer-new/traywnd.cpp - copied, changed from r64404, branches/shell-experiments/base/shell/explorer-new/traywnd.c branches/shell-experiments/base/shell/explorer-new/util.cpp (with props) Removed: branches/shell-experiments/base/shell/explorer-new/desktop.c branches/shell-experiments/base/shell/explorer-new/dragdrop.c branches/shell-experiments/base/shell/explorer-new/explorer.c branches/shell-experiments/base/shell/explorer-new/rshell.c branches/shell-experiments/base/shell/explorer-new/settings.c branches/shell-experiments/base/shell/explorer-new/shellservice.c branches/shell-experiments/base/shell/explorer-new/startmnu.c branches/shell-experiments/base/shell/explorer-new/startup.c branches/shell-experiments/base/shell/explorer-new/taskband.c branches/shell-experiments/base/shell/explorer-new/taskswnd.c branches/shell-experiments/base/shell/explorer-new/tbsite.c branches/shell-experiments/base/shell/explorer-new/trayntfy.c branches/shell-experiments/base/shell/explorer-new/trayprop.c branches/shell-experiments/base/shell/explorer-new/traywnd.c Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt branches/shell-experiments/base/shell/explorer-new/precomp.h branches/shell-experiments/dll/win32/browseui/bandsite.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Removed: branches/shell-experiments/base/shell/explorer-new/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Copied: branches/shell-experiments/base/shell/explorer-new/desktop.cpp (from r65192, branches/shell-experiments/base/shell/explorer-new/desktop.c) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Removed: branches/shell-experiments/base/shell/explorer-new/dragdrop.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Copied: branches/shell-experiments/base/shell/explorer-new/dragdrop.cpp (from r64404, branches/shell-experiments/base/shell/explorer-new/dragdrop.c) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Removed: branches/shell-experiments/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Copied: branches/shell-experiments/base/shell/explorer-new/explorer.cpp (from r64404, branches/shell-experiments/base/shell/explorer-new/explorer.c) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Modified: branches/shell-experiments/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Removed: branches/shell-experiments/base/shell/explorer-new/rshell.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Copied: branches/shell-experiments/base/shell/explorer-new/rshell.cpp (from r64404, branches/shell-experiments/base/shell/explorer-new/rshell.c) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Removed: branches/shell-experiments/base/shell/explorer-new/settings.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Copied: branches/shell-experiments/base/shell/explorer-new/settings.cpp (from r64404, branches/shell-experiments/base/shell/explorer-new/settings.c) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Removed: branches/shell-experiments/base/shell/explorer-new/shellservice.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Copied: branches/shell-experiments/base/shell/explorer-new/shellservice.cpp (from r64404, branches/shell-experiments/base/shell/explorer-new/shellservice.c) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Removed: branches/shell-experiments/base/shell/explorer-new/startmnu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Copied: branches/shell-experiments/base/shell/explorer-new/startmnu.cpp (from r64404, branches/shell-experiments/base/shell/explorer-new/startmnu.c) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Removed: branches/shell-experiments/base/shell/explorer-new/startup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Copied: branches/shell-experiments/base/shell/explorer-new/startup.cpp (from r64404, branches/shell-experiments/base/shell/explorer-new/startup.c) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Removed: branches/shell-experiments/base/shell/explorer-new/taskband.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Copied: branches/shell-experiments/base/shell/explorer-new/taskband.cpp (from r64404, branches/shell-experiments/base/shell/explorer-new/taskband.c) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Removed: branches/shell-experiments/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Copied: branches/shell-experiments/base/shell/explorer-new/taskswnd.cpp (from r64404, branches/shell-experiments/base/shell/explorer-new/taskswnd.c) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Removed: branches/shell-experiments/base/shell/explorer-new/tbsite.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Copied: branches/shell-experiments/base/shell/explorer-new/tbsite.cpp (from r64404, branches/shell-experiments/base/shell/explorer-new/tbsite.c) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Removed: branches/shell-experiments/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Copied: branches/shell-experiments/base/shell/explorer-new/trayntfy.cpp (from r64404, branches/shell-experiments/base/shell/explorer-new/trayntfy.c) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Removed: branches/shell-experiments/base/shell/explorer-new/trayprop.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Copied: branches/shell-experiments/base/shell/explorer-new/trayprop.cpp (from r64404, branches/shell-experiments/base/shell/explorer-new/trayprop.c) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Removed: branches/shell-experiments/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Copied: branches/shell-experiments/base/shell/explorer-new/traywnd.cpp (from r64404, branches/shell-experiments/base/shell/explorer-new/traywnd.c) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Added: branches/shell-experiments/base/shell/explorer-new/util.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Modified: branches/shell-experiments/dll/win32/browseui/bandsite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro…

1 0

[hpoussin] 65196: [NTFS] Hack fix duplicate directory entries for files having a short name and a long name
by hpoussin＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: hpoussin Date: Sun Nov 2 20:18:34 2014 New Revision: 65196 URL: http://svn.reactos.org/svn/reactos?rev=65196&view=rev Log: [NTFS] Hack fix duplicate directory entries for files having a short name and a long name Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Nov 2 20:18:34 2014 @@ -310,7 +310,7 @@ NTSTATUS Status = STATUS_SUCCESS; PFILE_RECORD_HEADER FileRecord; PNTFS_ATTR_CONTEXT DataContext; - ULONGLONG MFTRecord; + ULONGLONG MFTRecord, OldMFTRecord = 0; UNICODE_STRING Pattern; DPRINT1("NtfsQueryDirectory() called\n"); @@ -405,10 +405,21 @@ &DataContext, &MFTRecord, Fcb->MFTIndex); - //DPRINT("Found %S, Status=%x, entry %x\n", TempFcb.ObjectName, Status, Ccb->Entry); if (NT_SUCCESS(Status)) { + /* HACK: files with both a short name and a long name are present twice in the index. + * Ignore the second entry, if it is immediately following the first one. + */ + if (MFTRecord == OldMFTRecord) + { + DPRINT("Ignoring duplicate MFT entry 0x%x\n", MFTRecord); + Ccb->Entry++; + ExFreePoolWithTag(FileRecord, TAG_NTFS); + continue; + } + OldMFTRecord = MFTRecord; + switch (FileInformationClass) { case FileNameInformation:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs