Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[mjansen] 75730: [SERVICES] Allow CreateService to create an interactive service under the LocalSystem account. MSDN stated that this is allowed, and this fixes VMWare Horizon setup not working. CO...
by mjansen＠svn.reactos.org 01 Sep '17

01 Sep '17

Author: mjansen Date: Fri Sep 1 18:27:40 2017 New Revision: 75730 URL: http://svn.reactos.org/svn/reactos?rev=75730&view=rev Log: [SERVICES] Allow CreateService to create an interactive service under the LocalSystem account. MSDN stated that this is allowed, and this fixes VMWare Horizon setup not working. CORE-13434 Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Sep 1 18:27:40 2017 @@ -2192,7 +2192,11 @@ if ((dwServiceType == (SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS)) && (lpServiceStartName)) { - return ERROR_INVALID_PARAMETER; + /* We allow LocalSystem to run interactive. */ + if (wcsicmp(lpServiceStartName, L"LocalSystem")) + { + return ERROR_INVALID_PARAMETER; + } } if (lpdwTagId && (!lpLoadOrderGroup || !*lpLoadOrderGroup))

1 0

[hbelusca] 75729: [NET]: Whitespace fixes only.
by hbelusca＠svn.reactos.org 01 Sep '17

01 Sep '17

Author: hbelusca Date: Fri Sep 1 18:00:06 2017 New Revision: 75729 URL: http://svn.reactos.org/svn/reactos?rev=75729&view=rev Log: [NET]: Whitespace fixes only. Modified: trunk/reactos/base/applications/network/net/cmdAccounts.c trunk/reactos/base/applications/network/net/help.c Modified: trunk/reactos/base/applications/network/net/cmdAccounts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdAccounts.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdAccounts.c [iso-8859-1] Fri Sep 1 18:00:06 2017 @@ -90,9 +90,9 @@ value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/MINPWLEN"); - result = 1; - goto done; + ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/MINPWLEN"); + result = 1; + goto done; } Info0->usrmod0_min_passwd_len = value; Modified: trunk/reactos/base/applications/network/net/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/help.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/help.c [iso-8859-1] Fri Sep 1 18:00:06 2017 @@ -17,139 +17,139 @@ return 0; } - if (_wcsicmp(argv[2],L"ACCOUNTS") == 0) + if (_wcsicmp(argv[2], L"ACCOUNTS") == 0) { ConResPuts(StdOut, IDS_ACCOUNTS_HELP); return 0; } - if (_wcsicmp(argv[2],L"COMPUTER") == 0) + if (_wcsicmp(argv[2], L"COMPUTER") == 0) { ConResPuts(StdOut, IDS_COMPUTER_HELP); return 0; } - if (_wcsicmp(argv[2],L"CONFIG") == 0) + if (_wcsicmp(argv[2], L"CONFIG") == 0) { ConResPuts(StdOut, IDS_CONFIG_HELP); return 0; } - if (_wcsicmp(argv[2],L"CONTINUE") == 0) + if (_wcsicmp(argv[2], L"CONTINUE") == 0) { ConResPuts(StdOut, IDS_CONTINUE_HELP); return 0; } - if (_wcsicmp(argv[2],L"FILE") == 0) + if (_wcsicmp(argv[2], L"FILE") == 0) { ConResPuts(StdOut, IDS_FILE_HELP); return 0; } - if (_wcsicmp(argv[2],L"GROUP") == 0) + if (_wcsicmp(argv[2], L"GROUP") == 0) { ConResPuts(StdOut, IDS_GROUP_HELP); return 0; } - if (_wcsicmp(argv[2],L"HELPMSG") == 0) + if (_wcsicmp(argv[2], L"HELPMSG") == 0) { ConResPuts(StdOut, IDS_HELPMSG_HELP); return 0; } - if (_wcsicmp(argv[2],L"LOCALGROUP") == 0) + if (_wcsicmp(argv[2], L"LOCALGROUP") == 0) { ConResPuts(StdOut, IDS_LOCALGROUP_HELP); return 0; } - if (_wcsicmp(argv[2],L"NAME") == 0) + if (_wcsicmp(argv[2], L"NAME") == 0) { ConResPuts(StdOut, IDS_NAME_HELP); return 0; } - if (_wcsicmp(argv[2],L"PAUSE") == 0) + if (_wcsicmp(argv[2], L"PAUSE") == 0) { ConResPuts(StdOut, IDS_PAUSE_HELP); return 0; } - if (_wcsicmp(argv[2],L"PRINT") == 0) + if (_wcsicmp(argv[2], L"PRINT") == 0) { ConResPuts(StdOut, IDS_PRINT_HELP); return 0; } - if (_wcsicmp(argv[2],L"SEND") == 0) + if (_wcsicmp(argv[2], L"SEND") == 0) { ConResPuts(StdOut, IDS_SEND_HELP); return 0; } - if (_wcsicmp(argv[2],L"SESSION") == 0) + if (_wcsicmp(argv[2], L"SESSION") == 0) { ConResPuts(StdOut, IDS_SESSION_HELP); return 0; } - if (_wcsicmp(argv[2],L"SHARE") == 0) + if (_wcsicmp(argv[2], L"SHARE") == 0) { ConResPuts(StdOut, IDS_SHARE_HELP); return 0; } - if (_wcsicmp(argv[2],L"START") == 0) + if (_wcsicmp(argv[2], L"START") == 0) { ConResPuts(StdOut, IDS_START_HELP); return 0; } - if (_wcsicmp(argv[2],L"STATISTICS") == 0) + if (_wcsicmp(argv[2], L"STATISTICS") == 0) { ConResPuts(StdOut, IDS_STATISTICS_HELP); return 0; } - if (_wcsicmp(argv[2],L"STOP") == 0) + if (_wcsicmp(argv[2], L"STOP") == 0) { ConResPuts(StdOut, IDS_STOP_HELP); return 0; } - if (_wcsicmp(argv[2],L"TIME") == 0) + if (_wcsicmp(argv[2], L"TIME") == 0) { ConResPuts(StdOut, IDS_TIME_HELP); return 0; } - if (_wcsicmp(argv[2],L"USE") == 0) + if (_wcsicmp(argv[2], L"USE") == 0) { ConResPuts(StdOut, IDS_USE_HELP); return 0; } - if (_wcsicmp(argv[2],L"USER") == 0) + if (_wcsicmp(argv[2], L"USER") == 0) { ConResPuts(StdOut, IDS_USER_HELP); return 0; } - if (_wcsicmp(argv[2],L"VIEW") == 0) + if (_wcsicmp(argv[2], L"VIEW") == 0) { ConResPuts(StdOut, IDS_VIEW_HELP); return 0; } #if 0 - if (_wcsicmp(argv[2],L"SERVICES") == 0) + if (_wcsicmp(argv[2], L"SERVICES") == 0) { return 0; } - if (_wcsicmp(argv[2],L"SYNTAX") == 0) + if (_wcsicmp(argv[2], L"SYNTAX") == 0) { return 0; }

1 0

[tfaber] 75728: [0.4.6] - Tag the release
by tfaber＠svn.reactos.org 01 Sep '17

01 Sep '17

Author: tfaber Date: Fri Sep 1 10:17:45 2017 New Revision: 75728 URL: http://svn.reactos.org/svn/reactos?rev=75728&view=rev Log: [0.4.6] - Tag the release Added: tags/ReactOS-0.4.6/ (props changed) - copied from r75727, branches/ros-branch-0_4_6/ Removed: branches/ros-branch-0_4_6/ Propchange: tags/ReactOS-0.4.6/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Sep 1 10:17:45 2017 @@ -0,0 +1,2 @@ +/branches/colins-printing-for-freedom:67543-68405,68407-68414,68417-70595 +/trunk:75451,75458

1 0

[tthompson] 75727: [NTFS] - Fix some errors that break building in C89 mode, and remove an extraneous "ninja livecd" that got inserted in a comment. Thanks to Doug Lyons for spotting these errors. ...
by tthompson＠svn.reactos.org 01 Sep '17

01 Sep '17

Author: tthompson Date: Fri Sep 1 00:27:34 2017 New Revision: 75727 URL: http://svn.reactos.org/svn/reactos?rev=75727&view=rev Log: [NTFS] - Fix some errors that break building in C89 mode, and remove an extraneous "ninja livecd" that got inserted in a comment. Thanks to Doug Lyons for spotting these errors. SplitBTree() - comment-out redundant code for finding the median key and improve comments. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c [iso-8859-1] Fri Sep 1 00:27:34 2017 @@ -1139,7 +1139,7 @@ #ifndef NDEBUG DumpBTree(Tree); -#endif; +#endif return STATUS_SUCCESS; } @@ -1779,7 +1779,7 @@ #ifndef NDEBUG DumpBTree(Tree); -#endif NDEBUG +#endif } } else @@ -1880,6 +1880,9 @@ { ULONG MedianKeyIndex; PB_TREE_KEY LastKeyBeforeMedian, FirstKeyAfterMedian; + ULONG KeyCount; + ULONG HalfSize; + ULONG SizeSum; ULONG i; DPRINT1("SplitBTreeNode(%p, %p, %p, %p, %s) called\n", @@ -1889,7 +1892,9 @@ NewRightHandSibling, CaseSensitive ? "TRUE" : "FALSE"); - //DumpBTreeNode(Node, 0, 0); +#ifndef NDEBUG + DumpBTreeNode(Node, 0, 0); +#endif // Create the right hand sibling *NewRightHandSibling = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE_FILENAME_NODE), TAG_NTFS); @@ -1901,20 +1906,29 @@ RtlZeroMemory(*NewRightHandSibling, sizeof(B_TREE_FILENAME_NODE)); (*NewRightHandSibling)->DiskNeedsUpdating = TRUE; + + // Find the last key before the median + + // This is roughly how NTFS-3G calculates median, and it's not congruent with what Windows does: + /* // find the median key index MedianKeyIndex = (Node->KeyCount + 1) / 2; MedianKeyIndex--; - // Find the last key before the median LastKeyBeforeMedian = Node->FirstKey; for (i = 0; i < MedianKeyIndex - 1; i++) - LastKeyBeforeMedian = LastKeyBeforeMedian->NextKey; + LastKeyBeforeMedian = LastKeyBeforeMedian->NextKey;*/ + + // The method we'll use is a little bit closer to how Windows determines the median but it's not identical. + // What Windows does is actually more complicated than this, I think because Windows allocates more slack space to Odd-numbered + // Index Records, leaving less room for index entries in these records (I haven't discovered why this is done). + // (Neither Windows nor chkdsk complain if we choose a different median than Windows would have chosen, as our median will be in the ballpark) // Use size to locate the median key / index - ULONG HalfSize = 2016; // half the allocated size after subtracting the first index entry offset (TODO: MATH) - ULONG SizeSum = 0; LastKeyBeforeMedian = Node->FirstKey; MedianKeyIndex = 0; + HalfSize = 2016; // half the allocated size after subtracting the first index entry offset (TODO: MATH) + SizeSum = 0; for (i = 0; i < Node->KeyCount; i++) { SizeSum += LastKeyBeforeMedian->IndexEntry->Length; @@ -1989,7 +2003,7 @@ // Update Node's KeyCount (remember to add 1 for the new dummy key) Node->KeyCount = MedianKeyIndex + 2; - ULONG KeyCount = CountBTreeKeys(Node->FirstKey); + KeyCount = CountBTreeKeys(Node->FirstKey); ASSERT(Node->KeyCount == KeyCount); // everything to the right of MedianKey becomes the right hand sibling of Node Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Fri Sep 1 00:27:34 2017 @@ -2138,6 +2138,9 @@ ULONG MaxIndexRootSize; PB_TREE_KEY NewLeftKey; PB_TREE_FILENAME_NODE NewRightHandNode; + LARGE_INTEGER MinIndexRootSize; + ULONG NewMaxIndexRootSize; + ULONG NodeSize; // Allocate memory for the parent directory ParentFileRecord = ExAllocatePoolWithTag(NonPagedPool, @@ -2287,7 +2290,6 @@ // This a bit hacky, but it seems to be functional. // Calculate the minimum size of the index root attribute, considering one dummy key and one VCN - LARGE_INTEGER MinIndexRootSize; MinIndexRootSize.QuadPart = sizeof(INDEX_ROOT_ATTRIBUTE) // size of the index root headers + 0x18; // Size of dummy key with a VCN for a subnode ASSERT(MinIndexRootSize.QuadPart % ATTR_RECORD_ALIGNMENT == 0); @@ -2335,7 +2337,7 @@ // Find the maximum index root size given what the file record can hold // First, find the max index size assuming index root is the last attribute - ULONG NewMaxIndexRootSize = + NewMaxIndexRootSize = DeviceExt->NtfsInfo.BytesPerFileRecord // Start with the size of a file record - IndexRootOffset // Subtract the length of everything that comes before index root - IndexRootContext->pRecord->Resident.ValueOffset // Subtract the length of the attribute header for index root @@ -2361,7 +2363,7 @@ // The index allocation and index bitmap may have grown, leaving less room for the index root, // so now we need to double-check that index root isn't too large - ULONG NodeSize = GetSizeOfIndexEntries(NewTree->RootNode); + NodeSize = GetSizeOfIndexEntries(NewTree->RootNode); if (NodeSize > NewMaxIndexRootSize) { DPRINT1("Demoting index root.\nNodeSize: 0x%lx\nNewMaxIndexRootSize: 0x%lx\n", NodeSize, NewMaxIndexRootSize); @@ -2624,7 +2626,7 @@ * @param Vcb * Pointer to an NTFS_VCB for the volume whose Mft mirror is being updated. * -* @returninja livecd +* @return * STATUS_SUCCESS on success. * STATUS_INSUFFICIENT_RESOURCES if an allocation failed.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2017