diff --git a/reactos/base/applications/imagesoft/floatwindow.c b/reactos/base/applications/imagesoft/floatwindow.c
index 38e201cb893..fb9bf1a3971 100644
--- a/reactos/base/applications/imagesoft/floatwindow.c
+++ b/reactos/base/applications/imagesoft/floatwindow.c
@@ -40,12 +40,12 @@ TBBUTTON HistoryButtons[] = {
 
 
 BOOL
-ShowHideWindow(PFLT_WND FltInfo)
+ShowHideWindow(HWND hwnd)
 {
-    if (IsWindowVisible(FltInfo->hSelf))
-        return ShowWindow(FltInfo->hSelf, SW_HIDE);
+    if (IsWindowVisible(hwnd))
+        return ShowWindow(hwnd, SW_HIDE);
     else
-        return ShowWindow(FltInfo->hSelf, SW_SHOW);
+        return ShowWindow(hwnd, SW_SHOW);
 }
 
 
@@ -447,13 +447,13 @@ FloatToolbarWndProc(HWND hwnd,
         break;
 
         case WM_CLOSE:
-            ShowHideWindow(FltInfo);
+			ShowHideWindow(FltInfo->hSelf);
         break;
 
         case WM_COMMAND:
         {
             if (LOWORD(wParam) == IDCANCEL)
-                ShowHideWindow(FltInfo);
+                ShowHideWindow(FltInfo->hSelf);
 
             switch(LOWORD(wParam))
             {
diff --git a/reactos/base/applications/imagesoft/mainwnd.c b/reactos/base/applications/imagesoft/mainwnd.c
index aeed9b55b69..3bae9833139 100644
--- a/reactos/base/applications/imagesoft/mainwnd.c
+++ b/reactos/base/applications/imagesoft/mainwnd.c
@@ -378,10 +378,10 @@ MainWndToolbarDockBand(struct _TOOLBAR_DOCKS *TbDocks,
             {
                 SIZE Size;
                 BOOL Vert;
-                DWORD dwStyle = SendMessage(rbi->hwndChild,
-                                            TB_GETSTYLE,
-                                            0,
-                                            0);
+                DWORD dwStyle = (DWORD)SendMessage(rbi->hwndChild,
+                                                   TB_GETSTYLE,
+                                                   0,
+                                                   0);
                 switch (DockTo)
                 {
                     case LEFT_DOCK:
@@ -613,7 +613,7 @@ MainWndCreateFloatWindows(PMAIN_WND_INFO Info)
                           ID_TOOLS,
                           MF_CHECKED);
 
-            ShowHideWindow(Info->fltTools);
+            ShowHideWindow(Info->fltTools->hSelf);
         }
     }
 
@@ -642,10 +642,10 @@ MainWndDestroyFloatWindows(PMAIN_WND_INFO Info)
         HeapFree(ProcessHeap, 0, Info->fltTools);
 
     if (Info->fltColors != NULL)
-        HeapFree(ProcessHeap, 0, Info->fltTools);
+        HeapFree(ProcessHeap, 0, Info->fltColors);
 
     if (Info->fltHistory != NULL)
-        HeapFree(ProcessHeap, 0, Info->fltTools);
+        HeapFree(ProcessHeap, 0, Info->fltHistory);
 }
 
 
@@ -893,7 +893,7 @@ MainWndCommand(PMAIN_WND_INFO Info,
             {
                 UINT uCheck = MF_CHECKED;
 
-                if (ShowHideWindow(Info->fltTools))
+                if (ShowHideWindow(Info->fltTools->hSelf))
                     uCheck = MF_UNCHECKED;
 
                 CheckMenuItem(hMenu,
@@ -911,7 +911,7 @@ MainWndCommand(PMAIN_WND_INFO Info,
             {
                 UINT uCheck = MF_CHECKED;
 
-                if (ShowHideWindow(Info->fltColors))
+                if (ShowHideWindow(Info->fltColors->hSelf))
                     uCheck = MF_UNCHECKED;
 
                 CheckMenuItem(hMenu,
@@ -929,7 +929,7 @@ MainWndCommand(PMAIN_WND_INFO Info,
             {
                 UINT uCheck = MF_CHECKED;
 
-                if (ShowHideWindow(Info->fltHistory))
+                if (ShowHideWindow(Info->fltHistory->hSelf))
                     uCheck = MF_UNCHECKED;
 
                 CheckMenuItem(hMenu,
diff --git a/reactos/base/applications/imagesoft/precomp.h b/reactos/base/applications/imagesoft/precomp.h
index 1619d529c4e..cba6497ff90 100644
--- a/reactos/base/applications/imagesoft/precomp.h
+++ b/reactos/base/applications/imagesoft/precomp.h
@@ -388,7 +388,7 @@ BOOL FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info);
 BOOL FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info);
 BOOL InitFloatWndClass(VOID);
 VOID UninitFloatWndImpl(VOID);
-BOOL ShowHideWindow(PFLT_WND FltInfo);
+BOOL ShowHideWindow(HWND hwnd);
 
 /* font.c */
 VOID FillFontStyleComboList(HWND hwndCombo);