2 files changed, 20 insertions, 12 deletions

diff --git a/src/libs/7zip/win/CPP/Windows/FileIO.cpp b/src/libs/7zip/win/CPP/Windows/FileIO.cpp
index 938e6c701..c848a710c 100644
--- a/src/libs/7zip/win/CPP/Windows/FileIO.cpp
+++ b/src/libs/7zip/win/CPP/Windows/FileIO.cpp
@@ -71,12 +71,12 @@ bool GetLongPathBase(LPCWSTR s, UString &res)
   res.Empty();
   int len = MyStringLen(s);
   wchar_t c = s[0];
-  if (len < 1 || c == L'\\' || c == L'.' && (len == 1 || len == 2 && s[1] == L'.'))
+  if (len < 1 || c == L'\\' || (c == L'.' && (len == 1 || (len == 2 && s[1] == L'.')))) // PQR for MinGW-w64: Priority parentheses.
     return true;
   UString curDir;
   bool isAbs = false;
   if (len > 3)
-    isAbs = (s[1] == L':' && s[2] == L'\\' && (c >= L'a' && c <= L'z' || c >= L'A' && c <= L'Z'));
+    isAbs = (s[1] == L':' && s[2] == L'\\' && ((c >= L'a' && c <= L'z') || (c >= L'A' && c <= L'Z'))); // PQR for MinGW-w64: Priority parentheses.
 
   if (!isAbs)
     {
diff --git a/src/libs/7zip/win/CPP/Windows/Registry.cpp b/src/libs/7zip/win/CPP/Windows/Registry.cpp
index 8b25375d9..c6db9266f 100644
--- a/src/libs/7zip/win/CPP/Windows/Registry.cpp
+++ b/src/libs/7zip/win/CPP/Windows/Registry.cpp
@@ -116,7 +116,8 @@ LONG CKey::DeleteValue(LPCWSTR name)
 LONG CKey::SetValue(LPCTSTR name, UInt32 value)
 {
   MYASSERT(_object != NULL);
-  return RegSetValueEx(_object, name, NULL, REG_DWORD,
+  // PQR for MinGW-w64: Parameter #3 was NULL instead of 0.
+  return RegSetValueEx(_object, name, 0, REG_DWORD,
       (BYTE * const)&value, sizeof(UInt32));
 }
 
@@ -129,7 +130,8 @@ LONG CKey::SetValue(LPCTSTR name, LPCTSTR value)
 {
   MYASSERT(value != NULL);
   MYASSERT(_object != NULL);
-  return RegSetValueEx(_object, name, NULL, REG_SZ,
+  // PQR for MinGW-w64: Parameter #3 was NULL instead of 0.
+  return RegSetValueEx(_object, name, 0, REG_SZ,
       (const BYTE * )value, (lstrlen(value) + 1) * sizeof(TCHAR));
 }
 
@@ -163,7 +165,8 @@ LONG CKey::SetValue(LPCTSTR name, const void *value, UInt32 size)
 {
   MYASSERT(value != NULL);
   MYASSERT(_object != NULL);
-  return RegSetValueEx(_object, name, NULL, REG_BINARY,
+  // PQR for MinGW-w64: Parameter #3 was NULL instead of 0.
+  return RegSetValueEx(_object, name, 0, REG_BINARY,
       (const BYTE *)value, size);
 }
 
@@ -189,9 +192,10 @@ LONG CKey::SetKeyValue(LPCTSTR keyName, LPCTSTR valueName, LPCTSTR value)
 
 LONG CKey::QueryValue(LPCTSTR name, UInt32 &value)
 {
-  DWORD type = NULL;
+  DWORD type = 0; // PQR for MinGW-w64: Changed NULL to 0 to avoid warning.
   DWORD count = sizeof(DWORD);
-  LONG res = RegQueryValueEx(_object, (LPTSTR)name, NULL, &type,
+  // PQR for MinGW-w64: Parameter #3 was NULL instead of 0.
+  LONG res = RegQueryValueEx(_object, (LPTSTR)name, 0, &type,
     (LPBYTE)&value, &count);
   MYASSERT((res!=ERROR_SUCCESS) || (type == REG_DWORD));
   MYASSERT((res!=ERROR_SUCCESS) || (count == sizeof(UInt32)));
@@ -227,8 +231,9 @@ LONG CKey::GetValue_IfOk(LPCTSTR name, bool &value)
 LONG CKey::QueryValue(LPCTSTR name, LPTSTR value, UInt32 &count)
 {
   MYASSERT(count != NULL);
-  DWORD type = NULL;
-  LONG res = RegQueryValueEx(_object, (LPTSTR)name, NULL, &type, (LPBYTE)value, (DWORD *)&count);
+  DWORD type = 0; // PQR for MinGW-w64: Changed NULL to 0 to avoid warning.
+  // PQR for MinGW-w64: Parameter #3 was NULL instead of 0.
+  LONG res = RegQueryValueEx(_object, (LPTSTR)name, 0, &type, (LPBYTE)value, (DWORD *)&count);
   MYASSERT((res!=ERROR_SUCCESS) || (type == REG_SZ) || (type == REG_MULTI_SZ) || (type == REG_EXPAND_SZ));
   return res;
 }
@@ -236,8 +241,9 @@ LONG CKey::QueryValue(LPCTSTR name, LPTSTR value, UInt32 &count)
 LONG CKey::QueryValue(LPCTSTR name, CSysString &value)
 {
   value.Empty();
-  DWORD type = NULL;
+  DWORD type = 0; // PQR for MinGW-w64: Changed NULL to 0 to avoid warning.
   UInt32 currentSize = 0;
+  // PQR for MinGW-w64: Parameter #3 was NULL instead of 0.
   LONG res = RegQueryValueEx(_object, (LPTSTR)name, NULL, &type, NULL, (DWORD *)&currentSize);
   if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA)
     return res;
@@ -282,7 +288,8 @@ LONG CKey::QueryValue(LPCWSTR name, UString &value)
 
 LONG CKey::QueryValue(LPCTSTR name, void *value, UInt32 &count)
 {
-  DWORD type = NULL;
+  DWORD type = 0; // PQR for MinGW-w64: Changed NULL to 0 to avoid warning.
+  // PQR for MinGW-w64: Parameter #3 was NULL instead of 0.
   LONG res = RegQueryValueEx(_object, (LPTSTR)name, NULL, &type, (LPBYTE)value, (DWORD *)&count);
   MYASSERT((res!=ERROR_SUCCESS) || (type == REG_BINARY));
   return res;
@@ -291,8 +298,9 @@ LONG CKey::QueryValue(LPCTSTR name, void *value, UInt32 &count)
 
 LONG CKey::QueryValue(LPCTSTR name, CByteBuffer &value, UInt32 &dataSize)
 {
-  DWORD type = NULL;
+  DWORD type = 0; // PQR for MinGW-w64: Changed NULL to 0 to avoid warning.
   dataSize = 0;
+  // PQR for MinGW-w64: Parameter #3 was NULL instead of 0.
   LONG res = RegQueryValueEx(_object, (LPTSTR)name, NULL, &type, NULL, (DWORD *)&dataSize);
   if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA)
     return res;