aboutsummaryrefslogtreecommitdiff
path: root/CPP/Windows
diff options
context:
space:
mode:
Diffstat (limited to 'CPP/Windows')
-rw-r--r--CPP/Windows/Clipboard.cpp2
-rw-r--r--CPP/Windows/CommonDialog.cpp2
-rw-r--r--CPP/Windows/Console.h2
-rw-r--r--CPP/Windows/Control/ImageList.h2
-rw-r--r--CPP/Windows/FileFind.h2
-rw-r--r--CPP/Windows/FileIO.h2
-rw-r--r--CPP/Windows/FileSystem.cpp2
-rw-r--r--CPP/Windows/Menu.h2
-rw-r--r--CPP/Windows/ProcessUtils.h2
-rw-r--r--CPP/Windows/PropVariantConv.cpp2
-rw-r--r--CPP/Windows/SecurityUtils.h2
-rw-r--r--CPP/Windows/Shell.h2
-rw-r--r--CPP/Windows/Synchronization.h2
-rw-r--r--CPP/Windows/Thread.h2
-rw-r--r--CPP/Windows/TimeUtils.cpp2
-rw-r--r--CPP/Windows/WinDefs.h (renamed from CPP/Windows/Defs.h)4
-rw-r--r--CPP/Windows/Window.h2
17 files changed, 17 insertions, 19 deletions
diff --git a/CPP/Windows/Clipboard.cpp b/CPP/Windows/Clipboard.cpp
index bc7e201..d39c264 100644
--- a/CPP/Windows/Clipboard.cpp
+++ b/CPP/Windows/Clipboard.cpp
@@ -9,7 +9,7 @@
9#include "../Common/StringConvert.h" 9#include "../Common/StringConvert.h"
10 10
11#include "Clipboard.h" 11#include "Clipboard.h"
12#include "Defs.h" 12#include "WinDefs.h"
13#include "MemoryGlobal.h" 13#include "MemoryGlobal.h"
14#include "Shell.h" 14#include "Shell.h"
15 15
diff --git a/CPP/Windows/CommonDialog.cpp b/CPP/Windows/CommonDialog.cpp
index 7a92d5f..2e3f297 100644
--- a/CPP/Windows/CommonDialog.cpp
+++ b/CPP/Windows/CommonDialog.cpp
@@ -13,7 +13,7 @@
13#endif 13#endif
14 14
15#include "CommonDialog.h" 15#include "CommonDialog.h"
16#include "Defs.h" 16#include "WinDefs.h"
17// #include "FileDir.h" 17// #include "FileDir.h"
18 18
19#ifndef _UNICODE 19#ifndef _UNICODE
diff --git a/CPP/Windows/Console.h b/CPP/Windows/Console.h
index 818b8d4..6b494c8 100644
--- a/CPP/Windows/Console.h
+++ b/CPP/Windows/Console.h
@@ -3,7 +3,7 @@
3#ifndef ZIP7_INC_WINDOWS_CONSOLE_H 3#ifndef ZIP7_INC_WINDOWS_CONSOLE_H
4#define ZIP7_INC_WINDOWS_CONSOLE_H 4#define ZIP7_INC_WINDOWS_CONSOLE_H
5 5
6#include "Defs.h" 6#include "WinDefs.h"
7 7
8namespace NWindows { 8namespace NWindows {
9namespace NConsole { 9namespace NConsole {
diff --git a/CPP/Windows/Control/ImageList.h b/CPP/Windows/Control/ImageList.h
index 688f177..c10eea7 100644
--- a/CPP/Windows/Control/ImageList.h
+++ b/CPP/Windows/Control/ImageList.h
@@ -5,7 +5,7 @@
5 5
6#include <CommCtrl.h> 6#include <CommCtrl.h>
7 7
8#include "../Defs.h" 8#include "../WinDefs.h"
9 9
10namespace NWindows { 10namespace NWindows {
11namespace NControl { 11namespace NControl {
diff --git a/CPP/Windows/FileFind.h b/CPP/Windows/FileFind.h
index 944bca2..9ae1115 100644
--- a/CPP/Windows/FileFind.h
+++ b/CPP/Windows/FileFind.h
@@ -13,8 +13,6 @@
13#include "../Common/MyString.h" 13#include "../Common/MyString.h"
14#include "../Common/MyWindows.h" 14#include "../Common/MyWindows.h"
15 15
16#include "Defs.h"
17
18#include "FileIO.h" 16#include "FileIO.h"
19 17
20namespace NWindows { 18namespace NWindows {
diff --git a/CPP/Windows/FileIO.h b/CPP/Windows/FileIO.h
index 26edef4..a202df5 100644
--- a/CPP/Windows/FileIO.h
+++ b/CPP/Windows/FileIO.h
@@ -31,7 +31,7 @@
31 31
32#include "../Windows/TimeUtils.h" 32#include "../Windows/TimeUtils.h"
33 33
34#include "Defs.h" 34#include "WinDefs.h"
35 35
36HRESULT GetLastError_noZero_HRESULT(); 36HRESULT GetLastError_noZero_HRESULT();
37 37
diff --git a/CPP/Windows/FileSystem.cpp b/CPP/Windows/FileSystem.cpp
index b402306..6cb9808 100644
--- a/CPP/Windows/FileSystem.cpp
+++ b/CPP/Windows/FileSystem.cpp
@@ -9,7 +9,7 @@
9#endif 9#endif
10 10
11#include "FileSystem.h" 11#include "FileSystem.h"
12#include "Defs.h" 12#include "WinDefs.h"
13 13
14#ifndef _UNICODE 14#ifndef _UNICODE
15extern bool g_IsNT; 15extern bool g_IsNT;
diff --git a/CPP/Windows/Menu.h b/CPP/Windows/Menu.h
index e1de4c4..00aa692 100644
--- a/CPP/Windows/Menu.h
+++ b/CPP/Windows/Menu.h
@@ -6,7 +6,7 @@
6#include "../Common/MyWindows.h" 6#include "../Common/MyWindows.h"
7#include "../Common/MyString.h" 7#include "../Common/MyString.h"
8 8
9#include "Defs.h" 9#include "WinDefs.h"
10 10
11namespace NWindows { 11namespace NWindows {
12 12
diff --git a/CPP/Windows/ProcessUtils.h b/CPP/Windows/ProcessUtils.h
index b1fce3a..34fef8d 100644
--- a/CPP/Windows/ProcessUtils.h
+++ b/CPP/Windows/ProcessUtils.h
@@ -39,7 +39,7 @@ typedef PROCESS_MEMORY_COUNTERS *PPROCESS_MEMORY_COUNTERS;
39 39
40#include "../Common/MyString.h" 40#include "../Common/MyString.h"
41 41
42#include "Defs.h" 42#include "WinDefs.h"
43#include "Handle.h" 43#include "Handle.h"
44 44
45namespace NWindows { 45namespace NWindows {
diff --git a/CPP/Windows/PropVariantConv.cpp b/CPP/Windows/PropVariantConv.cpp
index 21a7b4e..467c0f8 100644
--- a/CPP/Windows/PropVariantConv.cpp
+++ b/CPP/Windows/PropVariantConv.cpp
@@ -4,7 +4,7 @@
4 4
5#include "../Common/IntToString.h" 5#include "../Common/IntToString.h"
6 6
7#include "Defs.h" 7#include "WinDefs.h"
8#include "PropVariantConv.h" 8#include "PropVariantConv.h"
9 9
10#define UINT_TO_STR_2(c, val) { s[0] = (c); s[1] = (char)('0' + (val) / 10); s[2] = (char)('0' + (val) % 10); s += 3; } 10#define UINT_TO_STR_2(c, val) { s[0] = (c); s[1] = (char)('0' + (val) / 10); s[2] = (char)('0' + (val) % 10); s += 3; }
diff --git a/CPP/Windows/SecurityUtils.h b/CPP/Windows/SecurityUtils.h
index 022a8f3..9775d09 100644
--- a/CPP/Windows/SecurityUtils.h
+++ b/CPP/Windows/SecurityUtils.h
@@ -9,7 +9,7 @@
9#include <NTSecAPI.h> 9#include <NTSecAPI.h>
10#endif 10#endif
11 11
12#include "Defs.h" 12#include "WinDefs.h"
13 13
14#ifndef _UNICODE 14#ifndef _UNICODE
15 15
diff --git a/CPP/Windows/Shell.h b/CPP/Windows/Shell.h
index 9e58e25..163c7d9 100644
--- a/CPP/Windows/Shell.h
+++ b/CPP/Windows/Shell.h
@@ -12,7 +12,7 @@
12 12
13#include "../Common/MyString.h" 13#include "../Common/MyString.h"
14 14
15#include "Defs.h" 15#include "WinDefs.h"
16 16
17namespace NWindows { 17namespace NWindows {
18namespace NShell { 18namespace NShell {
diff --git a/CPP/Windows/Synchronization.h b/CPP/Windows/Synchronization.h
index 1df84d3..25764b8 100644
--- a/CPP/Windows/Synchronization.h
+++ b/CPP/Windows/Synchronization.h
@@ -7,7 +7,7 @@
7 7
8#include "../Common/MyTypes.h" 8#include "../Common/MyTypes.h"
9 9
10#include "Defs.h" 10#include "WinDefs.h"
11 11
12#ifdef _WIN32 12#ifdef _WIN32
13#include "Handle.h" 13#include "Handle.h"
diff --git a/CPP/Windows/Thread.h b/CPP/Windows/Thread.h
index 75c1616..028267b 100644
--- a/CPP/Windows/Thread.h
+++ b/CPP/Windows/Thread.h
@@ -5,7 +5,7 @@
5 5
6#include "../../C/Threads.h" 6#include "../../C/Threads.h"
7 7
8#include "Defs.h" 8#include "WinDefs.h"
9 9
10namespace NWindows { 10namespace NWindows {
11 11
diff --git a/CPP/Windows/TimeUtils.cpp b/CPP/Windows/TimeUtils.cpp
index 4e3bc59..c83f75d 100644
--- a/CPP/Windows/TimeUtils.cpp
+++ b/CPP/Windows/TimeUtils.cpp
@@ -7,8 +7,8 @@
7#include <time.h> 7#include <time.h>
8#endif 8#endif
9 9
10#include "Defs.h"
11#include "TimeUtils.h" 10#include "TimeUtils.h"
11#include "WinDefs.h"
12 12
13namespace NWindows { 13namespace NWindows {
14namespace NTime { 14namespace NTime {
diff --git a/CPP/Windows/Defs.h b/CPP/Windows/WinDefs.h
index 8ab9cf5..86512d2 100644
--- a/CPP/Windows/Defs.h
+++ b/CPP/Windows/WinDefs.h
@@ -1,7 +1,7 @@
1// Windows/Defs.h 1// Windows/Defs.h
2 2
3#ifndef ZIP7_INC_WINDOWS_DEFS_H 3#ifndef ZIP7_INC_WINDOWS_WIN_DEFS_H
4#define ZIP7_INC_WINDOWS_DEFS_H 4#define ZIP7_INC_WINDOWS_WIN_DEFS_H
5 5
6#include "../Common/MyWindows.h" 6#include "../Common/MyWindows.h"
7 7
diff --git a/CPP/Windows/Window.h b/CPP/Windows/Window.h
index a99143b..b0ddef9 100644
--- a/CPP/Windows/Window.h
+++ b/CPP/Windows/Window.h
@@ -6,7 +6,7 @@
6#include "../Common/MyWindows.h" 6#include "../Common/MyWindows.h"
7#include "../Common/MyString.h" 7#include "../Common/MyString.h"
8 8
9#include "Defs.h" 9#include "WinDefs.h"
10 10
11#ifndef UNDER_CE 11#ifndef UNDER_CE
12#ifdef WM_CHANGEUISTATE 12#ifdef WM_CHANGEUISTATE