diff options
author | Norbert Preining <norbert@preining.info> | 2020-10-17 03:01:01 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-10-17 03:01:01 +0000 |
commit | 683b627ec089f4ddb05f06b1e93ee368189f78a4 (patch) | |
tree | 7a6ef1c8a2545a0d181cb890cc8611610263b8f5 /dviware | |
parent | d8395db550c4f6044f0f3586bbc5263f06444598 (diff) |
CTAN sync 202010170301
Diffstat (limited to 'dviware')
-rw-r--r-- | dviware/dviview/DVIView/DVIView.rc | bin | 8428 -> 0 bytes | |||
-rw-r--r-- | dviware/dviview/DVIView/DVIView.vcxproj.user | 8 | ||||
-rw-r--r-- | dviware/dviview/DVIView/framework.h | 17 | ||||
-rw-r--r-- | dviware/dviview/DVIView/resource.h | 31 | ||||
-rw-r--r-- | dviware/dviview/README | 29 | ||||
-rw-r--r-- | dviware/dvivue/COPYING (renamed from dviware/dviview/COPYING) | 0 | ||||
-rw-r--r-- | dviware/dvivue/DVIVue.sln (renamed from dviware/dviview/DVIView.sln) | 62 | ||||
-rw-r--r-- | dviware/dvivue/DVIVue/DVIVue.cpp (renamed from dviware/dviview/DVIView/DVIView.cpp) | 184 | ||||
-rw-r--r-- | dviware/dvivue/DVIVue/DVIVue.h (renamed from dviware/dviview/DVIView/DVIView.h) | 6 | ||||
-rw-r--r-- | dviware/dvivue/DVIVue/DVIVue.ico (renamed from dviware/dviview/DVIView/DVIView.ico) | bin | 46227 -> 46227 bytes | |||
-rw-r--r-- | dviware/dvivue/DVIVue/DVIVue.rc | bin | 0 -> 8192 bytes | |||
-rw-r--r-- | dviware/dvivue/DVIVue/DVIVue.vcxproj (renamed from dviware/dviview/DVIView/DVIView.vcxproj) | 342 | ||||
-rw-r--r-- | dviware/dvivue/DVIVue/DVIVue.vcxproj.filters (renamed from dviware/dviview/DVIView/DVIView.vcxproj.filters) | 102 | ||||
-rw-r--r-- | dviware/dvivue/DVIVue/DVIVue.vcxproj.user | 23 | ||||
-rw-r--r-- | dviware/dvivue/DVIVue/framework.h | 26 | ||||
-rw-r--r-- | dviware/dvivue/DVIVue/packages.config | 5 | ||||
-rw-r--r-- | dviware/dvivue/DVIVue/resource.h | 35 | ||||
-rw-r--r-- | dviware/dvivue/DVIVue/small.ico (renamed from dviware/dviview/DVIView/small.ico) | bin | 46227 -> 46227 bytes | |||
-rw-r--r-- | dviware/dvivue/DVIVue/targetver.h (renamed from dviware/dviview/DVIView/targetver.h) | 12 | ||||
-rw-r--r-- | dviware/dvivue/README | 29 |
20 files changed, 496 insertions, 415 deletions
diff --git a/dviware/dviview/DVIView/DVIView.rc b/dviware/dviview/DVIView/DVIView.rc Binary files differdeleted file mode 100644 index 22efb96c35..0000000000 --- a/dviware/dviview/DVIView/DVIView.rc +++ /dev/null diff --git a/dviware/dviview/DVIView/DVIView.vcxproj.user b/dviware/dviview/DVIView/DVIView.vcxproj.user deleted file mode 100644 index ddb789914e..0000000000 --- a/dviware/dviview/DVIView/DVIView.vcxproj.user +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LocalDebuggerCommandArguments>
- </LocalDebuggerCommandArguments>
- <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
- </PropertyGroup>
-</Project>
\ No newline at end of file diff --git a/dviware/dviview/DVIView/framework.h b/dviware/dviview/DVIView/framework.h deleted file mode 100644 index ec2fb66ab6..0000000000 --- a/dviware/dviview/DVIView/framework.h +++ /dev/null @@ -1,17 +0,0 @@ -// header.h : include file for standard system include files, -// or project specific include files -// - -#pragma once - -#include "targetver.h" - -// Windows Header Files -#include <windows.h> -// C RunTime Header Files -//#include <stdlib.h> -//#include <tchar.h> -// include WebView2 header -#include <wrl.h> -#include <wil/com.h> -#include "WebView2.h" diff --git a/dviware/dviview/DVIView/resource.h b/dviware/dviview/DVIView/resource.h deleted file mode 100644 index 1acdedd420..0000000000 --- a/dviware/dviview/DVIView/resource.h +++ /dev/null @@ -1,31 +0,0 @@ -//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by DVIView.rc
-//
-#define IDC_MYICON 2
-#define IDD_DVIVIEW_DIALOG 102
-#define IDS_APP_TITLE 103
-#define IDD_ABOUTBOX 103
-#define IDM_ABOUT 104
-#define IDM_EXIT 105
-#define IDI_DVIVIEW 107
-#define IDI_SMALL 108
-#define IDC_DVIVIEW 109
-#define IDM_FILE_NEW 114
-#define IDM_FILE_OPEN 115
-#define IDM_FILE_CLOSE 116
-#define IDM_FILE_VIEW_LOG 117
-#define IDR_MAINFRAME 128
-#define IDC_STATIC -1
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC 1
-#define _APS_NEXT_RESOURCE_VALUE 130
-#define _APS_NEXT_COMMAND_VALUE 32773
-#define _APS_NEXT_CONTROL_VALUE 1000
-#define _APS_NEXT_SYMED_VALUE 110
-#endif
-#endif
diff --git a/dviware/dviview/README b/dviware/dviview/README deleted file mode 100644 index 86c2c8d5a7..0000000000 --- a/dviware/dviview/README +++ /dev/null @@ -1,29 +0,0 @@ -DVIView v. 1.0 - - -About -===== - -This program is a DVI/PDF viewer. It uses dvipdfmx to convert a DVI file to PDF, thus allowing the text in the document to be searched or selected, unlike with conventional viewers. - - -Compilation -=========== - -To compile the program, you need to install certain packages required by the WebView2 control used by DVIView. Please follow the instruction in 'Step 2 - Install WebView2 SDK' substeps 2 and 3 here: https://docs.microsoft.com/en-us/microsoft-edge/webview2/gettingstarted/win32 - - -Copying -======= - -This program is released under the GNU General Public License -version 3 or newer. See the COPYING file included with this distribution or -<http://www.gnu.org/licenses/>. - - Copyright (C) 2020 Peter Frane Jr. - - -Contact -======= - -Please send any inquries to pfranejr@hotmail.com diff --git a/dviware/dviview/COPYING b/dviware/dvivue/COPYING index e72bfddabc..e72bfddabc 100644 --- a/dviware/dviview/COPYING +++ b/dviware/dvivue/COPYING diff --git a/dviware/dviview/DVIView.sln b/dviware/dvivue/DVIVue.sln index e0839c6fe8..8c70773bbc 100644 --- a/dviware/dviview/DVIView.sln +++ b/dviware/dvivue/DVIVue.sln @@ -1,31 +1,31 @@ -
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30413.136
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DVIView", "DVIView\DVIView.vcxproj", "{E03CFF29-163B-4E13-AC67-BBE0C5B87F74}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
- Release|x64 = Release|x64
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Debug|x64.ActiveCfg = Debug|x64
- {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Debug|x64.Build.0 = Debug|x64
- {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Debug|x86.ActiveCfg = Debug|Win32
- {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Debug|x86.Build.0 = Debug|Win32
- {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Release|x64.ActiveCfg = Release|x64
- {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Release|x64.Build.0 = Release|x64
- {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Release|x86.ActiveCfg = Release|Win32
- {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Release|x86.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {140C4E9E-7683-47C6-BB27-3111492A8E0A}
- EndGlobalSection
-EndGlobal
+ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30413.136 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DVIVue", "DVIVue\DVIVue.vcxproj", "{E03CFF29-163B-4E13-AC67-BBE0C5B87F74}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Debug|x64.ActiveCfg = Debug|x64 + {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Debug|x64.Build.0 = Debug|x64 + {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Debug|x86.ActiveCfg = Debug|Win32 + {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Debug|x86.Build.0 = Debug|Win32 + {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Release|x64.ActiveCfg = Release|x64 + {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Release|x64.Build.0 = Release|x64 + {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Release|x86.ActiveCfg = Release|Win32 + {E03CFF29-163B-4E13-AC67-BBE0C5B87F74}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {140C4E9E-7683-47C6-BB27-3111492A8E0A} + EndGlobalSection +EndGlobal diff --git a/dviware/dviview/DVIView/DVIView.cpp b/dviware/dvivue/DVIVue/DVIVue.cpp index 1b7c5adca8..6da6b14112 100644 --- a/dviware/dviview/DVIView/DVIView.cpp +++ b/dviware/dvivue/DVIVue/DVIVue.cpp @@ -1,9 +1,9 @@ -// DVIView.cpp : Defines the entry point for the application. +// DVIVue.cpp : Defines the entry point for the application. // /* - DVIView: A viewer for DVI files and frontend for dvipdfmx. + DVIVue: A viewer for DVI files and frontend for dvipdfmx. Copyright (c) 2020 by Peter Frane Jr. This program is free software: you can redistribute it and/or modify @@ -30,7 +30,7 @@ #include "framework.h" -#include "DVIView.h" +#include "DVIVue.h" #include <wchar.h> #include <shlwapi.h> @@ -64,6 +64,8 @@ INT_PTR CALLBACK About(HWND, UINT, WPARAM, LPARAM); void resize_window(HWND hWnd); void process_command_line(HWND hWnd); int on_create(HWND hWnd); +bool create_environment(HWND hWnd); +bool file_exists(const char* filename); int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, @@ -77,7 +79,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, // Initialize global strings LoadStringW(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); - LoadStringW(hInstance, IDC_DVIVIEW, szWindowClass, MAX_LOADSTRING); + LoadStringW(hInstance, IDC_DVIVUE, szWindowClass, MAX_LOADSTRING); MyRegisterClass(hInstance); // Perform application initialization: @@ -86,7 +88,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, return FALSE; } - HACCEL hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_DVIVIEW)); + HACCEL hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_DVIVUE)); MSG msg; @@ -121,10 +123,10 @@ ATOM MyRegisterClass(HINSTANCE hInstance) wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = hInstance; - wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_DVIVIEW)); + wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_DVIVUE)); wcex.hCursor = LoadCursor(nullptr, IDC_ARROW); wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); - wcex.lpszMenuName = MAKEINTRESOURCEW(IDC_DVIVIEW); + wcex.lpszMenuName = MAKEINTRESOURCEW(IDC_DVIVUE); wcex.lpszClassName = szWindowClass; wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL)); @@ -143,50 +145,71 @@ ATOM MyRegisterClass(HINSTANCE hInstance) // BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { - hInst = hInstance; // Store instance handle in our global variable + hInst = hInstance; // Store instance handle in our global variable - HWND hWnd = CreateWindowW(szWindowClass, szTitle, WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, nullptr, nullptr, hInstance, nullptr); + HWND hWnd = CreateWindowW(szWindowClass, szTitle, WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, nullptr, nullptr, hInstance, nullptr); - if (!hWnd) - { - return FALSE; - } - - ShowWindow(hWnd, nCmdShow); - UpdateWindow(hWnd); - - HRESULT hr = CreateCoreWebView2EnvironmentWithOptions(nullptr, nullptr, nullptr, - Callback<ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler>( - [hWnd](HRESULT result, ICoreWebView2Environment* env) -> HRESULT { + if (!hWnd) + { + return FALSE; + } - // Create a CoreWebView2Controller and get the associated CoreWebView2 whose parent is the main window hWnd - env->CreateCoreWebView2Controller(hWnd, Callback<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>( - [hWnd](HRESULT result, ICoreWebView2Controller* controller) -> HRESULT { - if (controller != nullptr) { - webviewController = controller; - if (webviewController->get_CoreWebView2(&webviewWindow) == S_OK) - { - // Resize WebView to fit the bounds of the parent window - resize_window(hWnd); + ShowWindow(hWnd, nCmdShow); + UpdateWindow(hWnd); - process_command_line(hWnd); - } - } + if (!create_environment(hWnd)) + { + DestroyWindow(hWnd); - return S_OK; - }).Get()); - return S_OK; - }).Get()); + return FALSE; + } + return TRUE; +} + - if (S_OK == hr) - return TRUE; +bool create_environment(HWND hWnd) +{ + HRESULT hr; + wchar_t temp_path[MAX_PATH + 1]{ 0 }; - DestroyWindow(hWnd); + if (GetTempPath(MAX_PATH, temp_path) == 0) + { + MessageBox(hWnd, L"Unable to obtain the TEMP path", L"Internal Error", MB_OK); - return FALSE; + return false; + } + + // To use a fixed version of WebView2, + // pass the folder name of the WebView2 runtime as the first parameter of CreateCoreWebView2EnvironmentWithOptions; + // otherwise, use nullptr to use an installed version of the runtime. + // For more info see the following link: https://docs.microsoft.com/en-us/microsoft-edge/webview2/reference/win32/webview2-idl?view=webview2-0.9.622#createcorewebview2environmentwithoptions + + hr = CreateCoreWebView2EnvironmentWithOptions(nullptr, temp_path, nullptr, + Callback<ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler>( + [hWnd](HRESULT result, ICoreWebView2Environment* env) -> HRESULT { + + // Create a CoreWebView2Controller and get the associated CoreWebView2 whose parent is the main window hWnd + env->CreateCoreWebView2Controller(hWnd, Callback<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>( + [hWnd](HRESULT result, ICoreWebView2Controller* controller) -> HRESULT { + if (controller != nullptr) { + webviewController = controller; + if (webviewController->get_CoreWebView2(&webviewWindow) == S_OK) + { + // Resize WebView to fit the bounds of the parent window + resize_window(hWnd); + + process_command_line(hWnd); + } + } + + return S_OK; + }).Get()); + return S_OK; + }).Get()); + + return (S_OK == hr); } - // read the messages of dvipdfx void read_pipe(HWND hWnd, HANDLE child_stdout_read) @@ -243,13 +266,29 @@ struct handle } }; -void show_pdf_file(const char *filename) +void show_pdf_file(HWND hWnd, const char *filename, const char *title) { wchar_t pdf_file[MAX_PATH + 1]{ 0 }; MultiByteToWideChar(CP_UTF8, 0, filename, lstrlenA(filename), pdf_file, MAX_PATH); - webviewWindow->Navigate(pdf_file); + if (webviewWindow->Navigate(pdf_file) == S_OK) + { + SetWindowTextA(hWnd, title); + } +} + +bool file_exists(const char* filename) +{ + WIN32_FILE_ATTRIBUTE_DATA attrib{ 0 }; + + GetFileAttributesExA(filename, GetFileExInfoStandard, &attrib); + + if (attrib.nFileSizeLow > 0 || attrib.nFileSizeHigh > 0) + { + return true; + } + return false; } void create_pdf(HWND hWnd, const char* dvi_file) @@ -277,14 +316,14 @@ void create_pdf(HWND hWnd, const char* dvi_file) SetHandleInformation(child_stdout_read.m_handle, HANDLE_FLAG_INHERIT, 0); } - if (_splitpath_s(dvi_file, 0, 0, 0, 0, fname, _MAX_FNAME, 0, 0) != 0) + if (_splitpath_s(dvi_file, 0, 0, 0, 0, fname, _MAX_FNAME, nullptr, 0) != 0) { MessageBox(hWnd, L"Unable to split the path", L"Internal Error", MB_OK); return; } - if (GetTempPathA(sizeof(temp_pdf_path) - 1, temp_pdf_path) == 0) + if (GetTempPathA(MAX_PATH, temp_pdf_path) == 0) { MessageBox(hWnd, L"Unable to obtain the TEMP path", L"Internal Error", MB_OK); @@ -362,14 +401,17 @@ void create_pdf(HWND hWnd, const char* dvi_file) } else { - WIN32_FILE_ATTRIBUTE_DATA attrib{ 0 }; - - GetFileAttributesExA(temp_pdf_path, GetFileExInfoStandard, &attrib); - - if( attrib.nFileSizeLow > 0 || attrib.nFileSizeHigh > 0) - { - show_pdf_file(temp_pdf_path); - } + if (file_exists(temp_pdf_path)) + { + const char* ext = strrchr(dvi_file, '.'); + + // can't fail, but check anyway + if (ext) + { + lstrcatA(fname, ext); + } + show_pdf_file(hWnd, temp_pdf_path, fname); + } } } return; @@ -382,29 +424,19 @@ void clear_log_file() void open_file(HWND hWnd) { - enum class file_type { ft_dvi = 1, ft_pdf = 2}; OPENFILENAMEA ofn = { 0 }; char filename[MAX_PATH + 1] = { 0 }; ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = hWnd; ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; - ofn.lpstrFilter = "DVI\0*.dvi\0PDF\0*.pdf\0\0\0"; + ofn.lpstrFilter = "DVI\0*.dvi\0\0"; ofn.lpstrFile = filename; ofn.nMaxFile = MAX_PATH; if (GetOpenFileNameA(&ofn) == TRUE) { - if (DWORD(file_type::ft_dvi) == ofn.nFilterIndex) // dvi - { - create_pdf(hWnd, ofn.lpstrFile); - } - else if (DWORD(file_type::ft_pdf) == ofn.nFilterIndex) - { - clear_log_file(); - - show_pdf_file(ofn.lpstrFile); - } + create_pdf(hWnd, ofn.lpstrFile); } } @@ -442,6 +474,17 @@ void process_command_line(HWND hWnd) if (result > 0) { + if (!file_exists(dvi_file)) + { + lstrcatA(dvi_file, ".dvi"); + + if (!file_exists(dvi_file)) + { + MessageBoxA(hWnd, dvi_file, "File not found", MB_OK); + + return; + } + } create_pdf(hWnd, dvi_file); } else @@ -504,6 +547,12 @@ void new_instance(HWND hWnd, const wchar_t* input_filename) run_application(hWnd, app_name, input_filename); } +void close_file(HWND hWnd) +{ + webviewWindow->Navigate(L"about:blank"); + clear_log_file(); + SetWindowText(hWnd, L"DVIVue"); +} // // FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM) // @@ -537,8 +586,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) open_file(hWnd); break; case IDM_FILE_CLOSE: - webviewWindow->Navigate(L"about:blank"); - clear_log_file(); + close_file(hWnd); break; case IDM_FILE_VIEW_LOG: view_log_file(hWnd); diff --git a/dviware/dviview/DVIView/DVIView.h b/dviware/dvivue/DVIVue/DVIVue.h index e60f2eb7ed..d00d47e788 100644 --- a/dviware/dviview/DVIView/DVIView.h +++ b/dviware/dvivue/DVIVue/DVIVue.h @@ -1,3 +1,3 @@ -#pragma once
-
-#include "resource.h"
+#pragma once + +#include "resource.h" diff --git a/dviware/dviview/DVIView/DVIView.ico b/dviware/dvivue/DVIVue/DVIVue.ico Binary files differindex b3ec03bd61..b3ec03bd61 100644 --- a/dviware/dviview/DVIView/DVIView.ico +++ b/dviware/dvivue/DVIVue/DVIVue.ico diff --git a/dviware/dvivue/DVIVue/DVIVue.rc b/dviware/dvivue/DVIVue/DVIVue.rc Binary files differnew file mode 100644 index 0000000000..9245ba3f42 --- /dev/null +++ b/dviware/dvivue/DVIVue/DVIVue.rc diff --git a/dviware/dviview/DVIView/DVIView.vcxproj b/dviware/dvivue/DVIVue/DVIVue.vcxproj index a062b6b8c8..7d5cc483d0 100644 --- a/dviware/dviview/DVIView/DVIView.vcxproj +++ b/dviware/dvivue/DVIVue/DVIVue.vcxproj @@ -1,172 +1,172 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <VCProjectVersion>16.0</VCProjectVersion>
- <Keyword>Win32Proj</Keyword>
- <ProjectGuid>{e03cff29-163b-4e13-ac67-bbe0c5b87f74}</ProjectGuid>
- <RootNamespace>DVIView</RootNamespace>
- <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="Shared">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ConformanceMode>true</ConformanceMode>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ConformanceMode>true</ConformanceMode>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ConformanceMode>true</ConformanceMode>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ConformanceMode>true</ConformanceMode>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClInclude Include="DVIView.h" />
- <ClInclude Include="framework.h" />
- <ClInclude Include="Resource.h" />
- <ClInclude Include="targetver.h" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="DVIView.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="DVIView.rc" />
- </ItemGroup>
- <ItemGroup>
- <Image Include="DVIView.ico" />
- <Image Include="small.ico" />
- </ItemGroup>
- <ItemGroup>
- <None Include="packages.config" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
- <Import Project="..\packages\Microsoft.Web.WebView2.0.9.579\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.0.9.579\build\native\Microsoft.Web.WebView2.targets')" />
- </ImportGroup>
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
- <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.0.9.579\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.0.9.579\build\native\Microsoft.Web.WebView2.targets'))" />
- </Target>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>16.0</VCProjectVersion> + <Keyword>Win32Proj</Keyword> + <ProjectGuid>{de4ab823-2855-4701-acd7-2c627fcad14a}</ProjectGuid> + <RootNamespace>DVIVue</RootNamespace> + <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v142</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v142</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v142</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v142</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="DVIVue.h" /> + <ClInclude Include="framework.h" /> + <ClInclude Include="Resource.h" /> + <ClInclude Include="targetver.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="DVIVue.cpp" /> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="DVIVue.rc" /> + </ItemGroup> + <ItemGroup> + <Image Include="DVIVue.ico" /> + <Image Include="small.ico" /> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" /> + <Import Project="..\packages\Microsoft.Web.WebView2.0.9.622.11\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.0.9.622.11\build\native\Microsoft.Web.WebView2.targets')" /> + </ImportGroup> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" /> + <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.0.9.622.11\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.0.9.622.11\build\native\Microsoft.Web.WebView2.targets'))" /> + </Target> </Project>
\ No newline at end of file diff --git a/dviware/dviview/DVIView/DVIView.vcxproj.filters b/dviware/dvivue/DVIVue/DVIVue.vcxproj.filters index b504b230d0..07260aea14 100644 --- a/dviware/dviview/DVIView/DVIView.vcxproj.filters +++ b/dviware/dvivue/DVIVue/DVIVue.vcxproj.filters @@ -1,52 +1,52 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="framework.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="targetver.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Resource.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="DVIView.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="DVIView.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="DVIView.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <Image Include="small.ico">
- <Filter>Resource Files</Filter>
- </Image>
- <Image Include="DVIView.ico">
- <Filter>Resource Files</Filter>
- </Image>
- </ItemGroup>
- <ItemGroup>
- <None Include="packages.config" />
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions> + </Filter> + <Filter Include="Resource Files"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClInclude Include="framework.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="targetver.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="Resource.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="DVIVue.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClCompile Include="DVIVue.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="DVIVue.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> + </ItemGroup> + <ItemGroup> + <Image Include="small.ico"> + <Filter>Resource Files</Filter> + </Image> + <Image Include="DVIVue.ico"> + <Filter>Resource Files</Filter> + </Image> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> </Project>
\ No newline at end of file diff --git a/dviware/dvivue/DVIVue/DVIVue.vcxproj.user b/dviware/dvivue/DVIVue/DVIVue.vcxproj.user new file mode 100644 index 0000000000..025581fb1e --- /dev/null +++ b/dviware/dvivue/DVIVue/DVIVue.vcxproj.user @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerCommandArguments> + </LocalDebuggerCommandArguments> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LocalDebuggerCommandArguments> + </LocalDebuggerCommandArguments> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LocalDebuggerCommandArguments> + </LocalDebuggerCommandArguments> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LocalDebuggerCommandArguments> + </LocalDebuggerCommandArguments> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/dviware/dvivue/DVIVue/framework.h b/dviware/dvivue/DVIVue/framework.h new file mode 100644 index 0000000000..1019da0d03 --- /dev/null +++ b/dviware/dvivue/DVIVue/framework.h @@ -0,0 +1,26 @@ +// header.h : include file for standard system include files, +// or project specific include files +// + +#pragma once + +#include "targetver.h" +//#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +// Windows Header Files +#include <windows.h> +// C RunTime Header Files +#include <stdlib.h> +#include <malloc.h> +#include <memory.h> +#include <tchar.h> +#include <wchar.h> +#include <shlwapi.h> +#include <wrl.h> +#include <wil/com.h> +// include WebView2 header +#include "WebView2.h" + +using namespace std; +using namespace Microsoft::WRL; + +#pragma comment(lib, "Shlwapi.lib") diff --git a/dviware/dvivue/DVIVue/packages.config b/dviware/dvivue/DVIVue/packages.config new file mode 100644 index 0000000000..6bc92dd57d --- /dev/null +++ b/dviware/dvivue/DVIVue/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Microsoft.Web.WebView2" version="0.9.622.11" targetFramework="native" /> + <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.200902.2" targetFramework="native" /> +</packages>
\ No newline at end of file diff --git a/dviware/dvivue/DVIVue/resource.h b/dviware/dvivue/DVIVue/resource.h new file mode 100644 index 0000000000..990422a418 --- /dev/null +++ b/dviware/dvivue/DVIVue/resource.h @@ -0,0 +1,35 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by DVIVue.rc + +#define IDS_APP_TITLE 103 + +#define IDR_MAINFRAME 128 +#define IDD_DVIVUE_DIALOG 102 +#define IDD_ABOUTBOX 103 +#define IDM_ABOUT 104 +#define IDM_EXIT 105 +#define IDI_DVIVUE 107 +#define IDI_SMALL 108 +#define IDC_DVIVUE 109 +#define IDC_MYICON 2 +#ifndef IDC_STATIC +#define IDC_STATIC -1 +#define IDM_FILE_NEW 114 +#define IDM_FILE_OPEN 115 +#define IDM_FILE_CLOSE 116 +#define IDM_FILE_VIEW_LOG 117 + +#endif +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS + +#define _APS_NO_MFC 130 +#define _APS_NEXT_RESOURCE_VALUE 129 +#define _APS_NEXT_COMMAND_VALUE 32771 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 110 +#endif +#endif diff --git a/dviware/dviview/DVIView/small.ico b/dviware/dvivue/DVIVue/small.ico Binary files differindex b3ec03bd61..b3ec03bd61 100644 --- a/dviware/dviview/DVIView/small.ico +++ b/dviware/dvivue/DVIVue/small.ico diff --git a/dviware/dviview/DVIView/targetver.h b/dviware/dvivue/DVIVue/targetver.h index 746516742b..bf75e0895e 100644 --- a/dviware/dviview/DVIView/targetver.h +++ b/dviware/dvivue/DVIVue/targetver.h @@ -1,6 +1,6 @@ -#pragma once
-
-// // Including SDKDDKVer.h defines the highest available Windows platform.
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-#include <SDKDDKVer.h>
+#pragma once + +// // Including SDKDDKVer.h defines the highest available Windows platform. +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. +#include <SDKDDKVer.h> diff --git a/dviware/dvivue/README b/dviware/dvivue/README new file mode 100644 index 0000000000..4cf405573d --- /dev/null +++ b/dviware/dvivue/README @@ -0,0 +1,29 @@ +DVIVue v. 1.0 + + +About +===== + +This program is a DVI viewer. It uses dvipdfmx to convert a DVI file to PDF, thus allowing the text in the document to be searched or selected, unlike with conventional viewers. + + +Compilation +=========== + +To compile the program, you need to install certain packages required by the WebView2 control used by DVIVue. Please follow the instruction in 'Step 2 - Install WebView2 SDK' substeps 2 and 3 here: https://docs.microsoft.com/en-us/microsoft-edge/webview2/gettingstarted/win32 + + +Copying +======= + +This program is released under the GNU General Public License +version 3 or newer. See the COPYING file included with this distribution or +<http://www.gnu.org/licenses/>. + + Copyright (C) 2020 Peter Frane Jr. + + +Contact +======= + +Please send any inquries to pfranejr@hotmail.com |