Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[aandrejevic] 72518: [NTVDM:SVGA] Halfplement (or perhaps hackplement) SVGA packed pixel addressing.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Aug 31 05:38:56 2016 New Revision: 72518 URL: http://svn.reactos.org/svn/reactos?rev=72518&view=rev Log: [NTVDM:SVGA] Halfplement (or perhaps hackplement) SVGA packed pixel addressing. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Wed Aug 31 05:38:56 2016 @@ -317,7 +317,12 @@ static inline DWORD VgaGetAddressSize(VOID) { - if (VgaCrtcRegisters[VGA_CRTC_UNDERLINE_REG] & VGA_CRTC_UNDERLINE_DWORD) + if (VgaSeqRegisters[SVGA_SEQ_EXT_MODE_REG] & SVGA_SEQ_EXT_MODE_HIGH_RES) + { + /* Packed pixel addressing */ + return 1; + } + else if (VgaCrtcRegisters[VGA_CRTC_UNDERLINE_REG] & VGA_CRTC_UNDERLINE_DWORD) { /* Double-word addressing */ return 4; // sizeof(DWORD) @@ -735,7 +740,8 @@ DWORD Address = StartAddressLatch; BYTE BytePanning = (VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] >> 5) & 3; WORD LineCompare = VgaCrtcRegisters[VGA_CRTC_LINE_COMPARE_REG] - | ((VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_LC8) << 4); + | ((VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_LC8) << 4) + | ((VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & VGA_CRTC_MAXSCANLINE_LC9) << 3); BYTE PixelShift = VgaAcRegisters[VGA_AC_HORZ_PANNING_REG] & 0x0F; /* @@ -815,99 +821,109 @@ X = j + ((PixelShift < 8) ? PixelShift : -1); } - /* Check the shifting mode */ - if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_SHIFT256) + if (VgaSeqRegisters[SVGA_SEQ_EXT_MODE_REG] & SVGA_SEQ_EXT_MODE_HIGH_RES) { - /* 4 bits shifted from each plane */ - - /* Check if this is 16 or 256 color mode */ - if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) + // TODO: Check for high color modes + + /* 256 color mode */ + PixelData = VgaMemory[Address + X]; + } + else + { + /* Check the shifting mode */ + if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_SHIFT256) { - /* One byte per pixel */ - PixelData = VgaMemory[WRAP_OFFSET((Address + (X / VGA_NUM_BANKS)) * AddressSize) - * VGA_NUM_BANKS + (X % VGA_NUM_BANKS)]; - } - else - { - /* 4-bits per pixel */ - - PixelData = VgaMemory[WRAP_OFFSET((Address + (X / (VGA_NUM_BANKS * 2))) * AddressSize) - * VGA_NUM_BANKS + (X % VGA_NUM_BANKS)]; - - /* Check if we should use the highest 4 bits or lowest 4 */ - if (((X / VGA_NUM_BANKS) % 2) == 0) + /* 4 bits shifted from each plane */ + + /* Check if this is 16 or 256 color mode */ + if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) { - /* Highest 4 */ - PixelData >>= 4; + /* One byte per pixel */ + PixelData = VgaMemory[WRAP_OFFSET((Address + (X / VGA_NUM_BANKS)) * AddressSize) + * VGA_NUM_BANKS + (X % VGA_NUM_BANKS)]; } else { - /* Lowest 4 */ - PixelData &= 0x0F; + /* 4-bits per pixel */ + + PixelData = VgaMemory[WRAP_OFFSET((Address + (X / (VGA_NUM_BANKS * 2))) * AddressSize) + * VGA_NUM_BANKS + (X % VGA_NUM_BANKS)]; + + /* Check if we should use the highest 4 bits or lowest 4 */ + if (((X / VGA_NUM_BANKS) % 2) == 0) + { + /* Highest 4 */ + PixelData >>= 4; + } + else + { + /* Lowest 4 */ + PixelData &= 0x0F; + } } } - } - else if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_SHIFTREG) - { - /* Check if this is 16 or 256 color mode */ - if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) + else if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_SHIFTREG) { - // TODO: NOT IMPLEMENTED - DPRINT1("8-bit interleaved mode is not implemented!\n"); - } - else - { - /* - * 2 bits shifted from plane 0 and 2 for the first 4 pixels, - * then 2 bits shifted from plane 1 and 3 for the next 4 - */ - DWORD BankNumber = (X / 4) % 2; - DWORD Offset = Address + (X / 8); - BYTE LowPlaneData = VgaMemory[WRAP_OFFSET(Offset * AddressSize) * VGA_NUM_BANKS + BankNumber]; - BYTE HighPlaneData = VgaMemory[WRAP_OFFSET(Offset * AddressSize) * VGA_NUM_BANKS + (BankNumber + 2)]; - - /* Extract the two bits from each plane */ - LowPlaneData = (LowPlaneData >> (6 - ((X % 4) * 2))) & 0x03; - HighPlaneData = (HighPlaneData >> (6 - ((X % 4) * 2))) & 0x03; - - /* Combine them into the pixel */ - PixelData = LowPlaneData | (HighPlaneData << 2); - } - } - else - { - /* 1 bit shifted from each plane */ - - /* Check if this is 16 or 256 color mode */ - if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) - { - /* 8 bits per pixel, 2 on each plane */ - - for (k = 0; k < VGA_NUM_BANKS; k++) + /* Check if this is 16 or 256 color mode */ + if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) { - /* The data is on plane k, 4 pixels per byte */ - BYTE PlaneData = VgaMemory[WRAP_OFFSET((Address + (X >> 2)) * AddressSize) * VGA_NUM_BANKS + k]; - - /* The mask of the first bit in the pair */ - BYTE BitMask = 1 << (((3 - (X % VGA_NUM_BANKS)) * 2) + 1); - - /* Bits 0, 1, 2 and 3 come from the first bit of the pair */ - if (PlaneData & BitMask) PixelData |= 1 << k; - - /* Bits 4, 5, 6 and 7 come from the second bit of the pair */ - if (PlaneData & (BitMask >> 1)) PixelData |= 1 << (k + 4); + // TODO: NOT IMPLEMENTED + DPRINT1("8-bit interleaved mode is not implemented!\n"); + } + else + { + /* + * 2 bits shifted from plane 0 and 2 for the first 4 pixels, + * then 2 bits shifted from plane 1 and 3 for the next 4 + */ + DWORD BankNumber = (X / 4) % 2; + DWORD Offset = Address + (X / 8); + BYTE LowPlaneData = VgaMemory[WRAP_OFFSET(Offset * AddressSize) * VGA_NUM_BANKS + BankNumber]; + BYTE HighPlaneData = VgaMemory[WRAP_OFFSET(Offset * AddressSize) * VGA_NUM_BANKS + (BankNumber + 2)]; + + /* Extract the two bits from each plane */ + LowPlaneData = (LowPlaneData >> (6 - ((X % 4) * 2))) & 0x03; + HighPlaneData = (HighPlaneData >> (6 - ((X % 4) * 2))) & 0x03; + + /* Combine them into the pixel */ + PixelData = LowPlaneData | (HighPlaneData << 2); } } else { - /* 4 bits per pixel, 1 on each plane */ - - for (k = 0; k < VGA_NUM_BANKS; k++) + /* 1 bit shifted from each plane */ + + /* Check if this is 16 or 256 color mode */ + if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) { - BYTE PlaneData = VgaMemory[WRAP_OFFSET((Address + (X >> 3)) * AddressSize) * VGA_NUM_BANKS + k]; - - /* If the bit on that plane is set, set it */ - if (PlaneData & (1 << (7 - (X % 8)))) PixelData |= 1 << k; + /* 8 bits per pixel, 2 on each plane */ + + for (k = 0; k < VGA_NUM_BANKS; k++) + { + /* The data is on plane k, 4 pixels per byte */ + BYTE PlaneData = VgaMemory[WRAP_OFFSET((Address + (X >> 2)) * AddressSize) * VGA_NUM_BANKS + k]; + + /* The mask of the first bit in the pair */ + BYTE BitMask = 1 << (((3 - (X % VGA_NUM_BANKS)) * 2) + 1); + + /* Bits 0, 1, 2 and 3 come from the first bit of the pair */ + if (PlaneData & BitMask) PixelData |= 1 << k; + + /* Bits 4, 5, 6 and 7 come from the second bit of the pair */ + if (PlaneData & (BitMask >> 1)) PixelData |= 1 << (k + 4); + } + } + else + { + /* 4 bits per pixel, 1 on each plane */ + + for (k = 0; k < VGA_NUM_BANKS; k++) + { + BYTE PlaneData = VgaMemory[WRAP_OFFSET((Address + (X >> 3)) * AddressSize) * VGA_NUM_BANKS + k]; + + /* If the bit on that plane is set, set it */ + if (PlaneData & (1 << (7 - (X % 8)))) PixelData |= 1 << k; + } } } } @@ -1687,6 +1703,7 @@ /* Save the scanline size */ ScanlineSizeLatch = ((DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] + (((DWORD)VgaCrtcRegisters[SVGA_CRTC_EXT_DISPLAY_REG] & SVGA_CRTC_EXT_OFFSET_BIT8) << 4)) * 2; + if (VgaSeqRegisters[SVGA_SEQ_EXT_MODE_REG] & SVGA_SEQ_EXT_MODE_HIGH_RES) ScanlineSizeLatch <<= 2; /* Save the starting address */ StartAddressLatch = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], @@ -1768,6 +1785,7 @@ /* Save the scanline size */ ScanlineSizeLatch = ((DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] + (((DWORD)VgaCrtcRegisters[SVGA_CRTC_EXT_DISPLAY_REG] & SVGA_CRTC_EXT_OFFSET_BIT8) << 4)) * 2; + if (VgaSeqRegisters[SVGA_SEQ_EXT_MODE_REG] & SVGA_SEQ_EXT_MODE_HIGH_RES) ScanlineSizeLatch <<= 2; /* Save the starting address */ StartAddressLatch = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], @@ -1797,12 +1815,11 @@ { VideoAddress = VgaTranslateAddress(Address); -#if 0 - /* Packed pixel mode - not used yet */ + /* Check for packed pixel, chain-4, and odd-even mode */ if (VgaSeqRegisters[SVGA_SEQ_EXT_MODE_REG] & SVGA_SEQ_EXT_MODE_HIGH_RES) { /* Just copy from the video memory */ - PVOID VideoMemory = &VgaMemory[VideoAddress * VGA_NUM_BANKS + (Address & 3)]; + PVOID VideoMemory = &VgaMemory[VideoAddress + (Address & 3)]; switch (Size) { @@ -1830,10 +1847,7 @@ #endif } } -#endif - - /* Check for chain-4 and odd-even mode */ - if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) + else if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) { i = 0; @@ -1979,38 +1993,78 @@ /* Also ignore if write access to all planes is disabled */ if ((VgaSeqRegisters[VGA_SEQ_MASK_REG] & 0x0F) == 0x00) return TRUE; - /* Loop through each byte */ - for (i = 0; i < Size; i++) - { - VideoAddress = VgaTranslateAddress(Address + i); - - for (j = 0; j < VGA_NUM_BANKS; j++) - { - /* Make sure the page is writeable */ - if (!(VgaSeqRegisters[VGA_SEQ_MASK_REG] & (1 << j))) continue; - - /* Check if this is chain-4 mode */ - if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) - { - if (((Address + i) & 0x03) != j) + if (!(VgaSeqRegisters[SVGA_SEQ_EXT_MODE_REG] & SVGA_SEQ_EXT_MODE_HIGH_RES)) + { + /* Loop through each byte */ + for (i = 0; i < Size; i++) + { + VideoAddress = VgaTranslateAddress(Address + i); + + for (j = 0; j < VGA_NUM_BANKS; j++) + { + /* Make sure the page is writeable */ + if (!(VgaSeqRegisters[VGA_SEQ_MASK_REG] & (1 << j))) continue; + + /* Check if this is chain-4 mode */ + if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) { - /* This plane will not be accessed */ - continue; + if (((Address + i) & 0x03) != j) + { + /* This plane will not be accessed */ + continue; + } } - } - - /* Check if this is odd-even mode */ - if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_OE) - { - if (((Address + i) & 0x01) != (j & 1)) + + /* Check if this is odd-even mode */ + if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_OE) { - /* This plane will not be accessed */ - continue; + if (((Address + i) & 0x01) != (j & 1)) + { + /* This plane will not be accessed */ + continue; + } } - } - - /* Copy the value to the VGA memory */ - VgaMemory[VideoAddress * VGA_NUM_BANKS + j] = VgaTranslateByteForWriting(BufPtr[i], j); + + /* Copy the value to the VGA memory */ + VgaMemory[VideoAddress * VGA_NUM_BANKS + j] = VgaTranslateByteForWriting(BufPtr[i], j); + } + } + } + else + { + PVOID VideoMemory; + + // TODO: Apply the page write mask! + // TODO: Check whether the write mode stuff applies to packed-pixel modes + + /* Just copy to the video memory */ + VideoAddress = VgaTranslateAddress(Address); + VideoMemory = &VgaMemory[VideoAddress + (Address & 3)]; + + switch (Size) + { + case sizeof(UCHAR): + *(PUCHAR)VideoMemory = *(PUCHAR)Buffer; + return TRUE; + + case sizeof(USHORT): + *(PUSHORT)VideoMemory = *(PUSHORT)Buffer; + return TRUE; + + case sizeof(ULONG): + *(PULONG)VideoMemory = *(PULONG)Buffer; + return TRUE; + + case sizeof(ULONGLONG): + *(PULONGLONG)VideoMemory = *(PULONGLONG)Buffer; + return TRUE; + + default: +#if defined(__GNUC__) + __builtin_memcpy(VideoMemory, Buffer, Size); +#else + RtlCopyMemory(VideoMemory, Buffer, Size); +#endif } } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] Wed Aug 31 05:38:56 2016 @@ -182,6 +182,7 @@ /* CRTC max scanline register bits */ #define VGA_CRTC_MAXSCANLINE_DOUBLE (1 << 7) +#define VGA_CRTC_MAXSCANLINE_LC9 (1 << 6) /* CRTC mode control register bits */ #define VGA_CRTC_MODE_CONTROL_WRAP (1 << 5)

8 years, 3 months

[jimtabor] 72517: [NtUser] - Fix mouse move auto selecting while tracking popup menu. See CORE-2338.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 31 02:24:14 2016 New Revision: 72517 URL: http://svn.reactos.org/svn/reactos?rev=72517&view=rev Log: [NtUser] - Fix mouse move auto selecting while tracking popup menu. See CORE-2338. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Wed Aug 31 02:24:14 2016 @@ -3471,7 +3471,15 @@ if ( PtMenu ) { if (IS_SYSTEM_MENU(PtMenu)) + { Index = 0; + //// ReactOS only HACK: CORE-2338 + // Windows tracks mouse moves to the system menu but does not open it. + // Only keyboard tracking can do that. + // + TRACE("SystemMenu\n"); + return TRUE; // Stay inside the Loop! + } else MENU_FindItemByCoords( PtMenu, pmt->Pt, &Index ); }

8 years, 3 months

[aandrejevic] 72516: [NTVDM:BIOS] Implement VESA function AH = 07h.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Aug 30 22:52:49 2016 New Revision: 72516 URL: http://svn.reactos.org/svn/reactos?rev=72516&view=rev Log: [NTVDM:BIOS] Implement VESA function AH = 07h. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] Tue Aug 30 22:52:49 2016 @@ -653,6 +653,104 @@ break; } + /* Get/Set Display Start */ + case 0x07: + { + DWORD StartAddress; + BYTE Value; + PCVBE_MODE Mode = VbeGetModeByNumber(Bda->VideoMode); + BYTE OldCrtcIndex = IOReadB(VGA_CRTC_INDEX_COLOR); + + if (getBL() & 0x80) + { + /* Wait for a vertical retrace */ + if (!(IOReadB(VGA_INSTAT1_READ_COLOR) & VGA_STAT_VRETRACE)) + { + setCF(1); + break; + } + + setCF(0); + } + + switch (getBL() & 0x7F) + { + /* Set Display Start */ + case 0x00: + { + setAL(0x4F); + + if (Mode == NULL || Mode->Info == NULL) + { + /* This is not a VBE mode */ + // TODO: Support anyway, perhaps? It can be done. + setAH(0x01); + break; + } + + StartAddress = getCX() + getDX() * Mode->Info->BytesPerScanline; + + IOWriteB(VGA_CRTC_INDEX_COLOR, SVGA_CRTC_OVERLAY_REG); + Value = IOReadB(VGA_CRTC_DATA_COLOR); + Value &= ~SVGA_CRTC_EXT_ADDR_BIT19; + Value |= (StartAddress >> 12) & SVGA_CRTC_EXT_ADDR_BIT19; + IOWriteB(VGA_CRTC_DATA_COLOR, Value); + + IOWriteB(VGA_CRTC_INDEX_COLOR, SVGA_CRTC_EXT_DISPLAY_REG); + Value = IOReadB(VGA_CRTC_DATA_COLOR); + Value &= ~(SVGA_CRTC_EXT_ADDR_BIT16 | SVGA_CRTC_EXT_ADDR_BITS1718); + Value |= (StartAddress >> 16) & SVGA_CRTC_EXT_ADDR_BIT16; + Value |= (StartAddress >> 15) & SVGA_CRTC_EXT_ADDR_BITS1718; + IOWriteB(VGA_CRTC_DATA_COLOR, Value); + + IOWriteB(VGA_CRTC_INDEX_COLOR, VGA_CRTC_START_ADDR_HIGH_REG); + IOWriteB(VGA_CRTC_DATA_COLOR, (StartAddress >> 8) & 0xFF); + IOWriteB(VGA_CRTC_INDEX_COLOR, VGA_CRTC_START_ADDR_LOW_REG); + IOWriteB(VGA_CRTC_DATA_COLOR, StartAddress & 0xFF); + + setAH(0); + break; + } + + /* Get Display Start */ + case 0x01: + { + setAL(0x4F); + StartAddress = 0; + + if (Mode == NULL || Mode->Info == NULL) + { + /* This is not a VBE mode */ + // TODO: Support anyway, perhaps? It can be done. + setAH(0x01); + break; + } + + IOWriteB(VGA_CRTC_INDEX_COLOR, SVGA_CRTC_OVERLAY_REG); + StartAddress = (IOReadB(VGA_CRTC_DATA_COLOR) & SVGA_CRTC_EXT_ADDR_BIT19) << 12; + + IOWriteB(VGA_CRTC_INDEX_COLOR, SVGA_CRTC_EXT_DISPLAY_REG); + Value = IOReadB(VGA_CRTC_DATA_COLOR); + StartAddress |= (Value & SVGA_CRTC_EXT_ADDR_BIT16) << 16; + StartAddress |= (Value & SVGA_CRTC_EXT_ADDR_BITS1718) << 15; + + IOWriteB(VGA_CRTC_INDEX_COLOR, VGA_CRTC_START_ADDR_HIGH_REG); + StartAddress |= IOReadB(VGA_CRTC_DATA_COLOR) << 8; + IOWriteB(VGA_CRTC_INDEX_COLOR, VGA_CRTC_START_ADDR_LOW_REG); + StartAddress |= IOReadB(VGA_CRTC_DATA_COLOR); + + setCX(StartAddress % Mode->Info->BytesPerScanline); + setDX(StartAddress / Mode->Info->BytesPerScanline); + + setAH(0); + break; + } + } + + IOWriteB(VGA_CRTC_INDEX_COLOR, OldCrtcIndex); + break; + } + default: { DPRINT1("VESA BIOS Extensions function %02Xh NOT IMPLEMENTED!\n", getAL());

8 years, 3 months

[dchapyshev] 72515: [WIN32K] - Stubpliment UOI_FLAGS flag in NtUserGetObjectInformation * Fixes 32 tests in user32_apitest GetUserObjectInformation

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Aug 30 21:45:39 2016 New Revision: 72515 URL: http://svn.reactos.org/svn/reactos?rev=72515&view=rev Log: [WIN32K] - Stubpliment UOI_FLAGS flag in NtUserGetObjectInformation * Fixes 32 tests in user32_apitest GetUserObjectInformation Modified: trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Tue Aug 30 21:45:39 2016 @@ -722,7 +722,21 @@ switch (nIndex) { case UOI_FLAGS: - Status = STATUS_NOT_IMPLEMENTED; + nDataSize = sizeof(USEROBJECTFLAGS); + if (nLength >= nDataSize) + { + PUSEROBJECTFLAGS ObjectFlags = pvInformation; + + ObjectFlags->fInherit = 0; + ObjectFlags->fReserved = 0; + ObjectFlags->dwFlags = 0; + + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_BUFFER_TOO_SMALL; + } ERR("UOI_FLAGS unimplemented!\n"); break;

8 years, 3 months

[aandrejevic] 72514: [NTVDM:SVGA] Chain-4 addressing isn't really the same as packed-pixel addressing. Also, fix a bug in the optimized odd/even mode reading code.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Aug 30 21:07:26 2016 New Revision: 72514 URL: http://svn.reactos.org/svn/reactos?rev=72514&view=rev Log: [NTVDM:SVGA] Chain-4 addressing isn't really the same as packed-pixel addressing. Also, fix a bug in the optimized odd/even mode reading code. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Tue Aug 30 21:07:26 2016 @@ -1797,8 +1797,9 @@ { VideoAddress = VgaTranslateAddress(Address); - /* Check for chain-4 and odd-even mode */ - if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) +#if 0 + /* Packed pixel mode - not used yet */ + if (VgaSeqRegisters[SVGA_SEQ_EXT_MODE_REG] & SVGA_SEQ_EXT_MODE_HIGH_RES) { /* Just copy from the video memory */ PVOID VideoMemory = &VgaMemory[VideoAddress * VGA_NUM_BANKS + (Address & 3)]; @@ -1829,12 +1830,65 @@ #endif } } +#endif + + /* Check for chain-4 and odd-even mode */ + if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) + { + i = 0; + + /* Write the unaligned part first */ + if (Address & 3) + { + switch (Address & 3) + { + case 1: + BufPtr[i++] = VgaMemory[VideoAddress * VGA_NUM_BANKS + 1]; + case 2: + BufPtr[i++] = VgaMemory[VideoAddress * VGA_NUM_BANKS + 2]; + case 3: + BufPtr[i++] = VgaMemory[VideoAddress * VGA_NUM_BANKS + 3]; + } + + VideoAddress += 4; + } + + /* Copy the aligned dwords */ + while ((i + 3) < Size) + { + *(PULONG)&BufPtr[i] = *(PULONG)&VgaMemory[VideoAddress * VGA_NUM_BANKS]; + + i += 4; + VideoAddress += 4; + } + + /* Write the remaining part */ + if (i < Size) + { + switch (Size - i - 3) + { + case 3: + BufPtr[i] = VgaMemory[VideoAddress * VGA_NUM_BANKS + ((Address + i) & 3)]; + i++; + case 2: + BufPtr[i] = VgaMemory[VideoAddress * VGA_NUM_BANKS + ((Address + i) & 3)]; + i++; + case 1: + BufPtr[i] = VgaMemory[VideoAddress * VGA_NUM_BANKS + ((Address + i) & 3)]; + i++; + } + } + } else if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_OE) { i = 0; /* Check if the starting address is odd */ - if (Address & 1) BufPtr[i++] = VgaMemory[(VideoAddress++) * VGA_NUM_BANKS + 1]; + if (Address & 1) + { + BufPtr[i++] = VgaMemory[VideoAddress * VGA_NUM_BANKS + 1]; + VideoAddress += 2; + } while (i < (Size - 1)) {

8 years, 3 months

[jimtabor] 72513: [NtUser] - Fix crash while using mouse or keyboard for menu selection in UxThmeme. - Sync/Ports and copy paste error fixes.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Aug 30 19:30:45 2016 New Revision: 72513 URL: http://svn.reactos.org/svn/reactos?rev=72513&view=rev Log: [NtUser] - Fix crash while using mouse or keyboard for menu selection in UxThmeme. - Sync/Ports and copy paste error fixes. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Tue Aug 30 19:30:45 2016 @@ -2219,7 +2219,7 @@ if (lpitem->fType & MF_SYSMENU) { - if ( (Wnd->style & WS_MINIMIZE)) + if (!(Wnd->style & WS_MINIMIZE)) { NC_GetInsideRect(Wnd, &rect); UserDrawSysMenuButton(Wnd, hdc, &rect, lpitem->fState & (MF_HILITE | MF_MOUSESELECT)); @@ -2720,7 +2720,7 @@ // No menu. Do not reserve any space return 0; } - + if (lprect == NULL) { return UserGetSystemMetrics(SM_CYMENU); @@ -2952,11 +2952,15 @@ BOOL sendMenuSelect, PMENU topmenu) { HDC hdc; - PWND pWnd = ValidateHwndNoErr(menu->hWnd); + PWND pWnd; TRACE("M_SI: owner=%p menu=%p index=0x%04x select=0x%04x\n", pwndOwner, menu, wIndex, sendMenuSelect); - if (!menu || !menu->cItems || !pWnd) return; + if (!menu || !menu->cItems) return; + + pWnd = ValidateHwndNoErr(menu->hWnd); + + if (!pWnd) return; if (menu->iItem == wIndex) return; @@ -3126,6 +3130,8 @@ PWND pWnd; TRACE("owner=%x menu=%p 0x%04x\n", WndOwner, Menu, SelectFirst); + + if (!Menu) return Menu; if (Menu->iItem == NO_SELECTED_ITEM) return Menu; @@ -3584,7 +3590,7 @@ { /* switch to the system menu */ MenuTmp = get_win_sys_menu(hNewWnd); - hNewMenu = UserHMGetHandle(MenuTmp); + if (MenuTmp) hNewMenu = UserHMGetHandle(MenuTmp); } else return FALSE; @@ -4355,6 +4361,9 @@ { co_IntSendMessage( UserHMGetHandle(pWnd), WM_INITMENUPOPUP, (WPARAM) UserHMGetHandle(menu), 0); } + + if (menu->fFlags & MNF_SYSMENU) + MENU_InitSysMenuPopup( menu, pWnd->style, pWnd->pcls->style, HTSYSMENU); if (MENU_ShowPopup(pWnd, menu, 0, wFlags, x, y, 0, 0 )) ret = MENU_TrackMenu( menu, wFlags | TPM_POPUPMENU, 0, 0, pWnd, @@ -5114,7 +5123,7 @@ ItemInfo.cbSize = sizeof(MENUITEMINFOW); ItemInfo.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE | MIIM_SUBMENU; - ItemInfo.fType = 0; + ItemInfo.fType = MF_POPUP; ItemInfo.fState = MFS_ENABLED; ItemInfo.dwTypeData = NULL; ItemInfo.cch = 0; @@ -5183,7 +5192,7 @@ if (OldMenu) { OldMenu->fFlags &= ~MNF_SYSMENU; - IntDestroyMenuObject(OldMenu, TRUE); + IntDestroyMenuObject(OldMenu, TRUE); } }

8 years, 3 months

[dchapyshev] 72512: [KERNEL32] - Failure if does not come to an end a way with a symbol '\' (exception - a path of a looks like 'C:') * Fixes 2 tests for kernel32_apitest GetDriveType (all tests fo...

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Aug 30 19:22:00 2016 New Revision: 72512 URL: http://svn.reactos.org/svn/reactos?rev=72512&view=rev Log: [KERNEL32] - Failure if does not come to an end a way with a symbol '\' (exception - a path of a looks like 'C:') * Fixes 2 tests for kernel32_apitest GetDriveType (all tests for GetDriveType passed now) Modified: trunk/reactos/dll/win32/kernel32/client/file/disk.c Modified: trunk/reactos/dll/win32/kernel32/client/file/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] Tue Aug 30 19:22:00 2016 @@ -19,6 +19,8 @@ */ #include <k32.h> +#include <strsafe.h> + #define NDEBUG #include <debug.h> DEBUG_CHANNEL(kernel32file); @@ -401,12 +403,35 @@ if (wcslen(CurrentDir) > 3) CurrentDir[3] = 0; - lpRootPath = (PCWSTR)CurrentDir; + lpRootPath = CurrentDir; } else { + size_t Length = wcslen(lpRootPathName); + TRACE("lpRootPathName: %S\n", lpRootPathName); - lpRootPath = lpRootPathName; + + if (Length == 2) + { + WCHAR DriveLetter = RtlUpcaseUnicodeChar(lpRootPathName[0]); + + if (DriveLetter >= L'A' && DriveLetter <= L'Z' && lpRootPathName[1] == L':') + { + Length = (Length + 2) * sizeof(WCHAR); + + CurrentDir = HeapAlloc(GetProcessHeap(), 0, Length); + if (!CurrentDir) + return DRIVE_UNKNOWN; + + StringCbPrintfW(CurrentDir, Length, L"%s\\", lpRootPathName); + + lpRootPath = CurrentDir; + } + } + else + { + lpRootPath = lpRootPathName; + } } TRACE("lpRootPath: %S\n", lpRootPath); @@ -423,6 +448,11 @@ if (CurrentDir != NULL) HeapFree(GetProcessHeap(), 0, CurrentDir); + + if (PathName.Buffer[(PathName.Length >> 1) - 1] != L'\\') + { + return DRIVE_NO_ROOT_DIR; + } InitializeObjectAttributes(&ObjectAttributes, &PathName, @@ -436,6 +466,7 @@ &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathName.Buffer); if (!NT_SUCCESS(Status)) return DRIVE_NO_ROOT_DIR; /* According to WINE regression tests */ @@ -453,19 +484,19 @@ switch (FileFsDevice.DeviceType) { - case FILE_DEVICE_CD_ROM: - case FILE_DEVICE_CD_ROM_FILE_SYSTEM: - return DRIVE_CDROM; - case FILE_DEVICE_VIRTUAL_DISK: - return DRIVE_RAMDISK; - case FILE_DEVICE_NETWORK_FILE_SYSTEM: - return DRIVE_REMOTE; - case FILE_DEVICE_DISK: - case FILE_DEVICE_DISK_FILE_SYSTEM: - if (FileFsDevice.Characteristics & FILE_REMOTE_DEVICE) + case FILE_DEVICE_CD_ROM: + case FILE_DEVICE_CD_ROM_FILE_SYSTEM: + return DRIVE_CDROM; + case FILE_DEVICE_VIRTUAL_DISK: + return DRIVE_RAMDISK; + case FILE_DEVICE_NETWORK_FILE_SYSTEM: return DRIVE_REMOTE; - if (FileFsDevice.Characteristics & FILE_REMOVABLE_MEDIA) - return DRIVE_REMOVABLE; + case FILE_DEVICE_DISK: + case FILE_DEVICE_DISK_FILE_SYSTEM: + if (FileFsDevice.Characteristics & FILE_REMOTE_DEVICE) + return DRIVE_REMOTE; + if (FileFsDevice.Characteristics & FILE_REMOVABLE_MEDIA) + return DRIVE_REMOVABLE; return DRIVE_FIXED; }

8 years, 3 months

[dchapyshev] 72511: [KERNEL32] - Initialization of a string before obtaining information * Fixes 2 tests for kernel32_apitest GetComputerNameEx (all tests passed now)

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Aug 30 17:36:01 2016 New Revision: 72511 URL: http://svn.reactos.org/svn/reactos?rev=72511&view=rev Log: [KERNEL32] - Initialization of a string before obtaining information * Fixes 2 tests for kernel32_apitest GetComputerNameEx (all tests passed now) Modified: trunk/reactos/dll/win32/kernel32/client/compname.c Modified: trunk/reactos/dll/win32/kernel32/client/compname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/compname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/compname.c [iso-8859-1] Tue Aug 30 17:36:01 2016 @@ -50,6 +50,9 @@ ULONG ReturnSize; NTSTATUS Status; + if (lpBuffer != NULL && *nSize > 0) + lpBuffer[0] = 0; + RtlInitUnicodeString(&KeyName, RegistryKey); InitializeObjectAttributes(&ObjectAttributes, &KeyName,

8 years, 3 months

[dchapyshev] 72510: [RTL] - Remove unneeded type-casts

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Aug 30 16:28:47 2016 New Revision: 72510 URL: http://svn.reactos.org/svn/reactos?rev=72510&view=rev Log: [RTL] - Remove unneeded type-casts Modified: trunk/reactos/sdk/lib/rtl/version.c Modified: trunk/reactos/sdk/lib/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/version.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/version.c [iso-8859-1] Tue Aug 30 16:28:47 2016 @@ -205,8 +205,8 @@ Condition = RtlpVerGetCondition(ConditionMask, VER_SERVICEPACKMINOR); } - Comparison = RtlpVerCompare((ULONG)Version.wServicePackMinor, - (ULONG)VersionInfo->wServicePackMinor, + Comparison = RtlpVerCompare(Version.wServicePackMinor, + VersionInfo->wServicePackMinor, Condition); if (!Comparison)

8 years, 3 months

[dchapyshev] 72509: [RTL] - The Condition parameter every time is compared to VER_EQUAL, but does not change thus. This behavior wrong. We have to receive new Condition every time * Fixes 7 tests i...

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Aug 30 15:10:07 2016 New Revision: 72509 URL: http://svn.reactos.org/svn/reactos?rev=72509&view=rev Log: [RTL] - The Condition parameter every time is compared to VER_EQUAL, but does not change thus. This behavior wrong. We have to receive new Condition every time * Fixes 7 tests in kernel32_winetest version (all tests passed now) Modified: trunk/reactos/sdk/lib/rtl/version.c Modified: trunk/reactos/sdk/lib/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/version.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/version.c [iso-8859-1] Tue Aug 30 15:10:07 2016 @@ -56,9 +56,11 @@ IN ULONG TypeMask, IN ULONGLONG ConditionMask) { + RTL_OSVERSIONINFOEXW Version; + BOOLEAN Comparison; + BOOLEAN DoNextCheck; NTSTATUS Status; - RTL_OSVERSIONINFOEXW ver; - BOOLEAN Comparison; + UCHAR Condition; /* FIXME: - Check the following special case on Windows (various versions): @@ -67,19 +69,28 @@ - MSDN talks about some tests being impossible. Check what really happens. */ - ver.dwOSVersionInfoSize = sizeof(ver); - Status = RtlGetVersion((PRTL_OSVERSIONINFOW)&ver); - if (Status != STATUS_SUCCESS) return Status; - - if (!TypeMask || !ConditionMask) return STATUS_INVALID_PARAMETER; + Version.dwOSVersionInfoSize = sizeof(Version); + + Status = RtlGetVersion((PRTL_OSVERSIONINFOW)&Version); + if (Status != STATUS_SUCCESS) + { + return Status; + } + + if (!TypeMask || !ConditionMask) + { + return STATUS_INVALID_PARAMETER; + } if (TypeMask & VER_PRODUCT_TYPE) { - Comparison = RtlpVerCompare(ver.wProductType, + Comparison = RtlpVerCompare(Version.wProductType, VersionInfo->wProductType, RtlpVerGetCondition(ConditionMask, VER_PRODUCT_TYPE)); if (!Comparison) - return STATUS_REVISION_MISMATCH; + { + return STATUS_REVISION_MISMATCH; + } } if (TypeMask & VER_SUITENAME) @@ -87,85 +98,123 @@ switch (RtlpVerGetCondition(ConditionMask, VER_SUITENAME)) { case VER_AND: - if ((VersionInfo->wSuiteMask & ver.wSuiteMask) != VersionInfo->wSuiteMask) + { + if ((VersionInfo->wSuiteMask & Version.wSuiteMask) != VersionInfo->wSuiteMask) { return STATUS_REVISION_MISMATCH; } + } + break; + + case VER_OR: + { + if (!(VersionInfo->wSuiteMask & Version.wSuiteMask) && VersionInfo->wSuiteMask) + { + return STATUS_REVISION_MISMATCH; + } break; - case VER_OR: - if (!(VersionInfo->wSuiteMask & ver.wSuiteMask) && VersionInfo->wSuiteMask) - { - return STATUS_REVISION_MISMATCH; - } - break; + } + default: + { return STATUS_INVALID_PARAMETER; + } } } if (TypeMask & VER_PLATFORMID) { - Comparison = RtlpVerCompare(ver.dwPlatformId, + Comparison = RtlpVerCompare(Version.dwPlatformId, VersionInfo->dwPlatformId, RtlpVerGetCondition(ConditionMask, VER_PLATFORMID)); if (!Comparison) - return STATUS_REVISION_MISMATCH; + { + return STATUS_REVISION_MISMATCH; + } } if (TypeMask & VER_BUILDNUMBER) { - Comparison = RtlpVerCompare(ver.dwBuildNumber, + Comparison = RtlpVerCompare(Version.dwBuildNumber, VersionInfo->dwBuildNumber, RtlpVerGetCondition(ConditionMask, VER_BUILDNUMBER)); if (!Comparison) - return STATUS_REVISION_MISMATCH; - } - - TypeMask &= VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR|VER_SERVICEPACKMINOR; - if (TypeMask) - { - BOOLEAN do_next_check = TRUE; - /* - * Select the leading comparison operator (for example, the comparison - * operator for VER_MAJORVERSION supersedes the others for VER_MINORVERSION, - * VER_SERVICEPACKMAJOR and VER_SERVICEPACKMINOR). - */ - UCHAR Condition = RtlpVerGetCondition(ConditionMask, TypeMask); - - Comparison = TRUE; - if (TypeMask & VER_MAJORVERSION) - { - Comparison = RtlpVerCompare(ver.dwMajorVersion, - VersionInfo->dwMajorVersion, - Condition); - do_next_check = (ver.dwMajorVersion == VersionInfo->dwMajorVersion) && - ((Condition != VER_EQUAL) || Comparison); - } - if ((TypeMask & VER_MINORVERSION) && do_next_check) - { - Comparison = RtlpVerCompare(ver.dwMinorVersion, + { + return STATUS_REVISION_MISMATCH; + } + } + + DoNextCheck = TRUE; + Condition = VER_EQUAL; + + if (TypeMask & VER_MAJORVERSION) + { + Condition = RtlpVerGetCondition(ConditionMask, VER_MAJORVERSION); + DoNextCheck = (VersionInfo->dwMajorVersion == Version.dwMajorVersion); + Comparison = RtlpVerCompare(Version.dwMajorVersion, + VersionInfo->dwMajorVersion, + Condition); + + if (!Comparison && !DoNextCheck) + { + return STATUS_REVISION_MISMATCH; + } + } + + if (DoNextCheck) + { + if (TypeMask & VER_MINORVERSION) + { + if (Condition == VER_EQUAL) + { + Condition = RtlpVerGetCondition(ConditionMask, VER_MINORVERSION); + } + + DoNextCheck = (VersionInfo->dwMinorVersion == Version.dwMinorVersion); + Comparison = RtlpVerCompare(Version.dwMinorVersion, VersionInfo->dwMinorVersion, Condition); - do_next_check = (ver.dwMinorVersion == VersionInfo->dwMinorVersion) && - ((Condition != VER_EQUAL) || Comparison); - } - if ((TypeMask & VER_SERVICEPACKMAJOR) && do_next_check) - { - Comparison = RtlpVerCompare(ver.wServicePackMajor, + + if (!Comparison && !DoNextCheck) + { + return STATUS_REVISION_MISMATCH; + } + } + + if (DoNextCheck && (TypeMask & VER_SERVICEPACKMAJOR)) + { + if (Condition == VER_EQUAL) + { + Condition = RtlpVerGetCondition(ConditionMask, VER_SERVICEPACKMAJOR); + } + + DoNextCheck = (VersionInfo->wServicePackMajor == Version.wServicePackMajor); + Comparison = RtlpVerCompare(Version.wServicePackMajor, VersionInfo->wServicePackMajor, Condition); - do_next_check = (ver.wServicePackMajor == VersionInfo->wServicePackMajor) && - ((Condition != VER_EQUAL) || Comparison); - } - if ((TypeMask & VER_SERVICEPACKMINOR) && do_next_check) - { - Comparison = RtlpVerCompare(ver.wServicePackMinor, - VersionInfo->wServicePackMinor, - Condition); - } - - if (!Comparison) - return STATUS_REVISION_MISMATCH; + + if (!Comparison && !DoNextCheck) + { + return STATUS_REVISION_MISMATCH; + } + + if (DoNextCheck && (TypeMask & VER_SERVICEPACKMINOR)) + { + if (Condition == VER_EQUAL) + { + Condition = RtlpVerGetCondition(ConditionMask, VER_SERVICEPACKMINOR); + } + + Comparison = RtlpVerCompare((ULONG)Version.wServicePackMinor, + (ULONG)VersionInfo->wServicePackMinor, + Condition); + + if (!Comparison) + { + return STATUS_REVISION_MISMATCH; + } + } + } } return STATUS_SUCCESS;

8 years, 3 months

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 2016