Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 32278: This header work now to build ksfilter, it is some linking issue now for ksfilter
by greatlrd＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: greatlrd Date: Sun Feb 10 23:22:16 2008 New Revision: 32278 URL: http://svn.reactos.org/svn/reactos?rev=32278&view=rev Log: This header work now to build ksfilter, it is some linking issue now for ksfilter Modified: branches/reactx/reactos/include/dxsdk/ks.h Modified: branches/reactx/reactos/include/dxsdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/dxsdk/ks… ============================================================================== --- branches/reactx/reactos/include/dxsdk/ks.h (original) +++ branches/reactx/reactos/include/dxsdk/ks.h Sun Feb 10 23:22:16 2008 @@ -511,7 +511,7 @@ KSEVENTS_ERESOURCE } KSEVENTS_LOCKTYPE; - #if !defined(__wtypes_h__) + #if !defined(__WIDL_WTYPES_H) enum VARENUM { VT_EMPTY = 0, @@ -562,6 +562,7 @@ VT_ILLEGALMASKED = 0xfff, VT_TYPEMASK = 0xfff }; + #endif #endif typedef struct _KSDEVICE KSDEVICE, *PKSDEVICE; typedef PVOID KSDEVICE_HEADER, KSOBJECT_HEADER; @@ -2203,7 +2204,11 @@ #if !defined(_WIN64) PVOID Alignment; #endif - } KSAUTOMATION_TABLE, *PKSAUTOMATION_TABLE; + }; + + typedef struct KSAUTOMATION_TABLE_ KSAUTOMATION_TABLE; + typedef struct KSAUTOMATION_TABLE_ *PKSAUTOMATION_TABLE; + #define DEFINE_KSAUTOMATION_TABLE(table) const KSAUTOMATION_TABLE table = struct _KSDEVICE_DISPATCH @@ -3489,25 +3494,25 @@ #define KsDiscard(Object,Pointer) KsRemoveItemFromObjectBag((Object)->Bag, (PVOID)(Pointer), TRUE) - void _inline + void __inline KsFilterAddEvent(IN PKSFILTER Filter, IN PKSEVENT_ENTRY EventEntry) { KsAddEvent(Filter,EventEntry); } - void _inline KsPinAddEvent(IN PKSPIN Pin, IN PKSEVENT_ENTRY EventEntry) + void __inline KsPinAddEvent(IN PKSPIN Pin, IN PKSEVENT_ENTRY EventEntry) { KsAddEvent(Pin,EventEntry); } - void _inline KsFilterGenerateEvents(IN PKSFILTER Filter, IN const GUID* EventSet OPTIONAL, + void __inline KsFilterGenerateEvents(IN PKSFILTER Filter, IN const GUID* EventSet OPTIONAL, IN ULONG EventId, IN ULONG DataSize, IN PVOID Data OPTIONAL, IN PFNKSGENERATEEVENTCALLBACK CallBack OPTIONAL, IN PVOID CallBackContext OPTIONAL) { KsGenerateEvents(Filter, EventSet, EventId, DataSize, Data, CallBack, CallBackContext); } - void _inline KsPinGenerateEvents(IN PKSPIN Pin, IN const GUID* EventSet OPTIONAL, IN ULONG EventId, IN ULONG DataSize, + void __inline KsPinGenerateEvents(IN PKSPIN Pin, IN const GUID* EventSet OPTIONAL, IN ULONG EventId, IN ULONG DataSize, IN PVOID Data OPTIONAL, IN PFNKSGENERATEEVENTCALLBACK CallBack OPTIONAL,IN PVOID CallBackContext OPTIONAL) { KsGenerateEvents(Pin, EventSet, EventId, DataSize, Data, CallBack, CallBackContext); @@ -3589,7 +3594,11 @@ KsReleaseControl((PVOID) Pin); } - #if defined(_UNKNOWN_H_) || defined(__IUnknown_INTERFACE_DEFINED__) + #if defined(_UNKNOWN_H_) || defined(__IUnknown_FWD_DEFINED__) + + #ifndef PUNKNOWN + typedef IUnknown *PUNKNOWN; + #endif KSDDKAPI NTSTATUS NTAPI KsPinGetReferenceClockInterface(IN PKSPIN Pin,

1 0

[fireball] 32277: - Revert 32276, since the include guard convention has been changed by 32274.
by fireball＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: fireball Date: Sun Feb 10 23:09:06 2008 New Revision: 32277 URL: http://svn.reactos.org/svn/reactos?rev=32277&view=rev Log: - Revert 32276, since the include guard convention has been changed by 32274. Modified: trunk/reactos/include/ddk/unknown.h Modified: trunk/reactos/include/ddk/unknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/unknown.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/unknown.h (original) +++ trunk/reactos/include/ddk/unknown.h Sun Feb 10 23:09:06 2008 @@ -1,5 +1,5 @@ -#ifndef _UNKNOWN_H_ -#define _UNKNOWN_H_ +#ifndef __unknwn_h__ +#define __unknwn_h__ #ifdef __cplusplus extern "C" { @@ -51,5 +51,6 @@ IN PUNKNOWN OuterUnknown, IN POOL_TYPE PoolType ); + #endif

1 0

[greatlrd] 32276: fix unknown.h back as it was correct fix is to fix ksfilter
by greatlrd＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: greatlrd Date: Sun Feb 10 23:02:26 2008 New Revision: 32276 URL: http://svn.reactos.org/svn/reactos?rev=32276&view=rev Log: fix unknown.h back as it was correct fix is to fix ksfilter Modified: trunk/reactos/include/ddk/unknown.h Modified: trunk/reactos/include/ddk/unknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/unknown.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/unknown.h (original) +++ trunk/reactos/include/ddk/unknown.h Sun Feb 10 23:02:26 2008 @@ -1,5 +1,5 @@ -#ifndef __unknwn_h__ -#define __unknwn_h__ +#ifndef _UNKNOWN_H_ +#define _UNKNOWN_H_ #ifdef __cplusplus extern "C" { @@ -51,6 +51,5 @@ IN PUNKNOWN OuterUnknown, IN POOL_TYPE PoolType ); - #endif

1 0

[hpoussin] 32275: Try to fix build
by hpoussin＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: hpoussin Date: Sun Feb 10 23:00:45 2008 New Revision: 32275 URL: http://svn.reactos.org/svn/reactos?rev=32275&view=rev Log: Try to fix build Modified: trunk/reactos/include/psdk/msxml2.idl Modified: trunk/reactos/include/psdk/msxml2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re… ============================================================================== --- trunk/reactos/include/psdk/msxml2.idl (original) +++ trunk/reactos/include/psdk/msxml2.idl Sun Feb 10 23:00:45 2008 @@ -50,7 +50,7 @@ cpp_quote("#define DOMDocument DOMDocument2") cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2") -cpp_quote("#ifndef __WIDL_XMLDOM_H") +cpp_quote("#ifndef __xmldom_h__") typedef enum tagDOMNodeType { NODE_INVALID = 0, @@ -67,7 +67,7 @@ NODE_DOCUMENT_FRAGMENT = 11, NODE_NOTATION = 12 } DOMNodeType; -cpp_quote("#endif /* __WIDL_XMLDOM_H */") +cpp_quote("#endif /* __xmldom_h__ */") [ local,

1 0

[hpoussin] 32274: Use the same include guard in WIDL generated files and MIDL generated files
by hpoussin＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: hpoussin Date: Sun Feb 10 22:47:42 2008 New Revision: 32274 URL: http://svn.reactos.org/svn/reactos?rev=32274&view=rev Log: Use the same include guard in WIDL generated files and MIDL generated files Modified: trunk/reactos/tools/widl/widl.c trunk/reactos/tools/widl/widl_ros.diff Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=3227… ============================================================================== --- trunk/reactos/tools/widl/widl.c (original) +++ trunk/reactos/tools/widl/widl.c Sun Feb 10 22:47:42 2008 @@ -174,7 +174,7 @@ token = xstrdup(name); for (i=0; token[i]; i++) { if (!isalnum(token[i])) token[i] = '_'; - else token[i] = toupper(token[i]); + else token[i] = tolower(token[i]); } return token; } @@ -561,8 +561,8 @@ fprintf(header, "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", PACKAGE_VERSION, input_name); fprintf(header, "#include <rpc.h>\n" ); fprintf(header, "#include <rpcndr.h>\n\n" ); - fprintf(header, "#ifndef __WIDL_%s\n", header_token); - fprintf(header, "#define __WIDL_%s\n", header_token); + fprintf(header, "#ifndef __%s__\n", header_token); + fprintf(header, "#define __%s__\n", header_token); start_cplusplus_guard(header); } @@ -606,7 +606,7 @@ fprintf(header, "/* End additional prototypes */\n"); fprintf(header, "\n"); end_cplusplus_guard(header); - fprintf(header, "#endif /* __WIDL_%s */\n", header_token); + fprintf(header, "#endif /* __%s__ */\n", header_token); fclose(header); } Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff (original) +++ trunk/reactos/tools/widl/widl_ros.diff Sun Feb 10 22:47:42 2008 @@ -60,6 +60,38 @@ #include "widl.h" #include "utils.h" +Index: widl.c +=================================================================== +--- widl.c (revision 32187) ++++ widl.c (working copy) +@@ -174,7 +174,7 @@ + token = xstrdup(name); + for (i=0; token[i]; i++) { + if (!isalnum(token[i])) token[i] = '_'; +- else token[i] = toupper(token[i]); ++ else token[i] = tolower(token[i]); + } + return token; + } +@@ -561,8 +561,8 @@ + fprintf(header, "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", PACKAGE_VERSION, input_name); + fprintf(header, "#include <rpc.h>\n" ); + fprintf(header, "#include <rpcndr.h>\n\n" ); +- fprintf(header, "#ifndef __WIDL_%s\n", header_token); +- fprintf(header, "#define __WIDL_%s\n", header_token); ++ fprintf(header, "#ifndef __%s__\n", header_token); ++ fprintf(header, "#define __%s__\n", header_token); + start_cplusplus_guard(header); + } + +@@ -606,7 +606,7 @@ + fprintf(header, "/* End additional prototypes */\n"); + fprintf(header, "\n"); + end_cplusplus_guard(header); +- fprintf(header, "#endif /* __WIDL_%s */\n", header_token); ++ fprintf(header, "#endif /* __%s__ */\n", header_token); + fclose(header); + } Index: widltypes.h =================================================================== --- widltypes.h (revision 32187)

1 0

[hpoussin] 32273: Revert r32271 ; I thought we decided to remove hacks instead of adding new ones! Correct fix will follow.
by hpoussin＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: hpoussin Date: Sun Feb 10 22:43:05 2008 New Revision: 32273 URL: http://svn.reactos.org/svn/reactos?rev=32273&view=rev Log: Revert r32271 ; I thought we decided to remove hacks instead of adding new ones! Correct fix will follow. Modified: trunk/reactos/include/ddk/unknown.h Modified: trunk/reactos/include/ddk/unknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/unknown.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/unknown.h (original) +++ trunk/reactos/include/ddk/unknown.h Sun Feb 10 22:43:05 2008 @@ -1,7 +1,5 @@ -#ifndef _UNKNOWN_H_ -#define _UNKNOWN_H_ -#ifndef __WIDL_UNKNWN_H -#define __WIDL_UNKNWN_H /* hack if psdk unknown.h have been included */ +#ifndef __unknwn_h__ +#define __unknwn_h__ #ifdef __cplusplus extern "C" { @@ -54,6 +52,5 @@ IN POOL_TYPE PoolType ); -#endif // __WIDL_UNKNWN_H /* hack if psdk unknown.h have been included */ #endif

1 0

[greatlrd] 32272: remove my hack in wtype.ldl I should not coding when i start fall into sleep sorry and thx fireball
by greatlrd＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: greatlrd Date: Sun Feb 10 22:40:36 2008 New Revision: 32272 URL: http://svn.reactos.org/svn/reactos?rev=32272&view=rev Log: remove my hack in wtype.ldl I should not coding when i start fall into sleep sorry and thx fireball Modified: trunk/reactos/include/psdk/wtypes.idl Modified: trunk/reactos/include/psdk/wtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wtypes.idl?re… ============================================================================== --- trunk/reactos/include/psdk/wtypes.idl (original) +++ trunk/reactos/include/psdk/wtypes.idl Sun Feb 10 22:40:36 2008 @@ -29,9 +29,6 @@ interface IWinTypes { -cpp_quote("#ifndef __wtypes_h__ ") /* fix compatible issue with VC and dxsdk use same name as ms __wtypes_h__*/ -cpp_quote("#define __wtypes_h__ ") /* fix compatible issue with VC and dxsdk use same name as ms __wtypes_h__*/ - /******************** BASIC WIN32 TYPES ********************/ cpp_quote("#if 0 /* winnt.h */") /* don't redefine these */ @@ -815,5 +812,4 @@ } ByObjectId; } uCLSSPEC; -cpp_quote("#endif") /* fix compatible issue with VC and dxsdk use same name as ms __wtypes_h__*/ } /* interface IWinTypes */

1 0

[greatlrd] 32271: some case psdk unknown.h being include when it should be ddk version for now we do not double inlcude the ddk version for ksfilter.
by greatlrd＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: greatlrd Date: Sun Feb 10 22:25:42 2008 New Revision: 32271 URL: http://svn.reactos.org/svn/reactos?rev=32271&view=rev Log: some case psdk unknown.h being include when it should be ddk version for now we do not double inlcude the ddk version for ksfilter. Modified: trunk/reactos/include/ddk/unknown.h Modified: trunk/reactos/include/ddk/unknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/unknown.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/unknown.h (original) +++ trunk/reactos/include/ddk/unknown.h Sun Feb 10 22:25:42 2008 @@ -1,5 +1,7 @@ #ifndef _UNKNOWN_H_ #define _UNKNOWN_H_ +#ifndef __WIDL_UNKNWN_H +#define __WIDL_UNKNWN_H /* hack if psdk unknown.h have been included */ #ifdef __cplusplus extern "C" { @@ -51,5 +53,7 @@ IN PUNKNOWN OuterUnknown, IN POOL_TYPE PoolType ); + +#endif // __WIDL_UNKNWN_H /* hack if psdk unknown.h have been included */ #endif

1 0

[greatlrd] 32270: fix some more build issue for ks.h in trunk for ksfilter driver
by greatlrd＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: greatlrd Date: Sun Feb 10 21:37:31 2008 New Revision: 32270 URL: http://svn.reactos.org/svn/reactos?rev=32270&view=rev Log: fix some more build issue for ks.h in trunk for ksfilter driver Modified: branches/reactx/reactos/include/dxsdk/ks.h Modified: branches/reactx/reactos/include/dxsdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/dxsdk/ks… ============================================================================== --- branches/reactx/reactos/include/dxsdk/ks.h (original) +++ branches/reactx/reactos/include/dxsdk/ks.h Sun Feb 10 21:37:31 2008 @@ -1870,7 +1870,9 @@ ULONG SemaphoreAdjustment; ULONG Reserved; ULONG Flags; - } KSEVENT_ENTRY, *PKSEVENT_ENTRY; + } KSEVENT_ENTRY; + + typedef struct _KSEVENT_ENTRY *PKSEVENT_ENTRY; typedef struct { @@ -1913,9 +1915,7 @@ PFNDEREFERENCEDEVICEOBJECT DereferenceDeviceObject; PFNQUERYREFERENCESTRING QueryReferenceString; } BUS_INTERFACE_REFERENCE, *PBUS_INTERFACE_REFERENCE; - - - + typedef VOID (*PFNKSITEMFREECALLBACK)( IN PKSOBJECT_CREATE_ITEM CreateItem ); typedef NTSTATUS (*PFNKSIRPLISTCALLBACK)( IN PIRP Irp, IN PVOID Context ); typedef NTSTATUS (*PFNQUERYMEDIUMSLIST)( IN PVOID Context, OUT ULONG* MediumsCount, OUT PKSPIN_MEDIUM* MediumList); @@ -2183,14 +2183,11 @@ } #endif - - typedef struct { INTERFACE Interface; PFNQUERYMEDIUMSLIST QueryMediumsList; } BUS_INTERFACE_MEDIUMS, *PBUS_INTERFACE_MEDIUMS; - struct KSAUTOMATION_TABLE_ { @@ -2533,13 +2530,14 @@ #endif #endif // end ntddk - #if defined(__cplusplus) extern "C" { #endif #ifdef _KSDDK_ #define KSDDKAPI DECLSPEC_EXPORT + #undef NTAPI + #define NTAPI #else #define KSDDKAPI DECLSPEC_IMPORT #endif @@ -3671,9 +3669,6 @@ #endif #endif - - - #if defined(__cplusplus) } #endif

1 0

[greatlrd] 32269: Fix a comptaible issue with dxsdk and vc, our dxsdk want the name #define __wtypes_h__ (same as windows psdk) this fix a comptiable issue with vc as well, wine ldl can not name a idl correct so I hardcode in this name
by greatlrd＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: greatlrd Date: Sun Feb 10 21:35:20 2008 New Revision: 32269 URL: http://svn.reactos.org/svn/reactos?rev=32269&view=rev Log: Fix a comptaible issue with dxsdk and vc, our dxsdk want the name #define __wtypes_h__ (same as windows psdk) this fix a comptiable issue with vc as well, wine ldl can not name a idl correct so I hardcode in this name Modified: trunk/reactos/include/psdk/wtypes.idl Modified: trunk/reactos/include/psdk/wtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wtypes.idl?re… ============================================================================== --- trunk/reactos/include/psdk/wtypes.idl (original) +++ trunk/reactos/include/psdk/wtypes.idl Sun Feb 10 21:35:20 2008 @@ -29,6 +29,9 @@ interface IWinTypes { +cpp_quote("#ifndef __wtypes_h__ ") /* fix compatible issue with VC and dxsdk use same name as ms __wtypes_h__*/ +cpp_quote("#define __wtypes_h__ ") /* fix compatible issue with VC and dxsdk use same name as ms __wtypes_h__*/ + /******************** BASIC WIN32 TYPES ********************/ cpp_quote("#if 0 /* winnt.h */") /* don't redefine these */ @@ -812,4 +815,5 @@ } ByObjectId; } uCLSSPEC; +cpp_quote("#endif") /* fix compatible issue with VC and dxsdk use same name as ms __wtypes_h__*/ } /* interface IWinTypes */

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