Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUPAPI]

Browse source 
* 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:
Amine Khaldi 2013-12-27 11:32:40 +00:00
parent 07f504790f
commit a4888c748b
17 changed files with 16 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/setupapi/cfgmgr.c
View file

@ -21,7 +21,9 @@
#include "setupapi_private.h" #include "setupapi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi); #include <pnp_c.h>
#include "rpc_private.h"
/* Registry key and value names */ /* Registry key and value names */
static const WCHAR Backslash[] = {'\\', 0}; static const WCHAR Backslash[] = {'\\', 0};

2
reactos/dll/win32/setupapi/devclass.c
View file

@ -21,7 +21,7 @@
#include "setupapi_private.h" #include "setupapi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi); #include <wingdi.h>
/* Unicode constants */ /* Unicode constants */
static const WCHAR BackSlash[] = {'\\',0}; static const WCHAR BackSlash[] = {'\\',0};

2
reactos/dll/win32/setupapi/devinst.c
View file

@ -21,8 +21,6 @@
#include "setupapi_private.h" #include "setupapi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
/* Unicode constants */ /* Unicode constants */
static const WCHAR BackSlash[] = {'\\',0}; static const WCHAR BackSlash[] = {'\\',0};
static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0}; static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0};

2
reactos/dll/win32/setupapi/dirid.c
View file

@ -20,8 +20,6 @@
#include "setupapi_private.h" #include "setupapi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
#define MAX_SYSTEM_DIRID DIRID_PRINTPROCESSOR #define MAX_SYSTEM_DIRID DIRID_PRINTPROCESSOR
#define MIN_CSIDL_DIRID 0x4000 #define MIN_CSIDL_DIRID 0x4000
#define MAX_CSIDL_DIRID 0x403f #define MAX_CSIDL_DIRID 0x403f

2
reactos/dll/win32/setupapi/diskspace.c
View file

@ -20,8 +20,6 @@
#include "setupapi_private.h" #include "setupapi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
typedef struct { typedef struct {
WCHAR lpzName[20]; WCHAR lpzName[20];
LONGLONG dwFreeSpace; LONGLONG dwFreeSpace;

2
reactos/dll/win32/setupapi/driver.c
View file

@ -20,8 +20,6 @@
#include "setupapi_private.h" #include "setupapi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
/* Unicode constants */ /* Unicode constants */
static const WCHAR BackSlash[] = {'\\',0}; static const WCHAR BackSlash[] = {'\\',0};
static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0}; static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0};

3
reactos/dll/win32/setupapi/install.c
View file

@ -21,7 +21,8 @@
#include "setupapi_private.h" #include "setupapi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi); #include <winsvc.h>
#include <ndk/cmfuncs.h>
/* Unicode constants */ /* Unicode constants */
static const WCHAR BackSlash[] = {'\\',0}; static const WCHAR BackSlash[] = {'\\',0};

2
reactos/dll/win32/setupapi/interface.c
View file

@ -21,8 +21,6 @@
#include "setupapi_private.h" #include "setupapi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
/* Unicode constants */ /* Unicode constants */
static const WCHAR AddInterface[] = {'A','d','d','I','n','t','e','r','f','a','c','e',0}; 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}; static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0};

3
reactos/dll/win32/setupapi/misc.c
View file

@ -21,7 +21,8 @@
#include "setupapi_private.h" #include "setupapi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi); #include <winver.h>
#include <lzexpand.h>
/* Unicode constants */ /* Unicode constants */
static const WCHAR BackSlash[] = {'\\',0}; static const WCHAR BackSlash[] = {'\\',0};

2
reactos/dll/win32/setupapi/parser.c
View file

@ -21,7 +21,7 @@
#include "setupapi_private.h" #include "setupapi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi); #include <ndk/obfuncs.h>
/* Unicode constants */ /* Unicode constants */
static const WCHAR BackSlash[] = {'\\',0}; static const WCHAR BackSlash[] = {'\\',0};

2
reactos/dll/win32/setupapi/query.c
View file

@ -20,8 +20,6 @@
#include "setupapi_private.h" #include "setupapi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
static const WCHAR source_disks_names[] = static const WCHAR source_disks_names[] =
{'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0};
static const WCHAR source_disks_files[] = static const WCHAR source_disks_files[] =

2
reactos/dll/win32/setupapi/queue.c
View file

@ -22,8 +22,6 @@
#include <aclapi.h> #include <aclapi.h>
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
/* Unicode constants */ /* Unicode constants */
static const WCHAR DotSecurity[] = {'.','S','e','c','u','r','i','t','y',0}; static const WCHAR DotSecurity[] = {'.','S','e','c','u','r','i','t','y',0};

2
reactos/dll/win32/setupapi/rpc.c
View file

@ -20,8 +20,6 @@
#include "setupapi_private.h" #include "setupapi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
static RPC_BINDING_HANDLE LocalBindingHandle = NULL; static RPC_BINDING_HANDLE LocalBindingHandle = NULL;
static HSTRING_TABLE LocalStringTable = NULL; static HSTRING_TABLE LocalStringTable = NULL;

19
reactos/dll/win32/setupapi/setupapi_private.h
View file

@ -20,42 +20,29 @@
#ifndef __SETUPAPI_PRIVATE_H #ifndef __SETUPAPI_PRIVATE_H
#define __SETUPAPI_PRIVATE_H #define __SETUPAPI_PRIVATE_H
#include <fcntl.h>
#include <share.h>
#include <wchar.h> #include <wchar.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 <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
#include <winreg.h> #include <winreg.h>
#include <winsvc.h>
#include <winver.h>
#include <wingdi.h>
#include <wincon.h> #include <wincon.h>
#include <objbase.h> #include <objbase.h>
#include <lzexpand.h>
#include <cfgmgr32.h> #include <cfgmgr32.h>
#include <fdi.h>
#include <regstr.h> #include <regstr.h>
#include <sddl.h> #include <sddl.h>
#include <setupapi.h> #include <setupapi.h>
#include <shlobj.h> #include <shlobj.h>
#include <wine/debug.h>
#include <wine/unicode.h> #include <wine/unicode.h>
#define NTOS_MODE_USER #define NTOS_MODE_USER
#include <ndk/cmfuncs.h>
#include <ndk/obfuncs.h>
#include <ndk/rtlfuncs.h> #include <ndk/rtlfuncs.h>
//#include <pseh/pseh2.h> #include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
#include <pnp_c.h>
#include "rpc_private.h"
//#include "resource.h"
#ifdef __REACTOS__ #ifdef __REACTOS__
#undef __WINESRC__ #undef __WINESRC__

6
reactos/dll/win32/setupapi/setupcab.c
View file

@ -25,6 +25,10 @@
#include "setupapi_private.h" #include "setupapi_private.h"
#include <fcntl.h>
#include <share.h>
#include <fdi.h>
HINSTANCE hInstance = 0; HINSTANCE hInstance = 0;
OSVERSIONINFOW OsVersionInfo; OSVERSIONINFOW OsVersionInfo;
@ -56,8 +60,6 @@ typedef struct {
WCHAR most_recent_cabinet_name[MAX_PATH]; WCHAR most_recent_cabinet_name[MAX_PATH];
} SC_HSC_W, *PSC_HSC_W; } SC_HSC_W, *PSC_HSC_W;
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
static BOOL LoadCABINETDll(void) static BOOL LoadCABINETDll(void)
{ {
if (!CABINET_hInstance) { if (!CABINET_hInstance) {

2
reactos/dll/win32/setupapi/stringtable.c
View file

@ -22,8 +22,6 @@
#define TABLE_DEFAULT_SIZE 256 #define TABLE_DEFAULT_SIZE 256
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
typedef struct _TABLE_SLOT typedef struct _TABLE_SLOT
{ {
LPWSTR pString; LPWSTR pString;

2
reactos/dll/win32/setupapi/stubs.c
View file

@ -20,8 +20,6 @@
#include "setupapi_private.h" #include "setupapi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
/*********************************************************************** /***********************************************************************
* pSetupRegistryDelnode(SETUPAPI.@) * pSetupRegistryDelnode(SETUPAPI.@)
*/ */