Mike McCormack : msi: Fixes for the MaskedEdit control.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 576b8a59201c336f06eb8a7034cd37c1ef2ab2b9
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=576b8a59201c336f06eb8a70...

Author: Mike McCormack 
Date:   Wed Jan  4 14:49:50 2006 +0100

msi: Fixes for the MaskedEdit control.
Allow MaskedEdit masks that aren't enclosed with <>.
Allow the MaskedEdit's edit controls to scroll a bit in case things
don't line up.

---

dlls/msi/dialog.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index d7b3fdd..1384e22 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -1129,15 +1129,16 @@ static struct msi_maskedit_info * msi_di
     if( !mask )
         return info;

-    p = strchrW(mask, '<');
-    if( !p )
-        return info;
-
     info = msi_alloc_zero( sizeof *info );
     if( !info )
         return info;

-    p++;
+    p = strchrW(mask, '<');
+    if( p )
+        p++;
+    else
+        p = mask;
+
     for( i=0; i<MASK_MAX_GROUPS; i++ )
     {
         /* stop at the end of the string */
@@ -1177,7 +1178,7 @@ msi_maskedit_create_children( struct msi
     HWND hwnd;
     UINT i;

-    style = WS_CHILD | WS_BORDER | WS_VISIBLE | WS_TABSTOP;
+    style = WS_CHILD | WS_BORDER | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL;

GetClientRect( info->hwnd, &rect );