RICHEDIT: don't clear ES_AUTO[HV]SCROLL in the edit control created by richedit

[Mike McCormack]

Lauri Tulmin's patch to implement ES_AUTO[HV]SCROLL broke the richedit 
because richedit relied on incorrect behaviour of Wine code.

http://www.winehq.org/hypermail/wine-cvs/2005/02/0506.html

This patch fixes it. Hopefully we can get rid of the richedit control's 
dependence on the edit control after Krzysztof gets his riched20 patch 
committed.

Mike


ChangeLog:
* don't clear ES_AUTO[HV]SCROLL in the edit control created by richedit
-------------- next part --------------
Index: dlls/richedit/richedit.c
===================================================================
RCS file: /home/wine/wine/dlls/richedit/richedit.c,v
retrieving revision 1.41
diff -u -p -r1.41 richedit.c
--- dlls/richedit/richedit.c	2 Mar 2005 13:53:51 -0000	1.41
+++ dlls/richedit/richedit.c	4 Mar 2005 07:34:22 -0000
@@ -114,7 +114,6 @@ static LRESULT WINAPI RICHED32_WindowPro
                                    LPARAM lParam)
 {
     LONG newstyle = 0;
-    LONG style = 0;
     RTFControl_Info *info;
     CHARRANGE *cr;
 
@@ -141,11 +140,7 @@ static LRESULT WINAPI RICHED32_WindowPro
 	    /* remove SCROLLBARS from the current window style */
 	    info->hwndParent = ((LPCREATESTRUCTA) lParam)->hwndParent;
 
-	    newstyle = style = ((LPCREATESTRUCTA) lParam)->style;
-            newstyle &= ~WS_HSCROLL;
-            newstyle &= ~WS_VSCROLL;
-            newstyle &= ~ES_AUTOHSCROLL;
-            newstyle &= ~ES_AUTOVSCROLL;
+            newstyle = ((LPCREATESTRUCTA) lParam)->style;
             newstyle &= ~ES_NUMBER;  /* Reused as ES_DISABLENOSCROLL */
 	    SetWindowLongA(hwnd,GWL_STYLE, newstyle);