Merge branch 'fixScroll'

pit-ray · Jan 20, 2021 · 092454a · 092454a
2 parents 3bf9942 + 9206290
commit 092454a
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 46 deletions.
diff --git a/build_resources/resource.rc b/build_resources/resource.rc
@@ -14,11 +14,11 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName",        "pit-ray\0"
-            VALUE "FileDescription",    "win-vind (32-bit)\0"
+            VALUE "FileDescription",    "win-vind (64-bit)\0"
             VALUE "LegalCopyright",     "Copyright (c) 2020 pit-ray\0"
-            VALUE "InternalName",       "win-vind (32-bit)\0"
+            VALUE "InternalName",       "win-vind (64-bit)\0"
             VALUE "OriginalFilename",   "win-vind.exe\0"
-            VALUE "ProductName",        "win-vind (32bit)\0"
+            VALUE "ProductName",        "win-vind (64bit)\0"
             VALUE "ProductVersion",     "3.0.1\0"
         END
     END

diff --git a/core/include/common/text_analyzer.hpp b/core/include/common/text_analyzer.hpp
@@ -1,8 +1,10 @@
 #ifndef _TEXT_ANALYZER_HPP
 #define _TEXT_ANALYZER_HPP
 
+#include "disable_gcc_warning.hpp"
 #include <functional>
 #include <string>
+#include "enable_gcc_warning.hpp"
 
 namespace TextAnalyzer
 {
@@ -22,13 +24,6 @@ namespace TextAnalyzer
         : str(),
           having_EOL(false)
         {}
-
-        virtual ~SelRes() noexcept = default ;
-
-        SelRes(SelRes&&) noexcept               = default ;
-        SelRes& operator=(SelRes&&) noexcept    = default ;
-        SelRes(const SelRes&) noexcept          = default ;
-        SelRes& operator=(const SelRes&)        = default ;
     } ;
 
     const SelRes get_selected_text(

diff --git a/core/include/disable_gcc_warning.hpp b/core/include/disable_gcc_warning.hpp
@@ -1,6 +1,7 @@
 #if defined(_MSC_VER) && _MSC_VER >= 1500
 #pragma warning(disable : 4996)
 #pragma warning(disable : 5054)
+#pragma warning(disable : 4244)
 
 #else
 #pragma warning(disable : 4068)

diff --git a/core/include/editor_bindings/edi_edit.hpp b/core/include/editor_bindings/edi_edit.hpp
@@ -5,7 +5,7 @@
 
 namespace TextAnalyzer
 {
-    class SelRes ;
+    struct SelRes ;
 }
 
 //Copy

diff --git a/core/include/enable_gcc_warning.hpp b/core/include/enable_gcc_warning.hpp
@@ -1,6 +1,7 @@
 #if defined(_MSC_VER) && _MSC_VER >= 1500
 #pragma warning(default : 4996)
 #pragma warning(default : 5054)
+#pragma warning(default : 4244)
 
 #else
 #pragma warning(disable : 4068)

diff --git a/core/src/common/key_absorber.cpp b/core/src/common/key_absorber.cpp
@@ -51,26 +51,30 @@ namespace KeyAbsorber
     static unique_ptr<HHOOK, decltype(uninstaller)> p_handle(nullptr, uninstaller) ;
 
     static LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam) {
-        const auto release = [&wParam, &lParam](const int code) {
-            return CallNextHookEx(*p_handle, code, wParam, lParam) ;
-        } ;
-
         if(nCode < HC_ACTION) {
             //not processed
-            return release(nCode) ;
+            return CallNextHookEx(*p_handle, nCode, wParam, lParam) ;
         }
-        const auto code = static_cast<unsigned char>(reinterpret_cast<KBDLLHOOKSTRUCT*>(lParam)->vkCode) ;
+
+        const auto code = static_cast<unsigned char>(
+                reinterpret_cast<KBDLLHOOKSTRUCT*>(lParam)->vkCode) ;
+
         const auto state = (wParam == WM_KEYDOWN || wParam == WM_SYSKEYDOWN) ;
         g_real_state[code] = state ;
         g_state[code]      = state ;
-        g_state[VKCConverter::get_representative_key(code)] = state ;
+
+        const auto rep = VKCConverter::get_representative_key(code) ;
+        g_real_state[rep] = state ;
+        g_state[rep]      = state ;
 
         if(!g_ignored_keys.empty()) {
             if(std::find(g_ignored_keys.cbegin(), g_ignored_keys.cend(), code) != g_ignored_keys.cend()) {
-                return release(HC_ACTION) ;
+                return CallNextHookEx(*p_handle, HC_ACTION, wParam, lParam) ;
             }
         }
-        return g_absorbed_flag ? -1 : release(HC_ACTION) ;
+
+        if(g_absorbed_flag) return -1 ;
+        else return CallNextHookEx(*p_handle, HC_ACTION, wParam, lParam) ;
     }
 
     void install_hook() {

diff --git a/core/src/common/smart_clipboard.cpp b/core/src/common/smart_clipboard.cpp
@@ -45,7 +45,6 @@ void SmartClipboard::open() {
     }
     if(!OpenClipboard(pimpl->hwnd)) {
         throw RUNTIME_EXCEPT("failed opening clipboard") ;
-        return ;
     }
     pimpl->opening = true ;
 }
@@ -56,39 +55,33 @@ void SmartClipboard::close() {
     }
     if(!CloseClipboard()) {
         throw RUNTIME_EXCEPT("failed closing clipboard") ;
-        return ;
     }
     pimpl->opening = false ;
 }
 
 void SmartClipboard::get_as_str(std::string& str, bool& having_EOL) {
     if(!pimpl->opening) {
         throw LOGIC_EXCEPT("Thread does not have a clipboard open.") ;
-        return ;
     }
 
     if(!IsClipboardFormatAvailable(COMMON_FORMAT)) {
         throw RUNTIME_EXCEPT("the current clipboard data is not supported unicode") ;
-        return ;
     }
 
     auto data = GetClipboardData(COMMON_FORMAT) ;
     if(data == NULL) {
         throw RUNTIME_EXCEPT("cannot get clipboard data") ;
-        return ;
     }
 
     auto unlocker = [](void* ptr) {GlobalUnlock(ptr) ;} ;
     std::unique_ptr<void, decltype(unlocker)> locked_data(GlobalLock(data), unlocker) ;
     if(locked_data == NULL) {
         throw RUNTIME_EXCEPT("cannot lock global clipboard data ") ;
-        return ;
     }
 
     auto data_size = GlobalSize(locked_data.get()) ;
     if(!data_size) {
         throw RUNTIME_EXCEPT("the clipboard does not have data.") ; 
-        return ;
     }
     auto rawstr = reinterpret_cast<char*>(locked_data.get()) ;
     str = rawstr ;
@@ -107,27 +100,23 @@ void SmartClipboard::get_as_str(std::string& str, bool& having_EOL) {
 void SmartClipboard::backup() {
     if(!pimpl->opening) {
         throw LOGIC_EXCEPT("Thread does not have a clipboard open.") ;
-        return ;
     }
 
     if(pimpl->cache != NULL) {
         if(!GlobalFree(pimpl->cache)) {
             throw RUNTIME_EXCEPT("Cannot free cache for backup") ;
-            return ;
         }
     }
 
     auto data = GetClipboardData(COMMON_FORMAT) ;
     if(data == NULL) {
         throw RUNTIME_EXCEPT("cannot get clipboard data") ;
-        return ;
     }
 
     auto unlocker = [](void* ptr) {GlobalUnlock(ptr) ;} ;
     std::unique_ptr<void, decltype(unlocker)> locked_data(GlobalLock(data), unlocker) ;
     if(locked_data == NULL) {
         throw RUNTIME_EXCEPT("cannot lock global clipboard data") ;
-        return ;
     }
 
     auto data_size = GlobalSize(locked_data.get()) ;
@@ -139,7 +128,6 @@ void SmartClipboard::backup() {
     auto gmem = GlobalAlloc(GHND, data_size) ;
     if(gmem == NULL) {
         throw RUNTIME_EXCEPT("cannot alloc memories in global area.") ;
-        return ;
     }
 
     std::unique_ptr<void, decltype(unlocker)> locked_gmem(GlobalLock(gmem), unlocker) ;
@@ -156,50 +144,42 @@ void SmartClipboard::backup() {
 void SmartClipboard::restore_backup() {
     if(!pimpl->opening) {
         throw LOGIC_EXCEPT("Thread does not have a clipboard open.") ;
-        return ;
     }
 
     if(pimpl->cache == NULL) {
         throw LOGIC_EXCEPT("cache does not have backup") ;
-        return ;
     }
 
     if(!EmptyClipboard()) {
         throw RUNTIME_EXCEPT("Failed initalization of clipboard") ;
-        return ;
     }
 
     //If SetClipboardData succeeds, the system owns gmem, so should not free gmem.
     if(!SetClipboardData(COMMON_FORMAT, pimpl->cache)) {
         throw RUNTIME_EXCEPT("cannot set data into clipboard") ;
-        return ;
     }
     pimpl->cache = NULL ;
 }
 
 void SmartClipboard::set(const char* const ar, const std::size_t size) {
     if(!pimpl->opening) {
         throw LOGIC_EXCEPT("Thread does not have a clipboard open.") ;
-        return ;
     }
 
     auto gmem = GlobalAlloc(GHND, size) ;
     if(gmem == NULL) {
         throw RUNTIME_EXCEPT("cannot alloc memories in global area.") ;
-        return ;
     }
 
     auto unlocker = [](void* ptr) {GlobalUnlock(ptr) ;} ;
     std::unique_ptr<void, decltype(unlocker)> locked_gmem(GlobalLock(gmem), unlocker) ;
     if(locked_gmem == NULL) {
-        throw RUNTIME_EXCEPT("cannot lock global memory for backup.") ;
         GlobalFree(gmem) ;
-        return ;
+        throw RUNTIME_EXCEPT("cannot lock global memory for backup.") ;
     }
 
     if(!EmptyClipboard()) {
         throw RUNTIME_EXCEPT("Failed initalization of clipboard") ;
-        return ;
     }
 
     std::memcpy(locked_gmem.get(), ar, size) ;
@@ -208,6 +188,5 @@ void SmartClipboard::set(const char* const ar, const std::size_t size) {
     //If SetClipboardData succeeds, the system owns gmem, so should not free gmem.
     if(!SetClipboardData(COMMON_FORMAT, gmem)) {
         throw RUNTIME_EXCEPT("cannot set data into clipboard") ;
-        return ;
     }
 }
diff --git a/core/src/common_bindings/filer.cpp b/core/src/common_bindings/filer.cpp
@@ -188,7 +188,7 @@ namespace FilerUtility
             if(FAILED(ppf2->GetCurFolder(&raw_pidl))) {
                 throw RUNTIME_EXCEPT("cannot get current folder.") ;
             }
-            auto idl_deleter = [](LPITEMIDLIST ptr) {CoTaskMemFree(ptr) ;} ;
+            auto idl_deleter = [](ITEMIDLIST* ptr) {CoTaskMemFree(ptr) ;} ;
             std::unique_ptr<ITEMIDLIST, decltype(idl_deleter)> pidl(raw_pidl, idl_deleter) ;
 
             //convert to path

diff --git a/core/src/editor_bindings/edi_replace.cpp b/core/src/editor_bindings/edi_replace.cpp
@@ -172,12 +172,14 @@ void EdiSwitchCharCase::sprocess(
             KeybrdEventer::pushup(VKCConverter::get_vkc(c + delta)) ;
         }
         else {
-            unsigned char vkc = 0 ;
-            if((vkc = VKCConverter::get_vkc(c))) {
+            auto vkc = VKCConverter::get_vkc(c) ;
+            if(vkc) {
                 KeybrdEventer::pushup(vkc) ;
                 continue ;
             }
-            else if((vkc = VKCConverter::get_shifted_vkc(c))) {
+
+            vkc = VKCConverter::get_shifted_vkc(c) ;
+            if(vkc) {
                 KeybrdEventer::pushup(VKC_LSHIFT, vkc) ;
                 continue ;
             }

diff --git a/core/src/key_binder.cpp b/core/src/key_binder.cpp
@@ -460,6 +460,7 @@ namespace KeyBinder
         if(l_repeat_num != 0) {
             l_logger.back() -= c_nums ;
         }
+
         auto matched_func = find_func(l_logger, l_running_func) ;
 
         if(!matched_func) {

diff --git a/log/error.log b/log/error.log
@@ -0,0 +1,3 @@
+[Error] Windows Error Code: [0],  0      0   ` is not supported in "config\US.kmp", L2. (JumpCursorUtility::load_config()::<lambda(auto:1)> [with auto:1 = const char*])
+[Error] Windows Error Code: [0],  12     0   = is not supported in "config\US.kmp", L14. (JumpCursorUtility::load_config()::<lambda(auto:1)> [with auto:1 = const char*])
+[Error] Windows Error Code: [0],  11.75   2  ' is not supported in "config\US.kmp", L43. (JumpCursorUtility::load_config()::<lambda(auto:1)> [with auto:1 = const char*])
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
     namespace TextAnalyzer
     {
-        class SelRes ;
+        struct SelRes ;
     }
     //Copy
@@ Expand Down @@