Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 65115: [FASTFAT] Don't attempt to mount any partition just because we have a valid partition table... Restrict this to them being marked as FAT or compatible.
by pschweitzer＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: pschweitzer Date: Wed Oct 29 22:51:16 2014 New Revision: 65115 URL: http://svn.reactos.org/svn/reactos?rev=65115&view=rev Log: [FASTFAT] Don't attempt to mount any partition just because we have a valid partition table... Restrict this to them being marked as FAT or compatible. Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Wed Oct 29 22:51:16 2014 @@ -89,7 +89,6 @@ return Status; } - PartitionInfoIsValid = TRUE; DPRINT("Partition Information:\n"); DPRINT("StartingOffset %I64x\n", PartitionInfo.StartingOffset.QuadPart / 512); DPRINT("PartitionLength %I64x\n", PartitionInfo.PartitionLength.QuadPart / 512); @@ -108,6 +107,7 @@ PartitionInfo.PartitionType == PARTITION_FAT32_XINT13 || PartitionInfo.PartitionType == PARTITION_XINT13) { + PartitionInfoIsValid = TRUE; *RecognizedFS = TRUE; } } @@ -117,6 +117,7 @@ PartitionInfo.PartitionLength.QuadPart > 0) { /* This is possible a removable media formated as super floppy */ + PartitionInfoIsValid = TRUE; *RecognizedFS = TRUE; } }

1 0

[dquintana] 65114: [RSHELL] * Hopefully fix the start menu closing randomly. May have side-effects, but I think it's best to be conservative here and prefer the possibility of the menu staying open...
by dquintana＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: dquintana Date: Wed Oct 29 22:50:27 2014 New Revision: 65114 URL: http://svn.reactos.org/svn/reactos?rev=65114&view=rev Log: [RSHELL] * Hopefully fix the start menu closing randomly. May have side-effects, but I think it's best to be conservative here and prefer the possibility of the menu staying open unexpectedly, rather than closing unexpectedly. Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Wed Oct 29 22:50:27 2014 @@ -501,6 +501,7 @@ CComPtr<IMenuPopup> oldParent = m_SubMenuParent; + TRACE("OnSelect dwSelectType=%d\n", this, dwSelectType); switch (dwSelectType) { case MPOS_EXECUTE: @@ -705,9 +706,11 @@ LRESULT CMenuDeskBar::_OnAppActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { +#if 0 if (wParam == 0 && m_Shown) { OnSelect(MPOS_FULLCANCEL); } +#endif return 0; }

1 0

[pschweitzer] 65113: [NTFS] Addendum to r65112
by pschweitzer＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: pschweitzer Date: Wed Oct 29 22:40:16 2014 New Revision: 65113 URL: http://svn.reactos.org/svn/reactos?rev=65113&view=rev Log: [NTFS] Addendum to r65112 Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/filesystems/ntfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Wed Oct 29 22:40:16 2014 @@ -715,6 +715,9 @@ /* volinfo.c */ +ULONGLONG +NtfsGetFreeClusters(PDEVICE_EXTENSION DeviceExt); + NTSTATUS NtfsQueryVolumeInformation(PNTFS_IRP_CONTEXT IrpContext); 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] Wed Oct 29 22:40:16 2014 @@ -32,7 +32,6 @@ /* FUNCTIONS ****************************************************************/ -static ULONGLONG NtfsGetFreeClusters(PDEVICE_EXTENSION DeviceExt) {

1 0

[pschweitzer] 65112: [NTFS] Implement support for the FSCTL_GET_NTFS_VOLUME_DATA user request in NtfsUserFsRequest(). This makes NTFSInfo capable of working in ReactOS :-). A picture to show it: ht...
by pschweitzer＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: pschweitzer Date: Wed Oct 29 22:36:55 2014 New Revision: 65112 URL: http://svn.reactos.org/svn/reactos?rev=65112&view=rev Log: [NTFS] Implement support for the FSCTL_GET_NTFS_VOLUME_DATA user request in NtfsUserFsRequest(). This makes NTFSInfo capable of working in ReactOS :-). A picture to show it: http://www.heisspiter.net/~Pierre/rostests/NTFS_info.png Yes, NTFS Zone isn't computed yet. I'll have a look at it later on. This doesn't fix nfi.exe though. If it can get its data, it cannot continue. It loops forever on a FSCTL we don't handle yet. CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Wed Oct 29 22:36:55 2014 @@ -533,6 +533,9 @@ { NTSTATUS Status; PIO_STACK_LOCATION Stack; + PDEVICE_EXTENSION DeviceExt; + PNTFS_VOLUME_DATA_BUFFER DataBuffer; + PNTFS_ATTR_RECORD Attribute; DPRINT1("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp); @@ -540,8 +543,56 @@ switch (Stack->Parameters.FileSystemControl.FsControlCode) { case FSCTL_GET_NTFS_VOLUME_DATA: - UNIMPLEMENTED; - Status = STATUS_NOT_IMPLEMENTED; + DeviceExt = DeviceObject->DeviceExtension; + DataBuffer = (PNTFS_VOLUME_DATA_BUFFER)Irp->UserBuffer; + + if (Stack->Parameters.FileSystemControl.OutputBufferLength < sizeof(NTFS_VOLUME_DATA_BUFFER) || + Irp->UserBuffer == NULL) + { + DPRINT1("Invalid output! %d %p\n", Stack->Parameters.FileSystemControl.OutputBufferLength, Irp->UserBuffer); + Status = STATUS_INVALID_PARAMETER; + break; + } + + DataBuffer->VolumeSerialNumber.QuadPart = DeviceExt->NtfsInfo.SerialNumber; + DataBuffer->NumberSectors.QuadPart = DeviceExt->NtfsInfo.SectorCount; + DataBuffer->TotalClusters.QuadPart = DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster; + DataBuffer->FreeClusters.QuadPart = NtfsGetFreeClusters(DeviceExt); + DataBuffer->TotalReserved.QuadPart = 0LL; // FIXME + DataBuffer->BytesPerSector = DeviceExt->NtfsInfo.BytesPerSector; + DataBuffer->BytesPerCluster = DeviceExt->NtfsInfo.BytesPerCluster; + DataBuffer->BytesPerFileRecordSegment = DeviceExt->NtfsInfo.BytesPerFileRecord; + DataBuffer->ClustersPerFileRecordSegment = DeviceExt->NtfsInfo.BytesPerFileRecord / DeviceExt->NtfsInfo.BytesPerCluster; + DataBuffer->MftStartLcn.QuadPart = DeviceExt->NtfsInfo.MftStart.QuadPart; + DataBuffer->Mft2StartLcn.QuadPart = DeviceExt->NtfsInfo.MftMirrStart.QuadPart; + DataBuffer->MftZoneStart.QuadPart = 0; // FIXME + DataBuffer->MftZoneEnd.QuadPart = 0; // FIXME + + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)DeviceExt->MasterFileTable + DeviceExt->MasterFileTable->AttributeOffset); + while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)DeviceExt->MasterFileTable + DeviceExt->MasterFileTable->BytesInUse) && + Attribute->Type != AttributeEnd) + { + if (Attribute->Type == AttributeData) + { + ASSERT(Attribute->IsNonResident); + DataBuffer->MftValidDataLength.QuadPart = Attribute->NonResident.DataSize; + + break; + } + + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); + } + + if (Stack->Parameters.FileSystemControl.OutputBufferLength >= sizeof(NTFS_EXTENDED_VOLUME_DATA) + sizeof(NTFS_VOLUME_DATA_BUFFER)) + { + PNTFS_EXTENDED_VOLUME_DATA ExtendedData = (PNTFS_EXTENDED_VOLUME_DATA)((ULONG_PTR)Irp->UserBuffer + sizeof(NTFS_VOLUME_DATA_BUFFER)); + + ExtendedData->ByteCount = sizeof(NTFS_EXTENDED_VOLUME_DATA); + ExtendedData->MajorVersion = DeviceExt->NtfsInfo.MajorVersion; + ExtendedData->MinorVersion = DeviceExt->NtfsInfo.MinorVersion; + } + + Status = STATUS_SUCCESS; break; default:

1 0

[dquintana] 65111: [BROWSEUI] * Allow the static items in the Favorites menu to be received by the shell browse window. * Handle the Organize Favorites menu item by opening either the USER favorite...
by dquintana＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: dquintana Date: Wed Oct 29 22:28:51 2014 New Revision: 65111 URL: http://svn.reactos.org/svn/reactos?rev=65111&view=rev Log: [BROWSEUI] * Allow the static items in the Favorites menu to be received by the shell browse window. * Handle the Organize Favorites menu item by opening either the USER favorites, or the COMMON version of the folder. [RSHELL] * Send the proper HWND together with the HMENU, when sending callbacks. Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.h branches/shell-experiments/base/shell/rshell/precomp.h branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/include/reactos/undocshell.h Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] Wed Oct 29 22:28:51 2014 @@ -2929,7 +2929,7 @@ { /* TODO: Implement properly */ - LPCWSTR strSite = L"http://www.reactos.org/"; + LPCWSTR strSite = L"https://www.reactos.org/"; /* TODO: Make localizable */ LPCWSTR strCaption = L"Sorry"; Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Wed Oct 29 22:28:51 2014 @@ -738,18 +738,14 @@ if (!m_psmc) return S_FALSE; - HWND hwnd; - GetWindow(&hwnd); - SMDATA smData = { 0 }; smData.punk = static_cast<IShellMenu2*>(this); smData.uId = id; smData.uIdParent = m_uId; smData.uIdAncestor = m_uIdAncestor; smData.pidlItem = pidl; - smData.hwnd = hwnd; - if (m_hmenu) - smData.hmenu = m_hmenu; + smData.hwnd = m_menuOwner ? m_menuOwner : m_topLevelWindow; + smData.hmenu = m_hmenu; smData.pvUserData = NULL; if (m_SFToolbar) m_SFToolbar->GetShellFolder(NULL, &smData.pidlFolder, IID_PPV_ARG(IShellFolder, &smData.psf)); Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Wed Oct 29 22:28:51 2014 @@ -1111,7 +1111,8 @@ CMenuStaticToolbar::CMenuStaticToolbar(CMenuBand *menuBand) : CMenuToolbarBase(menuBand, FALSE), - m_hmenu(NULL) + m_hmenu(NULL), + m_hwndMenu(NULL) { } @@ -1127,7 +1128,7 @@ if (phmenu) *phmenu = m_hmenu; if (phwnd) - *phwnd = NULL; + *phwnd = m_hwndMenu; if (pdwFlags) *pdwFlags = m_dwMenuFlags; @@ -1140,6 +1141,7 @@ DWORD dwFlags) { m_hmenu = hmenu; + m_hwndMenu = hwnd; m_dwMenuFlags = dwFlags; return S_OK; Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] Wed Oct 29 22:28:51 2014 @@ -137,6 +137,7 @@ { private: HMENU m_hmenu; + HWND m_hwndMenu; public: CMenuStaticToolbar(CMenuBand *menuBand); Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Wed Oct 29 22:28:51 2014 @@ -68,8 +68,6 @@ #endif #define shell32_hInstance 0 -#define SMC_EXEC 4 -extern "C" INT WINAPI Shell_GetCachedImageIndex(LPCWSTR szPath, INT nIndex, UINT bSimulateDoc); extern "C" HRESULT WINAPI CStartMenu_Constructor(REFIID riid, void **ppv); extern "C" HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv); Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Wed Oct 29 22:28:51 2014 @@ -645,6 +645,9 @@ case SMC_GETOBJECT: return GetObject(psmd, *reinterpret_cast<IID *>(wParam), reinterpret_cast<void **>(lParam)); case SMC_GETSFOBJECT: + break; + case SMC_EXEC: + PostMessageW(psmd->hwnd, WM_COMMAND, psmd->uId, 0); break; case SMC_SFEXEC: SHInvokeDefaultCommand(psmd->hwnd, psmd->psf, psmd->pidlItem); Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Wed Oct 29 22:28:51 2014 @@ -22,6 +22,7 @@ #include <shellapi.h> #include <htiframe.h> +#include <strsafe.h> extern "C" BOOL WINAPI Shell_GetImageLists( @@ -633,6 +634,7 @@ LRESULT OnBackspace(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnGoHome(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnIsThisLegal(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); + LRESULT OnOrganizeFavorites(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnToggleStatusBarVisible(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnToggleToolbarLock(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnToggleToolbarBandVisible(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); @@ -672,6 +674,7 @@ COMMAND_ID_HANDLER(IDM_GOTO_FORWARD, OnGoForward) COMMAND_ID_HANDLER(IDM_GOTO_UPONELEVEL, OnGoUpLevel) COMMAND_ID_HANDLER(IDM_GOTO_HOMEPAGE, OnGoHome) + COMMAND_ID_HANDLER(IDM_FAVORITES_ORGANIZEFAVORITES, OnOrganizeFavorites) COMMAND_ID_HANDLER(IDM_HELP_ISTHISCOPYLEGAL, OnIsThisLegal) COMMAND_ID_HANDLER(IDM_VIEW_STATUSBAR, OnToggleStatusBarVisible) COMMAND_ID_HANDLER(IDM_TOOLBARS_LOCKTOOLBARS, OnToggleToolbarLock) @@ -1871,7 +1874,7 @@ hResult = GetMenuBand(IID_PPV_ARG(IShellMenu, &shellMenu)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = shellMenu->SetMenu(hmenuShared, NULL, SMSET_DONTOWN); + hResult = shellMenu->SetMenu(hmenuShared, m_hWnd, SMSET_DONTOWN); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; fCurrentMenuBar = hmenuShared; @@ -3252,9 +3255,54 @@ return 0; } +LRESULT CShellBrowser::OnOrganizeFavorites(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) +{ + CComPtr<IShellFolder> psfDesktop; + LPITEMIDLIST pidlFavs; + HRESULT hr; + hr = SHGetSpecialFolderLocation(m_hWnd, CSIDL_FAVORITES, &pidlFavs); + if (FAILED(hr)) + { + hr = SHGetSpecialFolderLocation(m_hWnd, CSIDL_COMMON_FAVORITES, &pidlFavs); + if (FAILED(hr)) + return 0; + } + + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; + + hr = SHInvokeDefaultCommand(m_hWnd, psfDesktop, pidlFavs); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; + + return 0; +} + LRESULT CShellBrowser::OnIsThisLegal(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - ShellExecute(m_hWnd, NULL, L"https://reactos.org/user-faq", NULL, NULL, SW_SHOWNORMAL); + /* TODO: Implement properly */ + + LPCWSTR strSite = L"https://www.reactos.org/user-faq"; + + /* TODO: Make localizable */ + LPCWSTR strCaption = L"Sorry"; + LPCWSTR strMessage = L"ReactOS could not browse to '%s' (error %d). Please make sure there is a web browser installed."; + WCHAR tmpMessage[512]; + + /* TODO: Read from the registry */ + LPCWSTR strVerb = NULL; /* default */ + LPCWSTR strPath = strSite; + LPCWSTR strParams = NULL; + + /* The return value is defined as HINSTANCE for backwards compatibility only, the cast is needed */ + int result = (int) ShellExecuteW(m_hWnd, strVerb, strPath, strParams, NULL, SW_SHOWNORMAL); + if (result <= 32) + { + StringCchPrintfW(tmpMessage, 512, strMessage, strSite, result); + MessageBoxExW(m_hWnd, tmpMessage, strCaption, MB_OK, 0); + } + return 0; } Modified: branches/shell-experiments/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… ============================================================================== --- branches/shell-experiments/include/reactos/undocshell.h [iso-8859-1] (original) +++ branches/shell-experiments/include/reactos/undocshell.h [iso-8859-1] Wed Oct 29 22:28:51 2014 @@ -531,6 +531,9 @@ /* Utility functions */ #include <stdio.h> + +#define SMC_EXEC 4 +extern "C" INT WINAPI Shell_GetCachedImageIndex(LPCWSTR szPath, INT nIndex, UINT bSimulateDoc); static inline ULONG Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...)

1 0

[spetreolle] 65110: [NTOSKRNL] Reapply r65107. We need fixes, not hacks. Sorry for being popular^W pressure ; )
by spetreolle＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: spetreolle Date: Wed Oct 29 22:22:24 2014 New Revision: 65110 URL: http://svn.reactos.org/svn/reactos?rev=65110&view=rev Log: [NTOSKRNL] Reapply r65107. We need fixes, not hacks. Sorry for being popular^W pressure ;) Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Wed Oct 29 22:22:24 2014 @@ -419,7 +419,7 @@ DirectOpen = TRUE; } -#if 1 +#if 0 /* FIXME: Small hack still exists, have to check why... * This is triggered multiple times by usetup and then once per boot. */

1 0

[ekohl] 65109: [NETAPI32] NetUserModalsGet: - Return the proper maximum password age. - Remove dead code.
by ekohl＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: ekohl Date: Wed Oct 29 22:17:23 2014 New Revision: 65109 URL: http://svn.reactos.org/svn/reactos?rev=65109&view=rev Log: [NETAPI32] NetUserModalsGet: - Return the proper maximum password age. - Remove dead code. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Wed Oct 29 22:17:23 2014 @@ -3414,7 +3414,7 @@ umi0 = (PUSER_MODALS_INFO_0)*bufptr; umi0->usrmod0_min_passwd_len = PasswordInfo->MinPasswordLength; - umi0->usrmod0_max_passwd_age = (ULONG)(PasswordInfo->MaxPasswordAge.QuadPart / 10000000); + umi0->usrmod0_max_passwd_age = (ULONG)(-PasswordInfo->MaxPasswordAge.QuadPart / 10000000); umi0->usrmod0_min_passwd_age = DeltaTimeToSeconds(PasswordInfo->MinPasswordAge); umi0->usrmod0_force_logoff = @@ -3427,10 +3427,6 @@ switch (ServerRoleInfo->DomainServerRole) { - - umi1->usrmod1_role = UAS_ROLE_STANDALONE; - umi1->usrmod1_role = UAS_ROLE_MEMBER; - case DomainServerRolePrimary: umi1->usrmod1_role = UAS_ROLE_PRIMARY; break;

1 0

[spetreolle] 65108: [UNIATA] Update to 0.45c1.
by spetreolle＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: spetreolle Date: Wed Oct 29 21:34:01 2014 New Revision: 65108 URL: http://svn.reactos.org/svn/reactos?rev=65108&view=rev Log: [UNIATA] Update to 0.45c1. Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Wed Oct 29 21:34:01 2014 @@ -4020,8 +4020,13 @@ } chan->ChannelCtrlFlags &= ~CTRFLAGS_INTR_DISABLED; } else { - AtapiWritePort1(chan, IDX_IO2_o_Control, + if(deviceExtension->HwFlags & UNIATA_AHCI) { + // keep interrupts disabled + UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_IE, 0); + } else { + AtapiWritePort1(chan, IDX_IO2_o_Control, IDE_DC_DISABLE_INTERRUPTS /*| IDE_DC_A_4BIT*/ ); + } } return; } // end AtapiEnableInterrupts() Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Wed Oct 29 21:34:01 2014 @@ -522,7 +522,8 @@ ScsiPortFreeDeviceBase(HwDeviceExtension, deviceExtension->BaseIoAddressBM_0); - deviceExtension->BaseIoAddressBM_0 = 0; + deviceExtension->BaseIoAddressBM_0.Addr = 0; + deviceExtension->BaseIoAddressBM_0.MemIo = 0; deviceExtension->BusMaster = DMA_MODE_NONE; deviceExtension->MaxTransferMode = ATA_PIO4; break; @@ -1170,22 +1171,61 @@ break; } if(deviceExtension->MaxTransferMode >= ATA_SA150) { + + BOOLEAN OrigAHCI = FALSE; + GetPciConfig1(0x90, tmp8); KdPrint2((PRINT_PREFIX "Intel chip config: %x\n", tmp8)); /* SATA parts can be either compat or AHCI */ + MemIo = FALSE; if(ChipFlags & UNIATA_AHCI) { - + OrigAHCI = TRUE; if(tmp8 & 0xc0) { //KdPrint2((PRINT_PREFIX "AHCI not supported yet\n")); //return FALSE; KdPrint2((PRINT_PREFIX "try run AHCI\n")); break; } - KdPrint2((PRINT_PREFIX "Compatible mode\n")); + BaseIoAddressBM = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber, + 4, 0, sizeof(IDE_BUSMASTER_REGISTERS)); + if(BaseIoAddressBM) { + KdPrint2((PRINT_PREFIX "Intel BM check at %x\n", BaseIoAddressBM)); + /* check if we really have valid BM registers */ + if((*ConfigInfo->AccessRanges)[4].RangeInMemory) { + KdPrint2((PRINT_PREFIX "MemIo[4]\n")); + MemIo = TRUE; + } + deviceExtension->BaseIoAddressBM_0.Addr = BaseIoAddressBM; + deviceExtension->BaseIoAddressBM_0.MemIo = MemIo; + + tmp8 = AtapiReadPortEx1(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),IDX_BM_Status); + KdPrint2((PRINT_PREFIX "BM status: %x\n", tmp8)); + /* cleanup */ + ScsiPortFreeDeviceBase(HwDeviceExtension, (PCHAR)BaseIoAddressBM); + deviceExtension->BaseIoAddressBM_0.Addr = 0; + deviceExtension->BaseIoAddressBM_0.MemIo = 0; + + if(tmp8 == 0xff) { + KdPrint2((PRINT_PREFIX "invalid BM status, keep AHCI mode\n")); + break; + } + } + KdPrint2((PRINT_PREFIX "Compatible mode, reallocate LUNs\n")); + deviceExtension->NumberLuns = 2; // we may be in Legacy mode + if(!UniataAllocateLunExt(deviceExtension, 2)) { + KdPrint2((PRINT_PREFIX "can't re-allocate Luns\n")); + return STATUS_UNSUCCESSFUL; + } } deviceExtension->HwFlags &= ~UNIATA_AHCI; + MemIo = FALSE; /* if BAR(5) is IO it should point to SATA interface registers */ + if(OrigAHCI) { + /* Skip BAR(5) in compatible mode */ + KdPrint2((PRINT_PREFIX "Ignore BAR5 on compatible\n")); + BaseMemAddress = 0; + } else if(deviceExtension->DevID == 0x28288086 && pciData->u.type0.SubVendorID == 0x106b) { /* Skip BAR(5) on ICH8M Apples, system locks up on access. */ @@ -1195,7 +1235,7 @@ BaseMemAddress = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber, 5, 0, 0x10); if(BaseMemAddress && (*ConfigInfo->AccessRanges)[5].RangeInMemory) { - KdPrint2((PRINT_PREFIX "MemIo\n")); + KdPrint2((PRINT_PREFIX "MemIo[5]\n")); MemIo = TRUE; } } Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] Wed Oct 29 21:34:01 2014 @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "45b1" -#define UNIATA_VER_DOT 0.45.2.1 +#define UNIATA_VER_STR "45c1" +#define UNIATA_VER_DOT 0.45.3.1 #define UNIATA_VER_MJ 0 #define UNIATA_VER_MN 45 #define UNIATA_VER_SUB_MJ 2 #define UNIATA_VER_SUB_MN 1 -#define UNIATA_VER_DOT_COMMA 0,45,2,1 -#define UNIATA_VER_DOT_STR "0.45.2.1" +#define UNIATA_VER_DOT_COMMA 0,45,3,1 +#define UNIATA_VER_DOT_STR "0.45.3.1" #define UNIATA_VER_YEAR 2014 #define UNIATA_VER_YEAR_STR "2014"

1 0

[pschweitzer] 65107: [NTOSKRNL] Reenable hack due to popular pressure. Still better than fixing it, it seems... So, break again volume opening.
by pschweitzer＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: pschweitzer Date: Wed Oct 29 21:22:36 2014 New Revision: 65107 URL: http://svn.reactos.org/svn/reactos?rev=65107&view=rev Log: [NTOSKRNL] Reenable hack due to popular pressure. Still better than fixing it, it seems... So, break again volume opening. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Wed Oct 29 21:22:36 2014 @@ -419,7 +419,7 @@ DirectOpen = TRUE; } -#if 0 +#if 1 /* FIXME: Small hack still exists, have to check why... * This is triggered multiple times by usetup and then once per boot. */

1 0

[pschweitzer] 65106: [NTFS] Finally, move old stuff back from disk.sys to ntfs.sys now it can be properly reached on volume opening: - Halfplement NtfsUserFsRequest() and add support for IRP_MN_USE...
by pschweitzer＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: pschweitzer Date: Wed Oct 29 18:42:05 2014 New Revision: 65106 URL: http://svn.reactos.org/svn/reactos?rev=65106&view=rev Log: [NTFS] Finally, move old stuff back from disk.sys to ntfs.sys now it can be properly reached on volume opening: - Halfplement NtfsUserFsRequest() and add support for IRP_MN_USER_FS_REQUEST in NtfsFsdFileSystemControl() - Also, use the proper FSCTL code: FSCTL_GET_NTFS_VOLUME_DATA which exists and is documented instead of FSCTL_GET_NTFS_VOLUME_DATA. Spotted by Christoph. CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Wed Oct 29 18:42:05 2014 @@ -526,6 +526,34 @@ } +static +NTSTATUS +NtfsUserFsRequest(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + NTSTATUS Status; + PIO_STACK_LOCATION Stack; + + DPRINT1("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp); + + Stack = IoGetCurrentIrpStackLocation(Irp); + switch (Stack->Parameters.FileSystemControl.FsControlCode) + { + case FSCTL_GET_NTFS_VOLUME_DATA: + UNIMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; + break; + + default: + DPRINT1("Invalid user request: %x\n", Stack->Parameters.FileSystemControl.FsControlCode); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + return Status; +} + + NTSTATUS NTAPI NtfsFsdFileSystemControl(PDEVICE_OBJECT DeviceObject, @@ -541,9 +569,12 @@ switch (Stack->MinorFunction) { case IRP_MN_KERNEL_CALL: + DPRINT1("NTFS: IRP_MN_USER_FS_REQUEST\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + case IRP_MN_USER_FS_REQUEST: - DPRINT("NTFS: IRP_MN_USER_FS_REQUEST/IRP_MN_KERNEL_CALL\n"); - Status = STATUS_INVALID_DEVICE_REQUEST; + Status = NtfsUserFsRequest(DeviceObject, Irp); break; case IRP_MN_MOUNT_VOLUME: @@ -557,7 +588,7 @@ break; default: - DPRINT("NTFS FSC: MinorFunction %d\n", Stack->MinorFunction); + DPRINT1("NTFS FSC: MinorFunction %d\n", Stack->MinorFunction); Status = STATUS_INVALID_DEVICE_REQUEST; break; }

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