Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hyperion] 42470: Use include path for typeof.h that only depends on global include paths (typeof.h -> wine/typeof.h)
by hyperion＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: hyperion Date: Fri Aug 7 17:35:41 2009 New Revision: 42470 URL: http://svn.reactos.org/svn/reactos?rev=42470&view=rev Log: Use include path for typeof.h that only depends on global include paths (typeof.h -> wine/typeof.h) Modified: trunk/reactos/ReactOS-generic.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Fri Aug 7 17:35:41 2009 @@ -99,7 +99,7 @@ <compilerflag>/Zl</compilerflag> <compilerflag>/Zi</compilerflag> <compilerflag>/W1</compilerflag> - <compilerflag>/FItypeof.h</compilerflag> + <compilerflag>/FIwine/typeof.h</compilerflag> </group> <group compilerset="gcc">

1 0

[hyperion] 42469: added include/reactos/wine/typeof.h Simulate typeof operator for the Wine code that requires it modified ReactOS-generic.rbuild Force-include typeof.h when compiling with Visual C++
by hyperion＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: hyperion Date: Fri Aug 7 17:25:03 2009 New Revision: 42469 URL: http://svn.reactos.org/svn/reactos?rev=42469&view=rev Log: added include/reactos/wine/typeof.h Simulate typeof operator for the Wine code that requires it modified ReactOS-generic.rbuild Force-include typeof.h when compiling with Visual C++ Added: trunk/reactos/include/reactos/wine/typeof.h (with props) Modified: trunk/reactos/ReactOS-generic.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Fri Aug 7 17:25:03 2009 @@ -99,6 +99,7 @@ <compilerflag>/Zl</compilerflag> <compilerflag>/Zi</compilerflag> <compilerflag>/W1</compilerflag> + <compilerflag>/FItypeof.h</compilerflag> </group> <group compilerset="gcc"> Added: trunk/reactos/include/reactos/wine/typeof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/typeo… ============================================================================== --- trunk/reactos/include/reactos/wine/typeof.h (added) +++ trunk/reactos/include/reactos/wine/typeof.h [iso-8859-1] Fri Aug 7 17:25:03 2009 @@ -1,0 +1,56 @@ +#define typeof(X_) __typeof_ ## X_ + +#ifdef _WIN64 +#define __typeof_intptr long long +#define __typeof_longptr long long +#else +#define __typeof_intptr int +#define __typeof_longptr long +#endif + +#ifdef __cplusplus +#define __typeof_size size_t +#define __typeof_wchar wchar_t +#else +#define __typeof_size __typeof_intptr +#define __typeof_wchar unsigned short +#endif + +typedef struct IWineD3D * (__stdcall typeof(WineDirect3DCreate))(unsigned int, struct IUnknown *); +typedef struct IWineD3DClipper * (__stdcall typeof(WineDirect3DCreateClipper))(struct IUnknown *); +typedef int (__stdcall typeof(ImeInquire))(struct _tagIMEINFO *, __typeof_wchar *, const __typeof_wchar *); +typedef int (__stdcall typeof(ImeConfigure))(void *, void *, unsigned int, void *); +typedef int (__stdcall typeof(ImeDestroy))(unsigned int); +typedef __typeof_longptr (__stdcall typeof(ImeEscape))(void *, unsigned int, void *); +typedef int (__stdcall typeof(ImeSelect))(void *, int); +typedef int (__stdcall typeof(ImeSetActiveContext))(void *, int); +typedef unsigned int (__stdcall typeof(ImeToAsciiEx))(unsigned int, unsigned int, unsigned char *, unsigned int *, unsigned int, void *); +typedef int (__stdcall typeof(NotifyIME))(void *, unsigned int, unsigned int, unsigned int); +typedef int (__stdcall typeof(ImeRegisterWord))(const __typeof_wchar *, unsigned int, const __typeof_wchar *); +typedef int (__stdcall typeof(ImeUnregisterWord))(const __typeof_wchar *, unsigned int, const __typeof_wchar *); +typedef unsigned int (__stdcall typeof(ImeGetRegisterWordStyle))(unsigned int, struct tagSTYLEBUFW *); +typedef unsigned int (__stdcall typeof(ImeEnumRegisterWord))(int (__stdcall *)(const __typeof_wchar *, unsigned int, const __typeof_wchar *, void *), const __typeof_wchar *, unsigned int, const __typeof_wchar *, void *); +typedef int (__stdcall typeof(ImeSetCompositionString))(void *, unsigned int, const void *, unsigned int, const void *, unsigned int); +typedef unsigned int (__stdcall typeof(ImeConversionList))(void *, const __typeof_wchar *, struct tagCANDIDATELIST *, unsigned int, unsigned int); +typedef int (__stdcall typeof(ImeProcessKey))(void *, unsigned int, __typeof_longptr, unsigned char *); +typedef unsigned int (__stdcall typeof(ImeGetRegisterWordStyle))(unsigned int, struct tagSTYLEBUFW *); +typedef unsigned int (__stdcall typeof(ImeGetImeMenuItems))(void *, unsigned int, unsigned int, struct tagIMEMENUITEMINFOW *, struct tagIMEMENUITEMINFOW *, unsigned int); +typedef struct _xmlDoc * (__cdecl typeof(xsltApplyStylesheet))(struct _xsltStylesheet *, struct _xmlDoc *, const char **); +typedef void (__cdecl typeof(xsltCleanupGlobals))(void); +typedef void (__cdecl typeof(xsltFreeStylesheet))(struct _xsltStylesheet *); +typedef struct _xsltStylesheet * (__cdecl typeof(xsltParseStylesheetDoc))(struct _xmlDoc *); +typedef struct jpeg_error_mgr * (__cdecl typeof(jpeg_std_error))(struct jpeg_error_mgr *); +typedef void (__cdecl typeof(jpeg_CreateDecompress))(struct jpeg_decompress_struct *, int, __typeof_size); +typedef int (__cdecl typeof(jpeg_read_header))(struct jpeg_decompress_struct *, int); +typedef int (__cdecl typeof(jpeg_start_decompress))(struct jpeg_decompress_struct *); +typedef unsigned int (__cdecl typeof(jpeg_read_scanlines))(struct jpeg_decompress_struct *, unsigned char **, unsigned int); +typedef int (__cdecl typeof(jpeg_finish_decompress))(struct jpeg_decompress_struct *); +typedef void (__cdecl typeof(jpeg_destroy_decompress))(struct jpeg_decompress_struct *); + +#undef __typeof_intptr +#undef __typeof_longptr +#undef __typeof_wchar +#undef __typeof_size + +/* EOF */ + Propchange: trunk/reactos/include/reactos/wine/typeof.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 42468: - We associate the MDL with the IRP later (in TdiBuildSend, TdiBuildReceive, etc)
by cgutman＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: cgutman Date: Fri Aug 7 17:22:24 2009 New Revision: 42468 URL: http://svn.reactos.org/svn/reactos?rev=42468&view=rev Log: - We associate the MDL with the IRP later (in TdiBuildSend, TdiBuildReceive, etc) Modified: trunk/reactos/drivers/network/afd/afd/tdi.c Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Aug 7 17:22:24 2009 @@ -830,7 +830,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Use IRP */ + NULL); /* Don't use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoCompleteRequest(*Irp, IO_NO_INCREMENT); @@ -911,7 +911,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Use IRP */ + NULL); /* Don't use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoCompleteRequest(*Irp, IO_NO_INCREMENT); @@ -1011,7 +1011,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Use IRP */ + NULL); /* Don't use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoCompleteRequest(*Irp, IO_NO_INCREMENT); @@ -1109,7 +1109,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Use IRP */ + NULL); /* Don't use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n"));

1 0

[cgutman] 42467: - Call IoCompleteRequest to free IRPs created by IoBuildDeviceIoControlRequest - Fixes bug 4770
by cgutman＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: cgutman Date: Fri Aug 7 17:00:42 2009 New Revision: 42467 URL: http://svn.reactos.org/svn/reactos?rev=42467&view=rev Log: - Call IoCompleteRequest to free IRPs created by IoBuildDeviceIoControlRequest - Fixes bug 4770 Modified: trunk/reactos/drivers/network/afd/afd/tdi.c Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Aug 7 17:00:42 2009 @@ -833,7 +833,7 @@ *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; return STATUS_INSUFFICIENT_RESOURCES; } @@ -843,7 +843,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH2_END; @@ -914,7 +914,7 @@ *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; return STATUS_INSUFFICIENT_RESOURCES; } @@ -926,7 +926,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH2_END; @@ -1014,7 +1014,7 @@ *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; return STATUS_INSUFFICIENT_RESOURCES; } @@ -1024,7 +1024,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH2_END; @@ -1113,7 +1113,7 @@ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; return STATUS_INSUFFICIENT_RESOURCES; } @@ -1123,7 +1123,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); - IoFreeIrp(*Irp); + IoCompleteRequest(*Irp, IO_NO_INCREMENT); *Irp = NULL; _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH2_END;

1 0

[cwittich] 42466: include windef.h to get the definitions for BYTE and DWORD req. by bdatypes.h
by cwittich＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: cwittich Date: Fri Aug 7 16:09:36 2009 New Revision: 42466 URL: http://svn.reactos.org/svn/reactos?rev=42466&view=rev Log: include windef.h to get the definitions for BYTE and DWORD req. by bdatypes.h Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] Fri Aug 7 16:09:36 2009 @@ -1,11 +1,7 @@ #include <ntddk.h> +#include <windef.h> #include <ks.h> - -/* FIXME */ -typedef unsigned long DWORD; -typedef UCHAR BYTE; - #include <bdatypes.h> #include <bdamedia.h> #include <bdasup.h>

1 0

[cwittich] 42465: stub bdasup
by cwittich＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: cwittich Date: Fri Aug 7 15:23:35 2009 New Revision: 42465 URL: http://svn.reactos.org/svn/reactos?rev=42465&view=rev Log: stub bdasup Added: trunk/reactos/drivers/multimedia/bdasup/ (with props) trunk/reactos/drivers/multimedia/bdasup/bdasup.c (with props) trunk/reactos/drivers/multimedia/bdasup/bdasup.rbuild (with props) trunk/reactos/drivers/multimedia/bdasup/bdasup.spec (with props) trunk/reactos/include/dxsdk/bdamedia.h (with props) Modified: trunk/reactos/drivers/multimedia/directory.rbuild trunk/reactos/include/ddk/bdasup.h Propchange: trunk/reactos/drivers/multimedia/bdasup/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Aug 7 15:23:35 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/drivers/multimedia/bdasup/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/drivers/multimedia/bdasup/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/drivers/multimedia/bdasup/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/drivers/multimedia/bdasup/bdasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.c (added) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] Fri Aug 7 15:23:35 2009 @@ -1,0 +1,223 @@ + +#include <ntddk.h> +#include <ks.h> + +/* FIXME */ +typedef unsigned long DWORD; +typedef UCHAR BYTE; + +#include <bdatypes.h> +#include <bdamedia.h> +#include <bdasup.h> + +#define NDEBUG +#include <debug.h> + +STDMETHODIMP_(NTSTATUS) BdaCheckChanges(IN PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaCommitChanges(IN PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaCreateFilterFactory( + IN PKSDEVICE pKSDevice, + IN const KSFILTER_DESCRIPTOR *pFilterDescriptor, + IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaCreateFilterFactoryEx( + IN PKSDEVICE pKSDevice, + IN const KSFILTER_DESCRIPTOR *pFilterDescriptor, + IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate, + OUT PKSFILTERFACTORY *ppKSFilterFactory) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaCreatePin( + IN PKSFILTER pKSFilter, + IN ULONG ulPinType, + OUT ULONG *pulPinId) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaCreateTopology( + IN PKSFILTER pKSFilter, + IN ULONG InputPinId, + IN ULONG OutputPinId) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaDeletePin( + IN PKSFILTER pKSFilter, + IN ULONG *pulPinId) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaFilterFactoryUpdateCacheData( + IN PKSFILTERFACTORY pFilterFactory, + IN const KSFILTER_DESCRIPTOR *pFilterDescriptor OPTIONAL) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaGetChangeState( + IN PIRP Irp, + OUT BDA_CHANGE_STATE *pChangeState) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaInitFilter( + IN PKSFILTER pKSFilter, + IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaMethodCreatePin( + IN PIRP Irp, + IN KSMETHOD *pKSMethod, + OUT ULONG *pulPinFactoryID) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaMethodCreateTopology( + IN PIRP Irp, + IN KSMETHOD *pKSMethod, + OPTIONAL PVOID pvIgnored) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaMethodDeletePin( + IN PIRP Irp, + IN KSMETHOD *pKSMethod, + OPTIONAL PVOID pvIgnored) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyGetControllingPinId( + IN PIRP Irp, + IN KSP_BDA_NODE_PIN *pProperty, + OUT ULONG *pulControllingPinId) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyGetPinControl( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT ULONG *pulProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeDescriptors( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeEvents( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeMethods( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeProperties( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeTypes( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT ULONG *pulProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyPinTypes( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT ULONG *pulProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyTemplateConnections( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT KSTOPOLOGY_CONNECTION *pConnectionProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaStartChanges(IN PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaUninitFilter(IN PKSFILTER pKSFilter) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaValidateNodeProperty( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} Propchange: trunk/reactos/drivers/multimedia/bdasup/bdasup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/multimedia/bdasup/bdasup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.rbuild (added) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.rbuild [iso-8859-1] Fri Aug 7 15:23:35 2009 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="bdasup" type="kernelmodedriver" installbase="system32/drivers" installname="bdasup.sys" entrypoint="0"> + <importlibrary definition="bdasup.spec" /> + <library>ntoskrnl</library> + <library>ks</library> + <library>pseh</library> + <file>bdasup.c</file> +</module> Propchange: trunk/reactos/drivers/multimedia/bdasup/bdasup.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/multimedia/bdasup/bdasup.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.spec (added) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.spec [iso-8859-1] Fri Aug 7 15:23:35 2009 @@ -1,0 +1,25 @@ +@ stdcall BdaCheckChanges(ptr) +@ stdcall BdaCommitChanges(ptr) +@ stdcall BdaCreateFilterFactory(ptr ptr ptr) +@ stdcall BdaCreateFilterFactoryEx(ptr ptr ptr ptr) +@ stdcall BdaCreatePin(ptr long ptr) +@ stdcall BdaCreateTopology(ptr long long) +@ stdcall BdaDeletePin(ptr long) +@ stdcall BdaFilterFactoryUpdateCacheData(ptr ptr) +@ stdcall BdaGetChangeState(ptr ptr) +@ stdcall BdaInitFilter(ptr ptr) +@ stdcall BdaMethodCreatePin(ptr ptr ptr) +@ stdcall BdaMethodCreateTopology(ptr ptr ptr) +@ stdcall BdaMethodDeletePin(ptr ptr ptr) +@ stdcall BdaPropertyGetControllingPinId(ptr ptr ptr) +@ stdcall BdaPropertyGetPinControl(ptr ptr ptr) +@ stdcall BdaPropertyNodeDescriptors(ptr ptr ptr) +@ stdcall BdaPropertyNodeEvents(ptr ptr ptr) +@ stdcall BdaPropertyNodeMethods(ptr ptr ptr) +@ stdcall BdaPropertyNodeProperties(ptr ptr ptr) +@ stdcall BdaPropertyNodeTypes(ptr ptr ptr) +@ stdcall BdaPropertyPinTypes(ptr ptr ptr) +@ stdcall BdaPropertyTemplateConnections(ptr ptr ptr) +@ stdcall BdaStartChanges(ptr) +@ stdcall BdaUninitFilter(ptr) +@ stdcall BdaValidateNodeProperty(ptr ptr) Propchange: trunk/reactos/drivers/multimedia/bdasup/bdasup.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/multimedia/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/directo… ============================================================================== --- trunk/reactos/drivers/multimedia/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/directory.rbuild [iso-8859-1] Fri Aug 7 15:23:35 2009 @@ -4,4 +4,7 @@ <directory name="audio"> <xi:include href="audio/directory.rbuild" /> </directory> + <directory name="bdasup"> + <xi:include href="bdasup/bdasup.rbuild" /> + </directory> </group> Modified: trunk/reactos/include/ddk/bdasup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/bdasup.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/bdasup.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/bdasup.h [iso-8859-1] Fri Aug 7 15:23:35 2009 @@ -137,4 +137,4 @@ #if defined(__cplusplus) } -#endif +#endif Added: trunk/reactos/include/dxsdk/bdamedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdamedia.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdamedia.h (added) +++ trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] Fri Aug 7 15:23:35 2009 @@ -1,0 +1,8 @@ + + +typedef struct _KSP_BDA_NODE_PIN { + KSPROPERTY Property; + ULONG ulNodeType; + ULONG ulInputPinId; + ULONG ulOutputPinId; +} KSP_BDA_NODE_PIN, *PKSP_BDA_NODE_PIN; Propchange: trunk/reactos/include/dxsdk/bdamedia.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gschneider] 42464: IntChangeDisplaySettings: set last error before leaving the function NtUserChangeDisplaySettings: copy devmode only if passed, use SEH with buffer probing over CopyFromCaller
by gschneider＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: gschneider Date: Fri Aug 7 14:10:59 2009 New Revision: 42464 URL: http://svn.reactos.org/svn/reactos?rev=42464&view=rev Log: IntChangeDisplaySettings: set last error before leaving the function NtUserChangeDisplaySettings: copy devmode only if passed, use SEH with buffer probing over CopyFromCaller Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/objects/device.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Fri Aug 7 14:10:59 2009 @@ -121,7 +121,8 @@ DWORD dwflags, LPVOID lParam) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + LPDEVMODEW lpSafeDevMode = NULL; DEVMODEW DevMode; PUNICODE_STRING pSafeDeviceName = NULL; UNICODE_STRING SafeDeviceName; @@ -147,23 +148,32 @@ } /* Copy devmode */ - Status = MmCopyFromCaller(&DevMode.dmSize, &lpDevMode->dmSize, sizeof (DevMode.dmSize)); - if (!NT_SUCCESS(Status)) + if (lpDevMode != NULL) { - SetLastNtError(Status); - return DISP_CHANGE_BADPARAM; - } - DevMode.dmSize = min(sizeof (DevMode), DevMode.dmSize); - Status = MmCopyFromCaller(&DevMode, lpDevMode, DevMode.dmSize); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return DISP_CHANGE_BADPARAM; - } - if (DevMode.dmDriverExtra > 0) - { - DbgPrint("(%s:%i) WIN32K: %s lpDevMode->dmDriverExtra is IGNORED!\n", __FILE__, __LINE__, __FUNCTION__); - DevMode.dmDriverExtra = 0; + _SEH2_TRY + { + ProbeForRead(lpDevMode, sizeof(DevMode.dmSize), 1); + DevMode.dmSize = lpDevMode->dmSize; + DevMode.dmSize = min(sizeof(DevMode), DevMode.dmSize); + ProbeForRead(lpDevMode, DevMode.dmSize, 1); + RtlCopyMemory(&DevMode, lpDevMode, DevMode.dmSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return DISP_CHANGE_BADPARAM; + } + if (DevMode.dmDriverExtra > 0) + { + DPRINT1("lpDevMode->dmDriverExtra is IGNORED!\n"); + DevMode.dmDriverExtra = 0; + } + lpSafeDevMode = &DevMode; } /* Copy the device name */ @@ -179,7 +189,7 @@ } /* Call internal function */ - Ret = IntChangeDisplaySettings(pSafeDeviceName, &DevMode, dwflags, lParam); + Ret = IntChangeDisplaySettings(pSafeDeviceName, lpSafeDevMode, dwflags, lParam); if (pSafeDeviceName != NULL) RtlFreeUnicodeString(pSafeDeviceName); Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Fri Aug 7 14:10:59 2009 @@ -1229,8 +1229,8 @@ { /* Dynamically change graphics mode */ DPRINT1("flag 0 UNIMPLEMENTED\n"); + SetLastWin32Error(ERROR_CALL_NOT_IMPLEMENTED); return DISP_CHANGE_FAILED; - SetLastWin32Error(ERROR_CALL_NOT_IMPLEMENTED); } if ((dwflags & CDS_TEST) == CDS_TEST)

1 0

[gschneider] 42463: Remove deprecated define
by gschneider＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: gschneider Date: Fri Aug 7 14:06:04 2009 New Revision: 42463 URL: http://svn.reactos.org/svn/reactos?rev=42463&view=rev Log: Remove deprecated define Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Fri Aug 7 14:06:04 2009 @@ -76,8 +76,6 @@ return CurIcon; } - -#define COLORCURSORS_ALLOWED FALSE HCURSOR FASTCALL IntSetCursor(

1 0

[cwittich] 42462: add bdasup.h
by cwittich＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: cwittich Date: Fri Aug 7 14:04:50 2009 New Revision: 42462 URL: http://svn.reactos.org/svn/reactos?rev=42462&view=rev Log: add bdasup.h Added: trunk/reactos/include/ddk/bdasup.h (with props) Added: trunk/reactos/include/ddk/bdasup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/bdasup.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/bdasup.h (added) +++ trunk/reactos/include/ddk/bdasup.h [iso-8859-1] Fri Aug 7 14:04:50 2009 @@ -1,0 +1,140 @@ +#if defined(__cplusplus) +extern "C" { +#endif + +#define STDMETHODCALLTYPE __stdcall +typedef GUID *PGUID; + +/* Types */ + +typedef struct _BDA_PIN_PAIRING +{ + ULONG ulInputPin; + ULONG ulOutputPin; + ULONG ulcMaxInputsPerOutput; + ULONG ulcMinInputsPerOutput; + ULONG ulcMaxOutputsPerInput; + ULONG ulcMinOutputsPerInput; + ULONG ulcTopologyJoints; + const ULONG *pTopologyJoints; +} BDA_PIN_PAIRING, *PBDA_PIN_PAIRING; + +typedef struct _BDA_FILTER_TEMPLATE +{ + const KSFILTER_DESCRIPTOR *pFilterDescriptor; + ULONG ulcPinPairs; + const BDA_PIN_PAIRING *pPinPairs; +} BDA_FILTER_TEMPLATE, *PBDA_FILTER_TEMPLATE; + +/* Functions */ + +STDMETHODIMP_(NTSTATUS) BdaCheckChanges(IN PIRP Irp); +STDMETHODIMP_(NTSTATUS) BdaCommitChanges(IN PIRP Irp); + +STDMETHODIMP_(NTSTATUS) BdaCreateFilterFactory( + IN PKSDEVICE pKSDevice, + IN const KSFILTER_DESCRIPTOR *pFilterDescriptor, + IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate); + +STDMETHODIMP_(NTSTATUS) BdaCreateFilterFactoryEx( + IN PKSDEVICE pKSDevice, + IN const KSFILTER_DESCRIPTOR *pFilterDescriptor, + IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate, + OUT PKSFILTERFACTORY *ppKSFilterFactory); + +STDMETHODIMP_(NTSTATUS) BdaCreatePin( + IN PKSFILTER pKSFilter, + IN ULONG ulPinType, + OUT ULONG *pulPinId); + +STDMETHODIMP_(NTSTATUS) BdaCreateTopology( + IN PKSFILTER pKSFilter, + IN ULONG InputPinId, + IN ULONG OutputPinId); + +STDMETHODIMP_(NTSTATUS) BdaDeletePin( + IN PKSFILTER pKSFilter, + IN ULONG *pulPinId); + +STDMETHODIMP_(NTSTATUS) BdaFilterFactoryUpdateCacheData( + IN PKSFILTERFACTORY pFilterFactory, + IN const KSFILTER_DESCRIPTOR *pFilterDescriptor OPTIONAL); + +STDMETHODIMP_(NTSTATUS) BdaGetChangeState( + IN PIRP Irp, + OUT BDA_CHANGE_STATE *pChangeState); + +STDMETHODIMP_(NTSTATUS) BdaInitFilter( + IN PKSFILTER pKSFilter, + IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate); + +STDMETHODIMP_(NTSTATUS) BdaMethodCreatePin( + IN PIRP Irp, + IN KSMETHOD *pKSMethod, + OUT ULONG *pulPinFactoryID); + +STDMETHODIMP_(NTSTATUS) BdaMethodCreateTopology( + IN PIRP Irp, + IN KSMETHOD *pKSMethod, + OPTIONAL PVOID pvIgnored); + +STDMETHODIMP_(NTSTATUS) BdaMethodDeletePin( + IN PIRP Irp, + IN KSMETHOD *pKSMethod, + OPTIONAL PVOID pvIgnored); + +STDMETHODIMP_(NTSTATUS) BdaPropertyGetControllingPinId( + IN PIRP Irp, + IN KSP_BDA_NODE_PIN *pProperty, + OUT ULONG *pulControllingPinId); + +STDMETHODIMP_(NTSTATUS) BdaPropertyGetPinControl( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT ULONG *pulProperty); + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeDescriptors( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty); + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeEvents( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty); + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeMethods( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty); + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeProperties( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty); + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeTypes( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT ULONG *pulProperty); + +STDMETHODIMP_(NTSTATUS) BdaPropertyPinTypes( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT ULONG *pulProperty); + +STDMETHODIMP_(NTSTATUS) BdaPropertyTemplateConnections( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT KSTOPOLOGY_CONNECTION *pConnectionProperty); + +STDMETHODIMP_(NTSTATUS) BdaStartChanges(IN PIRP Irp); +STDMETHODIMP_(NTSTATUS) BdaUninitFilter(IN PKSFILTER pKSFilter); + +STDMETHODIMP_(NTSTATUS) BdaValidateNodeProperty( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty); + +#if defined(__cplusplus) +} +#endif Propchange: trunk/reactos/include/ddk/bdasup.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sginsberg] 42461: - winddk.h: Don't define NTSYSAPI and NTSYSCALLAPI -- this is defined in ntdef.h. Use NTSYSAPI for HalDispatchTable instead of DECLSPEC_IMPORT (see below). - wdm.h: Properly define NTKERNELAPI. - ntifs.h: Properly define NTKERNELAPI, and don't redefine NTSYSAPI. - ntoskrnl: Apply the WDK hack for our headers (and gcc) too. Also redefine NTHALAPI for NDK so we don't auto-import KdComPortInUse -- ld complains about this. - Apply this for cmlib, csq and rossym too. - Use this in
by sginsberg＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: sginsberg Date: Fri Aug 7 12:45:59 2009 New Revision: 42461 URL: http://svn.reactos.org/svn/reactos?rev=42461&view=rev Log: - winddk.h: Don't define NTSYSAPI and NTSYSCALLAPI -- this is defined in ntdef.h. Use NTSYSAPI for HalDispatchTable instead of DECLSPEC_IMPORT (see below). - wdm.h: Properly define NTKERNELAPI. - ntifs.h: Properly define NTKERNELAPI, and don't redefine NTSYSAPI. - ntoskrnl: Apply the WDK hack for our headers (and gcc) too. Also redefine NTHALAPI for NDK so we don't auto-import KdComPortInUse -- ld complains about this. - Apply this for cmlib, csq and rossym too. - Use this in HAL too, and redefine NTSYSAPI so we don't auto import some structures from the kernel. Also, don't define __declspec(dllimport) to nothing -- this doesn't work with gcc, and doesn't seem to be necessary. I tried building HAL with the WDK and this wasn't an issue. Modified: trunk/reactos/hal/halarm/include/hal.h trunk/reactos/hal/halppc/include/hal.h trunk/reactos/hal/halx86/include/hal.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ddk/winddk.h trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/drivers/csq/csq.c trunk/reactos/lib/rossym/initkm.c trunk/reactos/ntoskrnl/include/precomp.h Modified: trunk/reactos/hal/halarm/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halarm/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/include/hal.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -12,14 +12,13 @@ #include <stdio.h> /* WDK HAL Compilation hack */ -#ifdef _MSC_VER #include <excpt.h> #include <ntdef.h> #undef _NTHAL_ #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT -#define __declspec(dllimport) -#endif +#undef NTSYSAPI +#define NTSYSAPI __declspec(dllimport) /* IFS/DDK/NDK Headers */ #include <ntifs.h> Modified: trunk/reactos/hal/halppc/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halppc/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/include/hal.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -12,14 +12,13 @@ #include <stdio.h> /* WDK HAL Compilation hack */ -#ifdef _MSC_VER #include <excpt.h> #include <ntdef.h> #undef _NTHAL_ #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT -#define __declspec(dllimport) -#endif +#undef NTSYSAPI +#define NTSYSAPI __declspec(dllimport) /* IFS/DDK/NDK Headers */ #include <ntifs.h> Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -12,14 +12,13 @@ #include <stdio.h> /* WDK HAL Compilation hack */ -#ifdef _MSC_VER #include <excpt.h> #include <ntdef.h> #undef _NTHAL_ #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT -#define __declspec(dllimport) -#endif +#undef NTSYSAPI +#define NTSYSAPI __declspec(dllimport) /* IFS/DDK/NDK Headers */ #include <ntifs.h> Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -24,12 +24,7 @@ #define _NTIFS_ #define _GNU_NTIFS_ -#ifdef _NTOSKRNL_ -/* HACKHACKHACK!!! We shouldn't include this header from ntoskrnl! */ -#define NTKERNELAPI -#else #define NTKERNELAPI DECLSPEC_IMPORT -#endif #include <ntddk.h> @@ -42,10 +37,6 @@ #ifndef VER_PRODUCTBUILD #define VER_PRODUCTBUILD 10000 -#endif - -#ifndef NTSYSAPI -#define NTSYSAPI #endif #define EX_PUSH_LOCK ULONG_PTR Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4246… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -21,12 +21,7 @@ extern "C" { #endif -#ifdef _NTOSKRNL_ -/* HACKHACKHACK!!! We shouldn't include this header from ntoskrnl! */ -#define NTKERNELAPI -#else #define NTKERNELAPI DECLSPEC_IMPORT -#endif #ifdef _WIN64 #define PORT_MAXIMUM_MESSAGE_LENGTH 512 Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -65,18 +65,6 @@ #else # define _DDK_DUMMYUNION_MEMBER(name) name # define _DDK_DUMMYUNION_N_MEMBER(n, name) name -#endif - -#if !defined(_NTSYSTEM_) -#define NTSYSAPI DECLSPEC_IMPORT -#define NTSYSCALLAPI DECLSPEC_IMPORT -#else -#define NTSYSAPI -#if defined(_NTDLLBUILD_) -#define NTSYSCALLAPI -#else -#define NTSYSCALLAPI DECLSPEC_ADDRSAFE -#endif #endif /* @@ -2866,7 +2854,7 @@ } HAL_DISPATCH, *PHAL_DISPATCH; #if defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTHAL_) -extern DECLSPEC_IMPORT PHAL_DISPATCH HalDispatchTable; +extern NTSYSAPI PHAL_DISPATCH HalDispatchTable; #define HALDISPATCH ((PHAL_DISPATCH)&HalDispatchTable) #else extern DECLSPEC_EXPORT HAL_DISPATCH HalDispatchTable; Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=4246… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -88,7 +88,9 @@ #define CMLTRACE(x, ...) DPRINT(__VA_ARGS__) #endif - + #include <ntdef.h> + #undef DECLSPEC_IMPORT + #define DECLSPEC_IMPORT #include <ntddk.h> #endif Modified: trunk/reactos/lib/drivers/csq/csq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/csq/csq.c?rev=… ============================================================================== --- trunk/reactos/lib/drivers/csq/csq.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/csq/csq.c [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -25,11 +25,9 @@ */ /* $Id$ */ -#ifdef _MSC_VER #include <ntdef.h> #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT -#endif #include <ntifs.h> Modified: trunk/reactos/lib/rossym/initkm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/initkm.c?rev=42… ============================================================================== --- trunk/reactos/lib/rossym/initkm.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym/initkm.c [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -7,7 +7,9 @@ * PROGRAMMERS: Ge van Geldorp (gvg(a)reactos.com) */ -#define _NTOSKRNL_ +#include <ntdef.h> +#undef DECLSPEC_IMPORT +#define DECLSPEC_IMPORT #include <ntddk.h> #include <reactos/rossym.h> #include "rossympriv.h" Modified: trunk/reactos/ntoskrnl/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/precomp.h… ============================================================================== --- trunk/reactos/ntoskrnl/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/precomp.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -14,15 +14,15 @@ /* DDK/IFS/NDK Headers */ #define _REALLY_GET_CALLERS_CALLER -#ifdef _MSC_VER #include <excpt.h> #include <ntdef.h> #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT -#endif #include <ntifs.h> #include <wdmguid.h> #include <arc/arc.h> +#undef NTHALAPI +#define NTHALAPI __declspec(dllimport) #include <ntndk.h> #undef TEXT #define TEXT(s) L##s

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