Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[tkreuzer] 46580: add PIO_CSQ_INSERT_IRP_EX to wdm.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 30 07:09:48 2010 New Revision: 46580 URL: http://svn.reactos.org/svn/reactos?rev=46580&view=rev Log: add PIO_CSQ_INSERT_IRP_EX to wdm.h Modified: trunk/reactos/include/ddk/csq.h trunk/reactos/include/ddk/wdm.h Modified: trunk/reactos/include/ddk/csq.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/csq.h?rev=4658… ============================================================================== --- trunk/reactos/include/ddk/csq.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/csq.h [iso-8859-1] Tue Mar 30 07:09:48 2010 @@ -229,9 +229,11 @@ } * */ +#ifndef IO_TYPE_CSQ_EX typedef NTSTATUS (NTAPI *PIO_CSQ_INSERT_IRP_EX) (struct _IO_CSQ *Csq, PIRP Irp, PVOID InsertContext); +#endif /* * CANCEL-SAFE QUEUE DDIs Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4658… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Tue Mar 30 07:09:48 2010 @@ -5190,6 +5190,13 @@ (NTAPI *PIO_CSQ_INSERT_IRP)( IN struct _IO_CSQ *Csq, IN PIRP Irp); + +typedef NTSTATUS +(NTAPI IO_CSQ_INSERT_IRP_EX)( + IN struct _IO_CSQ *Csq, + IN PIRP Irp, + IN PVOID InsertContext); +typedef IO_CSQ_INSERT_IRP_EX *PIO_CSQ_INSERT_IRP_EX; typedef VOID (NTAPI *PIO_CSQ_REMOVE_IRP)(

14 years, 9 months

[tkreuzer] 46579: Add a todo list for win32k. Enjoy the current size as long as it's that small.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 30 06:59:56 2010 New Revision: 46579 URL: http://svn.reactos.org/svn/reactos?rev=46579&view=rev Log: Add a todo list for win32k. Enjoy the current size as long as it's that small. Added: branches/reactos-yarotows/subsystems/win32/win32k/TODO.txt (with props) Added: branches/reactos-yarotows/subsystems/win32/win32k/TODO.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/TODO.txt (added) +++ branches/reactos-yarotows/subsystems/win32/win32k/TODO.txt [iso-8859-1] Tue Mar 30 06:59:56 2010 @@ -1,0 +1,27 @@ + + +This is a list of todos for win32k. If you found something that needs to be +done, but you can't or don't want to handle it right now, you can add an entry +here, so it won't get forgotton. + +Please also note, where to find the problem (file / function), and possible +requirements before it can be handled. + + +# Lock the PDEV lock only when we are going to touch the PDEV or the Surface + Currently the PDEV is locked (shared HSEM == ERESOURCE) when we lock the DC, + this is only a minimal implementation, as we don't need to do that, when we + don't even touch anything from the PDEV or the surface. This should be + optimized. (see dc.h, DC_LockDc) + +# Get rid of all float and double in win32k. + We can't use the fpu on x86 in the kernel, as fpu state is not saved in + user/kernel transitions. There are 3 possible solutions: + 1.) Rewrite the function to use integer (preferred) + 2.) Use FLOATOBJ + 3.) Use KeSaveFloatingPointState (slow, avoid!) + +# Rewrite the handle manager! Once and for all! + + + Propchange: branches/reactos-yarotows/subsystems/win32/win32k/TODO.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 9 months

[cgutman] 46578: [RTL] - Fall back to the default user key if RtlFormatCurrentUserKeyPath fails (perhaps we are in a system process)

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Mar 30 05:26:35 2010 New Revision: 46578 URL: http://svn.reactos.org/svn/reactos?rev=46578&view=rev Log: [RTL] - Fall back to the default user key if RtlFormatCurrentUserKeyPath fails (perhaps we are in a system process) Modified: trunk/reactos/lib/rtl/registry.c Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=465… ============================================================================== --- trunk/reactos/lib/rtl/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/registry.c [iso-8859-1] Tue Mar 30 05:26:35 2010 @@ -474,13 +474,23 @@ /* Check if we need the current user key */ if (RelativeTo == RTL_REGISTRY_USER) { - /* Get the path */ + /* Get the user key path */ Status = RtlFormatCurrentUserKeyPath(&KeyPath); - if (!NT_SUCCESS(Status)) return(Status); - - /* Append it */ - Status = RtlAppendUnicodeStringToString(&KeyName, &KeyPath); - RtlFreeUnicodeString (&KeyPath); + + /* Check if it worked */ + if (NT_SUCCESS(Status)) + { + /* Append the user key path */ + Status = RtlAppendUnicodeStringToString(&KeyName, &KeyPath); + + /* Free the user key path */ + RtlFreeUnicodeString (&KeyPath); + } + else + { + /* It didn't work so fall back to the default user key */ + Status = RtlAppendUnicodeToString(&KeyName, RtlpRegPaths[RTL_REGISTRY_USER]); + } } else {

14 years, 9 months

[akhaldi] 46577: [PSDK] inaddr.h : Fix formatting. qos.h : Introduce pragma once along with several missing definitions. winsock(2).h : Introduce pragma once, apply consistent formatting, add so many missing definitions and remove several unrelated ones.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 30 01:58:01 2010 New Revision: 46577 URL: http://svn.reactos.org/svn/reactos?rev=46577&view=rev Log: [PSDK] inaddr.h : Fix formatting. qos.h : Introduce pragma once along with several missing definitions. winsock(2).h : Introduce pragma once, apply consistent formatting, add so many missing definitions and remove several unrelated ones. Modified: branches/header-work/include/psdk/inaddr.h branches/header-work/include/psdk/qos.h branches/header-work/include/psdk/winsock.h branches/header-work/include/psdk/winsock2.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/header-work/include/psdk/inaddr.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/inaddr… Modified: branches/header-work/include/psdk/qos.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/qos.h?… Modified: branches/header-work/include/psdk/winsock.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winsoc… Modified: branches/header-work/include/psdk/winsock2.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winsoc…

14 years, 9 months

[janderwald] 46576: - Fix trunk installation breakage introduced in 46570

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Mar 30 01:08:29 2010 New Revision: 46576 URL: http://svn.reactos.org/svn/reactos?rev=46576&view=rev Log: - Fix trunk installation breakage introduced in 46570 Modified: trunk/reactos/media/inf/syssetup.inf.tpl Modified: trunk/reactos/media/inf/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf.tpl… ============================================================================== Binary files - no diff available.

14 years, 9 months

[jgardou] 46575: [WIN32K] DC_SetOwnerShip : return FALSE on failure

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Mar 29 23:53:24 2010 New Revision: 46575 URL: http://svn.reactos.org/svn/reactos?rev=46575&view=rev Log: [WIN32K] DC_SetOwnerShip : return FALSE on failure Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Mon Mar 29 23:53:24 2010 @@ -386,7 +386,7 @@ INT Index; PGDI_TABLE_ENTRY Entry; PDC pDC; - BOOL ret; + BOOL ret = FALSE; /* FIXME: This function has broken error handling */

14 years, 9 months

[sir_richard] 46574: [HALACPI]: Add project, right now it just builds the normal HAL. The idea is to split the generic HAL into legacy (x86 only) and ACPI (x86+ACPI, or x64). Bus handling, reboot/shutdown, PnP, power management (sleep/resume/hibernate), timer, environment variable, debugging, and initialization code is expected to differ between legacy and ACPI, if not more.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Mar 29 23:35:31 2010 New Revision: 46574 URL: http://svn.reactos.org/svn/reactos?rev=46574&view=rev Log: [HALACPI]: Add project, right now it just builds the normal HAL. The idea is to split the generic HAL into legacy (x86 only) and ACPI (x86+ACPI, or x64). Bus handling, reboot/shutdown, PnP, power management (sleep/resume/hibernate), timer, environment variable, debugging, and initialization code is expected to differ between legacy and ACPI, if not more. Added: trunk/reactos/hal/halx86/generic/acpi/ trunk/reactos/hal/halx86/generic/legacy/ trunk/reactos/hal/halx86/halacpi.rbuild (with props) Modified: trunk/reactos/hal/halx86/directory.rbuild trunk/reactos/hal/halx86/hal.rbuild trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/hal/halx86/halamd64.rbuild trunk/reactos/hal/halx86/halmps.rbuild trunk/reactos/hal/halx86/halxbox.rbuild Modified: trunk/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuil… ============================================================================== --- trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010 @@ -8,6 +8,7 @@ <if property="ARCH" value="i386"> <xi:include href="hal.rbuild" /> + <xi:include href="halacpi.rbuild" /> <xi:include href="halxbox.rbuild" /> <if property="BUILD_MP" value="1"> <xi:include href="halmps.rbuild" /> Modified: trunk/reactos/hal/halx86/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal.rbuild?rev=… ============================================================================== --- trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010 @@ -8,7 +8,7 @@ <include base="ntoskrnl">include</include> <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> - <library>hal_generic</library> + <library>hal_generic_legacy</library> <library>hal_generic_up</library> <library>ntoskrnl</library> <library>libcntpr</library> Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010 @@ -1,7 +1,53 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> - <module name="hal_generic" type="objectlibrary"> + <module name="hal_generic_legacy" type="objectlibrary"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_NTHALDLL_" /> + <define name="_NTHAL_" /> + <directory name="generic"> + <directory name="bus"> + <file>bushndlr.c</file> + <file>isabus.c</file> + <file>halbus.c</file> + <file>pcibus.c</file> + <file>pcidata.c</file> + <file>sysbus.c</file> + </directory> + <file>beep.c</file> + <file>bios.c</file> + <file>cmos.c</file> + <file>display.c</file> + <file>dma.c</file> + <file>drive.c</file> + <file>halinit.c</file> + <file>misc.c</file> + <file>profil.c</file> + <file>reboot.c</file> + <file>sysinfo.c</file> + <file>timer.c</file> + <file>usage.c</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>portio.c</file> + <file>systimer.S</file> + <file>trap.S</file> + </directory> + </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>x86bios.c</file> + <file>systimer.S</file> + </directory> + </if> + </directory> + <directory name="include"> + <pch>hal.h</pch> + </directory> + </module> + + <module name="hal_generic_acpi" type="objectlibrary"> <include>include</include> <include base="ntoskrnl">include</include> <define name="_NTHALDLL_" /> Added: trunk/reactos/hal/halx86/halacpi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halacpi.rbuild?… ============================================================================== --- trunk/reactos/hal/halx86/halacpi.rbuild (added) +++ trunk/reactos/hal/halx86/halacpi.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010 @@ -1,0 +1,20 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="halacpi" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="halacpi.dll"> + <importlibrary base="hal" definition="../hal.pspec" /> + <bootstrap installbase="$(CDOUTPUT)" /> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_NTHALDLL_" /> + <define name="_NTHAL_" /> + <library>hal_generic_acpi</library> + <library>hal_generic_up</library> + <library>ntoskrnl</library> + <library>libcntpr</library> + <directory name="up"> + <file>halinit_up.c</file> + <file>halup.rc</file> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/halacpi.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halamd64.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010 @@ -10,7 +10,7 @@ <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <define name="_X86BIOS_" /> - <library>hal_generic</library> + <library>hal_generic_acpi</library> <library>hal_generic_up</library> <library>ntoskrnl</library>  Modified: trunk/reactos/hal/halx86/halmps.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmps.rbuild?r… ============================================================================== --- trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010 @@ -9,7 +9,7 @@ <define name="CONFIG_SMP" /> <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> - <library>hal_generic</library> + <library>hal_generic_legacy</library> <library>hal_generic_mp</library> <library>ntoskrnl</library> <library>libcntpr</library> Modified: trunk/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?… ============================================================================== --- trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010 @@ -8,7 +8,7 @@ <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> <define name="SARCH_XBOX" /> - <library>hal_generic</library> + <library>hal_generic_legacy</library> <library>hal_generic_up</library> <library>ntoskrnl</library> <library>libcntpr</library>

14 years, 9 months

[jgardou] 46573: [WIN32K] Free the surface instead of unlocking it

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Mar 29 21:50:49 2010 New Revision: 46573 URL: http://svn.reactos.org/svn/reactos?rev=46573&view=rev Log: [WIN32K] Free the surface instead of unlocking it Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Mon Mar 29 21:50:49 2010 @@ -52,13 +52,15 @@ /* Decrease reference count */ --ppdev->cPdevRefs; + ASSERT(ppdev->cPdevRefs >= 0) ; + /* Check if references are left */ if (ppdev->cPdevRefs == 0) { /* Release surface */ if(ppdev->pSurface) { - SURFACE_ShareUnlockSurface(ppdev->pSurface); + SURFACE_FreeSurface(ppdev->pSurface); ppdev->pfn.DisableSurface(ppdev->dhpdev); }

14 years, 9 months

[jgardou] 46572: [WIN32K] Implement releasing PDEVOBJs

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Mar 29 20:56:02 2010 New Revision: 46572 URL: http://svn.reactos.org/svn/reactos?rev=46572&view=rev Log: [WIN32K] Implement releasing PDEVOBJs Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Mon Mar 29 20:56:02 2010 @@ -34,9 +34,9 @@ ppdev = ExAllocatePoolWithTag(PagedPool, sizeof(PDEVOBJ), GDITAG_PDEV); if (!ppdev) return NULL; - + RtlZeroMemory(ppdev, sizeof(PDEVOBJ)); - + ppdev->cPdevRefs = 1; return ppdev; @@ -51,13 +51,44 @@ /* Decrease reference count */ --ppdev->cPdevRefs; - + /* Check if references are left */ if (ppdev->cPdevRefs == 0) { - // FIXME: should delete the PDEV now - UNIMPLEMENTED; - ASSERT(FALSE); + /* Release surface */ + if(ppdev->pSurface) + { + SURFACE_ShareUnlockSurface(ppdev->pSurface); + ppdev->pfn.DisableSurface(ppdev->dhpdev); + } + + /* Disable PDEV */ + ppdev->pfn.DisablePDEV(ppdev->dhpdev); + + /* Remove it from list */ + if( ppdev == gppdevList ) + gppdevList = ppdev->ppdevNext ; + else + { + PPDEVOBJ ppdevCurrent = gppdevList; + BOOL found = FALSE ; + while (!found && ppdevCurrent->ppdevNext) + { + if (ppdevCurrent->ppdevNext == ppdev) + found = TRUE; + else + ppdevCurrent = ppdevCurrent->ppdevNext ; + } + if(found) + ppdevCurrent->ppdevNext = ppdev->ppdevNext; + } + + /* Is this the primary one ? */ + if (ppdev == gppdevPrimary) + gppdevPrimary = NULL; + + /* Free it */ + ExFreePoolWithTag(ppdev, GDITAG_PDEV ); } /* Unlock loader */ @@ -179,7 +210,7 @@ pGraphicsDevice = EngpFindGraphicsDevice(pustrDeviceName, 0, 0); if (!pGraphicsDevice) { - DPRINT1("No GRAPHICS_DEVICE found for %ls!\n", + DPRINT1("No GRAPHICS_DEVICE found for %ls!\n", pustrDeviceName ? pustrDeviceName->Buffer : 0); return NULL; } @@ -267,7 +298,7 @@ ppdev->pfn = ppdev2->pfn; ppdev2->pfn = pdevTmp.pfn; - /* Exchange LDEVs */ + /* Exchange LDEVs */ ppdev->pldev = ppdev2->pldev; ppdev2->pldev = pdevTmp.pldev; @@ -291,8 +322,8 @@ ppdev2->gdiinfo = pdevTmp.gdiinfo; /* Notify each driver instance of its new HDEV association */ - ppdev->pfn.CompletePDEV(ppdev->dhpdev, (HDEV)ppdev); - ppdev2->pfn.CompletePDEV(ppdev2->dhpdev, (HDEV)ppdev2); + ppdev->pfn.CompletePDEV(ppdev->dhpdev, (HDEV)ppdev); + ppdev2->pfn.CompletePDEV(ppdev2->dhpdev, (HDEV)ppdev2); } void @@ -338,11 +369,10 @@ PSURFACE pSurface; BOOL retval = FALSE; - // FIXME: dynamic mode switching is broken, need to fix PDEV locking first! - return FALSE; - /* Lock the PDEV */ EngAcquireSemaphore(ppdev->hsemDevLock); + /* And everything else */ + EngAcquireSemaphore(ghsemPDEV); DPRINT1("PDEVOBJ_bSwitchMode, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface); @@ -385,19 +415,14 @@ /* 8. Disable DirectDraw */ - /* 9. Disable old surface */ - SURFACE_ShareUnlockSurface(ppdevTmp->pSurface); - ppdevTmp->pfn.DisableSurface(ppdevTmp->dhpdev); - - /* 10. Disable old PDEV */ - ppdevTmp->pfn.DisablePDEV(ppdevTmp->dhpdev); -// PDEVOBJ_vReleasePdev(ppdevTmp); + PDEVOBJ_vRelease(ppdevTmp); /* Success! */ retval = TRUE; leave: /* Unlock PDEV */ EngReleaseSemaphore(ppdev->hsemDevLock); + EngReleaseSemaphore(ghsemPDEV); DPRINT1("leave, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface); ASSERT(ppdev->pSurface->BitsLock); @@ -524,8 +549,8 @@ pDevCaps->ulLogPixelsX = pGdiInfo->ulLogPixelsX; pDevCaps->ulLogPixelsY = pGdiInfo->ulLogPixelsY; pDevCaps->ulSizePalette = pGdiInfo->ulNumPalReg; - pDevCaps->ulColorRes = pGdiInfo->ulDACRed + - pGdiInfo->ulDACGreen + + pDevCaps->ulColorRes = pGdiInfo->ulDACRed + + pGdiInfo->ulDACGreen + pGdiInfo->ulDACBlue; pDevCaps->ulPhysicalWidth = pGdiInfo->szlPhysSize.cx; pDevCaps->ulPhysicalHeight = pGdiInfo->szlPhysSize.cy;

14 years, 9 months

[cgutman] 46571: [NTOSKRNL] - Don't try to detect ACPI in IopEnumerateDetectedDevices because the only reason we got there is because ACPI is NOT present (as reported by IopIsAcpiComputer)

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Mar 29 18:56:42 2010 New Revision: 46571 URL: http://svn.reactos.org/svn/reactos?rev=46571&view=rev Log: [NTOSKRNL] - Don't try to detect ACPI in IopEnumerateDetectedDevices because the only reason we got there is because ACPI is NOT present (as reported by IopIsAcpiComputer) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Mar 29 18:56:42 2010 @@ -2166,11 +2166,6 @@ const UNICODE_STRING IdentifierPci = RTL_CONSTANT_STRING(L"PCI"); UNICODE_STRING HardwareIdPci = RTL_CONSTANT_STRING(L"*PNP0A03\0"); static ULONG DeviceIndexPci = 0; -#ifdef ENABLE_ACPI - const UNICODE_STRING IdentifierAcpi = RTL_CONSTANT_STRING(L"ACPI BIOS"); - UNICODE_STRING HardwareIdAcpi = RTL_CONSTANT_STRING(L"*PNP0C08\0"); - static ULONG DeviceIndexAcpi = 0; -#endif const UNICODE_STRING IdentifierSerial = RTL_CONSTANT_STRING(L"SerialController"); UNICODE_STRING HardwareIdSerial = RTL_CONSTANT_STRING(L"*PNP0501\0"); static ULONG DeviceIndexSerial = 0; @@ -2460,14 +2455,6 @@ DeviceIndex = DeviceIndexIsa++; IsDeviceDesc = FALSE; } -#ifdef ENABLE_ACPI - else if (RtlCompareUnicodeString(&ValueName, &IdentifierAcpi, FALSE) == 0) - { - pHardwareId = &HardwareIdAcpi; - DeviceIndex = DeviceIndexAcpi++; - IsDeviceDesc = FALSE; - } -#endif else { DPRINT("Unknown device '%wZ'\n", &ValueName);

14 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
...
90
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 March 2010