qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge cf818947fe into c7b3cb5f2a

This commit is contained in:
datadiode 2025-09-15 19:35:51 +00:00 committed by GitHub
parent c7b3cb5f2a cf818947fe
commit c86f0311a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
View File

@ -1752,7 +1752,7 @@ void QWindowsXpNativeFileDialog::populateOpenFileName(OPENFILENAME *ofn, HWND ow
int totalStringLength = 0; int totalStringLength = 0;
const QList<FilterSpec> specs = const QList<FilterSpec> specs =
filterSpecs(m_options->nameFilters(), m_options->options() & QFileDialogOptions::HideNameFilterDetails, &totalStringLength); filterSpecs(m_options->nameFilters(), m_options->options() & QFileDialogOptions::HideNameFilterDetails, &totalStringLength);
const int size = specs.size(); if (const int size = specs.size()) {
auto *ptr = new wchar_t[totalStringLength + 2 * size + 1]; auto *ptr = new wchar_t[totalStringLength + 2 * size + 1];
ofn->lpstrFilter = ptr; ofn->lpstrFilter = ptr;
for (const FilterSpec &spec : specs) { for (const FilterSpec &spec : specs) {
@ -1762,6 +1762,7 @@ void QWindowsXpNativeFileDialog::populateOpenFileName(OPENFILENAME *ofn, HWND ow
*ptr++ = 0; *ptr++ = 0;
} }
*ptr = 0; *ptr = 0;
}
const int nameFilterIndex = indexOfNameFilter(m_options->nameFilters(), m_data.selectedNameFilter()); const int nameFilterIndex = indexOfNameFilter(m_options->nameFilters(), m_data.selectedNameFilter());
if (nameFilterIndex >= 0) if (nameFilterIndex >= 0)
ofn->nFilterIndex = nameFilterIndex + 1; // 1..n based. ofn->nFilterIndex = nameFilterIndex + 1; // 1..n based.