Ros-diffs January 2023

ros-diffs@reactos.org

18 participants
79 discussions

[reactos] 01/13: [WIN32KNT_APITEST] Comment out btoken tests for NtGdiDdQueryDirectDrawObject

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9813457567a0400adaec… commit f9813457567a0400adaec034e03d39df2e3d35cd Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 30 19:17:22 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 31 18:39:21 2023 +0100 [WIN32KNT_APITEST] Comment out btoken tests for NtGdiDdQueryDirectDrawObject --- .../win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c | 52 +++++++++++----------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c index 4eeffc81c4e..3b380dabbe0 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c @@ -216,7 +216,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) /* Testing see if we got any hw support for * This test can fail on video card that does not support 2d/overlay/3d */ - RTEST( pHalInfo->ddCaps.dwCaps != 0); + //RTEST( pHalInfo->ddCaps.dwCaps != 0); RTEST( pHalInfo->ddCaps.ddsCaps.dwCaps != 0); /* This flags is obsolete and should not be used by the driver */ @@ -244,9 +244,9 @@ START_TEST(NtGdiDdQueryDirectDrawObject) * * point to kmode direcly to the win32k.sys, win32k.sys is kmode and it is kmode address we getting back */ - RTEST( ( (DWORD_PTR)pHalInfo->lpD3DGlobalDriverData & (~0x80000000)) != 0 ); - RTEST( ( (DWORD_PTR)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); - RTEST( ( (DWORD_PTR)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); + //RTEST( ( (DWORD_PTR)pHalInfo->lpD3DGlobalDriverData & (~0x80000000)) != 0 ); + //RTEST( ( (DWORD_PTR)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); + //RTEST( ( (DWORD_PTR)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); } /* Backup DD_HALINFO so we do not need resting it */ @@ -285,8 +285,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) * known workaround is to check if the drv really return a kmode pointer for the drv functions * we want to use. */ - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); + //RTEST(pCallBackFlags[0] != 0); + //RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); /* testing NtGdiDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, D3dCallbacks, NULL, .... */ @@ -317,7 +317,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) * this will be fill in of all drv, it is not only for 3d stuff, this always fill by win32k.sys or dxg.sys depns * if it windows 2000 or windows xp/2003 */ - RTEST(puD3dCallbacks->dwSize == sizeof(D3DNTHAL_CALLBACKS)); + //RTEST(puD3dCallbacks->dwSize == sizeof(D3DNTHAL_CALLBACKS)); /* Nivda like GF7900GS will not follow ms design rule here, * ContextDestroyAll must alwyas be NULL for it is not longer inuse in windows 2000 and higher @@ -374,8 +374,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) /* We do not retesting DD_HALINFO, instead we compare it */ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); + //RTEST(pCallBackFlags[0] != 0); + //RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); /* Backup D3DNTHAL_CALLBACKS so we do not need resting it */ @@ -418,8 +418,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) RTEST(puvmList == NULL); /* We retesting pCallBackFlags */ - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); + //RTEST(pCallBackFlags[0] != 0); + //RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); /* We do not retesting instead we compare it */ @@ -428,12 +428,12 @@ START_TEST(NtGdiDdQueryDirectDrawObject) /* start test of puD3dDriverData */ - RTEST(puD3dDriverData->dwSize == sizeof(D3DNTHAL_GLOBALDRIVERDATA)); - RTEST(puD3dDriverData->hwCaps.dwSize == sizeof(D3DNTHALDEVICEDESC_V1)); - RTEST(puD3dDriverData->hwCaps.dtcTransformCaps.dwSize == sizeof(D3DTRANSFORMCAPS)); - RTEST(puD3dDriverData->hwCaps.dlcLightingCaps.dwSize == sizeof(D3DLIGHTINGCAPS)); - RTEST(puD3dDriverData->hwCaps.dpcLineCaps.dwSize == sizeof(D3DPRIMCAPS)); - RTEST(puD3dDriverData->hwCaps.dpcTriCaps.dwSize == sizeof(D3DPRIMCAPS)); + //RTEST(puD3dDriverData->dwSize == sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + //RTEST(puD3dDriverData->hwCaps.dwSize == sizeof(D3DNTHALDEVICEDESC_V1)); + //RTEST(puD3dDriverData->hwCaps.dtcTransformCaps.dwSize == sizeof(D3DTRANSFORMCAPS)); + //RTEST(puD3dDriverData->hwCaps.dlcLightingCaps.dwSize == sizeof(D3DLIGHTINGCAPS)); + //RTEST(puD3dDriverData->hwCaps.dpcLineCaps.dwSize == sizeof(D3DPRIMCAPS)); + //RTEST(puD3dDriverData->hwCaps.dpcTriCaps.dwSize == sizeof(D3DPRIMCAPS)); RTEST(puD3dDriverData->hwCaps.dwMaxBufferSize == 0); RTEST(puD3dDriverData->hwCaps.dwMaxVertexCount == 0); @@ -490,8 +490,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) RTEST(puvmList == NULL); /* We retesting the flags */ - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); + //RTEST(pCallBackFlags[0] != 0); + //RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); /* We do not retesting instead we compare it */ @@ -500,7 +500,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) RTEST(memcmp(&oldD3dDriverData, puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)) == 0); /* start test of puD3dBufferCallbacks */ - RTEST(puD3dBufferCallbacks->dwSize == sizeof(DD_D3DBUFCALLBACKS)); + //RTEST(puD3dBufferCallbacks->dwSize == sizeof(DD_D3DBUFCALLBACKS)); if (puD3dBufferCallbacks->dwFlags & DDHAL_D3DBUFCB32_CANCREATED3DBUF) { /* point to kmode direcly to the graphic drv, the drv is kmode and it is kmode address we getting back*/ @@ -607,8 +607,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) RTEST(puvmList == NULL); /* We retesting the flags */ - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); + //RTEST(pCallBackFlags[0] != 0); + //RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); /* We do not retesting instead we compare it */ @@ -706,8 +706,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) RTEST(puvmList == NULL); /* We retesting the flags */ - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); + //RTEST(pCallBackFlags[0] != 0); + //RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); /* We do not retesting instead we compare it */ @@ -771,8 +771,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) /* We retesting the flags */ - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); + //RTEST(pCallBackFlags[0] != 0); + //RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); /* We do not retesting instead we compare it */

1 year, 7 months

[reactos] 01/01: [DRIVERS] Remove unused __NTDRIVER__ and KERNEL definitions

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=886670e914d45243e35af… commit 886670e914d45243e35afd45cfa72e2816f1798b Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Jan 31 19:27:33 2023 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Jan 31 20:18:18 2023 +0300 [DRIVERS] Remove unused __NTDRIVER__ and KERNEL definitions --- sdk/lib/3rdparty/freetype/CMakeLists.txt | 1 - sdk/lib/drivers/ip/CMakeLists.txt | 2 -- sdk/lib/drivers/ip/network/ip.c | 4 ---- sdk/lib/drivers/ip/transport/rawip/rawip.c | 2 -- sdk/lib/drivers/ip/transport/udp/udp.c | 2 -- sdk/lib/drivers/sound/legacy/CMakeLists.txt | 4 ---- sdk/lib/drivers/sound/shared/CMakeLists.txt | 4 ---- sdk/lib/drivers/sound/soundblaster/CMakeLists.txt | 4 ---- sdk/lib/drivers/sound/uartmidi/CMakeLists.txt | 4 ---- 9 files changed, 27 deletions(-) diff --git a/sdk/lib/3rdparty/freetype/CMakeLists.txt b/sdk/lib/3rdparty/freetype/CMakeLists.txt index e714504f97c..6eb1c346c51 100644 --- a/sdk/lib/3rdparty/freetype/CMakeLists.txt +++ b/sdk/lib/3rdparty/freetype/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions( - -D__NTDRIVER__ -DFT2_BUILD_LIBRARY) include_directories(include) diff --git a/sdk/lib/drivers/ip/CMakeLists.txt b/sdk/lib/drivers/ip/CMakeLists.txt index e772ebbae58..8065abe96d5 100644 --- a/sdk/lib/drivers/ip/CMakeLists.txt +++ b/sdk/lib/drivers/ip/CMakeLists.txt @@ -1,6 +1,4 @@ -add_definitions(-D__NTDRIVER__) - include_directories( BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/lwip/src/include diff --git a/sdk/lib/drivers/ip/network/ip.c b/sdk/lib/drivers/ip/network/ip.c index 0d8b729f5a1..1328be9b47c 100644 --- a/sdk/lib/drivers/ip/network/ip.c +++ b/sdk/lib/drivers/ip/network/ip.c @@ -235,9 +235,7 @@ PIP_INTERFACE IPCreateInterface( TCPRegisterInterface(IF); -#ifdef __NTDRIVER__ InsertTDIInterfaceEntity( IF ); -#endif return IF; } @@ -253,9 +251,7 @@ VOID IPDestroyInterface( { TI_DbgPrint(DEBUG_IP, ("Called. IF (0x%X).\n", IF)); -#ifdef __NTDRIVER__ RemoveTDIInterfaceEntity( IF ); -#endif TCPUnregisterInterface(IF); diff --git a/sdk/lib/drivers/ip/transport/rawip/rawip.c b/sdk/lib/drivers/ip/transport/rawip/rawip.c index cb32d4b02e3..ca985301f44 100644 --- a/sdk/lib/drivers/ip/transport/rawip/rawip.c +++ b/sdk/lib/drivers/ip/transport/rawip/rawip.c @@ -341,9 +341,7 @@ NTSTATUS RawIPStartup(VOID) * Status of operation */ { -#ifdef __NTDRIVER__ RtlZeroMemory(&UDPStats, sizeof(UDP_STATISTICS)); -#endif /* Register this protocol with IP layer */ IPRegisterProtocol(IPPROTO_RAW, RawIpReceive); diff --git a/sdk/lib/drivers/ip/transport/udp/udp.c b/sdk/lib/drivers/ip/transport/udp/udp.c index 0ad09fa7bf3..96d5ab684bf 100644 --- a/sdk/lib/drivers/ip/transport/udp/udp.c +++ b/sdk/lib/drivers/ip/transport/udp/udp.c @@ -343,9 +343,7 @@ NTSTATUS UDPStartup( { NTSTATUS Status; -#ifdef __NTDRIVER__ RtlZeroMemory(&UDPStats, sizeof(UDP_STATISTICS)); -#endif Status = PortsStartup( &UDPPorts, 1, UDP_STARTING_PORT + UDP_DYNAMIC_PORTS ); diff --git a/sdk/lib/drivers/sound/legacy/CMakeLists.txt b/sdk/lib/drivers/sound/legacy/CMakeLists.txt index 237044773bb..a69f4de3f65 100644 --- a/sdk/lib/drivers/sound/legacy/CMakeLists.txt +++ b/sdk/lib/drivers/sound/legacy/CMakeLists.txt @@ -1,8 +1,4 @@ -add_definitions( - -D__NTDRIVER__ - -DKERNEL) - include_directories( ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/sound/soundblaster ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/sound) diff --git a/sdk/lib/drivers/sound/shared/CMakeLists.txt b/sdk/lib/drivers/sound/shared/CMakeLists.txt index 855e98bda78..0032a6737e8 100644 --- a/sdk/lib/drivers/sound/shared/CMakeLists.txt +++ b/sdk/lib/drivers/sound/shared/CMakeLists.txt @@ -1,8 +1,4 @@ -add_definitions( - -D__NTDRIVER__ - -DKERNEL) - include_directories( ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/sound/soundblaster ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/sound) diff --git a/sdk/lib/drivers/sound/soundblaster/CMakeLists.txt b/sdk/lib/drivers/sound/soundblaster/CMakeLists.txt index 4b717a37fb6..a3decbbd259 100644 --- a/sdk/lib/drivers/sound/soundblaster/CMakeLists.txt +++ b/sdk/lib/drivers/sound/soundblaster/CMakeLists.txt @@ -1,8 +1,4 @@ -add_definitions( - -D__NTDRIVER__ - -DKERNEL) - include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/sound) list(APPEND SOURCE diff --git a/sdk/lib/drivers/sound/uartmidi/CMakeLists.txt b/sdk/lib/drivers/sound/uartmidi/CMakeLists.txt index c42b8f89122..6046afb6fc1 100644 --- a/sdk/lib/drivers/sound/uartmidi/CMakeLists.txt +++ b/sdk/lib/drivers/sound/uartmidi/CMakeLists.txt @@ -1,8 +1,4 @@ -add_definitions( - -D__NTDRIVER__ - -DKERNEL) - include_directories( ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/sound/soundblaster ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/sound)

1 year, 7 months

[reactos] 02/02: Update win32ss/user/ntuser/winpos.c

by Julen Urizar Compains

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8866b9d7b03e62b3ed304… commit 8866b9d7b03e62b3ed3041acb0b3791fbc1733aa Author: Julen Urizar Compains <julenuri(a)hotmail.com> AuthorDate: Tue Jan 24 21:54:40 2023 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 31 01:08:45 2023 +0100 Update win32ss/user/ntuser/winpos.c Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- win32ss/user/ntuser/winpos.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 3bf8a315c59..c0251ccc6a5 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -2100,7 +2100,8 @@ co_WinPosSetWindowPos( } /* We need to redraw what wasn't visible before or force a redraw */ - if ((WinPos.flags & (SWP_FRAMECHANGED | SWP_SHOWWINDOW)) || (((WinPos.flags & SWP_AGG_NOGEOMETRYCHANGE) != SWP_AGG_NOGEOMETRYCHANGE) && VisAfter != NULL)) + if ((WinPos.flags & (SWP_FRAMECHANGED | SWP_SHOWWINDOW)) || + (((WinPos.flags & SWP_AGG_NOGEOMETRYCHANGE) != SWP_AGG_NOGEOMETRYCHANGE) && VisAfter != NULL)) { PREGION DirtyRgn = IntSysCreateRectpRgn(0, 0, 0, 0); if (DirtyRgn)

1 year, 7 months

[reactos] 01/02: [WIN32SS] Fix winpos hyperlink&images loop rendering (CORE-7652)

by Julen Urizar Compains

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7866eb28862b31f2ee900… commit 7866eb28862b31f2ee90045293c662c8ac834a70 Author: Julen Urizar Compains <julenuri(a)hotmail.com> AuthorDate: Sun Jan 15 01:59:24 2023 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 31 01:08:45 2023 +0100 [WIN32SS] Fix winpos hyperlink&images loop rendering (CORE-7652) --- win32ss/user/ntuser/winpos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index f9ce2583b87..3bf8a315c59 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -2100,7 +2100,7 @@ co_WinPosSetWindowPos( } /* We need to redraw what wasn't visible before or force a redraw */ - if (VisAfter != NULL) + if ((WinPos.flags & (SWP_FRAMECHANGED | SWP_SHOWWINDOW)) || (((WinPos.flags & SWP_AGG_NOGEOMETRYCHANGE) != SWP_AGG_NOGEOMETRYCHANGE) && VisAfter != NULL)) { PREGION DirtyRgn = IntSysCreateRectpRgn(0, 0, 0, 0); if (DirtyRgn)

1 year, 7 months

[reactos] 01/01: [USBSTOR_NEW] Add missing poppack.h

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9bb0b9137fc48014b70ec… commit 9bb0b9137fc48014b70ecd17c842843a8e9d0fc6 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Dec 29 16:57:18 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Jan 30 15:12:06 2023 +0100 [USBSTOR_NEW] Add missing poppack.h --- drivers/usb/usbstor_new/usbstor.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/usbstor_new/usbstor.h b/drivers/usb/usbstor_new/usbstor.h index f477e9a1a04..fc725a6e117 100644 --- a/drivers/usb/usbstor_new/usbstor.h +++ b/drivers/usb/usbstor_new/usbstor.h @@ -312,6 +312,8 @@ typedef struct UCHAR Bytes[16]; }UFI_UNKNOWN_CMD, *PUFI_UNKNOWN_CMD; +#include <poppack.h> + typedef struct { union

1 year, 7 months

[reactos] 01/01: [NTUSER] Move IME window creation code (#5009)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3644fd4d328b9a6ae2a1… commit c3644fd4d328b9a6ae2a15b4606d49c497a7f48f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 30 12:19:39 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 30 12:19:39 2023 +0900 [NTUSER] Move IME window creation code (#5009) Move the code that creates the default IME window, from IntCreateWindow to co_UserCreateWindowEx, just before sending WM_NCCALCSIZE message. CORE-18723 CORE-18754 CORE-18773 CORE-18785 CORE-18802 CORE-18803 --- win32ss/user/ntuser/window.c | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 142815a6884..d1b650bf4c2 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2050,33 +2050,6 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, pWnd->strName.MaximumLength = WindowName->Length + sizeof(UNICODE_NULL); } - /* Create the IME window for pWnd */ - if (IS_IMM_MODE() && !(pti->spwndDefaultIme) && IntWantImeWindow(pWnd)) - { - PWND pwndDefaultIme = co_IntCreateDefaultImeWindow(pWnd, pWnd->hModule); - UserAssignmentLock((PVOID*)&(pti->spwndDefaultIme), pwndDefaultIme); - - if (pwndDefaultIme) - { - HWND hImeWnd; - USER_REFERENCE_ENTRY Ref; - UserRefObjectCo(pwndDefaultIme, &Ref); - - hImeWnd = UserHMGetHandle(pwndDefaultIme); - - co_IntSendMessage(hImeWnd, WM_IME_SYSTEM, IMS_LOADTHREADLAYOUT, 0); - - if (pti->pClientInfo->CI_flags & CI_IMMACTIVATE) - { - HKL hKL = pti->KeyboardLayout->hkl; - co_IntSendMessage(hImeWnd, WM_IME_SYSTEM, IMS_ACTIVATELAYOUT, (LPARAM)hKL); - pti->pClientInfo->CI_flags &= ~CI_IMMACTIVATE; - } - - UserDerefObjectCo(pwndDefaultIme); - } - } - /* Correct the window style. */ if ((pWnd->style & (WS_CHILD | WS_POPUP)) != WS_CHILD) { @@ -2450,6 +2423,33 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, IntLinkHwnd(Window, hwndInsertAfter); } + /* Create the IME window for pWnd */ + if (IS_IMM_MODE() && !pti->spwndDefaultIme && IntWantImeWindow(Window)) + { + PWND pwndDefaultIme = co_IntCreateDefaultImeWindow(Window, Window->hModule); + UserAssignmentLock((PVOID*)&pti->spwndDefaultIme, pwndDefaultIme); + + if (pwndDefaultIme) + { + HWND hImeWnd; + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(pwndDefaultIme, &Ref); + + hImeWnd = UserHMGetHandle(pwndDefaultIme); + + co_IntSendMessage(hImeWnd, WM_IME_SYSTEM, IMS_LOADTHREADLAYOUT, 0); + + if (pti->pClientInfo->CI_flags & CI_IMMACTIVATE) + { + HKL hKL = pti->KeyboardLayout->hkl; + co_IntSendMessage(hImeWnd, WM_IME_SYSTEM, IMS_ACTIVATELAYOUT, (LPARAM)hKL); + pti->pClientInfo->CI_flags &= ~CI_IMMACTIVATE; + } + + UserDerefObjectCo(pwndDefaultIme); + } + } + /* Send the WM_NCCALCSIZE message */ { // RECT rc;

1 year, 7 months

[reactos] 01/01: [SHELL32] Follow-up of #5008 (8e036fe)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f156f9a13797ef5cfe1ca… commit f156f9a13797ef5cfe1ca940f95bf927ee2688a0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 30 08:01:15 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jan 30 08:01:15 2023 +0900 [SHELL32] Follow-up of #5008 (8e036fe) Now the menu item actions on start button should work. CORE-16544 --- dll/win32/shell32/CCopyToMenu.cpp | 4 ++-- dll/win32/shell32/CMoveToMenu.cpp | 4 ++-- dll/win32/shell32/CSendToMenu.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/shell32/CCopyToMenu.cpp b/dll/win32/shell32/CCopyToMenu.cpp index 2206f968f7a..a692d7fed53 100644 --- a/dll/win32/shell32/CCopyToMenu.cpp +++ b/dll/win32/shell32/CCopyToMenu.cpp @@ -272,7 +272,7 @@ CCopyToMenu::QueryContextMenu(HMENU hMenu, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY)) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst); m_idCmdFirst = m_idCmdLast = idCmdFirst; @@ -310,7 +310,7 @@ CCopyToMenu::QueryContextMenu(HMENU hMenu, ++Count; } - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst + Count); } HRESULT WINAPI diff --git a/dll/win32/shell32/CMoveToMenu.cpp b/dll/win32/shell32/CMoveToMenu.cpp index 2bcb360439b..5087f5ec37d 100644 --- a/dll/win32/shell32/CMoveToMenu.cpp +++ b/dll/win32/shell32/CMoveToMenu.cpp @@ -271,7 +271,7 @@ CMoveToMenu::QueryContextMenu(HMENU hMenu, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY)) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst); m_idCmdFirst = m_idCmdLast = idCmdFirst; @@ -314,7 +314,7 @@ CMoveToMenu::QueryContextMenu(HMENU hMenu, ++Count; } - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst + Count); } HRESULT WINAPI diff --git a/dll/win32/shell32/CSendToMenu.cpp b/dll/win32/shell32/CSendToMenu.cpp index 41db2e13d1f..131f21e2a0a 100644 --- a/dll/win32/shell32/CSendToMenu.cpp +++ b/dll/win32/shell32/CSendToMenu.cpp @@ -296,7 +296,7 @@ CSendToMenu::QueryContextMenu(HMENU hMenu, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY)) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst); HMENU hSubMenu = CreateMenu(); if (!hSubMenu) @@ -327,7 +327,7 @@ CSendToMenu::QueryContextMenu(HMENU hMenu, m_hSubMenu = hSubMenu; DestroyMenu(hOldSubMenu); - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, cItems); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst + cItems); } STDMETHODIMP

1 year, 7 months

[reactos] 01/01: [NETSHELL] LanStatusDlg should show on LBUTTONUP in systray CORE-18813

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a17c7d9adadf88eafc38… commit 7a17c7d9adadf88eafc382d792771bea5fc412f8 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jan 29 21:05:33 2023 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jan 29 21:05:33 2023 +0100 [NETSHELL] LanStatusDlg should show on LBUTTONUP in systray CORE-18813 not on LBUTTONDOWN. --- dll/shellext/netshell/lanstatusui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/shellext/netshell/lanstatusui.cpp b/dll/shellext/netshell/lanstatusui.cpp index c3be62dcad3..a2c8d37dcc6 100644 --- a/dll/shellext/netshell/lanstatusui.cpp +++ b/dll/shellext/netshell/lanstatusui.cpp @@ -851,7 +851,7 @@ LANStatusDlg( } break; case WM_SHOWSTATUSDLG: - if (LOWORD(lParam) == WM_LBUTTONDOWN) + if (LOWORD(lParam) == WM_LBUTTONUP) { pContext = (LANSTATUSUI_CONTEXT*)GetWindowLongPtr(hwndDlg, DWLP_USER); if (!pContext)

1 year, 7 months

[reactos] 01/01: [KMTESTS:MM] Fix MmReservedMapping test failures on PAE kernels.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b863f63c224a0f03ba30… commit 6b863f63c224a0f03ba3037a2f8027b225149764 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Jan 29 11:34:45 2023 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jan 29 11:39:56 2023 -0500 [KMTESTS:MM] Fix MmReservedMapping test failures on PAE kernels. --- .../rostests/kmtests/ntos_mm/MmReservedMapping.c | 76 ++++++++++++++++------ 1 file changed, 57 insertions(+), 19 deletions(-) diff --git a/modules/rostests/kmtests/ntos_mm/MmReservedMapping.c b/modules/rostests/kmtests/ntos_mm/MmReservedMapping.c index fd35a208ce3..a8204b5a3c0 100644 --- a/modules/rostests/kmtests/ntos_mm/MmReservedMapping.c +++ b/modules/rostests/kmtests/ntos_mm/MmReservedMapping.c @@ -1,33 +1,54 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory - * PURPOSE: Kernel-Mode Test Suite Reserved Mapping test - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Kernel-Mode Test Suite Reserved Mapping test + * COPYRIGHT: Copyright 2015,2023 Thomas Faber (thomas.faber(a)reactos.org) + * COPYRIGHT: Copyright 2015 Pierre Schweitzer (pierre(a)reactos.org) */ #include <kmt_test.h> +static BOOLEAN g_IsPae; + #ifdef _M_IX86 +#define IS_PAE() (g_IsPae) + #define PTE_BASE 0xC0000000 -#define MiAddressToPte(x) \ - ((PMMPTE)(((((ULONG)(x)) >> 12) << 2) + PTE_BASE)) -#define MiPteToAddress(_Pte) ((PVOID)((ULONG)(_Pte) << 10)) + +#define MiAddressToPteX86(x) \ + ((PULONG)(((((ULONG)(x)) >> 12) << 2) + PTE_BASE)) +#define MiAddressToPtePAE(x) \ + ((PULONGLONG)(((((ULONG)(x)) >> 12) << 3) + PTE_BASE)) + +#define GET_PTE_VALUE_X86(Addr) (*MiAddressToPteX86(Addr)) +#define GET_PTE_VALUE_PAE(Addr) (*MiAddressToPtePAE(Addr)) +#define GET_PTE_VALUE(Addr) (IS_PAE() ? GET_PTE_VALUE_PAE(Addr) : GET_PTE_VALUE_X86(Addr)) + +#define PTE_IS_VALID(PteValue) ((PteValue) & 1) + +#define PTE_GET_PFN_X86(PteValue) (((PteValue) >> PAGE_SHIFT) & 0x0fffffULL) +#define PTE_GET_PFN_PAE(PteValue) (((PteValue) >> PAGE_SHIFT) & 0xffffffULL) +#define PTE_GET_PFN(PteValue) (IS_PAE() ? PTE_GET_PFN_PAE(PteValue) : PTE_GET_PFN_X86(PteValue)) #elif defined(_M_AMD64) #define PTI_SHIFT 12L #define PTE_BASE 0xFFFFF68000000000ULL -PMMPTE +PULONGLONG FORCEINLINE _MiAddressToPte(PVOID Address) { ULONG64 Offset = (ULONG64)Address >> (PTI_SHIFT - 3); Offset &= 0xFFFFFFFFFULL << 3; - return (PMMPTE)(PTE_BASE + Offset); + return (PULONGLONG)(PTE_BASE + Offset); } #define MiAddressToPte(x) _MiAddressToPte((PVOID)(x)) +#define GET_PTE_VALUE(Addr) (*_MiAddressToPte((PVOID)(Addr))) +#define PTE_IS_VALID(PteValue) ((PteValue) & 1) +#define PTE_GET_PFN(PteValue) (((PteValue) >> PAGE_SHIFT) & 0xFffffffffULL) + #endif static @@ -54,30 +75,45 @@ ValidateMapping( { BOOLEAN Valid = TRUE; #if defined(_M_IX86) || defined(_M_AMD64) - PMMPTE PointerPte; + PUCHAR CurrentAddress; + ULONGLONG PteValue; ULONG i; - PointerPte = MiAddressToPte(BaseAddress); for (i = 0; i < ValidPtes; i++) { + CurrentAddress = (PUCHAR)BaseAddress + i * PAGE_SIZE; + PteValue = GET_PTE_VALUE(CurrentAddress); Valid = Valid && - ok(PointerPte[i].u.Hard.Valid == 1, - "[%lu] PTE %p is not valid\n", i, &PointerPte[i]); + ok(PTE_IS_VALID(PteValue), + "[%lu] PTE for %p is not valid (0x%I64x)\n", + i, CurrentAddress, PteValue); Valid = Valid && - ok(PointerPte[i].u.Hard.PageFrameNumber == Pfns[i], - "[%lu] PTE %p has PFN %Ix, expected %Ix\n", - i, &PointerPte[i], PointerPte[i].u.Hard.PageFrameNumber, Pfns[i]); + ok(PTE_GET_PFN(PteValue) == Pfns[i], + "[%lu] PTE for %p has PFN %Ix, expected %Ix\n", + i, CurrentAddress, PTE_GET_PFN(PteValue), Pfns[i]); } for (; i < TotalPtes; i++) { + CurrentAddress = (PUCHAR)BaseAddress + i * PAGE_SIZE; + PteValue = GET_PTE_VALUE(CurrentAddress); Valid = Valid && - ok_eq_hex(PointerPte[i].u.Long, 0UL); + ok(PteValue == 0, + "[%lu] PTE for %p is nonzero (0x%I64x)\n", + i, CurrentAddress, PteValue); } + CurrentAddress = (PUCHAR)BaseAddress - 1 * PAGE_SIZE; + PteValue = GET_PTE_VALUE(CurrentAddress); Valid = Valid && - ok_eq_tag(PointerPte[-1].u.Long, PoolTag & ~1); + ok(PteValue == (PoolTag & ~1ULL), + "PTE for %p contains 0x%I64x, expected %x\n", + CurrentAddress, PteValue, PoolTag & ~1); + CurrentAddress = (PUCHAR)BaseAddress - 2 * PAGE_SIZE; + PteValue = GET_PTE_VALUE(CurrentAddress); Valid = Valid && - ok_eq_ulong(PointerPte[-2].u.Long, (TotalPtes + 2) * 2); + ok(PteValue == (TotalPtes + 2) * 2, + "PTE for %p contains 0x%I64x, expected %x\n", + CurrentAddress, PteValue, (TotalPtes + 2) * 2); #endif return Valid; @@ -244,6 +280,8 @@ START_TEST(MmReservedMapping) { PVOID Mapping; + g_IsPae = ExIsProcessorFeaturePresent(PF_PAE_ENABLED); + pMmAllocatePagesForMdlEx = KmtGetSystemRoutineAddress(L"MmAllocatePagesForMdlEx"); /* one byte - single page */

1 year, 7 months

[reactos] 01/01: [SHELL32] Improve StartButton context menu (#5008)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e036fe74d953faf8305d… commit 8e036fe74d953faf8305d6db1143840038b971af Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 29 22:40:40 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 29 22:40:40 2023 +0900 [SHELL32] Improve StartButton context menu (#5008) - Add uFlags argument to CDefaultContextMenu::AddShellExtensionsToMenu- CCopyToMenu, CMoveToMenu, and CSendToMenu check the uFlags against (CMF_NOVERBS | CMF_VERBSONLY). CORE-16544 --- dll/win32/shell32/CCopyToMenu.cpp | 3 +++ dll/win32/shell32/CDefaultContextMenu.cpp | 8 ++++---- dll/win32/shell32/CMoveToMenu.cpp | 3 +++ dll/win32/shell32/CSendToMenu.cpp | 3 +++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/CCopyToMenu.cpp b/dll/win32/shell32/CCopyToMenu.cpp index e72b217945b..2206f968f7a 100644 --- a/dll/win32/shell32/CCopyToMenu.cpp +++ b/dll/win32/shell32/CCopyToMenu.cpp @@ -271,6 +271,9 @@ CCopyToMenu::QueryContextMenu(HMENU hMenu, TRACE("CCopyToMenu::QueryContextMenu(%p, %u, %u, %u, %u)\n", hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY)) + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); + m_idCmdFirst = m_idCmdLast = idCmdFirst; // insert separator if necessary diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index ecb456661ae..2559e6e0438 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -84,7 +84,7 @@ class CDefaultContextMenu : BOOL IsShellExtensionAlreadyLoaded(REFCLSID clsid); HRESULT LoadDynamicContextMenuHandler(HKEY hKey, REFCLSID clsid); BOOL EnumerateDynamicContextHandlerForKey(HKEY hRootKey); - UINT AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UINT idCmdFirst, UINT idCmdLast); + UINT AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); UINT AddStaticContextMenusToMenu(HMENU hMenu, UINT* IndexMenu, UINT iIdCmdFirst, UINT iIdCmdLast); HRESULT DoPaste(LPCMINVOKECOMMANDINFOEX lpcmi, BOOL bLink); HRESULT DoOpenOrExplore(LPCMINVOKECOMMANDINFOEX lpcmi); @@ -417,7 +417,7 @@ CDefaultContextMenu::EnumerateDynamicContextHandlerForKey(HKEY hRootKey) } UINT -CDefaultContextMenu::AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UINT idCmdFirst, UINT idCmdLast) +CDefaultContextMenu::AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { UINT cIds = 0; @@ -429,7 +429,7 @@ CDefaultContextMenu::AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UIN { DynamicShellEntry& info = m_DynamicEntries.GetNext(it); - HRESULT hr = info.pCM->QueryContextMenu(hMenu, *pIndexMenu, idCmdFirst + cIds, idCmdLast, CMF_NORMAL); + HRESULT hr = info.pCM->QueryContextMenu(hMenu, *pIndexMenu, idCmdFirst + cIds, idCmdLast, uFlags); if (SUCCEEDED(hr)) { info.iIdCmdFirst = cIds; @@ -636,7 +636,7 @@ CDefaultContextMenu::QueryContextMenu( idCmdNext = idCmdFirst + cIds; /* Add dynamic context menu handlers */ - cIds += AddShellExtensionsToMenu(hMenu, &IndexMenu, idCmdNext, idCmdLast); + cIds += AddShellExtensionsToMenu(hMenu, &IndexMenu, idCmdNext, idCmdLast, uFlags); m_iIdSHEFirst = m_iIdSCMLast; m_iIdSHELast = cIds; idCmdNext = idCmdFirst + cIds; diff --git a/dll/win32/shell32/CMoveToMenu.cpp b/dll/win32/shell32/CMoveToMenu.cpp index c0e1c83a54d..2bcb360439b 100644 --- a/dll/win32/shell32/CMoveToMenu.cpp +++ b/dll/win32/shell32/CMoveToMenu.cpp @@ -270,6 +270,9 @@ CMoveToMenu::QueryContextMenu(HMENU hMenu, TRACE("CMoveToMenu::QueryContextMenu(%p, %u, %u, %u, %u)\n", hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY)) + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); + m_idCmdFirst = m_idCmdLast = idCmdFirst; // insert separator if necessary diff --git a/dll/win32/shell32/CSendToMenu.cpp b/dll/win32/shell32/CSendToMenu.cpp index 1f8c42ef144..41db2e13d1f 100644 --- a/dll/win32/shell32/CSendToMenu.cpp +++ b/dll/win32/shell32/CSendToMenu.cpp @@ -295,6 +295,9 @@ CSendToMenu::QueryContextMenu(HMENU hMenu, TRACE("%p %p %u %u %u %u\n", this, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY)) + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); + HMENU hSubMenu = CreateMenu(); if (!hSubMenu) {

1 year, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2023