mirror of
https://github.com/reactos/reactos.git
synced 2024-08-28 14:18:41 +00:00
[CABINET]
* 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=61338
This commit is contained in:
parent
6cf5162abd
commit
9bf098744c
|
@ -21,18 +21,23 @@
|
||||||
#ifndef __WINE_CABINET_H
|
#ifndef __WINE_CABINET_H
|
||||||
#define __WINE_CABINET_H
|
#define __WINE_CABINET_H
|
||||||
|
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
|
#include <stdarg.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
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
#include <windef.h>
|
#include <windef.h>
|
||||||
#include <winbase.h>
|
#include <winbase.h>
|
||||||
#include <winnt.h>
|
#include <winnt.h>
|
||||||
#include <fdi.h>
|
#include <fdi.h>
|
||||||
#include <fci.h>
|
#include <fci.h>
|
||||||
|
|
||||||
|
#include <wine/debug.h>
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(cabinet);
|
||||||
|
|
||||||
/* from msvcrt/sys/stat.h */
|
/* from msvcrt/sys/stat.h */
|
||||||
#define _S_IWRITE 0x0080
|
#define _S_IWRITE 0x0080
|
||||||
#define _S_IREAD 0x0100
|
#define _S_IREAD 0x0100
|
||||||
|
@ -66,10 +71,7 @@ typedef INT32 cab_LONG; /* 32 bits */
|
||||||
typedef UINT32 cab_off_t;
|
typedef UINT32 cab_off_t;
|
||||||
|
|
||||||
/* number of bits in a ULONG */
|
/* number of bits in a ULONG */
|
||||||
#ifndef CHAR_BIT
|
#define CAB_ULONG_BITS (sizeof(cab_ULONG) * 8) /* CHAR_BIT */
|
||||||
# define CHAR_BIT (8)
|
|
||||||
#endif
|
|
||||||
#define CAB_ULONG_BITS (sizeof(cab_ULONG) * CHAR_BIT)
|
|
||||||
|
|
||||||
/* structure offsets */
|
/* structure offsets */
|
||||||
#define cfhead_Signature (0x00)
|
#define cfhead_Signature (0x00)
|
||||||
|
|
|
@ -18,30 +18,12 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "cabinet.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
#define COM_NO_WINDOWS_H
|
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
|
|
||||||
//#include <assert.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winerror.h"
|
|
||||||
#define NO_SHLWAPI_REG
|
#define NO_SHLWAPI_REG
|
||||||
#include <shlwapi.h>
|
#include <shlwapi.h>
|
||||||
#undef NO_SHLWAPI_REG
|
#undef NO_SHLWAPI_REG
|
||||||
|
|
||||||
#include "cabinet.h"
|
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(cabinet);
|
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* DllGetVersion (CABINET.2)
|
* DllGetVersion (CABINET.2)
|
||||||
*
|
*
|
||||||
|
|
|
@ -30,28 +30,15 @@ There is still some work to be done:
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "cabinet.h"
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
//#include <stdarg.h>
|
|
||||||
//#include <stdio.h>
|
|
||||||
//#include <string.h>
|
|
||||||
#ifdef HAVE_ZLIB
|
#ifdef HAVE_ZLIB
|
||||||
# include <zlib.h>
|
# include <zlib.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//#include <windef.h>
|
|
||||||
//#include <winbase.h>
|
|
||||||
//#include "winerror.h"
|
|
||||||
//#include "winternl.h"
|
|
||||||
//#include <fci.h>
|
|
||||||
#include "cabinet.h"
|
|
||||||
#include <wine/list.h>
|
#include <wine/list.h>
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(cabinet);
|
|
||||||
|
|
||||||
#ifdef WORDS_BIGENDIAN
|
#ifdef WORDS_BIGENDIAN
|
||||||
#define fci_endian_ulong(x) RtlUlongByteSwap(x)
|
#define fci_endian_ulong(x) RtlUlongByteSwap(x)
|
||||||
|
|
|
@ -58,20 +58,8 @@
|
||||||
* -gmt
|
* -gmt
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
|
|
||||||
//#include <stdarg.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
//#include "windef.h"
|
|
||||||
//#include "winbase.h"
|
|
||||||
//#include "winerror.h"
|
|
||||||
//#include "fdi.h"
|
|
||||||
#include "cabinet.h"
|
#include "cabinet.h"
|
||||||
|
#include <stdio.h>
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(cabinet);
|
|
||||||
|
|
||||||
THOSE_ZIP_CONSTS;
|
THOSE_ZIP_CONSTS;
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,6 @@ DeleteExtractedFiles(
|
||||||
UNIMPLEMENTED;
|
UNIMPLEMENTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
LPCSTR
|
LPCSTR
|
||||||
WINAPI
|
WINAPI
|
||||||
GetDllVersion(void)
|
GetDllVersion(void)
|
||||||
|
@ -19,4 +18,3 @@ GetDllVersion(void)
|
||||||
/* This is what it returns on Windows XP SP3 */
|
/* This is what it returns on Windows XP SP3 */
|
||||||
return "5.1.2600.5512";
|
return "5.1.2600.5512";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue