Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 42611: - Check if allocation succeeded - Wait untill each audio service has been started - May now fix randomly playing logon sound
by janderwald＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: janderwald Date: Tue Aug 11 12:37:40 2009 New Revision: 42611 URL: http://svn.reactos.org/svn/reactos?rev=42611&view=rev Log: - Check if allocation succeeded - Wait untill each audio service has been started - May now fix randomly playing logon sound Modified: trunk/reactos/base/services/audiosrv/pnp.c trunk/reactos/base/services/audiosrv/services.c Modified: trunk/reactos/base/services/audiosrv/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/pnp… ============================================================================== --- trunk/reactos/base/services/audiosrv/pnp.c [iso-8859-1] (original) +++ trunk/reactos/base/services/audiosrv/pnp.c [iso-8859-1] Tue Aug 11 12:37:40 2009 @@ -60,6 +60,12 @@ (PSP_DEVICE_INTERFACE_DETAIL_DATA_W)HeapAlloc(GetProcessHeap(), 0, length); + + if ( ! detail_data ) + { + logmsg("ProcessExistingDevices() failed to allocate detail_data\n"); + return TRUE; + } while ( SetupDiEnumDeviceInterfaces(dev_info, Modified: trunk/reactos/base/services/audiosrv/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/ser… ============================================================================== --- trunk/reactos/base/services/audiosrv/services.c [iso-8859-1] (original) +++ trunk/reactos/base/services/audiosrv/services.c [iso-8859-1] Tue Aug 11 12:37:40 2009 @@ -17,51 +17,86 @@ #include <audiosrv/audiosrv.h> #include "audiosrv.h" +BOOL +WaitForService( + SC_HANDLE hService, + ULONG RetryCount) +{ + ULONG Index = 0; + DWORD dwSize; + SERVICE_STATUS_PROCESS Info; + + do + { + if (!QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)&Info, sizeof(SERVICE_STATUS_PROCESS), &dwSize)) + { + logmsg("QueryServiceStatusEx failed %x\n", GetLastError()); + break; + } + + if (Info.dwCurrentState == SERVICE_RUNNING) + return TRUE; + + Sleep(1000); + + }while(Index++ < RetryCount); + + logmsg("Timeout while waiting for service to become ready %p\n", hService); + + return FALSE; +} + +BOOL +StartAudioService( + SC_HANDLE hSCManager, + LPWSTR ServiceName, + ULONG RetryCount) +{ + SC_HANDLE hService; + BOOL ret; + + hService = OpenService(hSCManager, ServiceName, SERVICE_ALL_ACCESS); + + if (!hService) + { + logmsg("Failed to open service %S %x\n", ServiceName, GetLastError()); + return FALSE; + } + + if (!StartService(hService, 0, NULL)) + { + logmsg("Failed to start service %S %x\n", ServiceName, GetLastError()); + CloseServiceHandle(hService); + return FALSE; + } + + ret = WaitForService(hService, RetryCount); + + CloseServiceHandle(hService); + return ret; +} + + + BOOL StartSystemAudioServices() { - SC_HANDLE hSCManager, hService; + SC_HANDLE hSCManager; logmsg("Starting system audio services\n"); hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); if (!hSCManager) { - logmsg("Failed to open service manager\n"); + logmsg("Failed to open service manager %x\n", GetLastError()); return FALSE; } - hService = OpenService(hSCManager, L"sysaudio", SERVICE_ALL_ACCESS); - if (hService) - { - if (!StartService(hService, 0, NULL)) - { - logmsg("Failed to start sysaudio service\n"); - CloseServiceHandle(hService); - CloseServiceHandle(hSCManager); - return FALSE; - } - CloseServiceHandle(hService); - logmsg("Sysaudio service started\n"); - // FIXME - // wait untill service is started - } - - hService = OpenService(hSCManager, L"wdmaud", SERVICE_ALL_ACCESS); - if (hService) - { - if (!StartService(hService, 0, NULL)) - { - logmsg("Failed to start sysaudio service\n"); - CloseServiceHandle(hService); - CloseServiceHandle(hSCManager); - return FALSE; - } - CloseServiceHandle(hService); - logmsg("Wdmaud service started\n"); - } - + logmsg("Starting sysaudio service\n"); + StartAudioService(hSCManager, L"sysaudio", 20); + logmsg("Starting wdmaud service\n"); + StartAudioService(hSCManager, L"wdmaud", 20); CloseServiceHandle(hSCManager); return TRUE;

1 0

[janderwald] 42610: - Audiosrv first starts sysaudio and then wdmaud. It is more clever to wait untill the latter is started
by janderwald＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: janderwald Date: Tue Aug 11 12:36:25 2009 New Revision: 42610 URL: http://svn.reactos.org/svn/reactos?rev=42610&view=rev Log: - Audiosrv first starts sysaudio and then wdmaud. It is more clever to wait untill the latter is started Modified: trunk/reactos/base/system/winlogon/winlogon.c 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] Tue Aug 11 12:36:25 2009 @@ -65,7 +65,7 @@ if (!hSCManager) ExitThread(0);; - hService = OpenServiceW(hSCManager, L"sysaudio", GENERIC_READ); + hService = OpenServiceW(hSCManager, L"wdmaud", GENERIC_READ); if (!hService) { CloseServiceHandle(hSCManager);

1 0

[janderwald] 42609: - Add sanity checks
by janderwald＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: janderwald Date: Tue Aug 11 11:41:33 2009 New Revision: 42609 URL: http://svn.reactos.org/svn/reactos?rev=42609&view=rev Log: - Add sanity checks Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/pnp.c Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/pnp.c [iso-8859-1] Tue Aug 11 11:41:33 2009 @@ -156,6 +156,10 @@ /* Get driver object extension */ DriverObjectExtension = IoGetDriverObjectExtension(DeviceObject->DriverObject, (PVOID)StreamClassAddDevice); + + /* sanity checks */ + ASSERT(DeviceExtension); + ASSERT(DriverObjectExtension); /* Zero request block */ RtlZeroMemory(RequestBlock, ResultLength);

1 0

[janderwald] 42608: - Fix allocation check - Found by Amine Khaldi
by janderwald＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: janderwald Date: Tue Aug 11 11:36:41 2009 New Revision: 42608 URL: http://svn.reactos.org/svn/reactos?rev=42608&view=rev Log: - Fix allocation check - Found by Amine Khaldi Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Tue Aug 11 11:36:41 2009 @@ -65,7 +65,7 @@ } ResultOut = ExAllocatePool(NonPagedPool, NewSamples * NumChannels * BytesPerSample); - if (!FloatOut) + if (!ResultOut) { ExFreePool(FloatIn); ExFreePool(FloatOut);

1 0

[janderwald] 42607: [KS] - Fix uninitialized return value when the list is empty - Fix a horrible bug where the end of the list wasnt checked by the source list but the destination list - Found by Amine Khaldi
by janderwald＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: janderwald Date: Tue Aug 11 11:20:15 2009 New Revision: 42607 URL: http://svn.reactos.org/svn/reactos?rev=42607&view=rev Log: [KS] - Fix uninitialized return value when the list is empty - Fix a horrible bug where the end of the list wasnt checked by the source list but the destination list - Found by Amine Khaldi Modified: trunk/reactos/drivers/ksfilter/ks/irp.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] Tue Aug 11 11:20:15 2009 @@ -1075,7 +1075,7 @@ KIRQL OldLevel; PLIST_ENTRY SrcEntry; PIRP Irp; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; if (!DestinationLock) { @@ -1111,7 +1111,7 @@ SrcEntry = SrcEntry->Blink; } - if (SrcEntry == DestinationList) + if (SrcEntry == SourceList) { /* eof list reached */ break;

1 0

[janderwald] 42606: - Remove superflouous checks - Found by amine48rz
by janderwald＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: janderwald Date: Tue Aug 11 10:49:30 2009 New Revision: 42606 URL: http://svn.reactos.org/svn/reactos?rev=42606&view=rev Log: - Remove superflouous checks - Found by amine48rz Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Tue Aug 11 10:49:30 2009 @@ -91,7 +91,7 @@ IN ULONG DeviceExtensionSize) { NTSTATUS status = STATUS_UNSUCCESSFUL; - PDEVICE_OBJECT fdo = NULL; + PDEVICE_OBJECT fdo; PDEVICE_OBJECT PrevDeviceObject; PPCLASS_DEVICE_EXTENSION portcls_ext = NULL; @@ -200,27 +200,21 @@ cleanup: - if (portcls_ext) - { - - if (portcls_ext->KsDeviceHeader) - { - /* free the device header */ - KsFreeDeviceHeader(portcls_ext->KsDeviceHeader); - } - - if (portcls_ext->CreateItems) - { - /* free previously allocated create items */ - FreeItem(portcls_ext->CreateItems, TAG_PORTCLASS); - } - } - - if (fdo) - { - /* delete created fdo */ - IoDeleteDevice(fdo); - } + if (portcls_ext->KsDeviceHeader) + { + /* free the device header */ + KsFreeDeviceHeader(portcls_ext->KsDeviceHeader); + } + + if (portcls_ext->CreateItems) + { + /* free previously allocated create items */ + FreeItem(portcls_ext->CreateItems, TAG_PORTCLASS); + } + + /* delete created fdo */ + IoDeleteDevice(fdo); + return status; }

1 0

[tkreuzer] 42605: Move stubs for user mode printer drivers from stubs.c into umpdstubs.c. Unimplement some of them, as they were wrong.
by tkreuzer＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: tkreuzer Date: Tue Aug 11 00:20:28 2009 New Revision: 42605 URL: http://svn.reactos.org/svn/reactos?rev=42605&view=rev Log: Move stubs for user mode printer drivers from stubs.c into umpdstubs.c. Unimplement some of them, as they were wrong. Added: trunk/reactos/subsystems/win32/win32k/stubs/umpdstubs.c (with props) Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Tue Aug 11 00:20:28 2009 @@ -328,7 +328,6 @@ return 0; } - DWORD APIENTRY EngSetPrinterData( @@ -382,7 +381,6 @@ return FALSE; } - INT APIENTRY EngWideCharToMultiByte( @@ -660,8 +658,6 @@ UNIMPLEMENTED; return FALSE; } - - /* * @unimplemented @@ -690,8 +686,6 @@ UNIMPLEMENTED; return EHN_ERROR; } - - /* * @unimplemented @@ -753,7 +747,6 @@ return FileTime; } - /* * @unimplemented */ @@ -821,7 +814,6 @@ /* * @unimplemented */ - BOOL APIENTRY NtGdiAnyLinkedFonts() @@ -833,485 +825,12 @@ /* * @unimplemented */ -HANDLE -APIENTRY -NtGdiBRUSHOBJ_hGetColorTransform( - IN BRUSHOBJ *Brush) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ -PVOID APIENTRY -NtGdiBRUSHOBJ_pvAllocRbrush(IN BRUSHOBJ *BrushObj, - IN ULONG ObjSize) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ -PVOID APIENTRY -NtGdiBRUSHOBJ_pvGetRbrush(IN BRUSHOBJ *BrushObj) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ -ULONG APIENTRY -NtGdiBRUSHOBJ_ulGetBrushColor(BRUSHOBJ *pbo) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtGdiCLIPOBJ_bEnum( IN CLIPOBJ *ClipObj, - IN ULONG ObjSize, - OUT ULONG *EnumRects) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -ULONG APIENTRY -NtGdiCLIPOBJ_cEnumStart(IN CLIPOBJ *ClipObj, - IN BOOL ShouldDoAll, - IN ULONG ClipType, - IN ULONG BuildOrder, - IN ULONG MaxRects) -{ - UNIMPLEMENTED; - return 0; -} - - -/* - * @unimplemented - */ -PATHOBJ* APIENTRY -NtGdiCLIPOBJ_ppoGetPath(CLIPOBJ *ClipObj) -{ - UNIMPLEMENTED; - return NULL; -} - - -/* - * @unimplemented - */ BOOL APIENTRY NtGdiEnableEudc(BOOL enable) { UNIMPLEMENTED; return FALSE; -} - - -/* - * @unimplemented - */ -BOOL APIENTRY -NtGdiEngAssociateSurface(IN HSURF Surface, - IN HDEV Dev, - IN ULONG Hooks) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -CLIPOBJ* APIENTRY -NtGdiEngCreateClip(VOID) -{ - UNIMPLEMENTED; - return NULL; -} - - -/* - * @unimplemented - */ -VOID APIENTRY -NtGdiEngDeleteClip(CLIPOBJ *ClipRegion) -{ - UNIMPLEMENTED; -} - - -/* - * @unimplemented - */ -BOOL APIENTRY -NtGdiEngCheckAbort(SURFOBJ *pso) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @implemented - */ -HSURF APIENTRY -NtGdiEngCreateDeviceSurface( IN DHSURF Surface, - IN SIZEL Size, - IN ULONG FormatVersion) -{ - if ( FormatVersion <= BMF_8RLE && - FormatVersion >= BMF_1BPP ) - return EngCreateDeviceSurface(Surface, Size, FormatVersion); - else - return NULL; -} - -/* - * @implemented - */ -HBITMAP APIENTRY -NtGdiEngCreateDeviceBitmap( - IN DHSURF dhsurf, - IN SIZEL sizl, - IN ULONG iFormatCompat) -{ - if ( ( sizl.cx > 0 && sizl.cy > 0 && (((LONGLONG)(sizl.cy * sizl.cx)) <= 0xFFFFFFFFULL) ) && - iFormatCompat <= BMF_8RLE && - iFormatCompat >= BMF_1BPP ) - return EngCreateDeviceBitmap(dhsurf, sizl, iFormatCompat); - else - return NULL; -} - - -/* - * @unimplemented - */ -BOOL APIENTRY -NtGdiEngCopyBits(SURFOBJ *Dest, - SURFOBJ *Source, - CLIPOBJ *Clip, - XLATEOBJ *ColorTranslation, - RECTL *DestRect, - POINTL *SourcePoint) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @implemented - */ -HBITMAP APIENTRY -NtGdiEngCreateBitmap(IN SIZEL Size, - IN LONG Width, - IN ULONG Format, - IN ULONG Flags, - IN PVOID Bits) -{ - return EngCreateBitmap(Size, - Width, - Format, - Flags, - Bits); -} - - -/* - * @implemented - */ -HPALETTE APIENTRY -NtGdiEngCreatePalette(IN ULONG Mode, - IN ULONG NumColors, - IN ULONG *Colors, - IN ULONG Red, - IN ULONG Green, - IN ULONG Blue) -{ - return EngCreatePalette( Mode, - NumColors, - Colors, - Red, - Green, - Blue); -} - -BOOL APIENTRY -NtGdiEngTransparentBlt(IN SURFOBJ *Dest, - IN SURFOBJ *Source, - IN CLIPOBJ *Clip, - IN XLATEOBJ *ColorTranslation, - IN PRECTL DestRect, - IN PRECTL SourceRect, - IN ULONG TransparentColor, - IN ULONG Reserved) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL APIENTRY -NtGdiEngTextOut(SURFOBJ *pso, - STROBJ *pstro, - FONTOBJ *pfo, - CLIPOBJ *pco, - RECTL *prclExtra, - RECTL *prclOpaque, - BRUSHOBJ *pboFore, - BRUSHOBJ *pboOpaque, - POINTL *pptlOrg, - MIX mix) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtGdiEngStrokePath(SURFOBJ *pso, - PATHOBJ *ppo, - CLIPOBJ *pco, - XFORMOBJ *pxo, - BRUSHOBJ *pbo, - POINTL *pptlBrushOrg, - LINEATTRS *plineattrs, - MIX mix) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @implemented - */ -BOOL APIENTRY -NtGdiEngDeletePalette(IN HPALETTE Palette) -{ - return EngDeletePalette(Palette); -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtGdiEngStrokeAndFillPath(SURFOBJ *pso, - PATHOBJ *ppo, - CLIPOBJ *pco, - XFORMOBJ *pxo, - BRUSHOBJ *pboStroke, - LINEATTRS *plineattrs, - BRUSHOBJ *pboFill, - POINTL *pptlBrushOrg, - MIX mixFill, - FLONG flOptions) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -VOID APIENTRY -NtGdiEngDeletePath(PATHOBJ *ppo) -{ - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtGdiEngDeleteSurface(IN HSURF Surface) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtGdiEngEraseSurface(SURFOBJ *Surface, - RECTL *Rect, - ULONG iColor) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtGdiEngFillPath(SURFOBJ *pso, - PATHOBJ *ppo, - CLIPOBJ *pco, - BRUSHOBJ *pbo, - POINTL *pptlBrushOrg, - MIX mix, - FLONG flOptions) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL APIENTRY -NtGdiEngGradientFill(SURFOBJ *psoDest, - CLIPOBJ *pco, - XLATEOBJ *pxlo, - TRIVERTEX *pVertex, - ULONG nVertex, - PVOID pMesh, - ULONG nMesh, - RECTL *prclExtents, - POINTL *pptlDitherOrg, - ULONG ulMode) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL APIENTRY -NtGdiEngLineTo(SURFOBJ *Surface, - CLIPOBJ *Clip, - BRUSHOBJ *Brush, - LONG x1, - LONG y1, - LONG x2, - LONG y2, - RECTL *RectBounds, - MIX mix) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL APIENTRY -NtGdiEngMarkBandingSurface(HSURF hsurf) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL APIENTRY -NtGdiEngPaint(IN SURFOBJ *Surface, - IN CLIPOBJ *ClipRegion, - IN BRUSHOBJ *Brush, - IN POINTL *BrushOrigin, - IN MIX Mix) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtGdiEngPlgBlt(SURFOBJ *psoTrg, - SURFOBJ *psoSrc, - SURFOBJ *psoMsk, - CLIPOBJ *pco, - XLATEOBJ *pxlo, - COLORADJUSTMENT *pca, - POINTL *pptlBrushOrg, - POINTFIX *pptfx, - RECTL *prcl, - POINTL *pptl, - ULONG iMode) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtGdiEngStretchBltROP(SURFOBJ *psoDest, - SURFOBJ *psoSrc, - SURFOBJ *psoMask, - CLIPOBJ *pco, - XLATEOBJ *pxlo, - COLORADJUSTMENT *pca, - POINTL *pptlHTOrg, - RECTL *prclDest, - RECTL *prclSrc, - POINTL *pptlMask, - ULONG iMode, - BRUSHOBJ *pbo, - DWORD rop4) -{ - UNIMPLEMENTED; - return FALSE; -} - -FD_GLYPHSET* APIENTRY -NtGdiEngComputeGlyphSet( INT nCodePage, - INT nFirstChar, - INT cChars) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ -ULONG -APIENTRY -NtGdiFONTOBJ_cGetAllGlyphHandles(IN FONTOBJ *FontObj, - IN HGLYPH *Glyphs) -{ - UNIMPLEMENTED; - return 0; -} - - -/* - * @unimplemented - */ -ULONG -APIENTRY -NtGdiFONTOBJ_cGetGlyphs(IN FONTOBJ *FontObj, - IN ULONG Mode, - IN ULONG NumGlyphs, - IN HGLYPH *GlyphHandles, - IN PVOID *OutGlyphs) -{ - UNIMPLEMENTED; - return 0; } /* @@ -1346,7 +865,6 @@ return NULL; } - /* * @unimplemented */ @@ -1373,7 +891,6 @@ UNIMPLEMENTED; return FALSE; } - /* * @unimplemented @@ -1418,7 +935,6 @@ return NULL; } - /* * @unimplemented */ @@ -1439,80 +955,6 @@ /* * @unimplemented */ -PFD_GLYPHATTR -APIENTRY -NtGdiFONTOBJ_pQueryGlyphAttrs( - IN FONTOBJ *pfo, - IN ULONG iMode) -{ - UNIMPLEMENTED; - return NULL; -} - - /* - * @unimplemented - */ -IFIMETRICS* -APIENTRY -NtGdiFONTOBJ_pifi( - IN FONTOBJ *pfo) -{ - UNIMPLEMENTED; - return NULL; -} - - /* - * @unimplemented - */ -FD_GLYPHSET* -APIENTRY -NtGdiFONTOBJ_pfdg(IN FONTOBJ *pfo) -{ - UNIMPLEMENTED; - return NULL; -} - - /* - * @unimplemented - */ -PVOID -APIENTRY -NtGdiFONTOBJ_pvTrueTypeFontFile( - IN FONTOBJ *pfo, - OUT ULONG *pcjFile -) -{ - UNIMPLEMENTED; - return NULL; -} - - /* - * @unimplemented - */ -VOID -APIENTRY -NtGdiFONTOBJ_vGetInfo( - IN FONTOBJ *pfo, - IN ULONG cjSize, - OUT FONTINFO *pfi) -{ - UNIMPLEMENTED; -} - - /* - * @unimplemented - */ -XFORMOBJ* -APIENTRY -NtGdiFONTOBJ_pxoGetXform(IN FONTOBJ *pfo) -{ - UNIMPLEMENTED; - return NULL; -} - - /* - * @unimplemented - */ HBRUSH APIENTRY NtGdiClearBrushAttributes( @@ -1570,7 +1012,6 @@ return FALSE; } - /* * @unimplemented */ @@ -1626,7 +1067,6 @@ UNIMPLEMENTED; return FALSE; } - /* * @unimplemented @@ -1790,7 +1230,6 @@ return 0; } - /* * @unimplemented */ @@ -1801,7 +1240,6 @@ UNIMPLEMENTED; return FALSE; } - /* * @unimplemented @@ -1862,7 +1300,6 @@ return 0; } - /* * @unimplemented */ @@ -1904,81 +1341,11 @@ return FALSE; } - - /* - * @unimplemented - */ -BOOL -NtGdiUMPDEngFreeUserMem( - IN KERNEL_PVOID *ppv) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -NtGdiBRUSHOBJ_DeleteRbrush( - IN BRUSHOBJ *pbo, - IN BRUSHOBJ *pboB) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -NtGdiSetPUMPDOBJ( - IN HUMPD humpd, - IN BOOL bStoreID, - OUT HUMPD *phumpd, - OUT BOOL *pbWOW64) -{ - UNIMPLEMENTED; - return FALSE; -} - /* * @unimplemented */ BOOL NtGdiUpdateTransform(IN HDC hdc) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -LONG -APIENTRY -NtGdiHT_Get8BPPMaskPalette( - OUT OPTIONAL LPPALETTEENTRY pPaletteEntry, - IN BOOL Use8BPPMaskPal, - IN BYTE CMYMask, - IN USHORT RedGamma, - IN USHORT GreenGamma, - IN USHORT BlueGamma) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -LONG -APIENTRY -NtGdiHT_Get8BPPFormatPalette( - OUT OPTIONAL LPPALETTEENTRY pPaletteEntry, - IN USHORT RedGamma, - IN USHORT GreenGamma, - IN USHORT BlueGamma) { UNIMPLEMENTED; return FALSE; @@ -2017,81 +1384,12 @@ */ BOOL APIENTRY -NtGdiPATHOBJ_bEnum( - IN PATHOBJ *ppo, - OUT PATHDATA *ppd) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiPATHOBJ_bEnumClipLines( - IN PATHOBJ *ppo, - IN ULONG cb, - OUT CLIPLINE *pcl) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -VOID -APIENTRY -NtGdiPATHOBJ_vGetBounds( - IN PATHOBJ *ppo, - OUT PRECTFX prectfx) -{ - UNIMPLEMENTED; -} - - - - /* - * @unimplemented - */ -VOID -APIENTRY -NtGdiPATHOBJ_vEnumStart( - IN PATHOBJ *ppo) -{ - UNIMPLEMENTED; -} - - /* - * @unimplemented - */ -VOID -APIENTRY -NtGdiPATHOBJ_vEnumStartClipLines( - IN PATHOBJ *ppo, - IN CLIPOBJ *pco, - IN SURFOBJ *pso, - IN LINEATTRS *pla) -{ - UNIMPLEMENTED; -} - - - /* - * @unimplemented - */ -BOOL -APIENTRY NtGdiRemoveFontMemResourceEx( IN HANDLE hMMFont) { UNIMPLEMENTED; return FALSE; } - - /* * @unimplemented */ @@ -2140,76 +1438,6 @@ return STATUS_NOT_IMPLEMENTED; } - - /* - * @unimplemented - */ -ULONG -APIENTRY -NtGdiXLATEOBJ_cGetPalette( - IN XLATEOBJ *pxlo, - IN ULONG iPal, - IN ULONG cPal, - OUT ULONG *pPal) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -ULONG -APIENTRY -NtGdiXLATEOBJ_iXlate( - IN XLATEOBJ *pxlo, - IN ULONG iColor) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -HANDLE -APIENTRY -NtGdiXLATEOBJ_hGetColorTransform( - IN XLATEOBJ *pxlo) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiXFORMOBJ_bApplyXform( - IN XFORMOBJ *pxo, - IN ULONG iMode, - IN ULONG cPoints, - IN PVOID pvIn, - OUT PVOID pvOut) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -ULONG -APIENTRY -NtGdiXFORMOBJ_iGetXform( - IN XFORMOBJ *pxo, - OUT OPTIONAL XFORML *pxform) -{ - UNIMPLEMENTED; - return 0; -} - /* * @unimplemented */ @@ -2235,72 +1463,6 @@ { UNIMPLEMENTED; return NULL; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiSTROBJ_bEnum( - IN STROBJ *pstro, - OUT ULONG *pc, - OUT PGLYPHPOS *ppgpos) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiSTROBJ_bEnumPositionsOnly( - IN STROBJ *pstro, - OUT ULONG *pc, - OUT PGLYPHPOS *ppgpos) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiSTROBJ_bGetAdvanceWidths( - IN STROBJ*pstro, - IN ULONG iFirst, - IN ULONG c, - OUT POINTQF*pptqD) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -VOID -APIENTRY -NtGdiSTROBJ_vEnumStart( - IN STROBJ *pstro) -{ - UNIMPLEMENTED; -} - - /* - * @unimplemented - */ -DWORD -APIENTRY -NtGdiSTROBJ_dwGetCodePage( - IN STROBJ *pstro) -{ - UNIMPLEMENTED; - return 0; } /* @@ -2398,7 +1560,6 @@ return FALSE; } - /* * @unimplemented */ Added: trunk/reactos/subsystems/win32/win32k/stubs/umpdstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/umpdstubs.c (added) +++ trunk/reactos/subsystems/win32/win32k/stubs/umpdstubs.c [iso-8859-1] Tue Aug 11 00:20:28 2009 @@ -1,0 +1,699 @@ +#include <w32k.h> + +#define UNIMPLEMENTED DbgPrint("(%s:%i) WIN32K: %s UNIMPLEMENTED\n", __FILE__, __LINE__, __FUNCTION__ ) + +BOOL +//APIENTRY +NtGdiUMPDEngFreeUserMem( + IN KERNEL_PVOID *ppv) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +//APIENTRY +NtGdiSetPUMPDOBJ( + IN HUMPD humpd, + IN BOOL bStoreID, + OUT HUMPD *phumpd, + OUT BOOL *pbWOW64) +{ + UNIMPLEMENTED; + return FALSE; +} + +HANDLE +APIENTRY +NtGdiBRUSHOBJ_hGetColorTransform( + IN BRUSHOBJ *pbo) +{ + UNIMPLEMENTED; + return NULL; +} + +PVOID +APIENTRY +NtGdiBRUSHOBJ_pvAllocRbrush( + IN BRUSHOBJ *pbo, + IN ULONG cj) +{ + UNIMPLEMENTED; + return NULL; +} + +PVOID +APIENTRY +NtGdiBRUSHOBJ_pvGetRbrush( + IN BRUSHOBJ *pbo) +{ + UNIMPLEMENTED; + return NULL; +} + +ULONG +APIENTRY +NtGdiBRUSHOBJ_ulGetBrushColor( + BRUSHOBJ *pbo) +{ + UNIMPLEMENTED; + return 0; +} + +BOOL +//APIENTRY +NtGdiBRUSHOBJ_DeleteRbrush( + IN BRUSHOBJ *pbo, + IN BRUSHOBJ *pboB) +{ + UNIMPLEMENTED; + return 0; +} + +BOOL +APIENTRY +NtGdiCLIPOBJ_bEnum( + IN CLIPOBJ *pco, + IN ULONG cj, + OUT ULONG *pv) +{ + UNIMPLEMENTED; + return FALSE; +} + +ULONG +APIENTRY +NtGdiCLIPOBJ_cEnumStart( + IN CLIPOBJ *pco, + IN BOOL bAll, + IN ULONG iType, + IN ULONG iDirection, + IN ULONG cLimit) +{ + UNIMPLEMENTED; + return 0; +} + +PATHOBJ* +APIENTRY +NtGdiCLIPOBJ_ppoGetPath( + CLIPOBJ *pco) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +APIENTRY +NtGdiEngAssociateSurface( + IN HSURF hsurf, + IN HDEV hdev, + IN ULONG flHooks) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiEngCheckAbort( + IN SURFOBJ *pso) +{ + UNIMPLEMENTED; + return FALSE; +} + +FD_GLYPHSET* +APIENTRY +NtGdiEngComputeGlyphSet( + INT nCodePage, + INT nFirstChar, + INT cChars) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +APIENTRY +NtGdiEngCopyBits( + SURFOBJ *psoDest, + SURFOBJ *psoSrc, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + RECTL *prclDest, + POINTL *pptlSrc) +{ + UNIMPLEMENTED; + return FALSE; +} + +HBITMAP +APIENTRY +NtGdiEngCreateBitmap( + IN SIZEL sizl, + IN LONG lWidth, + IN ULONG iFormat, + IN ULONG fl, + IN PVOID pvBits) +{ + UNIMPLEMENTED; + return NULL; +} + +CLIPOBJ* +APIENTRY +NtGdiEngCreateClip(VOID) +{ + UNIMPLEMENTED; + return NULL; +} + +HBITMAP +APIENTRY +NtGdiEngCreateDeviceBitmap( + IN DHSURF dhsurf, + IN SIZEL sizl, + IN ULONG iFormatCompat) +{ + UNIMPLEMENTED; + return NULL; +} + +HSURF +APIENTRY +NtGdiEngCreateDeviceSurface( + IN DHSURF dhsurf, + IN SIZEL sizl, + IN ULONG iFormatCompat) +{ + UNIMPLEMENTED; + return NULL; +} + +HPALETTE +APIENTRY +NtGdiEngCreatePalette( + IN ULONG iMode, + IN ULONG cColors, + IN ULONG *pulColors, + IN ULONG flRed, + IN ULONG flGreen, + IN ULONG flBlue) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +APIENTRY +NtGdiEngDeleteClip( + CLIPOBJ *pco) +{ + UNIMPLEMENTED; +} + +BOOL +APIENTRY +NtGdiEngDeletePalette( + IN HPALETTE hpal) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +APIENTRY +NtGdiEngDeletePath( + IN PATHOBJ *ppo) +{ + UNIMPLEMENTED; +} + +BOOL +APIENTRY +NtGdiEngDeleteSurface( + IN HSURF hsurf) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiEngEraseSurface( + SURFOBJ *pso, + RECTL *prcl, + ULONG iColor) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiEngFillPath( + SURFOBJ *pso, + PATHOBJ *ppo, + CLIPOBJ *pco, + BRUSHOBJ *pbo, + POINTL *pptlBrushOrg, + MIX mix, + FLONG flOptions) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiEngGradientFill( + SURFOBJ *psoDest, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + TRIVERTEX *pVertex, + ULONG nVertex, + PVOID pMesh, + ULONG nMesh, + RECTL *prclExtents, + POINTL *pptlDitherOrg, + ULONG ulMode) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiEngLineTo( + IN SURFOBJ *pso, + IN CLIPOBJ *pco, + IN BRUSHOBJ *pbo, + IN LONG x1, + IN LONG y1, + IN LONG x2, + IN LONG y2, + IN RECTL *prclBounds, + IN MIX mix) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiEngMarkBandingSurface( + HSURF hsurf) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiEngPaint( + IN SURFOBJ *pso, + IN CLIPOBJ *pco, + IN BRUSHOBJ *pbo, + IN POINTL *pptlBrushOrg, + IN MIX mix) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiEngPlgBlt( + SURFOBJ *psoTrg, + SURFOBJ *psoSrc, + SURFOBJ *psoMsk, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + COLORADJUSTMENT *pca, + POINTL *pptlBrushOrg, + POINTFIX *pptfx, + RECTL *prcl, + POINTL *pptl, + ULONG iMode) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiEngStretchBltROP( + SURFOBJ *psoDest, + SURFOBJ *psoSrc, + SURFOBJ *psoMask, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + COLORADJUSTMENT *pca, + POINTL *pptlHTOrg, + RECTL *prclDest, + RECTL *prclSrc, + POINTL *pptlMask, + ULONG iMode, + BRUSHOBJ *pbo, + DWORD rop4) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiEngStrokePath( + SURFOBJ *pso, + PATHOBJ *ppo, + CLIPOBJ *pco, + XFORMOBJ *pxo, + BRUSHOBJ *pbo, + POINTL *pptlBrushOrg, + LINEATTRS *plineattrs, + MIX mix) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiEngStrokeAndFillPath( + SURFOBJ *pso, + PATHOBJ *ppo, + CLIPOBJ *pco, + XFORMOBJ *pxo, + BRUSHOBJ *pboStroke, + LINEATTRS *plineattrs, + BRUSHOBJ *pboFill, + POINTL *pptlBrushOrg, + MIX mixFill, + FLONG flOptions) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiEngTextOut( + SURFOBJ *pso, + STROBJ *pstro, + FONTOBJ *pfo, + CLIPOBJ *pco, + RECTL *prclExtra, + RECTL *prclOpaque, + BRUSHOBJ *pboFore, + BRUSHOBJ *pboOpaque, + POINTL *pptlOrg, + MIX mix) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiEngTransparentBlt( + IN SURFOBJ *psoDst, + IN SURFOBJ *psoSrc, + IN CLIPOBJ *pco, + IN XLATEOBJ *pxlo, + IN PRECTL prclDst, + IN PRECTL prclSrc, + IN ULONG iTransColor, + IN ULONG ulReserved) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +APIENTRY +NtGdiFONTOBJ_vGetInfo( + IN FONTOBJ *pfo, + IN ULONG cjSize, + OUT FONTINFO *pfi) +{ + UNIMPLEMENTED; +} + +XFORMOBJ* +APIENTRY +NtGdiFONTOBJ_pxoGetXform( + IN FONTOBJ *pfo) +{ + UNIMPLEMENTED; + return NULL; +} + +ULONG +APIENTRY +NtGdiFONTOBJ_cGetGlyphs( + IN FONTOBJ *pfo, + IN ULONG iMode, + IN ULONG cGlyph, + IN HGLYPH *phg, + IN PVOID *ppvGlyph) +{ + UNIMPLEMENTED; + return 0; +} + +IFIMETRICS* +APIENTRY +NtGdiFONTOBJ_pifi( + IN FONTOBJ *pfo) +{ + UNIMPLEMENTED; + return NULL; +} + +FD_GLYPHSET* +APIENTRY +NtGdiFONTOBJ_pfdg( + IN FONTOBJ *pfo) +{ + UNIMPLEMENTED; + return NULL; +} + +PFD_GLYPHATTR +APIENTRY +NtGdiFONTOBJ_pQueryGlyphAttrs( + IN FONTOBJ *pfo, + IN ULONG iMode) +{ + UNIMPLEMENTED; + return NULL; +} + +PVOID +APIENTRY +NtGdiFONTOBJ_pvTrueTypeFontFile( + IN FONTOBJ *pfo, + OUT ULONG *pcjFile) +{ + UNIMPLEMENTED; + return NULL; +} + +ULONG +APIENTRY +NtGdiFONTOBJ_cGetAllGlyphHandles( + IN FONTOBJ *pfo, + IN HGLYPH *phg) +{ + UNIMPLEMENTED; + return 0; +} + +LONG +APIENTRY +NtGdiHT_Get8BPPMaskPalette( + OUT OPTIONAL LPPALETTEENTRY pPaletteEntry, + IN BOOL Use8BPPMaskPal, + IN BYTE CMYMask, + IN USHORT RedGamma, + IN USHORT GreenGamma, + IN USHORT BlueGamma) +{ + UNIMPLEMENTED; + return FALSE; +} + +LONG +APIENTRY +NtGdiHT_Get8BPPFormatPalette( + OUT OPTIONAL LPPALETTEENTRY pPaletteEntry, + IN USHORT RedGamma, + IN USHORT GreenGamma, + IN USHORT BlueGamma) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +APIENTRY +NtGdiPATHOBJ_vGetBounds( + IN PATHOBJ *ppo, + OUT PRECTFX prectfx) +{ + UNIMPLEMENTED; +} + +BOOL +APIENTRY +NtGdiPATHOBJ_bEnum( + IN PATHOBJ *ppo, + OUT PATHDATA *ppd) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +APIENTRY +NtGdiPATHOBJ_vEnumStart( + IN PATHOBJ *ppo) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +NtGdiPATHOBJ_vEnumStartClipLines( + IN PATHOBJ *ppo, + IN CLIPOBJ *pco, + IN SURFOBJ *pso, + IN LINEATTRS *pla) +{ + UNIMPLEMENTED; +} + +BOOL +APIENTRY +NtGdiPATHOBJ_bEnumClipLines( + IN PATHOBJ *ppo, + IN ULONG cb, + OUT CLIPLINE *pcl) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiSTROBJ_bEnum( + IN STROBJ *pstro, + OUT ULONG *pc, + OUT PGLYPHPOS *ppgpos) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiSTROBJ_bEnumPositionsOnly( + IN STROBJ *pstro, + OUT ULONG *pc, + OUT PGLYPHPOS *ppgpos) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiSTROBJ_bGetAdvanceWidths( + IN STROBJ *pstro, + IN ULONG iFirst, + IN ULONG c, + OUT POINTQF *pptqD) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +APIENTRY +NtGdiSTROBJ_vEnumStart( + IN STROBJ *pstro) +{ + UNIMPLEMENTED; +} + +DWORD +APIENTRY +NtGdiSTROBJ_dwGetCodePage( + IN STROBJ *pstro) +{ + UNIMPLEMENTED; + return 0; +} + +BOOL +APIENTRY +NtGdiXFORMOBJ_bApplyXform( + IN XFORMOBJ *pxo, + IN ULONG iMode, + IN ULONG cPoints, + IN PVOID pvIn, + OUT PVOID pvOut) +{ + UNIMPLEMENTED; + return FALSE; +} + +ULONG +APIENTRY +NtGdiXFORMOBJ_iGetXform( + IN XFORMOBJ *pxo, + OUT OPTIONAL XFORML *pxform) +{ + UNIMPLEMENTED; + return 0; +} + +ULONG +APIENTRY +NtGdiXLATEOBJ_cGetPalette( + IN XLATEOBJ *pxlo, + IN ULONG iPal, + IN ULONG cPal, + OUT ULONG *pPal) +{ + UNIMPLEMENTED; + return 0; +} + +ULONG +APIENTRY +NtGdiXLATEOBJ_iXlate( + IN XLATEOBJ *pxlo, + IN ULONG iColor) +{ + UNIMPLEMENTED; + return 0; +} + +HANDLE +APIENTRY +NtGdiXLATEOBJ_hGetColorTransform( + IN XLATEOBJ *pxlo) +{ + UNIMPLEMENTED; + return 0; +} + + +//NtGdiEngAlphaBlend +//NtGdiEngUnlockSurface +//NtGdiEngLockSurface +//NtGdiEngBitBlt +//NtGdiEngStretchBlt + Propchange: trunk/reactos/subsystems/win32/win32k/stubs/umpdstubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Tue Aug 11 00:20:28 2009 @@ -196,6 +196,7 @@ </directory> <directory name="stubs"> <file>stubs.c</file> + <file>umpdstubs.c</file> </directory>

1 0

[cgutman] 42604: - Make Connect IRPs cancellable (should fix some deadlock issues) - Fix a bug which could result in a Listen IRP being unable to be cancelled
by cgutman＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: cgutman Date: Mon Aug 10 23:21:50 2009 New Revision: 42604 URL: http://svn.reactos.org/svn/reactos?rev=42604&view=rev Log: - Make Connect IRPs cancellable (should fix some deadlock issues) - Fix a bug which could result in a Listen IRP being unable to be cancelled Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Mon Aug 10 23:21:50 2009 @@ -192,6 +192,10 @@ DGRemoveIRP(TranContext->Handle.AddressHandle, Irp); break; + case TDI_CONNECT: + TCPRemoveIRP(TranContext->Handle.ConnectionContext, Irp); + break; + default: TI_DbgPrint(MIN_TRACE, ("Unknown IRP. MinorFunction (0x%X).\n", MinorFunction)); break; @@ -399,12 +403,18 @@ Parameters = (PTDI_REQUEST_KERNEL)&IrpSp->Parameters; - Status = TCPConnect( - TranContext->Handle.ConnectionContext, - Parameters->RequestConnectionInformation, - Parameters->ReturnConnectionInformation, - DispDataRequestComplete, - Irp ); + Status = DispPrepareIrpForCancel(TranContext->Handle.ConnectionContext, + Irp, + DispCancelRequest); + + if (NT_SUCCESS(Status)) { + Status = TCPConnect( + TranContext->Handle.ConnectionContext, + Parameters->RequestConnectionInformation, + Parameters->ReturnConnectionInformation, + DispDataRequestComplete, + Irp ); + } done: TcpipRecursiveMutexLeave( &TCPLock ); @@ -577,12 +587,17 @@ Connection->AddressFile->Listener)); } + Status = DispPrepareIrpForCancel + (TranContext->Handle.ConnectionContext, + Irp, + (PDRIVER_CANCEL)DispCancelListenRequest); + /* Listening will require us to create a listening socket and store it in * the address file. It will be signalled, and attempt to complete an irp * when a new connection arrives. */ /* The important thing to note here is that the irp we'll complete belongs * to the socket to be accepted onto, not the listener */ - if( !Connection->AddressFile->Listener ) { + if( NT_SUCCESS(Status) && !Connection->AddressFile->Listener ) { Connection->AddressFile->Listener = TCPAllocateConnectionEndpoint( NULL ); @@ -602,12 +617,6 @@ if( NT_SUCCESS(Status) ) Status = TCPListen( Connection->AddressFile->Listener, 1024 ); /* BACKLOG */ - } - if( NT_SUCCESS(Status) ) { - Status = DispPrepareIrpForCancel - (TranContext->Handle.ConnectionContext, - Irp, - (PDRIVER_CANCEL)DispCancelListenRequest); } if( NT_SUCCESS(Status) ) {

1 0

[janderwald] 42603: - Implement swenum
by janderwald＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: janderwald Date: Mon Aug 10 23:10:03 2009 New Revision: 42603 URL: http://svn.reactos.org/svn/reactos?rev=42603&view=rev Log: - Implement swenum Added: trunk/reactos/drivers/ksfilter/swenum/precomp.h (with props) trunk/reactos/drivers/ksfilter/swenum/swenum.c (with props) trunk/reactos/drivers/ksfilter/swenum/swenum.rbuild (with props) Modified: trunk/reactos/drivers/ksfilter/directory.rbuild Modified: trunk/reactos/drivers/ksfilter/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/directory… ============================================================================== --- trunk/reactos/drivers/ksfilter/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/directory.rbuild [iso-8859-1] Mon Aug 10 23:10:03 2009 @@ -4,5 +4,8 @@ <directory name="ks"> <xi:include href="ks/ks.rbuild" /> </directory> + <directory name="swenum"> + <xi:include href="swenum/swenum.rbuild" /> + </directory> </group> Added: trunk/reactos/drivers/ksfilter/swenum/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/swenum/pr… ============================================================================== --- trunk/reactos/drivers/ksfilter/swenum/precomp.h (added) +++ trunk/reactos/drivers/ksfilter/swenum/precomp.h [iso-8859-1] Mon Aug 10 23:10:03 2009 @@ -1,0 +1,12 @@ +#ifndef PRECOMP_H__ +#define PRECOMP_H__ + +#include <ntddk.h> +#include <ks.h> +#include <swenum.h> +#include <debug.h> + + + + +#endif Propchange: trunk/reactos/drivers/ksfilter/swenum/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/ksfilter/swenum/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/swenum/sw… ============================================================================== --- trunk/reactos/drivers/ksfilter/swenum/swenum.c (added) +++ trunk/reactos/drivers/ksfilter/swenum/swenum.c [iso-8859-1] Mon Aug 10 23:10:03 2009 @@ -1,0 +1,309 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/ksfilter/swenum/swenum.c + * PURPOSE: KS Allocator functions + * PROGRAMMER: Johannes Anderwald + */ + + +#include "precomp.h" + +const GUID KSMEDIUMSETID_Standard = {0x4747B320L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; + + +NTSTATUS +NTAPI +SwDispatchPower( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + + UNIMPLEMENTED; + + /* just complete the irp */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* complete the irp */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* done */ + return STATUS_SUCCESS; + +} + +NTSTATUS +NTAPI +SwDispatchPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + BOOLEAN ChildDevice; + PIO_STACK_LOCATION IoStack; + PDEVICE_OBJECT PnpDeviceObject = NULL; + + /* check if the device object is a child device */ + Status = KsIsBusEnumChildDevice(DeviceObject, &ChildDevice); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* failed */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + /* let ks handle it */ + Status = KsServiceBusEnumPnpRequest(DeviceObject, Irp); + + if (!NT_SUCCESS(Status)) + { + /* invalid request or not supported */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + /* get bus enum pnp object */ + Status = KsGetBusEnumPnpDeviceObject(DeviceObject, &PnpDeviceObject); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* failed to get pnp object */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + /* sanity check */ + ASSERT(PnpDeviceObject); + + /* get current stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->MinorFunction == IRP_MN_REMOVE_DEVICE) + { + /* delete the device */ + IoDeleteDevice(DeviceObject); + } + + /* skip current location */ + IoSkipCurrentIrpStackLocation(Irp); + /* call the pnp device object */ + return IoCallDriver(PnpDeviceObject, Irp); +} + +NTSTATUS +NTAPI +SwDispatchSystemControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + BOOLEAN ChildDevice; + PDEVICE_OBJECT PnpDeviceObject; + + /* check if the device object is a child device */ + Status = KsIsBusEnumChildDevice(DeviceObject, &ChildDevice); + + /* check for success */ + if (NT_SUCCESS(Status)) + { + if (!ChildDevice) + { + /* bus devices dont support internal requests */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + + /* get bus enum pnp object */ + Status = KsGetBusEnumPnpDeviceObject(DeviceObject, &PnpDeviceObject); + + /* check for success */ + if (NT_SUCCESS(Status)) + { + /* skip current location */ + IoSkipCurrentIrpStackLocation(Irp); + /* call the pnp device object */ + return IoCallDriver(PnpDeviceObject, Irp); + } + + } + + /* complete the request */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; + +} + +NTSTATUS +NTAPI +SwDispatchDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + NTSTATUS Status = STATUS_SUCCESS; + + /* get current stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SWENUM_INSTALL_INTERFACE) + { + /* install interface */ + Status = KsInstallBusEnumInterface(Irp); + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SWENUM_REMOVE_INTERFACE) + { + /* remove interface */ + Status = KsRemoveBusEnumInterface(Irp); + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SWENUM_GET_BUS_ID) + { + /* get bus id */ + return KsGetBusEnumIdentifier(Irp); + } + + /* store result */ + Irp->IoStatus.Status = Status; + + /* complete irp */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* done */ + return Status; +} + + +NTSTATUS +NTAPI +SwDispatchCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + BOOLEAN ChildDevice; + + /* check if the device object is a child device */ + Status = KsIsBusEnumChildDevice(DeviceObject, &ChildDevice); + + /* check for success */ + if (NT_SUCCESS(Status)) + { + if (ChildDevice) + { + /* child devices cant create devices */ + Irp->IoStatus.Status = STATUS_OBJECT_NAME_NOT_FOUND; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + /* perform the create request */ + Status = KsServiceBusEnumCreateRequest(DeviceObject, Irp); + } + + /* check the irp is pending */ + if (Status != STATUS_PENDING) + { + /* irp is ok to complete */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return Status; +} + + +NTSTATUS +NTAPI +SwDispatchClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + /* just complete the irp */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* complete the irp */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* done */ + return STATUS_SUCCESS; + +} + +NTSTATUS +NTAPI +SwAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + NTSTATUS Status; + PDEVICE_OBJECT FunctionalDeviceObject; + + /* create the device */ + Status = IoCreateDevice(DriverObject, sizeof(KSDEVICE_HEADER), NULL, FILE_DEVICE_BUS_EXTENDER, 0, FALSE, &FunctionalDeviceObject); + + if (!NT_SUCCESS(Status)) + { + /* failed */ + return Status; + } + + /* create the bus enum object */ + Status = KsCreateBusEnumObject(L"SW", FunctionalDeviceObject, PhysicalDeviceObject, NULL, &KSMEDIUMSETID_Standard, L"Devices"); + + /* check for success */ + if (NT_SUCCESS(Status)) + { + /* set device flags */ + FunctionalDeviceObject->Flags |= DO_POWER_PAGABLE; + FunctionalDeviceObject->Flags &= ~ DO_DEVICE_INITIALIZING; + } + else + { + /* failed to create bus enum object */ + IoDeleteDevice(FunctionalDeviceObject); + } + + /* done */ + return Status; +} + +VOID +NTAPI +SwUnload( + IN PDRIVER_OBJECT DriverObject) +{ + /* nop */ +} + +NTSTATUS +NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPathName) +{ + + /* setup add device routine */ + DriverObject->DriverExtension->AddDevice = SwAddDevice; + + /* setup unload routine */ + DriverObject->DriverUnload = SwUnload; + + /* misc irp handling routines */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = SwDispatchCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = SwDispatchClose; + DriverObject->MajorFunction[IRP_MJ_PNP] = SwDispatchPnp; + DriverObject->MajorFunction[IRP_MJ_POWER] = SwDispatchPower; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = SwDispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = SwDispatchSystemControl; + + + return STATUS_SUCCESS; +} + Propchange: trunk/reactos/drivers/ksfilter/swenum/swenum.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/ksfilter/swenum/swenum.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/swenum/sw… ============================================================================== --- trunk/reactos/drivers/ksfilter/swenum/swenum.rbuild (added) +++ trunk/reactos/drivers/ksfilter/swenum/swenum.rbuild [iso-8859-1] Mon Aug 10 23:10:03 2009 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="swenum" type="kernelmodedriver" installbase="system32/drivers" installname="swenum.sys"> + <library>ntoskrnl</library> + <library>ks</library> + <file>swenum.c</file> +</module> Propchange: trunk/reactos/drivers/ksfilter/swenum/swenum.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 42602: Revert part of my last commit, this was testcode not meant to be committed.
by tkreuzer＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: tkreuzer Date: Mon Aug 10 22:22:11 2009 New Revision: 42602 URL: http://svn.reactos.org/svn/reactos?rev=42602&view=rev Log: Revert part of my last commit, this was testcode not meant to be committed. Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Mon Aug 10 22:22:11 2009 @@ -8,7 +8,7 @@ #include <w32k.h> -#define YDEBUG +#define NDEBUG #include <debug.h> // TODO: proper implementation of LDEVOBJ and PDEVOBJ interface @@ -213,9 +213,6 @@ ULONG DisplayNumber; LARGE_INTEGER Zero; BOOLEAN ret = FALSE; - - DPRINT("IntPrepareDriver()\n"); -ASSERT(FALSE); Zero.QuadPart = 0; if (STATUS_SUCCESS != KeWaitForSingleObject(&VideoDriverNeedsPreparation, Executive, KernelMode, TRUE, &Zero)) @@ -453,7 +450,7 @@ IO_STATUS_BLOCK Iosb; BOOL Prepare = TRUE; ULONG Length = sizeof(BOOL); -// PIO_STACK_LOCATION StackPtr; + PIO_STACK_LOCATION StackPtr; LARGE_INTEGER StartOffset; PFILE_OBJECT FileObject = PrimarySurface.VideoFileObject; PDEVICE_OBJECT DeviceObject = FileObject->DeviceObject; @@ -478,16 +475,16 @@ } /* Set up IRP Data */ -// Irp->Tail.Overlay.OriginalFileObject = FileObject; -// Irp->RequestorMode = KernelMode; -// Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; -// Irp->Overlay.AsynchronousParameters.UserApcContext = NULL; -// Irp->Flags |= IRP_WRITE_OPERATION; + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = KernelMode; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + Irp->Overlay.AsynchronousParameters.UserApcContext = NULL; + Irp->Flags |= IRP_WRITE_OPERATION; /* Setup Stack Data */ -// StackPtr = IoGetNextIrpStackLocation(Irp); -// StackPtr->FileObject = PrimarySurface.VideoFileObject; -// StackPtr->Parameters.Write.Key = 0; + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->FileObject = PrimarySurface.VideoFileObject; + StackPtr->Parameters.Write.Key = 0; Status = IoCallDriver(DeviceObject, Irp); @@ -508,8 +505,6 @@ RECTL SurfaceRect; SURFOBJ *SurfObj; BOOL calledFromUser; - - DPRINT("IntCreatePrimarySurface()\n"); if (! IntPrepareDriverIfNeeded()) { Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Mon Aug 10 22:22:11 2009 @@ -19,9 +19,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#if 0 -#include "dibbmp.c" -#else #include <w32k.h> #define NDEBUG @@ -1738,6 +1735,4 @@ return hPal; } -#endif - /* EOF */

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