Re: wine/dlls/user button.c

[Mike McCormack]

Hi Dimi,

The following hunk of the patch below breaks the IE install.  You should 
be able to press Alt-A to accept the license in the first dialog, but 
with this hunk applied it no longer works.

Mike

Index: wine/dlls/user/button.c
diff -u wine/dlls/user/button.c:1.2 wine/dlls/user/button.c:1.3
--- wine/dlls/user/button.c:1.2 Thu Oct 21 11:18:35 2004
+++ wine/dlls/user/button.c     Thu Oct 21 11:18:35 2004
@@ -179,10 +224,13 @@
      case WM_GETDLGCODE:
          switch(btn_type)
          {
-        case BS_PUSHBUTTON:      return DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON;
-        case BS_DEFPUSHBUTTON:   return DLGC_BUTTON | DLGC_DEFPUSHBUTTON;
-        case BS_RADIOBUTTON:
-        case BS_AUTORADIOBUTTON: return DLGC_BUTTON | DLGC_RADIOBUTTON;
+        case BS_AUTOCHECKBOX:    return DLGC_BUTTON | DLGC_WANTCHARS;
+        case BS_AUTORADIOBUTTON: return DLGC_RADIOBUTTON;
+        case BS_CHECKBOX:        return DLGC_BUTTON | DLGC_WANTCHARS;
+        case BS_DEFPUSHBUTTON:   return DLGC_DEFPUSHBUTTON;
+        case BS_GROUPBOX:        return DLGC_STATIC;
+        case BS_PUSHBUTTON:      return DLGC_UNDEFPUSHBUTTON;
+        case BS_RADIOBUTTON:     return DLGC_RADIOBUTTON;
          default:                 return DLGC_BUTTON;
          }

Alexandre Julliard wrote:
> ChangeSet ID:	14031
> CVSROOT:	/opt/cvs-commit
> Module name:	wine
> Changes by:	[e-mail]	2004/10/04 23:11:13
>
> Modified files:
>    dlls/user      : button.c
>
> Log message:
>    Dimitrie O. Paun 
>    Audit and document button code.
>    Change [GS]etWindowLong{,Ptr}A to [GS]etWindowLong{,Ptr}W.
>    Change WM_GETDLGCODE as per the MSDN documentation.
>
> Patch: http://cvs.winehq.org/patch.py?id=14031
>
> Old revision  New revision  Changes     Path
>  1.2           1.3           +74 -26     wine/dlls/user/button.c

wine/dlls/user button.c

[Dimitrie O. Paun]

On Mon, Oct 25, 2004 at 05:38:01PM +0900, Mike McCormack wrote:
> Hi Dimi,
>
> The following hunk of the patch below breaks the IE install.  You should 
> be able to press Alt-A to accept the license in the first dialog, but 
> with this hunk applied it no longer works.

Thank you, I'll submit a patch later on tonight. It seems the MSDN is
wrong (oh, the horror!), so I'd guess a test would be nice as well.