Ros-diffs

ros-diffs@reactos.org

11 participants
81013 discussions

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFSchemeDef::DrawCtrlBitmap (#6348)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1156249d631cf79b2daaa… commit 1156249d631cf79b2daaa3c52c68bc465d431739 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 15 10:36:12 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 15 10:36:12 2024 +0900 [SDK] cicuif.h: Fix CUIFSchemeDef::DrawCtrlBitmap (#6348) Supporting TIPs... JIRA issue: CORE-19360 Implement CUIFSchemeDef::DrawCtrlBitmap method. --- sdk/include/reactos/cicero/cicuif.h | 59 +++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index c3f5df67245..5e3ac117ea4 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -1691,11 +1691,66 @@ CUIFSchemeDef::DrawCtrlIcon(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags } } -/// @unimplemented inline STDMETHODIMP_(void) CUIFSchemeDef::DrawCtrlBitmap(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) { - //FIXME + if (m_bMirroring) + { + hbm1 = cicMirrorBitmap(hbm1, GetBrush(9)); + hbm2 = cicMirrorBitmap(hbm2, (HBRUSH)GetStockObject(BLACK_BRUSH)); + } + + HBRUSH hBrush = (HBRUSH)UlongToHandle(COLOR_BTNFACE + 1); + BOOL bBrushCreated = FALSE; + if (hbm2) + { + HBITMAP hBitmap = NULL; + if (dwDrawFlags & UIF_DRAW_DISABLED) + { + hBitmap = cicCreateDisabledBitmap(prc, hbm2, GetBrush(9), GetBrush(11), TRUE); + } + else + { + if ((dwDrawFlags & UIF_DRAW_PRESSED) && !(dwDrawFlags & 0x2)) + { + hBrush = cicCreateDitherBrush(); + bBrushCreated = TRUE; + } + + COLORREF rgbFace = ::GetSysColor(COLOR_BTNFACE); + COLORREF rgbHighlight = ::GetSysColor(COLOR_BTNHIGHLIGHT); + hBitmap = cicCreateMaskBmp(prc, hbm1, hbm2, hBrush, rgbFace, rgbHighlight); + } + + if (hBitmap) + { + ::DrawState(hDC, NULL, NULL, (LPARAM)hBitmap, 0, + prc->left, prc->top, + prc->right - prc->left, prc->bottom - prc->top, + DST_BITMAP); + ::DeleteObject(hBitmap); + } + } + else + { + UINT uFlags = DST_BITMAP; + if (dwDrawFlags & 0x20) + uFlags |= (DSS_MONO | DSS_DISABLED); + + ::DrawState(hDC, NULL, NULL, (LPARAM)hbm1, 0, + prc->left, prc->top, + prc->right - prc->left, prc->bottom - prc->top, + uFlags); + } + + if (bBrushCreated) + ::DeleteObject(hBrush); + + if (m_bMirroring) + { + ::DeleteObject(hbm1); + ::DeleteObject(hbm2); + } } inline STDMETHODIMP_(void)

12 months

[reactos] 01/01: [FREELDR:UI] Update display after restoring screen contents

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=922757e2e3860695344fd… commit 922757e2e3860695344fd104367db2678c5a4fd6 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jan 14 19:09:48 2024 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Jan 14 19:12:11 2024 +0100 [FREELDR:UI] Update display after restoring screen contents JIRA issue: CORE-18186 --- boot/freeldr/freeldr/ui/tui.c | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index bb5646aa917..d8669ea196b 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -626,6 +626,7 @@ VOID TuiRestoreScreen(PUCHAR Buffer) { ScreenMemory[i] = Buffer[i]; } + VideoCopyOffScreenBufferToVRAM(); } VOID TuiMessageBox(PCSTR MessageText)

12 months

[reactos] 01/01: [CMAKE][WIN32U_APITEST] Remove 3 useless 'set_module_type(... IMAGEBASE default)' (#6328)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c895c986ffb7df63c4a8… commit 2c895c986ffb7df63c4a8845e7786d660f3c121c Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Jan 14 16:07:00 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 14 16:07:00 2024 +0100 [CMAKE][WIN32U_APITEST] Remove 3 useless 'set_module_type(... IMAGEBASE default)' (#6328) And add an explicit documentation comment. Addendum to commit 2b7246fd3. --- modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt | 2 +- sdk/cmake/CMakeMacros.cmake | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt index 8c086a367a4..021fba309c2 100644 --- a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_2k3sp2 MODULE ${win32u_2k3sp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_2k3sp2.def) -set_module_type(win32u_2k3sp2 module IMAGEBASE default) +set_module_type(win32u_2k3sp2 module) add_dependencies(win32u_2k3sp2 psdk) diff --git a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt index 743ded25e1f..38737886d0c 100644 --- a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_vista MODULE ${win32u_vista_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_vista.def) -set_module_type(win32u_vista module IMAGEBASE default) +set_module_type(win32u_vista module) add_dependencies(win32u_vista psdk) diff --git a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt index 6939993703a..457d5c1868a 100644 --- a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_xpsp2 MODULE ${win32u_xpsp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_xpsp2.def) -set_module_type(win32u_xpsp2 module IMAGEBASE default) +set_module_type(win32u_xpsp2 module) add_dependencies(win32u_xpsp2 psdk) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 6fcf476da69..802979c2422 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -642,6 +642,7 @@ function(set_module_type MODULE TYPE) endif() # Set base address + # Use 'IMAGEBASE default' to skip these set_image_base(), especially for win32dll test files if(__module_IMAGEBASE) if(NOT ${__module_IMAGEBASE} STREQUAL "default") set_image_base(${MODULE} ${__module_IMAGEBASE})

12 months

[reactos] 01/01: [JOY] Add IDCANCEL action to MainPageProc (#6346)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbc3ee2287c1972ac8257… commit cbc3ee2287c1972ac8257da60388a5de9ea6c0e5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 14 20:48:34 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 14 20:48:34 2024 +0900 [JOY] Add IDCANCEL action to MainPageProc (#6346) Based on KRosUser's joycancel.patch. Enable Esc key and Close button. JIRA issue: CORE-19424 Insert a line of "case IDCANCEL:". --- dll/cpl/joy/joy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/cpl/joy/joy.c b/dll/cpl/joy/joy.c index 057ec4c8534..dc9482ca34f 100644 --- a/dll/cpl/joy/joy.c +++ b/dll/cpl/joy/joy.c @@ -270,6 +270,7 @@ MainPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) break; case IDOK: + case IDCANCEL: DestroyIcon(s_hIcon); DestroyIcon(s_hIconSm); EndDialog(hwndDlg,LOWORD(wParam));

12 months

[reactos] 02/02: [MSVCRT] Add asm wrapper around RtlUnwind for Wine code

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92db51883abd474f3c3fe… commit 92db51883abd474f3c3fe3d788a4b5e4201f8515 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 8 21:55:15 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jan 13 19:39:23 2024 +0200 [MSVCRT] Add asm wrapper around RtlUnwind for Wine code This is needed, because Wine code expects RtlUnwind to restore the non-volatile registers, before returning, but ours / the native one doesn't do that. Should fix CORE-19392 and CORE-19397 --- sdk/lib/crt/crt.cmake | 1 + sdk/lib/crt/wine/msvcrt.h | 13 ++++++++++++ sdk/lib/crt/wine/rosglue_i386.s | 47 +++++++++++++++++++++++++++++++++++++++++ sdk/lib/crt/wine/wine.cmake | 3 +++ 4 files changed, 64 insertions(+) diff --git a/sdk/lib/crt/crt.cmake b/sdk/lib/crt/crt.cmake index 91f9d4a074e..f4868b27080 100644 --- a/sdk/lib/crt/crt.cmake +++ b/sdk/lib/crt/crt.cmake @@ -31,6 +31,7 @@ list(APPEND CRT_ASM_SOURCE ${CRT_SETJMP_ASM_SOURCE} ${CRT_STDLIB_ASM_SOURCE} ${CRT_STRING_ASM_SOURCE} + ${CRT_WINE_ASM_SOURCE} ) set_source_files_properties(${CRT_ASM_SOURCE} PROPERTIES COMPILE_DEFINITIONS "__MINGW_IMPORT=extern;USE_MSVCRT_PREFIX;_MSVCRT_LIB_;_MSVCRT_;_MT;CRTDLL") diff --git a/sdk/lib/crt/wine/msvcrt.h b/sdk/lib/crt/wine/msvcrt.h index d5dc4cd5366..47199794248 100644 --- a/sdk/lib/crt/wine/msvcrt.h +++ b/sdk/lib/crt/wine/msvcrt.h @@ -1489,6 +1489,19 @@ typedef struct { #ifdef __REACTOS__ #define __wine_longjmp longjmp #define __wine_jmp_buf _JBTYPE + +#ifdef _M_IX86 +// ASM wrapper for Wine code. See rosglue_i386.s for implementation. +void +WINAPI +__wine__RtlUnwind( + struct _EXCEPTION_REGISTRATION_RECORD* pEndFrame, + PVOID targetIp, + struct _EXCEPTION_RECORD* pRecord, + PVOID retval); +#define RtlUnwind __wine__RtlUnwind +#endif /* _M_IX86 */ + #endif #endif /* __WINE_MSVCRT_H */ diff --git a/sdk/lib/crt/wine/rosglue_i386.s b/sdk/lib/crt/wine/rosglue_i386.s new file mode 100644 index 00000000000..bc0b9b384fe --- /dev/null +++ b/sdk/lib/crt/wine/rosglue_i386.s @@ -0,0 +1,47 @@ + +#include <asm.inc> + +.code + +EXTERN _RtlUnwind@16:PROC + +// ASM wrapper for Wine code. This is needed, because Wine code expects +// RtlUnwind to restore the non-volatile registers, before returning, but +// ours / the native one does not do that. +// +// void +// WINAPI +// __wine__RtlUnwind( +// PVOID TargetFrame, +// PVOID TargetIp , +// PEXCEPTION_RECORD ExceptionRecord , +// PVOID ReturnValue); +// +PUBLIC ___wine__RtlUnwind@16 +___wine__RtlUnwind@16: + + push ebp + mov ebp, esp + + /* Save non-volatile registers */ + push ebx + push esi + push edi + + /* Call the native function */ + push dword ptr [ebp + 20] // ReturnValue + push dword ptr [ebp + 16] // ExceptionRecord + push dword ptr [ebp + 12] // TargetIp + push dword ptr [ebp + 8] // TargetFrame + call _RtlUnwind@16 + + /* Restore non-volatile registers */ + pop edi + pop esi + pop ebx + + mov esp, ebp + pop ebp + ret 16 + +END diff --git a/sdk/lib/crt/wine/wine.cmake b/sdk/lib/crt/wine/wine.cmake index d16da073c31..f279fe8bc72 100644 --- a/sdk/lib/crt/wine/wine.cmake +++ b/sdk/lib/crt/wine/wine.cmake @@ -10,6 +10,9 @@ if(ARCH STREQUAL "i386") list(APPEND CRT_WINE_SOURCE wine/except_i386.c ) + list(APPEND CRT_WINE_ASM_SOURCE + wine/rosglue_i386.s + ) elseif(ARCH STREQUAL "amd64") list(APPEND CRT_WINE_SOURCE wine/except_x86_64.c

12 months

[reactos] 01/02: [NTDLL_APITEST] Add test for x86 RtlUnwind

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d52b70a73e75293f03aa5… commit d52b70a73e75293f03aa5d5c2d6fe2d6aaaa901c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 8 19:53:28 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jan 13 19:39:23 2024 +0200 [NTDLL_APITEST] Add test for x86 RtlUnwind --- modules/rostests/apitests/ntdll/testlist.c | 4 ++ modules/rostests/apitests/rtl/CMakeLists.txt | 4 ++ modules/rostests/apitests/rtl/i386/RtlUnwind-asm.s | 76 ++++++++++++++++++++++ modules/rostests/apitests/rtl/i386/RtlUnwind.c | 58 +++++++++++++++++ modules/rostests/apitests/rtl/testlist.c | 4 ++ 5 files changed, 146 insertions(+) diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index a34b06f12d7..f837fa29f8f 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -94,6 +94,7 @@ extern void func_RtlRemovePrivileges(void); extern void func_RtlUnicodeStringToAnsiString(void); extern void func_RtlUnicodeStringToCountedOemString(void); extern void func_RtlUnicodeToOemN(void); +extern void func_RtlUnwind(void); extern void func_RtlUpcaseUnicodeStringToCountedOemString(void); extern void func_RtlValidateUnicodeString(void); extern void func_RtlxUnicodeStringToAnsiSize(void); @@ -201,6 +202,9 @@ const struct test winetest_testlist[] = { "StackOverflow", func_StackOverflow }, { "TimerResolution", func_TimerResolution }, { "UserModeException", func_UserModeException }, +#ifdef _M_IX86 + { "RtlUnwind", func_RtlUnwind }, +#endif #ifdef _M_AMD64 { "RtlCaptureContext", func_RtlCaptureContext }, #endif diff --git a/modules/rostests/apitests/rtl/CMakeLists.txt b/modules/rostests/apitests/rtl/CMakeLists.txt index 13bd9b7a718..49d87415d1a 100644 --- a/modules/rostests/apitests/rtl/CMakeLists.txt +++ b/modules/rostests/apitests/rtl/CMakeLists.txt @@ -7,6 +7,10 @@ list(APPEND SOURCE if(ARCH STREQUAL "i386") list(APPEND SOURCE i386/RtlCaptureContext.c + i386/RtlUnwind.c + ) + list(APPEND ASM_SOURCE + i386/RtlUnwind-asm.s ) elseif(ARCH STREQUAL "amd64") list(APPEND ASM_SOURCE diff --git a/modules/rostests/apitests/rtl/i386/RtlUnwind-asm.s b/modules/rostests/apitests/rtl/i386/RtlUnwind-asm.s new file mode 100644 index 00000000000..f9027ada782 --- /dev/null +++ b/modules/rostests/apitests/rtl/i386/RtlUnwind-asm.s @@ -0,0 +1,76 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test helper for x86 RtlUnwind + * COPYRIGHT: Copyright 2024 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <asm.inc> +#include <ks386.inc> + +.code + +EXTERN _g_InContext:DWORD +EXTERN _g_OutContext:DWORD +EXTERN _RtlUnwind@16:PROC + +// +// VOID +// WINAPI +// RtlUnwindWrapper( +// _In_ PVOID TargetFrame, +// _In_ PVOID TargetIp, +// _In_ PEXCEPTION_RECORD ExceptionRecord, +// _In_ PVOID ReturnValue); +// +PUBLIC _RtlUnwindWrapper@16 +FUNC _RtlUnwindWrapper@16 + + push ebp + mov ebp, esp + + /* Save non-volatile registers */ + push ebx + push esi + push edi + + /* Load registers from the in-context */ + mov eax, _g_InContext[CONTEXT_EAX] + mov ebx, _g_InContext[CONTEXT_EBX] + mov ecx, _g_InContext[CONTEXT_ECX] + mov edx, _g_InContext[CONTEXT_EDX] + mov esi, _g_InContext[CONTEXT_ESI] + mov edi, _g_InContext[CONTEXT_EDI] + + /* Call the native function */ + push dword ptr [ebp + 20] // ReturnValue + push dword ptr [ebp + 16] // ExceptionRecord + push dword ptr [ebp + 12] // TargetIp + push dword ptr [ebp + 8] // TargetFrame + call _RtlUnwind@16 + + /* Save registers in the out-context */ + mov _g_OutContext[CONTEXT_EAX], eax + mov _g_OutContext[CONTEXT_EBX], ebx + mov _g_OutContext[CONTEXT_ECX], ecx + mov _g_OutContext[CONTEXT_EDX], edx + mov _g_OutContext[CONTEXT_ESI], esi + mov _g_OutContext[CONTEXT_EDI], edi + mov word ptr _g_OutContext[CONTEXT_SEGCS], cs + mov word ptr _g_OutContext[CONTEXT_SEGDS], ds + mov word ptr _g_OutContext[CONTEXT_SEGES], es + mov word ptr _g_OutContext[CONTEXT_SEGFS], fs + + /* Restore non-volatile registers */ + pop edi + pop esi + pop ebx + + mov esp, ebp + pop ebp + ret 16 + +ENDFUNC + + +END diff --git a/modules/rostests/apitests/rtl/i386/RtlUnwind.c b/modules/rostests/apitests/rtl/i386/RtlUnwind.c new file mode 100644 index 00000000000..958c1318cea --- /dev/null +++ b/modules/rostests/apitests/rtl/i386/RtlUnwind.c @@ -0,0 +1,58 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for x86 RtlUnwind + * COPYRIGHT: Copyright 2024 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <rtltests.h> + +CONTEXT g_InContext; +CONTEXT g_OutContext; + +VOID +WINAPI +RtlUnwindWrapper( + _In_ PVOID TargetFrame, + _In_ PVOID TargetIp, + _In_ PEXCEPTION_RECORD ExceptionRecord, + _In_ PVOID ReturnValue); + +START_TEST(RtlUnwind) +{ + BOOL IsWow64; + + RtlZeroMemory(&g_InContext, sizeof(g_InContext)); + RtlZeroMemory(&g_OutContext, sizeof(g_OutContext)); + + PEXCEPTION_REGISTRATION_RECORD ExcptReg = (PEXCEPTION_REGISTRATION_RECORD)__readfsdword(0); + ok(ExcptReg != NULL, "ExcpReg is NULL\n"); + + g_InContext.Eax = 0xabcd0001; + g_InContext.Ebx = 0xabcd0002; + g_InContext.Ecx = 0xabcd0003; + g_InContext.Edx = 0xabcd0004; + g_InContext.Esi = 0xabcd0005; + g_InContext.Edi = 0xabcd0006; + RtlUnwindWrapper(ExcptReg, NULL, NULL, (PVOID)0x12345678); + ok_eq_hex(g_OutContext.Eax, 0x12345678ul); + ok_eq_hex(g_OutContext.Ebx, 0ul); + ok_eq_hex(g_OutContext.Ecx, 0ul); + ok_eq_hex(g_OutContext.Edx, 0ul); + ok_eq_hex(g_OutContext.Esi, 0ul); + ok_eq_hex(g_OutContext.Edi, 0ul); + if (IsWow64Process(NtCurrentProcess(), &IsWow64) && IsWow64) + { + ok_eq_hex(g_OutContext.SegCs, 0x23ul); + ok_eq_hex(g_OutContext.SegDs, 0x2bul); + ok_eq_hex(g_OutContext.SegEs, 0x2bul); + ok_eq_hex(g_OutContext.SegFs, 0x53ul); + } + else + { + ok_eq_hex(g_OutContext.SegCs, 0x1bul); + ok_eq_hex(g_OutContext.SegDs, 0x23ul); + ok_eq_hex(g_OutContext.SegEs, 0x23ul); + ok_eq_hex(g_OutContext.SegFs, 0x3bul); + } +} diff --git a/modules/rostests/apitests/rtl/testlist.c b/modules/rostests/apitests/rtl/testlist.c index 1eeed3b056b..62e2694add8 100644 --- a/modules/rostests/apitests/rtl/testlist.c +++ b/modules/rostests/apitests/rtl/testlist.c @@ -5,11 +5,15 @@ extern void func_RtlCaptureContext(void); extern void func_RtlIntSafe(void); +extern void func_RtlUnwind(void); const struct test winetest_testlist[] = { { "RtlIntSafe", func_RtlIntSafe }, +#ifdef _M_IX86 + { "RtlUnwind", func_RtlUnwind }, +#endif #ifdef _M_AMD64 { "RtlCaptureContext", func_RtlCaptureContext }, #endif

12 months

[reactos] 03/03: [TCPIP] Remove code duplication to get max link speed, MTU and max packet size

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=382836f08758055948a52… commit 382836f08758055948a52f3f20c1d33ec00e2a8c Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Dec 13 19:59:43 2023 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Jan 13 15:23:46 2024 +0100 [TCPIP] Remove code duplication to get max link speed, MTU and max packet size This is already done when link goes up, in ReconfigureAdapter() function. --- drivers/network/tcpip/datalink/lan.c | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/drivers/network/tcpip/datalink/lan.c b/drivers/network/tcpip/datalink/lan.c index 1da4e2129d6..e24c8985472 100644 --- a/drivers/network/tcpip/datalink/lan.c +++ b/drivers/network/tcpip/datalink/lan.c @@ -1371,38 +1371,6 @@ BOOLEAN BindAdapter( TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n", &IF->Description)); - /* Get maximum link speed */ - NdisStatus = NDISCall(Adapter, - NdisRequestQueryInformation, - OID_GEN_LINK_SPEED, - &IF->Speed, - sizeof(UINT)); - - if (!NT_SUCCESS(NdisStatus)) - IF->Speed = IP_DEFAULT_LINK_SPEED; - - Adapter->Speed = IF->Speed * 100L; - - /* Get maximum frame size */ - NdisStatus = NDISCall(Adapter, - NdisRequestQueryInformation, - OID_GEN_MAXIMUM_FRAME_SIZE, - &Adapter->MTU, - sizeof(UINT)); - if (NdisStatus != NDIS_STATUS_SUCCESS) - return FALSE; - - IF->MTU = Adapter->MTU; - - /* Get maximum packet size */ - NdisStatus = NDISCall(Adapter, - NdisRequestQueryInformation, - OID_GEN_MAXIMUM_TOTAL_SIZE, - &Adapter->MaxPacketSize, - sizeof(UINT)); - if (NdisStatus != NDIS_STATUS_SUCCESS) - return FALSE; - /* Register interface with IP layer */ IPRegisterInterface(IF);

12 months

[reactos] 02/03: [TCPIP] Call netif_set_link_up/netif_set_link_down after link status change

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89b685007a4265d764845… commit 89b685007a4265d764845e42afa5e8b20894d9be Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Dec 13 19:56:52 2023 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Jan 13 15:23:46 2024 +0100 [TCPIP] Call netif_set_link_up/netif_set_link_down after link status change - Update TCP cached information only after updating adapter information (so that TCPUpdateInterfaceIPInformation/TCPUpdateInterfaceLinkStatus gets new status) - Call netif_set_link_up/netif_set_link_down in TCPUpdateInterfaceLinkStatus This fixes a lwIP requirement: 2007-07-13 Jared Grubb (integrated by Frédéric Bernon) * [...] Be carefull for port maintainers to add the NETIF_FLAG_LINK_UP flag (like in ethernetif.c) if you want to be sure to be compatible with future changes... --- drivers/network/tcpip/datalink/lan.c | 8 ++++---- drivers/network/tcpip/ip/transport/tcp/if.c | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/network/tcpip/datalink/lan.c b/drivers/network/tcpip/datalink/lan.c index ccd0f555ef5..1da4e2129d6 100644 --- a/drivers/network/tcpip/datalink/lan.c +++ b/drivers/network/tcpip/datalink/lan.c @@ -750,10 +750,6 @@ BOOLEAN ReconfigureAdapter(PRECONFIGURE_CONTEXT Context) Context->Adapter->CompletingReset = FALSE; - /* Update the IP and link status information cached in TCP */ - TCPUpdateInterfaceIPInformation(Interface); - TCPUpdateInterfaceLinkStatus(Interface); - if (Context->State == LAN_STATE_STARTED) { /* Get maximum link speed */ @@ -791,6 +787,10 @@ BOOLEAN ReconfigureAdapter(PRECONFIGURE_CONTEXT Context) Adapter->State = Context->State; + /* Update the IP and link status information cached in TCP */ + TCPUpdateInterfaceIPInformation(Interface); + TCPUpdateInterfaceLinkStatus(Interface); + return TRUE; } diff --git a/drivers/network/tcpip/ip/transport/tcp/if.c b/drivers/network/tcpip/ip/transport/tcp/if.c index aba55d23abd..e69c3667fc3 100644 --- a/drivers/network/tcpip/ip/transport/tcp/if.c +++ b/drivers/network/tcpip/ip/transport/tcp/if.c @@ -6,6 +6,7 @@ #include "lwip/ip.h" #include "lwip/api.h" #include "lwip/tcpip.h" +#include <ipifcons.h> err_t TCPSendDataCallback(struct netif *netif, struct pbuf *p, struct ip_addr *dest) @@ -80,7 +81,6 @@ TCPSendDataCallback(struct netif *netif, struct pbuf *p, struct ip_addr *dest) VOID TCPUpdateInterfaceLinkStatus(PIP_INTERFACE IF) { -#if 0 ULONG OperationalStatus; GetInterfaceConnectionStatus(IF, &OperationalStatus); @@ -89,7 +89,6 @@ TCPUpdateInterfaceLinkStatus(PIP_INTERFACE IF) netif_set_link_up(IF->TCPContext); else netif_set_link_down(IF->TCPContext); -#endif } err_t

12 months

[reactos] 01/03: [TCPIP] Get max link speed, MTU and max packet size when adapter is connected

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e3d34d97b7b687bac71d… commit 3e3d34d97b7b687bac71d48269e7279d5ea0a6de Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Dec 13 19:54:50 2023 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Jan 13 15:23:46 2024 +0100 [TCPIP] Get max link speed, MTU and max packet size when adapter is connected --- drivers/network/tcpip/datalink/lan.c | 71 ++++++++++++++++-------------------- drivers/network/tcpip/include/lan.h | 2 +- 2 files changed, 33 insertions(+), 40 deletions(-) diff --git a/drivers/network/tcpip/datalink/lan.c b/drivers/network/tcpip/datalink/lan.c index 0440c098f49..ccd0f555ef5 100644 --- a/drivers/network/tcpip/datalink/lan.c +++ b/drivers/network/tcpip/datalink/lan.c @@ -718,7 +718,7 @@ BOOLEAN ReconfigureAdapter(PRECONFIGURE_CONTEXT Context) { PLAN_ADAPTER Adapter = Context->Adapter; PIP_INTERFACE Interface = Adapter->Context; - //NDIS_STATUS NdisStatus; + NDIS_STATUS NdisStatus; IP_ADDRESS DefaultMask; /* Initialize the default unspecified address (0.0.0.0) */ @@ -754,47 +754,40 @@ BOOLEAN ReconfigureAdapter(PRECONFIGURE_CONTEXT Context) TCPUpdateInterfaceIPInformation(Interface); TCPUpdateInterfaceLinkStatus(Interface); - /* We're done here if the adapter isn't connected */ - if (Context->State != LAN_STATE_STARTED) + if (Context->State == LAN_STATE_STARTED) { - Adapter->State = Context->State; - return TRUE; - } - - /* NDIS Bug! */ -#if 0 - /* Get maximum link speed */ - NdisStatus = NDISCall(Adapter, - NdisRequestQueryInformation, - OID_GEN_LINK_SPEED, - &Interface->Speed, - sizeof(UINT)); - - if (!NT_SUCCESS(NdisStatus)) - Interface->Speed = IP_DEFAULT_LINK_SPEED; - - Adapter->Speed = Interface->Speed * 100L; - - /* Get maximum frame size */ - NdisStatus = NDISCall(Adapter, - NdisRequestQueryInformation, - OID_GEN_MAXIMUM_FRAME_SIZE, - &Adapter->MTU, - sizeof(UINT)); - if (NdisStatus != NDIS_STATUS_SUCCESS) - return FALSE; + /* Get maximum link speed */ + NdisStatus = NDISCall(Adapter, + NdisRequestQueryInformation, + OID_GEN_LINK_SPEED, + &Interface->Speed, + sizeof(Interface->Speed)); + + if (!NT_SUCCESS(NdisStatus)) + Interface->Speed = IP_DEFAULT_LINK_SPEED; + + Adapter->Speed = Interface->Speed * 100L; + + /* Get maximum frame size */ + NdisStatus = NDISCall(Adapter, + NdisRequestQueryInformation, + OID_GEN_MAXIMUM_FRAME_SIZE, + &Adapter->MTU, + sizeof(Adapter->MTU)); + if (NdisStatus != NDIS_STATUS_SUCCESS) + return FALSE; - Interface->MTU = Adapter->MTU; + Interface->MTU = Adapter->MTU; - /* Get maximum packet size */ - NdisStatus = NDISCall(Adapter, - NdisRequestQueryInformation, - OID_GEN_MAXIMUM_TOTAL_SIZE, - &Adapter->MaxPacketSize, - sizeof(UINT)); - if (NdisStatus != NDIS_STATUS_SUCCESS) - return FALSE; -#endif + /* Get maximum packet size */ + NdisStatus = NDISCall(Adapter, + NdisRequestQueryInformation, + OID_GEN_MAXIMUM_TOTAL_SIZE, + &Adapter->MaxPacketSize, + sizeof(Adapter->MaxPacketSize)); + if (NdisStatus != NDIS_STATUS_SUCCESS) + return FALSE; + } Adapter->State = Context->State; diff --git a/drivers/network/tcpip/include/lan.h b/drivers/network/tcpip/include/lan.h index ab8f4bc5ba6..f99f588188e 100644 --- a/drivers/network/tcpip/include/lan.h +++ b/drivers/network/tcpip/include/lan.h @@ -52,7 +52,7 @@ typedef struct LAN_ADAPTER { UCHAR BCastCheck; /* Value to check against */ UCHAR BCastOffset; /* Offset in frame to check against */ UCHAR HeaderSize; /* Size of link-level header */ - USHORT MTU; /* Maximum Transfer Unit */ + UINT MTU; /* Maximum Transfer Unit */ UINT MinFrameSize; /* Minimum frame size in bytes */ UINT MaxPacketSize; /* Maximum packet size when sending */ UINT MaxSendPackets; /* Maximum number of packets per send */

12 months

[reactos] 01/01: [CRT_APITEST] Fix some Vista+ tests

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c9037fff1d9ced4e5996… commit 4c9037fff1d9ced4e59962aef5860bd1ddfe9f62 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Oct 5 09:43:25 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jan 13 15:15:47 2024 +0200 [CRT_APITEST] Fix some Vista+ tests --- modules/rostests/apitests/crt/crtdata.c | 157 ++++++++++++++++++++++---------- 1 file changed, 111 insertions(+), 46 deletions(-) diff --git a/modules/rostests/apitests/crt/crtdata.c b/modules/rostests/apitests/crt/crtdata.c index baf73a2f278..c5606ce56fb 100644 --- a/modules/rostests/apitests/crt/crtdata.c +++ b/modules/rostests/apitests/crt/crtdata.c @@ -24,6 +24,20 @@ int IsLocalSymbol(void* Address) return ((Address >= (void*)&__ImageBase) && (Address <= s_ImageEnd)); } +// Dynamically imported functions (Vista+) +int* (__cdecl *p__daylight)(void); +long* (__cdecl *p__dstbias)(void); +errno_t (__cdecl *p_get_fmode)(int* _PMode); +errno_t (__cdecl *p_get_osplatform)(unsigned int *pValue); +int (__cdecl *p_get_pgmptr)(char** p); +errno_t (__cdecl *p_get_wpgmptr)(_Outptr_result_z_ wchar_t **_Value); +errno_t (__cdecl *p_get_winver)(_Out_ unsigned int *_Value); +errno_t (__cdecl *p_get_winmajor)(_Out_ unsigned int *_Value); +errno_t (__cdecl *p_get_winminor)(_Out_ unsigned int *_Value); +errno_t (__cdecl *p_get_environ)(_Out_ char***); +errno_t (__cdecl *p_get_wenviron)(_Out_ wchar_t***); + + #ifndef TEST_STATIC #define test_is_local_symbol(addr, is) ok_int(IsLocalSymbol(addr), (is)) #else @@ -293,10 +307,10 @@ void Test__daylight(void) _CRTIMP void* __p__daylight(void); ok_ptr(__p__daylight(), &_daylight); #endif -#if (WINVER >= 0x600) - _CRTIMP int* __cdecl __daylight(void); - ok_ptr(&__daylight, &_daylight); -#endif + if (p__daylight != NULL) + { + ok_ptr(p__daylight(), &_daylight); + } } #ifndef _M_ARM @@ -312,10 +326,10 @@ void Test__dstbias(void) _CRTIMP long* __cdecl __p__dstbias(void); ok_ptr(__p__dstbias(), &_dstbias); #endif -#if (WINVER >= 0x600) - _CRTIMP long* __cdecl __dstbias(void); - ok_ptr(&__dstbias, &_dstbias); -#endif + if (p__dstbias != NULL) + { + ok_ptr(p__dstbias(), &_dstbias); + } } void Test__environ(void) @@ -329,6 +343,12 @@ void Test__environ(void) #ifdef _M_IX86 ok_ptr(__p__environ(), &_environ); #endif + if (p_get_environ != NULL) + { + char** result_environ; + ok_int(p_get_environ(&result_environ), 0); + ok_ptr(result_environ, _environ); + } } void Test__fileinfo(void) @@ -358,14 +378,15 @@ void Test__fmode(void) ok_ptr(__p__fmode(), p); #endif -#if (_WIN32_WINNT >= 0x600) - _fmode = 1234; - _CRTIMP errno_t __cdecl _get_fmode(_Out_ int* _PMode); - int mode; - ok_int(_get_fmode(&mode), 0); - ok_int(mode, _fmode); - _fmode = 0; -#endif + if (p_get_fmode != NULL) + { + _fmode = 1234; + + int mode; + ok_int(p_get_fmode(&mode), 0); + ok_int(mode, _fmode); + _fmode = 0; + } } void Test__iob(void) @@ -420,10 +441,12 @@ void Test__mbctype(void) void Test__osplatform(void) { ok_int(_osplatform, s_osvi.dwPlatformId); -#if (WINVER >= 0x600) - _CRTIMP unsigned int __cdecl _get_osplatform(void); - ok_ptr(_get_osplatform(), _osplatform); -#endif + if (p_get_osplatform != NULL) + { + unsigned int result_osplatform; + ok_int(p_get_osplatform(&result_osplatform), 0); + ok_int(result_osplatform, _osplatform); + } } #endif @@ -448,10 +471,12 @@ void Test__pgmptr(void) #ifdef _M_IX86 ok_ptr(__p__pgmptr(), &_pgmptr); #endif -#if (WINVER >= 0x600) - _CRTIMP char* __cdecl _get_pgmptr(void); - ok_ptr(_get_pgmptr(), _pgmptr); -#endif + if (p_get_pgmptr != NULL) + { + char *result_pgmptr; + ok_int(p_get_pgmptr(&result_pgmptr), 0); + ok_ptr(result_pgmptr, _pgmptr); + } } void Test__sys_errlist(void) @@ -505,10 +530,6 @@ void Test__tzname(void) _CRTIMP char** __p__tzname(); ok_ptr(__p__tzname(), &_tzname); #endif -#if (WINVER >= 0x600) - _CRTIMP char* __cdecl __tzname(void); - ok_ptr(__tzname(), _wenviron); -#endif } void Test__wcmdln(void) @@ -532,9 +553,14 @@ void Test__wenviron(void) #ifdef _M_IX86 ok_ptr(__p__wenviron(), &_wenviron); #endif -#if (WINVER >= 0x600) - _CRTIMP unsigned int __cdecl _get_wenviron(void); - ok_int(_get_wenviron(), _wenviron); + +#if 0 // FIXME: This returns an error / NULL on Windows 10 + if (p_get_wenviron != NULL) + { + wchar_t** result_wenviron; + ok_int(p_get_wenviron(&result_wenviron), 0); + ok_ptr(result_wenviron, _wenviron); + } #endif } #endif @@ -546,10 +572,12 @@ void Test__winmajor(void) _CRTIMP unsigned int* __cdecl __p__winmajor(); ok_ptr(__p__winmajor(), &_winmajor); #endif -#if (WINVER >= 0x600) - _CRTIMP unsigned int __cdecl _get_winmajor(void); - ok_int(_get_winmajor(), _winmajor); -#endif + if (p_get_winmajor != NULL) + { + unsigned int result_winmajor; + ok_int(p_get_winmajor(&result_winmajor), 0); + ok_int(result_winmajor, _winmajor); + } } void Test__winminor(void) @@ -559,10 +587,12 @@ void Test__winminor(void) _CRTIMP unsigned int* __cdecl __p__winminor(); ok_ptr(__p__winminor(), &_winminor); #endif -#if (WINVER >= 0x600) - _CRTIMP unsigned int __cdecl _get_winminor(void); - ok_int(_get_winminor(), _winminor); -#endif + if (p_get_winminor != NULL) + { + unsigned int result_winminor; + ok_int(p_get_winminor(&result_winminor), 0); + ok_int(result_winminor, _winminor); + } } #ifndef _M_ARM @@ -573,10 +603,12 @@ void Test__winver(void) _CRTIMP unsigned int* __cdecl __p__winver(); ok_ptr(__p__winver(), &_winver); #endif -#if (WINVER >= 0x600) - _CRTIMP unsigned int __cdecl _get_winver(void); - ok_int(_get_winver(), _winver); -#endif + if (p_get_winver != NULL) + { + unsigned int result_winver; + ok_int(p_get_winver(&result_winver), 0); + ok_int(result_winver, _winver); + } } #endif @@ -592,9 +624,14 @@ void Test__wpgmptr(void) _CRTIMP wchar_t ** __cdecl __p__wpgmptr(); ok_ptr(__p__wpgmptr(), &_wpgmptr); #endif -#if (WINVER >= 0x600) - _CRTIMP unsigned int __cdecl _get_wpgmptr(void); - ok_int(_get_wpgmptr(), _wpgmptr); + +#if 0 // FIXME: This returns an error on Windows 10 + if (p_get_wpgmptr != NULL) + { + wchar_t* result_wpgmptr; + ok_int(p_get_wpgmptr(&result_wpgmptr), 0); + ok_ptr(result_wpgmptr, _wpgmptr); + } #endif } @@ -609,6 +646,34 @@ START_TEST(crtdata) s_osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); GetVersionExW(&s_osvi); + HMODULE hmsvcrt = GetModuleHandleA("msvcrt.dll"); + p__daylight = (void*)GetProcAddress(hmsvcrt, "__daylight"); + p__dstbias = (void*)GetProcAddress(hmsvcrt, "__dstbias"); + p_get_fmode = (void*)GetProcAddress(hmsvcrt, "_get_fmode"); + p_get_osplatform = (void*)GetProcAddress(hmsvcrt, "_get_osplatform"); + p_get_pgmptr = (void*)GetProcAddress(hmsvcrt, "_get_pgmptr"); + p_get_wpgmptr = (void*)GetProcAddress(hmsvcrt, "_get_wpgmptr"); + p_get_winver = (void*)GetProcAddress(hmsvcrt, "_get_winver"); + p_get_winmajor = (void*)GetProcAddress(hmsvcrt, "_get_winmajor"); + p_get_winminor = (void*)GetProcAddress(hmsvcrt, "_get_winminor"); + p_get_environ = (void*)GetProcAddress(hmsvcrt, "_get_environ"); + p_get_wenviron = (void*)GetProcAddress(hmsvcrt, "_get_wenviron"); + + if (s_osvi.dwMajorVersion >= 6) + { + ok(p__daylight != NULL, "__daylight is NULL\n"); + ok(p__dstbias != NULL, "__dstbias is NULL\n"); + ok(p_get_fmode != NULL, "_get_fmode is NULL\n"); + ok(p_get_osplatform != NULL, "_get_osplatform is NULL\n"); + ok(p_get_pgmptr != NULL, "_get_pgmptr is NULL\n"); + ok(p_get_wpgmptr != NULL, "_get_wpgmptr is NULL\n"); + ok(p_get_winver != NULL, "_get_winver is NULL\n"); + ok(p_get_winmajor != NULL, "_get_winmajor is NULL\n"); + ok(p_get_winminor != NULL, "_get_winminor is NULL\n"); + ok(p_get_environ != NULL, "_get_environ is NULL\n"); + ok(p_get_wenviron != NULL, "_get_wenviron is NULL\n"); + } + Test___argc(); Test___argv(); Test___badioinfo();

12 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs