Merge pull request #1 from wkpark/win10-fix

Win10 build fix

Saenaru.sln

@@ -0,0 +1,51 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.960
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Saenaru", ".\src\Saenaru.vcxproj", "{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Debug|ARM.ActiveCfg = Debug|ARM
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Debug|ARM.Build.0 = Debug|ARM
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Debug|ARM.Deploy.0 = Debug|ARM
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Debug|ARM64.Build.0 = Debug|ARM64
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Debug|x64.ActiveCfg = Debug|x64
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Debug|x64.Build.0 = Debug|x64
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Debug|x64.Deploy.0 = Debug|x64
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Debug|x86.ActiveCfg = Debug|Win32
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Debug|x86.Build.0 = Debug|Win32
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Debug|x86.Deploy.0 = Debug|Win32
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Release|ARM.ActiveCfg = Release|ARM
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Release|ARM.Build.0 = Release|ARM
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Release|ARM.Deploy.0 = Release|ARM
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Release|ARM64.ActiveCfg = Release|ARM64
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Release|ARM64.Build.0 = Release|ARM64
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Release|ARM64.Deploy.0 = Release|ARM64
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Release|x64.ActiveCfg = Release|x64
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Release|x64.Build.0 = Release|x64
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Release|x64.Deploy.0 = Release|x64
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Release|x86.ActiveCfg = Release|Win32
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Release|x86.Build.0 = Release|Win32
+		{6D22B5C5-2AA2-4F77-8ADA-80BCD53F4C5F}.Release|x86.Deploy.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {F8E07632-0D67-4518-8D8F-9D5F502A7797}
+	EndGlobalSection
+EndGlobal

appveyor.yml

@@ -0,0 +1,49 @@
+version: "{build}"
+branches:
+  only:
+    - master
+    - /v\d+\..+/
+    - /release.*/
+    - appveyor
+clone_depth: 100
+
+image: Visual Studio 2017
+
+platform:
+  - x64
+
+configuration:
+  - Release
+
+matrix:
+  fast_finish: true
+
+for:
+-
+  build_script:
+   - msbuild Saenaru.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+   - msbuild Saenaru.sln -p:platform=x86 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
+after_build:
+  - set PATH=C:\Program Files (x86)\NSIS\;%PATH%
+  - cd setup
+  - makensis.exe /DOUTPUTFILE=Saenaru-$(appveyor_build_version).exe saenaru.nsi
+
+artifacts:
+  - path: setup/Saenaru-*.exe
+    name: saenaru
+
+deploy:
+  # Create GitHub release, also set the release name and description.
+  provider: GitHub
+  tag: $(appveyor_repo_tag_name)
+  release: "$(project_name) $(project_version)"
+  description: ""
+  force_update: true  # Force update in case Travis CI created the release before.
+  prerelease: $(project_version_is_prerelease)
+  draft: false
+  artifact: saenaru
+  auth_token:
+    secure: c/xeb8SWqrADeN+EXjJApIVIElDs/ro/tlIDGnNjZXhru7HP5zVKFlwSLTU3zqRf
+  on:
+    appveyor_repo_tag: true

setup/LICENSE.txt

@@ -1,5 +1,5 @@
 『새나루』는 열린 한글 프로젝트(http://kldp.net/projects/hangul)와 새나루 프로
-젝트(http://kldp.net/projects/saenaru)의 공동의 노력으로 개발되고 있습니다.
+젝트(https://github.com/wkpark/saenaru)의 공동의 노력으로 개발되고 있습니다.
 
 열린 한글 프로젝트/새나루 개발자 --
   박원규 [email protected]
@@ -9,7 +9,7 @@
 『새나루』는 오픈 소스 저작물이며, 저작권법에 의해서 다음 사용권 계약에 동의하
 시는 경우에만 사용하실 수 있습니다. (2항 BSD 라이센스 형태에서 변조되었습니다.)
 
-저작 (C) 2003-2010 박원규, 장혜식, 최환진.
+저작 (C) 2003-2019 박원규, 장혜식, 최환진.
 저작 (C) 1990-1998 Microsoft Corporation.
 이 소프트웨어의 모든 저작권은 보호됨.
 
@@ -38,5 +38,3 @@
 제에서만 사용될 수 있으며, 다른 운영체제에서 사용하여 발생하는 법적, 상업적,
 도덕적 문제 등 모든 사항에 대해서 열린 한글 프로젝트와 프로젝트의 공헌자들은
 책임이 없습니다.
-
-$Id$

setup/httplink-hangul.url

@@ -1,5 +1,5 @@
 [DEFAULT]
-BASEURL=http://kldp.net/projects/hangul
+BASEURL=http://kldp.net/hangul
 [InternetShortcut]
-URL=http://kldp.net/projects/hangul
+URL=http://kldp.net/hangul
 Modified=D0462585F3CBC30142

setup/httplink-saenaru.url

@@ -1,5 +1,5 @@
 [DEFAULT]
-BASEURL=http://saenaru.i18n.org/
+BASEURL=https://github.com/wkpark/saenaru
 [InternetShortcut]
-URL=http://kldp.net/projects/saenaru
+URL=https://github.com/wkpark/saenaru
 Modified=70F6B6BF8DAACA01DD

setup/saenaru.nsi

@@ -1,23 +1,25 @@
 ; Saenaru Installation Script
-; Written by Hye-Shik Chang <[email protected]>
-; $Id$
+; by Hye-Shik Chang <[email protected]>
 
-!define RELVERSION      "1.1.0cvs-snapshot"
+Unicode true
+
+!define RELVERSION      "1.2.0-GIT"
 !define APPNAME         "새나루 스냅샷 ${RELVERSION}"
 
 !define REGISTRY_PATH_ROOT   "Software\OpenHangulProject\Saenaru"
 !define REGISTRY_PATH   "Software\OpenHangulProject\Saenaru"
-!define DDKBUILDDIR     "..\src\objfre_wxp_x86\i386"
-!define DDK64BUILDDIR   "..\src\objfre_win7_amd64\amd64"
-!define DVBUILDDIR      "..\kbddvk\objfre_wxp_x86\i386"
-!define DV64BUILDDIR    "..\kbddvk\objfre_win7_amd64\amd64"
-!define CMBUILDDIR      "..\colemak\objfre_wxp_x86\i386"
-!define CM64BUILDDIR    "..\colemak\objfre_win7_amd64\amd64"
+!define DDKBUILDDIR     "..\Release"
+!define DDK64BUILDDIR   "..\x64\Release"
+!define DVBUILDDIR      "..\prebuilt\kbddvk\x86"
+!define DV64BUILDDIR    "..\prebuilt\kbddvk\x64"
+!define CMBUILDDIR      "..\prebuilt\colemak\x86"
+!define CM64BUILDDIR    "..\prebuilt\colemak\x64"
 !define RESOURCEDIR     "..\resource"
-!define HELPDIR         "..\help"
+!define HELPDIR         "..\prebuilt"
 !define SRCROOTDIR      ".."
 !define SMPATH          "$SMPROGRAMS\새나루"
 
+;; custom fixes
 !include /NONFATAL ".\local.nsi"
 
 !include "x64.nsh"
@@ -142,7 +144,7 @@ Section "새나루 입력기" SecBody
   File "${RESOURCEDIR}\old2set3set.reg"
   File "${RESOURCEDIR}\nk2set.reg"
   File "${RESOURCEDIR}\comp_default.reg"
-  ;;
+  ;; custom fix
   !include /NONFATAL ".\userkbd\file.nsi"
   ;;
   File /oname=saenaru.ico "${RESOURCEDIR}\about.ico"
@@ -151,24 +153,31 @@ Section "새나루 입력기" SecBody
   WriteRegStr HKLM "${REGISTRY_PATH}" "" $INSTDIR
 
   ;IME keys
-  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0120412" "Layout file" "kbdkor.dll"
-  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0120412" "Layout text" "새나루 한글 입력기"
-  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0120412" "Layout display name" "한글 입력기 (새나루)"
-  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0120412" "IME file" "SAENARU.IME"
+  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0120412" "Layout File" "kbdkor.dll"
+  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0120412" "Layout Text" "새나루 한글 입력기"
+  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0120412" "Layout Display Name" "새나루 한글 입력기"
+  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0120412" "IME File" "SAENARU.IME"
 
   ; dvorak driver support
-  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0130412" "Layout file" "kbddvk.dll"
-  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0130412" "Layout text" "새나루 한글 입력기"
-  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0130412" "Layout display name" "한글 입력기 (새나루 드보락)"
-  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0130412" "IME file" "SAENARU.IME"
+  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0130412" "Layout File" "kbddvk.dll"
+  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0130412" "Layout Text" "새나루 한글 입력기 (드보락)"
+  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0130412" "Layout Display Name" "새나루 한글 입력기 (드보락)"
+  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0130412" "IME File" "SAENARU.IME"
 
   WriteRegStr HKCU "${REGISTRY_PATH}\Dictionary" "" "nabi.dic"
   WriteRegStr HKCU "${REGISTRY_PATH}\Dictionary" "Symbol" "symwin.dic"
   WriteRegStr HKCU "${REGISTRY_PATH}\Dictionary" "Word" "word.dic"
   WriteRegStr HKCU "${REGISTRY_PATH}\Dictionary" "HanjaIndex" "jinsuk.dic"
 
-  WriteRegDWORD HKCU "${REGISTRY_PATH}" "OptionFlag" 169
-  WriteRegDWORD HKCU "${REGISTRY_PATH" "LayoutFlag" "1"
+  ReadRegDWORD $1 HKCU "${REGISTRY_PATH}" "OptionFlag" 
+  IfErrors 0 regDone
+  WriteRegDWORD HKCU "${REGISTRY_PATH}" "OptionFlag" 41
+  regDone:
+  ReadRegDWORD $1 HKCU "${REGISTRY_PATH}" "HangulToggle" 
+  IfErrors 0 regDone2
+  WriteRegDWORD HKCU "${REGISTRY_PATH}" "HangulToggle" 65568
+  regDone2:
+  ;WriteRegDWORD HKCU "${REGISTRY_PATH}" "LayoutFlag" "1"
 
   ;Create uninstaller
   WriteUninstaller "$INSTDIR\Uninstall.exe"
@@ -180,8 +189,8 @@ Section "새나루 입력기" SecBody
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Saenaru" "DisplayIcon" "$INSTDIR\saenaru.ico,-0"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Saenaru" "DisplayVersion" "${RELVERSION}"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Saenaru" "Publisher" "Open Hangul Project"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Saenaru" "HelpLink" "http://saenaru.i18n.org"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Saenaru" "URLInfoAbout" "http://kldp.net/projects/saenaru"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Saenaru" "HelpLink" "https://github.com/wkpark/saenaru"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Saenaru" "URLInfoAbout" "https://github.com/wkpark/saenaru"
 
   ;Create short cuts
   CreateDirectory "${SMPATH}"
@@ -227,10 +236,10 @@ Section /o "새나루 콜맥(Colemak)" SecColemak
   ${EndIf}
 
   ; Colemak driver support
-  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0140412" "Layout file" "kbdcmk.dll"
-  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0140412" "Layout text" "새나루 한글 입력기"
-  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0140412" "Layout display name" "한글 입력기 (새나루 콜맥)"
-  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0140412" "IME file" "SAENARU.IME"
+  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0140412" "Layout File" "kbdcmk.dll"
+  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0140412" "Layout Text" "새나루 한글 입력기 (콜맥)"
+  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0140412" "Layout Display Name" "새나루 한글 입력기 (콜맥)"
+  WriteRegStr HKLM "System\CurrentControlSet\Control\Keyboard Layouts\E0140412" "IME File" "SAENARU.IME"
 
   IfRebootFlag 0 noreboot
     MessageBox MB_OK|MB_ICONINFORMATION "새나루가 사용중이기 때문에 설치/업데이트가 완료되지 못했습니다. 재부팅을 해야 설치가 완료됩니다."
@@ -347,6 +356,7 @@ SectionEnd
   LangString DESC_KBD_NEW_BUTTON ${LANG_KOREAN} "새두벌/새세벌 자판 (&N)"
   LangString DESC_KBD_NK_BUTTON ${LANG_KOREAN} "북한 두벌식 (&K)"
 
+;; custom fix
 !include /NONFATAL ".\userkbd\extra.nsi"
 
 Function OpenInputSetting
@@ -381,6 +391,7 @@ Function OpenUserKeyboard
 	${NSD_CreateCheckBox} 0 144 110u 17u "$(DESC_KBD_NK_BUTTON)"
 	Pop $nk_kbd
 
+        ;; custom fix
         !include /NONFATAL "userkbd\ui.nsi"
 
 	nsDialogs::Show