[ros-diffs] [winesync] 22828: Autosyncing with Wine

Author: winesync
Date: Tue Jul  4 17:58:40 2006
New Revision: 22828

URL: http://svn.reactos.org/svn/reactos?rev=22828&view=rev
Log:
Autosyncing with Wine

Added:
    trunk/reactos/dll/win32/lz32/lz32.spec   (with props)
    trunk/reactos/dll/win32/lz32/lzexpand.spec   (with props)
    trunk/reactos/dll/win32/lz32/lzexpand16.c   (with props)
Removed:
    trunk/reactos/dll/win32/lz32/lz32.def
    trunk/reactos/dll/win32/lz32/lz32.rc
Modified:
    trunk/reactos/dll/win32/lz32/lz32.rbuild
    trunk/reactos/dll/win32/lz32/lzexpand_main.c

Removed: trunk/reactos/dll/win32/lz32/lz32.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/lz32.def?re…
==============================================================================
--- trunk/reactos/dll/win32/lz32/lz32.def (original)
+++ trunk/reactos/dll/win32/lz32/lz32.def (removed)
@@ -1,19 +1,0 @@
-; File generated automatically from lzexpand/lz32.spec; do not edit!
-
-LIBRARY lz32.dll
-
-EXPORTS
-CopyLZFile(a)8=KERNEL32.CopyLZFile
-GetExpandedNameA(a)8=KERNEL32.GetExpandedNameA
-GetExpandedNameW(a)8=KERNEL32.GetExpandedNameW
-LZClose(a)4=KERNEL32.LZClose
-;LZCloseFile
-LZCopy(a)8=KERNEL32.LZCopy
-;LZCreateFileW
-LZDone(a)0=KERNEL32.LZDone
-LZInit(a)4=KERNEL32.LZInit
-LZOpenFileA(a)12=KERNEL32.LZOpenFileA
-LZOpenFileW(a)12=KERNEL32.LZOpenFileW
-LZRead(a)12=KERNEL32.LZRead
-LZSeek(a)12=KERNEL32.LZSeek
-LZStart(a)0=KERNEL32.LZStart

Modified: trunk/reactos/dll/win32/lz32/lz32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/lz32.rbuild…
==============================================================================
--- trunk/reactos/dll/win32/lz32/lz32.rbuild (original)
+++ trunk/reactos/dll/win32/lz32/lz32.rbuild Tue Jul  4 17:58:40 2006
@@ -1,10 +1,16 @@
-<module name="lz32" type="win32dll"
baseaddress="${BASEADDRESS_LZ32}" installbase="system32"
installname="lz32.dll">
-	<importlibrary definition="lz32.def" />
+<module name="lz32" type="win32dll"
baseaddress="${BASEADDRESS_LZ32}" installbase="system32"
installname="lz32.dll" allowwarnings="true">
+	<importlibrary definition="lz32.spec.def" />
 	<include base="lz32">.</include>
-	<define name="_DISABLE_TIDENTS" />
+	<include base="ReactOS">include/reactos/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<library>wine</library>
+	<library>kernel32</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<file>lzexpand_main.c</file>
-	<file>lz32.rc</file>
+	<file>lz32.spec</file>
 </module>

Removed: trunk/reactos/dll/win32/lz32/lz32.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/lz32.rc?rev…
==============================================================================
--- trunk/reactos/dll/win32/lz32/lz32.rc (original)
+++ trunk/reactos/dll/win32/lz32/lz32.rc (removed)
@@ -1,5 +1,0 @@
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION	"Lempel-Ziv Expander\0"
-#define REACTOS_STR_INTERNAL_NAME	"lz32\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"lz32.dll\0"
-#include <reactos/version.rc>

Added: trunk/reactos/dll/win32/lz32/lz32.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/lz32.spec?r…
==============================================================================
--- trunk/reactos/dll/win32/lz32/lz32.spec (added)
+++ trunk/reactos/dll/win32/lz32/lz32.spec Tue Jul  4 17:58:40 2006
@@ -1,0 +1,12 @@
+@ stdcall CopyLZFile(long long) kernel32.CopyLZFile
+@ stdcall GetExpandedNameA(str ptr) kernel32.GetExpandedNameA
+@ stdcall GetExpandedNameW(wstr ptr) kernel32.GetExpandedNameW
+@ stdcall LZClose(long) kernel32.LZClose
+@ stdcall LZCopy(long long) kernel32.LZCopy
+@ stdcall LZDone() kernel32.LZDone
+@ stdcall LZInit(long) kernel32.LZInit
+@ stdcall LZOpenFileA(str ptr long) kernel32.LZOpenFileA
+@ stdcall LZOpenFileW(wstr ptr long) kernel32.LZOpenFileW
+@ stdcall LZRead(long ptr long) kernel32.LZRead
+@ stdcall LZSeek(long long long) kernel32.LZSeek
+@ stdcall LZStart() kernel32.LZStart

Propchange: trunk/reactos/dll/win32/lz32/lz32.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/lz32/lzexpand.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/lzexpand.sp…
==============================================================================
--- trunk/reactos/dll/win32/lz32/lzexpand.spec (added)
+++ trunk/reactos/dll/win32/lz32/lzexpand.spec Tue Jul  4 17:58:40 2006
@@ -1,0 +1,12 @@
+1  pascal   LZCopy(word word) LZCopy16
+2  pascal -ret16 LZOpenFile(str ptr word) LZOpenFile16
+3  pascal -ret16 LZInit(word) LZInit16
+4  pascal   LZSeek(word long word) LZSeek16
+5  pascal -ret16 LZRead(word ptr word) LZRead16
+6  pascal -ret16 LZClose(word) LZClose16
+7  pascal -ret16 LZStart() LZStart16
+8  pascal   CopyLZFile(word word) CopyLZFile16
+9  pascal -ret16 LZDone() LZDone16
+10 pascal -ret16 GetExpandedName(str ptr) GetExpandedName16
+#11 WEP
+#12 ___EXPORTEDSTUB

Propchange: trunk/reactos/dll/win32/lz32/lzexpand.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/lz32/lzexpand16.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/lzexpand16.…
==============================================================================
--- trunk/reactos/dll/win32/lz32/lzexpand16.c (added)
+++ trunk/reactos/dll/win32/lz32/lzexpand16.c Tue Jul  4 17:58:40 2006
@@ -1,0 +1,152 @@
+/*
+ * 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 <stdarg.h>
+
+#include "windef.h"
+#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( (HFILE)DosFileHandleToWin32Handle(hfSrc) );
+    if (IS_LZ_HANDLE(ret)) return ret;
+    if ((INT)ret <= 0) return ret;
+    return hfSrc;
+}
+
+
+/***********************************************************************
+ *           GetExpandedName   (LZEXPAND.10)
+ */
+INT16 WINAPI GetExpandedName16( LPSTR 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( (HFILE)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( (HFILE)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, (HFILE)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, (HFILE)DosFileHandleToWin32Handle(dest) );
+        LZClose( src );
+        return ret;
+    }
+    /* it was not a compressed file */
+    return LZCopy( (HFILE)DosFileHandleToWin32Handle(src),
(HFILE)DosFileHandleToWin32Handle(dest) );
+}
+
+
+/***********************************************************************
+ *           LZOpenFile   (LZEXPAND.2)
+ */
+HFILE16 WINAPI LZOpenFile16( LPSTR 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((HANDLE)hfret);
+}
+
+
+/***********************************************************************
+ *           LZClose   (LZEXPAND.6)
+ */
+void WINAPI LZClose16( HFILE16 fd )
+{
+    if (IS_LZ_HANDLE(fd)) LZClose( fd );
+    else DisposeLZ32Handle( DosFileHandleToWin32Handle((HFILE)fd) );
+}
+
+
+/***********************************************************************
+ *           CopyLZFile   (LZEXPAND.8)
+ */
+LONG WINAPI CopyLZFile16( HFILE16 src, HFILE16 dest )
+{
+    TRACE("(%d,%d)\n",src,dest);
+    return LZCopy16(src,dest);
+}
+
+
+/***********************************************************************
+ *           LZDone   (LZEXPAND.9)
+ */
+void WINAPI LZDone16(void)
+{
+    TRACE("(void)\n");
+}

Propchange: trunk/reactos/dll/win32/lz32/lzexpand16.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/lz32/lzexpand_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/lzexpand_ma…
==============================================================================
--- trunk/reactos/dll/win32/lz32/lzexpand_main.c (original)
+++ trunk/reactos/dll/win32/lz32/lzexpand_main.c Tue Jul  4 17:58:40 2006
@@ -1,29 +1,1 @@
-/*
- * 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 "windows.h"
-
-BOOL STDCALL
-DllMain(HANDLE hDll,
-	DWORD dwReason,
-	LPVOID lpReserved)
-{
-   return TRUE;
-}
+/* Nothing here - See lzexpand.c in kernel32 */