Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[jgardou] 64912: [WIN32K] - Remove the cursor from the process cache when its handle is deleted, not after. - Do not return an invalid handle in NtUserSetCursor. CORE-7575

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 23 09:32:39 2014 New Revision: 64912 URL: http://svn.reactos.org/svn/reactos?rev=64912&view=rev Log: [WIN32K] - Remove the cursor from the process cache when its handle is deleted, not after. - Do not return an invalid handle in NtUserSetCursor. CORE-7575 Modified: trunk/reactos/win32ss/user/ntuser/cursoricon_new.c Modified: trunk/reactos/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] Thu Oct 23 09:32:39 2014 @@ -63,9 +63,9 @@ return NULL; } - if(UserObjectInDestroy(hCurIcon)) - { - ERR("Requesting destroyed cursor.\n"); + if (UserObjectInDestroy(hCurIcon)) + { + WARN("Requesting invalid/destroyed cursor.\n"); EngSetLastError(ERROR_INVALID_CURSOR_HANDLE); return NULL; } @@ -155,71 +155,20 @@ { PCURICON_OBJECT CurIcon = Object; - /* We just mark the handle as being destroyed. - * Deleting all the stuff will be deferred to the actual struct free. */ - return UserDeleteObject(CurIcon->head.h, TYPE_CURSOR); -} - -void -FreeCurIconObject( - _In_ PVOID Object) -{ - PCURICON_OBJECT CurIcon = Object; - - if(!(CurIcon->CURSORF_flags & CURSORF_ACON)) - { - HBITMAP bmpMask = CurIcon->hbmMask; - HBITMAP bmpColor = CurIcon->hbmColor; - HBITMAP bmpAlpha = CurIcon->hbmAlpha; - - /* Delete bitmaps */ - if (bmpMask) - { - GreSetObjectOwner(bmpMask, GDI_OBJ_HMGR_POWNED); - GreDeleteObject(bmpMask); - CurIcon->hbmMask = NULL; - } - if (bmpColor) - { - GreSetObjectOwner(bmpColor, GDI_OBJ_HMGR_POWNED); - GreDeleteObject(bmpColor); - CurIcon->hbmColor = NULL; - } - if (bmpAlpha) - { - GreSetObjectOwner(bmpAlpha, GDI_OBJ_HMGR_POWNED); - GreDeleteObject(bmpAlpha); - CurIcon->hbmAlpha = NULL; - } - } - else - { - PACON AniCurIcon = (PACON)CurIcon; - UINT i; - - for(i = 0; i < AniCurIcon->cpcur; i++) - IntDestroyCurIconObject(AniCurIcon->aspcur[i]); - ExFreePoolWithTag(AniCurIcon->aspcur, USERTAG_CURSOR); - } - + /* Try finding it in its process cache */ if (CurIcon->CURSORF_flags & CURSORF_LRSHARED) { PPROCESSINFO ppi; - if (!IS_INTRESOURCE(CurIcon->strName.Buffer)) - ExFreePoolWithTag(CurIcon->strName.Buffer, TAG_STRING); - if (CurIcon->atomModName) - RtlDeleteAtomFromAtomTable(gAtomTable, CurIcon->atomModName); - CurIcon->strName.Buffer = NULL; - CurIcon->atomModName = 0; - - /* Try finding it in its process cache */ ppi = CurIcon->head.ppi; if (ppi->pCursorCache == CurIcon) + { ppi->pCursorCache = CurIcon->pcurNext; + UserDereferenceObject(CurIcon); + } else { - PCURICON_OBJECT CacheCurIcon= ppi->pCursorCache; + PCURICON_OBJECT CacheCurIcon = ppi->pCursorCache; while (CacheCurIcon) { if (CacheCurIcon->pcurNext == CurIcon) @@ -229,7 +178,68 @@ } CacheCurIcon = CacheCurIcon->pcurNext; } - } + + /* We must have found it! */ + ASSERT(CacheCurIcon != NULL); + UserDereferenceObject(CurIcon); + } + } + + /* We just mark the handle as being destroyed. + * Deleting all the stuff will be deferred to the actual struct free. */ + return UserDeleteObject(CurIcon->head.h, TYPE_CURSOR); +} + +void +FreeCurIconObject( + _In_ PVOID Object) +{ + PCURICON_OBJECT CurIcon = Object; + + if(!(CurIcon->CURSORF_flags & CURSORF_ACON)) + { + HBITMAP bmpMask = CurIcon->hbmMask; + HBITMAP bmpColor = CurIcon->hbmColor; + HBITMAP bmpAlpha = CurIcon->hbmAlpha; + + /* Delete bitmaps */ + if (bmpMask) + { + GreSetObjectOwner(bmpMask, GDI_OBJ_HMGR_POWNED); + GreDeleteObject(bmpMask); + CurIcon->hbmMask = NULL; + } + if (bmpColor) + { + GreSetObjectOwner(bmpColor, GDI_OBJ_HMGR_POWNED); + GreDeleteObject(bmpColor); + CurIcon->hbmColor = NULL; + } + if (bmpAlpha) + { + GreSetObjectOwner(bmpAlpha, GDI_OBJ_HMGR_POWNED); + GreDeleteObject(bmpAlpha); + CurIcon->hbmAlpha = NULL; + } + } + else + { + PACON AniCurIcon = (PACON)CurIcon; + UINT i; + + for(i = 0; i < AniCurIcon->cpcur; i++) + IntDestroyCurIconObject(AniCurIcon->aspcur[i]); + ExFreePoolWithTag(AniCurIcon->aspcur, USERTAG_CURSOR); + } + + if (CurIcon->CURSORF_flags & CURSORF_LRSHARED) + { + if (!IS_INTRESOURCE(CurIcon->strName.Buffer)) + ExFreePoolWithTag(CurIcon->strName.Buffer, TAG_STRING); + if (CurIcon->atomModName) + RtlDeleteAtomFromAtomTable(gAtomTable, CurIcon->atomModName); + CurIcon->strName.Buffer = NULL; + CurIcon->atomModName = 0; } /* Finally free the thing */ @@ -635,7 +645,7 @@ { BOOL ret; - TRACE("Enter NtUserDestroyCursorIcon\n"); + TRACE("Enter NtUserDestroyCursorIcon (%p, %u)\n", hCurIcon, bForce); UserEnterExclusive(); if (!bForce) @@ -842,7 +852,7 @@ PCURICON_OBJECT pcurOld, pcurNew; HCURSOR hOldCursor = NULL; - TRACE("Enter NtUserSetCursor\n"); + TRACE("Enter NtUserSetCursor: %p\n", hCursor); UserEnterExclusive(); if (hCursor) @@ -863,6 +873,10 @@ pcurOld = UserSetCursor(pcurNew, FALSE); if (pcurOld) { + hOldCursor = pcurOld->head.h; + /* See if it was destroyed in the meantime */ + if (UserObjectInDestroy(hOldCursor)) + hOldCursor = NULL; pcurOld->CURSORF_flags &= ~CURSORF_CURRENT; UserDereferenceObject(pcurOld); }

9 years, 11 months

[jgardou] 64911: [USER32] - Fix LookupIconIdFromDirectoryEx, returning 0 when no matching entry is found. - Fix error handling when opening a cursor file. - Various code beautification here and the...

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 23 09:32:21 2014 New Revision: 64911 URL: http://svn.reactos.org/svn/reactos?rev=64911&view=rev Log: [USER32] - Fix LookupIconIdFromDirectoryEx, returning 0 when no matching entry is found. - Fix error handling when opening a cursor file. - Various code beautification here and there CORE-7575 Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] Thu Oct 23 09:32:21 2014 @@ -393,10 +393,11 @@ WORD i; const CURSORICONFILEDIRENTRY* entry; + /* Check our file is what it claims to be */ if ( dwFileSize < sizeof(*dir) ) return NULL; - if ( dwFileSize < (sizeof(*dir) + sizeof(dir->idEntries[0])*(dir->idCount-1)) ) + if (dwFileSize < (sizeof(*dir) + FIELD_OFFSET(CURSORICONFILEDIR, idEntries[dir->idCount]))) return NULL; /* @@ -418,7 +419,8 @@ fakeEntry = &fakeDir->idEntries[i]; entry = &dir->idEntries[i]; /* Take this as an occasion to perform a size check */ - if((entry->dwDIBOffset + entry->dwDIBSize) > dwFileSize) + if ((entry->dwDIBOffset > dwFileSize) + || ((entry->dwDIBOffset + entry->dwDIBSize) > dwFileSize)) { ERR("Corrupted icon file?.\n"); HeapFree(GetProcessHeap(), 0, fakeDir); @@ -1260,12 +1262,12 @@ cursorData.rt = (USHORT)((ULONG_PTR)(bIcon ? RT_ICON : RT_CURSOR)); /* Do the dance */ - if(!CURSORICON_GetCursorDataFromBMI(&cursorData, (BITMAPINFO*)&bits[entry->dwDIBOffset])) + if(!CURSORICON_GetCursorDataFromBMI(&cursorData, (BITMAPINFO*)(&bits[entry->dwDIBOffset]))) goto end; hCurIcon = NtUserxCreateEmptyCurObject(FALSE); if(!hCurIcon) - goto end_error; + goto end; /* Tell win32k */ if(!NtUserSetCursorIconData(hCurIcon, NULL, NULL, &cursorData)) @@ -1283,6 +1285,7 @@ DeleteObject(cursorData.hbmMask); if(cursorData.hbmColor) DeleteObject(cursorData.hbmColor); if(cursorData.hbmAlpha) DeleteObject(cursorData.hbmAlpha); + UnmapViewOfFile(bits); return NULL; } @@ -2196,7 +2199,7 @@ /* No inferior or equal depth available. Get the smallest bigger one */ BitCount = 0xFFFF; - iIndex = 0; + iIndex = -1; for(i = 0; i < dir->idCount; i++) { entry = &dir->idEntries[i]; @@ -2222,8 +2225,10 @@ BitCount = entry->wBitCount; } } - - return dir->idEntries[iIndex].wResId; + if (iIndex >= 0) + return dir->idEntries[iIndex].wResId; + + return 0; } HICON WINAPI CreateIcon(

9 years, 11 months

[tkreuzer] 64910: [CRT/OLDNAMES] Fix ARM build, patch by Yuntian Zhang with minor adjustment by me. CORE-8666 #resolve #comment Committed in r64910, thanks!

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Oct 23 09:22:45 2014 New Revision: 64910 URL: http://svn.reactos.org/svn/reactos?rev=64910&view=rev Log: [CRT/OLDNAMES] Fix ARM build, patch by Yuntian Zhang with minor adjustment by me. CORE-8666 #resolve #comment Committed in r64910, thanks! Modified: trunk/reactos/include/asm/kxarm.h trunk/reactos/lib/sdk/crt/except/arm/chkstk_asm.s trunk/reactos/lib/sdk/crt/oldnames-msvcrt.S Modified: trunk/reactos/include/asm/kxarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/kxarm.h?rev=64… ============================================================================== --- trunk/reactos/include/asm/kxarm.h [iso-8859-1] (original) +++ trunk/reactos/include/asm/kxarm.h [iso-8859-1] Thu Oct 23 09:22:45 2014 @@ -67,6 +67,16 @@ TRAP_EPILOG $SystemCall fixme MEND + + #define CR 13 + #define LF 10 + #define NUL 0 + + #define ASCII dcb + + MACRO + UNIMPLEMENTED $Name + MEND #else Modified: trunk/reactos/lib/sdk/crt/except/arm/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/chk… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/chkstk_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/arm/chkstk_asm.s [iso-8859-1] Thu Oct 23 09:22:45 2014 @@ -2,31 +2,29 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Implementation of _chkstk and _alloca_probe - * FILE: lib/sdk/crt/math/amd64/chkstk_asm.s + * FILE: lib/sdk/crt/except/arm/chkstk_asm.s * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Yuntian Zhang (yuntian.zh(a)gmail.com) */ /* INCLUDES ******************************************************************/ -#include <asm.inc> +#include <kxarm.h> /* CODE **********************************************************************/ -.code64 + TEXTAREA -MsgUnimplemented: - .ascii "Unimplemented", CR, LF, NUL +MsgUnimplemented ASCII "Unimplemented", CR, LF, NUL -FUNC __chkstk - .endprolog + LEAF_ENTRY __chkstk UNIMPLEMENTED chkstk - ret -ENDFUNC + bx lr + LEAF_END __chkstk -FUNC __alloca_probe - .endprolog + LEAF_ENTRY __alloca_probe UNIMPLEMENTED alloca_probe - ret -ENDFUNC + bx lr + LEAF_END __alloca_probe -END + END /* EOF */ Modified: trunk/reactos/lib/sdk/crt/oldnames-msvcrt.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/oldnames-msvcr… ============================================================================== --- trunk/reactos/lib/sdk/crt/oldnames-msvcrt.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/oldnames-msvcrt.S [iso-8859-1] Thu Oct 23 09:22:45 2014 @@ -1,5 +1,3 @@ - -#include <asm.inc> #ifdef _M_IX86 #define SYM(name) _##name @@ -8,6 +6,10 @@ #define SYM(name) name #define IMPSYM(name) __imp_##name #endif + +#if (defined(_M_IX86) || defined(_M_AMD64)) + +#include <asm.inc> MACRO(CREATE_ALIAS1, alias, target) #ifdef _USE_ML @@ -32,124 +34,148 @@ CREATE_ALIAS2 &alias, &target ENDM -CREATE_ALIAS access, _access -CREATE_ALIAS chdir, _chdir -CREATE_ALIAS chmod, _chmod -CREATE_ALIAS chsize, _chsize -CREATE_ALIAS close, _close -CREATE_ALIAS creat, _creat -CREATE_ALIAS cwait, _cwait -CREATE_ALIAS2 daylight, _daylight -CREATE_ALIAS dup, _dup -CREATE_ALIAS dup2, _dup2 -CREATE_ALIAS ecvt, _ecvt -CREATE_ALIAS eof, _eof -CREATE_ALIAS execl, _execl -CREATE_ALIAS execle, _execle -CREATE_ALIAS execlp, _execlp -CREATE_ALIAS execlpe, _execlpe -CREATE_ALIAS execv, _execv -CREATE_ALIAS execve, _execve -CREATE_ALIAS execvp, _execvp -CREATE_ALIAS execvpe, _execvpe -CREATE_ALIAS fcvt, _fcvt -CREATE_ALIAS fdopen, _fdopen -CREATE_ALIAS fgetchar, _fgetchar -CREATE_ALIAS fgetwchar, _fgetwchar -CREATE_ALIAS filelength, _filelength -CREATE_ALIAS fileno, _fileno -CREATE_ALIAS fpreset, _fpreset -CREATE_ALIAS fputchar, _fputchar -CREATE_ALIAS fputwchar, _fputwchar -CREATE_ALIAS fstat, _fstat -CREATE_ALIAS ftime, _ftime -CREATE_ALIAS gcvt, _gcvt -CREATE_ALIAS getch, _getch -CREATE_ALIAS getche, _getche -CREATE_ALIAS getcwd, _getcwd -CREATE_ALIAS getpid, _getpid -CREATE_ALIAS getw, _getw -CREATE_ALIAS heapwalk, _heapwalk -CREATE_ALIAS isatty, _isatty -CREATE_ALIAS itoa, _itoa -CREATE_ALIAS kbhit, _kbhit -CREATE_ALIAS lfind, _lfind -CREATE_ALIAS lsearch, _lsearch -CREATE_ALIAS lseek, _lseek -CREATE_ALIAS ltoa, _ltoa -CREATE_ALIAS memccpy, _memccpy -CREATE_ALIAS memicmp, _memicmp -CREATE_ALIAS mkdir, _mkdir -CREATE_ALIAS mktemp, _mktemp -CREATE_ALIAS open, _open -CREATE_ALIAS pclose, _pclose -CREATE_ALIAS popen, _popen -CREATE_ALIAS putch, _putch -CREATE_ALIAS putenv, _putenv -CREATE_ALIAS putw, _putw -CREATE_ALIAS read, _read -CREATE_ALIAS rmdir, _rmdir -CREATE_ALIAS rmtmp, _rmtmp -CREATE_ALIAS searchenv, _searchenv -CREATE_ALIAS setmode, _setmode -CREATE_ALIAS snprintf, _snprintf -CREATE_ALIAS sopen, _sopen -CREATE_ALIAS spawnl, _spawnl -CREATE_ALIAS spawnle, _spawnle -CREATE_ALIAS spawnlp, _spawnlp -CREATE_ALIAS spawnlpe, _spawnlpe -CREATE_ALIAS spawnv, _spawnv -CREATE_ALIAS spawnve, _spawnve -CREATE_ALIAS spawnvp, _spawnvp -CREATE_ALIAS spawnvpe, _spawnvpe -CREATE_ALIAS stat, _stat -CREATE_ALIAS strcmpi, _strcmpi -CREATE_ALIAS strdup, _strdup -CREATE_ALIAS stricmp, _stricmp -CREATE_ALIAS stricoll, _stricoll -CREATE_ALIAS strlwr, _strlwr -CREATE_ALIAS strnicmp, _strnicmp -CREATE_ALIAS strnset, _strnset -CREATE_ALIAS strrev, _strrev -CREATE_ALIAS strset, _strset -CREATE_ALIAS strupr, _strupr -CREATE_ALIAS swab, _swab -CREATE_ALIAS tell, _tell -CREATE_ALIAS tempnam, _tempnam -CREATE_ALIAS2 timezone, _timezone -CREATE_ALIAS2 tzname, _tzname -CREATE_ALIAS tzset, _tzset -CREATE_ALIAS umask, _umask -CREATE_ALIAS ungetch, _ungetch -CREATE_ALIAS unlink, _unlink -CREATE_ALIAS utime, _utime -CREATE_ALIAS wcsdup, _wcsdup -CREATE_ALIAS wcsicmp, _wcsicmp -CREATE_ALIAS wcsicoll, _wcsicoll -CREATE_ALIAS wcslwr, _wcslwr -CREATE_ALIAS wcsnicmp, _wcsnicmp -CREATE_ALIAS wcsnset, _wcsnset -CREATE_ALIAS wcsrev, _wcsrev -CREATE_ALIAS wcsset, _wcsset -CREATE_ALIAS wcsupr, _wcsupr -CREATE_ALIAS wpopen, _wpopen -CREATE_ALIAS write, _write -// non-ANSI functions declared in math.h -CREATE_ALIAS j0, _j0 -CREATE_ALIAS j1, _j1 -CREATE_ALIAS jn, _jn -CREATE_ALIAS y0, _y0 -CREATE_ALIAS y1, _y1 -CREATE_ALIAS yn, _yn -CREATE_ALIAS chgsign, _chgsign -CREATE_ALIAS scalb, _scalb -CREATE_ALIAS finite, _finite -CREATE_ALIAS fpclass, _fpclass -// C99 functions -CREATE_ALIAS cabs, _cabs -CREATE_ALIAS hypot, _hypot -CREATE_ALIAS logb, _logb -CREATE_ALIAS nextafter, _nextafter +#elif defined(_M_ARM) -END +#include <kxarm.h> + MACRO + CREATE_ALIAS1 $alias, $target + IMPORT SYM($alias), WEAK SYM($target) + MEND + + MACRO + CREATE_ALIAS2 $alias, $target + IMPORT IMPSYM($alias), WEAK IMPSYM($target) + MEND + + MACRO + CREATE_ALIAS $alias, $target + CREATE_ALIAS1 $alias, $target + CREATE_ALIAS2 $alias, $target + MEND +#else +#error "Unsupported platform." +#endif + + /* Do not remove indentation, this would break ARM build! */ + CREATE_ALIAS access, _access + CREATE_ALIAS chdir, _chdir + CREATE_ALIAS chmod, _chmod + CREATE_ALIAS chsize, _chsize + CREATE_ALIAS close, _close + CREATE_ALIAS creat, _creat + CREATE_ALIAS cwait, _cwait + CREATE_ALIAS2 daylight, _daylight + CREATE_ALIAS dup, _dup + CREATE_ALIAS dup2, _dup2 + CREATE_ALIAS ecvt, _ecvt + CREATE_ALIAS eof, _eof + CREATE_ALIAS execl, _execl + CREATE_ALIAS execle, _execle + CREATE_ALIAS execlp, _execlp + CREATE_ALIAS execlpe, _execlpe + CREATE_ALIAS execv, _execv + CREATE_ALIAS execve, _execve + CREATE_ALIAS execvp, _execvp + CREATE_ALIAS execvpe, _execvpe + CREATE_ALIAS fcvt, _fcvt + CREATE_ALIAS fdopen, _fdopen + CREATE_ALIAS fgetchar, _fgetchar + CREATE_ALIAS fgetwchar, _fgetwchar + CREATE_ALIAS filelength, _filelength + CREATE_ALIAS fileno, _fileno + CREATE_ALIAS fpreset, _fpreset + CREATE_ALIAS fputchar, _fputchar + CREATE_ALIAS fputwchar, _fputwchar + CREATE_ALIAS fstat, _fstat + CREATE_ALIAS ftime, _ftime + CREATE_ALIAS gcvt, _gcvt + CREATE_ALIAS getch, _getch + CREATE_ALIAS getche, _getche + CREATE_ALIAS getcwd, _getcwd + CREATE_ALIAS getpid, _getpid + CREATE_ALIAS getw, _getw + CREATE_ALIAS heapwalk, _heapwalk + CREATE_ALIAS isatty, _isatty + CREATE_ALIAS itoa, _itoa + CREATE_ALIAS kbhit, _kbhit + CREATE_ALIAS lfind, _lfind + CREATE_ALIAS lsearch, _lsearch + CREATE_ALIAS lseek, _lseek + CREATE_ALIAS ltoa, _ltoa + CREATE_ALIAS memccpy, _memccpy + CREATE_ALIAS memicmp, _memicmp + CREATE_ALIAS mkdir, _mkdir + CREATE_ALIAS mktemp, _mktemp + CREATE_ALIAS open, _open + CREATE_ALIAS pclose, _pclose + CREATE_ALIAS popen, _popen + CREATE_ALIAS putch, _putch + CREATE_ALIAS putenv, _putenv + CREATE_ALIAS putw, _putw + CREATE_ALIAS read, _read + CREATE_ALIAS rmdir, _rmdir + CREATE_ALIAS rmtmp, _rmtmp + CREATE_ALIAS searchenv, _searchenv + CREATE_ALIAS setmode, _setmode + CREATE_ALIAS snprintf, _snprintf + CREATE_ALIAS sopen, _sopen + CREATE_ALIAS spawnl, _spawnl + CREATE_ALIAS spawnle, _spawnle + CREATE_ALIAS spawnlp, _spawnlp + CREATE_ALIAS spawnlpe, _spawnlpe + CREATE_ALIAS spawnv, _spawnv + CREATE_ALIAS spawnve, _spawnve + CREATE_ALIAS spawnvp, _spawnvp + CREATE_ALIAS spawnvpe, _spawnvpe + CREATE_ALIAS stat, _stat + CREATE_ALIAS strcmpi, _strcmpi + CREATE_ALIAS strdup, _strdup + CREATE_ALIAS stricmp, _stricmp + CREATE_ALIAS stricoll, _stricoll + CREATE_ALIAS strlwr, _strlwr + CREATE_ALIAS strnicmp, _strnicmp + CREATE_ALIAS strnset, _strnset + CREATE_ALIAS strrev, _strrev + CREATE_ALIAS strset, _strset + CREATE_ALIAS strupr, _strupr + CREATE_ALIAS swab, _swab + CREATE_ALIAS tell, _tell + CREATE_ALIAS tempnam, _tempnam + CREATE_ALIAS2 timezone, _timezone + CREATE_ALIAS2 tzname, _tzname + CREATE_ALIAS tzset, _tzset + CREATE_ALIAS umask, _umask + CREATE_ALIAS ungetch, _ungetch + CREATE_ALIAS unlink, _unlink + CREATE_ALIAS utime, _utime + CREATE_ALIAS wcsdup, _wcsdup + CREATE_ALIAS wcsicmp, _wcsicmp + CREATE_ALIAS wcsicoll, _wcsicoll + CREATE_ALIAS wcslwr, _wcslwr + CREATE_ALIAS wcsnicmp, _wcsnicmp + CREATE_ALIAS wcsnset, _wcsnset + CREATE_ALIAS wcsrev, _wcsrev + CREATE_ALIAS wcsset, _wcsset + CREATE_ALIAS wcsupr, _wcsupr + CREATE_ALIAS wpopen, _wpopen + CREATE_ALIAS write, _write + // non-ANSI functions declared in math.h + CREATE_ALIAS j0, _j0 + CREATE_ALIAS j1, _j1 + CREATE_ALIAS jn, _jn + CREATE_ALIAS y0, _y0 + CREATE_ALIAS y1, _y1 + CREATE_ALIAS yn, _yn + CREATE_ALIAS chgsign, _chgsign + CREATE_ALIAS scalb, _scalb + CREATE_ALIAS finite, _finite + CREATE_ALIAS fpclass, _fpclass + // C99 functions + CREATE_ALIAS cabs, _cabs + CREATE_ALIAS hypot, _hypot + CREATE_ALIAS logb, _logb + CREATE_ALIAS nextafter, _nextafter + + END +

9 years, 11 months

[tkreuzer] 64909: [CRT] Do not raise an exception in _invalid_parameter, which is only done in later MSVCRTs. Wine uses a symbolic constant (_MSVCR_VER) to handle this and other things and compiles...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Oct 23 09:05:32 2014 New Revision: 64909 URL: http://svn.reactos.org/svn/reactos?rev=64909&view=rev Log: [CRT] Do not raise an exception in _invalid_parameter, which is only done in later MSVCRTs. Wine uses a symbolic constant (_MSVCR_VER) to handle this and other things and compiles their CRT code multiple times. As an alternative we could use a global version variable to avoid recompiling, once we implement other CRT dlls. CORE-8670 #resolve Modified: trunk/reactos/lib/sdk/crt/stdlib/errno.c Modified: trunk/reactos/lib/sdk/crt/stdlib/errno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/errno.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/errno.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/errno.c [iso-8859-1] Thu Oct 23 09:05:32 2014 @@ -141,7 +141,9 @@ else { ERR( "%s:%u %s: %s %lx\n", debugstr_w(file), line, debugstr_w(func), debugstr_w(expr), arg ); +#if _MSVCR_VER > 0 // FIXME: possible improvement: use a global variable in the DLL RaiseException( STATUS_INVALID_CRUNTIME_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, NULL ); +#endif } }

9 years, 11 months

[khornicek] 64908: [I8042PRT] - check the right buffer's length [WIN32K] - simplify IntKeyboardUpdateLeds a bit and mind previous mode - fixes keyboard indicators CORE-8547

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Oct 22 20:05:32 2014 New Revision: 64908 URL: http://svn.reactos.org/svn/reactos?rev=64908&view=rev Log: [I8042PRT] - check the right buffer's length [WIN32K] - simplify IntKeyboardUpdateLeds a bit and mind previous mode - fixes keyboard indicators CORE-8547 Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c trunk/reactos/win32ss/user/ntuser/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] Wed Oct 22 20:05:32 2014 @@ -694,7 +694,7 @@ { TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_KEYBOARD_QUERY_INDICATORS\n"); - if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) { Status = STATUS_BUFFER_TOO_SMALL; } Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/keyboa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] Wed Oct 22 20:05:32 2014 @@ -61,7 +61,7 @@ while (pRet) { - Status = NtDeviceIoControlFile(hKeyboardDevice, + Status = ZwDeviceIoControlFile(hKeyboardDevice, NULL, NULL, NULL, @@ -104,8 +104,7 @@ NTSTATUS APIENTRY IntKeyboardUpdateLeds(HANDLE hKeyboardDevice, WORD wVk, - WORD wScanCode, - BOOL bEnabled) + WORD wScanCode) { NTSTATUS Status; UINT i; @@ -133,13 +132,10 @@ if (LedFlag) { - if (bEnabled) - gIndicators.LedFlags |= LedFlag; - else - gIndicators.LedFlags = ~LedFlag; + gIndicators.LedFlags ^= LedFlag; /* Update the lights on the hardware */ - Status = NtDeviceIoControlFile(hKeyboardDevice, + Status = ZwDeviceIoControlFile(hKeyboardDevice, NULL, NULL, NULL, @@ -164,10 +160,10 @@ { NTSTATUS Status; IO_STATUS_BLOCK Block; -/* + IntKeyboardGetIndicatorTrans(hKeyboardDevice, &gpKeyboardIndicatorTrans); - Status = NtDeviceIoControlFile(hKeyboardDevice, + Status = ZwDeviceIoControlFile(hKeyboardDevice, NULL, NULL, NULL, @@ -186,9 +182,9 @@ gIndicators.LedFlags & KEYBOARD_NUM_LOCK_ON); SET_KEY_LOCKED(gafAsyncKeyState, VK_SCROLL, gIndicators.LedFlags & KEYBOARD_SCROLL_LOCK_ON); -*/ + // FIXME: Need device driver to work! HID support more than one!!!! - Status = NtDeviceIoControlFile(hKeyboardDevice, + Status = ZwDeviceIoControlFile(hKeyboardDevice, NULL, NULL, NULL, @@ -808,8 +804,7 @@ /* Update keyboard LEDs */ IntKeyboardUpdateLeds(ghKeyboardDevice, wSimpleVk, - wScanCode, - IS_KEY_LOCKED(gafAsyncKeyState, wSimpleVk)); + wScanCode); } /* Call WH_KEYBOARD_LL hook */

9 years, 11 months

[tfaber] 64907: [RTL] - Address a review comment by Timo -- use more explicit comparison

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Oct 22 19:40:13 2014 New Revision: 64907 URL: http://svn.reactos.org/svn/reactos?rev=64907&view=rev Log: [RTL] - Address a review comment by Timo -- use more explicit comparison Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=64907… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Wed Oct 22 19:40:13 2014 @@ -362,7 +362,7 @@ /* Clear what's left */ NumberToClear &= (_BITCOUNT - 1); - if (NumberToClear) + if (NumberToClear != 0) { Mask = MAXINDEX << NumberToClear; *Buffer &= Mask; @@ -422,7 +422,7 @@ /* Set what's left */ NumberToSet &= (_BITCOUNT - 1); - if (NumberToSet) + if (NumberToSet != 0) { Mask = MAXINDEX << NumberToSet; *Buffer |= ~Mask;

9 years, 11 months

[tfaber] 64906: [NTOS:FORMATTING] - Trip trailing whitespace in Io/Pnp

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Oct 22 19:34:46 2014 New Revision: 64906 URL: http://svn.reactos.org/svn/reactos?rev=64906&view=rev Log: [NTOS:FORMATTING] - Trip trailing whitespace in Io/Pnp Modified: trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c trunk/reactos/ntoskrnl/io/iomgr/remlock.c trunk/reactos/ntoskrnl/io/iomgr/volume.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c trunk/reactos/ntoskrnl/io/pnpmgr/pnputil.c Modified: trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/ramdisk.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c [iso-8859-1] Wed Oct 22 19:34:46 2014 @@ -37,7 +37,7 @@ PLIST_ENTRY ListHead, NextEntry; OBJECT_ATTRIBUTES ObjectAttributes; WCHAR SourceString[54]; - + // // Scan memory descriptors // @@ -52,7 +52,7 @@ MemoryDescriptor = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - + // // Needs to be a ROM/RAM descriptor // @@ -63,7 +63,7 @@ // NextEntry = NextEntry->Flink; } - + // // Nothing found? // @@ -78,7 +78,7 @@ 0, 0); } - + // // Setup the input buffer // @@ -91,7 +91,7 @@ RamdiskCreate.DiskGuid = RAMDISK_BOOTDISK_GUID; RamdiskCreate.DriveLetter = L'C'; RamdiskCreate.Options.Fixed = TRUE; - + // // Check for commandline parameters // @@ -102,7 +102,7 @@ // Make everything upper case // _strupr(CommandLine); - + // // Check for offset parameter // @@ -121,12 +121,12 @@ RamdiskCreate.DiskOffset = atol(OffsetValue + 1); } } - + // // Reduce the disk length // RamdiskCreate.DiskLength.QuadPart -= RamdiskCreate.DiskOffset; - + // // Check for length parameter // @@ -146,7 +146,7 @@ } } } - + // // Setup object attributes // @@ -156,7 +156,7 @@ OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); - + // // Open a handle to the driver // @@ -177,7 +177,7 @@ 0, 0); } - + // // Send create command // @@ -203,7 +203,7 @@ 0, 0); } - + // // Convert the GUID // @@ -219,7 +219,7 @@ 0, 0); } - + // // Build the symbolic link name and target // @@ -230,7 +230,7 @@ SymbolicLinkName.Length = 38; SymbolicLinkName.MaximumLength = 38 + sizeof(UNICODE_NULL); SymbolicLinkName.Buffer = L"\\ArcName\\ramdisk(0)"; - + // // Create the symbolic link // @@ -248,7 +248,7 @@ 0, 0); } - + // // We made it // Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/remlock.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] Wed Oct 22 19:34:46 2014 @@ -100,7 +100,7 @@ TrackingBlock = ExAllocatePoolWithTag(NonPagedPool, sizeof(IO_REMOVE_LOCK_TRACKING_BLOCK), Lock->Dbg.AllocateTag); if (!TrackingBlock) { - /* Keep count of failures for lock release and missing tags */ + /* Keep count of failures for lock release and missing tags */ InterlockedIncrement(&(Lock->Dbg.LowMemoryCount)); } else Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Wed Oct 22 19:34:46 2014 @@ -1365,7 +1365,7 @@ * name lengths than MAXUSHORT, we can't use * them, because we have to return this in an UNICODE_STRING * that stores length on USHORT. - */ + */ Length = VolumePath.MultiSzLength + sizeof(VolumePath); if (Length > MAXUSHORT) { Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] Wed Oct 22 19:34:46 2014 @@ -55,7 +55,7 @@ UNICODE_STRING GroupString = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet" L"\\Control\\ServiceGroupOrder"); - + /* ReactOS HACK for SETUPLDR */ if (KeLoaderBlock->SetupLdrBlock) { @@ -64,7 +64,7 @@ PiInitGroupOrderTable = (PVOID)0xBABEB00B; return STATUS_SUCCESS; } - + /* Open the registry key */ Status = IopOpenRegistryKeyEx(&KeyHandle, NULL, @@ -75,7 +75,7 @@ /* Get the list */ Status = IopGetRegistryValue(KeyHandle, L"List", &KeyValueInformation); ZwClose(KeyHandle); - + /* Make sure we got it */ if (NT_SUCCESS(Status)) { @@ -87,7 +87,7 @@ Status = PnpRegMultiSzToUnicodeStrings(KeyValueInformation, &GroupTable, &Count); - + /* Cache it for later */ PiInitGroupOrderTable = GroupTable; PiInitGroupOrderTableCount = (USHORT)Count; @@ -97,12 +97,12 @@ /* Fail */ Status = STATUS_UNSUCCESSFUL; } - + /* Free the information */ ExFreePool(KeyValueInformation); } } - + /* Return status */ return Status; } @@ -117,13 +117,13 @@ PVOID Buffer; UNICODE_STRING Group; PAGED_CODE(); - + /* Make sure we have a cache */ if (!PiInitGroupOrderTable) return -1; - + /* If we don't have a handle, the rest is easy -- return the count */ if (!ServiceHandle) return PiInitGroupOrderTableCount + 1; - + /* Otherwise, get the group value */ Status = IopGetRegistryValue(ServiceHandle, L"Group", &KeyValueInformation); if (!NT_SUCCESS(Status)) return PiInitGroupOrderTableCount; @@ -131,20 +131,20 @@ /* Make sure we have a valid string */ ASSERT(KeyValueInformation->Type == REG_SZ); ASSERT(KeyValueInformation->DataLength); - + /* Convert to unicode string */ Buffer = (PVOID)((ULONG_PTR)KeyValueInformation + KeyValueInformation->DataOffset); PnpRegSzToString(Buffer, KeyValueInformation->DataLength, &Group.Length); Group.MaximumLength = (USHORT)KeyValueInformation->DataLength; Group.Buffer = Buffer; - + /* Loop the groups */ for (i = 0; i < PiInitGroupOrderTableCount; i++) { /* Try to find a match */ if (RtlEqualUnicodeString(&Group, &PiInitGroupOrderTable[i], TRUE)) break; } - + /* We're done */ ExFreePool(KeyValueInformation); return i; @@ -167,15 +167,15 @@ UNICODE_STRING GroupString = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet" L"\\Control\\ServiceGroupOrder"); - + /* Open the key */ Status = IopOpenRegistryKeyEx(&KeyHandle, NULL, &GroupString, KEY_READ); if (!NT_SUCCESS(Status)) goto Quickie; - + /* Read the group */ Status = IopGetRegistryValue(ServiceHandle, L"Group", &KeyValueInformation); if (!NT_SUCCESS(Status)) goto Quickie; - + /* Make sure we have a group */ if ((KeyValueInformation->Type == REG_SZ) && (KeyValueInformation->DataLength)) @@ -199,7 +199,7 @@ Tag = *(PULONG)((ULONG_PTR)KeyValueInformationTag + KeyValueInformationTag->DataOffset); } - + /* We can get rid of this now */ ExFreePool(KeyValueInformationTag); @@ -207,13 +207,13 @@ Status = IopGetRegistryValue(KeyHandle, Group.Buffer, &KeyValueInformationGroupOrderList); - + /* We can get rid of this now */ Quickie: if (KeyValueInformation) ExFreePool(KeyValueInformation); if (KeyHandle) NtClose(KeyHandle); if (!NT_SUCCESS(Status)) return -1; - + /* We're on the success path -- validate the tag order*/ if ((KeyValueInformationGroupOrderList->Type == REG_BINARY) && (KeyValueInformationGroupOrderList->DataLength)) @@ -221,12 +221,12 @@ /* Get the order array */ GroupOrder = (PULONG)((ULONG_PTR)KeyValueInformationGroupOrderList + KeyValueInformationGroupOrderList->DataOffset); - + /* Get the count */ Count = *GroupOrder; ASSERT(((Count + 1) * sizeof(ULONG)) <= KeyValueInformationGroupOrderList->DataLength); - + /* Now loop each tag */ GroupOrder++; for (i = 1; i <= Count; i++) @@ -238,7 +238,7 @@ GroupOrder++; } } - + /* Last buffer to free */ ExFreePool(KeyValueInformationGroupOrderList); return i; @@ -258,7 +258,7 @@ RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class"); PKEY_VALUE_FULL_INFORMATION KeyValueInformation = NULL; PWCHAR Buffer; - + /* Open enumeration root key */ Status = IopOpenRegistryKeyEx(&EnumRootKey, NULL, @@ -269,7 +269,7 @@ DPRINT1("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); return Status; } - + /* Open instance subkey */ Status = IopOpenRegistryKeyEx(&SubKey, EnumRootKey, @@ -281,7 +281,7 @@ DPRINT1("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); return Status; } - + /* Get class GUID */ Status = IopGetRegistryValue(SubKey, REGSTR_VAL_CLASSGUID, @@ -293,7 +293,7 @@ PnpRegSzToString(Buffer, KeyValueInformation->DataLength, &ClassGuid.Length); ClassGuid.MaximumLength = (USHORT)KeyValueInformation->DataLength; ClassGuid.Buffer = Buffer; - + /* Open the key */ Status = IopOpenRegistryKeyEx(&ControlKey, NULL, @@ -320,7 +320,7 @@ ClassKey = NULL; } } - + /* Check if we made it till here */ if (ClassKey) { @@ -342,11 +342,11 @@ ZwClose(PropertiesKey); } } - + /* Free the registry data */ ExFreePool(KeyValueInformation); } - + /* Do ReactOS-style setup */ Status = IopAttachFilterDrivers(DeviceNode, TRUE); if (!NT_SUCCESS(Status)) @@ -363,10 +363,10 @@ IopRemoveDevice(DeviceNode); return Status; } - + Status = IopStartDevice(DeviceNode); } - + /* Return status */ return Status; } @@ -382,21 +382,21 @@ UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET"); UNICODE_STRING PnpManagerDriverName = RTL_CONSTANT_STRING(DRIVER_ROOT_NAME L"PnpManager"); PDEVICE_OBJECT Pdo; - + /* Initialize locks and such */ KeInitializeSpinLock(&IopDeviceTreeLock); - + /* Get the default interface */ PnpDefaultInterfaceType = IopDetermineDefaultInterfaceType(); - + /* Initialize arbiters */ Status = IopInitializeArbiters(); if (!NT_SUCCESS(Status)) return Status; - + /* Setup the group cache */ Status = PiInitCacheGroupInformation(); if (!NT_SUCCESS(Status)) return Status; - + /* Open the current control set */ Status = IopOpenRegistryKeyEx(&KeyHandle, NULL, @@ -443,14 +443,14 @@ REG_OPTION_NON_VOLATILE, &Disposition); if (!NT_SUCCESS(Status)) return Status; - + /* Check if it's a new key */ if (Disposition == REG_CREATED_NEW_KEY) { /* FIXME: DACLs */ DPRINT1("Need to build DACL\n"); } - + /* Create the root key */ ParentHandle = EnumHandle; RtlInitUnicodeString(&KeyName, REGSTR_KEY_ROOTENUM); @@ -463,7 +463,7 @@ NtClose(ParentHandle); if (!NT_SUCCESS(Status)) return Status; NtClose(EnumHandle); - + /* Open the root key now */ RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET\\ENUM"); Status = IopOpenRegistryKeyEx(&EnumHandle, @@ -491,7 +491,7 @@ DPRINT1("IoCreateDriverObject() failed\n"); KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); } - + /* Create the root PDO */ Status = IoCreateDevice(IopRootDriverObject, sizeof(IOPNP_DEVICE_EXTENSION), @@ -505,10 +505,10 @@ DPRINT1("IoCreateDevice() failed\n"); KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); } - + /* This is a bus enumerated device */ Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; - + /* Create the root device node */ IopRootDeviceNode = PipAllocateDeviceNode(Pdo); @@ -516,11 +516,11 @@ IopRootDeviceNode->Flags |= DNF_STARTED + DNF_PROCESSED + DNF_ENUMERATED + DNF_MADEUP + DNF_NO_RESOURCE_REQUIRED + DNF_ADDED; - + /* Create instance path */ RtlCreateUnicodeString(&IopRootDeviceNode->InstancePath, REGSTR_VAL_ROOT_DEVNODE); - + /* Call the add device routine */ IopRootDriverObject->DriverExtension->AddDevice(IopRootDriverObject, IopRootDeviceNode->PhysicalDeviceObject); @@ -528,23 +528,23 @@ /* Initialize PnP-Event notification support */ Status = IopInitPlugPlayEvents(); if (!NT_SUCCESS(Status)) return Status; - + /* Report the device to the user-mode pnp manager */ IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, &IopRootDeviceNode->InstancePath); - + /* Initialize the Bus Type GUID List */ PnpBusTypeGuidList = ExAllocatePool(PagedPool, sizeof(IO_BUS_TYPE_GUID_LIST)); RtlZeroMemory(PnpBusTypeGuidList, sizeof(IO_BUS_TYPE_GUID_LIST)); ExInitializeFastMutex(&PnpBusTypeGuidList->Lock); - + /* Launch the firmware mapper */ Status = IopUpdateRootKey(); if (!NT_SUCCESS(Status)) return Status; - + /* Close the handle to the control set */ NtClose(KeyHandle); - + /* We made it */ return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Wed Oct 22 19:34:46 2014 @@ -87,7 +87,7 @@ PKEY_VALUE_PARTIAL_INFORMATION PartialInfo; ULONG HidLength = 0, CidLength = 0, BufferLength; PWCHAR IdBuffer, OriginalIdBuffer; - + /* Open the device instance key */ Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey); if (Status != STATUS_SUCCESS) @@ -174,7 +174,7 @@ ZwClose(InstanceKey); return; } - + /* Copy CID next */ CidLength = PartialInfo->DataLength; RtlCopyMemory(((PUCHAR)IdBuffer) + HidLength, PartialInfo->Data, CidLength); @@ -182,7 +182,7 @@ /* Free our temp buffer */ ExFreePool(PartialInfo); - + InitializeObjectAttributes(&ObjectAttributes, &CriticalDeviceKeyU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, @@ -203,15 +203,15 @@ while (*IdBuffer) { USHORT StringLength = (USHORT)wcslen(IdBuffer) + 1, Index; - + IopFixupDeviceId(IdBuffer); - + /* Look through all subkeys for a match */ for (Index = 0; TRUE; Index++) { ULONG NeededLength; PKEY_BASIC_INFORMATION BasicInfo; - + Status = ZwEnumerateKey(CriticalDeviceKey, Index, KeyBasicInformation, @@ -415,7 +415,7 @@ /* Advance to the next ID */ IdBuffer += StringLength; } - + ExFreePool(OriginalIdBuffer); ZwClose(InstanceKey); ZwClose(CriticalDeviceKey); @@ -428,7 +428,7 @@ { PDEVICE_OBJECT Fdo; NTSTATUS Status; - + if (!DriverObject) { /* Special case for bus driven devices */ @@ -497,11 +497,11 @@ { IO_STACK_LOCATION Stack; PVOID Dummy; - + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); Stack.MajorFunction = IRP_MJ_PNP; Stack.MinorFunction = IRP_MN_EJECT; - + return IopSynchronousCall(DeviceObject, &Stack, &Dummy); } @@ -512,11 +512,11 @@ { IO_STACK_LOCATION Stack; PVOID Dummy; - + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); Stack.MajorFunction = IRP_MJ_PNP; Stack.MinorFunction = IRP_MN_SURPRISE_REMOVAL; - + /* Drivers should never fail a IRP_MN_SURPRISE_REMOVAL request */ IopSynchronousCall(DeviceObject, &Stack, &Dummy); } @@ -530,12 +530,12 @@ IO_STACK_LOCATION Stack; PVOID Dummy; NTSTATUS Status; - + ASSERT(DeviceNode); - + IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVE_PENDING, &DeviceNode->InstancePath); - + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); Stack.MajorFunction = IRP_MJ_PNP; Stack.MinorFunction = IRP_MN_QUERY_REMOVE_DEVICE; @@ -547,7 +547,7 @@ &GUID_TARGET_DEVICE_QUERY_REMOVE, NULL, NULL); - + if (!NT_SUCCESS(Status)) { DPRINT1("Removal vetoed by %wZ\n", &DeviceNode->InstancePath); @@ -565,11 +565,11 @@ { IO_STACK_LOCATION Stack; PVOID Dummy; - + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); Stack.MajorFunction = IRP_MJ_PNP; Stack.MinorFunction = IRP_MN_QUERY_STOP_DEVICE; - + return IopSynchronousCall(DeviceObject, &Stack, &Dummy); } @@ -584,7 +584,7 @@ /* Drop all our state for this device in case it isn't really going away */ DeviceNode->Flags &= DNF_ENUMERATED | DNF_PROCESSED; - + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); Stack.MajorFunction = IRP_MJ_PNP; Stack.MinorFunction = IRP_MN_REMOVE_DEVICE; @@ -607,14 +607,14 @@ { IO_STACK_LOCATION Stack; PVOID Dummy; - + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); Stack.MajorFunction = IRP_MJ_PNP; Stack.MinorFunction = IRP_MN_CANCEL_REMOVE_DEVICE; - + /* Drivers should never fail a IRP_MN_CANCEL_REMOVE_DEVICE request */ IopSynchronousCall(DeviceObject, &Stack, &Dummy); - + IopNotifyPlugPlayNotification(DeviceObject, EventCategoryTargetDeviceChange, &GUID_TARGET_DEVICE_REMOVE_CANCELLED, @@ -629,11 +629,11 @@ { IO_STACK_LOCATION Stack; PVOID Dummy; - + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); Stack.MajorFunction = IRP_MJ_PNP; Stack.MinorFunction = IRP_MN_STOP_DEVICE; - + /* Drivers should never fail a IRP_MN_STOP_DEVICE request */ IopSynchronousCall(DeviceObject, &Stack, &Dummy); } @@ -647,17 +647,17 @@ NTSTATUS Status; PVOID Dummy; DEVICE_CAPABILITIES DeviceCapabilities; - + /* Get the device node */ DeviceNode = IopGetDeviceNode(DeviceObject); - + ASSERT(!(DeviceNode->Flags & DNF_DISABLED)); /* Build the I/O stack location */ RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); Stack.MajorFunction = IRP_MJ_PNP; Stack.MinorFunction = IRP_MN_START_DEVICE; - + Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->ResourceList; Stack.Parameters.StartDevice.AllocatedResourcesTranslated = @@ -677,7 +677,7 @@ DPRINT1("Warning: PnP Start failed (%wZ) [Status: 0x%x]\n", &DeviceNode->InstancePath, Status); return; } - + DPRINT("Sending IRP_MN_QUERY_CAPABILITIES to device stack (after start)\n"); Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCapabilities); @@ -688,7 +688,7 @@ /* Invalidate device state so IRP_MN_QUERY_PNP_DEVICE_STATE is sent */ IoInvalidateDeviceState(DeviceObject); - + /* Otherwise, mark us as started */ DeviceNode->Flags |= DNF_STARTED; DeviceNode->Flags &= ~DNF_STOPPED; @@ -704,23 +704,23 @@ PDEVICE_OBJECT DeviceObject; NTSTATUS Status; PAGED_CODE(); - + /* Sanity check */ ASSERT((DeviceNode->Flags & DNF_ADDED)); ASSERT((DeviceNode->Flags & (DNF_RESOURCE_ASSIGNED | DNF_RESOURCE_REPORTED | DNF_NO_RESOURCE_REQUIRED))); - + /* Get the device object */ DeviceObject = DeviceNode->PhysicalDeviceObject; - + /* Check if we're not started yet */ if (!(DeviceNode->Flags & DNF_STARTED)) { /* Start us */ IopStartDevice2(DeviceObject); } - + /* Do we need to query IDs? This happens in the case of manual reporting */ #if 0 if (DeviceNode->Flags & DNF_NEED_QUERY_IDS) @@ -730,7 +730,7 @@ ASSERT(FALSE); } #endif - + /* Make sure we're started, and check if we need enumeration */ if ((DeviceNode->Flags & DNF_STARTED) && (DeviceNode->Flags & DNF_NEED_ENUMERATION_ONLY)) @@ -744,7 +744,7 @@ /* Nothing to do */ Status = STATUS_SUCCESS; } - + /* Return */ return Status; } @@ -1243,18 +1243,18 @@ NTSTATUS Status; PDEVICE_OBJECT TopDeviceObject; PAGED_CODE(); - + /* Call the top of the device stack */ TopDeviceObject = IoGetAttachedDeviceReference(DeviceObject); - + /* Allocate an IRP */ Irp = IoAllocateIrp(TopDeviceObject->StackSize, FALSE); if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; - + /* Initialize to failure */ Irp->IoStatus.Status = IoStatusBlock.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = IoStatusBlock.Information = 0; - + /* Special case for IRP_MN_FILTER_RESOURCE_REQUIREMENTS */ if (IoStackLocation->MinorFunction == IRP_MN_FILTER_RESOURCE_REQUIREMENTS) { @@ -1262,22 +1262,22 @@ Irp->IoStatus.Information = IoStatusBlock.Information = (ULONG_PTR)IoStackLocation->Parameters.FilterResourceRequirements.IoResourceRequirementList; } - + /* Initialize the event */ KeInitializeEvent(&Event, SynchronizationEvent, FALSE); - + /* Set them up */ Irp->UserIosb = &IoStatusBlock; Irp->UserEvent = &Event; - + /* Queue the IRP */ Irp->Tail.Overlay.Thread = PsGetCurrentThread(); IoQueueThreadIrp(Irp); - + /* Copy-in the stack */ IrpStack = IoGetNextIrpStackLocation(Irp); *IrpStack = *IoStackLocation; - + /* Call the driver */ Status = IoCallDriver(TopDeviceObject, Irp); if (Status == STATUS_PENDING) @@ -1307,7 +1307,7 @@ IN PIO_STACK_LOCATION Stack OPTIONAL) { IO_STACK_LOCATION IoStackLocation; - + /* Fill out the stack information */ RtlZeroMemory(&IoStackLocation, sizeof(IO_STACK_LOCATION)); IoStackLocation.MajorFunction = IRP_MJ_PNP; @@ -1319,7 +1319,7 @@ &Stack->Parameters, sizeof(Stack->Parameters)); } - + /* Do the PnP call */ IoStatusBlock->Status = IopSynchronousCall(DeviceObject, &IoStackLocation, @@ -3295,11 +3295,11 @@ UNICODE_STRING KeyString; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - + /* P1 is start, pp is end */ p1 = KeyName->Buffer; pp = (PVOID)((ULONG_PTR)p1 + KeyName->Length); - + /* Create the target key */ InitializeObjectAttributes(&ObjectAttributes, KeyName, @@ -3320,31 +3320,31 @@ /* Target key failed, so we'll need to create its parent. Setup array */ HandleArray[0] = NULL; HandleArray[1] = RootHandle; - + /* Keep recursing for each missing parent */ while (Recursing) { /* And if we're deep enough, close the last handle */ if (NestedCloseLevel > 1) ZwClose(HandleArray[RootHandleIndex]); - + /* We're setup to ping-pong between the two handle array entries */ RootHandleIndex = i; i = (i + 1) & 1; - + /* Clear the one we're attempting to open now */ HandleArray[i] = NULL; - + /* Process the parent key name */ for (p = p1; ((p < pp) && (*p != OBJ_NAME_PATH_SEPARATOR)); p++); Length = (USHORT)(p - p1) * sizeof(WCHAR); - + /* Is there a parent name? */ if (Length) { /* Build the unicode string for it */ KeyString.Buffer = p1; KeyString.Length = KeyString.MaximumLength = Length; - + /* Now try opening the parent */ InitializeObjectAttributes(&ObjectAttributes, &KeyString, @@ -3377,7 +3377,7 @@ Recursing = FALSE; continue; } - + /* Now see if there's more parents to create */ p1 = p + 1; if ((p == pp) || (p1 == pp)) @@ -3386,11 +3386,11 @@ Recursing = FALSE; } } - + /* Outer loop check for handle nesting that requires closing the top handle */ if (NestedCloseLevel > 1) ZwClose(HandleArray[RootHandleIndex]); } - + /* Check if we broke out of the loop due to success */ if (NT_SUCCESS(Status)) { @@ -3398,7 +3398,7 @@ *Handle = HandleArray[i]; if (Disposition) *Disposition = KeyDisposition; } - + /* Return the success state */ return Status; } @@ -3543,14 +3543,14 @@ { PDEVICE_NODE DeviceNode; PAGED_CODE(); - + /* Allocate it */ DeviceNode = ExAllocatePoolWithTag(NonPagedPool, sizeof(DEVICE_NODE), 'donD'); if (!DeviceNode) return DeviceNode; - + /* Statistics */ InterlockedIncrement(&IopNumberDeviceNodes); - + /* Set it up */ RtlZeroMemory(DeviceNode, sizeof(DEVICE_NODE)); DeviceNode->InterfaceType = InterfaceTypeUndefined; @@ -3564,7 +3564,7 @@ InitializeListHead(&DeviceNode->TargetDeviceNotify); InitializeListHead(&DeviceNode->DockInfo.ListEntry); InitializeListHead(&DeviceNode->PendedSetInterfaceState); - + /* Check if there is a PDO */ if (PhysicalDeviceObject) { @@ -3573,7 +3573,7 @@ ((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension)->DeviceNode = DeviceNode; PhysicalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; } - + /* Return the node */ return DeviceNode; } @@ -3589,7 +3589,7 @@ /* Acquire the lock */ ExAcquireFastMutex(&PnpBusTypeGuidList->Lock); - + /* Validate size */ if (Index < PnpBusTypeGuidList->GuidCount) { @@ -3601,7 +3601,7 @@ /* Failure path */ Status = STATUS_OBJECT_NAME_NOT_FOUND; } - + /* Release lock and return status */ ExReleaseFastMutex(&PnpBusTypeGuidList->Lock); return Status; @@ -3618,14 +3618,14 @@ PDEVICE_NODE DeviceNode; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET\\ENUM"); PAGED_CODE(); - + /* Open the enum key */ Status = IopOpenRegistryKeyEx(&KeyHandle, NULL, &KeyName, KEY_READ); if (!NT_SUCCESS(Status)) return Status; - + /* Make sure we have an instance path */ DeviceNode = IopGetDeviceNode(DeviceObject); if ((DeviceNode) && (DeviceNode->InstancePath.Length)) @@ -3641,7 +3641,7 @@ /* Fail */ Status = STATUS_INVALID_DEVICE_REQUEST; } - + /* Close the handle and return status */ ZwClose(KeyHandle); return Status; @@ -3654,13 +3654,13 @@ ULONG FinalSize, PartialSize, EntrySize, i, j; PCM_FULL_RESOURCE_DESCRIPTOR FullDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; - + /* If we don't have one, that's easy */ if (!ResourceList) return 0; - + /* Start with the minimum size possible */ FinalSize = FIELD_OFFSET(CM_RESOURCE_LIST, List); - + /* Loop each full descriptor */ FullDescriptor = ResourceList->List; for (i = 0; i < ResourceList->Count; i++) @@ -3668,35 +3668,35 @@ /* Start with the minimum size possible */ PartialSize = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList) + FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors); - + /* Loop each partial descriptor */ PartialDescriptor = FullDescriptor->PartialResourceList.PartialDescriptors; for (j = 0; j < FullDescriptor->PartialResourceList.Count; j++) { /* Start with the minimum size possible */ EntrySize = sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - + /* Check if there is extra data */ if (PartialDescriptor->Type == CmResourceTypeDeviceSpecific) { /* Add that data */ EntrySize += PartialDescriptor->u.DeviceSpecificData.DataSize; } - + /* The size of partial descriptors is bigger */ PartialSize += EntrySize; - + /* Go to the next partial descriptor */ PartialDescriptor = (PVOID)((ULONG_PTR)PartialDescriptor + EntrySize); } - + /* The size of full descriptors is bigger */ FinalSize += PartialSize; - + /* Go to the next full descriptor */ FullDescriptor = (PVOID)((ULONG_PTR)FullDescriptor + PartialSize); } - + /* Return the final size */ return FinalSize; } @@ -3829,34 +3829,34 @@ /* This is the format of the returned data */ PIP_RETURN_DATA(sizeof(GUID), &BusTypeGuid); - + case DevicePropertyLegacyBusType: - + /* Validate correct interface type */ if (DeviceNode->ChildInterfaceType == InterfaceTypeUndefined) return STATUS_OBJECT_NAME_NOT_FOUND; /* This is the format of the returned data */ PIP_RETURN_DATA(sizeof(INTERFACE_TYPE), &DeviceNode->ChildInterfaceType); - + case DevicePropertyBusNumber: - + /* Validate correct bus number */ if ((DeviceNode->ChildBusNumber & 0x80000000) == 0x80000000) return STATUS_OBJECT_NAME_NOT_FOUND; - + /* This is the format of the returned data */ PIP_RETURN_DATA(sizeof(ULONG), &DeviceNode->ChildBusNumber); - + case DevicePropertyEnumeratorName: /* Get the instance path */ DeviceInstanceName = DeviceNode->InstancePath.Buffer; - + /* Sanity checks */ ASSERT((BufferLength & 1) == 0); ASSERT(DeviceInstanceName != NULL); - + /* Get the name from the path */ EnumeratorNameEnd = wcschr(DeviceInstanceName, OBJ_NAME_PATH_SEPARATOR); ASSERT(EnumeratorNameEnd); @@ -3867,7 +3867,7 @@ /* This is the format of the returned data */ PIP_RETURN_DATA((ULONG)(EnumeratorNameEnd - DeviceInstanceName) * sizeof(WCHAR), DeviceInstanceName); - + case DevicePropertyAddress: /* Query the device caps */ @@ -3877,9 +3877,9 @@ /* This is the format of the returned data */ PIP_RETURN_DATA(sizeof(ULONG), &DeviceCaps.Address); - + case DevicePropertyBootConfigurationTranslated: - + /* Validate we have resources */ if (!DeviceNode->BootResources) // if (!DeviceNode->BootResourcesTranslated) // FIXFIX: Need this field @@ -3888,21 +3888,21 @@ *ResultLength = 0; return STATUS_SUCCESS; } - + /* This is the format of the returned data */ PIP_RETURN_DATA(PnpDetermineResourceListSize(DeviceNode->BootResources), // FIXFIX: Should use BootResourcesTranslated DeviceNode->BootResources); // FIXFIX: Should use BootResourcesTranslated case DevicePropertyPhysicalDeviceObjectName: - + /* Sanity check for Unicode-sized string */ ASSERT((BufferLength & 1) == 0); - + /* Allocate name buffer */ Length = BufferLength + sizeof(OBJECT_NAME_INFORMATION); ObjectNameInfo = ExAllocatePool(PagedPool, Length); if (!ObjectNameInfo) return STATUS_INSUFFICIENT_RESOURCES; - + /* Query the PDO name */ Status = ObQueryNameString(DeviceObject, ObjectNameInfo, @@ -3924,7 +3924,7 @@ /* Let the caller know how big the name is */ *ResultLength -= sizeof(OBJECT_NAME_INFORMATION); break; - + /* Handle the registry-based properties */ case DevicePropertyUINumber: PIP_REGISTRY_DATA(REGSTR_VAL_UI_NUMBER, REG_DWORD); @@ -3962,13 +3962,13 @@ default: return STATUS_INVALID_PARAMETER_2; } - + /* Having a registry value name implies registry data */ if (ValueName) { /* We know up-front how much data to expect */ *ResultLength = BufferLength; - + /* Go get the data, use the LogConf subkey if necessary */ Status = PiGetDeviceRegistryProperty(DeviceObject, ValueType, @@ -3994,7 +3994,7 @@ /* Terminate the string */ ((PWCHAR)PropertyBuffer)[ReturnLength / sizeof(WCHAR)] = UNICODE_NULL; } - + /* This is the success path */ Status = STATUS_SUCCESS; } @@ -4004,7 +4004,7 @@ Status = STATUS_BUFFER_TOO_SMALL; } } - + /* Free any allocation we may have made, and return the status code */ if (ObjectNameInfo) ExFreePool(ObjectNameInfo); return Status; @@ -4022,11 +4022,11 @@ ULONG PnPFlags; NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; - + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); Stack.MajorFunction = IRP_MJ_PNP; Stack.MinorFunction = IRP_MN_QUERY_PNP_DEVICE_STATE; - + Status = IopSynchronousCall(PhysicalDeviceObject, &Stack, (PVOID*)&PnPFlags); if (!NT_SUCCESS(Status)) { @@ -4055,11 +4055,11 @@ /* Send surprise removal */ IopSendSurpriseRemoval(PhysicalDeviceObject); - + /* Tell the user-mode PnP manager that a device was removed */ IopQueueTargetDeviceEvent(&GUID_DEVICE_SURPRISE_REMOVAL, &DeviceNode->InstancePath); - + IopSendRemoveDevice(PhysicalDeviceObject); } else if ((PnPFlags & PNP_DEVICE_FAILED) && (PnPFlags & PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED)) @@ -4074,12 +4074,12 @@ PnPFlags &= ~PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED; } } - + /* Resource rebalance */ if (PnPFlags & PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED) { DPRINT("Sending IRP_MN_QUERY_RESOURCES to device stack\n"); - + Status = IopInitiatePnpIrp(PhysicalDeviceObject, &IoStatusBlock, IRP_MN_QUERY_RESOURCES, @@ -4095,9 +4095,9 @@ DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status); DeviceNode->BootResources = NULL; } - + DPRINT("Sending IRP_MN_QUERY_RESOURCE_REQUIREMENTS to device stack\n"); - + Status = IopInitiatePnpIrp(PhysicalDeviceObject, &IoStatusBlock, IRP_MN_QUERY_RESOURCE_REQUIREMENTS, @@ -4112,7 +4112,7 @@ DPRINT("IopInitiatePnpIrp() failed (Status %08lx)\n", Status); DeviceNode->ResourceRequirements = NULL; } - + /* IRP_MN_FILTER_RESOURCE_REQUIREMENTS is called indirectly by IopStartDevice */ if (IopStartDevice(DeviceNode) != STATUS_SUCCESS) { @@ -4288,28 +4288,28 @@ PDEVICE_NODE ChildDeviceNode, NextDeviceNode, FailedRemoveDevice; NTSTATUS Status; KIRQL OldIrql; - + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); ChildDeviceNode = ParentDeviceNode->Child; while (ChildDeviceNode != NULL) { NextDeviceNode = ChildDeviceNode->Sibling; KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); - + Status = IopPrepareDeviceForRemoval(ChildDeviceNode->PhysicalDeviceObject, Force); if (!NT_SUCCESS(Status)) { FailedRemoveDevice = ChildDeviceNode; goto cleanup; } - + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); ChildDeviceNode = NextDeviceNode; } KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); - + return STATUS_SUCCESS; - + cleanup: KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); ChildDeviceNode = ParentDeviceNode->Child; @@ -4317,20 +4317,20 @@ { NextDeviceNode = ChildDeviceNode->Sibling; KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); - + IopCancelPrepareDeviceForRemoval(ChildDeviceNode->PhysicalDeviceObject); - + /* IRP_MN_CANCEL_REMOVE_DEVICE is also sent to the device * that failed the IRP_MN_QUERY_REMOVE_DEVICE request */ if (ChildDeviceNode == FailedRemoveDevice) return Status; - + ChildDeviceNode = NextDeviceNode; - + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); } KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); - + return Status; } @@ -4340,18 +4340,18 @@ { PDEVICE_NODE ChildDeviceNode, NextDeviceNode; KIRQL OldIrql; - + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); ChildDeviceNode = ParentDeviceNode->Child; while (ChildDeviceNode != NULL) { NextDeviceNode = ChildDeviceNode->Sibling; KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); - + IopSendRemoveDevice(ChildDeviceNode->PhysicalDeviceObject); - + ChildDeviceNode = NextDeviceNode; - + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); } KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); @@ -4363,18 +4363,18 @@ { PDEVICE_NODE ChildDeviceNode, NextDeviceNode; KIRQL OldIrql; - + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); ChildDeviceNode = ParentDeviceNode->Child; while (ChildDeviceNode != NULL) { NextDeviceNode = ChildDeviceNode->Sibling; KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); - + IopCancelPrepareDeviceForRemoval(ChildDeviceNode->PhysicalDeviceObject); - + ChildDeviceNode = NextDeviceNode; - + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); } KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); @@ -4386,10 +4386,10 @@ { /* This function DOES NOT dereference the device objects on SUCCESS * but it DOES dereference device objects on FAILURE */ - + ULONG i, j; NTSTATUS Status; - + for (i = 0; i < DeviceRelations->Count; i++) { Status = IopPrepareDeviceForRemoval(DeviceRelations->Objects[i], Force); @@ -4399,9 +4399,9 @@ goto cleanup; } } - + return STATUS_SUCCESS; - + cleanup: /* IRP_MN_CANCEL_REMOVE_DEVICE is also sent to the device * that failed the IRP_MN_QUERY_REMOVE_DEVICE request */ @@ -4417,7 +4417,7 @@ DeviceRelations->Objects[i] = NULL; } ExFreePool(DeviceRelations); - + return Status; } @@ -4426,15 +4426,15 @@ IopSendRemoveDeviceRelations(PDEVICE_RELATIONS DeviceRelations) { /* This function DOES dereference the device objects in all cases */ - + ULONG i; - + for (i = 0; i < DeviceRelations->Count; i++) { IopSendRemoveDevice(DeviceRelations->Objects[i]); DeviceRelations->Objects[i] = NULL; } - + ExFreePool(DeviceRelations); } @@ -4443,16 +4443,16 @@ IopCancelRemoveDeviceRelations(PDEVICE_RELATIONS DeviceRelations) { /* This function DOES dereference the device objects in all cases */ - + ULONG i; - + for (i = 0; i < DeviceRelations->Count; i++) { IopCancelPrepareDeviceForRemoval(DeviceRelations->Objects[i]); ObDereferenceObject(DeviceRelations->Objects[i]); DeviceRelations->Objects[i] = NULL; } - + ExFreePool(DeviceRelations); } @@ -4463,11 +4463,11 @@ IO_STATUS_BLOCK IoStatusBlock; PDEVICE_RELATIONS DeviceRelations; NTSTATUS Status; - + IopCancelRemoveDevice(DeviceObject); - + Stack.Parameters.QueryDeviceRelations.Type = RemovalRelations; - + Status = IopInitiatePnpIrp(DeviceObject, &IoStatusBlock, IRP_MN_QUERY_DEVICE_RELATIONS, @@ -4481,7 +4481,7 @@ { DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information; } - + if (DeviceRelations) IopCancelRemoveDeviceRelations(DeviceRelations); } @@ -4500,16 +4500,16 @@ DPRINT1("Removal not allowed for %wZ\n", &DeviceNode->InstancePath); return STATUS_UNSUCCESSFUL; } - + if (!Force && IopQueryRemoveDevice(DeviceObject) != STATUS_SUCCESS) { DPRINT1("Removal vetoed by failing the query remove request\n"); - + IopCancelRemoveDevice(DeviceObject); - + return STATUS_UNSUCCESSFUL; } - + Stack.Parameters.QueryDeviceRelations.Type = RemovalRelations; Status = IopInitiatePnpIrp(DeviceObject, @@ -4544,7 +4544,7 @@ if (DeviceRelations) IopSendRemoveDeviceRelations(DeviceRelations); IopSendRemoveChildDevices(DeviceNode); - + return STATUS_SUCCESS; } @@ -4580,17 +4580,17 @@ IO_STACK_LOCATION Stack; DEVICE_CAPABILITIES Capabilities; NTSTATUS Status; - + IopQueueTargetDeviceEvent(&GUID_DEVICE_KERNEL_INITIATED_EJECT, &DeviceNode->InstancePath); - + if (IopQueryDeviceCapabilities(DeviceNode, &Capabilities) != STATUS_SUCCESS) { goto cleanup; } - + Stack.Parameters.QueryDeviceRelations.Type = EjectionRelations; - + Status = IopInitiatePnpIrp(PhysicalDeviceObject, &IoStatusBlock, IRP_MN_QUERY_DEVICE_RELATIONS, @@ -4604,14 +4604,14 @@ { DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information; } - + if (DeviceRelations) { Status = IopQueryRemoveDeviceRelations(DeviceRelations, FALSE); if (!NT_SUCCESS(Status)) goto cleanup; } - + Status = IopQueryRemoveChildDevices(DeviceNode, FALSE); if (!NT_SUCCESS(Status)) { @@ -4619,7 +4619,7 @@ IopCancelRemoveDeviceRelations(DeviceRelations); goto cleanup; } - + if (IopPrepareDeviceForRemoval(PhysicalDeviceObject, FALSE) != STATUS_SUCCESS) { if (DeviceRelations) @@ -4627,7 +4627,7 @@ IopCancelRemoveChildDevices(DeviceNode); goto cleanup; } - + if (DeviceRelations) IopSendRemoveDeviceRelations(DeviceRelations); IopSendRemoveChildDevices(DeviceNode); @@ -4644,12 +4644,12 @@ { DeviceNode->Flags |= DNF_DISABLED; } - + IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT, &DeviceNode->InstancePath); - + return; - + cleanup: IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, &DeviceNode->InstancePath); @@ -4699,7 +4699,7 @@ IN DEVICE_RELATION_TYPE Type) { PAGED_CODE(); - + switch (Type) { case BusRelations: Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Wed Oct 22 19:34:46 2014 @@ -231,7 +231,7 @@ /* We're enumerated already */ IopDeviceNodeSetFlag(DeviceNode, DNF_ENUMERATED); - + /* We don't call AddDevice for devices reported this way */ IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Wed Oct 22 19:34:46 2014 @@ -115,7 +115,7 @@ ASSERT(IoDesc->Type == CmDesc->Type); ASSERT(IoDesc->Type == CmResourceTypePort); - + /* HACK */ if (IoDesc->u.Port.Alignment == 0) IoDesc->u.Port.Alignment = 1; @@ -251,7 +251,7 @@ PCM_PARTIAL_RESOURCE_LIST PartialList = (*ResourceList) ? &(*ResourceList)->List[0].PartialResourceList : NULL; PIO_RESOURCE_DESCRIPTOR IoDesc = &ResList->Descriptors[ii]; BOOLEAN Matched = FALSE; - + /* Skip alternates if we don't need one */ if (!AlternateRequired && (IoDesc->Option & IO_RESOURCE_ALTERNATIVE)) { @@ -386,7 +386,7 @@ FoundResource = FALSE; } break; - + case CmResourceTypePort: /* Find an available port range */ if (!IopFindPortResource(IoDesc, &NewDesc)) @@ -398,7 +398,7 @@ FoundResource = FALSE; } break; - + case CmResourceTypeMemory: /* Find an available memory range */ if (!IopFindMemoryResource(IoDesc, &NewDesc)) @@ -410,7 +410,7 @@ FoundResource = FALSE; } break; - + case CmResourceTypeBusNumber: /* Find an available bus address range */ if (!IopFindBusNumberResource(IoDesc, &NewDesc)) @@ -422,7 +422,7 @@ FoundResource = FALSE; } break; - + case CmResourceTypeDma: /* Find an available DMA channel */ if (!IopFindDmaResource(IoDesc, &NewDesc)) @@ -433,7 +433,7 @@ FoundResource = FALSE; } break; - + default: DPRINT1("Unsupported resource type: %x\n", IoDesc->Type); FoundResource = FALSE; @@ -825,7 +825,7 @@ ULONG OldLength = 0; ASSERT(DeviceNode->ResourceListTranslated); - + RtlInitUnicodeString(&TranslatedSuffix, L".Translated"); RtlInitUnicodeString(&RawSuffix, L".Raw"); @@ -837,17 +837,17 @@ if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) { ASSERT(OldLength); - + NameU.Buffer = ExAllocatePool(PagedPool, OldLength + TranslatedSuffix.Length); if (!NameU.Buffer) { ZwClose(PnpMgrLevel2); return STATUS_INSUFFICIENT_RESOURCES; } - + NameU.Length = 0; NameU.MaximumLength = (USHORT)OldLength + TranslatedSuffix.Length; - + Status = IoGetDeviceProperty(DeviceNode->PhysicalDeviceObject, DevicePropertyPhysicalDeviceObjectName, NameU.MaximumLength, @@ -871,7 +871,7 @@ /* This should never happen */ ASSERT(FALSE); } - + NameU.Length = (USHORT)OldLength; RtlAppendUnicodeStringToString(&NameU, &RawSuffix); @@ -972,12 +972,12 @@ DPRINT1("Failed to translate port resource (Start: 0x%I64x)\n", DescriptorRaw->u.Port.Start.QuadPart); goto cleanup; } - + if (AddressSpace == 0) { DPRINT1("Guessed incorrect address space: 1 -> 0\n"); - /* FIXME: I think all other CM_RESOURCE_PORT_XXX flags are + /* FIXME: I think all other CM_RESOURCE_PORT_XXX flags are * invalid for this state but I'm not 100% sure */ DescriptorRaw->Flags = DescriptorTranslated->Flags = CM_RESOURCE_PORT_MEMORY; @@ -993,7 +993,7 @@ DescriptorRaw->u.Interrupt.Vector, (PKIRQL)&DescriptorTranslated->u.Interrupt.Level, &DescriptorTranslated->u.Interrupt.Affinity); - + if (!DescriptorTranslated->u.Interrupt.Vector) { Status = STATUS_UNSUCCESSFUL; Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnputil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnputil… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnputil.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnputil.c [iso-8859-1] Wed Oct 22 19:34:46 2014 @@ -22,7 +22,7 @@ IN ULONG StringCount) { ULONG i; - + /* Go through the list */ if (UnicodeStringList) { @@ -36,7 +36,7 @@ ExFreePool(UnicodeStringList[i].Buffer); } } - + /* Free the whole list */ ExFreePool(UnicodeStringList); } @@ -52,15 +52,15 @@ ULONG i = 0; SIZE_T n; ULONG Count = 0; - + /* Validate the key information */ if (KeyValueInformation->Type != REG_MULTI_SZ) return STATUS_INVALID_PARAMETER; - + /* Set the pointers */ p = (PWCHAR)((ULONG_PTR)KeyValueInformation + KeyValueInformation->DataOffset); pp = (PWCHAR)((ULONG_PTR)p + KeyValueInformation->DataLength); - + /* Loop the data */ while (p != pp) { @@ -69,28 +69,28 @@ { /* Add to our string count */ Count++; - + /* Check for a double-NULL, which means we're done */ if (((p + 1) == pp) || !(*(p + 1))) break; } - + /* Go to the next character */ p++; } /* If we looped the whole list over, we missed increment a string, do it */ if (p == pp) Count++; - + /* Allocate the list now that we know how big it is */ *UnicodeStringList = ExAllocatePoolWithTag(PagedPool, sizeof(UNICODE_STRING) * Count, 'sUpP'); if (!(*UnicodeStringList)) return STATUS_INSUFFICIENT_RESOURCES; - + /* Set pointers for second loop */ ps = p = (PWCHAR)((ULONG_PTR)KeyValueInformation + KeyValueInformation->DataOffset); - + /* Loop again, to do the copy this time */ while (p != pp) { @@ -99,7 +99,7 @@ { /* Check how long this string is */ n = (ULONG_PTR)p - (ULONG_PTR)ps + sizeof(UNICODE_NULL); - + /* Allocate the buffer */ (*UnicodeStringList)[i].Buffer = ExAllocatePoolWithTag(PagedPool, n, @@ -110,34 +110,34 @@ PnpFreeUnicodeStringList(*UnicodeStringList, i); return STATUS_INSUFFICIENT_RESOURCES; } - + /* Copy the string into the buffer */ RtlCopyMemory((*UnicodeStringList)[i].Buffer, ps, n); - + /* Set the lengths */ (*UnicodeStringList)[i].MaximumLength = (USHORT)n; (*UnicodeStringList)[i].Length = (USHORT)(n - sizeof(UNICODE_NULL)); - + /* One more entry done */ i++; - + /* Check for a double-NULL, which means we're done */ if (((p + 1) == pp) || !(*(p + 1))) break; /* New string */ ps = p + 1; } - + /* New string */ p++; } - + /* Check if we've reached the last string */ if (p == pp) { /* Calculate the string length */ n = (ULONG_PTR)p - (ULONG_PTR)ps; - + /* Allocate the buffer for it */ (*UnicodeStringList)[i].Buffer = ExAllocatePoolWithTag(PagedPool, n + @@ -149,18 +149,18 @@ PnpFreeUnicodeStringList(*UnicodeStringList, i); return STATUS_INSUFFICIENT_RESOURCES; } - + /* Make sure there's an actual string here */ if (n) RtlCopyMemory((*UnicodeStringList)[i].Buffer, ps, n); /* Null-terminate the string ourselves */ (*UnicodeStringList)[i].Buffer[n / sizeof(WCHAR)] = UNICODE_NULL; - + /* Set the lengths */ (*UnicodeStringList)[i].Length = (USHORT)n; (*UnicodeStringList)[i].MaximumLength = (USHORT)(n + sizeof(UNICODE_NULL)); } - + /* And we're done */ *UnicodeStringCount = Count; return STATUS_SUCCESS; @@ -173,11 +173,11 @@ OUT PUSHORT StringLength OPTIONAL) { PWCHAR p, pp; - + /* Find the end */ pp = RegSzData + RegSzLength; for (p = RegSzData; p < pp; p++) if (!*p) break; - + /* Return it */ if (StringLength) *StringLength = (USHORT)(p - RegSzData) * sizeof(WCHAR); return TRUE;

9 years, 11 months

[tkreuzer] 64905: [XDK/DDK] Improve debugprint in __assert_annotationA/W

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Oct 22 19:30:27 2014 New Revision: 64905 URL: http://svn.reactos.org/svn/reactos?rev=64905&view=rev Log: [XDK/DDK] Improve debugprint in __assert_annotationA/W Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/rtlfuncs.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6490… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Wed Oct 22 19:30:27 2014 @@ -11061,9 +11061,9 @@ # define __assert_annotationW(msg) __annotation(L"Debug", L"AssertFail", msg) #else # define __assert_annotationA(msg) \ - DbgPrint("Assertion %s(%d): %s", __FILE__, __LINE__, msg) + DbgPrint("Assertion failed at %s(%d): %s\n", __FILE__, __LINE__, msg) # define __assert_annotationW(msg) \ - DbgPrint("Assertion %s(%d): %S", __FILE__, __LINE__, msg) + DbgPrint("Assertion failed at %s(%d): %S\n", __FILE__, __LINE__, msg) #endif #define NT_VERIFY(exp) \ Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] Wed Oct 22 19:30:27 2014 @@ -3113,9 +3113,9 @@ # define __assert_annotationW(msg) __annotation(L"Debug", L"AssertFail", msg) #else # define __assert_annotationA(msg) \ - DbgPrint("Assertion %s(%d): %s", __FILE__, __LINE__, msg) + DbgPrint("Assertion failed at %s(%d): %s\n", __FILE__, __LINE__, msg) # define __assert_annotationW(msg) \ - DbgPrint("Assertion %s(%d): %S", __FILE__, __LINE__, msg) + DbgPrint("Assertion failed at %s(%d): %S\n", __FILE__, __LINE__, msg) #endif #define NT_VERIFY(exp) \

9 years, 11 months

[khornicek] 64904: [SERVMAN] - better fix for CDI 513719, LVText might not be null terminated - spotted by Timo

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Oct 22 19:28:33 2014 New Revision: 64904 URL: http://svn.reactos.org/svn/reactos?rev=64904&view=rev Log: [SERVMAN] - better fix for CDI 513719, LVText might not be null terminated - spotted by Timo Modified: trunk/reactos/base/applications/mscutils/servman/export.c Modified: trunk/reactos/base/applications/mscutils/servman/export.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/export.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/export.c [iso-8859-1] Wed Oct 22 19:28:33 2014 @@ -68,7 +68,7 @@ LVText, i, k); - if (_tcslen(LVText)) + if (dwTextLength != 0) { WriteFile(hFile, LVText,

9 years, 11 months

[tkreuzer] 64903: [NTOSKRNL] - Fix potential use-after-free CID 732509 - Fix buffer size in call to ObQueryNameString

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Oct 22 19:20:03 2014 New Revision: 64903 URL: http://svn.reactos.org/svn/reactos?rev=64903&view=rev Log: [NTOSKRNL] - Fix potential use-after-free CID 732509 - Fix buffer size in call to ObQueryNameString Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] Wed Oct 22 19:20:03 2014 @@ -310,11 +310,9 @@ /* We do, query its name */ Status = ObQueryNameString(LogEntry->DeviceObject, ObjectNameInfo, - sizeof(OBJECT_NAME_INFORMATION) + - 100 - - DriverNameLength, + sizeof(Buffer), &ReturnedLength); - if ((!NT_SUCCESS(Status)) || !(ObjectNameInfo->Name.Length)) + if (!NT_SUCCESS(Status) || (ObjectNameInfo->Name.Length == 0)) { /* Setup an empty name */ ObjectNameInfo->Name.Length = 0; @@ -371,6 +369,7 @@ { ExFreePool(PoolObjectNameInfo); PoolObjectNameInfo = NULL; + ObjectNameInfo = (POBJECT_NAME_INFORMATION)&Buffer; } /* Go to the next string buffer position */

9 years, 11 months

← Newer
1
...
23
24
25
26
27
28
29
...
73
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014