Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 65085: [FASTFAT] For now, disable the VfatSetRenameInformation() asserts in trunk. They can be reenabled for testing by commenting "#define NASSERTS_RENAME" out. CORE-8721 #resolve #c...
by pschweitzer＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: pschweitzer Date: Tue Oct 28 20:39:42 2014 New Revision: 65085 URL: http://svn.reactos.org/svn/reactos?rev=65085&view=rev Log: [FASTFAT] For now, disable the VfatSetRenameInformation() asserts in trunk. They can be reenabled for testing by commenting "#define NASSERTS_RENAME" out. CORE-8721 #resolve #comment Fixed with r65085 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] Tue Oct 28 20:39:42 2014 @@ -15,6 +15,8 @@ #define NDEBUG #include <debug.h> + +#define NASSERTS_RENAME /* GLOBALS ******************************************************************/ @@ -459,6 +461,11 @@ PFILE_RENAME_INFORMATION RenameInfo, PFILE_OBJECT TargetFileObject) { +#ifdef NASSERTS_RENAME +#pragma push_macro("ASSERT") +#undef ASSERT +#define ASSERT(x) ((VOID) 0) +#endif NTSTATUS Status; UNICODE_STRING NewName; UNICODE_STRING SourcePath; @@ -485,6 +492,9 @@ } OldReferences = FCB->parentFcb->RefCount; +#ifdef NASSERTS_RENAME + UNREFERENCED_PARAMETER(OldReferences); +#endif /* If we are performing relative opening for rename, get FO for getting FCB and path name */ if (RenameInfo->RootDirectory != NULL) @@ -790,6 +800,9 @@ /* Try to find target */ ParentFCB = NULL; OldParent = FCB->parentFcb; +#ifdef NASSERTS_RENAME + UNREFERENCED_PARAMETER(OldParent); +#endif Status = vfatPrepareTargetForRename(DeviceExt, &ParentFCB, &NewName, @@ -803,6 +816,9 @@ } NewReferences = ParentFCB->RefCount; +#ifdef NASSERTS_RENAME + UNREFERENCED_PARAMETER(NewReferences); +#endif FsRtlNotifyFullReportChange(DeviceExt->NotifySync, &(DeviceExt->NotifyList), @@ -854,6 +870,9 @@ if (RenameInfo->RootDirectory != NULL) ObDereferenceObject(RootFileObject); return Status; +#ifdef NASSERTS_RENAME +#pragma pop_macro("ASSERT") +#endif } /*

1 0

[gadamopoulos] 65084: Revert unwanted change
by gadamopoulos＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: gadamopoulos Date: Tue Oct 28 19:52:04 2014 New Revision: 65084 URL: http://svn.reactos.org/svn/reactos?rev=65084&view=rev Log: Revert unwanted change 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] Tue Oct 28 19:52:04 2014 @@ -45,7 +45,6 @@ CMenuDeskBar::~CMenuDeskBar() { - m_ShowFlags = 0; } LRESULT CMenuDeskBar::_OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)

1 0

[gadamopoulos] 65083: [RSHELL] - Do not release CMenuDeskBar more times than necessary - Should fix the start menu
by gadamopoulos＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: gadamopoulos Date: Tue Oct 28 19:50:49 2014 New Revision: 65083 URL: http://svn.reactos.org/svn/reactos?rev=65083&view=rev Log: [RSHELL] - Do not release CMenuDeskBar more times than necessary - Should fix the start menu 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] Tue Oct 28 19:50:49 2014 @@ -45,6 +45,7 @@ CMenuDeskBar::~CMenuDeskBar() { + m_ShowFlags = 0; } LRESULT CMenuDeskBar::_OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) @@ -57,7 +58,6 @@ void CMenuDeskBar::OnFinalMessage(HWND /* hWnd */) { - this->Release(); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::Initialize(THIS)

1 0

[pschweitzer] 65082: [NTFS] Finally, implement NtfsGetFreeClusters() which will just read the $Data stream from $BITMAP file record to get the amount of free clusters to allow estimating the free s...
by pschweitzer＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: pschweitzer Date: Tue Oct 28 19:17:59 2014 New Revision: 65082 URL: http://svn.reactos.org/svn/reactos?rev=65082&view=rev Log: [NTFS] Finally, implement NtfsGetFreeClusters() which will just read the $Data stream from $BITMAP file record to get the amount of free clusters to allow estimating the free space on a volume. The implementation is likely under-optimized... But wwell, the rest of the FSD is not better. Who talked about caching?! ;-) Because pictures are more relevant than words in such case: http://www.heisspiter.net/~Pierre/rostests/NTFS_disksize.png Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c 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] Tue Oct 28 19:17:59 2014 @@ -36,8 +36,67 @@ ULONGLONG NtfsGetFreeClusters(PDEVICE_EXTENSION DeviceExt) { - UNIMPLEMENTED; - return 0; + NTSTATUS Status; + PFILE_RECORD_HEADER BitmapRecord; + PNTFS_ATTR_CONTEXT DataContext; + ULONGLONG BitmapDataSize; + PCHAR BitmapData; + ULONGLONG FreeClusters = 0; + ULONG Read = 0; + RTL_BITMAP Bitmap; + + DPRINT1("NtfsGetFreeClusters(%p)\n", DeviceExt); + + BitmapRecord = ExAllocatePoolWithTag(NonPagedPool, + DeviceExt->NtfsInfo.BytesPerFileRecord, + TAG_NTFS); + if (BitmapRecord == NULL) + { + return 0; + } + + Status = ReadFileRecord(DeviceExt, NTFS_FILE_BITMAP, BitmapRecord); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(BitmapRecord, TAG_NTFS); + return 0; + } + + Status = FindAttribute(DeviceExt, BitmapRecord, AttributeData, L"", 0, &DataContext); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(BitmapRecord, TAG_NTFS); + return 0; + } + + BitmapDataSize = AttributeDataLength(&DataContext->Record); + ASSERT((BitmapDataSize * 8) >= (DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster)); + BitmapData = ExAllocatePoolWithTag(NonPagedPool, BitmapDataSize, TAG_NTFS); + if (BitmapData == NULL) + { + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(BitmapRecord, TAG_NTFS); + return 0; + } + + /* FIXME: Totally underoptimized! */ + for (; Read < BitmapDataSize; Read += DeviceExt->NtfsInfo.BytesPerSector) + { + ReadAttribute(DeviceExt, DataContext, Read, (PCHAR)((ULONG_PTR)BitmapData + Read), DeviceExt->NtfsInfo.BytesPerSector); + } + ReleaseAttributeContext(DataContext); + + DPRINT1("Total clusters: %I64x\n", DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster); + DPRINT1("Total clusters in bitmap: %I64x\n", BitmapDataSize * 8); + DPRINT1("Diff in size: %I64d B\n", ((BitmapDataSize * 8) - (DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster)) * DeviceExt->NtfsInfo.SectorsPerCluster * DeviceExt->NtfsInfo.BytesPerSector); + + RtlInitializeBitMap(&Bitmap, (PULONG)BitmapData, DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster); + FreeClusters = RtlNumberOfClearBits(&Bitmap); + + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ExFreePoolWithTag(BitmapRecord, TAG_NTFS); + + return FreeClusters; } static

1 0

[dquintana] 65081: [BROWSEUI] * Disable the Tools menu items until they are implemented.
by dquintana＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: dquintana Date: Tue Oct 28 18:37:44 2014 New Revision: 65081 URL: http://svn.reactos.org/svn/reactos?rev=65081&view=rev Log: [BROWSEUI] * Disable the Tools menu items until they are implemented. 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] Tue Oct 28 18:37:44 2014 @@ -3152,6 +3152,11 @@ } else if (theMenu == SHGetMenuFromID(fCurrentMenuBar, FCIDM_MENU_TOOLS)) { + // FIXME: Remove once implemented + SHEnableMenuItem(theMenu, IDM_TOOLS_MAPNETWORKDRIVE, FALSE); + SHEnableMenuItem(theMenu, IDM_TOOLS_DISCONNECTNETWORKDRIVE, FALSE); + SHEnableMenuItem(theMenu, IDM_TOOLS_SYNCHRONIZE, FALSE); + SHEnableMenuItem(theMenu, IDM_TOOLS_FOLDEROPTIONS, FALSE); menuIndex = 4; } else if (theMenu == SHGetMenuFromID(fCurrentMenuBar, FCIDM_MENU_HELP))

1 0

[dquintana] 65080: [BROWSEUI] * Properly return the toolbar status on QueryStatus. * Properly make use of the returned into from QueryStatus.
by dquintana＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: dquintana Date: Tue Oct 28 18:32:21 2014 New Revision: 65080 URL: http://svn.reactos.org/svn/reactos?rev=65080&view=rev Log: [BROWSEUI] * Properly return the toolbar status on QueryStatus. * Properly make use of the returned into from QueryStatus. Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp 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] Tue Oct 28 18:32:21 2014 @@ -1155,22 +1155,28 @@ prgCmds->cmdf = OLECMDF_SUPPORTED; break; case ITID_TOOLBARBANDSHOWN: // toolbar visibility - prgCmds->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; + prgCmds->cmdf = OLECMDF_SUPPORTED; + if (fControlsBar) + prgCmds->cmdf |= OLECMDF_LATCHED; break; case ITID_ADDRESSBANDSHOWN: // address bar visibility - prgCmds->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; + prgCmds->cmdf = OLECMDF_SUPPORTED; + if (fNavigationBar) + prgCmds->cmdf |= OLECMDF_LATCHED; break; case ITID_LINKSBANDSHOWN: // links bar visibility prgCmds->cmdf = 0; break; case ITID_MENUBANDSHOWN: // Menubar band visibility - prgCmds->cmdf = 0; + prgCmds->cmdf = OLECMDF_SUPPORTED; + if (fMenuBar) + prgCmds->cmdf |= OLECMDF_LATCHED; break; case ITID_AUTOHIDEENABLED: // Auto hide enabled/disabled prgCmds->cmdf = 0; break; case ITID_CUSTOMIZEENABLED: // customize enabled - prgCmds->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; + prgCmds->cmdf = OLECMDF_SUPPORTED; break; case ITID_TOOLBARLOCKED: // lock toolbars prgCmds->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; @@ -1796,12 +1802,18 @@ default: break; } - - MENUITEMINFO mii; - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE; - mii.fState = fLocked ? MFS_CHECKED : MFS_UNCHECKED; - SetMenuItemInfo(contextMenu, IDM_TOOLBARS_LOCKTOOLBARS, FALSE, &mii); + + // TODO: Implement show/hide toolbars + SHEnableMenuItem(contextMenu, IDM_TOOLBARS_STANDARDBUTTONS, FALSE); + SHEnableMenuItem(contextMenu, IDM_TOOLBARS_ADDRESSBAR, FALSE); + SHEnableMenuItem(contextMenu, IDM_TOOLBARS_LINKSBAR, FALSE); + SHEnableMenuItem(contextMenu, IDM_TOOLBARS_CUSTOMIZE, FALSE); + + SHCheckMenuItem(contextMenu, IDM_TOOLBARS_STANDARDBUTTONS, fControlsBar != NULL); + SHCheckMenuItem(contextMenu, IDM_TOOLBARS_ADDRESSBAR, fNavigationBar != NULL); + SHCheckMenuItem(contextMenu, IDM_TOOLBARS_LINKSBAR, FALSE); + SHCheckMenuItem(contextMenu, IDM_TOOLBARS_CUSTOMIZE, FALSE); + SHCheckMenuItem(contextMenu, IDM_TOOLBARS_LOCKTOOLBARS, fLocked); // TODO: use GetSystemMetrics(SM_MENUDROPALIGNMENT) to determine menu alignment command = TrackPopupMenu(contextMenu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, 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] Tue Oct 28 18:32:21 2014 @@ -1570,10 +1570,16 @@ RemoveMenu(toolbarMenuBar, 0, MF_BYPOSITION); DestroyMenu(toolbarMenuBar); - SHCheckMenuItem(toolbarMenu, IDM_TOOLBARS_STANDARDBUTTONS, commandList[0].cmdf); - SHCheckMenuItem(toolbarMenu, IDM_TOOLBARS_ADDRESSBAR, commandList[1].cmdf & OLECMDF_ENABLED); - SHCheckMenuItem(toolbarMenu, IDM_TOOLBARS_LINKSBAR, commandList[2].cmdf & OLECMDF_ENABLED); - SHCheckMenuItem(toolbarMenu, IDM_TOOLBARS_LOCKTOOLBARS, commandList[3].cmdf & OLECMDF_ENABLED); + // TODO: Implement + SHEnableMenuItem(toolbarMenu, IDM_TOOLBARS_STANDARDBUTTONS, commandList[0].cmdf & OLECMDF_ENABLED); + SHEnableMenuItem(toolbarMenu, IDM_TOOLBARS_ADDRESSBAR, commandList[1].cmdf & OLECMDF_ENABLED); + SHEnableMenuItem(toolbarMenu, IDM_TOOLBARS_LINKSBAR, commandList[2].cmdf & OLECMDF_ENABLED); + SHEnableMenuItem(toolbarMenu, IDM_TOOLBARS_CUSTOMIZE, commandList[4].cmdf & OLECMDF_ENABLED); + + SHCheckMenuItem(toolbarMenu, IDM_TOOLBARS_STANDARDBUTTONS, commandList[0].cmdf & OLECMDF_LATCHED); + SHCheckMenuItem(toolbarMenu, IDM_TOOLBARS_ADDRESSBAR, commandList[1].cmdf & OLECMDF_LATCHED); + SHCheckMenuItem(toolbarMenu, IDM_TOOLBARS_LINKSBAR, commandList[2].cmdf & OLECMDF_LATCHED); + SHCheckMenuItem(toolbarMenu, IDM_TOOLBARS_LOCKTOOLBARS, commandList[3].cmdf & OLECMDF_LATCHED); if ((commandList[4].cmdf & OLECMDF_ENABLED) == 0) DeleteMenu(toolbarMenu, IDM_TOOLBARS_CUSTOMIZE, MF_BYCOMMAND); DeleteMenu(toolbarMenu, IDM_TOOLBARS_TEXTLABELS, MF_BYCOMMAND); @@ -1585,6 +1591,9 @@ SetMenuItemInfo(theMenu, IDM_VIEW_TOOLBARS, FALSE, &menuItemInfo); } SHCheckMenuItem(theMenu, IDM_VIEW_STATUSBAR, fStatusBarVisible ? TRUE : FALSE); + + // TODO: Implement + SHEnableMenuItem(theMenu, IDM_VIEW_EXPLORERBAR, FALSE); } bool IUnknownIsEqual(IUnknown *int1, IUnknown *int2)

1 0

[gadamopoulos] 65079: Addendum to r65077 (svn merge info).
by gadamopoulos＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: gadamopoulos Date: Tue Oct 28 17:40:49 2014 New Revision: 65079 URL: http://svn.reactos.org/svn/reactos?rev=65079&view=rev Log: Addendum to r65077 (svn merge info). Modified: trunk/reactos/ (props changed) Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 28 17:40:49 2014 @@ -13,7 +13,7 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 /branches/ros-branch-0_3_15-lt2013:59059 /branches/ros-csrss:57561-58762 -/branches/shell-experiments:64866 +/branches/shell-experiments:64866,65001 /branches/shell32_new-bringup:51893-53652,53661,53700 /branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859

1 0

[dquintana] 65078: Fix GCC build.
by dquintana＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: dquintana Date: Tue Oct 28 17:33:22 2014 New Revision: 65078 URL: http://svn.reactos.org/svn/reactos?rev=65078&view=rev Log: Fix GCC build. 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] Tue Oct 28 17:33:22 2014 @@ -3170,6 +3170,8 @@ LRESULT CShellBrowser::OnFolderOptions(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { HRESULT hResult = DoFolderOptions(); + if (FAILED(hResult)) + TRACE("DoFolderOptions failed with hResult=%08lx\n", hResult); return 0; } @@ -3198,24 +3200,32 @@ LRESULT CShellBrowser::OnGoBack(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { HRESULT hResult = GoBack(); + if (FAILED(hResult)) + TRACE("GoBack failed with hResult=%08lx\n", hResult); return 0; } LRESULT CShellBrowser::OnGoForward(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { HRESULT hResult = GoForward(); + if (FAILED(hResult)) + TRACE("GoForward failed with hResult=%08lx\n", hResult); return 0; } LRESULT CShellBrowser::OnGoUpLevel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { HRESULT hResult = NavigateToParent(); + if (FAILED(hResult)) + TRACE("NavigateToParent failed with hResult=%08lx\n", hResult); return 0; } LRESULT CShellBrowser::OnGoHome(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { HRESULT hResult = GoHome(); + if (FAILED(hResult)) + TRACE("GoHome failed with hResult=%08lx\n", hResult); return 0; } @@ -3223,6 +3233,8 @@ { // FIXME: This does not appear to be what windows does. HRESULT hResult = NavigateToParent(); + if (FAILED(hResult)) + TRACE("NavigateToParent failed with hResult=%08lx\n", hResult); return 0; }

1 0

[gadamopoulos] 65077: Merge r65001 from shell-experiments branch: [user32] - Properly notify the theme engine that the caption needs to be repainted on WM_SETICON - Fixes a classic frame appearing ...
by gadamopoulos＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: gadamopoulos Date: Tue Oct 28 17:32:01 2014 New Revision: 65077 URL: http://svn.reactos.org/svn/reactos?rev=65077&view=rev Log: Merge r65001 from shell-experiments branch: [user32] - Properly notify the theme engine that the caption needs to be repainted on WM_SETICON - Fixes a classic frame appearing when themes are enabled and we navigate to a different folder Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Tue Oct 28 17:32:01 2014 @@ -447,6 +447,27 @@ return TRUE; } +static void +UserPaintCaption(HWND hwnd) +{ + /* FIXME: this is not 100% correct */ + + /* + * When themes are not enabled we can go on and paint the non client area. + * However if we do that with themes enabled we will draw a classic frame. + * This is sovled by sending a themes specific message to notify the themes + * engine that the caption needs to be redrawn + */ + if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK) + { + SendMessage(hwnd, WM_NCUAHDRAWCAPTION,0,0); + } + else + { + DefWndNCPaint(hwnd, HRGN_WINDOW, -1); + } +} + // WM_SETICON LRESULT FASTCALL DefWndSetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam) @@ -481,7 +502,7 @@ NtUserSetProp(UserHMGetHandle(pWnd), gpsi->atomIconSmProp, hIconSmall); if ((pWnd->style & WS_CAPTION ) == WS_CAPTION) - DefWndNCPaint(UserHMGetHandle(pWnd), HRGN_WINDOW, -1); /* Repaint caption */ + UserPaintCaption(UserHMGetHandle(pWnd)); /* Repaint caption */ return (LRESULT)hIconOld; } @@ -1454,17 +1475,7 @@ DefSetText(hWnd, (PCWSTR)lParam, TRUE); if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) - { - /* FIXME: this is not 100% correct */ - if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK) - { - SendMessage(hWnd, WM_NCUAHDRAWCAPTION,0,0); - } - else - { - DefWndNCPaint(hWnd, HRGN_WINDOW, -1); - } - } + UserPaintCaption(hWnd); Result = 1; break; } @@ -1626,17 +1637,7 @@ DefSetText(hWnd, (PCWSTR)lParam, FALSE); if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) - { - /* FIXME: this is not 100% correct */ - if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK) - { - SendMessage(hWnd, WM_NCUAHDRAWCAPTION,0,0); - } - else - { - DefWndNCPaint(hWnd, HRGN_WINDOW, -1); - } - } + UserPaintCaption(hWnd); Result = 1; break; }

1 0

[gedmurphy] 65076: [WINLOGON] - Stop the log from being spammed when the session is idle and no screensaver is set - Also checking if my login still works :)
by gedmurphy＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: gedmurphy Date: Tue Oct 28 17:07:47 2014 New Revision: 65076 URL: http://svn.reactos.org/svn/reactos?rev=65076&view=rev Log: [WINLOGON] - Stop the log from being spammed when the session is idle and no screensaver is set - Also checking if my login still works :) Modified: trunk/reactos/base/system/winlogon/screensaver.c Modified: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… ============================================================================== --- trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] Tue Oct 28 17:07:47 2014 @@ -277,7 +277,7 @@ &hCurrentUser); if (rc != ERROR_SUCCESS) { - ERR("WL: RegOpenCurrentUser Error!\n"); + ERR("WL: RegOpenCurrentUser error %lu\n", rc); goto cleanup; } @@ -288,7 +288,7 @@ &hKey); if (rc != ERROR_SUCCESS) { - ERR("WL: RegOpenKeyEx Error!\n"); + ERR("WL: RegOpenKeyEx error %lu\n", rc); goto cleanup; } @@ -300,7 +300,8 @@ &bufferSize); if (rc != ERROR_SUCCESS || dwType != REG_SZ) { - ERR("WL: RegQueryValueEx Error!\n"); + if (rc != ERROR_FILE_NOT_FOUND) + ERR("WL: RegQueryValueEx error %lu\n", rc); goto cleanup; }

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