Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 42901: - Gdi32: Update metafile structure.
by jimtabor＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: jimtabor Date: Mon Aug 24 08:06:05 2009 New Revision: 42901 URL: http://svn.reactos.org/svn/reactos?rev=42901&view=rev Log: - Gdi32: Update metafile structure. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/dll/win32/gdi32/objects/metafile.c Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Mon Aug 24 08:06:05 2009 @@ -42,32 +42,42 @@ /* TYPES *********************************************************************/ // Based on wmfapi.h and Wine. -typedef struct tagMETAFILEDC { - PVOID pvMetaBuffer; - HANDLE hFile; - DWORD Size; - METAHEADER mh; - UINT handles_size, cur_handles; - HGDIOBJ *handles; - - // more DC object stuff. - HGDIOBJ Pen; - HGDIOBJ Brush; - HGDIOBJ Palette; - HGDIOBJ Font; - - WCHAR Filename[MAX_PATH+2]; - // Add more later. +typedef struct tagMETAFILEDC +{ + PVOID pvMetaBuffer; + HANDLE hFile; + DWORD Size; + DWORD dwWritten; + METAHEADER mh; + WORD reserved; + HLOCAL MFObjList; + HPEN hPen; + HBRUSH hBrush; + HDC hDc; + HGDIOBJ hMetaDc; + HPALETTE hPalette; + HFONT hFont; + HBITMAP hBitmap; + HRGN hRegion; + HGDIOBJ hMetafile; + HGDIOBJ hMemDc; + HPEN hExtPen; + HGDIOBJ hEnhMetaDc; + HGDIOBJ hEnhMetaFile; + HCOLORSPACE hColorSpace; + WCHAR Filename[MAX_PATH+2]; } METAFILEDC,*PMETAFILEDC; // Metafile Entry handle -typedef struct tagMF_ENTRY { +typedef struct tagMF_ENTRY +{ LIST_ENTRY List; HGDIOBJ hmDC; // Handle return from NtGdiCreateClientObj. PMETAFILEDC pmfDC; } MF_ENTRY, *PMF_ENTRY; -typedef struct tagENHMETAFILE { +typedef struct tagENHMETAFILE +{ PVOID pvMetaBuffer; HANDLE hFile; /* Handle for disk based MetaFile */ DWORD Size; Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Mon Aug 24 08:06:05 2009 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/gdi32/object/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/me… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/metafile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/metafile.c [iso-8859-1] Mon Aug 24 08:06:05 2009 @@ -143,13 +143,18 @@ { HANDLE hFile; HDC hmDC; - DWORD dwWritten; PMETAFILEDC pmfDC = LocalAlloc(LMEM_ZEROINIT, sizeof(METAFILEDC)); if (!pmfDC) return NULL; pmfDC->mh.mtHeaderSize = sizeof(METAHEADER) / sizeof(WORD); pmfDC->mh.mtVersion = 0x0300; pmfDC->mh.mtSize = pmfDC->mh.mtHeaderSize; + + pmfDC->hPen = GetStockObject(BLACK_PEN); + pmfDC->hBrush = GetStockObject(WHITE_BRUSH); + pmfDC->hFont = GetStockObject(DEVICE_DEFAULT_FONT); + pmfDC->hBitmap = GetStockObject(DEFAULT_BITMAP); + pmfDC->hPalette = GetStockObject(DEFAULT_PALETTE); if (lpszFile) /* disk based metafile */ { @@ -160,7 +165,6 @@ (LPTSTR) &pmfDC->Filename, (LPTSTR*) &lpszFile)) { -// MFDRV_DeleteDC( dc->physDev ); LocalFree(pmfDC); return NULL; } @@ -168,14 +172,12 @@ if ((hFile = CreateFileW(pmfDC->Filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) { -// MFDRV_DeleteDC( dc->physDev ); LocalFree(pmfDC); return NULL; } - if (!WriteFile( hFile, &pmfDC->mh, sizeof(pmfDC->mh), &dwWritten, NULL )) - { -// MFDRV_DeleteDC( dc->physDev ); + if (!WriteFile( hFile, &pmfDC->mh, sizeof(pmfDC->mh), &pmfDC->dwWritten, NULL )) + { LocalFree(pmfDC); return NULL; }

1 0

[janderwald] 42900: - Fix broken check - Enables Ks Studio to instantiate audio pins
by janderwald＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: janderwald Date: Mon Aug 24 04:54:53 2009 New Revision: 42900 URL: http://svn.reactos.org/svn/reactos?rev=42900&view=rev Log: - Fix broken check - Enables Ks Studio to instantiate audio pins Modified: trunk/reactos/dll/directx/ksuser/ksuser.c Modified: trunk/reactos/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] Mon Aug 24 04:54:53 2009 @@ -187,10 +187,7 @@ ULONG BufferSize = sizeof(KSPIN_CONNECT); PKSDATAFORMAT DataFormat = ((PKSDATAFORMAT) ( ((ULONG)Connect) + ((ULONG)sizeof(KSPIN_CONNECT)) ) ); - if (DataFormat->Flags & KSDATAFORMAT_ATTRIBUTES) - { - BufferSize += (ROUND_UP(DataFormat->FormatSize,sizeof(LONGLONG)) + DataFormat->FormatSize); - } + BufferSize += DataFormat->FormatSize; return KsiCreateObjectType(FilterHandle, KSSTRING_Pin,

1 0

[gschneider] 42899: GetCharacterPlacementA: check FONT_mbtowc return value for validity
by gschneider＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: gschneider Date: Mon Aug 24 02:00:06 2009 New Revision: 42899 URL: http://svn.reactos.org/svn/reactos?rev=42899&view=rev Log: GetCharacterPlacementA: check FONT_mbtowc return value for validity Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Mon Aug 24 02:00:06 2009 @@ -323,6 +323,10 @@ memcpy(&resultsW, lpResults, sizeof(resultsW)); lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp); + if (lpStringW == NULL) + { + return 0; + } if(lpResults->lpOutString) { resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*uCountW);

1 0

[gschneider] 42898: GetCharacterPlacementA: Free memory on error
by gschneider＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: gschneider Date: Mon Aug 24 01:51:09 2009 New Revision: 42898 URL: http://svn.reactos.org/svn/reactos?rev=42898&view=rev Log: GetCharacterPlacementA: Free memory on error Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Mon Aug 24 01:51:09 2009 @@ -328,6 +328,7 @@ resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*uCountW); if (resultsW.lpOutString == NULL) { + HeapFree(GetProcessHeap(), 0, lpStringW); return 0; } }

1 0

[gschneider] 42897: CreateMetaFileW: WriteFile returns the number of bytes written for synchronous operations
by gschneider＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: gschneider Date: Mon Aug 24 01:40:48 2009 New Revision: 42897 URL: http://svn.reactos.org/svn/reactos?rev=42897&view=rev Log: CreateMetaFileW: WriteFile returns the number of bytes written for synchronous operations Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/me… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/metafile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/metafile.c [iso-8859-1] Mon Aug 24 01:40:48 2009 @@ -143,6 +143,7 @@ { HANDLE hFile; HDC hmDC; + DWORD dwWritten; PMETAFILEDC pmfDC = LocalAlloc(LMEM_ZEROINIT, sizeof(METAFILEDC)); if (!pmfDC) return NULL; @@ -172,7 +173,7 @@ return NULL; } - if (!WriteFile( hFile, &pmfDC->mh, sizeof(pmfDC->mh), NULL, NULL )) + if (!WriteFile( hFile, &pmfDC->mh, sizeof(pmfDC->mh), &dwWritten, NULL )) { // MFDRV_DeleteDC( dc->physDev ); LocalFree(pmfDC);

1 0

[gschneider] 42896: CreateMetaFileW: Free memory on error
by gschneider＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: gschneider Date: Mon Aug 24 01:09:55 2009 New Revision: 42896 URL: http://svn.reactos.org/svn/reactos?rev=42896&view=rev Log: CreateMetaFileW: Free memory on error Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/me… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/metafile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/metafile.c [iso-8859-1] Mon Aug 24 01:09:55 2009 @@ -160,6 +160,7 @@ (LPTSTR*) &lpszFile)) { // MFDRV_DeleteDC( dc->physDev ); + LocalFree(pmfDC); return NULL; } @@ -167,12 +168,14 @@ CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) { // MFDRV_DeleteDC( dc->physDev ); + LocalFree(pmfDC); return NULL; } if (!WriteFile( hFile, &pmfDC->mh, sizeof(pmfDC->mh), NULL, NULL )) { // MFDRV_DeleteDC( dc->physDev ); + LocalFree(pmfDC); return NULL; } pmfDC->hFile = hFile;

1 0

[janderwald] 42895: - fix build #2
by janderwald＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: janderwald Date: Mon Aug 24 01:05:23 2009 New Revision: 42895 URL: http://svn.reactos.org/svn/reactos?rev=42895&view=rev Log: - fix build #2 Modified: trunk/reactos/dll/directx/ksuser/ksuser.c Modified: trunk/reactos/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] Mon Aug 24 01:05:23 2009 @@ -177,7 +177,7 @@ *--*/ KSDDKAPI -NTSTATUS +DWORD NTAPI KsCreatePin(HANDLE FilterHandle, PKSPIN_CONNECT Connect,

1 0

[gschneider] 42894: Handle failed memory allocation
by gschneider＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: gschneider Date: Mon Aug 24 01:03:55 2009 New Revision: 42894 URL: http://svn.reactos.org/svn/reactos?rev=42894&view=rev Log: Handle failed memory allocation Modified: trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Mon Aug 24 01:03:55 2009 @@ -395,6 +395,10 @@ res = GetTextFaceW(hdc, 0, NULL); nameW = HeapAlloc( GetProcessHeap(), 0, res * 2 ); + if (nameW == NULL) + { + return 0; + } GetTextFaceW( hdc, res, nameW ); if (name)

1 0

[janderwald] 42893: - try fix build
by janderwald＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: janderwald Date: Mon Aug 24 00:56:06 2009 New Revision: 42893 URL: http://svn.reactos.org/svn/reactos?rev=42893&view=rev Log: - try fix build Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4289… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Aug 24 00:56:06 2009 @@ -3097,13 +3097,6 @@ Event Functions */ -KSDDKAPI NTSTATUS NTAPI -KsCreatePin( - IN HANDLE FilterHandle, - IN PKSPIN_CONNECT Connect, - IN ACCESS_MASK DesiredAccess, - OUT PHANDLE ConnectionHandle); - #if defined(_NTDDK_) #define KSPROBE_STREAMREAD 0x00000000 @@ -3219,7 +3212,12 @@ Connectivity Functions */ - +KSDDKAPI NTSTATUS NTAPI +KsCreatePin( + IN HANDLE FilterHandle, + IN PKSPIN_CONNECT Connect, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE ConnectionHandle); KSDDKAPI NTSTATUS NTAPI KsValidateConnectRequest( @@ -3701,6 +3699,18 @@ NTAPI KsPinGetConnectedPinFileObject( IN PKSPIN Pin + ); + +#else + +KSDDKAPI +DWORD +WINAPI +KsCreatePin( + IN HANDLE FilterHandle, + IN PKSPIN_CONNECT Connect, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE ConnectionHandle );

1 0

[janderwald] 42892: [KS] - Fix a few bugs in KsPinPropertyHandler & KsTopologyPropertyHandler [PORTCLS] - Implement retrieving KSPROPSETID's - Register KSCATEGORY_AUDIO_DEVICE as a temporary hack untill sysaudio is able to register device interfaces (bug 4556) Ks Studio is now able to instantiate audio filters on ReactOS
by janderwald＠svn.reactos.org 23 Aug '09

23 Aug '09

Author: janderwald Date: Mon Aug 24 00:50:09 2009 New Revision: 42892 URL: http://svn.reactos.org/svn/reactos?rev=42892&view=rev Log: [KS] - Fix a few bugs in KsPinPropertyHandler & KsTopologyPropertyHandler [PORTCLS] - Implement retrieving KSPROPSETID's - Register KSCATEGORY_AUDIO_DEVICE as a temporary hack untill sysaudio is able to register device interfaces (bug 4556) Ks Studio is now able to instantiate audio filters on ReactOS Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Mon Aug 24 00:50:09 2009 @@ -194,6 +194,8 @@ PVOID Buffer; PKSDATARANGE_AUDIO *WaveFormatOut; PKSDATAFORMAT_WAVEFORMATEX WaveFormatIn; + PULONG GuidBuffer; + static WCHAR Speaker[] = {L"PC-Speaker"}; IoStack = IoGetCurrentIrpStackLocation(Irp); Buffer = Irp->UserBuffer; @@ -243,7 +245,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + Irp->IoStatus.Status = STATUS_MORE_ENTRIES; break; } @@ -270,19 +272,30 @@ break; } - Size = sizeof(KSMULTIPLE_ITEM) + sizeof(KSPIN_INTERFACE) * Descriptor[Pin->PinId].InterfacesCount; - - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) - { - Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + /* calculate size */ + Size = sizeof(KSMULTIPLE_ITEM); + Size += max(1, Descriptor[Pin->PinId].InterfacesCount) * sizeof(KSPIN_INTERFACE); + + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Irp->IoStatus.Status = STATUS_MORE_ENTRIES; break; } Item = (KSMULTIPLE_ITEM*)Buffer; Item->Size = Size; - Item->Count = Descriptor[Pin->PinId].InterfacesCount; - RtlMoveMemory((PVOID)(Item + 1), Descriptor[Pin->PinId].Interfaces, Descriptor[Pin->PinId].InterfacesCount * sizeof(KSDATARANGE)); + + if (Descriptor[Pin->PinId].InterfacesCount) + { + Item->Count = Descriptor[Pin->PinId].InterfacesCount; + RtlMoveMemory((PVOID)(Item + 1), Descriptor[Pin->PinId].Interfaces, Descriptor[Pin->PinId].InterfacesCount * sizeof(KSPIN_INTERFACE)); + } + else + { + Item->Count = 1; + RtlMoveMemory((PVOID)(Item + 1), &StandardPinInterface, sizeof(KSPIN_INTERFACE)); + } Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Size; @@ -296,18 +309,30 @@ break; } - Size = sizeof(KSMULTIPLE_ITEM) + sizeof(KSPIN_MEDIUM) * Descriptor[Pin->PinId].MediumsCount; - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) - { - Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + /* calculate size */ + Size = sizeof(KSMULTIPLE_ITEM); + Size += max(1, Descriptor[Pin->PinId].MediumsCount) * sizeof(KSPIN_MEDIUM); + + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Irp->IoStatus.Status = STATUS_MORE_ENTRIES; break; } Item = (KSMULTIPLE_ITEM*)Buffer; Item->Size = Size; - Item->Count = Descriptor[Pin->PinId].MediumsCount; - RtlMoveMemory((PVOID)(Item + 1), Descriptor[Pin->PinId].Mediums, Descriptor[Pin->PinId].MediumsCount * sizeof(KSDATARANGE)); + + if (Descriptor[Pin->PinId].MediumsCount) + { + Item->Count = Descriptor[Pin->PinId].MediumsCount; + RtlMoveMemory((PVOID)(Item + 1), Descriptor[Pin->PinId].Mediums, Descriptor[Pin->PinId].MediumsCount * sizeof(KSPIN_MEDIUM)); + } + else + { + Item->Count = 1; + RtlMoveMemory((PVOID)(Item + 1), &StandardPinMedium, sizeof(KSPIN_MEDIUM)); + } Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Size; @@ -366,16 +391,19 @@ break; } - Size = sizeof(GUID); - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) - { - Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - break; - } - - - RtlMoveMemory(Buffer, &Descriptor[Pin->PinId].Name, sizeof(GUID)); + GuidBuffer = Buffer; + Size = sizeof(Speaker); + + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Irp->IoStatus.Status = STATUS_MORE_ENTRIES; + break; + } + + RtlMoveMemory(GuidBuffer, Speaker, sizeof(Speaker)); + + //RtlMoveMemory(Buffer, &Descriptor[Pin->PinId].Name, sizeof(GUID)); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Size; break; Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Mon Aug 24 00:50:09 2009 @@ -176,7 +176,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { Irp->IoStatus.Information = Size; - Status = STATUS_BUFFER_TOO_SMALL; + Status = STATUS_MORE_ENTRIES; break; } @@ -184,7 +184,10 @@ Item->Size = Size; Item->Count = Topology->CategoriesCount; - RtlMoveMemory((PVOID)(Item + 1), (PVOID)Topology->Categories, Topology->CategoriesCount * sizeof(GUID)); + if (Topology->CategoriesCount) + { + RtlMoveMemory((PVOID)(Item + 1), (PVOID)Topology->Categories, Topology->CategoriesCount * sizeof(GUID)); + } Irp->IoStatus.Information = Size; Status = STATUS_SUCCESS; break; @@ -194,7 +197,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { Irp->IoStatus.Information = Size; - Status = STATUS_BUFFER_TOO_SMALL; + Status = STATUS_MORE_ENTRIES; break; } @@ -203,6 +206,10 @@ Item->Count = Topology->TopologyNodesCount; RtlMoveMemory((PVOID)(Item + 1), (PVOID)Topology->TopologyNodes, Topology->TopologyNodesCount * sizeof(GUID)); + if (Topology->TopologyNodesCount) + { + RtlMoveMemory((PVOID)(Item + 1), (PVOID)Topology->TopologyNodes, Topology->TopologyNodesCount * sizeof(GUID)); + } Irp->IoStatus.Information = Size; Status = STATUS_SUCCESS; break; @@ -212,7 +219,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { Irp->IoStatus.Information = Size; - Status = STATUS_BUFFER_TOO_SMALL; + Status = STATUS_MORE_ENTRIES; break; } @@ -220,7 +227,11 @@ Item->Size = Size; Item->Count = Topology->TopologyConnectionsCount; - RtlMoveMemory((PVOID)(Item + 1), (PVOID)Topology->TopologyConnections, Topology->TopologyConnectionsCount * sizeof(KSTOPOLOGY_CONNECTION)); + if (Topology->TopologyConnections) + { + RtlMoveMemory((PVOID)(Item + 1), (PVOID)Topology->TopologyConnections, Topology->TopologyConnectionsCount * sizeof(KSTOPOLOGY_CONNECTION)); + } + Irp->IoStatus.Information = Size; Status = STATUS_SUCCESS; break; 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] Mon Aug 24 00:50:09 2009 @@ -165,6 +165,18 @@ IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) + { + DPRINT1("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); + + Irp->IoStatus.Status = STATUS_SUCCESS; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + + ASSERT(IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY); return PcPropertyHandler(Irp, This->Descriptor); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] Mon Aug 24 00:50:09 2009 @@ -21,6 +21,7 @@ const GUID IID_IMiniportMidi = {0xb4c90a41L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID IID_IMiniportWavePci = {0xb4c90a52L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; +const GUID GUID_NULL ={0x00000000L, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; const GUID IID_IPortTopology = {0xb4c90a30L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; 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] Mon Aug 24 00:50:09 2009 @@ -31,7 +31,7 @@ GUID KSPROPERTY_SETID_Topology = {0x720D4AC0L, 0x7533, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; -static GUID InterfaceGuids[3] = +static GUID InterfaceGuids[4] = { { /// KSCATEGORY_RENDER @@ -42,9 +42,14 @@ 0x65E8773DL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} }, { - /// KS_CATEGORY_AUDIO + //KS_CATEGORY_AUDIO 0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} - } + }, + { + ///KSCATEGORY_AUDIO_DEVICE + 0xFBF6F530L, 0x07B9, 0x11D2, {0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88} + } + }; DEFINE_KSPROPERTY_TOPOLOGYSET(PortFilterWaveCyclicTopologySet, TopologyPropertyHandler); @@ -363,7 +368,7 @@ /* create the subdevice descriptor */ Status = PcCreateSubdeviceDescriptor(&This->SubDeviceDescriptor, - 3, + 4, InterfaceGuids, 0, NULL, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Mon Aug 24 00:50:09 2009 @@ -302,6 +302,9 @@ DEFINE_KSPROPERTY_ITEM_PIN_INTERFACES(PropGeneral),\ DEFINE_KSPROPERTY_ITEM_PIN_MEDIUMS(PropGeneral),\ DEFINE_KSPROPERTY_ITEM_PIN_COMMUNICATION(PropGeneral),\ + DEFINE_KSPROPERTY_ITEM_PIN_GLOBALCINSTANCES(PropGeneral),\ + DEFINE_KSPROPERTY_ITEM_PIN_NECESSARYINSTANCES(PropGeneral),\ + DEFINE_KSPROPERTY_ITEM_PIN_PHYSICALCONNECTION(PropGeneral),\ DEFINE_KSPROPERTY_ITEM_PIN_CATEGORY(PropGeneral),\ DEFINE_KSPROPERTY_ITEM_PIN_NAME(PropGeneral),\ DEFINE_KSPROPERTY_ITEM_PIN_CONSTRAINEDDATARANGES(PropGeneral),\ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Mon Aug 24 00:50:09 2009 @@ -409,6 +409,68 @@ return STATUS_UNSUCCESSFUL; } +NTSTATUS +PcCountProperties( + IN PIRP Irp, + IN PSUBDEVICE_DESCRIPTOR Descriptor) +{ + ULONG Properties; + ULONG Index, Offset; + PIO_STACK_LOCATION IoStack; + LPGUID Guid; + + /* count property items */ + Properties = Descriptor->FilterPropertySet.FreeKsPropertySetOffset; + + if (Descriptor->DeviceDescriptor->AutomationTable) + { + Properties = Descriptor->DeviceDescriptor->AutomationTable->PropertyCount; + } + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* store output size */ + Irp->IoStatus.Information = sizeof(GUID) * Properties; + + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(GUID) * Properties) + { + /* buffer too small */ + Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_BUFFER_OVERFLOW; + } + + /* get output buffer */ + Guid = Irp->UserBuffer; + + + /* copy property guids from filter */ + Offset = 0; + for(Index = 0; Index < Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) + { + RtlMoveMemory(&Guid[Offset], Descriptor->FilterPropertySet.Properties[Index].Set, sizeof(GUID)); + Offset++; + } + + if (Descriptor->DeviceDescriptor->AutomationTable) + { + /* copy property guids from driver */ + for(Index = 0; Index < Descriptor->DeviceDescriptor->AutomationTable->PropertyCount; Index++) + { + RtlMoveMemory(&Guid[Offset], Descriptor->DeviceDescriptor->AutomationTable->Properties[Index].Set, sizeof(GUID)); + Offset++; + } + } + + /* done */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI @@ -428,6 +490,12 @@ Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; ASSERT(Property); + + if (IsEqualGUIDAligned(&Property->Set, &GUID_NULL) && Property->Id == 0 && Property->Flags == KSPROPERTY_TYPE_SETSUPPORT) + { + return PcCountProperties(Irp, Descriptor); + } + /* check properties provided by the driver */ if (Descriptor->DeviceDescriptor->AutomationTable) @@ -478,7 +546,7 @@ else { RtlStringFromGUID(&Property->Set, &GuidString); - DPRINT1("Unhandeled property: Set %S Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); + DPRINT1("Unhandeled property: Set %S Id %u Flags %x InputLength %u OutputLength %u\n", GuidString.Buffer, Property->Id, Property->Flags, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); RtlFreeUnicodeString(&GuidString); }

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