[RAPPS] Get rid of the flickering of the URL in the download dialog and decode it...

svn path=/trunk/; revision=69425

diff --git a/reactos/base/applications/rapps/loaddlg.c b/reactos/base/applications/rapps/loaddlg.c
index 7c4372b..0a49898 100644 (file)
--- a/reactos/base/applications/rapps/loaddlg.c
+++ b/reactos/base/applications/rapps/loaddlg.c
@@ -6,6 +6,7 @@
  *              Copyright 2004 Mike McCormack (for CodeWeavers)
  *              Copyright 2005 Ge van Geldorp (gvg@reactos.org)
  *              Copyright 2009 Dmitry Chapyshev (dmitry@reactos.org)
  *              Copyright 2004 Mike McCormack (for CodeWeavers)
  *              Copyright 2005 Ge van Geldorp (gvg@reactos.org)
  *              Copyright 2009 Dmitry Chapyshev (dmitry@reactos.org)

+ *              Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com)

  */
 /*
  * Based on Wine dlls/shdocvw/shdocvw_main.c
  */
 /*
  * Based on Wine dlls/shdocvw/shdocvw_main.c


@@ -37,6 +38,7 @@ typedef struct _IBindStatusCallbackImpl
     LONG ref;
     HWND hDialog;
     BOOL *pbCancelled;
     LONG ref;
     HWND hDialog;
     BOOL *pbCancelled;

+    BOOL UrlHasBeenCopied;

 } IBindStatusCallbackImpl;
 
 static
 } IBindStatusCallbackImpl;
 
 static


@@ -111,7 +113,6 @@ dlOnProgress(IBindStatusCallback* iface,
     IBindStatusCallbackImpl *This = (IBindStatusCallbackImpl *) iface;
     HWND Item;
     LONG r;
     IBindStatusCallbackImpl *This = (IBindStatusCallbackImpl *) iface;
     HWND Item;
     LONG r;

-    WCHAR OldText[100];

 
     Item = GetDlgItem(This->hDialog, IDC_DOWNLOAD_PROGRESS);
     if (Item && ulProgressMax)
 
     Item = GetDlgItem(This->hDialog, IDC_DOWNLOAD_PROGRESS);
     if (Item && ulProgressMax)


@@ -120,13 +121,29 @@ dlOnProgress(IBindStatusCallback* iface,
     }
 
     Item = GetDlgItem(This->hDialog, IDC_DOWNLOAD_STATUS);
     }
 
     Item = GetDlgItem(This->hDialog, IDC_DOWNLOAD_STATUS);

-    if (Item && szStatusText)
+    if (Item && szStatusText && wcslen(szStatusText) > 0 && This->UrlHasBeenCopied == FALSE)

     {
     {

-        SendMessageW(Item, WM_GETTEXT, sizeof(OldText) / sizeof(OldText[0]), (LPARAM) OldText);
-        if (sizeof(OldText) / sizeof(OldText[0]) - 1 <= wcslen(OldText) || 0 != wcscmp(OldText, szStatusText))
+        DWORD len = wcslen(szStatusText) * sizeof(WCHAR);
+        PWSTR buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
+
+        if (buf)
+        {
+            /* beautify our url for display purposes */
+            InternetCanonicalizeUrl(szStatusText, buf, &len, ICU_DECODE | ICU_NO_ENCODE);
+
+            /* paste it into our dialog, free the temp buffer
+               and don't do it again in this instance */
+            SendMessageW(Item, WM_SETTEXT, 0, (LPARAM)buf);
+            HeapFree(GetProcessHeap(), 0, buf);
+        }
+        else

         {
         {

-            SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) szStatusText);
+            /* our computer is old and rusty and does not have enough ram for this,
+               use the ugly version and call it a day */
+            SendMessageW(Item, WM_SETTEXT, 0, (LPARAM)szStatusText);

         }
         }

+
+        This->UrlHasBeenCopied = TRUE;

     }
 
     SetLastError(0);
     }
 
     SetLastError(0);