Re: HRGN

[Michael Stefaniuc]

On Fri, Sep 20, 2002 at 05:15:10PM -0400, Dimitrie O. Paun wrote:
> Oddly enough, this seem to work...

STOP! It dosn't work:
[...]
../../windows/painting.c:433: switch quantity not an integer
[...]
make[2]: *** [../../windows/painting.o] Error 1
make[2]: Leaving directory `/home/michi/work/wine/dlls/user'
make[1]: *** [user] Error 2
make[1]: Leaving directory `/home/michi/work/wine/dlls'
make: *** [dlls] Error 2

You picked one of the 3 handles that dosn't even compile when switched
to a void* (the other two are HICON, HINSTANCE). None of the to be
converted handles are so simple to convert, because if it would have
been so simple, it would have already been done ;). Before i start working
on the conversion of a handle i do an automated compile run for every
remaining DECLARE_OLD_HANDLE saving the output of the build. Here some
statistic from a compile run from 3 days ago:
camus:/scr/wine.test$ for i in wine.H*; do
> echo -n "$i: "
> diff -u wine/make.out $i/make.out | grep -c ^+
> done

wine.HBITMAP: 664
wine.HBRUSH: 428
wine.HDC: 941
wine.HFONT: 460
wine.HICON: 163
wine.HINSTANCE: 200
wine.HKEY: 423
wine.HMENU: 322
wine.HPEN: 216
wine.HRGN: 220

As you can the there are at least 160 lines of warnings to look at.

bye
    michael
> ChangeLog
>   Convert HRGN to void *
> Index: include/windef.h
>
> RCS file: /var/cvs/wine/include/windef.h,v
> retrieving revision 1.74
> diff -u -r1.74 windef.h
> --- include/windef.h	16 Sep 2002 22:47:05 -0000	1.74
> +++ include/windef.h	20 Sep 2002 18:25:30 -0000
> @@ -89,7 +89,7 @@
>  DECLARE_HANDLE(HMONITOR);
>  DECLARE_HANDLE(HPALETTE);
>  DECLARE_OLD_HANDLE(HPEN);
> -DECLARE_OLD_HANDLE(HRGN);
> +DECLARE_HANDLE(HRGN);
>  DECLARE_HANDLE(HRSRC);
>  DECLARE_HANDLE(HTASK);
>  DECLARE_HANDLE(HWINEVENTHOOK);

HRGN

[Dimitrie O. Paun]

On September 20, 2002 06:59 pm, Michael Stefaniuc wrote:
> On Fri, Sep 20, 2002 at 05:15:10PM -0400, Dimitrie O. Paun wrote:
> > Oddly enough, this seem to work...
>
> STOP! It dosn't work:

Yes, I knew something was wrong -- I did recompile, but I guess
make screwed up... Why that is, I don't know. Sorry about that.

HRGN

[Michael Stefaniuc]

On Sat, Sep 21, 2002 at 01:10:06AM -0400, Dimitrie O. Paun wrote:
> On September 20, 2002 06:59 pm, Michael Stefaniuc wrote:
> > On Fri, Sep 20, 2002 at 05:15:10PM -0400, Dimitrie O. Paun wrote:
> > > Oddly enough, this seem to work...
> >
> > STOP! It dosn't work:
>
> Yes, I knew something was wrong -- I did recompile, but I guess
> make screwed up... Why that is, I don't know. Sorry about that.

Do you compile with -DSTRICT? Because if not DECLARE_HANDLE and
DECLARE_OLD_HANDLE are the same.
Or do you use ccache to speed up wine compilation? I've seen with it
some make problems and had to do an "export CCACHE_NOLINK=1".

bye
    michael