Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 39104: - Start implementing object bag support functions - Implement KsCreateDevice, KsAddDevice, KsInitializeDriver - Add KsDefaultForwardIrp stub
by janderwald＠svn.reactos.org 26 Jan '09

26 Jan '09

Author: janderwald Date: Mon Jan 26 04:05:46 2009 New Revision: 39104 URL: http://svn.reactos.org/svn/reactos?rev=39104&view=rev Log: - Start implementing object bag support functions - Implement KsCreateDevice, KsAddDevice, KsInitializeDriver - Add KsDefaultForwardIrp stub Added: trunk/reactos/drivers/ksfilter/ks/bag.c (with props) trunk/reactos/drivers/ksfilter/ks/device.c (with props) trunk/reactos/drivers/ksfilter/ks/driver.c (with props) trunk/reactos/drivers/ksfilter/ks/ksfunc.h (with props) trunk/reactos/drivers/ksfilter/ks/ksiface.h (with props) Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/ks.rbuild trunk/reactos/drivers/ksfilter/ks/ks.spec trunk/reactos/drivers/ksfilter/ks/misc.c Added: 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 (added) +++ trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -1,0 +1,58 @@ +#include <ntddk.h> +#include <debug.h> +#include <ks.h> +#if 0 +typedef struct +{ + LIST_ENTRY Entry; + PVOID Item; + PFNKSFREE Free; + LONG ReferenceCount; +}KSOBJECT_BAG_ENTRY; + +typedef struct +{ + LIST_ENTRY ListHead; + KMUTEX Lock; +}KSOBJECT_BAG_IMPL; + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsAddItemToObjectBag( + IN KSOBJECT_BAG ObjectBag, + IN PVOID Item, + IN PFNKSFREE Free OPTIONAL) +{ + KSOBJECT_BAG_ENTRY * Entry; + KSOBJECT_BAG_IMPL * Bag = (KSOBJECT_BAG_IMPL)ObjectBag; + + Entry = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_BAG_ENTRY)); + if (!Entry) + return STATUS_INSUFFICIENT_RESOURCES; + + Entry->Free = Free; + Entry->Item = Item; + + InsertTailList(&Bag->ListHead, &Entry->Entry); + return STATUS_SUCCESS; +} + +KSDDKAPI +ULONG +NTAPI +KsRemoveItemFromObjectBag( + IN KSOBJECT_BAG ObjectBag, + IN PVOID Item, + IN BOOLEAN Free) +{ + KSOBJECT_BAG_IMPL * Bag = (KSOBJECT_BAG_IMPL)ObjectBag; + + + + +} +#endif Propchange: trunk/reactos/drivers/ksfilter/ks/bag.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/clocks… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -5,6 +5,11 @@ #include <ntddk.h> #include <debug.h> #include <ks.h> + +typedef struct +{ + +}KS_DEFAULT_CLOCK; /* @unimplemented @@ -27,19 +32,28 @@ IN PIRP Irp, IN PKSDEFAULTCLOCK DefaultClock) { - UNIMPLEMENTED; + NTSTATUS Status; + PKSCLOCK_CREATE ClockCreate; + + Status = KsValidateClockCreateRequest(Irp, &ClockCreate); + if (!NT_SUCCESS(Status)) + return Status; + +// ExAllocatePoolWithTag(NonPagedPool, sizeof(KS_DEFAULT_CLOCK), 0); + + + return STATUS_UNSUCCESSFUL; } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS NTAPI KsAllocateDefaultClock( OUT PKSDEFAULTCLOCK* DefaultClock) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + return KsAllocateDefaultClockEx(DefaultClock, NULL, NULL, NULL, NULL, NULL, 0); } /* Added: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c (added) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -1,0 +1,34 @@ +#include <ntddk.h> +#include <debug.h> +#include <ks.h> + +#include "ksiface.h" +#include "ksfunc.h" + +typedef struct +{ + IKsDeviceVtbl *lpVtbl; + + LONG ref; + + +}IKsDeviceImpl; + + +NTSTATUS +NTAPI +NewIKsDevice(IKsDevice** OutDevice) +{ + IKsDeviceImpl * This; + + This = ExAllocatePoolWithTag(NonPagedPool, sizeof(IKsDeviceImpl), 0x12345678); //FIX TAG + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->ref = 1; + //This->lpVtbl = &vt_IKsDevice; + + *OutDevice = (IKsDevice*)This; + return STATUS_SUCCESS; +} + Propchange: trunk/reactos/drivers/ksfilter/ks/device.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/ksfilter/ks/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/driver… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/driver.c (added) +++ trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -1,0 +1,143 @@ +#include <ntddk.h> +#include <debug.h> +#include <ks.h> + +#include "ksfunc.h" + + +/* + @unimplemented +*/ +KSDDKAPI +PKSDEVICE +NTAPI +KsGetDeviceForDeviceObject( + IN PDEVICE_OBJECT FunctionalDeviceObject) +{ + + return NULL; +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsInitializeDevice( + IN PDEVICE_OBJECT FunctionalDeviceObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PDEVICE_OBJECT NextDeviceObject, + IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL) +{ + return STATUS_UNSUCCESSFUL; +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsCreateDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL, + IN ULONG ExtensionSize OPTIONAL, + OUT PKSDEVICE* Device OPTIONAL) +{ + NTSTATUS Status = STATUS_DEVICE_REMOVED; + PDEVICE_OBJECT FunctionalDeviceObject= NULL; + PDEVICE_OBJECT OldHighestDeviceObject; + + if (!ExtensionSize) + ExtensionSize = sizeof(PVOID); + + Status = IoCreateDevice(DriverObject, ExtensionSize, NULL, FILE_DEVICE_KS, FILE_DEVICE_SECURE_OPEN, FALSE, &FunctionalDeviceObject); + if (!NT_SUCCESS(Status)) + return Status; + + OldHighestDeviceObject = IoAttachDeviceToDeviceStack(FunctionalDeviceObject, PhysicalDeviceObject); + if (OldHighestDeviceObject) + { + Status = KsInitializeDevice(FunctionalDeviceObject, PhysicalDeviceObject, OldHighestDeviceObject, Descriptor); + } + + if (!NT_SUCCESS(Status)) + { + if (OldHighestDeviceObject) + IoDetachDevice(OldHighestDeviceObject); + + IoDeleteDevice(FunctionalDeviceObject); + return Status; + } + + if (Device) + { + *Device = KsGetDeviceForDeviceObject(FunctionalDeviceObject); + } + + return Status; +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + PKSDEVICE_DESCRIPTOR *DriverObjectExtension; + PKSDEVICE_DESCRIPTOR Descriptor = NULL; + + DriverObjectExtension = IoGetDriverObjectExtension(DriverObject, (PVOID)KsAddDevice); + if (DriverObjectExtension) + { + Descriptor = *DriverObjectExtension; + } + + return KsCreateDevice(DriverObject, PhysicalDeviceObject, Descriptor, 0, NULL); +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsInitializeDriver( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath, + IN const KSDEVICE_DESCRIPTOR *Descriptor OPTIONAL +) +{ + PKSDEVICE_DESCRIPTOR *DriverObjectExtension; + NTSTATUS Status; + + if (Descriptor) + { + Status = IoAllocateDriverObjectExtension(DriverObject, (PVOID)KsAddDevice, sizeof(PKSDEVICE_DESCRIPTOR), (PVOID*)&DriverObjectExtension); + if (NT_SUCCESS(Status)) + { + *DriverObjectExtension = (KSDEVICE_DESCRIPTOR*)Descriptor; + } + } + /* Setting our IRP handlers */ + //DriverObject->MajorFunction[IRP_MJ_CREATE] = KspDispatch; + //DriverObject->MajorFunction[IRP_MJ_PNP] = KspDispatch; + //DriverObject->MajorFunction[IRP_MJ_POWER] = KspDispatch; + + /* The driver-supplied AddDevice */ + DriverObject->DriverExtension->AddDevice = KsAddDevice; + + /* KS handles these */ + DPRINT1("Setting KS function handlers\n"); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CLOSE); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_DEVICE_CONTROL); + + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/ksfilter/ks/driver.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -678,3 +678,16 @@ UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } + +/* + @unimplemented +*/ +KSDDKAPI NTSTATUS NTAPI +KsDefaultForwardIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.rbu… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -12,6 +12,9 @@ <define name="_COMDDK_" /> <file>ks.rc</file> <file>allocators.c</file> + <file>bag.c</file> + <file>device.c</file> + <file>driver.c</file> <file>clocks.c</file> <file>connectivity.c</file> <file>events.c</file> Modified: trunk/reactos/drivers/ksfilter/ks/ks.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.spe… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -44,6 +44,7 @@ @ stdcall KsHandleSizedListQuery(ptr long long ptr) @ stdcall KsAcquireResetValue(ptr ptr) +@ stdcall KsDefaultForwardIrp(ptr ptr) @ stdcall KsAddIrpToCancelableQueue(ptr ptr ptr long ptr) @ stdcall KsAddObjectCreateItemToDeviceHeader(ptr ptr ptr wstr ptr) @ stdcall KsAddObjectCreateItemToObjectHeader(ptr ptr ptr wstr ptr) Added: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksfunc.h (added) +++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -1,0 +1,17 @@ +#ifndef KSFUNC_H__ +#define KSFUNC_H__ + +#include "ksiface.h" + +NTSTATUS +NTAPI +NewIKsDevice(IKsDevice** OutDevice); + + + + + + + + +#endif Propchange: trunk/reactos/drivers/ksfilter/ks/ksfunc.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/ksfilter/ks/ksiface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksifac… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksiface.h (added) +++ trunk/reactos/drivers/ksfilter/ks/ksiface.h [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -1,0 +1,101 @@ +#ifndef KSIFACE_H__ +#define KSIFACE_H__ + +#include <ntddk.h> +#include <ks.h> + + + +/***************************************************************************** + * IKsFilterFactory + ***************************************************************************** + */ + +#undef INTERFACE +#define INTERFACE IKsFilterFactory + +struct KSFILTERFACTORY; + +DECLARE_INTERFACE_(IKsFilterFactory, IUnknown) +{ + //DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(struct KSFILTERFACTORY*,GetStruct)(THIS) PURE; + + STDMETHOD_(NTSTATUS,SetDeviceClassesState)(THIS_ + IN ULONG Unknown1, + IN BOOLEAN Enable)PURE; +}; + + +/***************************************************************************** + * IKsPowerNotify + ***************************************************************************** + */ + +#undef INTERFACE +#define INTERFACE IKsPowerNotify + +DECLARE_INTERFACE_(IKsPowerNotify, IUnknown) +{ + //DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(ULONG,Sleep)(THIS_ + IN DEVICE_POWER_STATE State) PURE; + + STDMETHOD_(ULONG,Wake)(THIS) PURE; +}; + + +/***************************************************************************** + * IKsDevice + ***************************************************************************** + */ + +#undef INTERFACE +#define INTERFACE IKsDevice + +struct KSIOBJECTBAG; +struct KSPOWER_ENTRY; + +DECLARE_INTERFACE_(IKsDevice, IUnknown) +{ + //DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(struct KSDEVICE*,GetStruct)(THIS) PURE; + + STDMETHOD_(NTSTATUS, InitializeObjectBag)(THIS_ + IN struct KSIOBJECTBAG *Bag, + IN KMUTANT * Mutant) PURE; + + STDMETHOD_(ULONG,AcquireDevice)(THIS) PURE; + STDMETHOD_(ULONG,ReleaseDevice)(THIS) PURE; + + STDMETHOD_(VOID, GetAdapterObject)(THIS_ + IN PADAPTER_OBJECT Object, + IN PULONG Unknown1, + IN PULONG Unknown2) PURE; + + STDMETHOD_(VOID, AddPowerEntry)(THIS_ + IN struct KSPOWER_ENTRY * Entry, + IN struct IKsPowerNotify* Notify)PURE; + + STDMETHOD_(VOID, RemovePowerEntry)(THIS_ + IN struct KSPOWER_ENTRY * Entry)PURE; + + STDMETHOD_(NTSTATUS, PinStateChange)(THIS_ + IN KSPIN Pin, + IN PIRP Irp, + IN KSSTATE OldState, + IN KSSTATE NewState)PURE; + + STDMETHOD_(NTSTATUS, ArbitrateAdapterChannel)(THIS_ + IN ULONG ControlCode, + IN IO_ALLOCATION_ACTION Action, + IN PVOID Context)PURE; + + STDMETHOD_(NTSTATUS, CheckIoCapability)(THIS_ + IN ULONG Unknown)PURE; +}; + +#endif Propchange: trunk/reactos/drivers/ksfilter/ks/ksiface.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -218,17 +218,5 @@ return STATUS_UNSUCCESSFUL; } -/* - @unimplemented -*/ -KSDDKAPI NTSTATUS NTAPI -KsInitializeDriver( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath, - IN const KSDEVICE_DESCRIPTOR *Descriptor OPTIONAL -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - + +

1 0

[dchapyshev] 39103: .def -> .spec
by dchapyshev＠svn.reactos.org 26 Jan '09

26 Jan '09

Author: dchapyshev Date: Mon Jan 26 03:27:47 2009 New Revision: 39103 URL: http://svn.reactos.org/svn/reactos?rev=39103&view=rev Log: .def -> .spec Added: trunk/reactos/dll/win32/authz/authz.spec (with props) trunk/reactos/dll/win32/beepmidi/beepmidi.spec (with props) trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec (with props) trunk/reactos/dll/win32/fmifs/fmifs.spec (with props) Removed: trunk/reactos/dll/win32/authz/authz.def trunk/reactos/dll/win32/beepmidi/beepmidi.def trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def trunk/reactos/dll/win32/fmifs/fmifs.def Modified: trunk/reactos/dll/win32/authz/authz.rbuild trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild trunk/reactos/dll/win32/fmifs/fmifs.rbuild Removed: trunk/reactos/dll/win32/authz/authz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/authz.def?… ============================================================================== --- trunk/reactos/dll/win32/authz/authz.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/authz/authz.def (removed) @@ -1,46 +1,0 @@ -LIBRARY authz.dll - -EXPORTS -AuthzAccessCheck@36 -AuthzAddSidsToContext@24 -AuthzCachedAccessCheck@20 -AuthzEnumerateSecurityEventSources@16 -AuthzFreeAuditEvent@4 -AuthzFreeContext@4 -AuthzFreeHandle@4 -AuthzFreeResourceManager@4 -AuthzGetInformationFromContext@20 -AuthzInitializeContextFromAuthzContext@28 -AuthzInitializeContextFromSid@32 -AuthzInitializeContextFromToken@32 -AuthzInitializeObjectAccessAuditEvent@32 -AuthzInitializeObjectAccessAuditEvent2@36 -AuthzInitializeResourceManager@24 -AuthzInstallSecurityEventSource@8 -AuthzOpenObjectAudit@32 -AuthzRegisterSecurityEventSource@12 -AuthzReportSecurityEvent@20=AuthzReportSecurityEvent -AuthzReportSecurityEventFromParams@20 -AuthzUninstallSecurityEventSource@8 -AuthzUnregisterSecurityEventSource@8 -;AuthziAllocateAuditParams -;AuthziFreeAuditEventType -;AuthziFreeAuditParams -;AuthziFreeAuditQueue -;AuthziInitializeAuditEvent -;AuthziInitializeAuditEventType -;AuthziInitializeAuditParams -;AuthziInitializeAuditParamsFromArray -;AuthziInitializeAuditParamsWithRM -;AuthziInitializeAuditQueue -;AuthziInitializeContextFromSid -;AuthziLogAuditEvent -;AuthziModifyAuditEvent2 -;AuthziModifyAuditEvent -;AuthziModifyAuditEventType -;AuthziModifyAuditQueue -;AuthziQueryAuditPolicy -;AuthziSetAuditPolicy -;AuthziSourceAudit - -; EOF Modified: trunk/reactos/dll/win32/authz/authz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/authz.rbui… ============================================================================== --- trunk/reactos/dll/win32/authz/authz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/authz/authz.rbuild [iso-8859-1] Mon Jan 26 03:27:47 2009 @@ -1,5 +1,5 @@ <module name="authz" type="win32dll" baseaddress="${BASEADDRESS_AUTHZ}" installbase="system32" installname="authz.dll" unicode="yes"> - <importlibrary definition="authz.def" /> + <importlibrary definition="authz.spec" /> <include base="authz">.</include> <library>ntdll</library> <library>kernel32</library> Added: trunk/reactos/dll/win32/authz/authz.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/authz.spec… ============================================================================== --- trunk/reactos/dll/win32/authz/authz.spec (added) +++ trunk/reactos/dll/win32/authz/authz.spec [iso-8859-1] Mon Jan 26 03:27:47 2009 @@ -1,0 +1,41 @@ +@ stdcall AuthzAccessCheck(long ptr ptr ptr ptr ptr long ptr ptr) +@ stdcall AuthzAddSidsToContext(ptr ptr long ptr long ptr) +@ stdcall AuthzCachedAccessCheck(long ptr ptr ptr ptr) +@ stdcall AuthzEnumerateSecurityEventSources(long ptr ptr ptr) +@ stdcall AuthzFreeAuditEvent(ptr) +@ stdcall AuthzFreeContext(ptr) +@ stdcall AuthzFreeHandle(ptr) +@ stdcall AuthzFreeResourceManager(ptr) +@ stdcall AuthzGetInformationFromContext(ptr ptr long ptr ptr) +@ stdcall AuthzInitializeContextFromAuthzContext(long ptr ptr long long ptr ptr) +@ stdcall AuthzInitializeContextFromSid(long ptr ptr ptr long long ptr ptr) +@ stdcall AuthzInitializeContextFromToken(long ptr ptr ptr long long ptr ptr) +@ stdcall AuthzInitializeObjectAccessAuditEvent(long ptr wstr wstr wstr wstr ptr long) +@ stdcall AuthzInitializeObjectAccessAuditEvent2(long ptr wstr wstr wstr wstr wstr ptr long) +@ stdcall AuthzInitializeResourceManager(long ptr ptr ptr ptr ptr) +@ stdcall AuthzInstallSecurityEventSource(long ptr) +@ stdcall AuthzOpenObjectAudit(long ptr ptr ptr ptr ptr long ptr) +@ stdcall AuthzRegisterSecurityEventSource(long ptr ptr) +@ stdcall AuthzReportSecurityEvent(long ptr long ptr long) authz.AuthzReportSecurityEvent +@ stdcall AuthzReportSecurityEventFromParams(long ptr long ptr ptr) +@ stdcall AuthzUninstallSecurityEventSource(long wstr) +@ stdcall AuthzUnregisterSecurityEventSource(long ptr) +@ stub AuthziAllocateAuditParams +@ stub AuthziFreeAuditEventType +@ stub AuthziFreeAuditParams +@ stub AuthziFreeAuditQueue +@ stub AuthziInitializeAuditEvent +@ stub AuthziInitializeAuditEventType +@ stub AuthziInitializeAuditParams +@ stub AuthziInitializeAuditParamsFromArray +@ stub AuthziInitializeAuditParamsWithRM +@ stub AuthziInitializeAuditQueue +@ stub AuthziInitializeContextFromSid +@ stub AuthziLogAuditEvent +@ stub AuthziModifyAuditEvent2 +@ stub AuthziModifyAuditEvent +@ stub AuthziModifyAuditEventType +@ stub AuthziModifyAuditQueue +@ stub AuthziQueryAuditPolicy +@ stub AuthziSetAuditPolicy +@ stub AuthziSourceAudit Propchange: trunk/reactos/dll/win32/authz/authz.spec ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/win32/beepmidi/beepmidi.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.def (removed) @@ -1,12 +1,0 @@ -; beepmidi.def -; -; BeepMidi driver by Andrew Greenwood -; -; For ReactOS Operating System -; - -LIBRARY beepmidi.dll - -EXPORTS -DriverProc@20 -modMessage@20 Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild [iso-8859-1] Mon Jan 26 03:27:47 2009 @@ -1,5 +1,5 @@ <module name="beepmidi" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_BEEPMIDI}" installbase="system32" installname="beepmidi.dll" unicode="yes"> - <importlibrary definition="beepmidi.def" /> + <importlibrary definition="beepmidi.spec" /> <include base="beepmidi">.</include> <library>ntdll</library> <library>kernel32</library> Added: trunk/reactos/dll/win32/beepmidi/beepmidi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.spec (added) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.spec [iso-8859-1] Mon Jan 26 03:27:47 2009 @@ -1,0 +1,2 @@ +@ stdcall DriverProc(long ptr long long long) +@ stdcall modMessage(long long long long long) Propchange: trunk/reactos/dll/win32/beepmidi/beepmidi.spec ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (removed) @@ -1,214 +1,0 @@ -; -; ReactOS cfgmgr32.dll -; -; Copyright (C) 2005, 2006 Eric Kohl -; -; This program is free software; you can redistribute it and/or modify -; it under the terms of the GNU General Public License as published by -; the Free Software Foundation; either version 2 of the License, or -; (at your option) any later version. -; -; This program 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 General Public License for more details. -; -; You should have received a copy of the GNU General Public License -; along with this program; if not, write to the Free Software -; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -; -LIBRARY CFGMGR32.DLL -EXPORTS -CMP_Init_Detection=SETUPAPI.CMP_Init_Detection -CMP_RegisterNotification=SETUPAPI.CMP_RegisterNotification -CMP_Report_LogOn=SETUPAPI.CMP_Report_LogOn -CMP_UnregisterNotification=SETUPAPI.CMP_UnregisterNotification -CMP_WaitNoPendingInstallEvents=SETUPAPI.CMP_WaitNoPendingInstallEvents -CMP_WaitServicesAvailable=SETUPAPI.CMP_WaitServicesAvailable -CM_Add_Empty_Log_Conf=SETUPAPI.CM_Add_Empty_Log_Conf -CM_Add_Empty_Log_Conf_Ex=SETUPAPI.CM_Add_Empty_Log_Conf_Ex -CM_Add_IDA=SETUPAPI.CM_Add_IDA -CM_Add_IDW=SETUPAPI.CM_Add_IDW -CM_Add_ID_ExA=SETUPAPI.CM_Add_ID_ExA -CM_Add_ID_ExW=SETUPAPI.CM_Add_ID_ExW -CM_Add_IDA=SETUPAPI.CM_Add_IDA -CM_Add_IDW=SETUPAPI.CM_Add_IDW -CM_Add_ID_ExA=SETUPAPI.CM_Add_ID_ExA -CM_Add_ID_ExW=SETUPAPI.CM_Add_ID_ExW -CM_Add_Range=SETUPAPI.CM_Add_Range -CM_Add_Res_Des=SETUPAPI.CM_Add_Res_Des -CM_Add_Res_Des_Ex=SETUPAPI.CM_Add_Res_Des_Ex -CM_Connect_MachineA=SETUPAPI.CM_Connect_MachineA -CM_Connect_MachineW=SETUPAPI.CM_Connect_MachineW -CM_Create_DevNodeA=SETUPAPI.CM_Create_DevNodeA -CM_Create_DevNodeW=SETUPAPI.CM_Create_DevNodeW -CM_Create_DevNode_ExA=SETUPAPI.CM_Create_DevNode_ExA -CM_Create_DevNode_ExW=SETUPAPI.CM_Create_DevNode_ExW -CM_Create_Range_List=SETUPAPI.CM_Create_Range_List -CM_Delete_Class_Key=SETUPAPI.CM_Delete_Class_Key -CM_Delete_Class_Key_Ex=SETUPAPI.CM_Delete_Class_Key_Ex -CM_Delete_DevNode_Key=SETUPAPI.CM_Delete_DevNode_Key -CM_Delete_DevNode_Key_Ex=SETUPAPI.CM_Delete_DevNode_Key_Ex -CM_Delete_Range=SETUPAPI.CM_Delete_Range -CM_Detect_Resource_Conflict=SETUPAPI.CM_Detect_Resource_Conflict -CM_Detect_Resource_Conflict_Ex=SETUPAPI.CM_Detect_Resource_Conflict_Ex -CM_Disable_DevNode=SETUPAPI.CM_Disable_DevNode -CM_Disable_DevNode_Ex=SETUPAPI.CM_Disable_DevNode_Ex -CM_Disconnect_Machine=SETUPAPI.CM_Disconnect_Machine -CM_Dup_Range_List=SETUPAPI.CM_Dup_Range_List -CM_Enable_DevNode=SETUPAPI.CM_Enable_DevNode -CM_Enable_DevNode_Ex=SETUPAPI.CM_Enable_DevNode_Ex -CM_Enumerate_Classes=SETUPAPI.CM_Enumerate_Classes -CM_Enumerate_Classes_Ex=SETUPAPI.CM_Enumerate_Classes_Ex -CM_Enumerate_EnumeratorsA=SETUPAPI.CM_Enumerate_EnumeratorsA -CM_Enumerate_EnumeratorsW=SETUPAPI.CM_Enumerate_EnumeratorsW -CM_Enumerate_Enumerators_ExA=SETUPAPI.CM_Enumerate_Enumerators_ExA -CM_Enumerate_Enumerators_ExW=SETUPAPI.CM_Enumerate_Enumerators_ExW -CM_Find_Range=SETUPAPI.CM_Find_Range -CM_First_Range=SETUPAPI.CM_First_Range -CM_Free_Log_Conf=SETUPAPI.CM_Free_Log_Conf -CM_Free_Log_Conf_Ex=SETUPAPI.CM_Free_Log_Conf_Ex -CM_Free_Log_Conf_Handle=SETUPAPI.CM_Free_Log_Conf_Handle -CM_Free_Range_List=SETUPAPI.CM_Free_Range_List -CM_Free_Res_Des=SETUPAPI.CM_Free_Res_Des -CM_Free_Res_Des_Ex=SETUPAPI.CM_Free_Res_Des_Ex -CM_Free_Res_Des_Handle=SETUPAPI.CM_Free_Res_Des_Handle -CM_Get_Child=SETUPAPI.CM_Get_Child -CM_Get_Child_Ex=SETUPAPI.CM_Get_Child_Ex -CM_Get_Class_Key_NameA=SETUPAPI.CM_Get_Class_Key_NameA -CM_Get_Class_Key_NameW=SETUPAPI.CM_Get_Class_Key_NameW -CM_Get_Class_Key_Name_ExA=SETUPAPI.CM_Get_Class_Key_Name_ExA -CM_Get_Class_Key_Name_ExW=SETUPAPI.CM_Get_Class_Key_Name_ExW -CM_Get_Class_NameA=SETUPAPI.CM_Get_Class_NameA -CM_Get_Class_NameW=SETUPAPI.CM_Get_Class_NameW -CM_Get_Class_Name_ExA=SETUPAPI.CM_Get_Class_Name_ExA -CM_Get_Class_Name_ExW=SETUPAPI.CM_Get_Class_Name_ExW -CM_Get_Depth=SETUPAPI.CM_Get_Depth -CM_Get_Depth_Ex=SETUPAPI.CM_Get_Depth_Ex -CM_Get_DevNode_Registry_PropertyA=SETUPAPI.CM_Get_DevNode_Registry_PropertyA -CM_Get_DevNode_Registry_PropertyW=SETUPAPI.CM_Get_DevNode_Registry_PropertyW -CM_Get_DevNode_Registry_Property_ExA=SETUPAPI.CM_Get_DevNode_Registry_Property_ExA -CM_Get_DevNode_Registry_Property_ExW=SETUPAPI.CM_Get_DevNode_Registry_Property_ExW -CM_Get_DevNode_Status=SETUPAPI.CM_Get_DevNode_Status -CM_Get_DevNode_Status_Ex=SETUPAPI.CM_Get_DevNode_Status_Ex -CM_Get_Device_IDA=SETUPAPI.CM_Get_Device_IDA -CM_Get_Device_IDW=SETUPAPI.CM_Get_Device_IDW -CM_Get_Device_ID_ExA=SETUPAPI.CM_Get_Device_ID_ExA -CM_Get_Device_ID_ExW=SETUPAPI.CM_Get_Device_ID_ExW -CM_Get_Device_ID_ListA=SETUPAPI.CM_Get_Device_ID_ListA -CM_Get_Device_ID_ListW=SETUPAPI.CM_Get_Device_ID_ListW -CM_Get_Device_ID_List_ExA=SETUPAPI.CM_Get_Device_ID_List_ExA -CM_Get_Device_ID_List_ExW=SETUPAPI.CM_Get_Device_ID_List_ExW -CM_Get_Device_ID_List_SizeA=SETUPAPI.CM_Get_Device_ID_List_SizeA -CM_Get_Device_ID_List_SizeW=SETUPAPI.CM_Get_Device_ID_List_SizeW -CM_Get_Device_ID_List_Size_ExA=SETUPAPI.CM_Get_Device_ID_List_Size_ExA -CM_Get_Device_ID_List_Size_ExW=SETUPAPI.CM_Get_Device_ID_List_Size_ExA -CM_Get_Device_ID_Size=SETUPAPI.CM_Get_Device_ID_Size -CM_Get_Device_ID_Size_Ex=SETUPAPI.CM_Get_Device_ID_Size_Ex -CM_Get_Device_Interface_AliasA=SETUPAPI.CM_Get_Device_Interface_AliasA -CM_Get_Device_Interface_AliasW=SETUPAPI.CM_Get_Device_Interface_AliasW -CM_Get_Device_Interface_Alias_ExA=SETUPAPI.CM_Get_Device_Interface_Alias_ExA -CM_Get_Device_Interface_Alias_ExW=SETUPAPI.CM_Get_Device_Interface_Alias_ExW -CM_Get_Device_Interface_ListA=SETUPAPI.CM_Get_Device_Interface_ListA -CM_Get_Device_Interface_ListW=SETUPAPI.CM_Get_Device_Interface_ListW -CM_Get_Device_Interface_List_ExA=SETUPAPI.CM_Get_Device_Interface_List_ExA -CM_Get_Device_Interface_List_ExW=SETUPAPI.CM_Get_Device_Interface_List_ExW -CM_Get_Device_Interface_List_SizeA=SETUPAPI.CM_Get_Device_Interface_List_SizeA -CM_Get_Device_Interface_List_SizeW=SETUPAPI.CM_Get_Device_Interface_List_SizeW -CM_Get_Device_Interface_List_Size_ExA=SETUPAPI.CM_Get_Device_Interface_List_Size_ExA -CM_Get_Device_Interface_List_Size_ExW=SETUPAPI.CM_Get_Device_Interface_List_Size_ExW -CM_Get_First_Log_Conf=SETUPAPI.CM_Get_First_Log_Conf -CM_Get_First_Log_Conf_Ex=SETUPAPI.CM_Get_First_Log_Conf_Ex -CM_Get_Global_State=SETUPAPI.CM_Get_Global_State -CM_Get_Global_State_Ex=SETUPAPI.CM_Get_Global_State_Ex -CM_Get_HW_Prof_FlagsA=SETUPAPI.CM_Get_HW_Prof_FlagsA -CM_Get_HW_Prof_FlagsW=SETUPAPI.CM_Get_HW_Prof_FlagsW -CM_Get_HW_Prof_Flags_ExA=SETUPAPI.CM_Get_HW_Prof_Flags_ExA -CM_Get_HW_Prof_Flags_ExW=SETUPAPI.CM_Get_HW_Prof_Flags_ExW -CM_Get_Hardware_Profile_InfoA=SETUPAPI.CM_Get_Hardware_Profile_InfoA -CM_Get_Hardware_Profile_InfoW=SETUPAPI.CM_Get_Hardware_Profile_InfoW -CM_Get_Hardware_Profile_Info_ExA=SETUPAPI.CM_Get_Hardware_Profile_Info_ExA -CM_Get_Hardware_Profile_Info_ExW=SETUPAPI.CM_Get_Hardware_Profile_Info_ExW -CM_Get_Log_Conf_Priority=SETUPAPI.CM_Get_Log_Conf_Priority -CM_Get_Log_Conf_Priority_Ex=SETUPAPI.CM_Get_Log_Conf_Priority_Ex -CM_Get_Next_Log_Conf=SETUPAPI.CM_Get_Next_Log_Conf -CM_Get_Next_Log_Conf_Ex=SETUPAPI.CM_Get_Next_Log_Conf_Ex -CM_Get_Next_Res_Des=SETUPAPI.CM_Get_Next_Res_Des -CM_Get_Next_Res_Des_Ex=SETUPAPI.CM_Get_Next_Res_Des_Ex -CM_Get_Parent=SETUPAPI.CM_Get_Parent -CM_Get_Parent_Ex=SETUPAPI.CM_Get_Parent_Ex -CM_Get_Res_Des_Data=SETUPAPI.CM_Get_Res_Des_Data -CM_Get_Res_Des_Data_Ex=SETUPAPI.CM_Get_Res_Des_Data_Ex -CM_Get_Res_Des_Data_Size=SETUPAPI.CM_Get_Res_Des_Data_Size -CM_Get_Res_Des_Data_Size_Ex=SETUPAPI.CM_Get_Res_Des_Data_Size_Ex -CM_Get_Sibling=SETUPAPI.CM_Get_Sibling -CM_Get_Sibling_Ex=SETUPAPI.CM_Get_Sibling_Ex -CM_Get_Version=SETUPAPI.CM_Get_Version -CM_Get_Version_Ex=SETUPAPI.CM_Get_Version_Ex -CM_Intersect_Range_List=SETUPAPI.CM_Intersect_Range_List -CM_Invert_Range_List=SETUPAPI.CM_Invert_Range_List -CM_Is_Dock_Station_Present=SETUPAPI.CM_Is_Dock_Station_Present -CM_Is_Dock_Station_Present_Ex=SETUPAPI.CM_Is_Dock_Station_Present_Ex -CM_Locate_DevNodeA=SETUPAPI.CM_Locate_DevNodeA -CM_Locate_DevNodeW=SETUPAPI.CM_Locate_DevNodeW -CM_Locate_DevNode_ExA=SETUPAPI.CM_Locate_DevNode_ExA -CM_Locate_DevNode_ExW=SETUPAPI.CM_Locate_DevNode_ExW -CM_Merge_Range_List=SETUPAPI.CM_Merge_Range_List -CM_Modify_Res_Des=SETUPAPI.CM_Modify_Res_Des -CM_Modify_Res_Des_Ex=SETUPAPI.CM_Modify_Res_Des_Ex -CM_Move_DevNode=SETUPAPI.CM_Move_DevNode -CM_Move_DevNode_Ex=SETUPAPI.CM_Move_DevNode_Ex -CM_Next_Range=SETUPAPI.CM_Next_Range -CM_Open_Class_KeyA=SETUPAPI.CM_Open_Class_KeyA -CM_Open_Class_KeyW=SETUPAPI.CM_Open_Class_KeyW -CM_Open_Class_Key_ExA=SETUPAPI.CM_Open_Class_Key_ExA -CM_Open_Class_Key_ExW=SETUPAPI.CM_Open_Class_Key_ExW -CM_Open_DevNode_Key=SETUPAPI.CM_Open_DevNode_Key -CM_Open_DevNode_Key_Ex=SETUPAPI.CM_Open_DevNode_Key_Ex -CM_Query_Arbitrator_Free_Data=SETUPAPI.CM_Query_Arbitrator_Free_Data -CM_Query_Arbitrator_Free_Data_Ex=SETUPAPI.CM_Query_Arbitrator_Free_Data_Ex -CM_Query_Arbitrator_Free_Size=SETUPAPI.CM_Query_Arbitrator_Free_Size -CM_Query_Arbitrator_Free_Size_Ex=SETUPAPI.CM_Query_Arbitrator_Free_Size_Ex -CM_Query_Remove_SubTree=SETUPAPI.CM_Query_Remove_SubTree -CM_Query_Remove_SubTree_Ex=SETUPAPI.CM_Query_Remove_SubTree_Ex -CM_Reenumerate_DevNode=SETUPAPI.CM_Reenumerate_DevNode -CM_Reenumerate_DevNode_Ex=SETUAPI.CM_Reenumerate_DevNode_Ex -CM_Register_Device_Driver=SETUAPI.CM_Register_Device_Driver -CM_Register_Device_Driver_Ex=SETUAPI.CM_Register_Device_Driver_Ex -CM_Register_Device_InterfaceA=SETUAPI.CM_Register_Device_InterfaceA -CM_Register_Device_InterfaceW=SETUAPI.CM_Register_Device_InterfaceW -CM_Register_Device_Interface_ExA=SETUAPI.CM_Register_Device_Interface_ExA -CM_Register_Device_Interface_ExW=SETUAPI.CM_Register_Device_Interface_ExW -CM_Remove_SubTree=SETUAPI.CM_Remove_SubTree -CM_Remove_SubTree_Ex=SETUAPI.CM_Remove_SubTree_Ex -CM_Remove_Unmarked_Children=SETUAPI.CM_Remove_Unmarked_Children -CM_Remove_Unmarked_Children_Ex=SETUAPI.CM_Remove_Unmarked_Children_Ex -CM_Request_Device_EjectA=SETUAPI.CM_Request_Device_EjectA -CM_Request_Device_EjectW=SETUAPI.CM_Request_Device_EjectW -CM_Request_Eject_PC=SETUPAPI.CM_Request_Eject_PC -CM_Request_Eject_PC_Ex=SETUPAPI.CM_Request_Eject_PC_Ex -CM_Reset_Children_Marks=SETUPAPI.CM_Reset_Children_Marks -CM_Reset_Children_Marks_Ex=SETUPAPI.CM_Reset_Children_Marks_Ex -CM_Run_Detection=SETUPAPI.CM_Run_Detection -CM_Run_Detection_Ex=SETUPAPI.CM_Run_Detection_Ex -CM_Set_DevNode_Problem=SETUPAPI.CM_Set_DevNode_Problem -CM_Set_DevNode_Problem_Ex=SETUPAPI.CM_Set_DevNode_Problem_Ex -CM_Set_DevNode_Registry_PropertyA=SETUPAPI.CM_Set_DevNode_Registry_PropertyA -CM_Set_DevNode_Registry_PropertyW=SETUPAPI.CM_Set_DevNode_Registry_PropertyW -CM_Set_DevNode_Registry_Property_ExA=SETUPAPI.CM_Set_DevNode_Registry_Property_ExA -CM_Set_DevNode_Registry_Property_ExW=SETUPAPI.CM_Set_DevNode_Registry_Property_ExW -CM_Set_HW_Prof=SETUPAPI.CM_Set_HW_Prof -CM_Set_HW_Prof_Ex=SETUPAPI.CM_Set_HW_Prof_Ex -CM_Set_HW_Prof_FlagsA=SETUPAPI.CM_Set_HW_Prof_FlagsA -CM_Set_HW_Prof_FlagsW=SETUPAPI.CM_Set_HW_Prof_FlagsW -CM_Set_HW_Prof_Flags_ExA=SETUPAPI.CM_Set_HW_Prof_Flags_ExA -CM_Set_HW_Prof_Flags_ExW=SETUPAPI.CM_Set_HW_Prof_Flags_ExW -CM_Setup_DevNode=SETUPAPI.CM_Setup_DevNode -CM_Setup_DevNode_Ex=SETUPAPI.CM_Setup_DevNode_Ex -CM_Test_Range_Available=SETUPAPI.CM_Test_Range_Available -CM_Uninstall_DevNode=SETUPAPI.CM_Uninstall_DevNode -CM_Uninstall_DevNode_Ex=SETUPAPI.CM_Uninstall_DevNode_Ex -CM_Unregister_Device_InterfaceA=SETUPAPI.CM_Unregister_Device_InterfaceA -CM_Unregister_Device_InterfaceW=SETUPAPI.CM_Unregister_Device_InterfaceW -CM_Unregister_Device_Interface_ExA=SETUPAPI.CM_Unregister_Device_Interface_ExA -CM_Unregister_Device_Interface_ExW=SETUPAPI.CM_Unregister_Device_Interface_ExW Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild [iso-8859-1] Mon Jan 26 03:27:47 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="cfgmgr32" type="win32dll" baseaddress="${BASEADDRESS_CFGMGR32}" entrypoint="0" installbase="system32" installname="cfgmgr32.dll"> - <importlibrary definition="cfgmgr32.def" /> + <importlibrary definition="cfgmgr32.spec" /> <file>cfgmgr32.rc</file> </module> Added: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec (added) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec [iso-8859-1] Mon Jan 26 03:27:47 2009 @@ -1,0 +1,189 @@ +@ stdcall CMP_Init_Detection(long) setupapi.CMP_Init_Detection +@ stub CMP_RegisterNotification # setupapi.CMP_RegisterNotification +@ stdcall CMP_Report_LogOn(long long) setupapi.CMP_Report_LogOn +@ stub CMP_UnregisterNotification # setupapi.CMP_UnregisterNotification +@ stdcall CMP_WaitNoPendingInstallEvents(long) setupapi.CMP_WaitNoPendingInstallEvents +@ stub CMP_WaitServicesAvailable # setupapi.CMP_WaitServicesAvailable +@ stdcall CM_Add_Empty_Log_Conf(ptr ptr long long) setupapi.CM_Add_Empty_Log_Conf +@ stdcall CM_Add_Empty_Log_Conf_Ex(ptr ptr long long ptr) setupapi.CM_Add_Empty_Log_Conf_Ex +@ stdcall CM_Add_IDA(ptr str long) setupapi.CM_Add_IDA +@ stdcall CM_Add_IDW(ptr wstr long) setupapi.CM_Add_IDW +@ stdcall CM_Add_ID_ExA(ptr str long ptr) setupapi.CM_Add_ID_ExA +@ stdcall CM_Add_ID_ExW(ptr wstr long ptr) setupapi.CM_Add_ID_ExW +@ stub CM_Add_Range # setupapi.CM_Add_Range +@ stub CM_Add_Res_Des # setupapi.CM_Add_Res_Des +@ stub CM_Add_Res_Des_Ex # setupapi.CM_Add_Res_Des_Ex +@ stdcall CM_Connect_MachineA(str ptr) setupapi.CM_Connect_MachineA +@ stdcall CM_Connect_MachineW(wstr ptr) setupapi.CM_Connect_MachineW +@ stdcall CM_Create_DevNodeA(ptr str long long) setupapi.CM_Create_DevNodeA +@ stdcall CM_Create_DevNodeW(ptr wstr long long) setupapi.CM_Create_DevNodeW +@ stdcall CM_Create_DevNode_ExA(ptr str long long long) setupapi.CM_Create_DevNode_ExA +@ stdcall CM_Create_DevNode_ExW(ptr wstr long long long) setupapi.CM_Create_DevNode_ExW +@ stub CM_Create_Range_List # setupapi.CM_Create_Range_List +@ stdcall CM_Delete_Class_Key(ptr long) setupapi.CM_Delete_Class_Key +@ stdcall CM_Delete_Class_Key_Ex(ptr long long) setupapi.CM_Delete_Class_Key_Ex +@ stdcall CM_Delete_DevNode_Key(long long long) setupapi.CM_Delete_DevNode_Key +@ stdcall CM_Delete_DevNode_Key_Ex(long long long ptr) setupapi.CM_Delete_DevNode_Key_Ex +@ stub CM_Delete_Range # setupapi.CM_Delete_Range +@ stub CM_Detect_Resource_Conflict # setupapi.CM_Detect_Resource_Conflict +@ stub CM_Detect_Resource_Conflict_Ex # setupapi.CM_Detect_Resource_Conflict_Ex +@ stdcall CM_Disable_DevNode(long long) setupapi.CM_Disable_DevNode +@ stdcall CM_Disable_DevNode_Ex(long long ptr) setupapi.CM_Disable_DevNode_Ex +@ stdcall CM_Disconnect_Machine(long) setupapi.CM_Disconnect_Machine +@ stub CM_Dup_Range_List # setupapi.CM_Dup_Range_List +@ stdcall CM_Enable_DevNode(long long) setupapi.CM_Enable_DevNode +@ stdcall CM_Enable_DevNode_Ex(long long ptr) setupapi.CM_Enable_DevNode_Ex +@ stdcall CM_Enumerate_Classes(long ptr long) setupapi.CM_Enumerate_Classes +@ stdcall CM_Enumerate_Classes_Ex(long ptr long ptr) setupapi.CM_Enumerate_Classes_Ex +@ stdcall CM_Enumerate_EnumeratorsA(long str ptr long) setupapi.CM_Enumerate_EnumeratorsA +@ stdcall CM_Enumerate_EnumeratorsW(long wstr ptr long) setupapi.CM_Enumerate_EnumeratorsW +@ stdcall CM_Enumerate_Enumerators_ExA(long str ptr long long) setupapi.CM_Enumerate_Enumerators_ExA +@ stdcall CM_Enumerate_Enumerators_ExW(long wstr ptr long long) setupapi.CM_Enumerate_Enumerators_ExW +@ stub CM_Find_Range # setupapi.CM_Find_Range +@ stub CM_First_Range # setupapi.CM_First_Range +@ stdcall CM_Free_Log_Conf(ptr long) setupapi.CM_Free_Log_Conf +@ stdcall CM_Free_Log_Conf_Ex(ptr long ptr) setupapi.CM_Free_Log_Conf_Ex +@ stdcall CM_Free_Log_Conf_Handle(ptr) setupapi.CM_Free_Log_Conf_Handle +@ stub CM_Free_Range_List # setupapi.CM_Free_Range_List +@ stub CM_Free_Res_Des # setupapi.CM_Free_Res_Des +@ stub CM_Free_Res_Des_Ex # setupapi.CM_Free_Res_Des_Ex +@ stub CM_Free_Res_Des_Handle # setupapi.CM_Free_Res_Des_Handle +@ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child +@ stdcall CM_Get_Child_Ex(ptr long long long) setupapi.CM_Get_Child_Ex +@ stdcall CM_Get_Class_Key_NameA(ptr str ptr long) setupapi.CM_Get_Class_Key_NameA +@ stdcall CM_Get_Class_Key_NameW(ptr wstr ptr long) setupapi.CM_Get_Class_Key_NameW +@ stdcall CM_Get_Class_Key_Name_ExA(ptr str ptr long long) setupapi.CM_Get_Class_Key_Name_ExA +@ stdcall CM_Get_Class_Key_Name_ExW(ptr wstr ptr long long) setupapi.CM_Get_Class_Key_Name_ExW +@ stdcall CM_Get_Class_NameA(ptr str ptr long) setupapi.CM_Get_Class_NameA +@ stdcall CM_Get_Class_NameW(ptr wstr ptr long) setupapi.CM_Get_Class_NameW +@ stdcall CM_Get_Class_Name_ExA(ptr str ptr long long) setupapi.CM_Get_Class_Name_ExA +@ stdcall CM_Get_Class_Name_ExW(ptr wstr ptr long long) setupapi.CM_Get_Class_Name_ExW +@ stdcall CM_Get_Depth(ptr long long) setupapi.CM_Get_Depth +@ stdcall CM_Get_Depth_Ex(ptr long long long) setupapi.CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyA +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long long) setupapi.CM_Get_DevNode_Registry_Property_ExA +@ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long long) setupapi.CM_Get_DevNode_Registry_Property_ExW +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status +@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long long) setupapi.CM_Get_DevNode_Status_Ex +@ stdcall CM_Get_Device_IDA(long str long long) setupapi.CM_Get_Device_IDA +@ stdcall CM_Get_Device_IDW(long wstr long long) setupapi.CM_Get_Device_IDW +@ stdcall CM_Get_Device_ID_ExA(long str long long long) setupapi.CM_Get_Device_ID_ExA +@ stdcall CM_Get_Device_ID_ExW(long wstr long long long) setupapi.CM_Get_Device_ID_ExW +@ stdcall CM_Get_Device_ID_ListA(str str long long) setupapi.CM_Get_Device_ID_ListA +@ stdcall CM_Get_Device_ID_ListW(wstr wstr long long) setupapi.CM_Get_Device_ID_ListW +@ stdcall CM_Get_Device_ID_List_ExA(str str long long long) setupapi.CM_Get_Device_ID_List_ExA +@ stdcall CM_Get_Device_ID_List_ExW(wstr wstr long long long) setupapi.CM_Get_Device_ID_List_ExW +@ stdcall CM_Get_Device_ID_List_SizeA(ptr str long) setupapi.CM_Get_Device_ID_List_SizeA +@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW +@ stdcall CM_Get_Device_ID_List_Size_ExA(ptr str long long) setupapi.CM_Get_Device_ID_List_Size_ExA +@ stdcall CM_Get_Device_ID_List_Size_ExW(ptr wstr long long) setupapi.CM_Get_Device_ID_List_Size_ExA +@ stdcall CM_Get_Device_ID_Size(ptr long long) setupapi.CM_Get_Device_ID_Size +@ stdcall CM_Get_Device_ID_Size_Ex(ptr long long long) setupapi.CM_Get_Device_ID_Size_Ex +@ stub CM_Get_Device_Interface_AliasA # setupapi.CM_Get_Device_Interface_AliasA +@ stub CM_Get_Device_Interface_AliasW # setupapi.CM_Get_Device_Interface_AliasW +@ stub CM_Get_Device_Interface_Alias_ExA # setupapi.CM_Get_Device_Interface_Alias_ExA +@ stub CM_Get_Device_Interface_Alias_ExW # setupapi.CM_Get_Device_Interface_Alias_ExW +@ stub CM_Get_Device_Interface_ListA # setupapi.CM_Get_Device_Interface_ListA +@ stub CM_Get_Device_Interface_ListW # setupapi.CM_Get_Device_Interface_ListW +@ stub CM_Get_Device_Interface_List_ExA # setupapi.CM_Get_Device_Interface_List_ExA +@ stub CM_Get_Device_Interface_List_ExW # setupapi.CM_Get_Device_Interface_List_ExW +@ stub CM_Get_Device_Interface_List_SizeA # setupapi.CM_Get_Device_Interface_List_SizeA +@ stub CM_Get_Device_Interface_List_SizeW # setupapi.CM_Get_Device_Interface_List_SizeW +@ stub CM_Get_Device_Interface_List_Size_ExA # setupapi.CM_Get_Device_Interface_List_Size_ExA +@ stub CM_Get_Device_Interface_List_Size_ExW # setupapi.CM_Get_Device_Interface_List_Size_ExW +@ stdcall CM_Get_First_Log_Conf(ptr long long) setupapi.CM_Get_First_Log_Conf +@ stdcall CM_Get_First_Log_Conf_Ex(ptr long long long) setupapi.CM_Get_First_Log_Conf_Ex +@ stdcall CM_Get_Global_State(ptr long) setupapi.CM_Get_Global_State +@ stdcall CM_Get_Global_State_Ex(ptr long long) setupapi.CM_Get_Global_State_Ex +@ stdcall CM_Get_HW_Prof_FlagsA(str long ptr long) setupapi.CM_Get_HW_Prof_FlagsA +@ stdcall CM_Get_HW_Prof_FlagsW(wstr long ptr long) setupapi.CM_Get_HW_Prof_FlagsW +@ stdcall CM_Get_HW_Prof_Flags_ExA(str long ptr long long) setupapi.CM_Get_HW_Prof_Flags_ExA +@ stdcall CM_Get_HW_Prof_Flags_ExW(wstr long ptr long long) setupapi.CM_Get_HW_Prof_Flags_ExW +@ stub CM_Get_Hardware_Profile_InfoA # setupapi.CM_Get_Hardware_Profile_InfoA +@ stub CM_Get_Hardware_Profile_InfoW # setupapi.CM_Get_Hardware_Profile_InfoW +@ stub CM_Get_Hardware_Profile_Info_ExA # setupapi.CM_Get_Hardware_Profile_Info_ExA +@ stub CM_Get_Hardware_Profile_Info_ExW # setupapi.CM_Get_Hardware_Profile_Info_ExW +@ stdcall CM_Get_Log_Conf_Priority(ptr ptr long) setupapi.CM_Get_Log_Conf_Priority +@ stdcall CM_Get_Log_Conf_Priority_Ex(ptr ptr long long) setupapi.CM_Get_Log_Conf_Priority_Ex +@ stdcall CM_Get_Next_Log_Conf(ptr ptr long) setupapi.CM_Get_Next_Log_Conf +@ stdcall CM_Get_Next_Log_Conf_Ex(ptr ptr long long) setupapi.CM_Get_Next_Log_Conf_Ex +@ stub CM_Get_Next_Res_Des # setupapi.CM_Get_Next_Res_Des +@ stub CM_Get_Next_Res_Des_Ex # setupapi.CM_Get_Next_Res_Des_Ex +@ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent +@ stdcall CM_Get_Parent_Ex(ptr long long long) setupapi.CM_Get_Parent_Ex +@ stub CM_Get_Res_Des_Data # setupapi.CM_Get_Res_Des_Data +@ stub CM_Get_Res_Des_Data_Ex # setupapi.CM_Get_Res_Des_Data_Ex +@ stub CM_Get_Res_Des_Data_Size # setupapi.CM_Get_Res_Des_Data_Size +@ stub CM_Get_Res_Des_Data_Size_Ex # setupapi.CM_Get_Res_Des_Data_Size_Ex +@ stdcall CM_Get_Sibling(ptr long long) setupapi.CM_Get_Sibling +@ stdcall CM_Get_Sibling_Ex(ptr long long long) setupapi.CM_Get_Sibling_Ex +@ stdcall CM_Get_Version() setupapi.CM_Get_Version +@ stdcall CM_Get_Version_Ex(long) setupapi.CM_Get_Version_Ex +@ stub CM_Intersect_Range_List # setupapi.CM_Intersect_Range_List +@ stub CM_Invert_Range_List # setupapi.CM_Invert_Range_List +@ stdcall CM_Is_Dock_Station_Present(ptr) setupapi.CM_Is_Dock_Station_Present +@ stdcall CM_Is_Dock_Station_Present_Ex(ptr long) setupapi.CM_Is_Dock_Station_Present_Ex +@ stdcall CM_Locate_DevNodeA(ptr str long) setupapi.CM_Locate_DevNodeA +@ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW +@ stdcall CM_Locate_DevNode_ExA(ptr str long long) setupapi.CM_Locate_DevNode_ExA +@ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) setupapi.CM_Locate_DevNode_ExW +@ stub CM_Merge_Range_List # setupapi.CM_Merge_Range_List +@ stub CM_Modify_Res_Des # setupapi.CM_Modify_Res_Des +@ stub CM_Modify_Res_Des_Ex # setupapi.CM_Modify_Res_Des_Ex +@ stdcall CM_Move_DevNode(long long long) setupapi.CM_Move_DevNode +@ stdcall CM_Move_DevNode_Ex(long long long long) setupapi.CM_Move_DevNode_Ex +@ stub CM_Next_Range # setupapi.CM_Next_Range +@ stdcall CM_Open_Class_KeyA(ptr str long long ptr long) setupapi.CM_Open_Class_KeyA +@ stdcall CM_Open_Class_KeyW(ptr wstr long long ptr long) setupapi.CM_Open_Class_KeyW +@ stdcall CM_Open_Class_Key_ExA(ptr str long long ptr long long) setupapi.CM_Open_Class_Key_ExA +@ stdcall CM_Open_Class_Key_ExW(ptr wstr long long ptr long long) setupapi.CM_Open_Class_Key_ExW +@ stdcall CM_Open_DevNode_Key(ptr long long long ptr long) setupapi.CM_Open_DevNode_Key +@ stdcall CM_Open_DevNode_Key_Ex(ptr long long long ptr long long) setupapi.CM_Open_DevNode_Key_Ex +@ stub CM_Query_Arbitrator_Free_Data # setupapi.CM_Query_Arbitrator_Free_Data +@ stub CM_Query_Arbitrator_Free_Data_Ex # setupapi.CM_Query_Arbitrator_Free_Data_Ex +@ stub CM_Query_Arbitrator_Free_Size # setupapi.CM_Query_Arbitrator_Free_Size +@ stub CM_Query_Arbitrator_Free_Size_Ex # setupapi.CM_Query_Arbitrator_Free_Size_Ex +@ stub CM_Query_Remove_SubTree # setupapi.CM_Query_Remove_SubTree +@ stub CM_Query_Remove_SubTree_Ex # setupapi.CM_Query_Remove_SubTree_Ex +@ stdcall CM_Reenumerate_DevNode(long long) setupapi.CM_Reenumerate_DevNode +@ stdcall CM_Reenumerate_DevNode_Ex(long long long) setuapi.CM_Reenumerate_DevNode_Ex +@ stub CM_Register_Device_Driver # setupapi.CM_Register_Device_Driver +@ stub CM_Register_Device_Driver_Ex # setupapi.CM_Register_Device_Driver_Ex +@ stub CM_Register_Device_InterfaceA # setupapi.CM_Register_Device_InterfaceA +@ stub CM_Register_Device_InterfaceW # setupapi.CM_Register_Device_InterfaceW +@ stub CM_Register_Device_Interface_ExA # setupapi.CM_Register_Device_Interface_ExA +@ stub CM_Register_Device_Interface_ExW # setupapi.CM_Register_Device_Interface_ExW +@ stub CM_Remove_SubTree # setupapi.CM_Remove_SubTree +@ stub CM_Remove_SubTree_Ex # setupapi.CM_Remove_SubTree_Ex +@ stub CM_Remove_Unmarked_Children # setupapi.CM_Remove_Unmarked_Children +@ stub CM_Remove_Unmarked_Children_Ex # setupapi.CM_Remove_Unmarked_Children_Ex +@ stub CM_Request_Device_EjectA # setupapi.CM_Request_Device_EjectA +@ stub CM_Request_Device_EjectW # setupapi.CM_Request_Device_EjectW +@ stdcall CM_Request_Eject_PC() setupapi.CM_Request_Eject_PC +@ stdcall CM_Request_Eject_PC_Ex(long) setupapi.CM_Request_Eject_PC_Ex +@ stub CM_Reset_Children_Marks # setupapi.CM_Reset_Children_Marks +@ stub CM_Reset_Children_Marks_Ex # setupapi.CM_Reset_Children_Marks_Ex +@ stdcall CM_Run_Detection(long) setupapi.CM_Run_Detection +@ stdcall CM_Run_Detection_Ex(long long) setupapi.CM_Run_Detection_Ex +@ stdcall CM_Set_DevNode_Problem(long long long) setupapi.CM_Set_DevNode_Problem +@ stdcall CM_Set_DevNode_Problem_Ex(long long long long) setupapi.CM_Set_DevNode_Problem_Ex +@ stdcall CM_Set_DevNode_Registry_PropertyA(long long ptr long long) setupapi.CM_Set_DevNode_Registry_PropertyA +@ stdcall CM_Set_DevNode_Registry_PropertyW(long long ptr long long) setupapi.CM_Set_DevNode_Registry_PropertyW +@ stdcall CM_Set_DevNode_Registry_Property_ExA(long long ptr long long long) setupapi.CM_Set_DevNode_Registry_Property_ExA +@ stdcall CM_Set_DevNode_Registry_Property_ExW(long long ptr long long long) setupapi.CM_Set_DevNode_Registry_Property_ExW +@ stub CM_Set_HW_Prof # setupapi.CM_Set_HW_Prof +@ stub CM_Set_HW_Prof_Ex # setupapi.CM_Set_HW_Prof_Ex +@ stdcall CM_Set_HW_Prof_FlagsA(str long long long) setupapi.CM_Set_HW_Prof_FlagsA +@ stdcall CM_Set_HW_Prof_FlagsW(wstr long long long) setupapi.CM_Set_HW_Prof_FlagsW +@ stdcall CM_Set_HW_Prof_Flags_ExA(str long long long long) setupapi.CM_Set_HW_Prof_Flags_ExA +@ stdcall CM_Set_HW_Prof_Flags_ExW(wstr long long long long) setupapi.CM_Set_HW_Prof_Flags_ExW +@ stdcall CM_Setup_DevNode(long long) setupapi.CM_Setup_DevNode +@ stdcall CM_Setup_DevNode_Ex(long long long) setupapi.CM_Setup_DevNode_Ex +@ stub CM_Test_Range_Available # setupapi.CM_Test_Range_Available +@ stdcall CM_Uninstall_DevNode(long long) setupapi.CM_Uninstall_DevNode +@ stdcall CM_Uninstall_DevNode_Ex(long long long) setupapi.CM_Uninstall_DevNode_Ex +@ stub CM_Unregister_Device_InterfaceA # setupapi.CM_Unregister_Device_InterfaceA +@ stub CM_Unregister_Device_InterfaceW # setupapi.CM_Unregister_Device_InterfaceW +@ stub CM_Unregister_Device_Interface_ExA # setupapi.CM_Unregister_Device_Interface_ExA +@ stub CM_Unregister_Device_Interface_ExW # setupapi.CM_Unregister_Device_Interface_ExW Propchange: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/win32/fmifs/fmifs.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/fmifs.def?… ============================================================================== --- trunk/reactos/dll/win32/fmifs/fmifs.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/fmifs.def (removed) @@ -1,31 +1,0 @@ -; $Id$ -; -; fmifs.def -; -; Project : ReactOS -; Description : fmifs.dll exported symbols -; Contributors: -; Created by Emanuele Aliberti -; -; -; NOTE: Functions with trailing @0 are unknown. -; -LIBRARY fmifs.dll -EXPORTS -Chkdsk@36 -;ChkdskEx -;ComputeFmMediaType -DiskCopy@0 -EnableVolumeCompression@8 -Extend@0 -Format@0 -FormatEx@28 -;FormatEx2 -InitializeFmIfs@12 -QueryAvailableFileSystemFormat@20 -;QueryDeviceInformation -;QueryDeviceInformationByHandle -;QueryFileSystemName -;QueryLatestFileSystemVersion -QuerySupportedMedia@16 -SetLabel(a)8=KERNEL32.SetVolumeLabelW Modified: trunk/reactos/dll/win32/fmifs/fmifs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/fmifs.rbui… ============================================================================== --- trunk/reactos/dll/win32/fmifs/fmifs.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/fmifs.rbuild [iso-8859-1] Mon Jan 26 03:27:47 2009 @@ -1,5 +1,5 @@ <module name="fmifs" type="win32dll" entrypoint="InitializeFmIfs@12" baseaddress="${BASEADDRESS_FMIFS}" installbase="system32" installname="fmifs.dll"> - <importlibrary definition="fmifs.def" /> + <importlibrary definition="fmifs.spec" /> <include base="fmifs">.</include> <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> Added: trunk/reactos/dll/win32/fmifs/fmifs.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/fmifs.spec… ============================================================================== --- trunk/reactos/dll/win32/fmifs/fmifs.spec (added) +++ trunk/reactos/dll/win32/fmifs/fmifs.spec [iso-8859-1] Mon Jan 26 03:27:47 2009 @@ -1,0 +1,17 @@ +@ stdcall Chkdsk(wstr wstr long long long long ptr ptr ptr) +@ stub ChkdskEx +@ stub ComputeFmMediaType +@ stdcall DiskCopy() +@ stdcall EnableVolumeCompression(wstr long) +@ stdcall Extend() +@ stdcall Format() +@ stdcall FormatEx(wstr ptr wstr wstr long long ptr) +@ stub FormatEx2 +@ stdcall InitializeFmIfs(ptr long ptr) +@ stdcall QueryAvailableFileSystemFormat(long wstr str str ptr) +@ stub QueryDeviceInformation +@ stub QueryDeviceInformationByHandle +@ stub QueryFileSystemName +@ stub QueryLatestFileSystemVersion +@ stdcall QuerySupportedMedia(wstr ptr long ptr) +@ stdcall SetLabel(wstr wstr) kernel32.SetVolumeLabelW Propchange: trunk/reactos/dll/win32/fmifs/fmifs.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 39102: -fix header -set entrypoint="0"
by cwittich＠svn.reactos.org 26 Jan '09

26 Jan '09

Author: cwittich Date: Mon Jan 26 01:29:08 2009 New Revision: 39102 URL: http://svn.reactos.org/svn/reactos?rev=39102&view=rev Log: -fix header -set entrypoint="0" Modified: trunk/reactos/drivers/wmi/wmilib.c trunk/reactos/drivers/wmi/wmilib.rbuild Modified: trunk/reactos/drivers/wmi/wmilib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/wmilib.c?rev=3… ============================================================================== --- trunk/reactos/drivers/wmi/wmilib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wmi/wmilib.c [iso-8859-1] Mon Jan 26 01:29:08 2009 @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS Kernel + * PROJECT: ReactOS WMI driver * COPYRIGHT: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ex/atom.c - * PURPOSE: Executive Atom Functions - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * Gunnar Dalsnes + * FILE: drivers/wmi/wmilib.c + * PURPOSE: Windows Management Intstrumentation + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + * */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/wmi/wmilib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/wmilib.rbuild?… ============================================================================== --- trunk/reactos/drivers/wmi/wmilib.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wmi/wmilib.rbuild [iso-8859-1] Mon Jan 26 01:29:08 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<module name="wmilib" type="kernelmodedriver" installbase="system32/drivers" installname="wmilib.sys"> +<module name="wmilib" type="kernelmodedriver" installbase="system32/drivers" installname="wmilib.sys" entrypoint="0"> <importlibrary definition="wmilib.spec" /> <include base="wmilib">.</include> <library>ntoskrnl</library>

1 0

[cwittich] 39101: no DriverEntry in here -> entrypoint="0"
by cwittich＠svn.reactos.org 26 Jan '09

26 Jan '09

Author: cwittich Date: Mon Jan 26 01:09:06 2009 New Revision: 39101 URL: http://svn.reactos.org/svn/reactos?rev=39101&view=rev Log: no DriverEntry in here -> entrypoint="0" Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Mon Jan 26 01:09:06 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../../tools/rbuild/project.dtd"> -<module name="portcls" type="kernelmodedriver" installbase="system32/drivers" installname="portcls.sys"> +<module name="portcls" type="kernelmodedriver" installbase="system32/drivers" installname="portcls.sys" entrypoint="0"> <importlibrary definition="portcls.spec" /> <define name="_NTDDK_" /> <define name="PC_NO_IMPORTS" />

1 0

[dgoette] 39100: replace tinyMCE 2.1.0 with 3.2.1.1 and move it into another directory
by dgoette＠svn.reactos.org 25 Jan '09

25 Jan '09

1 0

[dchapyshev] 39099: - .def -> .spec - Fix telephon.cpl - Small fix hdwwiz - Delete unneeded files in appwiz
by dchapyshev＠svn.reactos.org 25 Jan '09

25 Jan '09

Author: dchapyshev Date: Sun Jan 25 12:02:24 2009 New Revision: 39099 URL: http://svn.reactos.org/svn/reactos?rev=39099&view=rev Log: - .def -> .spec - Fix telephon.cpl - Small fix hdwwiz - Delete unneeded files in appwiz Added: trunk/reactos/dll/cpl/appwiz-new/appwiz.spec (with props) trunk/reactos/dll/cpl/appwiz/appwiz.spec (with props) trunk/reactos/dll/cpl/desk/desk.spec (with props) Removed: trunk/reactos/dll/cpl/appwiz-new/appwiz.def trunk/reactos/dll/cpl/appwiz/appwiz.def trunk/reactos/dll/cpl/appwiz/appwiz.dsp trunk/reactos/dll/cpl/appwiz/appwiz.dsw trunk/reactos/dll/cpl/desk/desk.def Modified: trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild trunk/reactos/dll/cpl/appwiz-new/createlink.c trunk/reactos/dll/cpl/appwiz/appwiz.rbuild trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/telephon/telephon.c Removed: trunk/reactos/dll/cpl/appwiz-new/appwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/appwiz.def [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz-new/appwiz.def (removed) @@ -1,9 +1,0 @@ -LIBRARY appwiz.cpl - -EXPORTS -CPlApplet@16 -;NewLinkHere@16 -;NewLinkHereA@16 -;NewLinkHereW@16 - -; EOF Modified: trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild [iso-8859-1] Sun Jan 25 12:02:24 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="appwiz-new" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="appwiz-new.cpl" unicode="yes"> - <importlibrary definition="appwiz.def" /> + <importlibrary definition="appwiz.spec" /> <include base="appwiz-new">.</include> <library>kernel32</library> <library>advapi32</library> Added: trunk/reactos/dll/cpl/appwiz-new/appwiz.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/appwiz.spec (added) +++ trunk/reactos/dll/cpl/appwiz-new/appwiz.spec [iso-8859-1] Sun Jan 25 12:02:24 2009 @@ -1,0 +1,4 @@ +@ stdcall CPlApplet(ptr long ptr ptr) +@ stdcall NewLinkHere(ptr long ptr ptr) +@ stdcall NewLinkHereA(ptr long ptr ptr) +@ stdcall NewLinkHereW(ptr long ptr ptr) Propchange: trunk/reactos/dll/cpl/appwiz-new/appwiz.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/appwiz-new/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/createl… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/createlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz-new/createlink.c [iso-8859-1] Sun Jan 25 12:02:24 2009 @@ -11,3 +11,24 @@ */ #include "appwiz.h" + +LONG +CALLBACK +NewLinkHere(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + return -1; +} + +LONG +CALLBACK +NewLinkHereA(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + return -1; +} + +LONG +CALLBACK +NewLinkHereW(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + return -1; +} Removed: trunk/reactos/dll/cpl/appwiz/appwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.def?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.def [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.def (removed) @@ -1,9 +1,0 @@ -LIBRARY appwiz.cpl - -EXPORTS -CPlApplet@16 -NewLinkHere@16 -NewLinkHereA@16 -NewLinkHereW@16 - -; EOF Removed: trunk/reactos/dll/cpl/appwiz/appwiz.dsp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.dsp?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.dsp [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.dsp (removed) @@ -1,124 +1,0 @@ -# Microsoft Developer Studio Project File - Name="appwiz" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=appwiz - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "appwiz.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "appwiz.mak" CFG="appwiz - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "appwiz - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "appwiz - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "appwiz - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APPWIZ_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APPWIZ_EXPORTS" /D "_UNICODE" /D "UNICODE" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_MSC_VER" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /dll /machine:I386 /out:"Release/appwiz.cpl" - -!ELSEIF "$(CFG)" == "appwiz - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APPWIZ_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APPWIZ_EXPORTS" /D "_UNICODE" /D "UNICODE" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_MSC_VER" -# SUBTRACT RSC /x -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /dll /debug /machine:I386 /out:"Debug/appwiz.cpl" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "appwiz - Win32 Release" -# Name "appwiz - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\appwiz.c -# End Source File -# Begin Source File - -SOURCE=.\appwiz.h -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\appwiz.def -# End Source File -# Begin Source File - -SOURCE=.\appwiz.rc -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project Removed: trunk/reactos/dll/cpl/appwiz/appwiz.dsw URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.dsw?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.dsw [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.dsw (removed) @@ -1,29 +1,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "appwiz"=.\appwiz.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rbui… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.rbuild [iso-8859-1] Sun Jan 25 12:02:24 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="appwiz.cpl" unicode="yes"> - <importlibrary definition="appwiz.def" /> + <importlibrary definition="appwiz.spec" /> <include base="appwiz">.</include> <library>kernel32</library> <library>advapi32</library> Added: trunk/reactos/dll/cpl/appwiz/appwiz.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.spec… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.spec (added) +++ trunk/reactos/dll/cpl/appwiz/appwiz.spec [iso-8859-1] Sun Jan 25 12:02:24 2009 @@ -1,0 +1,4 @@ +@ stdcall CPlApplet(ptr long ptr ptr) +@ stdcall NewLinkHere(ptr long ptr ptr) +@ stdcall NewLinkHereA(ptr long ptr ptr) +@ stdcall NewLinkHereW(ptr long ptr ptr) Propchange: trunk/reactos/dll/cpl/appwiz/appwiz.spec ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/cpl/desk/desk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.def?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.def [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.def (removed) @@ -1,8 +1,0 @@ -LIBRARY desk.cpl - -EXPORTS -CPlApplet@16 -DisplayClassInstaller@12 -DisplaySaveSettings@8 - -; EOF Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.rbuild [iso-8859-1] Sun Jan 25 12:02:24 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes" crt="msvcrt"> - <importlibrary definition="desk.def" /> + <importlibrary definition="desk.spec" /> <include base="desk">.</include> <define name="_WIN32" /> <library>kernel32</library> Added: trunk/reactos/dll/cpl/desk/desk.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.spec?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.spec (added) +++ trunk/reactos/dll/cpl/desk/desk.spec [iso-8859-1] Sun Jan 25 12:02:24 2009 @@ -1,0 +1,3 @@ +@ stdcall CPlApplet(ptr long ptr ptr) +@ stdcall DisplayClassInstaller(long ptr ptr) +@ stdcall DisplaySaveSettings(ptr ptr) Propchange: trunk/reactos/dll/cpl/desk/desk.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] Sun Jan 25 12:02:24 2009 @@ -55,7 +55,7 @@ LogFont = ncm.lfMessageFont; LogFont.lfWeight = FW_BOLD; - _tcscpy(LogFont.lfFaceName, _T("MS Shell Dlg")); + wcscpy(LogFont.lfFaceName, L"MS Shell Dlg"); hdc = GetDC(NULL); FontSize = 12; Modified: trunk/reactos/dll/cpl/telephon/telephon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/telephon.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/telephon.c [iso-8859-1] Sun Jan 25 12:02:24 2009 @@ -13,7 +13,7 @@ #include "resource.h" -typedef UINT (CALLBACK* LPINTERNALCONFIG)(HWND, UINT, LPARAM, LPARAM); +typedef LONG (CALLBACK* LPINTERNALCONFIG)(HWND, UINT, LPARAM, LPARAM); /* Control Panel Callback */ LONG CALLBACK @@ -45,7 +45,11 @@ if (!hTapi32) return FALSE; lpInternalConfig = (LPINTERNALCONFIG) GetProcAddress(hTapi32, "internalConfig"); - if (!lpInternalConfig) return FALSE; + if (!lpInternalConfig) + { + FreeLibrary(hTapi32); + return FALSE; + } lpInternalConfig(hwndCPl, 0, 0, 0); FreeLibrary(hTapi32);

1 0

[hyperion] 39098: r39097 was a bad idea, reverting
by hyperion＠svn.reactos.org 25 Jan '09

25 Jan '09

Author: hyperion Date: Sun Jan 25 11:18:09 2009 New Revision: 39098 URL: http://svn.reactos.org/svn/reactos?rev=39098&view=rev Log: r39097 was a bad idea, reverting Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/rule.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Jan 25 11:18:09 2009 @@ -1060,7 +1060,7 @@ NULL ); Rule gasRule ( "$(source): ${$(module_name)_precondition}\n" "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_unique).o.d: $(source) $(buildfile) | $(intermediate_dir)\n" + "$(intermediate_path_unique).o.d: $(source) | $(intermediate_dir)\n" "\t$(ECHO_DEPENDS)\n" "\t${gcc} -x assembler-with-cpp -MF $@ -D__ASM__ $($(module_name)_CFLAGS) -M -MP -MT $@ $<\n" "-include $(intermediate_path_unique).o.d\n" @@ -1084,7 +1084,7 @@ "$(intermediate_dir)$(SEP)", NULL ); Rule windresRule ( "$(source): ${$(module_name)_precondition}\n" "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_unique).coff.d: $(source) $(buildfile) | $(intermediate_dir) $(TEMPORARY)\n" + "$(intermediate_path_unique).coff.d: $(source) | $(intermediate_dir) $(TEMPORARY)\n" "\t$(ECHO_DEPENDS)\n" "\t${gcc} -xc -M -MP -MT $@ -DRC_INVOKED ${$(module_name)_RCFLAGS} $(source) -MF $@\n" "-include $(intermediate_path_unique).coff.d\n" @@ -1106,7 +1106,7 @@ "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h", "$(intermediate_dir)$(SEP)", NULL ); Rule winebuildPDefRule ( "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_unique).spec.d: $(source) $(buildfile) | $(intermediate_dir)\n" + "$(intermediate_path_unique).spec.d: $(source) | $(intermediate_dir)\n" "\t$(ECHO_DEPENDS)\n" "\t${gcc} -xc -M -MP -MT $@ ${$(module_name)_RCFLAGS} $(source) -MF $@\n\n" "-include $(intermediate_path_unique).spec.d\n" @@ -1224,7 +1224,7 @@ "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) --dlldata-only --dlldata=$(source) $(bare_dependencies)\n" "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_noext).o.d: $(source) $(buildfile) | $(intermediate_dir)\n" + "$(intermediate_path_noext).o.d: $(source) | $(intermediate_dir)\n" "\t$(ECHO_DEPENDS)\n" "\t${gcc} -MF $@ $($(module_name)_CFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" "-include $(intermediate_path_noext).o.d\n" @@ -1241,7 +1241,7 @@ "$(intermediate_dir)$(SEP)", NULL ); Rule gccRule ( "$(source): ${$(module_name)_precondition}\n" "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_unique).o.d: $(source) $(buildfile) | $(intermediate_dir)\n" + "$(intermediate_path_unique).o.d: $(source) | $(intermediate_dir)\n" "\t$(ECHO_DEPENDS)\n" "\t${gcc} -MF $@ $($(module_name)_CFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" "-include $(intermediate_path_unique).o.d\n" @@ -1258,7 +1258,7 @@ "$(intermediate_path_unique).o", NULL ); Rule gppRule ( "$(source): ${$(module_name)_precondition}\n" "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_unique).o.d: $(source) $(buildfile) | $(intermediate_dir)\n" + "$(intermediate_path_unique).o.d: $(source) | $(intermediate_dir)\n" "\t$(ECHO_DEPENDS)\n" "\t${gpp} -MF $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" "-include $(intermediate_path_unique).o.d\n" @@ -1275,7 +1275,7 @@ "$(intermediate_path_unique).o", NULL ); Rule pchRule ( "$(source): ${$(module_name)_precondition}\n" "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_dir)$(SEP).gch_$(module_name)$(SEP)$(source_name).gch.d: $(source) $(buildfile) | $(intermediate_dir)\n" + "$(intermediate_dir)$(SEP).gch_$(module_name)$(SEP)$(source_name).gch.d: $(source) | $(intermediate_dir)\n" "\t$(ECHO_DEPENDS)\n" "\t$(pch_cc) -MF $@ $(pch_ccflags)$(compiler_flags) -x $(pch_language) -M -MP -MT $@ $<\n" "-include $(intermediate_dir)$(SEP).gch_$(module_name)$(SEP)$(source_name).gch.d\n" Modified: trunk/reactos/tools/rbuild/backend/mingw/rule.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rule.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rule.cpp [iso-8859-1] Sun Jan 25 11:18:09 2009 @@ -63,7 +63,6 @@ ReplaceVariable ( ret, "$(intermediate_path_noext)", ReplaceExtension ( backend->GetFullName ( FileLocation ( IntermediateDirectory, source->relative_path, source->name ) ), "" ) ); ReplaceVariable ( ret, "$(intermediate_path_unique)", ReplaceExtension ( backend->GetFullName ( FileLocation ( IntermediateDirectory, source->relative_path, source->name ) ), "" ) + "_" + module.name ); } - ReplaceVariable ( ret, "$(buildfile)", module.xmlbuildFile ); ReplaceVariable ( ret, "$(dependencies)", dep ); ReplaceVariable ( ret, "$(bare_dependencies)", additional_dependencies ); ReplaceVariable ( ret, "$(module_name)", module.name );

1 0

[hyperion] 39097: modified tools/rbuild/backend/mingw/modulehandler.cpp Make .d files used for full dependencies depend on the module's .rbuild file modified tools/rbuild/backend/mingw/rule.cpp New $(buildfile) variable that expands to the module's .rbuild file name
by hyperion＠svn.reactos.org 25 Jan '09

25 Jan '09

Author: hyperion Date: Sun Jan 25 10:53:56 2009 New Revision: 39097 URL: http://svn.reactos.org/svn/reactos?rev=39097&view=rev Log: modified tools/rbuild/backend/mingw/modulehandler.cpp Make .d files used for full dependencies depend on the module's .rbuild file modified tools/rbuild/backend/mingw/rule.cpp New $(buildfile) variable that expands to the module's .rbuild file name Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/rule.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Jan 25 10:53:56 2009 @@ -1060,7 +1060,7 @@ NULL ); Rule gasRule ( "$(source): ${$(module_name)_precondition}\n" "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_unique).o.d: $(source) | $(intermediate_dir)\n" + "$(intermediate_path_unique).o.d: $(source) $(buildfile) | $(intermediate_dir)\n" "\t$(ECHO_DEPENDS)\n" "\t${gcc} -x assembler-with-cpp -MF $@ -D__ASM__ $($(module_name)_CFLAGS) -M -MP -MT $@ $<\n" "-include $(intermediate_path_unique).o.d\n" @@ -1084,7 +1084,7 @@ "$(intermediate_dir)$(SEP)", NULL ); Rule windresRule ( "$(source): ${$(module_name)_precondition}\n" "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_unique).coff.d: $(source) | $(intermediate_dir) $(TEMPORARY)\n" + "$(intermediate_path_unique).coff.d: $(source) $(buildfile) | $(intermediate_dir) $(TEMPORARY)\n" "\t$(ECHO_DEPENDS)\n" "\t${gcc} -xc -M -MP -MT $@ -DRC_INVOKED ${$(module_name)_RCFLAGS} $(source) -MF $@\n" "-include $(intermediate_path_unique).coff.d\n" @@ -1106,7 +1106,7 @@ "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h", "$(intermediate_dir)$(SEP)", NULL ); Rule winebuildPDefRule ( "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_unique).spec.d: $(source) | $(intermediate_dir)\n" + "$(intermediate_path_unique).spec.d: $(source) $(buildfile) | $(intermediate_dir)\n" "\t$(ECHO_DEPENDS)\n" "\t${gcc} -xc -M -MP -MT $@ ${$(module_name)_RCFLAGS} $(source) -MF $@\n\n" "-include $(intermediate_path_unique).spec.d\n" @@ -1224,7 +1224,7 @@ "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) --dlldata-only --dlldata=$(source) $(bare_dependencies)\n" "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_noext).o.d: $(source) | $(intermediate_dir)\n" + "$(intermediate_path_noext).o.d: $(source) $(buildfile) | $(intermediate_dir)\n" "\t$(ECHO_DEPENDS)\n" "\t${gcc} -MF $@ $($(module_name)_CFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" "-include $(intermediate_path_noext).o.d\n" @@ -1241,7 +1241,7 @@ "$(intermediate_dir)$(SEP)", NULL ); Rule gccRule ( "$(source): ${$(module_name)_precondition}\n" "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_unique).o.d: $(source) | $(intermediate_dir)\n" + "$(intermediate_path_unique).o.d: $(source) $(buildfile) | $(intermediate_dir)\n" "\t$(ECHO_DEPENDS)\n" "\t${gcc} -MF $@ $($(module_name)_CFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" "-include $(intermediate_path_unique).o.d\n" @@ -1258,7 +1258,7 @@ "$(intermediate_path_unique).o", NULL ); Rule gppRule ( "$(source): ${$(module_name)_precondition}\n" "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_unique).o.d: $(source) | $(intermediate_dir)\n" + "$(intermediate_path_unique).o.d: $(source) $(buildfile) | $(intermediate_dir)\n" "\t$(ECHO_DEPENDS)\n" "\t${gpp} -MF $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" "-include $(intermediate_path_unique).o.d\n" @@ -1275,7 +1275,7 @@ "$(intermediate_path_unique).o", NULL ); Rule pchRule ( "$(source): ${$(module_name)_precondition}\n" "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_dir)$(SEP).gch_$(module_name)$(SEP)$(source_name).gch.d: $(source) | $(intermediate_dir)\n" + "$(intermediate_dir)$(SEP).gch_$(module_name)$(SEP)$(source_name).gch.d: $(source) $(buildfile) | $(intermediate_dir)\n" "\t$(ECHO_DEPENDS)\n" "\t$(pch_cc) -MF $@ $(pch_ccflags)$(compiler_flags) -x $(pch_language) -M -MP -MT $@ $<\n" "-include $(intermediate_dir)$(SEP).gch_$(module_name)$(SEP)$(source_name).gch.d\n" Modified: trunk/reactos/tools/rbuild/backend/mingw/rule.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rule.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rule.cpp [iso-8859-1] Sun Jan 25 10:53:56 2009 @@ -63,6 +63,7 @@ ReplaceVariable ( ret, "$(intermediate_path_noext)", ReplaceExtension ( backend->GetFullName ( FileLocation ( IntermediateDirectory, source->relative_path, source->name ) ), "" ) ); ReplaceVariable ( ret, "$(intermediate_path_unique)", ReplaceExtension ( backend->GetFullName ( FileLocation ( IntermediateDirectory, source->relative_path, source->name ) ), "" ) + "_" + module.name ); } + ReplaceVariable ( ret, "$(buildfile)", module.xmlbuildFile ); ReplaceVariable ( ret, "$(dependencies)", dep ); ReplaceVariable ( ret, "$(bare_dependencies)", additional_dependencies ); ReplaceVariable ( ret, "$(module_name)", module.name );

1 0

[hyperion] 39096: Amendment to r39093. Fixes build
by hyperion＠svn.reactos.org 25 Jan '09

25 Jan '09

Author: hyperion Date: Sun Jan 25 10:39:10 2009 New Revision: 39096 URL: http://svn.reactos.org/svn/reactos?rev=39096&view=rev Log: Amendment to r39093. Fixes build Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Jan 25 10:39:10 2009 @@ -1049,7 +1049,7 @@ module.pch->file->name + ".gch" ); } -Rule arRule1 ( "$(intermediate_path_noext).a: $($(module_name)_OBJS) $(dependencies) | $(intermediate_dir)\n", +Rule arRule1 ( "$(intermediate_path_noext).a: $($(module_name)_OBJS) $(dependencies) | $(intermediate_dir)\n", "$(intermediate_path_noext).a", "$(intermediate_dir)$(SEP)", NULL ); Rule arRule2 ( "\t$(ECHO_AR)\n" @@ -1065,19 +1065,19 @@ "\t${gcc} -x assembler-with-cpp -MF $@ -D__ASM__ $($(module_name)_CFLAGS) -M -MP -MT $@ $<\n" "-include $(intermediate_path_unique).o.d\n" "endif\n" - "$(intermediate_path_unique).o: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).o.d)$(dependencies) | $(intermediate_dir)\n" + "$(intermediate_path_unique).o: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).o.d) $(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_GAS)\n" "\t${gcc} -x assembler-with-cpp -o $@ -D__ASM__ $($(module_name)_CFLAGS) -c $<\n", "$(intermediate_path_unique).o", "$(intermediate_path_unique).o.d", "$(intermediate_dir)$(SEP)", NULL ); Rule bootRule ( "$(source): ${$(module_name)_precondition}\n" - "$(module_output): $(source)$(dependencies) | $(OUTPUT)$(SEP)$(source_dir)\n" + "$(module_output): $(source) $(dependencies) | $(OUTPUT)$(SEP)$(source_dir)\n" "\t$(ECHO_NASM)\n" "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAGS)\n", "$(OUTPUT)$(SEP)$(source_dir)$(SEP)", NULL ); Rule nasmRule ( "$(source): ${$(module_name)_precondition}\n" - "$(intermediate_path_unique).o: $(source)$(dependencies) | $(intermediate_dir)\n" + "$(intermediate_path_unique).o: $(source) $(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_NASM)\n" "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAGS)\n", "$(intermediate_path_unique).o", @@ -1089,7 +1089,7 @@ "\t${gcc} -xc -M -MP -MT $@ -DRC_INVOKED ${$(module_name)_RCFLAGS} $(source) -MF $@\n" "-include $(intermediate_path_unique).coff.d\n" "endif\n" - "$(intermediate_path_unique).coff: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).coff.d)$(dependencies) $(WRC_TARGET) | $(intermediate_dir) $(TEMPORARY)\n" + "$(intermediate_path_unique).coff: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).coff.d) $(dependencies) $(WRC_TARGET) | $(intermediate_dir) $(TEMPORARY)\n" "\t$(ECHO_WRC)\n" "\t${gcc} -xc -E -DRC_INVOKED ${$(module_name)_RCFLAGS} $(source) > $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp\n" "\t$(Q)$(WRC_TARGET) ${$(module_name)_RCFLAGS} $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).res.tmp\n" @@ -1111,7 +1111,7 @@ "\t${gcc} -xc -M -MP -MT $@ ${$(module_name)_RCFLAGS} $(source) -MF $@\n\n" "-include $(intermediate_path_unique).spec.d\n" "endif\n" - "$(intermediate_path_unique).spec: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).spec.d)$(dependencies) | $(intermediate_dir)\n" + "$(intermediate_path_unique).spec: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).spec.d) $(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CPP)\n" "\t${gcc} -xc -E ${$(module_name)_RCFLAGS} $(source) > $(intermediate_path_unique).spec\n\n" "$(intermediate_path_unique).auto.def: $(intermediate_path_unique).spec $(WINEBUILD_TARGET) | $(intermediate_dir)\n" @@ -1138,7 +1138,7 @@ "$(intermediate_path_unique).stubs.o", "$(intermediate_path_unique).stubs.o.d", "$(intermediate_dir)$(SEP)", NULL ); -Rule winebuildDefRule ( "$(intermediate_path_unique).auto.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(intermediate_dir)\n" +Rule winebuildDefRule ( "$(intermediate_path_unique).auto.def: $(source) $(dependencies) $(WINEBUILD_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(intermediate_path_unique).auto.def --def -E $(source) --filename $(module_dllname)\n\n", "$(intermediate_path_noext).spec", @@ -1153,7 +1153,7 @@ "\t${gcc} -MF $@ $($(module_name)_CFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" "-include $(intermediate_path_unique).stubs.o.d\n" "endif\n" - "$(intermediate_path_unique).stubs.o: $(intermediate_path_unique).stubs.c$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).stubs.o.d)$(dependencies) | $(intermediate_dir)\n" + "$(intermediate_path_unique).stubs.o: $(intermediate_path_unique).stubs.c$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).stubs.o.d) $(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(intermediate_path_unique).stubs.c", @@ -1161,13 +1161,13 @@ "$(intermediate_path_unique).stubs.o.d", "$(intermediate_dir)$(SEP)", NULL ); Rule widlHeaderRule ( "$(source): ${$(module_name)_precondition}\n" - "$(intermediate_path_noext).h: $(source)$(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" + "$(intermediate_path_noext).h: $(source) $(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(intermediate_path_noext).h $(source)\n", "$(intermediate_path_noext).h", "$(intermediate_dir)$(SEP)", NULL ); Rule widlServerRule ( "$(source): ${$(module_name)_precondition}\n" - "$(intermediate_path_noext)_s.c $(intermediate_path_noext)_s.h: $(source)$(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" + "$(intermediate_path_noext)_s.c $(intermediate_path_noext)_s.h: $(source) $(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(intermediate_path_noext)_s.h -s -S $(intermediate_path_noext)_s.c $(source)\n" "ifeq ($(ROS_BUILDDEPS),full)\n" @@ -1176,7 +1176,7 @@ "\t${gcc} -MF $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -M -MP -MT $@ $<\n" "-include $(intermediate_path_noext)_s.o.d\n" "endif\n" - "$(intermediate_path_noext)_s.o: $(intermediate_path_noext)_s.c $(intermediate_path_noext)_s.h$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_noext)_s.o.d)$(dependencies) | $(intermediate_dir)\n" + "$(intermediate_path_noext)_s.o: $(intermediate_path_noext)_s.c $(intermediate_path_noext)_s.h$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_noext)_s.o.d) $(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", "$(intermediate_path_noext)_s.h", @@ -1185,7 +1185,7 @@ "$(intermediate_path_noext)_s.o.d", "$(intermediate_dir)$(SEP)", NULL ); Rule widlClientRule ( "$(source): ${$(module_name)_precondition}\n" - "$(intermediate_path_noext)_c.c $(intermediate_path_noext)_c.h: $(source)$(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" + "$(intermediate_path_noext)_c.c $(intermediate_path_noext)_c.h: $(source) $(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(intermediate_path_noext)_c.h -c -C $(intermediate_path_noext)_c.c $(source)\n" "ifeq ($(ROS_BUILDDEPS),full)\n" @@ -1194,7 +1194,7 @@ "\t${gcc} -MF $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -M -MP -MT $@ $<\n" "-include $(intermediate_path_noext)_c.o.d\n" "endif\n" - "$(intermediate_path_noext)_c.o: $(intermediate_path_noext)_c.c $(intermediate_path_noext)_c.h$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_noext)_c.o.d)$(dependencies) | $(intermediate_dir)\n" + "$(intermediate_path_noext)_c.o: $(intermediate_path_noext)_c.c $(intermediate_path_noext)_c.h$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_noext)_c.o.d) $(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", "$(intermediate_path_noext)_c.h", @@ -1203,7 +1203,7 @@ "$(intermediate_path_noext)_c.o.d", "$(intermediate_dir)$(SEP)", NULL ); Rule widlProxyRule ( "$(source): ${$(module_name)_precondition}\n" - "$(intermediate_path_noext)_p.c $(intermediate_path_noext)_p.h: $(source)$(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" + "$(intermediate_path_noext)_p.c $(intermediate_path_noext)_p.h: $(source) $(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(intermediate_path_noext)_p.h -p -P $(intermediate_path_noext)_p.c $(source)\n" "ifeq ($(ROS_BUILDDEPS),full)\n" @@ -1212,7 +1212,7 @@ "\t${gcc} -MF $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -M -MP -MT $@ $<\n" "-include $(intermediate_path_noext)_p.o.d\n" "endif\n" - "$(intermediate_path_noext)_p.o: $(intermediate_path_noext)_p.c $(intermediate_path_noext)_p.h$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_noext)_p.o.d)$(dependencies) | $(intermediate_dir)\n" + "$(intermediate_path_noext)_p.o: $(intermediate_path_noext)_p.c $(intermediate_path_noext)_p.h$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_noext)_p.o.d) $(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", "$(intermediate_path_noext)_p.h", @@ -1220,7 +1220,7 @@ "$(intermediate_path_noext)_p.o", "$(intermediate_path_noext)_p.o.d", "$(intermediate_dir)$(SEP)", NULL ); -Rule widlDlldataRule ( "$(source): $(dependencies) ${$(module_name)_precondition} $(WIDL_TARGET) | $(intermediate_dir)\n" +Rule widlDlldataRule ( "$(source): $(dependencies) ${$(module_name)_precondition} $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) --dlldata-only --dlldata=$(source) $(bare_dependencies)\n" "ifeq ($(ROS_BUILDDEPS),full)\n" @@ -1229,13 +1229,13 @@ "\t${gcc} -MF $@ $($(module_name)_CFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" "-include $(intermediate_path_noext).o.d\n" "endif\n" - "$(intermediate_path_noext).o: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_noext).o.d)$(dependencies) | $(intermediate_dir)\n" + "$(intermediate_path_noext).o: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_noext).o.d) $(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(intermediate_path_noext).o", "$(intermediate_path_noext).o.d", NULL ); Rule widlTlbRule ( "$(source): ${$(module_name)_precondition}\n" - "$(intermediate_dir)$(SEP)$(module_name).tlb: $(source)$(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" + "$(intermediate_dir)$(SEP)$(module_name).tlb: $(source) $(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(intermediate_path_noext).tlb $(source)\n", "$(intermediate_dir)$(SEP)", NULL ); @@ -1246,13 +1246,13 @@ "\t${gcc} -MF $@ $($(module_name)_CFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" "-include $(intermediate_path_unique).o.d\n" "endif\n" - "$(intermediate_path_unique).o: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).o.d)$(dependencies) | $(intermediate_dir)\n" + "$(intermediate_path_unique).o: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).o.d) $(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(intermediate_path_unique).o", "$(intermediate_path_unique).o.d", NULL ); Rule gccHostRule ( "$(source): ${$(module_name)_precondition}\n" - "$(intermediate_path_unique).o: $(source)$(dependencies) | $(intermediate_dir)\n" + "$(intermediate_path_unique).o: $(source) $(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_HOSTCC)\n" "\t${host_gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(intermediate_path_unique).o", NULL ); @@ -1263,13 +1263,13 @@ "\t${gpp} -MF $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" "-include $(intermediate_path_unique).o.d\n" "endif\n" - "$(intermediate_path_unique).o: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).o.d)$(dependencies) | $(intermediate_dir)\n" + "$(intermediate_path_unique).o: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).o.d) $(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" "\t${gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", "$(intermediate_path_unique).o", "$(intermediate_path_unique).o.d", NULL ); Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n" - "$(intermediate_path_unique).o: $(source)$(dependencies) | $(intermediate_dir)\n" + "$(intermediate_path_unique).o: $(source) $(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_HOSTCC)\n" "\t${host_gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", "$(intermediate_path_unique).o", NULL ); @@ -1280,7 +1280,7 @@ "\t$(pch_cc) -MF $@ $(pch_ccflags)$(compiler_flags) -x $(pch_language) -M -MP -MT $@ $<\n" "-include $(intermediate_dir)$(SEP).gch_$(module_name)$(SEP)$(source_name).gch.d\n" "endif\n" - "$(intermediate_dir)$(SEP).gch_$(module_name)$(SEP)$(source_name).gch: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_dir)$(SEP).gch_$(module_name)$(SEP)$(source_name).gch.d)$(dependencies) | $(intermediate_dir)$(SEP).gch_$(module_name)\n" + "$(intermediate_dir)$(SEP).gch_$(module_name)$(SEP)$(source_name).gch: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_dir)$(SEP).gch_$(module_name)$(SEP)$(source_name).gch.d) $(dependencies) | $(intermediate_dir)$(SEP).gch_$(module_name)\n" "\t$(ECHO_PCH)\n" "\t$(pch_cc) -o $@ $(pch_ccflags)$(compiler_flags) -x $(pch_language) -c $<\n", "$(intermediate_dir)$(SEP).gch_$(module_name)$(SEP)$(source_name).gch",

1 0

[jmorlan] 39095: split, splitspace: Allow quotation marks anywhere in an argument, not just the start and end. (Bug 4054)
by jmorlan＠svn.reactos.org 25 Jan '09

25 Jan '09

Author: jmorlan Date: Sun Jan 25 10:39:06 2009 New Revision: 39095 URL: http://svn.reactos.org/svn/reactos?rev=39095&view=rev Log: split, splitspace: Allow quotation marks anywhere in an argument, not just the start and end. (Bug 4054) Modified: trunk/reactos/base/shell/cmd/misc.c Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] Sun Jan 25 10:39:06 2009 @@ -295,7 +295,6 @@ LPTSTR q; INT ac; INT len; - BOOL bQuoted = FALSE; arg = cmd_alloc (sizeof (LPTSTR)); if (!arg) @@ -305,17 +304,12 @@ ac = 0; while (*s) { + BOOL bQuoted = FALSE; + /* skip leading spaces */ while (*s && (_istspace (*s) || _istcntrl (*s))) ++s; - /* if quote (") then set bQuoted */ - if (*s == _T('\"')) - { - ++s; - bQuoted = TRUE; - } - start = s; /* the first character can be '/' */ @@ -323,15 +317,11 @@ ++s; /* skip to next word delimiter or start of next option */ - if (bQuoted) - { - while (_istprint (*s) && (*s != _T('\"')) && (*s != _T('/'))) - ++s; - } - else - { - while (_istprint (*s) && !_istspace (*s) && (*s != _T('/'))) - ++s; + while (_istprint(*s) && (bQuoted || (!_istspace(*s) && *s != _T('/')))) + { + /* if quote (") then set bQuoted */ + bQuoted ^= (*s == _T('\"')); + ++s; } /* a word was found */ @@ -344,6 +334,7 @@ } memcpy (q, start, len * sizeof (TCHAR)); q[len] = _T('\0'); + StripQuotes(q); if (expand_wildcards && _T('/') != *start && (NULL != _tcschr(q, _T('*')) || NULL != _tcschr(q, _T('?')))) { @@ -365,19 +356,6 @@ } cmd_free (q); } - - /* adjust string pointer if quoted (") */ - if (bQuoted) - { - /* Check to make sure if there is no ending " - * we dont run over the null char */ - if(*s == _T('\0')) - { - break; - } - ++s; - bQuoted = FALSE; - } } *args = ac; @@ -396,7 +374,6 @@ LPTSTR q; INT ac; INT len; - BOOL bQuoted = FALSE; arg = cmd_alloc (sizeof (LPTSTR)); if (!arg) @@ -406,29 +383,20 @@ ac = 0; while (*s) { + BOOL bQuoted = FALSE; + /* skip leading spaces */ while (*s && (_istspace (*s) || _istcntrl (*s))) ++s; - /* if quote (") then set bQuoted */ - if (*s == _T('\"')) - { + start = s; + + /* skip to next word delimiter or start of next option */ + while (_istprint(*s) && (bQuoted || !_istspace(*s))) + { + /* if quote (") then set bQuoted */ + bQuoted ^= (*s == _T('\"')); ++s; - bQuoted = TRUE; - } - - start = s; - - /* skip to next word delimiter or start of next option */ - if (bQuoted) - { - while (_istprint (*s) && (*s != _T('\"'))) - ++s; - } - else - { - while (_istprint (*s) && !_istspace (*s)) - ++s; } /* a word was found */ @@ -441,6 +409,7 @@ } memcpy (q, start, len * sizeof (TCHAR)); q[len] = _T('\0'); + StripQuotes(q); if (! add_entry(&ac, &arg, q)) { cmd_free (q); @@ -448,19 +417,6 @@ return NULL; } cmd_free (q); - } - - /* adjust string pointer if quoted (") */ - if (bQuoted) - { - /* Check to make sure if there is no ending " - * we dont run over the null char */ - if(*s == _T('\0')) - { - break; - } - ++s; - bQuoted = FALSE; } }

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