Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 66711: [PSDK] Add missing _Enum_is_bitflag_ and _Strict_type_match_ annotations. remove a wrong annotation
by tkreuzer＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: tkreuzer Date: Sat Mar 14 18:12:50 2015 New Revision: 66711 URL: http://svn.reactos.org/svn/reactos?rev=66711&view=rev Log: [PSDK] Add missing _Enum_is_bitflag_ and _Strict_type_match_ annotations. remove a wrong annotation Modified: trunk/reactos/include/ndk/no_sal2.h trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/ndk/no_sal2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/no_sal2.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/no_sal2.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/no_sal2.h [iso-8859-1] Sat Mar 14 18:12:50 2015 @@ -183,6 +183,7 @@ #define _Deref_ret_range_(lb,ub) #define _Deref_ret_z_ #define _Deref2_pre_readonly_ +#define _Enum_is_bitflag_ #define _Field_range_(min,max) #define _Field_size_(size) #define _Field_size_bytes_(size) @@ -308,7 +309,7 @@ #define _Literal_ #define _Maybenull_ #define _Maybevalid_ -#define _Maybe_raises_SEH_exception +#define _Maybe_raises_SEH_exception_ #define _Must_inspect_result_ #define _Notliteral_ #define _Notnull_ @@ -566,7 +567,6 @@ #define _Prepost_z_ #define _Printf_format_string_ #define _Raises_SEH_exception_ -#define _Maybe_raises_SEH_exception_ #define _Readable_bytes_(size) #define _Readable_elements_(size) #define _Reserved_ @@ -629,6 +629,7 @@ #define _Return_type_success_(expr) #define _Scanf_format_string_ #define _Scanf_s_format_string_ +#define _Strict_type_match_ #define _Struct_size_bytes_(size) #define _Success_(expr) #define _Unchanged_(e) Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=667… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Sat Mar 14 18:12:50 2015 @@ -599,6 +599,7 @@ //#define _Deref_ret_range_(lb,ub) //#define _Deref_ret_z_ //#define _Deref2_pre_readonly_ +//#define _Enum_is_bitflag_ #define _Field_range_(min,max) _SAL2_NAME(_Field_range_) _Group_(_SA_annotes2(SAL_range,min,max)) #define _Field_size_(size) _SAL2_NAME(_Field_size_) _Group_(_Notnull_ _Writable_elements_(size)) #define _Field_size_opt_(size) _SAL2_NAME(_Field_size_opt_) _Group_(_Maybenull_ _Writable_elements_(size)) @@ -723,7 +724,7 @@ #define _Literal_ _SAL2_NAME(_Literal_) _Group_([SAL_pre] [SAL_annotes(Name="SAL_constant", p1="__yes")]) #define _Maybenull_ [SAL_annotes(Name="SAL_null", p1="__maybe")] #define _Maybevalid_ [SAL_annotes(Name="SAL_valid", p1="__maybe")] -//#define _Maybe_raises_SEH_exception +#define _Maybe_raises_SEH_exception_ _SAL2_NAME(_Maybe_raises_SEH_exception_) _Group_(_Pre_ [SAL_annotes(Name="SAL_inTry", p1="__yes")]) #define _Must_inspect_result_ _SAL2_NAME(_Must_inspect_result_) _Group_(_Post_ [SAL_annotes(Name="SAL_mustInspect")] [SA_Post(MustCheck=SA_Yes)]) #define _Notliteral_ _SAL2_NAME(_Notliteral_) _Group_([SAL_pre] [SAL_annotes(Name="SAL_constant", p1="__no")] ) #define _Notnull_ [SAL_annotes(Name="SAL_null", p1="__no")] @@ -979,7 +980,6 @@ #define _Prepost_z_ _SAL2_NAME(_Prepost_z_) _Group_(_Pre_z_ _Post_z_) #define _Printf_format_string_ _SAL2_NAME(_Printf_format_string_) _Group_([SA_FormatString(Style="printf")] ) //#define _Raises_SEH_exception_ -#define _Maybe_raises_SEH_exception_ _SAL2_NAME(_Maybe_raises_SEH_exception_) _Group_(_Pre_ [SAL_annotes(Name="SAL_inTry", p1="__yes")]) #define _Readable_bytes_(size) _SAL2_NAME(_Readable_bytes_) _Group_(_SA_annotes1(SAL_readableTo, byteCount(size))) #define _Readable_elements_(size) _SAL2_NAME(_Readable_elements_) _Group_([SAL_annotes(Name="SAL_readableTo", p1="elementCount(size)")]) #define _Reserved_ _SAL2_NAME(_Reserved_) _Group_([SA_Pre(Null=SA_Yes)]) @@ -1043,6 +1043,7 @@ #define _Return_type_success_(expr) _SAL2_NAME(_Return_type_success_) _Group_([SA_Success(Condition=_SA_SPECSTRIZE(expr))]) #define _Scanf_format_string_ _SAL2_NAME(_Scanf_format_string_) _Group_([SA_FormatString(Style="scanf")]) #define _Scanf_s_format_string_ _SAL2_NAME(_Scanf_s_format_string_) _Group_([SA_FormatString(Style="scanf_s")]) +#define _Strict_type_match_ _SAL2_NAME(_Strict_type_match_) _Group_([SAL_annotes(Name="SAL_strictType2")]) #define _Struct_size_bytes_(size) _SAL2_NAME(_Struct_size_bytes_) _Group_(_Writable_bytes_(byteCount(size))) #define _Success_(expr) _SAL2_NAME(_Success_) _Group_([SA_Success(Condition=_SA_SPECSTRIZE(expr))]) #define _Unchanged_(expr) _SAL2_NAME(_Unchanged_) _Group_([SAL_at(p1=_SA_SPECSTRIZE(expr))] _Group_(_Post_equal_to_(expr) _Const_)) @@ -1402,7 +1403,7 @@ #define _Literal_ #define _Maybenull_ #define _Maybevalid_ -#define _Maybe_raises_SEH_exception +#define _Maybe_raises_SEH_exception_ #define _Must_inspect_result_ #define _Notliteral_ #define _Notnull_ @@ -1660,7 +1661,6 @@ #define _Prepost_z_ #define _Printf_format_string_ #define _Raises_SEH_exception_ -#define _Maybe_raises_SEH_exception_ #define _Readable_bytes_(size) #define _Readable_elements_(size) #define _Reserved_ @@ -1724,6 +1724,7 @@ #define _Return_type_success_(expr) #define _Scanf_format_string_ #define _Scanf_s_format_string_ +#define _Strict_type_match_ #define _Struct_size_bytes_(size) #define _Success_(expr) #define _Unchanged_(e)

1 0

[janderwald] 66710: - fix build
by janderwald＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: janderwald Date: Sat Mar 14 17:53:52 2015 New Revision: 66710 URL: http://svn.reactos.org/svn/reactos?rev=66710&view=rev Log: - fix build Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c 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] Sat Mar 14 17:53:52 2015 @@ -74,7 +74,6 @@ IN PVOID Context) { PWDMAUD_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status; /* get device extension */ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -92,8 +91,6 @@ IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) { - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\wdmaud"); - UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\DosDevices\\wdmaud"); PDEVICE_OBJECT DeviceObject; NTSTATUS Status; PWDMAUD_DEVICE_EXTENSION DeviceExtension;

1 0

[janderwald] 66709: [WDMAUD] - convert wdmaud to a software pnp device - register device interface [WDMAUD.DRV] - open wdmaud via device interface
by janderwald＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: janderwald Date: Sat Mar 14 17:50:30 2015 New Revision: 66709 URL: http://svn.reactos.org/svn/reactos?rev=66709&view=rev Log: [WDMAUD] - convert wdmaud to a software pnp device - register device interface [WDMAUD.DRV] - open wdmaud via device interface Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h trunk/reactos/drivers/ksfilter/ks/misc.c 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/sup.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h trunk/reactos/media/inf/wdmaudio.inf Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/legac… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] Sat Mar 14 17:50:30 2015 @@ -255,25 +255,64 @@ IN PSOUND_DEVICE SoundDevice, OUT PVOID *Handle) { - /* Only open this if it's not already open */ + HDEVINFO hDevInfo; + SP_DEVICE_INTERFACE_DATA DeviceInterfaceData; + GUID SWBusGuid = {STATIC_KSCATEGORY_WDMAUD}; + PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData; + if ( KernelHandle == INVALID_HANDLE_VALUE ) { - SND_TRACE(L"Opening wdmaud device\n"); - KernelHandle = CreateFileW(KERNEL_DEVICE_NAME, - GENERIC_READ | GENERIC_WRITE, - 0, - NULL, - OPEN_EXISTING, - FILE_FLAG_OVERLAPPED, - NULL); - } + hDevInfo = SetupDiGetClassDevsW(&SWBusGuid, NULL, NULL, DIGCF_DEVICEINTERFACE| DIGCF_PRESENT); + if (!hDevInfo) + { + // failed + return MMSYSERR_ERROR; + } + + DeviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); + if (!SetupDiEnumDeviceInterfaces(hDevInfo, NULL, &SWBusGuid, 0, &DeviceInterfaceData)) + { + // failed + SetupDiDestroyDeviceInfoList(hDevInfo); + return MMSYSERR_ERROR; + } + + DeviceInterfaceDetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA_W)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) + sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W)); + if (!DeviceInterfaceDetailData) + { + // failed + SetupDiDestroyDeviceInfoList(hDevInfo); + return MMSYSERR_ERROR; + } + + DeviceInterfaceDetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + if (!SetupDiGetDeviceInterfaceDetailW(hDevInfo, &DeviceInterfaceData, DeviceInterfaceDetailData,MAX_PATH * sizeof(WCHAR) + sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W), NULL, NULL)) + { + // failed + HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData); + SetupDiDestroyDeviceInfoList(hDevInfo); + return MMSYSERR_ERROR; + } + SND_TRACE(L"Opening wdmaud device '%s'\n",DeviceInterfaceDetailData->DevicePath); + KernelHandle = CreateFileW(DeviceInterfaceDetailData->DevicePath, + GENERIC_READ | GENERIC_WRITE, + 0, + NULL, + OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, + NULL); + + HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData); + SetupDiDestroyDeviceInfoList(hDevInfo); + } + if ( KernelHandle == INVALID_HANDLE_VALUE ) return MMSYSERR_ERROR; ++ OpenCount; - - return MMSYSERR_NOERROR; + return MMSYSERR_NOERROR; + } MMRESULT Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] Sat Mar 14 17:50:30 2015 @@ -8,12 +8,16 @@ #define COM_NO_WINDOWS_H #include <windef.h> +#include <winbase.h> +#include <winreg.h> + #include <winuser.h> #include <mmddk.h> #include <mmebuddy.h> #include <ksmedia.h> #include <interface.h> #include <devioctl.h> +#include <setupapi.h> BOOL WdmAudInitUserModeMixer(VOID); Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Sat Mar 14 17:50:30 2015 @@ -11,6 +11,8 @@ #define NDEBUG #include <debug.h> +#define TAG_KS 'ssKK' + VOID CompleteRequest( PIRP Irp, @@ -29,7 +31,7 @@ IN POOL_TYPE PoolType, IN SIZE_T NumberOfBytes) { - PVOID Item = ExAllocatePool(PoolType, NumberOfBytes); + PVOID Item = ExAllocatePoolWithTag(PoolType, NumberOfBytes, TAG_KS); if (!Item) return Item; 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] Sat Mar 14 17:50:30 2015 @@ -49,9 +49,6 @@ { ULONG Result = 0; NTSTATUS Status = STATUS_SUCCESS; - //PWDMAUD_DEVICE_EXTENSION DeviceExtension; - - //DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; if (DeviceInfo->DeviceType == MIXER_DEVICE_TYPE) { @@ -231,13 +228,9 @@ IN PIRP Irp, IN PWDMAUD_DEVICE_INFO DeviceInfo) { - //PWDMAUD_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; LPWSTR Device; ULONG Size, Length; - - /* get device extension */ - //DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* get device interface string input length */ Size = DeviceInfo->u.Interface.DeviceInterfaceStringSize; @@ -420,19 +413,11 @@ /* grab next mdl */ Mdl = NextMdl; } - + //IoFreeMdl(Mdl); /* clear mdl list */ - Irp->MdlAddress = NULL; - - /* check if mdl is locked */ - if (Context->Mdl->MdlFlags & MDL_PAGES_LOCKED) - { - /* unlock pages */ - MmUnlockPages(Context->Mdl); - } - - /* now free the mdl */ - IoFreeMdl(Context->Mdl); + Irp->MdlAddress = Context->Mdl; + + DPRINT("IoCompletion Irp %p IoStatus %lx Information %lx Length %lu\n", Irp, Irp->IoStatus.Status, Irp->IoStatus.Information, Length); @@ -441,6 +426,9 @@ /* failed */ Irp->IoStatus.Information = 0; } + + /* dereference file object */ + ObDereferenceObject(Context->FileObject); /* free context */ FreeItem(Context); @@ -502,8 +490,6 @@ /* remove mdladdress as KsProbeStreamIrp will interprete it as an already probed audio buffer */ Irp->MdlAddress = NULL; - /* check for success */ - if (IoStack->MajorFunction == IRP_MJ_WRITE) { /* probe the write stream irp */ @@ -520,6 +506,7 @@ { DPRINT1("KsProbeStreamIrp failed with Status %x Cancel %u\n", Status, Irp->Cancel); Irp->MdlAddress = Mdl; + FreeItem(Context); return SetIrpIoStatus(Irp, Status, 0); } @@ -532,8 +519,13 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Invalid pin handle %p\n", DeviceInfo->hDevice); + Irp->MdlAddress = Mdl; + FreeItem(Context); return SetIrpIoStatus(Irp, Status, 0); } + + /* store file object whose reference is released in the completion callback */ + Context->FileObject = FileObject; /* skip current irp stack location */ IoSkipCurrentIrpStackLocation(Irp); @@ -541,30 +533,16 @@ /* get next stack location */ IoStack = IoGetNextIrpStackLocation(Irp); - if (Read) - { - IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_KS_READ_STREAM; - } - else - { - IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_KS_WRITE_STREAM; - } - - /* attach file object */ + /* prepare stack location */ IoStack->FileObject = FileObject; IoStack->Parameters.Write.Length = Length; IoStack->MajorFunction = IRP_MJ_WRITE; - + IoStack->Parameters.DeviceIoControl.IoControlCode = (Read ? IOCTL_KS_READ_STREAM : IOCTL_KS_WRITE_STREAM); IoSetCompletionRoutine(Irp, IoCompletion, (PVOID)Context, TRUE, TRUE, TRUE); - /* mark irp as pending */ // IoMarkIrpPending(Irp); /* call the driver */ Status = IoCallDriver(IoGetRelatedDeviceObject(FileObject), Irp); - - /* dereference file object */ - ObDereferenceObject(FileObject); - return Status; } 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] Sat Mar 14 17:50:30 2015 @@ -153,16 +153,18 @@ return Status; } - InsertTailList(&DeviceExtension->SysAudioDeviceList, &Entry->Entry); - DeviceExtension->NumSysAudioDevices++; - DPRINT("Opening device %S\n", Entry->SymbolicLink.Buffer); Status = WdmAudOpenSysAudioDevice(Entry->SymbolicLink.Buffer, &hSysAudio); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to open sysaudio %x\n", Status); + FreeItem(Entry->SymbolicLink.Buffer); + FreeItem(Entry); return Status; } + + InsertTailList(&DeviceExtension->SysAudioDeviceList, &Entry->Entry); + DeviceExtension->NumSysAudioDevices++; /* get the file object */ Status = ObReferenceObjectByHandle(hSysAudio, FILE_READ_DATA | FILE_WRITE_DATA, *IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); @@ -186,8 +188,6 @@ IN PWDMAUD_DEVICE_EXTENSION DeviceExtension) { NTSTATUS Status; - UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\DosDevices\\wdmaud"); - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\wdmaud"); UNICODE_STRING SymbolicLinkName; Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &KSCATEGORY_WDMAUD, NULL, &SymbolicLinkName); @@ -195,20 +195,7 @@ { IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); RtlFreeUnicodeString(&SymbolicLinkName); - DeviceExtension->DeviceInterfaceSupport = TRUE; - return Status; - } - - /* failed to register device interface - * create a symbolic link instead - */ - DeviceExtension->DeviceInterfaceSupport = FALSE; - - Status = IoCreateSymbolicLink(&SymlinkName, &DeviceName); - if (!NT_SUCCESS(Status)) - { - IoDeleteDevice(PhysicalDeviceObject); //FIXME - DPRINT("Failed to create wdmaud symlink!\n"); + //DeviceExtension->DeviceInterfaceSupport = TRUE; return Status; } 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] Sat Mar 14 17:50:30 2015 @@ -31,6 +31,19 @@ /* get device extension */ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (DeviceExtension->FileObject == NULL) + { + /* find available sysaudio devices */ + Status = WdmAudOpenSysAudioDevices(DeviceObject, DeviceExtension); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WdmAudOpenSysAudioDevices failed with %x\n", Status); + return; + } + } + + /* get device count */ DeviceCount = GetSysAudioDeviceCount(DeviceObject); @@ -61,6 +74,7 @@ IN PVOID Context) { PWDMAUD_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; /* get device extension */ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -74,8 +88,9 @@ NTSTATUS NTAPI -WdmAudInstallDevice( - IN PDRIVER_OBJECT DriverObject) +WdmaudAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) { UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\wdmaud"); UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\DosDevices\\wdmaud"); @@ -83,11 +98,11 @@ NTSTATUS Status; PWDMAUD_DEVICE_EXTENSION DeviceExtension; - DPRINT("WdmAudInstallDevice called\n"); + DPRINT("WdmaudAddDevice called\n"); Status = IoCreateDevice(DriverObject, sizeof(WDMAUD_DEVICE_EXTENSION), - &DeviceName, + NULL, FILE_DEVICE_KS, 0, FALSE, @@ -113,7 +128,7 @@ } /* register device interfaces */ - Status = WdmAudRegisterDeviceInterface(DeviceObject, DeviceExtension); + Status = WdmAudRegisterDeviceInterface(PhysicalDeviceObject, DeviceExtension); if (!NT_SUCCESS(Status)) { DPRINT1("WdmRegisterDeviceInterface failed with %x\n", Status); @@ -136,25 +151,19 @@ /* initialize timer */ IoInitializeTimer(DeviceObject, WdmAudTimerRoutine, (PVOID)WdmAudTimerRoutine); - /* find available sysaudio devices */ - Status = WdmAudOpenSysAudioDevices(DeviceObject, DeviceExtension); - if (!NT_SUCCESS(Status)) - { - DPRINT1("WdmAudOpenSysAudioDevices failed with %x\n", Status); - IoDeleteSymbolicLink(&SymlinkName); + /* allocate ks device header */ + Status = KsAllocateDeviceHeader(&DeviceExtension->DeviceHeader, 0, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("KsAllocateDeviceHeader failed with %x\n", Status); IoDeleteDevice(DeviceObject); return Status; } - /* allocate ks device header */ - Status = KsAllocateDeviceHeader(&DeviceExtension->DeviceHeader, 0, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("KsAllocateDeviceHeader failed with %x\n", Status); - IoDeleteSymbolicLink(&SymlinkName); - IoDeleteDevice(DeviceObject); - return Status; - } + /* attach to device stack */ + DeviceExtension->NextDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + KsSetDevicePnpAndBaseObject(DeviceExtension->DeviceHeader, DeviceExtension->NextDeviceObject, DeviceObject); + /* start the timer */ IoStartTimer(DeviceObject); @@ -203,10 +212,10 @@ NTSTATUS Status; PIO_STACK_LOCATION IoStack; PWDMAUD_CLIENT pClient; - //PWDMAUD_DEVICE_EXTENSION DeviceExtension; - - /* get device extension */ - //DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + PWDMAUD_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; #if KS_IMPLEMENTED Status = KsReferenceSoftwareBusObject((KSDEVICE_HEADER)DeviceObject->DeviceExtension); @@ -216,6 +225,13 @@ return Status; } #endif + + if (DeviceExtension->FileObject == NULL) + { + /* initialize */ + WdmAudInitWorkerRoutine(DeviceObject, NULL); + } + Status = WdmAudOpenSysaudio(DeviceObject, &pClient); if (!NT_SUCCESS(Status)) @@ -354,6 +370,7 @@ Driver->MajorFunction[IRP_MJ_WRITE] = WdmAudReadWrite; Driver->MajorFunction[IRP_MJ_READ] = WdmAudReadWrite; Driver->MajorFunction[IRP_MJ_POWER] = KsDefaultDispatchPower; - - return WdmAudInstallDevice(Driver); -} + Driver->DriverExtension->AddDevice = WdmaudAddDevice; + + return STATUS_SUCCESS; +} Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/sup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/sup.c [iso-8859-1] Sat Mar 14 17:50:30 2015 @@ -14,12 +14,14 @@ #define NDEBUG #include <debug.h> +#define TAG_WDMAUD 'DMDW' + PVOID AllocateItem( IN POOL_TYPE PoolType, IN SIZE_T NumberOfBytes) { - PVOID Item = ExAllocatePool(PoolType, NumberOfBytes); + PVOID Item = ExAllocatePoolWithTag(PoolType, NumberOfBytes, TAG_WDMAUD); if (!Item) return Item; 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] Sat Mar 14 17:50:30 2015 @@ -11,6 +11,7 @@ PMDL Mdl; ULONG Length; ULONG Function; + PFILE_OBJECT FileObject; }WDMAUD_COMPLETION_CONTEXT, *PWDMAUD_COMPLETION_CONTEXT; @@ -66,6 +67,7 @@ KEVENT InitializationCompletionEvent; ULONG WorkItemActive; + PDEVICE_OBJECT NextDeviceObject; }WDMAUD_DEVICE_EXTENSION, *PWDMAUD_DEVICE_EXTENSION; typedef struct Modified: trunk/reactos/media/inf/wdmaudio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/wdmaudio.inf?rev… ============================================================================== --- trunk/reactos/media/inf/wdmaudio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/wdmaudio.inf [iso-8859-1] Sat Mar 14 17:50:30 2015 @@ -30,8 +30,6 @@ %WDM_WDMAUD.DeviceDesc% = WDM_WDMAUD, SW\{CD171DE3-69E5-11D2-B56D-0000F8754380} ;%WDM_DRMKAUD.DeviceDesc% = WDM_DRMKAUD, SW\{EEC12DB6-AD9C-4168-8658-B03DAEF417FE} -%WDMAUDIO_CopyFilesOnlyId.DeviceDesc% = WDMAUDIO.CopyFilesOnly, WDMAUDIO_CopyFilesOnlyId - [WDMAUDIO.CopyFilesOnly] CopyFiles=WDM.CopyFiles, FX.CopyList @@ -45,6 +43,12 @@ AddReg = DeviceRegistration CopyFiles = WDM.CopyFiles +;; copied to system32\drivers +[WDM.CopyFiles] +drmk.sys,,,0x0100 +portcls.sys,,,0x0100 + + [DeviceRegistration] ; Kmixer swenum install ;HKLM,%RunOnce%,"WDM_KMIXER0",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_KMIXER.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_MIXER%,%17%\WDMAUDIO.inf,WDM_KMIXER.Interface.Install" @@ -160,10 +164,6 @@ ErrorControl = 1 ; SERVICE_ERROR_NORMAL ServiceBinary = %10%\system32\drivers\drmkaud.sys -;; copied to system32\drivers -[WDM.CopyFiles] -drmk.sys,,,0x0100 -portcls.sys,,,0x0100 ;; Destination Directory List [DestinationDirs]

1 0

[hbelusca] 66708: [NTOS]: Do not assert if we haven't shut down ReactOS yet, in 99.99% cases it's because you asked it to go into a non-yet implemented power state. CORE-8537 #resolve #comment Repl...
by hbelusca＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: hbelusca Date: Sat Mar 14 16:40:26 2015 New Revision: 66708 URL: http://svn.reactos.org/svn/reactos?rev=66708&view=rev Log: [NTOS]: Do not assert if we haven't shut down ReactOS yet, in 99.99% cases it's because you asked it to go into a non-yet implemented power state. CORE-8537 #resolve #comment Replaced the ASSERT by an informative message when the power action is not implemented. r66708. Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=66… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sat Mar 14 16:40:26 2015 @@ -926,7 +926,8 @@ } /* You should not have made it this far */ - ASSERTMSG("System is still up and running?!", FALSE); + // ASSERTMSG("System is still up and running?!", FALSE); + DPRINT1("System is still up and running, you may not have chosen a yet supported power option: %u\n", PopAction.Action); break; }

1 0

[akhaldi] 66707: [CMAKE/GCC] Prevent GCC from searching any of the default directories, except when we're dealing with set_cpp. Now GCC build is on par with the MSVC build in terms of header inclus...
by akhaldi＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: akhaldi Date: Sat Mar 14 15:47:04 2015 New Revision: 66707 URL: http://svn.reactos.org/svn/reactos?rev=66707&view=rev Log: [CMAKE/GCC] Prevent GCC from searching any of the default directories, except when we're dealing with set_cpp. Now GCC build is on par with the MSVC build in terms of header inclusions. Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Mar 14 15:47:04 2015 @@ -72,6 +72,8 @@ if(MSVC) add_definitions(-DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++) include_directories(${REACTOS_SOURCE_DIR}/include/c++/stlport) + else() + replace_compile_flags("-nostdinc" " ") endif() endif() Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=66707&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Mar 14 15:47:04 2015 @@ -38,6 +38,10 @@ # Compiler Core add_compile_flags("-pipe -fms-extensions -fno-strict-aliasing") + +# Prevent GCC from searching any of the default directories +add_compile_flags("-nostdinc") + if(GCC_VERSION VERSION_GREATER 4.7) add_compile_flags("-mstackrealign") endif()

1 0

[akhaldi] 66706: [WS2_32_WINETEST] Fix MSVC build.
by akhaldi＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: akhaldi Date: Sat Mar 14 15:45:07 2015 New Revision: 66706 URL: http://svn.reactos.org/svn/reactos?rev=66706&view=rev Log: [WS2_32_WINETEST] Fix MSVC build. Modified: trunk/rostests/winetests/ws2_32/sock.c Modified: trunk/rostests/winetests/ws2_32/sock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/sock.c?r… ============================================================================== --- trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] Sat Mar 14 15:45:07 2015 @@ -27,7 +27,7 @@ #define WIN32_NO_STATUS #include <wine/test.h> #include <winsock2.h> -#include <winternl.h> +#include <wine/winternl.h> #include <ws2tcpip.h> #include <wsipx.h> #include <wsnwlink.h>

1 0

[hbelusca] 66705: [FMIFS]: Reorganize a bit the inclusions, and always compile the DLL in UNICODE.
by hbelusca＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: hbelusca Date: Sat Mar 14 15:37:00 2015 New Revision: 66705 URL: http://svn.reactos.org/svn/reactos?rev=66705&view=rev Log: [FMIFS]: Reorganize a bit the inclusions, and always compile the DLL in UNICODE. Modified: trunk/reactos/dll/win32/fmifs/CMakeLists.txt trunk/reactos/dll/win32/fmifs/init.c trunk/reactos/dll/win32/fmifs/precomp.h Modified: trunk/reactos/dll/win32/fmifs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/fmifs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/CMakeLists.txt [iso-8859-1] Sat Mar 14 15:37:00 2015 @@ -18,7 +18,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/fmifs_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def) -set_module_type(fmifs win32dll ENTRYPOINT InitializeFmIfs 12) +set_module_type(fmifs win32dll UNICODE ENTRYPOINT InitializeFmIfs 12) add_importlibs(fmifs kernel32 ntdll) add_pch(fmifs precomp.h SOURCE) add_dependencies(fmifs psdk) Modified: trunk/reactos/dll/win32/fmifs/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/init.c?rev… ============================================================================== --- trunk/reactos/dll/win32/fmifs/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/init.c [iso-8859-1] Sat Mar 14 15:37:00 2015 @@ -11,6 +11,8 @@ #include "precomp.h" #include <winreg.h> + +#define NTOS_MODE_USER #include <ndk/cmfuncs.h> #include <ndk/obfuncs.h> Modified: trunk/reactos/dll/win32/fmifs/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] Sat Mar 14 15:37:00 2015 @@ -13,16 +13,15 @@ /* INCLUDES ******************************************************************/ +#include <stdio.h> + #define WIN32_NO_STATUS -#define NTOS_MODE_USER -#define UNICODE -#define _UNICODE - -#include <stdio.h> /* PSDK/NDK Headers */ #include <windef.h> #include <winbase.h> + +#define NTOS_MODE_USER #include <ndk/rtlfuncs.h> /* FMIFS Public Header */

1 0

[tkreuzer] 66704: [PSDK] Avoid redefinition of FILE_DEVICE_SMARTCARD in winsmcrd.h, when combined with wine/winioctl.h. A similar #ifdef exists in the MS header.
by tkreuzer＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: tkreuzer Date: Sat Mar 14 15:34:48 2015 New Revision: 66704 URL: http://svn.reactos.org/svn/reactos?rev=66704&view=rev Log: [PSDK] Avoid redefinition of FILE_DEVICE_SMARTCARD in winsmcrd.h, when combined with wine/winioctl.h. A similar #ifdef exists in the MS header. Modified: trunk/reactos/include/psdk/winsmcrd.h Modified: trunk/reactos/include/psdk/winsmcrd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsmcrd.h?re… ============================================================================== --- trunk/reactos/include/psdk/winsmcrd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsmcrd.h [iso-8859-1] Sat Mar 14 15:34:48 2015 @@ -60,7 +60,11 @@ SCARD_IO_REQUEST ioRequest; } SCARD_T1_REQUEST, *PSCARD_T1_REQUEST, *LPSCARD_T1_REQUEST; +#ifndef FILE_DEVICE_SMARTCARD #define FILE_DEVICE_SMARTCARD 49 +#elif FILE_DEVICE_SMARTCARD != 49 +#error "Incorrect Smart Card Device Definition" +#endif #define SCARD_ATR_LENGTH (0x21)

1 0

[akhaldi] 66703: [WINETESTS] Addendum to r66701. Fixes MSVC build.
by akhaldi＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: akhaldi Date: Sat Mar 14 15:22:32 2015 New Revision: 66703 URL: http://svn.reactos.org/svn/reactos?rev=66703&view=rev Log: [WINETESTS] Addendum to r66701. Fixes MSVC build. Modified: trunk/rostests/winetests/advapi32/crypt_lmhash.c trunk/rostests/winetests/advapi32/crypt_md4.c trunk/rostests/winetests/advapi32/registry.c trunk/rostests/winetests/ntdll/change.c trunk/rostests/winetests/ntdll/error.c trunk/rostests/winetests/quartz/filtermapper.c Modified: trunk/rostests/winetests/advapi32/crypt_lmhash.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/crypt_… ============================================================================== --- trunk/rostests/winetests/advapi32/crypt_lmhash.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/crypt_lmhash.c [iso-8859-1] Sat Mar 14 15:22:32 2015 @@ -26,7 +26,7 @@ #include "wine/test.h" #include "windef.h" #include "winbase.h" -#include "winternl.h" +#include "wine/winternl.h" struct ustring { DWORD Length; Modified: trunk/rostests/winetests/advapi32/crypt_md4.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/crypt_… ============================================================================== --- trunk/rostests/winetests/advapi32/crypt_md4.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/crypt_md4.c [iso-8859-1] Sat Mar 14 15:22:32 2015 @@ -26,7 +26,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winternl.h" +#include "wine/winternl.h" typedef struct { Modified: trunk/rostests/winetests/advapi32/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/regist… ============================================================================== --- trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] Sat Mar 14 15:22:32 2015 @@ -28,7 +28,7 @@ #include "wine/test.h" #include "windef.h" #include "winbase.h" -#include "winternl.h" +#include "wine/winternl.h" #include "winreg.h" #include "winsvc.h" #include "winerror.h" Modified: trunk/rostests/winetests/ntdll/change.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/change.c?… ============================================================================== --- trunk/rostests/winetests/ntdll/change.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/change.c [iso-8859-1] Sat Mar 14 15:22:32 2015 @@ -22,7 +22,7 @@ #define WIN32_NO_STATUS #include <windows.h> #include <winnt.h> -#include <winternl.h> +#include <wine/winternl.h> #include <winerror.h> #include <stdio.h> #include "wine/test.h" Modified: trunk/rostests/winetests/ntdll/error.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/error.c?r… ============================================================================== --- trunk/rostests/winetests/ntdll/error.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/error.c [iso-8859-1] Sat Mar 14 15:22:32 2015 @@ -31,7 +31,7 @@ #include "winbase.h" #include "rpcnterr.h" #include "winreg.h" -#include "winternl.h" +#include "wine/winternl.h" /* FIXME!!! this test checks only mappings, defined by MSDN * It is necessary to add other mappings and to test them Modified: trunk/rostests/winetests/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filterma… ============================================================================== --- trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] Sat Mar 14 15:22:32 2015 @@ -24,7 +24,7 @@ #include "winbase.h" #include "initguid.h" #include "dshow.h" -#include "winternl.h" +#include "wine/winternl.h" #include "fil_data.h"

1 0

[hbelusca] 66702: [TASKMGR]: Use correct headers aka. NDK instead of wine/winternl.h . Also remove an unneeded header. Spotted by Sylvain.
by hbelusca＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: hbelusca Date: Sat Mar 14 15:19:07 2015 New Revision: 66702 URL: http://svn.reactos.org/svn/reactos?rev=66702&view=rev Log: [TASKMGR]: Use correct headers aka. NDK instead of wine/winternl.h . Also remove an unneeded header. Spotted by Sylvain. Modified: trunk/reactos/base/applications/taskmgr/endproc.c Modified: trunk/reactos/base/applications/taskmgr/endproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/endproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/endproc.c [iso-8859-1] Sat Mar 14 15:19:07 2015 @@ -23,8 +23,9 @@ */ #include "precomp.h" -#include <psdk/stierr.h> -#include <wine/winternl.h> + +#define NTOS_MODE_USER +#include <ndk/psfuncs.h> void ProcessPage_OnEndProcess(void) {

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