diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-06-02 17:18:54 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-06-13 09:55:34 +0200 |
| commit | 3392df4c38248581f431a1ace3a835cb5da8c13b (patch) | |
| tree | 5351bf2243481311f9e3b27dff12214a5176f393 /src | |
| parent | 713da375ccc8830d572589676730de24c4718fca (diff) | |
Revert "Avoid possible symbol clashes on static builds on Windows"
This reverts commit aa00e8eb623d5cb4ba32860dd3671a87f3763f89.
Part of chain revert to go back to QWinOverlappedIoNotifier.
Task-number: QTBUG-101444
Change-Id: I863ee26ba010371689ccc3083435a5d28fb36fed
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/serialport/qserialport_win.cpp | 2 | ||||
| -rw-r--r-- | src/serialport/qtntdll_p.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index 7f916094..dbff1331 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -246,7 +246,7 @@ bool QSerialPortPrivate::open(QIODevice::OpenMode mode) { { QMutexLocker locker(&helper()->mutex); - static bool symbolsResolved = resolveNtdllSymbols(&helper()->ntLibrary); + static bool symbolsResolved = resolveSymbols(&helper()->ntLibrary); if (!symbolsResolved) { setError(QSerialPortErrorInfo(QSerialPort::OpenError, helper()->ntLibrary.errorString())); diff --git a/src/serialport/qtntdll_p.h b/src/serialport/qtntdll_p.h index 2aff6c24..f6f8ac6f 100644 --- a/src/serialport/qtntdll_p.h +++ b/src/serialport/qtntdll_p.h @@ -123,14 +123,14 @@ typedef VOID (WINAPI *PIO_APC_ROUTINE) ( static fp_##symbolName symbolName; #define RESOLVE_SYMBOL(symbolName) \ - symbolName = reinterpret_cast<fp_##symbolName>(resolveNtdllSymbol(ntLibrary, #symbolName)); \ + symbolName = reinterpret_cast<fp_##symbolName>(resolveSymbol(ntLibrary, #symbolName)); \ if (!symbolName) \ return false; GENERATE_SYMBOL_VARIABLE(ULONG, RtlNtStatusToDosError, NTSTATUS) GENERATE_SYMBOL_VARIABLE(NTSTATUS, NtDeviceIoControlFile, HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID, PIO_STATUS_BLOCK, ULONG, PVOID, ULONG, PVOID, ULONG) -inline QFunctionPointer resolveNtdllSymbol(QLibrary *ntLibrary, const char *symbolName) +inline QFunctionPointer resolveSymbol(QLibrary *ntLibrary, const char *symbolName) { QFunctionPointer symbolFunctionPointer = ntLibrary->resolve(symbolName); if (!symbolFunctionPointer) @@ -139,7 +139,7 @@ inline QFunctionPointer resolveNtdllSymbol(QLibrary *ntLibrary, const char *symb return symbolFunctionPointer; } -inline bool resolveNtdllSymbols(QLibrary *ntLibrary) +inline bool resolveSymbols(QLibrary *ntLibrary) { if (!ntLibrary->isLoaded()) { ntLibrary->setFileName(QStringLiteral("ntdll")); |