VS2019

nathancorvussolis · Jan 1, 2021 · 57c95d6 · 57c95d6
1 parent dbed697
commit 57c95d6
Show file tree

Hide file tree

Showing 17 changed files with 165 additions and 128 deletions.
diff --git a/README.TXT b/README.TXT
@@ -1,7 +1,7 @@
 
 -------------------------------------------------------------------------------
 
-   crvskkserv 2.2.0
+   crvskkserv 2.4.0
 
 -------------------------------------------------------------------------------
 
@@ -26,8 +26,8 @@ SKK辞書サーバ通信は、IPv4、IPv6に対応しています。
 
 Google CGI APIの「見出し語の検索除外条件」設定は、おそらく送りあり(と思われる)
 見出し語を除外する正規表現がデフォルトとなっています。
-Visual C++ 2015 の正規表現で、文法はECMAScriptを使用しています。
-https://msdn.microsoft.com/en-us/library/bb982727(v=vs.140).aspx
+Visual C++ 2019 の正規表現で、文法はECMAScriptを使用しています。
+https://docs.microsoft.com/en-us/cpp/standard-library/regular-expressions-cpp?view=msvc-160
 
 Google CGI APIの設定でクライアントの文字コードをEUC-JIS-2004にしたとき、
 UTF-8からEUC-JIS-2004に変換できない文字を含む候補は除外されます。
@@ -72,7 +72,7 @@ crvskkserv
 
 The MIT License
 
-Copyright (C) 2012-2016 SASAKI Nobuyuki
+Copyright (C) 2012-2021 SASAKI Nobuyuki
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

diff --git a/crvskkserv.sln b/crvskkserv.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30804.86
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crvskkserv", "crvskkserv\crvskkserv.vcxproj", "{EE56E58B-C54E-425C-A0AF-292B4653B1F0}"
 EndProject
@@ -19,4 +19,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {77834FB2-D0C0-411E-88B9-0EF4B38BE404}
+	EndGlobalSection
 EndGlobal
diff --git a/crvskkserv/app.ico b/crvskkserv/app.ico
diff --git a/crvskkserv/crvskkserv.cpp b/crvskkserv/crvskkserv.cpp
@@ -50,7 +50,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR lpCmdL
 	WSADATA wsaData;
 	INITCOMMONCONTROLSEX icex;
 
-	_wsetlocale(LC_ALL, L"JPN");
+	_wsetlocale(LC_ALL, L"ja-JP");
 
 	icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
 	icex.dwICC = ICC_LISTVIEW_CLASSES;
@@ -78,7 +78,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR lpCmdL
 
 	RegisterClassExW(&wcex);
 
-	hWnd = CreateWindowW(title, title, WS_OVERLAPPEDWINDOW, 0, 0, 0, 0, nullptr, nullptr, hInstance, nullptr);
+	hWnd = CreateWindowW(title, title, WS_OVERLAPPEDWINDOW, 0, 0, 320, 200, nullptr, nullptr, hInstance, nullptr);
 
 	if(!hWnd)
 	{
@@ -217,7 +217,7 @@ INT_PTR CALLBACK DlgProcSKKServ(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
 	static HWND hPDlg;
 	HWND hWndListView;
 	LVITEMW item;
-	int	index, count;
+	int index, count;
 	WCHAR path[MAX_PATH];
 	WCHAR host[256];
 	WCHAR port[6];
@@ -448,6 +448,11 @@ INT_PTR CALLBACK DlgProcConfig(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP
 		}
 		return (INT_PTR)TRUE;
 
+	case WM_DPICHANGED:
+		hWndListView = GetDlgItem(hDlg, IDC_LIST_SKK_DIC);
+		ListView_SetColumnWidth(hWndListView, 0, LVSCW_AUTOSIZE);
+		return (INT_PTR)TRUE;
+
 	case WM_COMMAND:
 		hWndListView = GetDlgItem(hDlg, IDC_LIST_SKK_DIC);
 

diff --git a/crvskkserv/crvskkserv.h b/crvskkserv/crvskkserv.h
@@ -1,15 +1,13 @@
-
-#ifndef CRVSKKSERV_H
-#define CRVSKKSERV_H
+#pragma once
 
 #define RC_PRODUCT		"crvskkserv"
-#define RC_VERSION		"2.2.0"
-#define RC_VERSION_D	2,2,0,0
-#define RC_TITLE		"crvskkserv (ver. 2.2.0)"
+#define RC_VERSION		"2.4.0"
+#define RC_VERSION_D	2,4,0,0
+#define RC_TITLE		"crvskkserv (ver. 2.4.0)"
 #define RC_AUTHOR		"nathancorvussolis"
 
 #define APP_TITLE		L"crvskkserv"
-#define APP_VERSION		L"2.2.0"
+#define APP_VERSION		L"2.4.0"
 #define RES_VER RC_PRODUCT "/" RC_VERSION " "
 
 #define REQ_END		'0'
@@ -82,5 +80,3 @@ BOOL get_skkserv_version(SOCKET &sock);
 
 // search_google_cgiapi
 void search_google_cgiapi(DICINFO &dicinfo, const std::string &key, std::string &s);
-
-#endif
diff --git a/crvskkserv/crvskkserv.manifest b/crvskkserv/crvskkserv.manifest
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+        type="win32"
+        name="Microsoft.Windows.Common-Controls"
+        version="6.0.0.0"
+        processorArchitecture="*"
+        publicKeyToken="6595b64144ccf1df"
+        language="*" />
+    </dependentAssembly>
+  </dependency>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">True</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+
+</assembly>
diff --git a/crvskkserv/crvskkserv.vcxproj b/crvskkserv/crvskkserv.vcxproj
@@ -14,18 +14,19 @@
     <ProjectGuid>{EE56E58B-C54E-425C-A0AF-292B4653B1F0}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>crvskkserv</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>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -59,6 +60,9 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>ws2_32.lib;wininet.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>crvskkserv.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -80,6 +84,9 @@
       <GenerateDebugInformation>No</GenerateDebugInformation>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>crvskkserv.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="crvskkserv.h" />
@@ -112,6 +119,9 @@
   <ItemGroup>
     <Text Include="..\README.TXT" />
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="crvskkserv.manifest" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/crvskkserv/crvskkserv.vcxproj.filters b/crvskkserv/crvskkserv.vcxproj.filters
@@ -76,4 +76,9 @@
   <ItemGroup>
     <Text Include="..\README.TXT" />
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="crvskkserv.manifest">
+      <Filter>Resource Files</Filter>
+    </Manifest>
+  </ItemGroup>
 </Project>