Index: dll/win32/shimgvw/shimgvw.c
===================================================================
--- dll/win32/shimgvw/shimgvw.c	(revision 61111)
+++ dll/win32/shimgvw/shimgvw.c	(working copy)
@@ -407,8 +407,8 @@
         {
             RECT rc;
             SendMessage(hToolBar, TB_AUTOSIZE, 0, 0);
-            SendMessage(hToolBar, TB_GETITEMRECT, 1, (LPARAM)&rc);
-            MoveWindow(hDispWnd, 1, 1, LOWORD(lParam)-1, HIWORD(lParam)-rc.bottom, TRUE);
+            GetWindowRect(hToolBar, &rc);
+            MoveWindow(hDispWnd, 1, 1, LOWORD(lParam) - 1, HIWORD(lParam) - (rc.bottom - rc.top) - 1, TRUE);
             return 0L;
         }
         case WM_DESTROY: