Re: Shell32: fix DllGetVersion for newer callers

[Robert Shearman]

Juan Lang wrote:
> A bit better than my last version, load the version
> resource from the file for DllGetVersion, and update
> the version of the file to produce the same output as
> before.
>
> ChangeLog: add support for DLLVERSIONINFO2 in
> DllGetVersion, and get version info from file
>
> --Juan

...
> --- dlls/shell32/Makefile.in	11 Aug 2004 23:59:07 -0000	1.84
> +++ dlls/shell32/Makefile.in	14 Sep 2004 17:16:37 -0000
> @@ -4,7 +4,7 @@
> SRCDIR    = @srcdir@
> VPATH     = @srcdir@
> MODULE    = shell32.dll
> -IMPORTS   = shlwapi comctl32 user32 gdi32 advapi32 kernel32
> +IMPORTS   = shlwapi comctl32 user32 gdi32 advapi32 kernel32 version
> DELAYIMPORTS = ole32
> EXTRALIBS = -luuid $(LIBUNICODE)

This is *really* ugly. Create a header file with just the version 
numbers defined and import it from the resource file and the file that 
implements the DllGetVersion function and problem solved.

Rob

Shell32: fix DllGetVersion for newer callers

[Juan Lang]

--- Robert Shearman  wrote:
> This is *really* ugly. Create a header file with
> just the version 
> numbers defined and import it from the resource file
> and the file that 
> implements the DllGetVersion function and problem
> solved.

Got any suggestions for the version string?  The rc
compiler doesn't like any complicated macro fun.

--Juan

_______________________________
Do you Yahoo!?
Declare Yourself - Register online to vote today!
http://vote.yahoo.com

Shell32: fix DllGetVersion for newer callers

[Robert Shearman]

Juan Lang wrote:
> --- Robert Shearman  wrote:
> > This is *really* ugly. Create a header file with
> > just the version 
> > numbers defined and import it from the resource file
> > and the file that 
> > implements the DllGetVersion function and problem
> > solved.
>
> Got any suggestions for the version string?  The rc
> compiler doesn't like any complicated macro fun.

Yes, you're right. I would submit a patch with the string manually 
created and I'll see what I can do about fixing wpp, unless anyone else 
volunteers. Attached is the patch I have so far, but it doesn't work on 
some of our header files.

Rob

Index: wine/libs/wpp/ppl.l
===================================================================
RCS file: /home/wine/wine/libs/wpp/ppl.l,v
retrieving revision 1.4
diff -u -p -r1.4 ppl.l
--- wine/libs/wpp/ppl.l	21 Oct 2003 23:57:25 -0000	1.4
+++ wine/libs/wpp/ppl.l	15 Sep 2004 11:38:13 -0000
@@ -433,8 +433,12 @@ includelogicentry_t *pp_includelogiclist
    /*
     * Scan the substitution of a define
     */
-<pp_define>[^'"/\\n]+		pplval.cptr = pp_xstrdup(pptext); return tLITERAL;
-<pp_define>(\\r?)|(/[^/*])	pplval.cptr = pp_xstrdup(pptext); return tLITERAL;
+<pp_define>[^a-zA-Z0-9'"#/\\n]+	pplval.cptr = pp_xstrdup(pptext); return tLITERAL;
+<pp_define>{cident}		pplval.cptr = pp_xstrdup(pptext); return tIDENT;
+<pp_define>##			return tCONCAT;
+<pp_define>#			return tSTRINGIZE;
+<pp_define>[0-9][^'"#/\\n]*	pplval.cptr = pp_xstrdup(pptext); return tLITERAL;
+<pp_define>(\\r?)|(/[^/*'"#\\n]*)	pplval.cptr = pp_xstrdup(pptext); return tLITERAL;
 <pp_define>\\r?\n{ws}+		newline(0); pplval.cptr = pp_xstrdup(" "); return tLITERAL;
 <pp_define>\\r?\n		newline(0);
 <pp_define>\n			newline(1); yy_pop_state(); return tNL;