Ros-diffs

ros-diffs@reactos.org

81390 discussions

[khornicek] 44126: - pass a pointer to the exclude rect to GreMovePointer - store the cursor coordinates in pdevobj - retrieve the cursor position form global CursorInfo in MouseSafetyOnDrawEnd - MouseSafetyOnDrawStart/End should work now
by khornicek＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: khornicek Date: Fri Nov 13 11:07:18 2009 New Revision: 44126 URL: http://svn.reactos.org/svn/reactos?rev=44126&view=rev Log: - pass a pointer to the exclude rect to GreMovePointer - store the cursor coordinates in pdevobj - retrieve the cursor position form global CursorInfo in MouseSafetyOnDrawEnd - MouseSafetyOnDrawStart/End should work now Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h branches/arwinss/reactos/subsystems/win32/win32k/include/devobj.h branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c [iso-8859-1] Fri Nov 13 11:07:18 2009 @@ -16,8 +16,6 @@ /* PUBLIC FUNCTIONS **********************************************************/ -POINTL ptlPointer; - VOID IntHideMousePointer( PDEVOBJ *ppdev, @@ -46,8 +44,8 @@ } /* Calculate cursor coordinates */ - pt.x = ptlPointer.x - pgp->HotSpot.x; - pt.y = ptlPointer.y - pgp->HotSpot.y; + pt.x = ppdev->ptlPointer.x - pgp->HotSpot.x; + pt.y = ppdev->ptlPointer.y - pgp->HotSpot.y; rclDest.left = max(pt.x, 0); rclDest.top = max(pt.y, 0); @@ -91,8 +89,8 @@ pgp->Enabled = TRUE; /* Calculate pointer coordinates */ - pt.x = ptlPointer.x - pgp->HotSpot.x; - pt.y = ptlPointer.y - pgp->HotSpot.y; + pt.x = ppdev->ptlPointer.x - pgp->HotSpot.x; + pt.y = ppdev->ptlPointer.y - pgp->HotSpot.y; /* Calculate the rect on the surface */ rclSurf.left = max(pt.x, 0); @@ -259,7 +257,7 @@ if (--ppdev->SafetyRemoveCount >= ppdev->SafetyRemoveLevel) return FALSE; - ppdev->pfnMovePointer(pso, ptlPointer.x, ptlPointer.y, &pgp->Exclude); + ppdev->pfnMovePointer(pso, CursorInfo.CursorPos.x, CursorInfo.CursorPos.y, &pgp->Exclude); ppdev->SafetyRemoveLevel = 0; @@ -441,8 +439,8 @@ if (x != -1) { - ptlPointer.x = x; - ptlPointer.y = y; + ppdev->ptlPointer.x = x; + ppdev->ptlPointer.y = y; IntShowMousePointer(ppdev, pso); @@ -485,8 +483,8 @@ IntHideMousePointer(ppdev, pso); - ptlPointer.x = x; - ptlPointer.y = y; + ppdev->ptlPointer.x = x; + ppdev->ptlPointer.y = y; if (x != -1) { Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] Fri Nov 13 11:07:18 2009 @@ -152,7 +152,7 @@ NewCursor->yHotspot, CursorInfo->CursorPos.x, CursorInfo->CursorPos.y, - NULL, + &(GDIDEV(pso)->Pointer.Exclude), SPS_CHANGE); if (Status != SPS_ACCEPT_NOEXCLUDE) Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h [iso-8859-1] Fri Nov 13 11:07:18 2009 @@ -20,3 +20,5 @@ SURFACE *psurfSave; RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ } GDIPOINTER, *PGDIPOINTER; + +extern SYSTEM_CURSORINFO CursorInfo; Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/devobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/devobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/devobj.h [iso-8859-1] Fri Nov 13 11:07:18 2009 @@ -5,6 +5,7 @@ { DEVINFO DevInfo; GDIINFO GDIInfo; + POINTL ptlPointer; PFN_DrvMovePointer pfnMovePointer; DHPDEV hPDev; PVOID pdmwDev; Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c [iso-8859-1] Fri Nov 13 11:07:18 2009 @@ -10,7 +10,7 @@ #define NDEBUG #include <debug.h> -static SYSTEM_CURSORINFO CursorInfo; +SYSTEM_CURSORINFO CursorInfo; extern PDEVOBJ PrimarySurface; @@ -60,7 +60,7 @@ if (CursorInfo.ShowingCursor) { pso = EngLockSurface(PrimarySurface.pSurface); - GreMovePointer(pso, pos.x, pos.y, NULL); + GreMovePointer(pso, pos.x, pos.y, &(GDIDEV(pso)->Pointer.Exclude)); EngUnlockSurface(pso); }

1 0

[sserapion] 44125: - Enable telnet, and tftpd. - re-add some missing ntdll exports. - export ctime64, its available.
by sserapion＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: sserapion Date: Fri Nov 13 10:30:39 2009 New Revision: 44125 URL: http://svn.reactos.org/svn/reactos?rev=44125&view=rev Log: - Enable telnet, and tftpd. - re-add some missing ntdll exports. - export ctime64, its available. Modified: branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild branches/ros-amd64-bringup/reactos/base/services/services.rbuild branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def Modified: branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild [iso-8859-1] Fri Nov 13 10:30:39 2009 @@ -31,9 +31,9 @@ <directory name="route"> <xi:include href="route/route.rbuild" /> </directory> -  + </directory> <directory name="tracert"> <xi:include href="tracert/tracert.rbuild" /> </directory> Modified: branches/ros-amd64-bringup/reactos/base/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/services.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/services.rbuild [iso-8859-1] Fri Nov 13 10:30:39 2009 @@ -25,9 +25,9 @@ <directory name="telnetd"> <xi:include href="telnetd/telnetd.rbuild" /> </directory> - <directory name="tftpd"> - <xi:include href="tftpd/tftpd.rbuild" /> - </directory> + <directory name="tftpd"> + <xi:include href="tftpd/tftpd.rbuild" /> + </directory> <directory name="umpnpmgr"> <xi:include href="umpnpmgr/umpnpmgr.rbuild" /> </directory> Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def [iso-8859-1] Fri Nov 13 10:30:39 2009 @@ -648,6 +648,7 @@ ;RtlConsoleMultiByteToUnicodeN RtlConvertExclusiveToShared ;RtlConvertLCIDToString +RtlConvertUlongToLargeInteger RtlConvertSharedToExclusive RtlConvertSidToUnicodeString ;RtlConvertToAutoInheritSecurityObject @@ -934,11 +935,13 @@ RtlIsNameLegalDOS8Dot3 ;RtlIsNormalizedString RtlIsTextUnicode -;RtlIsThreadWithinLoaderCallout +RtlIsThreadWithinLoaderCallout RtlIsValidHandle RtlIsValidIndexHandle ;RtlIsValidLocaleName ;RtlLCIDToCultureName +RtlLargeIntegerSubtract +RtlLargeIntegerDivide RtlLargeIntegerToChar ;RtlLcidToLocaleName RtlLeaveCriticalSection Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def [iso-8859-1] Fri Nov 13 10:30:39 2009 @@ -232,7 +232,7 @@ ; _cputws @226 _creat @227 _cscanf @228 -; _ctime64 @229 + _ctime64 @229 _ctype @230 DATA _cwait @231 ; _cwprintf @232

1 0

[sserapion] 44124: - re-add explorer (old one) to build, it builds. - use amd64 specific manifest file. - still not a valid exe according to windows 7
by sserapion＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: sserapion Date: Fri Nov 13 10:24:35 2009 New Revision: 44124 URL: http://svn.reactos.org/svn/reactos?rev=44124&view=rev Log: - re-add explorer (old one) to build, it builds. - use amd64 specific manifest file. - still not a valid exe according to windows 7 Added: branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.exe.amd64.manifest (with props) Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer_intres.rc branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild Added: branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.exe.amd64.manifest URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.exe.amd64.manifest (added) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.exe.amd64.manifest [iso-8859-1] Fri Nov 13 10:24:35 2009 @@ -1,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity + version="1.0.0.0" + processorArchitecture="amd64" + name="ReactOS.Explorer" + type="win32" +/> +<description>ROS Explorer</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="amd64" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Propchange: branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.exe.amd64.manifest ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] Fri Nov 13 10:24:35 2009 @@ -66,7 +66,6 @@ </if> <file>explorer.rc</file> <linkerflag>--enable-stdcall-fixup</linkerflag> - <linkerflag>'$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)'</linkerflag> </module> <installfile installbase=".">explorer-cfg-template.xml</installfile> <directory name="notifyhook"> Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer_intres.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer_intres.rc [iso-8859-1] Fri Nov 13 10:24:35 2009 @@ -104,7 +104,11 @@ "END\r\n" "#endif\r\n" "#ifndef _DEBUG\r\n" + "#ifdef _AMD64_" + "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE ""explorer.exe.amd64.manifest""\r\n" + "#else" "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE ""explorer.exe.manifest""\r\n" + "#endif\r\n" "#endif\r\n" "\r\n" "#include ""explorer-bg.rc""\r\n" Modified: branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild [iso-8859-1] Fri Nov 13 10:24:35 2009 @@ -4,11 +4,9 @@ <directory name="cmd"> <xi:include href="cmd/cmd.rbuild" /> </directory> - <ifnot property="ARCH" value="amd64"> - <directory name="explorer"> - <xi:include href="explorer/explorer.rbuild" /> - </directory> - </ifnot> + <directory name="explorer"> + <xi:include href="explorer/explorer.rbuild" /> + </directory> <directory name="explorer-new"> <xi:include href="explorer-new/explorer.rbuild" /> </directory>

1 0

[tkreuzer] 44123: fix a typo
by tkreuzer＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: tkreuzer Date: Fri Nov 13 03:16:15 2009 New Revision: 44123 URL: http://svn.reactos.org/svn/reactos?rev=44123&view=rev Log: fix a typo Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c [iso-8859-1] Fri Nov 13 03:16:15 2009 @@ -161,7 +161,7 @@ for (i = 0; i < cPages; i++) { - if (!FrLdrMapSinglePage(VirtualAddress, PhysicalAddress)) + if (!MempMapSinglePage(VirtualAddress, PhysicalAddress)) { return i; }

1 0

[janderwald] 44122: [WDMAUD_KERNEL] - Implement kernel side of notifying clients of volume / mute control changes
by janderwald＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: janderwald Date: Fri Nov 13 02:48:28 2009 New Revision: 44122 URL: http://svn.reactos.org/svn/reactos?rev=44122&view=rev Log: [WDMAUD_KERNEL] - Implement kernel side of notifying clients of volume / mute control changes Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Fri Nov 13 02:48:28 2009 @@ -372,6 +372,8 @@ return WdmAudGetControlDetails(DeviceObject, Irp, DeviceInfo, ClientInfo); case IOCTL_QUERYDEVICEINTERFACESTRING: return WdmAudGetDeviceInterface(DeviceObject, Irp, DeviceInfo); + case IOCTL_GET_MIXER_EVENT: + return WdmAudGetMixerEvent(DeviceObject, Irp, DeviceInfo, ClientInfo); case IOCTL_GETPOS: case IOCTL_GETDEVID: case IOCTL_GETVOLUME: Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c [iso-8859-1] Fri Nov 13 02:48:28 2009 @@ -205,22 +205,41 @@ PWDMAUD_CLIENT Client; PWDMAUD_DEVICE_EXTENSION DeviceExtension; + /* get device extension */ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; if (!DeviceExtension->NumSysAudioDevices) + { + /* wdmaud failed to open sysaudio */ return STATUS_UNSUCCESSFUL; - + } + + /* sanity check */ ASSERT(!IsListEmpty(&DeviceExtension->SysAudioDeviceList)); + /* allocate client context struct */ Client = ExAllocatePool(NonPagedPool, sizeof(WDMAUD_CLIENT)); + + /* check for allocation failure */ if (!Client) { + /* not enough memory */ return STATUS_INSUFFICIENT_RESOURCES; } + /* zero client context struct */ RtlZeroMemory(Client, sizeof(WDMAUD_CLIENT)); + + /* initialize mixer event list */ + InitializeListHead(&Client->MixerEventList); + + /* store result */ *pClient = Client; + /* insert client into list */ + ExInterlockedInsertTailList(&DeviceExtension->WdmAudClientList, &Client->Entry, &DeviceExtension->Lock); + + /* done */ return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] Fri Nov 13 02:48:28 2009 @@ -54,6 +54,9 @@ /* initialize sysaudio device list */ InitializeListHead(&DeviceExtension->SysAudioDeviceList); + /* initialize client context device list */ + InitializeListHead(&DeviceExtension->WdmAudClientList); + /* initialize spinlock */ KeInitializeSpinLock(&DeviceExtension->Lock); @@ -123,14 +126,11 @@ IN PIRP Irp) { NTSTATUS Status; - PIO_STACK_LOCATION IoStack; PWDMAUD_CLIENT pClient; - PWDMAUD_DEVICE_EXTENSION DeviceExtension; - DPRINT("WdmAudCreate\n"); - + /* get device extension */ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; #if KS_IMPLEMENTED @@ -146,8 +146,12 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to open sysaudio!\n"); - if (pClient) - ExFreePool(pClient); + + /* complete and forget */ + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + /* done */ + return STATUS_UNSUCCESSFUL; } IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -170,8 +174,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("WdmAudClose\n"); - + /* nothing to do complete request */ #if KS_IMPLEMENTED Status = KsDereferenceSoftwareBusObject(DeviceExtension->DeviceHeader); @@ -186,6 +189,7 @@ Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); + /* done */ return STATUS_SUCCESS; } @@ -196,45 +200,67 @@ IN PIRP Irp) { PIO_STACK_LOCATION IoStack; - WDMAUD_CLIENT *pClient; + PWDMAUD_CLIENT pClient; + PWDMAUD_DEVICE_EXTENSION DeviceExtension; ULONG Index; - - DPRINT("WdmAudCleanup\n"); - + KIRQL OldIrql; + + /* get device extension */ + DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); - pClient = (WDMAUD_CLIENT*)IoStack->FileObject->FsContext; - - if (pClient) - { - for (Index = 0; Index < pClient->NumPins; Index++) - { - DPRINT("Index %u Pin %p Type %x\n", Index, pClient->hPins[Index].Handle, pClient->hPins[Index].Type); - if (pClient->hPins[Index].Handle && pClient->hPins[Index].Type != MIXER_DEVICE_TYPE) - { - ZwClose(pClient->hPins[Index].Handle); - } - } - - if (pClient->hPins) - { - ExFreePool(pClient->hPins); - } - - ExFreePool(pClient); - IoStack->FileObject->FsContext = NULL; - } - + /* sanity check */ + ASSERT(IoStack->FileObject); + + /* get client context struct */ + pClient = (PWDMAUD_CLIENT)IoStack->FileObject->FsContext; + + /* sanity check */ + ASSERT(pClient); + + /* acquire client context list lock */ + KeAcquireSpinLock(&DeviceExtension->Lock, &OldIrql); + + /* remove entry */ + RemoveEntryList(&pClient->Entry); + + /* release lock */ + KeReleaseSpinLock(&DeviceExtension->Lock, OldIrql); + + /* check if all audio pins have been closed */ + for (Index = 0; Index < pClient->NumPins; Index++) + { + DPRINT("Index %u Pin %p Type %x\n", Index, pClient->hPins[Index].Handle, pClient->hPins[Index].Type); + if (pClient->hPins[Index].Handle && pClient->hPins[Index].Type != MIXER_DEVICE_TYPE) + { + /* found an still open audio pin */ + ZwClose(pClient->hPins[Index].Handle); + } + } + + /* free pin array */ + if (pClient->hPins) + ExFreePool(pClient->hPins); + + /* free client context struct */ + ExFreePool(pClient); + + /* clear old client pointer */ + IoStack->FileObject->FsContext = NULL; + + /* complete request */ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - DPRINT("WdmAudCleanup complete\n"); + + /* done */ return STATUS_SUCCESS; } - - -NTSTATUS NTAPI +NTSTATUS +NTAPI DriverEntry( IN PDRIVER_OBJECT Driver, IN PUNICODE_STRING Registry_path Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] Fri Nov 13 02:48:28 2009 @@ -49,9 +49,17 @@ LPWSTR DeviceInterfaceString; ULONG DeviceInterfaceStringSize; }Interface; + + struct + { + HANDLE hMixer; + ULONG NotificationType; + ULONG Value; + }MixerEvent; KSSTATE State; ULONG Volume; ULONG FrameSize; + HANDLE hNotifyEvent; }u; }WDMAUD_DEVICE_INFO, *PWDMAUD_DEVICE_INFO; @@ -336,4 +344,21 @@ METHOD_BUFFERED, \ FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS) +/// IOCTL_GET_MIXER_EVENT +/// +/// Description: This IOCTL queries for +/// +/// Arguments: InputBuffer is a pointer to a WDMAUD_DEVICE_INFO structure, +/// InputBufferSize is size of WDMAUD_DEVICE_INFO structure +/// Note: The hDevice member must be set +/// Result: The result is returned in the struct MixerInfo +/// ReturnCode: STATUS_SUCCESS indicates success + +#define IOCTL_GET_MIXER_EVENT \ + CTL_CODE(FILE_DEVICE_SOUND, \ + 16, \ + METHOD_BUFFERED, \ + FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS) + + #endif Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Fri Nov 13 02:48:28 2009 @@ -1770,6 +1770,7 @@ { /* re-use pseudo handle */ DeviceInfo->hDevice = (HANDLE)DeviceInfo->DeviceIndex; + ClientInfo->hPins[Index].hNotifyEvent = DeviceInfo->u.hNotifyEvent; return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } } @@ -1787,6 +1788,7 @@ ClientInfo->hPins = Handels; ClientInfo->hPins[ClientInfo->NumPins].Handle = (HANDLE)DeviceInfo->DeviceIndex; ClientInfo->hPins[ClientInfo->NumPins].Type = MIXER_DEVICE_TYPE; + ClientInfo->hPins[ClientInfo->NumPins].hNotifyEvent = DeviceInfo->u.hNotifyEvent; ClientInfo->NumPins++; } else @@ -2050,10 +2052,94 @@ } NTSTATUS +NotifyWdmAudClients( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG NotificationType, + IN HANDLE hMixer, + IN ULONG Value) +{ + PWDMAUD_DEVICE_EXTENSION DeviceExtension; + PLIST_ENTRY Entry; + PWDMAUD_CLIENT CurClient; + PKEVENT EventObject; + PMIXER_EVENT Event; + KIRQL OldIrql; + ULONG Index; + NTSTATUS Status; + + /* get device extension */ + DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* acquire client context lock */ + KeAcquireSpinLock(&DeviceExtension->Lock, &OldIrql); + + /* point to first entry */ + Entry = DeviceExtension->WdmAudClientList.Flink; + + /* iterate through all clients */ + while(Entry != &DeviceExtension->WdmAudClientList) + { + /* get client context */ + CurClient = (PWDMAUD_CLIENT)CONTAINING_RECORD(Entry, WDMAUD_CLIENT, Entry); + + /* now iterate through all pins and try to find an matching handle */ + for(Index = 0; Index < CurClient->NumPins; Index++) + { + if (CurClient->hPins[Index].Handle == hMixer && CurClient->hPins[Index].Type == MIXER_DEVICE_TYPE && CurClient->hPins[Index].hNotifyEvent) + { + /* found a matching mixer handle and a valid notify event */ + Status = ObReferenceObjectByHandle(CurClient->hPins[Index].hNotifyEvent, EVENT_MODIFY_STATE, ExEventObjectType, UserMode, (LPVOID*)&EventObject, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Invalid notify event passed %p from client %p\n", CurClient->hPins[Index].hNotifyEvent, CurClient); + break; + } + + /* allocate event entry */ + Event = (PMIXER_EVENT)ExAllocatePool(NonPagedPool, sizeof(MIXER_EVENT)); + if (!Event) + { + /* no memory */ + ObDereferenceObject(EventObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* initialize event entry */ + Event->hMixer = hMixer; + Event->NotificationType = NotificationType; + Event->Value = Value; + + /* insert event entry */ + InsertTailList(&CurClient->MixerEventList, &Event->Entry); + + /* now signal the event */ + KeSetEvent(EventObject, 0, FALSE); + + /* dereference event */ + ObDereferenceObject(EventObject); + + /* search next client */ + break; + } + } + + /* move to next client */ + Entry = Entry->Flink; + } + + /* release client context lock */ + KeReleaseSpinLock(&DeviceExtension->Lock, OldIrql); + + /* done */ + return STATUS_SUCCESS; +} + +NTSTATUS SetGetMuteControlDetails( IN PDEVICE_OBJECT DeviceObject, IN ULONG DeviceId, IN ULONG NodeId, + IN ULONG dwLineID, IN PWDMAUD_DEVICE_INFO DeviceInfo, IN ULONG bSet) { @@ -2074,9 +2160,21 @@ /* set control details */ Status = SetGetControlDetails(DeviceObject, DeviceId, NodeId, DeviceInfo, bSet, KSPROPERTY_AUDIO_MUTE, MAXULONG, &Value); + if (!NT_SUCCESS(Status)) + return Status; + /* FIXME SEH */ if (!bSet) + { Input->fValue = Value; + return Status; + } + else + { + /* notify clients of a line change */ + NotifyWdmAudClients(DeviceObject, MM_MIXM_LINE_CHANGE, DeviceInfo->hDevice, dwLineID); + } + return Status; } @@ -2147,8 +2245,74 @@ } Input->dwValue = VolumeData->InputSteppingDelta * (VolumeData->ValuesCount-1); } - + else + { + /* notify clients of a line change */ + NotifyWdmAudClients(DeviceObject, MM_MIXM_CONTROL_CHANGE, DeviceInfo->hDevice, MixerControl->dwControlID); + } return Status; +} + +NTSTATUS +NTAPI +WdmAudGetMixerEvent( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN PWDMAUD_CLIENT ClientInfo) +{ + PWDMAUD_DEVICE_EXTENSION DeviceExtension; + PMIXER_EVENT Event = NULL; + PLIST_ENTRY Entry; + KIRQL OldIrql; + + /* get device extension */ + DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* acquire client context lock */ + KeAcquireSpinLock(&DeviceExtension->Lock, &OldIrql); + + /* point to first entry */ + Entry = ClientInfo->MixerEventList.Flink; + + while(Entry != &ClientInfo->MixerEventList) + { + /* get mixer event */ + Event = (PMIXER_EVENT)CONTAINING_RECORD(Entry, MIXER_EVENT, Entry); + + if (Event->hMixer == DeviceInfo->hDevice) + { + /* found an event for that particular device */ + break; + } + + /* no match found */ + Event = NULL; + + /* move to next entry */ + Entry = Entry->Flink; + } + + + /* release client context lock */ + KeReleaseSpinLock(&DeviceExtension->Lock, OldIrql); + + if (!Event) + { + /* no events available */ + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + + /* store event result */ + DeviceInfo->u.MixerEvent.hMixer = Event->hMixer; + DeviceInfo->u.MixerEvent.NotificationType = Event->NotificationType; + DeviceInfo->u.MixerEvent.Value = Event->Value; + + /* free event info */ + ExFreePool(Event); + + /* done */ + return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } NTSTATUS @@ -2193,7 +2357,7 @@ if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) { /* send the request */ - Status = SetGetMuteControlDetails(DeviceObject, MixerLine->DeviceIndex, NodeId, DeviceInfo, TRUE); + Status = SetGetMuteControlDetails(DeviceObject, MixerLine->DeviceIndex, NodeId, MixerLine->Line.dwLineID, DeviceInfo, TRUE); } else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) { @@ -2245,7 +2409,7 @@ if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) { /* send the request */ - Status = SetGetMuteControlDetails(DeviceObject, MixerLine->DeviceIndex, NodeId, DeviceInfo, FALSE); + Status = SetGetMuteControlDetails(DeviceObject, MixerLine->DeviceIndex, NodeId, MixerLine->Line.dwLineID, DeviceInfo, FALSE); } else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) { Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Fri Nov 13 02:48:28 2009 @@ -18,19 +18,30 @@ typedef struct { + LIST_ENTRY Entry; + HANDLE hMixer; + ULONG NotificationType; + ULONG Value; +}MIXER_EVENT, *PMIXER_EVENT; + + +typedef struct +{ HANDLE Handle; SOUND_DEVICE_TYPE Type; ULONG FilterId; ULONG PinId; + HANDLE hNotifyEvent; }WDMAUD_HANDLE, *PWDMAUD_HANDLE; - -typedef struct -{ +typedef struct +{ + LIST_ENTRY Entry; HANDLE hProcess; ULONG NumPins; WDMAUD_HANDLE * hPins; + LIST_ENTRY MixerEventList; }WDMAUD_CLIENT, *PWDMAUD_CLIENT; typedef struct @@ -115,7 +126,7 @@ ULONG WaveOutDeviceCount; LIST_ENTRY WaveOutList; - + LIST_ENTRY WdmAudClientList; }WDMAUD_DEVICE_EXTENSION, *PWDMAUD_DEVICE_EXTENSION; NTSTATUS @@ -245,6 +256,14 @@ NTSTATUS NTAPI +WdmAudGetMixerEvent( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN PWDMAUD_CLIENT ClientInfo); + +NTSTATUS +NTAPI WdmAudGetControlDetails( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp,

1 0

[sginsberg] 44121: - Documentative amendment to 44115: It incorrectly stated that the commit added "init(i)al support for PCI and ISA interrupts". What was added is (disabled) initial support for ISA, EISA and PCI configurations that require level-triggered interrupts (we only support edge-triggered interrupts right now) and PCI IRQ routing, along with proper handling of IRQ13.
by sginsberg＠svn.reactos.org 12 Nov '09

12 Nov '09

Author: sginsberg Date: Thu Nov 12 22:46:52 2009 New Revision: 44121 URL: http://svn.reactos.org/svn/reactos?rev=44121&view=rev Log: - Documentative amendment to 44115: It incorrectly stated that the commit added "init(i)al support for PCI and ISA interrupts". What was added is (disabled) initial support for ISA, EISA and PCI configurations that require level-triggered interrupts (we only support edge-triggered interrupts right now) and PCI IRQ routing, along with proper handling of IRQ13. Modified: trunk/reactos/hal/halx86/generic/irq.S Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/irq.S [iso-8859-1] Thu Nov 12 22:46:52 2009 @@ -20,7 +20,7 @@ /* Master PIC */ .short 0x20 /* Port */ - .byte 0x11 /* Edge,, cascade, CAI 8, ICW4 */ + .byte 0x11 /* Edge, cascade, CAI 8, ICW4 */ .byte PRIMARY_VECTOR_BASE /* Base */ .byte 4 /* IRQ 4 connected to slave */ .byte 1 /* Non buffered, not nested, 8086 */ @@ -798,7 +798,7 @@ mov dword ptr PCR[KPCR_IRQL], DISPATCH_LEVEL #if DBG - /* Make sure we were not higher then dispatch */ + /* Make sure we were not higher then synch */ cmp eax, DISPATCH_LEVEL ja InvalidRaise #endif

1 0

[sginsberg] 44120: - Win32k doesn't know what "opaque" means. Store the module base address in the structure too for the code that relied on the handle being the base address.
by sginsberg＠svn.reactos.org 12 Nov '09

12 Nov '09

Author: sginsberg Date: Thu Nov 12 21:41:12 2009 New Revision: 44120 URL: http://svn.reactos.org/svn/reactos?rev=44120&view=rev Log: - Win32k doesn't know what "opaque" means. Store the module base address in the structure too for the code that relied on the handle being the base address. Modified: trunk/reactos/subsystems/win32/win32k/include/driver.h trunk/reactos/subsystems/win32/win32k/ldr/loader.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/subsystems/win32/win32k/include/driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/driver.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/driver.h [iso-8859-1] Thu Nov 12 21:41:12 2009 @@ -4,11 +4,13 @@ #include <winddi.h> - - - - - +typedef struct _DRIVERS +{ + LIST_ENTRY ListEntry; + PVOID SectionPointer; + PVOID BaseAddress; + UNICODE_STRING DriverName; +}DRIVERS, *PDRIVERS; BOOL DRIVER_RegisterDriver(LPCWSTR Name, PFN_DrvEnableDriver EnableDriver); PFN_DrvEnableDriver DRIVER_FindExistingDDIDriver(LPCWSTR Name); Modified: trunk/reactos/subsystems/win32/win32k/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ld… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ldr/loader.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ldr/loader.c [iso-8859-1] Thu Nov 12 21:41:12 2009 @@ -25,13 +25,6 @@ #define NDEBUG #include <debug.h> - -typedef struct _DRIVERS -{ - LIST_ENTRY ListEntry; - PVOID SectionPointer; - UNICODE_STRING DriverName; -}DRIVERS, *PDRIVERS; extern LIST_ENTRY GlobalDriverListHead; @@ -181,7 +174,7 @@ return NULL; } RtlInitAnsiString(&ProcNameString, ProcName); - Status = LdrGetProcedureAddress(Module, + Status = LdrGetProcedureAddress(((PDRIVERS)Module)->BaseAddress, &ProcNameString, 0, &Function); @@ -235,6 +228,7 @@ DriverInfo->DriverName.Buffer = ExAllocatePool(PagedPool, GdiDriverInfo.DriverName.MaximumLength); RtlCopyUnicodeString(&DriverInfo->DriverName, &GdiDriverInfo.DriverName); DriverInfo->SectionPointer = GdiDriverInfo.SectionPointer; + DriverInfo->BaseAddress = GdiDriverInfo.ImageAddress; InsertHeadList(&GlobalDriverListHead, &DriverInfo->ListEntry); } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] Thu Nov 12 21:41:12 2009 @@ -163,7 +163,7 @@ DPRINT("Loaded %wZ\n", &FullLayoutPath); RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" ); - LdrGetProcedureAddress((PVOID)*phModule, + LdrGetProcedureAddress((*(PDRIVERS*)phModule)->BaseAddress, &kbdProcedureName, 0, (PVOID*)&layerDescGetFn);

1 0

[sginsberg] 44119: - Add missing synchronization for access to PsLoadedModuleList. Inserting and removing entries to the list was protected by a spinlock, but some places didn't acquire the lock before looping the list when searching for module information. For efficiency, use an executive resource for other access than inserting/removing entries so we can have shared locking in some common cases (spinlock stays so access can be synchronized with DPCs). - Make SystemUnloadGdiDriverInformation ta
by sginsberg＠svn.reactos.org 12 Nov '09

12 Nov '09

Author: sginsberg Date: Thu Nov 12 20:41:39 2009 New Revision: 44119 URL: http://svn.reactos.org/svn/reactos?rev=44119&view=rev Log: - Add missing synchronization for access to PsLoadedModuleList. Inserting and removing entries to the list was protected by a spinlock, but some places didn't acquire the lock before looping the list when searching for module information. For efficiency, use an executive resource for other access than inserting/removing entries so we can have shared locking in some common cases (spinlock stays so access can be synchronized with DPCs). - Make SystemUnloadGdiDriverInformation take the opaque SectionPointer (which is really the Loader Entry) from the SYSTEM_GDI_DRIVER_INFORMATION structure returned in SystemLoadGdiDriverInformation so it doesn't need to loop the loaded module list to find it. - Fix EngLoad/UnloadImage to do this. Also make EngLoadImage return the pointer to the internal structure as the "handle" so EngUnloadImage doesn't need to loop the driver list to find it. The code is still extremely broken and needs a rewrite. - Remove some externs from related variables in the code -- we use something called "headers". Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/sysldr.c trunk/reactos/subsystems/win32/win32k/ldr/loader.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Thu Nov 12 20:41:39 2009 @@ -138,17 +138,6 @@ } /* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -#undef ExGetPreviousMode -KPROCESSOR_MODE -NTAPI -ExGetPreviousMode (VOID) -{ - return KeGetPreviousMode(); -} /* * @implemented @@ -1006,12 +995,23 @@ /* Class 11 - Module Information */ QSI_DEF(SystemModuleInformation) { - extern LIST_ENTRY PsLoadedModuleList; - return ExpQueryModuleInformation(&PsLoadedModuleList, - NULL, - (PRTL_PROCESS_MODULES)Buffer, - Size, - ReqSize); + NTSTATUS Status; + + /* Acquire system module list lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&PsLoadedModuleResource, TRUE); + + /* Call the generic handler with the system module list */ + Status = ExpQueryModuleInformation(&PsLoadedModuleList, + &MmLoadedUserImageList, + (PRTL_PROCESS_MODULES)Buffer, + Size, + ReqSize); + + /* Release list lock and return status */ + ExReleaseResourceLite(&PsLoadedModuleResource); + KeLeaveCriticalRegion(); + return Status; } /* Class 12 - Locks Information */ @@ -1322,10 +1322,9 @@ SSI_DEF(SystemLoadGdiDriverInformation) { PSYSTEM_GDI_DRIVER_INFORMATION DriverInfo = (PVOID)Buffer; - KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); UNICODE_STRING ImageName; PVOID ImageBase; - PLDR_DATA_TABLE_ENTRY ModuleObject; + PVOID SectionPointer; ULONG_PTR EntryPoint; NTSTATUS Status; ULONG DirSize; @@ -1338,8 +1337,8 @@ return STATUS_INFO_LENGTH_MISMATCH; } - /* Only kernel-mode can call this function */ - if (PreviousMode != KernelMode) return STATUS_PRIVILEGE_NOT_HELD; + /* Only kernel mode can call this function */ + if (ExGetPreviousMode() != KernelMode) return STATUS_PRIVILEGE_NOT_HELD; /* Load the driver */ ImageName = DriverInfo->DriverName; @@ -1347,7 +1346,7 @@ NULL, NULL, 0, - (PVOID)&ModuleObject, + &SectionPointer, &ImageBase); if (!NT_SUCCESS(Status)) return Status; @@ -1365,7 +1364,7 @@ /* Save other data */ DriverInfo->ImageAddress = ImageBase; - DriverInfo->SectionPointer = NULL; + DriverInfo->SectionPointer = SectionPointer; DriverInfo->EntryPoint = (PVOID)EntryPoint; DriverInfo->ImageLength = NtHeader->OptionalHeader.SizeOfImage; @@ -1376,44 +1375,21 @@ /* Class 27 - Unload Image */ SSI_DEF(SystemUnloadGdiDriverInformation) { - PLDR_DATA_TABLE_ENTRY LdrEntry; - PLIST_ENTRY NextEntry; - PVOID BaseAddr = *((PVOID*)Buffer); - - if(Size != sizeof(PVOID)) + PVOID SectionPointer = Buffer; + + /* Validate size */ + if (Size != sizeof(PVOID)) + { + /* Incorrect length, fail */ return STATUS_INFO_LENGTH_MISMATCH; - - if(KeGetPreviousMode() != KernelMode) - return STATUS_PRIVILEGE_NOT_HELD; - - // Scan the module list - NextEntry = PsLoadedModuleList.Flink; - while(NextEntry != &PsLoadedModuleList) - { - LdrEntry = CONTAINING_RECORD(NextEntry, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); - - if (LdrEntry->DllBase == BaseAddr) - { - // Found it. - break; - } - - NextEntry = NextEntry->Flink; - } - - // Check if we found the image - if(NextEntry != &PsLoadedModuleList) - { - return MmUnloadSystemImage(LdrEntry); - } - else - { - DPRINT1("Image 0x%x not found.\n", BaseAddr); - return STATUS_DLL_NOT_FOUND; - } - + } + + /* Only kernel mode can call this function */ + if (ExGetPreviousMode() != KernelMode) return STATUS_PRIVILEGE_NOT_HELD; + + /* Unload the image */ + MmUnloadSystemImage(SectionPointer); + return STATUS_SUCCESS; } /* Class 28 - Time Adjustment Information */ @@ -1986,7 +1962,6 @@ return STATUS_INVALID_INFO_CLASS; } - NTSTATUS NTAPI NtFlushInstructionCache(IN HANDLE ProcessHandle, @@ -2018,4 +1993,13 @@ return KeGetCurrentProcessorNumber(); } -/* EOF */ +/* + * @implemented + */ +#undef ExGetPreviousMode +KPROCESSOR_MODE +NTAPI +ExGetPreviousMode (VOID) +{ + return KeGetPreviousMode(); +} Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Thu Nov 12 20:41:39 2009 @@ -27,6 +27,8 @@ extern MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg; extern LIST_ENTRY MmLoadedUserImageList; + +extern KMUTANT MmSystemLoadLock; extern ULONG MmNumberOfPagingFiles; Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] Thu Nov 12 20:41:39 2009 @@ -434,6 +434,8 @@ extern LARGE_INTEGER ShortPsLockDelay; extern UNICODE_STRING PsNtDllPathName; extern LIST_ENTRY PsLoadedModuleList; +extern KSPIN_LOCK PsLoadedModuleSpinLock; +extern ERESOURCE PsLoadedModuleResource; extern ULONG_PTR PsNtosImageBase; // Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Thu Nov 12 20:41:39 2009 @@ -692,8 +692,6 @@ OUT PWCHAR *MissingDriver, OUT PLOAD_IMPORTS *LoadImports); -extern KSPIN_LOCK PsLoadedModuleSpinLock; - // // Used for images already loaded (boot drivers) // Modified: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] Thu Nov 12 20:41:39 2009 @@ -21,8 +21,6 @@ MM_DRIVER_VERIFIER_DATA MmVerifierData; LIST_ENTRY MiVerifierDriverAddedThunkListHead; ULONG MiActiveVerifierThunks; -extern KMUTANT MmSystemLoadLock; -extern LIST_ENTRY PsLoadedModuleList; /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Thu Nov 12 20:41:39 2009 @@ -56,7 +56,6 @@ UCHAR MmDisablePagingExecutive = 1; // Forced to off PMMPTE MmSharedUserDataPte; PMMSUPPORT MmKernelAddressSpace; -extern KMUTANT MmSystemLoadLock; BOOLEAN MiDbgEnableMdDump = #ifdef _ARM_ TRUE; Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Thu Nov 12 20:41:39 2009 @@ -30,6 +30,7 @@ LIST_ENTRY PsLoadedModuleList; LIST_ENTRY MmLoadedUserImageList; KSPIN_LOCK PsLoadedModuleSpinLock; +ERESOURCE PsLoadedModuleResource; ULONG_PTR PsNtosImageBase; KMUTANT MmSystemLoadLock; @@ -438,15 +439,21 @@ { KIRQL OldIrql; - /* Acquire the lock */ - KeAcquireSpinLock(&PsLoadedModuleSpinLock, &OldIrql); + /* Acquire module list lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&PsLoadedModuleResource, TRUE); + + /* Acquire the spinlock too as we will insert or remove the entry */ + OldIrql = KeAcquireSpinLockRaiseToSynch(&PsLoadedModuleSpinLock); /* Insert or remove from the list */ Insert ? InsertTailList(&PsLoadedModuleList, &LdrEntry->InLoadOrderLinks) : RemoveEntryList(&LdrEntry->InLoadOrderLinks); - /* Release the lock */ + /* Release locks */ KeReleaseSpinLock(&PsLoadedModuleSpinLock, OldIrql); + ExReleaseResourceLite(&PsLoadedModuleResource); + KeLeaveCriticalRegion(); } VOID @@ -1332,7 +1339,8 @@ PLIST_ENTRY ListHead, NextEntry; ULONG EntrySize; - /* Setup the loaded module list and lock */ + /* Setup the loaded module list and locks */ + ExInitializeResourceLite(&PsLoadedModuleResource); KeInitializeSpinLock(&PsLoadedModuleSpinLock); InitializeListHead(&PsLoadedModuleList); @@ -2005,6 +2013,7 @@ /* Lock the list */ KeEnterCriticalRegion(); + ExAcquireResourceSharedLite(&PsLoadedModuleResource, TRUE); /* Loop the loaded module list */ NextEntry = PsLoadedModuleList.Flink; @@ -2046,6 +2055,7 @@ } /* Release the lock */ + ExReleaseResourceLite(&PsLoadedModuleResource); KeLeaveCriticalRegion(); /* Free the string and return */ Modified: trunk/reactos/subsystems/win32/win32k/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ld… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ldr/loader.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ldr/loader.c [iso-8859-1] Thu Nov 12 20:41:39 2009 @@ -29,11 +29,12 @@ typedef struct _DRIVERS { LIST_ENTRY ListEntry; - HANDLE ImageHandle; + PVOID SectionPointer; UNICODE_STRING DriverName; }DRIVERS, *PDRIVERS; extern LIST_ENTRY GlobalDriverListHead; + /* * Blatantly stolen from ldr/utils.c in ntdll. I can't link ntdll from @@ -199,8 +200,8 @@ APIENTRY EngLoadImage (LPWSTR DriverName) { - HANDLE hImageHandle = NULL; SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo; + PDRIVERS DriverInfo = NULL; NTSTATUS Status; RtlInitUnicodeString(&GdiDriverInfo.DriverName, DriverName); @@ -213,14 +214,14 @@ { Current = CONTAINING_RECORD(CurrentEntry, DRIVERS, ListEntry); if( Current && (0 == RtlCompareUnicodeString(&GdiDriverInfo.DriverName, &Current->DriverName, FALSE)) ) { - hImageHandle = Current->ImageHandle; + DriverInfo = Current; break; } CurrentEntry = CurrentEntry->Flink; }; } - if( !hImageHandle ) + if( !DriverInfo ) { /* the driver was not loaded before, so let's do that */ Status = ZwSetSystemInformation(SystemLoadGdiDriverInformation, &GdiDriverInfo, sizeof(SYSTEM_GDI_DRIVER_INFORMATION)); @@ -228,19 +229,17 @@ DPRINT1("ZwSetSystemInformation failed with Status 0x%lx\n", Status); } else { - PDRIVERS DriverInfo; - hImageHandle = (HANDLE)GdiDriverInfo.ImageAddress; DriverInfo = ExAllocatePool(PagedPool, sizeof(DRIVERS)); DriverInfo->DriverName.MaximumLength = GdiDriverInfo.DriverName.MaximumLength; DriverInfo->DriverName.Length = GdiDriverInfo.DriverName.Length; DriverInfo->DriverName.Buffer = ExAllocatePool(PagedPool, GdiDriverInfo.DriverName.MaximumLength); RtlCopyUnicodeString(&DriverInfo->DriverName, &GdiDriverInfo.DriverName); - DriverInfo->ImageHandle = hImageHandle; + DriverInfo->SectionPointer = GdiDriverInfo.SectionPointer; InsertHeadList(&GlobalDriverListHead, &DriverInfo->ListEntry); } } - return hImageHandle; + return DriverInfo; } VOID @@ -248,11 +247,12 @@ EngUnloadImage ( IN HANDLE hModule ) { NTSTATUS Status; + PDRIVERS DriverInfo = (PDRIVERS)hModule; DPRINT("hModule 0x%x\n", hModule); Status = ZwSetSystemInformation(SystemUnloadGdiDriverInformation, - &hModule, sizeof(HANDLE)); + DriverInfo->SectionPointer, sizeof(PVOID)); if(!NT_SUCCESS(Status)) { @@ -261,27 +261,9 @@ } else { - /* remove from the list */ - if( !IsListEmpty(&GlobalDriverListHead) ) - { - PLIST_ENTRY CurrentEntry = GlobalDriverListHead.Flink; - PDRIVERS Current; - /* probably the driver was already loaded, let's try to find it out */ - while( CurrentEntry != &GlobalDriverListHead ) - { - Current = CONTAINING_RECORD(CurrentEntry, DRIVERS, ListEntry); - - if( Current ) { - if(Current->ImageHandle == hModule) { - ExFreePool(Current->DriverName.Buffer); - RemoveEntryList(&Current->ListEntry); - ExFreePool(Current); - break; - } - } - CurrentEntry = CurrentEntry->Flink; - }; - } + ExFreePool(DriverInfo->DriverName.Buffer); + RemoveEntryList(&DriverInfo->ListEntry); + ExFreePool(DriverInfo); } }

1 0

[fireball] 44118: [SWM] - Move out the code for setting foreground window into a separate helper function SwmBringToFront. Call it from SwmSetForeground and SwmShowWindow.
by fireball＠svn.reactos.org 12 Nov '09

12 Nov '09

Author: fireball Date: Thu Nov 12 20:11:28 2009 New Revision: 44118 URL: http://svn.reactos.org/svn/reactos?rev=44118&view=rev Log: [SWM] - Move out the code for setting foreground window into a separate helper function SwmBringToFront. Call it from SwmSetForeground and SwmShowWindow. Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Thu Nov 12 20:11:28 2009 @@ -422,10 +422,58 @@ VOID NTAPI +SwmBringToFront(PSWM_WINDOW SwmWin) +{ + PSWM_WINDOW Previous; + struct region *OldVisible; + + /* Save previous focus window */ + Previous = CONTAINING_RECORD(SwmWindows.Flink, SWM_WINDOW, Entry); + + /* It's already on top */ + if (Previous->hwnd == SwmWin->hwnd) + { + DPRINT1("hwnd %x is already on top\n", SwmWin->hwnd); + return; + } + + DPRINT1("Setting %x as foreground, previous window was %x\n", SwmWin->hwnd, Previous->hwnd); + + /* Remove it from the list */ + RemoveEntryList(&SwmWin->Entry); + + /* Add it to the head of the list */ + InsertHeadList(&SwmWindows, &SwmWin->Entry); + + /* Subtruct old visible from the new one to find region for updating */ + OldVisible = create_empty_region(); + set_region_rect(OldVisible, &SwmWin->Window); + + subtract_region(OldVisible, OldVisible, SwmWin->Visible); + + /* Make it fully visible */ + free_region(SwmWin->Visible); + SwmWin->Visible = create_empty_region(); + set_region_rect(SwmWin->Visible, &SwmWin->Window); + + /* If update region is not empty - draw missing parts */ + if (!is_region_empty(OldVisible)) + { + DPRINT1("Intersection isn't empty\n"); + SwmInvalidateRegion(SwmWin, OldVisible, NULL); + } + + free_region(OldVisible); + + /* Update previous window's visible region */ + SwmRecalculateVisibility(Previous); +} + +VOID +NTAPI SwmSetForeground(HWND hWnd) { - PSWM_WINDOW SwmWin, Previous; - struct region *OldVisible; + PSWM_WINDOW SwmWin; /* Acquire the lock */ SwmAcquire(); @@ -440,48 +488,7 @@ return; } - /* Save previous focus window */ - Previous = CONTAINING_RECORD(SwmWindows.Flink, SWM_WINDOW, Entry); - - /* It's already on top */ - if (Previous->hwnd == hWnd) - { - DPRINT1("hwnd %x is already on top\n", hWnd); - /* Release the lock */ - SwmRelease(); - return; - } - - DPRINT1("Setting %x as foreground, previous window was %x\n", hWnd, Previous->hwnd); - - /* Remove it from the list */ - RemoveEntryList(&SwmWin->Entry); - - /* Add it to the head of the list */ - InsertHeadList(&SwmWindows, &SwmWin->Entry); - - /* Subtruct old visible from the new one to find region for updating */ - OldVisible = create_empty_region(); - set_region_rect(OldVisible, &SwmWin->Window); - - subtract_region(OldVisible, OldVisible, SwmWin->Visible); - - /* Make it fully visible */ - free_region(SwmWin->Visible); - SwmWin->Visible = create_empty_region(); - set_region_rect(SwmWin->Visible, &SwmWin->Window); - - /* If update region is not empty - draw missing parts */ - if (!is_region_empty(OldVisible)) - { - DPRINT1("Intersection isn't empty\n"); - SwmInvalidateRegion(SwmWin, OldVisible, NULL); - } - - free_region(OldVisible); - - /* Update previous window's visible region */ - SwmRecalculateVisibility(Previous); + SwmBringToFront(SwmWin); /* Release the lock */ SwmRelease(); @@ -573,6 +580,7 @@ { /* Change state from hidden to visible */ Win->Hidden = FALSE; + SwmBringToFront(Win); } else if (!Show && !Win->Hidden) {

1 0

[fireball] 44117: [advapi32] Alexander Yastrebov <menone7@gmail.com> - Return proper lengths of required buffer sizes in characters (including the termination NULL character) in LookupAccountSid. Fixes 4 "advapi32_winetest security" failures. See issue #4904 for more details.
by fireball＠svn.reactos.org 12 Nov '09

12 Nov '09

Author: fireball Date: Thu Nov 12 14:55:51 2009 New Revision: 44117 URL: http://svn.reactos.org/svn/reactos?rev=44117&view=rev Log: [advapi32] Alexander Yastrebov <menone7(a)gmail.com> - Return proper lengths of required buffer sizes in characters (including the termination NULL character) in LookupAccountSid. Fixes 4 "advapi32_winetest security" failures. See issue #4904 for more details. Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Thu Nov 12 14:55:51 2009 @@ -1146,6 +1146,7 @@ PLSA_REFERENCED_DOMAIN_LIST ReferencedDomain = NULL; PLSA_TRANSLATED_NAME TranslatedName = NULL; BOOL ret; + DWORD dwAccountName, dwDomainName; RtlInitUnicodeString ( &SystemName, pSystemName ); Status = LsaOpenPolicy ( &SystemName, &ObjectAttributes, POLICY_LOOKUP_NAMES, &PolicyHandle ); @@ -1166,49 +1167,37 @@ else { ret = TRUE; - if ( TranslatedName ) + + dwAccountName = TranslatedName->Name.Length / sizeof(WCHAR); + if (ReferencedDomain && ReferencedDomain->Entries > 0) + dwDomainName = ReferencedDomain->Domains[0].Name.Length / sizeof(WCHAR); + else + dwDomainName = 0; + + if (*pdwAccountName <= dwAccountName || *pdwDomainName <= dwDomainName) { - DWORD dwSrcLen = TranslatedName->Name.Length / sizeof(WCHAR); - if ( *pdwAccountName <= dwSrcLen ) - { - *pdwAccountName = dwSrcLen + 1; - ret = FALSE; - } - else - { - *pdwAccountName = dwSrcLen; - if (pAccountName) - { - RtlCopyMemory ( pAccountName, TranslatedName->Name.Buffer, TranslatedName->Name.Length ); - pAccountName[TranslatedName->Name.Length / sizeof(WCHAR)] = L'\0'; - } - } - if ( peUse ) + /* One or two buffers are insufficient, add up a char for NULL termination */ + *pdwAccountName = dwAccountName + 1; + *pdwDomainName = dwDomainName + 1; + ret = FALSE; + } else + { + /* Lengths are sufficient, copy the data */ + if(dwAccountName) + RtlCopyMemory(pAccountName, TranslatedName->Name.Buffer, dwAccountName * sizeof(WCHAR)); + pAccountName[dwAccountName] = L'\0'; + + if(dwDomainName) + RtlCopyMemory(pDomainName, ReferencedDomain->Domains[0].Name.Buffer, dwDomainName * sizeof(WCHAR)); + pDomainName[dwDomainName] = L'\0'; + + *pdwAccountName = dwAccountName; + *pdwDomainName = dwDomainName; + + if (peUse) *peUse = TranslatedName->Use; } - - if ( ReferencedDomain ) - { - if ( ReferencedDomain->Entries > 0 ) - { - DWORD dwSrcLen = ReferencedDomain->Domains[0].Name.Length / sizeof(WCHAR); - if ( *pdwDomainName <= dwSrcLen ) - { - *pdwDomainName = dwSrcLen + 1; - ret = FALSE; - } - else - { - *pdwDomainName = dwSrcLen; - if (pDomainName) - { - RtlCopyMemory ( pDomainName, ReferencedDomain->Domains[0].Name.Buffer, ReferencedDomain->Domains[0].Name.Length ); - pDomainName[ReferencedDomain->Domains[0].Name.Length / sizeof(WCHAR)] = L'\0'; - } - } - } - } - + if ( !ret ) SetLastError(ERROR_INSUFFICIENT_BUFFER); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs