mirror of
https://github.com/reactos/reactos.git
synced 2024-09-28 13:34:53 +00:00
[CABINET] Sync with Wine Staging 3.3. CORE-14434
This commit is contained in:
parent
2781e242e6
commit
afb6bca511
|
@ -13,7 +13,7 @@ list(APPEND SOURCE
|
||||||
cabinet_main.c
|
cabinet_main.c
|
||||||
fci.c
|
fci.c
|
||||||
fdi.c
|
fdi.c
|
||||||
cabinet.h)
|
precomp.h)
|
||||||
|
|
||||||
add_library(cabinet SHARED
|
add_library(cabinet SHARED
|
||||||
${SOURCE}
|
${SOURCE}
|
||||||
|
@ -24,5 +24,5 @@ add_library(cabinet SHARED
|
||||||
set_module_type(cabinet win32dll)
|
set_module_type(cabinet win32dll)
|
||||||
target_link_libraries(cabinet wine zlib)
|
target_link_libraries(cabinet wine zlib)
|
||||||
add_importlibs(cabinet msvcrt kernel32 ntdll)
|
add_importlibs(cabinet msvcrt kernel32 ntdll)
|
||||||
add_pch(cabinet cabinet.h SOURCE)
|
add_pch(cabinet precomp.h SOURCE)
|
||||||
add_cd_file(TARGET cabinet DESTINATION reactos/system32 FOR all)
|
add_cd_file(TARGET cabinet DESTINATION reactos/system32 FOR all)
|
||||||
|
|
|
@ -18,24 +18,16 @@
|
||||||
* License along with this library; if not, write to the Free Software
|
* License along with this library; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __WINE_CABINET_H
|
#ifndef __WINE_CABINET_H
|
||||||
#define __WINE_CABINET_H
|
#define __WINE_CABINET_H
|
||||||
|
|
||||||
#include <wine/config.h>
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "windef.h"
|
||||||
#define _INC_WINDOWS
|
#include "winbase.h"
|
||||||
#define COM_NO_WINDOWS_H
|
#include "winnt.h"
|
||||||
|
#include "fdi.h"
|
||||||
#include <windef.h>
|
#include "fci.h"
|
||||||
#include <winbase.h>
|
|
||||||
#include <fdi.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
|
||||||
|
|
|
@ -18,11 +18,25 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#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
|
||||||
|
#include "shlwapi.h"
|
||||||
|
#undef NO_SHLWAPI_REG
|
||||||
|
|
||||||
#include "cabinet.h"
|
#include "cabinet.h"
|
||||||
|
|
||||||
#define NO_SHLWAPI_REG
|
#include "wine/debug.h"
|
||||||
#include <shlwapi.h>
|
|
||||||
#undef NO_SHLWAPI_REG
|
WINE_DEFAULT_DEBUG_CHANNEL(cabinet);
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* DllGetVersion (CABINET.2)
|
* DllGetVersion (CABINET.2)
|
||||||
|
|
|
@ -30,16 +30,28 @@ There is still some work to be done:
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "cabinet.h"
|
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <fci.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 <wine/list.h>
|
#include "windef.h"
|
||||||
|
#include "winbase.h"
|
||||||
|
#include "winerror.h"
|
||||||
|
#include "wine/winternl.h"
|
||||||
|
#include "fci.h"
|
||||||
|
#include "cabinet.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,9 +58,20 @@
|
||||||
* -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;
|
||||||
|
|
||||||
|
|
15
dll/win32/cabinet/precomp.h
Normal file
15
dll/win32/cabinet/precomp.h
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
|
||||||
|
#ifndef _WINE_CABINET_PRECOMP_H
|
||||||
|
#define _WINE_CABINET_PRECOMP_H
|
||||||
|
|
||||||
|
#include <wine/config.h>
|
||||||
|
|
||||||
|
#define WIN32_NO_STATUS
|
||||||
|
#define _INC_WINDOWS
|
||||||
|
#define COM_NO_WINDOWS_H
|
||||||
|
|
||||||
|
#include "cabinet.h"
|
||||||
|
|
||||||
|
#include <wine/debug.h>
|
||||||
|
|
||||||
|
#endif /* !_WINE_CABINET_PRECOMP_H */
|
|
@ -51,7 +51,7 @@ reactos/dll/win32/atl100 # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/avifil32 # Synced to WineStaging-3.3
|
reactos/dll/win32/avifil32 # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23
|
reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23
|
||||||
reactos/dll/win32/browseui # Out of sync
|
reactos/dll/win32/browseui # Out of sync
|
||||||
reactos/dll/win32/cabinet # Synced to Wine-3.0
|
reactos/dll/win32/cabinet # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/clusapi # Synced to WineStaging-2.9
|
reactos/dll/win32/clusapi # Synced to WineStaging-2.9
|
||||||
reactos/dll/win32/comcat # Synced to WineStaging-2.9
|
reactos/dll/win32/comcat # Synced to WineStaging-2.9
|
||||||
reactos/dll/win32/comctl32 # Synced to Wine-3.0
|
reactos/dll/win32/comctl32 # Synced to Wine-3.0
|
||||||
|
|
Loading…
Reference in a new issue