Rémi Assailly remi.assailly@free.fr writes:
Changelog:
- get rid of dce.h
--- dlls/x11drv/winpos.c 2004-12-09 19:10:35.000000000 +0100 +++ dlls/x11drv/winpos.c 2004-12-11 19:46:03.000000000 +0100 @@ -40,7 +40,6 @@ #include "x11drv.h" #include "win.h" #include "winpos.h" -#include "dce.h" #include "cursoricon.h" #include "nonclient.h"
@@ -49,6 +48,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
+extern BOOL DCE_InvalidateDCE( HWND, const RECT* );
The goal of the header files cleanup is not to mechanically remove the #includes by duplicating the definitions, if we wanted to do that it would have been done long ago. The real goal is to get rid of the inter-dll dependencies, the global headers are really just a symptom of the problem.
Alexandre Julliard wrote :
Rémi Assailly remi.assailly@free.fr writes:
Changelog:
- get rid of dce.h
--- dlls/x11drv/winpos.c 2004-12-09 19:10:35.000000000 +0100 +++ dlls/x11drv/winpos.c 2004-12-11 19:46:03.000000000 +0100 @@ -40,7 +40,6 @@ #include "x11drv.h" #include "win.h" #include "winpos.h" -#include "dce.h" #include "cursoricon.h" #include "nonclient.h"
@@ -49,6 +48,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
+extern BOOL DCE_InvalidateDCE( HWND, const RECT* );
The goal of the header files cleanup is not to mechanically remove the #includes by duplicating the definitions, if we wanted to do that it would have been done long ago. The real goal is to get rid of the inter-dll dependencies, the global headers are really just a symptom of the problem.
Well, I see. Do you agree if I first move all definitions used by only one dll ? ( in the case of dce.h, we'll just keep extern BOOL DCE_InvalidateDCE( HWND, const RECT* ) ) What will stay is inter-dll dependencies and we'll be sure the problem is here and we'll work on it.
Rémi Assailly remi.assailly@free.fr writes:
Do you agree if I first move all definitions used by only one dll ? ( in the case of dce.h, we'll just keep extern BOOL DCE_InvalidateDCE( HWND, const RECT* ) ) What will stay is inter-dll dependencies and we'll be sure the problem is here and we'll work on it.
Sure, we can move out definitions that are not needed by other dlls, as long as they are for things that won't need to be changed when getting rid of the dll dependencies. For DCE and more generally for all user32 headers I'd suggest leaving them alone for now, they are going to look completely different when I'm done with the wm changes anyway.
Alexandre Julliard wrote :
Sure, we can move out definitions that are not needed by other dlls, as long as they are for things that won't need to be changed when getting rid of the dll dependencies. For DCE and more generally for all user32 headers I'd suggest leaving them alone for now, they are going to look completely different when I'm done with the wm changes anyway.
I am not sure to have understood what you told me : you would like me not to take care of headers like dce.h or cursoricon.h while you are rewriting wm ? If you wanted to say that, I will work on others headers.
Rémi
Rémi Assailly remi.assailly@free.fr writes:
Alexandre Julliard wrote :
Sure, we can move out definitions that are not needed by other dlls, as long as they are for things that won't need to be changed when getting rid of the dll dependencies. For DCE and more generally for all user32 headers I'd suggest leaving them alone for now, they are going to look completely different when I'm done with the wm changes anyway.
I am not sure to have understood what you told me : you would like me not to take care of headers like dce.h or cursoricon.h while you are rewriting wm ?
Right, don't touch the user32 headers. Note that other headers will have similar issues; you can certainly start working on them, but you should expect to quickly get into tricky dll separation problems. The easy stuff has been done already...
Alexandre Julliard wrote :
The easy stuff has been done already...
Otherwise there would be nothing to do !
I noticed that in gdi.h PC_SYS_MAPPED is unused and PC_SYS_RESERVED is only used in dlls/x11drv/palette.c I think we can remove PC_SYS_MAPPED and move PC_SYS_RESERVED to dlls/x11drv/palette.c
In other cases, what do you suggest ?
If it is too difficult and if I can only be a cleaner, I'll be a cleaner ;)
Rémi Assailly remi.assailly@free.fr writes:
I noticed that in gdi.h PC_SYS_MAPPED is unused and PC_SYS_RESERVED is only used in dlls/x11drv/palette.c I think we can remove PC_SYS_MAPPED and move PC_SYS_RESERVED to dlls/x11drv/palette.c
I don't think you want to move just one flag, these are used together in the same variable so they have to be declared together too, otherwise someone might add a new flag without noticing that the same value is already used in another file.
-
Alexandre Julliard -
Rémi Assailly