mirror of
https://github.com/reactos/reactos.git
synced 2024-07-04 03:34:16 +00:00
[ADVPACK]
* 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=61345
This commit is contained in:
parent
f085d641dc
commit
841399ed95
|
@ -19,24 +19,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <winuser.h>
|
||||
#include <winreg.h>
|
||||
#include <winternl.h>
|
||||
//#include "winnls.h"
|
||||
//#include "setupapi.h"
|
||||
#include <advpub.h>
|
||||
#include <wine/unicode.h>
|
||||
#include <wine/debug.h>
|
||||
#include "advpack_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(advpack);
|
||||
|
||||
typedef HRESULT (WINAPI *DLLREGISTER) (void);
|
||||
|
||||
#define MAX_FIELD_LENGTH 512
|
||||
|
|
|
@ -21,6 +21,24 @@
|
|||
#ifndef __ADVPACK_PRIVATE_H
|
||||
#define __ADVPACK_PRIVATE_H
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <winuser.h>
|
||||
#include <winreg.h>
|
||||
#include <winternl.h>
|
||||
#include <advpub.h>
|
||||
|
||||
#include <wine/unicode.h>
|
||||
|
||||
#include <wine/debug.h>
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(advpack);
|
||||
|
||||
HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN;
|
||||
LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) DECLSPEC_HIDDEN;
|
||||
void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN;
|
||||
|
|
|
@ -18,25 +18,10 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
|
||||
#include <stdarg.h>
|
||||
//#include <stdlib.h>
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <winuser.h>
|
||||
#include <winreg.h>
|
||||
#include <winver.h>
|
||||
#include <winternl.h>
|
||||
//#include "setupapi.h"
|
||||
#include <advpub.h>
|
||||
#include <fdi.h>
|
||||
#include <wine/debug.h>
|
||||
#include <wine/unicode.h>
|
||||
#include "advpack_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(advpack);
|
||||
#include <winver.h>
|
||||
#include <fdi.h>
|
||||
|
||||
/* converts an ansi double null-terminated list to a unicode list */
|
||||
static LPWSTR ansi_to_unicode_list(LPCSTR ansi_list)
|
||||
|
|
|
@ -18,27 +18,9 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
||||
#include <stdarg.h>
|
||||
//#include <stdlib.h>
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <winuser.h>
|
||||
#include <winreg.h>
|
||||
#include <winternl.h>
|
||||
//#include "winnls.h"
|
||||
//#include "setupapi.h"
|
||||
#include <advpub.h>
|
||||
#include <ole2.h>
|
||||
#include <wine/debug.h>
|
||||
#include <wine/unicode.h>
|
||||
#include "advpack_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(advpack);
|
||||
#include <ole2.h>
|
||||
|
||||
#define SPAPI_ERROR 0xE0000000L
|
||||
#define SPAPI_PREFIX 0x800F0000L
|
||||
|
|
|
@ -18,20 +18,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <winreg.h>
|
||||
//#include "winerror.h"
|
||||
#include <winuser.h>
|
||||
#include <winternl.h>
|
||||
#include <advpub.h>
|
||||
#include <wine/unicode.h>
|
||||
#include <wine/debug.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(advpack);
|
||||
#include "advpack_private.h"
|
||||
|
||||
static const WCHAR REGINST[] = {'R','E','G','I','N','S','T',0};
|
||||
static const WCHAR Strings[] = {'S','t','r','i','n','g','s',0};
|
||||
|
|
Loading…
Reference in a new issue