9.179.17

15 files changed, 16 insertions, 21 deletions

diff --git a/CPP/Windows/COM.cpp b/CPP/Windows/COM.cpp
index 2f9fdcda..a746de12 100755
--- a/CPP/Windows/COM.cpp
+++ b/CPP/Windows/COM.cpp
@@ -34,4 +34,4 @@ HRESULT StringToGUIDA(const char *string, GUID &classID)
   return StringToGUIDW(MultiByteToUnicodeString(string), classID);
 }
 
-}}
\ No newline at end of file
+}}
diff --git a/CPP/Windows/COM.h b/CPP/Windows/COM.h
index cf003d59..506bbbc6 100755
--- a/CPP/Windows/COM.h
+++ b/CPP/Windows/COM.h
@@ -53,7 +53,7 @@ AString GUIDToStringA(REFGUID guid);
   #define GUIDToString GUIDToStringW
 #else
   #define GUIDToString GUIDToStringA
-#endif // !UNICODE
+#endif
 
 HRESULT StringToGUIDW(const wchar_t *string, GUID &classID);
 HRESULT StringToGUIDA(const char *string, GUID &classID);
@@ -61,7 +61,7 @@ HRESULT StringToGUIDA(const char *string, GUID &classID);
   #define StringToGUID StringToGUIDW
 #else
   #define StringToGUID StringToGUIDA
-#endif // !UNICODE
+#endif
 
   
 }}
diff --git a/CPP/Windows/Console.cpp b/CPP/Windows/Console.cpp
index 1dffc377..7773fee2 100755
--- a/CPP/Windows/Console.cpp
+++ b/CPP/Windows/Console.cpp
@@ -7,4 +7,4 @@
 namespace NWindows{
 namespace NConsole{
 
-}}
\ No newline at end of file
+}}
diff --git a/CPP/Windows/Console.h b/CPP/Windows/Console.h
index b4e6d35b..99ae90f1 100755
--- a/CPP/Windows/Console.h
+++ b/CPP/Windows/Console.h
@@ -49,4 +49,4 @@ public:
 
 }}
 
-#endif
\ No newline at end of file
+#endif
diff --git a/CPP/Windows/Control/CommandBar.h b/CPP/Windows/Control/CommandBar.h
index 4cbe07b6..387c5e2d 100755
--- a/CPP/Windows/Control/CommandBar.h
+++ b/CPP/Windows/Control/CommandBar.h
@@ -45,4 +45,4 @@ public:
 
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/CPP/Windows/Control/Edit.h b/CPP/Windows/Control/Edit.h
index d1af3644..c4bf5704 100755
--- a/CPP/Windows/Control/Edit.h
+++ b/CPP/Windows/Control/Edit.h
@@ -4,7 +4,6 @@
 #define __WINDOWS_CONTROL_EDIT_H
 
 #include "Windows/Window.h"
-#include "Windows/Defs.h"
 
 namespace NWindows {
 namespace NControl {
@@ -12,10 +11,9 @@ namespace NControl {
 class CEdit: public CWindow
 {
 public:
-  void SetPasswordChar(WPARAM c)
-    { SendMessage(EM_SETPASSWORDCHAR, c); }
+  void SetPasswordChar(WPARAM c) { SendMessage(EM_SETPASSWORDCHAR, c); }
 };
 
 }}
 
-#endif
\ No newline at end of file
+#endif
diff --git a/CPP/Windows/Control/ImageList.h b/CPP/Windows/Control/ImageList.h
index 791c96fd..127cd1ed 100755
--- a/CPP/Windows/Control/ImageList.h
+++ b/CPP/Windows/Control/ImageList.h
@@ -83,4 +83,3 @@ public:
 }}
 
 #endif
- 
\ No newline at end of file
diff --git a/CPP/Windows/Control/ReBar.h b/CPP/Windows/Control/ReBar.h
index ec27f0ed..8e11c139 100755
--- a/CPP/Windows/Control/ReBar.h
+++ b/CPP/Windows/Control/ReBar.h
@@ -32,4 +32,4 @@ public:
 
 }}
 
-#endif
\ No newline at end of file
+#endif
diff --git a/CPP/Windows/Control/StatusBar.h b/CPP/Windows/Control/StatusBar.h
index e8018a56..8766188b 100755
--- a/CPP/Windows/Control/StatusBar.h
+++ b/CPP/Windows/Control/StatusBar.h
@@ -40,4 +40,4 @@ public:
 
 }}
 
-#endif
\ No newline at end of file
+#endif
diff --git a/CPP/Windows/Control/Trackbar.h b/CPP/Windows/Control/Trackbar.h
index 64120f98..42dc4e40 100755
--- a/CPP/Windows/Control/Trackbar.h
+++ b/CPP/Windows/Control/Trackbar.h
@@ -25,4 +25,4 @@ public:
 
 }}
 
-#endif
\ No newline at end of file
+#endif
diff --git a/CPP/Windows/Control/Window2.h b/CPP/Windows/Control/Window2.h
index b016a13d..2af031b8 100755
--- a/CPP/Windows/Control/Window2.h
+++ b/CPP/Windows/Control/Window2.h
@@ -55,4 +55,4 @@ public:
 
 }}
 
-#endif
\ No newline at end of file
+#endif
diff --git a/CPP/Windows/FileMapping.cpp b/CPP/Windows/FileMapping.cpp
index d884afb1..55048fdb 100755
--- a/CPP/Windows/FileMapping.cpp
+++ b/CPP/Windows/FileMapping.cpp
@@ -9,6 +9,4 @@ namespace NFile {
 namespace NMapping {
 
 
-
-
-}}}
\ No newline at end of file
+}}}
diff --git a/CPP/Windows/Process.cpp b/CPP/Windows/Process.cpp
index d600abe0..9bcee7d5 100755
--- a/CPP/Windows/Process.cpp
+++ b/CPP/Windows/Process.cpp
@@ -8,7 +8,7 @@
 
 #ifndef _UNICODE
 extern bool g_IsNT;
-#endif _UNICODE
+#endif
 
 namespace NWindows {
 
diff --git a/CPP/Windows/ProcessMessages.cpp b/CPP/Windows/ProcessMessages.cpp
index a2a9247c..0f48aee2 100755
--- a/CPP/Windows/ProcessMessages.cpp
+++ b/CPP/Windows/ProcessMessages.cpp
@@ -19,4 +19,4 @@ void ProcessMessages(HWND window)
   }
 }
 
-}
\ No newline at end of file
+}
diff --git a/CPP/Windows/PropVariant.cpp b/CPP/Windows/PropVariant.cpp
index b95bd242..3675778d 100755
--- a/CPP/Windows/PropVariant.cpp
+++ b/CPP/Windows/PropVariant.cpp
@@ -168,7 +168,7 @@ HRESULT CPropVariant::Copy(const PROPVARIANT* pSrc)
       memmove((PROPVARIANT*)this, pSrc, sizeof(PROPVARIANT));
       return S_OK;
   }
-  return ::VariantCopy((tagVARIANT *)this, (tagVARIANT *)(pSrc));
+  return ::VariantCopy((tagVARIANT *)this, (tagVARIANT *)const_cast<PROPVARIANT *>(pSrc));
 }