diff options
| author | mitchell <unknown> | 2020-06-17 19:38:48 -0400 |
|---|---|---|
| committer | mitchell <unknown> | 2020-06-17 19:38:48 -0400 |
| commit | efaefe9e490c1d3cf5071ab8093abb59526a5002 (patch) | |
| tree | 7ef412f6c4dc353cc5d931a299f49b8601c5ec09 /win32/ScintillaWin.cxx | |
| parent | 9b9c12efef67a4f327f298e36a75b19d97a4735a (diff) | |
| download | scintilla-mirror-efaefe9e490c1d3cf5071ab8093abb59526a5002.tar.gz | |
Backport: Encapsulate GetProcAddress in a way that avoids undefined and conditionally defined behaviour.
Backport of changeset 8243:09cccd3f867b.
Diffstat (limited to 'win32/ScintillaWin.cxx')
| -rw-r--r-- | win32/ScintillaWin.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 0b7f6f77e..695371bf8 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -523,11 +523,8 @@ void ScintillaWin::Init() { hrOle = ::OleInitialize(nullptr); // Find SetCoalescableTimer which is only available from Windows 8+ - HMODULE user32 = ::GetModuleHandle(TEXT("user32.dll")); - if (user32) { - SetCoalescableTimerFn = reinterpret_cast<SetCoalescableTimerSig>( - ::GetProcAddress(user32, "SetCoalescableTimer")); - } + HMODULE user32 = ::GetModuleHandleW(L"user32.dll"); + SetCoalescableTimerFn = DLLFunction<SetCoalescableTimerSig>(user32, "SetCoalescableTimer"); vs.indicators[SC_INDICATOR_UNKNOWN] = Indicator(INDIC_HIDDEN, ColourDesired(0, 0, 0xff)); vs.indicators[SC_INDICATOR_INPUT] = Indicator(INDIC_DOTS, ColourDesired(0, 0, 0xff)); |