Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 26097: - Remove leftovers.
by ion＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: ion Date: Wed Mar 14 23:29:24 2007 New Revision: 26097 URL: http://svn.reactos.org/svn/reactos?rev=26097&view=rev Log: - Remove leftovers. Removed: trunk/reactos/lib/nt/

1 0

[ion] 26096: - Remove leftovers.
by ion＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: ion Date: Wed Mar 14 23:28:28 2007 New Revision: 26096 URL: http://svn.reactos.org/svn/reactos?rev=26096&view=rev Log: - Remove leftovers. Removed: trunk/reactos/lib/crt/

1 0

[ion] 26095: - Cleanup the /lib directory, by putting more 3rd-party libs in /3rdparty, and by creating a new directory called /sdk where libraries which emulate the ones in the WDK are present (Such as uuid, nt, crt, etc). - Removed lib/interlck and lib/string. - Removed math routines from lib/rtl. - Created a new library called libcntpr which is what NT/WDK use when compiling the kernel/system libraries. This is an "NT-Private" version of the CRT which is supposed to contain what we had in lib
by ion＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: ion Date: Wed Mar 14 23:24:57 2007 New Revision: 26095 URL: http://svn.reactos.org/svn/reactos?rev=26095&view=rev Log: - Cleanup the /lib directory, by putting more 3rd-party libs in /3rdparty, and by creating a new directory called /sdk where libraries which emulate the ones in the WDK are present (Such as uuid, nt, crt, etc). - Removed lib/interlck and lib/string. - Removed math routines from lib/rtl. - Created a new library called libcntpr which is what NT/WDK use when compiling the kernel/system libraries. This is an "NT-Private" version of the CRT which is supposed to contain what we had in lib/string and lib/rtl. Added: trunk/reactos/lib/3rdparty/libwine/ - copied from r26078, trunk/reactos/lib/libwine/ trunk/reactos/lib/3rdparty/mingw/ - copied from r26078, trunk/reactos/lib/mingw/ trunk/reactos/lib/sdk/ trunk/reactos/lib/sdk/crt/ - copied from r26078, trunk/reactos/lib/crt/ trunk/reactos/lib/sdk/dxguid/ - copied from r26078, trunk/reactos/lib/dxguid/ trunk/reactos/lib/sdk/nt/ - copied from r26078, trunk/reactos/lib/nt/ trunk/reactos/lib/sdk/strmiids/ - copied from r26078, trunk/reactos/lib/strmiids/ trunk/reactos/lib/sdk/uuid/ - copied from r26078, trunk/reactos/lib/uuid/ trunk/reactos/lib/sdk/wdmguid/ - copied from r26078, trunk/reactos/lib/wdmguid/ Removed: trunk/reactos/lib/dxguid/ trunk/reactos/lib/intrlck/ trunk/reactos/lib/libwine/ trunk/reactos/lib/mingw/ trunk/reactos/lib/nt/nt.rbuild trunk/reactos/lib/rtl/i386/alldiv_asm.s trunk/reactos/lib/rtl/i386/alldvrm_asm.s trunk/reactos/lib/rtl/i386/allmul_asm.s trunk/reactos/lib/rtl/i386/allrem_asm.s trunk/reactos/lib/rtl/i386/allshl_asm.s trunk/reactos/lib/rtl/i386/allshr_asm.s trunk/reactos/lib/rtl/i386/atan_asm.s trunk/reactos/lib/rtl/i386/aulldiv_asm.s trunk/reactos/lib/rtl/i386/aulldvrm_asm.s trunk/reactos/lib/rtl/i386/aullrem_asm.s trunk/reactos/lib/rtl/i386/aullshr_asm.s trunk/reactos/lib/rtl/i386/ceil_asm.s trunk/reactos/lib/rtl/i386/chkstk_asm.s trunk/reactos/lib/rtl/i386/cos_asm.s trunk/reactos/lib/rtl/i386/fabs_asm.s trunk/reactos/lib/rtl/i386/floor_asm.s trunk/reactos/lib/rtl/i386/ftol_asm.s trunk/reactos/lib/rtl/i386/log_asm.s trunk/reactos/lib/rtl/i386/pow_asm.s trunk/reactos/lib/rtl/i386/seh.s trunk/reactos/lib/rtl/i386/sin_asm.s trunk/reactos/lib/rtl/i386/sqrt_asm.s trunk/reactos/lib/rtl/i386/tan_asm.s trunk/reactos/lib/string/ trunk/reactos/lib/strmiids/ trunk/reactos/lib/uuid/ trunk/reactos/lib/wdmguid/ Modified: trunk/reactos/base/applications/cmdutils/more/more.c trunk/reactos/base/applications/cmdutils/more/more.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/win32/crtdll/crtdll.rbuild trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild trunk/reactos/lib/3rdparty/3rdparty.rbuild trunk/reactos/lib/cmlib/cmlib.rbuild trunk/reactos/lib/lib.rbuild trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cmdutils/more/more.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/more/more.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… Modified: trunk/reactos/dll/win32/crtdll/crtdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.rb… Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… Modified: trunk/reactos/lib/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/3rdparty.rbui… Modified: trunk/reactos/lib/cmlib/cmlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuild?rev… Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=26095&r… Removed: trunk/reactos/lib/nt/nt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/nt/nt.rbuild?rev=26094… Removed: trunk/reactos/lib/rtl/i386/alldiv_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/alldiv_asm.s?… Removed: trunk/reactos/lib/rtl/i386/alldvrm_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/alldvrm_asm.s… Removed: trunk/reactos/lib/rtl/i386/allmul_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/allmul_asm.s?… Removed: trunk/reactos/lib/rtl/i386/allrem_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/allrem_asm.s?… Removed: trunk/reactos/lib/rtl/i386/allshl_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/allshl_asm.s?… Removed: trunk/reactos/lib/rtl/i386/allshr_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/allshr_asm.s?… Removed: trunk/reactos/lib/rtl/i386/atan_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/atan_asm.s?re… Removed: trunk/reactos/lib/rtl/i386/aulldiv_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/aulldiv_asm.s… Removed: trunk/reactos/lib/rtl/i386/aulldvrm_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/aulldvrm_asm.… Removed: trunk/reactos/lib/rtl/i386/aullrem_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/aullrem_asm.s… Removed: trunk/reactos/lib/rtl/i386/aullshr_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/aullshr_asm.s… Removed: trunk/reactos/lib/rtl/i386/ceil_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/ceil_asm.s?re… Removed: trunk/reactos/lib/rtl/i386/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/chkstk_asm.s?… Removed: trunk/reactos/lib/rtl/i386/cos_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/cos_asm.s?rev… Removed: trunk/reactos/lib/rtl/i386/fabs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/fabs_asm.s?re… Removed: trunk/reactos/lib/rtl/i386/floor_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/floor_asm.s?r… Removed: trunk/reactos/lib/rtl/i386/ftol_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/ftol_asm.s?re… Removed: trunk/reactos/lib/rtl/i386/log_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/log_asm.s?rev… Removed: trunk/reactos/lib/rtl/i386/pow_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/pow_asm.s?rev… Removed: trunk/reactos/lib/rtl/i386/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/seh.s?rev=260… Removed: trunk/reactos/lib/rtl/i386/sin_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/sin_asm.s?rev… Removed: trunk/reactos/lib/rtl/i386/sqrt_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/sqrt_asm.s?re… Removed: trunk/reactos/lib/rtl/i386/tan_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/tan_asm.s?rev… Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=260… Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r…

1 0

[silverblade] 26094: Mostly minor updates to the source tree for portcls. Still much work to be done!
by silverblade＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: silverblade Date: Wed Mar 14 22:50:47 2007 New Revision: 26094 URL: http://svn.reactos.org/svn/reactos?rev=26094&view=rev Log: Mostly minor updates to the source tree for portcls. Still much work to be done! Added: trunk/reactos/drivers/multimedia/portcls/helper/ trunk/reactos/drivers/multimedia/portcls/helper/ResourceList.c trunk/reactos/drivers/multimedia/portcls/irp.c trunk/reactos/drivers/multimedia/portcls/miniport/ trunk/reactos/drivers/multimedia/portcls/miniport/IMiniport.cpp trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportDMus.cpp trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportMidi.cpp trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportTopology.cpp trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportWaveCyclic.cpp trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportWavePci.cpp trunk/reactos/drivers/multimedia/portcls/miniport/factory.cpp trunk/reactos/drivers/multimedia/portcls/port/ trunk/reactos/drivers/multimedia/portcls/port/IPort.cpp trunk/reactos/drivers/multimedia/portcls/port/IPortDMus.cpp trunk/reactos/drivers/multimedia/portcls/port/IPortMidi.cpp trunk/reactos/drivers/multimedia/portcls/port/IPortTopology.cpp trunk/reactos/drivers/multimedia/portcls/port/IPortWaveCyclic.cpp trunk/reactos/drivers/multimedia/portcls/port/IPortWavePci.cpp trunk/reactos/drivers/multimedia/portcls/port/factory.c trunk/reactos/drivers/multimedia/portcls/port/port.h trunk/reactos/drivers/multimedia/portcls/private.h trunk/reactos/drivers/multimedia/portcls/undoc.c Modified: trunk/reactos/drivers/multimedia/directory.rbuild trunk/reactos/drivers/multimedia/ks/irp.c trunk/reactos/drivers/multimedia/portcls/adapter.c trunk/reactos/drivers/multimedia/portcls/portcls.rbuild trunk/reactos/drivers/multimedia/portcls/stubs.c Modified: trunk/reactos/drivers/multimedia/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/directo… ============================================================================== --- trunk/reactos/drivers/multimedia/directory.rbuild (original) +++ trunk/reactos/drivers/multimedia/directory.rbuild Wed Mar 14 22:50:47 2007 @@ -23,3 +23,21 @@  + + + + +<directory name="mpu401_ks"> + <xi:include href="mpu401_ks/mpu401.rbuild" /> +</directory> + +<directory name="sb16_nt4"> + <xi:include href="sb16_nt4/sb16_nt4.rbuild" /> +</directory> + + + Modified: trunk/reactos/drivers/multimedia/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/ks/irp.… ============================================================================== --- trunk/reactos/drivers/multimedia/ks/irp.c (original) +++ trunk/reactos/drivers/multimedia/ks/irp.c Wed Mar 14 22:50:47 2007 @@ -66,12 +66,38 @@ */ KSDDKAPI NTSTATUS NTAPI KsAllocateDeviceHeader( - OUT PVOID Header, + OUT KSDEVICE_HEADER* Header, IN ULONG ItemsCount, IN PKSOBJECT_CREATE_ITEM ItemsList OPTIONAL) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + /* Allocates memory for the KSDEVICE_HEADER structure */ + + if ( ! Header ) + return STATUS_INVALID_PARAMETER; + + Header = ExAllocatePoolWithTag(PagedPool, sizeof(KSDEVICE_HEADER), 'HDSK'); + + if ( ! Header ) + return STATUS_INSUFFICIENT_RESOURCES; + + /* TODO: Actually do something with the header, perhaps? */ + + return STATUS_SUCCESS; +} + +/* + @unimplemented +*/ +KSDDKAPI VOID NTAPI +KsFreeDeviceHeader( + IN KSDEVICE_HEADER Header) +{ + if ( ! Header ) + return; + + /* TODO: Free content first */ + + ExFreePoolWithTag(Header, 'HDSK'); } /* @@ -89,6 +115,8 @@ /* @unimplemented + + http://www.osronline.com/DDKx/stream/ksfunc_3sc3.htm */ KSDDKAPI NTSTATUS NTAPI KsAllocateObjectCreateItem( @@ -103,6 +131,13 @@ /* @unimplemented + + Initialize the required file context header. + Allocates KSOBJECT_HEADER structure. + Irp is an IRP_MJ_CREATE structure. + Driver must allocate KSDISPATCH_TABLE and initialize it first. + + http://www.osronline.com/DDKx/stream/ksfunc_0u2b.htm */ KSDDKAPI NTSTATUS NTAPI KsAllocateObjectHeader( @@ -112,8 +147,40 @@ IN PIRP Irp, IN KSDISPATCH_TABLE* Table) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + /* NOTE: PKSOBJECT_HEADER is not defined yet */ +#if 0 + PKSOBJECT_HEADER object_header; + + /* TODO: Validate parameters */ + + object_header = ExAllocatePoolWithTag(PagedPool, sizeof(KSOBJECT_HEADER), 'HOSK'); + + if ( ! object_header ) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + (PVOID)(*Header) = object_header; + + /* TODO ... */ +#endif + + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +KSDDKAPI VOID NTAPI +KsFreeObjectHeader( + IN PVOID Header) +{ + ExFreePoolWithTag(Header, 'HOSK'); + + /* TODO */ + + UNIMPLEMENTED; } /* @@ -186,15 +253,18 @@ } /* - @unimplemented + Used in dispatch table entries that aren't handled and need to return + STATUS_INVALID_DEVICE_REQUEST. */ KSDDKAPI NTSTATUS NTAPI KsDispatchInvalidDeviceRequest( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_INVALID_DEVICE_REQUEST; } /* @@ -205,6 +275,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + /* Calls a dispatch routine corresponding to the function code of the IRP */ UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } @@ -258,26 +329,6 @@ { UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; -} - -/* - @unimplemented -*/ -KSDDKAPI VOID NTAPI -KsFreeDeviceHeader( - IN PVOID Header) -{ - UNIMPLEMENTED; -} - -/* - @unimplemented -*/ -KSDDKAPI VOID NTAPI -KsFreeObjectHeader( - IN PVOID Header) -{ - UNIMPLEMENTED; } /* @@ -427,6 +478,122 @@ return STATUS_UNSUCCESSFUL; } + + +/* + IRP handlers + NOT USED +*/ +#if 0 +static NTAPI +NTSTATUS +KsCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("KS / Create\n"); + return STATUS_UNSUCCESSFUL; +} + +static NTAPI +NTSTATUS +KsClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("KS / Close\n"); + return STATUS_UNSUCCESSFUL; +} + +static NTAPI +NTSTATUS +KsDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("KS / DeviceControl\n"); + return STATUS_UNSUCCESSFUL; +} + +static NTAPI +NTSTATUS +KsRead( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("KS / Read\n"); + return STATUS_UNSUCCESSFUL; +} + +static NTAPI +NTSTATUS +KsWrite( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("KS / Write\n"); + return STATUS_UNSUCCESSFUL; +} + +static NTAPI +NTSTATUS +KsFlushBuffers( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("KS / FlushBuffers\n"); + return STATUS_UNSUCCESSFUL; +} + +static NTAPI +NTSTATUS +KsQuerySecurity( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("KS / QuerySecurity\n"); + return STATUS_UNSUCCESSFUL; +} + +static NTAPI +NTSTATUS +KsSetSecurity( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("KS / SetSecurity\n"); + return STATUS_UNSUCCESSFUL; +} +#endif + + +static NTAPI +NTSTATUS +KsInternalIrpDispatcher( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + /* TODO - Nothing implemented really yet! */ + + DPRINT1("KS IRP dispatch function called\n"); + + PKSDISPATCH_TABLE ks_dispatch_table = NULL; + + /* ks_dispatch_table is the first element in a structure pointed to by FsContext */ + + switch ( IoGetCurrentIrpStackLocation(Irp)->MajorFunction ) + { + case IRP_MJ_CREATE : +/* return ks_dispatch_table->Create(DeviceObject, Irp);*/ + + /* TODO ... */ + + default : + return STATUS_INVALID_PARAMETER; + }; +} + + /* @unimplemented */ @@ -435,8 +602,31 @@ IN PDRIVER_OBJECT DriverObject, IN ULONG MajorFunction) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + /* + Sets a DriverObject's major function handler to point to an internal + function we implement. + + TODO: Deal with KSDISPATCH_FASTIO + */ + + switch ( MajorFunction ) + { + case IRP_MJ_CREATE : + case IRP_MJ_CLOSE : + case IRP_MJ_DEVICE_CONTROL : + case IRP_MJ_READ : + case IRP_MJ_WRITE : + case IRP_MJ_FLUSH_BUFFERS : + case IRP_MJ_QUERY_SECURITY : + case IRP_MJ_SET_SECURITY : + DriverObject->MajorFunction[MajorFunction] = KsInternalIrpDispatcher; + break; + + default : + return STATUS_INVALID_PARAMETER; /* is this right? */ + }; + + return STATUS_SUCCESS; } /* @@ -464,7 +654,7 @@ @unimplemented */ KSDDKAPI NTSTATUS NTAPI - KsWriteFile( +KsWriteFile( IN PFILE_OBJECT FileObject, IN PKEVENT Event OPTIONAL, IN PVOID PortContext OPTIONAL, Modified: trunk/reactos/drivers/multimedia/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/adapter.c (original) +++ trunk/reactos/drivers/multimedia/portcls/adapter.c Wed Mar 14 22:50:47 2007 @@ -1,35 +1,26 @@ /* - ReactOS Kernel Streaming - Port Class API: Adapter initialization - - Author: Andrew Greenwood - -*/ - + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/multimedia/portcls/adapter.c + * PURPOSE: Port Class driver / DriverEntry and IRP handlers + * PROGRAMMER: Andrew Greenwood + * + * HISTORY: + * 27 Jan 07 Created + */ #include <portcls.h> - - -NTSTATUS -PcStartIo( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - /* Internal function */ - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -PcUnload( - IN PDRIVER_OBJECT DriverObject) -{ - /* Internal function */ - return STATUS_UNSUCCESSFUL; -} - +#include "private.h" /* - * @unimplemented - */ + This is called from DriverEntry so that PortCls can take care of some + IRPs and map some others to the main KS driver. In most cases this will + be the first function called by an audio driver. + + First 2 parameters are from DriverEntry. + + The AddDevice parameter is a driver-supplied pointer to a function which + typically then calls PcAddAdapterDevice (see below.) +*/ PORTCLASSAPI NTSTATUS NTAPI PcInitializeAdapterDriver( IN PDRIVER_OBJECT DriverObject, @@ -37,17 +28,7 @@ IN PDRIVER_ADD_DEVICE AddDevice) { /* - This is effectively a common DriverEntry function for PortCls drivers. - So it has similar responsibilities to a normal driver. - - First 2 parameters are from DriverEntry. - Installs the supplied AddDevice routine in the driver object?s driver extension and installs the PortCls driver?s IRP handlers in the driver object itself. - */ - - DriverObject->DriverExtension->AddDevice = AddDevice; - - /* - TODO: (* = implement here, otherwise KS default) + (* = implement here, otherwise KS default) IRP_MJ_CLOSE * IRP_MJ_CREATE IRP_MJ_DEVICE_CONTROL @@ -61,14 +42,53 @@ IRP_MJ_WRITE */ - UNIMPLEMENTED; + //NTSTATUS status; + //ULONG i; + + DPRINT("PcInitializeAdapterDriver\n"); + +#if 0 + /* Set default stub - is this a good idea? */ + DPRINT1("Setting IRP stub\n"); + for ( i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i ++ ) + { + DriverObject->MajorFunction[i] = IrpStub; + } +#endif + + /* Our IRP handlers */ + DPRINT1("Setting IRP handlers\n"); + DriverObject->MajorFunction[IRP_MJ_CREATE] = PcDispatchIrp; + DriverObject->MajorFunction[IRP_MJ_PNP] = PcDispatchIrp; + DriverObject->MajorFunction[IRP_MJ_POWER] = PcDispatchIrp; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = PcDispatchIrp; + + /* The driver-supplied AddDevice */ + DriverObject->DriverExtension->AddDevice = AddDevice; + + /* KS handles these */ + DPRINT1("Setting KS function handlers\n"); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CLOSE); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_DEVICE_CONTROL); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_FLUSH_BUFFERS); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_QUERY_SECURITY); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_READ); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_SET_SECURITY); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_WRITE); + + DPRINT1("PortCls has finished initializing the adapter driver\n"); return STATUS_SUCCESS; } /* - * @unimplemented - */ + Typically called by a driver's AddDevice function, which is set when + calling PcInitializeAdapterDriver. This performs some common driver + operations, such as creating a device extension. + + The StartDevice parameter is a driver-supplied function which gets + called in response to IRP_MJ_PNP / IRP_MN_START_DEVICE. +*/ PORTCLASSAPI NTSTATUS NTAPI PcAddAdapterDevice( IN PDRIVER_OBJECT DriverObject, @@ -80,8 +100,70 @@ /* Note - after this has been called, we can handle IRP_MN_START_DEVICE by calling StartDevice + + TODO: + Validate DeviceExtensionSize!! (et al...) */ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + NTSTATUS status = STATUS_UNSUCCESSFUL; + PDEVICE_OBJECT fdo = NULL; + PCExtension* portcls_ext; + + DPRINT1("PcAddAdapterDevice called\n"); + + if ( ! DriverObject) + { + DPRINT("DriverObject is NULL!\n"); + return STATUS_INVALID_PARAMETER; + } + + if ( ! PhysicalDeviceObject ) + { + DPRINT("PhysicalDeviceObject is NULL!\n"); + return STATUS_INVALID_PARAMETER; + } + + if ( ! StartDevice ) + { + DPRINT("No StartDevice parameter!\n"); + return STATUS_INVALID_PARAMETER; + } + + /* TODO: Make sure this is right */ + if ( DeviceExtensionSize < PORT_CLASS_DEVICE_EXTENSION_SIZE ) + { + if ( DeviceExtensionSize != 0 ) + { + /* TODO: Error */ + DPRINT("DeviceExtensionSize is invalid\n"); + return STATUS_INVALID_PARAMETER; + } + } + + DPRINT("portcls is creating a device\n"); + status = IoCreateDevice(DriverObject, + DeviceExtensionSize, + NULL, + PhysicalDeviceObject->DeviceType, /* FILE_DEVICE_KS ? */ + PhysicalDeviceObject->Characteristics, /* TODO: Check */ + FALSE, + &fdo); + + if ( ! NT_SUCCESS(status) ) + { + DPRINT("IoCreateDevice() failed with status 0x$08lx\n", status); + return status; + } + + /* Obtain the new device extension */ + portcls_ext = (PCExtension*) fdo->DeviceExtension; + + ASSERT(portcls_ext); + + /* Initialize */ + portcls_ext->StartDevice = StartDevice; + + DPRINT("PcAddAdapterDriver succeeded\n"); + + return STATUS_SUCCESS; } Added: trunk/reactos/drivers/multimedia/portcls/helper/ResourceList.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/helper/ResourceList.c (added) +++ trunk/reactos/drivers/multimedia/portcls/helper/ResourceList.c Wed Mar 14 22:50:47 2007 @@ -1,0 +1,252 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: drivers/multimedia/portcls/helpers/ResourceList.c + * PURPOSE: Port Class driver / ResourceList implementation + * PROGRAMMER: Andrew Greenwood + * + * HISTORY: + * 27 Jan 07 Created + */ + +#include <portcls.h> +#include <stdunk.h> + +typedef struct CResourceList +{ + union + { + IUnknown IUnknown; + IResourceList IResourceList; + }; + + LONG m_ref_count; + PUNKNOWN m_outer_unknown; + + PCM_RESOURCE_LIST translated_resources; + PCM_RESOURCE_LIST untranslated_resources; +} CResourceList; + + +/* + Basic IUnknown methods +*/ + +STDMETHODCALLTYPE +NTSTATUS +ResourceList_QueryInterface( + IResourceList* this_container, + IN REFIID refiid, + OUT PVOID* output) +{ + /* TODO */ + return STATUS_SUCCESS; +} + +STDMETHODCALLTYPE +ULONG +ResourceList_AddRef( + IResourceList* this_container) +{ + struct CUnknown* this = CONTAINING_RECORD(this_container, struct CUnknown, IUnknown); + + InterlockedIncrement(&this->m_ref_count); + return this->m_ref_count; +} + +STDMETHODCALLTYPE +ULONG +ResourceList_Release( + IResourceList* this_container) +{ + struct CUnknown* this = CONTAINING_RECORD(this_container, struct CUnknown, IUnknown); + + InterlockedDecrement(&this->m_ref_count); + + if ( this->m_ref_count == 0 ) + { + ExFreePool(this); + return 0; + } + + return this->m_ref_count; +} + + +/* + IResourceList methods +*/ + +STDMETHODCALLTYPE +ULONG +ResourceList_NumberOfEntries(IResourceList* this_container) +{ + return 0; +} + +STDMETHODCALLTYPE +ULONG +ResourceList_NumberOfEntriesOfType( + IResourceList* this_container, + IN CM_RESOURCE_TYPE type) +{ + /* I guess the translated and untranslated lists will be same length? */ + + CResourceList* this = CONTAINING_RECORD(this_container, CResourceList, IResourceList); + ULONG index, count = 0; + + for ( index = 0; index < this->translated_resources->Count; index ++ ) + { + PCM_FULL_RESOURCE_DESCRIPTOR full_desc = &this->translated_resources->List[index]; + ULONG sub_index; + + for ( sub_index = 0; sub_index < full_desc->PartialResourceList.Count; sub_index ++ ) + { + PCM_PARTIAL_RESOURCE_DESCRIPTOR partial_desc; + partial_desc = &full_desc->PartialResourceList.PartialDescriptors[sub_index]; + + if ( partial_desc->Type == type ) + { + /* Yay! Finally found one that matches! */ + count ++; + } + } + } + + DPRINT("Found %d\n", count); + return count; +} + +STDMETHODCALLTYPE +PCM_PARTIAL_RESOURCE_DESCRIPTOR +ResourceList_FindTranslatedEntry( + IResourceList* this_container, + IN CM_RESOURCE_TYPE Type, + IN ULONG Index) +{ + return NULL; +} + +STDMETHODCALLTYPE +PCM_PARTIAL_RESOURCE_DESCRIPTOR +ResourceList_FindUntranslatedEntry( + IResourceList* this_container, + IN CM_RESOURCE_TYPE Type, + IN ULONG Index) +{ + return NULL; +} + +STDMETHODCALLTYPE +NTSTATUS +ResourceList_AddEntry( + IResourceList* this_container, + IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Translated, + IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Untranslated) +{ + return STATUS_SUCCESS; +} + +STDMETHODCALLTYPE +NTSTATUS +ResourceList_AddEntryFromParent( + IResourceList* this_container, + IN IResourceList* Parent, + IN CM_RESOURCE_TYPE Type, + IN ULONG Index) +{ + return STATUS_SUCCESS; +} + +STDMETHODCALLTYPE +PCM_RESOURCE_LIST +ResourceList_TranslatedList( + IResourceList* this_container) +{ + return NULL; +} + +STDMETHODCALLTYPE +PCM_RESOURCE_LIST +ResourceList_UntranslatedList( + IResourceList* this_container) +{ + return NULL; +} + + +/* + ResourceList V-Table +*/ +static const IResourceListVtbl ResourceListVtbl = +{ + /* IUnknown */ + ResourceList_QueryInterface, + ResourceList_AddRef, + ResourceList_Release, + + /* IResourceList */ + ResourceList_NumberOfEntries, + ResourceList_NumberOfEntriesOfType, + ResourceList_FindTranslatedEntry, + ResourceList_FindUntranslatedEntry, + ResourceList_AddEntry, + ResourceList_AddEntryFromParent, + ResourceList_TranslatedList, + ResourceList_UntranslatedList +}; + + +/* + Factory for creating a resource list +*/ +PORTCLASSAPI NTSTATUS NTAPI +PcNewResourceList( + OUT PRESOURCELIST* OutResourceList, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN PCM_RESOURCE_LIST TranslatedResources, + IN PCM_RESOURCE_LIST UntranslatedResources) +{ + IResourceList* new_list = NULL; + CResourceList* this = NULL; + + /* TODO: Validate parameters */ + + DPRINT("PcNewResourceList\n"); + + new_list = ExAllocatePoolWithTag(sizeof(IResourceList), PoolType, 'LRcP'); + + if ( ! new_list ) + { + DPRINT("ExAllocatePoolWithTag failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Obtain our private data */ + this = CONTAINING_RECORD(new_list, CResourceList, IResourceList); + + ASSERT(this); + + /* Initialize */ + this->m_outer_unknown = OuterUnknown; + this->translated_resources = TranslatedResources; + this->untranslated_resources = UntranslatedResources; + + /* Increment our usage count and set the pointer to this object */ + *OutResourceList = new_list; + ResourceListVtbl.AddRef(*OutResourceList); + + return STATUS_SUCCESS; +} + +PORTCLASSAPI NTSTATUS NTAPI +PcNewResourceSublist( + OUT PRESOURCELIST* OutResourceList, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN PRESOURCELIST ParentList, + IN ULONG MaximumEntries) +{ + return STATUS_UNSUCCESSFUL; +} Added: trunk/reactos/drivers/multimedia/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/irp.c (added) +++ trunk/reactos/drivers/multimedia/portcls/irp.c Wed Mar 14 22:50:47 2007 @@ -1,0 +1,273 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: drivers/multimedia/portcls/irp.c + * PURPOSE: Port Class driver / IRP Handling + * PROGRAMMER: Andrew Greenwood + * + * HISTORY: + * 27 Jan 07 Created + */ + +#include <portcls.h> +#include "private.h" + + +/* + A safe place for IRPs to be bounced to, if no handler has been + set. Whether this is a good idea or not...? +*/ +#if 0 +static NTAPI +NTSTATUS +IrpStub( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS status = STATUS_NOT_SUPPORTED; + + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + DPRINT1("IRP Stub called\n"); + + return status; +} +#endif + +/* + Handles IRP_MJ_CREATE, which occurs when someone wants to make use of + a device. +*/ +NTAPI +NTSTATUS +PortClsCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("PortClsCreate called\n"); + + /* TODO */ + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + + +/* + IRP_MJ_PNP handler + Used for things like IRP_MN_START_DEVICE +*/ +NTAPI +NTSTATUS +PortClsPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS status; + PCExtension* portcls_ext; + PIO_STACK_LOCATION irp_stack; + + DPRINT1("PortClsPnp called\n"); + + portcls_ext = (PCExtension*) DeviceObject->DeviceExtension; + irp_stack = IoGetCurrentIrpStackLocation(Irp); + + ASSERT(portcls_ext); + + /* + if IRP_MN_START_DEVICE, call the driver's customer start device routine. + Before we do so, we must create a ResourceList to pass to the Start + routine. + */ + if ( irp_stack->MinorFunction == IRP_MN_START_DEVICE ) + { + IResourceList* resource_list; + DPRINT("IRP_MN_START_DEVICE\n"); + + /* Create the resource list */ + status = PcNewResourceList( + &resource_list, + NULL, + PagedPool, + irp_stack->Parameters.StartDevice.AllocatedResourcesTranslated, + irp_stack->Parameters.StartDevice.AllocatedResources); + + if ( ! NT_SUCCESS(status) ) + { + DPRINT("PcNewResourceList failed [0x%8x]\n", status); + Irp->IoStatus.Status = status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return status; + } + + /* Assign the resource list to our extension */ + portcls_ext->resources = resource_list; + + ASSERT(portcls_ext->StartDevice); + + /* Call the StartDevice routine */ + DPRINT("Calling StartDevice at 0x%8x\n", portcls_ext->StartDevice); + status = portcls_ext->StartDevice(DeviceObject, Irp, resource_list); + + if ( ! NT_SUCCESS(status) ) + { + DPRINT("StartDevice returned a failure code [0x%8x]\n", status); + resource_list->lpVtbl->Release(resource_list); + + Irp->IoStatus.Status = status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return status; + } + + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + else if ( irp_stack->MinorFunction == IRP_MN_REMOVE_DEVICE ) + { + DPRINT("IRP_MN_REMOVE_DEVICE\n"); + /* Clean up */ + portcls_ext->resources->lpVtbl->Release(portcls_ext->resources); + + IoDeleteDevice(DeviceObject); + + /* Do not complete? */ + Irp->IoStatus.Status = STATUS_SUCCESS; + } + + return STATUS_SUCCESS; +} + +/* + Power management. Handles IRP_MJ_POWER + (not implemented) +*/ +NTAPI +NTSTATUS +PortClsPower( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("PortClsPower called\n"); + + /* TODO */ + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +/* + System control. Handles IRP_MJ_SYSTEM_CONTROL + (not implemented) +*/ +NTAPI +NTSTATUS +PortClsSysControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("PortClsSysControl called\n"); + + /* TODO */ + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + + +/* + ========================================================================== + API EXPORTS + ========================================================================== +*/ + +/* + Drivers may implement their own IRP handlers. If a driver decides to let + PortCls handle the IRP, it can do so by calling this. +*/ +PORTCLASSAPI NTSTATUS NTAPI +PcDispatchIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION irp_stack; + + DPRINT("PcDispatchIrp called - handling IRP in PortCls\n"); + + irp_stack = IoGetCurrentIrpStackLocation(Irp); + + switch ( irp_stack->MajorFunction ) + { + /* PortCls */ + case IRP_MJ_CREATE : + return PortClsCreate(DeviceObject, Irp); + + case IRP_MJ_PNP : + return PortClsPnp(DeviceObject, Irp); + + case IRP_MJ_POWER : + return PortClsPower(DeviceObject, Irp); + + case IRP_MJ_SYSTEM_CONTROL : + return PortClsSysControl(DeviceObject, Irp); + + /* KS - TODO */ + +#if 0 + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CLOSE); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_DEVICE_CONTROL); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_FLUSH_BUFFERS); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_QUERY_SECURITY); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_READ); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_SET_SECURITY); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_WRITE); +#endif + + default : + break; + }; + + /* If we reach here, we just complete the IRP */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcCompleteIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN NTSTATUS Status) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcForwardIrpSynchronous( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} Added: trunk/reactos/drivers/multimedia/portcls/miniport/IMiniport.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/miniport/IMiniport.cpp (added) +++ trunk/reactos/drivers/multimedia/portcls/miniport/IMiniport.cpp Wed Mar 14 22:50:47 2007 @@ -1,0 +1,32 @@ +/* + ReactOS Operating System + + Port Class API + IMiniPortMidi Implementation + + by Andrew Greenwood + + REFERENCE: + http://www.osronline.com/ddkx/stream/audmp-routines_64vn.htm +*/ + +#include <portcls.h> + +NTSTATUS +IMiniport::GetDescription( + OUT PPCFILTER_DESCRIPTOR* Description) +{ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +IMiniport::DataRangeIntersection( + IN ULONG PinId, + IN PKSDATARANGE DataRange, + IN PKSDATARANGE MatchingDataRange, + IN ULONG OutputBufferLength, + OUT PVOID ResultantFormat OPTIONAL, + OUT PULONG ResultantFormatLength) +{ + return STATUS_UNSUCCESSFUL; +} Added: trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportDMus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportDMus.cpp (added) +++ trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportDMus.cpp Wed Mar 14 22:50:47 2007 @@ -1,0 +1,1 @@ + Added: trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportMidi.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportMidi.cpp (added) +++ trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportMidi.cpp Wed Mar 14 22:50:47 2007 @@ -1,0 +1,43 @@ +/* + ReactOS Operating System + + Port Class API + IMiniPortMidi Implementation + + by Andrew Greenwood + + REFERENCE: + http://www.osronline.com/ddkx/stream/audmp-routines_1fsj.htm +*/ + +#include <portcls.h> + +NTSTATUS +IMiniportMidi::Init( + IN PUNKNOWN UnknownAdapter, + IN PRESOURCELIST ResourceList, + IN PPORTMIDI Port, + OUT PSERVICEGROUP* ServiceGroup) +{ + /* http://www.osronline.com/ddkx/stream/audmp-routines_6jsj.htm */ + + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +IMiniportMidi::NewStream( + OUT PMINIPORTMIDISTREAM Stream, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN ULONG Pin, + IN BOOLEAN Capture, + IN PKSDATAFORMAT DataFormat, + OUT PSERVICEGROUP* ServiceGroup) +{ + return STATUS_UNSUCCESSFUL; +} + +void +IMiniportMidi::Service(void) +{ +} Added: trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportTopology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportTopology.cpp (added) +++ trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportTopology.cpp Wed Mar 14 22:50:47 2007 @@ -1,0 +1,1 @@ + Added: trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportWaveCyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportWaveCyclic.cpp (added) +++ trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportWaveCyclic.cpp Wed Mar 14 22:50:47 2007 @@ -1,0 +1,1 @@ + Added: trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportWavePci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportWavePci.cpp (added) +++ trunk/reactos/drivers/multimedia/portcls/miniport/IMiniportWavePci.cpp Wed Mar 14 22:50:47 2007 @@ -1,0 +1,1 @@ + Added: trunk/reactos/drivers/multimedia/portcls/miniport/factory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/miniport/factory.cpp (added) +++ trunk/reactos/drivers/multimedia/portcls/miniport/factory.cpp Wed Mar 14 22:50:47 2007 @@ -1,0 +1,1 @@ + Added: trunk/reactos/drivers/multimedia/portcls/port/IPort.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/port/IPort.cpp (added) +++ trunk/reactos/drivers/multimedia/portcls/port/IPort.cpp Wed Mar 14 22:50:47 2007 @@ -1,0 +1,55 @@ +/* + ReactOS Operating System + Port Class API / IPort Implementation + + by Andrew Greenwood + + REFERENCE: + http://www.osronline.com/ddkx/stream/audmp-routines_0tgz.htm + + NOTE: I'm not sure if this file is even needed... +*/ + +#if 0 + +#include <stdunk.h> +#include <portcls.h> + +NTSTATUS +IPort::GetDeviceProperty( + IN DEVICE_REGISTRY_PROPERTY DeviceRegistryProperty, + IN ULONG BufferLength, + OUT PVOID PropertyBuffer, + OUT PULONG ReturnLength) +{ + /* http://www.osronline.com/ddkx/stream/audmp-routines_93xv.htm */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +IPort::Init( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PUNKNOWN UnknownMiniport, + IN PUNKNOWN UnknownAdapter OPTIONAL, + IN PRESOURCELIST ResourceList) +{ + /* http://www.osronline.com/ddkx/stream/audmp-routines_7qcz.htm */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +IPort::NewRegistryKey( + OUT PREGISTRYKEY* OutRegistryKey, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN ULONG RegistryKeyType, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN ULONG CreateOptions OPTIONAL, + OUT PULONG Disposition OPTIONAL) +{ + /* http://www.osronline.com/ddkx/stream/audmp-routines_2jhv.htm */ + return STATUS_UNSUCCESSFUL; +} + +#endif Added: trunk/reactos/drivers/multimedia/portcls/port/IPortDMus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/port/IPortDMus.cpp (added) +++ trunk/reactos/drivers/multimedia/portcls/port/IPortDMus.cpp Wed Mar 14 22:50:47 2007 @@ -1,0 +1,1 @@ + Added: trunk/reactos/drivers/multimedia/portcls/port/IPortMidi.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/port/IPortMidi.cpp (added) +++ trunk/reactos/drivers/multimedia/portcls/port/IPortMidi.cpp Wed Mar 14 22:50:47 2007 @@ -1,0 +1,74 @@ +/* + ReactOS Operating System + Port Class API / IPortMidi Implementation + + by Andrew Greenwood + + REFERENCE: + http://www.osronline.com/ddkx/stream/audmp-routines_49pv.htm + + NOTES: + IPortMidi inherits from IPort. This file contains specific + extensions. +*/ + +#include <stdunk.h> +#include <portcls.h> +#include "port.h" + + +/* + IPort Methods +*/ + +NTSTATUS +CPortMidi::GetDeviceProperty( + IN DEVICE_REGISTRY_PROPERTY DeviceRegistryProperty, + IN ULONG BufferLength, + OUT PVOID PropertyBuffer, + OUT PULONG ReturnLength) +{ + /* http://www.osronline.com/ddkx/stream/audmp-routines_93xv.htm */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +CPortMidi::Init( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PUNKNOWN UnknownMiniport, + IN PUNKNOWN UnknownAdapter OPTIONAL, + IN PRESOURCELIST ResourceList) +{ + /* http://www.osronline.com/ddkx/stream/audmp-routines_7qcz.htm */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +CPortMidi::NewRegistryKey( + OUT PREGISTRYKEY* OutRegistryKey, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN ULONG RegistryKeyType, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN ULONG CreateOptions OPTIONAL, + OUT PULONG Disposition OPTIONAL) +{ + /* http://www.osronline.com/ddkx/stream/audmp-routines_2jhv.htm */ + return STATUS_UNSUCCESSFUL; +} + +/* + IPortMidi Methods +*/ + +VOID +CPortMidi::Notify(IN PSERVICEGROUP ServiceGroup OPTIONAL) +{ +} + +NTSTATUS +CPortMidi::RegisterServiceGroup(IN PSERVICEGROUP ServiceGroup) +{ + return STATUS_UNSUCCESSFUL; +} Added: trunk/reactos/drivers/multimedia/portcls/port/IPortTopology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/port/IPortTopology.cpp (added) +++ trunk/reactos/drivers/multimedia/portcls/port/IPortTopology.cpp Wed Mar 14 22:50:47 2007 @@ -1,0 +1,3 @@ +/* + Inherits from IPort only +*/ Added: trunk/reactos/drivers/multimedia/portcls/port/IPortWaveCyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/port/IPortWaveCyclic.cpp (added) +++ trunk/reactos/drivers/multimedia/portcls/port/IPortWaveCyclic.cpp Wed Mar 14 22:50:47 2007 @@ -1,0 +1,41 @@ +/* + ReactOS Operating System + Port Class API / IPort Implementation + + by Andrew Greenwood +*/ + +#include <portcls.h> + +NTSTATUS +IPortWaveCyclic::NewMasterDmaChannel( + OUT PDMACHANNEL* DmaChannel, + IN PUNKNOWN OuterUnknown, + IN PRESOURCELIST ResourceList OPTIONAL, + IN ULONG MaximumLength, + IN BOOL Dma32BitAddresses, + IN BOOL Dma64BitAddresses, + IN DMA_WIDTH DmaWidth, + IN DMA_SPEED DmaSpeed) +{ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +IPortWaveCyclic::NewSlaveDmaChannel( + OUT PDMACHANNELSLAVE* DmaChannel, + IN PUNKNOWN OuterUnknown, + IN PRESOURCELIST ResourceList OPTIONAL, + IN ULONG DmaIndex, + IN ULONG MaximumLength, + IN BOOL DemandMode, + IN DMA_SPEED DmaSpeed) +{ + return STATUS_UNSUCCESSFUL; +} + +VOID +IPortWaveCyclic::Notify( + IN PSERVICEGROUP ServiceGroup) +{ +} Added: trunk/reactos/drivers/multimedia/portcls/port/IPortWavePci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/port/IPortWavePci.cpp (added) +++ trunk/reactos/drivers/multimedia/portcls/port/IPortWavePci.cpp Wed Mar 14 22:50:47 2007 @@ -1,0 +1,31 @@ +/* + ReactOS Operating System + Port Class API / IPort Implementation + + by Andrew Greenwood +*/ + +#include <portcls.h> + +NTSTATUS +IPortWavePci::NewMasterDmaChannel( + OUT PDMACHANNEL* DmaChannel, + IN PUNKNOWN OuterUnknown, + IN POOL_TYPE PoolType, + IN PRESOURCELIST ResourceList OPTIONAL, + IN BOOL ScatterGather, + IN BOOL Dma32BitAddresses, + IN BOOL Dma64BitAddresses, + IN DMA_WIDTH DmaWidth, + IN DMA_SPEED DmaSpeed, + IN ULONG MaximumLength, + IN ULONG DmaPort) +{ + return STATUS_UNSUCCESSFUL; +} + +VOID +IPortWavePci::Notify( + IN PSERVICEGROUP ServiceGroup) +{ +} Added: trunk/reactos/drivers/multimedia/portcls/port/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/port/factory.c (added) +++ trunk/reactos/drivers/multimedia/portcls/port/factory.c Wed Mar 14 22:50:47 2007 @@ -1,0 +1,58 @@ +/* + ReactOS Operating System + Port Class API / Port Factory + + by Andrew Greenwood +*/ + +#include <portcls.h> +#include "port.h" + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewPort( + OUT PPORT* OutPort, + IN REFCLSID ClassId) +{ + /* + ClassId can be one of the following: + CLSID_PortDMus -> IPortDMus (dmusicks.h) + CLSID_PortMidi -> IPortMidi + CLSID_PortTopology -> IPortTopology + CLSID_PortWaveCyclic -> IPortWaveCyclic + CLSID_PortWavePci -> IPortWavePci + */ + + PPORT new_port = NULL; + + if ( ! OutPort ) + { + DPRINT("PcNewPort was supplied a NULL OutPort parameter\n"); + return STATUS_INVALID_PARAMETER; + } + + /* FIXME - do not hack, for it is bad */ + //new_port = new PPortMidi; + +// STD_CREATE_BODY_(CPortMidi, (PUNKNOWN) &new_port, NULL, 0, PUNKNOWN); + +/* + if ( ClassId == CLSID_PortMidi ) + new_port = new IPortMidi; + else if ( ClassId == CLSID_PortTopology ) + new_port = new IPortTopology; + else if ( ClassId == CLSID_PortWaveCyclic ) + new_port = new IPortWaveCyclic; + else if ( ClassId == CLSID_PortWavePci ) + new_port = new IPortWavePci; + else +*/ + return STATUS_NOT_SUPPORTED; + + /* Fill the caller's PPORT* to point to the new port */ + *OutPort = new_port; + + return STATUS_SUCCESS; +} Added: trunk/reactos/drivers/multimedia/portcls/port/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/port/port.h (added) +++ trunk/reactos/drivers/multimedia/portcls/port/port.h Wed Mar 14 22:50:47 2007 @@ -1,0 +1,35 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: drivers/multimedia/portcls/port/port.h + * PURPOSE: Port Class driver / Private header for IPort + * PROGRAMMER: Andrew Greenwood + * + * HISTORY: + * 27 Jan 07 Created + */ + + +/* + Private header for Port implementations +*/ + +#ifndef PORT_PRIVATE_H +#define PORT_PRIVATE_H + +#include <stdunk.h> +#include <portcls.h> + +typedef struct CPort +{ + union + { + IUnknown IUnknown; + IPort IPort; + }; + + LONG m_ref_count; + PUNKNOWN m_outer_unknown; +} CPort; + +#endif Modified: trunk/reactos/drivers/multimedia/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/portcls.rbuild (original) +++ trunk/reactos/drivers/multimedia/portcls/portcls.rbuild Wed Mar 14 22:50:47 2007 @@ -1,12 +1,25 @@ -<module name="portcls" type="exportdriver" installbase="system32/drivers" installname="portcls.sys" allowwarnings="true"> +<module name="portcls" type="kernelmodedriver" installbase="system32/drivers" installname="portcls.sys" allowwarnings="true"> + <linkerflag>-fno-exceptions</linkerflag> + <linkerflag>-fno-rtti</linkerflag> <importlibrary definition="portcls.def" /> - <define name="__USE_W32API" /> - <include base="portcls">../include</include> - <library>ntoskrnl</library> - <library>drmk</library> + <define name="__USE_W32API" /> + <include base="portcls">../include</include> + <library>ntoskrnl</library> + <library>ks</library> + <library>drmk</library> + <file>dll.c</file> - <file>adapter.c</file> - <file>drm.c</file> - <file>stubs.c</file> - <file>portcls.rc</file> + <file>adapter.c</file> + <file>irp.c</file> + <file>drm.c</file> + <file>stubs.c</file> + +  + <file>../stdunk/stdunk.c</file> + + <file>helper/ResourceList.c</file> + + <file>port/factory.c</file> + + <file>portcls.rc</file> </module> Added: trunk/reactos/drivers/multimedia/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/private.h (added) +++ trunk/reactos/drivers/multimedia/portcls/private.h Wed Mar 14 22:50:47 2007 @@ -1,0 +1,44 @@ +/* + PortCls FDO Extension + + by Andrew Greenwood +*/ + +#ifndef PORTCLS_PRIVATE_H +#define PORTCLS_PRIVATE_H + +#include <portcls.h> + +NTAPI +NTSTATUS +PortClsCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTAPI +NTSTATUS +PortClsPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTAPI +NTSTATUS +PortClsPower( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTAPI +NTSTATUS +PortClsSysControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + +typedef struct +{ + PCPFNSTARTDEVICE StartDevice; + + IResourceList* resources; +} PCExtension; + +#endif Modified: trunk/reactos/drivers/multimedia/portcls/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/stubs.c (original) +++ trunk/reactos/drivers/multimedia/portcls/stubs.c Wed Mar 14 22:50:47 2007 @@ -1,7 +1,13 @@ /* - Port Class API - Stubbed functions -*/ + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: drivers/multimedia/portcls/stubs.c + * PURPOSE: Port Class driver / Stubs + * PROGRAMMER: Andrew Greenwood + * + * HISTORY: + * 27 Jan 07 Created + */ #include <portcls.h> @@ -45,18 +51,6 @@ PORTCLASSAPI NTSTATUS NTAPI PcNewMiniport( OUT PMINIPORT* OutMiniport, - IN REFCLSID ClassId) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -PORTCLASSAPI NTSTATUS NTAPI -PcNewPort( - OUT PPORT* OutPort, IN REFCLSID ClassId) { UNIMPLEMENTED; @@ -86,81 +80,9 @@ * @unimplemented */ PORTCLASSAPI NTSTATUS NTAPI -PcNewResourceList( - OUT PRESOURCELIST* OutResourceList, - IN PUNKNOWN OuterUnknown OPTIONAL, - IN POOL_TYPE PoolType, - IN PCM_RESOURCE_LIST TranslatedResources, - IN PCM_RESOURCE_LIST UntranslatedResources) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -PORTCLASSAPI NTSTATUS NTAPI -PcNewResourceSublist( - OUT PRESOURCELIST* OutResourceList, - IN PUNKNOWN OuterUnknown OPTIONAL, - IN POOL_TYPE PoolType, - IN PRESOURCELIST ParentList, - IN ULONG MaximumEntries) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -PORTCLASSAPI NTSTATUS NTAPI PcNewServiceGroup( OUT PSERVICEGROUP* OutServiceGroup, IN PUNKNOWN OuterUnknown OPTIONAL) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - - -/* =============================================================== - IRP Handling -*/ - -/* - * @unimplemented - */ -PORTCLASSAPI NTSTATUS NTAPI -PcDispatchIrp( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -PORTCLASSAPI NTSTATUS NTAPI -PcCompleteIrp( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN NTSTATUS Status) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -PORTCLASSAPI NTSTATUS NTAPI -PcForwardIrpSynchronous( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) { UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; Added: trunk/reactos/drivers/multimedia/portcls/undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/undoc.c (added) +++ trunk/reactos/drivers/multimedia/portcls/undoc.c Wed Mar 14 22:50:47 2007 @@ -1,0 +1,103 @@ +/* + Undocumented PortCls exports +*/ + +#include <portcls.h> + +PORTCLASSAPI NTSTATUS +KsoDispatchCreateWithGenericFactory( + LONG Unknown, + PIRP Irp) +{ +} + +PORTCLASSAPI void +KsoGetIrpTargetFromFileObject( + LONG Unknown) +{ +} + +PORTCLASSAPI void +KsoGetIrpTargetFromIrp( + LONG Unknown) +{ +} + +PORTCLASSAPI void +PcAcquireFormatResources( + LONG Unknown, + LONG Unknown2, + LONG Unknown3, + LONG Unknown4) +{ +} + +PORTCLASSAPI +NTSTATUS +PcAddToEventTable( + PVOID Ptr, + LONG Unknown2, + ULONG Length, + LONG Unknown3, + LONG Unknown4, + LONG Unknown5, + LONG Unknown6, + LONG Unknown7) +{ +} + +PORTCLASSAPI +NTSTATUS +PcAddToPropertyTable( + PVOID Ptr, + LONG Unknown, + LONG Unknown2, + LONG Unknown3, + CHAR Unknown4) +{ +} + +PORTCLASSAPI +NTSTATUS +PcCaptureFormat( + LONG Unknown, + LONG Unknown2, + LONG Unknown3, + LONG Unknown4) +{ +} + +PORTCLASSAPI +NTSTATUS +PcCreateSubdeviceDescriptor( + /* TODO */ ) +{ +} + +/* PcDeleteSubdeviceDescriptor */ + +/* PcDmaMasterDescription */ + +/* PcDmaSlaveDescription */ + +/* PcFreeEventTable */ + +/* PcFreePropertyTable */ + +/* PcGenerateEventDeferredRoutine */ + +/* PcGenerateEventList */ + +/* PcHandleDisableEventWithTable */ + +/* PcHandleEnableEventWithTable */ + +/* PcHandlePropertyWithTable */ + +/* PcPinPropertyHandler */ + +/* PcTerminateConnection */ + +/* PcValidateConnectRequest */ + +/* PcVerifyFilterIsReady */

1 0

[greatlrd] 26093: Bug fix DdCreateSurface, it can now create one surface, the code are tested in windows, in my syscall demo for win32k. We do not support create more that one surface. mulit surface create will be add later. But code path to implement it, exist
by greatlrd＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: greatlrd Date: Wed Mar 14 19:33:36 2007 New Revision: 26093 URL: http://svn.reactos.org/svn/reactos?rev=26093&view=rev Log: Bug fix DdCreateSurface, it can now create one surface, the code are tested in windows, in my syscall demo for win32k. We do not support create more that one surface. mulit surface create will be add later. But code path to implement it, exist Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Wed Mar 14 19:33:36 2007 @@ -209,16 +209,20 @@ DD_SURFACE_LOCAL DdSurfaceLocal; DD_SURFACE_MORE DdSurfaceMore; DD_SURFACE_GLOBAL DdSurfaceGlobal; + HANDLE hPrevSurface, hSurface; - DD_SURFACE_LOCAL* pDdSurfaceLocal; - DD_SURFACE_MORE* pDdSurfaceMore; - DD_SURFACE_GLOBAL* pDdSurfaceGlobal; - LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal; - //LPDDRAWI_DDRAWSURFACE_MORE pSurfaceMore; - LPDDRAWI_DDRAWSURFACE_GBL pSurfaceGlobal; + + + PDD_SURFACE_LOCAL pDdSurfaceLocal = NULL; + PDD_SURFACE_MORE pDdSurfaceMore = NULL; + PDD_SURFACE_GLOBAL pDdSurfaceGlobal = NULL; + + PDD_SURFACE_LOCAL ptmpDdSurfaceLocal = NULL; + PDD_SURFACE_MORE ptmpDdSurfaceMore = NULL; + PDD_SURFACE_GLOBAL ptmpDdSurfaceGlobal = NULL; PHANDLE phSurface = NULL, puhSurface = NULL; ULONG i; - LPDDSURFACEDESC pSurfaceDesc; + LPDDSURFACEDESC pSurfaceDesc = NULL; /* Check how many surfaces there are */ if (SurfaceCount != 1) @@ -241,67 +245,142 @@ RtlZeroMemory(&DdSurfaceMore, sizeof(DdSurfaceMore)); } - /* Loop for each surface */ - for (i = 0; i < pCreateSurface->dwSCnt; i++) - { - /* Get data */ - pSurfaceLocal = pCreateSurface->lplpSList[i]; - pSurfaceGlobal = pSurfaceLocal->lpGbl; + /* check if we got a surface or not */ + if (SurfaceCount!=0) + { + /* Loop for each surface */ + ptmpDdSurfaceGlobal = pDdSurfaceGlobal; + ptmpDdSurfaceLocal = pDdSurfaceLocal; + ptmpDdSurfaceMore = pDdSurfaceMore; pSurfaceDesc = pCreateSurface->lpDDSurfaceDesc; - /* Check if it has pixel data */ - if (pSurfaceDesc->dwFlags & DDRAWISURF_HASPIXELFORMAT) - { - /* Use its pixel data */ - DdSurfaceGlobal.ddpfSurface = pSurfaceDesc->ddpfPixelFormat; - DdSurfaceGlobal.ddpfSurface.dwSize = sizeof(DDPIXELFORMAT); - } - else - { - /* Use the one from the global surface */ - DdSurfaceGlobal.ddpfSurface = pSurfaceGlobal->lpDD->vmiData.ddpfDisplay; - } - - /* Convert data */ - DdSurfaceGlobal.wWidth = pSurfaceGlobal->wWidth; - DdSurfaceGlobal.wHeight = pSurfaceGlobal->wHeight; - DdSurfaceGlobal.lPitch = pSurfaceGlobal->lPitch; - DdSurfaceGlobal.fpVidMem = pSurfaceGlobal->fpVidMem; - DdSurfaceGlobal.dwBlockSizeX = pSurfaceGlobal->dwBlockSizeX; - DdSurfaceGlobal.dwBlockSizeY = pSurfaceGlobal->dwBlockSizeY; - // DdSurfaceGlobal.ddsCaps = pSurfaceLocal->ddsCaps | 0xBF0000; - - /* FIXME: Ddscapsex stuff missing */ - - /* Call win32k now */ - pCreateSurface->ddRVal = E_FAIL; - - Return = NtGdiDdCreateSurface(GetDdHandle(pCreateSurface->lpDD->hDD), - (HANDLE *)phSurface, + for (i = 0; i < SurfaceCount; i++) + { + LPDDRAWI_DDRAWSURFACE_LCL lcl = pCreateSurface->lplpSList[i]; + LPDDRAWI_DDRAWSURFACE_GBL gpl = pCreateSurface->lplpSList[i]->lpGbl; + + phSurface[i] = (HANDLE)lcl->hDDSurface; + ptmpDdSurfaceLocal->ddsCaps.dwCaps = lcl->ddsCaps.dwCaps; + + ptmpDdSurfaceLocal->dwFlags = (ptmpDdSurfaceLocal->dwFlags & + (0xB0000000 | DDRAWISURF_INMASTERSPRITELIST | + DDRAWISURF_HELCB | DDRAWISURF_FRONTBUFFER | + DDRAWISURF_BACKBUFFER | DDRAWISURF_INVALID | + DDRAWISURF_DCIBUSY | DDRAWISURF_DCILOCK)) | + (lcl->dwFlags & DDRAWISURF_DRIVERMANAGED); + + ptmpDdSurfaceGlobal->wWidth = gpl->wWidth; + ptmpDdSurfaceGlobal->wHeight = gpl->wHeight; + ptmpDdSurfaceGlobal->lPitch = gpl->fpVidMem; + ptmpDdSurfaceGlobal->fpVidMem = gpl->fpVidMem; + ptmpDdSurfaceGlobal->dwBlockSizeX = gpl->dwBlockSizeX; + ptmpDdSurfaceGlobal->dwBlockSizeY = gpl->dwBlockSizeY; + + if (lcl->dwFlags & DDRAWISURF_HASPIXELFORMAT) + { + RtlCopyMemory( &ptmpDdSurfaceGlobal->ddpfSurface , + &gpl->ddpfSurface, + sizeof(DDPIXELFORMAT)); + + ptmpDdSurfaceGlobal->ddpfSurface.dwSize = sizeof(DDPIXELFORMAT); + } + else + { + RtlCopyMemory( &ptmpDdSurfaceGlobal->ddpfSurface , + &gpl->lpDD->vmiData.ddpfDisplay, + sizeof(DDPIXELFORMAT)); + } + + if (lcl->lpSurfMore) + { + ptmpDdSurfaceMore->ddsCapsEx.dwCaps2 = lcl->lpSurfMore->ddsCapsEx.dwCaps2; + ptmpDdSurfaceMore->ddsCapsEx.dwCaps3 = lcl->lpSurfMore->ddsCapsEx.dwCaps3; + ptmpDdSurfaceMore->ddsCapsEx.dwCaps4 = lcl->lpSurfMore->ddsCapsEx.dwCaps4; + ptmpDdSurfaceMore->dwSurfaceHandle = (DWORD) pCreateSurface->lplpSList[i]->dbnOverlayNode.object_int; + } + + /* FIXME count to next SurfaceCount for + ptmpDdSurfaceGlobal = pDdSurfaceGlobal; + ptmpDdSurfaceLocal = pDdSurfaceLocal; + ptmpDdSurfaceMore = pDdSurfaceMore; + + we only support one surface create at moment + */ + } + } + + /* Call win32k now */ + pCreateSurface->ddRVal = DDERR_GENERIC; + + Return = NtGdiDdCreateSurface(GetDdHandle(pCreateSurface->lpDD->hDD), + (HANDLE *)phSurface, pSurfaceDesc, - &DdSurfaceGlobal, - &DdSurfaceLocal, - &DdSurfaceMore, + pDdSurfaceGlobal, + pDdSurfaceLocal, + pDdSurfaceMore, (PDD_CREATESURFACEDATA)pCreateSurface, puhSurface); - - - /* FIXME: Ddscapsex stuff missing */ - - /* Convert the data back */ - pSurfaceGlobal->lPitch = DdSurfaceGlobal.lPitch; - pSurfaceGlobal->fpVidMem = DdSurfaceGlobal.fpVidMem; - pSurfaceGlobal->dwBlockSizeX = DdSurfaceGlobal.dwBlockSizeX; - pSurfaceGlobal->dwBlockSizeY = DdSurfaceGlobal.dwBlockSizeY; - pCreateSurface->lplpSList[i]->hDDSurface = (DWORD) hSurface; - - /* FIXME: Ddscapsex stuff missing */ - } - + + if (SurfaceCount == 0) + { + pCreateSurface->ddRVal = DDERR_GENERIC; + } + else + { + ptmpDdSurfaceMore = pDdSurfaceMore; + ptmpDdSurfaceGlobal = pDdSurfaceGlobal; + ptmpDdSurfaceLocal = pDdSurfaceLocal; + + for (i=0;i<SurfaceCount;i++) + { + LPDDRAWI_DDRAWSURFACE_LCL lcl = pCreateSurface->lplpSList[i]; + LPDDRAWI_DDRAWSURFACE_GBL gpl = pCreateSurface->lplpSList[i]->lpGbl; + + gpl->lPitch = ptmpDdSurfaceGlobal->lPitch; + gpl->fpVidMem = ptmpDdSurfaceGlobal->fpVidMem; + gpl->dwBlockSizeX = ptmpDdSurfaceGlobal->dwBlockSizeX; + gpl->dwBlockSizeY = ptmpDdSurfaceGlobal->dwBlockSizeY; + + if (lcl->dwFlags & DDRAWISURF_HASPIXELFORMAT) + { + RtlCopyMemory( &gpl->ddpfSurface, &ptmpDdSurfaceGlobal->ddpfSurface , sizeof(DDPIXELFORMAT)); + } + + if (pCreateSurface->ddRVal != DD_OK) + { + gpl->fpVidMem = 0; + if (lcl->hDDSurface) + { + NtGdiDdDeleteSurfaceObject( (HANDLE)lcl->hDDSurface); + } + lcl->hDDSurface = 0; + } + else + { + + lcl->hDDSurface = (ULONG_PTR) puhSurface[i]; + } + + lcl->ddsCaps.dwCaps = ptmpDdSurfaceLocal->ddsCaps.dwCaps; + if (lcl->lpSurfMore) + { + lcl->lpSurfMore->ddsCapsEx.dwCaps2 = ptmpDdSurfaceMore->ddsCapsEx.dwCaps2; + lcl->lpSurfMore->ddsCapsEx.dwCaps3 = ptmpDdSurfaceMore->ddsCapsEx.dwCaps3; + lcl->lpSurfMore->ddsCapsEx.dwCaps4 = ptmpDdSurfaceMore->ddsCapsEx.dwCaps4; + } + /* FIXME count to next SurfaceCount for + ptmpDdSurfaceGlobal = pDdSurfaceGlobal; + ptmpDdSurfaceLocal = pDdSurfaceLocal; + ptmpDdSurfaceMore = pDdSurfaceMore; + we only support one surface create at moment + */ + } + } + /* Check if we have to free all our local allocations */ if (SurfaceCount > 1) { - /* FIXME: */ + /* FIXME: */ } /* Return */

1 0

[winesync] 26092: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 17:55:42 2007 New Revision: 26092 URL: http://svn.reactos.org/svn/reactos?rev=26092&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/main.c trunk/reactos/dll/win32/uxtheme/metric.c trunk/reactos/dll/win32/uxtheme/msstyles.c trunk/reactos/dll/win32/uxtheme/msstyles.h trunk/reactos/dll/win32/uxtheme/property.c trunk/reactos/dll/win32/uxtheme/system.c Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c Wed Mar 14 17:55:42 2007 @@ -27,6 +27,7 @@ #include "winbase.h" #include "winuser.h" #include "wingdi.h" +#include "vfwmsgs.h" #include "uxtheme.h" #include "tmschema.h" @@ -53,8 +54,8 @@ static const WCHAR szTab[] = { 'T','a','b',0 }; HRESULT hr; - TRACE("(%p,0x%08lx\n", hwnd, dwFlags); - hr = SetPropW (hwnd, MAKEINTATOMW (atDialogThemeEnabled), + TRACE("(%p,0x%08x\n", hwnd, dwFlags); + hr = SetPropW (hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled), (HANDLE)(dwFlags|0x80000000)); /* 0x80000000 serves as a "flags set" flag */ if (FAILED(hr)) @@ -75,7 +76,7 @@ TRACE("(%p)\n", hwnd); dwDialogTextureFlags = (DWORD)GetPropW (hwnd, - MAKEINTATOMW (atDialogThemeEnabled)); + (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled)); if (dwDialogTextureFlags == 0) /* Means EnableThemeDialogTexture wasn't called for this dialog */ return TRUE; @@ -220,7 +221,7 @@ } } if(reqsize.x <= size.x && reqsize.y <= size.y) { - TRACE("Using image size %ldx%ld, image %d\n", reqsize.x, reqsize.y, i + TMT_IMAGEFILE1); + TRACE("Using image size %dx%d, image %d\n", reqsize.x, reqsize.y, i + TMT_IMAGEFILE1); return fileProp; } } @@ -831,7 +832,7 @@ HRESULT hr = S_OK; int filltype = FT_SOLID; - TRACE("(%d,%d,%ld)\n", iPartId, iStateId, pOptions->dwFlags); + TRACE("(%d,%d,%d)\n", iPartId, iStateId, pOptions->dwFlags); if(pOptions->dwFlags & DTBG_OMITCONTENT) return S_OK; @@ -929,7 +930,7 @@ int bgtype = BT_BORDERFILL; RECT rt; - TRACE("(%p,%p,%d,%d,%ld,%ld)\n", hTheme, hdc, iPartId, iStateId,pRect->left,pRect->top); + TRACE("(%p,%p,%d,%d,%d,%d)\n", hTheme, hdc, iPartId, iStateId,pRect->left,pRect->top); if(!hTheme) return E_HANDLE; @@ -1388,7 +1389,7 @@ LTInnerI = RBInnerI = LTRBInnerFlat[uType & (BDR_INNER|BDR_OUTER)]; LTOuterI = RBOuterI = LTRBOuterFlat[uType & (BDR_INNER|BDR_OUTER)]; - if( LTInnerI != -1 ) LTInnerI = RBInnerI = COLOR_BTNFACE; + if( LTInnerI != -1 ) LTInnerI = RBInnerI = EDGE_FILL; } else if(uFlags & BF_SOFT) { @@ -1627,7 +1628,7 @@ /* If nothing was found, leave unchanged */ } - TRACE("left:%ld,top:%ld,right:%ld,bottom:%ld\n", pContentRect->left, pContentRect->top, pContentRect->right, pContentRect->bottom); + TRACE("left:%d,top:%d,right:%d,bottom:%d\n", pContentRect->left, pContentRect->top, pContentRect->right, pContentRect->bottom); return S_OK; } @@ -1675,7 +1676,7 @@ /* If nothing was found, leave unchanged */ } - TRACE("left:%ld,top:%ld,right:%ld,bottom:%ld\n", pExtentRect->left, pExtentRect->top, pExtentRect->right, pExtentRect->bottom); + TRACE("left:%d,top:%d,right:%d,bottom:%d\n", pExtentRect->left, pExtentRect->top, pExtentRect->right, pExtentRect->bottom); return S_OK; } @@ -1718,8 +1719,8 @@ } /* compute part size for "borderfill" backgrounds */ -HRESULT get_border_background_size (HTHEME hTheme, int iPartId, - int iStateId, THEMESIZE eSize, POINT* psz) +static HRESULT get_border_background_size (HTHEME hTheme, int iPartId, + int iStateId, THEMESIZE eSize, POINT* psz) { HRESULT hr = S_OK; int bordersize = 1; Modified: trunk/reactos/dll/win32/uxtheme/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/main.c (original) +++ trunk/reactos/dll/win32/uxtheme/main.c Wed Mar 14 17:55:42 2007 @@ -35,7 +35,7 @@ /* For the moment, do nothing here. */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { - TRACE("%p 0x%lx %p: stub\n", hInstDLL, fdwReason, lpv); + TRACE("%p 0x%x %p: stub\n", hInstDLL, fdwReason, lpv); switch(fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); Modified: trunk/reactos/dll/win32/uxtheme/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/metric.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/metric.c (original) +++ trunk/reactos/dll/win32/uxtheme/metric.c Wed Mar 14 17:55:42 2007 @@ -26,6 +26,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "vfwmsgs.h" #include "uxtheme.h" #include "tmschema.h" Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c Wed Mar 14 17:55:42 2007 @@ -28,6 +28,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "vfwmsgs.h" #include "uxtheme.h" #include "tmschema.h" @@ -46,7 +47,7 @@ BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value); BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize); void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics); -HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); +static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); extern HINSTANCE hDllInst; extern int alphaBlendMode; @@ -57,7 +58,7 @@ 't','h','e','m','e','s','_','i','n','i','\0' }; -PTHEME_FILE tfActiveTheme = NULL; +static PTHEME_FILE tfActiveTheme; /***********************************************************************/ @@ -115,7 +116,7 @@ } if((versize = SizeofResource(hTheme, hrsc)) != 2) { - TRACE("Version resource found, but wrong size: %ld\n", versize); + TRACE("Version resource found, but wrong size: %d\n", versize); hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); goto invalid_theme; } @@ -402,7 +403,7 @@ * RETURNS * The class found, or NULL */ -PTHEME_CLASS MSSTYLES_FindClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassName) +static PTHEME_CLASS MSSTYLES_FindClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassName) { PTHEME_CLASS cur = tf->classes; while(cur) { @@ -674,7 +675,7 @@ int captionColors; }; -inline void parse_init_color (struct PARSECOLORSTATE* state) +static inline void parse_init_color (struct PARSECOLORSTATE* state) { memset (state, 0, sizeof (*state)); } @@ -728,7 +729,7 @@ LOGFONTW iconTitleFont; }; -inline void parse_init_nonclient (struct PARSENONCLIENTSTATE* state) +static inline void parse_init_nonclient (struct PARSENONCLIENTSTATE* state) { memset (state, 0, sizeof (*state)); state->metrics.cbSize = sizeof (NONCLIENTMETRICSW); @@ -1225,8 +1226,8 @@ * * Retrieve a color value for a property */ -HRESULT MSSTYLES_GetFont (LPCWSTR lpCur, LPCWSTR lpEnd, - LPCWSTR *lpValEnd, LOGFONTW* pFont) +static HRESULT MSSTYLES_GetFont (LPCWSTR lpCur, LPCWSTR lpEnd, + LPCWSTR *lpValEnd, LOGFONTW* pFont) { static const WCHAR szBold[] = {'b','o','l','d','\0'}; static const WCHAR szItalic[] = {'i','t','a','l','i','c','\0'}; Modified: trunk/reactos/dll/win32/uxtheme/msstyles.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.h (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.h Wed Mar 14 17:55:42 2007 @@ -94,7 +94,6 @@ BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId); PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf); PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext); -PTHEME_CLASS MSSTYLES_FindClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassName); PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId); PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId); HBITMAP MSSTYLES_LoadBitmap(PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha); Modified: trunk/reactos/dll/win32/uxtheme/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/property… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/property.c (original) +++ trunk/reactos/dll/win32/uxtheme/property.c Wed Mar 14 17:55:42 2007 @@ -26,6 +26,7 @@ #include "winbase.h" #include "winuser.h" #include "wingdi.h" +#include "vfwmsgs.h" #include "uxtheme.h" #include "tmschema.h" Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c (original) +++ trunk/reactos/dll/win32/uxtheme/system.c Wed Mar 14 17:55:42 2007 @@ -28,6 +28,7 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" +#include "vfwmsgs.h" #include "uxtheme.h" #include "tmschema.h" @@ -165,7 +166,7 @@ } else { bThemeActive = FALSE; - TRACE("Failed to get ThemeActive: %ld\n", GetLastError()); + TRACE("Failed to get ThemeActive: %d\n", GetLastError()); } buffsize = sizeof(szCurrentColor)/sizeof(szCurrentColor[0]); if(RegQueryValueExW(hKey, szColorName, NULL, NULL, (LPBYTE)szCurrentColor, &buffsize)) @@ -205,7 +206,7 @@ } if(!bThemeActive) { MSSTYLES_SetActiveTheme(NULL, FALSE); - TRACE("Themeing not active\n"); + TRACE("Theming not active\n"); } } @@ -470,7 +471,7 @@ * * Change the current active theme */ -HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) +static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) { HKEY hKey; WCHAR tmp[2]; @@ -604,15 +605,15 @@ * I'm using atoms as there may be large numbers of duplicated strings * and they do the work of keeping memory down as a cause of that quite nicely */ -HRESULT UXTHEME_SetWindowProperty(HWND hwnd, ATOM aProp, LPCWSTR pszValue) -{ - ATOM oldValue = (ATOM)(size_t)RemovePropW(hwnd, MAKEINTATOMW(aProp)); +static HRESULT UXTHEME_SetWindowProperty(HWND hwnd, ATOM aProp, LPCWSTR pszValue) +{ + ATOM oldValue = (ATOM)(size_t)RemovePropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp)); if(oldValue) DeleteAtom(oldValue); if(pszValue) { ATOM atValue = AddAtomW(pszValue); if(!atValue - || !SetPropW(hwnd, MAKEINTATOMW(aProp), (LPWSTR)MAKEINTATOMW(atValue))) { + || !SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp), (LPWSTR)MAKEINTATOM(atValue))) { HRESULT hr = HRESULT_FROM_WIN32(GetLastError()); if(atValue) DeleteAtom(atValue); return hr; @@ -621,9 +622,9 @@ return S_OK; } -LPWSTR UXTHEME_GetWindowProperty(HWND hwnd, ATOM aProp, LPWSTR pszBuffer, int dwLen) -{ - ATOM atValue = (ATOM)(size_t)GetPropW(hwnd, MAKEINTATOMW(aProp)); +static LPWSTR UXTHEME_GetWindowProperty(HWND hwnd, ATOM aProp, LPWSTR pszBuffer, int dwLen) +{ + ATOM atValue = (ATOM)(size_t)GetPropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp)); if(atValue) { if(GetAtomNameW(atValue, pszBuffer, dwLen)) return pszBuffer; @@ -642,7 +643,7 @@ LPCWSTR pszAppName; LPCWSTR pszUseClassList; HTHEME hTheme = NULL; - TRACE("(%p,%s)", hwnd, debugstr_w(pszClassList)); + TRACE("(%p,%s)\n", hwnd, debugstr_w(pszClassList)); if(bThemeActive) { @@ -656,7 +657,7 @@ hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList); } if(IsWindow(hwnd)) - SetPropW(hwnd, MAKEINTATOMW(atWindowTheme), hTheme); + SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), hTheme); TRACE(" = %p\n", hTheme); return hTheme; } @@ -675,7 +676,7 @@ HTHEME WINAPI GetWindowTheme(HWND hwnd) { TRACE("(%p)\n", hwnd); - return GetPropW(hwnd, MAKEINTATOMW(atWindowTheme)); + return GetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme)); } /*********************************************************************** @@ -725,7 +726,7 @@ */ void WINAPI SetThemeAppProperties(DWORD dwFlags) { - TRACE("(0x%08lx)\n", dwFlags); + TRACE("(0x%08x)\n", dwFlags); dwThemeAppProperties = dwFlags; } @@ -748,7 +749,7 @@ const RECT *pRect, HRGN hrgn, POINT ptTest, WORD *pwHitTestCode) { - FIXME("%d %d 0x%08lx: stub\n", iPartId, iStateId, dwOptions); + FIXME("%d %d 0x%08x: stub\n", iPartId, iStateId, dwOptions); if(!hTheme) return E_HANDLE; return ERROR_CALL_NOT_IMPLEMENTED; @@ -867,7 +868,7 @@ LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile, DWORD unknown) { - TRACE("(%s,%s,%s,%p,%ld)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%s,%s,%p,%d)\n", debugstr_w(pszThemeFileName), debugstr_w(pszColorName), debugstr_w(pszSizeName), hThemeFile, unknown); return MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, pszSizeName, (PTHEME_FILE*)hThemeFile); @@ -947,7 +948,7 @@ { PTHEME_FILE pt; HRESULT hr; - TRACE("(%s,%p,%ld,%p,%ld)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%p,%d,%p,%d)\n", debugstr_w(pszThemeFileName), pszColorName, dwColorNameLen, pszSizeName, dwSizeNameLen); @@ -1066,7 +1067,7 @@ HRESULT hr; LPWSTR tmp; UINT resourceId = dwColorNum + 1000; - TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName), debugstr_w(pszSizeName), dwColorNum); hr = MSSTYLES_OpenThemeFile(pszThemeFileName, NULL, pszSizeName, &pt); @@ -1126,7 +1127,7 @@ HRESULT hr; LPWSTR tmp; UINT resourceId = dwSizeNum + 3000; - TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName), debugstr_w(pszColorName), dwSizeNum); hr = MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, NULL, &pt);

1 0

[winesync] 26091: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 17:54:22 2007 New Revision: 26091 URL: http://svn.reactos.org/svn/reactos?rev=26091&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/shfolder/shfolder_ros.diff (with props) Added: trunk/reactos/dll/win32/shfolder/shfolder_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shfolder/shfolde… ============================================================================== --- trunk/reactos/dll/win32/shfolder/shfolder_ros.diff (added) +++ trunk/reactos/dll/win32/shfolder/shfolder_ros.diff Wed Mar 14 17:54:22 2007 @@ -1,0 +1,9 @@ +Index: shfolder.rbuild +=================================================================== +--- shfolder.rbuild (revision 23782) ++++ shfolder.rbuild (working copy) +@@ -1,3 +1,3 @@ ++<module name="shfolder" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_SHFOLDER}" installbase="system32" installname="shfolder.dll" allowwarnings="true"> +-<module name="shfolder" type="win32dll" baseaddress="${BASEADDRESS_SHFOLDER}" installbase="system32" installname="shfolder.dll" allowwarnings="true"> + <importlibrary definition="shfolder.spec.def" /> + <include base="shfolder">.</include> Propchange: trunk/reactos/dll/win32/shfolder/shfolder_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[winesync] 26090: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 17:52:10 2007 New Revision: 26090 URL: http://svn.reactos.org/svn/reactos?rev=26090&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/sensapi/sensapi.c Modified: trunk/reactos/dll/win32/sensapi/sensapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sensapi/sensapi.… ============================================================================== --- trunk/reactos/dll/win32/sensapi/sensapi.c (original) +++ trunk/reactos/dll/win32/sensapi/sensapi.c Wed Mar 14 17:52:10 2007 @@ -44,11 +44,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(sensapi); -HMODULE SENSAPI_hModule = 0; +static HMODULE SENSAPI_hModule; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH:

1 0

[winesync] 26089: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 17:50:28 2007 New Revision: 26089 URL: http://svn.reactos.org/svn/reactos?rev=26089&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/olepro32/olepro32_ros.diff (with props) trunk/reactos/dll/win32/olepro32/version.rc (with props) Modified: trunk/reactos/dll/win32/olepro32/olepro32.rbuild trunk/reactos/dll/win32/olepro32/olepro32stubs.c Modified: trunk/reactos/dll/win32/olepro32/olepro32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro3… ============================================================================== --- trunk/reactos/dll/win32/olepro32/olepro32.rbuild (original) +++ trunk/reactos/dll/win32/olepro32/olepro32.rbuild Wed Mar 14 17:50:28 2007 @@ -14,5 +14,6 @@ <library>kernel32</library> <library>ntdll</library> <file>olepro32stubs.c</file> + <file>version.rc</file> <file>olepro32.spec</file> </module> Added: trunk/reactos/dll/win32/olepro32/olepro32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro3… ============================================================================== --- trunk/reactos/dll/win32/olepro32/olepro32_ros.diff (added) +++ trunk/reactos/dll/win32/olepro32/olepro32_ros.diff Wed Mar 14 17:50:28 2007 @@ -1,0 +1,9 @@ +Index: olepro32.rbuild +=================================================================== +--- olepro32.rbuild (revision 23782) ++++ olepro32.rbuild (working copy) +@@ -1,3 +1,3 @@ ++<module name="olepro32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll" allowwarnings="true"> +-<module name="olepro32" type="win32dll" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="olepro32.spec.def" /> Propchange: trunk/reactos/dll/win32/olepro32/olepro32_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/olepro32/olepro32stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro3… ============================================================================== --- trunk/reactos/dll/win32/olepro32/olepro32stubs.c (original) +++ trunk/reactos/dll/win32/olepro32/olepro32stubs.c Wed Mar 14 17:50:28 2007 @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <stdarg.h> #include "wine/debug.h" @@ -36,7 +35,7 @@ */ HRESULT WINAPI DllUnregisterServer() { - FIXME("not implemented (olepro32.dll)\n"); + FIXME("stub\n"); return S_OK; } @@ -45,7 +44,7 @@ */ HRESULT WINAPI DllRegisterServer() { - FIXME("not implemented (olepro32.dll)\n"); + FIXME("stub\n"); return S_OK; } @@ -54,7 +53,7 @@ */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("not implemented (olepro32.dll)\n"); + FIXME("stub\n"); return S_OK; } @@ -63,6 +62,6 @@ */ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) { - FIXME("not implemented (olepro32.dll)\n"); + FIXME("stub\n"); return S_OK; } Added: trunk/reactos/dll/win32/olepro32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/version… ============================================================================== --- trunk/reactos/dll/win32/olepro32/version.rc (added) +++ trunk/reactos/dll/win32/olepro32/version.rc Wed Mar 14 17:50:28 2007 @@ -1,0 +1,27 @@ +/* + * Copyright 2006 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine olepro32.dll" +#define WINE_FILENAME_STR "olepro32.dll" +#define WINE_FILEVERSION 5,0,4522,0 +#define WINE_FILEVERSION_STR "5.0.4522" +#define WINE_PRODUCTVERSION 2,40,4522,0 +#define WINE_PRODUCTVERSION_STR "2.40" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/olepro32/version.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[winesync] 26088: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 17:46:50 2007 New Revision: 26088 URL: http://svn.reactos.org/svn/reactos?rev=26088&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/oleacc/oleacc_ros.diff (with props) Modified: trunk/reactos/dll/win32/oleacc/main.c Modified: trunk/reactos/dll/win32/oleacc/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/oleacc/main.c (original) +++ trunk/reactos/dll/win32/oleacc/main.c Wed Mar 14 17:46:50 2007 @@ -31,7 +31,7 @@ HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, REFIID riidInterface, void** ppvObject ) { - FIXME("%p %ld %s %p\n", hwnd, idObject, + FIXME("%p %d %s %p\n", hwnd, idObject, debugstr_guid( riidInterface ), ppvObject ); return E_NOTIMPL; } @@ -45,7 +45,7 @@ HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, REFIID riid, void** ppvObject ) { - FIXME("%p %ld %s %p\n", hwnd, dwObjectID, + FIXME("%p %d %s %p\n", hwnd, dwObjectID, debugstr_guid( riid ), ppvObject ); return E_NOTIMPL; } Added: trunk/reactos/dll/win32/oleacc/oleacc_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_ro… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc_ros.diff (added) +++ trunk/reactos/dll/win32/oleacc/oleacc_ros.diff Wed Mar 14 17:46:50 2007 @@ -1,0 +1,9 @@ +Index: oleacc.rbuild +=================================================================== +--- oleacc.rbuild (revision 23782) ++++ oleacc.rbuild (working copy) +@@ -1,3 +1,3 @@ ++<module name="oleacc" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll" allowwarnings="true"> +-<module name="oleacc" type="win32dll" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="oleacc.spec.def" /> Propchange: trunk/reactos/dll/win32/oleacc/oleacc_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native

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