VersionInfo, W7UI, WhoUsesMyFiles, YAPP, ZeroNotification: changed folder structure

git-svn-id: http://svn.miranda-ng.org/main/trunk@1161 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

25 files changed, 78 insertions, 204 deletions

diff --git a/plugins/VersionInfo/AggressiveOptimize.h b/plugins/VersionInfo/AggressiveOptimize.h
deleted file mode 100644
index 1b646c301c..0000000000
--- a/plugins/VersionInfo/AggressiveOptimize.h
+++ /dev/null
@@ -1,58 +0,0 @@
-

-//////////////////////////////

-// Version 1.10

-// Jan 23rd, 2000

-// Version 1.00

-// May 20th, 1999

-// Todd C. Wilson, Fresh Ground Software

-// (todd@nopcode.com)

-// This header file will kick in settings for Visual C++ 5 and 6 that will (usually)

-// result in smaller exe's.

-// The "trick" is to tell the compiler to not pad out the function calls; this is done

-// by not using the /O1 or /O2 option - if you do, you implicitly use /Gy, which pads

-// out each and every function call. In one single 500k dll, I managed to cut out 120k

-// by this alone!

-// The other two "tricks" are telling the Linker to merge all data-type segments together

-// in the exe file. The relocation, read-only (constants) data, and code section (.text)

-// sections can almost always be merged. Each section merged can save 4k in exe space,

-// since each section is padded out to 4k chunks. This is very noticable with smaller

-// exes, since you could have only 700 bytes of data, 300 bytes of code, 94 bytes of

-// strings - padded out, this could be 12k of runtime, for 1094 bytes of stuff!

-// Note that if you're using MFC static or some other 3rd party libs, you may get poor

-// results with merging the readonly (.rdata) section - the exe may grow larger.

-// To use this feature, define _MERGE_DATA_ in your project or before this header is used.

-// With Visual C++ 5, the program uses a file alignement of 512 bytes, which results

-// in a small exe. Under VC6, the program instead uses 4k, which is the same as the

-// section size. The reason (from what I understand) is that 4k is the chunk size of

-// the virtual memory manager, and that WinAlign (an end-user tuning tool for Win98)

-// will re-align the programs on this boundary. The problem with this is that all of

-// Microsoft's system exes and dlls are not tuned like this, and using 4k causes serious

-// exe bloat. Very noticable for smaller programs.

-// The "trick" for this is to use the undocumented FILEALIGN linker parm to change the

-// padding from 4k to 1/2k, which results in a much smaller exe - anywhere from 20%-75%

-// depending on the size. 

-

-

-#ifdef NDEBUG

-// /Og (global optimizations), /Os (favor small code), /Oy (no frame pointers)

-#pragma optimize("gsy",on)

-

-#pragma comment(linker,"/RELEASE")

-

-// Note that merging the .rdata section will result in LARGER exe's if you using

-// MFC (esp. static link). If this is desirable, define _MERGE_RDATA_ in your project.

-#ifdef _MERGE_RDATA_

-#pragma comment(linker,"/merge:.rdata=.data")

-#endif // _MERGE_RDATA_

-

-#pragma comment(linker,"/merge:.text=.data")

-#pragma comment(linker,"/merge:.reloc=.data")

-

-#if _MSC_VER >= 1000

-// Only supported/needed with VC6; VC5 already does 0x200 for release builds.

-// Totally undocumented! And if you set it lower than 512 bytes, the program crashes.

-// Either leave at 0x200 or 0x1000

-#pragma comment(linker,"/FILEALIGN:0x200")

-#endif // _MSC_VER >= 1000

-

-#endif // NDEBUG

diff --git a/plugins/VersionInfo/VersionInfo_10.vcxproj b/plugins/VersionInfo/VersionInfo_10.vcxproj
index 9481a8a3dd..2f758a10f8 100644
--- a/plugins/VersionInfo/VersionInfo_10.vcxproj
+++ b/plugins/VersionInfo/VersionInfo_10.vcxproj
@@ -73,12 +73,11 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;VERSIONINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

     </ClCompile>

@@ -102,12 +101,11 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;VERSIONINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

@@ -134,7 +132,7 @@
       <Optimization>Disabled</Optimization>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;VERSIONINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

     </ClCompile>

     <Link>

@@ -159,7 +157,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;VERSIONINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -181,28 +179,25 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="CPlugin.cpp" />

-    <ClCompile Include="CVersionInfo.cpp" />

-    <ClCompile Include="dlgHandlers.cpp" />

-    <ClCompile Include="hooked_events.cpp" />

-    <ClCompile Include="main.cpp">

+    <ClCompile Include="src\CPlugin.cpp" />

+    <ClCompile Include="src\CVersionInfo.cpp" />

+    <ClCompile Include="src\dlgHandlers.cpp" />

+    <ClCompile Include="src\hooked_events.cpp" />

+    <ClCompile Include="src\main.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="services.cpp" />

-    <ClCompile Include="utils.cpp" />

+    <ClCompile Include="src\services.cpp" />

+    <ClCompile Include="src\utils.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="common.h" />

-    <ClInclude Include="CPlugin.h" />

-    <ClInclude Include="CVersionInfo.h" />

-    <ClInclude Include="hooked_events.h" />

-    <ClInclude Include="utils.h" />

+    <ClInclude Include="src\common.h" />

+    <ClInclude Include="src\CPlugin.h" />

+    <ClInclude Include="src\CVersionInfo.h" />

+    <ClInclude Include="src\hooked_events.h" />

+    <ClInclude Include="src\utils.h" />

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="VersionInfo.ico" />

+    <ResourceCompile Include="res\resource.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/VersionInfo/VersionInfo_10.vcxproj.filters b/plugins/VersionInfo/VersionInfo_10.vcxproj.filters
index e0c4f5db2e..b5f5a05d9b 100644
--- a/plugins/VersionInfo/VersionInfo_10.vcxproj.filters
+++ b/plugins/VersionInfo/VersionInfo_10.vcxproj.filters
@@ -15,53 +15,48 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="CPlugin.cpp">

+    <ClCompile Include="src\CPlugin.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="CVersionInfo.cpp">

+    <ClCompile Include="src\CVersionInfo.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="dlgHandlers.cpp">

+    <ClCompile Include="src\dlgHandlers.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="hooked_events.cpp">

+    <ClCompile Include="src\hooked_events.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

+    <ClCompile Include="src\main.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="services.cpp">

+    <ClCompile Include="src\services.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="utils.cpp">

+    <ClCompile Include="src\utils.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="CPlugin.h">

+    <ClInclude Include="src\CPlugin.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="CVersionInfo.h">

+    <ClInclude Include="src\CVersionInfo.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="hooked_events.h">

+    <ClInclude Include="src\hooked_events.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="common.h">

+    <ClInclude Include="src\common.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="utils.h">

+    <ClInclude Include="src\utils.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc">

+    <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

-  <ItemGroup>

-    <None Include="VersionInfo.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/VersionInfo/VersionInfo.html b/plugins/VersionInfo/docs/VersionInfo.html
index a955874979..a955874979 100644
--- a/plugins/VersionInfo/VersionInfo.html
+++ b/plugins/VersionInfo/docs/VersionInfo.html
diff --git a/plugins/VersionInfo/svc_vi-translation.txt b/plugins/VersionInfo/docs/svc_vi-translation.txt
index 719f0beb2c..719f0beb2c 100644
--- a/plugins/VersionInfo/svc_vi-translation.txt
+++ b/plugins/VersionInfo/docs/svc_vi-translation.txt
diff --git a/plugins/VersionInfo/VersionInfo.ico b/plugins/VersionInfo/res/VersionInfo.ico
index b026d584c2..b026d584c2 100644
--- a/plugins/VersionInfo/VersionInfo.ico
+++ b/plugins/VersionInfo/res/VersionInfo.ico
diff --git a/plugins/VersionInfo/resource.rc b/plugins/VersionInfo/res/resource.rc
index b4a8eb819a..420b122b90 100644
--- a/plugins/VersionInfo/resource.rc
+++ b/plugins/VersionInfo/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

+#include "..\src\resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -182,7 +182,7 @@ END
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

+    "..\\src\\resource.h\0"

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/VersionInfo/res/version.rc b/plugins/VersionInfo/res/version.rc
new file mode 100644
index 0000000000..f691628164
--- /dev/null
+++ b/plugins/VersionInfo/res/version.rc
@@ -0,0 +1,46 @@
+// Microsoft Visual C++ generated resource script.

+//

+#ifdef APSTUDIO_INVOKED

+#error this file is not editable by Microsoft Visual C++

+#endif //APSTUDIO_INVOKED

+

+#include "..\src\version.h"

+#include "afxres.h"

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION __PLUGINVERSION_STRING

+ PRODUCTVERSION __PLUGINVERSION_STRING

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x2L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "Author", __AUTHOR

+            VALUE "FileDescription", __DESC

+            VALUE "FileVersion", __VERSION_STRING

+            VALUE "InternalName", __PLUGIN_DISPLAY_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

diff --git a/plugins/VersionInfo/CPlugin.cpp b/plugins/VersionInfo/src/CPlugin.cpp
index 54d762064a..54d762064a 100644
--- a/plugins/VersionInfo/CPlugin.cpp
+++ b/plugins/VersionInfo/src/CPlugin.cpp
diff --git a/plugins/VersionInfo/CPlugin.h b/plugins/VersionInfo/src/CPlugin.h
index 5da1b1dc6b..5da1b1dc6b 100644
--- a/plugins/VersionInfo/CPlugin.h
+++ b/plugins/VersionInfo/src/CPlugin.h
diff --git a/plugins/VersionInfo/CVersionInfo.cpp b/plugins/VersionInfo/src/CVersionInfo.cpp
index da10f4b9a9..da10f4b9a9 100644
--- a/plugins/VersionInfo/CVersionInfo.cpp
+++ b/plugins/VersionInfo/src/CVersionInfo.cpp
diff --git a/plugins/VersionInfo/CVersionInfo.h b/plugins/VersionInfo/src/CVersionInfo.h
index eb55b808fc..eb55b808fc 100644
--- a/plugins/VersionInfo/CVersionInfo.h
+++ b/plugins/VersionInfo/src/CVersionInfo.h
diff --git a/plugins/VersionInfo/common.h b/plugins/VersionInfo/src/common.h
index 3182abc660..3182abc660 100644
--- a/plugins/VersionInfo/common.h
+++ b/plugins/VersionInfo/src/common.h
diff --git a/plugins/VersionInfo/dlgHandlers.cpp b/plugins/VersionInfo/src/dlgHandlers.cpp
index a1a81e6a51..a1a81e6a51 100644
--- a/plugins/VersionInfo/dlgHandlers.cpp
+++ b/plugins/VersionInfo/src/dlgHandlers.cpp
diff --git a/plugins/VersionInfo/dlgHandlers.h b/plugins/VersionInfo/src/dlgHandlers.h
index bab1876ea2..bab1876ea2 100644
--- a/plugins/VersionInfo/dlgHandlers.h
+++ b/plugins/VersionInfo/src/dlgHandlers.h
diff --git a/plugins/VersionInfo/hooked_events.cpp b/plugins/VersionInfo/src/hooked_events.cpp
index 77d72e6a97..77d72e6a97 100644
--- a/plugins/VersionInfo/hooked_events.cpp
+++ b/plugins/VersionInfo/src/hooked_events.cpp
diff --git a/plugins/VersionInfo/hooked_events.h b/plugins/VersionInfo/src/hooked_events.h
index b75b5e59a8..b75b5e59a8 100644
--- a/plugins/VersionInfo/hooked_events.h
+++ b/plugins/VersionInfo/src/hooked_events.h
diff --git a/plugins/VersionInfo/main.cpp b/plugins/VersionInfo/src/main.cpp
index 53c75be86f..53c75be86f 100644
--- a/plugins/VersionInfo/main.cpp
+++ b/plugins/VersionInfo/src/main.cpp
diff --git a/plugins/VersionInfo/resource.h b/plugins/VersionInfo/src/resource.h
index b282e8bca6..b282e8bca6 100644
--- a/plugins/VersionInfo/resource.h
+++ b/plugins/VersionInfo/src/resource.h
diff --git a/plugins/VersionInfo/services.cpp b/plugins/VersionInfo/src/services.cpp
index 4efa482404..4efa482404 100644
--- a/plugins/VersionInfo/services.cpp
+++ b/plugins/VersionInfo/src/services.cpp
diff --git a/plugins/VersionInfo/services.h b/plugins/VersionInfo/src/services.h
index 38acbc7731..38acbc7731 100644
--- a/plugins/VersionInfo/services.h
+++ b/plugins/VersionInfo/src/services.h
diff --git a/plugins/VersionInfo/utils.cpp b/plugins/VersionInfo/src/utils.cpp
index 9be552c8cc..9be552c8cc 100644
--- a/plugins/VersionInfo/utils.cpp
+++ b/plugins/VersionInfo/src/utils.cpp
diff --git a/plugins/VersionInfo/utils.h b/plugins/VersionInfo/src/utils.h
index 5db4b1a811..5db4b1a811 100644
--- a/plugins/VersionInfo/utils.h
+++ b/plugins/VersionInfo/src/utils.h
diff --git a/plugins/VersionInfo/version.h b/plugins/VersionInfo/src/version.h
index 7c0596e2c9..7c0596e2c9 100644
--- a/plugins/VersionInfo/version.h
+++ b/plugins/VersionInfo/src/version.h
diff --git a/plugins/VersionInfo/version.rc b/plugins/VersionInfo/version.rc
deleted file mode 100644
index cd65db2ee3..0000000000
--- a/plugins/VersionInfo/version.rc
+++ /dev/null
@@ -1,104 +0,0 @@
-// Microsoft Visual C++ generated resource script.

-//

-#ifdef APSTUDIO_INVOKED

-#error this file is not editable by Microsoft Visual C++

-#endif //APSTUDIO_INVOKED

-

-#include "resource.h"

-#include "version.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "afxres.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE 

-BEGIN

-    "resource1.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

-    "#include ""afxres.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION __PLUGINVERSION_STRING

- PRODUCTVERSION __PLUGINVERSION_STRING

- FILEFLAGSMASK 0x17L

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x4L

- FILETYPE 0x2L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "040904b0"

-        BEGIN

-            VALUE "Author", __AUTHOR

-            VALUE "FileDescription", __DESC

-            VALUE "FileVersion", __VERSION_STRING

-            VALUE "InternalName", __PLUGIN_DISPLAY_NAME

-            VALUE "LegalCopyright", __COPYRIGHT

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x409, 1200

-    END

-END

-

-#endif    // English (U.S.) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-