version: Make ver.dll into a stand-alone 16-bit module.

.gitignore

@@ -120,7 +120,6 @@ dlls/shdocvw/shdocvw_v1.tlb
 dlls/stdole2.tlb/std_ole_v2.tlb
 dlls/stdole32.tlb/std_ole_v1.tlb
 dlls/user.exe16
-dlls/ver.dll16
 dlls/wineps16.drv16
 dlls/wprocs.dll16
 include/activaut.h

configure

@@ -16868,6 +16868,14 @@ dlls/vdmdbg/Makefile: dlls/vdmdbg/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/vdmdbg/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
+	dlls/ver.dll16/Makefile"
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	ver.dll16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/ver.dll16/Makefile: dlls/ver.dll16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/ver.dll16/Makefile"
+
+ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/version/Makefile"
 test "x$enable_version" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	version"
@@ -19105,6 +19113,7 @@ do
     "dlls/uxtheme/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/uxtheme/tests/Makefile" ;;
     "dlls/vdhcp.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/vdhcp.vxd/Makefile" ;;
     "dlls/vdmdbg/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/vdmdbg/Makefile" ;;
+    "dlls/ver.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ver.dll16/Makefile" ;;
     "dlls/version/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/version/Makefile" ;;
     "dlls/version/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/version/tests/Makefile" ;;
     "dlls/vmm.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/vmm.vxd/Makefile" ;;

configure.ac

@@ -2471,6 +2471,7 @@ WINE_CONFIG_MAKEFILE([dlls/uxtheme/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL
 WINE_CONFIG_MAKEFILE([dlls/uxtheme/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/vdhcp.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/vdmdbg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ver.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/version/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/version/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/vmm.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])

dlls/Makefile.in

@@ -24,7 +24,6 @@ WIN16_FILES = \
 	mmsystem.dll16 \
 	setupx.dll16 \
 	user.exe16 \
-	ver.dll16 \
 	wineps16.drv16 \
 	wprocs.dll16
 
@@ -51,9 +50,6 @@ setupx.dll16:
 user.exe16:
 	echo "user32.dll" >$@
 
-ver.dll16:
-	echo "version.dll" >$@
-
 wprocs.dll16:
 	echo "winedos.dll" >$@
 

dlls/ver.dll16/Makefile.in

+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = ver.dll16
+IMPORTS   = version lz32 kernel32
+
+EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,version.dll
+
+C_SRCS = version.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend

dlls/version/Makefile.in

@@ -13,11 +13,6 @@ C_SRCS = \
 
 RC_SRCS = version.rc
 
-C_SRCS16 = \
-	ver16.c
-
-SPEC_SRCS16 = ver.spec
-
 @MAKE_DLL_RULES@
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend

dlls/version/ver16.c

-/*
- * Implementation of VER.DLL
- *
- * Copyright 1999 Ulrich Weigand
- *
- * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "wine/winbase16.h"
-#include "winver.h"
-#include "lzexpand.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(ver);
-
-
-extern DWORD find_resource( HFILE lzfd, LPCSTR type, LPCSTR id, DWORD *reslen, DWORD *offset );
-
-/*************************************************************************
- * GetFileResourceSize                     [VER.2]
- */
-DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType,
-                                    LPCSTR lpszResId, LPDWORD lpdwFileOffset )
-{
-    HFILE lzfd;
-    OFSTRUCT ofs;
-    DWORD reslen = 0;
-
-    TRACE("(%s,type=%p,id=%p,off=%p)\n",
-          debugstr_a(lpszFileName), lpszResType, lpszResId, lpszResId );
-
-    lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ );
-    if (lzfd >= 0)
-    {
-        if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, lpdwFileOffset )) reslen = 0;
-        LZClose( lzfd );
-    }
-    return reslen;
-}
-
-
-/*************************************************************************
- * GetFileResource                         [VER.3]
- */
-DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType,
-                                LPCSTR lpszResId, DWORD dwFileOffset,
-                                DWORD dwResLen, LPVOID lpvData )
-{
-    HFILE lzfd;
-    OFSTRUCT ofs;
-    DWORD reslen = dwResLen;
-
-    TRACE("(%s,type=%p,id=%p,off=%d,len=%d,data=%p)\n",
-		debugstr_a(lpszFileName), lpszResType, lpszResId,
-                dwFileOffset, dwResLen, lpvData );
-
-    lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ );
-    if ( lzfd < 0 ) return 0;
-
-    if ( !dwFileOffset )
-    {
-        if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, &dwFileOffset ))
-        {
-            LZClose( lzfd );
-            return 0;
-        }
-    }
-
-    LZSeek( lzfd, dwFileOffset, 0 /* SEEK_SET */ );
-    reslen = LZRead( lzfd, lpvData, min( reslen, dwResLen ) );
-    LZClose( lzfd );
-
-    return reslen;
-}
-
-/*************************************************************************
- * GetFileVersionInfoSize                  [VER.6]
- */
-DWORD WINAPI GetFileVersionInfoSize16( LPCSTR lpszFileName, LPDWORD lpdwHandle )
-{
-    TRACE("(%s, %p)\n", debugstr_a(lpszFileName), lpdwHandle );
-    return GetFileVersionInfoSizeA( lpszFileName, lpdwHandle );
-}
-
-/*************************************************************************
- * GetFileVersionInfo                      [VER.7]
- */
-DWORD WINAPI GetFileVersionInfo16( LPCSTR lpszFileName, DWORD handle,
-                                   DWORD cbBuf, LPVOID lpvData )
-{
-    TRACE("(%s, %08x, %d, %p)\n",
-                debugstr_a(lpszFileName), handle, cbBuf, lpvData );
-
-    return GetFileVersionInfoA( lpszFileName, handle, cbBuf, lpvData );
-}
-
-/*************************************************************************
- * VerFindFile                             [VER.8]
- */
-DWORD WINAPI VerFindFile16( UINT16 flags, LPSTR lpszFilename,
-                            LPSTR lpszWinDir, LPSTR lpszAppDir,
-                            LPSTR lpszCurDir, UINT16 *lpuCurDirLen,
-                            LPSTR lpszDestDir, UINT16 *lpuDestDirLen )
-{
-    UINT curDirLen, destDirLen;
-    DWORD retv = VerFindFileA( flags, lpszFilename, lpszWinDir, lpszAppDir,
-                                 lpszCurDir, &curDirLen, lpszDestDir, &destDirLen );
-
-    *lpuCurDirLen = (UINT16)curDirLen;
-    *lpuDestDirLen = (UINT16)destDirLen;
-    return retv;
-}
-
-/*************************************************************************
- * VerInstallFile                          [VER.9]
- */
-DWORD WINAPI VerInstallFile16( UINT16 flags,
-                               LPSTR lpszSrcFilename, LPSTR lpszDestFilename,
-                               LPSTR lpszSrcDir, LPSTR lpszDestDir, LPSTR lpszCurDir,
-                               LPSTR lpszTmpFile, UINT16 *lpwTmpFileLen )
-{
-    UINT filelen;
-    DWORD retv = VerInstallFileA( flags, lpszSrcFilename, lpszDestFilename,
-                                    lpszSrcDir, lpszDestDir, lpszCurDir,
-                                    lpszTmpFile, &filelen);
-
-    *lpwTmpFileLen = (UINT16)filelen;
-    return retv;
-}
-
-/*************************************************************************
- * VerLanguageName                        [VER.10]
- */
-DWORD WINAPI VerLanguageName16( UINT16 uLang, LPSTR lpszLang, UINT16 cbLang )
-{
-    return VerLanguageNameA( uLang, lpszLang, cbLang );
-}
-
-/*************************************************************************
- * VerQueryValue                          [VER.11]
- */
-DWORD WINAPI VerQueryValue16( SEGPTR spvBlock, LPSTR lpszSubBlock,
-                              SEGPTR *lpspBuffer, UINT16 *lpcb )
-{
-    LPVOID lpvBlock = MapSL( spvBlock );
-    LPVOID buffer = lpvBlock;
-    UINT buflen;
-    DWORD retv;
-
-    TRACE("(%p, %s, %p, %p)\n",
-                lpvBlock, debugstr_a(lpszSubBlock), lpspBuffer, lpcb );
-
-    retv = VerQueryValueA( lpvBlock, lpszSubBlock, &buffer, &buflen );
-    if ( !retv ) return FALSE;
-
-    if ( OFFSETOF( spvBlock ) + ((char *) buffer - (char *) lpvBlock) >= 0x10000 )
-    {
-        FIXME("offset %08X too large relative to %04X:%04X\n",
-               (char *) buffer - (char *) lpvBlock, SELECTOROF( spvBlock ), OFFSETOF( spvBlock ) );
-        return FALSE;
-    }
-
-    if (lpcb) *lpcb = buflen;
-    *lpspBuffer = (SEGPTR) ((char *) spvBlock + ((char *) buffer - (char *) lpvBlock));
-
-    return retv;
-}