Author: tfaber
Date: Fri Apr  3 12:54:42 2015
New Revision: 67019

URL: http://svn.reactos.org/svn/reactos?rev=67019&view=rev
Log:
[BROWSEUI]
- Correctly handle progress dialog message strings
CORE-9252

Modified:
    trunk/reactos/dll/win32/browseui/CProgressDialog.cpp

Modified: trunk/reactos/dll/win32/browseui/CProgressDialog.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CProgressDialog.cpp?rev=67019&r1=67018&r2=67019&view=diff
==============================================================================
--- trunk/reactos/dll/win32/browseui/CProgressDialog.cpp        [iso-8859-1] 
(original)
+++ trunk/reactos/dll/win32/browseui/CProgressDialog.cpp        [iso-8859-1] 
Fri Apr  3 12:54:42 2015
@@ -50,8 +50,8 @@
     this->cancelMsg = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE);
     this->title     = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE);
 
-    this->lines[0][0] = this->lines[1][0] = this->lines[2][0] = 0;
-    this->cancelMsg[0] = this->title[0];
+    this->lines[0][0] = this->lines[1][0] = this->lines[2][0] = UNICODE_NULL;
+    this->cancelMsg[0] = this->title[0] = UNICODE_NULL;
 
     this->clockHand = -1;
     this->progressClock[29].ullMark = 0ull;
@@ -76,12 +76,11 @@
 {
     if (!string)
     {
-        buffer[0] = 0;
+        (*buffer)[0] = UNICODE_NULL;
         return;
     }
 
-    ULONG len = max((wcslen(string) + 1)*sizeof(WCHAR), BUFFER_SIZE);
-    StringCchCopyW(*buffer, len, string);
+    StringCbCopyW(*buffer, BUFFER_SIZE, string);
 }
 
 struct create_params


Reply via email to