Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 59568: [PSDK] * Silence some warnings about nonstandard extensions used (zero-sized array in struct/union and nameless struct/union).
by akhaldi＠svn.reactos.org 24 Jul '13

24 Jul '13

Author: akhaldi Date: Wed Jul 24 14:47:11 2013 New Revision: 59568 URL: http://svn.reactos.org/svn/reactos?rev=59568&view=rev Log: [PSDK] * Silence some warnings about nonstandard extensions used (zero-sized array in struct/union and nameless struct/union). Modified: trunk/reactos/include/psdk/ntddstor.h trunk/reactos/include/psdk/ntdef.h Modified: trunk/reactos/include/psdk/ntddstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddstor.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddstor.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddstor.h [iso-8859-1] Wed Jul 24 14:47:11 2013 @@ -617,6 +617,11 @@ ULONG SupportFlags; } STORAGE_PRIORITY_HINT_SUPPORT, *PSTORAGE_PRIORITY_HINT_SUPPORT; +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4200) +#endif + #if defined(_MSC_EXTENSIONS) typedef struct _STORAGE_MEDIA_SERIAL_NUMBER_DATA { @@ -646,6 +651,10 @@ #endif /* defined(_MSC_EXTENSIONS) */ +#ifdef _MSC_VER +#pragma warning(pop) /* disable:4200 */ +#endif + typedef _Struct_size_bytes_(Size) struct _STORAGE_READ_CAPACITY { ULONG Version; ULONG Size; Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Wed Jul 24 14:47:11 2013 @@ -444,6 +444,10 @@ DEFAULT_COMPARTMENT_ID } COMPARTMENT_ID, *PCOMPARTMENT_ID; +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#endif /* Used to store a non-float 8 byte aligned structure */ typedef struct _QUAD { @@ -490,6 +494,10 @@ #endif /* MIDL_PASS */ ULONGLONG QuadPart; } ULARGE_INTEGER, *PULARGE_INTEGER; + +#ifdef _MSC_VER +#pragma warning(pop) /* disable:4201 */ +#endif /* Physical Addresses are always treated as 64-bit wide */ typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS;

1 0

[akhaldi] 59567: [MSFS][MUP] * Properly mark some unreferenced parameters as such.
by akhaldi＠svn.reactos.org 24 Jul '13

24 Jul '13

Author: akhaldi Date: Wed Jul 24 14:18:40 2013 New Revision: 59567 URL: http://svn.reactos.org/svn/reactos?rev=59567&view=rev Log: [MSFS][MUP] * Properly mark some unreferenced parameters as such. Modified: trunk/reactos/drivers/filesystems/msfs/msfs.c trunk/reactos/drivers/filesystems/mup/mup.c Modified: trunk/reactos/drivers/filesystems/msfs/msfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.c [iso-8859-1] Wed Jul 24 14:18:40 2013 @@ -24,6 +24,8 @@ PDEVICE_OBJECT DeviceObject; UNICODE_STRING DeviceName; NTSTATUS Status; + + UNREFERENCED_PARAMETER(RegistryPath); DPRINT("Mailslot FSD 0.0.1\n"); Modified: trunk/reactos/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] Wed Jul 24 14:18:40 2013 @@ -51,6 +51,8 @@ NTSTATUS Status; UNICODE_STRING DeviceName; + UNREFERENCED_PARAMETER(RegistryPath); + DPRINT("MUP 0.0.1\n"); RtlInitUnicodeString(&DeviceName,

1 0

[aandrejevic] 59566: [NTVDM] Modify the flags on the stack instead of the flags register directly. The flags register is restored during IRET so changing it directly does nothing.
by aandrejevic＠svn.reactos.org 23 Jul '13

23 Jul '13

Author: aandrejevic Date: Tue Jul 23 21:43:57 2013 New Revision: 59566 URL: http://svn.reactos.org/svn/reactos?rev=59566&view=rev Log: [NTVDM] Modify the flags on the stack instead of the flags register directly. The flags register is restored during IRET so changing it directly does nothing. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/dos.h branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h 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 Jul 23 21:43:57 2013 @@ -57,7 +57,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static DWORD BiosGetVideoPageSize() +static DWORD BiosGetVideoPageSize(VOID) { INT i; DWORD BufferSize = VideoModes[CurrentVideoMode].Width @@ -135,7 +135,7 @@ return TRUE; } -static BOOLEAN BiosKbdBufferPop() +static BOOLEAN BiosKbdBufferPop(VOID) { /* If it's empty, fail */ if (Bda->KeybdBufferHead == Bda->KeybdBufferTail) return FALSE; @@ -214,7 +214,7 @@ return TRUE; } -static VOID BiosDestroyGraphicsBuffer() +static VOID BiosDestroyGraphicsBuffer(VOID) { CloseHandle(ConsoleMutex); CloseHandle(BiosGraphicsOutput); @@ -222,7 +222,7 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -BYTE BiosGetVideoMode() +BYTE BiosGetVideoMode(VOID) { return CurrentVideoMode; } @@ -335,12 +335,12 @@ return TRUE; } -inline DWORD BiosGetVideoMemoryStart() +inline DWORD BiosGetVideoMemoryStart(VOID) { return (VideoModes[CurrentVideoMode].Segment << 4); } -inline VOID BiosVerticalRefresh() +inline VOID BiosVerticalRefresh(VOID) { /* Ignore if we're in text mode */ if (VideoModes[CurrentVideoMode].Text) return; @@ -355,7 +355,7 @@ VideoNeedsUpdate = FALSE; } -BOOLEAN BiosInitialize() +BOOLEAN BiosInitialize(VOID) { INT i; WORD Offset = 0; @@ -458,7 +458,7 @@ return TRUE; } -VOID BiosCleanup() +VOID BiosCleanup(VOID) { /* Restore the old screen buffer */ SetConsoleActiveScreenBuffer(BiosConsoleOutput); @@ -611,7 +611,7 @@ } } -WORD BiosPeekCharacter() +WORD BiosPeekCharacter(VOID) { WORD CharacterData; @@ -624,7 +624,7 @@ return CharacterData; } -WORD BiosGetCharacter() +WORD BiosGetCharacter(VOID) { WORD CharacterData; INPUT_RECORD InputRecord; @@ -660,7 +660,7 @@ return CharacterData; } -VOID BiosVideoService() +VOID BiosVideoService(LPWORD Stack) { INT i, CursorHeight; BOOLEAN Invisible = FALSE; @@ -811,7 +811,8 @@ *((LPWORD)((ULONG_PTR)BaseAddress + Address))); break; - } + } EmulatorSetFlag(EMULATOR_FLAG_ZF); + /* Write Character And Attribute At Cursor Position */ case 0x09: @@ -927,7 +928,7 @@ } } -VOID BiosKeyboardService() +VOID BiosKeyboardService(LPWORD Stack) { DWORD Eax = EmulatorGetRegister(EMULATOR_REG_AX); @@ -949,12 +950,12 @@ { /* There is a character, clear ZF and return it */ EmulatorSetRegister(EMULATOR_REG_AX, Data); - EmulatorClearFlag(EMULATOR_FLAG_ZF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_ZF; } else { /* No character, set ZF */ - EmulatorSetFlag(EMULATOR_FLAG_ZF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_ZF; } break; @@ -968,7 +969,7 @@ } } -VOID BiosTimeService() +VOID BiosTimeService(LPWORD Stack) { DWORD Eax = EmulatorGetRegister(EMULATOR_REG_AX); DWORD Ecx = EmulatorGetRegister(EMULATOR_REG_CX); @@ -1012,19 +1013,19 @@ } } -VOID BiosSystemTimerInterrupt() +VOID BiosSystemTimerInterrupt(LPWORD Stack) { /* Increase the system tick count */ Bda->TickCounter++; } -VOID BiosEquipmentService() +VOID BiosEquipmentService(LPWORD Stack) { /* Return the equipment list */ EmulatorSetRegister(EMULATOR_REG_AX, Bda->EquipmentList); } -VOID BiosHandleIrq(BYTE IrqNumber) +VOID BiosHandleIrq(BYTE IrqNumber, LPWORD Stack) { switch (IrqNumber) { Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Tue Jul 23 21:43:57 2013 @@ -97,19 +97,19 @@ /* FUNCTIONS ******************************************************************/ -BOOLEAN BiosInitialize(); -VOID BiosCleanup(); +BOOLEAN BiosInitialize(VOID); +VOID BiosCleanup(VOID); VOID BiosUpdateConsole(ULONG StartAddress, ULONG EndAddress); VOID BiosUpdateVideoMemory(ULONG StartAddress, ULONG EndAddress); -inline DWORD BiosGetVideoMemoryStart(); -inline VOID BiosVerticalRefresh(); -WORD BiosPeekCharacter(); -WORD BiosGetCharacter(); -VOID BiosVideoService(); -VOID BiosEquipmentService(); -VOID BiosKeyboardService(); -VOID BiosTimeService(); -VOID BiosHandleIrq(BYTE IrqNumber); -VOID BiosSystemTimerInterrupt(); +inline DWORD BiosGetVideoMemoryStart(VOID); +inline VOID BiosVerticalRefresh(VOID); +WORD BiosPeekCharacter(VOID); +WORD BiosGetCharacter(VOID); +VOID BiosVideoService(LPWORD Stack); +VOID BiosEquipmentService(LPWORD Stack); +VOID BiosKeyboardService(LPWORD Stack); +VOID BiosTimeService(LPWORD Stack); +VOID BiosHandleIrq(BYTE IrqNumber, LPWORD Stack); +VOID BiosSystemTimerInterrupt(LPWORD Stack); #endif Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Tue Jul 23 21:43:57 2013 @@ -1161,15 +1161,15 @@ DosWriteFile(DOS_OUTPUT_HANDLE, &Character, sizeof(CHAR), &BytesWritten); } -VOID DosHandleIoctl(BYTE ControlCode, WORD FileHandle) +BOOLEAN DosHandleIoctl(BYTE ControlCode, WORD FileHandle) { HANDLE Handle = DosGetRealHandle(FileHandle); if (Handle == INVALID_HANDLE_VALUE) { /* Doesn't exist */ - EmulatorSetFlag(EMULATOR_FLAG_CF); - EmulatorSetRegister(EMULATOR_REG_AX, ERROR_FILE_NOT_FOUND); + DosLastError = ERROR_FILE_NOT_FOUND; + return FALSE; } switch (ControlCode) @@ -1194,10 +1194,9 @@ InfoWord |= 1 << 7; /* Return the device information word */ - EmulatorClearFlag(EMULATOR_FLAG_CF); EmulatorSetRegister(EMULATOR_REG_DX, InfoWord); - break; + return TRUE; } /* Unsupported control code */ @@ -1205,19 +1204,19 @@ { DPRINT1("Unsupported IOCTL: 0x%02X\n", ControlCode); - EmulatorSetFlag(EMULATOR_FLAG_CF); - EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_PARAMETER); - } - } -} - -VOID DosInt20h(WORD CodeSegment) + DosLastError = ERROR_INVALID_PARAMETER; + return FALSE; + } + } +} + +VOID DosInt20h(LPWORD Stack) { /* This is the exit interrupt */ - DosTerminateProcess(CodeSegment, 0); -} - -VOID DosInt21h(WORD CodeSegment) + DosTerminateProcess(Stack[STACK_CS], 0); +} + +VOID DosInt21h(LPWORD Stack) { INT i; CHAR Character; @@ -1237,7 +1236,7 @@ /* Terminate Program */ case 0x00: { - DosTerminateProcess(CodeSegment, 0); + DosTerminateProcess(Stack[STACK_CS], 0); break; } @@ -1432,11 +1431,11 @@ if (CreateDirectoryA(String, NULL)) { - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } else { - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; EmulatorSetRegister(EMULATOR_REG_AX, (Eax & 0xFFFF0000) | LOWORD(GetLastError())); } @@ -1452,11 +1451,11 @@ if (RemoveDirectoryA(String)) { - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } else { - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; EmulatorSetRegister(EMULATOR_REG_AX, (Eax & 0xFFFF0000) | LOWORD(GetLastError())); } @@ -1473,11 +1472,11 @@ if (SetCurrentDirectoryA(String)) { - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } else { - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; EmulatorSetRegister(EMULATOR_REG_AX, (Eax & 0xFFFF0000) | LOWORD(GetLastError())); } @@ -1497,7 +1496,7 @@ if (ErrorCode == 0) { /* Clear CF */ - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; /* Return the handle in AX */ EmulatorSetRegister(EMULATOR_REG_AX, @@ -1506,7 +1505,7 @@ else { /* Set CF */ - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; /* Return the error code in AX */ EmulatorSetRegister(EMULATOR_REG_AX, @@ -1528,7 +1527,7 @@ if (ErrorCode == 0) { /* Clear CF */ - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; /* Return the handle in AX */ EmulatorSetRegister(EMULATOR_REG_AX, @@ -1537,7 +1536,7 @@ else { /* Set CF */ - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; /* Return the error code in AX */ EmulatorSetRegister(EMULATOR_REG_AX, @@ -1553,12 +1552,12 @@ if (DosCloseHandle(LOWORD(Ebx))) { /* Clear CF */ - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } else { /* Set CF */ - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; /* Return the error code in AX */ EmulatorSetRegister(EMULATOR_REG_AX, @@ -1581,7 +1580,7 @@ if (ErrorCode == 0) { /* Clear CF */ - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; /* Return the number of bytes read in AX */ EmulatorSetRegister(EMULATOR_REG_AX, @@ -1590,7 +1589,7 @@ else { /* Set CF */ - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; /* Return the error code in AX */ EmulatorSetRegister(EMULATOR_REG_AX, @@ -1612,7 +1611,7 @@ if (ErrorCode == 0) { /* Clear CF */ - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; /* Return the number of bytes written in AX */ EmulatorSetRegister(EMULATOR_REG_AX, @@ -1621,7 +1620,7 @@ else { /* Set CF */ - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; /* Return the error code in AX */ EmulatorSetRegister(EMULATOR_REG_AX, @@ -1637,10 +1636,10 @@ LPSTR FileName = (LPSTR)((ULONG_PTR)BaseAddress + TO_LINEAR(DataSegment, Edx)); /* Call the API function */ - if (DeleteFileA(FileName)) EmulatorClearFlag(EMULATOR_FLAG_CF); + if (DeleteFileA(FileName)) Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; else { - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; EmulatorSetRegister(EMULATOR_REG_AX, GetLastError()); } @@ -1659,7 +1658,7 @@ if (ErrorCode == 0) { /* Clear CF */ - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; /* Return the new offset in DX:AX */ EmulatorSetRegister(EMULATOR_REG_DX, @@ -1670,7 +1669,7 @@ else { /* Set CF */ - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; /* Return the error code in AX */ EmulatorSetRegister(EMULATOR_REG_AX, @@ -1694,14 +1693,14 @@ /* Check if it failed */ if (Attributes == INVALID_FILE_ATTRIBUTES) { - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; EmulatorSetRegister(EMULATOR_REG_AX, GetLastError()); break; } /* Return the attributes that DOS can understand */ - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; EmulatorSetRegister(EMULATOR_REG_CX, (Ecx & 0xFFFFFF00) | LOBYTE(Attributes)); } @@ -1710,17 +1709,17 @@ /* Try to set the attributes */ if (SetFileAttributesA(FileName, LOBYTE(Ecx))) { - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } else { - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; EmulatorSetRegister(EMULATOR_REG_AX, GetLastError()); } } else { - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_FUNCTION); } @@ -1730,7 +1729,15 @@ /* IOCTL */ case 0x44: { - DosHandleIoctl(LOBYTE(Eax), LOWORD(Ebx)); + if (DosHandleIoctl(LOBYTE(Eax), LOWORD(Ebx))) + { + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + } + else + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + EmulatorSetRegister(EMULATOR_REG_AX, DosLastError); + } break; } @@ -1744,7 +1751,7 @@ if (Handle != INVALID_HANDLE_VALUE) { /* The handle is invalid */ - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_HANDLE); break; @@ -1756,14 +1763,14 @@ if (NewHandle == INVALID_DOS_HANDLE) { /* Too many files open */ - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; EmulatorSetRegister(EMULATOR_REG_AX, ERROR_TOO_MANY_OPEN_FILES); break; } /* Return the result */ - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; EmulatorSetRegister(EMULATOR_REG_AX, NewHandle); break; @@ -1774,11 +1781,11 @@ { if (DosDuplicateHandle(LOWORD(Ebx), LOWORD(Ecx))) { - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } else { - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_HANDLE); } @@ -1794,13 +1801,13 @@ if (Segment != 0) { EmulatorSetRegister(EMULATOR_REG_AX, Segment); - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } else { EmulatorSetRegister(EMULATOR_REG_AX, DosLastError); EmulatorSetRegister(EMULATOR_REG_BX, MaxAvailable); - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; } break; @@ -1811,12 +1818,12 @@ { if (DosFreeMemory(ExtSegment)) { - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } else { EmulatorSetRegister(EMULATOR_REG_AX, ERROR_ARENA_TRASHED); - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; } break; @@ -1829,12 +1836,12 @@ if (DosResizeMemory(ExtSegment, LOWORD(Ebx), &Size)) { - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } else { EmulatorSetRegister(EMULATOR_REG_AX, DosLastError); - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; EmulatorSetRegister(EMULATOR_REG_BX, Size); } @@ -1864,7 +1871,7 @@ /* Get allocation strategy */ EmulatorSetRegister(EMULATOR_REG_AX, DosAllocStrategy); - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } else if (LOBYTE(Eax) == 0x01) { @@ -1875,7 +1882,7 @@ { /* Can't set both */ EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_PARAMETER); - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; break; } @@ -1883,12 +1890,12 @@ { /* Invalid allocation strategy */ EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_PARAMETER); - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; break; } DosAllocStrategy = LOBYTE(Ebx); - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } else if (LOBYTE(Eax) == 0x02) { @@ -1897,7 +1904,7 @@ Eax &= 0xFFFFFF00; if (DosUmbLinked) Eax |= 1; EmulatorSetRegister(EMULATOR_REG_AX, Eax); - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } else if (LOBYTE(Eax) == 0x03) { @@ -1905,13 +1912,13 @@ if (Ebx) DosLinkUmb(); else DosUnlinkUmb(); - EmulatorClearFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } else { /* Invalid or unsupported function */ - EmulatorSetFlag(EMULATOR_FLAG_CF); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_FUNCTION); } @@ -1922,12 +1929,12 @@ default: { DPRINT1("DOS Function INT 0x21, AH = 0x%02X NOT IMPLEMENTED!\n", HIBYTE(Eax)); - EmulatorSetFlag(EMULATOR_FLAG_CF); - } - } -} - -VOID DosBreakInterrupt(VOID) + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + } + } +} + +VOID DosBreakInterrupt(LPWORD Stack) { VdmRunning = FALSE; } Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Tue Jul 23 21:43:57 2013 @@ -117,9 +117,10 @@ VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode); CHAR DosReadCharacter(VOID); VOID DosPrintCharacter(CHAR Character); -VOID DosInt20h(WORD CodeSegment); -VOID DosInt21h(WORD CodeSegment); -VOID DosBreakInterrupt(VOID); +BOOLEAN DosHandleIoctl(BYTE ControlCode, WORD FileHandle); +VOID DosInt20h(LPWORD Stack); +VOID DosInt21h(LPWORD Stack); +VOID DosBreakInterrupt(LPWORD Stack); BOOLEAN DosInitialize(VOID); #endif 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 Jul 23 21:43:57 2013 @@ -114,6 +114,11 @@ *Buffer = KeyboardReadData(); break; } + + default: + { + DPRINT1("Read from unknown port: 0x%X\n", Address); + } } } @@ -162,6 +167,11 @@ KeyboardWriteData(Byte); break; } + + default: + { + DPRINT1("Write to unknown port: 0x%X\n", Address); + } } } @@ -186,11 +196,11 @@ if (Code == EMULATOR_INT_BOP) { /* Get the interrupt number */ - IntNum = LOBYTE(Stack[0]); + IntNum = LOBYTE(Stack[STACK_INT_NUM]); /* Get the CS:IP */ - InstructionPointer = Stack[1]; - CodeSegment = Stack[2]; + InstructionPointer = Stack[STACK_IP]; + CodeSegment = Stack[STACK_CS]; /* Check if this was an exception */ if (IntNum < 8) @@ -210,13 +220,13 @@ if (IntNum >= BIOS_PIC_MASTER_INT && IntNum < BIOS_PIC_MASTER_INT + 8) { /* It was an IRQ from the master PIC */ - BiosHandleIrq(IntNum - BIOS_PIC_MASTER_INT); + BiosHandleIrq(IntNum - BIOS_PIC_MASTER_INT, Stack); return; } else if (IntNum >= BIOS_PIC_SLAVE_INT && IntNum < BIOS_PIC_SLAVE_INT + 8) { /* It was an IRQ from the slave PIC */ - BiosHandleIrq(IntNum - BIOS_PIC_SLAVE_INT + 8); + BiosHandleIrq(IntNum - BIOS_PIC_SLAVE_INT + 8, Stack); return; } @@ -225,46 +235,46 @@ case BIOS_VIDEO_INTERRUPT: { /* This is the video BIOS interrupt, call the BIOS */ - BiosVideoService(); + BiosVideoService(Stack); break; } case BIOS_EQUIPMENT_INTERRUPT: { /* This is the BIOS "get equipment" command, call the BIOS */ - BiosEquipmentService(); + BiosEquipmentService(Stack); break; } case BIOS_KBD_INTERRUPT: { /* This is the keyboard BIOS interrupt, call the BIOS */ - BiosKeyboardService(); + BiosKeyboardService(Stack); break; } case BIOS_TIME_INTERRUPT: { /* This is the time BIOS interrupt, call the BIOS */ - BiosTimeService(); + BiosTimeService(Stack); break; } case BIOS_SYS_TIMER_INTERRUPT: { /* BIOS timer update */ - BiosSystemTimerInterrupt(); + BiosSystemTimerInterrupt(Stack); break; } case 0x20: { - DosInt20h(CodeSegment); + DosInt20h(Stack); break; } case 0x21: { - DosInt21h(CodeSegment); + DosInt21h(Stack); break; } case 0x23: { - DosBreakInterrupt(); + DosBreakInterrupt(Stack); break; } default: @@ -273,13 +283,6 @@ break; } } - - /* Update the flags on the stack */ -#ifndef NEW_EMULATOR - Stack[3] = EmulatorContext.state->reg_flags.val; -#else - Stack[3] = EmulatorContext.Flags.LowWord; -#endif } } Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Tue Jul 23 21:43:57 2013 @@ -72,6 +72,10 @@ #define MAX_GDT_ENTRIES 8192 #define EMULATOR_BOP 0xC4C4 #define EMULATOR_INT_BOP 0xBEEF +#define STACK_INT_NUM 0 +#define STACK_IP 1 +#define STACK_CS 2 +#define STACK_FLAGS 3 enum {

1 0

[aandrejevic] 59565: [NTVDM] Remove the old "INT 0xFF" hack and instead use an invalid opcode sequence for emulator operations. Fix the flags register update bug.
by aandrejevic＠svn.reactos.org 23 Jul '13

23 Jul '13

Author: aandrejevic Date: Tue Jul 23 19:31:00 2013 New Revision: 59565 URL: http://svn.reactos.org/svn/reactos?rev=59565&view=rev Log: [NTVDM] Remove the old "INT 0xFF" hack and instead use an invalid opcode sequence for emulator operations. Fix the flags register update bug. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h 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 Jul 23 19:31:00 2013 @@ -374,20 +374,19 @@ IntVecTable[i * 2] = Offset; IntVecTable[i * 2 + 1] = BIOS_SEGMENT; - if (i != SPECIAL_INT_NUM) - { - BiosCode[Offset++] = 0xFA; // cli - - BiosCode[Offset++] = 0x6A; // push i - BiosCode[Offset++] = (BYTE)i; - - BiosCode[Offset++] = 0xCD; // int SPECIAL_INT_NUM - BiosCode[Offset++] = SPECIAL_INT_NUM; - - BiosCode[Offset++] = 0x83; // add sp, 2 - BiosCode[Offset++] = 0xC4; - BiosCode[Offset++] = 0x02; - } + BiosCode[Offset++] = 0xFA; // cli + + BiosCode[Offset++] = 0x6A; // push i + BiosCode[Offset++] = (BYTE)i; + + BiosCode[Offset++] = LOBYTE(EMULATOR_BOP); // BOP sequence + BiosCode[Offset++] = HIBYTE(EMULATOR_BOP); + BiosCode[Offset++] = LOBYTE(EMULATOR_INT_BOP); + BiosCode[Offset++] = HIBYTE(EMULATOR_INT_BOP); + + BiosCode[Offset++] = 0x83; // add sp, 2 + BiosCode[Offset++] = 0xC4; + BiosCode[Offset++] = 0x02; BiosCode[Offset++] = 0xCF; // iret } 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 Jul 23 19:31:00 2013 @@ -165,34 +165,32 @@ } } -static VOID EmulatorSoftwareInt(PVOID Context, BYTE Number) +static VOID EmulatorBop(WORD Code) { WORD StackSegment, StackPointer, CodeSegment, InstructionPointer; BYTE IntNum; - - /* Check if this is the special interrupt */ - if (Number == SPECIAL_INT_NUM) - { - /* Get the SS:SP */ -#ifndef NEW_EMULATOR - StackSegment = EmulatorContext.state->segment_reg[SX86_SREG_SS].val; - StackPointer = EmulatorContext.state->general_reg[SX86_REG_SP].val; -#else - StackSegment = EmulatorContext.Registers[EMULATOR_REG_SS].LowWord; - StackPointer = EmulatorContext.Registers[EMULATOR_REG_SP].LowWord; -#endif - + LPWORD Stack; + + /* Get the SS:SP */ +#ifndef NEW_EMULATOR + StackSegment = EmulatorContext.state->segment_reg[SX86_SREG_SS].val; + StackPointer = EmulatorContext.state->general_reg[SX86_REG_SP].val; +#else + StackSegment = EmulatorContext.Registers[EMULATOR_REG_SS].LowWord; + StackPointer = EmulatorContext.Registers[EMULATOR_REG_SP].LowWord; +#endif + + /* Get the stack */ + Stack = (LPWORD)((ULONG_PTR)BaseAddress + TO_LINEAR(StackSegment, StackPointer)); + + if (Code == EMULATOR_INT_BOP) + { /* Get the interrupt number */ - IntNum = *(LPBYTE)((ULONG_PTR)BaseAddress + TO_LINEAR(StackSegment, StackPointer)); - - /* Move the stack pointer forward one word to skip the interrupt number */ - StackPointer += sizeof(WORD); + IntNum = LOBYTE(Stack[0]); /* Get the CS:IP */ - InstructionPointer = *(LPWORD)((ULONG_PTR)BaseAddress - + TO_LINEAR(StackSegment, StackPointer)); - CodeSegment = *(LPWORD)((ULONG_PTR)BaseAddress - + TO_LINEAR(StackSegment, StackPointer + sizeof(WORD))); + InstructionPointer = Stack[1]; + CodeSegment = Stack[2]; /* Check if this was an exception */ if (IntNum < 8) @@ -275,7 +273,19 @@ break; } } - } + + /* Update the flags on the stack */ +#ifndef NEW_EMULATOR + Stack[3] = EmulatorContext.state->reg_flags.val; +#else + Stack[3] = EmulatorContext.Flags.LowWord; +#endif + } +} + +static VOID EmulatorSoftwareInt(PVOID Context, BYTE Number) +{ + /* Do nothing */ } static VOID EmulatorHardwareInt(PVOID Context, BYTE Number) @@ -445,14 +455,30 @@ #endif } -VOID EmulatorStep() -{ +VOID EmulatorStep(VOID) +{ + LPWORD Instruction; + #ifndef NEW_EMULATOR /* Print the current position - useful for debugging */ DPRINT("Executing at CS:IP = %04X:%04X\n", EmulatorGetRegister(EMULATOR_REG_CS), EmulatorContext.state->reg_ip); + Instruction = (LPWORD)((ULONG_PTR)BaseAddress + + TO_LINEAR(EmulatorGetRegister(EMULATOR_REG_CS), + EmulatorContext.state->reg_ip)); + + /* Check for the BIOS operation (BOP) sequence */ + if (Instruction[0] == EMULATOR_BOP) + { + /* Skip the opcodes */ + EmulatorContext.state->reg_ip += 4; + + /* Call the BOP handler */ + EmulatorBop(Instruction[1]); + } + /* Call the softx86 API */ if (!softx86_step(&EmulatorContext)) { @@ -464,7 +490,7 @@ #endif } -VOID EmulatorCleanup() +VOID EmulatorCleanup(VOID) { /* Free the memory allocated for the 16-bit address space */ if (BaseAddress != NULL) HeapFree(GetProcessHeap(), 0, BaseAddress); Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Tue Jul 23 19:31:00 2013 @@ -70,7 +70,8 @@ #define EMULATOR_NUM_CONTROL_REGS 8 #define EMULATOR_NUM_DEBUG_REGS 8 #define MAX_GDT_ENTRIES 8192 -#define SPECIAL_INT_NUM 0xFF +#define EMULATOR_BOP 0xC4C4 +#define EMULATOR_INT_BOP 0xBEEF enum {

1 0

[tkreuzer] 59564: [WIN32K] Fix some bugs related to DIB brushes.
by tkreuzer＠svn.reactos.org 23 Jul '13

23 Jul '13

Author: tkreuzer Date: Tue Jul 23 15:31:43 2013 New Revision: 59564 URL: http://svn.reactos.org/svn/reactos?rev=59564&view=rev Log: [WIN32K] Fix some bugs related to DIB brushes. Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/b… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c [iso-8859-1] Tue Jul 23 15:31:43 2013 @@ -424,6 +424,13 @@ return NULL; } + /* Check for undocumented case 2 */ + if (iUsage == 2) + { + /* Tests show that this results in a hollow/null brush */ + return GreCreateNullBrush(); + } + /* Allocate a buffer large enough to hold the complete packed DIB */ pvSaveDIB = ExAllocatePoolWithTag(PagedPool, cjDIBSize, TAG_DIB); if (pvSaveDIB == NULL) @@ -468,18 +475,22 @@ entries directly, instead we need to create a fake palette containing pal indices, which is converted into a real palette when the brush is realized. */ - if (iUsage == DIB_PAL_COLORS) iUsage = DIB_PAL_BRUSHHACK; + if (iUsage == DIB_PAL_COLORS) + { + iUsage = DIB_PAL_BRUSHHACK; + flAttr |= BR_IS_DIBPALCOLORS; + } /* Create the pattern bitmap from the DIB. */ hbmPattern = GreCreateDIBitmapInternal(NULL, pbmi->bmiHeader.biWidth, abs(pbmi->bmiHeader.biHeight), - CBM_INIT, + CBM_INIT | CBM_CREATDIB, pvSafeBits, pbmi, iUsage,// FIXME!!! + cjDIBSize - cjInfoSize, 0, - cjDIBSize - cjInfoSize, NULL); /* Free the buffer already */ @@ -492,9 +503,6 @@ return NULL; } - /* Remember if the palette consists of palette indices */ - if (iUsage == DIB_PAL_COLORS) flAttr |= BR_IS_DIBPALCOLORS; - /* Call the internal worker function */ return GreCreateBrushInternal(0, hbmPattern, pvPackedDIB, 0, flAttr); } Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] Tue Jul 23 15:31:43 2013 @@ -286,7 +286,7 @@ the number of colors in the DC palette */ WORD wIndex = pwColors[i] % ppalDC->NumColors; - /* USe the RGB value from the DC palette */ + /* Use the RGB value from the DC palette */ crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, wIndex); PALETTE_vSetRGBColorForIndex(ppal, i, crColor); } @@ -644,6 +644,7 @@ if ((iUsage == DIB_PAL_COLORS) && !pdc) goto cleanup; iFormat = psurfDIB->SurfObj.iBitmapFormat; + if (iFormat > BMF_32BPP) goto cleanup; if (psurfDIB) { @@ -1354,7 +1355,7 @@ yTop = cyDIB - (iStartScan + cNumScan); /* Bail out if the intersecion between scanlines and copy area is empty */ - if ((ySrc > yTop + cNumScan) || (ySrc + (INT)cy < yTop)) goto leave; + if ((ySrc > yTop + (INT)cNumScan) || (ySrc + (INT)cy < yTop)) goto leave; /* Check if the copy area starts below or at the topmost scanline */ if (ySrc >= yTop)

1 0

[aandrejevic] 59563: [NTVDM] Implement several INT 21h functions.
by aandrejevic＠svn.reactos.org 23 Jul '13

23 Jul '13

Author: aandrejevic Date: Tue Jul 23 14:43:03 2013 New Revision: 59563 URL: http://svn.reactos.org/svn/reactos?rev=59563&view=rev Log: [NTVDM] Implement several INT 21h functions. Modified: branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/dos.h Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Tue Jul 23 14:43:03 2013 @@ -704,13 +704,58 @@ return Result; } -BOOLEAN DosCloseHandle(WORD DosHandle) +WORD DosSeekFile(WORD FileHandle, LONG Offset, BYTE Origin, LPDWORD NewOffset) +{ + WORD Result = ERROR_SUCCESS; + DWORD FilePointer; + HANDLE Handle = DosGetRealHandle(FileHandle); + + DPRINT("DosSeekFile: FileHandle 0x%04X, Offset 0x%08X, Origin 0x%02X\n", + FileHandle, + Offset, + Origin); + + /* Make sure the handle is valid */ + if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_HANDLE; + + /* Check if the origin is valid */ + if (Origin != FILE_BEGIN && Origin != FILE_CURRENT && Origin != FILE_END) + { + return ERROR_INVALID_FUNCTION; + } + + /* Move the file pointer */ + FilePointer = SetFilePointer(Handle, Offset, NULL, Origin); + + /* Check if there's a possibility the operation failed */ + if (FilePointer == INVALID_SET_FILE_POINTER) + { + /* Get the real error code */ + Result = GetLastError(); + } + + if (Result != ERROR_SUCCESS) + { + /* The operation did fail */ + return Result; + } + + /* Return the file pointer, if requested */ + if (NewOffset) *NewOffset = FilePointer; + + /* Return success */ + return ERROR_SUCCESS; +} + +BOOLEAN DosDuplicateHandle(WORD OldHandle, WORD NewHandle) { BYTE SftIndex; PDOS_PSP PspBlock; LPBYTE HandleTable; - DPRINT("DosCloseHandle: DosHandle 0x%04X\n", DosHandle); + DPRINT("DosDuplicateHandle: OldHandle 0x%04X, NewHandle 0x%04X\n", + OldHandle, + NewHandle); /* The system PSP has no handle table */ if (CurrentPsp == SYSTEM_PSP) return FALSE; @@ -719,6 +764,42 @@ PspBlock = SEGMENT_TO_PSP(CurrentPsp); HandleTable = (LPBYTE)FAR_POINTER(PspBlock->HandleTablePtr); + /* Make sure the old handle is open */ + if (HandleTable[OldHandle] == 0xFF) return FALSE; + + /* Check if the new handle is open */ + if (HandleTable[NewHandle] != 0xFF) + { + /* Close it */ + DosCloseHandle(NewHandle); + } + + /* Increment the reference count of the SFT entry */ + SftIndex = HandleTable[OldHandle]; + DosSftRefCount[SftIndex]++; + + /* Make the new handle point to that SFT entry */ + HandleTable[NewHandle] = SftIndex; + + /* Return success */ + return TRUE; +} + +BOOLEAN DosCloseHandle(WORD DosHandle) +{ + BYTE SftIndex; + PDOS_PSP PspBlock; + LPBYTE HandleTable; + + DPRINT("DosCloseHandle: DosHandle 0x%04X\n", DosHandle); + + /* The system PSP has no handle table */ + if (CurrentPsp == SYSTEM_PSP) return FALSE; + + /* Get a pointer to the handle table */ + PspBlock = SEGMENT_TO_PSP(CurrentPsp); + HandleTable = (LPBYTE)FAR_POINTER(PspBlock->HandleTablePtr); + /* Make sure the handle is open */ if (HandleTable[DosHandle] == 0xFF) return FALSE; @@ -735,6 +816,9 @@ /* Clear the handle */ DosSystemFileTable[SftIndex] = INVALID_HANDLE_VALUE; } + + /* Clear the entry in the JFT */ + HandleTable[DosHandle] = 0xFF; return TRUE; } @@ -1547,10 +1631,156 @@ break; } + /* Delete File */ + case 0x41: + { + LPSTR FileName = (LPSTR)((ULONG_PTR)BaseAddress + TO_LINEAR(DataSegment, Edx)); + + /* Call the API function */ + if (DeleteFileA(FileName)) EmulatorClearFlag(EMULATOR_FLAG_CF); + else + { + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, GetLastError()); + } + + break; + } + + /* Seek File */ + case 0x42: + { + DWORD NewLocation; + WORD ErrorCode = DosSeekFile(LOWORD(Ebx), + MAKELONG(LOWORD(Edx), LOWORD(Ecx)), + LOBYTE(Eax), + &NewLocation); + + if (ErrorCode == 0) + { + /* Clear CF */ + EmulatorClearFlag(EMULATOR_FLAG_CF); + + /* Return the new offset in DX:AX */ + EmulatorSetRegister(EMULATOR_REG_DX, + (Edx & 0xFFFF0000) | HIWORD(NewLocation)); + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | LOWORD(NewLocation)); + } + else + { + /* Set CF */ + EmulatorSetFlag(EMULATOR_FLAG_CF); + + /* Return the error code in AX */ + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | ErrorCode); + } + + break; + } + + /* Get/Set File Attributes */ + case 0x43: + { + DWORD Attributes; + LPSTR FileName = (LPSTR)((ULONG_PTR)BaseAddress + TO_LINEAR(DataSegment, Edx)); + + if (LOBYTE(Eax) == 0x00) + { + /* Get the attributes */ + Attributes = GetFileAttributesA(FileName); + + /* Check if it failed */ + if (Attributes == INVALID_FILE_ATTRIBUTES) + { + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, GetLastError()); + + break; + } + + /* Return the attributes that DOS can understand */ + EmulatorClearFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_CX, + (Ecx & 0xFFFFFF00) | LOBYTE(Attributes)); + } + else if (LOBYTE(Eax) == 0x01) + { + /* Try to set the attributes */ + if (SetFileAttributesA(FileName, LOBYTE(Ecx))) + { + EmulatorClearFlag(EMULATOR_FLAG_CF); + } + else + { + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, GetLastError()); + } + } + else + { + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_FUNCTION); + } + + break; + } + /* IOCTL */ case 0x44: { DosHandleIoctl(LOBYTE(Eax), LOWORD(Ebx)); + + break; + } + + /* Duplicate Handle */ + case 0x45: + { + WORD NewHandle; + HANDLE Handle = DosGetRealHandle(LOWORD(Ebx)); + + if (Handle != INVALID_HANDLE_VALUE) + { + /* The handle is invalid */ + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_HANDLE); + + break; + } + + /* Open a new handle to the same entry */ + NewHandle = DosOpenHandle(Handle); + + if (NewHandle == INVALID_DOS_HANDLE) + { + /* Too many files open */ + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_TOO_MANY_OPEN_FILES); + + break; + } + + /* Return the result */ + EmulatorClearFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, NewHandle); + + break; + } + + /* Force Duplicate Handle */ + case 0x46: + { + if (DosDuplicateHandle(LOWORD(Ebx), LOWORD(Ecx))) + { + EmulatorClearFlag(EMULATOR_FLAG_CF); + } + else + { + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_HANDLE); + } break; } @@ -1615,6 +1845,14 @@ case 0x4C: { DosTerminateProcess(CurrentPsp, LOBYTE(Eax)); + break; + } + + /* Get Current Process */ + case 0x51: + { + EmulatorSetRegister(EMULATOR_REG_BX, CurrentPsp); + break; } Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Tue Jul 23 14:43:03 2013 @@ -109,6 +109,9 @@ WORD DosOpenFile(LPWORD Handle, LPCSTR FilePath, BYTE AccessMode); WORD DosReadFile(WORD FileHandle, LPVOID Buffer, WORD Count, LPWORD BytesRead); WORD DosWriteFile(WORD FileHandle, LPVOID Buffer, WORD Count, LPWORD BytesWritten); +WORD DosSeekFile(WORD FileHandle, LONG Offset, BYTE Origin, LPDWORD NewOffset); +BOOLEAN DosDuplicateHandle(WORD OldHandle, WORD NewHandle); +BOOLEAN DosCloseHandle(WORD DosHandle); VOID DosInitializePsp(WORD PspSegment, LPCSTR CommandLine, WORD ProgramSize, WORD Environment); BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock); VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode);

1 0

[gadamopoulos] 59562: - forgot this file
by gadamopoulos＠svn.reactos.org 23 Jul '13

23 Jul '13

Author: gadamopoulos Date: Tue Jul 23 10:59:05 2013 New Revision: 59562 URL: http://svn.reactos.org/svn/reactos?rev=59562&view=rev Log: - forgot this file Modified: trunk/reactos/dll/win32/shell32/rgs_res.rc Modified: trunk/reactos/dll/win32/shell32/rgs_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/rgs_res.… ============================================================================== --- trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] Tue Jul 23 10:59:05 2013 @@ -9,6 +9,7 @@ IDR_FOLDEROPTIONS REGISTRY "res/rgs/folderoptions.rgs" IDR_FOLDERSHORTCUT REGISTRY "res/rgs/foldershortcut.rgs" IDR_FONTSFOLDERSHORTCUT REGISTRY "res/rgs/fontsfoldershortcut.rgs" +IDR_MENUBAND REGISTRY "res/rgs/menuband.rgs" IDR_MENUBANDSITE REGISTRY "res/rgs/menubandsite.rgs" IDR_MYCOMPUTER REGISTRY "res/rgs/mycomputer.rgs" IDR_MYDOCUMENTS REGISTRY "res/rgs/mydocuments.rgs"

1 0

[gadamopoulos] 59561: [shell32] - Stub CMenuBand class
by gadamopoulos＠svn.reactos.org 23 Jul '13

23 Jul '13

Author: gadamopoulos Date: Tue Jul 23 10:53:06 2013 New Revision: 59561 URL: http://svn.reactos.org/svn/reactos?rev=59561&view=rev Log: [shell32] - Stub CMenuBand class Added: trunk/reactos/dll/win32/shell32/CMenuBand.cpp (with props) trunk/reactos/dll/win32/shell32/CMenuBand.h (with props) trunk/reactos/dll/win32/shell32/res/rgs/menuband.rgs (with props) Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/shell32_main.cpp trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Tue Jul 23 10:53:06 2013 @@ -23,6 +23,7 @@ classes.cpp clipboard.cpp control.cpp + CMenuBand.cpp dataobject.cpp dde.cpp debughlp.cpp Added: trunk/reactos/dll/win32/shell32/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuBan… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuBand.cpp (added) +++ trunk/reactos/dll/win32/shell32/CMenuBand.cpp [iso-8859-1] Tue Jul 23 10:53:06 2013 @@ -0,0 +1,312 @@ +/* + * PROJECT: shell32 + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/shell32/CMenuBand.c + * PURPOSE: menu band implementation + * PROGRAMMERS: Giannis Adamopoulos (gadamopoulos(a)reactos.org) + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand); + +HRESULT STDMETHODCALLTYPE CMenuBand::GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::ShowDW(BOOL fShow) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::CloseDW(DWORD dwReserved) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetWindow(HWND *phwnd) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::ContextSensitiveHelp(BOOL fEnterMode) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetSite(IUnknown *pUnkSite) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetSite(REFIID riid, PVOID *ppvSite) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::HasFocusIO() +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::TranslateAcceleratorIO(LPMSG lpMsg) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::IsDirty() +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Load(IStream *pStm) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Save(IStream *pStm, BOOL fClearDirty) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetSizeMax(ULARGE_INTEGER *pcbSize) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetClassID(CLSID *pClassID) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::OnSelect(DWORD dwSelectType) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetSubMenu(IMenuPopup *pmp, BOOL fSet) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetClient(IUnknown *punkClient) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetClient(IUnknown **ppunkClient) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::OnPosRectChangeDB(RECT *prc) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::IsMenuMessage(MSG *pmsg) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::TranslateMenuMessage(MSG *pmsg, LRESULT *plRet) +{ + UNIMPLEMENTED; + return S_FALSE; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Initialize(IShellMenuCallback *psmc, UINT uId, UINT uIdAncestor,DWORD dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetMenuInfo(IShellMenuCallback **ppsmc, UINT *puId, UINT *puIdAncestor, DWORD *pdwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::InvalidateItem(LPSMDATA psmd, DWORD dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetState(LPSMDATA psmd) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetMenuToolbar(IUnknown *punk, DWORD dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::IsWindowOwner(HWND hWnd) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetSubMenu(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetToolbar(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetMinWidth(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetNoBorder(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetTheme(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetTop(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetBottom(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetTracked(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetParentSite(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetState(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::DoDefaultAction(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::IsEmpty(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + Propchange: trunk/reactos/dll/win32/shell32/CMenuBand.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shell32/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuBan… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuBand.h (added) +++ trunk/reactos/dll/win32/shell32/CMenuBand.h [iso-8859-1] Tue Jul 23 10:53:06 2013 @@ -0,0 +1,125 @@ + +class CMenuBand : + public CComCoClass<CMenuBand, &CLSID_MenuBand>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IDeskBand, + public IObjectWithSite, + public IInputObject, + public IPersistStream, + public IOleCommandTarget, + public IServiceProvider, + public IMenuPopup, + public IMenuBand, + public IShellMenu2, + public IWinEventHandler, + public IShellMenuAcc +{ +public : + + // *** IDeskBand methods *** + virtual HRESULT STDMETHODCALLTYPE GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi); + + // *** IDockingWindow methods *** + virtual HRESULT STDMETHODCALLTYPE ShowDW(BOOL fShow); + virtual HRESULT STDMETHODCALLTYPE CloseDW(DWORD dwReserved); + virtual HRESULT STDMETHODCALLTYPE ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved); + + // *** IOleWindow methods *** + virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); + virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); + + // *** IObjectWithSite methods *** + virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); + virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite); + + // *** IInputObject methods *** + virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg); + virtual HRESULT STDMETHODCALLTYPE HasFocusIO(); + virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg); + + // *** IPersistStream methods *** + virtual HRESULT STDMETHODCALLTYPE IsDirty(); + virtual HRESULT STDMETHODCALLTYPE Load(IStream *pStm); + virtual HRESULT STDMETHODCALLTYPE Save(IStream *pStm, BOOL fClearDirty); + virtual HRESULT STDMETHODCALLTYPE GetSizeMax(ULARGE_INTEGER *pcbSize); + + // *** IPersist methods *** + virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID); + + // *** IOleCommandTarget methods *** + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + + // *** IServiceProvider methods *** + virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); + + // *** IMenuPopup methods *** + virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags); + virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType); + virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet); + + // *** IDeskBar methods *** + virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient); + virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient); + virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(RECT *prc); + + // *** IMenuBand methods *** + virtual HRESULT STDMETHODCALLTYPE IsMenuMessage(MSG *pmsg); + virtual HRESULT STDMETHODCALLTYPE TranslateMenuMessage(MSG *pmsg, LRESULT *plRet); + + // *** IShellMenu methods *** + virtual HRESULT STDMETHODCALLTYPE Initialize(IShellMenuCallback *psmc, UINT uId, UINT uIdAncestor,DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetMenuInfo(IShellMenuCallback **ppsmc, UINT *puId, UINT *puIdAncestor, DWORD *pdwFlags); + virtual HRESULT STDMETHODCALLTYPE SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv); + virtual HRESULT STDMETHODCALLTYPE SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); + virtual HRESULT STDMETHODCALLTYPE InvalidateItem(LPSMDATA psmd, DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetState(LPSMDATA psmd); + virtual HRESULT STDMETHODCALLTYPE SetMenuToolbar(IUnknown *punk, DWORD dwFlags); + + // *** IWinEventHandler methods *** + virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult); + virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND hWnd); + + // *** IShellMenu2 methods *** + virtual HRESULT STDMETHODCALLTYPE GetSubMenu(THIS); + virtual HRESULT STDMETHODCALLTYPE SetToolbar(THIS); + virtual HRESULT STDMETHODCALLTYPE SetMinWidth(THIS); + virtual HRESULT STDMETHODCALLTYPE SetNoBorder(THIS); + virtual HRESULT STDMETHODCALLTYPE SetTheme(THIS); + + // *** IShellMenuAcc methods *** + virtual HRESULT STDMETHODCALLTYPE GetTop(THIS); + virtual HRESULT STDMETHODCALLTYPE GetBottom(THIS); + virtual HRESULT STDMETHODCALLTYPE GetTracked(THIS); + virtual HRESULT STDMETHODCALLTYPE GetParentSite(THIS); + virtual HRESULT STDMETHODCALLTYPE GetState(THIS); + virtual HRESULT STDMETHODCALLTYPE DoDefaultAction(THIS); + virtual HRESULT STDMETHODCALLTYPE IsEmpty(THIS); + +DECLARE_REGISTRY_RESOURCEID(IDR_MENUBAND) +DECLARE_NOT_AGGREGATABLE(CMenuBand) +DECLARE_PROTECT_FINAL_CONSTRUCT() + +BEGIN_COM_MAP(CMenuBand) + COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup) + COM_INTERFACE_ENTRY_IID(IID_IMenuBand, IMenuBand) + COM_INTERFACE_ENTRY_IID(IID_IShellMenu, IShellMenu) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow) + COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IDeskBar) + COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) + COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IMenuBand, IMenuBand) + COM_INTERFACE_ENTRY_IID(IID_IShellMenu2, IShellMenu2) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_IShellMenuAcc, IShellMenuAcc) +END_COM_MAP() + +}; Propchange: trunk/reactos/dll/win32/shell32/CMenuBand.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Tue Jul 23 10:53:06 2013 @@ -70,6 +70,7 @@ #include "startmenu.h" #include "filedefext.h" #include "drvdefext.h" +#include "CMenuBand.h" #include <wine/debug.h> Added: trunk/reactos/dll/win32/shell32/res/rgs/menuband.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/menuband.rgs (added) +++ trunk/reactos/dll/win32/shell32/res/rgs/menuband.rgs [iso-8859-1] Tue Jul 23 10:53:06 2013 @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {5B4DAE26-B807-11D0-9815-00C04FD91972} = s 'Menu Band' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } +} Propchange: trunk/reactos/dll/win32/shell32/res/rgs/menuband.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Tue Jul 23 10:53:06 2013 @@ -1368,6 +1368,7 @@ OBJECT_ENTRY(CLSID_NewMenu, CNewMenu) OBJECT_ENTRY(CLSID_StartMenu, CStartMenu) OBJECT_ENTRY(CLSID_MenuBandSite, CMenuBandSite) + OBJECT_ENTRY(CLSID_MenuBand, CMenuBand) END_OBJECT_MAP() CShell32Module gModule; Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Tue Jul 23 10:53:06 2013 @@ -537,5 +537,6 @@ #define IDR_OPENWITHMENU 146 #define IDR_FILEDEFEXT 147 #define IDR_DRVDEFEXT 148 +#define IDR_MENUBAND 149 #endif

1 0

[ekohl] 59560: [SAMSRV] SamrChangePasswordUser: - Check the MinPasswordAge before trying to change the password. - Set the PasswordLastSet time if the password has been changed successfully. - Set ...
by ekohl＠svn.reactos.org 22 Jul '13

22 Jul '13

Author: ekohl Date: Mon Jul 22 21:27:33 2013 New Revision: 59560 URL: http://svn.reactos.org/svn/reactos?rev=59560&view=rev Log: [SAMSRV] SamrChangePasswordUser: - Check the MinPasswordAge before trying to change the password. - Set the PasswordLastSet time if the password has been changed successfully. - Set the BadPasswordCount and LastBadPasswordTime if the caller tried to set a bad password. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Mon Jul 22 21:27:33 2013 @@ -7475,9 +7475,15 @@ PENCRYPTED_LM_OWF_PASSWORD NewLmPassword; PENCRYPTED_NT_OWF_PASSWORD OldNtPassword; PENCRYPTED_NT_OWF_PASSWORD NewNtPassword; + BOOLEAN StoredLmPresent = FALSE; + BOOLEAN StoredNtPresent = FALSE; + BOOLEAN StoredLmEmpty = TRUE; + BOOLEAN StoredNtEmpty = TRUE; PSAM_DB_OBJECT UserObject; ULONG Length; - SAM_USER_FIXED_DATA FixedUserData; + SAM_USER_FIXED_DATA UserFixedData; + SAM_DOMAIN_FIXED_DATA DomainFixedData; + LARGE_INTEGER SystemTime; NTSTATUS Status; TRACE("(%p %u %p %p %u %p %p %u %p %u %p)\n", @@ -7493,6 +7499,14 @@ if (!NT_SUCCESS(Status)) { TRACE("SampValidateDbObject failed with status 0x%08lx\n", Status); + return Status; + } + + /* Get the current time */ + Status = NtQuerySystemTime(&SystemTime); + if (!NT_SUCCESS(Status)) + { + TRACE("NtQuerySystemTime failed (Status 0x%08lx)\n", Status); return Status; } @@ -7503,9 +7517,16 @@ NULL, &StoredLmPassword, &Length); - if (!NT_SUCCESS(Status)) - { - + if (NT_SUCCESS(Status)) + { + if (Length == sizeof(ENCRYPTED_LM_OWF_PASSWORD)) + { + StoredLmPresent = TRUE; + if (!RtlEqualMemory(&StoredLmPassword, + &EmptyLmHash, + sizeof(ENCRYPTED_LM_OWF_PASSWORD))) + StoredLmEmpty = FALSE; + } } /* Retrieve the NT password */ @@ -7515,9 +7536,52 @@ NULL, &StoredNtPassword, &Length); - if (!NT_SUCCESS(Status)) - { - + if (NT_SUCCESS(Status)) + { + if (Length == sizeof(ENCRYPTED_NT_OWF_PASSWORD)) + { + StoredNtPresent = TRUE; + if (!RtlEqualMemory(&StoredNtPassword, + &EmptyNtHash, + sizeof(ENCRYPTED_NT_OWF_PASSWORD))) + StoredNtEmpty = FALSE; + } + } + + /* Retrieve the fixed size user data */ + Length = sizeof(SAM_USER_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject, + L"F", + NULL, + &UserFixedData, + &Length); + if (!NT_SUCCESS(Status)) + { + TRACE("SampGetObjectAttribute failed to retrieve the fixed user data (Status 0x%08lx)\n", Status); + return Status; + } + + /* Check if we can change the password at this time */ + if ((StoredNtEmpty == FALSE) || (StoredNtEmpty == FALSE)) + { + /* Get fixed domain data */ + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject->ParentObject, + L"F", + NULL, + &DomainFixedData, + &Length); + if (!NT_SUCCESS(Status)) + { + TRACE("SampGetObjectAttribute failed to retrieve the fixed domain data (Status 0x%08lx)\n", Status); + return Status; + } + + if (DomainFixedData.MinPasswordAge.QuadPart > 0) + { + if (SystemTime.QuadPart < (UserFixedData.PasswordLastSet.QuadPart + DomainFixedData.MinPasswordAge.QuadPart)) + return STATUS_ACCOUNT_RESTRICTION; + } } /* FIXME: Decrypt passwords */ @@ -7588,26 +7652,32 @@ LmPresent); if (NT_SUCCESS(Status)) { - /* Get the fixed size user data */ + /* Update PasswordLastSet */ + UserFixedData.PasswordLastSet.QuadPart = SystemTime.QuadPart; + + /* Set the fixed size user data */ Length = sizeof(SAM_USER_FIXED_DATA); - Status = SampGetObjectAttribute(UserObject, + Status = SampSetObjectAttribute(UserObject, L"F", - NULL, - &FixedUserData, - &Length); - if (NT_SUCCESS(Status)) - { - /* Update PasswordLastSet */ - NtQuerySystemTime(&FixedUserData.PasswordLastSet); - - /* Set the fixed size user data */ - Status = SampSetObjectAttribute(UserObject, - L"F", - REG_BINARY, - &FixedUserData, - Length); - } - } + REG_BINARY, + &UserFixedData, + Length); + } + } + + if (Status == STATUS_WRONG_PASSWORD) + { + /* Update BadPasswordCount and LastBadPasswordTime */ + UserFixedData.BadPasswordCount++; + UserFixedData.LastBadPasswordTime.QuadPart = SystemTime.QuadPart; + + /* Set the fixed size user data */ + Length = sizeof(SAM_USER_FIXED_DATA); + Status = SampSetObjectAttribute(UserObject, + L"F", + REG_BINARY, + &UserFixedData, + Length); } return Status;

1 0

[aandrejevic] 59559: [NTVDM] Add the program name after the environment block.
by aandrejevic＠svn.reactos.org 22 Jul '13

22 Jul '13

Author: aandrejevic Date: Mon Jul 22 20:21:46 2013 New Revision: 59559 URL: http://svn.reactos.org/svn/reactos?rev=59559&view=rev Log: [NTVDM] Add the program name after the environment block. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Mon Jul 22 20:21:46 2013 @@ -54,7 +54,7 @@ } } -static WORD DosCopyEnvironmentBlock(WORD SourceSegment) +static WORD DosCopyEnvironmentBlock(WORD SourceSegment, LPCSTR ProgramName) { PCHAR Ptr, SourceBuffer, DestBuffer = NULL; ULONG TotalSize = 0; @@ -70,6 +70,9 @@ } TotalSize++; + /* Add the string buffer size */ + TotalSize += strlen(ProgramName) + 1; + /* Allocate the memory for the environment block */ DestSegment = DosAllocateMemory((TotalSize + 0x0F) >> 4, NULL); if (!DestSegment) return 0; @@ -91,7 +94,10 @@ } /* Set the final zero */ - *DestBuffer = 0; + *(DestBuffer++) = 0; + + /* Copy the program name after the environment block */ + strcpy(DestBuffer, ProgramName); return DestSegment; } @@ -846,7 +852,8 @@ /* No, copy the one from the parent */ EnvBlock = DosCopyEnvironmentBlock((CurrentPsp != SYSTEM_PSP) ? SEGMENT_TO_PSP(CurrentPsp)->EnvBlock - : SYSTEM_ENV_BLOCK); + : SYSTEM_ENV_BLOCK, + ProgramFilePath); } /* Check if this is an EXE file or a COM file */

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