Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 46114: Comment out RegisterServiceProcess' stub.
by dgorbachev＠svn.reactos.org 11 Mar '10

11 Mar '10

Author: dgorbachev Date: Thu Mar 11 21:59:47 2010 New Revision: 46114 URL: http://svn.reactos.org/svn/reactos?rev=46114&view=rev Log: Comment out RegisterServiceProcess' stub. Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Mar 11 21:59:47 2010 @@ -732,7 +732,7 @@ @ stdcall RegisterConsoleIME(ptr ptr) @ stdcall RegisterConsoleOS2(long) @ stdcall RegisterConsoleVDM(long long long long long long long long long long long) -@ stub RegisterServiceProcess ; missing in XP SP3 +;@ stub RegisterServiceProcess ; missing in XP SP3 @ stub RegisterSysMsgHandler ; missing in XP SP3 @ stdcall RegisterWaitForInputIdle(ptr) @ stdcall RegisterWaitForSingleObject(ptr long ptr ptr long long)

1 0

[dgorbachev] 46113: Output PCH even when full dependencies are enabled.
by dgorbachev＠svn.reactos.org 11 Mar '10

11 Mar '10

Author: dgorbachev Date: Thu Mar 11 21:59:24 2010 New Revision: 46113 URL: http://svn.reactos.org/svn/reactos?rev=46113&view=rev Log: Output PCH even when full dependencies are enabled. Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] Thu Mar 11 21:59:24 2010 @@ -125,7 +125,7 @@ ${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1)$$(SEP)$(notdir $(2)).gch: $(2) ${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1)$$(SEP)$(notdir $(2)).gch.d $(3) | ${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1) $$(ECHO_PCH) - $${gcc} -MF $$@ ${call RBUILD_cflags,$(1),$(4)} -x c-header -M -MP -MT $$@ $$< + $${gcc} -o $$@ ${call RBUILD_cflags,$(1),$(4)} -x c-header $$< else @@ -152,7 +152,7 @@ ${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1)$$(SEP)$(notdir $(2)).gch: $(2) ${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1)$$(SEP)$(notdir $(2)).gch.d $(3) | ${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1) $$(ECHO_PCH) - $${gpp} -MF $$@ ${call RBUILD_cxxflags,$(1),$(4)} -x c++-header -M -MP -MT $$@ $$< + $${gpp} -o $$@ ${call RBUILD_cxxflags,$(1),$(4)} -x c++-header $$< else

1 0

[khornicek] 46112: [SHELL32] - according to msdn ppidl should be set to NULL if an error occurs - fixes shlfolder winetest crash
by khornicek＠svn.reactos.org 11 Mar '10

11 Mar '10

Author: khornicek Date: Thu Mar 11 20:42:59 2010 New Revision: 46112 URL: http://svn.reactos.org/svn/reactos?rev=46112&view=rev Log: [SHELL32] - according to msdn ppidl should be set to NULL if an error occurs - fixes shlfolder winetest crash Modified: trunk/reactos/dll/win32/shell32/shellord.c Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] Thu Mar 11 20:42:59 2010 @@ -2244,12 +2244,21 @@ HRESULT hr=E_FAIL; ULONG dwAttr=sfgaoIn; - if (!pszName || !ppidl || !psfgaoOut) + if(!ppidl) return E_INVALIDARG; + + if (!pszName || !psfgaoOut) + { + *ppidl = NULL; + return E_INVALIDARG; + } hr = SHGetDesktopFolder(&psfDesktop); if (FAILED(hr)) + { + *ppidl = NULL; return hr; + } hr = IShellFolder_ParseDisplayName(psfDesktop, (HWND)NULL, pbc, (LPOLESTR)pszName, (ULONG *)NULL, ppidl, &dwAttr); @@ -2257,6 +2266,8 @@ if (SUCCEEDED(hr)) *psfgaoOut = dwAttr; + else + *ppidl = NULL; return hr; }

1 0

[sir_richard] 46111: [WIN32K]: Revert accidental changes to IntCreateBitmap.
by sir_richard＠svn.reactos.org 11 Mar '10

11 Mar '10

Author: sir_richard Date: Thu Mar 11 20:26:00 2010 New Revision: 46111 URL: http://svn.reactos.org/svn/reactos?rev=46111&view=rev Log: [WIN32K]: Revert accidental changes to IntCreateBitmap. Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Thu Mar 11 20:26:00 2010 @@ -332,108 +332,117 @@ IN ULONG Flags, IN PVOID Bits) { + HBITMAP hbmp; SURFOBJ *pso; PSURFACE psurf; - SIZEL LocalSize; - ULONG ScanLine = 0; // Compiler is dumb - ULONG BitsSize; - - ScanLine = abs(Width); - - /* Does the device manage its own surface? */ - if (!Bits) - { - /* The height times the bytes for each scanline */ - BitsSize = Size.cy * ScanLine; - if (BitsSize) - { - /* Check for allocation flag */ - if (Flags & BMF_USERMEM) - { - /* Get the bits from user-mode memory */ - Bits = EngAllocUserMem(BitsSize, 'mbuG'); + PVOID UncompressedBits; + ULONG UncompressedFormat; + + if (Format == 0) + return 0; + + psurf = SURFACE_AllocSurfaceWithHandle(); + if (psurf == NULL) + { + return 0; + } + hbmp = psurf->BaseObject.hHmgr; + + if (! SURFACE_InitBitsLock(psurf)) + { + SURFACE_UnlockSurface(psurf); + SURFACE_FreeSurfaceByHandle(hbmp); + return 0; + } + pso = &psurf->SurfObj; + + if (Format == BMF_4RLE) + { + pso->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_4BPP)); + pso->cjBits = pso->lDelta * Size.cy; + UncompressedFormat = BMF_4BPP; + UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); + Decompress4bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, pso->lDelta); + } + else if (Format == BMF_8RLE) + { + pso->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_8BPP)); + pso->cjBits = pso->lDelta * Size.cy; + UncompressedFormat = BMF_8BPP; + UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); + Decompress8bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, pso->lDelta); + } + else + { + pso->lDelta = abs(Width); + pso->cjBits = pso->lDelta * Size.cy; + UncompressedBits = Bits; + UncompressedFormat = Format; + } + + if (UncompressedBits != NULL) + { + pso->pvBits = UncompressedBits; + } + else + { + if (pso->cjBits == 0) + { + pso->pvBits = NULL; + } + else + { + if (0 != (Flags & BMF_USERMEM)) + { + pso->pvBits = EngAllocUserMem(pso->cjBits, 0); } else { - /* Get kernel bits (zeroed out if requested) */ - Bits = EngAllocMem((Flags & BMF_NOZEROINIT) ? 0 : FL_ZERO_MEMORY, - BitsSize, - TAG_DIB); - } - - /* Bail out if that failed */ - if (!Bits) return NULL; - } + pso->pvBits = EngAllocMem(0 != (Flags & BMF_NOZEROINIT) ? + 0 : FL_ZERO_MEMORY, + pso->cjBits, TAG_DIB); + } + if (pso->pvBits == NULL) + { + SURFACE_UnlockSurface(psurf); + SURFACE_FreeSurfaceByHandle(hbmp); + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + } + } + + if (0 == (Flags & BMF_TOPDOWN)) + { + pso->pvScan0 = (PVOID)((ULONG_PTR)pso->pvBits + pso->cjBits - pso->lDelta); + pso->lDelta = - pso->lDelta; } else { - /* Should not have asked for user memory */ -// ASSERT((Flags & BMF_USERMEM) == 0); - } - - /* Allocate the actual surface object structure */ - psurf = SURFACE_AllocSurfaceWithHandle(); - if (!psurf) return NULL; - - /* Lock down the surface */ - if (!SURFACE_InitBitsLock(psurf)) - { - /* Bail out if that failed */ - SURFACE_UnlockSurface(psurf); - SURFACE_FreeSurface(psurf); - return NULL; - } - - /* We should now have our surface object */ - pso = &psurf->SurfObj; - - /* Set bits */ - pso->pvBits = Bits; - - /* Number of bits is based on the height times the scanline */ - pso->cjBits = Size.cy * ScanLine; - if (Flags & BMF_TOPDOWN) - { - /* For topdown, the base address starts with the bits */ pso->pvScan0 = pso->pvBits; - pso->lDelta = ScanLine; - } - else - { - /* Otherwise we start with the end and go up */ - pso->pvScan0 = (PVOID)((ULONG_PTR)pso->pvBits + pso->cjBits - ScanLine); - pso->lDelta = -ScanLine; - } - - /* Save format and flags */ - pso->iBitmapFormat = Format; - pso->fjBitmap = Flags & (BMF_TOPDOWN | BMF_UMPDMEM | BMF_USERMEM); - - /* Save size and type */ - LocalSize.cx = Size.cx; - LocalSize.cy = Size.cy; - pso->sizlBitmap = Size; - pso->iType = STYPE_BITMAP; - - /* Device-managed surface, no flags or dimension */ - pso->dhsurf = 0; + } + + pso->dhsurf = 0; /* device managed surface */ + pso->hsurf = (HSURF)hbmp; pso->dhpdev = NULL; pso->hdev = NULL; + pso->sizlBitmap = Size; + pso->iBitmapFormat = UncompressedFormat; + pso->iType = STYPE_BITMAP; + pso->fjBitmap = Flags & (BMF_TOPDOWN | BMF_NOZEROINIT); + pso->iUniq = 0; + + psurf->flHooks = 0; psurf->flFlags = 0; psurf->dimension.cx = 0; psurf->dimension.cy = 0; + psurf->hSecure = NULL; psurf->hDIBSection = NULL; - psurf->flHooks = 0; - - - /* Finally set the handle and uniq */ - pso->hsurf = (HSURF)psurf->BaseObject.hHmgr; - pso->iUniq = 0; - - /* Unlock and return the surface */ + SURFACE_UnlockSurface(psurf); - return pso->hsurf; + + return hbmp; } /* Name gleaned from C++ symbol information for SURFMEM::bInitDIB */

1 0

[khornicek] 46110: - missed this one.. fix build?
by khornicek＠svn.reactos.org 11 Mar '10

11 Mar '10

Author: khornicek Date: Thu Mar 11 19:48:46 2010 New Revision: 46110 URL: http://svn.reactos.org/svn/reactos?rev=46110&view=rev Log: - missed this one.. fix build? Modified: trunk/reactos/dll/win32/user32/include/user32p.h Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Thu Mar 11 19:48:46 2010 @@ -128,10 +128,6 @@ PUSER32_THREAD_DATA User32GetThreadData(); -DEVMODEW * -WINAPI -GdiConvertToDevmodeW(DEVMODEA *dm); - /* FIXME: Belongs to some header. */ BOOL WINAPI GdiDllInitialize(HANDLE, DWORD, LPVOID); void InitStockObjects(void);

1 0

[khornicek] 46109: - fix build
by khornicek＠svn.reactos.org 11 Mar '10

11 Mar '10

Author: khornicek Date: Thu Mar 11 19:40:26 2010 New Revision: 46109 URL: http://svn.reactos.org/svn/reactos?rev=46109&view=rev Log: - fix build Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Thu Mar 11 19:40:26 2010 @@ -233,10 +233,6 @@ BOOL FollowedByData ); -DEVMODEW * -NTAPI -GdiConvertToDevmodeW(DEVMODEA *dm); - DWORD WINAPI GetAndSetDCDWord( HDC, INT, DWORD, DWORD, DWORD, DWORD ); Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Thu Mar 11 19:40:26 2010 @@ -1353,7 +1353,7 @@ */ DEVMODEW * WINAPI -GdiConvertToDevmodeW(DEVMODEA *dmA) +GdiConvertToDevmodeW(const DEVMODEA *dmA) { DEVMODEW *dmW; WORD dmW_size, dmA_size;

1 0

[evb] 46108: - Remove bits saying dithering supported, since code patented and removed (also, ReactOS win32k not support dithering calls!).
by evb＠svn.reactos.org 11 Mar '10

11 Mar '10

Author: evb Date: Thu Mar 11 19:19:58 2010 New Revision: 46108 URL: http://svn.reactos.org/svn/reactos?rev=46108&view=rev Log: - Remove bits saying dithering supported, since code patented and removed (also, ReactOS win32k not support dithering calls!). Modified: trunk/reactos/drivers/video/displays/framebuf_new/screen.c Modified: trunk/reactos/drivers/video/displays/framebuf_new/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_new/screen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebuf_new/screen.c [iso-8859-1] Thu Mar 11 19:19:58 2010 @@ -17,15 +17,18 @@ const DEVINFO gDevInfoFrameBuffer = { ( GCAPS_OPAQUERECT - | GCAPS_MONO_DITHER +// eVb: 2.8 [DDK CHANGE] - No dithering support +// eVb: 2.8 [END] ), /* Graphics capabilities */ SYSTM_LOGFONT, /* Default font description */ HELVE_LOGFONT, /* ANSI variable font description */ COURI_LOGFONT, /* ANSI fixed font description */ 0, /* Count of device fonts */ 0, /* Preferred DIB format */ - 8, /* Width of color dither */ - 8, /* Height of color dither */ +// eVb: 2.9 [DDK CHANGE] - No dithering support + 0, /* Width of color dither */ + 0, /* Height of color dither */ +// eVb: 2.9 [END] 0 /* Default palette to use for this device */ }; @@ -449,9 +452,9 @@ pGdiInfo->ulNumColors = 20; pGdiInfo->ulNumPalReg = 1 << ppdev->ulBitCount; - - pDevInfo->flGraphicsCaps |= (GCAPS_PALMANAGED | GCAPS_COLOR_DITHER); - +// eVb: 2.7 [DDK CHANGE] - No dithering support + pDevInfo->flGraphicsCaps |= GCAPS_PALMANAGED; +// eVb: 2.7 [END] pGdiInfo->ulHTOutputFormat = HT_FORMAT_8BPP; pDevInfo->iDitherFormat = BMF_8BPP;

1 0

[sir_richard] 46107: [FRAMEBUF]: Use precompiled header.
by sir_richard＠svn.reactos.org 11 Mar '10

11 Mar '10

Author: sir_richard Date: Thu Mar 11 19:19:02 2010 New Revision: 46107 URL: http://svn.reactos.org/svn/reactos?rev=46107&view=rev Log: [FRAMEBUF]: Use precompiled header. Modified: trunk/reactos/drivers/video/displays/framebuf_new/framebuf_new.rbuild Modified: trunk/reactos/drivers/video/displays/framebuf_new/framebuf_new.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_new/framebuf_new.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebuf_new/framebuf_new.rbuild [iso-8859-1] Thu Mar 11 19:19:02 2010 @@ -15,4 +15,5 @@ <compilerflag>-fno-builtin</compilerflag> <compilerflag>-Wno-unused-variable</compilerflag> </group> + <pch>driver.h</pch> </module>

1 0

[evb] 46106: - Added support IOCTRL_QUERY_PUBLIC_ACCESS_RANGES, IOCTRL_SET_PALETTE_REGISTERS, IOCTRL_QUERY_CURRENT_MODE, used by test Standard VGA-only display driver. - Code from NT4 DDK Cirrus miniport with some mods by me.
by evb＠svn.reactos.org 11 Mar '10

11 Mar '10

Author: evb Date: Thu Mar 11 18:56:27 2010 New Revision: 46106 URL: http://svn.reactos.org/svn/reactos?rev=46106&view=rev Log: - Added support IOCTRL_QUERY_PUBLIC_ACCESS_RANGES, IOCTRL_SET_PALETTE_REGISTERS, IOCTRL_QUERY_CURRENT_MODE, used by test Standard VGA-only display driver. - Code from NT4 DDK Cirrus miniport with some mods by me. Modified: trunk/reactos/drivers/video/miniport/vga_new/modeset.c trunk/reactos/drivers/video/miniport/vga_new/vga.c Modified: trunk/reactos/drivers/video/miniport/vga_new/modeset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga_new/modeset.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga_new/modeset.c [iso-8859-1] Thu Mar 11 18:56:27 2010 @@ -38,6 +38,14 @@ PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_NUM_MODES NumModes, ULONG NumModesSize, + PULONG OutputSize + ); + +VP_STATUS +VgaQueryCurrentMode( + PHW_DEVICE_EXTENSION HwDeviceExtension, + PVIDEO_MODE_INFORMATION ModeInformation, + ULONG ModeInformationSize, PULONG OutputSize ); @@ -697,6 +705,139 @@ } // end VgaGetNumberOfAvailableModes() +VP_STATUS +VgaQueryCurrentMode( + PHW_DEVICE_EXTENSION HwDeviceExtension, + PVIDEO_MODE_INFORMATION ModeInformation, + ULONG ModeInformationSize, + PULONG OutputSize + ) + +/*++ + +Routine Description: + + This routine returns a description of the current video mode. + +Arguments: + + HwDeviceExtension - Pointer to the miniport driver's device extension. + + ModeInformation - Pointer to the output buffer supplied by the user. + This is where the current mode information is stored. + + ModeInformationSize - Length of the output buffer supplied by the user. + + OutputSize - Pointer to a buffer in which to return the actual size of + the data in the buffer. If the buffer was not large enough, this + contains the minimum required buffer size. + +Return Value: + + ERROR_INSUFFICIENT_BUFFER if the output buffer was not large enough + for the data being returned. + + NO_ERROR if the operation completed successfully. + +--*/ + +{ + // + // check if a mode has been set + // + + if (HwDeviceExtension->CurrentMode == NULL ) { + + return ERROR_INVALID_FUNCTION; + + } + + // + // Find out the size of the data to be put in the the buffer and return + // that in the status information (whether or not the information is + // there). If the buffer passed in is not large enough return an + // appropriate error code. + // + + if (ModeInformationSize < (*OutputSize = sizeof(VIDEO_MODE_INFORMATION))) { + + return ERROR_INSUFFICIENT_BUFFER; + + } + + // + // Store the characteristics of the current mode into the buffer. + // + + ModeInformation->Length = sizeof(VIDEO_MODE_INFORMATION); + ModeInformation->ModeIndex = HwDeviceExtension->ModeIndex; + ModeInformation->VisScreenWidth = HwDeviceExtension->CurrentMode->hres; + ModeInformation->ScreenStride = HwDeviceExtension->CurrentMode->wbytes; + ModeInformation->VisScreenHeight = HwDeviceExtension->CurrentMode->vres; + ModeInformation->NumberOfPlanes = HwDeviceExtension->CurrentMode->numPlanes; + ModeInformation->BitsPerPlane = HwDeviceExtension->CurrentMode->bitsPerPlane; + ModeInformation->Frequency = HwDeviceExtension->CurrentMode->Frequency; + ModeInformation->XMillimeter = 320; // temporary hardcoded constant + ModeInformation->YMillimeter = 240; // temporary hardcoded constant + + ModeInformation->AttributeFlags = HwDeviceExtension->CurrentMode->fbType; + + if ((ModeInformation->BitsPerPlane == 32) || + (ModeInformation->BitsPerPlane == 24)) + { + + ModeInformation->NumberRedBits = 8; + ModeInformation->NumberGreenBits = 8; + ModeInformation->NumberBlueBits = 8; + ModeInformation->RedMask = 0xff0000; + ModeInformation->GreenMask = 0x00ff00; + ModeInformation->BlueMask = 0x0000ff; + + } + else if (ModeInformation->BitsPerPlane == 16) + { + + ModeInformation->NumberRedBits = 6; + ModeInformation->NumberGreenBits = 6; + ModeInformation->NumberBlueBits = 6; + ModeInformation->RedMask = 0x1F << 11; + ModeInformation->GreenMask = 0x3F << 5; + ModeInformation->BlueMask = 0x1F; + + } +// eVb: 2.12 [VGA] - Add support for 15bpp modes, which Cirrus doesn't support + else if (ModeInformation->BitsPerPlane == 15) + { + + ModeInformation->NumberRedBits = 6; + ModeInformation->NumberGreenBits = 6; + ModeInformation->NumberBlueBits = 6; + ModeInformation->RedMask = 0x3E << 9; + ModeInformation->GreenMask = 0x1F << 5; + ModeInformation->BlueMask = 0x1F; + } +// eVb: 2.12 [END] + else + { + + ModeInformation->NumberRedBits = 6; + ModeInformation->NumberGreenBits = 6; + ModeInformation->NumberBlueBits = 6; + ModeInformation->RedMask = 0; + ModeInformation->GreenMask = 0; + ModeInformation->BlueMask = 0; + } + +// eVb: 2.13 [VGA] - All modes are palette managed/driven, unlike Cirrus + ModeInformation->AttributeFlags |= VIDEO_MODE_PALETTE_DRIVEN | + VIDEO_MODE_MANAGED_PALETTE; +// eVb: 2.13 [END] + + return NO_ERROR; + +} // end VgaQueryCurrentMode() + + VOID VgaZeroVideoMemory( PHW_DEVICE_EXTENSION HwDeviceExtension Modified: trunk/reactos/drivers/video/miniport/vga_new/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga_new/vga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga_new/vga.c [iso-8859-1] Thu Mar 11 18:56:27 2010 @@ -55,6 +55,14 @@ PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_NUM_MODES NumModes, ULONG NumModesSize, + PULONG OutputSize + ); + +VP_STATUS +VgaQueryCurrentMode( + PHW_DEVICE_EXTENSION HwDeviceExtension, + PVIDEO_MODE_INFORMATION ModeInformation, + ULONG ModeInformationSize, PULONG OutputSize ); @@ -79,6 +87,13 @@ PUSHORT pusCmdStream ); +VP_STATUS +VgaSetPaletteReg( + PHW_DEVICE_EXTENSION HwDeviceExtension, + PVIDEO_PALETTE_DATA PaletteBuffer, + ULONG PaletteBufferSize + ); + VP_STATUS VgaSetColorLookup( PHW_DEVICE_EXTENSION HwDeviceExtension, @@ -394,7 +409,7 @@ VGA_MAX_IO_PORT - VGA_BASE_IO_PORT + 1, VgaAccessRange->RangeInIoSpace)) == NULL) { - VideoDebugPrint((2, "VgaFindAdapter - Fail to get io address\n")); + VideoDebugPrint((0, "VgaFindAdapter - Fail to get io address\n")); return ERROR_INVALID_PARAMETER; } @@ -445,7 +460,7 @@ VgaAccessRange[2].RangeLength, FALSE)) == NULL) { - VideoDebugPrint((1, "VgaFindAdapter - Fail to get memory address\n")); + VideoDebugPrint((0, "VgaFindAdapter - Fail to get memory address\n")); return ERROR_INVALID_PARAMETER; } @@ -681,7 +696,10 @@ VideoDebugPrint((2, "VgaStartIO - QueryCurrentMode\n")); - status = ERROR_INVALID_FUNCTION; + status = VgaQueryCurrentMode(HwDeviceExtension, + (PVIDEO_MODE_INFORMATION) RequestPacket->OutputBuffer, + RequestPacket->OutputBufferLength, + &RequestPacket->StatusBlock->Information); break; @@ -775,7 +793,9 @@ VideoDebugPrint((2, "VgaStartIO - SetPaletteRegs\n")); - status = ERROR_INVALID_FUNCTION; + status = VgaSetPaletteReg(HwDeviceExtension, + (PVIDEO_PALETTE_DATA) RequestPacket->InputBuffer, + RequestPacket->InputBufferLength); break; @@ -825,8 +845,53 @@ break; case IOCTL_VIDEO_QUERY_PUBLIC_ACCESS_RANGES: + { + VideoDebugPrint((2, "VgaStartIO - Query Public Address Ranges\n")); + + PVIDEO_PUBLIC_ACCESS_RANGES portAccess; + ULONG physicalPortLength; + + if (RequestPacket->OutputBufferLength < + sizeof(VIDEO_PUBLIC_ACCESS_RANGES)) + { + status = ERROR_INSUFFICIENT_BUFFER; + break; + } + + RequestPacket->StatusBlock->Information = + sizeof(VIDEO_PUBLIC_ACCESS_RANGES); + + portAccess = RequestPacket->OutputBuffer; + + // + // The first public access range is the IO ports. + // + + portAccess->VirtualAddress = (PVOID) NULL; + portAccess->InIoSpace = TRUE; + portAccess->MappedInIoSpace = portAccess->InIoSpace; + physicalPortLength = VGA_MAX_IO_PORT - VGA_BASE_IO_PORT + 1; + + status = VideoPortMapMemory(hwDeviceExtension, + VgaAccessRange->RangeStart, + &physicalPortLength, + &(portAccess->MappedInIoSpace), + &(portAccess->VirtualAddress)); +// eVb: 1.17 [GCG] - Fix lvalue error + portAccess->VirtualAddress = (PVOID)((ULONG_PTR)portAccess->VirtualAddress - VGA_BASE_IO_PORT); +// eVb: 1.17 [END] + VideoDebugPrint((2, "VgaStartIO - mapping ports to (%x)\n", portAccess->VirtualAddress)); + } + + break; + case IOCTL_VIDEO_FREE_PUBLIC_ACCESS_RANGES: + VideoDebugPrint((2, "VgaStartIO - Free Public Access Ranges\n")); + + status = ERROR_INVALID_FUNCTION; + break; + // // if we get here, an invalid IoControlCode was specified. // @@ -1180,6 +1245,96 @@ } // VgaIsPresent() +//--------------------------------------------------------------------------- +VP_STATUS +VgaSetPaletteReg( + PHW_DEVICE_EXTENSION HwDeviceExtension, + PVIDEO_PALETTE_DATA PaletteBuffer, + ULONG PaletteBufferSize + ) + +/*++ + +Routine Description: + + This routine sets a specified portion of the EGA (not DAC) palette + registers. + +Arguments: + + HwDeviceExtension - Pointer to the miniport driver's device extension. + + PaletteBuffer - Pointer to the structure containing the palette data. + + PaletteBufferSize - Length of the input buffer supplied by the user. + +Return Value: + + NO_ERROR - information returned successfully + + ERROR_INSUFFICIENT_BUFFER - input buffer not large enough for input data. + + ERROR_INVALID_PARAMETER - invalid palette size. + +--*/ + +{ + USHORT i; + + // + // Check if the size of the data in the input buffer is large enough. + // + + if ((PaletteBufferSize) < (sizeof(VIDEO_PALETTE_DATA)) || + (PaletteBufferSize < (sizeof(VIDEO_PALETTE_DATA) + + (sizeof(USHORT) * (PaletteBuffer->NumEntries -1)) ))) { + + return ERROR_INSUFFICIENT_BUFFER; + + } + + // + // Check to see if the parameters are valid. + // + + if ( (PaletteBuffer->FirstEntry > VIDEO_MAX_COLOR_REGISTER ) || + (PaletteBuffer->NumEntries == 0) || + (PaletteBuffer->FirstEntry + PaletteBuffer->NumEntries > + VIDEO_MAX_PALETTE_REGISTER + 1 ) ) { + + return ERROR_INVALID_PARAMETER; + + } + + // + // Reset ATC to index mode + // + + VideoPortReadPortUchar(HwDeviceExtension->IOAddress + + ATT_INITIALIZE_PORT_COLOR); + + // + // Blast out our palette values. + // + + for (i = 0; i < PaletteBuffer->NumEntries; i++) { + + VideoPortWritePortUchar(HwDeviceExtension->IOAddress + ATT_ADDRESS_PORT, + (UCHAR)(i+PaletteBuffer->FirstEntry)); + + VideoPortWritePortUchar(HwDeviceExtension->IOAddress + + ATT_DATA_WRITE_PORT, + (UCHAR)PaletteBuffer->Colors[i]); + } + + VideoPortWritePortUchar(HwDeviceExtension->IOAddress + ATT_ADDRESS_PORT, + VIDEO_ENABLE); + + return NO_ERROR; + +} // end VgaSetPaletteReg() + + //--------------------------------------------------------------------------- VP_STATUS VgaSetColorLookup(

1 0

[akhaldi] 46105: [NTIFS] - Group related definitions - Add InterlockedPushListSList, ExAdjustLookasideDepth and ExDisableResourceBoost - Add some asserts
by akhaldi＠svn.reactos.org 11 Mar '10

11 Mar '10

Author: akhaldi Date: Thu Mar 11 18:51:43 2010 New Revision: 46105 URL: http://svn.reactos.org/svn/reactos?rev=46105&view=rev Log: [NTIFS] - Group related definitions - Add InterlockedPushListSList, ExAdjustLookasideDepth and ExDisableResourceBoost - Add some asserts Modified: branches/header-work/include/ddk/ntifs.h Modified: branches/header-work/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h… ============================================================================== --- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Thu Mar 11 18:51:43 2010 @@ -4946,14 +4946,66 @@ KeGetProcessorIndexFromNumber( IN PPROCESSOR_NUMBER ProcNumber); +#if (NTDDI_VERSION >= NTDDI_WIN2K) + +NTKERNELAPI +SIZE_T +NTAPI +ExQueryPoolBlockSize( + IN PVOID PoolBlock, + OUT PBOOLEAN QuotaCharged); + +VOID +ExAdjustLookasideDepth( + VOID); + +NTKERNELAPI +VOID +NTAPI +ExDisableResourceBoostLite( + IN PERESOURCE Resource); + +#endif + +#define ExDisableResourceBoost ExDisableResourceBoostLite + +#define EX_PUSH_LOCK ULONG_PTR +#define PEX_PUSH_LOCK PULONG_PTR + +#if (NTDDI_VERSION >= NTDDI_WINXP) +PSLIST_ENTRY +FASTCALL +InterlockedPushListSList( + IN OUT PSLIST_HEADER ListHead, + IN OUT PSLIST_ENTRY List, + IN OUT PSLIST_ENTRY ListEnd, + IN ULONG Count); + +#endif + +/* #if !defined(_X86AMD64_) FIXME : WHAT ?! */ +#if defined(_WIN64) + +C_ASSERT(sizeof(ERESOURCE) == 0x68); +C_ASSERT(FIELD_OFFSET(ERESOURCE,ActiveCount) == 0x18); +C_ASSERT(FIELD_OFFSET(ERESOURCE,Flag) == 0x1a); + +#else + +C_ASSERT(sizeof(ERESOURCE) == 0x38); +C_ASSERT(FIELD_OFFSET(ERESOURCE,ActiveCount) == 0x0c); +C_ASSERT(FIELD_OFFSET(ERESOURCE,Flag) == 0x0e); + +#endif +/* #endif */ + + + #pragma pack(push,4) #ifndef VER_PRODUCTBUILD #define VER_PRODUCTBUILD 10000 #endif - -#define EX_PUSH_LOCK ULONG_PTR -#define PEX_PUSH_LOCK PULONG_PTR #include "csq.h" @@ -6411,21 +6463,6 @@ IN BOOLEAN Wait ); -NTKERNELAPI -VOID -NTAPI -ExDisableResourceBoostLite ( - IN PERESOURCE Resource -); - -NTKERNELAPI -SIZE_T -NTAPI -ExQueryPoolBlockSize ( - IN PVOID PoolBlock, - OUT PBOOLEAN QuotaCharged -); - #if (VER_PRODUCTBUILD >= 2600) #ifndef __NTOSKRNL__

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