[ros-diffs] [fireball] 45104: - Remove all ROS-specific modifications from comctl32-1.1.30 except the TOOLTIPS_NotifyFormat one for now.

Author: fireball
Date: Sat Jan 16 16:43:36 2010
New Revision: 45104

URL: http://svn.reactos.org/svn/reactos?rev=45104&view=rev
Log:
- Remove all ROS-specific modifications from comctl32-1.1.30 except the
TOOLTIPS_NotifyFormat one for now.

Modified:
    branches/arwinss/reactos/dll/win32/comctl32/imagelist.c
    branches/arwinss/reactos/dll/win32/comctl32/propsheet.c
    branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc
    branches/arwinss/reactos/dll/win32/comctl32/treeview.c

Modified: branches/arwinss/reactos/dll/win32/comctl32/imagelist.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct…
==============================================================================
--- branches/arwinss/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Sat Jan 16
16:43:36 2010
@@ -156,7 +156,7 @@
  *     This function CANNOT be used to reduce the number of images.
  */
 static void
-IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cy)
+IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cx, INT cy)
 {
     HDC     hdcBitmap;
     HBITMAP hbmNewBitmap, hbmNull;
@@ -167,14 +167,15 @@
         && (himl->cy >= cy))
 	return;
 
+    if (cx == 0) cx = himl->cx;
     nNewCount = himl->cCurImage + nImageCount + himl->cGrow;
 
-    imagelist_get_bitmap_size(himl, nNewCount, himl->cx, &sz);
+    imagelist_get_bitmap_size(himl, nNewCount, cx, &sz);
 
     TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl,
sz.cx, cy, nNewCount);
     hdcBitmap = CreateCompatibleDC (0);
 
-    hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, himl->cx);
+    hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, cx);
 
     if (hbmNewBitmap == 0)
         ERR("creating new image bitmap (x=%d y=%d)!\n", sz.cx, cy);
@@ -248,7 +249,7 @@
 
     nImageCount = bmp.bmWidth / himl->cx;
 
-    IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmHeight);
+    IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight);
 
     hdcBitmap = CreateCompatibleDC(0);
 
@@ -350,7 +351,7 @@
     else
 	nImageCount = 0;
 
-    IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmHeight);
+    IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight);
 
     nIndex = himl->cCurImage;
     himl->cCurImage += nImageCount;
@@ -2304,7 +2305,7 @@
 
     if (nIndex == -1) {
         if (himl->cCurImage + 1 > himl->cMaxImage)
-            IMAGELIST_InternalExpandBitmaps (himl, 1, 0);
+            IMAGELIST_InternalExpandBitmaps (himl, 1, 0, 0);
 
         nIndex = himl->cCurImage;
         himl->cCurImage++;

Modified: branches/arwinss/reactos/dll/win32/comctl32/propsheet.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct…
==============================================================================
--- branches/arwinss/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] Sat Jan 16
16:43:36 2010
@@ -2422,28 +2422,6 @@
   return FALSE;
 }
 
-BOOL CALLBACK
-EnumChildProc(HWND hwnd, LPARAM lParam)
-{
-    WCHAR szType[20];
-    RealGetWindowClassW(hwnd, szType, 20);
-
-    if (strcmpW(szType, WC_EDITW) == 0)
-    {
-        if (IsWindowEnabled(hwnd) && IsWindowVisible(hwnd))
-        {
-            SetFocus(hwnd);
-            return FALSE;
-        }
-    } 
-    else
-    {
-        EnumChildWindows(hwnd, EnumChildProc, 0);
-    }
-
-    return TRUE;
-}
-
 /******************************************************************************
  *            PROPSHEET_SetWizButtons
  *
@@ -2464,6 +2442,17 @@
   EnableWindow(hwndBack, FALSE);
   EnableWindow(hwndNext, FALSE);
   EnableWindow(hwndFinish, FALSE);
+
+  /* set the default pushbutton to an enabled button */
+  if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags &
PSWIZB_DISABLEDFINISH))
+    SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0);
+  else if (dwFlags & PSWIZB_NEXT)
+    SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0);
+  else if (dwFlags & PSWIZB_BACK)
+    SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0);
+  else
+    SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0);
+
 
   if (dwFlags & PSWIZB_BACK)
     EnableWindow(hwndBack, TRUE);
@@ -2494,31 +2483,6 @@
   }
   else if (!(dwFlags & PSWIZB_DISABLEDFINISH))
     EnableWindow(hwndFinish, TRUE);
-
-  /* set the default pushbutton to an enabled button and give it focus */
-  if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags &
PSWIZB_DISABLEDFINISH))
-  {
-    SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0);
-    SetFocus(hwndFinish);
-  }
-  else if (dwFlags & PSWIZB_NEXT)
-  {
-    SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0);
-    SetFocus(hwndNext);
-  }
-  else if (dwFlags & PSWIZB_BACK)
-  {
-    SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0);
-    SetFocus(hwndBack);
-  }
-  else
-  {
-    SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0);
-    SetFocus(GetDlgItem(hwndDlg, IDCANCEL));
-  }
-
-  /* Now try to find an edit control that deserves focus */
-  EnumChildWindows(PropSheet_GetCurrentPageHwnd(hwndDlg), EnumChildProc, 0);
 }
 
 /******************************************************************************

Modified: branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct…
==============================================================================
--- branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] Sat Jan 16 16:43:36
2010
@@ -19,10 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winnls.h"
 #include "comctl32.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

Modified: branches/arwinss/reactos/dll/win32/comctl32/treeview.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct…
==============================================================================
--- branches/arwinss/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Sat Jan 16
16:43:36 2010
@@ -2843,12 +2843,7 @@
 	}
     }
 
-    //
-    // This is correct, but is causes and infinite loop of WM_PAINT messages, resulting
-    // in continuous painting of the scroll bar in reactos. Comment out until the real
-    // bug is found
-    // 
-    //TREEVIEW_UpdateScrollBars(infoPtr);
+    TREEVIEW_UpdateScrollBars(infoPtr);
 
     if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT)
 	infoPtr->cdmode =