Ros-diffs August 2013

ros-diffs@reactos.org

10 participants
327 discussions

[aandrejevic] 59662: [NTVDM] Remove unnecessary call to UNREFERENCED_PARAMETER, as the parameter is used later in the function.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Aug 7 12:06:39 2013 New Revision: 59662 URL: http://svn.reactos.org/svn/reactos?rev=59662&view=rev Log: [NTVDM] Remove unnecessary call to UNREFERENCED_PARAMETER, as the parameter is used later in the function. Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Wed Aug 7 12:06:39 2013 @@ -618,8 +618,6 @@ DWORD Edx = EmulatorGetRegister(EMULATOR_REG_DX); DWORD Ebx = EmulatorGetRegister(EMULATOR_REG_BX); - UNREFERENCED_PARAMETER(Ecx); - switch (HIBYTE(Eax)) { /* Set Video Mode */

11 years, 4 months

[akhaldi] 59661: [CRT] * Annotate time_s.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Aug 6 21:34:25 2013 New Revision: 59661 URL: http://svn.reactos.org/svn/reactos?rev=59661&view=rev Log: [CRT] * Annotate time_s.h. Modified: trunk/reactos/include/crt/sec_api/time_s.h Modified: trunk/reactos/include/crt/sec_api/time_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/time_s… ============================================================================== --- trunk/reactos/include/crt/sec_api/time_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/time_s.h [iso-8859-1] Tue Aug 6 21:34:25 2013 @@ -3,6 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ + #ifndef _TIME_H__S #define _TIME_H__S @@ -14,22 +15,110 @@ extern "C" { #endif - _CRTIMP errno_t __cdecl _ctime32_s(char *_Buf,size_t _SizeInBytes,const __time32_t *_Time); - _CRTIMP errno_t __cdecl _gmtime32_s(struct tm *_Tm,const __time32_t *_Time); - _CRTIMP errno_t __cdecl _localtime32_s(struct tm *_Tm,const __time32_t *_Time); - _CRTIMP errno_t __cdecl _strdate_s(char *_Buf,size_t _SizeInBytes); - _CRTIMP errno_t __cdecl _strtime_s(char *_Buf ,size_t _SizeInBytes); - _CRTIMP errno_t __cdecl _ctime64_s(char *_Buf,size_t _SizeInBytes,const __time64_t *_Time); - _CRTIMP errno_t __cdecl _gmtime64_s(struct tm *_Tm,const __time64_t *_Time); - _CRTIMP errno_t __cdecl _localtime64_s(struct tm *_Tm,const __time64_t *_Time); + _Success_(return == 0) + _CRTIMP + errno_t + __cdecl + _ctime32_s( + _Out_writes_(_SizeInBytes) _Post_readable_size_(26) char *_Buf, + _In_ size_t _SizeInBytes, + _In_ const __time32_t *_Time); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _gmtime32_s( + _In_ struct tm *_Tm, + _In_ const __time32_t *_Time); + + _CRTIMP + errno_t + __cdecl + _localtime32_s( + _Out_ struct tm *_Tm, + _In_ const __time32_t *_Time); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strdate_s( + _Out_writes_(_SizeInBytes) _Post_readable_size_(9) char *_Buf, + _In_range_(>= , 9) size_t _SizeInBytes); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strtime_s( + _Out_writes_(_SizeInBytes) _Post_readable_size_(9) char *_Buf, + _In_range_(>= , 9) size_t _SizeInBytes); + + _CRTIMP + errno_t + __cdecl + _ctime64_s( + _Out_writes_z_(_SizeInBytes) char *_Buf, + _In_ size_t _SizeInBytes, + _In_ const __time64_t *_Time); + + _CRTIMP + errno_t + __cdecl + _gmtime64_s( + _Out_ struct tm *_Tm, + _In_ const __time64_t *_Time); + + _CRTIMP + errno_t + __cdecl + _localtime64_s( + _Out_ struct tm *_Tm, + _In_ const __time64_t *_Time); #ifndef _WTIME_S_DEFINED #define _WTIME_S_DEFINED - _CRTIMP errno_t __cdecl _wasctime_s(wchar_t *_Buf,size_t _SizeInWords,const struct tm *_Tm); - _CRTIMP errno_t __cdecl _wctime32_s(wchar_t *_Buf,size_t _SizeInWords,const __time32_t *_Time); - _CRTIMP errno_t __cdecl _wstrdate_s(wchar_t *_Buf,size_t _SizeInWords); - _CRTIMP errno_t __cdecl _wstrtime_s(wchar_t *_Buf,size_t _SizeInWords); - _CRTIMP errno_t __cdecl _wctime64_s(wchar_t *_Buf,size_t _SizeInWords,const __time64_t *_Time); + + _CRTIMP + errno_t + __cdecl + _wasctime_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(26) wchar_t *_Buf, + _In_range_(>= , 26) size_t _SizeInWords, + _In_ const struct tm *_Tm); + + _Success_(return == 0) + _CRTIMP + errno_t + __cdecl + _wctime32_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(26) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ const __time32_t *_Time); + + _CRTIMP + errno_t + __cdecl + _wstrdate_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(9) wchar_t *_Buf, + _In_ size_t _SizeInWords); + + _CRTIMP + errno_t + __cdecl + _wstrtime_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(9) wchar_t *_Buf, + _In_range_(>= , 9) size_t _SizeInWords); + + _Success_(return == 0) + _CRTIMP + errno_t + __cdecl + _wctime64_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(26) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ const __time64_t *_Time); #if !defined (RC_INVOKED) && !defined (_INC_WTIME_S_INL) #define _INC_WTIME_S_INL @@ -38,7 +127,8 @@ __CRT_INLINE errno_t __cdecl _wctime_s(wchar_t *_Buffer,size_t _SizeInWords,const time_t *_Time) { return _wctime64_s(_Buffer,_SizeInWords,_Time); } #endif #endif -#endif + +#endif /* _WTIME_S_DEFINED */ #ifndef RC_INVOKED #ifdef _USE_32BIT_TIME_T @@ -52,5 +142,6 @@ } #endif -#endif -#endif +#endif /* MINGW_HAS_SECURE_API */ + +#endif /* _TIME_H__S */

11 years, 4 months

[hbelusca] 59660: [NTVDM] Code formatting only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Aug 6 21:06:00 2013 New Revision: 59660 URL: http://svn.reactos.org/svn/reactos?rev=59660&view=rev Log: [NTVDM] Code formatting only. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/ntvdm.h branches/ntvdm/subsystems/ntvdm/ps2.c branches/ntvdm/subsystems/ntvdm/timer.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Tue Aug 6 21:06:00 2013 @@ -326,9 +326,9 @@ /* Set the start address in the CRTC */ VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG); - VgaWritePort(VGA_CRTC_DATA, LOBYTE(Bda->VideoPageOffset)); + VgaWritePort(VGA_CRTC_DATA , LOBYTE(Bda->VideoPageOffset)); VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG); - VgaWritePort(VGA_CRTC_DATA, HIBYTE(Bda->VideoPageOffset)); + VgaWritePort(VGA_CRTC_DATA , HIBYTE(Bda->VideoPageOffset)); return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Tue Aug 6 21:06:00 2013 @@ -12,7 +12,6 @@ /* INCLUDES *******************************************************************/ #include <windows.h> -#include <tchar.h> #include <stdio.h> #include <conio.h> #include <stdarg.h> Modified: branches/ntvdm/subsystems/ntvdm/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] Tue Aug 6 21:06:00 2013 @@ -312,4 +312,3 @@ } /* EOF */ - Modified: branches/ntvdm/subsystems/ntvdm/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/timer.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/timer.c [iso-8859-1] Tue Aug 6 21:06:00 2013 @@ -234,4 +234,3 @@ } /* EOF */ -

11 years, 4 months

[hbelusca] 59659: [NTVDM] - Don't leak console input/output handles when opening them in BiosInitialize. - Deinitialize the emulator in the reverse order it was initialized. - Simplify VgaGetVideoB...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Aug 6 20:01:05 2013 New Revision: 59659 URL: http://svn.reactos.org/svn/reactos?rev=59659&view=rev Log: [NTVDM] - Don't leak console input/output handles when opening them in BiosInitialize. - Deinitialize the emulator in the reverse order it was initialized. - Simplify VgaGetVideoBaseAddress and VgaGetVideoLimitAddress and use the former one in VgaTranslate[Read-Write]Address. - Use only unicode Win32 APIs where it's needed. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Tue Aug 6 20:01:05 2013 @@ -21,7 +21,7 @@ static PBIOS_DATA_AREA Bda; static BYTE BiosKeyboardMap[256]; -static HANDLE BiosConsoleInput = INVALID_HANDLE_VALUE; +static HANDLE BiosConsoleInput = INVALID_HANDLE_VALUE; static HANDLE BiosConsoleOutput = INVALID_HANDLE_VALUE; static CONSOLE_SCREEN_BUFFER_INFO BiosSavedBufferInfo; @@ -216,14 +216,13 @@ { INT i, j; INT Counter = 0; + WORD Character; DWORD VideoAddress = TO_LINEAR(TEXT_VIDEO_SEG, Page * Bda->VideoPageSize); for (i = Rectangle.Top; i <= Rectangle.Bottom; i++) { for (j = Rectangle.Left; j <= Rectangle.Right; j++) { - WORD Character; - /* Read from video memory */ VgaReadMemory(VideoAddress + (i * Bda->ScreenColumns + j) * sizeof(WORD), (LPVOID)&Character, @@ -239,13 +238,14 @@ { INT i, j; INT Counter = 0; + WORD Character; DWORD VideoAddress = TO_LINEAR(TEXT_VIDEO_SEG, Page * Bda->VideoPageSize); for (i = Rectangle.Top; i <= Rectangle.Bottom; i++) { for (j = Rectangle.Left; j <= Rectangle.Right; j++) { - WORD Character = Buffer[Counter++]; + Character = Buffer[Counter++]; /* Read from video memory */ VgaWriteMemory(VideoAddress + (i * Bda->ScreenColumns + j) * sizeof(WORD), @@ -304,7 +304,7 @@ /* Update the values in the BDA */ Bda->VideoMode = ModeNumber; Bda->VideoPage = 0; - Bda->VideoPageSize = BIOS_PAGE_SIZE; + Bda->VideoPageSize = BIOS_PAGE_SIZE; Bda->VideoPageOffset = 0; Bda->CharacterHeight = 16; @@ -369,33 +369,38 @@ BiosCode[Offset++] = 0xCF; // iret } - /* Get the input and output handles to the real console */ - BiosConsoleInput = CreateFile(TEXT("CONIN$"), - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - 0, - NULL); - - BiosConsoleOutput = CreateFile(TEXT("CONOUT$"), + /* Get the input handle to the real console, and check for success */ + BiosConsoleInput = CreateFileW(L"CONIN$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); - - /* Make sure it was successful */ - if ((BiosConsoleInput == INVALID_HANDLE_VALUE) - || (BiosConsoleOutput == INVALID_HANDLE_VALUE)) - { + if (BiosConsoleInput == INVALID_HANDLE_VALUE) + { + return FALSE; + } + + /* Get the output handle to the real console, and check for success */ + BiosConsoleOutput = CreateFileW(L"CONOUT$", + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + 0, + NULL); + if (BiosConsoleOutput == INVALID_HANDLE_VALUE) + { + CloseHandle(BiosConsoleInput); return FALSE; } /* Save the console screen buffer information */ if (!GetConsoleScreenBufferInfo(BiosConsoleOutput, &BiosSavedBufferInfo)) { + CloseHandle(BiosConsoleOutput); + CloseHandle(BiosConsoleInput); return FALSE; } @@ -410,23 +415,23 @@ /* Initialize the PIC */ PicWriteCommand(PIC_MASTER_CMD, PIC_ICW1 | PIC_ICW1_ICW4); - PicWriteCommand(PIC_SLAVE_CMD, PIC_ICW1 | PIC_ICW1_ICW4); + PicWriteCommand(PIC_SLAVE_CMD , PIC_ICW1 | PIC_ICW1_ICW4); /* Set the interrupt offsets */ PicWriteData(PIC_MASTER_DATA, BIOS_PIC_MASTER_INT); - PicWriteData(PIC_SLAVE_DATA, BIOS_PIC_SLAVE_INT); + PicWriteData(PIC_SLAVE_DATA , BIOS_PIC_SLAVE_INT); /* Tell the master PIC there is a slave at IRQ 2 */ PicWriteData(PIC_MASTER_DATA, 1 << 2); - PicWriteData(PIC_SLAVE_DATA, 2); + PicWriteData(PIC_SLAVE_DATA , 2); /* Make sure the PIC is in 8086 mode */ PicWriteData(PIC_MASTER_DATA, PIC_ICW4_8086); - PicWriteData(PIC_SLAVE_DATA, PIC_ICW4_8086); + PicWriteData(PIC_SLAVE_DATA , PIC_ICW4_8086); /* Clear the masks for both PICs */ PicWriteData(PIC_MASTER_DATA, 0x00); - PicWriteData(PIC_SLAVE_DATA, 0x00); + PicWriteData(PIC_SLAVE_DATA , 0x00); PitWriteCommand(0x34); PitWriteData(0, 0x00); @@ -444,8 +449,8 @@ SetConsoleScreenBufferSize(BiosConsoleOutput, BiosSavedBufferInfo.dwSize); /* Close the console handles */ - if (BiosConsoleInput != INVALID_HANDLE_VALUE) CloseHandle(BiosConsoleInput); if (BiosConsoleOutput != INVALID_HANDLE_VALUE) CloseHandle(BiosConsoleOutput); + if (BiosConsoleInput != INVALID_HANDLE_VALUE) CloseHandle(BiosConsoleInput); } WORD BiosPeekCharacter(VOID) @@ -512,9 +517,9 @@ /* Modify the CRTC registers */ VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG); - VgaWritePort(VGA_CRTC_DATA, LOBYTE(Offset)); + VgaWritePort(VGA_CRTC_DATA , LOBYTE(Offset)); VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG); - VgaWritePort(VGA_CRTC_DATA, HIBYTE(Offset)); + VgaWritePort(VGA_CRTC_DATA , HIBYTE(Offset)); } } @@ -633,9 +638,9 @@ /* Modify the CRTC registers */ VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_START_REG); - VgaWritePort(VGA_CRTC_DATA, Bda->CursorStartLine); + VgaWritePort(VGA_CRTC_DATA , Bda->CursorStartLine); VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_END_REG); - VgaWritePort(VGA_CRTC_DATA, Bda->CursorEndLine); + VgaWritePort(VGA_CRTC_DATA , Bda->CursorEndLine); break; } Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Tue Aug 6 20:01:05 2013 @@ -543,14 +543,14 @@ VOID EmulatorCleanup(VOID) { +#ifndef NEW_EMULATOR + /* Free the softx86 CPU and FPU emulator */ + softx87_free(&FpuEmulatorContext); + softx86_free(&EmulatorContext); +#endif + /* Free the memory allocated for the 16-bit address space */ if (BaseAddress != NULL) HeapFree(GetProcessHeap(), 0, BaseAddress); - -#ifndef NEW_EMULATOR - /* Free the softx86 CPU and FPU emulator */ - softx86_free(&EmulatorContext); - softx87_free(&FpuEmulatorContext); -#endif } VOID EmulatorSetA20(BOOLEAN Enabled) Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Tue Aug 6 20:01:05 2013 @@ -50,7 +50,7 @@ va_start(Parameters, Format); _vsnwprintf(Buffer, 256, Format, Parameters); - MessageBox(NULL, Buffer, L"NTVDM Subsystem", MB_OK); + MessageBoxW(NULL, Buffer, L"NTVDM Subsystem", MB_OK); va_end(Parameters); } Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Tue Aug 6 20:01:05 2013 @@ -14,6 +14,9 @@ #include "bios.h" /* PRIVATE VARIABLES **********************************************************/ + +static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; +static CONST DWORD MemoryLimit[] = { 0xA7FFF, 0xA7FFF, 0xB7FFF, 0xBFFFF }; static BYTE VgaMemory[VGA_NUM_BANKS * VGA_BANK_SIZE]; static BYTE VgaMiscRegister; @@ -63,8 +66,7 @@ static inline DWORD VgaTranslateReadAddress(DWORD Address) { - CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; - DWORD Offset = Address - MemoryBase[(VgaGcRegisters[VGA_GC_MISC_REG] >> 2) & 0x03]; + DWORD Offset = Address - VgaGetVideoBaseAddress(); BYTE Plane; /* Check for chain-4 and odd-even mode */ @@ -94,8 +96,7 @@ static inline DWORD VgaTranslateWriteAddress(DWORD Address) { - CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; - DWORD Offset = Address - MemoryBase[(VgaGcRegisters[VGA_GC_MISC_REG] >> 2) & 0x03]; + DWORD Offset = Address - VgaGetVideoBaseAddress(); /* Check for chain-4 and odd-even mode */ if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) @@ -514,13 +515,11 @@ DWORD VgaGetVideoBaseAddress(VOID) { - CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; return MemoryBase[(VgaGcRegisters[VGA_GC_MISC_REG] >> 2) & 0x03]; } DWORD VgaGetVideoLimitAddress(VOID) { - CONST DWORD MemoryLimit[] = { 0xA7FFF, 0xA7FFF, 0xB7FFF, 0xBFFFF }; return MemoryLimit[(VgaGcRegisters[VGA_GC_MISC_REG] >> 2) & 0x03]; }

11 years, 4 months

[hbelusca] 59658: [CONSRV] - Fix console handle validation (triggered by recent Process changes by Alex). - Temporarily add commented-out asserts for testing purposes only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Aug 6 19:10:36 2013 New Revision: 59658 URL: http://svn.reactos.org/svn/reactos?rev=59658&view=rev Log: [CONSRV] - Fix console handle validation (triggered by recent Process changes by Alex). - Temporarily add commented-out asserts for testing purposes only. Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/handle.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Tue Aug 6 19:10:36 2013 @@ -143,8 +143,12 @@ RemoveConsoleByHandle(IN HANDLE Handle) { NTSTATUS Status = STATUS_SUCCESS; + PCONSOLE Console; + + BOOLEAN ValidHandle = ((HandleToULong(Handle) & 0x3) == 0x3); ULONG Index = HandleToULong(Handle) >> 2; - PCONSOLE Console; + + if (!ValidHandle) return STATUS_INVALID_HANDLE; ASSERT( (ConsoleList == NULL && ConsoleListSize == 0) || (ConsoleList != NULL && ConsoleListSize != 0) ); @@ -339,9 +343,12 @@ IN BOOLEAN LockConsole) { BOOLEAN RetVal = FALSE; - + PCONSOLE ValidatedConsole; + + BOOLEAN ValidHandle = ((HandleToULong(ConsoleHandle) & 0x3) == 0x3); ULONG Index = HandleToULong(ConsoleHandle) >> 2; - PCONSOLE ValidatedConsole; + + if (!ValidHandle) return FALSE; if (!Console) return FALSE; *Console = NULL; Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Tue Aug 6 19:10:36 2013 @@ -159,7 +159,7 @@ ConSrvReleaseConsole(PCONSOLE Console, BOOL WasConsoleLocked) { - /* Just call the driver*/ + /* Just call the driver */ ConDrvReleaseConsole(Console, WasConsoleLocked); } Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Tue Aug 6 19:10:36 2013 @@ -387,6 +387,8 @@ RtlEnterCriticalSection(&ProcessData->HandleTableLock); ASSERT(ProcessData->HandleTable); + // ASSERT( (ProcessData->HandleTable == NULL && ProcessData->HandleTableSize == 0) || + // (ProcessData->HandleTable != NULL && ProcessData->HandleTableSize != 0) ); if (Index >= ProcessData->HandleTableSize || (Object = ProcessData->HandleTable[Index].Object) == NULL) @@ -781,6 +783,9 @@ RtlEnterCriticalSection(&ProcessData->HandleTableLock); + // ASSERT( (ProcessData->HandleTable == NULL && ProcessData->HandleTableSize == 0) || + // (ProcessData->HandleTable != NULL && ProcessData->HandleTableSize != 0) ); + if (!IsConsoleHandle(ConsoleHandle) || Index >= ProcessData->HandleTableSize || ProcessData->HandleTable[Index].Object == NULL) @@ -815,6 +820,9 @@ } RtlEnterCriticalSection(&ProcessData->HandleTableLock); + + // ASSERT( (ProcessData->HandleTable == NULL && ProcessData->HandleTableSize == 0) || + // (ProcessData->HandleTable != NULL && ProcessData->HandleTableSize != 0) ); if ( /** !IsConsoleHandle(ConsoleHandle) || **/ Index >= ProcessData->HandleTableSize ||

11 years, 4 months

[hbelusca] 59657: [KERNEL32] Limit indentation by avoiding many "if ()" imbrications.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Aug 6 18:36:25 2013 New Revision: 59657 URL: http://svn.reactos.org/svn/reactos?rev=59657&view=rev Log: [KERNEL32] Limit indentation by avoiding many "if ()" imbrications. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Tue Aug 6 18:36:25 2013 @@ -60,30 +60,28 @@ { NTSTATUS Status; HANDLE DuplicatedHandle; - SIZE_T Dummy; - - /* Is there a handle to duplicate? */ - if (StandardHandle) - { - /* Duplicate it */ - Status = NtDuplicateObject(NtCurrentProcess(), - StandardHandle, - ProcessHandle, - &DuplicatedHandle, - 0, - 0, - DUPLICATE_SAME_ACCESS | - DUPLICATE_SAME_ATTRIBUTES); - if (NT_SUCCESS(Status)) - { - /* Write it */ - NtWriteVirtualMemory(ProcessHandle, - Address, - &DuplicatedHandle, - sizeof(HANDLE), - &Dummy); - } - } + SIZE_T NumberOfBytesWritten; + + /* If there is no handle to duplicate, return immediately */ + if (!StandardHandle) return; + + /* Duplicate the handle */ + Status = NtDuplicateObject(NtCurrentProcess(), + StandardHandle, + ProcessHandle, + &DuplicatedHandle, + 0, + 0, + DUPLICATE_SAME_ACCESS | + DUPLICATE_SAME_ATTRIBUTES); + if (!NT_SUCCESS(Status)) return; + + /* Write it */ + NtWriteVirtualMemory(ProcessHandle, + Address, + &DuplicatedHandle, + sizeof(HANDLE), + &NumberOfBytesWritten); } BOOLEAN

11 years, 4 months

[akhaldi] 59656: [CRT] * Annotate time.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Aug 6 16:16:27 2013 New Revision: 59656 URL: http://svn.reactos.org/svn/reactos?rev=59656&view=rev Log: [CRT] * Annotate time.h. Modified: trunk/reactos/include/crt/time.h Modified: trunk/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/time.h?rev=596… ============================================================================== --- trunk/reactos/include/crt/time.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/time.h [iso-8859-1] Tue Aug 6 16:16:27 2013 @@ -3,6 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ + #ifndef _TIME_H_ #define _TIME_H_ @@ -92,67 +93,295 @@ _CRTDATA(extern long _timezone); _CRTDATA(extern char * _tzname[2]); - _CRTIMP errno_t __cdecl _get_daylight(int *_Daylight); - _CRTIMP errno_t __cdecl _get_dstbias(long *_Daylight_savings_bias); - _CRTIMP errno_t __cdecl _get_timezone(long *_Timezone); - _CRTIMP errno_t __cdecl _get_tzname(size_t *_ReturnValue,char *_Buffer,size_t _SizeInBytes,int _Index); - - _CRTIMP _CRT_INSECURE_DEPRECATE(asctime_s) char *__cdecl asctime(const struct tm *_Tm); - _CRTIMP _CRT_INSECURE_DEPRECATE(_ctime32_s) char *__cdecl _ctime32(const __time32_t *_Time); - _CRTIMP clock_t __cdecl clock(void); - _CRTIMP double __cdecl _difftime32(__time32_t _Time1,__time32_t _Time2); - _CRTIMP _CRT_INSECURE_DEPRECATE(_gmtime32_s) struct tm *__cdecl _gmtime32(const __time32_t *_Time); - _CRTIMP _CRT_INSECURE_DEPRECATE(_localtime32_s) struct tm *__cdecl _localtime32(const __time32_t *_Time); - _CRTIMP size_t __cdecl strftime(char *_Buf,size_t _SizeInBytes,const char *_Format,const struct tm *_Tm); - _CRTIMP size_t __cdecl _strftime_l(char *_Buf,size_t _Max_size,const char *_Format,const struct tm *_Tm,_locale_t _Locale); - _CRTIMP char *__cdecl _strdate(char *_Buffer); - _CRTIMP char *__cdecl _strtime(char *_Buffer); - _CRTIMP __time32_t __cdecl _time32(__time32_t *_Time); - _CRTIMP __time32_t __cdecl _mktime32(struct tm *_Tm); - _CRTIMP __time32_t __cdecl _mkgmtime32(struct tm *_Tm); + _CRTIMP errno_t __cdecl _get_daylight(_Out_ int *_Daylight); + _CRTIMP errno_t __cdecl _get_dstbias(_Out_ long *_Daylight_savings_bias); + _CRTIMP errno_t __cdecl _get_timezone(_Out_ long *_Timezone); + + _CRTIMP + errno_t + __cdecl + _get_tzname( + _Out_ size_t *_ReturnValue, + _Out_writes_z_(_SizeInBytes) char *_Buffer, + _In_ size_t _SizeInBytes, + _In_ int _Index); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE(asctime_s) + char * + __cdecl + asctime( + _In_ const struct tm *_Tm); + + _CRTIMP + _CRT_INSECURE_DEPRECATE(_ctime32_s) + char * + __cdecl + _ctime32( + _In_ const __time32_t *_Time); + + _Check_return_ _CRTIMP clock_t __cdecl clock(void); + + _CRTIMP + double + __cdecl + _difftime32( + _In_ __time32_t _Time1, + _In_ __time32_t _Time2); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE(_gmtime32_s) + struct tm * + __cdecl + _gmtime32( + _In_ const __time32_t *_Time); + + _CRTIMP + _CRT_INSECURE_DEPRECATE(_localtime32_s) + struct tm * + __cdecl + _localtime32( + _In_ const __time32_t *_Time); + + _Success_(return > 0) + _CRTIMP + size_t + __cdecl + strftime( + _Out_writes_z_(_SizeInBytes) char *_Buf, + _In_ size_t _SizeInBytes, + _In_z_ _Printf_format_string_ const char *_Format, + _In_ const struct tm *_Tm); + + _Success_(return > 0) + _CRTIMP + size_t + __cdecl + _strftime_l( + _Out_writes_z_(_Max_size) char *_Buf, + _In_ size_t _Max_size, + _In_z_ _Printf_format_string_ const char *_Format, + _In_ const struct tm *_Tm, + _In_opt_ _locale_t _Locale); + + _CRTIMP char *__cdecl _strdate(_Out_writes_z_(9) char *_Buffer); + _CRTIMP char *__cdecl _strtime(_Out_writes_z_(9) char *_Buffer); + _CRTIMP __time32_t __cdecl _time32(_Out_opt_ __time32_t *_Time); + _CRTIMP __time32_t __cdecl _mktime32(_Inout_ struct tm *_Tm); + _CRTIMP __time32_t __cdecl _mkgmtime32(_Inout_ struct tm *_Tm); _CRTIMP void __cdecl _tzset(void); - _CRT_OBSOLETE(GetLocalTime) unsigned __cdecl _getsystime(struct tm *_Tm); - _CRT_OBSOLETE(GetLocalTime) unsigned __cdecl _setsystime(struct tm *_Tm,unsigned _MilliSec); - - _CRTIMP errno_t __cdecl asctime_s(char *_Buf,size_t _SizeInWords,const struct tm *_Tm); - _CRTIMP errno_t __cdecl _ctime32_s(char *_Buf,size_t _SizeInBytes,const __time32_t *_Time); - _CRTIMP errno_t __cdecl _gmtime32_s(struct tm *_Tm,const __time32_t *_Time); - _CRTIMP errno_t __cdecl _localtime32_s(struct tm *_Tm,const __time32_t *_Time); - _CRTIMP errno_t __cdecl _strdate_s(char *_Buf,size_t _SizeInBytes); - _CRTIMP errno_t __cdecl _strtime_s(char *_Buf ,size_t _SizeInBytes); + _CRT_OBSOLETE(GetLocalTime) unsigned __cdecl _getsystime(_Out_ struct tm *_Tm); + + _CRT_OBSOLETE(GetLocalTime) + unsigned + __cdecl + _setsystime( + _In_ struct tm *_Tm, + unsigned _MilliSec); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + asctime_s( + _Out_writes_(_SizeInBytes) _Post_readable_size_(26) char *_Buf, + _In_range_(>= , 26) size_t _SizeInBytes, + _In_ const struct tm *_Tm); + + _Success_(return == 0) + _CRTIMP + errno_t + __cdecl + _ctime32_s( + _Out_writes_(_SizeInBytes) _Post_readable_size_(26) char *_Buf, + _In_ size_t _SizeInBytes, + _In_ const __time32_t *_Time); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _gmtime32_s( + _In_ struct tm *_Tm, + _In_ const __time32_t *_Time); + + _CRTIMP + errno_t + __cdecl + _localtime32_s( + _Out_ struct tm *_Tm, + _In_ const __time32_t *_Time); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strdate_s( + _Out_writes_(_SizeInBytes) _Post_readable_size_(9) char *_Buf, + _In_range_(>= , 9) size_t _SizeInBytes); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strtime_s( + _Out_writes_(_SizeInBytes) _Post_readable_size_(9) char *_Buf, + _In_range_(>= , 9) size_t _SizeInBytes); #if _INTEGRAL_MAX_BITS >= 64 - _CRTIMP double __cdecl _difftime64(__time64_t _Time1,__time64_t _Time2); - _CRTIMP _CRT_INSECURE_DEPRECATE(_ctime64_s) char *__cdecl _ctime64(const __time64_t *_Time); - _CRTIMP _CRT_INSECURE_DEPRECATE(_gmtime64_s) struct tm *__cdecl _gmtime64(const __time64_t *_Time); - _CRTIMP _CRT_INSECURE_DEPRECATE(_localtime64_s) struct tm *__cdecl _localtime64(const __time64_t *_Time); - _CRTIMP __time64_t __cdecl _mktime64(struct tm *_Tm); - _CRTIMP __time64_t __cdecl _mkgmtime64(struct tm *_Tm); - _CRTIMP __time64_t __cdecl _time64(__time64_t *_Time); - - _CRTIMP errno_t __cdecl _ctime64_s(char *_Buf,size_t _SizeInBytes,const __time64_t *_Time); - _CRTIMP errno_t __cdecl _gmtime64_s(struct tm *_Tm,const __time64_t *_Time); - _CRTIMP errno_t __cdecl _localtime64_s(struct tm *_Tm,const __time64_t *_Time); -#endif + + _Check_return_ + _CRTIMP + double + __cdecl + _difftime64( + _In_ __time64_t _Time1, + _In_ __time64_t _Time2); + + _CRTIMP + _CRT_INSECURE_DEPRECATE(_ctime64_s) + char * + __cdecl + _ctime64( + _In_ const __time64_t *_Time); + + _CRTIMP + _CRT_INSECURE_DEPRECATE(_gmtime64_s) + struct tm * + __cdecl + _gmtime64( + _In_ const __time64_t *_Time); + + _CRTIMP + _CRT_INSECURE_DEPRECATE(_localtime64_s) + struct tm * + __cdecl + _localtime64( + _In_ const __time64_t *_Time); + + _CRTIMP __time64_t __cdecl _mktime64(_Inout_ struct tm *_Tm); + _CRTIMP __time64_t __cdecl _mkgmtime64(_Inout_ struct tm *_Tm); + _CRTIMP __time64_t __cdecl _time64(_Out_opt_ __time64_t *_Time); + + _CRTIMP + errno_t + __cdecl + _ctime64_s( + _Out_writes_z_(_SizeInBytes) char *_Buf, + _In_ size_t _SizeInBytes, + _In_ const __time64_t *_Time); + + _CRTIMP + errno_t + __cdecl + _gmtime64_s( + _Out_ struct tm *_Tm, + _In_ const __time64_t *_Time); + + _CRTIMP + errno_t + __cdecl + _localtime64_s( + _Out_ struct tm *_Tm, + _In_ const __time64_t *_Time); + +#endif /* _INTEGRAL_MAX_BITS >= 64 */ #ifndef _WTIME_DEFINED #define _WTIME_DEFINED - _CRTIMP _CRT_INSECURE_DEPRECATE(_wasctime_s) wchar_t *__cdecl _wasctime(const struct tm *_Tm); + + _CRTIMP + _CRT_INSECURE_DEPRECATE(_wasctime_s) + wchar_t * + __cdecl + _wasctime( + _In_ const struct tm *_Tm); + _CRTIMP wchar_t *__cdecl _wctime(const time_t *_Time); - _CRTIMP _CRT_INSECURE_DEPRECATE(_wctime32_s) wchar_t *__cdecl _wctime32(const __time32_t *_Time); - _CRTIMP size_t __cdecl wcsftime(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm); - _CRTIMP size_t __cdecl _wcsftime_l(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm,_locale_t _Locale); - _CRTIMP wchar_t *__cdecl _wstrdate(wchar_t *_Buffer); - _CRTIMP wchar_t *__cdecl _wstrtime(wchar_t *_Buffer); - - _CRTIMP errno_t __cdecl _wasctime_s(wchar_t *_Buf,size_t _SizeInWords,const struct tm *_Tm); - _CRTIMP errno_t __cdecl _wctime32_s(wchar_t *_Buf,size_t _SizeInWords,const __time32_t *_Time); - _CRTIMP errno_t __cdecl _wstrdate_s(wchar_t *_Buf,size_t _SizeInWords); - _CRTIMP errno_t __cdecl _wstrtime_s(wchar_t *_Buf,size_t _SizeInWords); + + _CRTIMP + _CRT_INSECURE_DEPRECATE(_wctime32_s) + wchar_t * + __cdecl + _wctime32( + _In_ const __time32_t *_Time); + + _Success_(return > 0) + _CRTIMP + size_t + __cdecl + wcsftime( + _Out_writes_z_(_SizeInWords) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_ const struct tm *_Tm); + + _Success_(return > 0) + _CRTIMP + size_t + __cdecl + _wcsftime_l( + _Out_writes_z_(_SizeInWords) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_ const struct tm *_Tm, + _In_opt_ _locale_t _Locale); + + _CRTIMP wchar_t *__cdecl _wstrdate(_Out_writes_z_(9) wchar_t *_Buffer); + _CRTIMP wchar_t *__cdecl _wstrtime(_Out_writes_z_(9) wchar_t *_Buffer); + + _CRTIMP + errno_t + __cdecl + _wasctime_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(26) wchar_t *_Buf, + _In_range_(>= , 26) size_t _SizeInWords, + _In_ const struct tm *_Tm); + + _Success_(return == 0) + _CRTIMP + errno_t + __cdecl + _wctime32_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(26) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ const __time32_t *_Time); + + _CRTIMP + errno_t + __cdecl + _wstrdate_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(9) wchar_t *_Buf, + _In_ size_t _SizeInWords); + + _CRTIMP + errno_t + __cdecl + _wstrtime_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(9) wchar_t *_Buf, + _In_range_(>= , 9) size_t _SizeInWords); + #if _INTEGRAL_MAX_BITS >= 64 - _CRTIMP _CRT_INSECURE_DEPRECATE(_wctime64_s) wchar_t *__cdecl _wctime64(const __time64_t *_Time); - _CRTIMP errno_t __cdecl _wctime64_s(wchar_t *_Buf,size_t _SizeInWords,const __time64_t *_Time); -#endif + + _CRTIMP + _CRT_INSECURE_DEPRECATE(_wctime64_s) + wchar_t * + __cdecl + _wctime64( + _In_ const __time64_t *_Time); + + _Success_(return == 0) + _CRTIMP + errno_t + __cdecl + _wctime64_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(26) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ const __time64_t *_Time); + +#endif /* _INTEGRAL_MAX_BITS >= 64 */ #if !defined (RC_INVOKED) && !defined (_INC_WTIME_INL) #define _INC_WTIME_INL @@ -218,4 +447,3 @@ #pragma pack(pop) #endif /* End _TIME_H_ */ -

11 years, 4 months

[akhaldi] 59655: [PSDK] * Annotate wincrypt.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Aug 6 13:48:36 2013 New Revision: 59655 URL: http://svn.reactos.org/svn/reactos?rev=59655&view=rev Log: [PSDK] * Annotate wincrypt.h. Modified: trunk/reactos/include/psdk/wincrypt.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re…

11 years, 4 months

[hbelusca] 59654: [KERNEL32] Clarify a comment; fix a parameter given to BasepIsRealtimeAllowed.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Aug 6 10:40:36 2013 New Revision: 59654 URL: http://svn.reactos.org/svn/reactos?rev=59654&view=rev Log: [KERNEL32] Clarify a comment; fix a parameter given to BasepIsRealtimeAllowed. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Tue Aug 6 10:40:36 2013 @@ -2270,17 +2270,17 @@ BOOL WINAPI CreateProcessInternalW(IN HANDLE hUserToken, - IN LPCWSTR lpApplicationName, - IN LPWSTR lpCommandLine, - IN LPSECURITY_ATTRIBUTES lpProcessAttributes, - IN LPSECURITY_ATTRIBUTES lpThreadAttributes, - IN BOOL bInheritHandles, - IN DWORD dwCreationFlags, - IN LPVOID lpEnvironment, - IN LPCWSTR lpCurrentDirectory, - IN LPSTARTUPINFOW lpStartupInfo, - IN LPPROCESS_INFORMATION lpProcessInformation, - OUT PHANDLE hNewToken) + IN LPCWSTR lpApplicationName, + IN LPWSTR lpCommandLine, + IN LPSECURITY_ATTRIBUTES lpProcessAttributes, + IN LPSECURITY_ATTRIBUTES lpThreadAttributes, + IN BOOL bInheritHandles, + IN DWORD dwCreationFlags, + IN LPVOID lpEnvironment, + IN LPCWSTR lpCurrentDirectory, + IN LPSTARTUPINFOW lpStartupInfo, + IN LPPROCESS_INFORMATION lpProcessInformation, + OUT PHANDLE hNewToken) { // // Core variables used for creating the initial process and thread @@ -2503,7 +2503,7 @@ else if (dwCreationFlags & REALTIME_PRIORITY_CLASS) { PriorityClass.PriorityClass = PROCESS_PRIORITY_CLASS_HIGH; - PriorityClass.PriorityClass += (BasepIsRealtimeAllowed(0) != NULL); + PriorityClass.PriorityClass += (BasepIsRealtimeAllowed(FALSE) != NULL); } else { @@ -3003,7 +3003,7 @@ if ((dwCreationFlags & CREATE_FORCEDOS) && (BaseStaticServerData->IsWowTaskReady)) { - /* This request can't be satisifeed, instead, a separate VDM is needed */ + /* This request can't be satisfied, instead, a separate VDM is needed */ dwCreationFlags &= ~(CREATE_FORCEDOS | CREATE_SHARED_WOW_VDM); dwCreationFlags |= CREATE_SEPARATE_WOW_VDM; @@ -4263,7 +4263,11 @@ if ((ImageInformation.SubSystemType == IMAGE_SUBSYSTEM_WINDOWS_GUI) || (IsWowApp)) { - /* Some flag sent to CSRSS, not sure for what purpose */ + /* + * For GUI apps we turn on the 2nd bit. This allow CSRSS server dlls + * (basesrv in particular) to know whether or not this is a GUI or a + * TUI application. + */ AddToHandle(CreateProcessMsg->ProcessHandle, 2); /* Also check if the parent is also a GUI process */ @@ -4271,7 +4275,7 @@ if ((NtHeaders) && (NtHeaders->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI)) { - /* Let it know that it should dislay the hourglass mouse cursor */ + /* Let it know that it should display the hourglass mouse cursor */ AddToHandle(CreateProcessMsg->ProcessHandle, 1); } }

11 years, 4 months

[ion] 59653: [NDK]: Update DNF_NEED_TO_ENUM to DNF_LEGACY_RESOURCE_DEVICENODE. The former wasn't used and doesn't seem to exist, the latter is the actual real flag with that value. [NTOSKRNL]: Comm...

by ion＠svn.reactos.org

Author: ion Date: Tue Aug 6 01:42:43 2013 New Revision: 59653 URL: http://svn.reactos.org/svn/reactos?rev=59653&view=rev Log: [NDK]: Update DNF_NEED_TO_ENUM to DNF_LEGACY_RESOURCE_DEVICENODE. The former wasn't used and doesn't seem to exist, the latter is the actual real flag with that value. [NTOSKRNL]: Commit an old patch of mine that sets up the right frontend code in IoAssignResources. All it does is add some error checking before calling the old halfplemented backend. Modified: trunk/reactos/include/ndk/iotypes.h trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/iotypes.h [iso-8859-1] Tue Aug 6 01:42:43 2013 @@ -174,7 +174,7 @@ #define DNF_LEGACY_DRIVER 0x00004000 #define DNF_STOPPED 0x00008000 #define DNF_WILL_BE_REMOVED 0x00010000 -#define DNF_NEED_TO_ENUM 0x00020000 +#define DNF_LEGACY_RESOURCE_DEVICENODE 0x00020000 #define DNF_NOT_CONFIGURED 0x00040000 #define DNF_REINSTALL 0x00080000 #define DNF_RESOURCE_REQUIREMENTS_NEED_FILTERED 0x00100000 // ??? Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Tue Aug 6 01:42:43 2013 @@ -908,35 +908,84 @@ return STATUS_SUCCESS; } -/* - * @halfplemented - */ -NTSTATUS NTAPI -IoAssignResources(PUNICODE_STRING RegistryPath, - PUNICODE_STRING DriverClassName, - PDRIVER_OBJECT DriverObject, - PDEVICE_OBJECT DeviceObject, - PIO_RESOURCE_REQUIREMENTS_LIST RequestedResources, - PCM_RESOURCE_LIST* AllocatedResources) +NTSTATUS +NTAPI +IopLegacyResourceAllocation(IN ARBITER_REQUEST_SOURCE AllocationType, + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT DeviceObject OPTIONAL, + IN PIO_RESOURCE_REQUIREMENTS_LIST ResourceRequirements, + IN OUT PCM_RESOURCE_LIST *AllocatedResources) { NTSTATUS Status; - - DPRINT1("IoAssignResources is halfplemented!\n"); - - *AllocatedResources = NULL; - Status = IopFixupResourceListWithRequirements(RequestedResources, + + DPRINT1("IopLegacyResourceAllocation is halfplemented!\n"); + + Status = IopFixupResourceListWithRequirements(ResourceRequirements, AllocatedResources); if (!NT_SUCCESS(Status)) { if (Status == STATUS_CONFLICTING_ADDRESSES) + { DPRINT1("Denying an attempt to claim resources currently in use by another device!\n"); - + } + return Status; } - + /* TODO: Claim resources in registry */ - return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IoAssignResources(IN PUNICODE_STRING RegistryPath, + IN PUNICODE_STRING DriverClassName, + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT DeviceObject, + IN PIO_RESOURCE_REQUIREMENTS_LIST RequestedResources, + IN OUT PCM_RESOURCE_LIST* AllocatedResources) +{ + PDEVICE_NODE DeviceNode; + + /* Do we have a DO? */ + if (DeviceObject) + { + /* Get its device node */ + DeviceNode = IopGetDeviceNode(DeviceObject); + if ((DeviceNode) && !(DeviceNode->Flags & DNF_LEGACY_RESOURCE_DEVICENODE)) + { + /* New drivers should not call this API */ + KeBugCheckEx(PNP_DETECTED_FATAL_ERROR, + 0, + 0, + (ULONG_PTR)DeviceObject, + (ULONG_PTR)DriverObject); + } + } + + /* Did the driver supply resources? */ + if (RequestedResources) + { + /* Make sure there's actually something useful in them */ + if (!(RequestedResources->AlternativeLists) || !(RequestedResources->List[0].Count)) + { + /* Empty resources are no resources */ + RequestedResources = NULL; + } + } + + /* Initialize output if given */ + if (AllocatedResources) *AllocatedResources = NULL; + + /* Call internal helper function */ + return IopLegacyResourceAllocation(ArbiterRequestLegacyAssigned, + DriverObject, + DeviceObject, + RequestedResources, + AllocatedResources); } /* 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] Tue Aug 6 01:42:43 2013 @@ -2267,8 +2267,6 @@ IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, &DeviceNode->InstancePath); } - - DeviceNode->Flags &= ~DNF_NEED_TO_ENUM; DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n");

11 years, 4 months

← Newer
1
...
25
26
27
28
29
30
31
32
33
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 August 2013