On Sunday 7 November 2004 14:12, Dan Kegel wrote:

> While putting together a tutorial on how to contribute
> test cases to Wine (http://kegel.com/wine/sweng/),
> I noticed that the current version 9 of WinZip
> doesn't install under vanilla Wine; it aborts with

I noticed that the WinZip installer actually fails because it can't
retrieve version information from hhctrl.ocx. This patch adds version
information and voila, WinZip installs. You still can't use HTML help
though unless you install Internet Explorer or use a native hhctrl.ocx
+ Mozilla ActiveX control.

 -Hans

Changelog:
  Add version information.
Index: dlls/hhctrl.ocx/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/hhctrl.ocx/Makefile.in,v
retrieving revision 1.3
diff -u -r1.3 Makefile.in
--- dlls/hhctrl.ocx/Makefile.in	23 Aug 2004 18:50:54 -0000	1.3
+++ dlls/hhctrl.ocx/Makefile.in	7 Nov 2004 21:00:54 -0000
@@ -9,6 +9,8 @@
 	hhctrl.c \
 	regsvr.c
 
+RC_SRCS = version.rc
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:
--- /dev/null	2004-11-07 21:01:18.332170224 +0100
+++ dlls/hhctrl.ocx/version.rc	2004-11-07 21:44:40.262136144 +0100
@@ -0,0 +1,24 @@
+/*
+ * Version information for hhctrl.ocx
+ *
+ * Copyright 2004 Hans Leidekker
+ *
+ * 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
+ */
+
+#define WINE_FILEDESCRIPTION_STR "Wine htmlhelp OCX"
+#define WINE_FILENAME_STR "hhctrl.ocx"
+
+#include <wine/wine_common_ver.rc>

Reply via email to