diff --git a/Release/tool3.exe b/Release/tool3.exe
index c0ffa02..be5f126 100644
Binary files a/Release/tool3.exe and b/Release/tool3.exe differ
diff --git a/tool3.sln b/tool3.sln
index 386c112..3a4a035 100644
--- a/tool3.sln
+++ b/tool3.sln
@@ -6,13 +6,19 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5AAACF95-B7BD-4C26-B1B4-6B97629C2883}.Debug|Win32.ActiveCfg = Debug|Win32
{5AAACF95-B7BD-4C26-B1B4-6B97629C2883}.Debug|Win32.Build.0 = Debug|Win32
+ {5AAACF95-B7BD-4C26-B1B4-6B97629C2883}.Debug|x64.ActiveCfg = Debug|x64
+ {5AAACF95-B7BD-4C26-B1B4-6B97629C2883}.Debug|x64.Build.0 = Debug|x64
{5AAACF95-B7BD-4C26-B1B4-6B97629C2883}.Release|Win32.ActiveCfg = Release|Win32
{5AAACF95-B7BD-4C26-B1B4-6B97629C2883}.Release|Win32.Build.0 = Release|Win32
+ {5AAACF95-B7BD-4C26-B1B4-6B97629C2883}.Release|x64.ActiveCfg = Release|x64
+ {5AAACF95-B7BD-4C26-B1B4-6B97629C2883}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/tool3.suo b/tool3.suo
index 9f6641c..9eb35e6 100644
Binary files a/tool3.suo and b/tool3.suo differ
diff --git a/tool3/MainFrm.cpp b/tool3/MainFrm.cpp
index f88f7f4..8f35ecd 100644
--- a/tool3/MainFrm.cpp
+++ b/tool3/MainFrm.cpp
@@ -104,7 +104,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
wq[1].LoadBitmapW(IDB_BITMAP4);
wchar_t w[140];
ExpandEnvironmentStrings(L"%USERPROFILE%\\Documents\\fold.",w,140);
- FILE *xf=_wfopen(w,L"r+");
+ FILE *xf;
+ _wfopen_s(&xf,w,L"r+");
DWORD c = 0L;
if(xf)
{
@@ -118,7 +119,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
}
else
{
- wcscpy_s(remmi,L"--block-sync-size 498 --db-sync-mode fastest:sync:8750");
+ wcscpy_s(remmi,L"--block-sync-size 4 --db-sync-mode fastest:sync:8750");
fwprintf(xf,L"\n%s",remmi);
}
fclose(xf);
@@ -126,7 +127,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
else
{
c=WS_DISABLED;
- wcscpy_s(remmi,L"--block-sync-size 498 --db-sync-mode fastest:sync:8750");
+ wcscpy_s(remmi,L"--block-sync-size 4 --db-sync-mode fastest:sync:8750");
t=NULL;
}
@@ -142,6 +143,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
dc->Create(WS_VISIBLE|WS_CHILD|PBS_SMOOTH,CRect(120,100+130,120+220,100+170),this,21);
t7->Create(WS_VISIBLE|WS_CHILD|PBS_VERTICAL|PBS_SMOOTHREVERSE|PBS_SMOOTH,CRect(10,200,10+19,200+140),this,29);
t7->SetState(PBST_ERROR);
+ t7->SetRange(0,140);
hc=CreateWindowEx(WS_EX_NOPARENTNOTIFY, MSFTEDIT_CLASS,remmi,
ES_MULTILINE|ES_AUTOVSCROLL|ES_NOOLEDRAGDROP| WS_VISIBLE | WS_CHILD |WS_TABSTOP|WS_VSCROLL,
1, 350, 450, 201,
@@ -195,7 +197,7 @@ VOID c(VOID *)
CStringA t,bear;
bear.Empty();
SETTEXTEX fw;
- fw.flags=0;
+ fw.flags=4;
fw.codepage=CP_THREAD_ACP;
int monte=0;
char reserve;
@@ -210,7 +212,14 @@ VOID c(VOID *)
h = min(400000,totalbytesavailable);
output_cmd[h]='\0';
t=output_cmd;
- if(monte) bear.SetAt(monte-2,reserve);
+ if(monte) bear.SetAt(monte-2,reserve);
+ else
+ {
+ sscanf_s(t.Left(19),"%d-%d-%d %d:%d:%d", &z.c.tm_year ,&z.c.tm_mon, &z.c.tm_mday , &z.c.tm_hour, &z.c.tm_min ,&z.c.tm_sec);
+ z.c.tm_year-=1900;
+ z.t=_mktime64(&z.c);
+ }
+
monte=monte+h;
bear=bear + t;
if(w++ > 13) {bear=bear.Right(monte=min(monte,3504));w=0;}
@@ -227,17 +236,11 @@ VOID c(VOID *)
tm=2940;
if(z.tb==2)
{
-
- sscanf(t.Left(19),"%d-%d-%d %d:%d:%d", &z.p.tm_year ,&z.p.tm_mon, &z.p.tm_mday , &z.p.tm_hour, &z.p.tm_min ,&z.p.tm_sec);
+ sscanf_s(t.Left(19),"%d-%d-%d %d:%d:%d", &z.p.tm_year ,&z.p.tm_mon, &z.p.tm_mday , &z.p.tm_hour, &z.p.tm_min ,&z.p.tm_sec);
z.p.tm_year-=1900;
z.b=_mktime64(&z.p);
}
- else
- {
- sscanf(t.Left(19),"%d-%d-%d %d:%d:%d", &z.c.tm_year ,&z.c.tm_mon, &z.c.tm_mday , &z.c.tm_hour, &z.c.tm_min ,&z.c.tm_sec);
- z.c.tm_year-=1900;
- z.t=_mktime64(&z.c);
- }
+
t=t.Right(h-c-7);
t.Truncate(h-c-11);
@@ -249,8 +252,8 @@ VOID c(VOID *)
{
z.block[2]=p[1];
z.q=60.0*((z.block[2] - z.block[1]))/(z.b - z.t);
- if(z.tp==0) { z.x= 3.78*z.q; z.tp++; }
- t7->SetPos(100*z.q/z.x);
+ if(z.tp==0) { z.x= 58.0*z.q; z.tp++; }
+ t7->SetPos(140*z.q/z.x);
}
else z.tb=2;
}
@@ -276,7 +279,6 @@ VOID c(VOID *)
dc->SetState(PBST_PAUSED);
bhr->SetProgressState(hz,TBPF_PAUSED);
q->EnableWindow(0);
- t7->SetPos(0);
WaitForSingleObject(pi.hProcess,INFINITE);
b=0;
bh->EnableWindow();
diff --git a/tool3/tool3.vcxproj b/tool3/tool3.vcxproj
index da805ac..ec3f18a 100644
--- a/tool3/tool3.vcxproj
+++ b/tool3/tool3.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{5AAACF95-B7BD-4C26-B1B4-6B97629C2883}
@@ -22,6 +30,12 @@
Unicode
Dynamic
+
+ Application
+ true
+ Unicode
+ Dynamic
+
Application
false
@@ -29,22 +43,41 @@
Unicode
Dynamic
+
+ Application
+ false
+ true
+ Unicode
+ Dynamic
+
+
+
+
+
+
+
true
-
+
true
+
+ false
+
+
+ false
+
Use
@@ -67,26 +100,50 @@
$(IntDir);%(AdditionalIncludeDirectories)
+
+
+ Use
+ Level3
+ Disabled
+ WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)
+
+
+ Windows
+ true
+
+
+ false
+ _DEBUG;%(PreprocessorDefinitions)
+
+
+ 0x0409
+ _DEBUG;%(PreprocessorDefinitions)
+ $(IntDir);%(AdditionalIncludeDirectories)
+
+
Level3
Use
MaxSpeed
- true
+ false
true
WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)
- OldStyle
+ ProgramDatabase
Speed
StreamingSIMDExtensions2
Default
false
+ true
+ None
Windows
false
- true
+ false
true
NoErrorReport
+ MachineX86
false
@@ -99,6 +156,39 @@
$(IntDir);%(AdditionalIncludeDirectories)
+
+
+ Level3
+ Use
+ MaxSpeed
+ false
+ true
+ WIN64;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)
+ ProgramDatabase
+ Speed
+ StreamingSIMDExtensions2
+ Default
+ false
+ true
+ None
+
+
+ Windows
+ false
+ false
+ true
+ NoErrorReport
+
+
+ false
+ NDEBUG;%(PreprocessorDefinitions)
+
+
+ 0x0409
+ NDEBUG;%(PreprocessorDefinitions)
+ $(IntDir);%(AdditionalIncludeDirectories)
+
+
@@ -115,7 +205,9 @@
Create
+ Create
Create
+ Create
diff --git a/x64/Release/tool3.exe b/x64/Release/tool3.exe
new file mode 100644
index 0000000..0d53253
Binary files /dev/null and b/x64/Release/tool3.exe differ