Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 65045: [ADVAPI32] * Remove unused MAX_GUID_STRING_LEN and RECORD. * Remove some unneeded forward declarations. * Reorder ACEFLAG to reduce difference to Wine. CORE-8540
by akhaldi＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: akhaldi Date: Mon Oct 27 17:00:41 2014 New Revision: 65045 URL: http://svn.reactos.org/svn/reactos?rev=65045&view=rev Log: [ADVAPI32] * Remove unused MAX_GUID_STRING_LEN and RECORD. * Remove some unneeded forward declarations. * Reorder ACEFLAG to reduce difference to Wine. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Mon Oct 27 17:00:41 2014 @@ -16,26 +16,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); -static DWORD ComputeStringSidSize(LPCWSTR StringSid); static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes); -#define MAX_GUID_STRING_LEN 39 - -BOOL WINAPI -AddAuditAccessAceEx(PACL pAcl, - DWORD dwAceRevision, - DWORD AceFlags, - DWORD dwAccessMask, - PSID pSid, - BOOL bAuditSuccess, - BOOL bAuditFailure); - -typedef struct RECORD -{ - LPCWSTR key; - DWORD value; -} RECORD; - +typedef struct _ACEFLAG +{ + LPCWSTR wstr; + DWORD value; +} ACEFLAG, *LPACEFLAG; typedef struct _MAX_SID { @@ -52,12 +39,6 @@ WELL_KNOWN_SID_TYPE Type; MAX_SID Sid; } WELLKNOWNSID; - -typedef struct _ACEFLAG -{ - LPCWSTR wstr; - DWORD value; -} ACEFLAG, *LPACEFLAG; static const WELLKNOWNSID WellKnownSids[] = {

1 0

[akhaldi] 65044: [ADVAPI32] * Zap SidTable.
by akhaldi＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: akhaldi Date: Mon Oct 27 16:30:45 2014 New Revision: 65044 URL: http://svn.reactos.org/svn/reactos?rev=65044&view=rev Log: [ADVAPI32] * Zap SidTable. Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Mon Oct 27 16:30:45 2014 @@ -236,49 +236,6 @@ return NT_SUCCESS(status); } -static const RECORD SidTable[] = -{ - { SDDL_ACCOUNT_OPERATORS, WinBuiltinAccountOperatorsSid }, - { SDDL_ALIAS_PREW2KCOMPACC, WinBuiltinPreWindows2000CompatibleAccessSid }, - { SDDL_ANONYMOUS, WinAnonymousSid }, - { SDDL_AUTHENTICATED_USERS, WinAuthenticatedUserSid }, - { SDDL_BUILTIN_ADMINISTRATORS, WinBuiltinAdministratorsSid }, - { SDDL_BUILTIN_GUESTS, WinBuiltinGuestsSid }, - { SDDL_BACKUP_OPERATORS, WinBuiltinBackupOperatorsSid }, - { SDDL_BUILTIN_USERS, WinBuiltinUsersSid }, - { SDDL_CERT_SERV_ADMINISTRATORS, WinAccountCertAdminsSid /* FIXME: DOMAIN_GROUP_RID_CERT_ADMINS */ }, - { SDDL_CREATOR_GROUP, WinCreatorGroupSid }, - { SDDL_CREATOR_OWNER, WinCreatorOwnerSid }, - { SDDL_DOMAIN_ADMINISTRATORS, WinAccountDomainAdminsSid /* FIXME: DOMAIN_GROUP_RID_ADMINS */ }, - { SDDL_DOMAIN_COMPUTERS, WinAccountComputersSid /* FIXME: DOMAIN_GROUP_RID_COMPUTERS */ }, - { SDDL_DOMAIN_DOMAIN_CONTROLLERS, WinAccountControllersSid /* FIXME: DOMAIN_GROUP_RID_CONTROLLERS */ }, - { SDDL_DOMAIN_GUESTS, WinAccountDomainGuestsSid /* FIXME: DOMAIN_GROUP_RID_GUESTS */ }, - { SDDL_DOMAIN_USERS, WinAccountDomainUsersSid /* FIXME: DOMAIN_GROUP_RID_USERS */ }, - { SDDL_ENTERPRISE_ADMINS, WinAccountEnterpriseAdminsSid /* FIXME: DOMAIN_GROUP_RID_ENTERPRISE_ADMINS */ }, - { SDDL_ENTERPRISE_DOMAIN_CONTROLLERS, WinEnterpriseControllersSid }, - { SDDL_EVERYONE, WinWorldSid }, - { SDDL_GROUP_POLICY_ADMINS, WinAccountPolicyAdminsSid /* FIXME: DOMAIN_GROUP_RID_POLICY_ADMINS */ }, - { SDDL_INTERACTIVE, WinInteractiveSid }, - { SDDL_LOCAL_ADMIN, WinAccountAdministratorSid /* FIXME: DOMAIN_USER_RID_ADMIN */ }, - { SDDL_LOCAL_GUEST, WinAccountGuestSid /* FIXME: DOMAIN_USER_RID_GUEST */ }, - { SDDL_LOCAL_SERVICE, WinLocalServiceSid }, - { SDDL_LOCAL_SYSTEM, WinLocalSystemSid }, - { SDDL_NETWORK, WinNetworkSid }, - { SDDL_NETWORK_CONFIGURATION_OPS, WinBuiltinNetworkConfigurationOperatorsSid }, - { SDDL_NETWORK_SERVICE, WinNetworkServiceSid }, - { SDDL_PRINTER_OPERATORS, WinBuiltinPrintOperatorsSid }, - { SDDL_PERSONAL_SELF, WinSelfSid }, - { SDDL_POWER_USERS, WinBuiltinPowerUsersSid }, - { SDDL_RAS_SERVERS, WinAccountRasAndIasServersSid /* FIXME: DOMAIN_ALIAS_RID_RAS_SERVERS */ }, - { SDDL_REMOTE_DESKTOP, WinBuiltinRemoteDesktopUsersSid }, - { SDDL_REPLICATOR, WinBuiltinReplicatorSid }, - { SDDL_RESTRICTED_CODE, WinRestrictedCodeSid }, - { SDDL_SCHEMA_ADMINISTRATORS, WinAccountSchemaAdminsSid /* FIXME: DOMAIN_GROUP_RID_SCHEMA_ADMINS */ }, - { SDDL_SERVER_OPERATORS, WinBuiltinSystemOperatorsSid }, - { SDDL_SERVICE, WinServiceSid }, - { NULL, 0 }, -}; - static LPWSTR SERV_dup( LPCSTR str ) { UINT len;

1 0

[pschweitzer] 65043: [FASTFAT] Don't leak reference in case of share access failure.
by pschweitzer＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: pschweitzer Date: Mon Oct 27 13:39:03 2014 New Revision: 65043 URL: http://svn.reactos.org/svn/reactos?rev=65043&view=rev Log: [FASTFAT] Don't leak reference in case of share access failure. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Mon Oct 27 13:39:03 2014 @@ -443,9 +443,9 @@ PVFATFCB pFcb = NULL; PVFATFCB ParentFcb = NULL; PWCHAR c, last; - BOOLEAN PagingFileCreate = FALSE; + BOOLEAN PagingFileCreate; BOOLEAN Dots; - BOOLEAN OpenTargetDir = FALSE; + BOOLEAN OpenTargetDir; UNICODE_STRING FileNameU; UNICODE_STRING PathNameU; ULONG Attributes; @@ -633,6 +633,7 @@ FALSE); if (!NT_SUCCESS(Status)) { + vfatReleaseFCB(DeviceExt, ParentFcb); VfatCloseFile(DeviceExt, FileObject); return Status; }

1 0

[pschweitzer] 65042: [FASTFAT] Add sanity checks in VfatSetRenameInformation() to make sure we don't leak any FCB reference
by pschweitzer＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: pschweitzer Date: Mon Oct 27 13:38:14 2014 New Revision: 65042 URL: http://svn.reactos.org/svn/reactos?rev=65042&view=rev Log: [FASTFAT] Add sanity checks in VfatSetRenameInformation() to make sure we don't leak any FCB reference Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Mon Oct 27 13:38:14 2014 @@ -473,6 +473,8 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE TargetHandle; BOOLEAN DeletedTarget; + ULONG OldReferences, NewReferences; + PVFATFCB OldParent; DPRINT("VfatSetRenameInfo(%p, %p, %p, %p, %p)\n", FileObject, FCB, DeviceExt, RenameInfo, TargetFileObject); @@ -481,6 +483,8 @@ { return STATUS_INVALID_PARAMETER; } + + OldReferences = FCB->parentFcb->RefCount; /* If we are performing relative opening for rename, get FO for getting FCB and path name */ if (RenameInfo->RootDirectory != NULL) @@ -686,6 +690,7 @@ if (FsRtlAreNamesEqual(&SourceFile, &NewFile, FALSE, NULL)) { Status = STATUS_SUCCESS; + ASSERT(OldReferences == FCB->parentFcb->RefCount); goto Cleanup; } @@ -729,6 +734,8 @@ &DeletedTarget); if (!NT_SUCCESS(Status)) { + ASSERT(OldReferences == FCB->parentFcb->RefCount - 1); + ASSERT(OldReferences == ParentFCB->RefCount - 1); goto Cleanup; } @@ -773,11 +780,16 @@ } } } + + ASSERT(OldReferences == FCB->parentFcb->RefCount - 1); // extra grab + ASSERT(OldReferences == ParentFCB->RefCount - 1); // extra grab } else { + /* Try to find target */ ParentFCB = NULL; + OldParent = FCB->parentFcb; Status = vfatPrepareTargetForRename(DeviceExt, &ParentFCB, &NewName, @@ -786,8 +798,11 @@ &DeletedTarget); if (!NT_SUCCESS(Status)) { + ASSERT(OldReferences == FCB->parentFcb->RefCount); goto Cleanup; } + + NewReferences = ParentFCB->RefCount; FsRtlNotifyFullReportChange(DeviceExt->NotifySync, &(DeviceExt->NotifyList), @@ -831,6 +846,8 @@ } } + ASSERT(OldReferences == OldParent->RefCount + 1); // removed file + ASSERT(NewReferences == ParentFCB->RefCount - 1); // new file Cleanup: if (ParentFCB != NULL) vfatReleaseFCB(DeviceExt, ParentFCB); if (NewName.Buffer != NULL) ExFreePoolWithTag(NewName.Buffer, TAG_VFAT);

1 0

[pschweitzer] 65041: [NTFS] Bugfixing... Part 10/X: - Properly compute entry name length in CompareFileName() - Also, in CompareFileName() properly handle the return of RtlCompareUnicodeString(); t...
by pschweitzer＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: pschweitzer Date: Mon Oct 27 12:35:58 2014 New Revision: 65041 URL: http://svn.reactos.org/svn/reactos?rev=65041&view=rev Log: [NTFS] Bugfixing... Part 10/X: - Properly compute entry name length in CompareFileName() - Also, in CompareFileName() properly handle the return of RtlCompareUnicodeString(); this is not RtlEqualUnicodeString()! - In NtfsLookupFileAt(), don't return an error when we're done walking the path, it's a normal behavior All these fixes allow our NTFS to go one step farther: it can open directory/files (reading files data remains untested so far) in root and in its subdirs. Which was broken previously. The said bugfixes in action (and in image): http://www.heisspiter.net/~Pierre/rostests/NTFS_listing_subdir.png Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c 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] Mon Oct 27 12:35:58 2014 @@ -469,7 +469,7 @@ EntryName.Buffer = IndexEntry->FileName.Name; EntryName.Length = - EntryName.MaximumLength = IndexEntry->FileName.NameLength; + EntryName.MaximumLength = IndexEntry->FileName.NameLength * sizeof(WCHAR); if (DirSearch) { @@ -477,7 +477,7 @@ } else { - return (RtlCompareUnicodeString(FileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX)) == TRUE); + return (RtlCompareUnicodeString(FileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX)) == 0); } } @@ -702,7 +702,7 @@ } if (Remaining.Length == 0) - return STATUS_OBJECT_PATH_NOT_FOUND; + break; FsRtlDissectName(Current, &Current, &Remaining); }

1 0

[tfaber] 65040: [ADVAPI32] - Hackfix CORE-8717 to stop 2nd stage from failing. Proper fix will be submitted to Wine.
by tfaber＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: tfaber Date: Mon Oct 27 11:52:44 2014 New Revision: 65040 URL: http://svn.reactos.org/svn/reactos?rev=65040&view=rev Log: [ADVAPI32] - Hackfix CORE-8717 to stop 2nd stage from failing. Proper fix will be submitted to Wine. Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Mon Oct 27 11:52:44 2014 @@ -3533,6 +3533,9 @@ while (*StringSid == ' ') StringSid++; + if (!*StringSid) + goto lend; /* ERROR_INVALID_SID */ + *cBytes = ComputeStringSidSize(StringSid); if (!pisid) /* Simply compute the size */ {

1 0

[jimtabor] 65039: [NtUser] - Fix default sizes for desktop resources. See CORE-8659.
by jimtabor＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: jimtabor Date: Mon Oct 27 02:11:08 2014 New Revision: 65039 URL: http://svn.reactos.org/svn/reactos?rev=65039&view=rev Log: [NtUser] - Fix default sizes for desktop resources. See CORE-8659. Modified: trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Mon Oct 27 02:11:08 2014 @@ -24,6 +24,10 @@ IntFreeDesktopHeap(IN PDESKTOP pdesk); /* GLOBALS *******************************************************************/ + +/* These can be changed via csrss startup, these are defaults */ +DWORD gdwDesktopSectionSize = 512; +DWORD gdwNOIOSectionSize = 128; // A guess, for one or more of the first three system desktops. /* Currently active desktop */ PDESKTOP gpdeskInputDesktop = NULL; @@ -1194,7 +1198,7 @@ UserInitializeDesktop(PDESKTOP pdesk, PUNICODE_STRING DesktopName, PWINSTATION_OBJECT pwinsta) { PVOID DesktopHeapSystemBase = NULL; - ULONG_PTR HeapSize = 400 * 1024; + ULONG_PTR HeapSize = gdwDesktopSectionSize * 1024; SIZE_T DesktopInfoSize; ULONG i;

1 0

[gadamopoulos] 65038: [BEOWSEUI] - Simplify shellbrowser.cpp a bit
by gadamopoulos＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: gadamopoulos Date: Mon Oct 27 00:39:53 2014 New Revision: 65038 URL: http://svn.reactos.org/svn/reactos?rev=65038&view=rev Log: [BEOWSEUI] - Simplify shellbrowser.cpp a bit Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp 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] Mon Oct 27 00:39:53 2014 @@ -1097,7 +1097,6 @@ HRESULT CShellBrowser::GetMenuBand(REFIID riid, void **shellMenu) { - CComPtr<IServiceProvider> serviceProvider; CComPtr<IBandSite> bandSite; CComPtr<IDeskBand> deskBand; HRESULT hResult; @@ -1121,7 +1120,6 @@ CComPtr<IUnknown> newBaseBar; CComPtr<IDeskBar> deskBar; CComPtr<IUnknown> newBaseBarSite; - CComPtr<IObjectWithSite> objectWithSite; CComPtr<IDeskBarClient> deskBarClient; IUnknown **cache; HRESULT hResult; @@ -1140,10 +1138,7 @@ return hResult; // tell the new base bar about the shell browser - hResult = newBaseBar->QueryInterface(IID_PPV_ARG(IObjectWithSite, &objectWithSite)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = objectWithSite->SetSite(static_cast<IDropTarget *>(this)); + hResult = IUnknown_SetSite(newBaseBar, static_cast<IDropTarget *>(this)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; @@ -1171,7 +1166,6 @@ HRESULT CShellBrowser::ShowBand(const CLSID &classID, bool vertical) { CComPtr<IDockingWindow> dockingWindow; - CComPtr<IOleCommandTarget> oleCommandTarget; CComPtr<IUnknown> baseBarSite; CComPtr<IUnknown> newBand; CComPtr<IUnknown> theBaseBar; @@ -1194,12 +1188,9 @@ hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = baseBarSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; V_VT(&vaIn) = VT_UNKNOWN; V_UNKNOWN(&vaIn) = newBand.p; - hResult = oleCommandTarget->Exec(&CGID_IDeskBand, 1, 1, &vaIn, NULL); + hResult = IUnknown_Exec(baseBarSite, CGID_IDeskBand, 1, 1, &vaIn, NULL); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = dockingWindow->ShowDW(TRUE); @@ -1210,14 +1201,11 @@ HRESULT CShellBrowser::NavigateToParent() { - LPITEMIDLIST newDirectory; - HRESULT hResult; - - newDirectory = ILClone(fCurrentDirectoryPIDL); + LPITEMIDLIST newDirectory = ILClone(fCurrentDirectoryPIDL); if (newDirectory == NULL) return E_OUTOFMEMORY; ILRemoveLastID(newDirectory); - hResult = BrowseToPIDL(newDirectory, BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); + HRESULT hResult = BrowseToPIDL(newDirectory, BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); ILFree(newDirectory); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; @@ -1226,9 +1214,7 @@ BOOL CALLBACK AddFolderOptionsPage(HPROPSHEETPAGE thePage, LPARAM lParam) { - PROPSHEETHEADER *sheetInfo; - - sheetInfo = (PROPSHEETHEADER *)lParam; + PROPSHEETHEADER* sheetInfo = reinterpret_cast<PROPSHEETHEADER*>(lParam); if (sheetInfo->nPages >= folderOptionsPageCountMax) return FALSE; sheetInfo->phpage[sheetInfo->nPages] = thePage; @@ -1239,7 +1225,6 @@ HRESULT CShellBrowser::DoFolderOptions() { CComPtr<IShellPropSheetExt> folderOptionsSheet; - CComPtr<IObjectWithSite> objectWithSite; PROPSHEETHEADER m_PropSheet; HPROPSHEETPAGE m_psp[folderOptionsPageCountMax]; // CComPtr<IGlobalFolderSettings> globalSettings; @@ -1256,9 +1241,7 @@ return E_FAIL; // must set site in order for Apply to all Folders on Advanced page to be enabled - hResult = folderOptionsSheet->QueryInterface(IID_PPV_ARG(IObjectWithSite, &objectWithSite)); - if (SUCCEEDED(hResult) && objectWithSite.p != NULL) - hResult = objectWithSite->SetSite(static_cast<IDispatch *>(this)); + hResult = IUnknown_SetSite(folderOptionsSheet, static_cast<IDispatch *>(this)); m_PropSheet.phpage = m_psp; #if 0 @@ -1553,7 +1536,6 @@ void CShellBrowser::UpdateViewMenu(HMENU theMenu) { - CComPtr<IOleCommandTarget> oleCommandTarget; CComPtr<ITravelLog> travelLog; HMENU gotoMenu; OLECMD commandList[5]; @@ -1572,10 +1554,8 @@ commandList[3].cmdID = ITID_TOOLBARLOCKED; commandList[4].cmdID = ITID_CUSTOMIZEENABLED; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); - if (SUCCEEDED(hResult)) - hResult = oleCommandTarget->QueryStatus(&CGID_PrivCITCommands, 5, commandList, NULL); + hResult = IUnknown_QueryStatus(fClientBars[BIInternetToolbar].clientBar, + CGID_PrivCITCommands, 5, commandList, NULL); if (FAILED_UNEXPECTEDLY(hResult)) DeleteMenu(theMenu, IDM_VIEW_TOOLBARS, MF_BYCOMMAND); else @@ -2589,10 +2569,8 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::GoBack() { - CComPtr<ITravelLog> travelLog; - HRESULT hResult; - - hResult = GetTravelLog(&travelLog); + CComPtr<ITravelLog> travelLog; + HRESULT hResult = GetTravelLog(&travelLog); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return travelLog->Travel(static_cast<IDropTarget *>(this), TLOG_BACK); @@ -2600,10 +2578,8 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::GoForward() { - CComPtr<ITravelLog> travelLog; - HRESULT hResult; - - hResult = GetTravelLog(&travelLog); + CComPtr<ITravelLog> travelLog; + HRESULT hResult = GetTravelLog(&travelLog); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return travelLog->Travel(static_cast<IDropTarget *>(this), TLOG_FORE); @@ -2842,16 +2818,14 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::Navigate2(VARIANT *URL, VARIANT *Flags, VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { - LPITEMIDLIST pidl; - HRESULT hResult; - // called from drive combo box to navigate to a directory if (V_VT(URL) != (VT_ARRAY | VT_UI1)) return E_INVALIDARG; if (V_ARRAY(URL)->cDims != 1 || V_ARRAY(URL)->cbElements != 1) return E_INVALIDARG; - pidl = (LPITEMIDLIST)V_ARRAY(URL)->pvData; - hResult = BrowseToPIDL((LPITEMIDLIST)pidl, BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); + + LPITEMIDLIST pidl = static_cast<LPITEMIDLIST>(V_ARRAY(URL)->pvData); + HRESULT hResult = BrowseToPIDL(pidl, BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return S_OK; @@ -3195,9 +3169,7 @@ LRESULT CShellBrowser::OnFolderOptions(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - HRESULT hResult; - - hResult = DoFolderOptions(); + HRESULT hResult = DoFolderOptions(); return 0; } @@ -3225,63 +3197,44 @@ LRESULT CShellBrowser::OnGoBack(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - HRESULT hResult; - - hResult = GoBack(); + HRESULT hResult = GoBack(); return 0; } LRESULT CShellBrowser::OnGoForward(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - HRESULT hResult; - - hResult = GoForward(); + HRESULT hResult = GoForward(); return 0; } LRESULT CShellBrowser::OnGoUpLevel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - HRESULT hResult; - - hResult = NavigateToParent(); + HRESULT hResult = NavigateToParent(); return 0; } LRESULT CShellBrowser::OnGoHome(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - HRESULT hResult; - - hResult = GoHome(); + HRESULT hResult = GoHome(); return 0; } LRESULT CShellBrowser::OnBackspace(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - HRESULT hResult; - // FIXME: This does not appear to be what windows does. - hResult = NavigateToParent(); + HRESULT hResult = NavigateToParent(); return 0; } +HRESULT WINAPI SHOpenNewFrame(LPITEMIDLIST pidl, IUnknown *paramC, long param10, DWORD dwFlags); + LRESULT CShellBrowser::OnIsThisLegal(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - HRESULT hResult; - - typedef HRESULT (WINAPI *PSHOpenNewFrame)(LPITEMIDLIST pidl, IUnknown *b, long c, long d); - PSHOpenNewFrame Func = NULL; - HMODULE Module = GetModuleHandle(TEXT("browseui.dll")); - if (Module != NULL) - Func = reinterpret_cast<PSHOpenNewFrame>(GetProcAddress(Module, (LPCSTR) 103)); - if (Func != NULL) - { - LPITEMIDLIST desktopPIDL; - - hResult = SHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, 0, &desktopPIDL); - if (SUCCEEDED(hResult)) - { - hResult = Func(desktopPIDL, NULL, -1, 1); - } + LPITEMIDLIST desktopPIDL; + HRESULT hResult = SHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, 0, &desktopPIDL); + if (SUCCEEDED(hResult)) + { + hResult = SHOpenNewFrame(desktopPIDL, NULL, -1, 1); } return 0; } @@ -3295,79 +3248,49 @@ LRESULT CShellBrowser::OnToggleToolbarLock(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CComPtr<IOleCommandTarget> commandTarget; - HRESULT hResult; - - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IOleCommandTarget, &commandTarget)); - if (FAILED_UNEXPECTEDLY(hResult)) - return 0; - hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_TOOLBARLOCKED, 0, NULL, NULL); + HRESULT hResult; + hResult = IUnknown_Exec(fClientBars[BIInternetToolbar].clientBar, + CGID_PrivCITCommands, ITID_TOOLBARLOCKED, 0, NULL, NULL); return 0; } LRESULT CShellBrowser::OnToggleToolbarBandVisible(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CComPtr<IOleCommandTarget> commandTarget; - HRESULT hResult; - - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IOleCommandTarget, &commandTarget)); - if (FAILED_UNEXPECTEDLY(hResult)) - return 0; - hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_TOOLBARBANDSHOWN, 0, NULL, NULL); + HRESULT hResult; + hResult = IUnknown_Exec(fClientBars[BIInternetToolbar].clientBar, + CGID_PrivCITCommands, ITID_TOOLBARBANDSHOWN, 0, NULL, NULL); return 0; } LRESULT CShellBrowser::OnToggleAddressBandVisible(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CComPtr<IOleCommandTarget> commandTarget; - HRESULT hResult; - - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IOleCommandTarget, &commandTarget)); - if (FAILED_UNEXPECTEDLY(hResult)) - return 0; - hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_ADDRESSBANDSHOWN, 0, NULL, NULL); + HRESULT hResult; + hResult = IUnknown_Exec(fClientBars[BIInternetToolbar].clientBar, + CGID_PrivCITCommands, ITID_ADDRESSBANDSHOWN, 0, NULL, NULL); return 0; } LRESULT CShellBrowser::OnToggleLinksBandVisible(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CComPtr<IOleCommandTarget> commandTarget; - HRESULT hResult; - - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IOleCommandTarget, &commandTarget)); - if (FAILED_UNEXPECTEDLY(hResult)) - return 0; - hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_LINKSBANDSHOWN, 0, NULL, NULL); + HRESULT hResult; + hResult = IUnknown_Exec(fClientBars[BIInternetToolbar].clientBar, + CGID_PrivCITCommands, ITID_LINKSBANDSHOWN, 0, NULL, NULL); return 0; } LRESULT CShellBrowser::OnToggleTextLabels(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CComPtr<IOleCommandTarget> commandTarget; - HRESULT hResult; - - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IOleCommandTarget, &commandTarget)); - if (FAILED_UNEXPECTEDLY(hResult)) - return 0; - hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_TEXTLABELS, 0, NULL, NULL); + HRESULT hResult; + hResult = IUnknown_Exec(fClientBars[BIInternetToolbar].clientBar, + CGID_PrivCITCommands, ITID_TEXTLABELS, 0, NULL, NULL); return 0; } LRESULT CShellBrowser::OnToolbarCustomize(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CComPtr<IOleCommandTarget> commandTarget; - HRESULT hResult; - - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IOleCommandTarget, &commandTarget)); - if (FAILED_UNEXPECTEDLY(hResult)) - return 0; - hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_CUSTOMIZEENABLED, 0, NULL, NULL); + HRESULT hResult; + hResult = IUnknown_Exec(fClientBars[BIInternetToolbar].clientBar, + CGID_PrivCITCommands, ITID_CUSTOMIZEENABLED, 0, NULL, NULL); return 0; }

1 0

[aandrejevic] 65037: [FAST486] Don't leave the prefetch cache in a possibly invalid state if Fast486ReadLinearMemory returns FALSE.
by aandrejevic＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: aandrejevic Date: Mon Oct 27 00:21:06 2014 New Revision: 65037 URL: http://svn.reactos.org/svn/reactos?rev=65037&view=rev Log: [FAST486] Don't leave the prefetch cache in a possibly invalid state if Fast486ReadLinearMemory returns FALSE. Modified: trunk/reactos/lib/fast486/common.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Mon Oct 27 00:21:06 2014 @@ -121,7 +121,11 @@ Size); return TRUE; } - else return FALSE; + else + { + State->PrefetchValid = FALSE; + return FALSE; + } } else #endif

1 0

[gadamopoulos] 65036: [BROWSUI] - Fix CAddressBand::Invoke to correctly detect if an item exists in the list and select the correct item when it does. - Improve CAddressEditBox::Execute to check if...
by gadamopoulos＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: gadamopoulos Date: Sun Oct 26 23:46:35 2014 New Revision: 65036 URL: http://svn.reactos.org/svn/reactos?rev=65036&view=rev Log: [BROWSUI] - Fix CAddressBand::Invoke to correctly detect if an item exists in the list and select the correct item when it does. - Improve CAddressEditBox::Execute to check if the passed pidl is the one that is being displayed. - Also fix it to parse the path if needed. - Directly call CAddressEditBox::Execute when enter is pressed or the Go button is pressed - Should fix most issues with the address bar Modified: branches/shell-experiments/dll/win32/browseui/addressband.cpp branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp Modified: branches/shell-experiments/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] Sun Oct 26 23:46:35 2014 @@ -489,12 +489,17 @@ oldIndex = SendMessage(m_hWnd, CB_GETCURSEL, 0, 0); + itemExists = FALSE; + pidlPrevious = NULL; + + ZeroMemory(&item, sizeof(item)); item.mask = CBEIF_LPARAM; item.iItem = 0; - itemExists = SendMessage(m_hWnd, CBEM_GETITEM, 0, reinterpret_cast<LPARAM>(&item)); - if (itemExists) + if (SendMessage(m_hWnd, CBEM_GETITEM, 0, reinterpret_cast<LPARAM>(&item))) { pidlPrevious = reinterpret_cast<LPITEMIDLIST>(item.lParam); + if (pidlPrevious) + itemExists = TRUE; } hr = IUnknown_QueryService(fSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &isb)); @@ -520,6 +525,7 @@ if (itemExists) { result = SendMessage(m_hWnd, CBEM_SETITEM, 0, reinterpret_cast<LPARAM>(&item)); + oldIndex = 0; if (result) { Modified: branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Sun Oct 26 23:46:35 2014 @@ -149,30 +149,72 @@ { HRESULT hr; + /* + * Parse the path is it wasn't parsed + */ + if (!pidlLastParsed) + ParseNow(0); + if (!pidlLastParsed) return E_FAIL; + /* + * Get the IShellBrowser and IBrowserService interfaces of the shell browser + */ CComPtr<IShellBrowser> pisb; hr = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IShellBrowser, &pisb)); + if (FAILED(hr)) + return hr; + + CComPtr<IBrowserService> pbs; + pisb->QueryInterface(IID_PPV_ARG(IBrowserService, &pbs)); + if (FAILED(hr)) + return hr; + + /* + * Get the current pidl of the shellbrowser and check if it is the same with the parsed one + */ + PIDLIST_ABSOLUTE pidl; + hr = pbs->GetPidl(&pidl); + if (FAILED(hr)) + return hr; + + CComPtr<IShellFolder> psf; + hr = SHGetDesktopFolder(&psf); + if (FAILED(hr)) + return hr; + + hr = psf->CompareIDs(0, pidl, pidlLastParsed); + + SHFree(pidl); + if (hr == 0) + return S_OK; + + /* + * Attempt to browse to the parsed pidl + */ + hr = pisb->BrowseObject(pidlLastParsed, 0); if (SUCCEEDED(hr)) - { - hr = pisb->BrowseObject(pidlLastParsed, 0); - if (FAILED_UNEXPECTEDLY(hr)) - { - HWND topLevelWindow; - LPCITEMIDLIST pidlChild; - CComPtr<IShellFolder> sf; - CComPtr<IShellBrowser> pisb; - - hr = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IShellBrowser, &pisb)); - - IUnknown_GetWindow(pisb, &topLevelWindow); - - hr = SHBindToParent(pidlLastParsed, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); - - SHInvokeDefaultCommand(topLevelWindow, sf, pidlChild); - } - } + return hr; + + /* + * Browsing to the pidl failed so it's not a folder. So invoke its defaule command. + */ + HWND topLevelWindow; + hr = IUnknown_GetWindow(pisb, &topLevelWindow); + if (FAILED(hr)) + return hr; + + LPCITEMIDLIST pidlChild; + CComPtr<IShellFolder> sf; + hr = SHBindToParent(pidlLastParsed, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); + if (FAILED(hr)) + return hr; + + hr = SHInvokeDefaultCommand(topLevelWindow, sf, pidlChild); + if (FAILED(hr)) + return hr; + return hr; } @@ -194,7 +236,15 @@ hdr = (LPNMHDR) lParam; if (hdr->code == CBEN_ENDEDIT) { - ParseNow(0); + NMCBEENDEDITW *endEdit = (NMCBEENDEDITW*) lParam; + if (endEdit->iWhy == CBENF_RETURN) + { + Execute(0); + } + else if (endEdit->iWhy == CBENF_ESCAPE) + { + /* Reset the contents of the combo box */ + } } 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