| Revision | 29437 (tree) |
|---|---|
| Time | 2022-08-03 03:32:23 |
| Author | stefankueng |
manually load the scilexer.dll on startup
trunk/src/TortoiseUDiff/TortoiseUDiff.cpp (diff)| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | // TortoiseSVN - a Windows shell extension for easy version control |
| 2 | 2 | |
| 3 | -// Copyright (C) 2003-2008, 2010-2012, 2014-2015, 2020-2021 - TortoiseSVN | |
| 3 | +// Copyright (C) 2003-2008, 2010-2012, 2014-2015, 2020-2022 - TortoiseSVN | |
| 4 | 4 | // Copyright (C) 2011-2016 - TortoiseGit |
| 5 | 5 | |
| 6 | 6 | // This program is free software; you can redistribute it and/or |
| @@ -27,6 +27,7 @@ | ||
| 27 | 27 | #include "../Utils/CrashReport.h" |
| 28 | 28 | #include "ResString.h" |
| 29 | 29 | #include "registry.h" |
| 30 | +#include "SmartHandle.h" | |
| 30 | 31 | |
| 31 | 32 | #include <commctrl.h> |
| 32 | 33 | #pragma comment(lib, "comctl32.lib") |
| @@ -60,6 +61,10 @@ | ||
| 60 | 61 | ULONG_PTR gdiplusToken; |
| 61 | 62 | Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, nullptr); |
| 62 | 63 | |
| 64 | + CAutoLibrary hSciLexerDll = ::LoadLibrary(L"SciLexer.DLL"); | |
| 65 | + if (hSciLexerDll == nullptr) | |
| 66 | + return FALSE; | |
| 67 | + | |
| 63 | 68 | CLangDll langDll; |
| 64 | 69 | hResource = langDll.Init(L"TortoiseUDiff", langId); |
| 65 | 70 | if (!hResource) |
TortoiseSVN