mirror of
https://github.com/reactos/reactos.git
synced 2024-08-02 17:40:58 +00:00
[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 svn path=/trunk/; revision=61327
This commit is contained in:
parent
cd74723d2f
commit
b54cee4f88
|
@ -23,18 +23,9 @@
|
||||||
* - Also creates the special registry keys created at run-time
|
* - Also creates the special registry keys created at run-time
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
|
|
||||||
#include "devenum_private.h"
|
#include "devenum_private.h"
|
||||||
#include <vfw.h>
|
#include <vfw.h>
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
//#include "wine/unicode.h"
|
|
||||||
//#include "mmddk.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(devenum);
|
|
||||||
|
|
||||||
extern HINSTANCE DEVENUM_hInstance;
|
extern HINSTANCE DEVENUM_hInstance;
|
||||||
|
|
||||||
const WCHAR wszInstanceKeyName[] ={'I','n','s','t','a','n','c','e',0};
|
const WCHAR wszInstanceKeyName[] ={'I','n','s','t','a','n','c','e',0};
|
||||||
|
|
|
@ -20,10 +20,8 @@
|
||||||
|
|
||||||
#pragma code_page(65001)
|
#pragma code_page(65001)
|
||||||
|
|
||||||
//#include "windef.h"
|
#include <windef.h>
|
||||||
//#include "winbase.h"
|
#include "resource.h"
|
||||||
//#include "winnls.h"
|
|
||||||
#include "devenum_private.h"
|
|
||||||
|
|
||||||
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
|
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
|
||||||
|
|
||||||
|
|
|
@ -21,9 +21,6 @@
|
||||||
|
|
||||||
#include "devenum_private.h"
|
#include "devenum_private.h"
|
||||||
#include <rpcproxy.h>
|
#include <rpcproxy.h>
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(devenum);
|
|
||||||
|
|
||||||
DECLSPEC_HIDDEN LONG dll_refs;
|
DECLSPEC_HIDDEN LONG dll_refs;
|
||||||
DECLSPEC_HIDDEN HINSTANCE DEVENUM_hInstance;
|
DECLSPEC_HIDDEN HINSTANCE DEVENUM_hInstance;
|
||||||
|
|
|
@ -30,24 +30,29 @@
|
||||||
#define _INC_WINDOWS
|
#define _INC_WINDOWS
|
||||||
#define COM_NO_WINDOWS_H
|
#define COM_NO_WINDOWS_H
|
||||||
|
|
||||||
|
#define NONAMELESSSTRUCT
|
||||||
|
#define NONAMELESSUNION
|
||||||
|
|
||||||
#include <windef.h>
|
#include <windef.h>
|
||||||
#include <winbase.h>
|
#include <winbase.h>
|
||||||
#include <wingdi.h>
|
#include <wingdi.h>
|
||||||
//#include "winuser.h"
|
|
||||||
#include <winreg.h>
|
#include <winreg.h>
|
||||||
//#include "winerror.h"
|
|
||||||
|
|
||||||
#define COBJMACROS
|
#define COBJMACROS
|
||||||
|
|
||||||
#include <ole2.h>
|
#include <ole2.h>
|
||||||
#include <strmif.h>
|
#include <strmif.h>
|
||||||
//#include "olectl.h"
|
|
||||||
#include <uuids.h>
|
#include <uuids.h>
|
||||||
|
|
||||||
|
#include <wine/debug.h>
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(devenum);
|
||||||
|
|
||||||
#ifndef RC_INVOKED
|
#ifndef RC_INVOKED
|
||||||
#include <wine/unicode.h>
|
#include <wine/unicode.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "resource.h"
|
||||||
|
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
* Dll lifetime tracking declaration for devenum.dll
|
* Dll lifetime tracking declaration for devenum.dll
|
||||||
*/
|
*/
|
||||||
|
@ -89,13 +94,3 @@ HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR
|
||||||
extern const WCHAR clsid_keyname[6];
|
extern const WCHAR clsid_keyname[6];
|
||||||
extern const WCHAR wszInstanceKeyName[];
|
extern const WCHAR wszInstanceKeyName[];
|
||||||
#define CLSID_STR_LEN (sizeof(clsid_keyname) / sizeof(WCHAR))
|
#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
|
|
||||||
|
|
|
@ -21,10 +21,6 @@
|
||||||
|
|
||||||
#include "devenum_private.h"
|
#include "devenum_private.h"
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(devenum);
|
|
||||||
|
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
* DEVENUM_IClassFactory_QueryInterface (also IUnknown)
|
* DEVENUM_IClassFactory_QueryInterface (also IUnknown)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -23,13 +23,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "devenum_private.h"
|
#include "devenum_private.h"
|
||||||
//#include "oleauto.h"
|
|
||||||
#include <ocidl.h>
|
#include <ocidl.h>
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(devenum);
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
IEnumMoniker IEnumMoniker_iface;
|
IEnumMoniker IEnumMoniker_iface;
|
||||||
|
|
|
@ -21,12 +21,9 @@
|
||||||
* - Implements IParseDisplayName interface which creates a moniker
|
* - Implements IParseDisplayName interface which creates a moniker
|
||||||
* from a string in a special format
|
* from a string in a special format
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "devenum_private.h"
|
#include "devenum_private.h"
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(devenum);
|
|
||||||
|
|
||||||
static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface(IParseDisplayName *iface,
|
static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface(IParseDisplayName *iface,
|
||||||
REFIID riid, void **ppv)
|
REFIID riid, void **ppv)
|
||||||
{
|
{
|
||||||
|
|
8
reactos/dll/directx/wine/devenum/resource.h
Normal file
8
reactos/dll/directx/wine/devenum/resource.h
Normal file
|
@ -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
|
Loading…
Reference in a new issue