From 8a549168bcc39cece918f16e6e91fd0905048312 Mon Sep 17 00:00:00 2001
From: jyvenugo <48108725+jyvenugo@users.noreply.github.com>
Date: Mon, 16 Dec 2019 17:47:06 -0800
Subject: [PATCH] Adjust UI controls size and add full stop to resource file
 strings (#302)

* Increase checkbox and full stop

* More UI updates

* changes

* Update string size
---
 MsixCore/msixmgr/InstallUI.cpp | 8 ++++----
 MsixCore/msixmgr/Util.cpp      | 2 +-
 MsixCore/msixmgr/msixmgr.rc    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/MsixCore/msixmgr/InstallUI.cpp b/MsixCore/msixmgr/InstallUI.cpp
index 1e5eb604..ac6c645f 100644
--- a/MsixCore/msixmgr/InstallUI.cpp
+++ b/MsixCore/msixmgr/InstallUI.cpp
@@ -578,7 +578,7 @@ BOOL UI::CreateDisplayErrorText(HWND parentHWnd, RECT parentRect)
         GetStringResource(IDS_STRING_ERROR_REASON_TEXT).c_str(),
         WS_CHILD,
         parentRect.left + 50,
-        parentRect.bottom - 80,
+        parentRect.bottom - 120,
         120,
         20,
         parentHWnd,
@@ -590,11 +590,11 @@ BOOL UI::CreateDisplayErrorText(HWND parentHWnd, RECT parentRect)
         WS_EX_LEFT,
         L"Static",
         L"",
-        WS_CHILD | WS_BORDER,
+        WS_CHILD,
         parentRect.left + 50,
-        parentRect.bottom - 60,
+        parentRect.bottom - 100,
         375,
-        40,
+        80,
         parentHWnd,
         (HMENU)IDC_STATICERRORCONTROL,
         reinterpret_cast<HINSTANCE>(GetWindowLongPtr(parentHWnd, GWLP_HINSTANCE)),
diff --git a/MsixCore/msixmgr/Util.cpp b/MsixCore/msixmgr/Util.cpp
index 894ef099..b4bc5f69 100644
--- a/MsixCore/msixmgr/Util.cpp
+++ b/MsixCore/msixmgr/Util.cpp
@@ -7,7 +7,7 @@ std::wstring GetStringResource(UINT resourceId)
 {
     HMODULE instance = GetModuleHandle(nullptr);
 
-    WCHAR buffer[MAX_PATH] = L"";
+    WCHAR buffer[2*MAX_PATH] = L"";
     int loadStringRet = LoadStringW(instance, resourceId, buffer, ARRAYSIZE(buffer));
     if (loadStringRet <= 0)
     {
diff --git a/MsixCore/msixmgr/msixmgr.rc b/MsixCore/msixmgr/msixmgr.rc
index a3d355ae..6bc78684 100644
--- a/MsixCore/msixmgr/msixmgr.rc
+++ b/MsixCore/msixmgr/msixmgr.rc
@@ -116,8 +116,8 @@ BEGIN
     IDS_STRING_ERROR_REASON_TEXT "Reason:"
     IDS_STRING_LOADING_PACKAGE "Loading Package..."
     IDS_STRING_LOADING_PACKAGE_OPEN_ERROR "Cannot open app package"
-    IDS_STRING_SIG_MISSING_ERROR "Ask the app developer for a new app package. This one isn't signed with a trusted certificate"
-    IDS_STRING_ROOT_SIG_UNTRUSTED_ERROR "Either you need a new certificate installed for this app package, or you need a new app package with trusted certificates. Your system administrator or the app developer can help. A certificate chain processed, but terminated in a root certificate which isn't trusted"
+    IDS_STRING_SIG_MISSING_ERROR "Ask the app developer for a new app package. This one isn't signed with a trusted certificate."
+    IDS_STRING_ROOT_SIG_UNTRUSTED_ERROR "Either you need a new certificate installed for this app package, or you need a new app package with trusted certificates. Your system administrator or the app developer can help. A certificate chain processed, but terminated in a root certificate which isn't trusted."
     IDS_STRING_CANNOT_OPEN_PACKAGE_ERROR "Unable to open package. Please go to aka.ms/msix for more information."
     IDS_STRING_GENERIC_INSTALL_FAILED_ERROR "Unable to install package. Please go to aka.ms/msix for more information."
     IDS_STRING_INVALID_TDF_ERROR "A Prerequisite for an install could not be satisfied."