InstallShield 6 again (debuggers requested)

[Huw D M Davies]

On Mon, Oct 01, 2001 at 12:06:14AM +0200, Ove Kaaven wrote:
> Almost there, here's the current state of the patch, now with more hacks
> than ever before (but you also need the MoveFileEx and DispGetParam
> patches I've submitted to wine-patches). The current showstopper is a bug
> in Wine's SLTG typelib loader (it crashes reading the iuser.dll typelib
> resource). I think that once that typelib bug is fixed, it should only
> have minor issues left, or even work outright... I've already mailed Huw
> about the problem, but if anyone else wants to fix it, *I* don't mind...

For those of you playing along at home, this should fix it.  A prettier
solution will be submitted to wine-patches when I become unjetlagged.

Huw.
PS The line nos. will probably be off, but I'm sure the interested will be able
to sort that out.
-------------- next part --------------
--- dlls/oleaut32/typelib.c	Mon Sep 24 18:55:13 2001
+++ dlls/oleaut32/typelib.c	Mon Oct  1 17:07:42 2001
@@ -2399,13 +2401,13 @@
 	       first letter. So let's take one char off paramName and if we're
 	       pointing at an alpha-numeric char.  Got that? */
 
-	    if(*pArg == 0xffff) /* If we don't have a name the type seems to
-				   always follow.  FIXME is this correct? */
+	    if(*pArg == 0xffff || *pArg == 0xfffe)
 	      paramName = NULL;
 
 	    pArg++;
 
-	    if(paramName && !isalnum(*(paramName-1))) { /* the next word is an
+
+	    if(*(pArg-1) == 0xfffe || (paramName && !isalnum(*(paramName-1)))) { /* the next word is an
 							   offset to type */
 	        pType = (WORD*)(pFirstItem + *pArg);
 		SLTG_DoType(pType, pFirstItem,