Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 03/13: [WIN32KNT_APITEST] Comment out broken test for NtGdiGetFontResourceInfoInternalW
by Timo Kreuzer 31 Jan '23

31 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be7a7f8c22ff8dc7c3036… commit be7a7f8c22ff8dc7c303647002deb4e69d232bc5 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 30 19:22:23 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 31 18:39:21 2023 +0100 [WIN32KNT_APITEST] Comment out broken test for NtGdiGetFontResourceInfoInternalW --- modules/rostests/apitests/win32nt/CMakeLists.txt | 2 +- modules/rostests/apitests/win32nt/testlist.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32nt/CMakeLists.txt index a861830bbc0..9968d8a0c9d 100644 --- a/modules/rostests/apitests/win32nt/CMakeLists.txt +++ b/modules/rostests/apitests/win32nt/CMakeLists.txt @@ -24,7 +24,7 @@ list(APPEND SOURCE #ntgdi/NtGdiFlushUserBatch.c ntgdi/NtGdiGetBitmapBits.c ntgdi/NtGdiGetDIBits.c - ntgdi/NtGdiGetFontResourceInfoInternalW.c + #ntgdi/NtGdiGetFontResourceInfoInternalW.c ntgdi/NtGdiGetRandomRgn.c ntgdi/NtGdiGetStockObject.c ntgdi/NtGdiIntersectClipRect.c diff --git a/modules/rostests/apitests/win32nt/testlist.c b/modules/rostests/apitests/win32nt/testlist.c index c63cc42c101..839d87480fc 100644 --- a/modules/rostests/apitests/win32nt/testlist.c +++ b/modules/rostests/apitests/win32nt/testlist.c @@ -92,7 +92,7 @@ const struct test winetest_testlist[] = //{ "NtGdiFlushUserBatch", func_NtGdiFlushUserBatch }, { "NtGdiGetBitmapBits", func_NtGdiGetBitmapBits }, { "NtGdiGetDIBitsInternal", func_NtGdiGetDIBitsInternal }, - { "NtGdiGetFontResourceInfoInternalW", func_NtGdiGetFontResourceInfoInternalW }, + //{ "NtGdiGetFontResourceInfoInternalW", func_NtGdiGetFontResourceInfoInternalW }, { "NtGdiGetRandomRgn", func_NtGdiGetRandomRgn }, { "NtGdiGetStockObject", func_NtGdiGetStockObject }, { "NtGdiIntersectClipRect", func_NtGdiIntersectClipRect },

1 0

[reactos] 02/13: [WIN32KNT_APITEST] Fix a test for NtGdiExtTextOutW
by Timo Kreuzer 31 Jan '23

31 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=329e065dbb280a2959d13… commit 329e065dbb280a2959d13328cfe7b8894eebfdf3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 30 19:17:54 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 31 18:39:21 2023 +0100 [WIN32KNT_APITEST] Fix a test for NtGdiExtTextOutW --- modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c index 044a0cde567..3a75f9f0b9f 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c @@ -54,5 +54,5 @@ START_TEST(NtGdiExtTextOutW) /* Test alignment requirement for lpDx */ ret = NtGdiExtTextOutW(hDC, 0, 0, 0, 0, lpstr, len, (INT*)((ULONG_PTR)Dx + 1), 0); - ok_int(ret, 1); + ok_int(ret, 0); }

1 0

[reactos] 01/13: [WIN32KNT_APITEST] Comment out btoken tests for NtGdiDdQueryDirectDrawObject
by Timo Kreuzer 31 Jan '23

31 Jan '23

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 0

[reactos] 01/01: [DRIVERS] Remove unused __NTDRIVER__ and KERNEL definitions
by Victor Perevertkin 31 Jan '23

31 Jan '23

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 0

[reactos] 02/02: Update win32ss/user/ntuser/winpos.c
by Julen Urizar Compains 31 Jan '23

31 Jan '23

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 0

[reactos] 01/02: [WIN32SS] Fix winpos hyperlink&images loop rendering (CORE-7652)
by Julen Urizar Compains 31 Jan '23

31 Jan '23

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 0

[reactos] 01/01: [USBSTOR_NEW] Add missing poppack.h
by Mark Jansen 30 Jan '23

30 Jan '23

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 0

[reactos] 01/01: [NTUSER] Move IME window creation code (#5009)
by Katayama Hirofumi MZ 30 Jan '23

30 Jan '23

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 0

[reactos] 01/01: [SHELL32] Follow-up of #5008 (8e036fe)
by Katayama Hirofumi MZ 29 Jan '23

29 Jan '23

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 0

[reactos] 01/01: [NETSHELL] LanStatusDlg should show on LBUTTONUP in systray CORE-18813
by Joachim Henze 29 Jan '23

29 Jan '23

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 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