[ros-diffs] [akhaldi] 61338: [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...

Author: akhaldi
Date: Sun Dec 22 17:55:22 2013
New Revision: 61338

URL: http://svn.reactos.org/svn/reactos?rev=61338&view=rev
Log:
[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

Modified:
    trunk/reactos/dll/win32/cabinet/cabinet.h
    trunk/reactos/dll/win32/cabinet/cabinet_main.c
    trunk/reactos/dll/win32/cabinet/fci.c
    trunk/reactos/dll/win32/cabinet/fdi.c
    trunk/reactos/dll/win32/cabinet/stubs.c

Modified: trunk/reactos/dll/win32/cabinet/cabinet.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/cabinet.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/cabinet.h	[iso-8859-1] Sun Dec 22 17:55:22 2013
@@ -21,17 +21,22 @@
 #ifndef __WINE_CABINET_H
 #define __WINE_CABINET_H
 
+#include <config.h>
+
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
 
 #include <windef.h>
 #include <winbase.h>
 #include <winnt.h>
 #include <fdi.h>
 #include <fci.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(cabinet);
 
 /* from msvcrt/sys/stat.h */
 #define _S_IWRITE 0x0080
@@ -66,10 +71,7 @@
 typedef UINT32        cab_off_t;
 
 /* number of bits in a ULONG */
-#ifndef CHAR_BIT
-# define CHAR_BIT (8)
-#endif
-#define CAB_ULONG_BITS (sizeof(cab_ULONG) * CHAR_BIT)
+#define CAB_ULONG_BITS (sizeof(cab_ULONG) * 8) /* CHAR_BIT */
 
 /* structure offsets */
 #define cfhead_Signature         (0x00)

Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/cabinet_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/cabinet_main.c	[iso-8859-1] Sun Dec 22 17:55:22 2013
@@ -18,29 +18,11 @@
  * 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 <config.h>
-
-//#include <assert.h>
-#include <stdarg.h>
-//#include <string.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
+#include "cabinet.h"
+
 #define NO_SHLWAPI_REG
 #include <shlwapi.h>
 #undef NO_SHLWAPI_REG
-
-#include "cabinet.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(cabinet);
-
 
 /***********************************************************************
  * DllGetVersion (CABINET.2)

Modified: trunk/reactos/dll/win32/cabinet/fci.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?re…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/fci.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/fci.c	[iso-8859-1] Sun Dec 22 17:55:22 2013
@@ -30,28 +30,15 @@
 
 */
 
-
-
-#include <config.h>
+#include "cabinet.h"
 
 #include <assert.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
+
 #ifdef HAVE_ZLIB
 # include <zlib.h>
 #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/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(cabinet);
 
 #ifdef WORDS_BIGENDIAN
 #define fci_endian_ulong(x) RtlUlongByteSwap(x)

Modified: trunk/reactos/dll/win32/cabinet/fdi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/fdi.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/fdi.c	[iso-8859-1] Sun Dec 22 17:55:22 2013
@@ -58,20 +58,8 @@
  *   -gmt
  */
 
-#include <config.h>
-
-//#include <stdarg.h>
+#include "cabinet.h"
 #include <stdio.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "fdi.h"
-#include "cabinet.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(cabinet);
 
 THOSE_ZIP_CONSTS;
 

Modified: trunk/reactos/dll/win32/cabinet/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/stubs.c?…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/stubs.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/stubs.c	[iso-8859-1] Sun Dec 22 17:55:22 2013
@@ -11,7 +11,6 @@
     UNIMPLEMENTED;
 }
 
-
 LPCSTR
 WINAPI
 GetDllVersion(void)
@@ -19,4 +18,3 @@
     /* This is what it returns on Windows XP SP3 */
     return "5.1.2600.5512";
 }
-