Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-03 21:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHDOCVW]

Browse source 
* 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

svn path=/trunk/; revision=61337
This commit is contained in:
Amine Khaldi 2013-12-22 17:11:12 +00:00
parent dd9b9c9af9
commit 6cf5162abd
3 changed files with 8 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reactos/dll/win32/shdocvw/shdocvw.h
View file

@ -22,24 +22,25 @@
#ifndef __WINE_SHDOCVW_H #ifndef __WINE_SHDOCVW_H
#define __WINE_SHDOCVW_H #define __WINE_SHDOCVW_H
#include <config.h>
#include <stdarg.h>
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#define _INC_WINDOWS #define _INC_WINDOWS
#define COM_NO_WINDOWS_H #define COM_NO_WINDOWS_H
#define COBJMACROS #define COBJMACROS
#include <stdarg.h>
#include <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
//#include "winuser.h" #include <winreg.h>
#include <ole2.h>
#include <shlobj.h> #include <shlobj.h>
//#include "exdisp.h"
#include <wine/unicode.h> #include <wine/unicode.h>
//#include "wine/list.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
/********************************************************************** /**********************************************************************
* Shell Instance Objects * Shell Instance Objects

14
reactos/dll/win32/shdocvw/shdocvw_main.c
View file

@ -20,24 +20,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "shdocvw.h"
#include <winreg.h>
#include <shlwapi.h> #include <shlwapi.h>
#include <wininet.h> #include <wininet.h>
//#include "isguids.h"
//#include "initguid.h"
WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
LONG SHDOCVW_refCount = 0; LONG SHDOCVW_refCount = 0;

15
reactos/dll/win32/shdocvw/shlinstobj.c
View file

@ -23,23 +23,8 @@
* some registry entries. This feature was introduced with win2k. Please * some registry entries. This feature was introduced with win2k. Please
* search for 'Shell Instance Objects' on MSDN to get more information. */ * 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 "shdocvw.h"
//#include "wine/unicode.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
#define CHARS_IN_GUID 39 #define CHARS_IN_GUID 39
/****************************************************************************** /******************************************************************************