ChangeLog:
* dlls/lzexpand/lzexpand_main.c
* dlls/lzexpand/lzexpand16.c
* dlls/lzexpand/Makefile.in
- Seperate the 16-bit funcitons into a seperate file.
Index: dlls/lzexpand/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/lzexpand/Makefile.in,v
retrieving revision 1.15
diff -u -r1.15 Makefile.in
--- dlls/lzexpand/Makefile.in 17 May 2002 03:37:13 -0000 1.15
+++ dlls/lzexpand/Makefile.in 24 Sep 2002 18:52:28 -0000
@@ -11,7 +11,8 @@
SYMBOLFILE = $(MODULE).tmp.o
C_SRCS = \
- lzexpand_main.c
+ lzexpand_main.c \
+ lzexpand16.c
@MAKE_DLL_RULES@
Index: dlls/lzexpand/lzexpand_main.c
===================================================================
RCS file: /home/wine/wine/dlls/lzexpand/lzexpand_main.c,v
retrieving revision 1.17
diff -u -r1.17 lzexpand_main.c
--- dlls/lzexpand/lzexpand_main.c 28 Aug 2002 23:42:34 -0000 1.17
+++ dlls/lzexpand/lzexpand_main.c 24 Sep 2002 18:52:32 -0000
@@ -35,7 +35,6 @@
#include "lzexpand.h"
#include "wine/unicode.h"
-#include "wine/winbase16.h"
#include "wine/debug.h"
@@ -136,15 +135,6 @@
return 1;
}
-/***********************************************************************
- * LZStart (LZEXPAND.7)
- */
-INT16 WINAPI LZStart16(void)
-{
- TRACE("(void)\n");
- return 1;
-}
-
/***********************************************************************
* LZStart (LZ32.@)
@@ -157,18 +147,6 @@
/***********************************************************************
- * LZInit (LZEXPAND.3)
- */
-HFILE16 WINAPI LZInit16( HFILE16 hfSrc )
-{
- HFILE ret = LZInit( DosFileHandleToWin32Handle(hfSrc) );
- if (IS_LZ_HANDLE(ret)) return ret;
- if ((INT)ret <= 0) return ret;
- return hfSrc;
-}
-
-
-/***********************************************************************
* LZInit (LZ32.@)
*
* initializes internal decompression buffers, returns lzfiledescriptor.
@@ -232,15 +210,6 @@
/***********************************************************************
- * GetExpandedName (LZEXPAND.10)
- */
-INT16 WINAPI GetExpandedName16( LPCSTR in, LPSTR out )
-{
- return (INT16)GetExpandedNameA( in, out );
-}
-
-
-/***********************************************************************
* GetExpandedNameA (LZ32.@)
*
* gets the full filename of the compressed file 'in' by opening it
@@ -337,16 +306,6 @@
/***********************************************************************
- * LZRead (LZEXPAND.5)
- */
-INT16 WINAPI LZRead16( HFILE16 fd, LPVOID buf, UINT16 toread )
-{
- if (IS_LZ_HANDLE(fd)) return LZRead( fd, buf, toread );
- return _lread( DosFileHandleToWin32Handle(fd), buf, toread );
-}
-
-
-/***********************************************************************
* LZRead (LZ32.@)
*/
INT WINAPI LZRead( HFILE fd, LPVOID vbuf, UINT toread )
@@ -438,16 +397,6 @@
/***********************************************************************
- * LZSeek (LZEXPAND.4)
- */
-LONG WINAPI LZSeek16( HFILE16 fd, LONG off, INT16 type )
-{
- if (IS_LZ_HANDLE(fd)) return LZSeek( fd, off, type );
- return _llseek( DosFileHandleToWin32Handle(fd), off, type );
-}
-
-
-/***********************************************************************
* LZSeek (LZ32.@)
*/
LONG WINAPI LZSeek( HFILE fd, LONG off, INT type )
@@ -480,29 +429,6 @@
/***********************************************************************
- * LZCopy (LZEXPAND.1)
- *
- */
-LONG WINAPI LZCopy16( HFILE16 src, HFILE16 dest )
-{
- /* already a LZ handle? */
- if (IS_LZ_HANDLE(src)) return LZCopy( src, DosFileHandleToWin32Handle(dest) );
-
- /* no, try to open one */
- src = LZInit16(src);
- if ((INT16)src <= 0) return 0;
- if (IS_LZ_HANDLE(src))
- {
- LONG ret = LZCopy( src, DosFileHandleToWin32Handle(dest) );
- LZClose( src );
- return ret;
- }
- /* it was not a compressed file */
- return LZCopy( DosFileHandleToWin32Handle(src), DosFileHandleToWin32Handle(dest) );
-}
-
-
-/***********************************************************************
* LZCopy (LZ32.@)
*
* Copies everything from src to dest
@@ -577,20 +503,6 @@
/***********************************************************************
- * LZOpenFile (LZEXPAND.2)
- */
-HFILE16 WINAPI LZOpenFile16( LPCSTR fn, LPOFSTRUCT ofs, UINT16 mode )
-{
- HFILE hfret = LZOpenFileA( fn, ofs, mode );
- /* return errors and LZ handles unmodified */
- if ((INT)hfret <= 0) return hfret;
- if (IS_LZ_HANDLE(hfret)) return hfret;
- /* but allocate a dos handle for 'normal' files */
- return Win32HandleToDosFileHandle(hfret);
-}
-
-
-/***********************************************************************
* LZOpenFileA (LZ32.@)
*
* Opens a file. If not compressed, open it as a normal file.
@@ -634,16 +546,6 @@
/***********************************************************************
- * LZClose (LZEXPAND.6)
- */
-void WINAPI LZClose16( HFILE16 fd )
-{
- if (IS_LZ_HANDLE(fd)) LZClose( fd );
- else DisposeLZ32Handle( DosFileHandleToWin32Handle(fd) );
-}
-
-
-/***********************************************************************
* LZClose (LZ32.@)
*/
void WINAPI LZClose( HFILE fd )
@@ -659,15 +561,6 @@
lzstates[fd - 0x400] = NULL;
HeapFree( GetProcessHeap(), 0, lzs );
}
-}
-
-/***********************************************************************
- * CopyLZFile (LZEXPAND.8)
- */
-LONG WINAPI CopyLZFile16( HFILE16 src, HFILE16 dest )
-{
- TRACE("(%d,%d)\n",src,dest);
- return LZCopy16(src,dest);
}
--- /dev/null 1970-01-01 02:00:00.000000000 +0200
+++ dlls/lzexpand/lzexpand16.c 2002-09-24 14:52:14.000000000 +0200
@@ -0,0 +1,140 @@
+/*
+ * LZ Decompression functions
+ *
+ * Copyright 1996 Marcus Meissner
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "winbase.h"
+#include "lzexpand.h"
+
+#include "wine/winbase16.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(file);
+
+#define MAX_LZSTATES 16
+
+#define IS_LZ_HANDLE(h) (((h) >= 0x400) && ((h) < 0x400+MAX_LZSTATES))
+
+
+/***********************************************************************
+ * LZStart (LZEXPAND.7)
+ */
+INT16 WINAPI LZStart16(void)
+{
+ TRACE("(void)\n");
+ return 1;
+}
+
+
+/***********************************************************************
+ * LZInit (LZEXPAND.3)
+ */
+HFILE16 WINAPI LZInit16( HFILE16 hfSrc )
+{
+ HFILE ret = LZInit( DosFileHandleToWin32Handle(hfSrc) );
+ if (IS_LZ_HANDLE(ret)) return ret;
+ if ((INT)ret <= 0) return ret;
+ return hfSrc;
+}
+
+
+/***********************************************************************
+ * GetExpandedName (LZEXPAND.10)
+ */
+INT16 WINAPI GetExpandedName16( LPCSTR in, LPSTR out )
+{
+ return (INT16)GetExpandedNameA( in, out );
+}
+
+
+/***********************************************************************
+ * LZRead (LZEXPAND.5)
+ */
+INT16 WINAPI LZRead16( HFILE16 fd, LPVOID buf, UINT16 toread )
+{
+ if (IS_LZ_HANDLE(fd)) return LZRead( fd, buf, toread );
+ return _lread( DosFileHandleToWin32Handle(fd), buf, toread );
+}
+
+
+/***********************************************************************
+ * LZSeek (LZEXPAND.4)
+ */
+LONG WINAPI LZSeek16( HFILE16 fd, LONG off, INT16 type )
+{
+ if (IS_LZ_HANDLE(fd)) return LZSeek( fd, off, type );
+ return _llseek( DosFileHandleToWin32Handle(fd), off, type );
+}
+
+
+/***********************************************************************
+ * LZCopy (LZEXPAND.1)
+ *
+ */
+LONG WINAPI LZCopy16( HFILE16 src, HFILE16 dest )
+{
+ /* already a LZ handle? */
+ if (IS_LZ_HANDLE(src)) return LZCopy( src, DosFileHandleToWin32Handle(dest) );
+
+ /* no, try to open one */
+ src = LZInit16(src);
+ if ((INT16)src <= 0) return 0;
+ if (IS_LZ_HANDLE(src))
+ {
+ LONG ret = LZCopy( src, DosFileHandleToWin32Handle(dest) );
+ LZClose( src );
+ return ret;
+ }
+ /* it was not a compressed file */
+ return LZCopy( DosFileHandleToWin32Handle(src), DosFileHandleToWin32Handle(dest) );
+}
+
+
+/***********************************************************************
+ * LZOpenFile (LZEXPAND.2)
+ */
+HFILE16 WINAPI LZOpenFile16( LPCSTR fn, LPOFSTRUCT ofs, UINT16 mode )
+{
+ HFILE hfret = LZOpenFileA( fn, ofs, mode );
+ /* return errors and LZ handles unmodified */
+ if ((INT)hfret <= 0) return hfret;
+ if (IS_LZ_HANDLE(hfret)) return hfret;
+ /* but allocate a dos handle for 'normal' files */
+ return Win32HandleToDosFileHandle(hfret);
+}
+
+
+/***********************************************************************
+ * LZClose (LZEXPAND.6)
+ */
+void WINAPI LZClose16( HFILE16 fd )
+{
+ if (IS_LZ_HANDLE(fd)) LZClose( fd );
+ else DisposeLZ32Handle( DosFileHandleToWin32Handle(fd) );
+}
+
+
+/***********************************************************************
+ * CopyLZFile (LZEXPAND.8)
+ */
+LONG WINAPI CopyLZFile16( HFILE16 src, HFILE16 dest )
+{
+ TRACE("(%d,%d)\n",src,dest);
+ return LZCopy16(src,dest);
+}
