Skip to content

Commit 207f957

Browse files
committed
ver_c0: 2019, cloud skip
1 parent 5cb819b commit 207f957

File tree

8 files changed

+635
-37
lines changed

8 files changed

+635
-37
lines changed

Col0/ver_c0/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,8 @@
1515
/final.64W.vc
1616
/makefile_gcc
1717
/pe.def
18+
/build
19+
/debug
20+
/ver_c0.x86
21+
/ver_c0.x64
22+
/.vs

Col0/ver_c0/changelog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Version 3.2
2+
3+
* Don't load cloud files (OneDrive free up space feature).
4+
5+
6+
Version 3.1
7+
18
* '.sys' extension added
29

310
* More extensions supported (dl, so, fmt, module, fll, ahp, t32, t64, sfx).

Col0/ver_c0/pe.cpp

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
#include <windows.h>
3030
#include <wintrust.h>
3131

32+
#ifndef FILE_ATTRIBUTE_RECALL_ON_OPEN
33+
#define FILE_ATTRIBUTE_RECALL_ON_OPEN 0x00040000 // NOLINT(cppcoreguidelines-macro-usage)
34+
#endif
35+
#ifndef FILE_ATTRIBUTE_RECALL_ON_DATA_ACCESS
36+
#define FILE_ATTRIBUTE_RECALL_ON_DATA_ACCESS 0x00400000 // NOLINT(cppcoreguidelines-macro-usage)
37+
#endif
38+
3239
#undef USE_TRACE
3340
//#define USE_TRACE
3441

@@ -49,7 +56,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4956
#include "../../../common/Defines.h"
5057
#include "../../../common/Memory.h"
5158
#else
52-
#define _wsprintf wsprintfW
59+
// ReSharper disable once CppInconsistentNaming
60+
#define _wsprintf wsprintfW // NOLINT(cppcoreguidelines-macro-usage)
5361
#define SKIPLEN(x)
5462
#endif
5563

@@ -58,6 +66,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5866
#endif
5967

6068
#ifdef _DEBUG
69+
// ReSharper disable once CppInconsistentNaming
6170
#define Msg(f,s) //MessageBoxA(NULL,s,f,MB_OK|MB_SETFOREGROUND)
6271
#else
6372
#define Msg(f,s)
@@ -2888,6 +2897,17 @@ intptr_t WINAPI GetContentDataW(struct GetContentDataInfo *Info)
28882897
// lstrcat(pszBuffer, FilePath);
28892898
// pszUNCPath = pszBuffer;
28902899
//}
2900+
2901+
// Don't trigger downloads of cloud files
2902+
const DWORD fileAttrs = GetFileAttributesW(pszUNCPath);
2903+
if (fileAttrs & FILE_ATTRIBUTE_RECALL_ON_DATA_ACCESS || fileAttrs & FILE_ATTRIBUTE_RECALL_ON_OPEN)
2904+
{
2905+
LPCWSTR pszCloud = L"[cloud]";
2906+
nLen = lstrlen(pszCloud)+1;
2907+
*CustomData = (wchar_t*)malloc(nLen*2);
2908+
lstrcpy(*CustomData, pszCloud);
2909+
return TRUE;
2910+
}
28912911

28922912
HANDLE hFile = CreateFileW(pszUNCPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0,0);
28932913
if (hFile == INVALID_HANDLE_VALUE)

Col0/ver_c0/pe.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ END
5353
//
5454

5555
VS_VERSION_INFO VERSIONINFO
56-
FILEVERSION 3,1,0,0
57-
PRODUCTVERSION 3,1,0,0
56+
FILEVERSION 3,2,0,0
57+
PRODUCTVERSION 3,2,0,0
5858
FILEFLAGSMASK 0x17L
5959
#ifdef _DEBUG
6060
FILEFLAGS 0x1L
@@ -70,9 +70,9 @@ BEGIN
7070
BLOCK "041904b0"
7171
BEGIN
7272
VALUE "FileDescription", "VerInfo for C0 column"
73-
VALUE "FileVersion", "3.1"
73+
VALUE "FileVersion", "3.2"
7474
VALUE "InternalName", "Ver_c0"
75-
VALUE "LegalCopyright", "(C) 2015 Maximus5"
75+
VALUE "LegalCopyright", "(C) 2020 Maximus5"
7676
VALUE "OriginalFilename", "ver_c0.dll"
7777
END
7878
END

Col0/ver_c0/pe.sln

Lines changed: 23 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,55 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.40629.0
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30413.136
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pe", "pe.vcxproj", "{D179531C-0F06-473A-A301-7FE8976046EC}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10-
Debug_C|Itanium = Debug_C|Itanium
11-
Debug_C|Win32 = Debug_C|Win32
1210
Debug_C|x64 = Debug_C|x64
13-
Debug_C0|Itanium = Debug_C0|Itanium
14-
Debug_C0|Win32 = Debug_C0|Win32
11+
Debug_C|x86 = Debug_C|x86
1512
Debug_C0|x64 = Debug_C0|x64
16-
Debug_E|Itanium = Debug_E|Itanium
17-
Debug_E|Win32 = Debug_E|Win32
13+
Debug_C0|x86 = Debug_C0|x86
1814
Debug_E|x64 = Debug_E|x64
19-
Debug_R|Itanium = Debug_R|Itanium
20-
Debug_R|Win32 = Debug_R|Win32
15+
Debug_E|x86 = Debug_E|x86
2116
Debug_R|x64 = Debug_R|x64
22-
Release_C0|Itanium = Release_C0|Itanium
23-
Release_C0|Win32 = Release_C0|Win32
17+
Debug_R|x86 = Debug_R|x86
2418
Release_C0|x64 = Release_C0|x64
25-
Release|Itanium = Release|Itanium
26-
Release|Win32 = Release|Win32
19+
Release_C0|x86 = Release_C0|x86
2720
Release|x64 = Release|x64
21+
Release|x86 = Release|x86
2822
EndGlobalSection
2923
GlobalSection(ProjectConfigurationPlatforms) = postSolution
30-
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_C|Itanium.ActiveCfg = Debug_C|Win32
31-
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_C|Win32.ActiveCfg = Debug_C|Win32
32-
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_C|Win32.Build.0 = Debug_C|Win32
3324
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_C|x64.ActiveCfg = Debug_C|x64
3425
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_C|x64.Build.0 = Debug_C|x64
35-
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_C0|Itanium.ActiveCfg = Debug_C0|Win32
36-
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_C0|Win32.ActiveCfg = Debug_C0|Win32
37-
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_C0|Win32.Build.0 = Debug_C0|Win32
26+
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_C|x86.ActiveCfg = Debug_C|Win32
27+
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_C|x86.Build.0 = Debug_C|Win32
3828
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_C0|x64.ActiveCfg = Debug_C0|x64
3929
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_C0|x64.Build.0 = Debug_C0|x64
40-
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_E|Itanium.ActiveCfg = Debug_E|Win32
41-
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_E|Win32.ActiveCfg = Debug_E|Win32
42-
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_E|Win32.Build.0 = Debug_E|Win32
30+
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_C0|x86.ActiveCfg = Debug_C0|Win32
31+
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_C0|x86.Build.0 = Debug_C0|Win32
4332
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_E|x64.ActiveCfg = Debug_E|x64
4433
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_E|x64.Build.0 = Debug_E|x64
45-
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_R|Itanium.ActiveCfg = Debug_R|Win32
46-
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_R|Win32.ActiveCfg = Debug_R|Win32
47-
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_R|Win32.Build.0 = Debug_R|Win32
34+
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_E|x86.ActiveCfg = Debug_E|Win32
35+
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_E|x86.Build.0 = Debug_E|Win32
4836
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_R|x64.ActiveCfg = Debug_R|x64
4937
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_R|x64.Build.0 = Debug_R|x64
50-
{D179531C-0F06-473A-A301-7FE8976046EC}.Release_C0|Itanium.ActiveCfg = Release_C0|Win32
51-
{D179531C-0F06-473A-A301-7FE8976046EC}.Release_C0|Win32.ActiveCfg = Release_C0|Win32
52-
{D179531C-0F06-473A-A301-7FE8976046EC}.Release_C0|Win32.Build.0 = Release_C0|Win32
38+
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_R|x86.ActiveCfg = Debug_R|Win32
39+
{D179531C-0F06-473A-A301-7FE8976046EC}.Debug_R|x86.Build.0 = Debug_R|Win32
5340
{D179531C-0F06-473A-A301-7FE8976046EC}.Release_C0|x64.ActiveCfg = Release_C0|x64
5441
{D179531C-0F06-473A-A301-7FE8976046EC}.Release_C0|x64.Build.0 = Release_C0|x64
55-
{D179531C-0F06-473A-A301-7FE8976046EC}.Release|Itanium.ActiveCfg = Release|Win32
56-
{D179531C-0F06-473A-A301-7FE8976046EC}.Release|Win32.ActiveCfg = Release|Win32
57-
{D179531C-0F06-473A-A301-7FE8976046EC}.Release|Win32.Build.0 = Release|Win32
42+
{D179531C-0F06-473A-A301-7FE8976046EC}.Release_C0|x86.ActiveCfg = Release_C0|Win32
43+
{D179531C-0F06-473A-A301-7FE8976046EC}.Release_C0|x86.Build.0 = Release_C0|Win32
5844
{D179531C-0F06-473A-A301-7FE8976046EC}.Release|x64.ActiveCfg = Release|x64
5945
{D179531C-0F06-473A-A301-7FE8976046EC}.Release|x64.Build.0 = Release|x64
46+
{D179531C-0F06-473A-A301-7FE8976046EC}.Release|x86.ActiveCfg = Release|Win32
47+
{D179531C-0F06-473A-A301-7FE8976046EC}.Release|x86.Build.0 = Release|Win32
6048
EndGlobalSection
6149
GlobalSection(SolutionProperties) = preSolution
6250
HideSolutionNode = FALSE
6351
EndGlobalSection
52+
GlobalSection(ExtensibilityGlobals) = postSolution
53+
SolutionGuid = {E8A00153-5736-4014-AFB0-6C8748816CD2}
54+
EndGlobalSection
6455
EndGlobal

Col0/ver_c0/pe.sln.DotSettings

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:Boolean x:Key="/Default/UserDictionary/Words/=cppcoreguidelines/@EntryIndexedValue">True</s:Boolean>
3+
<s:Boolean x:Key="/Default/UserDictionary/Words/=SETFOREGROUND/@EntryIndexedValue">True</s:Boolean>
4+
<s:Boolean x:Key="/Default/UserDictionary/Words/=SKIPLEN/@EntryIndexedValue">True</s:Boolean>
5+
<s:Boolean x:Key="/Default/UserDictionary/Words/=wsprintf/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

0 commit comments

Comments
 (0)