9.189.18

4 files changed, 8 insertions, 5 deletions

diff --git a/CPP/Windows/Control/Dialog.cpp b/CPP/Windows/Control/Dialog.cpp
index dd0cf066..3cfa517a 100755
--- a/CPP/Windows/Control/Dialog.cpp
+++ b/CPP/Windows/Control/Dialog.cpp
@@ -103,7 +103,7 @@ bool IsDialogSizeOK(int xSize, int ySize)
 void CDialog::NormalizeSize(bool fullNormalize)
 {
   RECT workRect;
-	GetWorkAreaRect(&workRect);
+  GetWorkAreaRect(&workRect);
   int xSize = RECT_SIZE_X(workRect);
   int ySize = RECT_SIZE_Y(workRect);
   RECT rect;
@@ -135,7 +135,7 @@ void CDialog::NormalizeSize(bool fullNormalize)
 void CDialog::NormalizePosition()
 {
   RECT workRect, rect;
-	GetWorkAreaRect(&workRect);
+  GetWorkAreaRect(&workRect);
   GetWindowRect(&rect);
   if (rect.bottom > workRect.bottom && rect.top > workRect.top)
     Move(rect.left, workRect.top, RECT_SIZE_X(rect), RECT_SIZE_Y(rect), true);
diff --git a/CPP/Windows/FileName.h b/CPP/Windows/FileName.h
index 20786e00..d9807902 100755
--- a/CPP/Windows/FileName.h
+++ b/CPP/Windows/FileName.h
@@ -3,6 +3,8 @@
 #ifndef __WINDOWS_FILENAME_H
 #define __WINDOWS_FILENAME_H
 
+#include "../../C/Types.h"
+
 #include "../Common/MyString.h"
 
 namespace NWindows {
diff --git a/CPP/Windows/PropVariant.cpp b/CPP/Windows/PropVariant.cpp
index 3675778d..90212e08 100755
--- a/CPP/Windows/PropVariant.cpp
+++ b/CPP/Windows/PropVariant.cpp
@@ -218,7 +218,7 @@ void CPropVariant::InternalCopy(const PROPVARIANT *pSrc)
 int CPropVariant::Compare(const CPropVariant &a)
 {
   if (vt != a.vt)
-    return 0; // it's bug case
+    return MyCompare(vt, a.vt);
   switch (vt)
   {
     case VT_EMPTY: return 0;
diff --git a/CPP/Windows/PropVariantUtils.cpp b/CPP/Windows/PropVariantUtils.cpp
index 0c9e8f34..0a9cfab7 100755
--- a/CPP/Windows/PropVariantUtils.cpp
+++ b/CPP/Windows/PropVariantUtils.cpp
@@ -53,13 +53,14 @@ AString FlagsToString(const CUInt32PCharPair *pairs, unsigned num, UInt32 flags)
   for (unsigned i = 0; i < num; i++)
   {
     const CUInt32PCharPair &p = pairs[i];
-    if ((flags & p.Value) != 0)
+    UInt32 flag = (UInt32)1 << (unsigned)p.Value;
+    if ((flags & flag) != 0)
     {
       if (!s.IsEmpty())
         s += ' ';
       s += p.Name;
     }
-    flags &= ~p.Value;
+    flags &= ~flag;
   }
   if (flags != 0)
   {