[ros-diffs] [akhaldi] 53944: [BROWSEUI] * Reduce the scope of a variable. * Comment out some unused code. * Initialize some member variables in the respective constructors.

[akhaldi]

Author: akhaldi
Date: Sun Oct  2 21:44:24 2011
New Revision: 53944

URL: http://svn.reactos.org/svn/reactos?rev=53944&view=rev
Log:
[BROWSEUI]
* Reduce the scope of a variable.
* Comment out some unused code.
* Initialize some member variables in the respective constructors.

Modified:
    trunk/reactos/dll/win32/browseui/bandsite.cpp
    trunk/reactos/dll/win32/browseui/basebar.cpp
    trunk/reactos/dll/win32/browseui/brandband.cpp
    trunk/reactos/dll/win32/browseui/internettoolbar.cpp

Modified: trunk/reactos/dll/win32/browseui/bandsite.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsite.cpp?rev=53944&r1=53943&r2=53944&view=diff
==============================================================================
--- trunk/reactos/dll/win32/browseui/bandsite.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/bandsite.cpp [iso-8859-1] Sun Oct  2 
21:44:24 2011
@@ -247,10 +247,9 @@
 
 CBandSiteBase::~CBandSiteBase()
 {
-    int                                                                        
        i;
 
     TRACE("destroying %p\n", this);
-    
+
     if (fRebarWindow != NULL)
     {
         DestroyWindow(fRebarWindow);
@@ -259,6 +258,7 @@
 
     if (fBands != NULL)
     {
+        int i;
         for (i = 0; i < fBandsAllocated; i++)
         {
             if (fBands[i].DeskBand != NULL)

Modified: trunk/reactos/dll/win32/browseui/basebar.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar.cpp?rev=53944&r1=53943&r2=53944&view=diff
==============================================================================
--- trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] Sun Oct  2 
21:44:24 2011
@@ -491,18 +491,19 @@
 LRESULT CBaseBar::OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL 
&bHandled)
 {
        POINT                                                                   
newLocation;
-       int                                                                     
        delta;
+       //int                                                                   
        delta;
 
        if (fTracking)
        {
                newLocation.x = (short)LOWORD(lParam);
                newLocation.y = (short)HIWORD(lParam);
+#if 0
                if (fVertical)
                        delta = newLocation.x - fLastLocation.x;
                else
                        delta = newLocation.y - fLastLocation.y;
                
-
+#endif
                fLastLocation = newLocation;
        }
        return 0;

Modified: trunk/reactos/dll/win32/browseui/brandband.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/brandband.cpp?rev=53944&r1=53943&r2=53944&view=diff
==============================================================================
--- trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] Sun Oct  2 
21:44:24 2011
@@ -66,6 +66,7 @@
        fCurrentFrame = 0;
        fMaxFrameCount = 0;
        fImageBitmap = NULL;
+       fBitmapSize = 0;
        fAdviseCookie = 0;
 }
 

Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/internettoolbar.cpp?rev=53944&r1=53943&r2=53944&view=diff
==============================================================================
--- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Sun Oct  
2 21:44:24 2011
@@ -135,6 +135,8 @@
        fToolbar = NULL;
        fRebarWindow = NULL;
        fChildWindow = NULL;
+       fBandID = 0;
+       fFlags = 0;
        fInitialized = false;
        memset(&fDeskBandInfo, 0, sizeof(fDeskBandInfo));
 }
@@ -150,7 +152,6 @@
        CComPtr<IDeskBand>                                              
deskBand;
        TCHAR                                                                   
textBuffer[40];
        REBARBANDINFOW                                                  
bandInfo;
-       int                                                                     
        bandCount;
        HRESULT                                                                 
hResult;
 
        hResult = containedBand->QueryInterface(IID_IObjectWithSite, (void 
**)&site);
@@ -180,7 +181,7 @@
        bandInfo.cch = sizeof(textBuffer) / sizeof(TCHAR);
        hResult = GetRBBandInfo(bandInfo);
 
-       bandCount = (int)SendMessage(fRebarWindow, RB_GETBANDCOUNT, 0, 0);
+       SendMessage(fRebarWindow, RB_GETBANDCOUNT, 0, 0);
        SendMessage(fRebarWindow, RB_INSERTBANDW, -1, (LPARAM)&bandInfo);
        fInitialized = true;
        return S_OK;