mirror of
https://github.com/reactos/reactos.git
synced 2025-05-23 02:56:09 +00:00
[SETUPAPI]
* Set the default debugging channel globally through the main header. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61443
This commit is contained in:
parent
07f504790f
commit
a4888c748b
17 changed files with 16 additions and 43 deletions
|
@ -21,7 +21,9 @@
|
|||
|
||||
#include "setupapi_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
#include <pnp_c.h>
|
||||
|
||||
#include "rpc_private.h"
|
||||
|
||||
/* Registry key and value names */
|
||||
static const WCHAR Backslash[] = {'\\', 0};
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "setupapi_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
#include <wingdi.h>
|
||||
|
||||
/* Unicode constants */
|
||||
static const WCHAR BackSlash[] = {'\\',0};
|
||||
|
|
|
@ -21,8 +21,6 @@
|
|||
|
||||
#include "setupapi_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
|
||||
/* Unicode constants */
|
||||
static const WCHAR BackSlash[] = {'\\',0};
|
||||
static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0};
|
||||
|
|
|
@ -20,8 +20,6 @@
|
|||
|
||||
#include "setupapi_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
|
||||
#define MAX_SYSTEM_DIRID DIRID_PRINTPROCESSOR
|
||||
#define MIN_CSIDL_DIRID 0x4000
|
||||
#define MAX_CSIDL_DIRID 0x403f
|
||||
|
|
|
@ -20,8 +20,6 @@
|
|||
|
||||
#include "setupapi_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
|
||||
typedef struct {
|
||||
WCHAR lpzName[20];
|
||||
LONGLONG dwFreeSpace;
|
||||
|
|
|
@ -20,8 +20,6 @@
|
|||
|
||||
#include "setupapi_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
|
||||
/* Unicode constants */
|
||||
static const WCHAR BackSlash[] = {'\\',0};
|
||||
static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0};
|
||||
|
|
|
@ -21,7 +21,8 @@
|
|||
|
||||
#include "setupapi_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
#include <winsvc.h>
|
||||
#include <ndk/cmfuncs.h>
|
||||
|
||||
/* Unicode constants */
|
||||
static const WCHAR BackSlash[] = {'\\',0};
|
||||
|
|
|
@ -21,8 +21,6 @@
|
|||
|
||||
#include "setupapi_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
|
||||
/* Unicode constants */
|
||||
static const WCHAR AddInterface[] = {'A','d','d','I','n','t','e','r','f','a','c','e',0};
|
||||
static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0};
|
||||
|
|
|
@ -21,7 +21,8 @@
|
|||
|
||||
#include "setupapi_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
#include <winver.h>
|
||||
#include <lzexpand.h>
|
||||
|
||||
/* Unicode constants */
|
||||
static const WCHAR BackSlash[] = {'\\',0};
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "setupapi_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
#include <ndk/obfuncs.h>
|
||||
|
||||
/* Unicode constants */
|
||||
static const WCHAR BackSlash[] = {'\\',0};
|
||||
|
|
|
@ -20,8 +20,6 @@
|
|||
|
||||
#include "setupapi_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
|
||||
static const WCHAR source_disks_names[] =
|
||||
{'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0};
|
||||
static const WCHAR source_disks_files[] =
|
||||
|
|
|
@ -22,8 +22,6 @@
|
|||
|
||||
#include <aclapi.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
|
||||
/* Unicode constants */
|
||||
static const WCHAR DotSecurity[] = {'.','S','e','c','u','r','i','t','y',0};
|
||||
|
||||
|
|
|
@ -20,8 +20,6 @@
|
|||
|
||||
#include "setupapi_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
|
||||
static RPC_BINDING_HANDLE LocalBindingHandle = NULL;
|
||||
static HSTRING_TABLE LocalStringTable = NULL;
|
||||
|
||||
|
|
|
@ -20,42 +20,29 @@
|
|||
#ifndef __SETUPAPI_PRIVATE_H
|
||||
#define __SETUPAPI_PRIVATE_H
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <share.h>
|
||||
#include <wchar.h>
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
#define COBJMACROS
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <winreg.h>
|
||||
#include <winsvc.h>
|
||||
#include <winver.h>
|
||||
#include <wingdi.h>
|
||||
#include <wincon.h>
|
||||
#include <objbase.h>
|
||||
#include <lzexpand.h>
|
||||
#include <cfgmgr32.h>
|
||||
#include <fdi.h>
|
||||
#include <regstr.h>
|
||||
#include <sddl.h>
|
||||
#include <setupapi.h>
|
||||
#include <shlobj.h>
|
||||
#include <wine/debug.h>
|
||||
#include <wine/unicode.h>
|
||||
#define NTOS_MODE_USER
|
||||
#include <ndk/cmfuncs.h>
|
||||
#include <ndk/obfuncs.h>
|
||||
#include <ndk/rtlfuncs.h>
|
||||
|
||||
//#include <pseh/pseh2.h>
|
||||
|
||||
#include <pnp_c.h>
|
||||
|
||||
#include "rpc_private.h"
|
||||
//#include "resource.h"
|
||||
#include <wine/debug.h>
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
|
||||
#ifdef __REACTOS__
|
||||
#undef __WINESRC__
|
||||
|
|
|
@ -25,6 +25,10 @@
|
|||
|
||||
#include "setupapi_private.h"
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <share.h>
|
||||
#include <fdi.h>
|
||||
|
||||
HINSTANCE hInstance = 0;
|
||||
OSVERSIONINFOW OsVersionInfo;
|
||||
|
||||
|
@ -56,8 +60,6 @@ typedef struct {
|
|||
WCHAR most_recent_cabinet_name[MAX_PATH];
|
||||
} SC_HSC_W, *PSC_HSC_W;
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
|
||||
static BOOL LoadCABINETDll(void)
|
||||
{
|
||||
if (!CABINET_hInstance) {
|
||||
|
|
|
@ -22,8 +22,6 @@
|
|||
|
||||
#define TABLE_DEFAULT_SIZE 256
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
|
||||
typedef struct _TABLE_SLOT
|
||||
{
|
||||
LPWSTR pString;
|
||||
|
|
|
@ -20,8 +20,6 @@
|
|||
|
||||
#include "setupapi_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
|
||||
/***********************************************************************
|
||||
* pSetupRegistryDelnode(SETUPAPI.@)
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue