Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[sginsberg] 42806: - Remove usage of dllexport for most dlls and drivers -- we use .def/.spec instead.
by sginsberg＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: sginsberg Date: Thu Aug 20 15:45:01 2009 New Revision: 42806 URL: http://svn.reactos.org/svn/reactos?rev=42806&view=rev Log: - Remove usage of dllexport for most dlls and drivers -- we use .def/.spec instead. Modified: trunk/reactos/include/ddk/cfgmgr32.h trunk/reactos/include/ddk/hidpi.h trunk/reactos/include/ddk/mcd.h trunk/reactos/include/ddk/ndis.h trunk/reactos/include/ddk/smbus.h trunk/reactos/include/ddk/storport.h trunk/reactos/include/ddk/tdikrnl.h trunk/reactos/include/ddk/upssvc.h trunk/reactos/include/ddk/usbcamdi.h trunk/reactos/include/psdk/authz.h trunk/reactos/include/psdk/batclass.h Modified: trunk/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev… ============================================================================== --- trunk/reactos/include/ddk/cfgmgr32.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/cfgmgr32.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -30,7 +30,7 @@ #endif #if defined(_CFGMGR32_) -#define CMAPI DECLSPEC_EXPORT +#define CMAPI #else #define CMAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/hidpi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hidpi.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/hidpi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/hidpi.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -30,7 +30,7 @@ #endif #if defined(_HIDPI_) - #define HIDAPI DECLSPEC_EXPORT + #define HIDAPI #else #define HIDAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/mcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/mcd.h?rev=4280… ============================================================================== --- trunk/reactos/include/ddk/mcd.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/mcd.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -32,7 +32,7 @@ #endif #if defined(_MCD_) - #define CHANGERAPI DECLSPEC_EXPORT + #define CHANGERAPI #else #define CHANGERAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=428… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -47,7 +47,7 @@ #endif #if defined(NDIS_WRAPPER) - #define NDISAPI DECLSPEC_EXPORT + #define NDISAPI #else #define NDISAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/smbus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/smbus.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/smbus.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/smbus.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -30,7 +30,7 @@ #if !defined(SMBCLASS) #define SMBCLASSAPI DECLSPEC_IMPORT #else - #define SMBCLASSAPI DECLSPEC_EXPORT + #define SMBCLASSAPI #endif #define SMB_BUS_REQUEST \ Modified: trunk/reactos/include/ddk/storport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/storport.h?rev… ============================================================================== --- trunk/reactos/include/ddk/storport.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/storport.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -30,7 +30,7 @@ #endif #if defined(_STORPORT_) - #define STORPORTAPI DECLSPEC_EXPORT + #define STORPORTAPI #else #define STORPORTAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/tdikrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tdikrnl.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/tdikrnl.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/tdikrnl.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -30,7 +30,7 @@ #endif #if defined(_TDI_) - #define TDIKRNLAPI DECLSPEC_EXPORT + #define TDIKRNLAPI #else #define TDIKRNLAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/upssvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/upssvc.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/upssvc.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/upssvc.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -28,7 +28,7 @@ #endif #if defined(_APCUPS_) - #define UPSAPI DECLSPEC_EXPORT + #define UPSAPI #else #define UPSAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/usbcamdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbcamdi.h?rev… ============================================================================== --- trunk/reactos/include/ddk/usbcamdi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/usbcamdi.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -34,7 +34,7 @@ #pragma pack(push,4) #if defined(_BATTERYCLASS_) - #define USBCAMAPI DECLSPEC_EXPORT + #define USBCAMAPI #else #define USBCAMAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/psdk/authz.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/authz.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/authz.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/authz.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -20,7 +20,7 @@ #if !defined(_AUTHZ_) #define AUTHZAPI DECLSPEC_IMPORT #else -#define AUTHZAPI DECLSPEC_EXPORT +#define AUTHZAPI #endif #ifdef __cplusplus Modified: trunk/reactos/include/psdk/batclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/batclass.h?re… ============================================================================== --- trunk/reactos/include/psdk/batclass.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/batclass.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -28,7 +28,7 @@ #endif #if defined(_BATTERYCLASS_) - #define BCLASSAPI DECLSPEC_EXPORT + #define BCLASSAPI #else #define BCLASSAPI DECLSPEC_IMPORT #endif

1 0

[janderwald] 42805: - Implement KsCopyObjectBagItems
by janderwald＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: janderwald Date: Thu Aug 20 15:21:24 2009 New Revision: 42805 URL: http://svn.reactos.org/svn/reactos?rev=42805&view=rev Log: - Implement KsCopyObjectBagItems Modified: trunk/reactos/drivers/ksfilter/ks/bag.c Modified: trunk/reactos/drivers/ksfilter/ks/bag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/bag.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] Thu Aug 20 15:21:24 2009 @@ -235,7 +235,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -244,8 +244,55 @@ IN KSOBJECT_BAG ObjectBagDestination, IN KSOBJECT_BAG ObjectBagSource) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PKSIOBJECT_BAG ObjectBagDest, ObjectBagSrc; + PLIST_ENTRY Entry; + PKSIOBJECT_BAG_ENTRY BagEntry; + NTSTATUS Status = STATUS_SUCCESS; + + /* get object bag src */ + ObjectBagSrc = (PKSIOBJECT_BAG)ObjectBagSource; + + /* get object bag dst */ + ObjectBagDest = (PKSIOBJECT_BAG)ObjectBagDestination; + + /* acquire source mutex */ + KeWaitForSingleObject(ObjectBagSrc->BagMutex, Executive, KernelMode, FALSE, NULL); + + if (ObjectBagSrc->BagMutex != ObjectBagDest->BagMutex) + { + /* acquire destination mutex */ + KeWaitForSingleObject(ObjectBagDest->BagMutex, Executive, KernelMode, FALSE, NULL); + } + + /* point to first item */ + Entry = ObjectBagSrc->ObjectList.Flink; + /* first scan the list if the item is already inserted */ + while(Entry != &ObjectBagSrc->ObjectList) + { + /* get bag entry */ + BagEntry = (PKSIOBJECT_BAG_ENTRY)CONTAINING_RECORD(Entry, KSIOBJECT_BAG_ENTRY, Entry); + + /* add the item */ + Status = KsAddItemToObjectBag(ObjectBagDestination, BagEntry->Item, BagEntry->Free); + + /* check for success */ + if (!NT_SUCCESS(Status)) + break; + + /* move to next entry */ + Entry = Entry->Flink; + } + + if (ObjectBagSrc->BagMutex != ObjectBagDest->BagMutex) + { + /* release destination mutex */ + KeReleaseMutex(ObjectBagDest->BagMutex, FALSE); + } + + /* release source mutex */ + KeReleaseMutex(ObjectBagSrc->BagMutex, FALSE); + + return Status; } /*

1 0

[janderwald] 42804: - Implement DllInitialize
by janderwald＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: janderwald Date: Thu Aug 20 14:38:52 2009 New Revision: 42804 URL: http://svn.reactos.org/svn/reactos?rev=42804&view=rev Log: - Implement DllInitialize Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c trunk/reactos/drivers/multimedia/bdasup/bdasup.spec Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] Thu Aug 20 14:38:52 2009 @@ -154,6 +154,21 @@ */ NTSTATUS NTAPI +DllInitialize( + PUNICODE_STRING RegistryPath) +{ + KeInitializeSpinLock(&g_Settings.FilterFactoryInstanceListLock); + InitializeListHead(&g_Settings.FilterFactoryInstanceList); + g_Settings.Initialized = TRUE; + + return STATUS_SUCCESS; +} + +/* + @implemented +*/ +NTSTATUS +NTAPI BdaCheckChanges(IN PIRP Irp) { if (!Irp) Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.spec [iso-8859-1] Thu Aug 20 14:38:52 2009 @@ -1,3 +1,4 @@ +@ stdcall DllInitialize(ptr) @ stdcall BdaCheckChanges(ptr) @ stdcall BdaCommitChanges(ptr) @ stdcall BdaCreateFilterFactory(ptr ptr ptr)

1 0

[sginsberg] 42803: - Release ntddsnd.h, portcls.h. punknown.h and stdunk.h to the public domain (silverblade and janderwald have agreed to this).
by sginsberg＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: sginsberg Date: Thu Aug 20 14:27:08 2009 New Revision: 42803 URL: http://svn.reactos.org/svn/reactos?rev=42803&view=rev Log: - Release ntddsnd.h, portcls.h. punknown.h and stdunk.h to the public domain (silverblade and janderwald have agreed to this). Modified: trunk/reactos/include/ddk/ntddsnd.h trunk/reactos/include/ddk/portcls.h trunk/reactos/include/ddk/punknown.h trunk/reactos/include/ddk/stdunk.h Modified: trunk/reactos/include/ddk/ntddsnd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddsnd.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntddsnd.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddsnd.h [iso-8859-1] Thu Aug 20 14:27:08 2009 @@ -1,6 +1,8 @@ /* ReactOS Sound System NT4 Multimedia Audio Support (ntddsnd.h) + + This file is in the public domain. Author: Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Thu Aug 20 14:27:08 2009 @@ -1,6 +1,8 @@ /* ReactOS Kernel Streaming Port Class + + This file is in the public domain. Andrew Greenwood Modified: trunk/reactos/include/ddk/punknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/punknown.h?rev… ============================================================================== --- trunk/reactos/include/ddk/punknown.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/punknown.h [iso-8859-1] Thu Aug 20 14:27:08 2009 @@ -2,7 +2,7 @@ ReactOS Kernel-Mode COM by Andrew Greenwood - Please see COPYING in the top-level directory for license information. + This file is in the public domain. */ #ifndef _UNKNOWN_H_ Modified: trunk/reactos/include/ddk/stdunk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stdunk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/stdunk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/stdunk.h [iso-8859-1] Thu Aug 20 14:27:08 2009 @@ -2,8 +2,7 @@ ReactOS Kernel-Mode COM IUnknown implementations - LICENSE - Please see COPYING in the top-level directory for license information. + This file is in the public domain. AUTHORS Andrew Greenwood

1 0

[janderwald] 42802: - Define automation tables for Filter & Pin - Plug in automation tables when creating a new filter factory / pin
by janderwald＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: janderwald Date: Thu Aug 20 14:26:09 2009 New Revision: 42802 URL: http://svn.reactos.org/svn/reactos?rev=42802&view=rev Log: - Define automation tables for Filter & Pin - Plug in automation tables when creating a new filter factory / pin Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] Thu Aug 20 14:26:09 2009 @@ -1,11 +1,93 @@ #include "precomp.h" + +const GUID KSPROPSETID_BdaPinControl = {0xded49d5, 0xa8b7, 0x4d5d, {0x97, 0xa1, 0x12, 0xb0, 0xc1, 0x95, 0x87, 0x4d}}; +const GUID KSMETHODSETID_BdaDeviceConfiguration = {0x71985f45, 0x1ca1, 0x11d3, {0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0}}; +const GUID KSPROPSETID_BdaTopology = {0xa14ee835, 0x0a23, 0x11d3, {0x9c, 0xc7, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0}}; BDA_GLOBAL g_Settings = { 0, 0, {NULL, NULL} +}; + +KSPROPERTY_ITEM FilterPropertyItem[] = +{ + DEFINE_KSPROPERTY_ITEM_BDA_NODE_TYPES(BdaPropertyNodeTypes, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPES( BdaPropertyPinTypes, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_TEMPLATE_CONNECTIONS(BdaPropertyTemplateConnections, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_NODE_METHODS(BdaPropertyNodeMethods, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_NODE_PROPERTIES(BdaPropertyNodeProperties, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_NODE_EVENTS(BdaPropertyNodeEvents, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_CONTROLLING_PIN_ID(BdaPropertyGetControllingPinId, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_NODE_DESCRIPTORS(BdaPropertyNodeDescriptors, NULL) +}; + + +KSPROPERTY_SET FilterPropertySet = +{ + &KSPROPSETID_BdaTopology, + 8, + FilterPropertyItem, + 0, + NULL +}; + +KSMETHOD_ITEM FilterMethodItem[] = +{ + //DEFINE_KSMETHOD_ITEM_BDA_CREATE_PIN_FACTORY(BdaMethodCreatePin, NULL), + DEFINE_KSMETHOD_ITEM_BDA_CREATE_TOPOLOGY(BdaMethodCreateTopology, NULL) +}; + +KSMETHOD_SET FilterMethodSet = +{ + &KSMETHODSETID_BdaDeviceConfiguration, + 2, + FilterMethodItem, + 0, + NULL +}; + +KSAUTOMATION_TABLE FilterAutomationTable = +{ + 1, + sizeof(KSPROPERTY_SET), + &FilterPropertySet, + 1, + sizeof(KSMETHOD_SET), + &FilterMethodSet, + 0, + sizeof(KSEVENT_SET), + NULL +}; + +KSPROPERTY_ITEM PinPropertyItem[] = +{ + DEFINE_KSPROPERTY_ITEM_BDA_PIN_ID(BdaPropertyGetPinControl, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPE(BdaPropertyGetPinControl, NULL) +}; + +KSPROPERTY_SET PinPropertySet = +{ + &KSPROPSETID_BdaPinControl, + 2, + PinPropertyItem, + 0, + NULL +}; + +KSAUTOMATION_TABLE PinAutomationTable = +{ + 1, + sizeof(KSPROPERTY_SET), + &PinPropertySet, + 0, + sizeof(KSMETHOD_SET), + NULL, + 0, + sizeof(KSEVENT_SET), + NULL }; @@ -158,10 +240,17 @@ PBDA_FILTER_INSTANCE_ENTRY FilterInstance; KIRQL OldLevel; NTSTATUS Status; - - /* FIXME provide a default automation table - * to handle requests which the driver doesnt implement - */ + KSFILTER_DESCRIPTOR FilterDescriptor; + + /* backup filter descriptor */ + RtlMoveMemory(&FilterDescriptor, pFilterDescriptor, sizeof(KSFILTER_DESCRIPTOR)); + + /* merge the automation tables */ + Status = KsMergeAutomationTables((PKSAUTOMATION_TABLE*)&FilterDescriptor.AutomationTable, (PKSAUTOMATION_TABLE)pFilterDescriptor->AutomationTable, &FilterAutomationTable, NULL); + + /* check for success */ + if (!NT_SUCCESS(Status)) + return Status; /* allocate filter instance */ FilterInstance = AllocateItem(NonPagedPool, sizeof(BDA_FILTER_INSTANCE_ENTRY)); @@ -172,7 +261,7 @@ } /* create the filter factory */ - Status = KsCreateFilterFactory(pKSDevice->FunctionalDeviceObject, pFilterDescriptor, NULL, NULL, 0, NULL, NULL, &FilterFactory); + Status = KsCreateFilterFactory(pKSDevice->FunctionalDeviceObject, &FilterDescriptor, NULL, NULL, 0, NULL, NULL, &FilterFactory); /* check for success */ if (NT_SUCCESS(Status)) @@ -233,14 +322,10 @@ PBDA_FILTER_INSTANCE_ENTRY InstanceEntry; NTSTATUS Status; ULONG PinId; + KSPIN_DESCRIPTOR_EX NewPinDescriptor; if (!pulPinId || !pKSFilter) return STATUS_INVALID_PARAMETER; - - - /* FIXME provide a default automation table - * to handle requests which the driver doesnt implement - */ /* get parent filter factory */ FilterFactory = KsFilterGetParentFilterFactory(pKSFilter); @@ -281,15 +366,26 @@ /* get pin descriptor */ PinDescriptor = (PKSPIN_DESCRIPTOR_EX)&InstanceEntry->FilterTemplate->pFilterDescriptor->PinDescriptors[ulPinType]; - /* create the pin factory */ - Status = KsFilterCreatePinFactory(pKSFilter, PinDescriptor, &PinId); + /* make a copy of the pin descriptor */ + RtlMoveMemory(&NewPinDescriptor, PinDescriptor, sizeof(KSPIN_DESCRIPTOR_EX)); + + /* merge the automation tables */ + Status = KsMergeAutomationTables((PKSAUTOMATION_TABLE*)&NewPinDescriptor.AutomationTable, (PKSAUTOMATION_TABLE)PinDescriptor->AutomationTable, &PinAutomationTable, pKSFilter->Bag); /* check for success */ if (NT_SUCCESS(Status)) { - /* store result */ - *pulPinId = PinId; - } + /* create the pin factory */ + Status = KsFilterCreatePinFactory(pKSFilter, &NewPinDescriptor, &PinId); + + /* check for success */ + if (NT_SUCCESS(Status)) + { + /* store result */ + *pulPinId = PinId; + } + } + DPRINT("BdaCreatePin Result %x\n", Status); return Status;

1 0

[janderwald] 42801: - Add KsMergeAutomationTables
by janderwald＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: janderwald Date: Thu Aug 20 14:11:36 2009 New Revision: 42801 URL: http://svn.reactos.org/svn/reactos?rev=42801&view=rev Log: - Add KsMergeAutomationTables Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4280… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Thu Aug 20 14:11:36 2009 @@ -3713,6 +3713,17 @@ */ #if defined(_NTDDK_) + +KSDDKAPI +NTSTATUS +NTAPI +KsMergeAutomationTables( + OUT PKSAUTOMATION_TABLE* AutomationTableAB, + IN PKSAUTOMATION_TABLE AutomationTableA OPTIONAL, + IN PKSAUTOMATION_TABLE AutomationTableB OPTIONAL, + IN KSOBJECT_BAG Bag OPTIONAL + ); + KSDDKAPI NTSTATUS NTAPI

1 0

[sginsberg] 42800: - Remove several assumptions that the default calling convention is stdcall (it isn't under gcc) - Fix even more definitions of function pointer protypes to define the calling convention compatibly for MSVC - Don't use dllexport in scsiport -- fixes linking under msvc
by sginsberg＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: sginsberg Date: Thu Aug 20 14:09:16 2009 New Revision: 42800 URL: http://svn.reactos.org/svn/reactos?rev=42800&view=rev Log: - Remove several assumptions that the default calling convention is stdcall (it isn't under gcc) - Fix even more definitions of function pointer protypes to define the calling convention compatibly for MSVC - Don't use dllexport in scsiport -- fixes linking under msvc Modified: trunk/reactos/dll/win32/psapi/psapi.c trunk/reactos/include/ddk/ntddpcm.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/parallel.h trunk/reactos/include/ddk/pfhook.h trunk/reactos/include/ddk/smbus.h trunk/reactos/include/ddk/srb.h trunk/reactos/include/ddk/storport.h trunk/reactos/include/ddk/usbcamdi.h trunk/reactos/include/ddk/video.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/ldrtypes.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/include/psdk/ntsecapi.h trunk/reactos/include/psdk/psapi.h trunk/reactos/include/psdk/wintrust.h trunk/reactos/include/psdk/winwlx.h Modified: trunk/reactos/dll/win32/psapi/psapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.c?re… ============================================================================== --- trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -587,7 +587,7 @@ } INTERNAL_ENUM_PAGE_FILES_CONTEXT, *PINTERNAL_ENUM_PAGE_FILES_CONTEXT; -static BOOL +static BOOL CALLBACK InternalAnsiPageFileCallback(LPVOID pContext, PENUM_PAGE_FILE_INFORMATION pPageFileInfo, LPCWSTR lpFilename) Modified: trunk/reactos/include/ddk/ntddpcm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddpcm.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntddpcm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddpcm.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -90,8 +90,8 @@ typedef ULONG MEMORY_SPACE; -typedef ULONG NTAPI -(*PPCMCIA_READ_WRITE_CONFIG)( +typedef ULONG +(NTAPI *PPCMCIA_READ_WRITE_CONFIG)( IN PVOID Context, IN ULONG WhichSpace, IN PUCHAR Buffer, @@ -117,8 +117,8 @@ #define PCMCIA_MEMORY_8BIT_ACCESS 0 #define PCMCIA_MEMORY_16BIT_ACCESS 1 -typedef BOOLEAN NTAPI -(*PPCMCIA_MODIFY_MEMORY_WINDOW)( +typedef BOOLEAN +(NTAPI *PPCMCIA_MODIFY_MEMORY_WINDOW)( IN PVOID Context, IN ULONGLONG HostBase, IN ULONGLONG CardBase, @@ -132,13 +132,13 @@ #define PCMCIA_VPP_12V 1 #define PCMCIA_VPP_IS_VCC 2 -typedef BOOLEAN NTAPI -(*PPCMCIA_SET_VPP)( +typedef BOOLEAN +(NTAPI *PPCMCIA_SET_VPP)( IN PVOID Context, IN UCHAR VppLevel); -typedef BOOLEAN NTAPI -(*PPCMCIA_IS_WRITE_PROTECTED)( +typedef BOOLEAN +(NTAPI *PPCMCIA_IS_WRITE_PROTECTED)( IN PVOID Context); typedef struct _PCMCIA_INTERFACE_STANDARD { Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -2378,7 +2378,7 @@ OUT PIO_STATUS_BLOCK IoStatus OPTIONAL ); -typedef VOID (*PDIRTY_PAGE_ROUTINE) ( +typedef VOID (NTAPI *PDIRTY_PAGE_ROUTINE) ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -3601,7 +3601,7 @@ IN PVOID FsContext ); -typedef BOOLEAN (*PCHECK_FOR_TRAVERSE_ACCESS) ( +typedef BOOLEAN (NTAPI *PCHECK_FOR_TRAVERSE_ACCESS) ( IN PVOID NotifyContext, IN PVOID TargetContext, IN PSECURITY_SUBJECT_CONTEXT SubjectContext @@ -5522,7 +5522,7 @@ ((PSECURITY_SUBJECT_CONTEXT) SubjectContext)->ClientToken : \ ((PSECURITY_SUBJECT_CONTEXT) SubjectContext)->PrimaryToken ) -typedef NTSTATUS (*PSE_LOGON_SESSION_TERMINATED_ROUTINE) ( +typedef NTSTATUS (NTAPI *PSE_LOGON_SESSION_TERMINATED_ROUTINE) ( IN PLUID LogonId ); Modified: trunk/reactos/include/ddk/parallel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/parallel.h?rev… ============================================================================== --- trunk/reactos/include/ddk/parallel.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/parallel.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -79,28 +79,28 @@ KINTERRUPT_MODE InterruptMode; } MORE_PARALLEL_PORT_INFORMATION, *PMORE_PARALLEL_PORT_INFORMATION; -typedef NTSTATUS DDKAPI -(*PPARALLEL_SET_CHIP_MODE)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_SET_CHIP_MODE)( IN PVOID SetChipContext, IN UCHAR ChipMode); -typedef NTSTATUS DDKAPI -(*PPARALLEL_CLEAR_CHIP_MODE)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_CLEAR_CHIP_MODE)( IN PVOID ClearChipContext, IN UCHAR ChipMode); -typedef NTSTATUS DDKAPI -(*PPARCHIP_CLEAR_CHIP_MODE)( +typedef NTSTATUS +(DDKAPI *PPARCHIP_CLEAR_CHIP_MODE)( IN PVOID ClearChipContext, IN UCHAR ChipMode); -typedef NTSTATUS DDKAPI -(*PPARALLEL_TRY_SELECT_ROUTINE)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_TRY_SELECT_ROUTINE)( IN PVOID TrySelectContext, IN PVOID TrySelectCommand); -typedef NTSTATUS DDKAPI -(*PPARALLEL_DESELECT_ROUTINE)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_DESELECT_ROUTINE)( IN PVOID DeselectContext, IN PVOID DeselectCommand); @@ -133,16 +133,16 @@ PWSTR PortName; } PARALLEL_PNP_INFORMATION, *PPARALLEL_PNP_INFORMATION; -typedef BOOLEAN DDKAPI -(*PPARALLEL_TRY_ALLOCATE_ROUTINE)( +typedef BOOLEAN +(DDKAPI *PPARALLEL_TRY_ALLOCATE_ROUTINE)( IN PVOID TryAllocateContext); -typedef VOID DDKAPI -(*PPARALLEL_FREE_ROUTINE)( +typedef VOID +(DDKAPI *PPARALLEL_FREE_ROUTINE)( IN PVOID FreeContext); -typedef ULONG DDKAPI -(*PPARALLEL_QUERY_WAITERS_ROUTINE)( +typedef ULONG +(DDKAPI *PPARALLEL_QUERY_WAITERS_ROUTINE)( IN PVOID QueryAllocsContext); typedef struct _PARALLEL_PORT_INFORMATION { @@ -164,8 +164,8 @@ BOOLEAN success; } PARALLEL_CHIP_MODE, *PPARALLEL_CHIP_MODE; -typedef VOID DDKAPI -(*PPARALLEL_DEFERRED_ROUTINE)( +typedef VOID +(DDKAPI *PPARALLEL_DEFERRED_ROUTINE)( IN PVOID DeferredContext); typedef struct _PARALLEL_INTERRUPT_SERVICE_ROUTINE { @@ -191,8 +191,8 @@ #define IOCTL_INTERNAL_UNLOCK_PORT_NO_DESELECT \ CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 53, METHOD_BUFFERED, FILE_ANY_ACCESS) -typedef USHORT DDKAPI -(*PDETERMINE_IEEE_MODES)( +typedef USHORT +(DDKAPI *PDETERMINE_IEEE_MODES)( IN PVOID Context); typedef enum _PARALLEL_SAFETY { @@ -200,49 +200,49 @@ UNSAFE_MODE } PARALLEL_SAFETY; -typedef NTSTATUS DDKAPI -(*PNEGOTIATE_IEEE_MODE)( +typedef NTSTATUS +(DDKAPI *PNEGOTIATE_IEEE_MODE)( IN PVOID Context, IN USHORT ModeMaskFwd, IN USHORT ModeMaskRev, IN PARALLEL_SAFETY ModeSafety, IN BOOLEAN IsForward); -typedef NTSTATUS DDKAPI -(*PTERMINATE_IEEE_MODE)( +typedef NTSTATUS +(DDKAPI *PTERMINATE_IEEE_MODE)( IN PVOID Context); -typedef NTSTATUS DDKAPI -(*PPARALLEL_IEEE_FWD_TO_REV)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_IEEE_FWD_TO_REV)( IN PVOID Context); -typedef NTSTATUS DDKAPI -(*PPARALLEL_IEEE_REV_TO_FWD)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_IEEE_REV_TO_FWD)( IN PVOID Context); -typedef NTSTATUS DDKAPI -(*PPARALLEL_READ)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_READ)( IN PVOID Context, OUT PVOID Buffer, IN ULONG NumBytesToRead, OUT PULONG NumBytesRead, IN UCHAR Channel); -typedef NTSTATUS DDKAPI -(*PPARALLEL_WRITE)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_WRITE)( IN PVOID Context, OUT PVOID Buffer, IN ULONG NumBytesToWrite, OUT PULONG NumBytesWritten, IN UCHAR Channel); -typedef NTSTATUS DDKAPI -(*PPARALLEL_TRYSELECT_DEVICE)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_TRYSELECT_DEVICE)( IN PVOID Context, IN PARALLEL_1284_COMMAND Command); -typedef NTSTATUS DDKAPI -(*PPARALLEL_DESELECT_DEVICE)( +typedef NTSTATUS +(DDKAPI *PPARALLEL_DESELECT_DEVICE)( IN PVOID Context, IN PARALLEL_1284_COMMAND Command); Modified: trunk/reactos/include/ddk/pfhook.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/pfhook.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/pfhook.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/pfhook.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -41,8 +41,8 @@ PF_ICMP_ON_DROP = 3 } PF_FORWARD_ACTION; -typedef PF_FORWARD_ACTION NTAPI -(*PacketFilterExtensionPtr)( +typedef PF_FORWARD_ACTION +(NTAPI *PacketFilterExtensionPtr)( IN unsigned char *PacketHeader, IN unsigned char *Packet, IN unsigned int PacketLength, Modified: trunk/reactos/include/ddk/smbus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/smbus.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/smbus.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/smbus.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -82,8 +82,8 @@ UCHAR Data[SMB_MAX_DATA_SIZE]; } SMB_REQUEST, *PSMB_REQUEST; -typedef VOID NTAPI -(*SMB_ALARM_NOTIFY)( +typedef VOID +(NTAPI *SMB_ALARM_NOTIFY)( PVOID Context, UCHAR Address, USHORT Data); @@ -99,18 +99,18 @@ #define SMB_CLASS_MAJOR_VERSION 0x0001 #define SMB_CLASS_MINOR_VERSION 0x0000 -typedef NTSTATUS DDKAPI -(*SMB_RESET_DEVICE)( +typedef NTSTATUS +(DDKAPI *SMB_RESET_DEVICE)( IN struct _SMB_CLASS *SmbClass, IN PVOID SmbMiniport); -typedef VOID DDKAPI -(*SMB_START_IO)( +typedef VOID +(DDKAPI *SMB_START_IO)( IN struct _SMB_CLASS *SmbClass, IN PVOID SmbMiniport); -typedef NTSTATUS DDKAPI -(*SMB_STOP_DEVICE)( +typedef NTSTATUS +(DDKAPI *SMB_STOP_DEVICE)( IN struct _SMB_CLASS *SmbClass, IN PVOID SmbMiniport); @@ -142,8 +142,8 @@ SmbClassCompleteRequest( IN PSMB_CLASS SmbClass); -typedef NTSTATUS DDKAPI -(*PSMB_INITIALIZE_MINIPORT)( +typedef NTSTATUS +(DDKAPI *PSMB_INITIALIZE_MINIPORT)( IN PSMB_CLASS SmbClass, IN PVOID MiniportExtension, IN PVOID MiniportContext); Modified: trunk/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=4280… ============================================================================== --- trunk/reactos/include/ddk/srb.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/srb.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -28,7 +28,7 @@ #endif #if defined(_SCSIPORT_) - #define SCSIPORTAPI DECLSPEC_EXPORT + #define SCSIPORTAPI #else #define SCSIPORTAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/storport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/storport.h?rev… ============================================================================== --- trunk/reactos/include/ddk/storport.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/storport.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -391,8 +391,8 @@ IN PVOID DeviceExtension, IN PSCSI_REQUEST_BLOCK Srb); -typedef BOOLEAN DDKAPI -(*PSTOR_SYNCHRONIZED_ACCESS)( +typedef BOOLEAN +(DDKAPI *PSTOR_SYNCHRONIZED_ACCESS)( IN PVOID HwDeviceExtension, IN PVOID Context); Modified: trunk/reactos/include/ddk/usbcamdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbcamdi.h?rev… ============================================================================== --- trunk/reactos/include/ddk/usbcamdi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/usbcamdi.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -74,23 +74,23 @@ USBCAMD_CamControlFlag_EnableDeviceEvents = 8 } USBCAMD_CamControlFlags; -typedef NTSTATUS DDKAPI -(*PCAM_ALLOCATE_BW_ROUTINE)( +typedef NTSTATUS +(DDKAPI *PCAM_ALLOCATE_BW_ROUTINE)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PULONG RawFrameLength, PVOID Format); -typedef NTSTATUS DDKAPI -(*PCAM_ALLOCATE_BW_ROUTINE_EX)( +typedef NTSTATUS +(DDKAPI *PCAM_ALLOCATE_BW_ROUTINE_EX)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PULONG RawFrameLength, PVOID Format, ULONG StreamNumber); -typedef NTSTATUS DDKAPI -(*PCAM_CONFIGURE_ROUTINE)( +typedef NTSTATUS +(DDKAPI *PCAM_CONFIGURE_ROUTINE)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PUSBD_INTERFACE_INFORMATION Interface, @@ -98,8 +98,8 @@ PLONG DataPipeIndex, PLONG SyncPipeIndex); -typedef NTSTATUS DDKAPI -(*PCAM_CONFIGURE_ROUTINE_EX)( +typedef NTSTATUS +(DDKAPI *PCAM_CONFIGURE_ROUTINE_EX)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PUSBD_INTERFACE_INFORMATION Interface, @@ -108,36 +108,36 @@ PUSBCAMD_Pipe_Config_Descriptor PipeConfig, PUSB_DEVICE_DESCRIPTOR DeviceDescriptor); -typedef NTSTATUS DDKAPI -(*PCAM_FREE_BW_ROUTINE)( - PDEVICE_OBJECT BusDeviceObject, - PVOID DeviceContext); - -typedef NTSTATUS DDKAPI -(*PCAM_FREE_BW_ROUTINE_EX)( - PDEVICE_OBJECT BusDeviceObject, - PVOID DeviceContext, - ULONG StreamNumber); - -typedef NTSTATUS DDKAPI -(*PCAM_INITIALIZE_ROUTINE)( - PDEVICE_OBJECT BusDeviceObject, - PVOID DeviceContext); - -typedef VOID DDKAPI -(*PCAM_NEW_FRAME_ROUTINE)( +typedef NTSTATUS +(DDKAPI *PCAM_FREE_BW_ROUTINE)( + PDEVICE_OBJECT BusDeviceObject, + PVOID DeviceContext); + +typedef NTSTATUS +(DDKAPI *PCAM_FREE_BW_ROUTINE_EX)( + PDEVICE_OBJECT BusDeviceObject, + PVOID DeviceContext, + ULONG StreamNumber); + +typedef NTSTATUS +(DDKAPI *PCAM_INITIALIZE_ROUTINE)( + PDEVICE_OBJECT BusDeviceObject, + PVOID DeviceContext); + +typedef VOID +(DDKAPI *PCAM_NEW_FRAME_ROUTINE)( PVOID DeviceContext, PVOID FrameContext); -typedef VOID DDKAPI -(*PCAM_NEW_FRAME_ROUTINE_EX)( +typedef VOID +(DDKAPI *PCAM_NEW_FRAME_ROUTINE_EX)( PVOID DeviceContext, PVOID FrameContext, ULONG StreamNumber, PULONG FrameLength); -typedef NTSTATUS DDKAPI -(*PCAM_PROCESS_RAW_FRAME_ROUTINE)( +typedef NTSTATUS +(DDKAPI *PCAM_PROCESS_RAW_FRAME_ROUTINE)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PVOID FrameContext, @@ -148,8 +148,8 @@ ULONG NumberOfPackets, PULONG BytesReturned); -typedef NTSTATUS DDKAPI -(*PCAM_PROCESS_RAW_FRAME_ROUTINE_EX)( +typedef NTSTATUS +(DDKAPI *PCAM_PROCESS_RAW_FRAME_ROUTINE_EX)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PVOID FrameContext, @@ -162,8 +162,8 @@ ULONG ActualRawFrameLength, ULONG StreamNumber); -typedef ULONG DDKAPI -(*PCAM_PROCESS_PACKET_ROUTINE)( +typedef ULONG +(DDKAPI *PCAM_PROCESS_PACKET_ROUTINE)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PVOID CurrentFrameContext, @@ -174,8 +174,8 @@ PBOOLEAN FrameComplete, PBOOLEAN NextFrameIsStill); -typedef ULONG DDKAPI -(*PCAM_PROCESS_PACKET_ROUTINE_EX)( +typedef ULONG +(DDKAPI *PCAM_PROCESS_PACKET_ROUTINE_EX)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, PVOID CurrentFrameContext, @@ -187,29 +187,29 @@ PULONG PacketFlag, PULONG ValidDataOffset); -typedef NTSTATUS DDKAPI -(*PCAM_STATE_ROUTINE)( - PDEVICE_OBJECT BusDeviceObject, - PVOID DeviceContext); - -typedef NTSTATUS DDKAPI -(*PCAM_START_CAPTURE_ROUTINE)( - PDEVICE_OBJECT BusDeviceObject, - PVOID DeviceContext); - -typedef NTSTATUS DDKAPI -(*PCAM_START_CAPTURE_ROUTINE_EX)( - PDEVICE_OBJECT BusDeviceObject, - PVOID DeviceContext, - ULONG StreamNumber); - -typedef NTSTATUS DDKAPI -(*PCAM_STOP_CAPTURE_ROUTINE)( - PDEVICE_OBJECT BusDeviceObject, - PVOID DeviceContext); - -typedef NTSTATUS DDKAPI -(*PCAM_STOP_CAPTURE_ROUTINE_EX)( +typedef NTSTATUS +(DDKAPI *PCAM_STATE_ROUTINE)( + PDEVICE_OBJECT BusDeviceObject, + PVOID DeviceContext); + +typedef NTSTATUS +(DDKAPI *PCAM_START_CAPTURE_ROUTINE)( + PDEVICE_OBJECT BusDeviceObject, + PVOID DeviceContext); + +typedef NTSTATUS +(DDKAPI *PCAM_START_CAPTURE_ROUTINE_EX)( + PDEVICE_OBJECT BusDeviceObject, + PVOID DeviceContext, + ULONG StreamNumber); + +typedef NTSTATUS +(DDKAPI *PCAM_STOP_CAPTURE_ROUTINE)( + PDEVICE_OBJECT BusDeviceObject, + PVOID DeviceContext); + +typedef NTSTATUS +(DDKAPI *PCAM_STOP_CAPTURE_ROUTINE_EX)( PDEVICE_OBJECT BusDeviceObject, PVOID DeviceContext, ULONG StreamNumber); @@ -255,14 +255,14 @@ IN ULONG Version, IN ULONG CamControlFlag); -typedef VOID DDKAPI -(*PCOMMAND_COMPLETE_FUNCTION)( +typedef VOID +(DDKAPI *PCOMMAND_COMPLETE_FUNCTION)( PVOID DeviceContext, PVOID CommandContext, NTSTATUS NtStatus); -typedef NTSTATUS DDKAPI -(*PFNUSBCAMD_BulkReadWrite)( +typedef NTSTATUS +(DDKAPI *PFNUSBCAMD_BulkReadWrite)( IN PVOID DeviceContext, IN USHORT PipeIndex, IN PVOID Buffer, @@ -270,23 +270,23 @@ IN PCOMMAND_COMPLETE_FUNCTION CommandComplete, IN PVOID CommandContext); -typedef NTSTATUS DDKAPI -(*PFNUSBCAMD_SetIsoPipeState)( +typedef NTSTATUS +(DDKAPI *PFNUSBCAMD_SetIsoPipeState)( IN PVOID DeviceContext, IN ULONG PipeStateFlags); -typedef NTSTATUS DDKAPI -(*PFNUSBCAMD_CancelBulkReadWrite)( +typedef NTSTATUS +(DDKAPI *PFNUSBCAMD_CancelBulkReadWrite)( IN PVOID DeviceContext, IN ULONG PipeIndex); -typedef NTSTATUS DDKAPI -(*PFNUSBCAMD_SetVideoFormat)( +typedef NTSTATUS +(DDKAPI *PFNUSBCAMD_SetVideoFormat)( IN PVOID DeviceContext, IN PHW_STREAM_REQUEST_BLOCK pSrb); -typedef NTSTATUS DDKAPI -(*PFNUSBCAMD_WaitOnDeviceEvent)( +typedef NTSTATUS +(DDKAPI *PFNUSBCAMD_WaitOnDeviceEvent)( IN PVOID DeviceContext, IN ULONG PipeIndex, IN PVOID Buffer, @@ -318,8 +318,8 @@ IN PCOMMAND_COMPLETE_FUNCTION CommandComplete, IN PVOID CommandContext); -typedef VOID DDKAPI -(*PADAPTER_RECEIVE_PACKET_ROUTINE)( +typedef VOID +(DDKAPI *PADAPTER_RECEIVE_PACKET_ROUTINE)( IN PHW_STREAM_REQUEST_BLOCK Srb); USBCAMAPI @@ -360,8 +360,8 @@ PFNUSBCAMD_CancelBulkReadWrite USBCAMD_CancelBulkReadWrite; } USBCAMD_INTERFACE, *PUSBCAMD_INTERFACE; -typedef VOID DDKAPI -(*PSTREAM_RECEIVE_PACKET)( +typedef VOID +(DDKAPI *PSTREAM_RECEIVE_PACKET)( IN PVOID Srb, IN PVOID DeviceContext, IN PBOOLEAN Completed); Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/video.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/video.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -76,7 +76,7 @@ } HW_DMA_RETURN, *PHW_DMA_RETURN; typedef HW_DMA_RETURN -(*PVIDEO_HW_START_DMA)( +(DDKAPI *PVIDEO_HW_START_DMA)( PVOID HwDeviceExtension, PDMA pDma); Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -4948,7 +4948,7 @@ } PHYSICAL_MEMORY_RANGE, *PPHYSICAL_MEMORY_RANGE; typedef ULONG_PTR -(*PDRIVER_VERIFIER_THUNK_ROUTINE)( +(NTAPI *PDRIVER_VERIFIER_THUNK_ROUTINE)( IN PVOID Context); typedef struct _DRIVER_VERIFIER_THUNK_PAIRS { Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -156,7 +156,7 @@ } LDR_DLL_LOADED_NOTIFICATION_DATA, *PLDR_DLL_LOADED_NOTIFICATION_DATA; typedef VOID -(*PLDR_DLL_LOADED_NOTIFICATION_CALLBACK)( +(NTAPI *PLDR_DLL_LOADED_NOTIFICATION_CALLBACK)( IN BOOLEAN Type, IN struct _LDR_DLL_LOADED_NOTIFICATION_DATA *Data ); Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -435,7 +435,7 @@ // Callback for RTL Heap Enumeration // typedef NTSTATUS -(*PHEAP_ENUMERATION_ROUTINE)( +(NTAPI *PHEAP_ENUMERATION_ROUTINE)( IN PVOID HeapHandle, IN PVOID UserParam ); Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -728,10 +728,10 @@ TRUSTED_INFORMATION_CLASS,PVOID); NTSTATUS NTAPI LsaStorePrivateData(LSA_HANDLE,PLSA_UNICODE_STRING, PLSA_UNICODE_STRING); -typedef NTSTATUS (*PSAM_PASSWORD_NOTIFICATION_ROUTINE)(PUNICODE_STRING, +typedef NTSTATUS (NTAPI *PSAM_PASSWORD_NOTIFICATION_ROUTINE)(PUNICODE_STRING, ULONG,PUNICODE_STRING); -typedef BOOLEAN (*PSAM_INIT_NOTIFICATION_ROUTINE)(void); -typedef BOOLEAN (*PSAM_PASSWORD_FILTER_ROUTINE)(PUNICODE_STRING,PUNICODE_STRING, +typedef BOOLEAN (NTAPI *PSAM_INIT_NOTIFICATION_ROUTINE)(void); +typedef BOOLEAN (NTAPI *PSAM_PASSWORD_FILTER_ROUTINE)(PUNICODE_STRING,PUNICODE_STRING, PUNICODE_STRING,BOOLEAN); #ifdef __cplusplus } Modified: trunk/reactos/include/psdk/psapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psapi.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/psapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/psapi.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -72,8 +72,8 @@ SIZE_T PeakUsage; } ENUM_PAGE_FILE_INFORMATION, *PENUM_PAGE_FILE_INFORMATION; -typedef BOOL (*PENUM_PAGE_FILE_CALLBACKA)(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCSTR); -typedef BOOL (*PENUM_PAGE_FILE_CALLBACKW)(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCWSTR); +typedef BOOL (CALLBACK *PENUM_PAGE_FILE_CALLBACKA)(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCSTR); +typedef BOOL (CALLBACK *PENUM_PAGE_FILE_CALLBACKW)(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCWSTR); /* Grouped by application,not in alphabetical order. */ BOOL WINAPI EnumProcesses(DWORD *,DWORD,DWORD *); Modified: trunk/reactos/include/psdk/wintrust.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wintrust.h?re… ============================================================================== --- trunk/reactos/include/psdk/wintrust.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wintrust.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -371,7 +371,7 @@ #define CPD_UISTATE_MODE_ALLOW 0x00000002 #define CPD_UISTATE_MODE_MASK 0x00000003 -typedef BOOL (*PFN_PROVUI_CALL)(HWND hWndSecurityDialog, +typedef BOOL (CALLBACK *PFN_PROVUI_CALL)(HWND hWndSecurityDialog, struct _CRYPT_PROVIDER_DATA *pProvData); typedef struct _CRYPT_PROVUI_FUNCS { Modified: trunk/reactos/include/psdk/winwlx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winwlx.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winwlx.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winwlx.h [iso-8859-1] Thu Aug 20 14:09:16 2009 @@ -633,7 +633,7 @@ /* non-GINA notification DLLs*/ typedef -DWORD (*PFNMSGECALLBACK)( +DWORD (CALLBACK *PFNMSGECALLBACK)( BOOL bVerbose, LPWSTR lpMessage);

1 0

[janderwald] 42799: - Add types for bda driver
by janderwald＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: janderwald Date: Thu Aug 20 13:55:42 2009 New Revision: 42799 URL: http://svn.reactos.org/svn/reactos?rev=42799&view=rev Log: - Add types for bda driver Modified: trunk/reactos/include/dxsdk/bdamedia.h Modified: trunk/reactos/include/dxsdk/bdamedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdamedia.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] Thu Aug 20 13:55:42 2009 @@ -1,11 +1,5 @@ #ifndef BDAMEDIA_H__ #define BDAMEDIA_H__ - -typedef enum -{ - KSPROPERTY_BDA_PIN_ID = 0, - KSPROPERTY_BDA_PIN_TYPE -} KSPROPERTY_BDA_PIN_CONTROL; typedef struct _KSP_BDA_NODE_PIN { KSPROPERTY Property; @@ -174,5 +168,37 @@ 0,\ SupportHandler) +/* ------------------------------------------------------------ + BDA Pin Control Property {0DED49D5-A8B7-4d5d-97A1-12B0C195874D} +*/ + +#define STATIC_KSPROPSETID_BdaPinControl \ + 0xded49d5, 0xa8b7, 0x4d5d, 0x97, 0xa1, 0x12, 0xb0, 0xc1, 0x95, 0x87, 0x4d +DEFINE_GUIDSTRUCT("0DED49D5-A8B7-4d5d-97A1-12B0C195874D", KSPROPSETID_BdaPinControl); +#define KSPROPSETID_BdaPinControl DEFINE_GUIDNAMED(KSPROPSETID_BdaPinControl) + +typedef enum { + KSPROPERTY_BDA_PIN_ID = 0, + KSPROPERTY_BDA_PIN_TYPE +} KSPROPERTY_BDA_PIN_CONTROL; + +#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_ID(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_PIN_ID,\ + (GetHandler),\ + sizeof( KSPROPERTY),\ + sizeof( ULONG),\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPE(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_PIN_TYPE,\ + (GetHandler),\ + sizeof( KSPROPERTY),\ + sizeof( ULONG),\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + #endif

1 0

[cwittich] 42798: sync credui with wine 1.1.27
by cwittich＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: cwittich Date: Thu Aug 20 13:41:11 2009 New Revision: 42798 URL: http://svn.reactos.org/svn/reactos?rev=42798&view=rev Log: sync credui with wine 1.1.27 Modified: trunk/reactos/dll/win32/credui/credui_Da.rc trunk/reactos/dll/win32/credui/credui_De.rc trunk/reactos/dll/win32/credui/credui_En.rc trunk/reactos/dll/win32/credui/credui_Es.rc trunk/reactos/dll/win32/credui/credui_Fr.rc trunk/reactos/dll/win32/credui/credui_Ko.rc trunk/reactos/dll/win32/credui/credui_Lt.rc trunk/reactos/dll/win32/credui/credui_Nl.rc trunk/reactos/dll/win32/credui/credui_No.rc trunk/reactos/dll/win32/credui/credui_Pl.rc trunk/reactos/dll/win32/credui/credui_Pt.rc trunk/reactos/dll/win32/credui/credui_Ro.rc trunk/reactos/dll/win32/credui/credui_Ru.rc trunk/reactos/dll/win32/credui/credui_Si.rc trunk/reactos/dll/win32/credui/credui_Sv.rc trunk/reactos/dll/win32/credui/credui_Zh.rc trunk/reactos/dll/win32/credui/credui_resources.h Modified: trunk/reactos/dll/win32/credui/credui_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Da… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Da.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/credui/credui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_De… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_De.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" + +#pragma code_page(65001) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -44,7 +48,7 @@ IDS_TITLEFORMAT "Mit %s verbinden" IDS_MESSAGEFORMAT "Verbindung mit %s wird hergestellt" IDS_INCORRECTPASSWORDTITLE "Anmeldung fehlgeschlagen" - IDS_INCORRECTPASSWORD "Bitte überprüfen Sie Ihren Benutzernamen\nund geben Sie das Kennwort neu ein." + IDS_INCORRECTPASSWORD "Bitte Ã¼berprÃ¼fen Sie Ihren Benutzernamen\nund geben Sie das Kennwort neu ein." IDS_CAPSLOCKONTITLE "Die Feststelltaste ist aktiviert" - IDS_CAPSLOCKON "Mit aktivierter Feststelltaste könnte das Kennwort falsch eingeben werden.\n\nVor der Eingabe des Kennworts sollten Sie die Feststelltaste deaktivieren." + IDS_CAPSLOCKON "Mit aktivierter Feststelltaste kÃ¶nnte das Kennwort falsch eingeben werden.\n\nVor der Eingabe des Kennworts sollten Sie die Feststelltaste deaktivieren." } Modified: trunk/reactos/dll/win32/credui/credui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_En… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_En.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/credui/credui_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Es… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Es.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -18,6 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -50,5 +53,3 @@ IDS_CAPSLOCKONTITLE "Bloq Mayus estÃ¡ activado" IDS_CAPSLOCKON "El Bloq Mayus activado puede hacer que entre su contraseÃ±a incorrectamente.\n\nPulse la tecla Bloq Mayus de su teclado para desactivar Bloq Mayus antes\n de introducir su contraseÃ±a." } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/credui/credui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Fr… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Fr.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -49,5 +52,4 @@ IDS_CAPSLOCKONTITLE "VERR.MAJ est activÃ©" IDS_CAPSLOCKON "Le verrouillage majuscule Ã©tant activÃ©, cela pourrait provoquer une erreur lors de la saisie de votre mot de passe.\n\nAppuyez sur la touche VERR.MAJ de votre clavier afin de dÃ©sactiver le verrouilage majuscule avant\nde saisir votre mot de passe." } - #pragma code_page(default) Modified: trunk/reactos/dll/win32/credui/credui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Ko… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Ko.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/credui/credui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Lt… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Lt.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" /* UTF-8 */ #pragma code_page(65001) @@ -51,5 +53,4 @@ IDS_CAPSLOCKONTITLE "DidÅ¾iÅ³jÅ³ raidÅ¾iÅ³ bÅ«sena Ä¯jungta" IDS_CAPSLOCKON "Kai Ä¯jungta didÅ¾iÅ³jÅ³ raidÅ¾iÅ³ bÅ«sena, savo slaptaÅ¾odÄ¯ galite Ä¯vesti neteisingai.\n\nPaspauskite didÅ¾iÅ³jÅ³ raidÅ¾iÅ³ klaviatÅ«ros klaviÅ¡Ä didÅ¾iÅ³jÅ³ raidÅ¾iÅ³ bÅ«senai iÅ¡jungti\nprieÅ¡ rinkdami savo slaptaÅ¾odÄ¯." } - #pragma code_page(default) Modified: trunk/reactos/dll/win32/credui/credui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Nl… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Nl.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/credui/credui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_No… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_No.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/credui/credui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Pl… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Pl.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/credui/credui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Pt… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Pt.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/credui/credui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Ro… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Ro.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -16,6 +16,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -49,5 +51,3 @@ IDS_CAPSLOCKONTITLE "Tasta Caps Lock este activatÄ" IDS_CAPSLOCKON "Cu tasta Caps Lock activatÄ este foarte probabil cÄ veÈi introduce parola greÈit.\n\nInainte de a introduce parola apÄsaÈi tasta Caps Lock pentru a dezactiva scrierea cu majuscule." } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/credui/credui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Ru… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Ru.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -18,6 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 @@ -28,23 +33,23 @@ CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, 0,213,37 LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "Ïî&ëüçîâàòåëü:",-1,8,62,72,12,SS_CENTERIMAGE + LTEXT "ÐÐ¾&Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:",-1,8,62,72,12,SS_CENTERIMAGE CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&Ïàðîëü:",-1,8,80,72,12,SS_CENTERIMAGE + LTEXT "&ÐÐ°ÑÐ¾Ð»Ñ:",-1,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "Ñî&õðàíèòü ïàðîëü",IDC_SAVE,"Button", + CONTROL "Ð¡Ð¾&ÑÑÐ°Ð½Ð¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ",IDC_SAVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "ÎÊ",IDOK,97,128,50,14 - PUSHBUTTON "Îòìåíà",IDCANCEL,156,128,50,14 + DEFPUSHBUTTON "ÐÐ",IDOK,97,128,50,14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,156,128,50,14 END STRINGTABLE DISCARDABLE { - IDS_TITLEFORMAT "Ïîäêëþ÷åíèå ê %s" - IDS_MESSAGEFORMAT "Ïîäêëþ÷åíèå ê %s" - IDS_INCORRECTPASSWORDTITLE "Âõîä íå áûë ïðîèçâåä¸í" - IDS_INCORRECTPASSWORD "Óáåäèòåñü, ÷òî èìÿ ïîëüçîâàòåëÿ\nè ïàðîëü âåðíû." - IDS_CAPSLOCKONTITLE "Caps Lock âêëþ÷åí" - IDS_CAPSLOCKON "Ïàðîëü ìîæåò áûòü ââåä¸í íåïðàâèëüíî èç-çà íàæàòîé êëàâèøè Caps Lock.\n\nÎòêëþ÷èòå Caps Lock ïåðåä òåì, êàê ââîäèòü ïàðîëü." + IDS_TITLEFORMAT "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº %s" + IDS_MESSAGEFORMAT "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº %s" + IDS_INCORRECTPASSWORDTITLE "ÐÑÐ¾Ð´ Ð½Ðµ Ð±ÑÐ» Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÑÐ½" + IDS_INCORRECTPASSWORD "Ð£Ð±ÐµÐ´Ð¸ÑÐµÑÑ, ÑÑÐ¾ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ\nÐ¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð²ÐµÑÐ½Ñ." + IDS_CAPSLOCKONTITLE "Caps Lock Ð²ÐºÐ»ÑÑÐµÐ½" + IDS_CAPSLOCKON "ÐÐ°ÑÐ¾Ð»Ñ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð²Ð²ÐµÐ´ÑÐ½ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ Ð¸Ð·-Ð·Ð° Ð½Ð°Ð¶Ð°ÑÐ¾Ð¹ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ Caps Lock.\n\nÐÑÐºÐ»ÑÑÐ¸ÑÐµ Caps Lock Ð¿ÐµÑÐµÐ´ ÑÐµÐ¼, ÐºÐ°Ðº Ð²Ð²Ð¾Ð´Ð¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ." } Modified: trunk/reactos/dll/win32/credui/credui_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Si… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Si.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/credui/credui_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Sv… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Sv.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/credui/credui_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Zh… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Zh.rc [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -82,5 +84,3 @@ IDS_CAPSLOCKONTITLE "å¤§å¯«éå®éè" IDS_CAPSLOCKON "éèå¤§å¯«éå®å¯è½å°è´ä½ è¼¸å¥é¯èª¤çå¯ç¢¼." } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/credui/credui_resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_re… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_resources.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_resources.h [iso-8859-1] Thu Aug 20 13:41:11 2009 @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> + #define IDD_CREDDIALOG 100 #define IDC_USERNAME 101 #define IDC_PASSWORD 102

1 0

[janderwald] 42797: - Add types for bda driver
by janderwald＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: janderwald Date: Thu Aug 20 13:39:54 2009 New Revision: 42797 URL: http://svn.reactos.org/svn/reactos?rev=42797&view=rev Log: - Add types for bda driver Modified: trunk/reactos/include/dxsdk/bdamedia.h trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/dxsdk/bdamedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdamedia.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] Thu Aug 20 13:39:54 2009 @@ -14,4 +14,165 @@ ULONG ulOutputPinId; } KSP_BDA_NODE_PIN, *PKSP_BDA_NODE_PIN; +typedef struct _KSM_BDA_PIN +{ + KSMETHOD Method; + union + { + ULONG PinId; + ULONG PinType; + }; + ULONG Reserved; +} KSM_BDA_PIN, * PKSM_BDA_PIN; + +typedef struct _KSM_BDA_PIN_PAIR +{ + KSMETHOD Method; + union + { + ULONG InputPinId; + ULONG InputPinType; + }; + union + { + ULONG OutputPinId; + ULONG OutputPinType; + }; +} KSM_BDA_PIN_PAIR, * PKSM_BDA_PIN_PAIR; + +/* ------------------------------------------------------------ + BDA Topology Property Set {A14EE835-0A23-11d3-9CC7-00C04F7971E0} +*/ + +#define STATIC_KSPROPSETID_BdaTopology \ + 0xa14ee835, 0x0a23, 0x11d3, 0x9c, 0xc7, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 +DEFINE_GUIDSTRUCT("A14EE835-0A23-11d3-9CC7-00C04F7971E0", KSPROPSETID_BdaTopology); +#define KSPROPSETID_BdaTopology DEFINE_GUIDNAMED(KSPROPSETID_BdaTopology) + +typedef enum { + KSPROPERTY_BDA_NODE_TYPES, + KSPROPERTY_BDA_PIN_TYPES, + KSPROPERTY_BDA_TEMPLATE_CONNECTIONS, + KSPROPERTY_BDA_NODE_METHODS, + KSPROPERTY_BDA_NODE_PROPERTIES, + KSPROPERTY_BDA_NODE_EVENTS, + KSPROPERTY_BDA_CONTROLLING_PIN_ID, + KSPROPERTY_BDA_NODE_DESCRIPTORS + }KSPROPERTY_BDA_TOPOLOGY; + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_TYPES(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_NODE_TYPES,\ + (GetHandler),\ + sizeof(KSPROPERTY),\ + 0,\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPES(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_PIN_TYPES,\ + (GetHandler),\ + sizeof(KSPROPERTY),\ + 0,\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_TEMPLATE_CONNECTIONS(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_TEMPLATE_CONNECTIONS,\ + (GetHandler),\ + sizeof(KSPROPERTY),\ + sizeof( BDA_TEMPLATE_CONNECTION),\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_METHODS(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_NODE_METHODS,\ + (GetHandler),\ + sizeof(KSP_NODE),\ + 0,\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_PROPERTIES(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_NODE_PROPERTIES,\ + (GetHandler),\ + sizeof(KSP_NODE),\ + 0,\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_EVENTS(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_NODE_EVENTS,\ + (GetHandler),\ + sizeof(KSP_NODE),\ + 0,\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_CONTROLLING_PIN_ID(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_CONTROLLING_PIN_ID,\ + (GetHandler),\ + sizeof(KSP_BDA_NODE_PIN),\ + sizeof( ULONG),\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_DESCRIPTORS(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_BDA_NODE_DESCRIPTORS,\ + (GetHandler),\ + sizeof(KSPROPERTY),\ + 0,\ + FALSE,\ + NULL, 0, NULL, NULL, 0) + +/* ------------------------------------------------------------ + BDA Device Configuration Method Set {71985F45-1CA1-11d3-9CC8-00C04F7971E0} +*/ + +#define STATIC_KSMETHODSETID_BdaDeviceConfiguration \ + 0x71985f45, 0x1ca1, 0x11d3, 0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 +DEFINE_GUIDSTRUCT("71985F45-1CA1-11d3-9CC8-00C04F7971E0", KSMETHODSETID_BdaDeviceConfiguration); +#define KSMETHODSETID_BdaDeviceConfiguration DEFINE_GUIDNAMED(KSMETHODSETID_BdaDeviceConfiguration) + +typedef enum { + KSMETHOD_BDA_CREATE_PIN_FACTORY = 0, + KSMETHOD_BDA_DELETE_PIN_FACTORY, + KSMETHOD_BDA_CREATE_TOPOLOGY +} KSMETHOD_BDA_DEVICE_CONFIGURATION; + +#define DEFINE_KSMETHOD_ITEM_BDA_CREATE_PIN_FACTORY(MethodHandler, SupportHandler)\ + DEFINE_KSMETHOD_ITEM(\ + KSMETHOD_BDA_CREATE_PIN_FACTORY,\ + KSMETHOD_TYPE_READ,\ + (MethodHandler),\ + sizeof(KSM_BDA_PIN),\ + sizeof(ULONG),\ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_DELETE_PIN_FACTORY(MethodHandler, SupportHandler)\ + DEFINE_KSMETHOD_ITEM(\ + KSMETHOD_BDA_DELETE_PIN_FACTORY,\ + KSMETHOD_TYPE_NONE,\ + (MethodHandler),\ + sizeof(KSM_BDA_PIN),\ + 0,\ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_CREATE_TOPOLOGY(MethodHandler, SupportHandler)\ + DEFINE_KSMETHOD_ITEM(\ + KSMETHOD_BDA_CREATE_TOPOLOGY,\ + KSMETHOD_TYPE_WRITE,\ + (MethodHandler),\ + sizeof(KSM_BDA_PIN_PAIR),\ + 0,\ + SupportHandler) + + #endif Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4279… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Thu Aug 20 13:39:54 2009 @@ -1808,6 +1808,30 @@ ULONG Flags; } KSMETHOD_ITEM, *PKSMETHOD_ITEM; +#ifndef _MSC_VER + +#define DEFINE_KSMETHOD_ITEM(MethodId, Flags,\ + MethodHandler,\ + MinMethod, MinData, SupportHandler)\ +{\ + MethodId, {(PFNKSHANDLER)MethodHandler}, MinMethod, MinData,\ + SupportHandler, Flags\ +} + +#else + +#define DEFINE_KSMETHOD_ITEM(MethodId, Flags,\ + MethodHandler,\ + MinMethod, MinData, SupportHandler)\ +{\ + MethodId, (PFNKSHANDLER)MethodHandler, MinMethod, MinData,\ + SupportHandler, Flags\ +} + + + +#endif + typedef struct { @@ -1818,6 +1842,12 @@ }; } KSFASTMETHOD_ITEM, *PKSFASTMETHOD_ITEM; +#define DEFINE_KSFASTMETHOD_ITEM(MethodId, MethodHandler)\ +{\ + MethodId, (PFNKSFASTHANDLER)MethodHandler\ +} + + typedef struct { const GUID* Set; @@ -1826,6 +1856,20 @@ ULONG FastIoCount; const KSFASTMETHOD_ITEM*FastIoTable; } KSMETHOD_SET, *PKSMETHOD_SET; + + +#define DEFINE_KSMETHOD_SET(Set,\ + MethodsCount,\ + MethodItem,\ + FastIoCount,\ + FastIoTable)\ +{\ + Set,\ + MethodsCount,\ + MethodItem,\ + FastIoCount,\ + FastIoTable\ +} #endif /* ===============================================================

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009