Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[tfaber] 69657: [NTOS:SE] - Fail if the provided default DACL is invalid in NtCreateToken. CID 1237131

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 23 12:40:29 2015 New Revision: 69657 URL: http://svn.reactos.org/svn/reactos?rev=69657&view=rev Log: [NTOS:SE] - Fail if the provided default DACL is invalid in NtCreateToken. CID 1237131 Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=69… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Fri Oct 23 12:40:29 2015 @@ -2852,6 +2852,10 @@ NonPagedPool, FALSE, &CapturedDefaultDacl); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } } /* Call the internal function */

9 years, 2 months

[rnaumann] 69656: revert r69654

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Fri Oct 23 12:23:37 2015 New Revision: 69656 URL: http://svn.reactos.org/svn/reactos?rev=69656&view=rev Log: revert r69654 Modified: trunk/reactos/dll/win32/devmgr/resources/toolbar.bmp Modified: trunk/reactos/dll/win32/devmgr/resources/toolbar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/resources… ============================================================================== Binary files - no diff available.

9 years, 2 months

[rnaumann] 69655: [CPL] Fix some blurry resources. By Henry Tang Ih. CORE-10385

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Fri Oct 23 11:42:02 2015 New Revision: 69655 URL: http://svn.reactos.org/svn/reactos?rev=69655&view=rev Log: [CPL] Fix some blurry resources. By Henry Tang Ih. CORE-10385 Modified: trunk/reactos/dll/cpl/inetcpl/resources/inetcpl.ico trunk/reactos/dll/cpl/main/resources/admintools_folder.ico trunk/reactos/dll/cpl/main/resources/fonts_folder.ico trunk/reactos/dll/cpl/main/resources/keyboard.ico trunk/reactos/dll/cpl/mmsys/resources/4393.ico trunk/reactos/dll/cpl/timedate/resources/world.bmp Modified: trunk/reactos/dll/cpl/inetcpl/resources/inetcpl.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/resources/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/admintools_folder.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/adm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/fonts_folder.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/fon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/keyboard.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/key… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/mmsys/resources/4393.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/timedate/resources/world.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/resources… ============================================================================== Binary files - no diff available.

9 years, 2 months

[rnaumann] 69654: [DEVMGR] Improve the toolbar bitmap. By Jared Smudde. CORE-10342

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Fri Oct 23 11:27:52 2015 New Revision: 69654 URL: http://svn.reactos.org/svn/reactos?rev=69654&view=rev Log: [DEVMGR] Improve the toolbar bitmap. By Jared Smudde. CORE-10342 Modified: trunk/reactos/dll/win32/devmgr/resources/toolbar.bmp Modified: trunk/reactos/dll/win32/devmgr/resources/toolbar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/resources… ============================================================================== Binary files - no diff available.

9 years, 2 months

[tfaber] 69653: [WIN32K:NTUSER] - Don't open-code IoGetRemainingStackSize

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 23 10:34:44 2015 New Revision: 69653 URL: http://svn.reactos.org/svn/reactos?rev=69653&view=rev Log: [WIN32K:NTUSER] - Don't open-code IoGetRemainingStackSize Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Fri Oct 23 10:34:44 2015 @@ -1300,7 +1300,7 @@ INT lParamBufferSize; LPARAM lParamPacked; PTHREADINFO Win32Thread, ptiSendTo = NULL; - ULONG_PTR Hi, Lo, Result = 0; + ULONG_PTR Result = 0; DECLARE_RETURN(LRESULT); USER_REFERENCE_ENTRY Ref; BOOL DoCallBack = TRUE; @@ -1348,9 +1348,8 @@ if ( Window->state & WNDS_SERVERSIDEWINDOWPROC ) { TRACE("SMT: Server Side Window Procedure\n"); - IoGetStackLimits(&Lo, &Hi); // Handle it here. Safeguard against excessive recursions. - if (((ULONG_PTR)&uResult - Lo) < 4096 ) + if (IoGetRemainingStackSize() < PAGE_SIZE) { ERR("Server Callback Exceeded Stack!\n"); RETURN( FALSE);

9 years, 2 months

[tfaber] 69652: [NETWORKING][CABMAN] - Attempt to silence some 200 benign "Operands don't affect result" Coverity defects

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 23 07:26:42 2015 New Revision: 69652 URL: http://svn.reactos.org/svn/reactos?rev=69652&view=rev Log: [NETWORKING][CABMAN] - Attempt to silence some 200 benign "Operands don't affect result" Coverity defects Modified: trunk/reactos/dll/win32/ws2_32/include/debug.h trunk/reactos/dll/win32/wshirda/debug.h trunk/reactos/drivers/network/afd/include/debug.h trunk/reactos/drivers/network/dd/ne2000/include/debug.h trunk/reactos/drivers/network/dd/rtl8139/debug.h trunk/reactos/drivers/network/lan/include/debug.h trunk/reactos/drivers/network/ndis/include/debug.h trunk/reactos/tools/cabman/cabinet.h trunk/rosapps/applications/net/tditest/include/debug.h Modified: trunk/reactos/dll/win32/ws2_32/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -28,8 +28,9 @@ extern DWORD DebugTraceLevel; #define WS_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%hS:%d)(%hS) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_; \ } Modified: trunk/reactos/dll/win32/wshirda/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshirda/debug.h?… ============================================================================== --- trunk/reactos/dll/win32/wshirda/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshirda/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -22,8 +22,9 @@ extern DWORD DebugTraceLevel; #define WSH_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%hS:%d)(%hS) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_; \ } Modified: trunk/reactos/drivers/network/afd/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -26,8 +26,9 @@ #ifdef _MSC_VER #define AFD_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d) ", __FILE__, __LINE__); \ DbgPrint _x_ ; \ } @@ -35,8 +36,9 @@ #else /* _MSC_VER */ #define AFD_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_ ; \ } Modified: trunk/reactos/drivers/network/dd/ne2000/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/include/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -25,8 +25,9 @@ #ifdef _MSC_VER #define NDIS_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d) ", __FILE__, __LINE__); \ DbgPrint _x_ ; \ } @@ -34,8 +35,9 @@ #else /* _MSC_VER */ #define NDIS_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_ ; \ } Modified: trunk/reactos/drivers/network/dd/rtl8139/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/rtl8139… ============================================================================== --- trunk/reactos/drivers/network/dd/rtl8139/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/rtl8139/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -25,8 +25,9 @@ #ifdef _MSC_VER #define NDIS_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d) ", __FILE__, __LINE__); \ DbgPrint _x_ ; \ } @@ -34,8 +35,9 @@ #else /* _MSC_VER */ #define NDIS_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_ ; \ } Modified: trunk/reactos/drivers/network/lan/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/lan/includ… ============================================================================== --- trunk/reactos/drivers/network/lan/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/lan/include/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -40,8 +40,9 @@ #ifdef _MSC_VER #define LA_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d) ", __FILE__, __LINE__); \ DbgPrint _x_ ; \ } @@ -49,8 +50,9 @@ #else /* _MSC_VER */ #define LA_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_ ; \ } Modified: trunk/reactos/drivers/network/ndis/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -26,8 +26,9 @@ #ifdef _MSC_VER #define NDIS_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d) ", __FILE__, __LINE__); \ DbgPrint _x_ ; \ } @@ -35,8 +36,9 @@ #else /* _MSC_VER */ #define NDIS_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_ ; \ } Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -65,8 +65,9 @@ #undef DPRINT #define DPRINT(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ printf("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ printf _x_ ; \ } Modified: trunk/rosapps/applications/net/tditest/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/tditest/i… ============================================================================== --- trunk/rosapps/applications/net/tditest/include/debug.h [iso-8859-1] (original) +++ trunk/rosapps/applications/net/tditest/include/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -28,8 +28,9 @@ #ifdef _MSC_VER #define TDI_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d) ", __FILE__, __LINE__); \ DbgPrint _x_ ; \ } @@ -37,8 +38,9 @@ #else /* _MSC_VER */ #define TDI_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_ ; \ }

9 years, 2 months

[tfaber] 69651: [WIN32K:NTUSER] - Properly set the window minimize status in WM_ACTIVATE's WPARAM. CID 513028, 513029

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Oct 22 21:06:25 2015 New Revision: 69651 URL: http://svn.reactos.org/svn/reactos?rev=69651&view=rev Log: [WIN32K:NTUSER] - Properly set the window minimize status in WM_ACTIVATE's WPARAM. CID 513028, 513029 Modified: trunk/reactos/win32ss/user/ntuser/focus.c Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Thu Oct 22 21:06:25 2015 @@ -62,7 +62,7 @@ if (co_IntSendMessageNoWait(hWndPrev, WM_NCACTIVATE, FALSE, 0)) //(LPARAM)hWnd)) { co_IntSendMessageNoWait(hWndPrev, WM_ACTIVATE, - MAKEWPARAM(WA_INACTIVE, WndPrev->style & WS_MINIMIZE), + MAKEWPARAM(WA_INACTIVE, (WndPrev->style & WS_MINIMIZE) != 0), (LPARAM)hWnd); if (WndPrev) @@ -248,7 +248,7 @@ co_IntSendMessage( UserHMGetHandle(Window), WM_ACTIVATE, - MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, Window->style & WS_MINIMIZE), + MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, (Window->style & WS_MINIMIZE) != 0), (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0)); if (Window->spwndParent == UserGetDesktopWindow() &&

9 years, 2 months

[gedmurphy] 69650: The c++ bool is 1 byte, not 4. Thanks Thomas

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Oct 22 17:37:51 2015 New Revision: 69650 URL: http://svn.reactos.org/svn/reactos?rev=69650&view=rev Log: The c++ bool is 1 byte, not 4. Thanks Thomas Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Thu Oct 22 17:37:51 2015 @@ -786,7 +786,7 @@ // we set a timer to run in 500ms, which should leave enough time for all // the messages to come through. Wrap so we don't set multiple timers // - if (InterlockedCompareExchange((LONG *)&This->m_RefreshPending, true, false) == false) + if (InterlockedCompareExchange((LONG *)&This->m_RefreshPending, TRUE, FALSE) == FALSE) { SetTimer(hwnd, REFRESH_TIMER, 500, NULL); } @@ -807,7 +807,7 @@ KillTimer(hwnd, REFRESH_TIMER); // Allow more change notifications - InterlockedExchange((LONG *)&This->m_RefreshPending, false); + InterlockedExchange((LONG *)&This->m_RefreshPending, FALSE); } break; } Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] Thu Oct 22 17:37:51 2015 @@ -17,7 +17,7 @@ HMENU m_hMenu; HMENU m_hActionMenu; int m_CmdShow; - bool m_RefreshPending; + BOOL m_RefreshPending; public: CDeviceManager(void);

9 years, 2 months

[gedmurphy] 69649: [DEVMGR] - Automatically refresh the view whenever there is a hardware change on the machine - Don't force a refresh when we enable/disable devices, this is now be picked up auto...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Oct 22 17:21:30 2015 New Revision: 69649 URL: http://svn.reactos.org/svn/reactos?rev=69649&view=rev Log: [DEVMGR] - Automatically refresh the view whenever there is a hardware change on the machine - Don't force a refresh when we enable/disable devices, this is now be picked up automatically Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h trunk/reactos/dll/win32/devmgr/precomp.h Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Thu Oct 22 17:21:30 2015 @@ -700,13 +700,7 @@ } } - if (Node->EnableDevice(Enable, NeedsReboot)) - { - Refresh(m_ViewType, true, true, Node->GetDeviceId()); - return true; - } - - return false; + return Node->EnableDevice(Enable, NeedsReboot); } bool Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Thu Oct 22 17:21:30 2015 @@ -20,6 +20,8 @@ #define BTN_DISABLE_DRV 3 #define BTN_UPDATE_DRV 4 #define BTN_UNINSTALL_DRV 5 + +#define REFRESH_TIMER 1 HINSTANCE g_hThisInstance = NULL; HINSTANCE g_hParentInstance = NULL; @@ -81,7 +83,8 @@ m_hMainWnd(NULL), m_hStatusBar(NULL), m_hToolBar(NULL), - m_CmdShow(0) + m_CmdShow(0), + m_RefreshPending(false) { m_szMainWndClass = L"DevMgmtWndClass"; } @@ -773,6 +776,42 @@ break; } + case WM_DEVICECHANGE: + { + if (wParam == DBT_DEVNODES_CHANGED) + { + // + // The OS can send multiple change messages in quick sucsession. To avoid + // refreshing multiple times (and to avoid waiting in the message thread) + // we set a timer to run in 500ms, which should leave enough time for all + // the messages to come through. Wrap so we don't set multiple timers + // + if (InterlockedCompareExchange((LONG *)&This->m_RefreshPending, true, false) == false) + { + SetTimer(hwnd, REFRESH_TIMER, 500, NULL); + } + } + break; + } + case WM_TIMER: + { + if (wParam == REFRESH_TIMER) + { + // Schedule a refresh (this just creates a thread and returns) + This->m_DeviceView->Refresh(This->m_DeviceView->GetCurrentView(), + true, + true, + NULL); + + // Cleanup the timer + KillTimer(hwnd, REFRESH_TIMER); + + // Allow more change notifications + InterlockedExchange((LONG *)&This->m_RefreshPending, false); + } + break; + } + case WM_ENTERMENULOOP: { This->UpdateStatusBar(true); Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] Thu Oct 22 17:21:30 2015 @@ -17,6 +17,7 @@ HMENU m_hMenu; HMENU m_hActionMenu; int m_CmdShow; + bool m_RefreshPending; public: CDeviceManager(void); Modified: trunk/reactos/dll/win32/devmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] Thu Oct 22 17:21:30 2015 @@ -12,6 +12,7 @@ #include <Cfgmgr32.h> #include <devguid.h> #include <process.h> +#include <dbt.h> #include <RegStr.h> #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit @@ -59,6 +60,7 @@ #include <strsafe.h> #include <regstr.h> #include <newdevp.h> +#include <dbt.h> #include <setupapi.h> #include <commctrl.h>

9 years, 2 months

[tfaber] 69648: [WIN32K:NTUSER] - Fix uninitialized variable use in failure case of NtUserSetCursorIconData. CID 1322233

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Oct 22 16:41:38 2015 New Revision: 69648 URL: http://svn.reactos.org/svn/reactos?rev=69648&view=rev Log: [WIN32K:NTUSER] - Fix uninitialized variable use in failure case of NtUserSetCursorIconData. CID 1322233 Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Thu Oct 22 16:41:38 2015 @@ -1507,7 +1507,7 @@ PINT ajifRate; UINT cjSize; NTSTATUS status; - BOOL bResult; + BOOL bResult = FALSE; TRACE("Enter NtUserSetCursorIconData\n"); @@ -1531,7 +1531,6 @@ { ERR("Range error (cpcur = %u, cicur = %u)\n", cursordata.cpcur, cursordata.cicur); - bResult = FALSE; goto Exit; } @@ -1547,7 +1546,6 @@ { ERR("Failed to allocate memory (cpcur = %u, cicur = %u)\n", cursordata.cpcur, cursordata.cicur); - bResult = FALSE; goto Exit; } @@ -1590,7 +1588,6 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - bResult = FALSE; goto Exit; } _SEH2_END

9 years, 2 months

← Newer
1
...
9
10
11
12
13
14
15
...
35
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 October 2015