Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[janderwald] 42344: [PORTCLS] - Fix lots of COM object leaks - IPortWaveCyclic & IPortTopology drivers now shutdown cleanly - Implement freeing of all registered physical connections and release of the registered power management interface [SYSAUDIO] - Close handles to audio filters

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Aug 2 20:20:39 2009 New Revision: 42344 URL: http://svn.reactos.org/svn/reactos?rev=42344&view=rev Log: [PORTCLS] - Fix lots of COM object leaks - IPortWaveCyclic & IPortTopology drivers now shutdown cleanly - Implement freeing of all registered physical connections and release of the registered power management interface [SYSAUDIO] - Close handles to audio filters Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/sysaudio/main.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c [iso-8859-1] Sun Aug 2 20:20:39 2009 @@ -16,6 +16,7 @@ IPortTopology* Port; SUBDEVICE_DESCRIPTOR * Descriptor; + ISubdevice *SubDevice; }IPortFilterTopologyImpl; @@ -112,24 +113,12 @@ IN PIRP Irp) { PIO_STACK_LOCATION IoStack; - ISubdevice *SubDevice = NULL; - SUBDEVICE_DESCRIPTOR * Descriptor; - NTSTATUS Status; IPortFilterTopologyImpl * This = (IPortFilterTopologyImpl *)iface; IoStack = IoGetCurrentIrpStackLocation(Irp); ASSERT(IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY); - Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&SubDevice); - ASSERT(Status == STATUS_SUCCESS); - ASSERT(SubDevice != NULL); - - Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &Descriptor); - ASSERT(Status == STATUS_SUCCESS); - ASSERT(Descriptor != NULL); - - SubDevice->lpVtbl->Release(SubDevice); - - return PcPropertyHandler(Irp, Descriptor); + + return PcPropertyHandler(Irp, This->Descriptor); } /* @@ -181,18 +170,21 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - //PMINIPORTTOPOLOGY Miniport; - //IPortFilterTopologyImpl * This = (IPortFilterTopologyImpl *)iface; - - /* release reference to port */ - //This->Port->lpVtbl->Release(This->Port); - - /* get the miniport driver */ - //Miniport = GetTopologyMiniport(This->Port); - /* release miniport driver */ - //Miniport->lpVtbl->Release(Miniport); - - Irp->IoStatus.Status = STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS; + IPortFilterTopologyImpl * This = (IPortFilterTopologyImpl *)iface; + + /* FIXME handle DirectSound */ + + if (This->ref == 1) + { + /* release reference to port */ + This->SubDevice->lpVtbl->Release(This->SubDevice); + + /* time to shutdown the audio system */ + Status = This->SubDevice->lpVtbl->ReleaseChildren(This->SubDevice); + } + + Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -244,9 +236,6 @@ { ULONG Index; PKSPROPERTY Property; - NTSTATUS Status; - ISubdevice * SubDevice = NULL; - PSUBDEVICE_DESCRIPTOR Descriptor = NULL; IPortFilterTopologyImpl * This = (IPortFilterTopologyImpl*)iface; Property = (PKSPROPERTY)InputBuffer; @@ -254,28 +243,14 @@ if (InputBufferLength < sizeof(KSPROPERTY)) return FALSE; - - /* get private interface */ - Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&SubDevice); - if (!NT_SUCCESS(Status)) - return FALSE; - - /* get descriptor */ - Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &Descriptor); - if (!NT_SUCCESS(Status)) - { - SubDevice->lpVtbl->Release(SubDevice); - return FALSE; - } - - for(Index = 0; Index < Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) - { - if (IsEqualGUIDAligned(&Property->Set, Descriptor->FilterPropertySet.Properties[Index].Set)) + for(Index = 0; Index < This->Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) + { + if (IsEqualGUIDAligned(&Property->Set, This->Descriptor->FilterPropertySet.Properties[Index].Set)) { FastPropertyHandler(FileObject, (PKSPROPERTY)InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, StatusBlock, 1, - &Descriptor->FilterPropertySet.Properties[Index], - Descriptor, SubDevice); + &This->Descriptor->FilterPropertySet.Properties[Index], + This->Descriptor, This->SubDevice); } } return TRUE; @@ -342,17 +317,14 @@ /* get the subdevice descriptor */ Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); - /* release subdevice interface */ - ISubDevice->lpVtbl->Release(ISubDevice); + /* store subdevice interface */ + This->SubDevice = ISubDevice; if (!NT_SUCCESS(Status)) return STATUS_UNSUCCESSFUL; /* save descriptor */ This->Descriptor = Descriptor; - - /* increment reference count */ - Port->lpVtbl->AddRef(Port); /* store port object */ This->Port = Port; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Sun Aug 2 20:20:39 2009 @@ -17,6 +17,7 @@ IPortWaveCyclic* Port; IPortPinWaveCyclic ** Pins; SUBDEVICE_DESCRIPTOR * Descriptor; + ISubdevice * SubDevice; }IPortFilterWaveCyclicImpl; @@ -161,24 +162,12 @@ IN PIRP Irp) { PIO_STACK_LOCATION IoStack; - ISubdevice *SubDevice = NULL; - SUBDEVICE_DESCRIPTOR * Descriptor; - NTSTATUS Status; IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; IoStack = IoGetCurrentIrpStackLocation(Irp); ASSERT(IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY); - Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&SubDevice); - ASSERT(Status == STATUS_SUCCESS); - ASSERT(SubDevice != NULL); - - Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &Descriptor); - ASSERT(Status == STATUS_SUCCESS); - ASSERT(Descriptor != NULL); - - SubDevice->lpVtbl->Release(SubDevice); - - return PcPropertyHandler(Irp, Descriptor); + + return PcPropertyHandler(Irp, This->Descriptor); } /* @@ -231,7 +220,7 @@ IN PIRP Irp) { ULONG Index; - //PMINIPORTWAVECYCLIC Miniport; + NTSTATUS Status = STATUS_SUCCESS; IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; for(Index = 0; Index < This->Descriptor->Factory.PinDescriptorCount; Index++) @@ -240,16 +229,18 @@ ASSERT(This->Pins[Index] == NULL); } - /* release reference to port */ - //This->Port->lpVtbl->Release(This->Port); - - /* get the miniport driver */ - //Miniport = GetWaveCyclicMiniport(This->Port); - /* release miniport driver */ - //Miniport->lpVtbl->Release(Miniport); - - - Irp->IoStatus.Status = STATUS_SUCCESS; + DPRINT("IPortFilterWaveCyclic_fnClose ref %u\n", This->ref); + + if (This->ref == 1) + { + /* release reference to port */ + This->SubDevice->lpVtbl->Release(This->SubDevice); + + /* time to shutdown the audio system */ + Status = This->SubDevice->lpVtbl->ReleaseChildren(This->SubDevice); + } + + Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -358,18 +349,16 @@ NTSTATUS Status; IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl*)iface; - This->Port = Port; - /* get our private interface */ - Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); + Status = Port->lpVtbl->QueryInterface(Port, &IID_ISubdevice, (PVOID*)&ISubDevice); if (!NT_SUCCESS(Status)) return STATUS_UNSUCCESSFUL; /* get the subdevice descriptor */ Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); - /* release subdevice interface */ - ISubDevice->lpVtbl->Release(ISubDevice); + /* store subdevice interface */ + This->SubDevice = ISubDevice; if (!NT_SUCCESS(Status)) return STATUS_UNSUCCESSFUL; @@ -383,8 +372,8 @@ if (!This->Pins) return STATUS_UNSUCCESSFUL; - /* increment reference count */ - Port->lpVtbl->AddRef(Port); + /* store port driver */ + This->Port = Port; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Sun Aug 2 20:20:39 2009 @@ -194,10 +194,39 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PPCLASS_DEVICE_EXTENSION DeviceExtension; + PLIST_ENTRY Entry; + PPHYSICAL_CONNECTION Connection; DPRINT("PortClsShutdown called\n"); - //DbgBreakPoint(); - - /* TODO */ + + /* get device extension */ + DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + while(!IsListEmpty(&DeviceExtension->PhysicalConnectionList)) + { + /* get connection entry */ + Entry = RemoveHeadList(&DeviceExtension->PhysicalConnectionList); + Connection = (PPHYSICAL_CONNECTION)CONTAINING_RECORD(Entry, PHYSICAL_CONNECTION, Entry); + + if (Connection->FromSubDevice) + { + /* release subdevice */ + Connection->FromSubDevice->lpVtbl->Release(Connection->FromSubDevice); + } + + if (Connection->ToSubDevice) + { + /* release subdevice */ + Connection->ToSubDevice->lpVtbl->Release(Connection->ToSubDevice); + } + FreeItem(Connection, TAG_PORTCLASS); + } + + if (DeviceExtension->AdapterPowerManagement) + { + /* release adapter power management */ + DPRINT1("Power %u\n", DeviceExtension->AdapterPowerManagement->lpVtbl->Release(DeviceExtension->AdapterPowerManagement)); + } Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Sun Aug 2 20:20:39 2009 @@ -777,6 +777,12 @@ /* free work item ctx */ FreeItem(Ctx, TAG_PORTCLASS); + /* release reference to port driver */ + This->Port->lpVtbl->Release(This->Port); + + /* release reference to filter instance */ + This->Filter->lpVtbl->Release(This->Filter); + if (This->Stream) { Stream = This->Stream; @@ -1013,11 +1019,6 @@ IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; - Port->lpVtbl->AddRef(Port); - Filter->lpVtbl->AddRef(Filter); - - This->Port = Port; - This->Filter = Filter; This->KsPinDescriptor = KsPinDescriptor; This->ConnectDetails = ConnectDetails; This->Miniport = GetWaveCyclicMiniport(Port); @@ -1115,11 +1116,18 @@ return Status; } + Port->lpVtbl->AddRef(Port); + Filter->lpVtbl->AddRef(Filter); + + This->Port = Port; + This->Filter = Filter; + //This->Stream->lpVtbl->SetFormat(This->Stream, (PKSDATAFORMAT)This->Format); DPRINT1("Setting state to acquire %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_ACQUIRE)); DPRINT1("Setting state to pause %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE)); This->State = KSSTATE_PAUSE; + //This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, This->Delay); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Sun Aug 2 20:20:39 2009 @@ -124,7 +124,6 @@ IPortTopology* iface) { IPortTopologyImpl * This = (IPortTopologyImpl*)iface; - return InterlockedIncrement(&This->ref); } @@ -136,6 +135,7 @@ IPortTopologyImpl * This = (IPortTopologyImpl*)iface; InterlockedDecrement(&This->ref); + DPRINT("Reference Count %u\n", This->ref); if (This->ref == 0) { @@ -208,9 +208,7 @@ This->pDeviceObject = DeviceObject; This->bInitialized = TRUE; - /* increment reference on miniport adapter */ - Miniport->lpVtbl->AddRef(Miniport); - + /* now initialize the miniport driver */ Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface); if (!NT_SUCCESS(Status)) { @@ -394,10 +392,17 @@ ISubDevice_fnReleaseChildren( IN ISubdevice *iface) { - //IPortTopologyImpl * This = (IPortTopologyImpl*)CONTAINING_RECORD(iface, IPortTopologyImpl, lpVtblSubDevice); - - UNIMPLEMENTED - return STATUS_UNSUCCESSFUL; + IPortTopologyImpl * This = (IPortTopologyImpl*)CONTAINING_RECORD(iface, IPortTopologyImpl, lpVtblSubDevice); + + DPRINT1("ISubDevice_fnReleaseChildren with ref %u\n", This->ref); + + /* release the filter */ + This->Filter->lpVtbl->Release(This->Filter); + + /* release the miniport */ + DPRINT("Refs %u %u\n", This->pMiniport->lpVtbl->Release(This->pMiniport), This->ref); + + return STATUS_SUCCESS; } static Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] Sun Aug 2 20:20:39 2009 @@ -266,12 +266,6 @@ if (This->ref == 0) { - if (This->pPinCount) - This->pPinCount->lpVtbl->Release(This->pPinCount); - - if (This->pPowerNotify) - This->pPowerNotify->lpVtbl->Release(This->pPowerNotify); - FreeItem(This, TAG_PORTCLASS); return 0; } @@ -342,9 +336,6 @@ This->pDeviceObject = DeviceObject; This->bInitialized = TRUE; This->pResourceList = ResourceList; - - /* increment reference on miniport adapter */ - Miniport->lpVtbl->AddRef(Miniport); Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface); if (!NT_SUCCESS(Status)) @@ -644,10 +635,29 @@ ISubDevice_fnReleaseChildren( IN ISubdevice *iface) { - //IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)CONTAINING_RECORD(iface, IPortWaveCyclicImpl, lpVtblSubDevice); - - UNIMPLEMENTED - return STATUS_UNSUCCESSFUL; + IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)CONTAINING_RECORD(iface, IPortWaveCyclicImpl, lpVtblSubDevice); + + DPRINT("ISubDevice_fnReleaseChildren ref %u\n", This->ref); + + /* release the filter */ + This->Filter->lpVtbl->Release(This->Filter); + + if (This->pPinCount) + { + /* release pincount interface */ + This->pPinCount->lpVtbl->Release(This->pPinCount); + } + + if (This->pPowerNotify) + { + /* release power notify interface */ + This->pPowerNotify->lpVtbl->Release(This->pPowerNotify); + } + + /* now release the miniport */ + This->pMiniport->lpVtbl->Release(This->pMiniport); + + return STATUS_SUCCESS; } static Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Sun Aug 2 20:20:39 2009 @@ -47,8 +47,17 @@ DeviceEntry = (PKSAUDIO_DEVICE_ENTRY)CONTAINING_RECORD(Entry, KSAUDIO_DEVICE_ENTRY, Entry); DPRINT1("Freeing item %wZ\n", &DeviceEntry->DeviceName); + + /* dereference audio device file object */ + ObDereferenceObject(DeviceEntry->FileObject); + + /* close audio device handle */ + ZwClose(DeviceEntry->Handle); + /* free device string */ RtlFreeUnicodeString(&DeviceEntry->DeviceName); - + /* free pins */ + ExFreePool(DeviceEntry->Pins); + /* free audio device entry */ ExFreePool(DeviceEntry); }

15 years, 1 month

[fireball] 42343: - Remove unnecessary hack from RosDrv_GetTextMetrics. Text output now is nearly perfect. See arwinss issue nr. 6.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 2 20:18:58 2009 New Revision: 42343 URL: http://svn.reactos.org/svn/reactos?rev=42343&view=rev Log: - Remove unnecessary hack from RosDrv_GetTextMetrics. Text output now is nearly perfect. See arwinss issue nr. 6. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Sun Aug 2 20:18:58 2009 @@ -313,16 +313,8 @@ BOOL CDECL RosDrv_GetTextMetrics(NTDRV_PDEVICE *physDev, TEXTMETRICW *metrics) { - UNIMPLEMENTED; - - // HACK - metrics->tmMaxCharWidth = 9; - metrics->tmHeight = 18; - metrics->tmExternalLeading = 0; - - - return TRUE; - //return FALSE; + /* Let GDI font engine do the work */ + return FALSE; } BOOL CDECL RosDrv_LineTo( NTDRV_PDEVICE *physDev, INT x, INT y ) @@ -482,8 +474,7 @@ /* We don't have a kernelmode font engine */ if (gdiFont == 0) { - UNIMPLEMENTED; - //RosGdiSelectFont(physDev->hKernelDC, hfont, gdiFont); + /*RosGdiSelectFont(physDev->hKernelDC, hfont, gdiFont);*/ } else { @@ -612,10 +603,6 @@ return; } - // FIXME: What to do with origin? - //XSetClipRectangles( gdi_display, physDev->gc, physDev->dc_rect.left, physDev->dc_rect.top, - // (XRectangle *)data->Buffer, data->rdh.nCount, YXBanded ); - /* Set clipping */ RosGdiSetDeviceClipping(physDev->hKernelDC, data->rdh.nCount, (RECTL *)data->Buffer, (RECTL *)&data->rdh.rcBound);

15 years, 1 month

[sginsberg] 42342: - npapi.h: Correct definitions of function pointer prototypes. - ntifs.h & cmdata.h : Don't use array size of 0. Fixes C4200. - wdm.h: Correct definition of 64-bit SLIST_HEADER. Add explicit casts to avoid /W4 warnings in RtlEnlargedUnsignedDivide. - winddk.h: Add MSVC intrinsic __readfsbyte for KeGetCurrentProcessorNumber. Misc fixes. - Fix various msvc issues in cmd, setupapi, usetup, win32csr, winlogon, msafd, ws2_32 and ext2lib, most notably: - cmd & doskey: Don't use fish

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Aug 2 19:38:27 2009 New Revision: 42342 URL: http://svn.reactos.org/svn/reactos?rev=42342&view=rev Log: - npapi.h: Correct definitions of function pointer prototypes. - ntifs.h & cmdata.h : Don't use array size of 0. Fixes C4200. - wdm.h: Correct definition of 64-bit SLIST_HEADER. Add explicit casts to avoid /W4 warnings in RtlEnlargedUnsignedDivide. - winddk.h: Add MSVC intrinsic __readfsbyte for KeGetCurrentProcessorNumber. Misc fixes. - Fix various msvc issues in cmd, setupapi, usetup, win32csr, winlogon, msafd, ws2_32 and ext2lib, most notably: - cmd & doskey: Don't use fishy gcc extension to allocate variable-sized arrays from the stack. Use the heap instead. - Disable warning C4733 for mingw_main too (was only done for mingw_wmain previously). - advapi32: Pass the correct handles to TRACE -- spotted by MSVC. - Set the specified register in ecx in MSVC versions of Ke386Wrmsr and Ke386Rdmsr instead of reading from/writing to a random MSR. Yay /W4. Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/memory.c trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/mklink.c trunk/reactos/base/shell/cmd/parser.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/dll/cpl/desk/preview.c trunk/reactos/dll/cpl/desk/settings.c trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/ws2_32/misc/ns.c trunk/reactos/dll/win32/ws2_32/misc/stubs.c trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/psdk/npapi.h trunk/reactos/lib/3rdparty/mingw/mingw.rbuild trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/lib/fslib/ext2lib/Mke2fs.c trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/subsystems/win32/csrss/win32csr/alias.c Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -19,15 +19,27 @@ static VOID PrintHistory(VOID) { DWORD Length = GetConsoleCommandHistoryLength(pszExeName); + DWORD BufferLength; + PBYTE HistBuf; + TCHAR *Hist; + TCHAR *HistEnd; + /* On Windows, the ANSI version of GetConsoleCommandHistory requires * a buffer twice as large as the actual history length. */ - BYTE HistBuf[Length * (sizeof(WCHAR) / sizeof(TCHAR))]; - TCHAR *Hist = (TCHAR *)HistBuf; - TCHAR *HistEnd = (TCHAR *)&HistBuf[Length]; - - if (GetConsoleCommandHistory(Hist, sizeof HistBuf, pszExeName)) + BufferLength = Length * (sizeof(WCHAR) / sizeof(TCHAR)) * sizeof(BYTE); + + HistBuf = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + BufferLength); + if (!HistBuf) return; + Hist = (TCHAR *)HistBuf; + HistEnd = (TCHAR *)&HistBuf[Length]; + + if (GetConsoleCommandHistory(Hist, BufferLength, pszExeName)) for (; Hist < HistEnd; Hist += _tcslen(Hist) + 1) _tprintf(_T("%s\n"), Hist); + + HeapFree(GetProcessHeap(), 0, HistBuf); } static INT SetMacro(LPTSTR definition) @@ -65,23 +77,39 @@ static VOID PrintMacros(LPTSTR pszExeName, LPTSTR Indent) { DWORD Length = GetConsoleAliasesLength(pszExeName); - BYTE AliasBuf[Length]; - TCHAR *Alias = (TCHAR *)AliasBuf; - TCHAR *AliasEnd = (TCHAR *)&AliasBuf[Length]; - - if (GetConsoleAliases(Alias, sizeof AliasBuf, pszExeName)) + PBYTE AliasBuf; + TCHAR *Alias; + TCHAR *AliasEnd; + + AliasBuf = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + Length * sizeof(BYTE)); + if (!AliasBuf) return; + Alias = (TCHAR *)AliasBuf; + AliasEnd = (TCHAR *)&AliasBuf[Length]; + + if (GetConsoleAliases(Alias, Length * sizeof(BYTE), pszExeName)) for (; Alias < AliasEnd; Alias += _tcslen(Alias) + 1) _tprintf(_T("%s%s\n"), Indent, Alias); + + HeapFree(GetProcessHeap(), 0, AliasBuf); } static VOID PrintAllMacros(VOID) { DWORD Length = GetConsoleAliasExesLength(); - BYTE ExeNameBuf[Length]; - TCHAR *ExeName = (TCHAR *)ExeNameBuf; - TCHAR *ExeNameEnd = (TCHAR *)&ExeNameBuf[Length]; - - if (GetConsoleAliasExes(ExeName, sizeof ExeNameBuf)) + PBYTE ExeNameBuf; + TCHAR *ExeName; + TCHAR *ExeNameEnd; + + ExeNameBuf = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + Length * sizeof(BYTE)); + if (!ExeNameBuf) return; + ExeName = (TCHAR *)ExeNameBuf; + ExeNameEnd = (TCHAR *)&ExeNameBuf[Length]; + + if (GetConsoleAliasExes(ExeName, Length * sizeof(BYTE))) { for (; ExeName < ExeNameEnd; ExeName += _tcslen(ExeName) + 1) { @@ -90,6 +118,8 @@ _tprintf(_T("\n")); } } + + HeapFree(GetProcessHeap(), 0, ExeNameBuf); } static VOID ReadFromFile(LPTSTR param) Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -3133,6 +3133,7 @@ FileCopyPage(PINPUT_RECORD Ir) { COPYCONTEXT CopyContext; + unsigned int mem_bar_width; MUIDisplayPage(FILE_COPY_PAGE); @@ -3153,7 +3154,7 @@ MUIGetString(STRING_SETUPCOPYINGFILES)); // fit memory bars to screen width, distribute them uniform - unsigned int mem_bar_width = (xScreen - 26) / 5; + mem_bar_width = (xScreen - 26) / 5; mem_bar_width -= mem_bar_width % 2; // make even /* ATTENTION: The following progress bars are debug stuff, which should not be translated!! */ /* Create the paged pool progress bar */ Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -484,14 +484,23 @@ INT DoCommand(LPTSTR first, LPTSTR rest, PARSED_COMMAND *Cmd) { - TCHAR com[_tcslen(first) + _tcslen(rest) + 2]; /* full command line */ + TCHAR *com; TCHAR *cp; LPTSTR param; /* pointer to command's parameters */ INT cl; LPCOMMAND cmdptr; BOOL nointernal = FALSE; + INT ret; TRACE ("DoCommand: (\'%s\' \'%s\')\n", debugstr_aw(first), debugstr_aw(rest)); + + /* full command line */ + com = cmd_alloc((_tcslen(first) + _tcslen(rest) + 2) * sizeof(TCHAR)); + if (com == NULL) + { + error_out_of_memory(); + return 1; + } /* If present in the first word, these characters end the name of an * internal command and become the beginning of its parameters. */ @@ -526,11 +535,15 @@ if (_tcsicmp(cmdptr->name, _T("echo")) != 0) while (_istspace(*param)) param++; - return cmdptr->func(param); - } - } - - return Execute(com, first, rest, Cmd); + ret = cmdptr->func(param); + cmd_free(com); + return ret; + } + } + + ret = Execute(com, first, rest, Cmd); + cmd_free(com); + return ret; } Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -125,20 +125,36 @@ if (bUnicodeOutput) { #ifndef _UNICODE - WCHAR buffer[len]; + WCHAR *buffer = cmd_alloc(len * sizeof(WCHAR)); + if (!buffer) + { + error_out_of_memory(); + return; + } len = MultiByteToWideChar(OutputCodePage, 0, str, len, buffer, len, NULL, NULL); str = (PVOID)buffer; #endif WriteFile(hOutput, str, len * sizeof(WCHAR), &dwWritten, NULL); +#ifndef _UNICODE + cmd_free(buffer); +#endif } else { #ifdef _UNICODE - CHAR buffer[len * MB_LEN_MAX]; + CHAR *buffer = cmd_alloc(len * MB_LEN_MAX * sizeof(CHAR)); + if (!buffer) + { + error_out_of_memory(); + return; + } len = WideCharToMultiByte(OutputCodePage, 0, str, len, buffer, len * MB_LEN_MAX, NULL, NULL); str = (PVOID)buffer; #endif WriteFile(hOutput, str, len, &dwWritten, NULL); +#ifdef _UNICODE + cmd_free(buffer); +#endif } } Modified: trunk/reactos/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/memory.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/memory.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/memory.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -25,6 +25,7 @@ TCHAR szAvailPageFile[40]; TCHAR szTotalVirtual[40]; TCHAR szAvailVirtual[40]; + BOOL (WINAPI *GlobalMemoryStatusEx)(LPMEMORYSTATUSEX); if (!_tcsncmp (param, _T("/?"), 2)) { @@ -32,8 +33,8 @@ return 0; } - BOOL (WINAPI *GlobalMemoryStatusEx)(LPMEMORYSTATUSEX) - = GetProcAddress(GetModuleHandle(_T("KERNEL32")), "GlobalMemoryStatusEx"); + GlobalMemoryStatusEx + = (BOOL (WINAPI *)(LPMEMORYSTATUSEX))GetProcAddress(GetModuleHandle(_T("KERNEL32")), "GlobalMemoryStatusEx"); if (GlobalMemoryStatusEx) { msex.dwLength = sizeof(MEMORYSTATUSEX); Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -38,7 +38,8 @@ /* * get a character out-of-band and honor Ctrl-Break characters */ -TCHAR cgetchar (VOID) +TCHAR +cgetchar (VOID) { HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); INPUT_RECORD irBuffer; Modified: trunk/reactos/base/shell/cmd/mklink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/mklink.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/mklink.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/mklink.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -39,9 +39,9 @@ HMODULE hNTDLL = GetModuleHandle(_T("NTDLL")); BOOLEAN (WINAPI *RtlDosPathNameToNtPathName_U)(PCWSTR, PUNICODE_STRING, PCWSTR *, CURDIR *) - = (BOOLEAN (WINAPI *)())GetProcAddress(hNTDLL, "RtlDosPathNameToNtPathName_U"); + = (BOOLEAN (WINAPI *)(PCWSTR, PUNICODE_STRING, PCWSTR *, CURDIR *))GetProcAddress(hNTDLL, "RtlDosPathNameToNtPathName_U"); VOID (WINAPI *RtlFreeUnicodeString)(PUNICODE_STRING) - = (VOID (WINAPI *)())GetProcAddress(hNTDLL, "RtlFreeUnicodeString"); + = (VOID (WINAPI *)(PUNICODE_STRING))GetProcAddress(hNTDLL, "RtlFreeUnicodeString"); TCHAR TargetFullPath[MAX_PATH]; #ifdef UNICODE @@ -177,9 +177,9 @@ * so load dynamically */ BOOL (WINAPI *CreateSymbolicLink)(LPCTSTR, LPCTSTR, DWORD) #ifdef UNICODE - = (BOOL (WINAPI *)())GetProcAddress(hKernel32, "CreateSymbolicLinkW"); + = (BOOL (WINAPI *)(LPCTSTR, LPCTSTR, DWORD))GetProcAddress(hKernel32, "CreateSymbolicLinkW"); #else - = (BOOL (WINAPI *)())GetProcAddress(hKernel32, "CreateSymbolicLinkA"); + = (BOOL (WINAPI *)(LPCTSTR, LPCTSTR, DWORD))GetProcAddress(hKernel32, "CreateSymbolicLinkA"); #endif if (CreateSymbolicLink && CreateSymbolicLink(Name[0], Name[1], Flags)) { @@ -193,9 +193,9 @@ * so load dynamically */ BOOL (WINAPI *CreateHardLink)(LPCTSTR, LPCTSTR, LPSECURITY_ATTRIBUTES) #ifdef UNICODE - = (BOOL (WINAPI *)())GetProcAddress(hKernel32, "CreateHardLinkW"); + = (BOOL (WINAPI *)(LPCTSTR, LPCTSTR, LPSECURITY_ATTRIBUTES))GetProcAddress(hKernel32, "CreateHardLinkW"); #else - = (BOOL (WINAPI *)())GetProcAddress(hKernel32, "CreateHardLinkA"); + = (BOOL (WINAPI *)(LPCTSTR, LPCTSTR, LPSECURITY_ATTRIBUTES))GetProcAddress(hKernel32, "CreateHardLinkA"); #endif if (CreateHardLink && CreateHardLink(Name[0], Name[1], NULL)) { Modified: trunk/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -326,10 +326,11 @@ static PARSED_COMMAND *ParseIf(void) { PARSED_COMMAND *Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + int Type; memset(Cmd, 0, sizeof(PARSED_COMMAND)); Cmd->Type = C_IF; - int Type = CurrentTokenType; + Type = CurrentTokenType; if (_tcsicmp(CurrentToken, _T("/I")) == 0) { Cmd->If.Flags |= IFFLAG_IGNORECASE; @@ -619,8 +620,9 @@ if (CurChar == _T('@')) { + PARSED_COMMAND *Cmd; ParseChar(); - PARSED_COMMAND *Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); Cmd->Type = C_QUIET; Cmd->Next = NULL; /* @ acts like a unary operator with low precedence, Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -34,7 +34,7 @@ DWORD dwSize = sizeof(szBuffer); HMODULE hLibrary; SERVICE_STATUS_PROCESS Info; - typedef BOOL WINAPI (*PLAYSOUNDW)(LPCWSTR,HMODULE,DWORD); + typedef BOOL (WINAPI *PLAYSOUNDW)(LPCWSTR,HMODULE,DWORD); PLAYSOUNDW Play; ULONG Index = 0; Modified: trunk/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/preview.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -332,7 +332,7 @@ hUser32 = LoadLibrary(_T("user32.dll")); if(hUser32 == NULL) - return FALSE; + return; DrawCaptionTemp = (DCT_PROC)GetProcAddress(hUser32, (LPCSTR)DCT_ORD); DrawMenuBarTemp = (DMBT_PROC)GetProcAddress(hUser32, (LPCSTR)DMBT_ORD); Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -626,10 +626,9 @@ SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) { PGLOBAL_DATA pGlobalData; + TCHAR Message[1024], Title[256]; pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); - - TCHAR Message[1024], Title[256]; switch(uMsg) { Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=42… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/add.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -188,9 +188,11 @@ while (RegEnumKeyEx(hKey, dwIndex, szLayoutID, &dwSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { + INT iIndex; + GetLayoutName(szLayoutID, KeyName); - INT iIndex = (INT) SendMessage(hItemsList, CB_ADDSTRING, 0, (LPARAM)KeyName); + iIndex = (INT) SendMessage(hItemsList, CB_ADDSTRING, 0, (LPARAM)KeyName); pstrLayoutID = (PTSTR)HeapAlloc(hProcessHeap, 0, sizeof(szLayoutID)); lstrcpy(pstrLayoutID, szLayoutID); Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -4104,7 +4104,7 @@ static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); TRACE("(%p,%s,%p,%p,%p,%p=%d)\n", - hkey, debugstr_w(name), reserved, type, data, count, + hkeyorg, debugstr_w(name), reserved, type, data, count, (count && data) ? *count : 0 ); if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; @@ -4885,7 +4885,7 @@ DWORD ret; NTSTATUS Status; - TRACE("(%p,%s,%d,%s,%d)\n", hKey, debugstr_a(lpSubKey), dwType, debugstr_a(lpData), cbData ); + TRACE("(%p,%s,%d,%s,%d)\n", hKeyOriginal, debugstr_a(lpSubKey), dwType, debugstr_a(lpData), cbData ); if (dwType != REG_SZ || !lpData) return ERROR_INVALID_PARAMETER; Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -683,7 +683,7 @@ fd_set *readfds, fd_set *writefds, fd_set *exceptfds, - struct timeval *timeout, + const LPTIMEVAL timeout, LPINT lpErrno) { IO_STATUS_BLOCK IOSB; Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -1409,6 +1409,17 @@ { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; HKEY key = INVALID_HANDLE_VALUE; + LPWSTR lpGuidString = NULL; + LPWSTR DriverKey = NULL; /* {GUID}\Index */ + LPWSTR pDeviceInstance; /* Points into DriverKey, on the Index field */ + DWORD Index; /* Index used in the DriverKey name */ + DWORD rc; + HKEY hHWProfileKey = INVALID_HANDLE_VALUE; + HKEY hEnumKey = NULL; + HKEY hClassKey = NULL; + HKEY hDeviceKey = INVALID_HANDLE_VALUE; + HKEY hKey = NULL; + HKEY RootKey; TRACE("%p %p %lu %lu %lu %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName)); @@ -1449,18 +1460,6 @@ SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } - - LPWSTR lpGuidString = NULL; - LPWSTR DriverKey = NULL; /* {GUID}\Index */ - LPWSTR pDeviceInstance; /* Points into DriverKey, on the Index field */ - DWORD Index; /* Index used in the DriverKey name */ - DWORD rc; - HKEY hHWProfileKey = INVALID_HANDLE_VALUE; - HKEY hEnumKey = NULL; - HKEY hClassKey = NULL; - HKEY hDeviceKey = INVALID_HANDLE_VALUE; - HKEY hKey = NULL; - HKEY RootKey; if (Scope == DICS_FLAG_GLOBAL) RootKey = set->HKLM; @@ -1670,6 +1669,7 @@ { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; BOOL ret = FALSE; + SP_DEVINFO_DATA DevInfo; TRACE("%p %s %s %s %p %x %p\n", DeviceInfoSet, debugstr_w(DeviceName), debugstr_guid(ClassGuid), debugstr_w(DeviceDescription), @@ -1707,8 +1707,6 @@ SetLastError(ERROR_INVALID_FLAGS); return FALSE; } - - SP_DEVINFO_DATA DevInfo; if (CreationFlags & DICD_GENERATE_ID) { Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -96,9 +96,9 @@ typedef BOOL (*iterate_fields_func)( HINF hinf, PCWSTR field, void *arg ); static BOOL GetLineText( HINF hinf, PCWSTR section_name, PCWSTR key_name, PWSTR *value); -typedef HRESULT WINAPI (*COINITIALIZE)(IN LPVOID pvReserved); -typedef HRESULT WINAPI (*COCREATEINSTANCE)(IN REFCLSID rclsid, IN LPUNKNOWN pUnkOuter, IN DWORD dwClsContext, IN REFIID riid, OUT LPVOID *ppv); -typedef HRESULT WINAPI (*COUNINITIALIZE)(VOID); +typedef HRESULT (WINAPI *COINITIALIZE)(IN LPVOID pvReserved); +typedef HRESULT (WINAPI *COCREATEINSTANCE)(IN REFCLSID rclsid, IN LPUNKNOWN pUnkOuter, IN DWORD dwClsContext, IN REFIID riid, OUT LPVOID *ppv); +typedef HRESULT (WINAPI *COUNINITIALIZE)(VOID); /* Unicode constants */ static const WCHAR AddService[] = {'A','d','d','S','e','r','v','i','c','e',0}; Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -632,8 +632,9 @@ void free_servent(struct servent* s) { + char* next; HFREE(s->s_name); - char* next = s->s_aliases[0]; + next = s->s_aliases[0]; while(next) { HFREE(next); next++; } s->s_port = 0; HFREE(s->s_proto); @@ -660,10 +661,11 @@ DNS_STATUS dns_status = {0}; /* include/WinDNS.h -- look up DNS_RECORD on MSDN */ PDNS_RECORD dp = 0; + PWINSOCK_THREAD_BLOCK p; addr = GH_INVALID; - PWINSOCK_THREAD_BLOCK p = NtCurrentTeb()->WinSockData; + p = NtCurrentTeb()->WinSockData; if( !p ) { Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -510,13 +510,13 @@ IN USHORT hostshort, OUT USHORT FAR* lpnetshort) { - if (!WSAINITIALIZED) - { - WSASetLastError(WSANOTINITIALISED); - return SOCKET_ERROR; - } - PCATALOG_ENTRY provider; + if (!WSAINITIALIZED) + { + WSASetLastError(WSANOTINITIALISED); + return SOCKET_ERROR; + } + if (!ReferenceProviderByHandle((HANDLE)s, &provider)) { WSASetLastError(WSAENOTSOCK); @@ -599,13 +599,13 @@ IN USHORT netshort, OUT USHORT FAR* lphostshort) { - if (!WSAINITIALIZED) - { - WSASetLastError(WSANOTINITIALISED); - return SOCKET_ERROR; - } - PCATALOG_ENTRY provider; + if (!WSAINITIALIZED) + { + WSASetLastError(WSANOTINITIALISED); + return SOCKET_ERROR; + } + if (!ReferenceProviderByHandle((HANDLE)s, &provider)) { WSASetLastError(WSAENOTSOCK); Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -1093,7 +1093,7 @@ ULONG FileAttributes; ULONG FileNameLength; ULONG EaSize; - WCHAR FileName[0]; + WCHAR FileName[ANYSIZE_ARRAY]; } FILE_FULL_DIRECTORY_INFORMATION, *PFILE_FULL_DIRECTORY_INFORMATION; typedef struct _FILE_ID_FULL_DIR_INFORMATION { Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4234… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -575,13 +575,13 @@ ULONGLONG Reserved:59; ULONGLONG Region:3; } Header8; + struct { ULONGLONG Depth:16; ULONGLONG Sequence:48; ULONGLONG HeaderType:1; ULONGLONG Init:1; ULONGLONG Reserved:2; ULONGLONG NextEntry:60; - struct { } Header16; } SLIST_HEADER, *PSLIST_HEADER; #else @@ -1956,8 +1956,8 @@ IN OUT PULONG Remainder) { if (Remainder) - *Remainder = Dividend.QuadPart % Divisor; - return Dividend.QuadPart / Divisor; + *Remainder = (ULONG)(Dividend.QuadPart % Divisor); + return (ULONG)(Dividend.QuadPart / Divisor); } //DECLSPEC_DEPRECATED_DDK Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -5128,9 +5128,17 @@ ULONG Spare1; } KFLOATING_SAVE, *PKFLOATING_SAVE; -static __inline +#ifdef _MSC_VER +// +// FIXME: Intrinsics +// +unsigned char __readfsbyte(const unsigned long Offset); +#pragma intrinsic(__readfsbyte) +#endif + + +FORCEINLINE ULONG -DDKAPI KeGetCurrentProcessorNumber(VOID) { #if defined(__GNUC__) @@ -5145,7 +5153,7 @@ #if _MSC_FULL_VER >= 13012035 return (ULONG)__readfsbyte(FIELD_OFFSET(KPCR, Number)); #else - __asm { movzx eax, _PCR KPCR.Number } + __asm { movzx eax, fs:[0] KPCR.Number } #endif #else #error Unknown compiler @@ -5945,7 +5953,7 @@ OldBlink = Entry->Blink; OldFlink->Blink = OldBlink; OldBlink->Flink = OldFlink; - return (OldFlink == OldBlink); + return (BOOLEAN)(OldFlink == OldBlink); } static __inline PLIST_ENTRY Modified: trunk/reactos/include/psdk/npapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/npapi.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/npapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/npapi.h [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -56,45 +56,45 @@ #define WNNC_START 0x0000000c #define WNNC_WAIT_FOR_START 0x00000001 -typedef DWORD APIENTRY (*PF_NPGetCaps)(DWORD ndex); +typedef DWORD (APIENTRY *PF_NPGetCaps)(DWORD ndex); /* get user */ -typedef DWORD APIENTRY (*PF_NPGetUser)(LPWSTR lpName, LPWSTR lpUserName, +typedef DWORD (APIENTRY *PF_NPGetUser)(LPWSTR lpName, LPWSTR lpUserName, LPDWORD lpnBufferLen); /* enumeration-related */ -typedef DWORD APIENTRY (*PF_NPOpenEnum)(DWORD dwScope, DWORD dwType, DWORD dwUsage, +typedef DWORD (APIENTRY *PF_NPOpenEnum)(DWORD dwScope, DWORD dwType, DWORD dwUsage, LPNETRESOURCEW lpNetResource, LPHANDLE lphEnum); -typedef DWORD APIENTRY (*PF_NPEnumResource)(HANDLE hEnum, LPDWORD lpcCount, +typedef DWORD (APIENTRY *PF_NPEnumResource)(HANDLE hEnum, LPDWORD lpcCount, LPVOID lpBuffer, LPDWORD lpBufferSize); -typedef DWORD APIENTRY (*PF_NPCloseEnum)(HANDLE hEnum); +typedef DWORD (APIENTRY *PF_NPCloseEnum)(HANDLE hEnum); typedef DWORD (APIENTRY *PF_NPGetResourceInformation)(LPNETRESOURCEW lpNetResource, LPVOID lpBuffer, LPDWORD lpcbBuffer, LPWSTR* lplpSystem); /* connection-related */ -typedef DWORD APIENTRY (*PF_NPAddConnection)(LPNETRESOURCEW lpNetResource, +typedef DWORD (APIENTRY *PF_NPAddConnection)(LPNETRESOURCEW lpNetResource, LPWSTR lpPassword, LPWSTR lpUserName); -typedef DWORD APIENTRY (*PF_NPAddConnection3)(HWND hwndOwner, +typedef DWORD (APIENTRY *PF_NPAddConnection3)(HWND hwndOwner, LPNETRESOURCEW lpNetResource, LPWSTR lpPassword, LPWSTR lpUserName, DWORD dwFlags); -typedef DWORD APIENTRY (*PF_NPCancelConnection)(LPWSTR lpName, BOOL fForce); -typedef DWORD APIENTRY (*PF_NPGetConnection)(LPWSTR lpLocalName, +typedef DWORD (APIENTRY *PF_NPCancelConnection)(LPWSTR lpName, BOOL fForce); +typedef DWORD (APIENTRY *PF_NPGetConnection)(LPWSTR lpLocalName, LPWSTR lpRemoteName, LPDWORD lpnBufferLen); /* network name manipulation */ -typedef DWORD APIENTRY (*PF_NPGetUniversalName)(LPWSTR lpLocalPath, +typedef DWORD (APIENTRY *PF_NPGetUniversalName)(LPWSTR lpLocalPath, DWORD dwInfoLevel, LPVOID lpBuffer, LPDWORD lpnBufferSize); -typedef DWORD APIENTRY (*PF_NPFormatNetworkName)(LPWSTR lpRemoteName, +typedef DWORD (APIENTRY *PF_NPFormatNetworkName)(LPWSTR lpRemoteName, LPWSTR lpFormattedName, LPDWORD lpnLength, DWORD dwFlags, DWORD dwAveCharPerLine); /* dialogs */ -typedef DWORD APIENTRY (*PF_NPDeviceMode)(HWND hParent); +typedef DWORD (APIENTRY *PF_NPDeviceMode)(HWND hParent); /* search dialog */ #define WNSRCH_REFRESH_FIRST_LEVEL 0x00000001 -typedef DWORD APIENTRY (*PF_NPSearchDialog)(HWND hwndParent, +typedef DWORD (APIENTRY *PF_NPSearchDialog)(HWND hwndParent, LPNETRESOURCEW lpNetResource, LPVOID lpBuffer, DWORD cbBuffer, LPDWORD lpnFlags); @@ -109,10 +109,10 @@ #define WNPS_DIR 1 #define WNPS_MULT 2 -typedef DWORD APIENTRY (*PF_NPGetPropertyText)(DWORD iButton, DWORD nPropSel, +typedef DWORD (APIENTRY *PF_NPGetPropertyText)(DWORD iButton, DWORD nPropSel, LPWSTR lpName, LPWSTR lpButtonName, DWORD nButtonNameLen, DWORD nType); -typedef DWORD APIENTRY (*PF_NPPropertyDialog)(HWND hwndParent, DWORD iButtonDlg, +typedef DWORD (APIENTRY *PF_NPPropertyDialog)(HWND hwndParent, DWORD iButtonDlg, DWORD nPropSel, LPWSTR lpFileName, DWORD nType); /* admin */ @@ -123,9 +123,9 @@ #define WNDN_RMDIR 2 #define WNDN_MVDIR 3 -typedef DWORD APIENTRY (*PF_NPGetDirectoryType)(LPWSTR lpName, LPINT lpType, +typedef DWORD (APIENTRY *PF_NPGetDirectoryType)(LPWSTR lpName, LPINT lpType, BOOL bFlushCache); -typedef DWORD APIENTRY (*PF_NPDirectoryNotify)(HWND hwnd, LPWSTR lpDir, +typedef DWORD (APIENTRY *PF_NPDirectoryNotify)(HWND hwnd, LPWSTR lpDir, DWORD dwOper); /* permission editor dialogs */ @@ -133,16 +133,16 @@ #define WNPERMC_AUDIT 0x00000002 #define WNPERMC_OWNER 0x00000004 -typedef DWORD APIENTRY (*PF_NPFMXGetPermCaps)(LPWSTR lpDriveName); +typedef DWORD (APIENTRY *PF_NPFMXGetPermCaps)(LPWSTR lpDriveName); #define WNPERM_DLG_PERM 0 #define WNPERM_DLG_AUDIT 1 #define WNPERM_DLG_OWNER 2 -typedef DWORD APIENTRY (*PF_NPFMXEditPerm)(LPWSTR lpDriveName, HWND hwndFMX, +typedef DWORD (APIENTRY *PF_NPFMXEditPerm)(LPWSTR lpDriveName, HWND hwndFMX, DWORD nDialogType); -typedef DWORD APIENTRY (*PF_NPFMXGetPermHelp)(LPWSTR lpDriveName, +typedef DWORD (APIENTRY *PF_NPFMXGetPermHelp)(LPWSTR lpDriveName, DWORD nDialogType, BOOL fDirectory, LPVOID lpFileNameBuffer, LPDWORD lpBufferSize, LPDWORD lpnHelpContext); @@ -160,11 +160,11 @@ #define WN_NT_PASSWORD_CHANGED 0x00000002 /* notifications */ -typedef DWORD APIENTRY (*PF_NPLogonNotify)(PLUID lpLogonId, +typedef DWORD (APIENTRY *PF_NPLogonNotify)(PLUID lpLogonId, LPCWSTR lpAuthentInfoType, LPVOID lpAuthentInfo, LPCWSTR lpPreviousAuthentInfoType, LPVOID lpPreviousAuthentInfo, LPWSTR lpStationName, LPVOID StationHandle, LPWSTR *lpLogonScript); -typedef DWORD APIENTRY (*PF_NPPasswordChangeNotify)(LPCWSTR lpAuthentInfoType, +typedef DWORD (APIENTRY *PF_NPPasswordChangeNotify)(LPCWSTR lpAuthentInfoType, LPVOID lpAuthentInfo, LPCWSTR lpPreviousAuthentInfoType, LPVOID lpPreviousAuthentInfo, LPWSTR lpStationName, LPVOID StationHandle, DWORD dwChangeInfo); @@ -201,9 +201,9 @@ BOOL fForce; } NOTIFYCANCEL, *LPNOTIFYCANCEL; -typedef DWORD APIENTRY (*PF_AddConnectNotify)(LPNOTIFYINFO lpNotifyInfo, +typedef DWORD (APIENTRY *PF_AddConnectNotify)(LPNOTIFYINFO lpNotifyInfo, LPNOTIFYADD lpAddInfo); -typedef DWORD APIENTRY (*PF_CancelConnectNotify)(LPNOTIFYINFO lpNotifyInfo, +typedef DWORD (APIENTRY *PF_CancelConnectNotify)(LPNOTIFYINFO lpNotifyInfo, LPNOTIFYADD lpAddInfo); #endif /* ndef __WINE_NPAPI_H__ */ Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -31,6 +31,7 @@ <module name="mingw_main" type="staticlibrary" isstartuplib="true" crt="dll"> <define name="_CRTBLD" /> <include base="ReactOS">include/reactos/mingw-w64</include> + <compilerflag compilerset="msc">/wd4733</compilerflag> <file>crt0_c.c</file> <file>crtexe.c</file> <file>dllargv.c</file> Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=423… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -114,7 +114,7 @@ ULONG WorkVar; USHORT NameLength; USHORT ClassLength; - WCHAR Name[0]; + WCHAR Name[ANYSIZE_ARRAY]; } CM_KEY_NODE, *PCM_KEY_NODE; // @@ -122,7 +122,7 @@ // typedef struct _VALUE_LIST_CELL { - HCELL_INDEX ValueOffset[0]; + HCELL_INDEX ValueOffset[ANYSIZE_ARRAY]; } VALUE_LIST_CELL, *PVALUE_LIST_CELL; // @@ -137,7 +137,7 @@ ULONG Type; USHORT Flags; USHORT Unused1; - WCHAR Name[0]; + WCHAR Name[ANYSIZE_ARRAY]; } CM_KEY_VALUE, *PCM_KEY_VALUE; // @@ -152,7 +152,7 @@ ULONG ReferenceCount; ULONG DescriptorLength; //SECURITY_DESCRIPTOR_RELATIVE Descriptor; - UCHAR Data[0]; + UCHAR Data[ANYSIZE_ARRAY]; } CM_KEY_SECURITY, *PCM_KEY_SECURITY; #ifdef CMLIB_HOST Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.c… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -814,6 +814,10 @@ /* File Sys Structure */ EXT2_FILESYS FileSys; ULONG Percent; + ULONG rsv; + ULONG blocks; + ULONG start; + ULONG ret_blk; Callback(PROGRESS, 0, (PVOID)&Percent); @@ -917,10 +921,8 @@ } /* rsv must be a power of two (64kB is MD RAID sb alignment) */ - ULONG rsv = 65536 / FileSys.blocksize; - ULONG blocks = Ext2Sb.s_blocks_count; - ULONG start; - ULONG ret_blk; + rsv = 65536 / FileSys.blocksize; + blocks = Ext2Sb.s_blocks_count; #ifdef ZAP_BOOTBLOCK zap_sector(&FileSys, 0, 2); Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -123,6 +123,7 @@ IN ULONG Var1, IN ULONG Var2) { + __asm mov ecx, Register; __asm mov eax, Var1; __asm mov edx, Var2; __asm wrmsr; @@ -134,6 +135,7 @@ IN ULONG Var1, IN ULONG Var2) { + __asm mov ecx, Register; __asm mov eax, Var1; __asm mov edx, Var2; __asm rdmsr; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/alias.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/alias.c [iso-8859-1] Sun Aug 2 19:38:27 2009 @@ -104,14 +104,17 @@ PALIAS_ENTRY IntGetAliasEntry(PALIAS_HEADER Header, LPCWSTR lpSrcName) { + PALIAS_ENTRY RootHeader; + if (Header == NULL) return NULL; - PALIAS_ENTRY RootHeader = Header->Data; + RootHeader = Header->Data; while(RootHeader) { + INT diff; DPRINT("IntGetAliasEntry>lpSource %S\n", RootHeader->lpSource); - INT diff = _wcsicmp(RootHeader->lpSource, lpSrcName); + diff = _wcsicmp(RootHeader->lpSource, lpSrcName); if (!diff) return RootHeader;

15 years, 1 month

[fireball] 42341: - Initialize size field of font_mapping structure, this fixes freetype font loading errors (see arwinss issue nr. 6). - Add mapping lookup, in case that process already mapped it, so mapping will just be reused. - Add unmapping support, so if process closes, no mapping leaks occur.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 2 19:32:22 2009 New Revision: 42341 URL: http://svn.reactos.org/svn/reactos?rev=42341&view=rev Log: - Initialize size field of font_mapping structure, this fixes freetype font loading errors (see arwinss issue nr. 6). - Add mapping lookup, in case that process already mapped it, so mapping will just be reused. - Add unmapping support, so if process closes, no mapping leaks occur. Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] Sun Aug 2 19:32:22 2009 @@ -469,10 +469,12 @@ { struct list entry; int refcount; - dev_t dev; - ino_t ino; + DWORD volumeserial; + DWORD indexhigh; + DWORD indexlow; void *data; size_t size; + HANDLE file; }; static struct list mappings_list = LIST_INIT( mappings_list ); @@ -2983,22 +2985,25 @@ static struct font_mapping *map_font_file( const char *name ) { struct font_mapping *mapping; - //struct stat st; + BY_HANDLE_FILE_INFORMATION hfi; HANDLE file, mapped_file; file = CreateFileA( name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 ); if (!file) return NULL; + if (!GetFileInformationByHandle( file, &hfi )) + return NULL; + LIST_FOR_EACH_ENTRY( mapping, &mappings_list, struct font_mapping, entry ) { -#if 0 - if (mapping->dev == st.st_dev && mapping->ino == st.st_ino) + if (mapping->volumeserial == hfi.dwVolumeSerialNumber && + mapping->indexhigh == hfi.nFileIndexHigh && + mapping->indexlow == hfi.nFileIndexLow ) { mapping->refcount++; CloseHandle( file ); return mapping; } -#endif } if (!(mapping = HeapAlloc( GetProcessHeap(), 0, sizeof(*mapping) ))) goto error; @@ -3013,9 +3018,11 @@ return NULL; } mapping->refcount = 1; - //mapping->dev = st.st_dev; - //mapping->ino = st.st_ino; - //mapping->size = st.st_size; + mapping->volumeserial = hfi.dwVolumeSerialNumber; + mapping->indexhigh = hfi.nFileIndexHigh; + mapping->indexlow = hfi.nFileIndexLow; + mapping->file = mapped_file; + mapping->size = hfi.nFileSizeLow; list_add_tail( &mappings_list, &mapping->entry ); return mapping; @@ -3026,14 +3033,14 @@ static void unmap_font_file( struct font_mapping *mapping ) { -#if 0 if (!--mapping->refcount) { list_remove( &mapping->entry ); - munmap( mapping->data, mapping->size ); + if (!UnmapViewOfFile(mapping->data)) + ERR("Unmapping view of file failed with error %x\n", GetLastError()); + CloseHandle(mapping->file); HeapFree( GetProcessHeap(), 0, mapping ); } -#endif } static LONG load_VDMX(GdiFont*, LONG);

15 years, 1 month

[fireball] 42340: - Move GDIPOINTER inside DEVOBJ, where it belongs. - Bring in and use mouse safety functions from trunk.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 2 19:06:38 2009 New Revision: 42340 URL: http://svn.reactos.org/svn/reactos?rev=42340&view=rev Log: - Move GDIPOINTER inside DEVOBJ, where it belongs. - Bring in and use mouse safety functions from trunk. Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c branches/arwinss/reactos/subsystems/win32/win32k/include/devobj.h branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h 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] Sun Aug 2 19:06:38 2009 @@ -17,7 +17,6 @@ /* PUBLIC FUNCTIONS **********************************************************/ -GDIPOINTER Pointer; POINTL ptlPointer; VOID @@ -33,7 +32,7 @@ ASSERT(ppdev); ASSERT(psoDest); - pgp = &Pointer; + pgp = &ppdev->Pointer; if (!pgp->Enabled) { @@ -83,8 +82,7 @@ ASSERT(ppdev); ASSERT(psoDest); - - pgp = &Pointer; + pgp = &ppdev->Pointer; if (pgp->Enabled) { @@ -169,6 +167,91 @@ ROP3_TO_ROP4(SRCINVERT), FALSE); } +} + +/* + * FUNCTION: Notify the mouse driver that drawing is about to begin in + * a rectangle on a particular surface. + */ +INT FASTCALL +MouseSafetyOnDrawStart(SURFOBJ *pso, + LONG HazardX1, + LONG HazardY1, + LONG HazardX2, + LONG HazardY2) +{ + LONG tmp; + PDEVOBJ *ppdev; + GDIPOINTER *pgp; + + ASSERT(pso != NULL); + + ppdev = GDIDEV(pso); + if (!ppdev) return FALSE; + + pgp = &ppdev->Pointer; + + if (pgp->Exclude.right == -1) + return FALSE; + + ppdev->SafetyRemoveCount++; + + if (ppdev->SafetyRemoveLevel != 0) + return FALSE; + + if (HazardX1 > HazardX2) + { + tmp = HazardX2; + HazardX2 = HazardX1; + HazardX1 = tmp; + } + if (HazardY1 > HazardY2) + { + tmp = HazardY2; + HazardY2 = HazardY1; + HazardY1 = tmp; + } + + if (pgp->Exclude.right >= HazardX1 + && pgp->Exclude.left <= HazardX2 + && pgp->Exclude.bottom >= HazardY1 + && pgp->Exclude.top <= HazardY2) + { + ppdev->SafetyRemoveLevel = ppdev->SafetyRemoveCount; + ppdev->pfnMovePointer(pso, -1, -1, NULL); + } + + return TRUE; +} + +/* + * FUNCTION: Notify the mouse driver that drawing has finished on a surface. + */ +INT FASTCALL +MouseSafetyOnDrawEnd(SURFOBJ *pso) +{ + PDEVOBJ *ppdev; + GDIPOINTER *pgp; + + ASSERT(pso != NULL); + + ppdev = (PDEVOBJ*)pso->hdev; + + if (!ppdev) return FALSE; + + pgp = &ppdev->Pointer; + + if (pgp->Exclude.right == -1) + return FALSE; + + if (--ppdev->SafetyRemoveCount >= ppdev->SafetyRemoveLevel) + return FALSE; + + ppdev->pfnMovePointer(pso, ptlPointer.x, ptlPointer.y, &pgp->Exclude); + + ppdev->SafetyRemoveLevel = 0; + + return TRUE; } /* @@ -197,7 +280,7 @@ ASSERT(pso); ppdev = GDIDEV(pso); - pgp = &Pointer; + pgp = &ppdev->Pointer; IntHideMousePointer(ppdev, pso); @@ -386,7 +469,7 @@ ppdev = GDIDEV(pso); ASSERT(ppdev); - pgp = &Pointer; + pgp = &ppdev->Pointer; IntHideMousePointer(ppdev, pso); 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] Sun Aug 2 19:06:38 2009 @@ -17,8 +17,13 @@ }; ULONG DisplayNumber; DEVMODEW DMW; - PFILE_OBJECT VideoFileObject; + PFILE_OBJECT VideoFileObject; BOOLEAN PreparedDriver; + GDIPOINTER Pointer; + /* Stuff to keep track of software cursors; win32k gdi part */ + UINT SafetyRemoveLevel; /* at what level was the cursor removed? + 0 for not removed */ + UINT SafetyRemoveCount; } PDEVOBJ, *PPDEVOBJ; extern PPDEVOBJ pPrimarySurface; Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Sun Aug 2 19:06:38 2009 @@ -212,6 +212,8 @@ BRUSHOBJ* pbo, LONG x, LONG y, LONG deltax, LONG deltay, POINTL* Translate); +/* Mouse pointer */ + BOOL NTAPI GreSetCursor(ICONINFO* NewCursor, PSYSTEM_CURSORINFO CursorInfo); @@ -222,5 +224,14 @@ LONG y, RECTL *prcl); +INT FASTCALL +MouseSafetyOnDrawStart(SURFOBJ *pso, + LONG HazardX1, + LONG HazardY1, + LONG HazardX2, + LONG HazardY2); + +INT FASTCALL +MouseSafetyOnDrawEnd(SURFOBJ *pso); #endif Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h [iso-8859-1] Sun Aug 2 19:06:38 2009 @@ -45,7 +45,4 @@ #define SURFACE_LockBitmapBits(x) #define SURFACE_UnlockBitmapBits(x) -#define MouseSafetyOnDrawStart(srf, a, b, c, d) -#define MouseSafetyOnDrawEnd(srf) - #endif Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sun Aug 2 19:06:38 2009 @@ -36,6 +36,7 @@ /* Eng and GRE stuff */ #include <driver.h> #include <engevent.h> +#include <cursor.h> #include <devobj.h> #include <gdiobj.h> #include <surfobj.h> @@ -46,7 +47,6 @@ #include <floatobj.h> #include <xformobj.h> #include <xlateobj.h> -#include <cursor.h> #include <gre.h> #include <monitor.h>

15 years, 1 month

[gschneider] 42339: Cleanup in win32k/dib: - Replace old headers with new ones, programmers added according to svn blame info - Apply consistent 2pt indentation because of the many indentation levels in this code; getting rid of a tab and 2/3/4pt mixture - Rename universal StretchBlt file to reflect content

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Aug 2 17:49:17 2009 New Revision: 42339 URL: http://svn.reactos.org/svn/reactos?rev=42339&view=rev Log: Cleanup in win32k/dib: - Replace old headers with new ones, programmers added according to svn blame info - Apply consistent 2pt indentation because of the many indentation levels in this code; getting rid of a tab and 2/3/4pt mixture - Rename universal StretchBlt file to reflect content Added: trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c (with props) Removed: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c trunk/reactos/subsystems/win32/win32k/dib/dib.h trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib24bppc.c trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c trunk/reactos/subsystems/win32/win32k/dib/floodfill.c trunk/reactos/subsystems/win32/win32k/dib/i386/dib24bpp_hline.s trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s trunk/reactos/subsystems/win32/win32k/win32k.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Removed: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/floodfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib24bpp_hline.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Added: trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi…

15 years, 1 month

[jmorlan] 42338: Fix many incompatibilities in DIR switch parsing, including those noted in Bug 4744.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sun Aug 2 17:16:03 2009 New Revision: 42338 URL: http://svn.reactos.org/svn/reactos?rev=42338&view=rev Log: Fix many incompatibilities in DIR switch parsing, including those noted in Bug 4744. Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Sun Aug 2 17:16:03 2009 @@ -176,22 +176,16 @@ { DWORD dwAttribVal; /* The desired state of attribute */ DWORD dwAttribMask; /* Which attributes to check */ - BOOL bUnSet; /* A helper flag if "-" was given with the switch */ - BOOL bParSetted; /* A helper flag if parameters of switch were given */ } stAttribs; /* Displays files with this attributes only */ struct { enum EOrderBy eCriteria[3]; /* Criterias used to order by */ BOOL bCriteriaRev[3]; /* If the criteria is in reversed order */ short sCriteriaCount; /* The quantity of criterias */ - BOOL bUnSet; /* A helper flag if "-" was given with the switch */ - BOOL bParSetted; /* A helper flag if parameters of switch were given */ } stOrderBy; /* Ordered by criterias */ struct { enum ETimeField eTimeField; /* The time field that will be used for */ - BOOL bUnSet; /* A helper flag if "-" was given with the switch */ - BOOL bParSetted; /* A helper flag if parameters of switch were given */ } stTimeField; /* The time field to display or use for sorting */ } DIRSWITCHFLAGS, *LPDIRSWITCHFLAGS; @@ -247,6 +241,7 @@ BOOL bIntoQuotes; /* A flag showing if we are in quotes (") */ LPTSTR ptrStart; /* A pointer to the first character of a parameter */ LPTSTR ptrEnd; /* A pointer to the last character of a parameter */ + BOOL bOrderByNoPar; /* A flag to indicate /O with no switch parameter */ LPTSTR temp; /* Initialize parameter array */ @@ -261,10 +256,7 @@ /* We suppose that switch parameters were given to avoid setting them to default if the switch was not given */ - lpFlags->stAttribs.bParSetted = TRUE; - lpFlags->stOrderBy.bParSetted = TRUE; - lpFlags->stTimeField.bParSetted = TRUE; - + bOrderByNoPar = FALSE; /* Main Loop (see README_DIR.txt) */ /* scan the command line char per char, and we process its char */ @@ -278,23 +270,45 @@ /* When a switch is expecting */ if (cCurSwitch == _T('/')) { + while (*Line == _T(' ')) + Line++; + + bNegative = (*Line == _T('-')); + Line += bNegative; + + cCurChar = *Line; + cCurUChar = _totupper(*Line); + if ((cCurUChar == _T('A')) ||(cCurUChar == _T('T')) || (cCurUChar == _T('O'))) { - cCurSwitch = cCurUChar; + /* If positive, prepare for parameters... if negative, reset to defaults */ switch (cCurUChar) { case _T('A'): - lpFlags->stAttribs.bUnSet = bNegative; - lpFlags->stAttribs.bParSetted = FALSE; + lpFlags->stAttribs.dwAttribVal = 0L; + lpFlags->stAttribs.dwAttribMask = 0L; + if (bNegative) + lpFlags->stAttribs.dwAttribMask = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM; break; case _T('T'): - lpFlags->stTimeField.bUnSet = bNegative; - lpFlags->stTimeField.bParSetted = FALSE; + if (bNegative) + lpFlags->stTimeField.eTimeField = TF_MODIFIEDDATE; break; case _T('O'): - lpFlags->stOrderBy.bUnSet = bNegative; - lpFlags->stOrderBy.bParSetted = FALSE; + bOrderByNoPar = !bNegative; + lpFlags->stOrderBy.sCriteriaCount = 0; break; + } + + if (!bNegative) + { + /* Positive switch, so it can take parameters. */ + cCurSwitch = cCurUChar; + Line++; + /* Skip optional leading colon */ + if (*Line == _T(':')) + Line++; + continue; } } else if (cCurUChar == _T('L')) @@ -324,24 +338,20 @@ DirHelp(); return FALSE; } - else if (cCurChar == _T('-')) - { - bNegative = TRUE; - } else { error_invalid_switch ((TCHAR)_totupper (*Line)); return FALSE; } - /* We check if we calculated the negative value and realese the flag */ - if ((cCurChar != _T('-')) && bNegative) - bNegative = FALSE; - - /* if not a,o,t or - option then next parameter is not a switch */ - if ((cCurSwitch == _T('/')) && (!bNegative)) - cCurSwitch = _T(' '); - + /* Make sure there's no extra characters at the end of the switch */ + if (Line[1] && Line[1] != _T('/') && Line[1] != _T(' ')) + { + error_parameter_format(Line[1]); + return FALSE; + } + + cCurSwitch = _T(' '); } else if (cCurSwitch == _T(' ')) { @@ -393,20 +403,14 @@ if ((cCurChar == _T('/')) || ( cCurChar == _T(' '))) { /* Wrong desicion path, reprocess current character */ - cCurSwitch = cCurChar; + cCurSwitch = _T(' '); continue; } /* Process parameter switch */ switch(cCurSwitch) { case _T('A'): /* Switch parameters for /A (attributes filter) */ - /* Ok a switch parameter was given */ - lpFlags->stAttribs.bParSetted = TRUE; - - if (cCurChar == _T(':')) - /* =V= dead command, used to make the "if" work */ - cCurChar = cCurChar; - else if(cCurChar == _T('-')) + if(cCurChar == _T('-')) bPNegative = TRUE; else if(cCurUChar == _T('D')) { @@ -455,14 +459,7 @@ } break; case _T('T'): /* Switch parameters for /T (time field) */ - - /* Ok a switch parameter was given */ - lpFlags->stTimeField.bParSetted = TRUE; - - if (cCurChar == _T(':')) - /* =V= dead command, used to make the "if" work */ - cCurChar = cCurChar; - else if(cCurUChar == _T('C')) + if(cCurUChar == _T('C')) lpFlags->stTimeField.eTimeField= TF_CREATIONDATE ; else if(cCurUChar == _T('A')) lpFlags->stTimeField.eTimeField= TF_LASTACCESSEDDATE ; @@ -476,12 +473,9 @@ break; case _T('O'): /* Switch parameters for /O (order) */ /* Ok a switch parameter was given */ - lpFlags->stOrderBy.bParSetted = TRUE; - - if (cCurChar == _T(':')) - /* <== dead command, used to make the "if" work */ - cCurChar = cCurChar; - else if(cCurChar == _T('-')) + bOrderByNoPar = FALSE; + + if(cCurChar == _T('-')) bPNegative = TRUE; else if(cCurUChar == _T('N')) { @@ -530,38 +524,16 @@ Line++; } - /* Calculate the switches with no switch paramater */ - if (!(lpFlags->stAttribs.bParSetted)) - { - lpFlags->stAttribs.dwAttribVal = 0L; - lpFlags->stAttribs.dwAttribMask = lpFlags->stAttribs.dwAttribVal; - } - if (!(lpFlags->stOrderBy.bParSetted)) - { - lpFlags->stOrderBy.sCriteriaCount = 1; - lpFlags->stOrderBy.eCriteria[0] = ORDER_NAME; + /* /O with no switch parameters acts like /O:GN */ + if (bOrderByNoPar) + { + lpFlags->stOrderBy.sCriteriaCount = 2; + lpFlags->stOrderBy.eCriteria[0] = ORDER_DIRECTORY; lpFlags->stOrderBy.bCriteriaRev[0] = FALSE; - } - if (!(lpFlags->stTimeField.bParSetted)) - lpFlags->stTimeField.eTimeField = TF_MODIFIEDDATE ; - - /* Calculate the unsetted switches (the "-" prefixed)*/ - if (lpFlags->stAttribs.bUnSet) - { - lpFlags->stAttribs.bUnSet = FALSE; - lpFlags->stAttribs.dwAttribVal = 0L; - lpFlags->stAttribs.dwAttribMask = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM; - } - if (lpFlags->stOrderBy.bUnSet) - { - lpFlags->stOrderBy.bUnSet = FALSE; - lpFlags->stOrderBy.sCriteriaCount = 0; - } - if (lpFlags->stTimeField.bUnSet ) - { - lpFlags->stTimeField.bUnSet = FALSE; - lpFlags->stTimeField.eTimeField = TF_MODIFIEDDATE; - } + lpFlags->stOrderBy.eCriteria[1] = ORDER_NAME; + lpFlags->stOrderBy.bCriteriaRev[1] = FALSE; + } + return TRUE; } @@ -1600,12 +1572,9 @@ stFlags.bWideList = FALSE; stFlags.bWideListColSort = FALSE; stFlags.stTimeField.eTimeField = TF_MODIFIEDDATE; - stFlags.stTimeField.bUnSet = FALSE; stFlags.stAttribs.dwAttribMask = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM; stFlags.stAttribs.dwAttribVal = 0L; - stFlags.stAttribs.bUnSet = FALSE; stFlags.stOrderBy.sCriteriaCount = 0; - stFlags.stOrderBy.bUnSet = FALSE; nErrorLevel = 0;

15 years, 1 month

[janderwald] 42337: - Implement KsStreamPointerDelete, KsStreamPointerScheduleTimeout, KsStreamPointerCancelTimeout, KsPinGetFirstCloneStreamPointer, KsStreamPointerGetNextClone - Partly Implement IKsPin_DispatchDeviceIoControl, IKsPin_Close

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Aug 2 16:40:15 2009 New Revision: 42337 URL: http://svn.reactos.org/svn/reactos?rev=42337&view=rev Log: - Implement KsStreamPointerDelete, KsStreamPointerScheduleTimeout, KsStreamPointerCancelTimeout, KsPinGetFirstCloneStreamPointer, KsStreamPointerGetNextClone - Partly Implement IKsPin_DispatchDeviceIoControl, IKsPin_Close Modified: trunk/reactos/drivers/ksfilter/ks/pin.c Modified: trunk/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Sun Aug 2 16:40:15 2009 @@ -9,6 +9,17 @@ #include "priv.h" +typedef struct _KSISTREAM_POINTER +{ + KSSTREAM_POINTER StreamPointer; + PFNKSSTREAMPOINTER Callback; + PIRP Irp; + KTIMER Timer; + KDPC TimerDpc; + struct _KSISTREAM_POINTER *Next; + +}KSISTREAM_POINTER, *PKSISTREAM_POINTER; + typedef struct { KSBASIC_HEADER BasicHeader; @@ -24,6 +35,13 @@ PKSGATE AttachedGate; BOOL OrGate; + + LIST_ENTRY IrpList; + KSPIN_LOCK IrpListLock; + + PKSISTREAM_POINTER ClonedStreamPointer; + PKSISTREAM_POINTER LeadingEdgeStreamPointer; + PKSISTREAM_POINTER TrailingStreamPointer; PFNKSPINPOWER Sleep; PFNKSPINPOWER Wake; @@ -687,7 +705,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI VOID @@ -695,7 +713,41 @@ KsStreamPointerDelete( IN PKSSTREAM_POINTER StreamPointer) { - UNIMPLEMENTED + IKsPinImpl * This; + PKSISTREAM_POINTER Cur, Last; + PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)StreamPointer; + + This = (IKsPinImpl*)CONTAINING_RECORD(Pointer->StreamPointer.Pin, IKsPinImpl, Pin); + + /* point to first stream pointer */ + Last = NULL; + Cur = This->ClonedStreamPointer; + + while(Cur != Pointer && Cur) + { + Last = Cur; + /* iterate to next cloned pointer */ + Cur = Cur->Next; + } + + if (!Cur) + { + /* you naughty driver */ + return; + } + + if (!Last) + { + /* remove first cloned pointer */ + This->ClonedStreamPointer = Pointer->Next; + } + else + { + Last->Next = Pointer->Next; + } + + /* FIXME make sure no timeouts are pending */ + FreeItem(Pointer); } /* @@ -772,7 +824,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI VOID @@ -782,11 +834,22 @@ IN PFNKSSTREAMPOINTER Callback, IN ULONGLONG Interval) { - UNIMPLEMENTED -} - -/* - @unimplemented + LARGE_INTEGER DueTime; + PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)StreamPointer; + + /* setup timer callback */ + Pointer->Callback = Callback; + + /* setup expiration */ + DueTime.QuadPart = (LONGLONG)Interval; + + /* setup the timer */ + KeSetTimer(&Pointer->Timer, DueTime, &Pointer->TimerDpc); + +} + +/* + @implemented */ KSDDKAPI VOID @@ -794,11 +857,14 @@ KsStreamPointerCancelTimeout( IN PKSSTREAM_POINTER StreamPointer) { - UNIMPLEMENTED -} - -/* - @unimplemented + PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)StreamPointer; + + KeCancelTimer(&Pointer->Timer); + +} + +/* + @implemented */ KSDDKAPI PKSSTREAM_POINTER @@ -806,12 +872,13 @@ KsPinGetFirstCloneStreamPointer( IN PKSPIN Pin) { - UNIMPLEMENTED - return NULL; -} - -/* - @unimplemented + IKsPinImpl * This = (IKsPinImpl*)CONTAINING_RECORD(Pin, IKsPinImpl, Pin); + /* return first cloned stream pointer */ + return &This->ClonedStreamPointer->StreamPointer; +} + +/* + @implemented */ KSDDKAPI PKSSTREAM_POINTER @@ -819,8 +886,14 @@ KsStreamPointerGetNextClone( IN PKSSTREAM_POINTER StreamPointer) { - UNIMPLEMENTED - return NULL; + PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)StreamPointer; + + /* is there a another cloned stream pointer */ + if (!Pointer->Next) + return NULL; + + /* return next stream pointer */ + return &Pointer->Next->StreamPointer; } NTSTATUS @@ -829,11 +902,55 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + PKSIOBJECT_HEADER ObjectHeader; + IKsPinImpl * This; + NTSTATUS Status = STATUS_SUCCESS; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* sanity check */ + ASSERT(IoStack->FileObject); + ASSERT(IoStack->FileObject->FsContext); + + /* get the object header */ + ObjectHeader = (PKSIOBJECT_HEADER)IoStack->FileObject->FsContext; + + /* locate ks pin implemention fro KSPIN offset */ + This = (IKsPinImpl*)CONTAINING_RECORD(ObjectHeader->ObjectType, IKsPinImpl, Pin); + + if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_WRITE_STREAM && IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_READ_STREAM) + { + UNIMPLEMENTED; + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } + + /* mark irp as pending */ + IoMarkIrpPending(Irp); + + /* add irp to cancelable queue */ + KsAddIrpToCancelableQueue(&This->IrpList, &This->IrpListLock, Irp, KsListEntryTail, NULL /* FIXME */); + + if (This->Pin.Descriptor->Dispatch->Process) + { + /* it is a pin centric avstream */ + Status = This->Pin.Descriptor->Dispatch->Process(&This->Pin); + + /* TODO */ + } + else + { + /* TODO + * filter-centric avstream + */ + UNIMPLEMENTED + } + + return Status; } NTSTATUS @@ -842,11 +959,51 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + PKSIOBJECT_HEADER ObjectHeader; + IKsPinImpl * This; + NTSTATUS Status = STATUS_SUCCESS; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* sanity check */ + ASSERT(IoStack->FileObject); + ASSERT(IoStack->FileObject->FsContext); + + /* get the object header */ + ObjectHeader = (PKSIOBJECT_HEADER)IoStack->FileObject->FsContext; + + /* locate ks pin implemention fro KSPIN offset */ + This = (IKsPinImpl*)CONTAINING_RECORD(ObjectHeader->ObjectType, IKsPinImpl, Pin); + + /* acquire filter control mutex */ + KsFilterAcquireControl(This->BasicHeader.Parent.KsFilter); + + if (This->Pin.Descriptor->Dispatch->Close) + { + /* call pin close routine */ + Status = This->Pin.Descriptor->Dispatch->Close(&This->Pin, Irp); + + if (!NT_SUCCESS(Status)) + { + /* abort closing */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + /* FIXME remove pin from filter pin list and decrement reference count */ + + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + } + + return Status; } NTSTATUS @@ -962,6 +1119,8 @@ This->ref = 1; This->FileObject = IoStack->FileObject; KeInitializeMutex(&This->ProcessingMutex, 0); + InitializeListHead(&This->IrpList); + KeInitializeSpinLock(&This->IrpListLock); /* initialize ks pin descriptor */ This->Pin.Descriptor = Descriptor;

15 years, 1 month

[khornicek] 42336: - add support for ETO_OPAQUE

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Aug 2 15:37:22 2009 New Revision: 42336 URL: http://svn.reactos.org/svn/reactos?rev=42336&view=rev Log: - add support for ETO_OPAQUE Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Sun Aug 2 15:37:22 2009 @@ -622,16 +622,21 @@ } #endif - if(flags & ETO_OPAQUE) + if((flags & ETO_OPAQUE) && lprect) { -#if 0 - wine_tsx11_lock(); - XSetForeground( gdi_display, physDev->gc, backgroundPixel ); - XFillRectangle( gdi_display, physDev->drawable, physDev->gc, - physDev->dc_rect.left + lprect->left, physDev->dc_rect.top + lprect->top, - lprect->right - lprect->left, lprect->bottom - lprect->top ); - wine_tsx11_unlock(); -#endif + HBRUSH brush, oldBrush; + HPEN pen, oldPen; + + brush = CreateSolidBrush(GetBkColor(physDev->hUserDC)); + oldBrush = SelectObject(physDev->hUserDC, brush); + + pen = CreatePen(PS_NULL, 0, 0); + oldPen = SelectObject(physDev->hUserDC, pen); + + RosGdiRectangle(physDev->hKernelDC, lprect); + + DeleteObject(SelectObject(physDev->hUserDC, oldBrush)); + DeleteObject(SelectObject(physDev->hUserDC, oldPen)); } if(count == 0)

15 years, 1 month

[janderwald] 42335: [KS] - Acquire Spinlock at dpc level - Release cancel spinlock at correct level [PORTCLS] - Check if current partially processed irp has been cancelled and complete it in that case - Silence debug flood

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Aug 2 14:38:08 2009 New Revision: 42335 URL: http://svn.reactos.org/svn/reactos?rev=42335&view=rev Log: [KS] - Acquire Spinlock at dpc level - Release cancel spinlock at correct level [PORTCLS] - Check if current partially processed irp has been cancelled and complete it in that case - Silence debug flood Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Sun Aug 2 14:38:08 2009 @@ -1287,25 +1287,24 @@ IN PIRP Irp) { PKSPIN_LOCK SpinLock; - KIRQL OldLevel; /* get internal queue lock */ SpinLock = KSQUEUE_SPINLOCK_IRP_STORAGE(Irp); /* acquire spinlock */ - KeAcquireSpinLock(SpinLock, &OldLevel); + KeAcquireSpinLockAtDpcLevel(SpinLock); /* sanity check */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); /* release cancel spinlock */ - IoReleaseCancelSpinLock(DISPATCH_LEVEL); + IoReleaseCancelSpinLock(Irp->CancelIrql); /* remove the irp from the list */ RemoveEntryList(&Irp->Tail.Overlay.ListEntry); /* release spinlock */ - KeReleaseSpinLock(SpinLock, OldLevel); + KeReleaseSpinLockFromDpcLevel(SpinLock); /* has the irp already been canceled */ if (Irp->IoStatus.Status != STATUS_CANCELLED) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Sun Aug 2 14:38:08 2009 @@ -165,10 +165,18 @@ if (This->Irp) { /* use last irp */ - Irp = This->Irp; - Offset = This->CurrentOffset; - /* TODO cancel irp when required */ - ASSERT(Irp->Cancel == FALSE); + if (This->Irp->Cancel == FALSE) + { + Irp = This->Irp; + Offset = This->CurrentOffset; + } + else + { + /* irp has been cancelled */ + This->Irp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(This->Irp, IO_NO_INCREMENT); + This->Irp = Irp = NULL; + } } else { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Sun Aug 2 14:38:08 2009 @@ -970,7 +970,7 @@ PrePostRatio = (This->PreCompleted * 100) / This->TotalPackets; MinData = This->IrpQueue->lpVtbl->NumData(This->IrpQueue); - DPRINT1("IPortPinWaveCyclic_fnFastWrite entered Total %u Pre %u Post %u State %x MinData %u Ratio %u\n", This->TotalPackets, This->PreCompleted, This->PostCompleted, This->State, This->IrpQueue->lpVtbl->NumData(This->IrpQueue), PrePostRatio); + DPRINT("IPortPinWaveCyclic_fnFastWrite entered Total %u Pre %u Post %u State %x MinData %u Ratio %u\n", This->TotalPackets, This->PreCompleted, This->PostCompleted, This->State, This->IrpQueue->lpVtbl->NumData(This->IrpQueue), PrePostRatio); Packet = (PCONTEXT_WRITE)Buffer; Irp = Packet->Irp;

15 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009