[akhaldi] 61327: [DEVENUM] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Extract the resource IDs into resource.h and include it...
Author: akhaldi Date: Sat Dec 21 18:21:51 2013 New Revision: 61327
URL: http://svn.reactos.org/svn/reactos?rev=61327&view=rev Log: [DEVENUM] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Extract the resource IDs into resource.h and include it in both the main header and the resource file. * Remove inclusions and definitions that already exist in the main header. CORE-7716
Added: trunk/reactos/dll/directx/wine/devenum/resource.h (with props) Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c trunk/reactos/dll/directx/wine/devenum/devenum.rc trunk/reactos/dll/directx/wine/devenum/devenum_main.c trunk/reactos/dll/directx/wine/devenum/devenum_private.h trunk/reactos/dll/directx/wine/devenum/factory.c trunk/reactos/dll/directx/wine/devenum/mediacatenum.c trunk/reactos/dll/directx/wine/devenum/parsedisplayname.c
Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/cr... ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -23,17 +23,8 @@ * - Also creates the special registry keys created at run-time */
-#define NONAMELESSSTRUCT -#define NONAMELESSUNION - #include "devenum_private.h" #include <vfw.h> - -#include <wine/debug.h> -//#include "wine/unicode.h" -//#include "mmddk.h" - -WINE_DEFAULT_DEBUG_CHANNEL(devenum);
extern HINSTANCE DEVENUM_hInstance;
Modified: trunk/reactos/dll/directx/wine/devenum/devenum.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/de... ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/devenum.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/devenum.rc [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -20,10 +20,8 @@
#pragma code_page(65001)
-//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" -#include "devenum_private.h" +#include <windef.h> +#include "resource.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/directx/wine/devenum/devenum_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/de... ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/devenum_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/devenum_main.c [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -21,9 +21,6 @@
#include "devenum_private.h" #include <rpcproxy.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(devenum);
DECLSPEC_HIDDEN LONG dll_refs; DECLSPEC_HIDDEN HINSTANCE DEVENUM_hInstance;
Modified: trunk/reactos/dll/directx/wine/devenum/devenum_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/de... ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/devenum_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/devenum_private.h [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -30,23 +30,28 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H
+#define NONAMELESSSTRUCT +#define NONAMELESSUNION + #include <windef.h> #include <winbase.h> #include <wingdi.h> -//#include "winuser.h" #include <winreg.h> -//#include "winerror.h"
#define COBJMACROS
#include <ole2.h> #include <strmif.h> -//#include "olectl.h" #include <uuids.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(devenum);
#ifndef RC_INVOKED #include <wine/unicode.h> #endif + +#include "resource.h"
/********************************************************************** * Dll lifetime tracking declaration for devenum.dll @@ -89,13 +94,3 @@ extern const WCHAR clsid_keyname[6]; extern const WCHAR wszInstanceKeyName[]; #define CLSID_STR_LEN (sizeof(clsid_keyname) / sizeof(WCHAR)) - -/********************************************************************** - * Resource IDs - */ -#define IDS_DEVENUM_DSDEFAULT 7 -#define IDS_DEVENUM_DS 8 -#define IDS_DEVENUM_WODEFAULT 9 -#define IDS_DEVENUM_MIDEFAULT 10 -#define IDS_DEVENUM_KSDEFAULT 11 -#define IDS_DEVENUM_KS 12
Modified: trunk/reactos/dll/directx/wine/devenum/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/fa... ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/factory.c [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -20,10 +20,6 @@ */
#include "devenum_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(devenum);
/********************************************************************** * DEVENUM_IClassFactory_QueryInterface (also IUnknown)
Modified: trunk/reactos/dll/directx/wine/devenum/mediacatenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/me... ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/mediacatenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/mediacatenum.c [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -23,12 +23,7 @@ */
#include "devenum_private.h" -//#include "oleauto.h" #include <ocidl.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(devenum);
typedef struct {
Modified: trunk/reactos/dll/directx/wine/devenum/parsedisplayname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/pa... ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/parsedisplayname.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/parsedisplayname.c [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -21,11 +21,8 @@ * - Implements IParseDisplayName interface which creates a moniker * from a string in a special format */ + #include "devenum_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(devenum);
static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface(IParseDisplayName *iface, REFIID riid, void **ppv)
Added: trunk/reactos/dll/directx/wine/devenum/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/re... ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/resource.h (added) +++ trunk/reactos/dll/directx/wine/devenum/resource.h [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -0,0 +1,8 @@ +#pragma once + +#define IDS_DEVENUM_DSDEFAULT 7 +#define IDS_DEVENUM_DS 8 +#define IDS_DEVENUM_WODEFAULT 9 +#define IDS_DEVENUM_MIDEFAULT 10 +#define IDS_DEVENUM_KSDEFAULT 11 +#define IDS_DEVENUM_KS 12
Propchange: trunk/reactos/dll/directx/wine/devenum/resource.h ------------------------------------------------------------------------------ svn:eol-style = native
-
akhaldi＠svn.reactos.org