CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+fix: set correct _WIN32_WINNT version (0x0601 /*_WIN32_WINNT_WIN7*/)

Browse Source
This commit is contained in:
METANEOCORTEX\Kotti 2022-11-09 08:28:30 +01:00
parent 20cb2880f7
commit 78fbcd20fa
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scintilla/win32/PlatWin.cxx
View File

@ -28,11 +28,11 @@
#define NOMINMAX
#endif
#undef _WIN32_WINNT
//~#define _WIN32_WINNT 0x0601 /*_WIN32_WINNT_WIN7*/
#define _WIN32_WINNT 0x0A00 /*_WIN32_WINNT_WINTHRESHOLD, _WIN32_WINNT_WIN10*/
#define _WIN32_WINNT 0x0601 /*_WIN32_WINNT_WIN7*/
//~#define _WIN32_WINNT 0x0A00 /*_WIN32_WINNT_WINTHRESHOLD, _WIN32_WINNT_WIN10*/
#undef WINVER
//~#define WINVER 0x0601 /*_WIN32_WINNT_WIN7*/
#define WINVER 0x0A00 /*_WIN32_WINNT_WINTHRESHOLD, _WIN32_WINNT_WIN10*/
#define WINVER 0x0601 /*_WIN32_WINNT_WIN7*/
//~#define WINVER 0x0A00 /*_WIN32_WINNT_WINTHRESHOLD, _WIN32_WINNT_WIN10*/
#define WIN32_LEAN_AND_MEAN 1
#include <windows.h>
#include <commctrl.h>

10
scintilla/win32/ScintillaWin.cxx
View File

@ -32,11 +32,11 @@
#define NOMINMAX
#endif
#undef _WIN32_WINNT
//~#define _WIN32_WINNT 0x0601 /*_WIN32_WINNT_WIN7*/
#define _WIN32_WINNT 0x0A00 /*_WIN32_WINNT_WINTHRESHOLD, _WIN32_WINNT_WIN10*/
#define _WIN32_WINNT 0x0601 /*_WIN32_WINNT_WIN7*/
//~#define _WIN32_WINNT 0x0A00 /*_WIN32_WINNT_WINTHRESHOLD, _WIN32_WINNT_WIN10*/
#undef WINVER
//~#define WINVER 0x0601 /*_WIN32_WINNT_WIN7*/
#define WINVER 0x0A00 /*_WIN32_WINNT_WINTHRESHOLD, _WIN32_WINNT_WIN10*/
#define WINVER 0x0601 /*_WIN32_WINNT_WIN7*/
//~#define WINVER 0x0A00 /*_WIN32_WINNT_WINTHRESHOLD, _WIN32_WINNT_WIN10*/
#define WIN32_LEAN_AND_MEAN 1
#include <windows.h>
#include <commctrl.h>
@ -2108,6 +2108,7 @@ sptr_t ScintillaWin::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
InvalidateStyleRedraw();
break;
#if(WINVER >= 0x0605)
case WM_DPICHANGED_AFTERPARENT: {
const UINT dpiNow = DpiForWindow(wMain.GetID());
if (dpi != dpiNow) {
@ -2116,6 +2117,7 @@ sptr_t ScintillaWin::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
}
}
break;
#endif
// >>>>>>>>>>>>>>> BEG NON STD SCI PATCH >>>>>>>>>>>>>>>
#if SCI_EnablePopupMenu

1
src/Helpers.c
View File

@ -1920,6 +1920,7 @@ LPCTSTR const lpszUnsafeChars = L" \"\\<>{|}^`";
void UrlEscapeEx(LPCWSTR lpURL, LPWSTR lpEscaped, DWORD* pcchEscaped, bool bEscReserved)
{
#if (NTDDI_VERSION >= NTDDI_WIN8)
UNREFERENCED_PARAMETER(bEscReserved);
UrlEscape(lpURL, lpEscaped, pcchEscaped, (URL_ESCAPE_SEGMENT_ONLY | URL_ESCAPE_URI_COMPONENT));
#else
//UrlEscape(lpURL, lpEscaped, pcchEscaped, (URL_ESCAPE_SEGMENT_ONLY | URL_ESCAPE_PERCENT | URL_ESCAPE_AS_UTF8));