Isn't the correct solution to use SxS with an activation context?
Best regards, Alex Ionescu
On Sun, Dec 21, 2014 at 1:49 AM, gadamopoulos@svn.reactos.org wrote:
Author: gadamopoulos Date: Sat Dec 20 16:49:31 2014 New Revision: 65766
URL: http://svn.reactos.org/svn/reactos?rev=65766&view=rev Log: [COMCTL32]
- Do not add two additional pixels at the top margin of the toolbar. This
is the behaviour of comctl32 v6 and our explorer depends on that to appear properly. We don't have a proper solution for these differences in behavior and since we already opt to use the v6 behavior I think it is fine.
CORE-5483 #resolve #comment Committed a slightly different version of the patch, thanks.
Modified: trunk/reactos/dll/win32/comctl32/toolbar.c
Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar....
============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sat Dec 20 16:49:31 2014 @@ -244,7 +244,12 @@
static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) { +#if 0 return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); +#else
- /* This is the behaviour in comctl32 v6 */
- return 0;
+#endif }
static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle)
Hi !
By the way, what is the status of SxS in ReactOS ?
Regards,
Hermès.
De : Ros-dev [mailto:ros-dev-bounces@reactos.org] De la part de Alex Ionescu Envoyé : dimanche 21 décembre 2014 09:02 À : ReactOS Development List Cc : Linda Wang; Filip Objet : Re: [ros-dev] [ros-diffs] [gadamopoulos] 65766: [COMCTL32] * Do not add two additional pixels at the top margin of the toolbar. This is the behaviour of comctl32 v6 and our explorer depends on that to appear properly. We do...
Isn't the correct solution to use SxS with an activation context?
Best regards, Alex Ionescu
On Sun, Dec 21, 2014 at 1:49 AM, gadamopoulos@svn.reactos.org wrote:
Author: gadamopoulos Date: Sat Dec 20 16:49:31 2014 New Revision: 65766
URL: http://svn.reactos.org/svn/reactos?rev=65766 http://svn.reactos.org/svn/reactos?rev=65766&view=rev &view=rev Log: [COMCTL32] * Do not add two additional pixels at the top margin of the toolbar. This is the behaviour of comctl32 v6 and our explorer depends on that to appear properly. We don't have a proper solution for these differences in behavior and since we already opt to use the v6 behavior I think it is fine.
CORE-5483 #resolve #comment Committed a slightly different version of the patch, thanks.
Modified: trunk/reactos/dll/win32/comctl32/toolbar.c
Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar.... http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar.c?rev=65766&r1=65765&r2=65766&view=diff &r1=65765&r2=65766&view=diff ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sat Dec 20 16:49:31 2014 @@ -244,7 +244,12 @@
static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) { +#if 0 return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); +#else + /* This is the behaviour in comctl32 v6 */ + return 0; +#endif }
static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle)
Indeed. At some point we will need to have two versions of the library. And I think that we already need it. That was evident by the fact that when I run explorer.exe from windows in ros, the start button doesn't appear because comctl32 doesn't support BCM_GETIDEALSIZE . Surprisingly native explorer works quite well on ReactOS (as long as themes are not enabled).
My plan was to check if sxs is capable of loading a secondary comctl32 and in that case we should go on and start adding more changes to comctl32. I don't think we should do a complete fork but a partial one. The problem is that some parts of comctl32 are actively supported by wine like the list view control which is really complex but some others like the rebar or the themed standard controls are not maintained at all.
So, before having side by side libraries we should make sure that we can load them in a proper way (and make sure that they work against windows of course).
ReactOS Development List ros-dev@reactos.org wrote on Sun, December 21st, 2014, 9:02 AM:
Isn't the correct solution to use SxS with an activation context?
Best regards, Alex Ionescu