Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[greatlrd] 17911: revert my change from r17909. Thx hbirr to fix the bug with 17910.

by greatlrd＠svn.reactos.com

revert my change from r17909. Thx hbirr to fix the bug with 17910. Modified: trunk/reactos/lib/kernel32/file/file.c _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2005-09-18 13:10:43 UTC (rev 17910) +++ trunk/reactos/lib/kernel32/file/file.c 2005-09-18 13:36:29 UTC (rev 17911) @@ -869,18 +869,12 @@ NULL); /* Open the file */ - - Status = NtOpenFile (&FileHandle, - SYNCHRONIZE | GENERIC_ALL, + SYNCHRONIZE | FILE_READ_ATTRIBUTES, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT); - - - - RtlFreeUnicodeString (&FileName); if (!NT_SUCCESS (Status)) {

19 years

[hbirr] 17910: Don't check the share access for directories.

by hbirr＠svn.reactos.com

Don't check the share access for directories. Modified: trunk/reactos/drivers/fs/vfat/cleanup.c Modified: trunk/reactos/drivers/fs/vfat/create.c _____ Modified: trunk/reactos/drivers/fs/vfat/cleanup.c --- trunk/reactos/drivers/fs/vfat/cleanup.c 2005-09-18 12:05:57 UTC (rev 17909) +++ trunk/reactos/drivers/fs/vfat/cleanup.c 2005-09-18 13:10:43 UTC (rev 17910) @@ -75,7 +75,10 @@ CcUninitializeCacheMap (FileObject, NULL, NULL); #endif pFcb->OpenHandleCount--; - IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); + if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY)) + { + IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); + } } return STATUS_SUCCESS; } _____ Modified: trunk/reactos/drivers/fs/vfat/create.c --- trunk/reactos/drivers/fs/vfat/create.c 2005-09-18 12:05:57 UTC (rev 17909) +++ trunk/reactos/drivers/fs/vfat/create.c 2005-09-18 13:10:43 UTC (rev 17910) @@ -612,7 +612,8 @@ pFcb = FileObject->FsContext; - if (pFcb->OpenHandleCount != 0) + if (pFcb->OpenHandleCount != 0 && + !(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY)) { Status = IoCheckShareAccess(Stack->Parameters.Create.SecurityContext->DesiredAcce ss, Stack->Parameters.Create.ShareAccess, @@ -708,7 +709,8 @@ } } - if (pFcb->OpenHandleCount == 0) + if (pFcb->OpenHandleCount == 0 && + !(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY)) { IoSetShareAccess(Stack->Parameters.Create.SecurityContext->DesiredAccess , Stack->Parameters.Create.ShareAccess,

19 years

[greatlrd] 17909: give GetFileAttributesExW more NtOpenFile right to prevent reactos crash if u using CreateFile then GetFileAttributesExW. It also fix a bug for me for livecd it booting on first try now in vmware. instead second or more booting try.

by greatlrd＠svn.reactos.com

give GetFileAttributesExW more NtOpenFile right to prevent reactos crash if u using CreateFile then GetFileAttributesExW. It also fix a bug for me for livecd it booting on first try now in vmware. instead second or more booting try. Modified: trunk/reactos/lib/kernel32/file/file.c _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2005-09-18 11:18:28 UTC (rev 17908) +++ trunk/reactos/lib/kernel32/file/file.c 2005-09-18 12:05:57 UTC (rev 17909) @@ -869,12 +869,18 @@ NULL); /* Open the file */ + + Status = NtOpenFile (&FileHandle, - SYNCHRONIZE | FILE_READ_ATTRIBUTES, + SYNCHRONIZE | GENERIC_ALL, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT); + + + + RtlFreeUnicodeString (&FileName); if (!NT_SUCCESS (Status)) {

19 years

[greatlrd] 17908: Clean up patch from filip, with small change from me, for MoveFileWithProgressW.

by greatlrd＠svn.reactos.com

Clean up patch from filip, with small change from me, for MoveFileWithProgressW. Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-09-18 09:29:37 UTC (rev 17907) +++ trunk/reactos/lib/kernel32/file/move.c 2005-09-18 11:18:28 UTC (rev 17908) @@ -326,26 +326,15 @@ FILE_SHARE_WRITE|FILE_SHARE_READ, NULL, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, + FILE_FLAG_BACKUP_SEMANTICS, NULL); if (hFile == INVALID_HANDLE_VALUE) { - hFile = CreateFileW (lpExistingFileName, - GENERIC_ALL, - FILE_SHARE_WRITE|FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_FLAG_BACKUP_SEMANTICS, - NULL); - - if (hFile == INVALID_HANDLE_VALUE) - return FALSE; - - folder = TRUE; - + return FALSE; } + /* validate & translate the filename */ if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpNewFileName, &DstPathU, @@ -379,6 +368,12 @@ sizeof(FILE_RENAME_INFORMATION) + DstPathU.Length, FileRenameInformation); CloseHandle(hFile); + + if (GetFileAttributesW(lpExistingFileName) & FILE_ATTRIBUTE_DIRECTORY) + { + folder = TRUE; + } + /* * FIXME:

19 years

[greatlrd] 17907: Implement second part of move folder. Now we can move empty folder. we need add code for move folder with contain now.

by greatlrd＠svn.reactos.com

Implement second part of move folder. Now we can move empty folder. we need add code for move folder with contain now. Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-09-18 03:52:34 UTC (rev 17906) +++ trunk/reactos/lib/kernel32/file/move.c 2005-09-18 09:29:37 UTC (rev 17907) @@ -314,6 +314,7 @@ NTSTATUS errCode; BOOL Result; UNICODE_STRING DstPathU; + BOOL folder = FALSE; DPRINT("MoveFileWithProgressW()\n"); @@ -325,12 +326,24 @@ FILE_SHARE_WRITE|FILE_SHARE_READ, NULL, OPEN_EXISTING, - FILE_FLAG_BACKUP_SEMANTICS, + FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { - return FALSE; + hFile = CreateFileW (lpExistingFileName, + GENERIC_ALL, + FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS, + NULL); + + if (hFile == INVALID_HANDLE_VALUE) + return FALSE; + + folder = TRUE; + } /* validate & translate the filename */ @@ -373,26 +386,41 @@ * Before we fail at CreateFileW */ + if (NT_SUCCESS(errCode)) { Result = TRUE; } - else if (STATUS_NOT_SAME_DEVICE == errCode && - MOVEFILE_COPY_ALLOWED == (dwFlags & MOVEFILE_COPY_ALLOWED)) + else if (STATUS_NOT_IMPLEMENTED == errCode) { - Result = CopyFileExW (lpExistingFileName, + if (folder==FALSE) + { + Result = CopyFileExW (lpExistingFileName, lpNewFileName, lpProgressRoutine, lpData, NULL, FileRename->ReplaceIfExists ? 0 : COPY_FILE_FAIL_IF_EXISTS); - if (Result) - { + if (Result) + { /* Cleanup the source file */ AdjustFileAttributes(lpExistingFileName, lpNewFileName); Result = DeleteFileW (lpExistingFileName); - } + } + } + else + { + /* move folder not complete code */ + Result = CreateDirectoryW (lpNewFileName, NULL); + if (Result == FALSE) return FALSE; + + /* add scan code for move the folder */ + + AdjustFileAttributes(lpExistingFileName, lpNewFileName); + Result = RemoveDirectoryW(lpExistingFileName); + } } + #if 1 /* FIXME file rename not yet implemented in all FSDs so it will always * fail, even when the move is to the same device @@ -445,7 +473,7 @@ else { SetLastErrorByStatus (errCode); - Result = FALSE; + Result = TRUE; } return Result; }

19 years

[royce] 17906: 1) strip ^ escapes from text before processing set command

by royce＠svn.reactos.com

1) strip ^ escapes from text before processing set command 2) recursive descent implementation of set /a - should fix bug 728 (In case anyone checks I realized there were some gaping holes in the implementation I posted to the ml, so this one is modified from it. This code could stand to benefit from a comprehensive feature/regression test.) Modified: trunk/reactos/subsys/system/cmd/set.c _____ Modified: trunk/reactos/subsys/system/cmd/set.c --- trunk/reactos/subsys/system/cmd/set.c 2005-09-18 03:26:52 UTC (rev 17905) +++ trunk/reactos/subsys/system/cmd/set.c 2005-09-18 03:52:34 UTC (rev 17906) @@ -35,6 +35,8 @@ */ #include <precomp.h> +#include <malloc.h> +#include <stdio.h> #include "resource.h" #ifdef INCLUDE_CMD_SET @@ -43,18 +45,35 @@ /* initial size of environment variable buffer */ #define ENV_BUFFER_SIZE 1024 +static BOOL +seta_eval ( LPCTSTR expr ); +static LPCTSTR +skip_ws ( LPCTSTR p ) +{ + return p + strspn ( p, " \t" ); +} + INT cmd_set (LPTSTR cmd, LPTSTR param) { TCHAR szMsg[RC_STRING_MAX_SIZE]; + INT i; LPTSTR p; - if (!_tcsncmp (param, _T("/?"), 2)) + if ( !_tcsncmp (param, _T("/?"), 2) ) { ConOutResPaging(TRUE,STRING_SET_HELP); return 0; } + /* remove escapes */ + if ( param[0] ) for ( i = 0; param[i+1]; i++ ) + { + if ( param[i] == '^' && strchr("<|>",param[i+1]) ) + { + memmove ( &param[i], &param[i+1], _tcslen(&param[i]) * sizeof(TCHAR) ); + } + } /* if no parameters, show the environment */ if (param[0] == _T('\0')) @@ -83,6 +102,12 @@ return 0; } + if ( !_tcsnicmp (param, _T("/A"), 2) ) + { + // TODO FIXME - what are we supposed to return? + return seta_eval ( skip_ws(param+2) ); + } + p = _tcschr (param, _T('=')); if (p) { @@ -124,4 +149,404 @@ return 0; } +static INT +ident_len ( LPCTSTR p ) +{ + LPCTSTR p2 = p; + if ( __iscsymf(*p) ) + { + ++p2; + while ( __iscsym(*p2) ) + ++p2; + } + return p2-p; +} + +#define PARSE_IDENT(ident,identlen,p) \ + identlen = ident_len(p); \ + ident = (LPTSTR)alloca ( ( identlen + 1 ) * sizeof(TCHAR) ); \ + memmove ( ident, p, identlen * sizeof(TCHAR) ); \ + ident[identlen] = 0; \ + p += identlen; + +static BOOL +seta_identval ( LPCTSTR ident, INT* result ) +{ + // get size of buffer for env var + LPTSTR buf; + DWORD dwBuffer = GetEnvironmentVariable ( ident, NULL, 0 ); + // if GetEnvironmentVariable() fails, it returns 0 + if ( !dwBuffer ) + { + // TODO FIXME - is it correct to report a value of 0 for non-existant variables? + *result = 0; + return FALSE; + } + buf = (LPTSTR)alloca ( dwBuffer * sizeof(TCHAR) ); + if ( !buf ) + { + // TODO FIXME - is it correct to report 0 when report resources low... should we error somehow? + *result = 0; + return FALSE; + } + GetEnvironmentVariable ( ident, buf, dwBuffer ); + *result = atoi ( buf ); + return TRUE; +} + +static BOOL +calc ( INT* lval, TCHAR op, INT rval ) +{ + switch ( op ) + { + case '*': + *lval *= rval; + break; + case '/': + *lval /= rval; + break; + case '%': + *lval %= rval; + break; + case '+': + *lval += rval; + break; + case '-': + *lval -= rval; + break; + case '&': + *lval &= rval; + break; + case '^': + *lval ^= rval; + break; + case '|': + *lval |= rval; + break; + default: + printf ( "Invalid operand.\n" ); + return FALSE; + } + return TRUE; +} + +static BOOL +seta_stmt ( LPCTSTR* p_, INT* result ); + +static BOOL +seta_unaryTerm ( LPCTSTR* p_, INT* result ) +{ + LPCTSTR p = *p_; + if ( *p == '(' ) + { + INT rval; + p = skip_ws ( p + 1 ); + if ( !seta_stmt ( &p, &rval ) ) + return FALSE; + if ( *p != ')' ) + { + _tprintf ( _T("Expected ')'\n") ); + return FALSE; + } + *result = rval; + p = skip_ws ( p + 1 ); + } + else if ( isdigit(*p) ) + { + *result = atoi ( p ); + p = skip_ws ( p + strspn ( p, "1234567890" ) ); + } + else if ( __iscsymf(*p) ) + { + LPTSTR ident; + INT identlen; + PARSE_IDENT(ident,identlen,p); + if ( !seta_identval ( ident, result ) ) + return FALSE; + } + else + { + _tprintf ( _T("Expected number or variable name\n") ); + return FALSE; + } + *p_ = p; + return TRUE; +} + +static BOOL +seta_mulTerm ( LPCTSTR* p_, INT* result ) +{ + LPCTSTR p = *p_; + TCHAR op = 0; + INT rval; + if ( _tcschr(_T("!~-"),*p) ) + { + op = *p; + p = skip_ws ( p + 1 ); + } + if ( !seta_unaryTerm ( &p, &rval ) ) + return FALSE; + switch ( op ) + { + case '!': + rval = !rval; + break; + case '~': + rval = ~rval; + break; + case '-': + rval = -rval; + break; + } + + *result = rval; + *p_ = p; + return TRUE; +} + +static BOOL +seta_addTerm ( LPCTSTR* p_, INT* result ) +{ + LPCTSTR p = *p_; + INT lval; + if ( !seta_mulTerm ( &p, &lval ) ) + return FALSE; + while ( *p && _tcschr(_T("*/%"),*p) ) + { + INT rval; + TCHAR op = *p; + + p = skip_ws ( p+1 ); + + if ( !seta_mulTerm ( &p, &rval ) ) + return FALSE; + + if ( !calc ( &lval, op, rval ) ) + return FALSE; + } + + *result = lval; + *p_ = p; + return TRUE; +} + +static BOOL +seta_logShiftTerm ( LPCTSTR* p_, INT* result ) +{ + LPCTSTR p = *p_; + INT lval; + if ( !seta_addTerm ( &p, &lval ) ) + return FALSE; + while ( *p && _tcschr(_T("+-"),*p) ) + { + INT rval; + TCHAR op = *p; + + p = skip_ws ( p+1 ); + + if ( !seta_addTerm ( &p, &rval ) ) + return FALSE; + + if ( !calc ( &lval, op, rval ) ) + return FALSE; + } + + *result = lval; + *p_ = p; + return TRUE; +} + +static BOOL +seta_bitAndTerm ( LPCTSTR* p_, INT* result ) +{ + LPCTSTR p = *p_; + INT lval; + if ( !seta_logShiftTerm ( &p, &lval ) ) + return FALSE; + while ( *p && _tcschr(_T("<>"),*p) && p[0] == p[1] ) + { + INT rval; + TCHAR op = *p; + + p = skip_ws ( p+2 ); + + if ( !seta_logShiftTerm ( &p, &rval ) ) + return FALSE; + + if ( !calc ( &lval, op, rval ) ) + return FALSE; + } + + *result = lval; + *p_ = p; + return TRUE; +} + +static BOOL +seta_bitExclOrTerm ( LPCTSTR* p_, INT* result ) +{ + LPCTSTR p = *p_; + INT lval; + if ( !seta_bitAndTerm ( &p, &lval ) ) + return FALSE; + while ( *p == _T('&') ) + { + INT rval; + + p = skip_ws ( p+1 ); + + if ( !seta_bitAndTerm ( &p, &rval ) ) + return FALSE; + + lval &= rval; + } + + *result = lval; + *p_ = p; + return TRUE; +} + +static BOOL +seta_bitOrTerm ( LPCTSTR* p_, INT* result ) +{ + LPCTSTR p = *p_; + INT lval; + if ( !seta_bitExclOrTerm ( &p, &lval ) ) + return FALSE; + while ( *p == _T('^') ) + { + INT rval; + + p = skip_ws ( p+1 ); + + if ( !seta_bitExclOrTerm ( &p, &rval ) ) + return FALSE; + + lval ^= rval; + } + + *result = lval; + *p_ = p; + return TRUE; +} + +static BOOL +seta_expr ( LPCTSTR* p_, INT* result ) +{ + LPCTSTR p = *p_; + INT lval; + if ( !seta_bitOrTerm ( &p, &lval ) ) + return FALSE; + while ( *p == _T('|') ) + { + INT rval; + + p = skip_ws ( p+1 ); + + if ( !seta_bitOrTerm ( &p, &rval ) ) + return FALSE; + + lval |= rval; + } + + *result = lval; + *p_ = p; + return TRUE; +} + +static BOOL +seta_assignment ( LPCTSTR* p_, INT* result ) +{ + LPCTSTR p = *p_; + LPTSTR ident; + TCHAR op = 0; + INT identlen, exprval; + + PARSE_IDENT(ident,identlen,p); + if ( identlen ) + { + if ( *p == _T('=') ) + op = *p, p++; + else if ( _tcschr ( _T("*/%+-&^|"), *p ) && p[1] == _T('=') ) + op = *p, p += 2; + else if ( _tcschr ( _T("<>"), *p ) && *p == p[1] && p[2] == _T('=') ) + op = *p, p += 3; + else + { + _tprintf ( _T("Missing operand.\n") ); + return FALSE; + } + p = skip_ws ( p ); + } + + /* allow to chain multiple assignments, such as: a=b=1 */ + if ( ident && op ) + { + if ( !seta_assignment ( &p, &exprval ) ) + return FALSE; + } + else + { + if ( !seta_expr ( &p, &exprval ) ) + return FALSE; + } + + if ( identlen ) + { + INT identval; + LPTSTR buf; + + if ( !seta_identval ( ident, &identval ) ) + identval = 0; + if ( op == '=' ) + identval = exprval; + else if ( !calc ( &identval, op, exprval ) ) + return FALSE; + buf = (LPTSTR)alloca ( 32 * sizeof(TCHAR) ); + _sntprintf ( buf, 32, _T("%i"), identval ); + SetEnvironmentVariable ( ident, buf ); // TODO FIXME - check return value + exprval = identval; + } + + *result = exprval; + *p_ = p; + return TRUE; +} + +static BOOL +seta_stmt ( LPCTSTR* p_, INT* result ) +{ + LPCTSTR p = *p_; + INT rval; + + if ( !seta_assignment ( &p, &rval ) ) + return FALSE; + while ( *p == _T(',') ) + { + p = skip_ws ( p+1 ); + + if ( !seta_assignment ( &p, &rval ) ) + return FALSE; + } + + *result = rval; + *p_ = p; + return TRUE; +} + +static BOOL +seta_eval ( LPCTSTR p ) +{ + INT rval; + if ( !*p ) + { + _tprintf ( _T("The syntax of the command is incorrect.\n") ); + return FALSE; + } + if ( !seta_stmt ( &p, &rval ) ) + return FALSE; + _tprintf ( _T("%i\n"), rval ); + return TRUE; +} + #endif

19 years

[ion] 17905: Fix user-mode stack trace regression caused by my exception patch. Traces are now shown again

by ion＠svn.reactos.com

Fix user-mode stack trace regression caused by my exception patch. Traces are now shown again Modified: trunk/reactos/lib/rtl/i386/except.s _____ Modified: trunk/reactos/lib/rtl/i386/except.s --- trunk/reactos/lib/rtl/i386/except.s 2005-09-17 22:33:53 UTC (rev 17904) +++ trunk/reactos/lib/rtl/i386/except.s 2005-09-18 03:26:52 UTC (rev 17905) @@ -95,7 +95,7 @@ mov [ebx+CONTEXT_SEGFS], fs mov [ebx+CONTEXT_SEGGS], gs mov [ebx+CONTEXT_SEGSS], ss - + /* Capture flags */ pushfd pop [ebx+CONTEXT_EFLAGS] @@ -105,7 +105,7 @@ mov [ebx+CONTEXT_EIP], eax /* Get EBP */ - mov eax, [esp] + mov eax, [ebp+0] mov [ebx+CONTEXT_EBP], eax /* And get ESP */

19 years

[gvg] 17904: _getch() doesn't echo the chars it retrieves and operates in raw mode.

by gvg＠svn.reactos.com

_getch() doesn't echo the chars it retrieves and operates in raw mode. Modified: trunk/reactos/lib/crt/conio/getch.c _____ Modified: trunk/reactos/lib/crt/conio/getch.c --- trunk/reactos/lib/crt/conio/getch.c 2005-09-17 22:00:35 UTC (rev 17903) +++ trunk/reactos/lib/crt/conio/getch.c 2005-09-17 22:33:53 UTC (rev 17904) @@ -20,21 +20,41 @@ */ int _getch(void) { - DWORD NumberOfCharsRead = 0; + DWORD NumberOfCharsRead = 0; char c; + HANDLE ConsoleHandle; + BOOL RestoreMode; + DWORD ConsoleMode; + if (char_avail) { c = ungot_char; char_avail = 0; } else { + /* + * _getch() is documented to NOT echo characters. Testing shows it + * doesn't wait for a CR either. So we need to switch off + * ENABLE_ECHO_INPUT and ENABLE_LINE_INPUT if they're currently + * switched on. + */ + ConsoleHandle = (HANDLE) _get_osfhandle(stdin->_file); + RestoreMode = GetConsoleMode(ConsoleHandle, &ConsoleMode) && + (0 != (ConsoleMode & + (ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT))); + if (RestoreMode) { + SetConsoleMode(ConsoleHandle, + ConsoleMode & (~ (ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT))); + } ReadConsoleA((HANDLE)_get_osfhandle(stdin->_file), &c, 1, &NumberOfCharsRead, NULL); + if (RestoreMode) { + SetConsoleMode(ConsoleHandle, ConsoleMode); + } } if (c == 10) c = 13; - putchar(c); return c; }

19 years

[hbirr] 17903: Do not overwrite the disk signature, if we install the boot code into the mbr.

by hbirr＠svn.reactos.com

Do not overwrite the disk signature, if we install the boot code into the mbr. Modified: trunk/reactos/subsys/system/usetup/bootsup.c Modified: trunk/reactos/subsys/system/usetup/usetup.h _____ Modified: trunk/reactos/subsys/system/usetup/bootsup.c --- trunk/reactos/subsys/system/usetup/bootsup.c 2005-09-17 21:22:47 UTC (rev 17902) +++ trunk/reactos/subsys/system/usetup/bootsup.c 2005-09-17 22:00:35 UTC (rev 17903) @@ -1002,13 +1002,13 @@ UNICODE_STRING Name; HANDLE FileHandle; NTSTATUS Status; - PUCHAR OrigBootSector; - PUCHAR NewBootSector; + PPARTITION_SECTOR OrigBootSector; + PPARTITION_SECTOR NewBootSector; /* Allocate buffer for original bootsector */ - OrigBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, - 0, - SECTORSIZE); + OrigBootSector = (PPARTITION_SECTOR)RtlAllocateHeap(ProcessHeap, + 0, + sizeof(PARTITION_SECTOR)); if (OrigBootSector == NULL) return(STATUS_INSUFFICIENT_RESOURCES); @@ -1052,9 +1052,9 @@ /* Allocate buffer for new bootsector */ - NewBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, - 0, - SECTORSIZE); + NewBootSector = (PPARTITION_SECTOR)RtlAllocateHeap(ProcessHeap, + 0, + sizeof(PARTITION_SECTOR)); if (NewBootSector == NULL) { RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -1090,7 +1090,7 @@ NULL, &IoStatusBlock, NewBootSector, - SECTORSIZE, + sizeof(PARTITION_SECTOR), NULL, NULL); NtClose(FileHandle); @@ -1102,9 +1102,9 @@ } /* Copy partition table from old MBR to new */ - RtlCopyMemory ((NewBootSector + 446), - (OrigBootSector + 446), - 4*16 /* Length of partition table */); + RtlCopyMemory (&NewBootSector->Signature, + &OrigBootSector->Signature, + sizeof(PARTITION_SECTOR) - offsetof(PARTITION_SECTOR, Signature) /* Length of partition table */); /* Free the original boot sector */ RtlFreeHeap(ProcessHeap, 0, OrigBootSector); _____ Modified: trunk/reactos/subsys/system/usetup/usetup.h --- trunk/reactos/subsys/system/usetup/usetup.h 2005-09-17 21:22:47 UTC (rev 17902) +++ trunk/reactos/subsys/system/usetup/usetup.h 2005-09-17 22:00:35 UTC (rev 17903) @@ -30,6 +30,7 @@ /* C Headers */ #include <ctype.h> #include <stdio.h> +#include <stddef.h> /* PSDK/NDK */ #include <windows.h>

19 years

[gvg] 17902: Count each handle which has pending events only once, independent of the number

by gvg＠svn.reactos.com

Count each handle which has pending events only once, independent of the number of pending events. Fixes bug 779. Modified: trunk/reactos/lib/msafd/misc/dllmain.c _____ Modified: trunk/reactos/lib/msafd/misc/dllmain.c --- trunk/reactos/lib/msafd/misc/dllmain.c 2005-09-17 21:02:38 UTC (rev 17901) +++ trunk/reactos/lib/msafd/misc/dllmain.c 2005-09-17 21:22:47 UTC (rev 17902) @@ -596,6 +596,7 @@ PVOID PollBuffer; ULONG i, j = 0, x; HANDLE SockEvent; + BOOL HandleCounted; Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, NULL, 1, FALSE ); @@ -690,6 +691,7 @@ /* Return in FDSET Format */ for (i = 0; i < HandleCount; i++) { + HandleCounted = FALSE; for(x = 1; x; x<<=1) { switch (PollInfo->Handles[i].Events & x) { case AFD_EVENT_RECEIVE: @@ -700,7 +702,10 @@ AFD_DbgPrint(MID_TRACE,("Event %x on handle %x\n", PollInfo->Handles[i].Events, PollInfo->Handles[i].Handle)); - OutCount++; + if (! HandleCounted) { + OutCount++; + HandleCounted = TRUE; + } if( readfds ) FD_SET(PollInfo->Handles[i].Handle, readfds); break; @@ -708,7 +713,10 @@ AFD_DbgPrint(MID_TRACE,("Event %x on handle %x\n", PollInfo->Handles[i].Events, PollInfo->Handles[i].Handle)); - OutCount++; + if (! HandleCounted) { + OutCount++; + HandleCounted = TRUE; + } if( writefds ) FD_SET(PollInfo->Handles[i].Handle, writefds); break; @@ -716,7 +724,10 @@ AFD_DbgPrint(MID_TRACE,("Event %x on handle %x\n", PollInfo->Handles[i].Events, PollInfo->Handles[i].Handle)); - OutCount++; + if (! HandleCounted) { + OutCount++; + HandleCounted = TRUE; + } if( exceptfds ) FD_SET(PollInfo->Handles[i].Handle, exceptfds); break; }

19 years

← Newer
1
...
25
26
27
28
29
30
31
...
59
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 September 2005