* 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=61335
This commit is contained in:
Amine Khaldi 2013-12-22 16:59:08 +00:00
parent ba2ab59c2f
commit 96c3ffb738
4 changed files with 4 additions and 29 deletions

View file

@ -19,9 +19,6 @@
#include "qedit_private.h"
#include <rpcproxy.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(qedit);
static HINSTANCE instance;

View file

@ -17,20 +17,8 @@
* 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);
#include <assert.h>
typedef struct MediaDetImpl {
IUnknown IUnknown_inner;

View file

@ -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;

View file

@ -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 };