Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 68611: [NTOS:MM] - Allow (and then ignore) PAGE_NOCACHE in the protection flags for MmMapViewOfSection CORE-9808
by tfaber＠svn.reactos.org 07 Aug '15

07 Aug '15

Author: tfaber Date: Fri Aug 7 15:52:04 2015 New Revision: 68611 URL: http://svn.reactos.org/svn/reactos?rev=68611&view=rev Log: [NTOS:MM] - Allow (and then ignore) PAGE_NOCACHE in the protection flags for MmMapViewOfSection CORE-9808 Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Fri Aug 7 15:52:04 2015 @@ -115,7 +115,8 @@ PAGE_EXECUTE_READ | \ PAGE_EXECUTE_READWRITE | \ PAGE_EXECUTE_WRITECOPY | \ - PAGE_NOACCESS) + PAGE_NOACCESS | \ + PAGE_NOCACHE) #define PAGE_IS_READABLE \ (PAGE_READONLY | \ Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Fri Aug 7 15:52:04 2015 @@ -4484,6 +4484,8 @@ return STATUS_INVALID_PAGE_PROTECTION; } + /* FIXME: We should keep this, but it would break code checking equality */ + Protect &= PAGE_NOCACHE; Section = (PROS_SECTION_OBJECT)SectionObject; AddressSpace = &Process->Vm;

1 0

[hbelusca] 68610: [NTVDM]: Fix few file headers.
by hbelusca＠svn.reactos.org 07 Aug '15

07 Aug '15

Author: hbelusca Date: Fri Aug 7 15:50:09 2015 New Revision: 68610 URL: http://svn.reactos.org/svn/reactos?rev=68610&view=rev Log: [NTVDM]: Fix few file headers. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.h trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.h trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Fri Aug 7 15:50:09 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: kbdbios32.c - * PURPOSE: VDM Keyboard 32-bit BIOS + * PURPOSE: VDM 32-bit PS/2 Keyboard BIOS * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ @@ -209,10 +209,8 @@ * In return, if CF is set we continue processing the scan code * stored in AL, and if not, we skip it. */ - BYTE CF; - WORD AX; - CF = getCF(); - AX = getAX(); + BYTE CF = getCF(); + WORD AX = getAX(); setCF(1); setAL(IOReadB(PS2_DATA_PORT)); Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h [iso-8859-1] Fri Aug 7 15:50:09 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: kbdbios32.h - * PURPOSE: VDM Keyboard 32-bit BIOS + * PURPOSE: VDM 32-bit PS/2 Keyboard BIOS * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h [iso-8859-1] Fri Aug 7 15:50:09 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: moubios32.h - * PURPOSE: VDM Mouse 32-bit BIOS + * PURPOSE: VDM 32-bit PS/2 Mouse BIOS * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] Fri Aug 7 15:50:09 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: vidbios32.c - * PURPOSE: VDM Video 32-bit BIOS + * PURPOSE: VDM 32-bit Video BIOS * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) * * NOTE: All of the real code is in bios/vidbios.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.h [iso-8859-1] Fri Aug 7 15:50:09 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: vidbios32.h - * PURPOSE: VDM Video 32-bit BIOS + * PURPOSE: VDM 32-bit Video BIOS * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) * * NOTE: All of the real code is in bios/vidbios.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c [iso-8859-1] Fri Aug 7 15:50:09 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: kbdbios.c - * PURPOSE: VDM Keyboard BIOS Support Library + * PURPOSE: VDM 32-bit PS/2 Keyboard BIOS Support Library * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.h [iso-8859-1] Fri Aug 7 15:50:09 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: kbdbios.h - * PURPOSE: VDM Keyboard BIOS Support Library + * PURPOSE: VDM 32-bit PS/2 Keyboard BIOS Support Library * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Fri Aug 7 15:50:09 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: vidbios.c - * PURPOSE: VDM Video BIOS Support Library + * PURPOSE: VDM 32-bit Video BIOS Support Library * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h [iso-8859-1] Fri Aug 7 15:50:09 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: vidbios.h - * PURPOSE: VDM Video BIOS Support Library + * PURPOSE: VDM 32-bit Video BIOS Support Library * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */

1 0

[hbelusca] 68609: [NTVDM]: DOS: When we create a new PSP, or terminate a TSR, we *must* use the code segment value of the CALLER!! and not the current one (DOS code segment). Should fix a lot of st...
by hbelusca＠svn.reactos.org 07 Aug '15

07 Aug '15

Author: hbelusca Date: Fri Aug 7 15:14:19 2015 New Revision: 68609 URL: http://svn.reactos.org/svn/reactos?rev=68609&view=rev Log: [NTVDM]: DOS: When we create a new PSP, or terminate a TSR, we *must* use the code segment value of the CALLER!! and not the current one (DOS code segment). Should fix a lot of stuff... Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Fri Aug 7 15:14:19 2015 @@ -563,7 +563,7 @@ /* Create New PSP */ case 0x26: { - DosClonePsp(getDX(), getCS()); + DosClonePsp(getDX(), Stack[STACK_CS]); break; } @@ -2096,7 +2096,7 @@ VOID WINAPI DosInt27h(LPWORD Stack) { - DosTerminateProcess(getCS(), 0, (getDX() + 0x0F) >> 4); + DosTerminateProcess(Stack[STACK_CS], 0, (getDX() + 0x0F) >> 4); } VOID WINAPI DosIdle(LPWORD Stack)

1 0

[jimtabor] 68608: [NtGdi] - Add more function for NtUser.
by jimtabor＠svn.reactos.org 07 Aug '15

07 Aug '15

Author: jimtabor Date: Fri Aug 7 05:56:01 2015 New Revision: 68608 URL: http://svn.reactos.org/svn/reactos?rev=68608&view=rev Log: [NtGdi] - Add more function for NtUser. Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c trunk/reactos/win32ss/gdi/ntgdi/coord.h trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dcutil.c trunk/reactos/win32ss/gdi/ntgdi/text.c trunk/reactos/win32ss/gdi/ntgdi/text.h Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] Fri Aug 7 05:56:01 2015 @@ -894,6 +894,38 @@ return iPrevMapMode; } +BOOL +FASTCALL +GreSetViewportOrgEx( + HDC hDC, + int X, + int Y, + LPPOINT Point) +{ + PDC dc; + PDC_ATTR pdcattr; + + dc = DC_LockDc(hDC); + if (!dc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + pdcattr = dc->pdcattr; + + if (Point) + { + Point->x = pdcattr->ptlViewportOrg.x; + Point->y = pdcattr->ptlViewportOrg.y; + } + + pdcattr->ptlViewportOrg.x = X; + pdcattr->ptlViewportOrg.y = Y; + pdcattr->flXform |= PAGE_XLATE_CHANGED; + + DC_UnlockDc(dc); + return TRUE; +} BOOL APIENTRY @@ -1239,6 +1271,89 @@ } BOOL APIENTRY +GreGetDCPoint( + HDC hDC, + UINT iPoint, + PPOINTL Point) +{ + BOOL Ret = TRUE; + DC *pdc; + SIZE Size; + PSIZEL pszlViewportExt; + + if (!Point) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + pdc = DC_LockDc(hDC); + if (!pdc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + switch (iPoint) + { + case GdiGetViewPortExt: + pszlViewportExt = DC_pszlViewportExt(pdc); + Point->x = pszlViewportExt->cx; + Point->y = pszlViewportExt->cy; + break; + + case GdiGetWindowExt: + Point->x = pdc->pdcattr->szlWindowExt.cx; + Point->y = pdc->pdcattr->szlWindowExt.cy; + break; + + case GdiGetViewPortOrg: + *Point = pdc->pdcattr->ptlViewportOrg; + break; + + case GdiGetWindowOrg: + *Point = pdc->pdcattr->ptlWindowOrg; + break; + + case GdiGetDCOrg: + *Point = pdc->ptlDCOrig; + break; + + case GdiGetAspectRatioFilter: + DC_vGetAspectRatioFilter(pdc, &Size); + Point->x = Size.cx; + Point->y = Size.cy; + break; + + default: + EngSetLastError(ERROR_INVALID_PARAMETER); + Ret = FALSE; + break; + } + + DC_UnlockDc(pdc); + return Ret; +} + +BOOL +WINAPI +GreGetWindowExtEx( + _In_ HDC hdc, + _Out_ LPSIZE lpSize) +{ + return GreGetDCPoint(hdc, GdiGetWindowExt, (PPOINTL)lpSize); +} + +BOOL +WINAPI +GreGetViewportExtEx( + _In_ HDC hdc, + _Out_ LPSIZE lpSize) +{ + return GreGetDCPoint(hdc, GdiGetViewPortExt, (PPOINTL)lpSize); +} + +BOOL APIENTRY NtGdiGetDCPoint( HDC hDC, UINT iPoint, Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.h [iso-8859-1] Fri Aug 7 05:56:01 2015 @@ -156,3 +156,7 @@ int APIENTRY IntGdiSetMapMode(PDC, int); BOOL FASTCALL GreLPtoDP(HDC, LPPOINT, INT); BOOL FASTCALL GreDPtoLP(HDC, LPPOINT, INT); +BOOL APIENTRY GreGetDCPoint(HDC,UINT,PPOINTL); +BOOL WINAPI GreGetWindowExtEx( _In_ HDC hdc, _Out_ LPSIZE lpSize); +BOOL WINAPI GreGetViewportExtEx( _In_ HDC hdc, _Out_ LPSIZE lpSize); +BOOL FASTCALL GreSetViewportOrgEx(HDC,int,int,LPPOINT); Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Fri Aug 7 05:56:01 2015 @@ -181,7 +181,7 @@ COLORREF FASTCALL GreGetTextColor(HDC); COLORREF FASTCALL IntSetDCBrushColor(HDC,COLORREF); COLORREF FASTCALL IntSetDCPenColor(HDC,COLORREF); - +int FASTCALL GreGetGraphicsMode(HDC); INIT_FUNCTION NTSTATUS NTAPI InitDcImpl(VOID); PPDEVOBJ FASTCALL IntEnumHDev(VOID); Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Fri Aug 7 05:56:01 2015 @@ -239,6 +239,21 @@ DC_UnlockDc(pdc); } return oSMode; +} + +int FASTCALL +GreGetGraphicsMode(HDC hdc) +{ + PDC dc; + int GraphicsMode; + if (!(dc = DC_LockDc(hdc))) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return CLR_INVALID; + } + GraphicsMode = dc->pdcattr->iGraphicsMode;; + DC_UnlockDc(dc); + return GraphicsMode; } VOID Modified: trunk/reactos/win32ss/gdi/ntgdi/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] Fri Aug 7 05:56:01 2015 @@ -146,6 +146,18 @@ return Result; } +BOOL +WINAPI +GreGetTextMetricsW( + _In_ HDC hdc, + _Out_ LPTEXTMETRICW lptm) +{ + TMW_INTERNAL tmwi; + if (!ftGdiGetTextMetricsW(hdc, &tmwi)) return FALSE; + *lptm = tmwi.TextMetric; + return TRUE; +} + DWORD APIENTRY NtGdiGetCharSet(HDC hDC) Modified: trunk/reactos/win32ss/gdi/ntgdi/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] Fri Aug 7 05:56:01 2015 @@ -132,6 +132,7 @@ BOOL FASTCALL GreGetTextExtentExW(HDC,LPWSTR,ULONG,ULONG,PULONG,PULONG,LPSIZE,FLONG); BOOL FASTCALL GreTextOutW(HDC,int,int,LPCWSTR,int); HFONT FASTCALL GreCreateFontIndirectW( LOGFONTW * ); +BOOL WINAPI GreGetTextMetricsW( _In_ HDC hdc, _Out_ LPTEXTMETRICW lptm); #define IntLockProcessPrivateFonts(W32Process) \ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&W32Process->PrivateFontListLock)

1 0

[aandrejevic] 68607: [FASTFAT] Irp->UserBuffer being NULL doesn't indicate any error. It could be that the caller really wants the result stored at address NULL (which can be valid, and is valid by...
by aandrejevic＠svn.reactos.org 07 Aug '15

07 Aug '15

Author: aandrejevic Date: Fri Aug 7 03:30:05 2015 New Revision: 68607 URL: http://svn.reactos.org/svn/reactos?rev=68607&view=rev Log: [FASTFAT] Irp->UserBuffer being NULL doesn't indicate any error. It could be that the caller really wants the result stored at address NULL (which can be valid, and is valid by default for programs like NTVDM). Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Fri Aug 7 03:30:05 2015 @@ -656,7 +656,7 @@ } Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO)); - if (!Buffer) + if (!Buffer && IrpContext->Irp->MdlAddress) { Status = STATUS_INVALID_USER_BUFFER; goto ByeBye; @@ -927,7 +927,7 @@ OldFileSize = Fcb->RFCB.FileSize; Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO)); - if (!Buffer) + if (!Buffer && IrpContext->Irp->MdlAddress) { Status = STATUS_INVALID_USER_BUFFER; goto ByeBye;

1 0

[hbelusca] 68606: [NTVDM] - Copy-paste error fix in the initialization of the collating table. - Fix DosCombineFreeBlocks so that it doesn't say "DOS memory arena corrupted" because while combining...
by hbelusca＠svn.reactos.org 06 Aug '15

06 Aug '15

Author: hbelusca Date: Thu Aug 6 23:00:17 2015 New Revision: 68606 URL: http://svn.reactos.org/svn/reactos?rev=68606&view=rev Log: [NTVDM] - Copy-paste error fix in the initialization of the collating table. - Fix DosCombineFreeBlocks so that it doesn't say "DOS memory arena corrupted" because while combining blocks, the current block became the last one and we tried to merge it with a next block which, by definition, cannot exist (see comment in the code). - Remove a spurious call to DosCombineFreeBlocks in DosResizeMemory which was forgotten in r68596. - Check the validity of the encountered MCBs during the loop for linking or unlinking the UMB chain to the main arena chain. - Fix the size of the created UMB blocks. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c [iso-8859-1] Thu Aug 6 23:00:17 2015 @@ -279,8 +279,8 @@ CountryData->FNameTermTbl.Data[21] = ','; CountryData->CollateTbl.Size = ARRAYSIZE(CountryData->CollateTbl.Data); - for (i = 0; i < CountryData->LoCaseTbl.Size; ++i) - CountryData->LoCaseTbl.Data[i] = i; + for (i = 0; i < CountryData->CollateTbl.Size; ++i) + CountryData->CollateTbl.Data[i] = i; CountryData->DBCSLeadTbl.Size = 0; // Empty DBCS table CountryData->DBCSLeadTbl.Data[0] = 0x0000; Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Thu Aug 6 23:00:17 2015 @@ -63,7 +63,7 @@ /* Make sure it's valid */ if (!ValidateMcb(CurrentMcb)) { - DPRINT1("The DOS memory arena is corrupted! (CurrentMcb = %04x; PreviousMcb = %04X)\n", Segment, PrevSegment); + DPRINT1("The DOS memory arena is corrupted! (CurrentMcb = 0x%04X; PreviousMcb = 0x%04X)\n", Segment, PrevSegment); return; } @@ -82,12 +82,25 @@ static VOID DosCombineFreeBlocks(WORD StartBlock) { + /* NOTE: This function is always called with valid MCB blocks */ + PDOS_MCB CurrentMcb = SEGMENT_TO_MCB(StartBlock), NextMcb; - /* If this is the last block or it's not free, quit */ - if (CurrentMcb->BlockType == 'Z' || CurrentMcb->OwnerPsp != 0) return; - - while (TRUE) + /* If the block is not free, quit */ + if (CurrentMcb->OwnerPsp != 0) return; + + /* + * Loop while the current block is not the last one. It can happen + * that the block is not the last one at the beginning, but becomes + * the last one at the end of the process. This happens in the case + * where its next following blocks are free but not combined yet, + * and they are terminated by a free last block. During the process + * all the blocks are combined together and we end up in the situation + * where the current (free) block is followed by the last (free) block. + * At the last step of the algorithm the current block becomes the + * last one. + */ + while (CurrentMcb->BlockType != 'Z') { /* Get a pointer to the next MCB */ NextMcb = SEGMENT_TO_MCB(StartBlock + CurrentMcb->Size + 1); @@ -210,7 +223,6 @@ } Done: - DosMemValidate(); /* If we didn't find a free block, bail out */ @@ -278,12 +290,11 @@ PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment), NextMcb; DPRINT("DosResizeMemory: BlockData 0x%04X, NewSize 0x%04X\n", - BlockData, - NewSize); - - DosMemValidate(); - - /* Make sure this is a valid, allocated block */ + BlockData, NewSize); + + DosMemValidate(); + + /* Make sure this is a valid and allocated block */ if (BlockData == 0 || !ValidateMcb(Mcb) || Mcb->OwnerPsp == 0) { Success = FALSE; @@ -291,15 +302,13 @@ goto Done; } - DosCombineFreeBlocks(SysVars->FirstMcb); - ReturnSize = Mcb->Size; /* Check if we need to expand or contract the block */ if (NewSize > Mcb->Size) { /* We can't expand the last block */ - if (Mcb->BlockType != 'M') + if (Mcb->BlockType == 'Z') { Success = FALSE; goto Done; @@ -431,21 +440,32 @@ DPRINT("Linking UMB\n"); - /* Check if UMBs are already linked */ + /* Check if UMBs are initialized and already linked */ if (SysVars->UmbChainStart == 0xFFFF) return FALSE; if (SysVars->UmbLinked) return TRUE; DosMemValidate(); - /* Find the last block */ - // FIXME: Use SysVars->UmbChainStart - while ((Mcb->BlockType == 'M') && (Segment <= 0xFFFF)) - { + /* Find the last block before the start of the UMB chain */ + while (Segment < SysVars->UmbChainStart) + { + /* Get a pointer to the MCB */ + Mcb = SEGMENT_TO_MCB(Segment); + + /* Make sure it's valid */ + if (!ValidateMcb(Mcb)) + { + DPRINT1("The DOS memory arena is corrupted!\n"); + Sda->LastErrorCode = ERROR_ARENA_TRASHED; + return FALSE; + } + + /* If this was the last MCB in the chain, quit */ + if (Mcb->BlockType == 'Z') break; + + /* Otherwise, update the segment and continue */ Segment += Mcb->Size + 1; - Mcb = SEGMENT_TO_MCB(Segment); - } - - DosMemValidate(); + } /* Make sure it's valid */ if (Mcb->BlockType != 'Z') return FALSE; @@ -453,6 +473,8 @@ /* Connect the MCB with the UMB chain */ Mcb->BlockType = 'M'; + DosMemValidate(); + SysVars->UmbLinked = TRUE; return TRUE; } @@ -464,25 +486,28 @@ DPRINT("Unlinking UMB\n"); - /* Check if UMBs are already unlinked */ + /* Check if UMBs are initialized and already unlinked */ if (SysVars->UmbChainStart == 0xFFFF) return FALSE; if (!SysVars->UmbLinked) return TRUE; DosMemValidate(); - /* Find the block preceding the MCB that links it with the UMB chain */ - while (Segment <= 0xFFFF) - { - // FIXME: Use SysVars->UmbChainStart - if ((Segment + Mcb->Size) == (SysVars->FirstMcb + USER_MEMORY_SIZE)) - { - /* This is the last non-UMB segment */ - break; + /* Find the last block before the start of the UMB chain */ + while (Segment < SysVars->UmbChainStart) + { + /* Get a pointer to the MCB */ + Mcb = SEGMENT_TO_MCB(Segment); + + /* Make sure it's valid */ + if (!ValidateMcb(Mcb)) + { + DPRINT1("The DOS memory arena is corrupted!\n"); + Sda->LastErrorCode = ERROR_ARENA_TRASHED; + return FALSE; } /* Advance to the next MCB */ Segment += Mcb->Size + 1; - Mcb = SEGMENT_TO_MCB(Segment); } /* Mark the MCB as the last MCB */ @@ -509,7 +534,7 @@ WORD DosGetPreviousUmb(WORD UmbSegment) { PDOS_MCB CurrentMcb; - WORD Segment, PrevSegment = 0; + WORD Segment, PrevSegment = 0; // FIXME: or use UmbChainStart ?? if (SysVars->UmbChainStart == 0xFFFF) return 0; @@ -529,14 +554,13 @@ return 0; } - if (Segment >= UmbSegment) - break; + /* We went over the UMB segment, quit */ + if (Segment >= UmbSegment) break; PrevSegment = Segment; /* If this was the last MCB in the chain, quit */ - if (CurrentMcb->BlockType == 'Z') - break; + if (CurrentMcb->BlockType == 'Z') break; /* Otherwise, update the segment and continue */ Segment += CurrentMcb->Size + 1; @@ -583,7 +607,7 @@ // It will be splitted as needed just below. Mcb = SEGMENT_TO_MCB(SysVars->FirstMcb + USER_MEMORY_SIZE + 1); // '+1': Readjust the fact that USER_MEMORY_SIZE is based using 0x9FFE instead of 0x9FFF Mcb->BlockType = 'Z'; // At the moment it is really the last block - Mcb->Size = SysVars->UmbChainStart /* UmbSegment */ - SysVars->FirstMcb - USER_MEMORY_SIZE - 2; + Mcb->Size = (SysVars->UmbChainStart /* UmbSegment */ - SysVars->FirstMcb - USER_MEMORY_SIZE - 2) + 1; Mcb->OwnerPsp = SYSTEM_PSP; RtlCopyMemory(Mcb->Name, "SC ", sizeof("SC ")-1); @@ -609,7 +633,7 @@ Mcb = SEGMENT_TO_MCB(UmbSegment + /*Mcb->Size*/(Size - 1) + 0); // Mcb->BlockType = 'Z'; // FIXME: What if this block happens to be the last one?? Mcb->BlockType = PrevMcb->BlockType; - Mcb->Size = PrevMcb->Size - (UmbSegment + Size - PrevSegment); + Mcb->Size = PrevMcb->Size - (UmbSegment + Size - PrevSegment) + 1; Mcb->OwnerPsp = PrevMcb->OwnerPsp; RtlCopyMemory(Mcb->Name, PrevMcb->Name, sizeof(PrevMcb->Name));

1 0

[jimtabor] 68605: [User32] - Fix a old code port that was missed from the last menu rewrite.
by jimtabor＠svn.reactos.org 06 Aug '15

06 Aug '15

Author: jimtabor Date: Thu Aug 6 13:17:27 2015 New Revision: 68605 URL: http://svn.reactos.org/svn/reactos?rev=68605&view=rev Log: [User32] - Fix a old code port that was missed from the last menu rewrite. Modified: trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Thu Aug 6 13:17:27 2015 @@ -1005,9 +1005,9 @@ switch ((INT_PTR)hbmToDraw) { case (INT_PTR)HBMMENU_SYSTEM: - if (lpitem->dwTypeData) + if (lpitem->dwItemData) { - bmp = (HBITMAP)lpitem->dwTypeData; + bmp = (HBITMAP)lpitem->dwItemData; if (!GetObjectW( bmp, sizeof(bm), &bm )) return; } else

1 0

[hbelusca] 68604: [NTVDM]: - Use a static buffer for read or writes of "few" bytes (and allocate one for larger operations). - Writes of zero length, in DOS, truncates or extends the file to the cu...
by hbelusca＠svn.reactos.org 06 Aug '15

06 Aug '15

Author: hbelusca Date: Thu Aug 6 01:32:38 2015 New Revision: 68604 URL: http://svn.reactos.org/svn/reactos?rev=68604&view=rev Log: [NTVDM]: - Use a static buffer for read or writes of "few" bytes (and allocate one for larger operations). - Writes of zero length, in DOS, truncates or extends the file to the current position of the file pointer. This fixes some "corruption" in some files (so far, only .INI files) in Windows 3.11 installation. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] Thu Aug 6 01:32:38 2015 @@ -676,6 +676,7 @@ { WORD Result = ERROR_SUCCESS; PDOS_FILE_DESCRIPTOR Descriptor = DosGetHandleFileDescriptor(FileHandle); + BYTE StaticBuffer[8192]; DPRINT("DosReadFile: FileHandle 0x%04X, Count 0x%04X\n", FileHandle, Count); @@ -697,10 +698,19 @@ else { DWORD BytesRead32 = 0; - LPVOID LocalBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Count); - ASSERT(LocalBuffer != NULL); - - /* Read the file */ + LPVOID LocalBuffer; + + if (Count <= sizeof(StaticBuffer)) + { + LocalBuffer = StaticBuffer; + } + else + { + LocalBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Count); + ASSERT(LocalBuffer != NULL); + } + + /* Read from the file */ if (ReadFile(Descriptor->Win32Handle, LocalBuffer, Count, &BytesRead32, NULL)) { /* Write to the memory */ @@ -710,7 +720,7 @@ LOWORD(BytesRead32)); /* Update the position */ - Descriptor->Position += BytesRead32; + Descriptor->Position += BytesRead32; // or LOWORD(BytesRead32); ? } else { @@ -720,7 +730,9 @@ /* The number of bytes read is always 16-bit */ *BytesRead = LOWORD(BytesRead32); - RtlFreeHeap(RtlGetProcessHeap(), 0, LocalBuffer); + + if (LocalBuffer != StaticBuffer) + RtlFreeHeap(RtlGetProcessHeap(), 0, LocalBuffer); } /* Return the error code */ @@ -734,6 +746,7 @@ { WORD Result = ERROR_SUCCESS; PDOS_FILE_DESCRIPTOR Descriptor = DosGetHandleFileDescriptor(FileHandle); + BYTE StaticBuffer[8192]; DPRINT("DosWriteFile: FileHandle 0x%04X, Count 0x%04X\n", FileHandle, Count); @@ -755,21 +768,44 @@ else { DWORD BytesWritten32 = 0; - LPVOID LocalBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Count); - ASSERT(LocalBuffer != NULL); + LPVOID LocalBuffer; + + /* + * Writing zero bytes truncates or extends the file + * to the current position of the file pointer. + */ + if (Count == 0) + { + if (!SetEndOfFile(Descriptor->Win32Handle)) + { + /* Store the error code */ + Result = (WORD)GetLastError(); + } + *BytesWritten = 0; + return Result; + } + + if (Count <= sizeof(StaticBuffer)) + { + LocalBuffer = StaticBuffer; + } + else + { + LocalBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Count); + ASSERT(LocalBuffer != NULL); + } /* Read from the memory */ EmulatorReadMemory(&EmulatorContext, - TO_LINEAR(HIWORD(Buffer), - LOWORD(Buffer)), + TO_LINEAR(HIWORD(Buffer), LOWORD(Buffer)), LocalBuffer, Count); - /* Write the file */ + /* Write to the file */ if (WriteFile(Descriptor->Win32Handle, LocalBuffer, Count, &BytesWritten32, NULL)) { /* Update the position and size */ - Descriptor->Position += BytesWritten32; + Descriptor->Position += BytesWritten32; // or LOWORD(BytesWritten32); ? if (Descriptor->Position > Descriptor->Size) Descriptor->Size = Descriptor->Position; } else @@ -780,7 +816,9 @@ /* The number of bytes written is always 16-bit */ *BytesWritten = LOWORD(BytesWritten32); - RtlFreeHeap(RtlGetProcessHeap(), 0, LocalBuffer); + + if (LocalBuffer != StaticBuffer) + RtlFreeHeap(RtlGetProcessHeap(), 0, LocalBuffer); } /* Return the error code */ @@ -797,9 +835,7 @@ PDOS_FILE_DESCRIPTOR Descriptor = DosGetHandleFileDescriptor(FileHandle); DPRINT("DosSeekFile: FileHandle 0x%04X, Offset 0x%08X, Origin 0x%02X\n", - FileHandle, - Offset, - Origin); + FileHandle, Offset, Origin); if (Descriptor == NULL) { @@ -950,11 +986,10 @@ { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; - return FALSE; } - /* Read From Device I/O Control Channel */ + /* Read from Device I/O Control Channel */ case 0x02: { if (Node == NULL || !(Node->DeviceAttributes & DOS_DEVATTR_IOCTL)) @@ -974,7 +1009,7 @@ return TRUE; } - /* Write To Device I/O Control Channel */ + /* Write to Device I/O Control Channel */ case 0x03: { if (Node == NULL || !(Node->DeviceAttributes & DOS_DEVATTR_IOCTL)) @@ -1071,5 +1106,4 @@ } } - /* EOF */

1 0

[jimtabor] 68603: [Win32SS] - Implement OEM bitmaps sizes for server information. If more is need, it will be added. This will be plugged in later.
by jimtabor＠svn.reactos.org 06 Aug '15

06 Aug '15

Author: jimtabor Date: Thu Aug 6 00:56:01 2015 New Revision: 68603 URL: http://svn.reactos.org/svn/reactos?rev=68603&view=rev Log: [Win32SS] - Implement OEM bitmaps sizes for server information. If more is need, it will be added. This will be plugged in later. Modified: trunk/reactos/win32ss/include/callback.h trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/callback.h trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/win32ss/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/callback.h… ============================================================================== --- trunk/reactos/win32ss/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/callback.h [iso-8859-1] Thu Aug 6 00:56:01 2015 @@ -16,7 +16,8 @@ #define USER32_CALLBACK_DELIVERUSERAPC (12) #define USER32_CALLBACK_DDEPOST (13) #define USER32_CALLBACK_DDEGET (14) -#define USER32_CALLBACK_MAXIMUM (14) +#define USER32_CALLBACK_SETOBM (15) +#define USER32_CALLBACK_MAXIMUM (15) typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -133,6 +134,11 @@ BYTE buffer[1]; } DDEPOSTGET_CALLBACK_ARGUMENTS, *PDDEPOSTGET_CALLBACK_ARGUMENTS; +typedef struct _SETOBM_CALLBACK_ARGUMENTS +{ + struct tagOEMBITMAPINFO oembmi[93]; +} SETOBM_CALLBACK_ARGUMENTS, *PSETOBM_CALLBACK_ARGUMENTS; + NTSTATUS WINAPI User32CallCopyImageFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI @@ -163,4 +169,6 @@ User32CallDDEPostFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32CallDDEGetFromKernel(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32CallOBMFromKernel(PVOID Arguments, ULONG ArgumentLength); #endif /* __INCLUDE_USER32_CALLBACK_H */ Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Thu Aug 6 00:56:01 2015 @@ -902,6 +902,17 @@ INT cy; } OEMBITMAPINFO, *POEMBITMAPINFO; +typedef enum _OBI_TYPES +{ + OBI_CLOSE = 0, + OBI_UPARROW = 46, + OBI_UPARROWI = 49, + OBI_DNARROW = 50, + OBI_DNARROWI = 53, + OBI_MNARROW = 62, + OBI_CTYPES = 93 +} OBI_TYPES; + typedef struct tagMBSTRING { WCHAR szName[16]; @@ -953,7 +964,7 @@ DWORD dwKeyCache; DWORD dwAsyncKeyCache; ULONG cCaptures; - OEMBITMAPINFO oembmi[93]; + OEMBITMAPINFO oembmi[OBI_CTYPES]; RECT rcScreenReal; USHORT BitCount; USHORT dmLogPixels; Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Thu Aug 6 00:56:01 2015 @@ -1148,4 +1148,49 @@ ERR("Delivering User APC callback failed!\n"); } } + +VOID FASTCALL +co_IntSetupOBM(VOID) +{ + NTSTATUS Status; + ULONG ArgumentLength, ResultLength; + PVOID Argument, ResultPointer; + PSETOBM_CALLBACK_ARGUMENTS Common; + + ResultPointer = NULL; + ResultLength = ArgumentLength = sizeof(SETOBM_CALLBACK_ARGUMENTS); + + Argument = IntCbAllocateMemory(ArgumentLength); + if (NULL == Argument) + { + ERR("Set Window Icons callback failed: out of memory\n"); + return; + } + Common = (PSETOBM_CALLBACK_ARGUMENTS) Argument; + + UserLeaveCo(); + + Status = KeUserModeCallback(USER32_CALLBACK_SETOBM, + Argument, + ArgumentLength, + &ResultPointer, + &ResultLength); + + + UserEnterCo(); + + if (!NT_SUCCESS(Status)) + { + ERR("Set Window Icons callback failed!\n"); + IntCbFreeMemory(Argument); + return; + } + + RtlMoveMemory(Common, ResultPointer, ArgumentLength); + RtlCopyMemory(gpsi->oembmi, Common->oembmi, sizeof(gpsi->oembmi)); + + IntCbFreeMemory(Argument); +} + + /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] Thu Aug 6 00:56:01 2015 @@ -74,3 +74,4 @@ BOOL FASTCALL co_IntSetWndIcons(VOID); VOID FASTCALL co_IntDeliverUserAPC(VOID); +VOID FASTCALL co_IntSetupOBM(VOID); Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Thu Aug 6 00:56:01 2015 @@ -205,6 +205,7 @@ User32DeliverUserAPC, User32CallDDEPostFromKernel, User32CallDDEGetFromKernel, + User32CallOBMFromKernel, }; @@ -602,3 +603,37 @@ { return ZwCallbackReturn(0, 0, STATUS_SUCCESS); } + +NTSTATUS +WINAPI +User32CallOBMFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + BITMAP bmp; + PSETOBM_CALLBACK_ARGUMENTS Common = Arguments; + + GetObjectW(LoadBitmapW(0, MAKEINTRESOURCEW(OBM_CLOSE)), sizeof(bmp), &bmp); + Common->oembmi[OBI_CLOSE].cx = bmp.bmWidth; + Common->oembmi[OBI_CLOSE].cy = bmp.bmHeight; + + GetObjectW(LoadBitmapW(0, MAKEINTRESOURCEW(OBM_MNARROW)), sizeof(bmp), &bmp); + Common->oembmi[OBI_MNARROW].cx = bmp.bmWidth; + Common->oembmi[OBI_MNARROW].cy = bmp.bmHeight; + + GetObjectW(LoadBitmapW(0, MAKEINTRESOURCEW(OBM_DNARROW)), sizeof(bmp), &bmp); + Common->oembmi[OBI_DNARROW].cx = bmp.bmWidth; + Common->oembmi[OBI_DNARROW].cy = bmp.bmHeight; + + GetObjectW(LoadBitmapW(0, MAKEINTRESOURCEW(OBM_DNARROWI)), sizeof(bmp), &bmp); + Common->oembmi[OBI_DNARROWI].cx = bmp.bmWidth; + Common->oembmi[OBI_DNARROWI].cy = bmp.bmHeight; + + GetObjectW(LoadBitmapW(0, MAKEINTRESOURCEW(OBM_UPARROW)), sizeof(bmp), &bmp); + Common->oembmi[OBI_UPARROW].cx = bmp.bmWidth; + Common->oembmi[OBI_UPARROW].cy = bmp.bmHeight; + + GetObjectW(LoadBitmapW(0, MAKEINTRESOURCEW(OBM_UPARROWI)), sizeof(bmp), &bmp); + Common->oembmi[OBI_UPARROWI].cx = bmp.bmWidth; + Common->oembmi[OBI_UPARROWI].cy = bmp.bmHeight; + + return ZwCallbackReturn(Arguments, ArgumentLength, STATUS_SUCCESS); +}

1 0

[aandrejevic] 68602: [NTVDM] Make our VGA DAC behave like the cirrus one: palette changes do not apply until all 3 color components have been set.
by aandrejevic＠svn.reactos.org 05 Aug '15

05 Aug '15

Author: aandrejevic Date: Wed Aug 5 20:46:42 2015 New Revision: 68602 URL: http://svn.reactos.org/svn/reactos?rev=68602&view=rev Log: [NTVDM] Make our VGA DAC behave like the cirrus one: palette changes do not apply until all 3 color components have been set. 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] Wed Aug 5 20:46:42 2015 @@ -275,6 +275,8 @@ static BYTE VgaAcRegisters[VGA_AC_MAX_REG]; static BYTE VgaDacMask = 0xFF; +static BYTE VgaDacLatchCounter = 0; +static BYTE VgaDacLatch[3]; static BOOLEAN VgaDacReadWrite = FALSE; static WORD VgaDacIndex = 0; @@ -1571,15 +1573,24 @@ return (VgaDacReadWrite ? 0 : 3); case VGA_DAC_WRITE_INDEX: - return (VgaDacIndex / 3); + return VgaDacIndex; case VGA_DAC_DATA: { /* Ignore reads in write mode */ if (!VgaDacReadWrite) { - BYTE Data = VgaDacRegisters[VgaDacIndex++]; - VgaDacIndex %= VGA_PALETTE_SIZE; + BYTE Data = VgaDacRegisters[VgaDacIndex * 3 + VgaDacLatchCounter]; + VgaDacLatchCounter++; + + if (VgaDacLatchCounter == 3) + { + /* Reset the latch counter and increment the palette index */ + VgaDacLatchCounter = 0; + VgaDacIndex++; + VgaDacIndex %= VGA_MAX_COLORS; + } + return Data; } @@ -1697,28 +1708,34 @@ static inline VOID VgaWriteDac(BYTE Data) { - UINT i, PaletteIndex; + UINT i; PALETTEENTRY Entry; - /* Set the value */ - VgaDacRegisters[VgaDacIndex] = Data; - - /* Find the palette index */ - PaletteIndex = VgaDacIndex / 3; + /* Store the value in the latch */ + VgaDacLatch[VgaDacLatchCounter++] = Data; + if (VgaDacLatchCounter < 3) return; + + /* Reset the latch counter */ + VgaDacLatchCounter = 0; + + /* Set the DAC register values */ + VgaDacRegisters[VgaDacIndex * 3] = VgaDacLatch[0]; + VgaDacRegisters[VgaDacIndex * 3 + 1] = VgaDacLatch[1]; + VgaDacRegisters[VgaDacIndex * 3 + 2] = VgaDacLatch[2]; /* Fill the entry structure */ - Entry.peRed = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3]); - Entry.peGreen = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3 + 1]); - Entry.peBlue = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3 + 2]); + Entry.peRed = VGA_DAC_TO_COLOR(VgaDacLatch[0]); + Entry.peGreen = VGA_DAC_TO_COLOR(VgaDacLatch[1]); + Entry.peBlue = VGA_DAC_TO_COLOR(VgaDacLatch[2]); Entry.peFlags = 0; /* Update the palette entry */ - SetPaletteEntries(PaletteHandle, PaletteIndex, 1, &Entry); + SetPaletteEntries(PaletteHandle, VgaDacIndex, 1, &Entry); /* Check which text palette entries are affected */ for (i = 0; i <= VGA_AC_PAL_F_REG; i++) { - if (VgaAcRegisters[i] == PaletteIndex) + if (VgaAcRegisters[i] == VgaDacIndex) { /* Update the text palette entry */ SetPaletteEntries(TextPaletteHandle, i, 1, &Entry); @@ -1730,7 +1747,7 @@ /* Update the index */ VgaDacIndex++; - VgaDacIndex %= VGA_PALETTE_SIZE; + VgaDacIndex %= VGA_MAX_COLORS; } static inline VOID VgaWriteAc(BYTE Data) @@ -1888,14 +1905,16 @@ case VGA_DAC_READ_INDEX: { VgaDacReadWrite = FALSE; - VgaDacIndex = Data * 3; + VgaDacIndex = Data; + VgaDacLatchCounter = 0; break; } case VGA_DAC_WRITE_INDEX: { VgaDacReadWrite = TRUE; - VgaDacIndex = Data * 3; + VgaDacIndex = Data; + VgaDacLatchCounter = 0; break; }

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