Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[gadamopoulos] 75071: [BROWSEUI] - CShellBrowser: Propagate WM_WININICHANGE to all immediate children. - CInternetToolbar: Forward WM_WININICHANGE to the menu band to make aware that the flat menus...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Jun 17 07:28:35 2017 New Revision: 75071 URL: http://svn.reactos.org/svn/reactos?rev=75071&view=rev Log: [BROWSEUI] - CShellBrowser: Propagate WM_WININICHANGE to all immediate children. - CInternetToolbar: Forward WM_WININICHANGE to the menu band to make aware that the flat menus option changed. Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp trunk/reactos/dll/win32/browseui/internettoolbar.h trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Sat Jun 17 07:28:35 2017 @@ -1850,3 +1850,24 @@ return 0; } +LRESULT CInternetToolbar::OnWinIniChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + HRESULT hr; + HWND hwndMenu; + + hr = IUnknown_GetWindow(fMenuBar, &hwndMenu); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; + + CComPtr<IWinEventHandler> menuWinEventHandler; + hr = fMenuBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; + + LRESULT lres; + hr = menuWinEventHandler->OnWinEvent(hwndMenu, uMsg, wParam, lParam, &lres); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; + + return lres; +} Modified: trunk/reactos/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] Sat Jun 17 07:28:35 2017 @@ -195,6 +195,7 @@ LRESULT OnLDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnLUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnWinIniChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); BEGIN_MSG_MAP(CInternetToolbar) COMMAND_ID_HANDLER(IDM_GOTO_BACK, OnTravelBack) @@ -215,6 +216,7 @@ MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLDown) MESSAGE_HANDLER(WM_LBUTTONUP, OnLUp) MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) + MESSAGE_HANDLER(WM_WININICHANGE, OnWinIniChange) END_MSG_MAP() DECLARE_REGISTRY_RESOURCEID(IDR_INTERNETTOOLBAR) Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Jun 17 07:28:35 2017 @@ -593,6 +593,7 @@ LRESULT OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT RelayMsgToShellView(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT PropagateMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnClose(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnFolderOptions(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnMapNetworkDrive(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); @@ -638,6 +639,7 @@ MESSAGE_HANDLER(WM_MEASUREITEM, RelayMsgToShellView) MESSAGE_HANDLER(WM_DRAWITEM, RelayMsgToShellView) MESSAGE_HANDLER(WM_MENUSELECT, RelayMsgToShellView) + MESSAGE_HANDLER(WM_WININICHANGE, PropagateMessage) COMMAND_ID_HANDLER(IDM_FILE_CLOSE, OnClose) COMMAND_ID_HANDLER(IDM_TOOLS_FOLDEROPTIONS, OnFolderOptions) COMMAND_ID_HANDLER(IDM_TOOLS_MAPNETWORKDRIVE, OnMapNetworkDrive) @@ -3508,6 +3510,12 @@ return 0; } +LRESULT CShellBrowser::PropagateMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + SHPropagateMessage(m_hWnd, uMsg, wParam, lParam, TRUE); + return 0; +} + LRESULT CShellBrowser::OnClose(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { return SendMessage(WM_CLOSE);

7 years, 6 months

[hbelusca] 75070: [NTOS]: Employ the simple CMP_ASSERT_KCB_LOCK() macro to perform these asserts.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 17 01:22:17 2017 New Revision: 75070 URL: http://svn.reactos.org/svn/reactos?rev=75070&view=rev Log: [NTOS]: Employ the simple CMP_ASSERT_KCB_LOCK() macro to perform these asserts. Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Sat Jun 17 01:22:17 2017 @@ -305,9 +305,8 @@ NTAPI CmpRemoveKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) { - /* Make sure that the registry and KCB are utterly locked */ - ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); + /* Make sure we have the exclusive lock */ + CMP_ASSERT_KCB_LOCK(Kcb); /* Remove the key hash */ CmpRemoveKeyHash(&Kcb->KeyHash); @@ -434,9 +433,8 @@ PULONG_PTR CachedList; ULONG i; - /* Sanity check */ - ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); + /* Make sure we have the exclusive lock */ + CMP_ASSERT_KCB_LOCK(Kcb); /* Check if the value list is cached */ if (CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList)) @@ -482,8 +480,7 @@ PAGED_CODE(); /* Sanity checks */ - ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); + CMP_ASSERT_KCB_LOCK(Kcb); ASSERT(Kcb->RefCount == 0); /* Cleanup the value cache */ @@ -521,9 +518,8 @@ { PCM_KEY_NODE KeyNode; - /* Sanity check */ - ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); + /* Make sure we have the exclusive lock */ + CMP_ASSERT_KCB_LOCK(Kcb); /* Check if there's any cached subkey */ if (Kcb->ExtFlags & (CM_KCB_NO_SUBKEY | CM_KCB_SUBKEY_ONE | CM_KCB_SUBKEY_HINT)) @@ -619,9 +615,8 @@ /* Check if this is the last reference */ if ((InterlockedDecrement((PLONG)&Kcb->RefCount) & 0xFFFF) == 0) { - /* Sanity check */ - ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); + /* Make sure we have the exclusive lock */ + CMP_ASSERT_KCB_LOCK(Kcb); /* Check if we should do a direct delete */ if (((CmpHoldLazyFlush) && @@ -1086,10 +1081,9 @@ } /* Make sure we have the exclusive lock */ - ASSERT((CmpIsKcbLockedExclusive(KeyBody->KeyControlBlock) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); - - /* do the insert */ + CMP_ASSERT_KCB_LOCK(KeyBody->KeyControlBlock); + + /* Do the insert */ InsertTailList(&KeyBody->KeyControlBlock->KeyBodyListHead, &KeyBody->KeyBodyList); @@ -1132,8 +1126,7 @@ /* Lock the KCB */ if (!LockHeld) CmpAcquireKcbLockExclusive(KeyBody->KeyControlBlock); - ASSERT((CmpIsKcbLockedExclusive(KeyBody->KeyControlBlock) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); + CMP_ASSERT_KCB_LOCK(KeyBody->KeyControlBlock); /* Remove the entry */ RemoveEntryList(&KeyBody->KeyBodyList);

7 years, 6 months

[hbelusca] 75069: [NTOS]: Whitespace fixes only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 17 01:21:21 2017 New Revision: 75069 URL: http://svn.reactos.org/svn/reactos?rev=75069&view=rev Log: [NTOS]: Whitespace fixes only. Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Sat Jun 17 01:21:21 2017 @@ -26,10 +26,10 @@ CmpInitializeCache(VOID) { ULONG Length, i; - + /* Calculate length for the table */ Length = CmpHashTableSize * sizeof(CM_KEY_HASH_TABLE_ENTRY); - + /* Allocate it */ CmpCacheTable = CmpAllocate(Length, TRUE, TAG_CM); if (!CmpCacheTable) @@ -37,20 +37,20 @@ /* Take the system down */ KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 3, 1, 0, 0); } - + /* Zero out the table */ RtlZeroMemory(CmpCacheTable, Length); - + /* Initialize the locks */ for (i = 0;i < CmpHashTableSize; i++) { /* Setup the pushlock */ ExInitializePushLock(&CmpCacheTable[i].Lock); } - + /* Calculate length for the name cache */ Length = CmpHashTableSize * sizeof(CM_NAME_HASH_TABLE_ENTRY); - + /* Now allocate the name cache table */ CmpNameCacheTable = CmpAllocate(Length, TRUE, TAG_CM); if (!CmpNameCacheTable) @@ -58,7 +58,7 @@ /* Take the system down */ KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 3, 3, 0, 0); } - + /* Zero out the table */ RtlZeroMemory(CmpNameCacheTable, Length); @@ -68,7 +68,7 @@ /* Setup the pushlock */ ExInitializePushLock(&CmpNameCacheTable[i].Lock); } - + /* Setup the delayed close table */ CmpInitializeDelayedCloseTable(); } @@ -374,13 +374,13 @@ /* Increase the reference count while we release the lock */ InterlockedIncrement((PLONG)&Kcb->RefCount); - + /* Go from shared to exclusive */ CmpConvertKcbSharedToExclusive(Kcb); /* Decrement the reference count; the lock is now held again */ InterlockedDecrement((PLONG)&Kcb->RefCount); - + /* Check if we still control the index */ if (Kcb->DelayedCloseIndex == 1) { @@ -1052,7 +1052,7 @@ /* Sanity check */ ASSERT(KeyBody->KeyControlBlock != NULL); - + /* Initialize the list entry */ InitializeListHead(&KeyBody->KeyBodyList); @@ -1069,7 +1069,7 @@ return; } } - + /* Array full, check if we need to unlock the KCB */ if (Flags & CMP_ENLIST_KCB_LOCKED_SHARED) { @@ -1129,12 +1129,12 @@ /* Sanity checks */ ASSERT(IsListEmpty(&KeyBody->KeyControlBlock->KeyBodyListHead) == FALSE); ASSERT(IsListEmpty(&KeyBody->KeyBodyList) == FALSE); - + /* Lock the KCB */ if (!LockHeld) CmpAcquireKcbLockExclusive(KeyBody->KeyControlBlock); ASSERT((CmpIsKcbLockedExclusive(KeyBody->KeyControlBlock) == TRUE) || (CmpTestRegistryLockExclusive() == TRUE)); - + /* Remove the entry */ RemoveEntryList(&KeyBody->KeyBodyList); @@ -1177,14 +1177,14 @@ ASSERT(KeyBody->NotifyBlock == NULL); continue; } - + /* Lock isn't held, so we need to take a reference */ if (ObReferenceObjectSafe(KeyBody)) { /* Now we can flush */ CmpFlushNotify(KeyBody, LockHeld); ASSERT(KeyBody->NotifyBlock == NULL); - + /* Release the reference we took */ ObDereferenceObjectDeferDelete(KeyBody); continue; @@ -1195,7 +1195,7 @@ NextEntry = NextEntry->Flink; } } - + /* List has been parsed, exit */ break; }

7 years, 6 months

[jimtabor] 75068: [User32] - Based on patch by Nikolay Sivov : Fix static control id. Fixes dialog tests, see CORE-13362.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Jun 16 22:49:36 2017 New Revision: 75068 URL: http://svn.reactos.org/svn/reactos?rev=75068&view=rev Log: [User32] - Based on patch by Nikolay Sivov : Fix static control id. Fixes dialog tests, see CORE-13362. Modified: trunk/reactos/win32ss/user/user32/windows/messagebox.c Modified: trunk/reactos/win32ss/user/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] Fri Jun 16 22:49:36 2017 @@ -40,7 +40,7 @@ /* DEFINES *******************************************************************/ #define MSGBOX_IDICON (1088) -#define MSGBOX_IDTEXT (100) +#define MSGBOX_IDTEXT (0xffff) #define IDI_HANDW MAKEINTRESOURCEW(32513) #define IDI_QUESTIONW MAKEINTRESOURCEW(32514)

7 years, 6 months

[jimtabor] 75067: [User32] - Skip desktop for positive index. See CORE-13362.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Jun 16 22:44:21 2017 New Revision: 75067 URL: http://svn.reactos.org/svn/reactos?rev=75067&view=rev Log: [User32] - Skip desktop for positive index. See CORE-13362. Modified: trunk/reactos/win32ss/user/user32/windows/class.c Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Fri Jun 16 22:44:21 2017 @@ -1092,7 +1092,7 @@ return 0; } - if (offset >= 0) + if (offset >= 0 && wndPtr->fnid != FNID_DESKTOP) { if (offset > (int)(wndPtr->cbwndExtra - size)) {

7 years, 6 months

[hbelusca] 75066: [NTOS]: Fix a bit the CmUnloadKey() function: - When a hive is unloaded, we *must* set the HIVE_IS_UNLOADING flag before doing anything else (as other code in Cm depends on this); ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 16 21:06:04 2017 New Revision: 75066 URL: http://svn.reactos.org/svn/reactos?rev=75066&view=rev Log: [NTOS]: Fix a bit the CmUnloadKey() function: - When a hive is unloaded, we *must* set the HIVE_IS_UNLOADING flag before doing anything else (as other code in Cm depends on this); - If we don't force a hive unload, we *must* check whether there are other opened handles to keys inside this hive, and if so, we must fail. If this is a force-unload however, we *must* invalidate/close all the opened handles to keys inside this hive, BUT this is left UNIMPLEMENTED at the moment (and therefore expect the already existing problems linked to this to still happen). - Move the HvFree(Hive); call at the very end, just before deleting the Cm hive, and as is done in CmpDestroyHive(). Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Fri Jun 16 21:06:04 2017 @@ -2198,6 +2198,27 @@ return STATUS_INVALID_PARAMETER; } + /* Mark this hive as being unloaded */ + Hive->HiveFlags |= HIVE_IS_UNLOADING; + + /* Search for any opened keys in this hive, and take an appropriate action */ + if (Kcb->RefCount > 1) + { + if (Flags != REG_FORCE_UNLOAD) + { + if (CmCountOpenSubKeys(Kcb, FALSE) != 0) + { + /* There are open subkeys but we don't force hive unloading, fail */ + Hive->HiveFlags &= ~HIVE_IS_UNLOADING; + return STATUS_CANNOT_DELETE; + } + } + else + { + DPRINT1("CmUnloadKey: Force unloading is UNIMPLEMENTED, expect dangling KCBs problems!\n"); + } + } + /* Flush the hive */ CmFlushKey(Kcb, TRUE); @@ -2206,9 +2227,8 @@ { DPRINT("CmpUnlinkHiveFromMaster() failed!\n"); - /* Remove the unloading flag */ + /* Remove the unloading flag and return failure */ Hive->HiveFlags &= ~HIVE_IS_UNLOADING; - return STATUS_INSUFFICIENT_RESOURCES; } @@ -2243,15 +2263,15 @@ /* Destroy the view list */ CmpDestroyHiveViewList(CmHive); - /* Free the hive storage */ - HvFree(Hive); - /* Delete the flusher lock */ ExDeleteResourceLite(CmHive->FlusherLock); ExFreePoolWithTag(CmHive->FlusherLock, TAG_CMHIVE); /* Delete the view lock */ ExFreePoolWithTag(CmHive->ViewLock, TAG_CMHIVE); + + /* Free the hive storage */ + HvFree(Hive); /* Free the hive */ CmpFree(CmHive, TAG_CM);

7 years, 6 months

[hbelusca] 75065: [NTOS]: Reorder the destruction code in CmpDestroyHive() to make it similar to the one in CmUnloadKey(). Same remark for a comment in NtUnloadKey2() too.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 16 21:02:27 2017 New Revision: 75065 URL: http://svn.reactos.org/svn/reactos?rev=75065&view=rev Log: [NTOS]: Reorder the destruction code in CmpDestroyHive() to make it similar to the one in CmUnloadKey(). Same remark for a comment in NtUnloadKey2() too. Modified: trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Fri Jun 16 21:02:27 2017 @@ -234,18 +234,18 @@ RemoveEntryList(&CmHive->HiveList); ExReleasePushLock(&CmpHiveListHeadLock); + /* Destroy the security descriptor cache */ + CmpDestroySecurityCache(CmHive); + + /* Destroy the view list */ + CmpDestroyHiveViewList(CmHive); + /* Delete the flusher lock */ ExDeleteResourceLite(CmHive->FlusherLock); ExFreePoolWithTag(CmHive->FlusherLock, TAG_CMHIVE); /* Delete the view lock */ ExFreePoolWithTag(CmHive->ViewLock, TAG_CMHIVE); - - /* Destroy the security descriptor cache */ - CmpDestroySecurityCache(CmHive); - - /* Destroy the view list */ - CmpDestroyHiveViewList(CmHive); /* Free the hive storage */ HvFree(&CmHive->Hive); Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Fri Jun 16 21:02:27 2017 @@ -1521,7 +1521,7 @@ { if (Flags != REG_FORCE_UNLOAD) { - /* Release two KCBs lock */ + /* Release the KCB locks */ CmpReleaseTwoKcbLockByKey(ChildConv, ParentConv); /* Release the hive loading lock */

7 years, 6 months

[hbelusca] 75064: [NTOS]: Few improvements: - Remove few unneeded PCMHIVE "backwards"-casts, and in particular the 1st parameter of CmpUnlinkHiveFromMaster(). - Improve the dprints in CmCountOpenSu...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 16 20:59:15 2017 New Revision: 75064 URL: http://svn.reactos.org/svn/reactos?rev=75064&view=rev Log: [NTOS]: Few improvements: - Remove few unneeded PCMHIVE "backwards"-casts, and in particular the 1st parameter of CmpUnlinkHiveFromMaster(). - Improve the dprints in CmCountOpenSubKeys(). Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Fri Jun 16 20:59:15 2017 @@ -1967,7 +1967,7 @@ } /* Release the flush lock */ - CmpUnlockHiveFlusher((PCMHIVE)Hive); + CmpUnlockHiveFlusher(CmHive); } /* Return the status */ @@ -2130,7 +2130,7 @@ static BOOLEAN NTAPI -CmpUnlinkHiveFromMaster(IN PHHIVE Hive, +CmpUnlinkHiveFromMaster(IN PCMHIVE CmHive, IN HCELL_INDEX Cell) { PCELL_DATA CellData; @@ -2140,13 +2140,13 @@ DPRINT("CmpUnlinkHiveFromMaster()\n"); /* Get the cell data */ - CellData = HvGetCell(Hive, Cell); + CellData = HvGetCell(&CmHive->Hive, Cell); if (CellData == NULL) return FALSE; /* Get the link cell and release the current cell */ LinkCell = CellData->u.KeyNode.Parent; - HvReleaseCell(Hive, Cell); + HvReleaseCell(&CmHive->Hive, Cell); /* Remove the link cell from the master hive */ CmpLockHiveFlusherExclusive(CmiVolatileHive); @@ -2160,13 +2160,9 @@ return FALSE; } - /* Lock the hive list */ + /* Remove the hive from the list */ ExAcquirePushLockExclusive(&CmpHiveListHeadLock); - - /* Remove this hive */ - RemoveEntryList(&((PCMHIVE)Hive)->HiveList); - - /* Release the lock */ + RemoveEntryList(&CmHive->HiveList); ExReleasePushLock(&CmpHiveListHeadLock); return TRUE; @@ -2206,7 +2202,7 @@ CmFlushKey(Kcb, TRUE); /* Unlink the hive from the master hive */ - if (!CmpUnlinkHiveFromMaster(Hive, Cell)) + if (!CmpUnlinkHiveFromMaster(CmHive, Cell)) { DPRINT("CmpUnlinkHiveFromMaster() failed!\n"); @@ -2280,7 +2276,7 @@ /* The root key is the only referenced key. There are no refereced sub keys. */ if (RootKcb->RefCount == 1) { - DPRINT("open sub keys: 0\n"); + DPRINT("Open sub keys: 0\n"); return 0; } @@ -2312,8 +2308,7 @@ /* Check whether the parent is the root key */ if (ParentKcb == RootKcb) { - DPRINT("Found a sub key \n"); - DPRINT("RefCount = %u\n", CachedKcb->RefCount); + DPRINT("Found a sub key, RefCount = %u\n", CachedKcb->RefCount); if (CachedKcb->RefCount > 0) { @@ -2340,8 +2335,7 @@ } } - DPRINT("open sub keys: %u\n", SubKeys); - + DPRINT("Open sub keys: %u\n", SubKeys); return SubKeys; }

7 years, 6 months

[hbelusca] 75063: [NTOS]: Remove trailing whitespace ; Use a correct pool tag in the CmpFree() call in CmpFreeDelayItem().

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 16 20:44:51 2017 New Revision: 75063 URL: http://svn.reactos.org/svn/reactos?rev=75063&view=rev Log: [NTOS]: Remove trailing whitespace ; Use a correct pool tag in the CmpFree() call in CmpFreeDelayItem(). Modified: trunk/reactos/ntoskrnl/config/cmalloc.c Modified: trunk/reactos/ntoskrnl/config/cmalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmalloc.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmalloc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmalloc.c [iso-8859-1] Fri Jun 16 20:44:51 2017 @@ -55,11 +55,11 @@ ULONG i; PCM_ALLOC_PAGE AllocPage; PAGED_CODE(); - + /* Sanity checks */ ASSERT(IsListEmpty(&Kcb->KeyBodyListHead) == TRUE); for (i = 0; i < 4; i++) ASSERT(Kcb->KeyBodyArray[i] == NULL); - + /* Check if it wasn't privately allocated */ if (!Kcb->PrivateAlloc) { @@ -67,22 +67,22 @@ CmpFree(Kcb, TAG_KCB); return; } - + /* Acquire the private allocation lock */ KeAcquireGuardedMutex(&CmpAllocBucketLock); - + /* Sanity check on lock ownership */ CMP_ASSERT_HASH_ENTRY_LOCK(Kcb->ConvKey); - + /* Add us to the free list */ InsertTailList(&CmpFreeKCBListHead, &Kcb->FreeListEntry); - + /* Get the allocation page */ AllocPage = CmpGetAllocPageFromKcb(Kcb); - + /* Sanity check */ ASSERT(AllocPage->FreeCount != CM_KCBS_PER_PAGE); - + /* Increase free count */ if (++AllocPage->FreeCount == CM_KCBS_PER_PAGE) { @@ -93,15 +93,15 @@ Kcb = (PVOID)((ULONG_PTR)AllocPage + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + i * sizeof(CM_KEY_CONTROL_BLOCK)); - - /* Remove the entry */ + + /* Remove the entry */ RemoveEntryList(&Kcb->FreeListEntry); } - + /* Free the page */ CmpFree(AllocPage, TAG_KCB); } - + /* Release the lock */ KeReleaseGuardedMutex(&CmpAllocBucketLock); } @@ -121,43 +121,43 @@ { /* They are, acquire the bucket lock */ KeAcquireGuardedMutex(&CmpAllocBucketLock); - + /* See if there's something on the free KCB list */ SearchKcbList: if (!IsListEmpty(&CmpFreeKCBListHead)) { /* Remove the entry */ NextEntry = RemoveHeadList(&CmpFreeKCBListHead); - + /* Get the KCB */ CurrentKcb = CONTAINING_RECORD(NextEntry, CM_KEY_CONTROL_BLOCK, FreeListEntry); - + /* Get the allocation page */ AllocPage = CmpGetAllocPageFromKcb(CurrentKcb); - + /* Decrease the free count */ ASSERT(AllocPage->FreeCount != 0); AllocPage->FreeCount--; - + /* Make sure this KCB is privately allocated */ ASSERT(CurrentKcb->PrivateAlloc == 1); - + /* Release the allocation lock */ KeReleaseGuardedMutex(&CmpAllocBucketLock); - + /* Return the KCB */ return CurrentKcb; } - + /* Allocate an allocation page */ AllocPage = CmpAllocate(PAGE_SIZE, TRUE, TAG_KCB); if (AllocPage) { /* Set default entries */ AllocPage->FreeCount = CM_KCBS_PER_PAGE; - + /* Loop each entry */ for (i = 0; i < CM_KCBS_PER_PAGE; i++) { @@ -165,14 +165,14 @@ CurrentKcb = (PVOID)((ULONG_PTR)AllocPage + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + i * sizeof(CM_KEY_CONTROL_BLOCK)); - + /* Set it up */ CurrentKcb->PrivateAlloc = TRUE; CurrentKcb->DelayCloseEntry = NULL; InsertTailList(&CmpFreeKCBListHead, &CurrentKcb->FreeListEntry); } - + /* Now go back and search the list */ goto SearchKcbList; } @@ -186,7 +186,7 @@ CurrentKcb->PrivateAlloc = 0; CurrentKcb->DelayCloseEntry = NULL; } - + /* Return it */ return CurrentKcb; } @@ -200,42 +200,42 @@ ULONG i; PLIST_ENTRY NextEntry; PAGED_CODE(); - + /* Lock the allocation buckets */ KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); - + /* Look for an item on the free list */ SearchList: if (!IsListEmpty(&CmpFreeDelayItemsListHead)) { /* Get the current entry in the list */ NextEntry = RemoveHeadList(&CmpFreeDelayItemsListHead); - + /* Grab the item */ Entry = CONTAINING_RECORD(NextEntry, CM_DELAY_ALLOC, ListEntry); - + /* Clear the list */ Entry->ListEntry.Flink = Entry->ListEntry.Blink = NULL; - + /* Grab the alloc page */ AllocPage = CmpGetAllocPageFromDelayAlloc(Entry); - + /* Decrease free entries */ ASSERT(AllocPage->FreeCount != 0); AllocPage->FreeCount--; - + /* Release the lock */ KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); return Entry; } - + /* Allocate an allocation page */ AllocPage = CmpAllocate(PAGE_SIZE, TRUE, TAG_CM); if (AllocPage) { /* Set default entries */ AllocPage->FreeCount = CM_DELAYS_PER_PAGE; - + /* Loop each entry */ for (i = 0; i < CM_DELAYS_PER_PAGE; i++) { @@ -245,7 +245,7 @@ i * sizeof(CM_DELAY_ALLOC)); InsertTailList(&CmpFreeDelayItemsListHead, &Entry->ListEntry); - + /* Clear the KCB pointer */ Entry->Kcb = NULL; } @@ -256,7 +256,7 @@ KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); return NULL; } - + /* Do the search again */ goto SearchList; } @@ -269,17 +269,17 @@ PCM_ALLOC_PAGE AllocPage; ULONG i; PAGED_CODE(); - + /* Lock the table */ KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); - + /* Add the entry at the end */ InsertTailList(&CmpFreeDelayItemsListHead, &AllocEntry->ListEntry); - + /* Get the alloc page */ AllocPage = CmpGetAllocPageFromDelayAlloc(Entry); ASSERT(AllocPage->FreeCount != CM_DELAYS_PER_PAGE); - + /* Increase the number of free items */ if (++AllocPage->FreeCount == CM_DELAYS_PER_PAGE) { @@ -292,11 +292,11 @@ i * sizeof(CM_DELAY_ALLOC)); RemoveEntryList(&AllocEntry->ListEntry); } - + /* Now free the page */ - CmpFree(AllocPage, 0); - } - + CmpFree(AllocPage, TAG_CM); + } + /* Release the lock */ KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); }

7 years, 6 months

[akhaldi] 75062: [USBPORT] Bring-in the usbport driver created by Vadim Galyant. CR-111 GitHub PR #27. This is the first module out of many to come, so stay tuned! Many thanks to everyone involved ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 16 19:20:03 2017 New Revision: 75062 URL: http://svn.reactos.org/svn/reactos?rev=75062&view=rev Log: [USBPORT] Bring-in the usbport driver created by Vadim Galyant. CR-111 GitHub PR #27. This is the first module out of many to come, so stay tuned! Many thanks to everyone involved in the code review. Very special thanks for Thomas as his help, insight and reviews helped tremendously. Added: trunk/reactos/drivers/usb/usbport/ trunk/reactos/drivers/usb/usbport/CMakeLists.txt (with props) trunk/reactos/drivers/usb/usbport/debug.c (with props) trunk/reactos/drivers/usb/usbport/device.c (with props) trunk/reactos/drivers/usb/usbport/endpoint.c (with props) trunk/reactos/drivers/usb/usbport/guid.c (with props) trunk/reactos/drivers/usb/usbport/iface.c (with props) trunk/reactos/drivers/usb/usbport/ioctl.c (with props) trunk/reactos/drivers/usb/usbport/pnp.c (with props) trunk/reactos/drivers/usb/usbport/power.c (with props) trunk/reactos/drivers/usb/usbport/queue.c (with props) trunk/reactos/drivers/usb/usbport/roothub.c (with props) trunk/reactos/drivers/usb/usbport/urb.c (with props) trunk/reactos/drivers/usb/usbport/usb2.c (with props) trunk/reactos/drivers/usb/usbport/usbdebug.h (with props) trunk/reactos/drivers/usb/usbport/usbport.c (with props) trunk/reactos/drivers/usb/usbport/usbport.h (with props) trunk/reactos/drivers/usb/usbport/usbport.rc (with props) trunk/reactos/drivers/usb/usbport/usbport.spec (with props) trunk/reactos/sdk/include/reactos/drivers/usbport/ trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h (with props) Modified: trunk/reactos/drivers/usb/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/CMakeLists.txt… Added: trunk/reactos/drivers/usb/usbport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/CMakeL… Added: trunk/reactos/drivers/usb/usbport/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/debug.… Added: trunk/reactos/drivers/usb/usbport/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/device… Added: trunk/reactos/drivers/usb/usbport/endpoint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/endpoi… Added: trunk/reactos/drivers/usb/usbport/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/guid.c… Added: trunk/reactos/drivers/usb/usbport/iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/iface.… Added: trunk/reactos/drivers/usb/usbport/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/ioctl.… Added: trunk/reactos/drivers/usb/usbport/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/pnp.c?… Added: trunk/reactos/drivers/usb/usbport/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/power.… Added: trunk/reactos/drivers/usb/usbport/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/queue.… Added: trunk/reactos/drivers/usb/usbport/roothub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/roothu… Added: trunk/reactos/drivers/usb/usbport/urb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/urb.c?… Added: trunk/reactos/drivers/usb/usbport/usb2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usb2.c… Added: trunk/reactos/drivers/usb/usbport/usbdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbdeb… Added: trunk/reactos/drivers/usb/usbport/usbport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbpor… Added: trunk/reactos/drivers/usb/usbport/usbport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbpor… Added: trunk/reactos/drivers/usb/usbport/usbport.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbpor… Added: trunk/reactos/drivers/usb/usbport/usbport.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbpor… Added: trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/driver…

7 years, 6 months

← Newer
1
...
16
17
18
19
20
21
22
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2017