Ros-diffs January 2017

ros-diffs@reactos.org

15 participants
160 discussions

[tfaber] 73633: [FRAMEDYN] - Fix integer overflow checks. CID 1101981, 1248380, 1248381

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Jan 30 13:15:41 2017 New Revision: 73633 URL: http://svn.reactos.org/svn/reactos?rev=73633&view=rev Log: [FRAMEDYN] - Fix integer overflow checks. CID 1101981, 1248380, 1248381 Modified: trunk/reactos/dll/win32/framedyn/chstring.cpp Modified: trunk/reactos/dll/win32/framedyn/chstring.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/chstrin… ============================================================================== --- trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] Mon Jan 30 13:15:41 2017 @@ -288,7 +288,7 @@ } // Nor too big - if (nSize > INT_MAX) + if (nSize > (INT_MAX - (int)sizeof(CHStringData)) / (int)sizeof(WCHAR)) { RaiseException(STATUS_INTEGER_OVERFLOW, EXCEPTION_NONCONTINUABLE, 0, 0); } @@ -442,7 +442,7 @@ } // Ensure we wouldn't overflow with the concat - if (GetData()->nDataLength + nSrcLen > INT_MAX) + if (GetData()->nDataLength > INT_MAX - nSrcLen) { RaiseException(STATUS_INTEGER_OVERFLOW, EXCEPTION_NONCONTINUABLE, 0, 0); } @@ -461,7 +461,7 @@ else { // Ensure we don't overflow - if (nSrcLen > INT_MAX) + if (nSrcLen > INT_MAX - GetData()->nDataLength) { RaiseException(STATUS_INTEGER_OVERFLOW, EXCEPTION_NONCONTINUABLE, 0, 0); }

7 years, 8 months

[tfaber] 73632: [NDK] - Add missing lpctypes.h include in lpcfuncs.h - Fix some file header comments

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Jan 30 11:45:51 2017 New Revision: 73632 URL: http://svn.reactos.org/svn/reactos?rev=73632&view=rev Log: [NDK] - Add missing lpctypes.h include in lpcfuncs.h - Fix some file header comments Modified: trunk/reactos/sdk/include/ndk/ketypes.h trunk/reactos/sdk/include/ndk/lpcfuncs.h trunk/reactos/sdk/include/ndk/lpctypes.h trunk/reactos/sdk/include/ndk/obfuncs.h Modified: trunk/reactos/sdk/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/ketypes.h?… ============================================================================== --- trunk/reactos/sdk/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/ketypes.h [iso-8859-1] Mon Jan 30 11:45:51 2017 @@ -4,11 +4,11 @@ Header Name: - lpctypes.h + ketypes.h Abstract: - Type definitions for the Loader. + Type definitions for the Kernel services. Author: Modified: trunk/reactos/sdk/include/ndk/lpcfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/lpcfuncs.h… ============================================================================== --- trunk/reactos/sdk/include/ndk/lpcfuncs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/lpcfuncs.h [iso-8859-1] Mon Jan 30 11:45:51 2017 @@ -8,7 +8,7 @@ Abstract: - Function definitions for the Executive. + Function definitions for the Local Procedure Call. Author: @@ -23,6 +23,7 @@ // Dependencies // #include <umtypes.h> +#include <lpctypes.h> // // LPC Exports Modified: trunk/reactos/sdk/include/ndk/lpctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/lpctypes.h… ============================================================================== --- trunk/reactos/sdk/include/ndk/lpctypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/lpctypes.h [iso-8859-1] Mon Jan 30 11:45:51 2017 @@ -8,7 +8,7 @@ Abstract: - Type definitions for the Loader. + Type definitions for the Local Procedure Call. Author: Modified: trunk/reactos/sdk/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/obfuncs.h?… ============================================================================== --- trunk/reactos/sdk/include/ndk/obfuncs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/obfuncs.h [iso-8859-1] Mon Jan 30 11:45:51 2017 @@ -4,11 +4,11 @@ Header Name: - obtypes.h + obfuncs.h Abstract: - Type definitions for the Object Manager + Function definitions for the Object Manager Author:

7 years, 8 months

[tfaber] 73631: [0.4.4] - Mask WndProc exceptions CORE-11915

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Jan 30 11:35:05 2017 New Revision: 73631 URL: http://svn.reactos.org/svn/reactos?rev=73631&view=rev Log: [0.4.4] - Mask WndProc exceptions CORE-11915 Modified: branches/ros-branch-0_4_4/reactos/win32ss/user/user32/windows/message.c Modified: branches/ros-branch-0_4_4/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_4/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Mon Jan 30 11:35:05 2017 @@ -1464,20 +1464,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && MsgOverride) { @@ -1518,20 +1513,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && MsgOverride) { @@ -1611,20 +1601,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && MsgOverride) { @@ -1672,20 +1657,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && MsgOverride) {

7 years, 8 months

[akhaldi] 73630: [0.4.4] * Revert revisions 72835 and 72839 to avoid the FsRtlIsNameInExpressionPrivate crash from CORE-12121.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 29 23:03:34 2017 New Revision: 73630 URL: http://svn.reactos.org/svn/reactos?rev=73630&view=rev Log: [0.4.4] * Revert revisions 72835 and 72839 to avoid the FsRtlIsNameInExpressionPrivate crash from CORE-12121. Modified: branches/ros-branch-0_4_4/reactos/ntoskrnl/fsrtl/dbcsname.c branches/ros-branch-0_4_4/reactos/ntoskrnl/fsrtl/name.c Modified: branches/ros-branch-0_4_4/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_4_4/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Sun Jan 29 23:03:34 2017 @@ -160,14 +160,9 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, IN PANSI_STRING Name) { - USHORT Offset, Position, BackTrackingPosition, OldBackTrackingPosition; - USHORT BackTrackingBuffer[16], OldBackTrackingBuffer[16] = {0}; - PUSHORT BackTrackingSwap, BackTracking = BackTrackingBuffer, OldBackTracking = OldBackTrackingBuffer; - USHORT ExpressionPosition, NamePosition = 0, MatchingChars = 1; - USHORT NameChar = 0, ExpressionChar; - BOOLEAN EndOfName = FALSE; - BOOLEAN Result; - BOOLEAN DontSkipDot; + SHORT StarFound = -1, DosStarFound = -1; + PUSHORT BackTracking = NULL, DosBackTracking = NULL; + USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, LastDot; PAGED_CODE(); ASSERT(Name->Length); @@ -237,180 +232,170 @@ } } - /* Name parsing loop */ - for (; !EndOfName; MatchingChars = BackTrackingPosition) - { - /* Reset positions */ - OldBackTrackingPosition = BackTrackingPosition = 0; - - if (NamePosition >= Name->Length) - { - EndOfName = TRUE; - if (OldBackTracking[MatchingChars - 1] == Expression->Length * 2) + while (NamePosition < Name->Length && ExpressionPosition < Expression->Length) + { + /* Basic check to test if chars are equal */ + if ((Expression->Buffer[ExpressionPosition] == Name->Buffer[NamePosition])) + { + NamePosition++; + ExpressionPosition++; + } + /* Check cases that eat one char */ + else if (Expression->Buffer[ExpressionPosition] == '?') + { + NamePosition++; + ExpressionPosition++; + } + /* Test star */ + else if (Expression->Buffer[ExpressionPosition] == '*') + { + /* Skip contigous stars */ + while (ExpressionPosition + 1 < Expression->Length && Expression->Buffer[ExpressionPosition + 1] == '*') + { + ExpressionPosition++; + } + + /* Save star position */ + if (!BackTracking) + { + BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + Expression->Length * sizeof(USHORT), 'nrSF'); + } + BackTracking[++StarFound] = ExpressionPosition++; + + /* If star is at the end, then eat all rest and leave */ + if (ExpressionPosition == Expression->Length) + { + NamePosition = Name->Length; break; - } + } + /* Allow null matching */ + else if (Expression->Buffer[ExpressionPosition] != '?' && + Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition]) + { + NamePosition++; + } + } + /* Check DOS_STAR */ + else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_STAR) + { + /* Skip contigous stars */ + while (ExpressionPosition + 1 < Expression->Length && Expression->Buffer[ExpressionPosition + 1] == ANSI_DOS_STAR) + { + ExpressionPosition++; + } + + /* Look for last dot */ + MatchingChars = 0; + LastDot = (USHORT)-1; + while (MatchingChars < Name->Length) + { + if (Name->Buffer[MatchingChars] == '.') + { + LastDot = MatchingChars; + if (LastDot > NamePosition) + break; + } + + MatchingChars++; + } + + /* If we don't have dots or we didn't find last yet + * start eating everything + */ + if (MatchingChars != Name->Length || LastDot == (USHORT)-1) + { + if (!DosBackTracking) DosBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + Expression->Length * sizeof(USHORT), 'nrSF'); + DosBackTracking[++DosStarFound] = ExpressionPosition++; + + /* Not the same char, start exploring */ + if (Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition]) + NamePosition++; + } + else + { + /* Else, if we are at last dot, eat it - otherwise, null match */ + if (Name->Buffer[NamePosition] == '.') + NamePosition++; + + ExpressionPosition++; + } + } + /* Check DOS_DOT */ + else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT) + { + /* We only match dots */ + if (Name->Buffer[NamePosition] == '.') + { + NamePosition++; + } + /* Try to explore later on for null matching */ + else if (ExpressionPosition + 1 < Expression->Length && + Name->Buffer[NamePosition] == Expression->Buffer[ExpressionPosition + 1]) + { + NamePosition++; + } + ExpressionPosition++; + } + /* Check DOS_QM */ + else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) + { + /* We match everything except dots */ + if (Name->Buffer[NamePosition] != '.') + { + NamePosition++; + } + ExpressionPosition++; + } + /* If nothing match, try to backtrack */ + else if (StarFound >= 0) + { + ExpressionPosition = BackTracking[StarFound--]; + } + else if (DosStarFound >= 0) + { + ExpressionPosition = DosBackTracking[DosStarFound--]; + } + /* Otherwise, fail */ else { - /* If lead byte present */ - if (FsRtlIsLeadDbcsCharacter(Name->Buffer[NamePosition])) - { - NameChar = Name->Buffer[NamePosition] + - (0x100 * Name->Buffer[NamePosition + 1]); - NamePosition += sizeof(USHORT); - } - else - { - NameChar = Name->Buffer[NamePosition]; - NamePosition += sizeof(UCHAR); - } - } - - while (MatchingChars > OldBackTrackingPosition) - { - ExpressionPosition = (OldBackTracking[OldBackTrackingPosition++] + 1) / 2; - - /* Expression parsing loop */ - for (Offset = 0; ExpressionPosition < Expression->Length; ) - { - ExpressionPosition += Offset; - - if (ExpressionPosition == Expression->Length) - { - BackTracking[BackTrackingPosition++] = Expression->Length * 2; - break; - } - - /* If buffer too small */ - if (BackTrackingPosition > RTL_NUMBER_OF(BackTrackingBuffer) - 1) - { - /* Allocate memory for BackTracking */ - BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, - (Expression->Length + 1) * sizeof(USHORT) * 2, - 'nrSF'); - /* Copy old buffer content */ - RtlCopyMemory(BackTracking, - BackTrackingBuffer, - RTL_NUMBER_OF(BackTrackingBuffer) * sizeof(USHORT)); - - /* Allocate memory for OldBackTracking */ - OldBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, - (Expression->Length + 1) * sizeof(USHORT) * 2, - 'nrSF'); - /* Copy old buffer content */ - RtlCopyMemory(OldBackTracking, - OldBackTrackingBuffer, - RTL_NUMBER_OF(OldBackTrackingBuffer) * sizeof(USHORT)); - } - - /* If lead byte present */ - if (FsRtlIsLeadDbcsCharacter(Expression->Buffer[ExpressionPosition])) - { - ExpressionChar = Expression->Buffer[ExpressionPosition] + - (0x100 * Expression->Buffer[ExpressionPosition + 1]); - Offset = sizeof(USHORT); - } - else - { - ExpressionChar = Expression->Buffer[ExpressionPosition]; - Offset = sizeof(UCHAR); - } - - /* Basic check to test if chars are equal */ - if (ExpressionChar == NameChar && !EndOfName) - { - BackTracking[BackTrackingPosition++] = (ExpressionPosition + Offset) * 2; - } - /* Check cases that eat one char */ - else if (ExpressionChar == '?' && !EndOfName) - { - BackTracking[BackTrackingPosition++] = (ExpressionPosition + Offset) * 2; - } - /* Test star */ - else if (ExpressionChar == '*') - { - BackTracking[BackTrackingPosition++] = ExpressionPosition * 2; - BackTracking[BackTrackingPosition++] = (ExpressionPosition * 2) + 1; - continue; - } - /* Check DOS_STAR */ - else if (ExpressionChar == ANSI_DOS_STAR) - { - /* Look for last dot */ - DontSkipDot = TRUE; - if (!EndOfName && NameChar == '.') - { - for (Position = NamePosition; Position < Name->Length; ) - { - /* If lead byte not present */ - if (!FsRtlIsLeadDbcsCharacter(Name->Buffer[Position])) - { - if (Name->Buffer[Position] == '.') - { - DontSkipDot = FALSE; - break; - } - - Position += sizeof(UCHAR); - } - else - { - Position += sizeof(USHORT); - } - } - } - - if (EndOfName || NameChar != '.' || !DontSkipDot) - BackTracking[BackTrackingPosition++] = ExpressionPosition * 2; - - BackTracking[BackTrackingPosition++] = (ExpressionPosition * 2) + 1; - continue; - } - /* Check DOS_DOT */ - else if (ExpressionChar == DOS_DOT) - { - if (EndOfName) continue; - - if (NameChar == '.') - BackTracking[BackTrackingPosition++] = (ExpressionPosition + Offset) * 2; - } - /* Check DOS_QM */ - else if (ExpressionChar == ANSI_DOS_QM) - { - if (EndOfName || NameChar == '.') continue; - - BackTracking[BackTrackingPosition++] = (ExpressionPosition + Offset) * 2; - } - - /* Leave from loop */ + break; + } + + /* Under certain circumstances, expression is over, but name isn't + * and we can backtrack, then, backtrack */ + if (ExpressionPosition == Expression->Length && + NamePosition != Name->Length && StarFound >= 0) + { + ExpressionPosition = BackTracking[StarFound--]; + } + } + /* If we have nullable matching wc at the end of the string, eat them */ + if (ExpressionPosition != Expression->Length && NamePosition == Name->Length) + { + while (ExpressionPosition < Expression->Length) + { + if (Expression->Buffer[ExpressionPosition] != ANSI_DOS_DOT && + Expression->Buffer[ExpressionPosition] != '*' && + Expression->Buffer[ExpressionPosition] != ANSI_DOS_STAR) + { break; } - - for (Position = 0; MatchingChars > OldBackTrackingPosition && Position < BackTrackingPosition; Position++) - { - while (MatchingChars > OldBackTrackingPosition && - BackTracking[Position] > OldBackTracking[OldBackTrackingPosition]) - { - ++OldBackTrackingPosition; - } - } - } - - /* Swap pointers */ - BackTrackingSwap = BackTracking; - BackTracking = OldBackTracking; - OldBackTracking = BackTrackingSwap; - } - - /* Store result value */ - Result = (OldBackTracking[MatchingChars - 1] == Expression->Length * 2); - - /* Frees the memory if necessary */ - if (BackTracking != BackTrackingBuffer && BackTracking != OldBackTrackingBuffer) + ExpressionPosition++; + } + } + + if (BackTracking) + { ExFreePoolWithTag(BackTracking, 'nrSF'); - if (OldBackTracking != BackTrackingBuffer && OldBackTracking != OldBackTrackingBuffer) - ExFreePoolWithTag(OldBackTracking, 'nrSF'); - - return Result; + } + if (DosBackTracking) + { + ExFreePoolWithTag(DosBackTracking, 'nrSF'); + } + + return (ExpressionPosition == Expression->Length && NamePosition == Name->Length); } /*++ Modified: branches/ros-branch-0_4_4/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_4_4/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Sun Jan 29 23:03:34 2017 @@ -23,14 +23,13 @@ IN BOOLEAN IgnoreCase, IN PWCHAR UpcaseTable OPTIONAL) { - USHORT Offset, Position, BackTrackingPosition, OldBackTrackingPosition; - USHORT BackTrackingBuffer[16], OldBackTrackingBuffer[16] = {0}; - PUSHORT BackTrackingSwap, BackTracking = BackTrackingBuffer, OldBackTracking = OldBackTrackingBuffer; + SHORT StarFound = -1, DosStarFound = -1; + USHORT BackTrackingBuffer[5], DosBackTrackingBuffer[5]; + PUSHORT BackTracking = BackTrackingBuffer, DosBackTracking = DosBackTrackingBuffer; + SHORT BackTrackingSize = RTL_NUMBER_OF(BackTrackingBuffer); + SHORT DosBackTrackingSize = RTL_NUMBER_OF(DosBackTrackingBuffer); UNICODE_STRING IntExpression; - USHORT ExpressionPosition, NamePosition = 0, MatchingChars = 1; - BOOLEAN EndOfName = FALSE; - BOOLEAN Result; - BOOLEAN DontSkipDot; + USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, LastDot; WCHAR CompareChar; PAGED_CODE(); @@ -38,7 +37,7 @@ if (!Name->Length || !Expression->Length) { /* Return TRUE if both strings are empty, otherwise FALSE */ - if (!Name->Length && !Expression->Length) + if (Name->Length == 0 && Expression->Length == 0) return TRUE; else return FALSE; @@ -104,144 +103,193 @@ } } - /* Name parsing loop */ - for (; !EndOfName; MatchingChars = BackTrackingPosition, NamePosition++) - { - /* Reset positions */ - OldBackTrackingPosition = BackTrackingPosition = 0; - - if (NamePosition >= Name->Length / sizeof(WCHAR)) - { - EndOfName = TRUE; - if (OldBackTracking[MatchingChars - 1] == Expression->Length * 2) + while ((NamePosition < Name->Length / sizeof(WCHAR)) && + (ExpressionPosition < Expression->Length / sizeof(WCHAR))) + { + /* Basic check to test if chars are equal */ + CompareChar = IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : + Name->Buffer[NamePosition]; + if (Expression->Buffer[ExpressionPosition] == CompareChar) + { + NamePosition++; + ExpressionPosition++; + } + /* Check cases that eat one char */ + else if (Expression->Buffer[ExpressionPosition] == L'?') + { + NamePosition++; + ExpressionPosition++; + } + /* Test star */ + else if (Expression->Buffer[ExpressionPosition] == L'*') + { + /* Skip contigous stars */ + while ((ExpressionPosition + 1 < (USHORT)(Expression->Length / sizeof(WCHAR))) && + (Expression->Buffer[ExpressionPosition + 1] == L'*')) + { + ExpressionPosition++; + } + + /* Save star position */ + StarFound++; + if (StarFound >= BackTrackingSize) + { + ASSERT(BackTracking == BackTrackingBuffer); + + BackTrackingSize = Expression->Length / sizeof(WCHAR); + BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + BackTrackingSize * sizeof(USHORT), + 'nrSF'); + RtlCopyMemory(BackTracking, BackTrackingBuffer, sizeof(BackTrackingBuffer)); + + } + BackTracking[StarFound] = ExpressionPosition++; + + /* If star is at the end, then eat all rest and leave */ + if (ExpressionPosition == Expression->Length / sizeof(WCHAR)) + { + NamePosition = Name->Length / sizeof(WCHAR); break; - } - - while (MatchingChars > OldBackTrackingPosition) - { - ExpressionPosition = (OldBackTracking[OldBackTrackingPosition++] + 1) / 2; - - /* Expression parsing loop */ - for (Offset = 0; ExpressionPosition < Expression->Length; Offset = sizeof(WCHAR)) - { - ExpressionPosition += Offset; - - if (ExpressionPosition == Expression->Length) + } + + /* Allow null matching */ + if (Expression->Buffer[ExpressionPosition] != L'?' && + Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition]) + { + NamePosition++; + } + } + /* Check DOS_STAR */ + else if (Expression->Buffer[ExpressionPosition] == DOS_STAR) + { + /* Skip contigous stars */ + while ((ExpressionPosition + 1 < (USHORT)(Expression->Length / sizeof(WCHAR))) && + (Expression->Buffer[ExpressionPosition + 1] == DOS_STAR)) + { + ExpressionPosition++; + } + + /* Look for last dot */ + MatchingChars = 0; + LastDot = (USHORT)-1; + while (MatchingChars < Name->Length / sizeof(WCHAR)) + { + if (Name->Buffer[MatchingChars] == L'.') { - BackTracking[BackTrackingPosition++] = Expression->Length * 2; - break; + LastDot = MatchingChars; + if (LastDot > NamePosition) + break; } - /* If buffer too small */ - if (BackTrackingPosition > RTL_NUMBER_OF(BackTrackingBuffer) - 1) + MatchingChars++; + } + + /* If we don't have dots or we didn't find last yet + * start eating everything + */ + if (MatchingChars != Name->Length || LastDot == (USHORT)-1) + { + DosStarFound++; + if (DosStarFound >= DosBackTrackingSize) { - /* Allocate memory for BackTracking */ - BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, - (Expression->Length + sizeof(WCHAR)) * sizeof(USHORT), - 'nrSF'); - /* Copy old buffer content */ - RtlCopyMemory(BackTracking, - BackTrackingBuffer, - RTL_NUMBER_OF(BackTrackingBuffer) * sizeof(USHORT)); - - /* Allocate memory for OldBackTracking */ - OldBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, - (Expression->Length + sizeof(WCHAR)) * sizeof(USHORT), + ASSERT(DosBackTracking == DosBackTrackingBuffer); + + DosBackTrackingSize = Expression->Length / sizeof(WCHAR); + DosBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + DosBackTrackingSize * sizeof(USHORT), 'nrSF'); - /* Copy old buffer content */ - RtlCopyMemory(OldBackTracking, - OldBackTrackingBuffer, - RTL_NUMBER_OF(OldBackTrackingBuffer) * sizeof(USHORT)); + RtlCopyMemory(DosBackTracking, DosBackTrackingBuffer, sizeof(DosBackTrackingBuffer)); } - - /* Basic check to test if chars are equal */ - CompareChar = IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : - Name->Buffer[NamePosition]; - if (Expression->Buffer[ExpressionPosition / sizeof(WCHAR)] == CompareChar && !EndOfName) - { - BackTracking[BackTrackingPosition++] = (ExpressionPosition + sizeof(WCHAR)) * 2; - } - /* Check cases that eat one char */ - else if (Expression->Buffer[ExpressionPosition / sizeof(WCHAR)] == L'?' && !EndOfName) - { - BackTracking[BackTrackingPosition++] = (ExpressionPosition + sizeof(WCHAR)) * 2; - } - /* Test star */ - else if (Expression->Buffer[ExpressionPosition / sizeof(WCHAR)] == L'*') - { - BackTracking[BackTrackingPosition++] = ExpressionPosition * 2; - BackTracking[BackTrackingPosition++] = (ExpressionPosition * 2) + 3; - continue; - } - /* Check DOS_STAR */ - else if (Expression->Buffer[ExpressionPosition / sizeof(WCHAR)] == DOS_STAR) - { - /* Look for last dot */ - DontSkipDot = TRUE; - if (!EndOfName && Name->Buffer[NamePosition] == '.') - { - for (Position = NamePosition - 1; Position < Name->Length; Position++) - { - if (Name->Buffer[Position] == L'.') - { - DontSkipDot = FALSE; - break; - } - } - } - - if (EndOfName || Name->Buffer[NamePosition] != L'.' || !DontSkipDot) - BackTracking[BackTrackingPosition++] = ExpressionPosition * 2; - - BackTracking[BackTrackingPosition++] = (ExpressionPosition * 2) + 3; - continue; - } - /* Check DOS_DOT */ - else if (Expression->Buffer[ExpressionPosition / sizeof(WCHAR)] == DOS_DOT) - { - if (EndOfName) continue; - - if (Name->Buffer[NamePosition] == L'.') - BackTracking[BackTrackingPosition++] = (ExpressionPosition + sizeof(WCHAR)) * 2; - } - /* Check DOS_QM */ - else if (Expression->Buffer[ExpressionPosition / sizeof(WCHAR)] == DOS_QM) - { - if (EndOfName || Name->Buffer[NamePosition] == L'.') continue; - - BackTracking[BackTrackingPosition++] = (ExpressionPosition + sizeof(WCHAR)) * 2; - } - - /* Leave from loop */ + DosBackTracking[DosStarFound] = ExpressionPosition++; + + /* Not the same char, start exploring */ + if (Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition]) + NamePosition++; + } + else + { + /* Else, if we are at last dot, eat it - otherwise, null match */ + if (Name->Buffer[NamePosition] == '.') + NamePosition++; + + ExpressionPosition++; + } + } + /* Check DOS_DOT */ + else if (Expression->Buffer[ExpressionPosition] == DOS_DOT) + { + /* We only match dots */ + if (Name->Buffer[NamePosition] == L'.') + { + NamePosition++; + } + /* Try to explore later on for null matching */ + else if ((ExpressionPosition + 1 < (USHORT)(Expression->Length / sizeof(WCHAR))) && + (Name->Buffer[NamePosition] == Expression->Buffer[ExpressionPosition + 1])) + { + NamePosition++; + } + ExpressionPosition++; + } + /* Check DOS_QM */ + else if (Expression->Buffer[ExpressionPosition] == DOS_QM) + { + /* We match everything except dots */ + if (Name->Buffer[NamePosition] != L'.') + { + NamePosition++; + } + ExpressionPosition++; + } + /* If nothing match, try to backtrack */ + else if (StarFound >= 0) + { + ExpressionPosition = BackTracking[StarFound--]; + } + else if (DosStarFound >= 0) + { + ExpressionPosition = DosBackTracking[DosStarFound--]; + } + /* Otherwise, fail */ + else + { + break; + } + + /* Under certain circumstances, expression is over, but name isn't + * and we can backtrack, then, backtrack */ + if (ExpressionPosition == Expression->Length / sizeof(WCHAR) && + NamePosition != Name->Length / sizeof(WCHAR) && + StarFound >= 0) + { + ExpressionPosition = BackTracking[StarFound--]; + } + } + /* If we have nullable matching wc at the end of the string, eat them */ + if (ExpressionPosition != Expression->Length / sizeof(WCHAR) && NamePosition == Name->Length / sizeof(WCHAR)) + { + while (ExpressionPosition < Expression->Length / sizeof(WCHAR)) + { + if (Expression->Buffer[ExpressionPosition] != DOS_DOT && + Expression->Buffer[ExpressionPosition] != L'*' && + Expression->Buffer[ExpressionPosition] != DOS_STAR) + { break; } - - for (Position = 0; MatchingChars > OldBackTrackingPosition && Position < BackTrackingPosition; Position++) - { - while (MatchingChars > OldBackTrackingPosition && - BackTracking[Position] > OldBackTracking[OldBackTrackingPosition]) - { - ++OldBackTrackingPosition; - } - } - } - - /* Swap pointers */ - BackTrackingSwap = BackTracking; - BackTracking = OldBackTracking; - OldBackTracking = BackTrackingSwap; - } - - /* Store result value */ - Result = (OldBackTracking[MatchingChars - 1] == (Expression->Length * 2)); - - /* Frees the memory if necessary */ - if (BackTracking != BackTrackingBuffer && BackTracking != OldBackTrackingBuffer) + ExpressionPosition++; + } + } + + if (BackTracking != BackTrackingBuffer) + { ExFreePoolWithTag(BackTracking, 'nrSF'); - if (OldBackTracking != BackTrackingBuffer && OldBackTracking != OldBackTrackingBuffer) - ExFreePoolWithTag(OldBackTracking, 'nrSF'); - - return Result; + } + if (DosBackTracking != DosBackTrackingBuffer) + { + ExFreePoolWithTag(DosBackTracking, 'nrSF'); + } + + return (ExpressionPosition == Expression->Length / sizeof(WCHAR) && NamePosition == Name->Length / sizeof(WCHAR)); } /* PUBLIC FUNCTIONS **********************************************************/

7 years, 8 months

[akhaldi] 73629: [0.4.4] Revert some shell32 work (revisions 73436, 73591 and 73599) on Giannis request to avoid any potential last minute regressions. CORE-12700

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 29 21:49:41 2017 New Revision: 73629 URL: http://svn.reactos.org/svn/reactos?rev=73629&view=rev Log: [0.4.4] Revert some shell32 work (revisions 73436, 73591 and 73599) on Giannis request to avoid any potential last minute regressions. CORE-12700 Modified: branches/ros-branch-0_4_4/reactos/dll/win32/shell32/CDefView.cpp branches/ros-branch-0_4_4/reactos/dll/win32/shell32/CDefaultContextMenu.cpp branches/ros-branch-0_4_4/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp branches/ros-branch-0_4_4/reactos/dll/win32/shell32/iconcache.cpp branches/ros-branch-0_4_4/reactos/dll/win32/shell32/shell32.cpp branches/ros-branch-0_4_4/reactos/dll/win32/shell32/wine/shellord.c Modified: branches/ros-branch-0_4_4/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_4/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Sun Jan 29 21:49:41 2017 @@ -96,7 +96,6 @@ LONG m_iDragOverItem; /* Dragged over item's index, iff m_pCurDropTarget != NULL */ UINT m_cScrollDelay; /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */ POINT m_ptLastMousePos; /* Mouse position at last DragOver call */ - POINT m_ptFirstMousePos; /* Mouse position when the drag operation started */ // CComPtr<IContextMenu> m_pCM; @@ -1757,8 +1756,6 @@ DWORD dwEffect2; m_pSourceDataObject = pda; - m_ptFirstMousePos = ((LPNMLISTVIEW)lParam)->ptAction; - ClientToScreen(&m_ptFirstMousePos); DoDragDrop(pda, this, dwEffect, &dwEffect2); @@ -2905,6 +2902,7 @@ { /* Get a hold on the data object for later calls to DragEnter on the sub-folders */ m_pCurDataObject = pDataObject; + pDataObject->AddRef(); return drag_notify_subitem(grfKeyState, pt, pdwEffect); } @@ -2938,22 +2936,11 @@ if ((m_iDragOverItem == -1) && (*pdwEffect & DROPEFFECT_MOVE) && - /*(GetKeyState(VK_LBUTTON) != 0) &&*/ + (GetKeyState(VK_LBUTTON) != 0) && (m_pSourceDataObject.p) && (SHIsSameObject(pDataObject, m_pSourceDataObject))) { - /* Reposition the items */ - int lvIndex = -1; - while ((lvIndex = m_ListView.GetNextItem(lvIndex, LVNI_SELECTED)) > -1) - { - POINT ptItem; - if (m_ListView.GetItemPosition(lvIndex, &ptItem)) - { - ptItem.x += pt.x - m_ptFirstMousePos.x; - ptItem.y += pt.y - m_ptFirstMousePos.y; - m_ListView.SetItemPosition(lvIndex, &ptItem); - } - } + ERR("Should implement moving items here!\n"); if (m_pCurDropTarget) { Modified: branches/ros-branch-0_4_4/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_4/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Sun Jan 29 21:49:41 2017 @@ -76,8 +76,6 @@ PStaticShellEntry m_pStaticEntries; /* first static shell extension entry */ UINT m_iIdSCMFirst; /* first static used id */ UINT m_iIdSCMLast; /* last static used id */ - UINT m_iIdCBFirst; /* first callback used id */ - UINT m_iIdCBLast; /* last callback used id */ HRESULT _DoCallback(UINT uMsg, WPARAM wParam, LPVOID lParam); void AddStaticEntry(const HKEY hkeyClass, const WCHAR *szVerb); @@ -86,7 +84,8 @@ HRESULT LoadDynamicContextMenuHandler(HKEY hKey, const CLSID *pclsid); BOOL EnumerateDynamicContextHandlerForKey(HKEY hRootKey); UINT InsertMenuItemsOfDynamicContextMenuExtension(HMENU hMenu, UINT IndexMenu, UINT idCmdFirst, UINT idCmdLast); - UINT AddStaticContextMenusToMenu(HMENU hMenu, UINT IndexMenu, UINT iIdCmdFirst, UINT iIdCmdLast); + UINT AddStaticContextMenusToMenu(HMENU hMenu, UINT IndexMenu); + UINT BuildShellItemContextMenu(HMENU hMenu, UINT iIdCmdFirst, UINT iIdCmdLast, UINT uFlags); HRESULT DoPaste(LPCMINVOKECOMMANDINFO lpcmi, BOOL bLink); HRESULT DoOpenOrExplore(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoCreateLink(LPCMINVOKECOMMANDINFO lpcmi); @@ -147,9 +146,7 @@ m_iIdSHELast(0), m_pStaticEntries(NULL), m_iIdSCMFirst(0), - m_iIdSCMLast(0), - m_iIdCBFirst(0), - m_iIdCBLast(0) + m_iIdSCMLast(0) { } @@ -473,6 +470,8 @@ } PDynamicShellEntry pEntry = m_pDynamicEntries; + idCmdFirst = 0x5000; + idCmdLast = 0x6000; m_iIdSHEFirst = idCmdFirst; do { @@ -483,13 +482,6 @@ pEntry->NumIds = LOWORD(hr); IndexMenu += pEntry->NumIds; idCmdFirst += pEntry->NumIds + 0x10; - - if(idCmdFirst >= idCmdLast) - { - /* There is no more room for items */ - idCmdFirst = idCmdLast; - break; - } } TRACE("pEntry %p hr %x contextmenu %p cmdfirst %x num ids %x\n", pEntry, hr, pEntry->pCM, pEntry->iIdCmdFirst, pEntry->NumIds); pEntry = pEntry->pNext; @@ -503,9 +495,7 @@ UINT CDefaultContextMenu::AddStaticContextMenusToMenu( HMENU hMenu, - UINT IndexMenu, - UINT iIdCmdFirst, - UINT iIdCmdLast) + UINT IndexMenu) { MENUITEMINFOW mii; UINT idResource; @@ -515,7 +505,7 @@ mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; mii.fType = MFT_STRING; - mii.wID = iIdCmdFirst; + mii.wID = 0x4000; mii.dwTypeData = NULL; m_iIdSCMFirst = mii.wID; @@ -600,9 +590,6 @@ mii.wID++; pEntry = pEntry->pNext; - - if (mii.wID >= iIdCmdLast) - break; } m_iIdSCMLast = mii.wID - 1; @@ -658,11 +645,6 @@ UINT uFlags) { HRESULT hr; - UINT idCmdNext = idCmdFirst; - - /* Add a tiny hack to make all the shell happy until we understand how we should handle 0 ids */ - if (!idCmdNext) - idCmdNext = 1; TRACE("BuildShellItemContextMenu entered\n"); @@ -674,40 +656,35 @@ } /* Add static context menu handlers */ - IndexMenu = AddStaticContextMenusToMenu(hMenu, IndexMenu, idCmdNext, idCmdLast); - if (m_iIdSCMLast && m_iIdSCMFirst != m_iIdSCMLast) - idCmdNext = m_iIdSCMLast + 1; + IndexMenu = AddStaticContextMenusToMenu(hMenu, IndexMenu); /* Add dynamic context menu handlers */ BOOL bAddSep = FALSE; - IndexMenu = InsertMenuItemsOfDynamicContextMenuExtension(hMenu, IndexMenu, idCmdNext, idCmdLast); - if (m_iIdSHELast && m_iIdSHELast != m_iIdSHEFirst) - idCmdNext = m_iIdSHELast + 1; + IndexMenu = InsertMenuItemsOfDynamicContextMenuExtension(hMenu, IndexMenu, idCmdFirst, idCmdLast); + TRACE("IndexMenu %d\n", IndexMenu); /* Now let the callback add its own items */ - QCMINFO qcminfo = {hMenu, IndexMenu, idCmdNext, idCmdLast, NULL}; - if (SUCCEEDED(_DoCallback(DFM_MERGECONTEXTMENU, uFlags, &qcminfo))) - { - m_iIdCBFirst = idCmdNext; - m_iIdCBLast = qcminfo.idCmdFirst; - idCmdNext = m_iIdCBLast + 1; - } - - /* The rest of the items will be added in the end of the menu */ + QCMINFO qcminfo; + qcminfo.hmenu = hMenu; + qcminfo.indexMenu = IndexMenu; + qcminfo.idCmdFirst = idCmdFirst; + qcminfo.idCmdLast = idCmdLast; + qcminfo.pIdMap = NULL; + _DoCallback(DFM_MERGECONTEXTMENU, uFlags, &qcminfo); IndexMenu = GetMenuItemCount(hMenu); if (uFlags & CMF_VERBSONLY) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdNext - idCmdFirst); + return S_OK; /* If this is a background context menu we are done */ if (!m_cidl) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdNext - idCmdFirst); + return S_OK; /* Get the attributes of the items */ SFGAOF rfg = SFGAO_BROWSABLE | SFGAO_CANCOPY | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANDELETE | SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_FILESYSTEM | SFGAO_FOLDER; hr = m_psf->GetAttributesOf(m_cidl, m_apidl, &rfg); if (FAILED_UNEXPECTEDLY(hr)) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdNext - idCmdFirst); + return S_OK; /* Add the standard menu entries based on the attributes of the items */ BOOL bClipboardData = (HasClipboardData() && (rfg & SFGAO_FILESYSTEM)); @@ -1229,6 +1206,9 @@ Result = DoCreateNewFolder(&LocalInvokeInfo); break; default: + + _DoCallback(DFM_INVOKECOMMAND, LOWORD(LocalInvokeInfo.lpVerb), NULL); + Result = E_UNEXPECTED; break; } @@ -1236,27 +1216,21 @@ /* Check for ID's we didn't find a handler for */ if (Result == E_UNEXPECTED) { - if (m_pDynamicEntries) + if (m_iIdSHEFirst && m_iIdSHELast) { if (LOWORD(LocalInvokeInfo.lpVerb) >= m_iIdSHEFirst && LOWORD(LocalInvokeInfo.lpVerb) <= m_iIdSHELast) Result = DoDynamicShellExtensions(&LocalInvokeInfo); } - if (m_pStaticEntries) + if (m_iIdSCMFirst && m_iIdSCMLast) { if (LOWORD(LocalInvokeInfo.lpVerb) >= m_iIdSCMFirst && LOWORD(LocalInvokeInfo.lpVerb) <= m_iIdSCMLast) Result = DoStaticShellExtensions(&LocalInvokeInfo); } - - if (m_iIdCBFirst != m_iIdCBLast) - { - if (LOWORD(LocalInvokeInfo.lpVerb) >= m_iIdCBFirst && LOWORD(LocalInvokeInfo.lpVerb) <= m_iIdCBLast) - Result = _DoCallback(DFM_INVOKECOMMAND, LOWORD(LocalInvokeInfo.lpVerb), NULL); - } } if (Result == E_UNEXPECTED) - ERR("Unhandled Verb %xl\n", LOWORD(LocalInvokeInfo.lpVerb)); + FIXME("Unhandled Verb %xl\n", LOWORD(LocalInvokeInfo.lpVerb)); return Result; } Modified: branches/ros-branch-0_4_4/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_4/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Sun Jan 29 21:49:41 2017 @@ -76,23 +76,23 @@ if (!(dwFlags & FILE_READ_ONLY_VOLUME) && GetDriveTypeA(szDrive) != DRIVE_REMOTE) { _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, pqcminfo->idCmdFirst++, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0x7ABC, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); } } } else if (uMsg == DFM_INVOKECOMMAND) { - if (wParam == DFM_CMD_PROPERTIES) + if(wParam == 0x7ABC) + { + SHFormatDrive(hwnd, szDrive[0] - 'A', SHFMT_ID_DEFAULT, 0); + } + else if (wParam == DFM_CMD_PROPERTIES) { WCHAR wszBuf[4]; wcscpy(wszBuf, L"A:\\"); wszBuf[0] = (WCHAR)szDrive[0]; if (!SH_ShowDriveProperties(wszBuf, pidlFolder, apidl)) hr = E_FAIL; - } - else - { - SHFormatDrive(hwnd, szDrive[0] - 'A', SHFMT_ID_DEFAULT, 0); } } Modified: branches/ros-branch-0_4_4/reactos/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_4/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] Sun Jan 29 21:49:41 2017 @@ -453,9 +453,6 @@ sice.dwSourceIndex = dwSourceIndex; sice.dwFlags = dwFlags; - if (!sic_hdpa) - SIC_Initialize(); - EnterCriticalSection(&SHELL32_SicCS); if (NULL != DPA_GetPtr (sic_hdpa, 0)) @@ -690,9 +687,6 @@ RegCloseKey(hKeyShellIcons); } - if (!sic_hdpa) - SIC_Initialize(); - return SIC_LoadIcon(iconPath, iconIdx, 0); } @@ -704,17 +698,13 @@ * */ BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) -{ - TRACE("(%p,%p)\n",lpBigList,lpSmallList); - - if (!sic_hdpa) - SIC_Initialize(); - +{ TRACE("(%p,%p)\n",lpBigList,lpSmallList); if (lpBigList) - *lpBigList = ShellBigIconList; - + { *lpBigList = ShellBigIconList; + } if (lpSmallList) - *lpSmallList = ShellSmallIconList; + { *lpSmallList = ShellSmallIconList; + } return TRUE; } @@ -744,9 +734,6 @@ int iShortcutDefaultIndex = INVALID_INDEX; TRACE("sf=%p pidl=%p %s\n", sh, pidl, bBigIcon?"Big":"Small"); - - if (!sic_hdpa) - SIC_Initialize(); if (SUCCEEDED (sh->GetUIObjectOf(0, 1, &pidl, IID_NULL_PPV_ARG(IExtractIconW, &ei)))) { Modified: branches/ros-branch-0_4_4/reactos/dll/win32/shell32/shell32.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_4/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] Sun Jan 29 21:49:41 2017 @@ -347,6 +347,7 @@ InitCommonControlsEx(&InitCtrls); /* Bad idea, initialization in DllMain! */ + SIC_Initialize(); InitChangeNotifications(); } else if (dwReason == DLL_PROCESS_DETACH) Modified: branches/ros-branch-0_4_4/reactos/dll/win32/shell32/wine/shellord.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_4/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] Sun Jan 29 21:49:41 2017 @@ -1292,8 +1292,8 @@ * */ BOOL WINAPI FileIconInit(BOOL bFullInit) -{ - return SIC_Initialize(); +{ FIXME("(%s)\n", bFullInit ? "true" : "false"); + return FALSE; } /*************************************************************************

7 years, 8 months

[akhaldi] 73628: [0.4.4] * Apply the patch that allows us to dynamically change the resolution by resizing in VirtualBox. CORE-6742

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 29 21:09:43 2017 New Revision: 73628 URL: http://svn.reactos.org/svn/reactos?rev=73628&view=rev Log: [0.4.4] * Apply the patch that allows us to dynamically change the resolution by resizing in VirtualBox. CORE-6742 Modified: branches/ros-branch-0_4_4/reactos/win32ss/gdi/eng/device.c branches/ros-branch-0_4_4/reactos/win32ss/gdi/eng/device.h branches/ros-branch-0_4_4/reactos/win32ss/gdi/eng/pdevobj.c branches/ros-branch-0_4_4/reactos/win32ss/user/ntuser/display.c Modified: branches/ros-branch-0_4_4/reactos/win32ss/gdi/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_4/reactos/win32ss/gdi/eng/device.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/win32ss/gdi/eng/device.c [iso-8859-1] Sun Jan 29 21:09:43 2017 @@ -30,99 +30,22 @@ return STATUS_SUCCESS; } - -PGRAPHICS_DEVICE -NTAPI -EngpRegisterGraphicsDevice( - _In_ PUNICODE_STRING pustrDeviceName, - _In_ PUNICODE_STRING pustrDiplayDrivers, - _In_ PUNICODE_STRING pustrDescription, +BOOLEAN +EngpPopulateDeviceModeList( + _Inout_ PGRAPHICS_DEVICE pGraphicsDevice, _In_ PDEVMODEW pdmDefault) { - PGRAPHICS_DEVICE pGraphicsDevice; - PDEVICE_OBJECT pDeviceObject; - PFILE_OBJECT pFileObject; - NTSTATUS Status; PWSTR pwsz; - ULONG i, cj, cModes = 0; - SIZE_T cjWritten; - BOOL bEnable = TRUE; + PLDEVOBJ pldev; PDEVMODEINFO pdminfo; PDEVMODEW pdm, pdmEnd; - PLDEVOBJ pldev; + ULONG i, cModes = 0; BOOLEAN bModeMatch = FALSE; - TRACE("EngpRegisterGraphicsDevice(%wZ)\n", pustrDeviceName); - - /* Allocate a GRAPHICS_DEVICE structure */ - pGraphicsDevice = ExAllocatePoolWithTag(PagedPool, - sizeof(GRAPHICS_DEVICE), - GDITAG_GDEVICE); - if (!pGraphicsDevice) - { - ERR("ExAllocatePoolWithTag failed\n"); - return NULL; - } - - /* Try to open the driver */ - Status = IoGetDeviceObjectPointer(pustrDeviceName, - FILE_READ_DATA | FILE_WRITE_DATA, - &pFileObject, - &pDeviceObject); - if (!NT_SUCCESS(Status)) - { - ERR("Could not open driver %wZ, 0x%lx\n", pustrDeviceName, Status); - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; - } - - /* Enable the device */ - EngFileWrite(pFileObject, &bEnable, sizeof(BOOL), &cjWritten); - - /* Copy the device and file object pointers */ - pGraphicsDevice->DeviceObject = pDeviceObject; - pGraphicsDevice->FileObject = pFileObject; - - /* Copy device name */ - RtlStringCbCopyNW(pGraphicsDevice->szNtDeviceName, - sizeof(pGraphicsDevice->szNtDeviceName), - pustrDeviceName->Buffer, - pustrDeviceName->Length); - - /* Create a win device name (FIXME: virtual devices!) */ - swprintf(pGraphicsDevice->szWinDeviceName, L"\\\\.\\DISPLAY%d", (int)giDevNum); - - /* Allocate a buffer for the strings */ - cj = pustrDiplayDrivers->Length + pustrDescription->Length + sizeof(WCHAR); - pwsz = ExAllocatePoolWithTag(PagedPool, cj, GDITAG_DRVSUP); - if (!pwsz) - { - ERR("Could not allocate string buffer\n"); - ASSERT(FALSE); // FIXME - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; - } - - /* Copy display driver names */ - pGraphicsDevice->pDiplayDrivers = pwsz; - RtlCopyMemory(pGraphicsDevice->pDiplayDrivers, - pustrDiplayDrivers->Buffer, - pustrDiplayDrivers->Length); - - /* Copy description */ - pGraphicsDevice->pwszDescription = pwsz + pustrDiplayDrivers->Length / sizeof(WCHAR); - RtlCopyMemory(pGraphicsDevice->pwszDescription, - pustrDescription->Buffer, - pustrDescription->Length); - pGraphicsDevice->pwszDescription[pustrDescription->Length/sizeof(WCHAR)] = 0; - - /* Initialize the pdevmodeInfo list and default index */ - pGraphicsDevice->pdevmodeInfo = NULL; - pGraphicsDevice->iDefaultMode = 0; - pGraphicsDevice->iCurrentMode = 0; - - // FIXME: initialize state flags - pGraphicsDevice->StateFlags = 0; + ASSERT(pGraphicsDevice->pdevmodeInfo == NULL); + ASSERT(pGraphicsDevice->pDevModeList == NULL); + + pwsz = pGraphicsDevice->pDiplayDrivers; /* Loop through the driver names * This is a REG_MULTI_SZ string */ @@ -138,7 +61,7 @@ } /* Get the mode list from the driver */ - pdminfo = LDEVOBJ_pdmiGetModes(pldev, pDeviceObject); + pdminfo = LDEVOBJ_pdmiGetModes(pldev, pGraphicsDevice->DeviceObject); if (!pdminfo) { ERR("Could not get mode list for '%ls'\n", pwsz); @@ -170,8 +93,7 @@ if (!pGraphicsDevice->pdevmodeInfo || cModes == 0) { ERR("No devmodes\n"); - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; + return FALSE; } /* Allocate an index buffer */ @@ -182,8 +104,7 @@ if (!pGraphicsDevice->pDevModeList) { ERR("No devmode list\n"); - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; + return FALSE; } TRACE("Looking for mode %lux%lux%lu(%lu Hz)\n", @@ -232,7 +153,106 @@ pGraphicsDevice->pDevModeList[i].pdm = pdm; i++; } - } + } + return TRUE; +} + +PGRAPHICS_DEVICE +NTAPI +EngpRegisterGraphicsDevice( + _In_ PUNICODE_STRING pustrDeviceName, + _In_ PUNICODE_STRING pustrDiplayDrivers, + _In_ PUNICODE_STRING pustrDescription, + _In_ PDEVMODEW pdmDefault) +{ + PGRAPHICS_DEVICE pGraphicsDevice; + PDEVICE_OBJECT pDeviceObject; + PFILE_OBJECT pFileObject; + NTSTATUS Status; + PWSTR pwsz; + ULONG cj; + SIZE_T cjWritten; + BOOL bEnable = TRUE; + + TRACE("EngpRegisterGraphicsDevice(%wZ)\n", pustrDeviceName); + + /* Allocate a GRAPHICS_DEVICE structure */ + pGraphicsDevice = ExAllocatePoolWithTag(PagedPool, + sizeof(GRAPHICS_DEVICE), + GDITAG_GDEVICE); + if (!pGraphicsDevice) + { + ERR("ExAllocatePoolWithTag failed\n"); + return NULL; + } + + /* Try to open the driver */ + Status = IoGetDeviceObjectPointer(pustrDeviceName, + FILE_READ_DATA | FILE_WRITE_DATA, + &pFileObject, + &pDeviceObject); + if (!NT_SUCCESS(Status)) + { + ERR("Could not open driver %wZ, 0x%lx\n", pustrDeviceName, Status); + ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); + return NULL; + } + + /* Enable the device */ + EngFileWrite(pFileObject, &bEnable, sizeof(BOOL), &cjWritten); + + /* Copy the device and file object pointers */ + pGraphicsDevice->DeviceObject = pDeviceObject; + pGraphicsDevice->FileObject = pFileObject; + + /* Copy device name */ + RtlStringCbCopyNW(pGraphicsDevice->szNtDeviceName, + sizeof(pGraphicsDevice->szNtDeviceName), + pustrDeviceName->Buffer, + pustrDeviceName->Length); + + /* Create a win device name (FIXME: virtual devices!) */ + swprintf(pGraphicsDevice->szWinDeviceName, L"\\\\.\\DISPLAY%d", (int)giDevNum); + + /* Allocate a buffer for the strings */ + cj = pustrDiplayDrivers->Length + pustrDescription->Length + sizeof(WCHAR); + pwsz = ExAllocatePoolWithTag(PagedPool, cj, GDITAG_DRVSUP); + if (!pwsz) + { + ERR("Could not allocate string buffer\n"); + ASSERT(FALSE); // FIXME + ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); + return NULL; + } + + /* Copy display driver names */ + pGraphicsDevice->pDiplayDrivers = pwsz; + RtlCopyMemory(pGraphicsDevice->pDiplayDrivers, + pustrDiplayDrivers->Buffer, + pustrDiplayDrivers->Length); + + /* Copy description */ + pGraphicsDevice->pwszDescription = pwsz + pustrDiplayDrivers->Length / sizeof(WCHAR); + RtlCopyMemory(pGraphicsDevice->pwszDescription, + pustrDescription->Buffer, + pustrDescription->Length); + pGraphicsDevice->pwszDescription[pustrDescription->Length/sizeof(WCHAR)] = 0; + + /* Initialize the pdevmodeInfo list and default index */ + pGraphicsDevice->pdevmodeInfo = NULL; + pGraphicsDevice->iDefaultMode = 0; + pGraphicsDevice->iCurrentMode = 0; + + // FIXME: initialize state flags + pGraphicsDevice->StateFlags = 0; + + /* Create the mode list */ + pGraphicsDevice->pDevModeList = NULL; + if (!EngpPopulateDeviceModeList(pGraphicsDevice, pdmDefault)) + { + ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); + return NULL; + } /* Lock loader */ EngAcquireSemaphore(ghsemGraphicsDeviceList); @@ -250,7 +270,7 @@ /* Unlock loader */ EngReleaseSemaphore(ghsemGraphicsDeviceList); - TRACE("Prepared %lu modes for %ls\n", cModes, pGraphicsDevice->pwszDescription); + TRACE("Prepared %lu modes for %ls\n", pGraphicsDevice->cDevModes, pGraphicsDevice->pwszDescription); return pGraphicsDevice; } Modified: branches/ros-branch-0_4_4/reactos/win32ss/gdi/eng/device.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_4/reactos/win32ss/gdi/eng/device.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/win32ss/gdi/eng/device.h [iso-8859-1] Sun Jan 29 21:09:43 2017 @@ -2,6 +2,11 @@ #pragma once #define TAG_GDEV 'gdev' + +VOID +NTAPI +PDEVOBJ_vRefreshModeList( + PPDEVOBJ ppdev); extern PGRAPHICS_DEVICE gpPrimaryGraphicsDevice; extern PGRAPHICS_DEVICE gpVgaGraphicsDevice; @@ -29,6 +34,11 @@ _In_ PUNICODE_STRING pustrDescription, _In_ PDEVMODEW pdmDefault); +BOOLEAN +EngpPopulateDeviceModeList( + _Inout_ PGRAPHICS_DEVICE pGraphicsDevice, + _In_ PDEVMODEW pdmDefault); + INIT_FUNCTION NTSTATUS NTAPI Modified: branches/ros-branch-0_4_4/reactos/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_4/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Sun Jan 29 21:09:43 2017 @@ -249,6 +249,45 @@ DPRINT("PDEVOBJ_pSurface() returning %p\n", ppdev->pSurface); return ppdev->pSurface; +} + +VOID +NTAPI +PDEVOBJ_vRefreshModeList( + PPDEVOBJ ppdev) +{ + PGRAPHICS_DEVICE pGraphicsDevice; + PDEVMODEINFO pdminfo, pdmiNext; + DEVMODEW dmDefault; + + /* Lock the PDEV */ + EngAcquireSemaphore(ppdev->hsemDevLock); + + pGraphicsDevice = ppdev->pGraphicsDevice; + + /* Remember our default mode */ + dmDefault = *pGraphicsDevice->pDevModeList[pGraphicsDevice->iDefaultMode].pdm; + + /* Clear out the modes */ + for (pdminfo = pGraphicsDevice->pdevmodeInfo; + pdminfo; + pdminfo = pdmiNext) + { + pdmiNext = pdminfo->pdmiNext; + ExFreePoolWithTag(pdminfo, GDITAG_DEVMODE); + } + pGraphicsDevice->pdevmodeInfo = NULL; + ExFreePoolWithTag(pGraphicsDevice->pDevModeList, GDITAG_GDEVICE); + pGraphicsDevice->pDevModeList = NULL; + + /* Now re-populate the list */ + if (!EngpPopulateDeviceModeList(pGraphicsDevice, &dmDefault)) + { + DPRINT1("FIXME: EngpPopulateDeviceModeList failed, we just destroyed a perfectly good mode list\n"); + } + + /* Unlock PDEV */ + EngReleaseSemaphore(ppdev->hsemDevLock); } PDEVMODEW Modified: branches/ros-branch-0_4_4/reactos/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_4/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Sun Jan 29 21:09:43 2017 @@ -463,19 +463,27 @@ PGRAPHICS_DEVICE pGraphicsDevice; PDEVMODEENTRY pdmentry; ULONG i, iFoundMode; + PPDEVOBJ ppdev; TRACE("Enter UserEnumDisplaySettings('%wZ', %lu)\n", pustrDevice, iModeNum); /* Ask GDI for the GRAPHICS_DEVICE */ pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0, 0); - - if (!pGraphicsDevice) + ppdev = EngpGetPDEV(pustrDevice); + + if (!pGraphicsDevice || !ppdev) { /* No device found */ ERR("No device found!\n"); return STATUS_INVALID_PARAMETER_1; } + + /* let's politely ask the driver for an updated mode list, + just in case there's something new in there (vbox) */ + + PDEVOBJ_vRefreshModeList(ppdev); + PDEVOBJ_vRelease(ppdev); iFoundMode = 0; for (i = 0; i < pGraphicsDevice->cDevModes; i++)

7 years, 8 months

[akhaldi] 73627: [0.4.4] Add a hack by Thomas to avoid MmGetPhysicalAddress failures during USB transfers. CORE-9224

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 29 20:30:58 2017 New Revision: 73627 URL: http://svn.reactos.org/svn/reactos?rev=73627&view=rev Log: [0.4.4] Add a hack by Thomas to avoid MmGetPhysicalAddress failures during USB transfers. CORE-9224 Modified: branches/ros-branch-0_4_4/reactos/drivers/usb/usbehci/usb_request.cpp branches/ros-branch-0_4_4/reactos/drivers/usb/usbohci/usb_request.cpp Modified: branches/ros-branch-0_4_4/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/driver… ============================================================================== --- branches/ros-branch-0_4_4/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Sun Jan 29 20:30:58 2017 @@ -601,6 +601,7 @@ // // get address // + *(volatile char *)TransferBuffer; // HACK for CORE-9224 Address = MmGetPhysicalAddress(TransferBuffer); // Modified: branches/ros-branch-0_4_4/reactos/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/driver… ============================================================================== --- branches/ros-branch-0_4_4/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Sun Jan 29 20:30:58 2017 @@ -771,6 +771,7 @@ // // get physical page // + *(volatile char *)Buffer; // HACK for CORE-9224 Page = MmGetPhysicalAddress(Buffer).LowPart; //

7 years, 8 months

[hbelusca] 73626: [PING]: Convert ping to use ConStreams. Also fix file redirection. CORE-12122 #resolve

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 29 20:29:28 2017 New Revision: 73626 URL: http://svn.reactos.org/svn/reactos?rev=73626&view=rev Log: [PING]: Convert ping to use ConStreams. Also fix file redirection. CORE-12122 #resolve Modified: trunk/reactos/base/applications/network/ping/CMakeLists.txt trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/CMakeLists.txt [iso-8859-1] Sun Jan 29 20:29:28 2017 @@ -1,5 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) add_executable(ping ping.c ping.rc) set_module_type(ping win32cui UNICODE) -add_importlibs(ping ws2_32 iphlpapi user32 msvcrt kernel32 ntdll) +target_link_libraries(ping conutils ${PSEH_LIB}) +add_importlibs(ping ws2_32 iphlpapi msvcrt kernel32 ntdll) add_cd_file(TARGET ping DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] Sun Jan 29 20:29:28 2017 @@ -19,7 +19,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - /* * PROJECT: ReactOS Ping Command * LICENSE: MIT @@ -28,14 +27,19 @@ * PROGRAMMERS: Tim Crawford <crawfxrd(a)gmail.com> */ +#include <stdlib.h> + #define WIN32_LEAN_AND_MEAN -#include <stdio.h> -#include <stdlib.h> +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> #include <winsock2.h> #include <ws2tcpip.h> #include <iphlpapi.h> #include <icmpapi.h> + +#include <conutils.h> #include "resource.h" @@ -52,9 +56,7 @@ static void Ping(void); static void PrintStats(void); static BOOL WINAPI ConsoleCtrlHandler(DWORD ControlType); -static void PrintString(UINT id, ...); - -static HANDLE hStdOut; + static HANDLE hIcmpFile = INVALID_HANDLE_VALUE; static ULONG Timeout = 4000; static int Family = AF_UNSPEC; @@ -84,34 +86,30 @@ DWORD StrLen = 46; int Status; + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); + IpOptions.Ttl = 128; - hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); - if (!ParseCmdLine(argc, argv)) - { return 1; - } if (!SetConsoleCtrlHandler(ConsoleCtrlHandler, TRUE)) { DPRINT("Failed to set control handler: %lu\n", GetLastError()); - return 1; } Status = WSAStartup(MAKEWORD(2, 2), &wsaData); if (Status != 0) { - PrintString(IDS_WINSOCK_FAIL, Status); - + ConResPrintf(StdErr, IDS_WINSOCK_FAIL, Status); return 1; } if (!ResolveTarget(TargetName)) { WSACleanup(); - return 1; } @@ -120,18 +118,13 @@ DPRINT("WSAAddressToStringW failed: %d\n", WSAGetLastError()); FreeAddrInfoW(Target); WSACleanup(); - return 1; } if (Family == AF_INET6) - { hIcmpFile = Icmp6CreateFile(); - } else - { hIcmpFile = IcmpCreateFile(); - } if (hIcmpFile == INVALID_HANDLE_VALUE) @@ -139,24 +132,19 @@ DPRINT("IcmpCreateFile failed: %lu\n", GetLastError()); FreeAddrInfoW(Target); WSACleanup(); - return 1; } if (*CanonName) - { - PrintString(IDS_PINGING_HOSTNAME, CanonName, Address); - } + ConResPrintf(StdOut, IDS_PINGING_HOSTNAME, CanonName, Address); else - { - PrintString(IDS_PINGING_ADDRESS, Address); - } - - PrintString(IDS_PING_SIZE, RequestSize); + ConResPrintf(StdOut, IDS_PINGING_ADDRESS, Address); + + ConResPrintf(StdOut, IDS_PING_SIZE, RequestSize); Ping(); + i = 1; - while (i < PingCount) { Sleep(1000); @@ -173,41 +161,6 @@ WSACleanup(); return 0; -} - -static -void -PrintString(UINT id, ...) -{ -#define RC_STRING_MAX_SIZE 4096 - - WCHAR Format[RC_STRING_MAX_SIZE]; - LPWSTR lpMsgBuf = NULL; - DWORD Len; - va_list args; - - if (!LoadStringW(GetModuleHandleW(NULL), id, Format, _countof(Format))) - { - DPRINT("LoadStringW failed: %lu\n", GetLastError()); - return; - } - - va_start(args, id); - - Len = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, - Format, 0, 0, (PWSTR)&lpMsgBuf, 0, &args); - if (lpMsgBuf /* && Len != 0 */) - { - // TODO: Handle writing to file. Well, use the ConUtils lib! - WriteConsoleW(hStdOut, lpMsgBuf, Len, &Len, NULL); - LocalFree(lpMsgBuf); - } - else - { - DPRINT("FormatMessageW failed: %lu\n", GetLastError()); - } - - va_end(args); } static @@ -218,7 +171,7 @@ if (argc < 2) { - PrintString(IDS_USAGE); + ConResPrintf(StdOut, IDS_USAGE); return FALSE; } @@ -237,69 +190,66 @@ break; case L'n': + { if (i + 1 < argc) { PingForever = FALSE; PingCount = wcstoul(argv[++i], NULL, 0); - if (PingCount == 0) { - PrintString(IDS_BAD_VALUE, argv[i - 1], 1, UINT_MAX); - + ConResPrintf(StdErr, IDS_BAD_VALUE, argv[i - 1], 1, UINT_MAX); return FALSE; } } else { - PrintString(IDS_MISSING_VALUE, argv[i]); - - return FALSE; - } - - break; + ConResPrintf(StdErr, IDS_MISSING_VALUE, argv[i]); + return FALSE; + } + break; + } case L'l': + { if (i + 1 < argc) { RequestSize = wcstoul(argv[++i], NULL, 0); - if (RequestSize > MAX_SEND_SIZE) { - PrintString(IDS_BAD_VALUE, argv[i - 1], 0, MAX_SEND_SIZE); - + ConResPrintf(StdErr, IDS_BAD_VALUE, argv[i - 1], 0, MAX_SEND_SIZE); return FALSE; } } else { - PrintString(IDS_MISSING_VALUE, argv[i]); - - return FALSE; - } - - break; + ConResPrintf(StdErr, IDS_MISSING_VALUE, argv[i]); + return FALSE; + } + break; + } case L'f': + { if (Family == AF_INET6) { - PrintString(IDS_WRONG_FAMILY, argv[i], L"IPv4"); - + ConResPrintf(StdErr, IDS_WRONG_FAMILY, argv[i], L"IPv4"); return FALSE; } Family = AF_INET; IpOptions.Flags |= IP_FLAG_DF; break; + } case L'i': + { if (i + 1 < argc) { ULONG Ttl = wcstoul(argv[++i], NULL, 0); if ((Ttl == 0) || (Ttl > UCHAR_MAX)) { - PrintString(IDS_BAD_VALUE, argv[i - 1], 1, UCHAR_MAX); - + ConResPrintf(StdErr, IDS_BAD_VALUE, argv[i - 1], 1, UCHAR_MAX); return FALSE; } @@ -307,18 +257,17 @@ } else { - PrintString(IDS_MISSING_VALUE, argv[i]); - - return FALSE; - } - - break; + ConResPrintf(StdErr, IDS_MISSING_VALUE, argv[i]); + return FALSE; + } + break; + } case L'v': + { if (Family == AF_INET6) { - PrintString(IDS_WRONG_FAMILY, argv[i], L"IPv4"); - + ConResPrintf(StdErr, IDS_WRONG_FAMILY, argv[i], L"IPv4"); return FALSE; } @@ -331,37 +280,34 @@ } else { - PrintString(IDS_MISSING_VALUE, argv[i]); - - return FALSE; - } - - break; + ConResPrintf(StdErr, IDS_MISSING_VALUE, argv[i]); + return FALSE; + } + + break; + } case L'w': + { if (i + 1 < argc) { Timeout = wcstoul(argv[++i], NULL, 0); - if (Timeout < DEFAULT_TIMEOUT) - { Timeout = DEFAULT_TIMEOUT; - } } else { - PrintString(IDS_MISSING_VALUE, argv[i]); - - return FALSE; - } - - break; + ConResPrintf(StdErr, IDS_MISSING_VALUE, argv[i]); + return FALSE; + } + break; + } case L'R': + { if (Family == AF_INET) { - PrintString(IDS_WRONG_FAMILY, argv[i], L"IPv6"); - + ConResPrintf(StdErr, IDS_WRONG_FAMILY, argv[i], L"IPv6"); return FALSE; } @@ -369,36 +315,39 @@ /* This option has been deprecated. Don't do anything. */ break; + } case L'4': + { if (Family == AF_INET6) { - PrintString(IDS_WRONG_FAMILY, argv[i], L"IPv4"); - + ConResPrintf(StdErr, IDS_WRONG_FAMILY, argv[i], L"IPv4"); return FALSE; } Family = AF_INET; break; + } case L'6': + { if (Family == AF_INET) { - PrintString(IDS_WRONG_FAMILY, argv[i], L"IPv6"); - + ConResPrintf(StdErr, IDS_WRONG_FAMILY, argv[i], L"IPv6"); return FALSE; } Family = AF_INET6; break; + } case L'?': - PrintString(IDS_USAGE); + ConResPrintf(StdOut, IDS_USAGE); return FALSE; default: - PrintString(IDS_BAD_OPTION, argv[i]); - PrintString(IDS_USAGE); + ConResPrintf(StdErr, IDS_BAD_OPTION, argv[i]); + ConResPrintf(StdErr, IDS_USAGE); return FALSE; } } @@ -406,8 +355,7 @@ { if (TargetName != NULL) { - PrintString(IDS_BAD_PARAMETER, argv[i]); - + ConResPrintf(StdErr, IDS_BAD_PARAMETER, argv[i]); return FALSE; } @@ -417,8 +365,7 @@ if (TargetName == NULL) { - PrintString(IDS_MISSING_ADDRESS); - + ConResPrintf(StdErr, IDS_MISSING_ADDRESS); return FALSE; } @@ -444,8 +391,7 @@ Status = GetAddrInfoW(target, NULL, &hints, &Target); if (Status != 0) { - PrintString(IDS_UNKNOWN_HOST, target); - + ConResPrintf(StdOut, IDS_UNKNOWN_HOST, target); return FALSE; } @@ -453,12 +399,10 @@ } else if (ResolveAddress) { - Status = GetNameInfoW( - Target->ai_addr, Target->ai_addrlen, - CanonName, _countof(CanonName), - NULL, 0, - NI_NAMEREQD); - + Status = GetNameInfoW(Target->ai_addr, Target->ai_addrlen, + CanonName, _countof(CanonName), + NULL, 0, + NI_NAMEREQD); if (Status != 0) { DPRINT("GetNameInfoW failed: %d\n", WSAGetLastError()); @@ -482,30 +426,24 @@ SendBuffer = malloc(RequestSize); if (SendBuffer == NULL) { - PrintString(IDS_NO_RESOURCES); - + ConResPrintf(StdErr, IDS_NO_RESOURCES); exit(1); } ZeroMemory(SendBuffer, RequestSize); if (Family == AF_INET6) - { ReplySize += sizeof(ICMPV6_ECHO_REPLY); - } else - { ReplySize += sizeof(ICMP_ECHO_REPLY); - } ReplySize += RequestSize + SIZEOF_ICMP_ERROR + SIZEOF_IO_STATUS_BLOCK; ReplyBuffer = malloc(ReplySize); if (ReplyBuffer == NULL) { - PrintString(IDS_NO_RESOURCES); + ConResPrintf(StdErr, IDS_NO_RESOURCES); free(SendBuffer); - exit(1); } @@ -520,20 +458,18 @@ ZeroMemory(&Source, sizeof(Source)); Source.sin6_family = AF_INET6; - Status = Icmp6SendEcho2( - hIcmpFile, NULL, NULL, NULL, - &Source, - (struct sockaddr_in6 *)Target->ai_addr, - SendBuffer, (USHORT)RequestSize, &IpOptions, - ReplyBuffer, ReplySize, Timeout); + Status = Icmp6SendEcho2(hIcmpFile, NULL, NULL, NULL, + &Source, + (struct sockaddr_in6 *)Target->ai_addr, + SendBuffer, (USHORT)RequestSize, &IpOptions, + ReplyBuffer, ReplySize, Timeout); } else { - Status = IcmpSendEcho2( - hIcmpFile, NULL, NULL, NULL, - ((PSOCKADDR_IN)Target->ai_addr)->sin_addr.s_addr, - SendBuffer, (USHORT)RequestSize, &IpOptions, - ReplyBuffer, ReplySize, Timeout); + Status = IcmpSendEcho2(hIcmpFile, NULL, NULL, NULL, + ((PSOCKADDR_IN)Target->ai_addr)->sin_addr.s_addr, + SendBuffer, (USHORT)RequestSize, &IpOptions, + ReplyBuffer, ReplySize, Timeout); } free(SendBuffer); @@ -544,19 +480,19 @@ switch (Status) { case IP_DEST_HOST_UNREACHABLE: - PrintString(IDS_DEST_HOST_UNREACHABLE); + ConResPrintf(StdOut, IDS_DEST_HOST_UNREACHABLE); break; case IP_DEST_NET_UNREACHABLE: - PrintString(IDS_DEST_NET_UNREACHABLE); + ConResPrintf(StdOut, IDS_DEST_NET_UNREACHABLE); break; case IP_REQ_TIMED_OUT: - PrintString(IDS_REQUEST_TIMED_OUT); + ConResPrintf(StdOut, IDS_REQUEST_TIMED_OUT); break; default: - PrintString(IDS_TRANSMIT_FAILED, Status); + ConResPrintf(StdOut, IDS_TRANSMIT_FAILED, Status); break; } } @@ -564,7 +500,7 @@ { EchosReceived++; - PrintString(IDS_REPLY_FROM, Address); + ConResPrintf(StdOut, IDS_REPLY_FROM, Address); if (Family == AF_INET6) { @@ -575,38 +511,32 @@ switch (pEchoReply->Status) { case IP_SUCCESS: + { EchosSuccessful++; if (pEchoReply->RoundTripTime == 0) - { - PrintString(IDS_REPLY_TIME_0MS); - } + ConResPrintf(StdOut, IDS_REPLY_TIME_0MS); else - { - PrintString(IDS_REPLY_TIME_MS, pEchoReply->RoundTripTime); - } + ConResPrintf(StdOut, IDS_REPLY_TIME_MS, pEchoReply->RoundTripTime); if (pEchoReply->RoundTripTime < RTTMin || RTTMin == 0) - { RTTMin = pEchoReply->RoundTripTime; - } if (pEchoReply->RoundTripTime > RTTMax || RTTMax == 0) - { RTTMax = pEchoReply->RoundTripTime; - } - - wprintf(L"\n"); + + ConPuts(StdOut, L"\n"); RTTTotal += pEchoReply->RoundTripTime; break; + } case IP_TTL_EXPIRED_TRANSIT: - PrintString(IDS_TTL_EXPIRED); + ConResPrintf(StdOut, IDS_TTL_EXPIRED); break; default: - PrintString(IDS_REPLY_STATUS, pEchoReply->Status); + ConResPrintf(StdOut, IDS_REPLY_STATUS, pEchoReply->Status); break; } } @@ -619,40 +549,34 @@ switch (pEchoReply->Status) { case IP_SUCCESS: + { EchosSuccessful++; - PrintString(IDS_REPLY_BYTES, pEchoReply->DataSize); + ConResPrintf(StdOut, IDS_REPLY_BYTES, pEchoReply->DataSize); if (pEchoReply->RoundTripTime == 0) - { - PrintString(IDS_REPLY_TIME_0MS); - } + ConResPrintf(StdOut, IDS_REPLY_TIME_0MS); else - { - PrintString(IDS_REPLY_TIME_MS, pEchoReply->RoundTripTime); - } - - PrintString(IDS_REPLY_TTL, pEchoReply->Options.Ttl); + ConResPrintf(StdOut, IDS_REPLY_TIME_MS, pEchoReply->RoundTripTime); + + ConResPrintf(StdOut, IDS_REPLY_TTL, pEchoReply->Options.Ttl); if (pEchoReply->RoundTripTime < RTTMin || RTTMin == 0) - { RTTMin = pEchoReply->RoundTripTime; - } if (pEchoReply->RoundTripTime > RTTMax || RTTMax == 0) - { RTTMax = pEchoReply->RoundTripTime; - } RTTTotal += pEchoReply->RoundTripTime; break; + } case IP_TTL_EXPIRED_TRANSIT: - PrintString(IDS_TTL_EXPIRED); + ConResPrintf(StdOut, IDS_TTL_EXPIRED); break; default: - PrintString(IDS_REPLY_STATUS, pEchoReply->Status); + ConResPrintf(StdOut, IDS_REPLY_STATUS, pEchoReply->Status); break; } } @@ -668,13 +592,12 @@ ULONG EchosLost = EchosSent - EchosReceived; ULONG PercentLost = (ULONG)((EchosLost / (double)EchosSent) * 100.0); - PrintString(IDS_STATISTICS, Address, EchosSent, EchosReceived, EchosLost, PercentLost); + ConResPrintf(StdOut, IDS_STATISTICS, Address, EchosSent, EchosReceived, EchosLost, PercentLost); if (EchosSuccessful > 0) { ULONG RTTAverage = RTTTotal / EchosSuccessful; - - PrintString(IDS_APPROXIMATE_RTT, RTTMin, RTTMax, RTTAverage); + ConResPrintf(StdOut, IDS_APPROXIMATE_RTT, RTTMin, RTTMax, RTTAverage); } } @@ -687,12 +610,12 @@ { case CTRL_C_EVENT: PrintStats(); - PrintString(IDS_CTRL_C); + ConResPrintf(StdOut, IDS_CTRL_C); return FALSE; case CTRL_BREAK_EVENT: PrintStats(); - PrintString(IDS_CTRL_BREAK); + ConResPrintf(StdOut, IDS_CTRL_BREAK); return TRUE; case CTRL_CLOSE_EVENT:

7 years, 8 months

[akhaldi] 73625: [0.4.4] * Disable COMMAND.COM debugging messages. CORE-10710

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 29 20:27:29 2017 New Revision: 73625 URL: http://svn.reactos.org/svn/reactos?rev=73625&view=rev Log: [0.4.4] * Disable COMMAND.COM debugging messages. CORE-10710 Modified: branches/ros-branch-0_4_4/reactos/subsystems/mvdm/dos/command.S Modified: branches/ros-branch-0_4_4/reactos/subsystems/mvdm/dos/command.S URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/subsys… ============================================================================== --- branches/ros-branch-0_4_4/reactos/subsystems/mvdm/dos/command.S [iso-8859-1] (original) +++ branches/ros-branch-0_4_4/reactos/subsystems/mvdm/dos/command.S [iso-8859-1] Sun Jan 29 20:27:29 2017 @@ -17,7 +17,7 @@ #include "asmxtras.inc" #include <isvbop.inc> -// #define NDEBUG +#define NDEBUG /* DEFINES ********************************************************************/

7 years, 8 months

[akhaldi] 73624: [0.4.4] * Apply the Wordpad related hack from CORE-5823 by Jared Smudde.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 29 20:26:21 2017 New Revision: 73624 URL: http://svn.reactos.org/svn/reactos?rev=73624&view=rev Log: [0.4.4] * Apply the Wordpad related hack from CORE-5823 by Jared Smudde. Modified: branches/ros-branch-0_4_4/reactos/base/applications/wordpad/res/formatbar.bmp branches/ros-branch-0_4_4/reactos/base/applications/wordpad/res/toolbar.bmp Modified: branches/ros-branch-0_4_4/reactos/base/applications/wordpad/res/formatbar.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/base/a… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_4_4/reactos/base/applications/wordpad/res/toolbar.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_4/reactos/base/a… ============================================================================== Binary files - no diff available.

7 years, 8 months

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 January 2017