Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 19536: Fix missed files. Svn problem?
by jimtabor＠svn.reactos.com 24 Nov '05

24 Nov '05

Fix missed files. Svn problem? Added: trunk/reactos/drivers/multimedia/portcls/ Added: trunk/reactos/drivers/multimedia/portcls/portcls.c Added: trunk/reactos/drivers/multimedia/portcls/portcls.def Added: trunk/reactos/drivers/multimedia/portcls/portcls.h Added: trunk/reactos/drivers/multimedia/portcls/portcls.rc Added: trunk/reactos/drivers/multimedia/portcls/portcls.xml _____ Added: trunk/reactos/drivers/multimedia/portcls/portcls.c --- trunk/reactos/drivers/multimedia/portcls/portcls.c 2005-11-24 21:08:13 UTC (rev 19535) +++ trunk/reactos/drivers/multimedia/portcls/portcls.c 2005-11-24 22:08:38 UTC (rev 19536) @@ -0,0 +1,505 @@ +/* + * ReactOS PortCls Driver + * Copyright (C) 2005 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Sound System + * PURPOSE: Audio Port Class Functions + * FILE: drivers/dd/sound/portcls/portcls.c + * PROGRAMMERS: + * + * REVISION HISTORY: + * 21 November 2005 Created James Tabor + */ +#include <windows.h> +#include "portcls.h" + + +#define NDEBUG +#include <debug.h> + + +NTSTATUS STDCALL +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +DWORD STDCALL +DllInitialize(DWORD Unknown) +{ + return 0; +} + +/* + * @implemented + */ +DWORD STDCALL +DllUnload(VOID) +{ + return 0; +} + + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcAddAdapterDevice( + DWORD DriverObject, + DWORD PhysicalDeviceObject, + DWORD StartDevice, + DWORD MaxObjects, + DWORD DeviceExtensionSize +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcAddContentHandlers( + DWORD ContentId, + DWORD paHandlers, + DWORD NumHandlers +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcCompleteIrp( + DWORD DeviceObject, + DWORD Irp, + DWORD Status +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcCompletePendingPropertyRequest( + DWORD PropertyRequest, + DWORD NtStatus +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcCreateContentMixed( + DWORD paContentId, + DWORD cContentId, + DWORD pMixedContentId +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcDestroyContent( + DWORD ContentId +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcDispatchIrp( + DWORD DeviceObject, + DWORD Irp +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcForwardContentToDeviceObject( + DWORD ContentId, + DWORD Reserved, + DWORD DrmForward +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcForwardContentToFileObject( + DWORD ContentId, + DWORD FileObject +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcForwardContentToInterface( + DWORD ContentId, + DWORD Unknown, + DWORD NumMethods +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcForwardIrpSynchronous( + DWORD DeviceObject, + DWORD Irp +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcGetContentRights( + DWORD ContentId, + DWORD DrmRights +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcGetDeviceProperty( + DWORD DeviceObject, + DWORD DeviceProperty, + DWORD BufferLength, + DWORD PropertyBuffer, + DWORD ResultLength +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +ULONGLONG STDCALL +PcGetTimeInterval( + ULONGLONG Timei +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcInitializeAdapterDriver( + DWORD DriverObject, + DWORD RegistryPathName, + DWORD AddDevice +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewDmaChannel( + DWORD OutDmaChannel, + DWORD Unknown, + DWORD PoolType, + DWORD DeviceDescription, + DWORD DeviceObject +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewInterruptSync( + DWORD OutInterruptSync, + DWORD Unknown, + DWORD ResourceList, + DWORD ResourceIndex, + DWORD Mode +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewMiniport( + DWORD OutMiniport, + DWORD ClassId +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewPort( + DWORD OutPort, + DWORD ClassId +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewRegistryKey( + DWORD OutRegistryKey, + DWORD Unknown, + DWORD RegistryKeyType, + DWORD DesiredAccess, + DWORD DeviceObject, + DWORD SubDevice, + DWORD ObjectAttributes, + DWORD CreateOptions, + DWORD Disposition +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewResourceList( + DWORD OutResourceList, + DWORD Unknown, + DWORD PoolType, + DWORD TranslatedResources, + DWORD UntranslatedResources +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewResourceSublist( + DWORD OutResourceList, + DWORD Unknown, + DWORD PoolType, + DWORD ParentList, + DWORD MaximumEntries +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewServiceGroup( + DWORD OutServiceGroup, + DWORD Unknown +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterAdapterPowerManagement( + DWORD Unknown, + DWORD pvContext +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterIoTimeout( + DWORD pDeviceObject, + DWORD pTimerRoutine, + DWORD pContext +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterPhysicalConnection( + DWORD DeviceObject, + DWORD FromUnknown, + DWORD FromPin, + DWORD ToUnknown, + DWORD ToPin +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterPhysicalConnectionFromExternal( + DWORD DeviceObject, + DWORD FromString, + DWORD FromPin, + DWORD ToUnknown, + DWORD ToPin +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterPhysicalConnectionToExternal( + DWORD DeviceObject, + DWORD FromUnknown, + DWORD FromPin, + DWORD ToString, + DWORD ToPin +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterSubdevice( + DWORD DeviceObject, + DWORD SubdevName, + DWORD Unknown +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRequestNewPowerState( + DWORD pDeviceObject, + DWORD RequestedNewState +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcUnregisterIoTimeout( + DWORD pDeviceObject, + DWORD pTimerRoutine, + DWORD pContext +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + Property changes on: trunk/reactos/drivers/multimedia/portcls/portcls.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/multimedia/portcls/portcls.def --- trunk/reactos/drivers/multimedia/portcls/portcls.def 2005-11-24 21:08:13 UTC (rev 19535) +++ trunk/reactos/drivers/multimedia/portcls/portcls.def 2005-11-24 22:08:38 UTC (rev 19536) @@ -0,0 +1,36 @@ +; +; Exports definition file for portcls.sys +; +EXPORTS +PcAddAdapterDevice@20 +PcAddContentHandlers@12 +PcCompleteIrp@12 +PcCompletePendingPropertyRequest@8 +PcCreateContentMixed@12 +PcDestroyContent@4 +PcDispatchIrp@8 +PcForwardContentToDeviceObject@12 +PcForwardContentToFileObject@8 +PcForwardContentToInterface@12 +PcForwardIrpSynchronous@8 +PcGetContentRights@8 +PcGetDeviceProperty@20 +PcGetTimeInterval@8 +PcInitializeAdapterDriver@12 +PcNewDmaChannel@20 +PcNewInterruptSync@20 +PcNewMiniport@8 +PcNewPort@8 +PcNewRegistryKey@36 +PcNewResourceList@20 +PcNewResourceSublist@20 +PcNewServiceGroup@8 +PcRegisterAdapterPowerManagement@8 +PcRegisterIoTimeout@12 +PcRegisterPhysicalConnection@20 +PcRegisterPhysicalConnectionFromExternal@20 +PcRegisterPhysicalConnectionToExternal@20 +PcRegisterSubdevice@12 +PcRequestNewPowerState@8 +PcUnregisterIoTimeout@12 + Property changes on: trunk/reactos/drivers/multimedia/portcls/portcls.def ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/multimedia/portcls/portcls.h --- trunk/reactos/drivers/multimedia/portcls/portcls.h 2005-11-24 21:08:13 UTC (rev 19535) +++ trunk/reactos/drivers/multimedia/portcls/portcls.h 2005-11-24 22:08:38 UTC (rev 19536) @@ -0,0 +1,252 @@ +/* + + Move to w32api when it is ready. + + */ +#ifndef _PORTCLS_H +#define _PORTCLS_H +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#include <windef.h> +#include <ddk/ntddk.h> + +#define PORTCLASSAPI extern + +PORTCLASSAPI NTSTATUS STDCALL +PcAddAdapterDevice( + DWORD DriverObject, + DWORD PhysicalDeviceObject, + DWORD StartDevice, + DWORD MaxObjects, + DWORD DeviceExtensionSize +); + +PORTCLASSAPI NTSTATUS STDCALL +PcAddContentHandlers( + DWORD ContentId, + DWORD paHandlers, + DWORD NumHandlers +); + +PORTCLASSAPI NTSTATUS STDCALL +PcCompleteIrp( + DWORD DeviceObject, + DWORD Irp, + DWORD Status +); + +PORTCLASSAPI NTSTATUS STDCALL +PcCompletePendingPropertyRequest( + DWORD PropertyRequest, + DWORD NtStatus +); + +PORTCLASSAPI NTSTATUS STDCALL +PcCreateContentMixed( + DWORD paContentId, + DWORD cContentId, + DWORD pMixedContentId +); + +PORTCLASSAPI NTSTATUS STDCALL +PcDestroyContent( + DWORD ContentId +); + +PORTCLASSAPI NTSTATUS STDCALL +PcDispatchIrp( + DWORD DeviceObject, + DWORD Irp +); + +PORTCLASSAPI NTSTATUS STDCALL +PcForwardContentToDeviceObject( + DWORD ContentId, + DWORD Reserved, + DWORD DrmForward +); + +PORTCLASSAPI NTSTATUS STDCALL +PcForwardContentToFileObject( + DWORD ContentId, + DWORD FileObject +); + +PORTCLASSAPI NTSTATUS STDCALL +PcForwardContentToInterface( + DWORD ContentId, + DWORD Unknown, + DWORD NumMethods +); + +PORTCLASSAPI NTSTATUS STDCALL +PcForwardIrpSynchronous( + DWORD DeviceObject, + DWORD Irp +); + +PORTCLASSAPI NTSTATUS STDCALL +PcGetContentRights( + DWORD ContentId, + DWORD DrmRights +); + +PORTCLASSAPI NTSTATUS STDCALL +PcGetDeviceProperty( + DWORD DeviceObject, + DWORD DeviceProperty, + DWORD BufferLength, + DWORD PropertyBuffer, + DWORD ResultLength +); + +PORTCLASSAPI ULONGLONG STDCALL +PcGetTimeInterval( + ULONGLONG Timei +); + +PORTCLASSAPI NTSTATUS STDCALL +PcInitializeAdapterDriver( + DWORD DriverObject, + DWORD RegistryPathName, + DWORD AddDevice +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewDmaChannel( + DWORD OutDmaChannel, + DWORD Unknown, + DWORD PoolType, + DWORD DeviceDescription, + DWORD DeviceObject +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewInterruptSync( + DWORD OutInterruptSync, + DWORD Unknown, + DWORD ResourceList, + DWORD ResourceIndex, + DWORD Mode +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewMiniport( + DWORD OutMiniport, + DWORD ClassId +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewPort( + DWORD OutPort, + DWORD ClassId +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewRegistryKey( + DWORD OutRegistryKey, + DWORD Unknown, + DWORD RegistryKeyType, + DWORD DesiredAccess, + DWORD DeviceObject, + DWORD SubDevice, + DWORD ObjectAttributes, + DWORD CreateOptions, + DWORD Disposition +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewResourceList( + DWORD OutResourceList, + DWORD Unknown, + DWORD PoolType, + DWORD TranslatedResources, + DWORD UntranslatedResources +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewResourceSublist( + DWORD OutResourceList, + DWORD Unknown, + DWORD PoolType, + DWORD ParentList, + DWORD MaximumEntries +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewServiceGroup( + DWORD OutServiceGroup, + DWORD Unknown +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterAdapterPowerManagement( + DWORD Unknown, + DWORD pvContext +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterIoTimeout( + DWORD pDeviceObject, + DWORD pTimerRoutine, + DWORD pContext +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterPhysicalConnection( + DWORD DeviceObject, + DWORD FromUnknown, + DWORD FromPin, + DWORD ToUnknown, + DWORD ToPin +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterPhysicalConnectionFromExternal( + DWORD DeviceObject, + DWORD FromString, + DWORD FromPin, + DWORD ToUnknown, + DWORD ToPin +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterPhysicalConnectionToExternal( + DWORD DeviceObject, + DWORD FromUnknown, + DWORD FromPin, + DWORD ToString, + DWORD ToPin +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterSubdevice( + DWORD DeviceObject, + DWORD SubdevName, + DWORD Unknown +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRequestNewPowerState( + DWORD pDeviceObject, + DWORD RequestedNewState +); + +PORTCLASSAPI NTSTATUS STDCALL +PcUnregisterIoTimeout( + DWORD pDeviceObject, + DWORD pTimerRoutine, + DWORD pContext +); + +#ifdef __cplusplus +} +#endif + +#endif Property changes on: trunk/reactos/drivers/multimedia/portcls/portcls.h ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/multimedia/portcls/portcls.rc --- trunk/reactos/drivers/multimedia/portcls/portcls.rc 2005-11-24 21:08:13 UTC (rev 19535) +++ trunk/reactos/drivers/multimedia/portcls/portcls.rc 2005-11-24 22:08:38 UTC (rev 19536) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "PORTCLS Port Class Driver API\0" +#define REACTOS_STR_INTERNAL_NAME "portcls\0" +#define REACTOS_STR_ORIGINAL_FILENAME "portcls.sys\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/drivers/multimedia/portcls/portcls.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/multimedia/portcls/portcls.xml --- trunk/reactos/drivers/multimedia/portcls/portcls.xml 2005-11-24 21:08:13 UTC (rev 19535) +++ trunk/reactos/drivers/multimedia/portcls/portcls.xml 2005-11-24 22:08:38 UTC (rev 19536) @@ -0,0 +1,8 @@ +<module name="portcls" type="kernelmodedriver" installbase="system32/drivers" installname="portcls.sys"> + <importlibrary definition="portcls.def" /> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <file>portcls.c</file> + <file>portcls.rc</file> +</module> Property changes on: trunk/reactos/drivers/multimedia/portcls/portcls.xml ___________________________________________________________________ Name: svn:eol-style + native

1 0

[hbirr] 19535: - Allow trailing back slashes only for directories.
by hbirr＠svn.reactos.com 24 Nov '05

24 Nov '05

- Allow trailing back slashes only for directories. - Allow trailing back slashes, if a new directory will be created. Modified: trunk/reactos/drivers/fs/vfat/create.c Modified: trunk/reactos/drivers/fs/vfat/vfat.h _____ Modified: trunk/reactos/drivers/fs/vfat/create.c --- trunk/reactos/drivers/fs/vfat/create.c 2005-11-24 18:05:53 UTC (rev 19534) +++ trunk/reactos/drivers/fs/vfat/create.c 2005-11-24 21:08:13 UTC (rev 19535) @@ -337,9 +337,11 @@ return Status; } +static NTSTATUS VfatOpenFile ( PDEVICE_EXTENSION DeviceExt, + PUNICODE_STRING PathNameU, PFILE_OBJECT FileObject, PVFATFCB* ParentFcb ) /* @@ -348,10 +350,8 @@ { PVFATFCB Fcb; NTSTATUS Status; - UNICODE_STRING PathNameU; - WCHAR Buffer[260]; - DPRINT ("VfatOpenFile(%08lx, %08lx, '%wZ')\n", DeviceExt, FileObject, &FileObject->FileName); + DPRINT ("VfatOpenFile(%08lx, '%wZ', %08lx, %08lx)\n", DeviceExt, PathNameU, FileObject, ParentFcb); if (FileObject->RelatedFileObject) { @@ -403,21 +403,10 @@ (*ParentFcb)->RefCount++; } - PathNameU.Buffer = Buffer; - PathNameU.Length = 0; - PathNameU.MaximumLength = sizeof(Buffer); - RtlCopyUnicodeString(&PathNameU, &FileObject->FileName); - if (PathNameU.Length > sizeof(WCHAR) && - PathNameU.Buffer[PathNameU.Length / sizeof(WCHAR) - 1] == L'\\') - { - PathNameU.Length -= sizeof(WCHAR); - } - PathNameU.Buffer[PathNameU.Length / sizeof(WCHAR)] = 0; - /* try first to find an existing FCB in memory */ DPRINT ("Checking for existing FCB in memory\n"); - Status = vfatGetFCBForFile (DeviceExt, ParentFcb, &Fcb, &PathNameU); + Status = vfatGetFCBForFile (DeviceExt, ParentFcb, &Fcb, PathNameU); if (!NT_SUCCESS (Status)) { DPRINT ("Could not make a new FCB, status: %x\n", Status); @@ -456,6 +445,7 @@ LARGE_INTEGER AllocationSize; BOOLEAN Dots; UNICODE_STRING FileNameU; + UNICODE_STRING PathNameU; /* Unpack the various parameters. */ Stack = IoGetCurrentIrpStackLocation (Irp); @@ -473,6 +463,12 @@ return(STATUS_INVALID_PARAMETER); } + if (RequestedOptions & FILE_DIRECTORY_FILE && + RequestedOptions & FILE_NON_DIRECTORY_FILE) + { + return(STATUS_INVALID_PARAMETER); + } + /* This a open operation for the volume itself */ if (FileObject->FileName.Length == 0 && FileObject->RelatedFileObject == NULL) @@ -506,12 +502,13 @@ /* * Check for illegal characters and illegale dot sequences in the file name */ - c = FileObject->FileName.Buffer + FileObject->FileName.Length / sizeof(WCHAR); + PathNameU = FileObject->FileName; + c = PathNameU.Buffer + PathNameU.Length / sizeof(WCHAR); last = c - 1; Dots = TRUE; - while (c-- > FileObject->FileName.Buffer) + while (c-- > PathNameU.Buffer) { - if (*c == L'\\' || c == FileObject->FileName.Buffer) + if (*c == L'\\' || c == PathNameU.Buffer) { if (Dots && last > c) { @@ -530,9 +527,22 @@ return(STATUS_OBJECT_NAME_INVALID); } } + if (FileObject->RelatedFileObject && PathNameU.Buffer[0] == L'\\') + { + return(STATUS_OBJECT_NAME_INVALID); + } + if (PathNameU.Length > sizeof(WCHAR) && PathNameU.Buffer[PathNameU.Length/sizeof(WCHAR)-1] == L'\\') + { + if (!(RequestedOptions & FILE_DIRECTORY_FILE)) + { + /* FIXME: Is this the right error message? */ + return(STATUS_OBJECT_NAME_INVALID); + } + PathNameU.Length -= sizeof(WCHAR); + } /* Try opening the file. */ - Status = VfatOpenFile (DeviceExt, FileObject, &ParentFcb); + Status = VfatOpenFile (DeviceExt, &PathNameU, FileObject, &ParentFcb); /* * If the directory containing the file to open doesn't exist then @@ -562,7 +572,7 @@ ULONG Attributes; Attributes = Stack->Parameters.Create.FileAttributes; - vfatSplitPathName(&FileObject->FileName, NULL, &FileNameU); + vfatSplitPathName(&PathNameU, NULL, &FileNameU); Status = VfatAddEntry (DeviceExt, &FileNameU, &pFcb, ParentFcb, RequestedOptions, (UCHAR)(Attributes & FILE_ATTRIBUTE_VALID_FLAGS)); vfatReleaseFCB (DeviceExt, ParentFcb); _____ Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-11-24 18:05:53 UTC (rev 19534) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-11-24 21:08:13 UTC (rev 19535) @@ -478,10 +478,6 @@ NTSTATUS VfatCreate (PVFAT_IRP_CONTEXT IrpContext); -NTSTATUS VfatOpenFile (PDEVICE_EXTENSION DeviceExt, - PFILE_OBJECT FileObject, - PVFATFCB* parentFcb); - NTSTATUS FindFile (PDEVICE_EXTENSION DeviceExt, PVFATFCB Parent, PUNICODE_STRING FileToFindU,

1 0

[gvg] 19534: Fix optimized builds
by gvg＠svn.reactos.com 24 Nov '05

24 Nov '05

Fix optimized builds Modified: trunk/reactos/lib/inflib/inflib.xml _____ Modified: trunk/reactos/lib/inflib/inflib.xml --- trunk/reactos/lib/inflib/inflib.xml 2005-11-24 17:57:15 UTC (rev 19533) +++ trunk/reactos/lib/inflib/inflib.xml 2005-11-24 18:05:53 UTC (rev 19534) @@ -1,5 +1,6 @@ <module name="inflib" type="staticlibrary"> <include base="inflib">.</include> + <define name="__NO_CTYPE_INLINES" /> <pch>inflib.h</pch> <file>infcore.c</file> <file>infget.c</file>

1 0

[chorns] 19533: Store renamed file in the right directory
by chorns＠svn.reactos.com 24 Nov '05

24 Nov '05

Store renamed file in the right directory Modified: trunk/cis/ReactOS.CustomRevisionAction/Main.cs _____ Modified: trunk/cis/ReactOS.CustomRevisionAction/Main.cs --- trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-24 16:33:38 UTC (rev 19532) +++ trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-24 17:57:15 UTC (rev 19533) @@ -189,7 +189,7 @@ revision); string destinationFilename = Path.Combine(Path.GetDirectoryName(sourceFilename), distributionFilename); - File.Move(sourceFilename, distributionFilename); + File.Move(sourceFilename, destinationFilename); string server; string directory; SplitRemotePublishPath(publishPath, out server, out directory);

1 0

[chorns] 19532: Rename ISO before upload
by chorns＠svn.reactos.com 24 Nov '05

24 Nov '05

Rename ISO before upload Modified: trunk/cis/ReactOS.CustomRevisionAction/Main.cs _____ Modified: trunk/cis/ReactOS.CustomRevisionAction/Main.cs --- trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-24 16:23:07 UTC (rev 19531) +++ trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-24 16:33:38 UTC (rev 19532) @@ -185,6 +185,11 @@ string branch, int revision) { + string distributionFilename = GetDistributionFilename(branch, + revision); + string destinationFilename = Path.Combine(Path.GetDirectoryName(sourceFilename), + distributionFilename); + File.Move(sourceFilename, distributionFilename); string server; string directory; SplitRemotePublishPath(publishPath, out server, out directory); @@ -196,7 +201,7 @@ if (!ftpClient.DirectoryExists(branch)) ftpClient.MakeDir(branch); ftpClient.ChangeDir(branch); - ftpClient.Upload(sourceFilename); + ftpClient.Upload(destinationFilename); ftpClient.Close(); }

1 0

[hpoussin] 19531: Patch by Elrond:
by hpoussin＠svn.reactos.com 24 Nov '05

24 Nov '05

Patch by Elrond: - Let NpfsListeningCancelRoutine show the pipe name it is trying to act on. - Add more ASSERT()s to NpfsRead, which seems to act quite strange sometimes Modified: trunk/reactos/drivers/fs/np/fsctrl.c Modified: trunk/reactos/drivers/fs/np/rw.c _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2005-11-24 14:36:47 UTC (rev 19530) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2005-11-24 16:23:07 UTC (rev 19531) @@ -22,10 +22,11 @@ { PNPFS_WAITER_ENTRY Waiter; - DPRINT1("NpfsListeningCancelRoutine() called\n"); - Waiter = (PNPFS_WAITER_ENTRY)&Irp->Tail.Overlay.DriverContext; + DPRINT1("NpfsListeningCancelRoutine() called for <%wZ>\n", + &Waiter->Fcb->Pipe->PipeName); + IoReleaseCancelSpinLock(Irp->CancelIrql); _____ Modified: trunk/reactos/drivers/fs/np/rw.c --- trunk/reactos/drivers/fs/np/rw.c 2005-11-24 14:36:47 UTC (rev 19530) +++ trunk/reactos/drivers/fs/np/rw.c 2005-11-24 16:23:07 UTC (rev 19531) @@ -442,6 +442,7 @@ break; } } + ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); if (Fcb->Pipe->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) { DPRINT("Byte stream mode\n");

1 0

[silverblade] 19530: Partial implementation of WDMAUD.DRV - device capability querying fails
by silverblade＠svn.reactos.com 24 Nov '05

24 Nov '05

Partial implementation of WDMAUD.DRV - device capability querying fails Added: trunk/reactos/lib/wdmaud/ Added: trunk/reactos/lib/wdmaud/TODO Added: trunk/reactos/lib/wdmaud/control.c Added: trunk/reactos/lib/wdmaud/devices.c Added: trunk/reactos/lib/wdmaud/helper.c Added: trunk/reactos/lib/wdmaud/kernel.c Added: trunk/reactos/lib/wdmaud/threads.c Added: trunk/reactos/lib/wdmaud/user.c Added: trunk/reactos/lib/wdmaud/wavehdr.c Added: trunk/reactos/lib/wdmaud/wdmaud.def Added: trunk/reactos/lib/wdmaud/wdmaud.h Added: trunk/reactos/lib/wdmaud/wdmaud.rc Added: trunk/reactos/lib/wdmaud/wdmaud.xml _____ Added: trunk/reactos/lib/wdmaud/TODO --- trunk/reactos/lib/wdmaud/TODO 2005-11-24 14:34:44 UTC (rev 19529) +++ trunk/reactos/lib/wdmaud/TODO 2005-11-24 14:36:47 UTC (rev 19530) @@ -0,0 +1,4 @@ +To-Do: +- Globally store the heap handle +- Ensure cleanups are... clean... +- Clone device info in OPEN/close? _____ Added: trunk/reactos/lib/wdmaud/control.c --- trunk/reactos/lib/wdmaud/control.c 2005-11-24 14:34:44 UTC (rev 19529) +++ trunk/reactos/lib/wdmaud/control.c 2005-11-24 14:36:47 UTC (rev 19530) @@ -0,0 +1,47 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Multimedia + * FILE: lib/wdmaud/wavehdr.c + * PURPOSE: WDM Audio Support - Device Control (Play/Stop etc.) + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Nov 23, 2005: Created + */ + +#include <windows.h> +#include "wdmaud.h" + +/* + TODO: + Make these work for the other device types! +*/ + +MMRESULT StartDevice(PWDMAUD_DEVICE_INFO device) +{ + MMRESULT result; + DWORD ioctl_code; + + result = ValidateDeviceInfoAndState(device); + + if ( result != MMSYSERR_NOERROR ) + return result; + + ioctl_code = device == WDMAUD_WAVE_IN ? IOCTL_WDMAUD_WAVE_IN_START : + device == WDMAUD_WAVE_OUT ? IOCTL_WDMAUD_WAVE_OUT_START : + 0x0000; + + ASSERT( ioctl_code ); +} + +MMRESULT StopDevice(PWDMAUD_DEVICE_INFO device) +{ +} + +MMRESULT PauseDevice(PWDMAUD_DEVICE_INFO device) +{ +} + +MMRESULT StopDeviceLooping(PWDMAUD_DEVICE_INFO device) +{ +} Property changes on: trunk/reactos/lib/wdmaud/control.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/wdmaud/devices.c --- trunk/reactos/lib/wdmaud/devices.c 2005-11-24 14:34:44 UTC (rev 19529) +++ trunk/reactos/lib/wdmaud/devices.c 2005-11-24 14:36:47 UTC (rev 19530) @@ -0,0 +1,697 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Multimedia + * FILE: lib/wdmaud/devices.c + * PURPOSE: WDM Audio Support - Device Management + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Nov 18, 2005: Created + * + * WARNING! SOME OF THESE FUNCTIONS OUGHT TO COPY THE DEVICE INFO STRUCTURE + * THAT HAS BEEN FED TO THEM! +*/ + +#include <windows.h> +#include "wdmaud.h" + +const char WDMAUD_DEVICE_INFO_SIG[4] = "WADI"; +const char WDMAUD_DEVICE_STATE_SIG[4] = "WADS"; + + +BOOL IsValidDevicePath(WCHAR* path) +{ + if (IsBadReadPtr(path, 1)) /* TODO: Replace with flags */ + { + DPRINT1("Bad interface\n"); + return FALSE; + } + + /* Original driver seems to check for strlenW < 0x1000 */ + + return TRUE; +} + +MMRESULT ValidateDeviceInfo(PWDMAUD_DEVICE_INFO device_info) +{ + if ( IsBadWritePtr(device_info, sizeof(WDMAUD_DEVICE_INFO)) ) + return MMSYSERR_INVALPARAM; + + if ( *device_info->signature != *WDMAUD_DEVICE_INFO_SIG ) + return MMSYSERR_INVALPARAM; + + return MMSYSERR_NOERROR; +} + +MMRESULT ValidateDeviceState(PWDMAUD_DEVICE_STATE state) +{ + if ( IsBadWritePtr(state, sizeof(WDMAUD_DEVICE_INFO)) ) + return MMSYSERR_INVALPARAM; + + if ( *state->signature != *WDMAUD_DEVICE_STATE_SIG ) + return MMSYSERR_INVALPARAM; + + return MMSYSERR_NOERROR; +} + +/* + ValidateDeviceStateEvents should be used in conjunction with the standard + state validation routine. +*/ + +MMRESULT ValidateDeviceStateEvents(PWDMAUD_DEVICE_STATE state) +{ + if ( ( (DWORD) state->exit_thread_event == 0x00000000 ) && + ( (DWORD) state->exit_thread_event != 0x48484848 ) ) + { + DPRINT1("Bad exit thread event\n"); + return MMSYSERR_INVALPARAM; + } + + if ( ( (DWORD) state->queue_event == 0x00000000 ) && + ( (DWORD) state->queue_event != 0x42424242 ) && + ( (DWORD) state->queue_event != 0x43434343 ) ) + { + DPRINT1("Bad queue event\n"); + return MMSYSERR_INVALPARAM; + } + + return MMSYSERR_NOERROR; +} + +MMRESULT ValidateDeviceInfoAndState(PWDMAUD_DEVICE_INFO device_info) +{ + MMRESULT result; + + result = ValidateDeviceInfo(device_info); + + if ( result != MMSYSERR_NOERROR ) + return result; + + result = ValidateDeviceState(device_info->state); + + if ( result != MMSYSERR_NOERROR ) + return result; + + return MMSYSERR_NOERROR; +} + +PWDMAUD_DEVICE_INFO CreateDeviceData(CHAR device_type, WCHAR* device_path) +{ + HANDLE heap = 0; + PWDMAUD_DEVICE_INFO device_data = 0; + int path_size = 0; + + if ( ! IsValidDevicePath(device_path) ) + { + DPRINT1("No valid device interface given!\n"); + goto cleanup; + } + + /* Take into account this is a unicode string... */ + path_size = (lstrlen(device_path) + 1) * sizeof(WCHAR); + DPRINT("Size of path is %d\n", (int) path_size); + + heap = GetProcessHeap(); + + if ( ! heap ) + { + DPRINT1("Couldn't get the process heap (error %d)\n", + (int) GetLastError()); + goto cleanup; + } + + DPRINT("Allocating %d bytes\n", + path_size + sizeof(WDMAUD_DEVICE_INFO)); + + device_data = (PWDMAUD_DEVICE_INFO) HeapAlloc(heap, + HEAP_ZERO_MEMORY, + path_size + sizeof(WDMAUD_DEVICE_INFO)); + + if ( ! device_data ) + { + DPRINT1("Unable to allocate memory for device data (error %d)\n", + (int) GetLastError()); + goto cleanup; + } + + DPRINT("Copying signature\n"); + memcpy(device_data->signature, WDMAUD_DEVICE_INFO_SIG, 4); + + DPRINT("Copying path (0x%x)\n", (int)device_path); + lstrcpy(device_data->path, device_path); + + device_data->type = device_type; + + cleanup : + { + /* No cleanup needed (no failures possible after allocation.) */ + DPRINT("Performing cleanup\n"); + + return device_data; + } +} + +PWDMAUD_DEVICE_INFO CloneDeviceData(PWDMAUD_DEVICE_INFO original) +{ + PWDMAUD_DEVICE_INFO clone = NULL; + + if ( ValidateDeviceInfo(original) != MMSYSERR_NOERROR) + { + DPRINT1("Original device data was invalid\n"); + return NULL; + } + + /* This will set the type and path, so we can forget about those */ + clone = CreateDeviceData(original->type, original->path); + + if ( ! clone ) + { + DPRINT1("Clone creation failed\n"); + return NULL; + } + + clone->id = original->id; + clone->wave_handle = original->wave_handle; /* ok? */ + + /* TODO: Maybe we should copy some more? */ + + return clone; +} + +void DeleteDeviceData(PWDMAUD_DEVICE_INFO device_data) +{ + ASSERT( device_data ); + /* TODO */ +} + +MMRESULT ModifyDevicePresence( + CHAR device_type, + WCHAR* device_path, + BOOL adding) +{ + DWORD ioctl = 0; + PWDMAUD_DEVICE_INFO device_data = 0; + MMRESULT result = MMSYSERR_ERROR; + MMRESULT kernel_result = MMSYSERR_ERROR; + + DPRINT("ModifyDevicePresence - %s a device\n", + adding ? "adding" : "removing"); + + DPRINT("Topology path %S\n", device_path); + + /* FIXME: DeviceType! */ + /* TODO: Assert on device type? */ + + ASSERT( IsValidDeviceType(device_type) ); + ASSERT( device_path ); + + device_data = CreateDeviceData(device_type, device_path); + + if ( ! device_data ) + { + DPRINT1("Couldn't allocate memory for device data\n"); + result = MMSYSERR_NOMEM; + goto cleanup; + } + +/* device_data->type = device_type; */ + + ioctl = adding ? IOCTL_WDMAUD_ADD_DEVICE : IOCTL_WDMAUD_REMOVE_DEVICE; + + kernel_result = CallKernelDevice(device_data, + ioctl, + 0, + 0); + + if ( kernel_result != MMSYSERR_NOERROR ) + { + DPRINT1("WdmAudioIoControl FAILED with error %d\n", (int) kernel_result); + + switch ( kernel_result ) + { + /* TODO: Translate into a real error code */ + default : + result = MMSYSERR_ERROR; + } + + goto cleanup; + } + + DPRINT("ModifyDevicePresence succeeded\n"); + + result = MMSYSERR_NOERROR; + + cleanup : + { + if ( device_data ) + DeleteDeviceData(device_data); + + return result; + } +} + +DWORD GetDeviceCount(CHAR device_type, WCHAR* topology_path) +{ + PWDMAUD_DEVICE_INFO device_data; + int device_count = 0; + + DPRINT("Topology path %S\n", topology_path); + + device_data = CreateDeviceData(device_type, topology_path); + + if (! device_data) + { + DPRINT1("Couldn't allocate device data\n"); + goto cleanup; + } + + DPRINT("Getting num devs\n"); + + /*device_data->type = device_type;*/ + device_data->with_critical_section = FALSE; + + if ( CallKernelDevice(device_data, + IOCTL_WDMAUD_GET_DEVICE_COUNT, + 0, + 0) != MMSYSERR_NOERROR ) + { + DPRINT1("Failed\n"); + goto cleanup; + } + + device_count = device_data->id; + + DPRINT("There are %d devs\n", device_count); + + cleanup : + { + if ( device_data ) + DeleteDeviceData(device_data); + + return device_count; + } +} + +/* + This is a bit messed up +*/ + +MMRESULT GetDeviceCapabilities( + CHAR device_type, + DWORD device_id, + WCHAR* device_path, + LPCOMMONCAPS caps +) +{ + PWDMAUD_DEVICE_INFO device = NULL; + MMRESULT result = MMSYSERR_ERROR; + + DPRINT("Device path %S\n", device_path); + + /* Hmm - caps->wMid seems to be 0x54 (84) from XP's winmm.dll */ + if (caps->wMid == 0) + { + return MMSYSERR_NOERROR; + + DPRINT("caps->wMid == 0\n"); + + DPRINT("Manufacturer: 0x%x (%d)\n", caps->wMid, caps->wMid); + DPRINT("Product: 0x%x (%d)\n", caps->wPid, caps->wPid); + DPRINT("Device is: %S\n", caps->szPname); + + if ( IsWaveOutDeviceType(device_type) ) + { + LPWAVEOUTCAPS woc = (LPWAVEOUTCAPS) caps; + DPRINT("Formats: %d\n", (int) woc->dwFormats); + DPRINT("Channels: %d\n", woc->wChannels); + DPRINT("Reserved: %d\n", woc->wReserved1); + DPRINT("Support: %d\n", (int) woc->dwSupport); + } + + return MMSYSERR_NOERROR; + } + +#if 0 + int i; + for (i = 0; i < 64; i ++) + { + DPRINT("0x%x\n", *(((UCHAR*)caps) + i)); + } + + return MMSYSERR_NOERROR; +#endif + + DPRINT("Going to have to query the kernel-mode part\n"); + + device = CreateDeviceData(device_type, device_path); + + if ( ! device ) + { + DPRINT("Unable to allocate device data memory\n"); + result = MMSYSERR_NOMEM; + goto cleanup; + } + + device->id = device_id; + device->with_critical_section = FALSE; + + /* ? */ + DPRINT("Caps wMid is 0x%x\n", (int) caps->wMid); + DPRINT("Driver version is 0x%x\n", (int) caps->vDriverVersion); + + DPRINT("%S\n", (WCHAR*) caps->vDriverVersion); + + LPWORD theword; + theword = (LPWORD) caps->vDriverVersion; + *theword = 0x43; + //caps->vDriverVersion=0x4300; + + + DPRINT("Calling kernel device\n"); + result = CallKernelDevice(device, + IOCTL_WDMAUD_GET_CAPABILITIES, + (DWORD)caps->wMid, + (DWORD)caps->vDriverVersion); + + if ( result != MMSYSERR_NOERROR ) + { + DPRINT("IoControl failed\n"); + goto cleanup; + } + + + + /* What do we return? */ + /*return MMSYSERR_NOERROR; */ /* already set by now */ + + cleanup : + { + if ( device ) + DeleteDeviceData(device); + + return result; + } +} + +MMRESULT TryOpenDevice( + PWDMAUD_DEVICE_INFO device, + LPWAVEFORMATEX format +) +{ + if ( device->id > 0x64 ) /* FIXME */ + { + DPRINT1("device->id > 0x64 ! ???\n"); + return MMSYSERR_BADDEVICEID; /* OK? */ + } + + /* We'll only have a format set for wave devices */ + if ( format ) + { + if ( format->wFormatTag == 1 ) + { + DWORD sample_size; + + DPRINT("Standard (PCM) format\n"); + sample_size = format->nChannels * format->wBitsPerSample; + device->state->sample_size = sample_size; + + if ( CallKernelDevice(device, + IOCTL_WDMAUD_OPEN_DEVICE, + 0x10, + (DWORD)format) + != MMSYSERR_NOERROR ) + { + DPRINT("Call failed\n"); + /* FIXME */ + return MMSYSERR_NOTSUPPORTED; /* WAVERR_BADFORMAT? */ + } + } + else + { + /* FIXME */ + DPRINT("Non-PCM format\n"); + return MMSYSERR_NOTSUPPORTED; + } + } + + /* If we got this far without error, the format is supported! */ + return MMSYSERR_NOERROR; +} + +MMRESULT OpenWaveDevice( + CHAR device_type, + DWORD device_id, + LPWAVEOPENDESC open_details, + DWORD flags, + DWORD user_data +) +{ + HANDLE heap = 0; + PWDMAUD_DEVICE_INFO device = NULL; + WCHAR* device_path = NULL; + MMRESULT result = MMSYSERR_ERROR; + + /* ASSERT(open_details); */ + + heap = GetProcessHeap(); + + if ( ! heap ) + { + DPRINT1("Couldn't get the process heap (error %d)\n", + (int) GetLastError()); + result = MMSYSERR_ERROR; + goto cleanup; + } + + DPRINT("OpenDevice called\n"); + + device_path = (WCHAR*) open_details->dnDevNode; + device = CreateDeviceData(device_type, device_path); + + if ( ! device ) + { + DPRINT1("Couldn't create device data\n"); + result = MMSYSERR_NOMEM; + goto cleanup; + } + + DPRINT("Allocated device data, allocating device state\n"); + + device->state = HeapAlloc(heap, + HEAP_ZERO_MEMORY, + sizeof(WDMAUD_DEVICE_STATE)); + + if ( ! device->state ) + { + DPRINT1("Couldn't allocate memory for device state (error %d)\n", + (int) GetLastError()); + result = MMSYSERR_NOMEM; + goto cleanup; + } + + /* FIXME: ok here ? */ + device->type = device_type; + device->id = device_id; + device->flags = flags; + + if ( flags & WAVE_FORMAT_QUERY ) + { + DPRINT("Do I support this format? Hmm...\n"); + + result = TryOpenDevice(device, open_details->lpFormat); + + if ( result != MMSYSERR_NOERROR ) + { + DPRINT("Format not supported\n"); + goto cleanup; + } + + DPRINT("Yes, I do support this format!\n"); + } + else + { + + DPRINT("You actually want me to open the device, huh?\n"); + + /* Allocate memory for the "queue" critical section */ + + device->state->queue_critical_section = + HeapAlloc(heap, HEAP_ZERO_MEMORY, sizeof(CRITICAL_SECTION)); + + if ( ! device->state->queue_critical_section ) + { + DPRINT1("Couldn't allocate memory for queue critical section (error %d)\n", + (int) GetLastError()); + result = MMSYSERR_NOMEM; + goto cleanup; + } + + /* Initialize the critical section */ + InitializeCriticalSection(device->state->queue_critical_section); + + /* We need these so we can contact the client later */ + device->client_instance = open_details->dwInstance; + device->client_callback = open_details->dwCallback; + + /* Reset state */ + device->state->open_descriptor = NULL; + device->state->unknown_24 = 0; + + device->state->is_running = FALSE; + device->state->is_paused = + device->type == WDMAUD_WAVE_IN ? TRUE : FALSE; + + memcpy(device->state->signature, WDMAUD_DEVICE_STATE_SIG, 4); + + DPRINT("All systems are go...\n"); + + result = TryOpenDevice(device, open_details->lpFormat); + + if ( result != MMSYSERR_NOERROR ) + { + DPRINT1("Format not supported?\n"); + goto cleanup; /* no need to set result - already done */ + } + + /* Enter the critical section while updating the device list */ + EnterCriticalSection(device->state->queue_critical_section); + /* ... */ + LeaveCriticalSection(device->state->queue_critical_section); + + /* The wave device handle is actually our structure. Neat, eh? */ + open_details->hWave = (HWAVE) device; + + /* We also need to set our "user data" for winmm */ + LPVOID* ud = (LPVOID*) user_data; /* FIXME */ + *ud = device; + + if (device->client_callback) + { + DWORD message; + + message = (device->type == WDMAUD_WAVE_IN ? WIM_OPEN : + WDMAUD_WAVE_OUT ? WOM_OPEN : -1); + + DPRINT("About to call the client callback\n"); + + /* Call the callback */ + NotifyClient(device, message, 0, 0); + + DPRINT("...it is done!\n"); + } + + result = MMSYSERR_NOERROR; + } + + /* + This cleanup may need checking for memory leakage :/ + */ + + cleanup : + { + if ( ( result != MMSYSERR_NOERROR ) && ( heap ) ) + { + if ( device ) + { + if ( device->state ) + { + if ( device->state->queue_critical_section ) + { + DeleteCriticalSection(device->state->queue_critical_section); + HeapFree(heap, 0, device->state->queue_critical_section); + } + + HeapFree(heap, 0, device->state); + } + + DeleteDeviceData(device); + } + } + + DPRINT("Returning %d\n", (int) result); + + return result; + } +} + +MMRESULT CloseDevice( + PWDMAUD_DEVICE_INFO device +) +{ + MMRESULT result = MMSYSERR_ERROR; + + DPRINT("CloseDevice()\n"); + + DUMP_WDMAUD_DEVICE_INFO(device); + + if ( ValidateDeviceInfo(device) != MMSYSERR_NOERROR ) + { + DPRINT1("Invalid device info passed to CloseDevice\n"); + result = MMSYSERR_INVALHANDLE; + goto cleanup; + } + + /* TODO: Check state! */ + + if ( device->id > 0x64 ) /* FIXME ? */ + { + DPRINT1("??\n"); + goto cleanup; + } + + switch(device->type) + { + case WDMAUD_WAVE_OUT : + { + if ( device->state->open_descriptor ) + { + DPRINT1("Device is still playing!\n"); + result = WAVERR_STILLPLAYING; + goto cleanup; + } + + /* TODO: Destroy completion thread */ + + break; + } + + default : + { + DPRINT1("Sorry, device type %d not supported yet!\n", (int) device->type); + goto cleanup; + } + } + + result = CallKernelDevice(device, IOCTL_WDMAUD_CLOSE_DEVICE, 0, 0); + + if ( result != MMSYSERR_NOERROR ) + { + DPRINT1("Couldn't close the device!\n"); + goto cleanup; + } + + if (device->client_callback) + { + DWORD message; + + message = (device->type == WDMAUD_WAVE_IN ? WIM_CLOSE : + WDMAUD_WAVE_OUT ? WOM_CLOSE : + WDMAUD_MIDI_IN ? MIM_CLOSE : + WDMAUD_MIDI_OUT ? MOM_CLOSE : -1); + + DPRINT("About to call the client callback\n"); + + /* Call the callback */ + NotifyClient(device, message, 0, 0); + + DPRINT("...it is done!\n"); + } + + /* Result was set earlier by CallKernelDevice */ + + cleanup : + { + return result; + } +} Property changes on: trunk/reactos/lib/wdmaud/devices.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/wdmaud/helper.c --- trunk/reactos/lib/wdmaud/helper.c 2005-11-24 14:34:44 UTC (rev 19529) +++ trunk/reactos/lib/wdmaud/helper.c 2005-11-24 14:36:47 UTC (rev 19530) @@ -0,0 +1,46 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Multimedia + * FILE: lib/wdmaud/helper.c + * PURPOSE: Multimedia User Mode Driver - Helper Funcs + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Nov 13, 2005: Created + */ + +#include <windows.h> +#include <mmsystem.h> + +/* + TranslateWinError converts Win32 error codes (returned by + GetLastError, typically) into MMSYSERR codes. +*/ + +MMRESULT TranslateWinError(DWORD error) +{ + switch(error) + { + case NO_ERROR : + case ERROR_IO_PENDING : + return MMSYSERR_NOERROR; + + case ERROR_BUSY : + return MMSYSERR_ALLOCATED; + + case ERROR_NOT_SUPPORTED : + case ERROR_INVALID_FUNCTION : + return MMSYSERR_NOTSUPPORTED; + + case ERROR_NOT_ENOUGH_MEMORY : + return MMSYSERR_NOMEM; + + case ERROR_ACCESS_DENIED : + return MMSYSERR_BADDEVICEID; + + case ERROR_INSUFFICIENT_BUFFER : + return MMSYSERR_INVALPARAM; + } + + return MMSYSERR_ERROR; +} Property changes on: trunk/reactos/lib/wdmaud/helper.c ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + native _____ Added: trunk/reactos/lib/wdmaud/kernel.c --- trunk/reactos/lib/wdmaud/kernel.c 2005-11-24 14:34:44 UTC (rev 19529) +++ trunk/reactos/lib/wdmaud/kernel.c 2005-11-24 14:36:47 UTC (rev 19530) @@ -0,0 +1,358 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Multimedia + * FILE: lib/wdmaud/kernel.c + * PURPOSE: WDM Audio Support - Kernel Mode Interface + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Nov 18, 2005: Created + */ + +#define INITGUID /* FIXME */ + +#include <windows.h> +#include <setupapi.h> +#include "wdmaud.h" + +/* HACK ALERT - This goes in ksmedia.h */ +DEFINE_GUID(KSCATEGORY_WDMAUD, + 0x3e227e76L, 0x690d, 0x11d2, 0x81, 0x61, 0x00, 0x00, 0xf8, 0x77, 0x5b, 0xf1); + +/* This stores the handle of the kernel device */ +static HANDLE kernel_device_handle = NULL; + +//static WCHAR* + + +/* + TODO: There's a variant of this that uses critical sections... +*/ + +MMRESULT CallKernelDevice( + PWDMAUD_DEVICE_INFO device, + DWORD ioctl_code, + DWORD param1, + DWORD param2) +{ + OVERLAPPED overlap; + MMRESULT result = MMSYSERR_ERROR; + DWORD name_len = 0; + DWORD bytes_returned = 0; + BOOL using_critical_section = FALSE; + + ASSERT(kernel_device_handle); + ASSERT(device); + + DPRINT("Creating event\n"); + overlap.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + + if ( ! overlap.hEvent ) + { + DPRINT1("CreateEvent failed - error %d\n", (int)GetLastError()); + result = MMSYSERR_NOMEM; + goto cleanup; + } + + DPRINT("Sizeof wchar == %d\n", (int) sizeof(WCHAR)); + name_len = lstrlen(device->path) * sizeof(WCHAR); /* ok ? */ + + /* These seem to carry optional structures */ + device->ioctl_param1 = param1; + device->ioctl_param2 = param2; + + /* Enter critical section if wave/midi device, and if required */ + if ( ( ! IsMixerDeviceType(device->type) ) && + ( ! IsAuxDeviceType(device->type) ) && + ( device->with_critical_section ) ) + { + /* this seems to crash under some conditions */ + ASSERT(device->state); + using_critical_section = TRUE; + EnterCriticalSection(device->state->queue_critical_section); + } + + DPRINT("Calling DeviceIoControl with IOCTL %x\n", (int) ioctl_code); + + if ( ! DeviceIoControl(kernel_device_handle, + ioctl_code, + device, + name_len + sizeof(WDMAUD_DEVICE_INFO), + device, + sizeof(WDMAUD_DEVICE_INFO), + &bytes_returned, + &overlap) ) + { + DWORD error = GetLastError(); + + if (error != ERROR_IO_PENDING) + { + DPRINT1("FAILED in CallKernelDevice (error %d)\n", (int) error); + + DUMP_WDMAUD_DEVICE_INFO(device); + + result = TranslateWinError(error); + goto cleanup; + } + + DPRINT("Waiting for overlap I/O event\n"); + + /* Wait for the IO to be complete */ + WaitForSingleObject(overlap.hEvent, INFINITE); + } + + result = MMSYSERR_NOERROR; + DPRINT("CallKernelDevice succeeded :)\n"); + + DUMP_WDMAUD_DEVICE_INFO(device); + + cleanup : + { + /* Leave the critical section */ + if ( using_critical_section ) + LeaveCriticalSection(device->state->queue_critical_section); + + if ( overlap.hEvent ) + CloseHandle(overlap.hEvent); + + return result; + } +} + + +static BOOL ChangeKernelDeviceState(BOOL enable) +{ + PWDMAUD_DEVICE_INFO device = NULL; + DWORD ioctl_code; + MMRESULT call_result; + + ioctl_code = enable ? IOCTL_WDMAUD_HELLO : IOCTL_WDMAUD_GOODBYE; + + device = CreateDeviceData(WDMAUD_AUX, L""); + + if ( ! device ) + { + DPRINT1("Couldn't create a new device instance structure\n"); + return FALSE; + } + + DPRINT("Setting device type and disabling critical section\n"); + + device->type = WDMAUD_AUX; + device->with_critical_section = FALSE; + + DPRINT("Calling kernel device\n"); + + call_result = CallKernelDevice(device, ioctl_code, 0, 0); + + DeleteDeviceData(device); + + if ( call_result != MMSYSERR_NOERROR ) + { + DPRINT1("Kernel device doesn't like us! (error %d)\n", (int) GetLastError()); + return FALSE; + } + else + { + return TRUE; + } +} + + +BOOL EnableKernelInterface() +{ + /* SetupAPI variables/structures for querying device data */ + SP_DEVICE_INTERFACE_DATA interface_data; + PSP_DEVICE_INTERFACE_DETAIL_DATA detail = NULL; + DWORD detail_size = 0; [truncated at 1000 lines; 2036 more skipped]

1 0

[hpoussin] 19529: Display the unknown class name in error message
by hpoussin＠svn.reactos.com 24 Nov '05

24 Nov '05

Display the unknown class name in error message Modified: trunk/reactos/subsys/win32k/ntuser/class.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-11-24 14:34:41 UTC (rev 19528) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-11-24 14:34:44 UTC (rev 19529) @@ -124,7 +124,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to lookup class atom!\n"); + DPRINT1("Failed to lookup class atom (ClassName '%S')!\n", ClassName); return FALSE; }

1 0

[silverblade] 19528: Fixing EOL...
by silverblade＠svn.reactos.com 24 Nov '05

24 Nov '05

Fixing EOL... Property changes on: trunk/reactos/drivers/multimedia/README ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/directory.xml ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/ks/avstream.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/ks/connect.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/ks/ks.def ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/ks/ks.xml ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/ks/stubs.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/ks.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/wdmaud/entry.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/multimedia/wdmaud/wdmaud.xml ___________________________________________________________________ Name: svn:eol-style + native

1 0

[chorns] 19527: Check for presence of directory
by chorns＠svn.reactos.com 24 Nov '05

24 Nov '05

Check for presence of directory Modified: trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs Modified: trunk/cis/ReactOS.CustomRevisionAction/Main.cs _____ Modified: trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs --- trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs 2005-11-24 13:33:37 UTC (rev 19526) +++ trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs 2005-11-24 13:57:25 UTC (rev 19527) @@ -354,7 +354,21 @@ return msg; } - + + public bool DirectoryExists(string directory) + { + try + { + ChangeDir(directory); + ChangeDir(".."); + return true; + } + catch (FtpException) + { + return false; + } + } + /// <summary> /// Return the size of a file. /// </summary> _____ Modified: trunk/cis/ReactOS.CustomRevisionAction/Main.cs --- trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-24 13:33:37 UTC (rev 19526) +++ trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-24 13:57:25 UTC (rev 19527) @@ -193,7 +193,7 @@ if (directory != "") ftpClient.ChangeDir(directory); /* Create destination directory if it does not already exist */ - if (ftpClient.GetFileList(branch).Length < 1) + if (!ftpClient.DirectoryExists(branch)) ftpClient.MakeDir(branch); ftpClient.ChangeDir(branch); ftpClient.Upload(sourceFilename);

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