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.h... ============================================================================== --- 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_m... ============================================================================== --- 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/shlinstob... ============================================================================== --- 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