Ros-diffs October 2016

ros-diffs@reactos.org

20 participants
222 discussions

[mjansen] 73083: [APPHELP][APPHELP_APITEST] Update db apitests to succeed from 2k3 to 10, paving the way for the next set of tests. - Support 2k3 and Vista+ versions of the SDBQUERYRESULT structure...

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun Oct 30 19:39:43 2016 New Revision: 73083 URL: http://svn.reactos.org/svn/reactos?rev=73083&view=rev Log: [APPHELP][APPHELP_APITEST] Update db apitests to succeed from 2k3 to 10, paving the way for the next set of tests. - Support 2k3 and Vista+ versions of the SDBQUERYRESULT structure. - Add tests for SdbFindFirstNamedTag, SdbTagIDToTagRef, SdbGetLayerTagRef - Implement SdbFindFirstNamedTag, SdbTagIDToTagRef, SdbGetLayerTagRef - Add a version resource to apphelp, so that we can use it to identify which tests to use. Added: trunk/reactos/dll/appcompat/apphelp/apphelp.rc (with props) trunk/rostests/apitests/apphelp/db.cpp - copied, changed from r73082, trunk/rostests/apitests/apphelp/db.c Removed: trunk/rostests/apitests/apphelp/db.c Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt trunk/reactos/dll/appcompat/apphelp/apphelp.h trunk/reactos/dll/appcompat/apphelp/apphelp.spec trunk/reactos/dll/appcompat/apphelp/hsdb.c trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/rostests/apitests/apphelp/CMakeLists.txt trunk/rostests/apitests/apphelp/apphelp_apitest.h trunk/rostests/apitests/apphelp/data.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/CMak… Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… Added: trunk/reactos/dll/appcompat/apphelp/apphelp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… Modified: trunk/reactos/dll/appcompat/apphelp/hsdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/hsdb… Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… Modified: trunk/rostests/apitests/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/CMakeLis… Modified: trunk/rostests/apitests/apphelp/apphelp_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/apphelp_… Modified: trunk/rostests/apitests/apphelp/data.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/data.c?r… Removed: trunk/rostests/apitests/apphelp/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/db.c?rev… Copied: trunk/rostests/apitests/apphelp/db.cpp (from r73082, trunk/rostests/apitests/apphelp/db.c) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/db.cpp?p…

8 years, 1 month

[hbelusca] 73082: Art work commit: [PIFMGR]: Update the 16-colour version of the computer icon. [NTVDM]: Add the tangoified versions of the NTVDM computer icon by Ismael Ferreras Morezuelas. Also u...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 30 19:02:15 2016 New Revision: 73082 URL: http://svn.reactos.org/svn/reactos?rev=73082&view=rev Log: Art work commit: [PIFMGR]: Update the 16-colour version of the computer icon. [NTVDM]: Add the tangoified versions of the NTVDM computer icon by Ismael Ferreras Morezuelas. Also update the Tango PC-AT and XT icons. CORE-10340 #resolve #comment Committed in r73082, thanks to you all! Added: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_3d.ico - copied, changed from r73078, trunk/reactos/subsystems/mvdm/pifmgr/res/13.ico trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_brown.ico - copied, changed from r73078, trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_flat.ico - copied, changed from r73078, trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_grey.ico - copied, changed from r73078, trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_3d.ico - copied, changed from r73078, trunk/reactos/subsystems/mvdm/pifmgr/res/13.ico trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_brown.ico - copied, changed from r73078, trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_flat.ico - copied, changed from r73078, trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_grey.ico - copied, changed from r73078, trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico Removed: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.rc trunk/reactos/subsystems/mvdm/ntvdm/res/README.txt trunk/reactos/subsystems/mvdm/ntvdm/res/pc_at.ico trunk/reactos/subsystems/mvdm/ntvdm/res/pc_xt.ico trunk/reactos/subsystems/mvdm/pifmgr/res/13.ico Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.rc [iso-8859-1] Sun Oct 30 19:02:15 2016 @@ -12,12 +12,23 @@ #include <reactos/version.rc> /* Icons */ -1 ICON "res/ntvdm.ico" -// 2 ICON "res/ntvdm_2.ico" // TODO: Swyter's icon, see CORE-10340 -3 ICON "res/pc_xt.ico" -4 ICON "res/pc_at.ico" -5 ICON "res/ros_dos.ico" -6 ICON "res/vdm_dos.ico" + +/* Icons for the PC-AT (most recent IBM-PC version) */ +1 ICON "res/ntvdm_pc_at_grey.ico" +2 ICON "res/ntvdm_pc_at_brown.ico" +3 ICON "res/ntvdm_pc_at_flat.ico" +4 ICON "res/ntvdm_pc_at_3d.ico" +5 ICON "res/pc_at.ico" +/* Icons for the PC-XT (older IBM-PC version) */ +6 ICON "res/ntvdm_pc_xt_grey.ico" +7 ICON "res/ntvdm_pc_xt_brown.ico" +8 ICON "res/ntvdm_pc_xt_flat.ico" +9 ICON "res/ntvdm_pc_xt_3d.ico" +10 ICON "res/pc_xt.ico" +/* Embedded products */ +11 ICON "res/ros_dos.ico" +12 ICON "res/vdm_dos.ico" + /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/subsystems/mvdm/ntvdm/res/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/res/README.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/res/README.txt [iso-8859-1] Sun Oct 30 19:02:15 2016 @@ -1,12 +1,28 @@ +ï»¿ +ntvdm_pc_at_flat.ico and ntvdm_pc_xt_flat.ico +--------------------------------------------- +(C) 2013, 2016 HermÃ¨s BÃ©lusca-MaÃ¯to. +Distributed under CC-BY-SA 4.0 International License Terms. -ntvdm.ico ---------- -(C) 2013 HermÃ¨s BÃ©lusca-MaÃ¯to. +ntvdm_pc_at_brown.ico and ntvdm_pc_xt_brown.ico; +ntvdm_pc_at_grey.ico and ntvdm_pc_xt_grey.ico +------------------------------------------------ +Tango-style versions of ntvdm_pc_at_flat.ico and ntvdm_pc_xt_flat.ico. +(C) 2013, 2016 HermÃ¨s BÃ©lusca-MaÃ¯to. +(C) 2015, 2016 Ismael Ferreras Morezuelas. Distributed under CC-BY-SA 4.0 International License Terms. + +ntvdm_pc_at_3d.ico and ntvdm_pc_xt_3d.ico +----------------------------------------- +From pifmgr.dll icon-set. +(C) 2016 DSP2003. +http://dsp2003.deviantart.com | http://wks.arai-kibou.ru +Distributed under CC-BY-SA 4.0 International License Terms. +Adapted for PC-AT and XT style by HermÃ¨s BÃ©lusca-MaÃ¯to. pc_at.ico and pc_xt.ico ----------------------- -Tango-style PC icons +Tango-style PC icons. (C) 2015 Henry Tang Ih and Jared Smudde. Adapted for PC-AT and XT style by HermÃ¨s BÃ©lusca-MaÃ¯to. 16-colour conversion by HermÃ¨s BÃ©lusca-MaÃ¯to. Removed: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== Binary file - no diff available. Copied: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_3d.ico (from r73078, trunk/reactos/subsystems/mvdm/pifmgr/res/13.ico) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== Binary files - no diff available. Copied: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_brown.ico (from r73078, trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== Binary files - no diff available. Copied: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_flat.ico (from r73078, trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== Binary files - no diff available. Copied: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_grey.ico (from r73078, trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== Binary files - no diff available. Copied: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_3d.ico (from r73078, trunk/reactos/subsystems/mvdm/pifmgr/res/13.ico) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== Binary files - no diff available. Copied: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_brown.ico (from r73078, trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== Binary files - no diff available. Copied: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_flat.ico (from r73078, trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== Binary files - no diff available. Copied: trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_grey.ico (from r73078, trunk/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/subsystems/mvdm/ntvdm/res/pc_at.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/subsystems/mvdm/ntvdm/res/pc_xt.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/subsystems/mvdm/pifmgr/res/13.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary files - no diff available.

8 years, 1 month

[tfaber] 73081: [0.4.3] - Revert r72839 & r72835 to avoid the FsRtlIsNameInExpressionPrivate crash from CORE-12121

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Oct 30 18:11:13 2016 New Revision: 73081 URL: http://svn.reactos.org/svn/reactos?rev=73081&view=rev Log: [0.4.3] - Revert r72839 & r72835 to avoid the FsRtlIsNameInExpressionPrivate crash from CORE-12121 Modified: branches/ros-branch-0_4_3/reactos/ntoskrnl/fsrtl/dbcsname.c branches/ros-branch-0_4_3/reactos/ntoskrnl/fsrtl/name.c Modified: branches/ros-branch-0_4_3/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_4_3/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Sun Oct 30 18:11:13 2016 @@ -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_3/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_4_3/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Sun Oct 30 18:11:13 2016 @@ -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 **********************************************************/

8 years, 1 month

[akhaldi] 73080: [0.4.3] * Merge rpcrt4 noisy fixme removal by Pierre in r73075.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 30 17:19:18 2016 New Revision: 73080 URL: http://svn.reactos.org/svn/reactos?rev=73080&view=rev Log: [0.4.3] * Merge rpcrt4 noisy fixme removal by Pierre in r73075. Modified: branches/ros-branch-0_4_3/ (props changed) branches/ros-branch-0_4_3/reactos/ (props changed) branches/ros-branch-0_4_3/reactos/dll/win32/rpcrt4/rpc_transport.c Propchange: branches/ros-branch-0_4_3/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 30 17:19:18 2016 @@ -1 +1 @@ -/trunk:73043,73077 +/trunk:73043,73075,73077 Propchange: branches/ros-branch-0_4_3/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 30 17:19:18 2016 @@ -21,4 +21,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:73043,73077 +/trunk/reactos:73043,73075,73077 Modified: branches/ros-branch-0_4_3/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_3/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Sun Oct 30 17:19:18 2016 @@ -458,7 +458,6 @@ /* Store the local computer name as the NetworkAddr for ncacn_np as long as * we don't support named pipes over the network. */ - FIXME("Using local computer name as NetworkAddr\n"); new_conn->NetworkAddr = HeapAlloc(GetProcessHeap(), 0, len); if (!GetComputerNameA(new_conn->NetworkAddr, &len)) {

8 years, 1 month

[akhaldi] 73079: [0.4.3] * Merge regsvr32 fix by Mark in r73077. CORE-12209

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 30 17:16:53 2016 New Revision: 73079 URL: http://svn.reactos.org/svn/reactos?rev=73079&view=rev Log: [0.4.3] * Merge regsvr32 fix by Mark in r73077. CORE-12209 Modified: branches/ros-branch-0_4_3/ (props changed) branches/ros-branch-0_4_3/reactos/ (props changed) branches/ros-branch-0_4_3/reactos/base/system/regsvr32/regsvr32.c Propchange: branches/ros-branch-0_4_3/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 30 17:16:53 2016 @@ -1 +1 @@ -/trunk:73043 +/trunk:73043,73077 Propchange: branches/ros-branch-0_4_3/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 30 17:16:53 2016 @@ -21,4 +21,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:73043 +/trunk/reactos:73043,73077 Modified: branches/ros-branch-0_4_3/reactos/base/system/regsvr32/regsvr32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_3/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] Sun Oct 30 17:16:53 2016 @@ -258,7 +258,7 @@ LPCSTR lpFuncName; LPWSTR lpwDllCmdLine; BOOL bUnregister,bSilent,bConsole,bInstall,bNoRegister; - UINT nDllCount; + UINT nDllCount, fuOldErrorMode; HMODULE hDll; DLLREGISTER fnDllRegister; DLLINSTALL fnDllInstall; @@ -386,9 +386,11 @@ if (*argv[i] != _T('/')) { lptDllName = argv[i]; + fuOldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS); // Everything is all setup, so load the dll now hDll = LoadLibraryEx(lptDllName,0,LOAD_WITH_ALTERED_SEARCH_PATH); if (hDll) { + SetErrorMode(fuOldErrorMode); if (!bNoRegister) { // Get the address of DllRegisterServer or DllUnregisterServer fnDllRegister = (DLLREGISTER)GetProcAddress(hDll,lpFuncName); @@ -463,6 +465,7 @@ else { // The dll could not be loaded; display an error message dwErr = GetLastError(); + SetErrorMode(fuOldErrorMode); lptMsgBuffer = (LPTSTR)malloc((_tcslen(DllNotLoaded) + 2 + _tcslen(lptDllName) + 1) * sizeof(TCHAR)); _stprintf(lptMsgBuffer,DllNotLoaded,lptDllName,dwErr); DisplayMessage(bConsole,bSilent,lptMsgBuffer,ModuleTitle,MB_ICONEXCLAMATION);

8 years, 1 month

[hbelusca] 73078: [BTRFS]: Fix compilation with MSVC too, as we don't have the 'FileFsSectorSizeInformation' FS information class in our headers (this is some Win8+ stuff). CORE-12223 #comment MSVC...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 30 14:14:27 2016 New Revision: 73078 URL: http://svn.reactos.org/svn/reactos?rev=73078&view=rev Log: [BTRFS]: Fix compilation with MSVC too, as we don't have the 'FileFsSectorSizeInformation' FS information class in our headers (this is some Win8+ stuff). CORE-12223 #comment MSVC compilation fixed in r73078 ('FileFsSectorSizeInformation' absent in our headers). Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.c Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… ============================================================================== --- trunk/reactos/drivers/filesystems/btrfs/btrfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/btrfs/btrfs.c [iso-8859-1] Sun Oct 30 14:14:27 2016 @@ -716,7 +716,8 @@ Status = overflow ? STATUS_BUFFER_OVERFLOW : STATUS_SUCCESS; break; } - + +#ifndef __REACTOS__ #ifdef _MSC_VER // not in mingw yet case FileFsSectorSizeInformation: { @@ -739,6 +740,7 @@ break; } #endif +#endif /* __REACTOS__ */ default: Status = STATUS_INVALID_PARAMETER;

8 years, 1 month

[mjansen] 73077: [REGSVR32] Disable error message boxes while loading a dll. CORE-12209

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun Oct 30 11:50:10 2016 New Revision: 73077 URL: http://svn.reactos.org/svn/reactos?rev=73077&view=rev Log: [REGSVR32] Disable error message boxes while loading a dll. CORE-12209 Modified: trunk/reactos/base/system/regsvr32/regsvr32.c Modified: trunk/reactos/base/system/regsvr32/regsvr32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsv… ============================================================================== --- trunk/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] Sun Oct 30 11:50:10 2016 @@ -258,7 +258,7 @@ LPCSTR lpFuncName; LPWSTR lpwDllCmdLine; BOOL bUnregister,bSilent,bConsole,bInstall,bNoRegister; - UINT nDllCount; + UINT nDllCount, fuOldErrorMode; HMODULE hDll; DLLREGISTER fnDllRegister; DLLINSTALL fnDllInstall; @@ -386,9 +386,11 @@ if (*argv[i] != _T('/')) { lptDllName = argv[i]; + fuOldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS); // Everything is all setup, so load the dll now hDll = LoadLibraryEx(lptDllName,0,LOAD_WITH_ALTERED_SEARCH_PATH); if (hDll) { + SetErrorMode(fuOldErrorMode); if (!bNoRegister) { // Get the address of DllRegisterServer or DllUnregisterServer fnDllRegister = (DLLREGISTER)GetProcAddress(hDll,lpFuncName); @@ -463,6 +465,7 @@ else { // The dll could not be loaded; display an error message dwErr = GetLastError(); + SetErrorMode(fuOldErrorMode); lptMsgBuffer = (LPTSTR)malloc((_tcslen(DllNotLoaded) + 2 + _tcslen(lptDllName) + 1) * sizeof(TCHAR)); _stprintf(lptMsgBuffer,DllNotLoaded,lptDllName,dwErr); DisplayMessage(bConsole,bSilent,lptMsgBuffer,ModuleTitle,MB_ICONEXCLAMATION);

8 years, 1 month

[tfaber] 73076: [MKISOFS] - Fix Win64 build -- the define is _WIN32, not WIN32. CORE-11988

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Oct 30 09:44:29 2016 New Revision: 73076 URL: http://svn.reactos.org/svn/reactos?rev=73076&view=rev Log: [MKISOFS] - Fix Win64 build -- the define is _WIN32, not WIN32. CORE-11988 Modified: trunk/reactos/sdk/tools/mkisofs/reactos/xconfig.h Modified: trunk/reactos/sdk/tools/mkisofs/reactos/xconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/reactos/… ============================================================================== --- trunk/reactos/sdk/tools/mkisofs/reactos/xconfig.h [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/mkisofs/reactos/xconfig.h [iso-8859-1] Sun Oct 30 09:44:29 2016 @@ -24,21 +24,21 @@ #define HAVE_STRING_H 1 #define STDC_HEADERS 1 -#ifndef WIN32 +#ifndef _WIN32 #define HAVE_UNISTD_H 1 #endif #define HAVE_LIMITS_H 1 #define HAVE_FCNTL_H 1 -#ifdef WIN32 +#ifdef _WIN32 #define HAVE_IO_H 1 #endif #define HAVE_INTTYPES_H 1 #define HAVE_STDINT_H 1 -#ifndef WIN32 +#ifndef _WIN32 #define HAVE_DIRENT_H 1 #define HAVE_SYS_TIME_H 1 #define TIME_WITH_SYS_TIME 1 @@ -48,7 +48,7 @@ #define HAVE_MATH_H 1 #define HAVE_ERRNO_DEF 1 -#ifdef WIN32 +#ifdef _WIN32 #define HAVE_WINDOWS_H 1 #define WBOOL WINBOOL #endif @@ -72,7 +72,7 @@ #define HAVE_MEMMOVE 1 #define HAVE_MEMSET 1 -#ifndef WIN32 +#ifndef _WIN32 #define HAVE_GETTIMEOFDAY 1 #endif @@ -109,7 +109,7 @@ #define HAVE_STRCASECMP 1 #define HAVE_STRNCASECMP 1 -#ifndef WIN32 +#ifndef _WIN32 #define HAVE_USLEEP 1 #endif @@ -133,7 +133,7 @@ #define HAVE_WCSRCHR 1 #define HAVE_WCSSTR 1 -#ifndef WIN32 +#ifndef _WIN32 #define HAVE_WCWIDTH 1 #endif @@ -145,21 +145,21 @@ #define HAVE_MBRTOWC 1 #define HAVE_WCRTOMB 1 -#if !defined(WIN32) && !defined(__APPLE__) +#if !defined(_WIN32) && !defined(__APPLE__) #define HAVE_RAW_FEXECVE 1 #endif /* * Misc OS stuff */ -#ifndef WIN32 +#ifndef _WIN32 #define HAVE__DEV_NULL 1 #endif /* * Structures */ -#ifndef WIN32 +#ifndef _WIN32 #define HAVE_STRUCT_TIMEVAL 1 #endif @@ -171,11 +171,11 @@ */ #define HAVE_LONGLONG 1 -#ifndef WIN32 +#ifndef _WIN32 #define VA_LIST_IS_ARRAY 1 #endif -#ifdef WIN32 +#ifdef _WIN32 #define uid_t int #define gid_t int #define nlink_t unsigned long

8 years, 1 month

[pschweitzer] 73075: [RPCRT4] Import Wine commit (by Alexandre Julliard): - 7b0c2cdbcd64cffa2f5c5a37f55799b114132b59, Remove noisy fixme.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Oct 30 09:17:42 2016 New Revision: 73075 URL: http://svn.reactos.org/svn/reactos?rev=73075&view=rev Log: [RPCRT4] Import Wine commit (by Alexandre Julliard): - 7b0c2cdbcd64cffa2f5c5a37f55799b114132b59, Remove noisy fixme. Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Sun Oct 30 09:17:42 2016 @@ -458,7 +458,6 @@ /* Store the local computer name as the NetworkAddr for ncacn_np as long as * we don't support named pipes over the network. */ - FIXME("Using local computer name as NetworkAddr\n"); new_conn->NetworkAddr = HeapAlloc(GetProcessHeap(), 0, len); if (!GetComputerNameA(new_conn->NetworkAddr, &len)) {

8 years, 1 month

[phater] 73074: Revert r73068 and r73070 Current tests are obviously not enough to declare them OK. I'll add more tests first

by phater＠svn.reactos.org

Author: phater Date: Sun Oct 30 05:58:02 2016 New Revision: 73074 URL: http://svn.reactos.org/svn/reactos?rev=73074&view=rev Log: Revert r73068 and r73070 Current tests are obviously not enough to declare them OK. I'll add more tests first Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/msafd.h trunk/reactos/dll/win32/ws2_32/src/dcatalog.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Oct 30 05:58:02 2016 @@ -95,33 +95,13 @@ Protocol = SharedData->Protocol; } - if (lpProtocolInfo) - { - if (lpProtocolInfo->iAddressFamily && AddressFamily <= 0) - AddressFamily = lpProtocolInfo->iAddressFamily; - if (lpProtocolInfo->iSocketType && SocketType <= 0) - SocketType = lpProtocolInfo->iSocketType; - if (lpProtocolInfo->iProtocol && Protocol <= 0) - Protocol = lpProtocolInfo->iProtocol; - } - - /* FIXME: AF_NETDES should be AF_MAX */ - if (AddressFamily < AF_UNSPEC || AddressFamily > AF_NETDES) + if (AddressFamily == AF_UNSPEC && SocketType == 0 && Protocol == 0) return WSAEINVAL; - if (SocketType < 0 && SocketType > SOCK_SEQPACKET) - return WSAEINVAL; - - if (Protocol < 0 && Protocol > IPPROTO_MAX) - return WSAEINVAL; - - /* when no protocol and socket type are specified the first entry - * from WSAEnumProtocols that has the flag PFL_MATCHES_PROTOCOL_ZERO - * is returned */ - if (SocketType == 0 && Protocol == 0 && lpProtocolInfo && (lpProtocolInfo->dwProviderFlags & PFL_MATCHES_PROTOCOL_ZERO) == 0) - return WSAEINVAL; - /* Set the defaults */ + if (AddressFamily == AF_UNSPEC) + AddressFamily = AF_INET; + if (SocketType == 0) { switch (Protocol) @@ -137,7 +117,8 @@ break; default: TRACE("Unknown Protocol (%d). We will try SOCK_STREAM.\n", Protocol); - return WSAEINVAL; + SocketType = SOCK_STREAM; + break; } } @@ -156,12 +137,10 @@ break; default: TRACE("Unknown SocketType (%d). We will try IPPROTO_TCP.\n", SocketType); - return WSAEINVAL; - } - } - - if (AddressFamily == AF_UNSPEC) - return WSAEINVAL; + Protocol = IPPROTO_TCP; + break; + } + } /* Get Helper Data and Transport */ Status = SockGetTdiName (&AddressFamily, @@ -1719,46 +1698,6 @@ return AcceptSocket; } -VOID -NTAPI -AfdConnectAPC(PVOID ApcContext, - PIO_STATUS_BLOCK IoStatusBlock, - ULONG Reserved) -{ - PAFDCONNECTAPCCONTEXT Context = ApcContext; - - if (IoStatusBlock->Status == STATUS_SUCCESS) - { - Context->lpSocket->SharedData->State = SocketConnected; - Context->lpSocket->TdiConnectionHandle = (HANDLE)IoStatusBlock->Information; - } - - if (Context->lpConnectInfo) HeapFree(GetProcessHeap(), 0, Context->lpConnectInfo); - - /* Re-enable Async Event */ - SockReenableAsyncSelectEvent(Context->lpSocket, FD_WRITE); - - /* FIXME: THIS IS NOT RIGHT!!! HACK HACK HACK! */ - SockReenableAsyncSelectEvent(Context->lpSocket, FD_CONNECT); - - if (IoStatusBlock->Status == STATUS_SUCCESS && (Context->lpSocket->HelperEvents & WSH_NOTIFY_CONNECT)) - { - Context->lpSocket->HelperData->WSHNotify(Context->lpSocket->HelperContext, - Context->lpSocket->Handle, - Context->lpSocket->TdiAddressHandle, - Context->lpSocket->TdiConnectionHandle, - WSH_NOTIFY_CONNECT); - } - else if (IoStatusBlock->Status != STATUS_SUCCESS && (Context->lpSocket->HelperEvents & WSH_NOTIFY_CONNECT_ERROR)) - { - Context->lpSocket->HelperData->WSHNotify(Context->lpSocket->HelperContext, - Context->lpSocket->Handle, - Context->lpSocket->TdiAddressHandle, - Context->lpSocket->TdiConnectionHandle, - WSH_NOTIFY_CONNECT_ERROR); - } - HeapFree(GlobalHeap, 0, ApcContext); -} int WSPAPI WSPConnect(SOCKET Handle, @@ -1781,18 +1720,6 @@ PSOCKADDR BindAddress; HANDLE SockEvent; int SocketDataLength; - PVOID APCContext = NULL; - PVOID APCFunction = NULL; - - TRACE("Called\n"); - - /* Get the Socket Structure associate to this Socket*/ - Socket = GetSocketStructure(Handle); - if (!Socket) - { - if (lpErrno) *lpErrno = WSAENOTSOCK; - return SOCKET_ERROR; - } Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, @@ -1802,6 +1729,17 @@ if (!NT_SUCCESS(Status)) return MsafdReturnWithErrno(Status, lpErrno, 0, NULL); + + TRACE("Called\n"); + + /* Get the Socket Structure associate to this Socket*/ + Socket = GetSocketStructure(Handle); + if (!Socket) + { + NtClose(SockEvent); + if (lpErrno) *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } /* Bind us First */ if (Socket->SharedData->State == SocketOpen) @@ -1913,22 +1851,14 @@ /* FIXME: Handle Async Connect */ if (Socket->SharedData->NonBlocking) { - APCFunction = &AfdConnectAPC; // should be a private io completition function inside us - APCContext = HeapAlloc(GlobalHeap, 0, sizeof(AFDCONNECTAPCCONTEXT)); - if (!APCContext) - { - ERR("Not enough memory for APC Context\n"); - return MsafdReturnWithErrno(STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL); - } - ((PAFDCONNECTAPCCONTEXT)APCContext)->lpConnectInfo = ConnectInfo; - ((PAFDCONNECTAPCCONTEXT)APCContext)->lpSocket = Socket; + ERR("Async Connect UNIMPLEMENTED!\n"); } /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Handle, SockEvent, - APCFunction, - APCContext, + NULL, + NULL, &IOSB, IOCTL_AFD_CONNECT, ConnectInfo, @@ -1936,19 +1866,11 @@ NULL, 0); /* Wait for return */ - if (Status == STATUS_PENDING && !Socket->SharedData->NonBlocking) + if (Status == STATUS_PENDING) { WaitForSingleObject(SockEvent, INFINITE); Status = IOSB.Status; } - - if (Status == STATUS_PENDING) - { - TRACE("Leaving (Pending)\n"); - return MsafdReturnWithErrno(STATUS_CANT_WAIT, lpErrno, 0, NULL); - } - - if (APCContext) HeapFree(GetProcessHeap(), 0, APCContext); if (Status != STATUS_SUCCESS) goto notify; Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] Sun Oct 30 05:58:02 2016 @@ -135,12 +135,6 @@ PSOCKET_INFORMATION lpSocket; } AFDAPCCONTEXT, *PAFDAPCCONTEXT; -typedef struct _AFDCONNECTAPCCONTEXT -{ - PAFD_CONNECT_INFO lpConnectInfo; - PSOCKET_INFORMATION lpSocket; -} AFDCONNECTAPCCONTEXT, *PAFDCONNECTAPCCONTEXT; - SOCKET WSPAPI WSPAccept( Modified: trunk/reactos/dll/win32/ws2_32/src/dcatalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/dcata… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/dcatalog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/dcatalog.c [iso-8859-1] Sun Oct 30 05:58:02 2016 @@ -490,20 +490,6 @@ /* Assume failure */ *CatalogEntry = NULL; - /* Params can't be all wildcards */ - if (af == AF_UNSPEC && type == 0 && protocol == 0) - return WSAEINVAL; - - /* FIXME: AF_NETDES should be AF_MAX */ - if (af < AF_UNSPEC || af > AF_NETDES) - return WSAEINVAL; - - if (type < 0 && type > SOCK_SEQPACKET) - return WSAEINVAL; - - if (protocol < 0 && protocol > IPPROTO_MAX) - return WSAEINVAL; - /* Lock the catalog */ WsTcLock(); @@ -541,13 +527,6 @@ Entry->ProtocolInfo.iProtocolMaxOffset) >= protocol)) || (protocol == 0)) { - /* Check that if type and protocol are 0 provider entry has PFL_MATCHES_PROTOCOL_ZERO flag set */ - if (type == 0 && protocol == 0 && (Entry->ProtocolInfo.dwProviderFlags & PFL_MATCHES_PROTOCOL_ZERO) == 0) - { - ErrorCode = WSAEPROTONOSUPPORT; - continue; - } - /* Check if it doesn't already have a provider */ if (!Entry->Provider) { @@ -571,14 +550,12 @@ } else { - if (ErrorCode != WSAEPROTONOSUPPORT) - ErrorCode = WSAESOCKTNOSUPPORT; + ErrorCode = WSAESOCKTNOSUPPORT; } } else { - if (ErrorCode != WSAEPROTONOSUPPORT && ErrorCode != WSAESOCKTNOSUPPORT) - ErrorCode = WSAEAFNOSUPPORT; + ErrorCode = WSAEAFNOSUPPORT; } }

8 years, 1 month

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 2016