Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [ATL_APITEST] Fixup of #3492; fix SubclassWindow testcase
by Katayama Hirofumi MZ 28 Feb '21

28 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e32854998bffb8af580b… commit 9e32854998bffb8af580b570495c1a25027595db Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Feb 28 13:06:49 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Feb 28 13:13:38 2021 +0900 [ATL_APITEST] Fixup of #3492; fix SubclassWindow testcase Fix the tests at Line 359 and 403. CORE-9281 --- modules/rostests/apitests/atl/SubclassWindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/atl/SubclassWindow.cpp b/modules/rostests/apitests/atl/SubclassWindow.cpp index f372b1e7f9e..14b114ea44d 100644 --- a/modules/rostests/apitests/atl/SubclassWindow.cpp +++ b/modules/rostests/apitests/atl/SubclassWindow.cpp @@ -356,7 +356,7 @@ START_TEST(SubclassWindow) hwnd2 = Ctrl2.UnsubclassWindow(TRUE); ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); fn2 = Ctrl2.m_pfnSuperWindowProc; - ok(fn2 == fn1, "fn2 was %p\n", fn2); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); DestroyWindow(hwnd2); ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); @@ -400,7 +400,7 @@ START_TEST(SubclassWindow) hwnd2 = Ctrl2.UnsubclassWindow(TRUE); ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); fn2 = Ctrl2.m_pfnSuperWindowProc; - ok(fn2 != DefWindowProc, "fn2 was %p\n", fn2); // ntdll.dll!NtdllEditWndProc_W + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); DestroyWindow(hwnd2); ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd);

1 0

[reactos] 01/01: [SDK][ATL] Implement UnsubclassWindow methods (#3492)
by Katayama Hirofumi MZ 28 Feb '21

28 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef3e7a3717e13a97a652a… commit ef3e7a3717e13a97a652a961e5217a249778f4d4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Feb 28 12:45:16 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 28 12:45:16 2021 +0900 [SDK][ATL] Implement UnsubclassWindow methods (#3492) I want UnsubclassWindow methods. - Implement CWindowImpl::UnsubclassWindow method. - Implement CContainedWindowT::UnsubclassWindow method. - Add SubclassWindow testcase to atl_apitest test program. - Fix generic text mapping of <atlwin.h>. CORE-9281 --- modules/rostests/apitests/atl/CMakeLists.txt | 3 +- modules/rostests/apitests/atl/SubclassWindow.cpp | 428 +++++++++++++++++++++ modules/rostests/apitests/atl/devenv/.gitignore | 16 + modules/rostests/apitests/atl/devenv/ATLTest.sln | 10 + .../apitests/atl/devenv/SubclassWindow.vcxproj | 189 +++++++++ modules/rostests/apitests/atl/testlist.c | 2 + sdk/lib/atl/atlwin.h | 89 +++-- 7 files changed, 712 insertions(+), 25 deletions(-) diff --git a/modules/rostests/apitests/atl/CMakeLists.txt b/modules/rostests/apitests/atl/CMakeLists.txt index 555529b7e38..8f12a5071aa 100644 --- a/modules/rostests/apitests/atl/CMakeLists.txt +++ b/modules/rostests/apitests/atl/CMakeLists.txt @@ -16,7 +16,8 @@ list(APPEND SOURCE CRegKey.cpp CSimpleArray.cpp CSimpleMap.cpp - CString.cpp) + CString.cpp + SubclassWindow.cpp) list(APPEND PCH_SKIP_SOURCE testlist.c) diff --git a/modules/rostests/apitests/atl/SubclassWindow.cpp b/modules/rostests/apitests/atl/SubclassWindow.cpp new file mode 100644 index 00000000000..f372b1e7f9e --- /dev/null +++ b/modules/rostests/apitests/atl/SubclassWindow.cpp @@ -0,0 +1,428 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for SubclassWindow/UnsubclassWindow + * PROGRAMMER: Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#ifdef HAVE_APITEST + #include <apitest.h> + #define ATLASSUME(x) /*empty*/ + #define ATLASSERT(x) /*empty*/ +#else + #include "atltest.h" + #define ATLASSUME(x) do { \ + trace("ATLASSUME(%s) %s.\n", #x, ((x) ? "success" : "failure")); \ + } while (0) + #define ATLASSERT(x) do { \ + trace("ATLASSERT(%s) %s.\n", #x, ((x) ? "success" : "failure")); \ + } while (0) +#endif + +#include <atlbase.h> +#include <atlwin.h> + +#ifdef _WIN64 + #define INVALID_HWND ((HWND)(ULONG_PTR)0xDEADBEEFDEADBEEFULL) +#else + #define INVALID_HWND ((HWND)(ULONG_PTR)0xDEADBEEF) +#endif + +static BOOL s_flag = TRUE; + +class CMyCtrl1 : public CWindowImpl<CMyCtrl1, CWindow> +{ +public: + static LPCWSTR GetWndClassName() + { + if (s_flag) + return L"EDIT"; + else + return L"STATIC"; + } + + CMyCtrl1() + { + } + virtual ~CMyCtrl1() + { + } + + BEGIN_MSG_MAP(CMyCtrl1) + END_MSG_MAP() +}; + +class CMyCtrl2 + : public CContainedWindowT<CWindowImpl<CMyCtrl2, CWindow> > +{ +public: + static LPCWSTR GetWndClassName() + { + if (s_flag) + return L"EDIT"; + else + return L"STATIC"; + } + + CMyCtrl2() : CContainedWindowT<CWindowImpl<CMyCtrl2, CWindow> >(this) + { + } + virtual ~CMyCtrl2() + { + } + + BEGIN_MSG_MAP(CMyCtrl2) + END_MSG_MAP() +}; + +static HWND MyCreateWindow(DWORD style) +{ + return CreateWindowW(L"EDIT", NULL, style, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, GetModuleHandleW(NULL), NULL); +} + +static LRESULT CALLBACK +MyWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return 0; +} + +START_TEST(SubclassWindow) +{ + const DWORD style = WS_POPUPWINDOW | ES_MULTILINE; + HWND hwnd1, hwnd2; + WNDPROC fn1, fn2; + BOOL b; + trace("DefWindowProcA == %p\n", DefWindowProcA); + trace("DefWindowProcW == %p\n", DefWindowProcW); + trace("MyWindowProc == %p\n", MyWindowProc); + + // + // Ctrl1 + // + { + CMyCtrl1 Ctrl1; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl1.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl1.m_hWnd == hwnd1, "Ctrl1.m_hWnd was %p\n", Ctrl1.m_hWnd); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + hwnd2 = Ctrl1.UnsubclassWindow(); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 != fn2, "fn1 == fn2\n"); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + DestroyWindow(hwnd2); + ok(Ctrl1.m_hWnd == NULL, "hwnd != NULL\n"); + } + + { + CMyCtrl1 Ctrl1; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl1.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl1.m_hWnd == hwnd1, "Ctrl1.m_hWnd was %p\n", Ctrl1.m_hWnd); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + DestroyWindow(hwnd1); // destroy now + hwnd2 = Ctrl1.UnsubclassWindow(); + ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); + fn2 = Ctrl1.m_pfnSuperWindowProc; + ok(fn2 == fn1, "fn2 was %p\n", fn2); + DestroyWindow(hwnd2); + ok(Ctrl1.m_hWnd == NULL, "hwnd != NULL\n"); + } + + { + CMyCtrl1 Ctrl1; + s_flag = FALSE; // "STATIC" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl1.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl1.m_hWnd == hwnd1, "Ctrl1.m_hWnd was %p\n", Ctrl1.m_hWnd); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + hwnd2 = Ctrl1.UnsubclassWindow(); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 != fn2, "fn1 == fn2\n"); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + DestroyWindow(hwnd2); + ok(Ctrl1.m_hWnd == NULL, "hwnd != NULL\n"); + } + + { + CMyCtrl1 Ctrl1; + s_flag = FALSE; // "STATIC" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl1.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl1.m_hWnd == hwnd1, "Ctrl1.m_hWnd was %p\n", Ctrl1.m_hWnd); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + DestroyWindow(hwnd1); // destroy now + hwnd2 = Ctrl1.UnsubclassWindow(); + ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); + fn2 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 == fn2, "fn1 != fn2\n"); + DestroyWindow(hwnd2); + ok(Ctrl1.m_hWnd == NULL, "hwnd != NULL\n"); + } + + { + CMyCtrl1 Ctrl1; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl1.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl1.m_hWnd == hwnd1, "Ctrl1.m_hWnd was %p\n", Ctrl1.m_hWnd); + Ctrl1.m_pfnSuperWindowProc = MyWindowProc; + hwnd2 = Ctrl1.UnsubclassWindow(); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 == fn2, "fn2 was %p\n", fn2); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + DestroyWindow(hwnd2); + ok(Ctrl1.m_hWnd == NULL, "hwnd != NULL\n"); + } + + // + // Ctrl2 (Not Forced) + // + { + CMyCtrl2 Ctrl2; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + hwnd2 = Ctrl2.UnsubclassWindow(FALSE); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != fn2, "fn1 == fn2\n"); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + DestroyWindow(hwnd1); // destroy now + hwnd2 = Ctrl2.UnsubclassWindow(FALSE); + ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == fn2, "fn1 == fn2\n"); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = FALSE; // "STATIC" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + hwnd2 = Ctrl2.UnsubclassWindow(FALSE); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != fn2, "fn1 == fn2\n"); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = FALSE; // "STATIC" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + DestroyWindow(hwnd1); // destroy now + hwnd2 = Ctrl2.UnsubclassWindow(FALSE); + ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn2 != DefWindowProc, "fn2 was %p\n", fn2); // ntdll.dll!NtdllEditWndProc_W + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + Ctrl2.m_pfnSuperWindowProc = MyWindowProc; + hwnd2 = Ctrl2.UnsubclassWindow(FALSE); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + ok(Ctrl2.m_hWnd == NULL, "hwnd != NULL\n"); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "hwnd != NULL\n"); + } + + // + // Ctrl2 (Forced) + // + { + CMyCtrl2 Ctrl2; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + hwnd2 = Ctrl2.UnsubclassWindow(TRUE); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != fn2, "fn1 == fn2\n"); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + DestroyWindow(hwnd1); // destroy now + hwnd2 = Ctrl2.UnsubclassWindow(TRUE); + ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn2 == fn1, "fn2 was %p\n", fn2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = FALSE; // "STATIC" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + hwnd2 = Ctrl2.UnsubclassWindow(TRUE); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != fn2, "fn1 == fn2\n"); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = FALSE; // "STATIC" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + DestroyWindow(hwnd1); // destroy now + hwnd2 = Ctrl2.UnsubclassWindow(TRUE); + ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn2 != DefWindowProc, "fn2 was %p\n", fn2); // ntdll.dll!NtdllEditWndProc_W + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + Ctrl2.m_pfnSuperWindowProc = MyWindowProc; + hwnd2 = Ctrl2.UnsubclassWindow(TRUE); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + ok(Ctrl2.m_hWnd == NULL, "hwnd != NULL\n"); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "hwnd != NULL\n"); + } +} diff --git a/modules/rostests/apitests/atl/devenv/.gitignore b/modules/rostests/apitests/atl/devenv/.gitignore new file mode 100644 index 00000000000..15eeeeb1607 --- /dev/null +++ b/modules/rostests/apitests/atl/devenv/.gitignore @@ -0,0 +1,16 @@ +*.opendb +*.db +x64/ +.vs/ +CAtlArray/ +CAtlFileMapping/ +CAtlList/ +CComHeapPtr/ +CComObject/ +CComQIPtr/ +CHeapPtrList/ +CImage/ +CSimpleArray/ +CSimpleMap/ +CString/ +SubclassWindow/ diff --git a/modules/rostests/apitests/atl/devenv/ATLTest.sln b/modules/rostests/apitests/atl/devenv/ATLTest.sln index 8fd0e07a092..9811121c7fd 100644 --- a/modules/rostests/apitests/atl/devenv/ATLTest.sln +++ b/modules/rostests/apitests/atl/devenv/ATLTest.sln @@ -25,6 +25,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CHeapPtrList", "CHeapPtrLis EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CComHeapPtr", "CComHeapPtr.vcxproj", "{F10E34E3-FB53-4650-985A-28BD1905D65C}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SubclassWindow", "SubclassWindow.vcxproj", "{ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -121,6 +123,14 @@ Global {F10E34E3-FB53-4650-985A-28BD1905D65C}.Release|x64.Build.0 = Release|x64 {F10E34E3-FB53-4650-985A-28BD1905D65C}.Release|x86.ActiveCfg = Release|Win32 {F10E34E3-FB53-4650-985A-28BD1905D65C}.Release|x86.Build.0 = Release|Win32 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Debug|x64.ActiveCfg = Debug|x64 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Debug|x64.Build.0 = Debug|x64 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Debug|x86.ActiveCfg = Debug|Win32 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Debug|x86.Build.0 = Debug|Win32 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Release|x64.ActiveCfg = Release|x64 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Release|x64.Build.0 = Release|x64 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Release|x86.ActiveCfg = Release|Win32 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/modules/rostests/apitests/atl/devenv/SubclassWindow.vcxproj b/modules/rostests/apitests/atl/devenv/SubclassWindow.vcxproj new file mode 100644 index 00000000000..5b1569b871c --- /dev/null +++ b/modules/rostests/apitests/atl/devenv/SubclassWindow.vcxproj @@ -0,0 +1,189 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}</ProjectGuid> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <Keyword>AtlProj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="../SubclassWindow.cpp"> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MultiThreaded</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MultiThreaded</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MultiThreadedDebug</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MultiThreadedDebug</RuntimeLibrary> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\resource.h" /> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="..\atl_apitest.rc" /> + </ItemGroup> + <ItemGroup> + <None Include="..\cstring.inl" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file diff --git a/modules/rostests/apitests/atl/testlist.c b/modules/rostests/apitests/atl/testlist.c index 028063f826e..213ce2419c4 100644 --- a/modules/rostests/apitests/atl/testlist.c +++ b/modules/rostests/apitests/atl/testlist.c @@ -16,6 +16,7 @@ extern void func_CRegKey(void); extern void func_CSimpleArray(void); extern void func_CSimpleMap(void); extern void func_CString(void); +extern void func_SubclassWindow(void); const struct test winetest_testlist[] = { @@ -34,5 +35,6 @@ const struct test winetest_testlist[] = { "CSimpleArray", func_CSimpleArray }, { "CSimpleMap", func_CSimpleMap }, { "CString", func_CString }, + { "SubclassWindow", func_SubclassWindow }, { 0, 0 } }; diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index 70f0413b41a..d8994988d40 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -1482,28 +1482,49 @@ public: BOOL SubclassWindow(HWND hWnd) { - CWindowImplBaseT<TBase, TWinTraits> *pThis; - WNDPROC newWindowProc; - WNDPROC oldWindowProc; - BOOL result; - ATLASSERT(m_hWnd == NULL); ATLASSERT(::IsWindow(hWnd)); + CWindowImplBaseT<TBase, TWinTraits> *pThis; pThis = reinterpret_cast<CWindowImplBaseT<TBase, TWinTraits>*>(this); - result = m_thunk.Init(GetWindowProc(), this); + BOOL result = m_thunk.Init(GetWindowProc(), this); if (result == FALSE) return FALSE; - newWindowProc = m_thunk.GetWNDPROC(); - oldWindowProc = reinterpret_cast<WNDPROC>(::SetWindowLongPtr(hWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(newWindowProc))); + + WNDPROC newWindowProc = m_thunk.GetWNDPROC(); + WNDPROC oldWindowProc = reinterpret_cast<WNDPROC>( + ::SetWindowLongPtr(hWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(newWindowProc))); if (oldWindowProc == NULL) return FALSE; - m_pfnSuperWindowProc = oldWindowProc; + + pThis->m_pfnSuperWindowProc = oldWindowProc; pThis->m_hWnd = hWnd; return TRUE; } + HWND UnsubclassWindow(BOOL bForce = FALSE) + { + ATLASSERT(m_hWnd != NULL); + ATLASSERT(::IsWindow(m_hWnd)); + + CWindowImplBaseT<TBase, TWinTraits>* pThis; + pThis = reinterpret_cast<CWindowImplBaseT<TBase, TWinTraits>*>(this); + + HWND hwndOld = pThis->m_hWnd; + WNDPROC oldWindowProc = m_thunk.GetWNDPROC(); + WNDPROC subclassedProc = reinterpret_cast<WNDPROC>( + ::GetWindowLongPtr(hwndOld, GWLP_WNDPROC)); + if (!bForce && oldWindowProc != subclassedProc) + return NULL; + + ::SetWindowLongPtr(hwndOld, GWLP_WNDPROC, + (LONG_PTR)pThis->m_pfnSuperWindowProc); + pThis->m_pfnSuperWindowProc = ::DefWindowProc; + pThis->m_hWnd = NULL; + return hwndOld; + } + virtual WNDPROC GetWindowProc() { return WindowProc; @@ -1609,7 +1630,7 @@ public: MenuOrID.m_hMenu = (HMENU)(UINT_PTR)this; if (rect.m_lpRect == NULL) rect.m_lpRect = &TBase::rcDefault; - hWnd = ::CreateWindowEx(dwExStyle, reinterpret_cast<LPCWSTR>(MAKEINTATOM(atom)), szWindowName, dwStyle, rect.m_lpRect->left, + hWnd = ::CreateWindowEx(dwExStyle, MAKEINTATOM(atom), szWindowName, dwStyle, rect.m_lpRect->left, rect.m_lpRect->top, rect.m_lpRect->right - rect.m_lpRect->left, rect.m_lpRect->bottom - rect.m_lpRect->top, hWndParent, MenuOrID.m_hMenu, _AtlBaseModule.GetModuleInstance(), lpCreateParam); @@ -1681,7 +1702,7 @@ public: m_pCurrentMsg = NULL; } - CContainedWindowT(LPTSTR lpszClassName, CMessageMap *pObject, DWORD dwMsgMapID = 0) + CContainedWindowT(LPCTSTR lpszClassName, CMessageMap *pObject, DWORD dwMsgMapID = 0) { m_lpszClassName = lpszClassName; m_pfnSuperWindowProc = ::DefWindowProc; @@ -1697,28 +1718,48 @@ public: BOOL SubclassWindow(HWND hWnd) { - CContainedWindowT<TBase> *pThis; - WNDPROC newWindowProc; - WNDPROC oldWindowProc; - BOOL result; - ATLASSERT(m_hWnd == NULL); ATLASSERT(::IsWindow(hWnd)); + CContainedWindowT<TBase> *pThis; pThis = reinterpret_cast<CContainedWindowT<TBase> *>(this); - result = m_thunk.Init(WindowProc, pThis); + BOOL result = m_thunk.Init(WindowProc, pThis); if (result == FALSE) return FALSE; - newWindowProc = m_thunk.GetWNDPROC(); - oldWindowProc = reinterpret_cast<WNDPROC>(::SetWindowLongPtr(hWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(newWindowProc))); + + WNDPROC newWindowProc = m_thunk.GetWNDPROC(); + WNDPROC oldWindowProc = reinterpret_cast<WNDPROC>( + ::SetWindowLongPtr(hWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(newWindowProc))); if (oldWindowProc == NULL) return FALSE; - m_pfnSuperWindowProc = oldWindowProc; + + pThis->m_pfnSuperWindowProc = oldWindowProc; pThis->m_hWnd = hWnd; return TRUE; } + HWND UnsubclassWindow(BOOL bForce = FALSE) + { + ATLASSERT(m_hWnd != NULL); + ATLASSERT(::IsWindow(m_hWnd)); + + CContainedWindowT<TBase>* pThis; + pThis = reinterpret_cast<CContainedWindowT<TBase>*>(this); + HWND hwndOld = pThis->m_hWnd; + + WNDPROC subclassedProc = reinterpret_cast<WNDPROC>( + ::GetWindowLongPtr(hwndOld, GWLP_WNDPROC)); + if (!bForce && m_thunk.GetWNDPROC() != subclassedProc) + return NULL; + + ::SetWindowLongPtr(hwndOld, GWLP_WNDPROC, + (LONG_PTR)pThis->m_pfnSuperWindowProc); + pThis->m_pfnSuperWindowProc = ::DefWindowProc; + pThis->m_hWnd = NULL; + return hwndOld; + } + static LRESULT CALLBACK StartWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { CContainedWindowT<TBase> *pThis; @@ -1897,13 +1938,13 @@ static ATL::CWndClassInfo& GetWndClassInfo() struct _ATL_WNDCLASSINFOW { - WNDCLASSEXW m_wc; - LPCWSTR m_lpszOrigName; + WNDCLASSEX m_wc; + LPCTSTR m_lpszOrigName; WNDPROC pWndProc; - LPCWSTR m_lpszCursorID; + LPCTSTR m_lpszCursorID; BOOL m_bSystemCursor; ATOM m_atom; - WCHAR m_szAutoName[sizeof("ATL:") + sizeof(void *) * 2]; // == 4 characters + NULL + number of hexadecimal digits describing a pointer. + TCHAR m_szAutoName[sizeof("ATL:") + sizeof(void *) * 2]; // == 4 characters + NULL + number of hexadecimal digits describing a pointer. ATOM Register(WNDPROC *p) {

1 0

[reactos] 01/01: [LSASRV] Fix a typo in the trusted user identification
by Eric Kohl 28 Feb '21

28 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76247390e53c0957753d5… commit 76247390e53c0957753d56c919767c4969ff0777 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 28 01:57:43 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 28 01:57:43 2021 +0100 [LSASRV] Fix a typo in the trusted user identification --- dll/win32/lsasrv/authport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/lsasrv/authport.c b/dll/win32/lsasrv/authport.c index 192c43bda5a..aec05f287e2 100644 --- a/dll/win32/lsasrv/authport.c +++ b/dll/win32/lsasrv/authport.c @@ -138,7 +138,7 @@ LsapCheckLogonProcess(PLSA_API_MSG RequestMsg, Context->Untrusted = RequestMsg->ConnectInfo.Untrusted; if (Context->Untrusted == FALSE) - Context->Untrusted = LsapIsTrustedClient(ProcessHandle); + Context->Untrusted = !LsapIsTrustedClient(ProcessHandle); *LogonContext = Context;

1 0

[reactos] 01/01: [WKSSVC] Get version info and authentication package on startup
by Eric Kohl 27 Feb '21

27 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95188553ba5e6212f7e91… commit 95188553ba5e6212f7e9110fac75f3c35b549cbc Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 27 19:07:47 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 27 19:07:47 2021 +0100 [WKSSVC] Get version info and authentication package on startup --- base/services/wkssvc/CMakeLists.txt | 2 +- base/services/wkssvc/precomp.h | 4 ++ base/services/wkssvc/rpcserver.c | 8 +-- base/services/wkssvc/wkssvc.c | 121 +++++++++++++++++++++++++++--------- 4 files changed, 99 insertions(+), 36 deletions(-) diff --git a/base/services/wkssvc/CMakeLists.txt b/base/services/wkssvc/CMakeLists.txt index c7bb4c8b41a..8ce12e206bb 100644 --- a/base/services/wkssvc/CMakeLists.txt +++ b/base/services/wkssvc/CMakeLists.txt @@ -13,5 +13,5 @@ add_library(wkssvc MODULE set_module_type(wkssvc win32dll UNICODE) target_link_libraries(wkssvc wine) -add_importlibs(wkssvc advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_importlibs(wkssvc secur32 advapi32 rpcrt4 msvcrt kernel32 ntdll) add_cd_file(TARGET wkssvc DESTINATION reactos/system32 FOR all) diff --git a/base/services/wkssvc/precomp.h b/base/services/wkssvc/precomp.h index be3c7982465..ac6d6e8d0c7 100644 --- a/base/services/wkssvc/precomp.h +++ b/base/services/wkssvc/precomp.h @@ -22,6 +22,10 @@ #include <wine/debug.h> +extern OSVERSIONINFOW VersionInfo; +extern HANDLE LsaHandle; +extern ULONG LsaAuthenticationPackage; + /* domain.c */ NET_API_STATUS diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c index f80461c0608..d95cab57e94 100644 --- a/base/services/wkssvc/rpcserver.c +++ b/base/services/wkssvc/rpcserver.c @@ -89,7 +89,6 @@ NetrWkstaGetInfo( DWORD dwComputerNameLength; LPCWSTR pszLanRoot = L""; PWKSTA_INFO pWkstaInfo = NULL; - OSVERSIONINFOW VersionInfo; LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle; PPOLICY_PRIMARY_DOMAIN_INFO DomainInfo = NULL; @@ -102,9 +101,6 @@ NetrWkstaGetInfo( GetComputerNameW(szComputerName, &dwComputerNameLength); dwComputerNameLength++; /* include NULL terminator */ - VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo); - GetVersionExW(&VersionInfo); - ZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes)); NtStatus = LsaOpenPolicy(NULL, &ObjectAttributes, @@ -249,6 +245,10 @@ NetrWkstaUserEnum( unsigned long *TotalEntries, unsigned long *ResumeHandle) { + ERR("NetrWkstaUserEnum(%p %p 0x%lx %p %p)\n", + ServerName, UserInfo, PreferredMaximumLength, TotalEntries, ResumeHandle); + + UNIMPLEMENTED; return 0; } diff --git a/base/services/wkssvc/wkssvc.c b/base/services/wkssvc/wkssvc.c index 9feb7bb50e2..d1e5b87840a 100644 --- a/base/services/wkssvc/wkssvc.c +++ b/base/services/wkssvc/wkssvc.c @@ -37,6 +37,10 @@ static WCHAR ServiceName[] = L"lanmanworkstation"; static SERVICE_STATUS_HANDLE ServiceStatusHandle; static SERVICE_STATUS ServiceStatus; +OSVERSIONINFOW VersionInfo; +HANDLE LsaHandle = NULL; +ULONG LsaAuthenticationPackage = 0; + /* FUNCTIONS *****************************************************************/ static VOID @@ -64,6 +68,90 @@ UpdateServiceStatus(DWORD dwState) &ServiceStatus); } + +static +DWORD +ServiceInit(VOID) +{ + LSA_STRING ProcessName, PackageName; + LSA_OPERATIONAL_MODE Mode; + HANDLE hThread; + NTSTATUS Status; + + ERR("ServiceInit()\n"); + + /* Get the OS version */ + VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo); + GetVersionExW(&VersionInfo); + + ProcessName.Buffer = "Workstation"; + ProcessName.Length = strlen(ProcessName.Buffer); + ProcessName.MaximumLength = ProcessName.Length + 1; + + Status = LsaRegisterLogonProcess(&ProcessName, + &LsaHandle, + &Mode); + if (!NT_SUCCESS(Status)) + { + ERR("LsaRegisterLogonProcess() failed! (Status 0x%08lx)\n", Status); + return 1; + } + + PackageName.Buffer = MSV1_0_PACKAGE_NAME; + PackageName.Length = strlen(PackageName.Buffer); + PackageName.MaximumLength = PackageName.Length + 1; + + Status = LsaLookupAuthenticationPackage(LsaHandle, + &PackageName, + &LsaAuthenticationPackage); + if (!NT_SUCCESS(Status)) + { + ERR("LsaLookupAuthenticationPackage() failed! (Status 0x%08lx)\n", Status); + return 1; + } + + hThread = CreateThread(NULL, + 0, + (LPTHREAD_START_ROUTINE)RpcThreadRoutine, + NULL, + 0, + NULL); + + if (!hThread) + { + ERR("Can't create PortThread\n"); + return GetLastError(); + } + else + CloseHandle(hThread); + + /* Report a running workstation service */ + SetServiceBits(ServiceStatusHandle, + SV_TYPE_WORKSTATION, + TRUE, + TRUE); + + return ERROR_SUCCESS; +} + + +static +VOID +ServiceShutdown(VOID) +{ + NTSTATUS Status; + + ERR("ServiceShutdown()\n"); + + Status = LsaDeregisterLogonProcess(LsaHandle); + if (!NT_SUCCESS(Status)) + { + ERR("LsaDeRegisterLogonProcess() failed! (Status 0x%08lx)\n", Status); + return; + } +} + + static DWORD WINAPI ServiceControlHandler(DWORD dwControl, DWORD dwEventType, @@ -79,6 +167,7 @@ ServiceControlHandler(DWORD dwControl, UpdateServiceStatus(SERVICE_STOP_PENDING); /* Stop listening to incoming RPC messages */ RpcMgmtStopServerListening(NULL); + ServiceShutdown(); UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS; @@ -103,6 +192,7 @@ ServiceControlHandler(DWORD dwControl, UpdateServiceStatus(SERVICE_STOP_PENDING); /* Stop listening to incoming RPC messages */ RpcMgmtStopServerListening(NULL); + ServiceShutdown(); UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS; @@ -113,37 +203,6 @@ ServiceControlHandler(DWORD dwControl, } -static -DWORD -ServiceInit(VOID) -{ - HANDLE hThread; - - hThread = CreateThread(NULL, - 0, - (LPTHREAD_START_ROUTINE)RpcThreadRoutine, - NULL, - 0, - NULL); - - if (!hThread) - { - ERR("Can't create PortThread\n"); - return GetLastError(); - } - else - CloseHandle(hThread); - - /* Report a running workstation service */ - SetServiceBits(ServiceStatusHandle, - SV_TYPE_WORKSTATION, - TRUE, - TRUE); - - return ERROR_SUCCESS; -} - - VOID WINAPI ServiceMain(DWORD argc, LPTSTR *argv) {

1 0

[reactos] 01/01: [SDK][INCLUDE] layout.h: Delete an assertion for window style
by Katayama Hirofumi MZ 27 Feb '21

27 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b2e79d0672d4228366cf… commit 6b2e79d0672d4228366cf43c04a17916d2990cca Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 27 22:59:00 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Feb 27 22:59:00 2021 +0900 [SDK][INCLUDE] layout.h: Delete an assertion for window style WS_SIZEBOX or WS_THICKFRAME. CORE-9281 --- sdk/include/reactos/layout.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sdk/include/reactos/layout.h b/sdk/include/reactos/layout.h index 7cddf11cd11..3403ba06b3e 100644 --- a/sdk/include/reactos/layout.h +++ b/sdk/include/reactos/layout.h @@ -237,9 +237,7 @@ LayoutInit(HWND hwndParent, const LAYOUT_INFO *pLayouts, INT cLayouts) } memcpy(pData->m_pLayouts, pLayouts, cb); - /* NOTE: The parent window must have initially WS_SIZEBOX style. */ assert(IsWindow(hwndParent)); - assert(GetWindowLongPtrW(hwndParent, GWL_STYLE) & WS_SIZEBOX); pData->m_hwndParent = hwndParent;

1 0

[reactos] 03/03: [NTOS:KD] Use Zw* syscall variants
by Jérôme Gardou 26 Feb '21

26 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7caf9e9d48ca37d30f9d9… commit 7caf9e9d48ca37d30f9d9d89475b0275b4ebb638 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Feb 26 08:44:51 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Feb 26 08:46:53 2021 +0100 [NTOS:KD] Use Zw* syscall variants The log file can be (re-)initialized when previous mode is User-Mode, thus the calls fail on probing input parameters --- ntoskrnl/kd/kdio.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 288977bebbc..4ada3609a89 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -253,7 +253,7 @@ KdpDebugLogInit(PKD_DISPATCH_TABLE DispatchTable, NULL); /* Create the log file */ - Status = NtCreateFile(&KdpLogFileHandle, + Status = ZwCreateFile(&KdpLogFileHandle, FILE_APPEND_DATA | SYNCHRONIZE, &ObjectAttributes, &Iosb, @@ -268,7 +268,10 @@ KdpDebugLogInit(PKD_DISPATCH_TABLE DispatchTable, RtlFreeUnicodeString(&FileName); if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open log file: 0x%08x\n", Status); return; + } KeInitializeEvent(&KdpLoggerThreadEvent, SynchronizationEvent, TRUE); @@ -282,12 +285,12 @@ KdpDebugLogInit(PKD_DISPATCH_TABLE DispatchTable, NULL); if (!NT_SUCCESS(Status)) { - NtClose(KdpLogFileHandle); + ZwClose(KdpLogFileHandle); return; } Priority = 7; - NtSetInformationThread(ThreadHandle, + ZwSetInformationThread(ThreadHandle, ThreadPriority, &Priority, sizeof(Priority));

1 0

[reactos] 02/03: [NTOS:MM] Do not chunk-read file when we are the modified-page-writer thread
by Jérôme Gardou 26 Feb '21

26 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a93e065ebce692289cec4… commit a93e065ebce692289cec49af0e686122be479fbf Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Feb 23 11:07:35 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Feb 26 08:46:53 2021 +0100 [NTOS:MM] Do not chunk-read file when we are the modified-page-writer thread --- ntoskrnl/mm/section.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index ea56635b72f..b3e300a58cc 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1200,8 +1200,10 @@ MmMakeSegmentResident( if (!NT_SUCCESS(Status)) return Status; - /* If the file is not random access, read a 64K Chunk. */ - if (!FlagOn(FileObject->Flags, FO_RANDOM_ACCESS)) + /* If the file is not random access and we are not the page out thread + * read a 64K Chunk. */ + if (((ULONG_PTR)IoGetTopLevelIrp() != FSRTL_MOD_WRITE_TOP_LEVEL_IRP) + && !FlagOn(FileObject->Flags, FO_RANDOM_ACCESS)) { RangeStart = Offset - (Offset % _64K); if (RangeEnd % _64K)

1 0

[reactos] 01/03: [NTOS:MM] Do not chunk-read files marked with FO_RANDOM_ACCESS
by Jérôme Gardou 26 Feb '21

26 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35c091adaf7ee70a57743… commit 35c091adaf7ee70a57743f29ab288e3ca0881366 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Feb 16 11:27:19 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Feb 26 08:46:53 2021 +0100 [NTOS:MM] Do not chunk-read files marked with FO_RANDOM_ACCESS --- ntoskrnl/mm/section.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 3f364b49f4d..ea56635b72f 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1200,9 +1200,19 @@ MmMakeSegmentResident( if (!NT_SUCCESS(Status)) return Status; - RangeStart = Offset - (Offset % _64K); - if (RangeEnd % _64K) - RangeEnd += _64K - (RangeEnd % _64K); + /* If the file is not random access, read a 64K Chunk. */ + if (!FlagOn(FileObject->Flags, FO_RANDOM_ACCESS)) + { + RangeStart = Offset - (Offset % _64K); + if (RangeEnd % _64K) + RangeEnd += _64K - (RangeEnd % _64K); + } + else + { + RangeStart = Offset - (Offset % PAGE_SIZE); + if (RangeEnd % PAGE_SIZE) + RangeEnd += PAGE_SIZE - (RangeEnd % PAGE_SIZE); + } /* Clamp if needed */ if (!FlagOn(*Segment->Flags, MM_DATAFILE_SEGMENT))

1 0

[reactos] 01/01: [BROWSEUI] Fix and small improvement (#3486)
by Katayama Hirofumi MZ 25 Feb '21

25 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f04890c2afdd8089e895d… commit f04890c2afdd8089e895dbc4f6aed6768b4d9b3a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 25 20:36:20 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 25 20:36:20 2021 +0900 [BROWSEUI] Fix and small improvement (#3486) Fix a mistake in CAutoComplete PR #3472 (6bfb76b) and improve. - Fix confusion between m_hwndEdit and hwndEdit. - Delete extra this-> codes. CORE-9281 --- dll/win32/browseui/CAutoComplete.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index fed833e0fba..ffd14267d3e 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -134,14 +134,14 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p if (m_options & ACO_RTLREADING) FIXME(" ACO_RTLREADING not supported\n"); - if (!m_hwndEdit || !punkACL) + if (!hwndEdit || !punkACL) return E_INVALIDARG; - if (this->m_initialized) + if (m_initialized) { WARN("Autocompletion object is already initialized\n"); /* This->hwndEdit is set to NULL when the edit window is destroyed. */ - return this->m_hwndEdit ? E_FAIL : E_UNEXPECTED; + return m_hwndEdit ? E_FAIL : E_UNEXPECTED; } if (!SUCCEEDED(punkACL->QueryInterface(IID_PPV_ARG(IEnumString, &m_enumstr)))) @@ -150,11 +150,11 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p return E_NOINTERFACE; } - this->m_hwndEdit = hwndEdit; - this->m_initialized = TRUE; + m_hwndEdit = hwndEdit; + m_initialized = TRUE; /* Keep at least one reference to the object until the edit window is destroyed. */ - this->AddRef(); + AddRef(); /* If another AutoComplete object was previously assigned to this edit control, release it but keep the same callback on the control, to avoid an infinite @@ -163,20 +163,20 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p if (prev && prev->m_initialized) { - this->m_wpOrigEditProc = prev->m_wpOrigEditProc; + m_wpOrigEditProc = prev->m_wpOrigEditProc; SetPropW(m_hwndEdit, autocomplete_propertyW, this); prev->m_wpOrigEditProc = NULL; prev->Release(); } else { - SetPropW(this->m_hwndEdit, autocomplete_propertyW, (HANDLE)this); - this->m_wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(m_hwndEdit, GWLP_WNDPROC, (LONG_PTR)ACEditSubclassProc); + SetPropW(m_hwndEdit, autocomplete_propertyW, (HANDLE)this); + m_wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(m_hwndEdit, GWLP_WNDPROC, (LONG_PTR)ACEditSubclassProc); } if (m_options & ACO_AUTOSUGGEST) { - this->CreateListbox(); + CreateListbox(); } if (pwzsRegKeyPath)

1 0

[reactos] 01/01: [SDK][INCLUDE] Erase files of incorrect commit
by Katayama Hirofumi MZ 25 Feb '21

25 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c14c9ca0d888562ec3004… commit c14c9ca0d888562ec300477e96cfaff81a03af97 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 25 09:21:13 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Feb 25 09:21:13 2021 +0900 [SDK][INCLUDE] Erase files of incorrect commit Delete files at mistaken commit: https://github.com/reactos/reactos/commit/0efd7b97643c0a6a60d322e902de29e6d… rm sdk/include/host/cmake_install.cmake rm sdk/include/reactos/buildno.h rm sdk/include/reactos/version.h --- sdk/include/host/cmake_install.cmake | 34 ---------------------------------- sdk/include/reactos/buildno.h | 25 ------------------------- sdk/include/reactos/version.h | 27 --------------------------- 3 files changed, 86 deletions(-) diff --git a/sdk/include/host/cmake_install.cmake b/sdk/include/host/cmake_install.cmake deleted file mode 100644 index c63853082e7..00000000000 --- a/sdk/include/host/cmake_install.cmake +++ /dev/null @@ -1,34 +0,0 @@ -# Install script for directory: C:/Users/katahiromz/reactos-1/sdk/include/host - -# Set the install prefix -if(NOT DEFINED CMAKE_INSTALL_PREFIX) - set(CMAKE_INSTALL_PREFIX "C:/Program Files (x86)/REACTOS") -endif() -string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - if(BUILD_TYPE) - string(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - else() - set(CMAKE_INSTALL_CONFIG_NAME "") - endif() - message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -endif() - -# Set the component getting installed. -if(NOT CMAKE_INSTALL_COMPONENT) - if(COMPONENT) - message(STATUS "Install component: \"${COMPONENT}\"") - set(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - else() - set(CMAKE_INSTALL_COMPONENT) - endif() -endif() - -# Is this installation the result of a crosscompile? -if(NOT DEFINED CMAKE_CROSSCOMPILING) - set(CMAKE_CROSSCOMPILING "FALSE") -endif() - diff --git a/sdk/include/reactos/buildno.h b/sdk/include/reactos/buildno.h deleted file mode 100644 index d8f923d88be..00000000000 --- a/sdk/include/reactos/buildno.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Do not edit - Machine generated */ -#ifndef _INC_REACTOS_BUILDNO -#define _INC_REACTOS_BUILDNO - -#define KERNEL_VERSION_BUILD 20210222 -#define KERNEL_VERSION_BUILD_STR "20210222-0.4.15-dev-2073-ga6e3e8a" -#define KERNEL_VERSION_BUILD_RC "20210222-0.4.15-dev-2073-ga6e3e8a\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-2073-ga6e3e8a\0" -#define KERNEL_VERSION_REVISION_STR "0.4.15-dev-2073-ga6e3e8a" - -#define KERNEL_VERSION_COMMIT_HASH "a6e3e8adf0ff581390dafc0bcf8f615c93d8c8b1" - -#define REACTOS_DLL_VERSION_MAJOR 42 -#define REACTOS_DLL_VERSION_RC "42.4.15-dev\0" -#define REACTOS_DLL_VERSION_STR "42.4.15-dev" - -#define REACTOS_COMPILER_NAME "GNU" -#define REACTOS_COMPILER_VERSION "8.4.0" - -#endif -/* EOF */ diff --git a/sdk/include/reactos/version.h b/sdk/include/reactos/version.h deleted file mode 100644 index 8d8015a86e0..00000000000 --- a/sdk/include/reactos/version.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: include/reactos/version.h.cmake - * PURPOSE: Defines the current version - * PROGRAMMER: David Welch (welch(a)mcmail.com) - * REVISIONS: - * 1999-11-06 (ea) - * Moved from include/internal in include/reactos - * to be used by buildno. - * 2002-01-17 (ea) - * KERNEL_VERSION removed. Use - * reactos/buildno.h:KERNEL_VERSION_STR instead. - */ - -#ifndef __VERSION_H -#define __VERSION_H - -#define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 15 - -#define COPYRIGHT_YEAR "2021" - -#endif - -/* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs