diff --git a/CMakeLists.txt b/CMakeLists.txt index e4f8a09..6d89b8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,8 +34,7 @@ add_executable(notepad WIN32 settings.c text.c rsrc.rc - compat/WinMain.c - compat/_CrtSetDbgFlag.c) + compat/WinMain.c) target_compile_definitions(notepad PRIVATE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS diff --git a/compat/_CrtSetDbgFlag.c b/compat/_CrtSetDbgFlag.c deleted file mode 100644 index d8da53a..0000000 --- a/compat/_CrtSetDbgFlag.c +++ /dev/null @@ -1,6 +0,0 @@ -#ifdef _DEBUG -int _CrtSetDbgFlag(int dummy) -{ - return 0; -} -#endif diff --git a/main.c b/main.c index 77100a2..85cd029 100644 --- a/main.c +++ b/main.c @@ -564,11 +564,6 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh static const TCHAR className[] = _T("Notepad"); static const TCHAR winName[] = _T("Notepad"); -#ifdef _DEBUG - /* Report any memory leaks on exit */ - _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); -#endif - switch (GetUserDefaultUILanguage()) { case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): diff --git a/notepad.h b/notepad.h index b369101..494fd8b 100644 --- a/notepad.h +++ b/notepad.h @@ -25,10 +25,6 @@ #include #include #include -#ifdef _DEBUG - #define _CRTDBG_MAP_ALLOC - #include -#endif #include "dialog.h" #include "notepad_res.h" diff --git a/reactos/buildno.h b/reactos/buildno.h index b2e732e..bf51cc5 100644 --- a/reactos/buildno.h +++ b/reactos/buildno.h @@ -2,17 +2,17 @@ #ifndef _INC_REACTOS_BUILDNO #define _INC_REACTOS_BUILDNO -#define KERNEL_VERSION_BUILD 20230911 -#define KERNEL_VERSION_BUILD_STR "20230911-0.4.15-dev-6611-ge4512e6" -#define KERNEL_VERSION_BUILD_RC "20230911-0.4.15-dev-6611-ge4512e6\0" +#define KERNEL_VERSION_BUILD 20231012 +#define KERNEL_VERSION_BUILD_STR "20231012-0.4.15-dev-6743-g70d5c86" +#define KERNEL_VERSION_BUILD_RC "20231012-0.4.15-dev-6743-g70d5c86\0" #define KERNEL_VERSION_RC "0.4.15-x86-dev\0" #define KERNEL_VERSION_STR "0.4.15-x86-dev" -#define KERNEL_VERSION_REVISION_RC "0.4.15-dev-6611-ge4512e6\0" -#define KERNEL_VERSION_REVISION_STR "0.4.15-dev-6611-ge4512e6" +#define KERNEL_VERSION_REVISION_RC "0.4.15-dev-6743-g70d5c86\0" +#define KERNEL_VERSION_REVISION_STR "0.4.15-dev-6743-g70d5c86" -#define KERNEL_VERSION_COMMIT_HASH "e4512e6af250d261c8ff4b0ece6b3411c503d6b0" +#define KERNEL_VERSION_COMMIT_HASH "70d5c864bc14a2427ca7f0b762f20589c1206491" #define REACTOS_DLL_VERSION_MAJOR 42 #define REACTOS_DLL_VERSION_RC "42.4.15-dev\0"