オブジェクトエクスプローラからドラッグドロップしたファイルがある場合の出力に対応。

出力時のファイルハンドルチェック時にエラーが発生していた。
rigaya · Mar 4, 2023 · 2876dae · 2876dae
1 parent a8f2f03
commit 2876dae
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/ffmpegOut/auo_version.h b/ffmpegOut/auo_version.h
@@ -28,9 +28,9 @@
 #ifndef _AUO_VERSION_H_
 #define _AUO_VERSION_H_
 
-#define AUO_VERSION          0,1,5,0
-#define AUO_VERSION_STR      "1.05"
-#define AUO_VERSION_STR_W   L"1.05"
+#define AUO_VERSION          0,1,6,0
+#define AUO_VERSION_STR      "1.06"
+#define AUO_VERSION_STR_W   L"1.06"
 #define AUO_NAME_R            ffmpegOut
 #define AUO_NAME_WITHOUT_EXT "ffmpegOut"
 #define AUO_NAME_WITHOUT_EXT_W L"ffmpegOut"

diff --git a/ffmpegOut/encode/auo_encode.cpp b/ffmpegOut/encode/auo_encode.cpp
@@ -1461,17 +1461,20 @@ static std::vector<unique_handle> createProcessHandleList(const std::vector<size
                 }
                 if (handle_type) {
                     // handleの種類を確認する
+                    size = 0;
                     status = fNtQueryObject(handle.get(), ObjectTypeInformation, NULL, 0, &size);
-                    std::vector<char> otibuffer(size, 0);
-                    status = fNtQueryObject(handle.get(), ObjectTypeInformation, otibuffer.data(), otibuffer.size(), &size);
-                    const auto oti = (PPUBLIC_OBJECT_TYPE_INFORMATION)otibuffer.data();
-                    if (NT_SUCCESS(status) && oti->TypeName.Buffer && _wcsicmp(oti->TypeName.Buffer, handle_type) == 0) {
-                        //static const OBJECT_INFORMATION_CLASS ObjectNameInformation = (OBJECT_INFORMATION_CLASS)1;
-                        //status = fNtQueryObject(handle, ObjectNameInformation, NULL, 0, &size);
-                        //std::vector<char> buffer3(size, 0);
-                        //status = fNtQueryObject(handle, ObjectNameInformation, buffer3.data(), buffer3.size(), &size);
-                        //POBJECT_NAME_INFORMATION oni = (POBJECT_NAME_INFORMATION)buffer3.data();
-                        handle_list.push_back(std::move(handle));
+                    if (status == STATUS_INFO_LENGTH_MISMATCH) { // 問題なければ、STATUS_INFO_LENGTH_MISMATCHが返る
+                        std::vector<char> otibuffer(size, 0);
+                        status = fNtQueryObject(handle.get(), ObjectTypeInformation, otibuffer.data(), otibuffer.size(), &size);
+                        const auto oti = (PPUBLIC_OBJECT_TYPE_INFORMATION)otibuffer.data();
+                        if (NT_SUCCESS(status) && oti->TypeName.Buffer && _wcsicmp(oti->TypeName.Buffer, handle_type) == 0) {
+                            //static const OBJECT_INFORMATION_CLASS ObjectNameInformation = (OBJECT_INFORMATION_CLASS)1;
+                            //status = fNtQueryObject(handle, ObjectNameInformation, NULL, 0, &size);
+                            //std::vector<char> buffer3(size, 0);
+                            //status = fNtQueryObject(handle, ObjectNameInformation, buffer3.data(), buffer3.size(), &size);
+                            //POBJECT_NAME_INFORMATION oni = (POBJECT_NAME_INFORMATION)buffer3.data();
+                            handle_list.push_back(std::move(handle));
+                        }
                     }
                 } else {
                     handle_list.push_back(std::move(handle));

diff --git a/ffmpegOut_readme.txt b/ffmpegOut_readme.txt
@@ -19,7 +19,7 @@ x264
 
 
 �y������z
-Windows 8.1/10/11 (x86/x64)
+Windows 10/11 (x86/x64)
 Aviutl 1.00 �ȍ~
 
 
@@ -216,6 +216,9 @@ ini
 VC++ 2022 Community
 
 �y�ǂ��ł����������z
+2023.03.04 (1.06)
+- �I�u�W�F�N�g�G�N�X�v���[������h���b�O�h���b�v�����t�@�C��������ꍇ�̏o�͂ɑΉ��B
+
 2022.12.09 (1.05)
 - �|��R����C���B
 

diff --git a/readme.md b/readme.md
@@ -8,7 +8,7 @@ ffmpegOut は、[ffmpeg](https://ffmpeg.org/)を使用してエンコードを
 [こちら＞＞](https://github.com/rigaya/ffmpegOut/releases)
 
 ## 想定動作環境
-Windows 8.1/10/11 (x86/x64)  
+Windows 10/11 (x86/x64)  
 Aviutl 1.00 以降 推奨
 
 ## ffmpegOut 使用にあたっての注意事項