Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [UMPNPMGR] Implement PNP_DetectResourceConflict().
by Eric Kohl 01 Nov '18

01 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce15c8430970d9b0fcee9… commit ce15c8430970d9b0fcee9cc664d2944c33da803e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Nov 1 14:50:08 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Nov 1 14:50:08 2018 +0100 [UMPNPMGR] Implement PNP_DetectResourceConflict(). --- base/services/umpnpmgr/umpnpmgr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index 0a00d40325..486b1ad82d 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -2746,7 +2746,11 @@ PNP_DetectResourceConflict( BOOL *pbConflictDetected, DWORD ulFlags) { - UNIMPLEMENTED; + DPRINT("PNP_DetectResourceConflict()\n"); + + if (pbConflictDetected != NULL) + *pbConflictDetected = FALSE; + return CR_CALL_NOT_IMPLEMENTED; }

1 0

01/01: [RICHED20] Revert ocr_reverse.cur to fix CORE-15190
by Joachim Henze 30 Oct '18

30 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad34c91d1c003a9e78b7b… commit ad34c91d1c003a9e78b7b9795c3b5a08a633a5e9 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Oct 30 19:06:50 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Oct 30 19:06:50 2018 +0100 [RICHED20] Revert ocr_reverse.cur to fix CORE-15190 Old cursor looks better. We revert to SVN state r75865 and note the diff for Amine so that the wrong version won't come back in the future. Old file is just 326bytes while the one that we do not want is 33.134bytes which means we will save some RAM as well. --- dll/win32/riched20/ocr_reverse.cur | Bin 33134 -> 326 bytes dll/win32/riched20/riched20_ros.diff | 2 ++ 2 files changed, 2 insertions(+) diff --git a/dll/win32/riched20/ocr_reverse.cur b/dll/win32/riched20/ocr_reverse.cur index 6392093f62..179774c60e 100644 Binary files a/dll/win32/riched20/ocr_reverse.cur and b/dll/win32/riched20/ocr_reverse.cur differ diff --git a/dll/win32/riched20/riched20_ros.diff b/dll/win32/riched20/riched20_ros.diff new file mode 100644 index 0000000000..c47d0a11d9 --- /dev/null +++ b/dll/win32/riched20/riched20_ros.diff @@ -0,0 +1,2 @@ +diff -pudN e:\wine\dlls\riched20/ocr_reverse.cur e:\reactos\dll\win32\ole32/ocr_reverse.cur +#cur file kept at older state of ros SVN r75865 to avoid CORE-15190

1 0

01/01: [CMAKE] Do not add any extension to separate debug symbol files (#1000)
by Jérôme Gardou 30 Oct '18

30 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c61063d25a3712edc585… commit 5c61063d25a3712edc585efdd93ebdae5f616e69 Author: Jérôme Gardou <zefklop(a)users.noreply.github.com> AuthorDate: Tue Oct 30 17:23:42 2018 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 30 17:23:42 2018 +0100 [CMAKE] Do not add any extension to separate debug symbol files (#1000) There is no possibility for GDB to recognize them otherwise --- sdk/cmake/gcc.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index ae4056b21b..da203e5aa1 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -190,9 +190,10 @@ if(SEPARATE_DBG) message(STATUS "Building separate debug symbols") file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/symbols) if(CMAKE_GENERATOR STREQUAL "Ninja") + set(CMAKE_DEBUG_SYMBOL_SUFFIX "") set(SYMBOL_FILE <TARGET_PDB>) else() - set(SYMBOL_FILE <TARGET>.gdb) + set(SYMBOL_FILE <TARGET>) endif() set(OBJCOPY ${CMAKE_OBJCOPY}) set(CMAKE_C_LINK_EXECUTABLE

1 0

01/01: [WIN32SS] Fix SwitchToThisWindow for #998 (#999)
by Katayama Hirofumi MZ 30 Oct '18

30 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e39863bdf672cb3c3e6d8… commit e39863bdf672cb3c3e6d83264e1212c4d281ea8b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 30 17:24:47 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 30 17:24:47 2018 +0900 [WIN32SS] Fix SwitchToThisWindow for #998 (#999) Reduce a failure in SwitchToThisWindow testcase of #998. CORE-15165 --- win32ss/user/ntuser/simplecall.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index 0c9b184f0d..9356415c46 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -522,7 +522,9 @@ NtUserCallTwoParam( UserPostMessage(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); } /* bring window to top and activate */ - co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOMOVE | SWP_NOSENDCHANGING | + SWP_NOOWNERZORDER | SWP_ASYNCWINDOWPOS); } else {

1 0

01/01: [APITESTS] Add InSendMessage check in SwitchToThisWindow testcase (#998)
by Katayama Hirofumi MZ 30 Oct '18

30 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=665269be9cac5d0045fa6… commit 665269be9cac5d0045fa6440e1a390152347b9ff Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 30 17:14:37 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 30 17:14:37 2018 +0900 [APITESTS] Add InSendMessage check in SwitchToThisWindow testcase (#998) CORE-15165 --- .../rostests/apitests/user32/SwitchToThisWindow.c | 54 ++++++++++++++++++---- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/modules/rostests/apitests/user32/SwitchToThisWindow.c b/modules/rostests/apitests/user32/SwitchToThisWindow.c index e89bf11c47..815dc72b8d 100644 --- a/modules/rostests/apitests/user32/SwitchToThisWindow.c +++ b/modules/rostests/apitests/user32/SwitchToThisWindow.c @@ -19,30 +19,68 @@ static INT s_nWM_ACTIVATE = 0; #define TIMER_INTERVAL 200 +static const char * +DumpInSMEX(void) +{ + static char s_buf[128]; + DWORD dwRet = InSendMessageEx(NULL); + if (dwRet == ISMEX_NOSEND) + { + strcpy(s_buf, "ISMEX_NOSEND,"); + return s_buf; + } + s_buf[0] = 0; + if (dwRet & ISMEX_CALLBACK) + strcat(s_buf, "ISMEX_CALLBACK,"); + if (dwRet & ISMEX_NOTIFY) + strcat(s_buf, "ISMEX_NOTIFY,"); + if (dwRet & ISMEX_REPLIED) + strcat(s_buf, "ISMEX_REPLIED,"); + if (dwRet & ISMEX_SEND) + strcat(s_buf, "ISMEX_SEND,"); + return s_buf; +} + static void DoMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { if (uMsg == WM_TIMER || !s_bTracing) return; - trace("uMsg:0x%04X, wParam:0x%08lX, lParam:0x%08lX\n", uMsg, (LONG)wParam, (LONG)lParam); + trace("%s: uMsg:0x%04X, wParam:0x%08lX, lParam:0x%08lX, ISMEX_:%s\n", + (InSendMessage() ? "S" : "P"), uMsg, (LONG)wParam, (LONG)lParam, + DumpInSMEX()); - if (uMsg == WM_SYSCOMMAND) + if (uMsg == WM_SYSCOMMAND) // 0x0112 { + ok(InSendMessageEx(NULL) == ISMEX_NOSEND, + "InSendMessageEx(NULL) was 0x%08lX\n", InSendMessageEx(NULL)); if (wParam == SC_RESTORE) ++s_nWM_SYSCOMMAND_SC_RESTORE; else ++s_nWM_SYSCOMMAND_NOT_SC_RESTORE; } - if (uMsg == WM_NCACTIVATE) + if (uMsg == WM_NCACTIVATE) // 0x0086 + { + ok(InSendMessageEx(NULL) == ISMEX_NOSEND, + "InSendMessageEx(NULL) was 0x%08lX\n", InSendMessageEx(NULL)); ++s_nWM_NCACTIVATE; + } - if (uMsg == WM_WINDOWPOSCHANGING) + if (uMsg == WM_WINDOWPOSCHANGING) // 0x0046 + { + ok(InSendMessageEx(NULL) == ISMEX_NOSEND, + "InSendMessageEx(NULL) was 0x%08lX\n", InSendMessageEx(NULL)); ++s_nWM_WINDOWPOSCHANGING; + } - if (uMsg == WM_ACTIVATE) + if (uMsg == WM_ACTIVATE) // 0x0006 + { + ok(InSendMessageEx(NULL) == ISMEX_NOSEND, + "InSendMessageEx(NULL) was 0x%08lX\n", InSendMessageEx(NULL)); ++s_nWM_ACTIVATE; + } } // WM_TIMER @@ -84,9 +122,9 @@ OnTimer(HWND hwnd, UINT id) ok(GetFocus() == hwnd, "GetFocus() != hwnd\n"); ok(s_nWM_SYSCOMMAND_SC_RESTORE == 1, "WM_SYSCOMMAND SC_RESTORE: %d\n", s_nWM_SYSCOMMAND_SC_RESTORE); ok(!s_nWM_SYSCOMMAND_NOT_SC_RESTORE, "WM_SYSCOMMAND non-SC_RESTORE: %d\n", s_nWM_SYSCOMMAND_NOT_SC_RESTORE); - ok(s_nWM_NCACTIVATE > 0, "WM_NCACTIVATE: not found\n"); - ok(s_nWM_WINDOWPOSCHANGING > 0, "WM_WINDOWPOSCHANGING: not found\n"); - ok(s_nWM_ACTIVATE > 0, "WM_ACTIVATE: not found\n"); + ok(s_nWM_NCACTIVATE == 1, "WM_NCACTIVATE: %d\n", s_nWM_NCACTIVATE); + ok(s_nWM_WINDOWPOSCHANGING == 2, "WM_WINDOWPOSCHANGING: %d\n", s_nWM_WINDOWPOSCHANGING); + ok(s_nWM_ACTIVATE == 1, "WM_ACTIVATE: %d\n", s_nWM_ACTIVATE); break; // // SwitchToThisWindow(FALSE)

1 0

01/01: [APITESTS] Improve CloseWindow testcase (#997)
by Katayama Hirofumi MZ 29 Oct '18

29 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c550bad4ef7237dd7b8b4… commit c550bad4ef7237dd7b8b45b2632bba104a160a4e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 30 08:54:40 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 30 08:54:40 2018 +0900 [APITESTS] Improve CloseWindow testcase (#997) Improve the testcase for user32!CloseWindow function. --- modules/rostests/apitests/user32/CloseWindow.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/user32/CloseWindow.c b/modules/rostests/apitests/user32/CloseWindow.c index ee81056d44..c1aa51cce5 100644 --- a/modules/rostests/apitests/user32/CloseWindow.c +++ b/modules/rostests/apitests/user32/CloseWindow.c @@ -172,6 +172,8 @@ START_TEST(CloseWindow) HWND hwnd; MSG msg; + ok(!CloseWindow(NULL), "CloseWindow(NULL) should be failed\n"); + hIcon = LoadIcon(NULL, IDI_APPLICATION); ok(hIcon != NULL, "hIcon was NULL\n"); hCursor = LoadCursor(NULL, IDC_ARROW); @@ -195,7 +197,7 @@ START_TEST(CloseWindow) return; } - hwnd = CreateWindowW(s_szClassName, L"SwitchToThisWindow", WS_OVERLAPPEDWINDOW, + hwnd = CreateWindowW(s_szClassName, L"CloseWindow testcase", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, GetModuleHandleW(NULL), NULL); ok(hwnd != NULL, "CreateWindowW failed\n");

1 0

01/01: [APITESTS] Add CloseWindow testcase (#996)
by Katayama Hirofumi MZ 29 Oct '18

29 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=328a4c383473cf0ff61b8… commit 328a4c383473cf0ff61b8abf335775f5c3f94445 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 30 08:38:03 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 30 08:38:03 2018 +0900 [APITESTS] Add CloseWindow testcase (#996) Add a testcase for user32!CloseWindow function. --- modules/rostests/apitests/user32/CMakeLists.txt | 1 + modules/rostests/apitests/user32/CloseWindow.c | 225 ++++++++++++++++++++++++ modules/rostests/apitests/user32/testlist.c | 2 + 3 files changed, 228 insertions(+) diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index 0a82490574..87a257ec81 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -2,6 +2,7 @@ list(APPEND SOURCE AttachThreadInput.c ../include/msgtrace.c + CloseWindow.c CreateDialog.c CreateIconFromResourceEx.c CreateWindowEx.c diff --git a/modules/rostests/apitests/user32/CloseWindow.c b/modules/rostests/apitests/user32/CloseWindow.c new file mode 100644 index 0000000000..ee81056d44 --- /dev/null +++ b/modules/rostests/apitests/user32/CloseWindow.c @@ -0,0 +1,225 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for CloseWindow + * PROGRAMMERS: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" + +static const WCHAR s_szClassName[] = L"CloseWindowTest"; + +static BOOL s_bTracing = FALSE; + +static INT s_nWM_SYSCOMMAND = 0; +static INT s_nWM_NCACTIVATE = 0; +static INT s_nWM_WINDOWPOSCHANGING = 0; +static INT s_nWM_ACTIVATE = 0; + +#define TIMER_INTERVAL 200 + +static void +DoMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg == WM_TIMER || !s_bTracing) + return; + + trace("uMsg:0x%04X, wParam:0x%08lX, lParam:0x%08lX\n", uMsg, (LONG)wParam, (LONG)lParam); + + if (uMsg == WM_SYSCOMMAND) + { + ++s_nWM_SYSCOMMAND; + } + + if (uMsg == WM_NCACTIVATE) + ++s_nWM_NCACTIVATE; + + if (uMsg == WM_WINDOWPOSCHANGING) + ++s_nWM_WINDOWPOSCHANGING; + + if (uMsg == WM_ACTIVATE) + ++s_nWM_ACTIVATE; +} + +// WM_TIMER +static void +OnTimer(HWND hwnd, UINT id) +{ + KillTimer(hwnd, id); + switch (id) + { + // + // SetActiveWindow(GetDesktopWindow()); + // + case 0: + SetForegroundWindow(GetDesktopWindow()); + SetActiveWindow(GetDesktopWindow()); + ok(GetForegroundWindow() == NULL, "GetForegroundWindow() != NULL\n"); + ok(GetActiveWindow() == NULL, "GetActiveWindow() != NULL\n"); + ok(GetFocus() == NULL, "GetFocus() != NULL\n"); + s_nWM_SYSCOMMAND = 0; + s_nWM_NCACTIVATE = 0; + s_nWM_WINDOWPOSCHANGING = 0; + s_nWM_ACTIVATE = 0; + s_bTracing = TRUE; + trace("CloseWindow(hwnd): tracing...\n"); + ok(CloseWindow(hwnd), "CloseWindow failed\n"); + break; + case 1: + ok(GetForegroundWindow() == NULL, "GetForegroundWindow() != NULL\n"); + ok(GetActiveWindow() == hwnd, "GetActiveWindow() != hwnd\n"); + ok(GetFocus() == NULL, "GetFocus() != NULL\n"); + s_bTracing = FALSE; + trace("CloseWindow(hwnd): tracing done\n"); + ok(s_nWM_SYSCOMMAND == 0, "WM_SYSCOMMAND: %d\n", s_nWM_SYSCOMMAND); + ok(s_nWM_NCACTIVATE == 1, "WM_NCACTIVATE: %d\n", s_nWM_NCACTIVATE); + ok(s_nWM_WINDOWPOSCHANGING == 2, "WM_WINDOWPOSCHANGING: %d\n", s_nWM_WINDOWPOSCHANGING); + ok(s_nWM_ACTIVATE == 1, "WM_ACTIVATE: %d\n", s_nWM_ACTIVATE); + ShowWindow(hwnd, SW_RESTORE); + break; + // + // SetActiveWindow(hwnd); + // + case 2: + SetForegroundWindow(GetDesktopWindow()); + SetActiveWindow(hwnd); + ok(GetForegroundWindow() == NULL, "GetForegroundWindow() != NULL\n"); + ok(GetActiveWindow() == hwnd, "GetActiveWindow() != hwnd\n"); + ok(GetFocus() == hwnd, "GetFocus() != hwnd\n"); + s_nWM_SYSCOMMAND = 0; + s_nWM_NCACTIVATE = 0; + s_nWM_WINDOWPOSCHANGING = 0; + s_nWM_ACTIVATE = 0; + s_bTracing = TRUE; + trace("CloseWindow(hwnd): tracing...\n"); + ok(CloseWindow(hwnd), "CloseWindow failed\n"); + break; + case 3: + ok(GetForegroundWindow() == NULL, "GetForegroundWindow() != NULL\n"); + ok(GetActiveWindow() == hwnd, "GetActiveWindow() != hwnd\n"); + ok(GetFocus() == NULL, "GetFocus() != NULL\n"); + s_bTracing = FALSE; + trace("CloseWindow(hwnd): tracing done\n"); + ok(s_nWM_SYSCOMMAND == 0, "WM_SYSCOMMAND: %d\n", s_nWM_SYSCOMMAND); + ok(s_nWM_NCACTIVATE == 0, "WM_NCACTIVATE: %d\n", s_nWM_NCACTIVATE); + ok(s_nWM_WINDOWPOSCHANGING == 1, "WM_WINDOWPOSCHANGING: %d\n", s_nWM_WINDOWPOSCHANGING); + ok(s_nWM_ACTIVATE == 0, "WM_ACTIVATE: %d\n", s_nWM_ACTIVATE); + ShowWindow(hwnd, SW_RESTORE); + break; + // + // SetForegroundWindow(hwnd); + // + case 4: + SetActiveWindow(GetDesktopWindow()); + SetForegroundWindow(hwnd); + ok(GetForegroundWindow() == hwnd, "GetForegroundWindow() != hwnd\n"); + ok(GetActiveWindow() == hwnd, "GetActiveWindow() != hwnd\n"); + ok(GetFocus() == hwnd, "GetFocus() != hwnd\n"); + s_nWM_SYSCOMMAND = 0; + s_nWM_NCACTIVATE = 0; + s_nWM_WINDOWPOSCHANGING = 0; + s_nWM_ACTIVATE = 0; + s_bTracing = TRUE; + trace("CloseWindow(hwnd): tracing...\n"); + ok(CloseWindow(hwnd), "CloseWindow failed\n"); + break; + case 5: + ok(GetForegroundWindow() == hwnd, "GetForegroundWindow() != hwnd\n"); + ok(GetActiveWindow() == hwnd, "GetActiveWindow() != hwnd\n"); + ok(GetFocus() == NULL, "GetFocus() != NULL\n"); + s_bTracing = FALSE; + trace("CloseWindow(hwnd): tracing done\n"); + ok(s_nWM_SYSCOMMAND == 0, "WM_SYSCOMMAND: %d\n", s_nWM_SYSCOMMAND); + ok(s_nWM_NCACTIVATE == 0, "WM_NCACTIVATE: %d\n", s_nWM_NCACTIVATE); + ok(s_nWM_WINDOWPOSCHANGING == 1, "WM_WINDOWPOSCHANGING: %d\n", s_nWM_WINDOWPOSCHANGING); + ok(s_nWM_ACTIVATE == 0, "WM_ACTIVATE: %d\n", s_nWM_ACTIVATE); + ShowWindow(hwnd, SW_RESTORE); + break; + default: // finish + DestroyWindow(hwnd); + return; + } + SetTimer(hwnd, id + 1, TIMER_INTERVAL, NULL); +} + +static LRESULT CALLBACK +WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + DoMessage(hwnd, uMsg, wParam, lParam); + switch (uMsg) + { + case WM_CREATE: + SetTimer(hwnd, 0, TIMER_INTERVAL, NULL); + break; + case WM_TIMER: + OnTimer(hwnd, (UINT)wParam); + break; + case WM_DESTROY: + PostQuitMessage(0); + break; + default: + return DefWindowProc(hwnd, uMsg, wParam, lParam); + } + return 0; +} + +START_TEST(CloseWindow) +{ + WNDCLASSW wc; + HICON hIcon; + HCURSOR hCursor; + ATOM atom; + HWND hwnd; + MSG msg; + + hIcon = LoadIcon(NULL, IDI_APPLICATION); + ok(hIcon != NULL, "hIcon was NULL\n"); + hCursor = LoadCursor(NULL, IDC_ARROW); + ok(hCursor != NULL, "hCursor was NULL\n"); + + ZeroMemory(&wc, sizeof(wc)); + wc.lpfnWndProc = WindowProc; + wc.hInstance = GetModuleHandleW(NULL); + wc.hIcon = hIcon; + wc.hCursor = hCursor; + wc.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); + wc.lpszClassName = s_szClassName; + atom = RegisterClassW(&wc); + ok(atom != 0, "RegisterClassW failed\n"); + + if (!atom) + { + skip("atom is zero\n"); + DestroyIcon(hIcon); + DestroyCursor(hCursor); + return; + } + + hwnd = CreateWindowW(s_szClassName, L"SwitchToThisWindow", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, GetModuleHandleW(NULL), NULL); + ok(hwnd != NULL, "CreateWindowW failed\n"); + trace("hwnd: %p\n", hwnd); + + if (!hwnd) + { + skip("hwnd is NULL\n"); + UnregisterClassW(s_szClassName, GetModuleHandleW(NULL)); + DestroyIcon(hIcon); + DestroyCursor(hCursor); + return; + } + + ShowWindow(hwnd, SW_SHOWNORMAL); + UpdateWindow(hwnd); + + while (GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + UnregisterClassW(s_szClassName, GetModuleHandleW(NULL)); + DestroyIcon(hIcon); + DestroyCursor(hCursor); +} diff --git a/modules/rostests/apitests/user32/testlist.c b/modules/rostests/apitests/user32/testlist.c index 1155a39aa8..c72a48ff81 100644 --- a/modules/rostests/apitests/user32/testlist.c +++ b/modules/rostests/apitests/user32/testlist.c @@ -4,6 +4,7 @@ #include <apitest.h> extern void func_AttachThreadInput(void); +extern void func_CloseWindow(void); extern void func_CreateDialog(void); extern void func_CreateIconFromResourceEx(void); extern void func_CreateWindowEx(void); @@ -47,6 +48,7 @@ extern void func_wsprintf(void); const struct test winetest_testlist[] = { { "AttachThreadInput", func_AttachThreadInput }, + { "CloseWindow", func_CloseWindow }, { "CreateDialog", func_CreateDialog }, { "CreateIconFromResourceEx", func_CreateIconFromResourceEx }, { "CreateWindowEx", func_CreateWindowEx },

1 0

01/01: [WIN32SS] Make window foreground in SwitchToThisWindow (#995)
by Katayama Hirofumi MZ 29 Oct '18

29 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41b5f295142de30df8cff… commit 41b5f295142de30df8cff0e333b9a9cdc28b3d79 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 30 08:13:05 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 30 08:13:05 2018 +0900 [WIN32SS] Make window foreground in SwitchToThisWindow (#995) CORE-15165 --- win32ss/user/ntuser/simplecall.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index 97879bda10..0c9b184f0d 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -521,8 +521,13 @@ NtUserCallTwoParam( { UserPostMessage(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); } + /* bring window to top and activate */ + co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + } + else + { + UserSetActiveWindow(Window); } - UserSetActiveWindow(Window); break; }

1 0

18/18: [FLTMGR] Remove duplicated export
by Pierre Schweitzer 29 Oct '18

29 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f39f25ca1783ab356f2a2… commit f39f25ca1783ab356f2a2612596acfbb35fd547f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 29 17:28:01 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 29 23:56:39 2018 +0100 [FLTMGR] Remove duplicated export --- drivers/filters/fltmgr/fltmgr.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/filters/fltmgr/fltmgr.spec b/drivers/filters/fltmgr/fltmgr.spec index 9249ac8311..ad99c6c40d 100644 --- a/drivers/filters/fltmgr/fltmgr.spec +++ b/drivers/filters/fltmgr/fltmgr.spec @@ -1,7 +1,6 @@ @ stdcall FltRegisterFilter(ptr ptr ptr) @ stdcall FltUnregisterFilter(ptr) - @ stdcall FltCloseCommunicationPort(ptr) @ stdcall FltStartFiltering(ptr) @ stdcall FltBuildDefaultSecurityDescriptor(ptr long) @ stdcall FltFreeSecurityDescriptor(ptr)

1 0

17/18: [FLTMGR] Add a bit more basic code layout for filter registration Needs implementing
by Ged Murphy 29 Oct '18

29 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa46f362ea7d91bed91db… commit fa46f362ea7d91bed91db5eb34e682e762271f88 Author: Ged Murphy <gedmurphy(a)reactos.org> AuthorDate: Mon Oct 29 17:03:11 2018 +0000 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 29 23:56:39 2018 +0100 [FLTMGR] Add a bit more basic code layout for filter registration Needs implementing --- drivers/filters/fltmgr/Filter.c | 87 ++++++++++++++++++++++++++++++++------ drivers/filters/fltmgr/Interface.c | 5 +++ 2 files changed, 80 insertions(+), 12 deletions(-) diff --git a/drivers/filters/fltmgr/Filter.c b/drivers/filters/fltmgr/Filter.c index 1c50f14738..d71f3f6b21 100644 --- a/drivers/filters/fltmgr/Filter.c +++ b/drivers/filters/fltmgr/Filter.c @@ -21,6 +21,9 @@ #define SERVICES_KEY L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\" #define MAX_KEY_LENGTH 0x200 +LIST_ENTRY FilterList; +ERESOURCE FilterListLock; + NTSTATUS FltpStartingToDrainObject( _Inout_ PFLT_OBJECT Object @@ -30,6 +33,12 @@ VOID FltpMiniFilterDriverUnload( ); +NTSTATUS +FltpAttachFrame( + _In_ PUNICODE_STRING Altitude, + _Inout_ PFLTP_FRAME *Frame +); + static NTSTATUS GetFilterAltitude( @@ -37,6 +46,14 @@ GetFilterAltitude( _Inout_ PUNICODE_STRING AltitudeString ); +static +NTSTATUS +GetFilterFrame( + _In_ PFLT_FILTER Filter, + _In_ PUNICODE_STRING Altitude, + _Out_ PFLTP_FRAME *Frame +); + /* EXPORTED FUNCTIONS ******************************************************/ @@ -98,6 +115,7 @@ FltRegisterFilter(_In_ PDRIVER_OBJECT DriverObject, { PFLT_OPERATION_REGISTRATION Callbacks; PFLT_FILTER Filter; + PFLTP_FRAME Frame; ULONG CallbackBufferSize; ULONG FilterBufferSize; ULONG Count = 0; @@ -235,12 +253,28 @@ FltRegisterFilter(_In_ PDRIVER_OBJECT DriverObject, Filter->Name.Buffer = (PWCH)Ptr; RtlCopyUnicodeString(&Filter->Name, &DriverObject->DriverExtension->ServiceKeyName); + /* Lookup the altitude of the mini-filter */ Status = GetFilterAltitude(Filter, &Filter->DefaultAltitude); if (!NT_SUCCESS(Status)) { goto Quit; } + /* Lookup the filter frame */ + Status = GetFilterFrame(Filter, &Filter->DefaultAltitude, &Frame); + if (Status == STATUS_NOT_FOUND) + { + /* Store the frame this mini-filter's main struct */ + Filter->Frame = Frame; + + Status = FltpAttachFrame(&Filter->DefaultAltitude, &Frame); + } + + if (!NT_SUCCESS(Status)) + { + goto Quit; + } + // // - Slot the filter into the correct altitude location // - More stuff?? @@ -364,6 +398,17 @@ FltStartFiltering(_In_ PFLT_FILTER Filter) return Status; } +NTSTATUS +NTAPI +FltGetFilterFromName(_In_ PCUNICODE_STRING FilterName, + _Out_ PFLT_FILTER *RetFilter) +{ + UNIMPLEMENTED; + UNREFERENCED_PARAMETER(FilterName); + *RetFilter = NULL; + return STATUS_NOT_IMPLEMENTED; +} + /* INTERNAL FUNCTIONS ******************************************************/ @@ -389,13 +434,24 @@ FltpMiniFilterDriverUnload() __debugbreak(); } + +NTSTATUS +FltpAttachFrame( + _In_ PUNICODE_STRING Altitude, + _Inout_ PFLTP_FRAME *Frame) +{ + UNIMPLEMENTED; + UNREFERENCED_PARAMETER(Altitude); + *Frame = NULL; + return STATUS_SUCCESS; +} + /* PRIVATE FUNCTIONS ******************************************************/ static NTSTATUS -GetFilterAltitude( - _In_ PFLT_FILTER Filter, - _Inout_ PUNICODE_STRING AltitudeString) +GetFilterAltitude(_In_ PFLT_FILTER Filter, + _Inout_ PUNICODE_STRING AltitudeString) { UNICODE_STRING InstancesKey = RTL_CONSTANT_STRING(L"Instances"); UNICODE_STRING DefaultInstance = RTL_CONSTANT_STRING(L"DefaultInstance"); @@ -523,14 +579,21 @@ Quit: return Status; } +static +NTSTATUS +GetFilterFrame(_In_ PFLT_FILTER Filter, + _In_ PUNICODE_STRING Altitude, + _Out_ PFLTP_FRAME *Frame) +{ + UNIMPLEMENTED; + UNREFERENCED_PARAMETER(Filter); + UNREFERENCED_PARAMETER(Altitude); + // + // Try to find a frame from our existing filter list (see FilterList) + // If none exists, create a new frame, add it and return it + // -NTSTATUS -FltpReadRegistryValue( - _In_ HANDLE KeyHandle, - _In_ PUNICODE_STRING ValueName, - _In_opt_ ULONG Type, - _Out_writes_bytes_(BufferSize) PVOID Buffer, - _In_ ULONG BufferSize, - _Out_opt_ PULONG BytesRequired -); \ No newline at end of file + *Frame = NULL; + return STATUS_SUCCESS; +} diff --git a/drivers/filters/fltmgr/Interface.c b/drivers/filters/fltmgr/Interface.c index 158303be92..1ed7e7986e 100644 --- a/drivers/filters/fltmgr/Interface.c +++ b/drivers/filters/fltmgr/Interface.c @@ -29,6 +29,8 @@ ((_devObj)->DeviceExtension != NULL)) extern PDEVICE_OBJECT CommsDeviceObject; +extern LIST_ENTRY FilterList; +extern ERESOURCE FilterListLock; DRIVER_INITIALIZE DriverEntry; @@ -2129,6 +2131,9 @@ DriverEntry(_In_ PDRIVER_OBJECT DriverObject, FLT_ASSERT(Status != STATUS_DEVICE_ALREADY_ATTACHED); // Windows checks for this, I'm not sure how it can happen. Needs investigation?? if (!NT_SUCCESS(Status)) goto Cleanup; + InitializeListHead(&FilterList); + ExInitializeResourceLite(&FilterListLock); + /* IoRegisterFsRegistrationChange isn't notified about the raw file systems, so we attach to them manually */ RtlInitUnicodeString(&ObjectName, L"\\Device\\RawDisk"); Status = IoGetDeviceObjectPointer(&ObjectName,

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