Changes based on reviewer comments.

Author: Doug-Lyons

dll/win32/comctl32/edit.c

@@ -5146,11 +5146,13 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
     {
         SCROLLINFO si;
 
-        ZeroMemory(&si, sizeof(si));
         si.cbSize = sizeof(si);
         si.fMask = SIF_TRACKPOS;
         if (!GetScrollInfo(hwnd, SB_VERT, &si))
-            return 1;
+        {
+            result = 1;
+            break;
+        }
         result = EDIT_WM_VScroll(es, LOWORD(wParam), si.nTrackPos);
     }
 #else

win32ss/user/user32/controls/edit.c

@@ -5354,11 +5354,13 @@ LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
     {
         SCROLLINFO si;
 
-        ZeroMemory(&si, sizeof(si));
         si.cbSize = sizeof(si);
         si.fMask = SIF_TRACKPOS;
         if (!GetScrollInfo(hwnd, SB_VERT, &si))
-            return 1;
+        {
+            result = 1;
+            break;
+        }
         result = EDIT_WM_VScroll(es, LOWORD(wParam), si.nTrackPos);
     }
 #else