Skip to content
This repository has been archived by the owner on Aug 22, 2022. It is now read-only.

Commit

Permalink
Update v1.6.2 file
Browse files Browse the repository at this point in the history
  • Loading branch information
@XyLe-GBP
XyLe-GBP committed Feb 24, 2021
1 parent 9abcc26 commit 58b36ae
Show file tree
Hide file tree
Showing 13 changed files with 407 additions and 565 deletions.
Binary file modified Sources/App.General.Lib/App.General.Lib.aps
View file
Binary file not shown.
Binary file modified Sources/App.General.Lib/App.General.Lib.rc
View file
Binary file not shown.
55 changes: 10 additions & 45 deletions Sources/waifu2x-ncnn-vulkan/DELETEDIALOG.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "afxdialogex.h"
#include "waifu2x-ncnn-vulkanDlg.h"

#define WM_USER_COMPLETE_MAIN (WM_USER + 0x10)

// DELETEDIALOG ダイアログ

Expand Down Expand Up @@ -41,7 +40,6 @@ void DELETEDIALOG::DoDataExchange(CDataExchange* pDX)
BEGIN_MESSAGE_MAP(DELETEDIALOG, CDialogEx)
ON_WM_TIMER()
ON_WM_DESTROY()
ON_MESSAGE(WM_USER_COMPLETE_MAIN, DELETEDIALOG::OnCompleteMainThread)
END_MESSAGE_MAP()


Expand Down Expand Up @@ -78,51 +76,8 @@ BOOL DELETEDIALOG::OnInitDialog()
hDCStatic = ::GetDC(this->m_Static);
this->m_Static.GetClientRect(&rc);

CWinThread* pMainThread = NULL;
pMainThread = AfxBeginThread(MainThread, (LPVOID)this, THREAD_PRIORITY_NORMAL, 0, CREATE_SUSPENDED, NULL);
if (pMainThread)
{
pMainThread->m_pMainWnd = this;
pMainThread->m_bAutoDelete = TRUE;
pMainThread->ResumeThread();
}

return TRUE;
}
UINT DELETEDIALOG::MainThread(LPVOID pParam)
{
DELETEDIALOG* pFileView = dynamic_cast<DELETEDIALOG*>(reinterpret_cast<CWnd*>(pParam));
if (pFileView)
{
pFileView->MainThread();
}
return 0;
}

void DELETEDIALOG::MainThread()
{
INT cur, max;

xv_Progress.GetRange(cur, max);
while (max >= static_cast<INT>(Cwaifu2xncnnvulkanDlg::DELETECURCOUNT)) {
if (max <= static_cast<INT>(Cwaifu2xncnnvulkanDlg::DELETECURCOUNT)) {
Sleep(1000);
break;
}
if (ExceptionCounter > 20) {
Cwaifu2xncnnvulkanDlg::DeleteExceptionFlag = 1;
MessageBox(_T("An unexpected error has occurred.\nA static variable stopped with an unexpected value.\nSome files failed to be deleted."), _T("Error"), MB_ICONWARNING | MB_OK);
break;
}
}
PostMessage(WM_USER_COMPLETE_MAIN);
}

LRESULT DELETEDIALOG::OnCompleteMainThread(WPARAM wParam, LPARAM lParam)
{
PostMessage(WM_CLOSE);
return 0;
}

void DELETEDIALOG::UpdateProgressText()
{
Expand Down Expand Up @@ -204,6 +159,9 @@ void DELETEDIALOG::OnTimer(UINT_PTR nIDEvent)
// TODO: ここにメッセージ ハンドラー コードを追加するか、既定の処理を呼び出します。

if (nIDEvent == m_TimerID) {
INT cur{}, max{};

xv_Progress.GetRange(cur, max);
xv_Progress.SetPos(Cwaifu2xncnnvulkanDlg::DELETECURCOUNT);
UpdateProgressText();
if (ValueFlag != Cwaifu2xncnnvulkanDlg::DELETECURCOUNT) {
Expand All @@ -212,6 +170,13 @@ void DELETEDIALOG::OnTimer(UINT_PTR nIDEvent)
else {
ExceptionCounter++;
}
if (static_cast<UINT>(max) <= Cwaifu2xncnnvulkanDlg::DELETECURCOUNT) {
PostMessage(WM_CLOSE);
}
if (ExceptionCounter > 20) {
Cwaifu2xncnnvulkanDlg::DeleteExceptionFlag = 1;
PostMessage(WM_CLOSE);
}
}
if (nIDEvent == m_hTimerID) {
ValueFlag = CUR_POS;
Expand Down
12 changes: 4 additions & 8 deletions Sources/waifu2x-ncnn-vulkan/DELETEDIALOG.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ class DELETEDIALOG : public CDialogEx
public:
DELETEDIALOG(CWnd* pParent = nullptr); // 標準コンストラクター
virtual ~DELETEDIALOG();
static UINT MainThread(LPVOID pParam);
void MainThread();
void UpdateProgressText();

// ダイアログ データ
#ifdef AFX_DESIGN_TIME
Expand All @@ -23,6 +20,7 @@ class DELETEDIALOG : public CDialogEx
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV サポート
virtual BOOL OnInitDialog();
afx_msg void OnDestroy();
afx_msg void OnTimer(UINT_PTR nIDEvent);
virtual BOOL PreTranslateMessage(MSG* pMsg);
NEW_CORE;

Expand All @@ -31,7 +29,9 @@ class DELETEDIALOG : public CDialogEx
HDC hDCBackBuffer;
HDC hDCStatic;
HBRUSH m_Hbrush;
CProgressCtrl xv_Progress;
CRect rc;
CStatic m_Static;
CString MAX;
CString POS;
CString PROGRESSTEXT;
Expand All @@ -41,9 +41,5 @@ class DELETEDIALOG : public CDialogEx
UINT CUR_POS;
UINT ExceptionCounter;
UINT ValueFlag;
public:
afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg LRESULT OnCompleteMainThread(WPARAM wParam, LPARAM lParam);
CProgressCtrl xv_Progress;
CStatic m_Static;
void UpdateProgressText();
};
69 changes: 15 additions & 54 deletions Sources/waifu2x-ncnn-vulkan/DLDIALOG.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "DLDIALOG.h"
#include "afxdialogex.h"

#define WM_USER_COMPLETE_MAIN (WM_USER + 0x30)

// DLDIALOG ダイアログ

Expand Down Expand Up @@ -41,7 +40,6 @@ void DLDIALOG::DoDataExchange(CDataExchange* pDX)
BEGIN_MESSAGE_MAP(DLDIALOG, CDialogEx)
ON_WM_TIMER()
ON_WM_DESTROY()
ON_MESSAGE(WM_USER_COMPLETE_MAIN, DLDIALOG::OnCompleteMainThread)
END_MESSAGE_MAP()


Expand All @@ -51,7 +49,7 @@ BOOL DLDIALOG::OnInitDialog()
{
CDialogEx::OnInitDialog();

UINT Lang;
UINT Lang{};
Lang = GetPrivateProfileInt(L"LANGUAGE", L"0x0000", INFINITE, L".\\settings.ini");
if (Lang == 0) {
Core->LoadJPNLangLibrary();
Expand Down Expand Up @@ -79,63 +77,15 @@ BOOL DLDIALOG::OnInitDialog()
hDCStatic = ::GetDC(this->m_Static);
this->m_Static.GetClientRect(&rc);

CWinThread* pMainThread = NULL;
pMainThread = AfxBeginThread(MainThread, (LPVOID)this, THREAD_PRIORITY_NORMAL, 0, CREATE_SUSPENDED, NULL);
if (pMainThread)
{
pMainThread->m_pMainWnd = this;
pMainThread->m_bAutoDelete = TRUE;
pMainThread->ResumeThread();
}

return TRUE;
}


UINT DLDIALOG::MainThread(LPVOID pParam)
{
DLDIALOG* pFileView = dynamic_cast<DLDIALOG*>(reinterpret_cast<CWnd*>(pParam));
if (pFileView)
{
pFileView->MainThread();
}
return 0;
}


void DLDIALOG::MainThread()
{
INT cur, max;
CFileFind find;

xv_Progress1.GetRange(cur, max);
while (max >= static_cast<INT>(Cwaifu2xncnnvulkanDlg::DLCount)) {
if (max <= static_cast<INT>(Cwaifu2xncnnvulkanDlg::DLCount)) {
Sleep(1000);
break;
}
if (ExceptionCounter > 40) {
Cwaifu2xncnnvulkanDlg::DLErrorFlag = 1;
MessageBox(_T("An error occurred while downloading.\nPlease make sure that you have an Internet connection."), _T("Error"), MB_ICONWARNING | MB_OK);
break;
}
}
PostMessage(WM_USER_COMPLETE_MAIN);
}


LRESULT DLDIALOG::OnCompleteMainThread(WPARAM wParam, LPARAM lParam)
{
PostMessage(WM_CLOSE);
return 0;
}


void DLDIALOG::UpdateProgressText()
{
HDC hdc;
PAINTSTRUCT ps;
UINT Lang;
HDC hdc{};
PAINTSTRUCT ps{};
UINT Lang{};
Lang = GetPrivateProfileInt(L"LANGUAGE", L"0x0000", INFINITE, L".\\settings.ini");

CUR_POS = Cwaifu2xncnnvulkanDlg::DLCount;
Expand Down Expand Up @@ -199,6 +149,7 @@ void DLDIALOG::OnDestroy()

FreeLibrary(Core->Lang_hinst);
SAFE_DELETE(CORE_FUNC);
SAFE_DELETE(COREUTIL_FUNC);
KillTimer(m_TimerID);
KillTimer(m_hTimerID);
m_TimerID = 0;
Expand All @@ -214,6 +165,9 @@ void DLDIALOG::OnTimer(UINT_PTR nIDEvent)
// TODO: ここにメッセージ ハンドラー コードを追加するか、既定の処理を呼び出します。

if (nIDEvent == m_TimerID) {
INT cur{}, max{};

xv_Progress1.GetRange(cur, max);
xv_Progress1.SetPos(Cwaifu2xncnnvulkanDlg::DLCount);
UpdateProgressText();
if (ValueFlag != Cwaifu2xncnnvulkanDlg::DLCount) {
Expand All @@ -222,6 +176,13 @@ void DLDIALOG::OnTimer(UINT_PTR nIDEvent)
else {
ExceptionCounter++;
}
if (static_cast<UINT>(max) <= Cwaifu2xncnnvulkanDlg::DLCount) {
PostMessage(WM_CLOSE);
}
if (ExceptionCounter > 40) {
Cwaifu2xncnnvulkanDlg::DLErrorFlag = 1;
PostMessage(WM_CLOSE);
}
}
if (nIDEvent == m_hTimerID) {
ValueFlag = CUR_POS;
Expand Down
12 changes: 4 additions & 8 deletions Sources/waifu2x-ncnn-vulkan/DLDIALOG.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ class DLDIALOG : public CDialogEx
public:
DLDIALOG(CWnd* pParent = nullptr); // 標準コンストラクター
virtual ~DLDIALOG();
static UINT MainThread(LPVOID pParam);
void MainThread();
void UpdateProgressText();

// ダイアログ データ
#ifdef AFX_DESIGN_TIME
Expand All @@ -23,6 +20,7 @@ class DLDIALOG : public CDialogEx
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV サポート
virtual BOOL OnInitDialog();
virtual BOOL PreTranslateMessage(MSG* pMsg);
afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg void OnDestroy();
NEW_CORE;
NEW_COREUTIL;
Expand All @@ -32,7 +30,9 @@ class DLDIALOG : public CDialogEx
HDC hDCBackBuffer;
HDC hDCStatic;
HBRUSH m_Hbrush;
CProgressCtrl xv_Progress1;
CRect rc;
CStatic m_Static;
CString MAX;
CString POS;
CString PROGRESSTEXT;
Expand All @@ -42,9 +42,5 @@ class DLDIALOG : public CDialogEx
UINT CUR_POS;
UINT ExceptionCounter;
UINT ValueFlag;
public:
afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg LRESULT OnCompleteMainThread(WPARAM wParam, LPARAM lParam);
CProgressCtrl xv_Progress1;
CStatic m_Static;
void UpdateProgressText();
};
60 changes: 13 additions & 47 deletions Sources/waifu2x-ncnn-vulkan/THREADWAITDIALOG.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include "waifu2x-ncnn-vulkanDlg.h"
#include "CThreadWaitDlgThread.h"

#define WM_USER_COMPLETE_MAIN (WM_USER + 0x20)

// THREADWAITDIALOG ダイアログ

Expand Down Expand Up @@ -43,7 +42,6 @@ BEGIN_MESSAGE_MAP(THREADWAITDIALOG, CDialogEx)
ON_WM_TIMER()
ON_WM_DESTROY()
ON_BN_CLICKED(IDC_BUTTON_CANCEL, &THREADWAITDIALOG::OnBnClickedButtonCancel)
ON_MESSAGE(WM_USER_COMPLETE_MAIN, THREADWAITDIALOG::OnCompleteMainThread)
END_MESSAGE_MAP()


Expand Down Expand Up @@ -85,54 +83,9 @@ BOOL THREADWAITDIALOG::OnInitDialog()
hDCStatic = ::GetDC(this->m_Static);
this->m_Static.GetClientRect(&rc);

CWinThread* pMainThread = NULL;
pMainThread = AfxBeginThread(MainThread, (LPVOID)this, THREAD_PRIORITY_NORMAL, 0, CREATE_SUSPENDED, NULL);
if (pMainThread)
{
pMainThread->m_pMainWnd = this;
pMainThread->m_bAutoDelete = TRUE;
pMainThread->ResumeThread();
}

return TRUE;
}
UINT THREADWAITDIALOG::MainThread(LPVOID pParam)
{
THREADWAITDIALOG* pFileView = dynamic_cast<THREADWAITDIALOG*>(reinterpret_cast<CWnd*>(pParam));
if (pFileView)
{
pFileView->MainThread();
}
return 0;
}

void THREADWAITDIALOG::MainThread()
{
INT cur, max;

xv_Progress.GetRange(cur, max);
while (max >= static_cast<INT>(Cwaifu2xncnnvulkanDlg::UPSCALE_COUNT)) {
if (Cwaifu2xncnnvulkanDlg::SuspendFlag == 1) {
break;
}
if (max <= static_cast<INT>(Cwaifu2xncnnvulkanDlg::UPSCALE_COUNT)) {
Sleep(1000);
break;
}
if (ExceptionCounter > 50) {
Cwaifu2xncnnvulkanDlg::UpscaleExceptionFlag = 1;
MessageBox(_T("An unexpected error has occurred.\nA static variable stopped with an unexpected value.\nCheck the waifu2x conversion settings."), _T("Error"), MB_ICONERROR | MB_OK);
break;
}
}
PostMessage(WM_USER_COMPLETE_MAIN);
}

LRESULT THREADWAITDIALOG::OnCompleteMainThread(WPARAM wParam, LPARAM lParam)
{
PostMessage(WM_CLOSE);
return 0;
}

void THREADWAITDIALOG::UpdateProgressText()
{
Expand Down Expand Up @@ -263,6 +216,9 @@ void THREADWAITDIALOG::OnTimer(UINT_PTR nIDEvent)
{
// TODO: ここにメッセージ ハンドラー コードを追加するか、既定の処理を呼び出します。
if (nIDEvent == m_TimerID) {
INT cur{}, max{};

xv_Progress.GetRange(cur, max);
xv_Progress.SetPos(Cwaifu2xncnnvulkanDlg::UPSCALE_COUNT);
UpdateProgressText();
if (ValueFlag != Cwaifu2xncnnvulkanDlg::UPSCALE_COUNT) {
Expand All @@ -271,6 +227,16 @@ void THREADWAITDIALOG::OnTimer(UINT_PTR nIDEvent)
else {
ExceptionCounter++;
}
if (Cwaifu2xncnnvulkanDlg::SuspendFlag == 1) {
PostMessage(WM_CLOSE);
}
if (static_cast<UINT>(max) <= Cwaifu2xncnnvulkanDlg::UPSCALE_COUNT) {
PostMessage(WM_CLOSE);
}
if (ExceptionCounter > 50) {
Cwaifu2xncnnvulkanDlg::UpscaleExceptionFlag = 1;
PostMessage(WM_CLOSE);
}
}
if (nIDEvent == m_hTimerID) {
ValueFlag = CUR_POS;
Expand Down
Loading

0 comments on commit 58b36ae

Please sign in to comment.