Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[greatlrd] 27197: prepare vbe driver for two thing 1. a framebuf for VBE 1.2 this will be pretty hard to implement, I got some idea, this mean our vbe drv will work on vbe 1.2 without doing a bankswitch 2. prepare for some dx api for vbe by adding support for special mode 0x81FF meaing we getting full access to the video driver memory in vbe. Thx aleasky you remmid and long talk in some month how we can do it.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jun 16 03:58:10 2007 New Revision: 27197 URL: http://svn.reactos.org/svn/reactos?rev=27197&view=rev Log: prepare vbe driver for two thing 1. a framebuf for VBE 1.2 this will be pretty hard to implement, I got some idea, this mean our vbe drv will work on vbe 1.2 without doing a bankswitch 2. prepare for some dx api for vbe by adding support for special mode 0x81FF meaing we getting full access to the video driver memory in vbe. Thx aleasky you remmid and long talk in some month how we can do it. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c Sat Jun 16 03:58:10 2007 @@ -251,6 +251,9 @@ VBEDeviceExtension->VbeInfo.Version & 0xFF, VBEDeviceExtension->VbeInfo.TotalMemory * 64); + + + #ifdef VBE12_SUPPORT if (VBEDeviceExtension->VbeInfo.Version < 0x102) #else @@ -295,14 +298,16 @@ break; } + + /* * Allocate space for video modes information. */ VBEDeviceExtension->ModeInfo = - VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, ModeCount * sizeof(VBE_MODEINFO), TAG_VBE); + VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, (ModeCount + 1) * sizeof(VBE_MODEINFO), TAG_VBE); VBEDeviceExtension->ModeNumbers = - VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, ModeCount * sizeof(USHORT), TAG_VBE); + VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, (ModeCount+ 1) * sizeof(USHORT), TAG_VBE); /* * Get the actual mode infos. @@ -355,13 +360,64 @@ } #ifdef VBE12_SUPPORT else - { - VBEDeviceExtension->ModeNumbers[SuitableModeCount] = ModeTemp; - SuitableModeCount++; + { + /* FIXME when PCI bus scanner are inplace we need add ModeTemp | 0x4000 + * for we will map the memory our self and do not use bankswitch */ + + if (VBEDeviceExtension->VbeInfo.Version < 0x200) + { + VBEDeviceExtension->ModeNumbers[SuitableModeCount] = ModeTemp; + SuitableModeCount++; + } } #endif } } + + +#ifdef VBE12_SUPPORT + if (VBEDeviceExtension->VbeInfo.Version < 0x200) + { + /* FIXME add PCI bus scanner to detect the video ram phy address */ + } + else +#endif + if (VBEDeviceExtension->VbeInfo.Version >= 0x200) + { + + /* Call VBE BIOS to read the mode info.for the special mode */ + VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); + BiosRegisters.Eax = VBE_GET_MODE_INFORMATION; + BiosRegisters.Ecx = 0x81FF; + BiosRegisters.Edi = VBEDeviceExtension->TrampolineMemoryOffset + 0x200; + BiosRegisters.SegEs = VBEDeviceExtension->TrampolineMemorySegment; + VBEDeviceExtension->Int10Interface.Int10CallBios( + VBEDeviceExtension->Int10Interface.Context, + &BiosRegisters); + + VBEDeviceExtension->ModeNumbers[SuitableModeCount] = 0; + + if (BiosRegisters.Eax == VBE_SUCCESS) + { + /* transfer the special mode data to protected memory */ + VBEDeviceExtension->Int10Interface.Int10ReadMemory( + VBEDeviceExtension->Int10Interface.Context, + VBEDeviceExtension->TrampolineMemorySegment, + VBEDeviceExtension->TrampolineMemoryOffset + 0x200, + VBEDeviceExtension->ModeInfo + SuitableModeCount, + sizeof(VBE_MODEINFO)); + + VBEDeviceExtension->ModeNumbers[SuitableModeCount] = 0x81FF; + /* Do not add special mode to the list */ + //SuitableModeCount++; + + /* to gain full phy memory + * VBEDeviceExtension->ModeNumbers[SuitableModeCount].PhysBasePtr + * VBEDeviceExtension->VbeInfo.TotalMemory * 64 = x Memory on the card in Kbyte + */ + } + } + if (SuitableModeCount == 0) { @@ -390,6 +446,9 @@ VBEDeviceExtension->ModeInfo[CurrentMode].YResolution, VBEDeviceExtension->ModeInfo[CurrentMode].BitsPerPixel); } + + + /* * Enumerate our children. @@ -814,11 +873,14 @@ #ifdef VBE12_SUPPORT else { + // when pci bus scanner are in place we remove this one FrameBuffer.QuadPart = 0xA0000; MapInformation->VideoRamBase = RequestedAddress->RequestedVirtualAddress; MapInformation->VideoRamLength = 0x10000; } -#endif +#endif + + VideoPortMapMemory(DeviceExtension, FrameBuffer, &MapInformation->VideoRamLength, &inIoSpace,

17 years, 6 months

[dgorbachev] 27196: Fix bug #2151. Thanks to Alex Ionescu.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sat Jun 16 01:46:42 2007 New Revision: 27196 URL: http://svn.reactos.org/svn/reactos?rev=27196&view=rev Log: Fix bug #2151. Thanks to Alex Ionescu. Modified: trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Sat Jun 16 01:46:42 2007 @@ -1767,7 +1767,7 @@ NtHeader->OptionalHeader.AddressOfEntryPoint); LdrEntry->SizeOfImage = DriverSize; LdrEntry->CheckSum = NtHeader->OptionalHeader.CheckSum; - LdrEntry->SectionPointer = NULL; // FIXME: Bug 2151. + LdrEntry->SectionPointer = Section; /* Now write the DLL name */ LdrEntry->BaseDllName.Buffer = (PVOID)(LdrEntry + 1);

17 years, 6 months

[dgorbachev] 27195: I'm sorry, but r27177 does not work for me. I just tested LiveCD on real hardware, something goes wrong. So I'm reverting it for now. Please test it more carefully.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sat Jun 16 01:39:28 2007 New Revision: 27195 URL: http://svn.reactos.org/svn/reactos?rev=27195&view=rev Log: I'm sorry, but r27177 does not work for me. I just tested LiveCD on real hardware, something goes wrong. So I'm reverting it for now. Please test it more carefully. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Sat Jun 16 01:39:28 2007 @@ -2574,19 +2574,11 @@ if (! ConioGetIntersection(&SrcRegion, &ScreenBuffer, &ScrollRectangle)) { ConioUnlockScreenBuffer(Buff); - if (NULL != Console) - { - ConioUnlockConsole(Console); - } return Request->Status = STATUS_INVALID_PARAMETER; } if (UseClipRectangle && ! ConioGetIntersection(&SrcRegion, &SrcRegion, &ClipRectangle)) { - if (NULL != Console) - { - ConioUnlockConsole(Console); - } ConioUnlockScreenBuffer(Buff); return Request->Status = STATUS_SUCCESS; } @@ -2601,10 +2593,6 @@ /* Make sure destination rectangle is inside the screen buffer */ if (! ConioGetIntersection(&DstRegion, &DstRegion, &ScreenBuffer)) { - if (NULL != Console) - { - ConioUnlockConsole(Console); - } ConioUnlockScreenBuffer(Buff); return Request->Status = STATUS_INVALID_PARAMETER; } @@ -2675,10 +2663,6 @@ Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputCharRequest.ConsoleHandle, &Buff); if (! NT_SUCCESS(Status)) { - if (NULL != Console) - { - ConioUnlockConsole(Console); - } return Request->Status = Status; }

17 years, 6 months

[spetreolle] 27194: add missing library to portcls

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Jun 15 23:52:26 2007 New Revision: 27194 URL: http://svn.reactos.org/svn/reactos?rev=27194&view=rev Log: add missing library to portcls Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild Fri Jun 15 23:52:26 2007 @@ -8,6 +8,7 @@ <library>ntoskrnl</library> <library>ks</library> <library>drmk</library> + <library>kernel32</library> <file>dll.c</file> <file>adapter.c</file>

17 years, 6 months

[dgorbachev] 27193: Do not break away from the loop on every error. It can cause situation when many threads die after one client death.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Fri Jun 15 23:14:15 2007 New Revision: 27193 URL: http://svn.reactos.org/svn/reactos?rev=27193&view=rev Log: Do not break away from the loop on every error. It can cause situation when many threads die after one client death. Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/wapi.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/wapi.c Fri Jun 15 23:14:15 2007 @@ -216,6 +216,13 @@ 0, &Reply->Header, &Request->Header); + /* Client died, continue */ + if (Status == STATUS_INVALID_CID) + { + Reply = NULL; + continue; + } + if (!NT_SUCCESS(Status)) { DPRINT1("NtReplyWaitReceivePort failed: %lx\n", Status);

17 years, 6 months

[greatlrd] 27192: Fixing right behvoir for setcooperlevel with normal flag set in windows mode Fixing gpl.dwflag being set right.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 15 21:02:17 2007 New Revision: 27192 URL: http://svn.reactos.org/svn/reactos?rev=27192&view=rev Log: Fixing right behvoir for setcooperlevel with normal flag set in windows mode Fixing gpl.dwflag being set right. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c Fri Jun 15 21:02:17 2007 @@ -86,7 +86,7 @@ /* FIXME in setup.c set DDRAWI_UMODELOADED | DDRAWI_DISPLAYDRV | DDRAWI_EMULATIONINITIALIZED | DDRAWI_GDIDRV | DDRAWI_ATTACHEDTODESKTOP */ /* FIXME in setup.c This->lpLcl->lpGbl->dwFlags = */ - This->lpLcl->dwLocalFlags = DDRAWILCL_SETCOOPCALLED | DDRAWILCL_DIRECTDRAW7 | DDRAWILCL_HOOKEDHWND; + This->lpLcl->dwLocalFlags = DDRAWILCL_SETCOOPCALLED | DDRAWILCL_DIRECTDRAW7 ; This->lpLcl->hWnd = (ULONG_PTR) hwnd; This->lpLcl->hFocusWnd = (ULONG_PTR) hwnd; This->lpLcl->lpGbl->lpExclusiveOwner=NULL; Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Fri Jun 15 21:02:17 2007 @@ -285,7 +285,7 @@ } /* Fill some basic info for Surface */ - This->lpLcl->lpGbl->dwFlags = dwFlags | DDRAWI_ATTACHEDTODESKTOP; + This->lpLcl->lpGbl->dwFlags = This->lpLcl->lpGbl->dwFlags | dwFlags | DDRAWI_ATTACHEDTODESKTOP; This->lpLcl->lpDDCB = This->lpLcl->lpGbl->lpDDCBtmp; This->lpLcl->hDD = ddgbl.hDD;

17 years, 6 months

[greatlrd] 27191: Fixing smaller bugs in startup.c it does not set windows handler or use windows handler hdc it create own hdc

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 15 20:44:15 2007 New Revision: 27191 URL: http://svn.reactos.org/svn/reactos?rev=27191&view=rev Log: Fixing smaller bugs in startup.c it does not set windows handler or use windows handler hdc it create own hdc Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Fri Jun 15 20:44:15 2007 @@ -172,8 +172,9 @@ } } } - - DX_STUB_str("here\n"); + /* Windows handler are by set of SetCooperLevel + * so do not set it + */ if (reenable == FALSE) { @@ -183,8 +184,8 @@ devicetypes= 1; /* Create HDC for default, hal and hel driver */ - This->lpLcl->hWnd = (ULONG_PTR) GetActiveWindow(); - This->lpLcl->hDC = (ULONG_PTR) GetDC((HWND)This->lpLcl->hWnd); + // This->lpLcl->hWnd = (ULONG_PTR) GetActiveWindow(); + This->lpLcl->hDC = (ULONG_PTR)CreateDCA("DISPLAY",NULL,NULL,NULL); /* cObsolete is undoc in msdn it being use in CreateDCA */ RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7); @@ -197,8 +198,8 @@ { devicetypes = 2; /* Create HDC for default, hal driver */ - This->lpLcl->hWnd =(ULONG_PTR) GetActiveWindow(); - This->lpLcl->hDC = (ULONG_PTR) GetDC((HWND)This->lpLcl->hWnd); + // This->lpLcl->hWnd =(ULONG_PTR) GetActiveWindow(); + This->lpLcl->hDC = (ULONG_PTR)CreateDCA("DISPLAY",NULL,NULL,NULL); /* cObsolete is undoc in msdn it being use in CreateDCA */ RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7); @@ -210,8 +211,8 @@ devicetypes = 3; /* Create HDC for default, hal and hel driver */ - This->lpLcl->hWnd = (ULONG_PTR) GetActiveWindow(); - This->lpLcl->hDC = (ULONG_PTR) GetDC((HWND)This->lpLcl->hWnd); + //This->lpLcl->hWnd = (ULONG_PTR) GetActiveWindow(); + This->lpLcl->hDC = (ULONG_PTR)CreateDCA("DISPLAY",NULL,NULL,NULL); /* cObsolete is undoc in msdn it being use in CreateDCA */ RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7); @@ -225,15 +226,17 @@ * the register. we do not support that yet */ devicetypes = 4; - This->lpLcl->hDC = (ULONG_PTR) NULL ; - This->lpLcl->hWnd = (ULONG_PTR) GetActiveWindow(); - } - + //This->lpLcl->hDC = (ULONG_PTR) NULL ; + //This->lpLcl->hDC = (ULONG_PTR)CreateDCA("DISPLAY",NULL,NULL,NULL); + } + + /* if ( (HDC)This->lpLcl->hDC == NULL) { DX_STUB_str("DDERR_OUTOFMEMORY\n"); return DDERR_OUTOFMEMORY ; } + */ } This->lpLcl->lpDDCB = ddgbl.lpDDCBtmp; @@ -585,6 +588,11 @@ */ } + if (mHALInfo.dwFlags & DDHALINFO_GETDRIVERINFO2) + { + This->lpLcl->lpGbl->dwFlags = This->lpLcl->lpGbl->dwFlags | DDRAWI_DRIVERINFO2; + } + return DD_OK; }

17 years, 6 months

[greatlrd] 27190: Fix so our demo apps can be compile with vs, this mean we can now using our demo apps debug our ddraw.dll internal struct data or ms ddraw.dll internal struct data allot easy.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 15 18:46:18 2007 New Revision: 27190 URL: http://svn.reactos.org/svn/reactos?rev=27190&view=rev Log: Fix so our demo apps can be compile with vs, this mean we can now using our demo apps debug our ddraw.dll internal struct data or ms ddraw.dll internal struct data allot easy. Modified: trunk/rosapps/demos/ddraw/main.cpp Modified: trunk/rosapps/demos/ddraw/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/ddraw/main.cpp?rev=2… ============================================================================== --- trunk/rosapps/demos/ddraw/main.cpp (original) +++ trunk/rosapps/demos/ddraw/main.cpp Fri Jun 15 18:46:18 2007 @@ -1,9 +1,11 @@ #include <windows.h> +#include <ddrawi.h> #include <ddraw.h> LPDIRECTDRAW7 DirectDraw = NULL; LPDIRECTDRAWSURFACE7 FrontBuffer = NULL; LPDIRECTDRAWCLIPPER Clipper = NULL; +LPDDRAWI_DIRECTDRAW_INT This = NULL; PCHAR DDErrorString (HRESULT hResult); LONG WINAPI WndProc (HWND hwnd, UINT message, UINT wParam, LONG lParam); @@ -25,6 +27,8 @@ MessageBox(0,DDErrorString(hResult), "DirectDrawCreateEx", 0); return 0; } + + This = (LPDDRAWI_DIRECTDRAW_INT)DirectDraw; // Set Fullscreen or windowed mode OutputDebugString("=> DDraw->SetCooperativeLevel\n"); @@ -143,7 +147,7 @@ { MSG msg; WNDCLASS wndclass; - + HWND hwnd; Fullscreen = MessageBox(0, "Do you want to me to run in Fullscreen ?", 0, MB_YESNO) == IDYES; // Create windnow @@ -160,19 +164,27 @@ RegisterClass(&wndclass); - HWND hwnd = CreateWindow("DDrawDemo", +#ifdef USE_CLIPPER + hwnd = CreateWindow("DDrawDemo", "ReactOS DirectDraw Demo", -#ifdef USE_CLIPPER Fullscreen ? WS_POPUP : WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, + CW_USEDEFAULT, + 800, + 600, + NULL, NULL, + hInst, NULL); #else - WS_POPUP, -#endif - CW_USEDEFAULT, + hwnd = CreateWindow("DDrawDemo", + "ReactOS DirectDraw Demo", + WS_POPUP, + CW_USEDEFAULT, CW_USEDEFAULT, - 800, - 600, - NULL, NULL, + 800, + 600, + NULL, NULL, hInst, NULL); +#endif // Inizalize Ddraw if(Init(hwnd))

17 years, 6 months

[mbosma] 27189: Add lots of test cases for the CreateSurface API. See caps_tests.h for more info.

by mbosma＠svn.reactos.org

Author: mbosma Date: Fri Jun 15 18:46:03 2007 New Revision: 27189 URL: http://svn.reactos.org/svn/reactos?rev=27189&view=rev Log: Add lots of test cases for the CreateSurface API. See caps_tests.h for more info. Added: trunk/rostests/dxtest/ddraw/Surface/caps_tests.h (with props) Modified: trunk/rostests/dxtest/ddraw/Surface/create.cpp [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rostests/dxtest/ddraw/Surface/caps_tests.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/Surface/caps… Modified: trunk/rostests/dxtest/ddraw/Surface/create.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/Surface/crea…

17 years, 6 months

[fireball] 27188: - Match prototypes, stub missing functions. - Disable VGA Text mode for now.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jun 15 16:21:01 2007 New Revision: 27188 URL: http://svn.reactos.org/svn/reactos?rev=27188&view=rev Log: - Match prototypes, stub missing functions. - Disable VGA Text mode for now. Modified: branches/olpc/drivers/base/bootvid/bootvid.def branches/olpc/drivers/base/bootvid/bootvid.h branches/olpc/drivers/base/bootvid/vid.c branches/olpc/drivers/base/bootvid/vid_vga.c branches/olpc/drivers/base/bootvid/vid_vgatext.c branches/olpc/drivers/base/bootvid/vid_xbox.c Modified: branches/olpc/drivers/base/bootvid/bootvid.def URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/bootv… ============================================================================== --- branches/olpc/drivers/base/bootvid/bootvid.def (original) +++ branches/olpc/drivers/base/bootvid/bootvid.def Fri Jun 15 16:21:01 2007 @@ -1,14 +1,15 @@ -LIBRARY bootvid.sys +LIBRARY BOOTVID.DLL EXPORTS -VidInitialize -VidCleanUp -VidResetDisplay -VidBufferToScreenBlt -VidScreenToBufferBlt -VidBitBlt -VidSolidColorFill -VidDisplayString -BootVidDisplayBootLogo -BootVidUpdateProgress -BootVidFinalizeBootLogo +VidBitBlt@12 +VidBufferToScreenBlt@24 +VidCleanUp@0 +VidDisplayString@4 +VidDisplayStringXY +VidInitialize@4 +VidResetDisplay@4 +VidScreenToBufferBlt@24 +VidSetScrollRegion@16 +VidSetTextColor@4 +VidSolidColorFill@20 + Modified: branches/olpc/drivers/base/bootvid/bootvid.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/bootv… ============================================================================== --- branches/olpc/drivers/base/bootvid/bootvid.h (original) +++ branches/olpc/drivers/base/bootvid/bootvid.h Fri Jun 15 16:21:01 2007 @@ -34,7 +34,7 @@ BOOLEAN NTAPI VidInitialize(BOOLEAN); VOID NTAPI VidCleanUp(VOID); -VOID NTAPI VidResetDisplay(VOID); +VOID NTAPI VidResetDisplay(IN BOOLEAN HalReset); VOID NTAPI VidBufferToScreenBlt(PUCHAR, ULONG, ULONG, ULONG, ULONG, ULONG); VOID NTAPI VidScreenToBufferBlt(PUCHAR, ULONG, ULONG, ULONG, ULONG, ULONG); VOID NTAPI VidBitBlt(PUCHAR, ULONG, ULONG); @@ -49,6 +49,7 @@ typedef VOID (NTAPI *PVID_BITBLT)(PUCHAR, ULONG, ULONG); typedef VOID (NTAPI *PVID_SOLID_COLOR_FILL)(ULONG, ULONG, ULONG, ULONG, ULONG); typedef VOID (NTAPI *PVID_DISPLAY_STRING)(PCSTR); +typedef VOID (NTAPI *PVID_DISPLAY_STRING_XY)(PUCHAR, ULONG, ULONG, BOOLEAN); typedef struct _VID_FUNCTION_TABLE { @@ -60,6 +61,7 @@ PVID_BITBLT BitBlt; PVID_SOLID_COLOR_FILL SolidColorFill; PVID_DISPLAY_STRING DisplayString; + PVID_DISPLAY_STRING_XY DisplayStringXY; } VID_FUNCTION_TABLE, *PVID_FUNCTION_TABLE; #endif /* _BOOTVID_H */ Modified: branches/olpc/drivers/base/bootvid/vid.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/vid.c… ============================================================================== --- branches/olpc/drivers/base/bootvid/vid.c (original) +++ branches/olpc/drivers/base/bootvid/vid.c Fri Jun 15 16:21:01 2007 @@ -50,13 +50,13 @@ VidTable = &VidXboxTable; else if (SetMode) VidTable = &VidVgaTable; - else - VidTable = &VidVgaTextTable; + /*else + VidTable = &VidVgaTextTable;*/ return VidTable->Initialize(SetMode); } -VOID STDCALL -VidResetDisplay(VOID) +VOID NTAPI +VidResetDisplay(IN BOOLEAN HalReset) { VidTable->ResetDisplay(); } @@ -117,3 +117,28 @@ { VidTable->DisplayString(String); } + +VOID NTAPI +VidSetScrollRegion(IN ULONG x1, + IN ULONG y1, + IN ULONG x2, + IN ULONG y2) +{ + // UNIMPLEMENTED +} + +VOID NTAPI +VidDisplayStringXY(IN PUCHAR String, + IN ULONG Left, + IN ULONG Top, + IN BOOLEAN Transparent) +{ + // UNIMPLEMENTED +} + +ULONG NTAPI +VidSetTextColor(IN ULONG Color) +{ + // UNIMPLEMENTED + return 0; // FIXME: Return old text color +} Modified: branches/olpc/drivers/base/bootvid/vid_vga.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/vid_v… ============================================================================== --- branches/olpc/drivers/base/bootvid/vid_vga.c (original) +++ branches/olpc/drivers/base/bootvid/vid_vga.c Fri Jun 15 16:21:01 2007 @@ -499,6 +499,16 @@ { } +static VOID NTAPI +VidVgaDisplayStringXY( + IN PUCHAR String, + IN ULONG Top, + IN ULONG Left, + IN BOOLEAN Transparent) +{ +} + + VID_FUNCTION_TABLE VidVgaTable = { VidVgaInitialize, @@ -508,5 +518,6 @@ VidVgaScreenToBufferBlt, VidVgaBitBlt, VidVgaSolidColorFill, - VidVgaDisplayString + VidVgaDisplayString, + VidVgaDisplayStringXY }; Modified: branches/olpc/drivers/base/bootvid/vid_vgatext.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/vid_v… ============================================================================== --- branches/olpc/drivers/base/bootvid/vid_vgatext.c (original) +++ branches/olpc/drivers/base/bootvid/vid_vgatext.c Fri Jun 15 16:21:01 2007 @@ -238,6 +238,16 @@ WRITE_PORT_UCHAR(CRTCDATA, (UCHAR)((offset >> 8) & 0xff)); } +static VOID NTAPI +VidVgaTextDisplayStringXY( + IN PUCHAR String, + IN ULONG Top, + IN ULONG Left, + IN BOOLEAN Transparent) +{ +} + + VID_FUNCTION_TABLE VidVgaTextTable = { VidVgaTextInitialize, VidVgaTextCleanUp, @@ -246,5 +256,6 @@ VidVgaTextScreenToBufferBlt, VidVgaTextBitBlt, VidVgaTextSolidColorFill, - VidVgaTextDisplayString + VidVgaTextDisplayString, + VidVgaTextDisplayStringXY }; Modified: branches/olpc/drivers/base/bootvid/vid_xbox.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/vid_x… ============================================================================== --- branches/olpc/drivers/base/bootvid/vid_xbox.c (original) +++ branches/olpc/drivers/base/bootvid/vid_xbox.c Fri Jun 15 16:21:01 2007 @@ -89,6 +89,15 @@ { } +static VOID NTAPI +VidXboxDisplayStringXY( + IN PUCHAR String, + IN ULONG Top, + IN ULONG Left, + IN BOOLEAN Transparent) +{ +} + VID_FUNCTION_TABLE VidXboxTable = { VidXboxInitialize, VidXboxCleanUp, @@ -97,5 +106,6 @@ VidXboxScreenToBufferBlt, VidXboxBitBlt, VidXboxSolidColorFill, - VidXboxDisplayString + VidXboxDisplayString, + VidXboxDisplayStringXY };

17 years, 6 months

← Newer
1
...
13
14
15
16
17
18
19
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2007