Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[akhaldi] 61339: [OBJSEL] * Improve header inclusions. * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and defin...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 22 18:01:43 2013 New Revision: 61339 URL: http://svn.reactos.org/svn/reactos?rev=61339&view=rev Log: [OBJSEL] * Improve header inclusions. * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/objsel/factory.c trunk/reactos/dll/win32/objsel/objsel.c trunk/reactos/dll/win32/objsel/objsel_private.h Modified: trunk/reactos/dll/win32/objsel/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/factory.c… ============================================================================== --- trunk/reactos/dll/win32/objsel/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/objsel/factory.c [iso-8859-1] Sun Dec 22 18:01:43 2013 @@ -20,11 +20,6 @@ */ #include "objsel_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(objsel); - static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) { Modified: trunk/reactos/dll/win32/objsel/objsel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.c?… ============================================================================== --- trunk/reactos/dll/win32/objsel/objsel.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/objsel/objsel.c [iso-8859-1] Sun Dec 22 18:01:43 2013 @@ -20,10 +20,6 @@ #include "objsel_private.h" #include <rpcproxy.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(objsel); LONG dll_refs = 0; static HINSTANCE hInstance; Modified: trunk/reactos/dll/win32/objsel/objsel_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel_pr… ============================================================================== --- trunk/reactos/dll/win32/objsel/objsel_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/objsel/objsel_private.h [iso-8859-1] Sun Dec 22 18:01:43 2013 @@ -18,29 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -//#include <string.h> -#include <stdarg.h> -//#include <stdio.h> -//#include "winerror.h" +#define COBJMACROS + #include <windef.h> #include <winbase.h> -//#include "winreg.h" -//#include "wingdi.h" -//#include "winuser.h" +#include <objbase.h> +#include <objsel.h> -#define COBJMACROS - -#include <ole2.h> -//#include "strmif.h" -//#include "olectl.h" -//#include "unknwn.h" -#include <objsel.h> -//#include "wine/unicode.h" -//#include "uuids.h" +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(objsel); /********************************************************************** * Dll lifetime tracking declaration for objsel.dll

10 years, 9 months

[akhaldi] 61338: [CABINET] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 22 17:55:22 2013 New Revision: 61338 URL: http://svn.reactos.org/svn/reactos?rev=61338&view=rev Log: [CABINET] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/cabinet/cabinet.h trunk/reactos/dll/win32/cabinet/cabinet_main.c trunk/reactos/dll/win32/cabinet/fci.c trunk/reactos/dll/win32/cabinet/fdi.c trunk/reactos/dll/win32/cabinet/stubs.c Modified: trunk/reactos/dll/win32/cabinet/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/cabinet.h [iso-8859-1] Sun Dec 22 17:55:22 2013 @@ -21,17 +21,22 @@ #ifndef __WINE_CABINET_H #define __WINE_CABINET_H +#include <config.h> + +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H - -#include <stdarg.h> #include <windef.h> #include <winbase.h> #include <winnt.h> #include <fdi.h> #include <fci.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(cabinet); /* from msvcrt/sys/stat.h */ #define _S_IWRITE 0x0080 @@ -66,10 +71,7 @@ typedef UINT32 cab_off_t; /* number of bits in a ULONG */ -#ifndef CHAR_BIT -# define CHAR_BIT (8) -#endif -#define CAB_ULONG_BITS (sizeof(cab_ULONG) * CHAR_BIT) +#define CAB_ULONG_BITS (sizeof(cab_ULONG) * 8) /* CHAR_BIT */ /* structure offsets */ #define cfhead_Signature (0x00) Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] Sun Dec 22 17:55:22 2013 @@ -18,29 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -//#include <assert.h> -#include <stdarg.h> -//#include <string.h> - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" +#include "cabinet.h" + #define NO_SHLWAPI_REG #include <shlwapi.h> #undef NO_SHLWAPI_REG - -#include "cabinet.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(cabinet); - /*********************************************************************** * DllGetVersion (CABINET.2) Modified: trunk/reactos/dll/win32/cabinet/fci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fci.c [iso-8859-1] Sun Dec 22 17:55:22 2013 @@ -30,28 +30,15 @@ */ - - -#include <config.h> +#include "cabinet.h" #include <assert.h> -//#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> + #ifdef HAVE_ZLIB # include <zlib.h> #endif -//#include <windef.h> -//#include <winbase.h> -//#include "winerror.h" -//#include "winternl.h" -//#include <fci.h> -#include "cabinet.h" #include <wine/list.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(cabinet); #ifdef WORDS_BIGENDIAN #define fci_endian_ulong(x) RtlUlongByteSwap(x) Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] Sun Dec 22 17:55:22 2013 @@ -58,20 +58,8 @@ * -gmt */ -#include <config.h> - -//#include <stdarg.h> +#include "cabinet.h" #include <stdio.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -//#include "fdi.h" -#include "cabinet.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(cabinet); THOSE_ZIP_CONSTS; Modified: trunk/reactos/dll/win32/cabinet/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/cabinet/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/stubs.c [iso-8859-1] Sun Dec 22 17:55:22 2013 @@ -11,7 +11,6 @@ UNIMPLEMENTED; } - LPCSTR WINAPI GetDllVersion(void) @@ -19,4 +18,3 @@ /* This is what it returns on Windows XP SP3 */ return "5.1.2600.5512"; } -

10 years, 9 months

[akhaldi] 61337: [SHDOCVW] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 22 17:11:12 2013 New Revision: 61337 URL: http://svn.reactos.org/svn/reactos?rev=61337&view=rev Log: [SHDOCVW] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h trunk/reactos/dll/win32/shdocvw/shdocvw_main.c trunk/reactos/dll/win32/shdocvw/shlinstobj.c Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.h [iso-8859-1] Sun Dec 22 17:11:12 2013 @@ -22,24 +22,25 @@ #ifndef __WINE_SHDOCVW_H #define __WINE_SHDOCVW_H +#include <config.h> + +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H #define COBJMACROS -#include <stdarg.h> - #include <windef.h> #include <winbase.h> -//#include "winuser.h" - -#include <ole2.h> +#include <winreg.h> #include <shlobj.h> -//#include "exdisp.h" #include <wine/unicode.h> -//#include "wine/list.h" + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); /********************************************************************** * Shell Instance Objects Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] Sun Dec 22 17:11:12 2013 @@ -20,24 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include <stdarg.h> -//#include <stdio.h> - -//#include "wine/unicode.h" -#include <wine/debug.h> - #include "shdocvw.h" -#include <winreg.h> #include <shlwapi.h> #include <wininet.h> -//#include "isguids.h" - -//#include "initguid.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); LONG SHDOCVW_refCount = 0; Modified: trunk/reactos/dll/win32/shdocvw/shlinstobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shlinsto… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shlinstobj.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shlinstobj.c [iso-8859-1] Sun Dec 22 17:11:12 2013 @@ -23,22 +23,7 @@ * some registry entries. This feature was introduced with win2k. Please * search for 'Shell Instance Objects' on MSDN to get more information. */ -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -//#include "objbase.h" -//#include "oleauto.h" - #include "shdocvw.h" - -//#include "wine/unicode.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); #define CHARS_IN_GUID 39

10 years, 9 months

[akhaldi] 61336: [QUARTZ] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 22 17:03:20 2013 New Revision: 61336 URL: http://svn.reactos.org/svn/reactos?rev=61336&view=rev Log: [QUARTZ] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/directx/wine/quartz/acmwrapper.c trunk/reactos/dll/directx/wine/quartz/avidec.c trunk/reactos/dll/directx/wine/quartz/avisplit.c trunk/reactos/dll/directx/wine/quartz/dsoundrender.c trunk/reactos/dll/directx/wine/quartz/enumfilters.c trunk/reactos/dll/directx/wine/quartz/enummedia.c trunk/reactos/dll/directx/wine/quartz/enummoniker.c trunk/reactos/dll/directx/wine/quartz/enumregfilters.c trunk/reactos/dll/directx/wine/quartz/filesource.c trunk/reactos/dll/directx/wine/quartz/filtergraph.c trunk/reactos/dll/directx/wine/quartz/filtermapper.c trunk/reactos/dll/directx/wine/quartz/main.c trunk/reactos/dll/directx/wine/quartz/memallocator.c trunk/reactos/dll/directx/wine/quartz/mpegsplit.c trunk/reactos/dll/directx/wine/quartz/nullrenderer.c trunk/reactos/dll/directx/wine/quartz/parser.c trunk/reactos/dll/directx/wine/quartz/pin.c trunk/reactos/dll/directx/wine/quartz/quartz_private.h trunk/reactos/dll/directx/wine/quartz/regsvr.c trunk/reactos/dll/directx/wine/quartz/systemclock.c trunk/reactos/dll/directx/wine/quartz/videorenderer.c trunk/reactos/dll/directx/wine/quartz/vmr9.c trunk/reactos/dll/directx/wine/quartz/waveparser.c Modified: trunk/reactos/dll/directx/wine/quartz/acmwrapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ac… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/acmwrapper.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/acmwrapper.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -18,26 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - #include "quartz_private.h" -#include "pin.h" - -//#include "uuids.h" -#include <mmreg.h> -//#include "windef.h" -//#include "winbase.h" -//#include "dshow.h" -//#include "strmif.h" -//#include "vfwmsgs.h" -#include <msacm.h> - -#include <assert.h> - -//#include "wine/unicode.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct ACMWrapperImpl { Modified: trunk/reactos/dll/directx/wine/quartz/avidec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/avidec.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/avidec.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -18,27 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - #include "quartz_private.h" -#include "pin.h" - -//#include "uuids.h" -//#include "amvideo.h" -//#include "windef.h" -//#include "winbase.h" -//#include "dshow.h" -//#include "strmif.h" -//#include "vfwmsgs.h" -#include <vfw.h> -#include <dvdmedia.h> - -#include <assert.h> - -//#include <wine/unicode.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct AVIDecImpl { Modified: trunk/reactos/dll/directx/wine/quartz/avisplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -30,29 +30,12 @@ */ #include "quartz_private.h" -#include "pin.h" - -//#include "uuids.h" -#include <vfw.h> -#include <aviriff.h> -//#include "vfwmsgs.h" -//#include "amvideo.h" - -//#include <wine/unicode.h> -#include <wine/debug.h> - -//#include <math.h> -#include <assert.h> - -#include "parser.h" #define TWOCCFromFOURCC(fcc) HIWORD(fcc) /* four character codes used in AVI files */ #define ckidINFO mmioFOURCC('I','N','F','O') #define ckidREC mmioFOURCC('R','E','C',' ') - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct StreamData { Modified: trunk/reactos/dll/directx/wine/quartz/dsoundrender.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ds… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/dsoundrender.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/dsoundrender.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - #include "quartz_private.h" -#include "pin.h" - -//#include "uuids.h" -//#include "vfwmsgs.h" -//#include "windef.h" -//#include "winbase.h" -//#include "dshow.h" -//#include "evcode.h" -//#include "strmif.h" -//#include "dsound.h" -//#include "amaudio.h" - -#include <wine/unicode.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); /* NOTE: buffer can still be filled completely, * but we start waiting until only this amount is buffered Modified: trunk/reactos/dll/directx/wine/quartz/enumfilters.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/en… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/enumfilters.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/enumfilters.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -19,10 +19,6 @@ */ #include "quartz_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct IEnumFiltersImpl { Modified: trunk/reactos/dll/directx/wine/quartz/enummedia.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/en… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/enummedia.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/enummedia.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -20,10 +20,6 @@ #include "quartz_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); - void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) { if (!pmt) Modified: trunk/reactos/dll/directx/wine/quartz/enummoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/en… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/enummoniker.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/enummoniker.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - #include "quartz_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct EnumMonikerImpl { Modified: trunk/reactos/dll/directx/wine/quartz/enumregfilters.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/en… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/enumregfilters.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/enumregfilters.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -19,12 +19,6 @@ */ #include "quartz_private.h" - -#include <wine/unicode.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct IEnumRegFiltersImpl { Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -18,22 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "quartz_private.h" -#include <wine/debug.h> -#include <wine/unicode.h> -#include "pin.h" -//#include "uuids.h" -//#include "vfwmsgs.h" -//#include "winbase.h" -//#include "winreg.h" #include <shlwapi.h> -#include <assert.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const WCHAR wszOutputPinName[] = { 'O','u','t','p','u','t',0 }; Modified: trunk/reactos/dll/directx/wine/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -18,28 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "shlwapi.h" -#include "dshow.h" -#include <wine/debug.h> #include "quartz_private.h" -#include "ole2.h" -#include "olectl.h" -#include <strmif.h> -#include "vfwmsgs.h" -#include "evcode.h" -#include <wine/unicode.h> - - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct { HWND hWnd; /* Target window */ Modified: trunk/reactos/dll/directx/wine/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -19,27 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "winreg.h" -//#include "winerror.h" - #include "quartz_private.h" -//#include "ole2.h" -//#include "olectl.h" -//#include "strmif.h" -#include <wine/unicode.h> -//#include "uuids.h" #include <initguid.h> #include <fil_data.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) @@ -401,24 +384,24 @@ rrf.dwVersion = prf2->dwVersion; rrf.dwMerit = prf2->dwMerit; - rrf.dwPins = prf2->cPins2; + rrf.dwPins = prf2->u.s2.cPins2; rrf.dwUnused = 0; add_data(&mainStore, (LPBYTE)&rrf, sizeof(rrf)); - for (i = 0; i < prf2->cPins2; i++) + for (i = 0; i < prf2->u.s2.cPins2; i++) { size += sizeof(struct REG_RFP); - if (prf2->rgPins2[i].clsPinCategory) + if (prf2->u.s2.rgPins2[i].clsPinCategory) size += sizeof(DWORD); - size += prf2->rgPins2[i].nMediaTypes * sizeof(struct REG_TYPE); - size += prf2->rgPins2[i].nMediums * sizeof(DWORD); - } - - for (i = 0; i < prf2->cPins2; i++) + size += prf2->u.s2.rgPins2[i].nMediaTypes * sizeof(struct REG_TYPE); + size += prf2->u.s2.rgPins2[i].nMediums * sizeof(DWORD); + } + + for (i = 0; i < prf2->u.s2.cPins2; i++) { struct REG_RFP rrfp; - REGFILTERPINS2 rgPin2 = prf2->rgPins2[i]; + REGFILTERPINS2 rgPin2 = prf2->u.s2.rgPins2[i]; unsigned int j; rrfp.signature[0] = '0'; @@ -520,9 +503,9 @@ prf2->dwVersion = prrf->dwVersion; prf2->dwMerit = prrf->dwMerit; - prf2->cPins2 = prrf->dwPins; + prf2->u.s2.cPins2 = prrf->dwPins; rgPins2 = CoTaskMemAlloc(prrf->dwPins * sizeof(*rgPins2)); - prf2->rgPins2 = rgPins2; + prf2->u.s2.rgPins2 = rgPins2; pCurrent += sizeof(struct REG_RF); for (i = 0; i < prrf->dwPins; i++) @@ -604,21 +587,21 @@ static void FM2_DeleteRegFilter(REGFILTER2 * prf2) { UINT i; - for (i = 0; i < prf2->cPins2; i++) + for (i = 0; i < prf2->u.s2.cPins2; i++) { UINT j; - if (prf2->rgPins2[i].clsPinCategory) - CoTaskMemFree((LPVOID)prf2->rgPins2[i].clsPinCategory); - - for (j = 0; j < prf2->rgPins2[i].nMediaTypes; j++) + if (prf2->u.s2.rgPins2[i].clsPinCategory) + CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].clsPinCategory); + + for (j = 0; j < prf2->u.s2.rgPins2[i].nMediaTypes; j++) { - CoTaskMemFree((LPVOID)prf2->rgPins2[i].lpMediaType[j].clsMajorType); - CoTaskMemFree((LPVOID)prf2->rgPins2[i].lpMediaType[j].clsMinorType); + CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].lpMediaType[j].clsMajorType); + CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].lpMediaType[j].clsMinorType); } - CoTaskMemFree((LPVOID)prf2->rgPins2[i].lpMediaType); - CoTaskMemFree((LPVOID)prf2->rgPins2[i].lpMedium); - } - CoTaskMemFree((LPVOID)prf2->rgPins2); + CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].lpMediaType); + CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].lpMedium); + } + CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2); } static HRESULT WINAPI FilterMapper3_RegisterFilter( @@ -663,24 +646,24 @@ /* REGFILTER2 structure is converted from version 1 to 2. Tested on Win2k. */ regfilter2.dwVersion = 2; regfilter2.dwMerit = prf2->dwMerit; - regfilter2.cPins2 = prf2->cPins; - pregfp2 = CoTaskMemAlloc(prf2->cPins * sizeof(REGFILTERPINS2)); - regfilter2.rgPins2 = pregfp2; - for (i = 0; i < prf2->cPins; i++) + regfilter2.u.s2.cPins2 = prf2->u.s1.cPins; + pregfp2 = CoTaskMemAlloc(prf2->u.s1.cPins * sizeof(REGFILTERPINS2)); + regfilter2.u.s2.rgPins2 = pregfp2; + for (i = 0; i < prf2->u.s1.cPins; i++) { flags = 0; - if (prf2->rgPins[i].bRendered) + if (prf2->u.s1.rgPins[i].bRendered) flags |= REG_PINFLAG_B_RENDERER; - if (prf2->rgPins[i].bOutput) + if (prf2->u.s1.rgPins[i].bOutput) flags |= REG_PINFLAG_B_OUTPUT; - if (prf2->rgPins[i].bZero) + if (prf2->u.s1.rgPins[i].bZero) flags |= REG_PINFLAG_B_ZERO; - if (prf2->rgPins[i].bMany) + if (prf2->u.s1.rgPins[i].bMany) flags |= REG_PINFLAG_B_MANY; pregfp2[i].dwFlags = flags; pregfp2[i].cInstances = 1; - pregfp2[i].nMediaTypes = prf2->rgPins[i].nMediaTypes; - pregfp2[i].lpMediaType = prf2->rgPins[i].lpMediaType; + pregfp2[i].nMediaTypes = prf2->u.s1.rgPins[i].nMediaTypes; + pregfp2[i].lpMediaType = prf2->u.s1.rgPins[i].lpMediaType; pregfp2[i].nMediums = 0; pregfp2[i].lpMedium = NULL; pregfp2[i].clsPinCategory = NULL; @@ -1022,9 +1005,9 @@ /* determine whether filter meets requirements */ if (SUCCEEDED(hrSub) && (rf2.dwMerit >= dwMerit)) { - for (i = 0; (i < rf2.cPins2) && (!bInputMatch || !bOutputMatch); i++) + for (i = 0; (i < rf2.u.s2.cPins2) && (!bInputMatch || !bOutputMatch); i++) { - const REGFILTERPINS2 * rfp2 = rf2.rgPins2 + i; + const REGFILTERPINS2 * rfp2 = rf2.u.s2.rgPins2 + i; bInputMatch = bInputMatch || (!(rfp2->dwFlags & REG_PINFLAG_B_OUTPUT) && (!bRender || (rfp2->dwFlags & REG_PINFLAG_B_RENDERER)) && Modified: trunk/reactos/dll/directx/wine/quartz/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ma… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/main.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -17,13 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/debug.h> - #include "quartz_private.h" -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); extern HRESULT WINAPI QUARTZ_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/directx/wine/quartz/memallocator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/me… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/memallocator.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/memallocator.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -18,18 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -//#include <limits.h> -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "vfwmsgs.h" - #include "quartz_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct StdMediaSample2 { Modified: trunk/reactos/dll/directx/wine/quartz/mpegsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/mp… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -21,24 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -//#include <math.h> - #include "quartz_private.h" -#include "pin.h" - -//#include "uuids.h" -#include <mmreg.h> -//#include "mmsystem.h" - -//#include "winternl.h" - -//#include "wine/unicode.h" -#include <wine/debug.h> - -#include "parser.h" - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); #define SEQUENCE_HEADER_CODE 0xB3 #define PACK_START_CODE 0xBA Modified: trunk/reactos/dll/directx/wine/quartz/nullrenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/nu… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/nullrenderer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/nullrenderer.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -19,27 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include "quartz_private.h" -#include "pin.h" - -//#include "uuids.h" -//#include "vfwmsgs.h" -//#include "amvideo.h" -//#include "windef.h" -//#include "winbase.h" -//#include "dshow.h" -//#include "evcode.h" -//#include "strmif.h" -//#include "ddraw.h" - -#include <wine/unicode.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct NullRendererImpl { Modified: trunk/reactos/dll/directx/wine/quartz/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pa… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -20,20 +20,6 @@ */ #include "quartz_private.h" -#include "pin.h" - -//#include "vfwmsgs.h" -//#include "amvideo.h" - -#include <wine/unicode.h> -#include <wine/debug.h> - -//#include <math.h> -#include <assert.h> - -#include "parser.h" - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const IMediaSeekingVtbl Parser_Seeking_Vtbl; Modified: trunk/reactos/dll/directx/wine/quartz/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -19,15 +19,6 @@ */ #include "quartz_private.h" -#include "pin.h" - -#include <wine/debug.h> -#include <wine/unicode.h> -//#include "uuids.h" -//#include "vfwmsgs.h" -#include <assert.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const IPinVtbl PullPin_Vtbl; Modified: trunk/reactos/dll/directx/wine/quartz/quartz_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/qu… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/quartz_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/quartz_private.h [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -20,11 +20,17 @@ #ifndef __QUARTZ_PRIVATE_INCLUDED__ #define __QUARTZ_PRIVATE_INCLUDED__ +#include <config.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H #include <stdarg.h> +#include <assert.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #define COBJMACROS @@ -36,8 +42,19 @@ #include <objbase.h> #include <oleauto.h> #include <dshow.h> +#include <dvdmedia.h> +#include <vfw.h> +#include <aviriff.h> + #include <wine/strmbase.h> #include <wine/list.h> +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(quartz); + +#include "pin.h" +#include "parser.h" #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define SEC_FROM_MEDIATIME(time) ((time) / 10000000) Modified: trunk/reactos/dll/directx/wine/quartz/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/re… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -18,32 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#define COBJMACROS -#include <stdarg.h> -//#include <string.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <winreg.h> -//#include "winerror.h" - -//#include "ole2.h" -#include "objbase.h" -#include <uuids.h> -#include <strmif.h> - -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); +#include "quartz_private.h" /* * Near the bottom of this file are the exported DllRegisterServer and Modified: trunk/reactos/dll/directx/wine/quartz/systemclock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/sy… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/systemclock.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/systemclock.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -19,12 +19,6 @@ */ #include "quartz_private.h" - -#include <wine/debug.h> -//#include "wine/unicode.h" -//#include <assert.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct SystemClockAdviseEntry SystemClockAdviseEntry; struct SystemClockAdviseEntry { Modified: trunk/reactos/dll/directx/wine/quartz/videorenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/videorenderer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/videorenderer.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -18,29 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include "quartz_private.h" -#include "pin.h" - -//#include "uuids.h" -//#include "vfwmsgs.h" -//#include "amvideo.h" -//#include "windef.h" -//#include "winbase.h" -//#include "dshow.h" -//#include "evcode.h" -//#include "strmif.h" -//#include "ddraw.h" -#include <dvdmedia.h> - -//#include <assert.h> -#include <wine/unicode.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct VideoRendererImpl { Modified: trunk/reactos/dll/directx/wine/quartz/vmr9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vm… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -20,30 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include "quartz_private.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include "amvideo.h" -#include "windef.h" -#include "winbase.h" -#include "dshow.h" -#include "evcode.h" -#include "strmif.h" -#include "ddraw.h" -#include "dvdmedia.h" -#include "d3d9.h" -#include "vmr9.h" -#include "pin.h" - -#include "wine/unicode.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); +#include <d3d9.h> +#include <vmr9.h> typedef struct { Modified: trunk/reactos/dll/directx/wine/quartz/waveparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/wa… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/waveparser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/waveparser.c [iso-8859-1] Sun Dec 22 17:03:20 2013 @@ -19,22 +19,6 @@ */ #include "quartz_private.h" -#include "pin.h" - -//#include "uuids.h" -#include <aviriff.h> -//#include "vfwmsgs.h" -//#include "mmsystem.h" - -//#include "wine/unicode.h" -#include <wine/debug.h> - -//#include <math.h> -//#include <assert.h> - -#include "parser.h" - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0};

10 years, 9 months

[akhaldi] 61335: [QEDIT] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in t...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 22 16:59:08 2013 New Revision: 61335 URL: http://svn.reactos.org/svn/reactos?rev=61335&view=rev Log: [QEDIT] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/directx/wine/qedit/main.c trunk/reactos/dll/directx/wine/qedit/mediadet.c trunk/reactos/dll/directx/wine/qedit/qedit_private.h trunk/reactos/dll/directx/wine/qedit/samplegrabber.c Modified: trunk/reactos/dll/directx/wine/qedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/mai… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/main.c [iso-8859-1] Sun Dec 22 16:59:08 2013 @@ -19,9 +19,6 @@ #include "qedit_private.h" #include <rpcproxy.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(qedit); static HINSTANCE instance; Modified: trunk/reactos/dll/directx/wine/qedit/mediadet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/med… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/mediadet.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/mediadet.c [iso-8859-1] Sun Dec 22 16:59:08 2013 @@ -17,20 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "qedit_private.h" #include <assert.h> -//#include <stdarg.h> - -#define COBJMACROS - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "ole2.h" - -#include "qedit_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(qedit); typedef struct MediaDetImpl { IUnknown IUnknown_inner; Modified: trunk/reactos/dll/directx/wine/qedit/qedit_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/qed… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/qedit_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/qedit_private.h [iso-8859-1] Sun Dec 22 16:59:08 2013 @@ -40,6 +40,9 @@ #define __WINE_DDRAW_H /* ROS HACK */ #include <qedit.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(qedit); + HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/directx/wine/qedit/samplegrabber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/sam… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/samplegrabber.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/samplegrabber.c [iso-8859-1] Sun Dec 22 16:59:08 2013 @@ -17,20 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <assert.h> -//#include <stdarg.h> - -#define COBJMACROS - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "ole2.h" - #include "qedit_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(qedit); static const WCHAR vendor_name[] = { 'W', 'i', 'n', 'e', 0 }; static const WCHAR pin_in_name[] = { 'I', 'n', 0 };

10 years, 9 months

[jgardou] 61334: [CMIDRIVER] - Do not use the WAVERT interface, it's a win vista+ thing

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Dec 22 16:58:58 2013 New Revision: 61334 URL: http://svn.reactos.org/svn/reactos?rev=61334&view=rev Log: [CMIDRIVER] - Do not use the WAVERT interface, it's a win vista+ thing Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/debug.hpp Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt [iso-8859-1] Sun Dec 22 16:58:58 2013 @@ -33,7 +33,7 @@ add_cd_file(TARGET cmipci DESTINATION reactos/system32/drivers FOR all) if(ARCH STREQUAL "i386") - add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/CM8738-x32-WaveRT.inf" DESTINATION reactos/inf FOR all) + add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/CM8738-x32.inf" DESTINATION reactos/inf FOR all) else() - add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/CM8738-x64-WaveRT.inf" DESTINATION reactos/inf FOR all) + add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/CM8738-x64.inf" DESTINATION reactos/inf FOR all) endif() Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/debug.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/debug.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/debug.hpp [iso-8859-1] Sun Dec 22 16:58:58 2013 @@ -29,7 +29,7 @@ #define _DEBUG_HPP_ #define CMIVERSION "1.2.6" -#define WAVERT +// #define WAVERT //#define UART //disabled for improved stability on ULi motherboards #if (DBG)

10 years, 9 months

[akhaldi] 61333: [STRMBASE] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist i...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 22 16:51:58 2013 New Revision: 61333 URL: http://svn.reactos.org/svn/reactos?rev=61333&view=rev Log: [STRMBASE] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/lib/3rdparty/strmbase/audio.c trunk/reactos/lib/3rdparty/strmbase/dispatch.c trunk/reactos/lib/3rdparty/strmbase/dllfunc.c trunk/reactos/lib/3rdparty/strmbase/enumpins.c trunk/reactos/lib/3rdparty/strmbase/filter.c trunk/reactos/lib/3rdparty/strmbase/mediatype.c trunk/reactos/lib/3rdparty/strmbase/outputqueue.c trunk/reactos/lib/3rdparty/strmbase/pin.c trunk/reactos/lib/3rdparty/strmbase/pospass.c trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c trunk/reactos/lib/3rdparty/strmbase/renderer.c trunk/reactos/lib/3rdparty/strmbase/seeking.c trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h trunk/reactos/lib/3rdparty/strmbase/transform.c trunk/reactos/lib/3rdparty/strmbase/video.c trunk/reactos/lib/3rdparty/strmbase/window.c Modified: trunk/reactos/lib/3rdparty/strmbase/audio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/audi… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/audio.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/audio.c [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -18,15 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include <assert.h> -#include "dshow.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include "wine/unicode.h" -#include "wine/strmbase.h" - +#include "strmbase_private.h" static inline BasicAudio *impl_from_IBasicAudio(IBasicAudio *iface) { Modified: trunk/reactos/lib/3rdparty/strmbase/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/disp… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/dispatch.c [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/unicode.h" -#include "wine/strmbase.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include <assert.h> +#include "strmbase_private.h" HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid) { Modified: trunk/reactos/lib/3rdparty/strmbase/dllfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/dllf… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/dllfunc.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/dllfunc.c [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -18,29 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winerror.h" -#include "winreg.h" -#include "objbase.h" -#include "uuids.h" -#include "strmif.h" - -#include "wine/unicode.h" -#include "wine/debug.h" -#include "wine/strmbase.h" - -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); + +#include "strmbase_private.h" extern const int g_cTemplates; extern const FactoryTemplate g_Templates[]; Modified: trunk/reactos/lib/3rdparty/strmbase/enumpins.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/enum… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/enumpins.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/enumpins.c [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -19,13 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/strmbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +#include "strmbase_private.h" typedef struct IEnumPinsImpl { Modified: trunk/reactos/lib/3rdparty/strmbase/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/filt… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/filter.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/filter.c [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -18,16 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/strmbase.h" -#include "uuids.h" -#include <assert.h> - -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +#include "strmbase_private.h" static inline BaseFilter *impl_from_IBaseFilter(IBaseFilter *iface) { Modified: trunk/reactos/lib/3rdparty/strmbase/mediatype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/medi… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/mediatype.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/mediatype.c [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -18,15 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS -#include "dshow.h" - -#include "wine/strmbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); + +#include "strmbase_private.h" HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE *dest, const AM_MEDIA_TYPE *src) { Modified: trunk/reactos/lib/3rdparty/strmbase/outputqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/outp… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/outputqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/outputqueue.c [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -18,18 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" -#include "wine/strmbase.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include <assert.h> - -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +#include "strmbase_private.h" enum {SAMPLE_PACKET, EOS_PACKET}; Modified: trunk/reactos/lib/3rdparty/strmbase/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/pin.… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/pin.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/pin.c [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -19,17 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/strmbase.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include <assert.h> - -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +#include "strmbase_private.h" static const IPinVtbl InputPin_Vtbl; static const IPinVtbl OutputPin_Vtbl; Modified: trunk/reactos/lib/3rdparty/strmbase/pospass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/posp… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/pospass.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/pospass.c [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -20,17 +20,7 @@ */ /* FIXME: critical sections */ -#define COBJMACROS - -#include "dshow.h" -#include "uuids.h" - -#include "wine/debug.h" -#include "wine/strmbase.h" - -#include <assert.h> - -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +#include "strmbase_private.h" static const IMediaSeekingVtbl IMediaSeekingPassThru_Vtbl; static const IMediaPositionVtbl IMediaPositionPassThru_Vtbl; Modified: trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/qual… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -23,18 +23,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/strmbase.h" #include "strmbase_private.h" - -#include "uuids.h" -#include "wine/debug.h" - -#include <assert.h> - -WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) { QualityControlImpl *This; Modified: trunk/reactos/lib/3rdparty/strmbase/renderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/rend… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/renderer.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/renderer.c [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -18,17 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/strmbase.h" -#include "uuids.h" -#include "vfwmsgs.h" #include "strmbase_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const WCHAR wcsAltInputPinName[] = {'I','n',0}; Modified: trunk/reactos/lib/3rdparty/strmbase/seeking.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/seek… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/seeking.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/seeking.c [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -20,17 +20,7 @@ */ /* FIXME: critical sections */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/strmbase.h" - -#include "uuids.h" -#include "wine/debug.h" - -#include <assert.h> - -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +#include "strmbase_private.h" static inline SourceSeeking *impl_from_IMediaSeeking(IMediaSeeking *iface) { Modified: trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/strm… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -17,6 +17,26 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include <config.h> + +#include <assert.h> + +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN + +#define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + +#include <dshow.h> + +#include <wine/list.h> +#include <wine/strmbase.h> +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(strmbase); /* Quality Control */ typedef struct QualityControlImpl { Modified: trunk/reactos/lib/3rdparty/strmbase/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/tran… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -18,26 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "dshow.h" -#include "amvideo.h" -#include "strmif.h" -#include "vfw.h" - -#include <assert.h> - -#include "wine/unicode.h" -#include "wine/debug.h" -#include "wine/strmbase.h" + #include "strmbase_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0}; Modified: trunk/reactos/lib/3rdparty/strmbase/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/vide… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/video.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/video.c [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -18,17 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include <assert.h> -#include "dshow.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/strmbase.h" - -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +#include "strmbase_private.h" static inline BaseControlVideo *impl_from_IBasicVideo(IBasicVideo *iface) { Modified: trunk/reactos/lib/3rdparty/strmbase/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/wind… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/window.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/window.c [iso-8859-1] Sun Dec 22 16:51:58 2013 @@ -18,17 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/strmbase.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include <assert.h> - -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +#include "strmbase_private.h" static inline BaseControlWindow *impl_from_IVideoWindow( IVideoWindow *iface) {

10 years, 9 months

[jgardou] 61332: [NTOSKRNL] - Stop being shy and claim having WDM 1.30, like windows 2003 does

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Dec 22 15:42:47 2013 New Revision: 61332 URL: http://svn.reactos.org/svn/reactos?rev=61332&view=rev Log: [NTOSKRNL] - Stop being shy and claim having WDM 1.30, like windows 2003 does Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/util.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] Sun Dec 22 15:42:47 2013 @@ -99,8 +99,8 @@ IoIsWdmVersionAvailable(IN UCHAR MajorVersion, IN UCHAR MinorVersion) { - /* Return support for WDM 1.10 (Windows 2000) */ - if (MajorVersion <= 1 && MinorVersion <= 0x10) return TRUE; + /* Return support for WDM 1.30 (Windows Server 2003) */ + if (MajorVersion <= 1 && MinorVersion <= 0x30) return TRUE; return FALSE; }

10 years, 9 months

[jgardou] 61331: [CMIPCI] - Use correct calling convention for some callbacks - Actually use DriverEntry as entry point CORE-7094 CORE-7668 #Comment Please retest after r61331

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Dec 22 15:26:17 2013 New Revision: 61331 URL: http://svn.reactos.org/svn/reactos?rev=61331&view=rev Log: [CMIPCI] - Use correct calling convention for some callbacks - Actually use DriverEntry as entry point CORE-7094 CORE-7668 #Comment Please retest after r61331 Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.hpp Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt [iso-8859-1] Sun Dec 22 15:26:17 2013 @@ -20,7 +20,7 @@ target_link_libraries(cmipci stdunk libcntpr) -set_module_type(cmipci wdmdriver UNICODE ENTRYPOINT 0) +set_module_type(cmipci wdmdriver UNICODE) add_importlibs(cmipci portcls hal ntoskrnl) Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp [iso-8859-1] Sun Dec 22 15:26:17 2013 @@ -33,7 +33,9 @@ #pragma code_seg("PAGE") #endif -NTSTATUS InstallSubdevice(PDEVICE_OBJECT DeviceObject, PIRP Irp, PWCHAR Name, REFGUID PortClassId, REFGUID MiniportClassId, PFNCREATEINSTANCE MiniportCreate, PUNKNOWN UnknownAdapter, PRESOURCELIST ResourceList, REFGUID PortInterfaceId, PUNKNOWN* OutPortUnknown) +static +NTSTATUS +InstallSubdevice(PDEVICE_OBJECT DeviceObject, PIRP Irp, PWCHAR Name, REFGUID PortClassId, REFGUID MiniportClassId, PFNCREATEINSTANCE MiniportCreate, PUNKNOWN UnknownAdapter, PRESOURCELIST ResourceList, REFGUID PortInterfaceId, PUNKNOWN* OutPortUnknown) { PAGED_CODE(); DBGPRINT(("InstallSubdevice()")); @@ -76,8 +78,9 @@ return ntStatus; } - -NTSTATUS ProcessResources(PRESOURCELIST ResourceList, PRESOURCELIST* UartResourceList) +static +NTSTATUS +ProcessResources(PRESOURCELIST ResourceList, PRESOURCELIST* UartResourceList) { PAGED_CODE(); ASSERT(ResourceList); @@ -107,7 +110,9 @@ } -NTSTATUS StartDevice(PDEVICE_OBJECT DeviceObject, PIRP Irp, PRESOURCELIST ResourceList) +NTSTATUS +NTAPI +StartDevice(PDEVICE_OBJECT DeviceObject, PIRP Irp, PRESOURCELIST ResourceList) { PAGED_CODE(); ASSERT(DeviceObject); @@ -256,10 +261,12 @@ PAGED_CODE(); DBGPRINT(("AddDevice()")); - return PcAddAdapterDevice(DriverObject, PhysicalDeviceObject, (PCPFNSTARTDEVICE)StartDevice, MAX_MINIPORTS, 0); -} - -bool CopyResourceDescriptor(PIO_RESOURCE_DESCRIPTOR pInResDescriptor, PIO_RESOURCE_DESCRIPTOR pOutResDescriptor) + return PcAddAdapterDevice(DriverObject, PhysicalDeviceObject, StartDevice, MAX_MINIPORTS, 0); +} + +static +bool +CopyResourceDescriptor(PIO_RESOURCE_DESCRIPTOR pInResDescriptor, PIO_RESOURCE_DESCRIPTOR pOutResDescriptor) { PAGED_CODE(); ASSERT(pInResDescriptor); @@ -302,7 +309,7 @@ #endif } -extern "C" NTSTATUS AdapterDispatchPnp(PDEVICE_OBJECT pDeviceObject, PIRP pIrp) +extern "C" NTSTATUS NTAPI AdapterDispatchPnp(PDEVICE_OBJECT pDeviceObject, PIRP pIrp) { PAGED_CODE(); ASSERT(pDeviceObject); @@ -390,7 +397,10 @@ return ntStatus; } -extern "C" NTSTATUS DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPathName) +extern "C" +NTSTATUS +NTAPI +DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPathName) { PAGED_CODE(); DBGPRINT(("DriverEntry()")); Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.hpp [iso-8859-1] Sun Dec 22 15:26:17 2013 @@ -62,7 +62,7 @@ IN POOL_TYPE PoolType ); -extern "C" NTSTATUS AdapterDispatchPnp +extern "C" NTSTATUS NTAPI AdapterDispatchPnp ( IN PDEVICE_OBJECT pDeviceObject, IN PIRP pIrp

10 years, 9 months

[akhaldi] 61330: [USBHUB] * Do not include debug.h into the main header. * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Dec 21 19:15:13 2013 New Revision: 61330 URL: http://svn.reactos.org/svn/reactos?rev=61330&view=rev Log: [USBHUB] * Do not include debug.h into the main header. * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/hub_fdo.c trunk/reactos/drivers/usb/usbhub/misc.c trunk/reactos/drivers/usb/usbhub/pdo.c trunk/reactos/drivers/usb/usbhub/usbhub.c trunk/reactos/drivers/usb/usbhub/usbhub.h Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Sat Dec 21 19:15:13 2013 @@ -8,8 +8,10 @@ * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ -#define INITGUID #include "usbhub.h" + +#define NDEBUG +#include <debug.h> NTSTATUS QueryStatusChangeEndpoint( Modified: trunk/reactos/drivers/usb/usbhub/hub_fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/hub_fdo… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/hub_fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/hub_fdo.c [iso-8859-1] Sat Dec 21 19:15:13 2013 @@ -7,7 +7,11 @@ * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ + #include "usbhub.h" + +#define NDEBUG +#include <debug.h> NTSTATUS USBHUB_ParentFDOStartDevice( Modified: trunk/reactos/drivers/usb/usbhub/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/misc.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/misc.c [iso-8859-1] Sat Dec 21 19:15:13 2013 @@ -7,8 +7,11 @@ * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ + #include "usbhub.h" -#include <stdarg.h> + +#define NDEBUG +#include <debug.h> VOID DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor) Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Sat Dec 21 19:15:13 2013 @@ -10,6 +10,9 @@ */ #include "usbhub.h" + +#define NDEBUG +#include <debug.h> #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) Modified: trunk/reactos/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.c [iso-8859-1] Sat Dec 21 19:15:13 2013 @@ -11,6 +11,9 @@ #include "usbhub.h" +#define NDEBUG +#include <debug.h> + NTSTATUS NTAPI USBHUB_Create( IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] Sat Dec 21 19:15:13 2013 @@ -1,6 +1,7 @@ #pragma once -#define NDEBUG +#define INITGUID + #include <ntifs.h> #include <ntddk.h> #include <wdmguid.h> @@ -8,9 +9,10 @@ #include <usbbusif.h> #include <usbioctl.h> #include <usb.h> +#include <stdarg.h> #include <stdio.h> #include <usbdlib.h> -#include <debug.h> + //BROKEN: #include <usbprotocoldefs.h> #include <pseh/pseh2.h> @@ -193,4 +195,4 @@ NTSTATUS USBHUB_ParentFDOStartDevice( IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); + IN PIRP Irp);

10 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2013