Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[jgardou] 60066: [VGA_NEW] - Lessons learnt: the more trivial, the more suspicious. Fix build, and remind that MSDN is not always right.

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 12 21:22:42 2013 New Revision: 60066 URL: http://svn.reactos.org/svn/reactos?rev=60066&view=rev Log: [VGA_NEW] - Lessons learnt: the more trivial, the more suspicious. Fix build, and remind that MSDN is not always right. Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c [iso-8859-1] Thu Sep 12 21:22:42 2013 @@ -470,7 +470,7 @@ if (pRequestedMode->hres == 320) { - VideoDebugPrint(0, "ModeX not support!!!\n"); + VideoDebugPrint((0, "ModeX not support!!!\n")); return ERROR_INVALID_PARAMETER; } // eVb: 2.7 [END] @@ -481,7 +481,7 @@ if (!(pRequestedMode->fbType & VIDEO_MODE_GRAPHICS)) { // eVb: 2.8 [TODO] - This code path is not implemented yet - VideoDebugPrint(0, "Text-mode not support!!!\n"); + VideoDebugPrint((0, "Text-mode not support!!!\n")); return ERROR_INVALID_PARAMETER; // eVb: 2.8 [END] } Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c [iso-8859-1] Thu Sep 12 21:22:42 2013 @@ -44,7 +44,7 @@ CHAR Version[21]; /* If the broken VESA bios found, turn VESA off */ - VideoDebugPrint(0, "Vendor: %s Product: %s Revision: %s (%lx)\n", Vendor, Product, Revision, OemRevision); + VideoDebugPrint((0, "Vendor: %s Product: %s Revision: %s (%lx)\n", Vendor, Product, Revision, OemRevision)); for (i = 0; i < (sizeof(BrokenVesaBiosList) / sizeof(PCHAR)); i++) { if (!strncmp(Product, BrokenVesaBiosList[i], strlen(BrokenVesaBiosList[i]))) return FALSE; @@ -69,7 +69,7 @@ } /* VESA ok */ - VideoDebugPrint(0, "Vesa ok\n"); + VideoDebugPrint((0, "Vesa ok\n")); return TRUE; } @@ -153,7 +153,7 @@ Entries = ClutBuffer->NumEntries; - VideoDebugPrint(0, "Setting %lu entries.\n", Entries); + VideoDebugPrint((0, "Setting %lu entries.\n", Entries)); /* * For Vga compatible modes, write them directly. @@ -209,7 +209,7 @@ Status = VgaExtension->Int10Interface.Int10CallBios(Context, &BiosArguments); if (Status != NO_ERROR) return ERROR_INVALID_PARAMETER; VideoPortFreePool(VgaExtension, VesaClut); - VideoDebugPrint(Error, "VBE Status: %lx\n", BiosArguments.Eax); + VideoDebugPrint((Error, "VBE Status: %lx\n", BiosArguments.Eax)); if (VBE_GETRETURNCODE(BiosArguments.Eax) == VBE_SUCCESS) return NO_ERROR; return ERROR_INVALID_PARAMETER; Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c [iso-8859-1] Thu Sep 12 21:22:42 2013 @@ -98,12 +98,12 @@ ModeIndex = VgaMode->Mode; BiosArguments.Eax = VBE_SET_VBE_MODE; BiosArguments.Ebx = HIWORD(ModeIndex); - VideoDebugPrint(0, "Switching to %lx %lx\n", BiosArguments.Eax, BiosArguments.Ebx); + VideoDebugPrint((0, "Switching to %lx %lx\n", BiosArguments.Eax, BiosArguments.Ebx)); Status = VideoPortInt10(VgaDeviceExtension, &BiosArguments); if (Status != NO_ERROR) return Status; if(VBE_GETRETURNCODE(BiosArguments.Eax) != VBE_SUCCESS) { - VideoDebugPrint(0, "Changing VBE mode failed, Eax %lx", BiosArguments.Eax); + VideoDebugPrint((0, "Changing VBE mode failed, Eax %lx", BiosArguments.Eax)); return ERROR_INVALID_PARAMETER; } @@ -202,7 +202,7 @@ } /* Add ref */ - VideoDebugPrint(0, "have int10 iface\n"); + VideoDebugPrint((0, "have int10 iface\n")); VgaExtension->Int10Interface.InterfaceReference(VgaExtension->Int10Interface.Context); Context = VgaExtension->Int10Interface.Context; @@ -217,7 +217,7 @@ if (!VbeInfo) return; /* Init VBE data and write to card buffer */ - VideoDebugPrint(0, "have int10 data\n"); + VideoDebugPrint((0, "have int10 data\n")); VbeInfo->ModeArray[128] = 0xFFFF; VbeInfo->Info.Signature = VBE2_MAGIC; Status = VgaExtension->Int10Interface.Int10WriteMemory(Context, @@ -236,7 +236,7 @@ if (Status != NO_ERROR) return; if(VBE_GETRETURNCODE(BiosArguments.Eax) != VBE_SUCCESS) { - VideoDebugPrint(0, "BiosArguments.Eax %lx\n", BiosArguments.Eax); + VideoDebugPrint((0, "BiosArguments.Eax %lx\n", BiosArguments.Eax)); return; } Status = VgaExtension->Int10Interface.Int10ReadMemory(Context, @@ -247,21 +247,21 @@ if (Status != NO_ERROR) return; /* Check correct VBE BIOS */ - VideoDebugPrint(0, "have vbe data\n"); + VideoDebugPrint((0, "have vbe data\n")); TotalMemory = VbeInfo->Info.TotalMemory << 16; VbeVersion = VbeInfo->Info.Version; - VideoDebugPrint(0, "vbe version %lx memory %lx\n", VbeVersion, TotalMemory); + VideoDebugPrint((0, "vbe version %lx memory %lx\n", VbeVersion, TotalMemory)); if (!ValidateVbeInfo(VgaExtension, VbeInfo)) return; /* Read modes */ - VideoDebugPrint(0, "read modes from %p\n", VbeInfo->Info.VideoModePtr); + VideoDebugPrint((0, "read modes from %p\n", VbeInfo->Info.VideoModePtr)); Status = VgaExtension->Int10Interface.Int10ReadMemory(Context, HIWORD(VbeInfo->Info.VideoModePtr), LOWORD(VbeInfo->Info.VideoModePtr), VbeInfo->ModeArray, 128 * sizeof(USHORT)); if (Status != NO_ERROR) return; - VideoDebugPrint(0, "Read modes at: %p\n", VbeInfo->ModeArray); + VideoDebugPrint((0, "Read modes at: %p\n", VbeInfo->ModeArray)); /* Count modes, check for new 4bpp SVGA modes */ ThisMode = VbeInfo->ModeArray; @@ -269,7 +269,7 @@ while (ModeResult != 0xFFFF) { Mode = ModeResult & 0x1FF; - VideoDebugPrint(0, "Mode found: %lx\n", Mode); + VideoDebugPrint((0, "Mode found: %lx\n", Mode)); if ((Mode == 0x102) || (Mode == 0x6A)) FourBppModeFound = TRUE; ModeResult = *++ThisMode; NewModes++; @@ -287,19 +287,19 @@ /* Apply fixup for Intel Brookdale */ if (g_bIntelBrookdaleBIOS) { - VideoDebugPrint(0, "Intel Brookdale-G Video BIOS Not Support!\n"); + VideoDebugPrint((0, "Intel Brookdale-G Video BIOS Not Support!\n")); while (TRUE); } /* Scan SVGA modes */ - VideoDebugPrint(0, "Static modes: %d\n", NumVideoModes); + VideoDebugPrint((0, "Static modes: %d\n", NumVideoModes)); VgaMode = &VgaModeList[NumVideoModes]; ThisMode = VbeInfo->ModeArray; - VideoDebugPrint(0, "new modes: %d\n", NewModes); + VideoDebugPrint((0, "new modes: %d\n", NewModes)); while (NewModes--) { /* Get info on mode */ - VideoDebugPrint(0, "Getting info of mode %lx.\n", *ThisMode); + VideoDebugPrint((0, "Getting info of mode %lx.\n", *ThisMode)); VideoPortZeroMemory(&BiosArguments, sizeof(BiosArguments)); BiosArguments.Eax = VBE_GET_MODE_INFORMATION; BiosArguments.Ecx = *ThisMode; @@ -316,7 +316,7 @@ if (Status != NO_ERROR) goto Next; /* Parse graphics modes only if linear framebuffer support */ - VideoDebugPrint(0, "attr: %lx\n", VbeModeInfo->ModeAttributes); + VideoDebugPrint((0, "attr: %lx\n", VbeModeInfo->ModeAttributes)); if (!(VbeModeInfo->ModeAttributes & (VBE_MODEATTR_VALID | VBE_MODEATTR_GRAPHICS))) goto Next; LinearAddressing = ((VbeVersion >= 0x200) && @@ -325,7 +325,7 @@ TRUE : FALSE; /* Check SVGA modes if 8bpp or higher */ - VideoDebugPrint(0, "PhysBase: %lx\n", VbeModeInfo->PhysBasePtr); + VideoDebugPrint((0, "PhysBase: %lx\n", VbeModeInfo->PhysBasePtr)); if ((VbeModeInfo->XResolution >= 640) && (VbeModeInfo->YResolution >= 480) && (VbeModeInfo->NumberOfPlanes >= 1) && @@ -339,7 +339,7 @@ VgaMode->Frequency = 1; VgaMode->Mode = (*ThisMode << 16) | VBE_SET_VBE_MODE; VgaMode->Granularity = VbeModeInfo->WinGranularity << 10; - VideoDebugPrint(0, "Mode %lx (Granularity %d)\n", VgaMode->Mode, VgaMode->Granularity); + VideoDebugPrint((0, "Mode %lx (Granularity %d)\n", VgaMode->Mode, VgaMode->Granularity)); /* Set flags */ if (VbeModeInfo->ModeAttributes & VBE_MODEATTR_COLOR) VgaMode->fbType |= VIDEO_MODE_COLOR; @@ -349,12 +349,12 @@ /* If no char data, say 80x25 */ VgaMode->col = VbeModeInfo->XCharSize ? VbeModeInfo->XResolution / VbeModeInfo->XCharSize : 80; VgaMode->row = VbeModeInfo->YCharSize ? VbeModeInfo->YResolution / VbeModeInfo->YCharSize : 25; - VideoDebugPrint(0, "%d by %d rows\n", VgaMode->col, VgaMode->row); + VideoDebugPrint((0, "%d by %d rows\n", VgaMode->col, VgaMode->row)); /* Check RGB555 (15bpp only) */ VgaMode->bitsPerPlane = VbeModeInfo->BitsPerPixel / VbeModeInfo->NumberOfPlanes; if ((VgaMode->bitsPerPlane == 16) && (VbeModeInfo->GreenMaskSize == 5)) VgaMode->bitsPerPlane = 15; - VideoDebugPrint(0, "BPP: %d\n", VgaMode->bitsPerPlane); + VideoDebugPrint((0, "BPP: %d\n", VgaMode->bitsPerPlane)); /* Do linear or banked frame buffers */ VgaMode->FrameBufferBase = 0; @@ -364,18 +364,18 @@ ScreenStride = RaiseToPower2(VbeModeInfo->BytesPerScanLine); //ASSERT(ScreenStride <= MAX_USHORT); VgaMode->wbytes = (USHORT)ScreenStride; - VideoDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->wbytes); + VideoDebugPrint((0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->wbytes)); /* Size of frame buffer is Height X ScanLine, align to bank/page size */ ScreenSize = VgaMode->hres * ScreenStride; - VideoDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoDebugPrint((0, "Size: %lx\n", ScreenSize)); Size = (ScreenSize + ((64 * 1024) - 1)) & ((64 * 1024) - 1); - VideoDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoDebugPrint((0, "Size: %lx\n", ScreenSize)); if (Size > TotalMemory) Size = (Size + ((4 * 1024) - 1)) & ((4 * 1024) - 1); - VideoDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoDebugPrint((0, "Size: %lx\n", ScreenSize)); /* Banked VGA at 0xA0000 (64K) */ - VideoDebugPrint(0, "Final size: %lx\n", Size); + VideoDebugPrint((0, "Final size: %lx\n", Size)); VgaMode->fbType |= VIDEO_MODE_BANKED; VgaMode->sbytes = Size; VgaMode->PhysSize = 64 * 1024; @@ -387,20 +387,20 @@ else { /* VBE 3.00+ has specific field, read legacy field if not */ - VideoDebugPrint(0, "LINEAR MODE!!!\n"); + VideoDebugPrint((0, "LINEAR MODE!!!\n")); ScreenStride = (VbeVersion >= 0x300) ? VbeModeInfo->LinBytesPerScanLine : 0; if (!ScreenStride) ScreenStride = VbeModeInfo->BytesPerScanLine; //ASSERT(ScreenStride <= MAX_USHORT); VgaMode->wbytes = (USHORT)ScreenStride; - VideoDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->wbytes); + VideoDebugPrint((0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->wbytes)); /* Size of frame buffer is Height X ScanLine, align to page size */ ScreenSize = VgaMode->hres * LOWORD(VgaMode->wbytes); - VideoDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoDebugPrint((0, "Size: %lx\n", ScreenSize)); Size = RaiseToPower2Ulong(ScreenSize); - VideoDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoDebugPrint((0, "Size: %lx\n", ScreenSize)); if (Size > TotalMemory) Size = (Size + ((4 * 1024) - 1)) & ((4 * 1024) - 1); - VideoDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoDebugPrint((0, "Size: %lx\n", ScreenSize)); /* Linear VGA must read settings from VBE */ VgaMode->fbType |= VIDEO_MODE_LINEAR; @@ -431,7 +431,7 @@ } /* Check if last mode was color to do test */ - VideoDebugPrint(0, "mode scan complete. Total modes: %d\n", ModeCount); + VideoDebugPrint((0, "mode scan complete. Total modes: %d\n", ModeCount)); if (--VgaMode->fbType & VIDEO_MODE_COLOR) { /* Try map physical buffer and free if worked */ Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c [iso-8859-1] Thu Sep 12 21:22:42 2013 @@ -478,7 +478,7 @@ return ERROR_INVALID_PARAMETER; } - VideoDebugPrint(0, "vga mapped at %x\n", hwDeviceExtension->VideoMemoryAddress); + VideoDebugPrint((0, "vga mapped at %x\n", hwDeviceExtension->VideoMemoryAddress)); #endif // eVb: 1.7 [VDM] - Disable VDM for now ConfigInfo->VdmPhysicalVideoMemoryAddress.QuadPart = 0; @@ -1508,7 +1508,7 @@ --*/ { - VideoDebugPrint(Error, "Detected internal VGA chip on embedded board, todo\n"); + VideoDebugPrint((Error, "Detected internal VGA chip on embedded board, todo\n")); while (TRUE); return NO_ERROR;

11 years

[ion] 60065: [CSRSRV]: hbelusca: wait a sec ; -) Fix CsrCreateWait and CSR_WAIT_BLOCK to match Windows Server 2003 semantics, which don't have a "UserWaitList". Fix our winsrv not to call CsrCreateW...

by ion＠svn.reactos.org

Author: ion Date: Thu Sep 12 21:05:58 2013 New Revision: 60065 URL: http://svn.reactos.org/svn/reactos?rev=60065&view=rev Log: [CSRSRV]: hbelusca: wait a sec ;-) Fix CsrCreateWait and CSR_WAIT_BLOCK to match Windows Server 2003 semantics, which don't have a "UserWaitList". Fix our winsrv not to call CsrCreateWait incorrectly (which corrupted the heap/stack when using windows's csrsrv.dll). Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h trunk/reactos/subsystems/win32/csrsrv/csrsrv.spec trunk/reactos/subsystems/win32/csrsrv/wait.c trunk/reactos/win32ss/user/winsrv/consrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Thu Sep 12 21:05:58 2013 @@ -148,7 +148,6 @@ { ULONG Size; // Size of the wait block (variable-sized) LIST_ENTRY WaitList; - LIST_ENTRY UserWaitList; PVOID WaitContext; PCSR_THREAD WaitThread; CSR_WAIT_FUNCTION WaitFunction; @@ -285,8 +284,7 @@ IN CSR_WAIT_FUNCTION WaitFunction, IN PCSR_THREAD CsrWaitThread, IN OUT PCSR_API_MESSAGE WaitApiMessage, - IN PVOID WaitContext, - IN PLIST_ENTRY UserWaitList OPTIONAL); + IN PVOID WaitContext); NTSTATUS NTAPI Modified: trunk/reactos/subsystems/win32/csrsrv/csrsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/cs… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/csrsrv.spec [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/csrsrv.spec [iso-8859-1] Thu Sep 12 21:05:58 2013 @@ -4,7 +4,7 @@ @ stdcall CsrCreateProcess(ptr ptr ptr ptr long ptr) @ stdcall CsrCreateRemoteThread(ptr ptr) @ stdcall CsrCreateThread(ptr ptr ptr long) -@ stdcall CsrCreateWait(ptr ptr ptr ptr ptr ptr) +@ stdcall CsrCreateWait(ptr ptr ptr ptr ptr) @ stdcall CsrDebugProcess(ptr) @ stdcall CsrDebugProcessStop(ptr) @ stdcall CsrDereferenceProcess(ptr) Modified: trunk/reactos/subsystems/win32/csrsrv/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/wa… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/wait.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/wait.c [iso-8859-1] Thu Sep 12 21:05:58 2013 @@ -76,12 +76,11 @@ CsrWaitThread->WaitBlock = WaitBlock; WaitBlock->WaitContext = WaitContext; WaitBlock->WaitFunction = WaitFunction; - WaitBlock->UserWaitList.Flink = NULL; - WaitBlock->UserWaitList.Blink = NULL; - WaitBlock->WaitList = WaitBlock->UserWaitList; + WaitBlock->WaitList.Flink = NULL; + WaitBlock->WaitList.Blink = NULL; /* Copy the message */ - RtlMoveMemory(&WaitBlock->WaitApiMessage, + RtlCopyMemory(&WaitBlock->WaitApiMessage, WaitApiMessage, WaitApiMessage->Header.u1.s1.TotalLength); @@ -158,12 +157,6 @@ RemoveEntryList(&WaitBlock->WaitList); } - /* Remove it from the User Wait List */ - if (WaitBlock->UserWaitList.Flink) - { - RemoveEntryList(&WaitBlock->UserWaitList); - } - /* Dereference the thread */ CsrDereferenceThread(WaitBlock->WaitThread); @@ -206,9 +199,6 @@ * * @param WaitContext * Pointer to a user-defined parameter associated to this wait. - * - * @param UserWaitList - * Pointer to a list entry of the user-defined waits to associate. * * @return TRUE in case of success, FALSE otherwise. * @@ -221,8 +211,7 @@ IN CSR_WAIT_FUNCTION WaitFunction, IN PCSR_THREAD CsrWaitThread, IN OUT PCSR_API_MESSAGE WaitApiMessage, - IN PVOID WaitContext, - IN PLIST_ENTRY UserWaitList OPTIONAL) + IN PVOID WaitContext) { PCSR_WAIT_BLOCK WaitBlock; @@ -252,9 +241,6 @@ /* Insert the wait in the queue */ InsertTailList(WaitList, &WaitBlock->WaitList); - /* Insert the User Wait too, if one was given */ - if (UserWaitList) InsertTailList(UserWaitList, &WaitBlock->UserWaitList); - /* Return */ CsrReleaseWaitLock(); return TRUE; @@ -304,12 +290,6 @@ if (WaitBlock->WaitList.Flink) { RemoveEntryList(&WaitBlock->WaitList); - } - - /* Remove it from the User Wait List */ - if (WaitBlock->UserWaitList.Flink) - { - RemoveEntryList(&WaitBlock->UserWaitList); } /* Dereference the thread waiting on it */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Thu Sep 12 21:05:58 2013 @@ -60,8 +60,7 @@ WaitFunction, InputInfo->CallingThread, ApiMessage, - CapturedInputInfo, - NULL)) + CapturedInputInfo)) { ConsoleFreeHeap(CapturedInputInfo); return STATUS_NO_MEMORY; Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Thu Sep 12 21:05:58 2013 @@ -380,7 +380,6 @@ WriteConsoleThread, ClientThread, ApiMessage, - NULL, NULL)) { /* Fail */

11 years

[jgardou] 60064: [VGA_NEW] - Use VideoDebugPrint macro instead of VideoPortDebugPrint function. It's the same, but different (tm).

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 12 20:58:12 2013 New Revision: 60064 URL: http://svn.reactos.org/svn/reactos?rev=60064&view=rev Log: [VGA_NEW] - Use VideoDebugPrint macro instead of VideoPortDebugPrint function. It's the same, but different (tm). Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c [iso-8859-1] Thu Sep 12 20:58:12 2013 @@ -470,7 +470,7 @@ if (pRequestedMode->hres == 320) { - VideoPortDebugPrint(0, "ModeX not support!!!\n"); + VideoDebugPrint(0, "ModeX not support!!!\n"); return ERROR_INVALID_PARAMETER; } // eVb: 2.7 [END] @@ -481,7 +481,7 @@ if (!(pRequestedMode->fbType & VIDEO_MODE_GRAPHICS)) { // eVb: 2.8 [TODO] - This code path is not implemented yet - VideoPortDebugPrint(0, "Text-mode not support!!!\n"); + VideoDebugPrint(0, "Text-mode not support!!!\n"); return ERROR_INVALID_PARAMETER; // eVb: 2.8 [END] } Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c [iso-8859-1] Thu Sep 12 20:58:12 2013 @@ -44,7 +44,7 @@ CHAR Version[21]; /* If the broken VESA bios found, turn VESA off */ - VideoPortDebugPrint(0, "Vendor: %s Product: %s Revision: %s (%lx)\n", Vendor, Product, Revision, OemRevision); + VideoDebugPrint(0, "Vendor: %s Product: %s Revision: %s (%lx)\n", Vendor, Product, Revision, OemRevision); for (i = 0; i < (sizeof(BrokenVesaBiosList) / sizeof(PCHAR)); i++) { if (!strncmp(Product, BrokenVesaBiosList[i], strlen(BrokenVesaBiosList[i]))) return FALSE; @@ -69,7 +69,7 @@ } /* VESA ok */ - //VideoPortDebugPrint(0, "Vesa ok\n"); + VideoDebugPrint(0, "Vesa ok\n"); return TRUE; } @@ -153,7 +153,7 @@ Entries = ClutBuffer->NumEntries; - VideoPortDebugPrint(0, "Setting %lu entries.\n", Entries); + VideoDebugPrint(0, "Setting %lu entries.\n", Entries); /* * For Vga compatible modes, write them directly. @@ -209,7 +209,7 @@ Status = VgaExtension->Int10Interface.Int10CallBios(Context, &BiosArguments); if (Status != NO_ERROR) return ERROR_INVALID_PARAMETER; VideoPortFreePool(VgaExtension, VesaClut); - VideoPortDebugPrint(Error, "VBE Status: %lx\n", BiosArguments.Eax); + VideoDebugPrint(Error, "VBE Status: %lx\n", BiosArguments.Eax); if (VBE_GETRETURNCODE(BiosArguments.Eax) == VBE_SUCCESS) return NO_ERROR; return ERROR_INVALID_PARAMETER; Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c [iso-8859-1] Thu Sep 12 20:58:12 2013 @@ -98,11 +98,14 @@ ModeIndex = VgaMode->Mode; BiosArguments.Eax = VBE_SET_VBE_MODE; BiosArguments.Ebx = HIWORD(ModeIndex); - VideoPortDebugPrint(0, "Switching to %lx %lx\n", BiosArguments.Eax, BiosArguments.Ebx); + VideoDebugPrint(0, "Switching to %lx %lx\n", BiosArguments.Eax, BiosArguments.Ebx); Status = VideoPortInt10(VgaDeviceExtension, &BiosArguments); if (Status != NO_ERROR) return Status; if(VBE_GETRETURNCODE(BiosArguments.Eax) != VBE_SUCCESS) - VideoPortDebugPrint(0, "Changing VBE mode failed, Eax %lx", BiosArguments.Eax); + { + VideoDebugPrint(0, "Changing VBE mode failed, Eax %lx", BiosArguments.Eax); + return ERROR_INVALID_PARAMETER; + } /* Check for VESA mode */ if (ModeIndex >> 16) @@ -199,7 +202,7 @@ } /* Add ref */ - VideoPortDebugPrint(0, "have int10 iface\n"); + VideoDebugPrint(0, "have int10 iface\n"); VgaExtension->Int10Interface.InterfaceReference(VgaExtension->Int10Interface.Context); Context = VgaExtension->Int10Interface.Context; @@ -214,7 +217,7 @@ if (!VbeInfo) return; /* Init VBE data and write to card buffer */ - VideoPortDebugPrint(0, "have int10 data\n"); + VideoDebugPrint(0, "have int10 data\n"); VbeInfo->ModeArray[128] = 0xFFFF; VbeInfo->Info.Signature = VBE2_MAGIC; Status = VgaExtension->Int10Interface.Int10WriteMemory(Context, @@ -233,7 +236,7 @@ if (Status != NO_ERROR) return; if(VBE_GETRETURNCODE(BiosArguments.Eax) != VBE_SUCCESS) { - VideoPortDebugPrint(0, "BiosArguments.Eax %lx\n", BiosArguments.Eax); + VideoDebugPrint(0, "BiosArguments.Eax %lx\n", BiosArguments.Eax); return; } Status = VgaExtension->Int10Interface.Int10ReadMemory(Context, @@ -244,21 +247,21 @@ if (Status != NO_ERROR) return; /* Check correct VBE BIOS */ - VideoPortDebugPrint(0, "have vbe data\n"); + VideoDebugPrint(0, "have vbe data\n"); TotalMemory = VbeInfo->Info.TotalMemory << 16; VbeVersion = VbeInfo->Info.Version; - VideoPortDebugPrint(0, "vbe version %lx memory %lx\n", VbeVersion, TotalMemory); + VideoDebugPrint(0, "vbe version %lx memory %lx\n", VbeVersion, TotalMemory); if (!ValidateVbeInfo(VgaExtension, VbeInfo)) return; /* Read modes */ - VideoPortDebugPrint(0, "read modes from %p\n", VbeInfo->Info.VideoModePtr); + VideoDebugPrint(0, "read modes from %p\n", VbeInfo->Info.VideoModePtr); Status = VgaExtension->Int10Interface.Int10ReadMemory(Context, HIWORD(VbeInfo->Info.VideoModePtr), LOWORD(VbeInfo->Info.VideoModePtr), VbeInfo->ModeArray, 128 * sizeof(USHORT)); if (Status != NO_ERROR) return; - VideoPortDebugPrint(0, "Read modes at: %p\n", VbeInfo->ModeArray); + VideoDebugPrint(0, "Read modes at: %p\n", VbeInfo->ModeArray); /* Count modes, check for new 4bpp SVGA modes */ ThisMode = VbeInfo->ModeArray; @@ -266,7 +269,7 @@ while (ModeResult != 0xFFFF) { Mode = ModeResult & 0x1FF; - VideoPortDebugPrint(0, "Mode found: %lx\n", Mode); + VideoDebugPrint(0, "Mode found: %lx\n", Mode); if ((Mode == 0x102) || (Mode == 0x6A)) FourBppModeFound = TRUE; ModeResult = *++ThisMode; NewModes++; @@ -284,19 +287,19 @@ /* Apply fixup for Intel Brookdale */ if (g_bIntelBrookdaleBIOS) { - VideoPortDebugPrint(0, "Intel Brookdale-G Video BIOS Not Support!\n"); + VideoDebugPrint(0, "Intel Brookdale-G Video BIOS Not Support!\n"); while (TRUE); } /* Scan SVGA modes */ - VideoPortDebugPrint(0, "Static modes: %d\n", NumVideoModes); + VideoDebugPrint(0, "Static modes: %d\n", NumVideoModes); VgaMode = &VgaModeList[NumVideoModes]; ThisMode = VbeInfo->ModeArray; - VideoPortDebugPrint(0, "new modes: %d\n", NewModes); + VideoDebugPrint(0, "new modes: %d\n", NewModes); while (NewModes--) { /* Get info on mode */ - VideoPortDebugPrint(0, "Getting info of mode %lx.\n", *ThisMode); + VideoDebugPrint(0, "Getting info of mode %lx.\n", *ThisMode); VideoPortZeroMemory(&BiosArguments, sizeof(BiosArguments)); BiosArguments.Eax = VBE_GET_MODE_INFORMATION; BiosArguments.Ecx = *ThisMode; @@ -313,7 +316,7 @@ if (Status != NO_ERROR) goto Next; /* Parse graphics modes only if linear framebuffer support */ - VideoPortDebugPrint(0, "attr: %lx\n", VbeModeInfo->ModeAttributes); + VideoDebugPrint(0, "attr: %lx\n", VbeModeInfo->ModeAttributes); if (!(VbeModeInfo->ModeAttributes & (VBE_MODEATTR_VALID | VBE_MODEATTR_GRAPHICS))) goto Next; LinearAddressing = ((VbeVersion >= 0x200) && @@ -322,7 +325,7 @@ TRUE : FALSE; /* Check SVGA modes if 8bpp or higher */ - VideoPortDebugPrint(0, "PhysBase: %lx\n", VbeModeInfo->PhysBasePtr); + VideoDebugPrint(0, "PhysBase: %lx\n", VbeModeInfo->PhysBasePtr); if ((VbeModeInfo->XResolution >= 640) && (VbeModeInfo->YResolution >= 480) && (VbeModeInfo->NumberOfPlanes >= 1) && @@ -336,7 +339,7 @@ VgaMode->Frequency = 1; VgaMode->Mode = (*ThisMode << 16) | VBE_SET_VBE_MODE; VgaMode->Granularity = VbeModeInfo->WinGranularity << 10; - VideoPortDebugPrint(0, "Mode %lx (Granularity %d)\n", VgaMode->Mode, VgaMode->Granularity); + VideoDebugPrint(0, "Mode %lx (Granularity %d)\n", VgaMode->Mode, VgaMode->Granularity); /* Set flags */ if (VbeModeInfo->ModeAttributes & VBE_MODEATTR_COLOR) VgaMode->fbType |= VIDEO_MODE_COLOR; @@ -346,12 +349,12 @@ /* If no char data, say 80x25 */ VgaMode->col = VbeModeInfo->XCharSize ? VbeModeInfo->XResolution / VbeModeInfo->XCharSize : 80; VgaMode->row = VbeModeInfo->YCharSize ? VbeModeInfo->YResolution / VbeModeInfo->YCharSize : 25; - VideoPortDebugPrint(0, "%d by %d rows\n", VgaMode->col, VgaMode->row); + VideoDebugPrint(0, "%d by %d rows\n", VgaMode->col, VgaMode->row); /* Check RGB555 (15bpp only) */ VgaMode->bitsPerPlane = VbeModeInfo->BitsPerPixel / VbeModeInfo->NumberOfPlanes; if ((VgaMode->bitsPerPlane == 16) && (VbeModeInfo->GreenMaskSize == 5)) VgaMode->bitsPerPlane = 15; - VideoPortDebugPrint(0, "BPP: %d\n", VgaMode->bitsPerPlane); + VideoDebugPrint(0, "BPP: %d\n", VgaMode->bitsPerPlane); /* Do linear or banked frame buffers */ VgaMode->FrameBufferBase = 0; @@ -361,18 +364,18 @@ ScreenStride = RaiseToPower2(VbeModeInfo->BytesPerScanLine); //ASSERT(ScreenStride <= MAX_USHORT); VgaMode->wbytes = (USHORT)ScreenStride; - VideoPortDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->wbytes); + VideoDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->wbytes); /* Size of frame buffer is Height X ScanLine, align to bank/page size */ ScreenSize = VgaMode->hres * ScreenStride; - VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoDebugPrint(0, "Size: %lx\n", ScreenSize); Size = (ScreenSize + ((64 * 1024) - 1)) & ((64 * 1024) - 1); - VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoDebugPrint(0, "Size: %lx\n", ScreenSize); if (Size > TotalMemory) Size = (Size + ((4 * 1024) - 1)) & ((4 * 1024) - 1); - VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoDebugPrint(0, "Size: %lx\n", ScreenSize); /* Banked VGA at 0xA0000 (64K) */ - VideoPortDebugPrint(0, "Final size: %lx\n", Size); + VideoDebugPrint(0, "Final size: %lx\n", Size); VgaMode->fbType |= VIDEO_MODE_BANKED; VgaMode->sbytes = Size; VgaMode->PhysSize = 64 * 1024; @@ -384,20 +387,20 @@ else { /* VBE 3.00+ has specific field, read legacy field if not */ - VideoPortDebugPrint(0, "LINEAR MODE!!!\n"); + VideoDebugPrint(0, "LINEAR MODE!!!\n"); ScreenStride = (VbeVersion >= 0x300) ? VbeModeInfo->LinBytesPerScanLine : 0; if (!ScreenStride) ScreenStride = VbeModeInfo->BytesPerScanLine; //ASSERT(ScreenStride <= MAX_USHORT); VgaMode->wbytes = (USHORT)ScreenStride; - VideoPortDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->wbytes); + VideoDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->wbytes); /* Size of frame buffer is Height X ScanLine, align to page size */ ScreenSize = VgaMode->hres * LOWORD(VgaMode->wbytes); - VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoDebugPrint(0, "Size: %lx\n", ScreenSize); Size = RaiseToPower2Ulong(ScreenSize); - VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoDebugPrint(0, "Size: %lx\n", ScreenSize); if (Size > TotalMemory) Size = (Size + ((4 * 1024) - 1)) & ((4 * 1024) - 1); - VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoDebugPrint(0, "Size: %lx\n", ScreenSize); /* Linear VGA must read settings from VBE */ VgaMode->fbType |= VIDEO_MODE_LINEAR; @@ -428,7 +431,7 @@ } /* Check if last mode was color to do test */ - VideoPortDebugPrint(0, "mode scan complete. Total modes: %d\n", ModeCount); + VideoDebugPrint(0, "mode scan complete. Total modes: %d\n", ModeCount); if (--VgaMode->fbType & VIDEO_MODE_COLOR) { /* Try map physical buffer and free if worked */ Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c [iso-8859-1] Thu Sep 12 20:58:12 2013 @@ -478,7 +478,7 @@ return ERROR_INVALID_PARAMETER; } - VideoPortDebugPrint(0, "vga mapped at %x\n", hwDeviceExtension->VideoMemoryAddress); + VideoDebugPrint(0, "vga mapped at %x\n", hwDeviceExtension->VideoMemoryAddress); #endif // eVb: 1.7 [VDM] - Disable VDM for now ConfigInfo->VdmPhysicalVideoMemoryAddress.QuadPart = 0; @@ -1508,7 +1508,7 @@ --*/ { - VideoPortDebugPrint(Error, "Detected internal VGA chip on embedded board, todo\n"); + VideoDebugPrint(Error, "Detected internal VGA chip on embedded board, todo\n"); while (TRUE); return NO_ERROR;

11 years

[jgardou] 60063: [VGA_NEW] - Zero out the Int10 Bios call arguments structure before calling Videoprt Int10CallBios - Properly check for VESA BIOS return value from such calls - Use VGA registers t...

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 12 20:25:24 2013 New Revision: 60063 URL: http://svn.reactos.org/svn/reactos?rev=60063&view=rev Log: [VGA_NEW] - Zero out the Int10 Bios call arguments structure before calling Videoprt Int10CallBios - Properly check for VESA BIOS return value from such calls - Use VGA registers to update the palette when possible. Now bochs goes up to 3rd stage when using this driver in conjunction with framebuf_new. Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c [iso-8859-1] Thu Sep 12 20:25:24 2013 @@ -91,7 +91,7 @@ Context = VgaExtension->Int10Interface.Context; /* Check magic and version */ - if (VbeInfo->Info.Signature == VESA_MAGIC) return VesaBiosOk; + if (VbeInfo->Info.Signature != VESA_MAGIC) return VesaBiosOk; if (VbeInfo->Info.Version < 0x102) return VesaBiosOk; /* Read strings */ @@ -149,11 +149,31 @@ USHORT TrampolineMemorySegment, TrampolineMemoryOffset; VP_STATUS Status; USHORT i; + PVIDEOMODE CurrentMode = VgaExtension->CurrentMode; Entries = ClutBuffer->NumEntries; + + VideoPortDebugPrint(0, "Setting %lu entries.\n", Entries); + + /* + * For Vga compatible modes, write them directly. + * Otherwise, the LGPL VGABIOS (used in bochs) fails! + * It is also said that this way is faster. + */ + if(!CurrentMode->NonVgaMode) + { + for (i=ClutBuffer->FirstEntry; i<ClutBuffer->FirstEntry + Entries; i++) + { + VideoPortWritePortUchar((PUCHAR)0x03c8, i); + VideoPortWritePortUchar((PUCHAR)0x03c9, ClutBuffer->LookupTable[i].RgbArray.Red); + VideoPortWritePortUchar((PUCHAR)0x03c9, ClutBuffer->LookupTable[i].RgbArray.Green); + VideoPortWritePortUchar((PUCHAR)0x03c9, ClutBuffer->LookupTable[i].RgbArray.Blue); + } + return NO_ERROR; + } /* Allocate INT10 context/buffer */ - VesaClut = VideoPortAllocatePool(VgaExtension, 1, sizeof(ULONG) * Entries, 0x20616756u); + VesaClut = VideoPortAllocatePool(VgaExtension, 1, sizeof(ULONG) * Entries, ' agV'); if (!VesaClut) return ERROR_INVALID_PARAMETER; if (!VgaExtension->Int10Interface.Size) return ERROR_INVALID_PARAMETER; Context = VgaExtension->Int10Interface.Context; @@ -178,7 +198,8 @@ Entries * sizeof(ULONG)); if (Status != NO_ERROR) return ERROR_INVALID_PARAMETER; - /* Write new palette */ + /* Write the palette */ + VideoPortZeroMemory(&BiosArguments, sizeof(BiosArguments)); BiosArguments.Ebx = 0; BiosArguments.Ecx = Entries; BiosArguments.Edx = ClutBuffer->FirstEntry; @@ -189,7 +210,8 @@ if (Status != NO_ERROR) return ERROR_INVALID_PARAMETER; VideoPortFreePool(VgaExtension, VesaClut); VideoPortDebugPrint(Error, "VBE Status: %lx\n", BiosArguments.Eax); - if (BiosArguments.Eax == VBE_SUCCESS) return NO_ERROR; + if (VBE_GETRETURNCODE(BiosArguments.Eax) == VBE_SUCCESS) + return NO_ERROR; return ERROR_INVALID_PARAMETER; } Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c [iso-8859-1] Thu Sep 12 20:25:24 2013 @@ -58,13 +58,15 @@ if (Status != NO_ERROR) return 0; /* Ask VBE BIOS for mode info */ + VideoPortZeroMemory(&BiosArguments, sizeof(BiosArguments)); BiosArguments.Ecx = HIWORD(VgaMode->Mode); BiosArguments.Edi = TrampolineMemorySegment; BiosArguments.SegEs = TrampolineMemoryOffset; BiosArguments.Eax = VBE_GET_MODE_INFORMATION; Status = VgaExtension->Int10Interface.Int10CallBios(Context, &BiosArguments); if (Status != NO_ERROR) return 0; - if (BiosArguments.Eax != VBE_SUCCESS) return 0; + if (VBE_GETRETURNCODE(BiosArguments.Eax) != VBE_SUCCESS) + return 0; Status = VgaExtension->Int10Interface.Int10ReadMemory(Context, TrampolineMemorySegment, TrampolineMemoryOffset, @@ -94,23 +96,27 @@ VideoPortZeroMemory(&BiosArguments, sizeof(BiosArguments)); ModeIndex = VgaMode->Mode; - BiosArguments.Eax = ModeIndex & 0x0000FFFF; - BiosArguments.Ebx = ModeIndex >> 16; + BiosArguments.Eax = VBE_SET_VBE_MODE; + BiosArguments.Ebx = HIWORD(ModeIndex); VideoPortDebugPrint(0, "Switching to %lx %lx\n", BiosArguments.Eax, BiosArguments.Ebx); Status = VideoPortInt10(VgaDeviceExtension, &BiosArguments); if (Status != NO_ERROR) return Status; + if(VBE_GETRETURNCODE(BiosArguments.Eax) != VBE_SUCCESS) + VideoPortDebugPrint(0, "Changing VBE mode failed, Eax %lx", BiosArguments.Eax); /* Check for VESA mode */ if (ModeIndex >> 16) { /* Mode set fail */ - if (BiosArguments.Eax != VBE_SUCCESS) return ERROR_INVALID_PARAMETER; + if (VBE_GETRETURNCODE(BiosArguments.Eax) != VBE_SUCCESS) + return ERROR_INVALID_PARAMETER; /* Check current mode is desired mode */ + VideoPortZeroMemory(&BiosArguments, sizeof(BiosArguments)); BiosArguments.Eax = VBE_GET_CURRENT_VBE_MODE; Status = VideoPortInt10(VgaDeviceExtension, &BiosArguments); if ((Status == NO_ERROR) && - (BiosArguments.Eax == VBE_SUCCESS) && + (VBE_GETRETURNCODE(BiosArguments.Eax) == VBE_SUCCESS) && ((BiosArguments.Ebx ^ (ModeIndex >> 16)) & VBE_MODE_BITS)) { return ERROR_INVALID_PARAMETER; @@ -120,12 +126,13 @@ if (VgaMode->LogicalWidth != VgaMode->hres) { /* Check setting works after being set */ + VideoPortZeroMemory(&BiosArguments, sizeof(BiosArguments)); BiosArguments.Eax = VBE_SET_GET_LOGICAL_SCAN_LINE_LENGTH; BiosArguments.Ecx = VgaMode->LogicalWidth; BiosArguments.Ebx = 0; Status = VideoPortInt10(VgaDeviceExtension, &BiosArguments); if ((Status != NO_ERROR) || - (BiosArguments.Eax != VBE_SUCCESS) || + (VBE_GETRETURNCODE(BiosArguments.Eax) != VBE_SUCCESS) || (BiosArguments.Ecx != VgaMode->LogicalWidth)) { return ERROR_INVALID_PARAMETER; @@ -192,7 +199,7 @@ } /* Add ref */ - //VideoPortDebugPrint(0, "have int10 iface\n"); + VideoPortDebugPrint(0, "have int10 iface\n"); VgaExtension->Int10Interface.InterfaceReference(VgaExtension->Int10Interface.Context); Context = VgaExtension->Int10Interface.Context; @@ -207,23 +214,28 @@ if (!VbeInfo) return; /* Init VBE data and write to card buffer */ - //VideoPortDebugPrint(0, "have int10 data\n"); + VideoPortDebugPrint(0, "have int10 data\n"); VbeInfo->ModeArray[128] = 0xFFFF; VbeInfo->Info.Signature = VBE2_MAGIC; Status = VgaExtension->Int10Interface.Int10WriteMemory(Context, TrampolineMemorySegment, TrampolineMemoryOffset, - VbeInfo, - 512); + &VbeInfo->Info.Signature, + 4); if (Status != NO_ERROR) return; /* Get controller info */ + VideoPortZeroMemory(&BiosArguments, sizeof(BiosArguments)); BiosArguments.Edi = TrampolineMemoryOffset; BiosArguments.SegEs = TrampolineMemorySegment; BiosArguments.Eax = VBE_GET_CONTROLLER_INFORMATION; Status = VgaExtension->Int10Interface.Int10CallBios(Context, &BiosArguments); if (Status != NO_ERROR) return; - if (BiosArguments.Eax != VBE_SUCCESS) return; + if(VBE_GETRETURNCODE(BiosArguments.Eax) != VBE_SUCCESS) + { + VideoPortDebugPrint(0, "BiosArguments.Eax %lx\n", BiosArguments.Eax); + return; + } Status = VgaExtension->Int10Interface.Int10ReadMemory(Context, TrampolineMemorySegment, TrampolineMemoryOffset, @@ -232,21 +244,21 @@ if (Status != NO_ERROR) return; /* Check correct VBE BIOS */ - //VideoPortDebugPrint(0, "have vbe data\n"); + VideoPortDebugPrint(0, "have vbe data\n"); TotalMemory = VbeInfo->Info.TotalMemory << 16; VbeVersion = VbeInfo->Info.Version; VideoPortDebugPrint(0, "vbe version %lx memory %lx\n", VbeVersion, TotalMemory); if (!ValidateVbeInfo(VgaExtension, VbeInfo)) return; /* Read modes */ - //VideoPortDebugPrint(0, "read modes from %p\n", VbeInfo->Info.VideoModePtr); + VideoPortDebugPrint(0, "read modes from %p\n", VbeInfo->Info.VideoModePtr); Status = VgaExtension->Int10Interface.Int10ReadMemory(Context, HIWORD(VbeInfo->Info.VideoModePtr), LOWORD(VbeInfo->Info.VideoModePtr), VbeInfo->ModeArray, 128 * sizeof(USHORT)); if (Status != NO_ERROR) return; - //VideoPortDebugPrint(0, "Read modes at: %p\n", VbeInfo->ModeArray); + VideoPortDebugPrint(0, "Read modes at: %p\n", VbeInfo->ModeArray); /* Count modes, check for new 4bpp SVGA modes */ ThisMode = VbeInfo->ModeArray; @@ -254,7 +266,7 @@ while (ModeResult != 0xFFFF) { Mode = ModeResult & 0x1FF; - //VideoPortDebugPrint(0, "Mode found: %lx\n", Mode); + VideoPortDebugPrint(0, "Mode found: %lx\n", Mode); if ((Mode == 0x102) || (Mode == 0x6A)) FourBppModeFound = TRUE; ModeResult = *++ThisMode; NewModes++; @@ -277,20 +289,22 @@ } /* Scan SVGA modes */ -// VideoPortDebugPrint(0, "Static modes: %d\n", NumVideoModes); + VideoPortDebugPrint(0, "Static modes: %d\n", NumVideoModes); VgaMode = &VgaModeList[NumVideoModes]; ThisMode = VbeInfo->ModeArray; - //VideoPortDebugPrint(0, "new modes: %d\n", NewModes); + VideoPortDebugPrint(0, "new modes: %d\n", NewModes); while (NewModes--) { /* Get info on mode */ + VideoPortDebugPrint(0, "Getting info of mode %lx.\n", *ThisMode); + VideoPortZeroMemory(&BiosArguments, sizeof(BiosArguments)); BiosArguments.Eax = VBE_GET_MODE_INFORMATION; BiosArguments.Ecx = *ThisMode; BiosArguments.Edi = TrampolineMemoryOffset; BiosArguments.SegEs = TrampolineMemorySegment; Status = VgaExtension->Int10Interface.Int10CallBios(Context, &BiosArguments); if (Status != NO_ERROR) goto Next; - if (BiosArguments.Eax != VBE_SUCCESS) goto Next; + if (VBE_GETRETURNCODE(BiosArguments.Eax) != VBE_SUCCESS) goto Next; Status = VgaExtension->Int10Interface.Int10ReadMemory(Context, TrampolineMemorySegment, TrampolineMemoryOffset, @@ -299,7 +313,7 @@ if (Status != NO_ERROR) goto Next; /* Parse graphics modes only if linear framebuffer support */ - //VideoPortDebugPrint(0, "attr: %lx\n", VbeModeInfo->ModeAttributes); + VideoPortDebugPrint(0, "attr: %lx\n", VbeModeInfo->ModeAttributes); if (!(VbeModeInfo->ModeAttributes & (VBE_MODEATTR_VALID | VBE_MODEATTR_GRAPHICS))) goto Next; LinearAddressing = ((VbeVersion >= 0x200) && @@ -308,7 +322,7 @@ TRUE : FALSE; /* Check SVGA modes if 8bpp or higher */ - //VideoPortDebugPrint(0, "PhysBase: %lx\n", VbeModeInfo->PhysBasePtr); + VideoPortDebugPrint(0, "PhysBase: %lx\n", VbeModeInfo->PhysBasePtr); if ((VbeModeInfo->XResolution >= 640) && (VbeModeInfo->YResolution >= 480) && (VbeModeInfo->NumberOfPlanes >= 1) && @@ -322,7 +336,7 @@ VgaMode->Frequency = 1; VgaMode->Mode = (*ThisMode << 16) | VBE_SET_VBE_MODE; VgaMode->Granularity = VbeModeInfo->WinGranularity << 10; - //VideoPortDebugPrint(0, "Mode %lx (Granularity %d)\n", VgaMode->Mode, VgaMode->Granularity); + VideoPortDebugPrint(0, "Mode %lx (Granularity %d)\n", VgaMode->Mode, VgaMode->Granularity); /* Set flags */ if (VbeModeInfo->ModeAttributes & VBE_MODEATTR_COLOR) VgaMode->fbType |= VIDEO_MODE_COLOR; @@ -332,12 +346,12 @@ /* If no char data, say 80x25 */ VgaMode->col = VbeModeInfo->XCharSize ? VbeModeInfo->XResolution / VbeModeInfo->XCharSize : 80; VgaMode->row = VbeModeInfo->YCharSize ? VbeModeInfo->YResolution / VbeModeInfo->YCharSize : 25; - //VideoPortDebugPrint(0, "%d by %d rows\n", VgaMode->Columns, VgaMode->Rows); + VideoPortDebugPrint(0, "%d by %d rows\n", VgaMode->col, VgaMode->row); /* Check RGB555 (15bpp only) */ VgaMode->bitsPerPlane = VbeModeInfo->BitsPerPixel / VbeModeInfo->NumberOfPlanes; if ((VgaMode->bitsPerPlane == 16) && (VbeModeInfo->GreenMaskSize == 5)) VgaMode->bitsPerPlane = 15; - //VideoPortDebugPrint(0, "BPP: %d\n", VgaMode->BitsPerPlane); + VideoPortDebugPrint(0, "BPP: %d\n", VgaMode->bitsPerPlane); /* Do linear or banked frame buffers */ VgaMode->FrameBufferBase = 0; @@ -347,18 +361,18 @@ ScreenStride = RaiseToPower2(VbeModeInfo->BytesPerScanLine); //ASSERT(ScreenStride <= MAX_USHORT); VgaMode->wbytes = (USHORT)ScreenStride; - //VideoPortDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->Stride); + VideoPortDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->wbytes); /* Size of frame buffer is Height X ScanLine, align to bank/page size */ ScreenSize = VgaMode->hres * ScreenStride; - //VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); Size = (ScreenSize + ((64 * 1024) - 1)) & ((64 * 1024) - 1); - //VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); if (Size > TotalMemory) Size = (Size + ((4 * 1024) - 1)) & ((4 * 1024) - 1); - //VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); /* Banked VGA at 0xA0000 (64K) */ - //VideoPortDebugPrint(0, "Final size: %lx\n", Size); + VideoPortDebugPrint(0, "Final size: %lx\n", Size); VgaMode->fbType |= VIDEO_MODE_BANKED; VgaMode->sbytes = Size; VgaMode->PhysSize = 64 * 1024; @@ -370,20 +384,20 @@ else { /* VBE 3.00+ has specific field, read legacy field if not */ - //VideoPortDebugPrint(0, "LINEAR MODE!!!\n"); + VideoPortDebugPrint(0, "LINEAR MODE!!!\n"); ScreenStride = (VbeVersion >= 0x300) ? VbeModeInfo->LinBytesPerScanLine : 0; if (!ScreenStride) ScreenStride = VbeModeInfo->BytesPerScanLine; //ASSERT(ScreenStride <= MAX_USHORT); VgaMode->wbytes = (USHORT)ScreenStride; - //VideoPortDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->Stride); + VideoPortDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->wbytes); /* Size of frame buffer is Height X ScanLine, align to page size */ ScreenSize = VgaMode->hres * LOWORD(VgaMode->wbytes); - //VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); Size = RaiseToPower2Ulong(ScreenSize); - //VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); if (Size > TotalMemory) Size = (Size + ((4 * 1024) - 1)) & ((4 * 1024) - 1); - //VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); + VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); /* Linear VGA must read settings from VBE */ VgaMode->fbType |= VIDEO_MODE_LINEAR;

11 years

[jgardou] 60062: [SETUPAPI] SourceDisksFiles and SourceDisksNames inf section can be platform dependant.

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 12 20:18:26 2013 New Revision: 60062 URL: http://svn.reactos.org/svn/reactos?rev=60062&view=rev Log: [SETUPAPI] SourceDisksFiles and SourceDisksNames inf section can be platform dependant. Modified: trunk/reactos/dll/win32/setupapi/queue.c Modified: trunk/reactos/dll/win32/setupapi/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/queue.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] Thu Sep 12 20:18:26 2013 @@ -283,9 +283,12 @@ INFCONTEXT file_ctx, disk_ctx; INT id, diskid; DWORD len, len2; + WCHAR SectionName[MAX_PATH]; /* find the SourceDisksFiles entry */ - if (!SetupFindFirstLineW( hinf, SourceDisksFiles, op->src_file, &file_ctx )) + if(!SetupDiGetActualSectionToInstallW(hinf, SourceDisksFiles, SectionName, MAX_PATH, NULL, NULL)) + return; + if (!SetupFindFirstLineW( hinf, SectionName, op->src_file, &file_ctx )) { if ((op->style & (SP_COPY_SOURCE_ABSOLUTE|SP_COPY_SOURCEPATH_ABSOLUTE))) return; /* no specific info, use .inf file source directory */ @@ -295,7 +298,9 @@ if (!SetupGetIntField( &file_ctx, 1, &diskid )) return; /* now find the diskid in the SourceDisksNames section */ - if (!SetupFindFirstLineW( hinf, SourceDisksNames, NULL, &disk_ctx )) return; + if(!SetupDiGetActualSectionToInstallW(hinf, SourceDisksNames, SectionName, MAX_PATH, NULL, NULL)) + return; + if (!SetupFindFirstLineW( hinf, SectionName, NULL, &disk_ctx )) return; for (;;) { if (SetupGetIntField( &disk_ctx, 0, &id ) && (id == diskid)) break;

11 years

[khornicek] 60061: [NTOSKRNL][KERNEL32] Fix a few more cases of missing _SEH2_YIELD.

by khornicek＠svn.reactos.org

Author: khornicek Date: Thu Sep 12 10:06:34 2013 New Revision: 60061 URL: http://svn.reactos.org/svn/reactos?rev=60061&view=rev Log: [NTOSKRNL][KERNEL32] Fix a few more cases of missing _SEH2_YIELD. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Thu Sep 12 10:06:34 2013 @@ -1838,7 +1838,7 @@ ProcessHandle = OpenProcess(PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, FALSE, ProcessId); - if (!ProcessHandle) return 0; + if (!ProcessHandle) _SEH2_YIELD(return 0); /* Try to find out where its PEB lives */ Status = NtQueryInformationProcess(ProcessHandle, Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Thu Sep 12 10:06:34 2013 @@ -1109,7 +1109,7 @@ /* Try with exclusive KCB lock */ CmpConvertKcbSharedToExclusive(Kcb); - goto DoAgain; + _SEH2_YIELD(goto DoAgain); } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -1278,7 +1278,7 @@ /* Try with exclusive KCB lock */ CmpConvertKcbSharedToExclusive(Kcb); - goto DoAgain; + _SEH2_YIELD(goto DoAgain); } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Thu Sep 12 10:06:34 2013 @@ -418,7 +418,7 @@ #endif /* Validate them */ - if (StackEnd <= StackBegin) return 0; + if (StackEnd <= StackBegin) _SEH2_YIELD(return 0); ProbeForRead((PVOID)StackBegin, StackEnd - StackBegin, sizeof(CHAR));

11 years

[tfaber] 60060: [NTMARTA] - Request the necessary SYNCHRONIZE access right. Fixes advapi32:security regression

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Sep 12 09:57:25 2013 New Revision: 60060 URL: http://svn.reactos.org/svn/reactos?rev=60060&view=rev Log: [NTMARTA] - Request the necessary SYNCHRONIZE access right. Fixes advapi32:security regression Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c [iso-8859-1] Thu Sep 12 09:57:25 2013 @@ -887,7 +887,7 @@ NULL); Status = NtOpenFile(Handle, - DesiredAccess /* | SYNCHRONIZE */, + DesiredAccess | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,

11 years

[ion] 60059: [NTOSKRNL]: Implement ThreadIsTermination info class in NtQueryInformationThread. [CSRSRV]: CsrInsertThread should call this API to make sure the thread isn't dead already. Update the ...

by ion＠svn.reactos.org

Author: ion Date: Thu Sep 12 09:02:48 2013 New Revision: 60059 URL: http://svn.reactos.org/svn/reactos?rev=60059&view=rev Log: [NTOSKRNL]: Implement ThreadIsTermination info class in NtQueryInformationThread. [CSRSRV]: CsrInsertThread should call this API to make sure the thread isn't dead already. Update the callers to handle this possible failure. This behavior was obeserved in Windows' CSRSRV.DLL. It now works in ReactOS as well. Modified: trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/subsystems/win32/csrsrv/api.h trunk/reactos/subsystems/win32/csrsrv/procsup.c trunk/reactos/subsystems/win32/csrsrv/session.c trunk/reactos/subsystems/win32/csrsrv/thredsup.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=60… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Thu Sep 12 09:02:48 2013 @@ -2412,6 +2412,7 @@ (PTHREAD_BASIC_INFORMATION)ThreadInformation; PKERNEL_USER_TIMES ThreadTime = (PKERNEL_USER_TIMES)ThreadInformation; KIRQL OldIrql; + ULONG ThreadTerminated; PAGED_CODE(); /* Check if we were called from user mode */ @@ -2659,6 +2660,31 @@ Status = _SEH2_GetExceptionCode(); } _SEH2_END; + break; + + case ThreadIsTerminated: + + /* Set the return length*/ + Length = sizeof(ThreadTerminated); + + if (ThreadInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + ThreadTerminated = PsIsThreadTerminating(Thread); + + _SEH2_TRY + { + *(PULONG)ThreadInformation = ThreadTerminated ? 1 : 0; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + break; /* Anything else */ Modified: trunk/reactos/subsystems/win32/csrsrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] Thu Sep 12 09:02:48 2013 @@ -137,10 +137,14 @@ NTAPI UnProtectHandle(IN HANDLE ObjectHandle); -VOID +NTSTATUS NTAPI CsrInsertThread(IN PCSR_PROCESS Process, IN PCSR_THREAD Thread); + +VOID +NTAPI +CsrDeallocateThread(IN PCSR_THREAD CsrThread); VOID NTAPI Modified: trunk/reactos/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/pr… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Thu Sep 12 09:02:48 2013 @@ -690,7 +690,15 @@ CsrThread->Flags = 0; /* Insert the Thread into the Process */ - CsrInsertThread(CsrProcess, CsrThread); + Status = CsrInsertThread(CsrProcess, CsrThread); + if (!NT_SUCCESS(Status)) + { + /* Bail out */ + CsrDeallocateProcess(CsrProcess); + CsrDeallocateThread(CsrThread); + CsrReleaseProcessLock(); + return Status; + } /* Reference the session */ CsrReferenceNtSession(NtSession); Modified: trunk/reactos/subsystems/win32/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/se… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/session.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/session.c [iso-8859-1] Thu Sep 12 09:02:48 2013 @@ -289,7 +289,15 @@ CsrThread->Flags = 0; /* Insert it into the Process List */ - CsrInsertThread(CsrProcess, CsrThread); + Status = CsrInsertThread(CsrProcess, CsrThread); + if (!NT_SUCCESS(Status)) + { + /* Bail out */ + CsrDeallocateProcess(CsrProcess); + CsrDeallocateThread(CsrThread); + CsrReleaseProcessLock(); + return Status; + } /* Setup Process Data */ CsrProcess->ClientId = CreateSession->ProcessInfo.ClientId; Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/th… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Thu Sep 12 09:02:48 2013 @@ -292,13 +292,24 @@ * @remarks None. * *--*/ -VOID +NTSTATUS NTAPI CsrInsertThread(IN PCSR_PROCESS Process, IN PCSR_THREAD Thread) { ULONG i; + NTSTATUS Status; + ULONG ThreadInfo; // ASSERT(ProcessStructureListLocked()); + + /* Make sure the thread isn't already dead by the time we got this */ + Status = NtQueryInformationThread(Thread->ThreadHandle, + ThreadIsTerminated, + &ThreadInfo, + sizeof(ThreadInfo), + NULL); + if (!NT_SUCCESS(Status)) return Status; + if (ThreadInfo == TRUE) return STATUS_THREAD_IS_TERMINATING; /* Insert it into the Regular List */ InsertTailList(&Process->ThreadList, &Thread->Link); @@ -311,6 +322,7 @@ /* Insert it there too */ InsertHeadList(&CsrThreadHashTable[i], &Thread->HashLinks); + return STATUS_SUCCESS; } /*++ @@ -623,7 +635,15 @@ CsrThread->Flags = 0; /* Insert the Thread into the Process */ - CsrInsertThread(CsrProcess, CsrThread); + Status = CsrInsertThread(CsrProcess, CsrThread); + if (!NT_SUCCESS(Status)) + { + /* Bail out */ + if (CsrThread->ThreadHandle != hThread) NtClose(CsrThread->ThreadHandle); + CsrUnlockProcess(CsrProcess); + CsrDeallocateThread(CsrThread); + return Status; + } /* Release the lock and return */ CsrUnlockProcess(CsrProcess); @@ -720,7 +740,14 @@ CsrThread->Flags = 0; /* Insert the Thread into the Process */ - CsrInsertThread(CsrProcess, CsrThread); + Status = CsrInsertThread(CsrProcess, CsrThread); + if (!NT_SUCCESS(Status)) + { + /* Bail out */ + CsrUnlockProcess(CsrProcess); + CsrDeallocateThread(CsrThread); + return Status; + } /* Release the lock and return */ CsrReleaseProcessLock();

11 years

[ion] 60058: [USER32]: Make ClientThreadSetup return TRUE, and document how initialization should work. Enable CsrConnectToUser in CSRSRV. Works-4-me(TM).

by ion＠svn.reactos.org

Author: ion Date: Thu Sep 12 08:41:25 2013 New Revision: 60058 URL: http://svn.reactos.org/svn/reactos?rev=60058&view=rev Log: [USER32]: Make ClientThreadSetup return TRUE, and document how initialization should work. Enable CsrConnectToUser in CSRSRV. Works-4-me(TM). Modified: trunk/reactos/subsystems/win32/csrsrv/api.c trunk/reactos/win32ss/user/user32/misc/desktop.c trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/user32/misc/stubs.c trunk/reactos/win32ss/user/user32/windows/hook.c Modified: trunk/reactos/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] Thu Sep 12 08:41:25 2013 @@ -1016,7 +1016,6 @@ NTAPI CsrConnectToUser(VOID) { -#if 0 // FIXME: This code is OK, however it is ClientThreadSetup which sucks. NTSTATUS Status; ANSI_STRING DllName; UNICODE_STRING TempName; @@ -1073,21 +1072,6 @@ /* Return it */ return CsrThread; - -#else - - PTEB Teb = NtCurrentTeb(); - PCSR_THREAD CsrThread; - - /* Save pointer to this thread in TEB */ - CsrAcquireProcessLock(); - CsrThread = CsrLocateThreadInProcess(NULL, &Teb->ClientId); - CsrReleaseProcessLock(); - if (CsrThread) Teb->CsrClientThread = CsrThread; - - /* Return it */ - return CsrThread; -#endif } /*++ Modified: trunk/reactos/win32ss/user/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/desktop.c [iso-8859-1] Thu Sep 12 08:41:25 2013 @@ -128,8 +128,8 @@ int WINAPI RealGetSystemMetrics(int nIndex) { - GetConnected(); -// FIXME("Global Server Data -> %x\n",gpsi); + //GetConnected(); + //FIXME("Global Server Data -> %x\n",gpsi); if (nIndex < 0 || nIndex >= SM_CMETRICS) return 0; return gpsi->aiSysMet[nIndex]; } 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 Sep 12 08:41:25 2013 @@ -208,6 +208,47 @@ User32CallGetCharsetInfo, }; +/* +* @unimplemented +*/ +BOOL +WINAPI +ClientThreadSetup(VOID) +{ + // + // This routine, in Windows, does a lot of what Init does, but in a radically + // different way. + // + // In Windows, because CSRSS's threads have TIF_CSRSSTHREAD set (we have this + // flag in ROS but not sure if we use it), the xxxClientThreadSetup callback + // isn't made when CSRSS first loads WINSRV.DLL (which loads USER32.DLL). + // + // However, all the other calls are made as normal, and WINSRV.DLL loads + // USER32.dll, the DllMain runs, and eventually the first NtUser system call is + // made which initializes Win32k (and initializes the thread, but as mentioned + // above, the thread is marked as TIF_CSRSSTHREAD. + // + // In the DllMain of User32, there is also a CsrClientConnectToServer call to + // server 2 (winsrv). When this is done from CSRSS, the "InServer" flag is set, + // so user32 will remember that it's running inside of CSRSS. Also, another + // flag, called "FirstThread" is manually set by DllMain. + // + // Then, WINSRV finishes loading, and CSRSRV starts the API thread/loop. This + // code then calls CsrConnectToUser, which calls... ClientThreadStartup. Now + // this routine detects that it's in the server process, which means it's CSRSS + // and that the callback never happened. It does some first-time-Win32k connection + // initialization and caches a bunch of things -- if it's the first thread. It also + // acquires a critical section to initialize GDI -- and then resets the first thread + // flag. + // + // For now, we'll do none of this, but to support Windows' CSRSRV.DLL which calls + // CsrConnectToUser, we'll pretend we "did something" here. Then the rest will + // continue as normal. + // + UNIMPLEMENTED; + return TRUE; +} + BOOL Init(VOID) { @@ -310,38 +351,12 @@ return TRUE; } - -VOID -FASTCALL -GetConnected(VOID) -{ - USERCONNECT UserCon; -// ERR("GetConnected\n"); - - if ((PTHREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) - NtUserGetThreadState(THREADSTATE_GETTHREADINFO); - - if (gpsi && g_ppi) return; -// FIXME HAX: Due to the "Dll Initialization Bug" we have to call this too. - GdiDllInitialize(NULL, DLL_PROCESS_ATTACH, NULL); - - NtUserProcessConnect( NtCurrentProcess(), - &UserCon, - sizeof(USERCONNECT)); - - g_ppi = GetWin32ClientInfo()->ppi; - g_ulSharedDelta = UserCon.siClient.ulSharedDelta; - gpsi = SharedPtrToUser(UserCon.siClient.psi); - gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); - gHandleEntries = SharedPtrToUser(gHandleTable->handles); - -} - NTSTATUS WINAPI User32CallClientThreadSetupFromKernel(PVOID Arguments, ULONG ArgumentLength) { ERR("GetConnected\n"); + ClientThreadSetup(); return ZwCallbackReturn(NULL, 0, STATUS_SUCCESS); } Modified: trunk/reactos/win32ss/user/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/s… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] Thu Sep 12 08:41:25 2013 @@ -214,17 +214,6 @@ BOOL WINAPI GetAccCursorInfo ( PCURSORINFO pci ) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -ClientThreadSetup ( VOID ) { UNIMPLEMENTED; return FALSE; Modified: trunk/reactos/win32ss/user/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] Thu Sep 12 08:41:25 2013 @@ -211,7 +211,7 @@ PHOOK pHook, phkNext; LRESULT lResult = 0; - GetConnected(); + //GetConnected(); ClientInfo = GetWin32ClientInfo();

11 years

[ion] 60057: [SMLIB]: Use the right API port name. Now Windows's SMSS works fine in ROS.

by ion＠svn.reactos.org

Author: ion Date: Thu Sep 12 08:02:05 2013 New Revision: 60057 URL: http://svn.reactos.org/svn/reactos?rev=60057&view=rev Log: [SMLIB]: Use the right API port name. Now Windows's SMSS works fine in ROS. Modified: trunk/reactos/base/system/smss/sminit.c trunk/reactos/lib/smlib/smclient.c Modified: trunk/reactos/base/system/smss/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/sminit.c?… ============================================================================== --- trunk/reactos/base/system/smss/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/sminit.c [iso-8859-1] Thu Sep 12 08:02:05 2013 @@ -2429,7 +2429,7 @@ RtlInitUnicodeString(&Os2Name, L"OS2"); /* Create the SM API Port */ - RtlInitUnicodeString(&PortName, L"\\SmApiPort2"); + RtlInitUnicodeString(&PortName, L"\\SmApiPort"); InitializeObjectAttributes(&ObjectAttributes, &PortName, 0, NULL, NULL); Status = NtCreatePort(&PortHandle, &ObjectAttributes, Modified: trunk/reactos/lib/smlib/smclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/smclient.c?rev=6… ============================================================================== --- trunk/reactos/lib/smlib/smclient.c [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/smclient.c [iso-8859-1] Thu Sep 12 08:02:05 2013 @@ -81,7 +81,7 @@ SecurityQos.EffectiveOnly = TRUE; /* Set the SM API port name */ - RtlInitUnicodeString(&DestinationString, L"\\SmApiPort2"); + RtlInitUnicodeString(&DestinationString, L"\\SmApiPort"); /* Check if this is a client connecting to SMSS, or SMSS to itself */ if (SbApiPortName)

11 years

← Newer
1
...
40
41
42
43
44
45
46
...
56
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 September 2013