inbox: reflect changes from 20h1 branch (#2310)

microsoft · Aug 7, 2019 · 89925eb · 89925eb
1 parent 8fa42e0
commit 89925eb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/src/host/cmdline.h b/src/host/cmdline.h
@@ -102,9 +102,9 @@ class CommandLine
     CommandLine(CommandLine const&) = delete;
     CommandLine& operator=(CommandLine const&) = delete;
 
-    [[nodiscard]] NTSTATUS CommandLine::_startCommandListPopup(COOKED_READ_DATA& cookedReadData);
-    [[nodiscard]] NTSTATUS CommandLine::_startCopyFromCharPopup(COOKED_READ_DATA& cookedReadData);
-    [[nodiscard]] NTSTATUS CommandLine::_startCopyToCharPopup(COOKED_READ_DATA& cookedReadData);
+    [[nodiscard]] NTSTATUS _startCommandListPopup(COOKED_READ_DATA& cookedReadData);
+    [[nodiscard]] NTSTATUS _startCopyFromCharPopup(COOKED_READ_DATA& cookedReadData);
+    [[nodiscard]] NTSTATUS _startCopyToCharPopup(COOKED_READ_DATA& cookedReadData);
 
     void _processHistoryCycling(COOKED_READ_DATA& cookedReadData, const CommandHistory::SearchDirection searchDirection);
     void _setPromptToOldestCommand(COOKED_READ_DATA& cookedReadData);

diff --git a/src/propslib/RegistrySerialization.hpp b/src/propslib/RegistrySerialization.hpp
@@ -98,10 +98,10 @@ class RegistrySerialization
     } RegPropertyMap;
 
     static const RegPropertyMap s_PropertyMappings[];
-    static const size_t RegistrySerialization::s_PropertyMappingsSize;
+    static const size_t s_PropertyMappingsSize;
 
     static const RegPropertyMap s_GlobalPropMappings[];
-    static const size_t RegistrySerialization::s_GlobalPropMappingsSize;
+    static const size_t s_GlobalPropMappingsSize;
 
     [[nodiscard]] static NTSTATUS s_LoadRegDword(const HKEY hKey, const _RegPropertyMap* const pPropMap, _In_ Settings* const pSettings);
     [[nodiscard]] static NTSTATUS s_LoadRegString(const HKEY hKey, const _RegPropertyMap* const pPropMap, _In_ Settings* const pSettings);

diff --git a/src/terminal/parser/ft_fuzzer/fuzzing_directed.h b/src/terminal/parser/ft_fuzzer/fuzzing_directed.h
@@ -898,7 +898,7 @@ namespace fuzz
 
         _Type operator->() const throw()
         {
-            return (m_fFuzzed) ? m_t : m_tInit;
+            return (this->m_fFuzzed) ? this->m_t : m_tInit;
         }
 
         // This operator makes it possible to invoke the fuzzing map
@@ -960,7 +960,7 @@ namespace fuzz
         __inline virtual _Type** operator&() throw()
         {
             m_ftEffectiveTraits |= TRAIT_TRANSFER_ALLOCATION;
-            return (m_fFuzzed) ? &m_t : &m_tInit;
+            return (this->m_fFuzzed) ? &(this->m_t) : &m_tInit;
         }
 
     private:
@@ -978,11 +978,11 @@ namespace fuzz
         void OnFuzzedValueFromMap()
         {
             m_pszFuzzed = nullptr;
-            m_ftEffectiveTraits = m_traits;
-            m_pfnOnFuzzedValueFromMap = [&](_Type* psz, std::function<void(_Type*)> dealloc) {
+            m_ftEffectiveTraits = this->m_traits;
+            this->m_pfnOnFuzzedValueFromMap = [&](_Type* psz, std::function<void(_Type*)> dealloc) {
                 FreeFuzzedString();
                 _Type* pszFuzzed = psz;
-                if (psz && psz != m_tInit)
+                if (psz && psz != this->m_tInit)
                 {
                     size_t cb = (sizeof(_Type) == sizeof(char)) ?
                                     (strlen(reinterpret_cast<LPSTR>(psz)) + 1) * sizeof(char) :
@@ -1014,8 +1014,8 @@ namespace fuzz
                 // allocation and deallocation responsibilities.
                 if (m_ftEffectiveTraits & TRAIT_TRANSFER_ALLOCATION)
                 {
-                    _Alloc::Free(m_tInit);
-                    m_tInit = nullptr;
+                    _Alloc::Free(this->m_tInit);
+                    this->m_tInit = nullptr;
                 }
                 else
                 {
@@ -1070,11 +1070,11 @@ namespace fuzz
     protected:
         __inline virtual _Type GetValueFromMap()
         {
-            if (!m_fFuzzed)
+            if (!this->m_fFuzzed)
             {
-                m_t = 0;
-                m_fFuzzed = TRUE;
-                for (auto& r : m_map)
+                this->m_t = 0;
+                this->m_fFuzzed = TRUE;
+                for (auto& r : this->m_map)
                 {
                     // Generate a new random value during each map entry
                     // and use it to evaluate if each individual fuzz map
@@ -1087,12 +1087,12 @@ namespace fuzz
                     int iLow = iHigh - (r.range.iHigh - r.range.iLow);
                     if (iLow <= wRandom && wRandom < iHigh)
                     {
-                        m_t |= CallFuzzMapFunction(r.fte.pfnFuzz, m_tInit, m_tArgs);
+                        this->m_t |= CallFuzzMapFunction(r.fte.pfnFuzz, this->m_tInit, m_tArgs);
                     }
                 }
             }
 
-            return m_t;
+            return this->m_t;
         }
     };
 }