port 1772006

comm-central/patches/9999999-port1772006-suite-bustage.patch

@@ -0,0 +1,32 @@
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1659277095 0
+Bug 9999999 - Port bug 1772006 to suite.
+Bug 1772006 - Clean up nsString implementation source files.
+
+diff --git a/suite/components/shell/nsWindowsShellService.cpp b/suite/components/shell/nsWindowsShellService.cpp
+--- a/suite/components/shell/nsWindowsShellService.cpp
++++ b/suite/components/shell/nsWindowsShellService.cpp
+@@ -357,20 +357,20 @@ nsWindowsShellService::TestForDefault(SE
+   wchar_t currValue[MAX_BUF];
+   SETTING* end = aSettings + aSize;
+   for (SETTING * settings = aSettings; settings < end; ++settings) {
+     NS_ConvertUTF8toUTF16 dataLongPath(settings->valueData);
+     NS_ConvertUTF8toUTF16 dataShortPath(settings->valueData);
+     NS_ConvertUTF8toUTF16 key(settings->keyName);
+     NS_ConvertUTF8toUTF16 value(settings->valueName);
+     if (settings->flags & APP_PATH_SUBSTITUTION) {
+-      int32_t offset = dataLongPath.Find("%APPPATH%");
++      int32_t offset = dataLongPath.Find(u"%APPPATH%");
+       dataLongPath.Replace(offset, 9, mAppLongPath);
+       // Remove the quotes around %APPPATH% in VAL_OPEN for short paths
+-      int32_t offsetQuoted = dataShortPath.Find("\"%APPPATH%\"");
++      int32_t offsetQuoted = dataShortPath.Find(u"\"%APPPATH%\"");
+       if (offsetQuoted != -1)
+         dataShortPath.Replace(offsetQuoted, 11, mAppShortPath);
+       else
+         dataShortPath.Replace(offset, 9, mAppShortPath);
+     }
+ 
+     ::ZeroMemory(currValue, sizeof(currValue));
+     HKEY theKey;

comm-central/patches/series

@@ -1,4 +1,5 @@
 9999999-newmail-icon-suite.patch
+9999999-port1772006-suite-bustage.patch
 TOP-1642188-remove-nsDOMIEvent-cc.patch
 TOP-1611010-DOMEventListener-cc.patch
 TOP-1614671-port1456035-4-and-5-61a1-cc.patch