Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

マクロの Python 対応 #1866

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

マクロの Python 対応 #1866

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d99a021
マクロの Python 対応
beru Jun 26, 2020
ff2b219
use PyUnicode_AsUTF8AndSize instead of PyUnicode_AsUTF8 so that vulne…
beru Oct 10, 2022
090317b
call GetProcAddress only after DLL is loaded
beru Oct 10, 2022
ceb8e76
add file open error check in CPythonMacroManager::LoadKeyMacro method
beru Oct 10, 2022
acee205
use case-insensitive string comparison for python file extension
beru Oct 10, 2022
51e0fd7
update handleFunction to use PyUnicode_AsWideCharString instead of Py…
beru Oct 10, 2022
1f594fa
add error checks
beru Oct 10, 2022
4cc6343
use UTF-8 encoding string for filename argument of Py_CompileString f…
beru Oct 10, 2022
3f95404
detect and erase UTF-8 BOM from fread string in CPythonMacroManager::…
beru Oct 10, 2022
7421430
use PyErr_Fetch to get error message string
beru Oct 10, 2022
12ba7b8
use LoadLibraryExedir function
beru Oct 11, 2022
15a80d2
show Python error message with MessageBox
beru Oct 11, 2022
55205f1
remove unused utf8_to_utf16le function
beru Oct 11, 2022
bc086a4
CPythonMacroManager.cpp で g_pEditView グローバル変数を使うのを止める
beru Dec 4, 2022
5bc588b
show error message when LodLibrary fails
beru Dec 4, 2022
4a98819
auto call Py_XDECREF
beru Dec 20, 2022
22ee1b8
make PyObjectPtr noncopyable
beru Dec 20, 2022
1fbfc59
don't forget to call Py_FinalizeEx after Py_InitializeEx
beru Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sakura/sakura.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@
<ClInclude Include="..\sakura_core\macro\CMacroManagerBase.h" />
<ClInclude Include="..\sakura_core\macro\CPPA.h" />
<ClInclude Include="..\sakura_core\macro\CPPAMacroMgr.h" />
<ClInclude Include="..\sakura_core\macro\CPythonMacroManager.h" />
<ClInclude Include="..\sakura_core\macro\CSMacroMgr.h" />
<ClInclude Include="..\sakura_core\macro\CWSH.h" />
<ClInclude Include="..\sakura_core\macro\CWSHIfObj.h" />
Expand Down Expand Up @@ -707,6 +708,7 @@
<ClCompile Include="..\sakura_core\macro\CMacroManagerBase.cpp" />
<ClCompile Include="..\sakura_core\macro\CPPA.cpp" />
<ClCompile Include="..\sakura_core\macro\CPPAMacroMgr.cpp" />
<ClCompile Include="..\sakura_core\macro\CPythonMacroManager.cpp" />
<ClCompile Include="..\sakura_core\macro\CSMacroMgr.cpp" />
<ClCompile Include="..\sakura_core\macro\CWSH.cpp" />
<ClCompile Include="..\sakura_core\macro\CWSHIfObj.cpp" />
Expand Down
6 changes: 6 additions & 0 deletions sakura/sakura.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,6 +1115,9 @@
<ClInclude Include="..\sakura_core\view\CMiniMapView.h">
<Filter>Cpp Source Files\view</Filter>
</ClInclude>
<ClInclude Include="..\sakura_core\macro\CPythonMacroManager.h">
<Filter>Cpp Source Files\macro</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\resource\auto_scroll_center.cur">
Expand Down Expand Up @@ -2315,6 +2318,9 @@
<ClCompile Include="..\sakura_core\view\CMiniMapView.cpp">
<Filter>Cpp Source Files\view</Filter>
</ClCompile>
<ClCompile Include="..\sakura_core\macro\CPythonMacroManager.cpp">
<Filter>Cpp Source Files\macro</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Image Include="..\resource\auto_scroll_center.bmp">
Expand Down
3 changes: 2 additions & 1 deletion sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,10 +726,11 @@ bool CDlgOpenFile_CommonFileDialog::DoModal_GetOpenFileName( WCHAR* pszPath, EFi
cFileExt.AppendExtRaw( LS(STR_DLGOPNFL_EXTNAME2), L"*.txt" );
break;
case EFITER_MACRO:
cFileExt.AppendExtRaw( L"Macros", L"*.js;*.vbs;*.ppa;*.mac" );
cFileExt.AppendExtRaw( L"Macros", L"*.js;*.vbs;*.ppa;*.py;*.mac" );
cFileExt.AppendExtRaw( L"JScript", L"*.js" );
cFileExt.AppendExtRaw( L"VBScript", L"*.vbs" );
cFileExt.AppendExtRaw( L"Pascal", L"*.ppa" );
cFileExt.AppendExtRaw( L"Python", L"*.py" );
cFileExt.AppendExtRaw( L"Key Macro", L"*.mac" );
break;
case EFITER_NONE:
Expand Down
3 changes: 2 additions & 1 deletion sakura_core/dlg/CDlgOpenFile_CommonItemDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,11 @@ bool CDlgOpenFile_CommonItemDialog::DoModal_GetOpenFileName( WCHAR* pszPath, EFi
specs.push_back(COMDLG_FILTERSPEC{strs.back().c_str(), L"*.txt"});
break;
case EFITER_MACRO:
specs.push_back(COMDLG_FILTERSPEC{L"Macros", L"*.js;*.vbs;*.ppa;*.mac"});
specs.push_back(COMDLG_FILTERSPEC{L"Macros", L"*.js;*.vbs;*.ppa;*.py;*.mac"});
specs.push_back(COMDLG_FILTERSPEC{L"JScript", L"*.js"});
specs.push_back(COMDLG_FILTERSPEC{L"VBScript", L"*.vbs"});
specs.push_back(COMDLG_FILTERSPEC{L"Pascal", L"*.ppa"});
specs.push_back(COMDLG_FILTERSPEC{L"Python", L"*.py"});
specs.push_back(COMDLG_FILTERSPEC{L"Key Macro", L"*.mac"});
break;
case EFITER_NONE:
Expand Down
Loading