Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 52749: [KERNEL32] Hey Arch, stop deleting our code!
by tkreuzer＠svn.reactos.org 20 Jul '11

20 Jul '11

Author: tkreuzer Date: Wed Jul 20 20:18:17 2011 New Revision: 52749 URL: http://svn.reactos.org/svn/reactos?rev=52749&view=rev Log: [KERNEL32] Hey Arch, stop deleting our code! Added: trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c (with props) Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/kernel32.rbuild Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Wed Jul 20 20:18:17 2011 @@ -50,6 +50,7 @@ client/misc/actctx.c client/misc/atom.c client/misc/comm.c + client/misc/commdcb.c client/misc/computername.c client/misc/dllmain.c client/misc/env.c Added: trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c (added) +++ trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c [iso-8859-1] Wed Jul 20 20:18:17 2011 @@ -1,0 +1,673 @@ +/* + Copyright (c) 2008 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +/* Parses a mode string for a serial port, in the same syntax as the mode.com command */ + +#if defined(__REACTOS__) && defined(_KERNEL32_) +#include <k32.h> + +#define DCB_BuildCommDCBA BuildCommDCBA +#define DCB_BuildCommDCBAndTimeoutsA BuildCommDCBAndTimeoutsA +#define DCB_BuildCommDCBW BuildCommDCBW +#define DCB_BuildCommDCBAndTimeoutsW BuildCommDCBAndTimeoutsW +#else +#include <stdio.h> +#include <stdlib.h> +#include <ctype.h> + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#endif + +static +void DCB_SkipSpace(const char ** ppTail) +{ + while(**ppTail && isspace(**ppTail)) + ++ *ppTail; +} + +static +size_t DCB_SkipNonSpace(const char ** ppTail) +{ + const char * pOriginal = *ppTail; + + while(**ppTail && !isspace(**ppTail)) + ++ *ppTail; + + return *ppTail - pOriginal; +} + +static +BOOL DCB_SetBaudRate(unsigned long baudRate, LPDCB lpDCB) +{ + switch(baudRate) + { + case 11: lpDCB->BaudRate = 110; break; + case 15: lpDCB->BaudRate = 150; break; + case 30: lpDCB->BaudRate = 300; break; + case 60: lpDCB->BaudRate = 600; break; + case 12: lpDCB->BaudRate = 1200; break; + case 24: lpDCB->BaudRate = 2400; break; + case 48: lpDCB->BaudRate = 4800; break; + case 96: lpDCB->BaudRate = 9600; break; + case 19: lpDCB->BaudRate = 19200; break; + default: lpDCB->BaudRate = baudRate; break; + } + + return TRUE; +} + +static +BYTE DCB_SetParity(char parity, LPDCB lpDCB) +{ + switch(parity) + { + case 'N': + case 'n': + lpDCB->Parity = 0; + break; + + case 'O': + case 'o': + lpDCB->Parity = 1; + break; + + case 'E': + case 'e': + lpDCB->Parity = 2; + break; + + case 'M': + case 'm': + lpDCB->Parity = 3; + break; + + case 'S': + case 's': + lpDCB->Parity = 4; + break; + + default: + return FALSE; + } + + return TRUE; +} + +static +BYTE DCB_SetDataBits(unsigned long dataBits, LPDCB lpDCB) +{ + BOOL bRet; + + bRet = dataBits >= 5 && dataBits <= 8; + + if(!bRet) + return bRet; + + lpDCB->ByteSize = (BYTE)dataBits; + return bRet; +} + +static +BOOL DCB_ParseOldSeparator(const char ** ppTail) +{ + BOOL bRet; + + bRet = **ppTail == 0; + + if(bRet) + return bRet; + + bRet = **ppTail == ','; + + if(bRet) + { + ++ *ppTail; + return bRet; + } + + return bRet; +} + +static +unsigned long DCB_ParseOldNumber(const char ** ppTail, unsigned long nDefault) +{ + char * pNumTail; + unsigned long number; + + DCB_SkipSpace(ppTail); + + if(!isdigit(**ppTail)) + return nDefault; + + number = strtoul(*ppTail, &pNumTail, 10); + *ppTail = pNumTail; + + DCB_SkipSpace(ppTail); + return number; +} + +static +char DCB_ParseOldCharacter(const char ** ppTail, char cDefault) +{ + char character; + + DCB_SkipSpace(ppTail); + + if(**ppTail == 0 || **ppTail == ',') + return cDefault; + + character = **ppTail; + ++ *ppTail; + + DCB_SkipSpace(ppTail); + return character; +} + +static +const char * DCB_ParseOldString(const char ** ppTail, const char * pDefault, size_t * pLength) +{ + const char * string; + + DCB_SkipSpace(ppTail); + + if(**ppTail == 0 || **ppTail == ',') + return pDefault; + + string = *ppTail; + + *pLength = 0; + + while(**ppTail != 0 && **ppTail != ',' && !isspace(**ppTail)) + { + ++ *ppTail; + ++ *pLength; + } + + DCB_SkipSpace(ppTail); + return string; +} + +static +BOOL +DCB_ParseOldMode(const char * pTail, LPDCB lpDCB, LPCOMMTIMEOUTS lpCommTimeouts) +{ + BOOL bRet; + + unsigned long baudRate; + char parity; + unsigned long dataBits; + size_t stopBitsLength; + const char * stopBits; + char retry; + + /* Baud rate */ + baudRate = DCB_ParseOldNumber(&pTail, 0); + bRet = DCB_ParseOldSeparator(&pTail); + bRet = bRet && DCB_SetBaudRate(baudRate, lpDCB); + + if(!bRet) + return bRet; + + /* Parity */ + parity = DCB_ParseOldCharacter(&pTail, 'E'); + bRet = DCB_ParseOldSeparator(&pTail); + bRet = bRet && DCB_SetParity(parity, lpDCB); + + if(!bRet) + return bRet; + + /* Data bits */ + dataBits = DCB_ParseOldNumber(&pTail, 7); + bRet = DCB_ParseOldSeparator(&pTail); + bRet = bRet && DCB_SetDataBits(dataBits, lpDCB); + + if(!bRet) + return bRet; + + /* Stop bits */ + stopBitsLength = 1; + stopBits = DCB_ParseOldString(&pTail, baudRate == 110 ? "2" : "1", &stopBitsLength); + bRet = DCB_ParseOldSeparator(&pTail); + + if(!bRet) + return bRet; + + if(strncmp(stopBits, "1", stopBitsLength) == 0) + lpDCB->StopBits = 0; + else if(strncmp(stopBits, "1.5", stopBitsLength) == 0) + lpDCB->StopBits = 1; + else if(strncmp(stopBits, "2", stopBitsLength) == 0) + lpDCB->StopBits = 2; + else + return FALSE; + + /* Retry */ + retry = DCB_ParseOldCharacter(&pTail, 0); + bRet = *pTail == 0; + + if(!bRet) + return bRet; + + switch(retry) + { + case 0: + lpDCB->fInX = FALSE; + lpDCB->fOutX = FALSE; + lpDCB->fOutxCtsFlow = FALSE; + lpDCB->fOutxDsrFlow = FALSE; + lpDCB->fDtrControl = DTR_CONTROL_ENABLE; + lpDCB->fRtsControl = RTS_CONTROL_ENABLE; + break; + + case 'p': + case 'P': + lpDCB->fInX = FALSE; + lpDCB->fOutX = FALSE; + lpDCB->fOutxCtsFlow = TRUE; + lpDCB->fOutxDsrFlow = TRUE; + lpDCB->fDtrControl = DTR_CONTROL_HANDSHAKE; + lpDCB->fRtsControl = RTS_CONTROL_HANDSHAKE; + break; + + case 'x': + case 'X': + lpDCB->fInX = TRUE; + lpDCB->fOutX = TRUE; + lpDCB->fOutxCtsFlow = FALSE; + lpDCB->fOutxDsrFlow = FALSE; + lpDCB->fDtrControl = DTR_CONTROL_ENABLE; + lpDCB->fRtsControl = RTS_CONTROL_ENABLE; + break; + + default: + return FALSE; + } + + return bRet; +} + +static +BOOL DCB_ParseNewNumber(const char * pString, size_t cchString, unsigned long * pNumber) +{ + BOOL bRet; + char * pStringEnd; + unsigned long number; + + bRet = cchString > 0; + + if(!bRet) + return bRet; + + number = strtoul(pString, &pStringEnd, 10); + + bRet = pStringEnd - pString == cchString; + + if(!bRet) + return bRet; + + *pNumber = number; + return bRet; +} + +static +BOOL DCB_ParseNewBoolean(const char * pString, size_t cchString, BOOL * pBoolean) +{ + BOOL bRet; + + bRet = _strnicmp(pString, "on", cchString) == 0; + + if(bRet) + { + *pBoolean = bRet; + return bRet; + } + + bRet = _strnicmp(pString, "off", cchString) == 0; + + if(bRet) + { + *pBoolean = !bRet; + return bRet; + } + + return bRet; +} + +static +BOOL +DCB_ParseNewMode(const char * pTail, LPDCB lpDCB, LPCOMMTIMEOUTS lpCommTimeouts) +{ + BOOL bRet; + BOOL stopBitsSet = FALSE; + + lpDCB->StopBits = 0; + + while(*pTail) + { + const char * pArg; + size_t cchArg; + size_t cchArgName; + size_t cchArgValue; + const char * pArgName; + const char * pArgValue; + unsigned long nArgValue; + BOOL fArgValue; + + pArg = pTail; + cchArg = DCB_SkipNonSpace(&pTail); + DCB_SkipSpace(&pTail); + + for(cchArgName = 0; cchArgName < cchArg; ++ cchArgName) + { + if(pArg[cchArgName] == '=') + break; + } + + bRet = cchArgName < cchArg; + + if(!bRet) + return bRet; + + cchArgValue = cchArg - cchArgName - 1; + pArgName = pArg; + pArgValue = pArg + cchArgName + 1; + + if(_strnicmp(pArgName, "baud", cchArgName) == 0) + { + bRet = DCB_ParseNewNumber(pArgValue, cchArgValue, &nArgValue); + bRet = bRet && DCB_SetBaudRate(nArgValue, lpDCB); + + if(bRet) + { + if(lpDCB->BaudRate == 110 && !stopBitsSet) + lpDCB->StopBits = 2; + else + lpDCB->StopBits = 0; + } + } + else if(_strnicmp(pArgName, "parity", cchArgName) == 0) + { + bRet = cchArgValue == 1; + bRet = bRet && DCB_SetParity(pArgValue[0], lpDCB); + } + else if(_strnicmp(pArgName, "data", cchArgName) == 0) + { + bRet = DCB_ParseNewNumber(pArgValue, cchArgValue, &nArgValue); + bRet = bRet && DCB_SetDataBits(nArgValue, lpDCB); + } + else if(_strnicmp(pArgName, "stop", cchArgName) == 0) + { + stopBitsSet = TRUE; + + if(strncmp(pArgValue, "1", cchArgValue) == 0) + lpDCB->StopBits = 0; + else if(strncmp(pArgValue, "1.5", cchArgValue) == 0) + lpDCB->StopBits = 1; + else if(strncmp(pArgValue, "2", cchArgValue) == 0) + lpDCB->StopBits = 2; + else + bRet = FALSE; + } + else if(_strnicmp(pArgName, "to", cchArgName) == 0) + { + bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); + + if(bRet) + { + if(lpCommTimeouts) + { + memset(lpCommTimeouts, 0, sizeof(*lpCommTimeouts)); + + if(fArgValue) + lpCommTimeouts->WriteTotalTimeoutConstant = 60000; + } + } + } + else if(_strnicmp(pArgName, "xon", cchArgName) == 0) + { + bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); + + if(bRet) + { + lpDCB->fInX = !!fArgValue; + lpDCB->fOutX = !!fArgValue; + } + } + else if(_strnicmp(pArgName, "odsr", cchArgName) == 0) + { + bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); + + if(bRet) + lpDCB->fOutxDsrFlow = !!fArgValue; + } + else if(_strnicmp(pArgName, "octs", cchArgName) == 0) + { + bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); + + if(bRet) + lpDCB->fOutxCtsFlow = !!fArgValue; + } + else if(_strnicmp(pArgName, "dtr", cchArgName) == 0) + { + bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); + + if(bRet) + { + if(fArgValue) + lpDCB->fDtrControl = DTR_CONTROL_ENABLE; + else + lpDCB->fDtrControl = DTR_CONTROL_DISABLE; + } + else + { + bRet = _strnicmp(pArgValue, "hs", cchArgValue) == 0; + + if(bRet) + lpDCB->fDtrControl = DTR_CONTROL_HANDSHAKE; + } + } + else if(_strnicmp(pArgName, "rts", cchArgName) == 0) + { + bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); + + if(bRet) + { + if(fArgValue) + lpDCB->fRtsControl = RTS_CONTROL_ENABLE; + else + lpDCB->fRtsControl = RTS_CONTROL_DISABLE; + } + else + { + bRet = _strnicmp(pArgValue, "hs", cchArgValue) == 0; + + if(bRet) + lpDCB->fRtsControl = RTS_CONTROL_HANDSHAKE; + else + { + bRet = _strnicmp(pArgValue, "tg", cchArgValue) == 0; + + if(bRet) + lpDCB->fRtsControl = RTS_CONTROL_TOGGLE; + } + } + } + else if(_strnicmp(pArgName, "idsr", cchArgName) == 0) + { + bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); + + if(bRet) + lpDCB->fDsrSensitivity = !!fArgValue; + } + else + bRet = FALSE; + + if(!bRet) + return bRet; + } + + return TRUE; +} + +static +BOOL +DCB_ValidPort(unsigned long nPort) +{ + BOOL bRet; + DWORD dwErr; + WCHAR szPort[3 + 10 + 1]; + + dwErr = GetLastError(); + + _snwprintf(szPort, sizeof(szPort) / sizeof(szPort[0]), L"COM%lu", nPort); + + bRet = QueryDosDeviceW(szPort, NULL, 0) == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER; + + if(!bRet) + dwErr = ERROR_INVALID_PARAMETER; + + SetLastError(dwErr); + return bRet; +} + +/* + * @implemented + */ +BOOL +WINAPI +DCB_BuildCommDCBAndTimeoutsA(LPCSTR lpDef, LPDCB lpDCB, LPCOMMTIMEOUTS lpCommTimeouts) +{ + BOOL bRet; + LPCSTR pTail = lpDef; + DCB DCBCopy; + + if(_strnicmp(pTail, "COM", 3) == 0) + { + char * pNumTail; + unsigned long nPort; + + pTail += 3; + + if(!isdigit(*pTail)) + return FALSE; + + nPort = strtoul(pTail, &pNumTail, 10); + pTail = pNumTail; + + bRet = DCB_ValidPort(nPort); + + if(!bRet) + return bRet; + + DCB_SkipSpace(&pTail); + + if(*pTail == ':') + ++ pTail; + + DCB_SkipSpace(&pTail); + } + + DCBCopy = *lpDCB; + + if(isdigit(*pTail)) + bRet = DCB_ParseOldMode(pTail, &DCBCopy, lpCommTimeouts); + else + bRet = DCB_ParseNewMode(pTail, &DCBCopy, lpCommTimeouts); + + if(!bRet) + SetLastError(ERROR_INVALID_PARAMETER); + else + *lpDCB = DCBCopy; + + return bRet; +} + +/* + * @implemented + */ +BOOL +WINAPI +DCB_BuildCommDCBA(LPCSTR lpDef, LPDCB lpDCB) +{ + return DCB_BuildCommDCBAndTimeoutsA(lpDef, lpDCB, NULL); +} + +/* + * @implemented + */ +BOOL +WINAPI +DCB_BuildCommDCBAndTimeoutsW(LPCWSTR lpDef, LPDCB lpDCB, LPCOMMTIMEOUTS lpCommTimeouts) +{ + BOOL bRet; + HANDLE hHeap; + BOOL bInvalidChars; + LPSTR pszAscii; + int cchAscii; + DWORD dwErr; + + dwErr = ERROR_INVALID_PARAMETER; + cchAscii = WideCharToMultiByte(CP_ACP, 0, lpDef, -1, NULL, 0, NULL, NULL); + + bRet = cchAscii > 0; + + if(bRet) + { + hHeap = GetProcessHeap(); + pszAscii = HeapAlloc(hHeap, 0, cchAscii); + + bRet = pszAscii != NULL; + + if(bRet) + { + bInvalidChars = FALSE; + cchAscii = WideCharToMultiByte(CP_ACP, 0, lpDef, -1, pszAscii, cchAscii, NULL, &bInvalidChars); + + bRet = cchAscii > 0 && !bInvalidChars; + + if(bRet) + bRet = DCB_BuildCommDCBAndTimeoutsA(pszAscii, lpDCB, lpCommTimeouts); + + HeapFree(hHeap, 0, pszAscii); + } + else + dwErr = ERROR_OUTOFMEMORY; + } + + if(!bRet) + SetLastError(dwErr); + + return bRet; +} + +/* + * @implemented + */ +BOOL +WINAPI +DCB_BuildCommDCBW(LPCWSTR lpDef, LPDCB lpDCB) +{ + return DCB_BuildCommDCBAndTimeoutsW(lpDef, lpDCB, NULL); +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Wed Jul 20 20:18:17 2011 @@ -72,6 +72,7 @@ <file>actctx.c</file> <file>atom.c</file> <file>comm.c</file> + <file>commdcb.c</file> <file>computername.c</file> <file>dllmain.c</file> <file>env.c</file>

1 0

[cgutman] 52748: [USETUP] - Fix length calculation for FAT16 volumes
by cgutman＠svn.reactos.org 20 Jul '11

20 Jul '11

Author: cgutman Date: Wed Jul 20 19:56:58 2011 New Revision: 52748 URL: http://svn.reactos.org/svn/reactos?rev=52748&view=rev Log: [USETUP] - Fix length calculation for FAT16 volumes Modified: trunk/reactos/base/setup/usetup/bootsup.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Wed Jul 20 19:56:58 2011 @@ -850,8 +850,8 @@ /* Adjust bootsector (copy a part of the FAT BPB) */ memcpy(&NewBootSector->OemName, &OrigBootSector->OemName, - FIELD_OFFSET(FAT32_BOOTSECTOR, BootCodeAndData) - - FIELD_OFFSET(FAT32_BOOTSECTOR, OemName)); + FIELD_OFFSET(FAT_BOOTSECTOR, BootCodeAndData) - + FIELD_OFFSET(FAT_BOOTSECTOR, OemName)); /* Free the original boot sector */ RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -1369,8 +1369,8 @@ /* Adjust bootsector (copy a part of the FAT16 BPB) */ memcpy(&NewBootSector->OemName, &OrigBootSector->OemName, - FIELD_OFFSET(FAT32_BOOTSECTOR, BootCodeAndData) - - FIELD_OFFSET(FAT32_BOOTSECTOR, OemName)); + FIELD_OFFSET(FAT_BOOTSECTOR, BootCodeAndData) - + FIELD_OFFSET(FAT_BOOTSECTOR, OemName)); PartInfo = &PartitionList->CurrentPartition->PartInfo[PartitionList->CurrentPartitionNumber]; NewBootSector->HiddenSectors = PartInfo->HiddenSectors;

1 0

[tkreuzer] 52747: [CMAKE] Really fix build
by tkreuzer＠svn.reactos.org 20 Jul '11

20 Jul '11

Author: tkreuzer Date: Wed Jul 20 19:04:59 2011 New Revision: 52747 URL: http://svn.reactos.org/svn/reactos?rev=52747&view=rev Log: [CMAKE] Really fix build Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Wed Jul 20 19:04:59 2011 @@ -13,11 +13,20 @@ list(APPEND SOURCE client/debugger.c client/except.c + client/fiber.c + client/heapmem.c + client/job.c + client/proc.c + client/session.c + client/synch.c + client/thread.c + client/virtmem.c + client/vista.c client/file/backup.c client/file/bintype.c client/file/cnotify.c client/file/copy.c - client/file/console.c + client/file/console.c client/file/create.c client/file/curdir.c client/file/delete.c @@ -25,7 +34,7 @@ client/file/dir.c client/file/dosdev.c client/file/file.c - client/file/filemap.c + client/file/filemap.c client/file/find.c client/file/hardlink.c client/file/iocompl.c @@ -38,8 +47,6 @@ client/file/rw.c client/file/tape.c client/file/volume.c - client/heapmem.c - client/virtmem.c client/misc/actctx.c client/misc/atom.c client/misc/comm.c @@ -53,9 +60,8 @@ client/misc/perfcnt.c client/misc/power.c client/misc/profile.c - client/misc/recovery.c client/misc/res.c - client/misc/resntfy.c + client/misc/resntfy.c client/misc/stubs.c client/misc/sysinfo.c client/misc/time.c @@ -63,9 +69,6 @@ client/misc/toolhelp.c client/misc/utils.c client/misc/version.c - client/job.c - client/proc.c - client/session.c winnls/string/casemap.c winnls/string/chartype.c winnls/string/collation.c @@ -76,10 +79,6 @@ winnls/string/lstring.c winnls/string/nls.c winnls/string/sortkey.c - client/synch.c - client/vista.c - client/fiber.c - client/thread.c kernel32.rc ${CMAKE_CURRENT_BINARY_DIR}/kernel32.def)

1 0

[cgutman] 52746: [RTL] - Fix a couple of potential null pointer accesses
by cgutman＠svn.reactos.org 20 Jul '11

20 Jul '11

Author: cgutman Date: Wed Jul 20 18:38:13 2011 New Revision: 52746 URL: http://svn.reactos.org/svn/reactos?rev=52746&view=rev Log: [RTL] - Fix a couple of potential null pointer accesses Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=52746&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Wed Jul 20 18:38:13 2011 @@ -210,6 +210,9 @@ Path = PathString->Buffer; Chars = PathString->Length / sizeof(WCHAR); + /* Return if there are no characters */ + if (!Chars) return RtlPathTypeUnknown; + /* * The algorithm is similar to RtlDetermineDosPathNameType_U but here we * actually check for the path length before touching the characters @@ -291,7 +294,8 @@ /* Handle initial path type and failure case */ *PathType = RtlPathTypeUnknown; - if (!(Size) || !(Buffer) || !(FileName) || (FileName->Buffer[0] == UNICODE_NULL)) return 0; + if (!(Size) || !(Buffer) || !(FileName) || + !(FileName->Length) || (FileName->Buffer[0] == UNICODE_NULL)) return 0; /* Break filename into component parts */ FileNameBuffer = FileName->Buffer;

1 0

[cgutman] 52745: [KERNEL32] - Try to fix CMake build
by cgutman＠svn.reactos.org 20 Jul '11

20 Jul '11

Author: cgutman Date: Wed Jul 20 18:14:08 2011 New Revision: 52745 URL: http://svn.reactos.org/svn/reactos?rev=52745&view=rev Log: [KERNEL32] - Try to fix CMake build Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Wed Jul 20 18:14:08 2011 @@ -13,7 +13,7 @@ list(APPEND SOURCE client/debugger.c client/except.c - client/file/ackup.c + client/file/backup.c client/file/bintype.c client/file/cnotify.c client/file/copy.c

1 0

[cgutman] 52744: [RTL] - Validate parameters passed into path functions
by cgutman＠svn.reactos.org 20 Jul '11

20 Jul '11

Author: cgutman Date: Wed Jul 20 17:59:16 2011 New Revision: 52744 URL: http://svn.reactos.org/svn/reactos?rev=52744&view=rev Log: [RTL] - Validate parameters passed into path functions Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=52744&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Wed Jul 20 17:59:16 2011 @@ -51,6 +51,9 @@ USHORT ReturnOffset = 0, ReturnLength; WCHAR c; + /* Validate the input */ + if (!PathString) return 0; + /* Check what type of path this is */ switch (RtlDetermineDosPathNameType_Ustr(PathString)) { @@ -198,8 +201,14 @@ NTAPI RtlDetermineDosPathNameType_Ustr(IN PCUNICODE_STRING PathString) { - PWCHAR Path = PathString->Buffer; - ULONG Chars = PathString->Length / sizeof(WCHAR); + PWCHAR Path; + ULONG Chars; + + /* Validate the input */ + if (!PathString) return RtlPathTypeUnknown; + + Path = PathString->Buffer; + Chars = PathString->Length / sizeof(WCHAR); /* * The algorithm is similar to RtlDetermineDosPathNameType_U but here we @@ -282,7 +291,7 @@ /* Handle initial path type and failure case */ *PathType = RtlPathTypeUnknown; - if (!(Size) || (FileName->Buffer[0] == UNICODE_NULL)) return 0; + if (!(Size) || !(Buffer) || !(FileName) || (FileName->Buffer[0] == UNICODE_NULL)) return 0; /* Break filename into component parts */ FileNameBuffer = FileName->Buffer; @@ -358,12 +367,15 @@ NTSTATUS NTAPI RtlpWin32NTNameToNtPathName_U(IN PUNICODE_STRING DosPath, - IN PUNICODE_STRING NtPath, + OUT PUNICODE_STRING NtPath, OUT PCWSTR *PartName, OUT PRTL_RELATIVE_NAME_U RelativeName) { ULONG DosLength; PWSTR NewBuffer, p; + + /* Validate the input */ + if (!DosPath) return STATUS_OBJECT_NAME_INVALID; /* Validate the DOS length */ DosLength = DosPath->Length; @@ -444,6 +456,9 @@ DPRINT("Relative: %lx DosName: %wZ NtName: %wZ, PartName: %p, RelativeName: %p\n", HaveRelative, DosName, NtName, PartName, RelativeName); MaxLength = sizeof(BigBuffer); + + /* Validate the input */ + if (!DosName) return STATUS_OBJECT_NAME_INVALID; /* Capture input string */ CapturedDosName = *DosName; @@ -670,6 +685,9 @@ NTSTATUS Status; FILE_BASIC_INFORMATION BasicInformation; + /* Validate the input */ + if (!FileName) return FALSE; + /* Get the NT Path */ Result = RtlDosPathNameToRelativeNtPathName_Ustr(FileName, &NtPathName, @@ -798,7 +816,9 @@ RtlDetermineDosPathNameType_U(IN PCWSTR Path) { DPRINT("RtlDetermineDosPathNameType_U %S\n", Path); - ASSERT(Path != NULL); + + /* Validate the input */ + if (!Path) return RtlPathTypeUnknown; /* Unlike the newer RtlDetermineDosPathNameType_U we assume 4 characters */ if (IS_PATH_SEPARATOR(Path[0])) @@ -1443,6 +1463,9 @@ PWCHAR NewBuffer, BufferStart; PCWSTR p; + /* Validate the input */ + if (!(Path) || !(FileName)) return 0; + /* Check if this is an absolute path */ if (RtlDetermineDosPathNameType_U(FileName) != RtlPathTypeRelative) {

1 0

[tkreuzer] 52743: [USETUP] Fix formatting. No code change.
by tkreuzer＠svn.reactos.org 20 Jul '11

20 Jul '11

Author: tkreuzer Date: Wed Jul 20 17:54:28 2011 New Revision: 52743 URL: http://svn.reactos.org/svn/reactos?rev=52743&view=rev Log: [USETUP] Fix formatting. No code change. Modified: trunk/reactos/base/setup/usetup/bootsup.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.…

1 0

[tkreuzer] 52742: [USETUP] Patch by Dmitry Gorbachev: Don't overwrite the OemName field in the bootsector. Although this field could theoretically contain any string, MS recommends using "MSWIN4.0"...
by tkreuzer＠svn.reactos.org 20 Jul '11

20 Jul '11

Author: tkreuzer Date: Wed Jul 20 17:00:28 2011 New Revision: 52742 URL: http://svn.reactos.org/svn/reactos?rev=52742&view=rev Log: [USETUP] Patch by Dmitry Gorbachev: Don't overwrite the OemName field in the bootsector. Although this field could theoretically contain any string, MS recommends using "MSWIN4.0" and MSDOS does even rely on it being this (or having higher last 2 characters) This way we preserve what is being put there when the disk is formatted, which is "MSWIN4.0" See issue #6386 for more details. Modified: trunk/reactos/base/setup/usetup/bootsup.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Wed Jul 20 17:00:28 2011 @@ -788,13 +788,13 @@ UNICODE_STRING Name; HANDLE FileHandle; NTSTATUS Status; - PUCHAR OrigBootSector; - PUCHAR NewBootSector; + PFAT_BOOTSECTOR OrigBootSector; + PFAT_BOOTSECTOR NewBootSector; /* Allocate buffer for original bootsector */ - OrigBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, - 0, - SECTORSIZE); + OrigBootSector = RtlAllocateHeap(ProcessHeap, + 0, + SECTORSIZE); if (OrigBootSector == NULL) return(STATUS_INSUFFICIENT_RESOURCES); @@ -836,11 +836,10 @@ return(Status); } - /* Allocate buffer for new bootsector */ - NewBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, - 0, - SECTORSIZE); + NewBootSector = RtlAllocateHeap(ProcessHeap, + 0, + SECTORSIZE); if (NewBootSector == NULL) { RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -888,7 +887,10 @@ } /* Adjust bootsector (copy a part of the FAT BPB) */ - memcpy((NewBootSector + 11), (OrigBootSector + 11), 51 /*fat BPB length*/); + memcpy(&NewBootSector->OemName, + &OrigBootSector->OemName, + FIELD_OFFSET(FAT32_BOOTSECTOR, BootCodeAndData) - + FIELD_OFFSET(FAT32_BOOTSECTOR, OemName)); /* Free the original boot sector */ RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -951,14 +953,14 @@ UNICODE_STRING Name; HANDLE FileHandle; NTSTATUS Status; - PUCHAR OrigBootSector; - PUCHAR NewBootSector; + PFAT32_BOOTSECTOR OrigBootSector; + PFAT32_BOOTSECTOR NewBootSector; LARGE_INTEGER FileOffset; /* Allocate buffer for original bootsector */ - OrigBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, - 0, - SECTORSIZE); + OrigBootSector = RtlAllocateHeap(ProcessHeap, + 0, + SECTORSIZE); if (OrigBootSector == NULL) return(STATUS_INSUFFICIENT_RESOURCES); @@ -1001,9 +1003,9 @@ } /* Allocate buffer for new bootsector (2 sectors) */ - NewBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, - 0, - 2 * SECTORSIZE); + NewBootSector = RtlAllocateHeap(ProcessHeap, + 0, + 2 * SECTORSIZE); if (NewBootSector == NULL) { RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -1051,13 +1053,13 @@ } /* Adjust bootsector (copy a part of the FAT32 BPB) */ - memcpy((NewBootSector + 3), - (OrigBootSector + 3), - 87); /* FAT32 BPB length */ + memcpy(&NewBootSector->OemName, + &OrigBootSector->OemName, + FIELD_OFFSET(FAT32_BOOTSECTOR, BootCodeAndData) - + FIELD_OFFSET(FAT32_BOOTSECTOR, OemName)); /* Disable the backup boot sector */ - NewBootSector[0x32] = 0x00; - NewBootSector[0x33] = 0x00; + NewBootSector->BackupBootSector = 0; /* Free the original boot sector */ RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -1416,9 +1418,10 @@ } /* Adjust bootsector (copy a part of the FAT16 BPB) */ - memcpy(&NewBootSector->BytesPerSector, - &OrigBootSector->BytesPerSector, - 51); /* FAT16 BPB length */ + memcpy(&NewBootSector->OemName, + &OrigBootSector->OemName, + FIELD_OFFSET(FAT32_BOOTSECTOR, BootCodeAndData) - + FIELD_OFFSET(FAT32_BOOTSECTOR, OemName)); PartInfo = &PartitionList->CurrentPartition->PartInfo[PartitionList->CurrentPartitionNumber]; NewBootSector->HiddenSectors = PartInfo->HiddenSectors; @@ -1582,9 +1585,10 @@ } /* Adjust bootsector (copy a part of the FAT32 BPB) */ - memcpy(&NewBootSector->BytesPerSector, - &OrigBootSector->BytesPerSector, - 79); /* FAT32 BPB length */ + memcpy(&NewBootSector->OemName, + &OrigBootSector->OemName, + FIELD_OFFSET(FAT32_BOOTSECTOR, BootCodeAndData) - + FIELD_OFFSET(FAT32_BOOTSECTOR, OemName)); PartInfo = &PartitionList->CurrentPartition->PartInfo[PartitionList->CurrentPartitionNumber]; NewBootSector->HiddenSectors = PartInfo->HiddenSectors;

1 0

[tkreuzer] 52741: [NTOSKRNL] Patch by Thomas Faber ExAcquireSharedStarveExclusive and ExAcquireSharedWaitForExclusive should return FALSE when they cannot immediately acquire the resource, and the ...
by tkreuzer＠svn.reactos.org 20 Jul '11

20 Jul '11

Author: tkreuzer Date: Wed Jul 20 16:29:38 2011 New Revision: 52741 URL: http://svn.reactos.org/svn/reactos?rev=52741&view=rev Log: [NTOSKRNL] Patch by Thomas Faber ExAcquireSharedStarveExclusive and ExAcquireSharedWaitForExclusive should return FALSE when they cannot immediately acquire the resource, and the Wait parameter is false. They return TRUE instead, leading the caller to believe it acquired the resource, which will result in a bugcheck when it tries to release it. See issue #6375 for more details. Modified: trunk/reactos/ntoskrnl/ex/resource.c Modified: trunk/reactos/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] Wed Jul 20 16:29:38 2011 @@ -1159,7 +1159,7 @@ { /* Release the lock and return */ ExReleaseResourceLock(Resource, &LockHandle); - return TRUE; + return FALSE; } /* Check if we have a shared waiters semaphore */ @@ -1276,7 +1276,7 @@ { /* So bail out if we're not allowed */ ExReleaseResourceLock(Resource, &LockHandle); - return TRUE; + return FALSE; } /* Check if we have a shared waiters semaphore */ @@ -1359,7 +1359,7 @@ { /* So bail out if we're not allowed */ ExReleaseResourceLock(Resource, &LockHandle); - return TRUE; + return FALSE; } /* Check if we have a shared waiters semaphore */

1 0

[ion] 52740: NO CODE CHANGE. [KERNEL32]: Delete now empty directories.
by ion＠svn.reactos.org 20 Jul '11

20 Jul '11

Author: ion Date: Wed Jul 20 16:16:14 2011 New Revision: 52740 URL: http://svn.reactos.org/svn/reactos?rev=52740&view=rev Log: NO CODE CHANGE. [KERNEL32]: Delete now empty directories. Removed: trunk/reactos/dll/win32/kernel32/process/

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs