[ros-diffs] [ashaposhnikov] 75317: [RAPPS] Fixes - Minor style improvements - Not resizing with GetBuffer() calls where not nessesary - loaddlg.cpp: Wrong logic fixed - rosui.h: Fixed length determination

Author: ashaposhnikov
Date: Mon Jul 10 22:45:53 2017
New Revision: 75317

URL: http://svn.reactos.org/svn/reactos?rev=75317&view=rev
Log:
[RAPPS] Fixes
- Minor style improvements
- Not resizing with GetBuffer() calls where not nessesary
- loaddlg.cpp: Wrong logic fixed
- rosui.h: Fixed length determination

Modified:
    branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp
    branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp
    branches/GSoC_2017/rapps/reactos/base/applications/rapps/rosui.h

Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp	[iso-8859-1]
(original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp	[iso-8859-1] Mon Jul
10 22:45:53 2017
@@ -1148,12 +1148,12 @@
 
         /* Get version info */
         GetApplicationString(ItemInfo->hSubKey, L"DisplayVersion", szText);
-        ListView_SetItemText(hListView, Index, 1, szText.GetBuffer(MAX_PATH));
+        ListView_SetItemText(hListView, Index, 1, szText.GetBuffer());
         szText.ReleaseBuffer();
 
         /* Get comments */
         GetApplicationString(ItemInfo->hSubKey, L"Comments", szText);
-        ListView_SetItemText(hListView, Index, 2, szText.GetBuffer(MAX_PATH));
+        ListView_SetItemText(hListView, Index, 2, szText.GetBuffer());
         szText.ReleaseBuffer();
         return TRUE;
     }
@@ -1163,8 +1163,7 @@
         INT Index;
         HICON hIcon = NULL;
         ATL::CStringW szIconPath;
-        HIMAGELIST hImageListView = NULL;
-        hImageListView = ListView_GetImageList(hListView, LVSIL_SMALL);
+        HIMAGELIST hImageListView = ListView_GetImageList(hListView, LVSIL_SMALL);
 
         if (!SearchPatternMatch(Info->szName, szSearchPattern) &&
             !SearchPatternMatch(Info->szDesc, szSearchPattern))
@@ -1195,10 +1194,10 @@
         Index = ListViewAddItem(Info->Category, Index, Info->szName, (LPARAM)
Info);
         hImageListView = ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL);
 
-        ListView_SetItemText(hListView, Index, 1,
Info->szVersion.GetBuffer(MAX_PATH));
+        ListView_SetItemText(hListView, Index, 1, Info->szVersion.GetBuffer());
         Info->szVersion.ReleaseBuffer();
 
-        ListView_SetItemText(hListView, Index, 2, Info->szDesc.GetBuffer(MAX_PATH));
+        ListView_SetItemText(hListView, Index, 2, Info->szDesc.GetBuffer());
         Info->szDesc.ReleaseBuffer();
         return TRUE;
     }

Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp	[iso-8859-1]
(original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp	[iso-8859-1] Mon
Jul 10 22:45:53 2017
@@ -366,11 +366,8 @@
 
     memset(&urlComponents, 0, sizeof(urlComponents));
     urlComponents.dwStructSize = sizeof(urlComponents);
-    
-    if (AppInfo->szUrlDownload.GetLength() > urlLength)
-        goto end;
-
-    urlLength /= sizeof(WCHAR);
+
+    urlLength = AppInfo->szUrlDownload.GetLength();
     urlComponents.dwSchemeLength = urlLength + 1;
     urlComponents.lpszScheme = (LPWSTR) malloc(urlComponents.dwSchemeLength *
sizeof(WCHAR));
     urlComponents.dwHostNameLength = urlLength + 1;

Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/rosui.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/rosui.h	[iso-8859-1]
(original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/rosui.h	[iso-8859-1] Mon Jul
10 22:45:53 2017
@@ -495,8 +495,8 @@
 
     void GetWindowTextW(ATL::CStringW& szText)
     {
-        INT length = CWindow::GetWindowTextLengthW();
-        CWindow::GetWindowText(szText.GetBuffer(length), length);
+        INT length = CWindow::GetWindowTextLengthW() + 1;
+        CWindow::GetWindowTextW(szText.GetBuffer(length), length);
         szText.ReleaseBuffer();
     }
 };