Re: [resend] Ensure ole32.dll gets correct version number

2003-07-23 Thread Mike Hearn
On Tue, 2003-07-22 at 18:18, Alexandre Julliard wrote:
 You may be able to install it by playing with the load order (i.e. set
 ole32 to native only). Having a bogus version in the builtin is going
 to force everybody to install the native, which is not what we want.

g, yes you are quite right, setting ole32=n does force it to
install. I wish I'd thought of that :/ 

So, I attached a patch to add this case to the sample configuration, as
it seems non-obvious (and quite a lot of end user queries are related to
this).

thanks -mike
Index: documentation/samples/config
===
RCS file: /home/wine/wine/documentation/samples/config,v
retrieving revision 1.46
diff -u -r1.46 config
--- documentation/samples/config	9 Jul 2003 04:22:57 -	1.46
+++ documentation/samples/config	23 Jul 2003 09:00:11 -
@@ -311,6 +311,14 @@
 [AppDefaults\\_INS5576._MP\\x11drv]
 Desktop = 640x480
 
+; force it to install even though wine has a newer version
+[AppDefaults\\dcom98.exe\\DllOverrides]
+ole32 = native
+
+[AppDefaults\\dcom95.exe\\DllOverrides]
+ole32 = native
+
+
 ;[AppDefaults\\iexplore.exe\\DllOverrides]
 ;shlwapi = native
 ;rpcrt4 = native


Re: [resend] Ensure ole32.dll gets correct version number

2003-07-22 Thread Mike Hearn
On Mon, 2003-07-21 at 23:42, Alexandre Julliard wrote:
 Version 2.0 is awfully old for ole32.dll. Why do you need that?

The primary motivation for this bugfix was to enable the DCOM98
installer to work again correctly. It requires at least  4.something,
otherwise it refuses to install. As our OLE framework isn't yet up to
scratch for some tasks, being able to install it is important (hopefully
once I finish digesting Oves work maybe it will be less important).

I suppose we could make it every so slightly below the version DCOM98
requires, but there are only so many versions, and if an app checks for
the version shipped in the DCOM updates, it'd still be too low.

The real fix is just to get the DCOM infrastructure to the point where
nobody needs to install Microsofts version anymore, but it's going to be
a couple of months before I have this patch in a form suitable for
submission I suspect (unless Ove decides to beat me to it).

thanks -mike




Re: [resend] Ensure ole32.dll gets correct version number

2003-07-22 Thread Alexandre Julliard
Mike Hearn [EMAIL PROTECTED] writes:

 The primary motivation for this bugfix was to enable the DCOM98
 installer to work again correctly. It requires at least  4.something,
 otherwise it refuses to install. As our OLE framework isn't yet up to
 scratch for some tasks, being able to install it is important (hopefully
 once I finish digesting Oves work maybe it will be less important).

You may be able to install it by playing with the load order (i.e. set
ole32 to native only). Having a bogus version in the builtin is going
to force everybody to install the native, which is not what we want.

-- 
Alexandre Julliard
[EMAIL PROTECTED]



Re: [resend] Ensure ole32.dll gets correct version number

2003-07-21 Thread Alexandre Julliard
Mike Hearn [EMAIL PROTECTED] writes:

 diff -u -r1.1 version.rc
 --- dlls/ole32/version.rc 28 Mar 2003 19:33:04 -  1.1
 +++ dlls/ole32/version.rc 13 Jul 2003 13:09:17 -
 @@ -21,4 +21,8 @@
  #define WINE_OLESELFREGISTER
  #define WINE_FILENAME_STR ole32.dll
  
 +#define WINE_FILEVERSION_STR 2.0
 +#define WINE_FILEVERSION 2,0,0,0
 +
  #include wine/wine_common_ver.rc

Version 2.0 is awfully old for ole32.dll. Why do you need that?

-- 
Alexandre Julliard
[EMAIL PROTECTED]