Ros-diffs January 2025

ros-diffs@reactos.org

23 participants
278 discussions

[reactos] 01/01: [NTOS:MM] Do not use PAGE_ROUND_DOWN for LONGLONG values (#7603)

by Vincent Franchomme

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ada5978d023504e591bc… commit 6ada5978d023504e591bce2fd91d48ed7c262fd6 Author: Vincent Franchomme <franchomme.vincent(a)gmail.com> AuthorDate: Thu Jan 16 04:30:38 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 16 10:30:38 2025 +0700 [NTOS:MM] Do not use PAGE_ROUND_DOWN for LONGLONG values (#7603) PAGE_ROUND_DOWN macro seems to not work correctly with LONGLONG values. It creates some random freezes in the 1st-stage setup after commit 69bf14050686f81db153c70df4f874b5dfa4a5ff. It's fixed by creating PAGE_ROUND_UP_64 and PAGE_ROUND_DOWN_64 macros for 64-bit only data types. --------- Co-authored-by: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> --- ntoskrnl/include/internal/mm.h | 7 +++++++ ntoskrnl/mm/section.c | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 91bf7599df2..1c3870d6370 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -131,6 +131,13 @@ typedef ULONG_PTR SWAPENTRY; #define MM_ROUND_DOWN(x,s) \ ((PVOID)(((ULONG_PTR)(x)) & ~((ULONG_PTR)(s)-1))) +/* PAGE_ROUND_UP and PAGE_ROUND_DOWN equivalent, with support for 64-bit-only data types */ +#define PAGE_ROUND_UP_64(x) \ + (((x) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)) + +#define PAGE_ROUND_DOWN_64(x) \ + ((x) & ~(PAGE_SIZE - 1)) + #define PAGE_FLAGS_VALID_FOR_SECTION \ (PAGE_READONLY | \ PAGE_READWRITE | \ diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 73b414315fe..d570dbc3cec 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -4876,7 +4876,7 @@ MmPurgeSegment( } /* Find byte offset of the page to start */ - PurgeStart.QuadPart = PAGE_ROUND_DOWN(PurgeStart.QuadPart); + PurgeStart.QuadPart = PAGE_ROUND_DOWN_64(PurgeStart.QuadPart); while (PurgeStart.QuadPart < PurgeEnd.QuadPart) { @@ -4947,7 +4947,7 @@ MmIsDataSectionResident( return FALSE; /* Find byte offset of the page to start */ - RangeStart.QuadPart = PAGE_ROUND_DOWN(RangeStart.QuadPart); + RangeStart.QuadPart = PAGE_ROUND_DOWN_64(RangeStart.QuadPart); MmLockSectionSegment(Segment); @@ -5010,7 +5010,7 @@ MmMakeSegmentDirty( return STATUS_NOT_MAPPED_VIEW; /* Find byte offset of the page to start */ - RangeStart.QuadPart = PAGE_ROUND_DOWN(RangeStart.QuadPart); + RangeStart.QuadPart = PAGE_ROUND_DOWN_64(RangeStart.QuadPart); MmLockSectionSegment(Segment); @@ -5098,7 +5098,7 @@ MmFlushSegment( } /* Find byte offset of the page to start */ - FlushStart.QuadPart = PAGE_ROUND_DOWN(FlushStart.QuadPart); + FlushStart.QuadPart = PAGE_ROUND_DOWN_64(FlushStart.QuadPart); while (FlushStart.QuadPart < FlushEnd.QuadPart) {

3 weeks

[reactos] 03/03: [NTOS:MM] MiBalancerThread: Formatting fixes

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=190f710942b7f6cb45307… commit 190f710942b7f6cb45307ca51afcd14b7a0f9ada Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Thu Dec 26 16:34:21 2024 +0700 Commit: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> CommitDate: Wed Jan 15 16:10:55 2025 +0700 [NTOS:MM] MiBalancerThread: Formatting fixes --- ntoskrnl/mm/balance.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index eb5e6f1d05f..6e3c51f9ded 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -349,20 +349,20 @@ CcRosTrimCache( _In_ ULONG Target, _Out_ PULONG NrFreed); -VOID NTAPI +VOID +NTAPI MiBalancerThread(PVOID Unused) { PVOID WaitObjects[2]; NTSTATUS Status; - ULONG i; WaitObjects[0] = &MiBalancerEvent; WaitObjects[1] = &MiBalancerTimer; - while (1) + while (TRUE) { KeSetEvent(&MiBalancerDoneEvent, IO_NO_INCREMENT, FALSE); - Status = KeWaitForMultipleObjects(2, + Status = KeWaitForMultipleObjects(_countof(WaitObjects), WaitObjects, WaitAny, Executive, @@ -382,7 +382,7 @@ MiBalancerThread(PVOID Unused) ULONG OldTarget = InitialTarget; /* Trim each consumer */ - for (i = 0; i < MC_MAXIMUM; i++) + for (ULONG i = 0; i < MC_MAXIMUM; i++) { InitialTarget = MiTrimMemoryConsumer(i, InitialTarget); } @@ -397,7 +397,7 @@ MiBalancerThread(PVOID Unused) /* No pages left to swap! */ if (InitialTarget != 0 && - InitialTarget == OldTarget) + InitialTarget == OldTarget) { /* Game over */ KeBugCheck(NO_PAGES_AVAILABLE);

3 weeks

[reactos] 02/03: [NTOS:MM] MmRequestPageMemoryConsumer: Properly mark CORE-17624 delay hack

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c69ad5efa2d1962b69315… commit c69ad5efa2d1962b6931599fb36060edd09a14e5 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Tue Dec 24 20:02:23 2024 +0700 Commit: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> CommitDate: Wed Jan 15 16:10:55 2025 +0700 [NTOS:MM] MmRequestPageMemoryConsumer: Properly mark CORE-17624 delay hack Addendum to commit 2b14056600bae80532f7ab9320fdc0853a55e30a. --- ntoskrnl/mm/balance.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index bdb50c78707..eb5e6f1d05f 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -314,10 +314,12 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, PPFN_NUMBER AllocatedPage) { PFN_NUMBER Page; + + /* Delay some requests for the Memory Manager to recover pages (CORE-17624). + * FIXME: This is suboptimal. + */ static INT i = 0; static LARGE_INTEGER TinyTime = {{-1L, -1L}}; - - /* Delay some requests for the Memory Manager to recover pages */ if (i++ >= 100) { KeDelayExecutionThread(KernelMode, FALSE, &TinyTime);

3 weeks

[reactos] 01/03: [NTOS:MM] balance: Fix PageOutThreadActive value check

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8322459abcd634256d1e… commit a8322459abcd634256d1e61b04c4d1f35d6c2c90 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Tue Dec 24 15:30:58 2024 +0700 Commit: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> CommitDate: Wed Jan 15 16:10:55 2025 +0700 [NTOS:MM] balance: Fix PageOutThreadActive value check --- ntoskrnl/mm/balance.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index 3b11aeab2c8..bdb50c78707 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -289,7 +289,7 @@ VOID NTAPI MmRebalanceMemoryConsumers(VOID) { - // if (InterlockedCompareExchange(&PageOutThreadActive, 0, 1) == 0) + if (InterlockedCompareExchange(&PageOutThreadActive, 1, 0) == 0) { KeSetEvent(&MiBalancerEvent, IO_NO_INCREMENT, FALSE); } @@ -404,7 +404,11 @@ MiBalancerThread(PVOID Unused) while (InitialTarget != 0); if (Status == STATUS_WAIT_0) - InterlockedDecrement(&PageOutThreadActive); + { + LONG Active = InterlockedExchange(&PageOutThreadActive, 0); + ASSERT(Active == 1); + DBG_UNREFERENCED_LOCAL_VARIABLE(Active); + } } else {

3 weeks

[reactos] 03/03: [WIDL] Reduce diff to Wine-4.0

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bba03c886c830ffa6d4eb… commit bba03c886c830ffa6d4ebe70e0c9bf34153c7dff Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Dec 14 17:40:44 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 15 08:29:53 2025 +0200 [WIDL] Reduce diff to Wine-4.0 --- sdk/tools/widl/CMakeLists.txt | 2 +- sdk/tools/widl/client.c | 2 +- sdk/tools/widl/hash.c | 6 +++--- sdk/tools/widl/parser.y | 2 -- sdk/tools/widl/register.c | 25 ++++--------------------- sdk/tools/widl/widl.h | 2 -- sdk/tools/widl/write_msft.c | 10 +++++----- 7 files changed, 14 insertions(+), 35 deletions(-) diff --git a/sdk/tools/widl/CMakeLists.txt b/sdk/tools/widl/CMakeLists.txt index 4c0818489d0..4346c14a188 100644 --- a/sdk/tools/widl/CMakeLists.txt +++ b/sdk/tools/widl/CMakeLists.txt @@ -35,7 +35,7 @@ list(APPEND SOURCE ../port/getopt1.c ../port/mkstemps.c) -add_definitions(-DINT16=SHORT) +add_definitions(-DINT16=SHORT -DLANG_SCOTTISH_GAELIC=0x91) add_host_tool(widl ${SOURCE}) target_link_libraries(widl PRIVATE host_includes wpphost) diff --git a/sdk/tools/widl/client.c b/sdk/tools/widl/client.c index 20ebd51a581..30b0dce5b8a 100644 --- a/sdk/tools/widl/client.c +++ b/sdk/tools/widl/client.c @@ -20,7 +20,7 @@ #include "config.h" #include "wine/port.h" - + #include <stdio.h> #include <stdlib.h> #ifdef HAVE_UNISTD_H diff --git a/sdk/tools/widl/hash.c b/sdk/tools/widl/hash.c index 673625ed1e3..249c824e9e0 100644 --- a/sdk/tools/widl/hash.c +++ b/sdk/tools/widl/hash.c @@ -543,10 +543,10 @@ unsigned int lhash_val_of_name_sys( syskind_t skind, LCID lcid, LPCSTR lpStr) case LANG_VIETNAMESE: case LANG_MALTESE: case LANG_IRISH: case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_TSWANA: case LANG_XHOSA: case LANG_ZULU: case LANG_WELSH: - case LANG_BRETON: case LANG_NEUTRAL: + case LANG_BRETON: case LANG_SCOTTISH_GAELIC: case LANG_NEUTRAL: /* some languages not in all windows versions or ReactOS */ -#ifdef LANG_GAELIC - case LANG_GAELIC: +#ifdef LANG_MANX_GAELIC + case LANG_MANX_GAELIC: #endif #ifdef LANG_TAJIK case LANG_TAJIK: diff --git a/sdk/tools/widl/parser.y b/sdk/tools/widl/parser.y index 63b70e9e47c..bbb03e8ef74 100644 --- a/sdk/tools/widl/parser.y +++ b/sdk/tools/widl/parser.y @@ -136,9 +136,7 @@ static struct namespace global_namespace = { static struct namespace *current_namespace = &global_namespace; -#ifndef __REACTOS__ static typelib_t *current_typelib; -#endif %} %union { diff --git a/sdk/tools/widl/register.c b/sdk/tools/widl/register.c index a6d1ef840f7..718d444cc7a 100644 --- a/sdk/tools/widl/register.c +++ b/sdk/tools/widl/register.c @@ -34,9 +34,7 @@ #include "parser.h" #include "header.h" #include "typegen.h" -#ifndef __REACTOS__ #include "typelib.h" -#endif static int indent; @@ -276,7 +274,6 @@ void write_regscript( const statement_list_t *stmts ) } } -#ifndef __REACTOS__ void write_typelib_regscript( const statement_list_t *stmts ) { const statement_t *stmt; @@ -289,17 +286,11 @@ void write_typelib_regscript( const statement_list_t *stmts ) if (count && !strendswith( typelib_name, ".res" )) error( "Cannot store multiple typelibs into %s\n", typelib_name ); else - { - if (do_old_typelib) - create_sltg_typelib( stmt->u.lib ); - else - create_msft_typelib( stmt->u.lib ); - } + create_msft_typelib( stmt->u.lib ); count++; } if (count && strendswith( typelib_name, ".res" )) flush_output_resources( typelib_name ); } -#endif void output_typelib_regscript( const typelib_t *typelib ) { @@ -309,9 +300,7 @@ void output_typelib_regscript( const typelib_t *typelib ) unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); unsigned int flags = 0; char id_part[12] = ""; -#ifndef __REACTOS__ char *resname = typelib_name; -#endif expr_t *expr; if (is_attr( typelib->attrs, ATTR_RESTRICTED )) flags |= 1; /* LIBFLAG_FRESTRICTED */ @@ -329,17 +318,14 @@ void output_typelib_regscript( const typelib_t *typelib ) MAJORVERSION(version), MINORVERSION(version), descr ? descr : typelib->name ); put_str( indent++, "{\n" ); expr = get_attrp( typelib->attrs, ATTR_ID ); -#ifdef __REACTOS__ - if (expr) - sprintf(id_part, "\\%d", expr->cval); -#else if (expr) { sprintf(id_part, "\\%d", expr->cval); +#ifndef __REACTOS__ resname = xmalloc( strlen(typelib_name) + 20 ); sprintf(resname, "%s\\%d", typelib_name, expr->cval); - } #endif + } put_str( indent, "'%x' { %s = s '%%MODULE%%%s' }\n", lcid_expr ? lcid_expr->cval : 0, pointer_size == 8 ? "win64" : "win32", id_part ); put_str( indent, "FLAGS = s '%u'\n", flags ); @@ -359,9 +345,6 @@ void output_typelib_regscript( const typelib_t *typelib ) write_progids( typelib->stmts ); put_str( --indent, "}\n" ); -#ifdef __REACTOS__ - add_output_to_resources( "WINE_REGISTRY", typelib_name ); -#else + add_output_to_resources( "WINE_REGISTRY", resname ); -#endif } diff --git a/sdk/tools/widl/widl.h b/sdk/tools/widl/widl.h index c015ec01384..3e015ca7e13 100644 --- a/sdk/tools/widl/widl.h +++ b/sdk/tools/widl/widl.h @@ -96,9 +96,7 @@ extern void write_proxies(const statement_list_t *stmts); extern void write_client(const statement_list_t *stmts); extern void write_server(const statement_list_t *stmts); extern void write_regscript(const statement_list_t *stmts); -#ifndef __REACTOS__ extern void write_typelib_regscript(const statement_list_t *stmts); -#endif extern void output_typelib_regscript( const typelib_t *typelib ); extern void write_local_stubs(const statement_list_t *stmts); extern void write_dlldata(const statement_list_t *stmts); diff --git a/sdk/tools/widl/write_msft.c b/sdk/tools/widl/write_msft.c index 88cdbc78248..2fa7e193619 100644 --- a/sdk/tools/widl/write_msft.c +++ b/sdk/tools/widl/write_msft.c @@ -900,7 +900,7 @@ static int encode_type( if (typeoffset == typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length) { int mix_field; - + if (target_type & 0x80000000) { mix_field = ((target_type >> 16) & 0x3fff) | VT_BYREF; } else { @@ -936,7 +936,7 @@ static int encode_type( if (typeoffset == typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length) { int mix_field; - + if (target_type & 0x80000000) { mix_field = ((target_type >> 16) & VT_TYPEMASK) | VT_ARRAY; } else { @@ -1551,7 +1551,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) } /* update the index data */ - typeinfo->func_indices[typeinfo->typeinfo->cElement & 0xffff] = id; + typeinfo->func_indices[typeinfo->typeinfo->cElement & 0xffff] = id; typeinfo->func_offsets[typeinfo->typeinfo->cElement & 0xffff] = offset; typeinfo->func_names[typeinfo->typeinfo->cElement & 0xffff] = name_offset; @@ -1607,7 +1607,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) unsigned int typedata_size; INT *typedata; unsigned int var_datawidth, var_alignment = 0; - int var_type_size, var_kind = 0 /* VAR_PERINSTANCE */; + int var_type_size, var_kind = 0 /* VAR_PERINSTANCE */; int alignment; int varflags = 0; const attr_t *attr; @@ -2705,7 +2705,7 @@ int create_msft_typelib(typelib_t *typelib) set_help_context(msft); set_help_string_dll(msft); set_help_string_context(msft); - + /* midl adds two sets of custom data to the library: the current unix time and midl's version number */ time_override = getenv( "WIDL_TIME_OVERRIDE");

3 weeks

[reactos] 02/03: [WIDL] Properly pass architecture flag instead of modifying the code

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=995e4c829ad16ab58f1fd… commit 995e4c829ad16ab58f1fdb116597eec6c9c5c613 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Dec 15 10:23:50 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 15 08:29:53 2025 +0200 [WIDL] Properly pass architecture flag instead of modifying the code This reverts commit 73c776c744f26b294a5e6bc7e1fc11b374b05c17 "[WIDL] Fix non-x86 builds". --- CMakeLists.txt | 4 ++++ sdk/cmake/widl-support.cmake | 6 +++--- sdk/tools/widl/widl.c | 11 +++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 13916a9362a..38f70b17f63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,6 +140,10 @@ if(NOT CMAKE_CROSSCOMPILING) add_definitions(/D_X86_ /D__i386__ /DWIN32 /D_WINDOWS) elseif(ARCH STREQUAL "amd64") add_definitions(-D_AMD64_ -D__x86_64__ /DWIN32 -D_WINDOWS) + elseif(ARCH STREQUAL "arm") + add_definitions(-D__arm__) + elseif(ARCH STREQUAL "arm64") + add_definitions(-D__aarch64__) endif() if(MSVC_VERSION GREATER 1699) add_definitions(/D_ALLOW_KEYWORD_MACROS) diff --git a/sdk/cmake/widl-support.cmake b/sdk/cmake/widl-support.cmake index a8e926614a0..1b291dfa5b3 100644 --- a/sdk/cmake/widl-support.cmake +++ b/sdk/cmake/widl-support.cmake @@ -1,11 +1,11 @@ #idl files support if(ARCH STREQUAL "i386") - set(IDL_FLAGS -m32 --win32) + set(IDL_FLAGS -m32 --win32 -b i386-x-y) elseif(ARCH STREQUAL "amd64") - set(IDL_FLAGS -m64 --win64) + set(IDL_FLAGS -m64 --win64 -b amd64-x-y) else() - set(IDL_FLAGS "") + set(IDL_FLAGS -b ${ARCH}-x-y) endif() function(add_typelib) diff --git a/sdk/tools/widl/widl.c b/sdk/tools/widl/widl.c index ec1e61e22a8..77d4b7750a9 100644 --- a/sdk/tools/widl/widl.c +++ b/sdk/tools/widl/widl.c @@ -92,16 +92,15 @@ static const char usage[] = static const char version_string[] = "Wine IDL Compiler version " PACKAGE_VERSION "\n" "Copyright 2002 Ove Kaaven\n"; -// __REACTOS__!! We must use TARGET_ macros here! -#ifdef TARGET_i386 +#ifdef __i386__ enum target_cpu target_cpu = CPU_x86; -#elif defined(TARGET_amd64) +#elif defined(__x86_64__) enum target_cpu target_cpu = CPU_x86_64; -#elif defined(TARGET_ppc) +#elif defined(__powerpc__) enum target_cpu target_cpu = CPU_POWERPC; -#elif defined(TARGET_arm) +#elif defined(__arm__) enum target_cpu target_cpu = CPU_ARM; -#elif defined(TARGET_arm64) +#elif defined(__aarch64__) enum target_cpu target_cpu = CPU_ARM64; #else #error Unsupported CPU

3 weeks

[reactos] 01/03: [WIDL] Turn warnings into errors

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b14ce5db3b34dd6df9c7… commit 1b14ce5db3b34dd6df9c76397c5e7d8ddf78bfc1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Dec 14 20:55:42 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 15 08:29:53 2025 +0200 [WIDL] Turn warnings into errors --- sdk/tools/widl/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/tools/widl/CMakeLists.txt b/sdk/tools/widl/CMakeLists.txt index 0a4533f03b0..4c0818489d0 100644 --- a/sdk/tools/widl/CMakeLists.txt +++ b/sdk/tools/widl/CMakeLists.txt @@ -48,4 +48,6 @@ if(MSVC) # Disable warning "'=': conversion from 'a' to 'b', possible loss of data" target_compile_options(widl PRIVATE "/wd4244") + + target_compile_options(widl PRIVATE "-WX") endif()

3 weeks

[reactos] 01/01: [RAPPS] Allow .zip generated installers to skip writing the DisplayIcon value (#7609)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91b8923601ff4ef4cf47c… commit 91b8923601ff4ef4cf47c4fd0b004de1f1db3aa2 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Tue Jan 14 18:09:48 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 14 18:09:48 2025 +0100 [RAPPS] Allow .zip generated installers to skip writing the DisplayIcon value (#7609) This is useful for wallpaper and theme packs. --- base/applications/rapps/geninst.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/base/applications/rapps/geninst.cpp b/base/applications/rapps/geninst.cpp index 9fff1d2b264..ba57b53b502 100644 --- a/base/applications/rapps/geninst.cpp +++ b/base/applications/rapps/geninst.cpp @@ -28,6 +28,7 @@ extern "C" { #define REGPATH_UNINSTALL L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall" +#define DB_NONE L"!" // Skip/Ignore #define DB_GENINST_FILES L"Files" #define DB_GENINST_DIR L"Dir" #define DB_GENINST_ICON L"Icon" @@ -230,6 +231,8 @@ GetCustomIconPath(InstallInfo &Info, CStringW &Path) { if (*GetGenerateString(DB_GENINST_ICON, Path)) { + if (Path.Compare(DB_NONE) == 0) + return HRESULT_FROM_WIN32(ERROR_CAN_NOT_COMPLETE); Path = BuildPath(Info.InstallDir, Path); int idx = PathParseIconLocation(Path.GetBuffer()); Path.ReleaseBuffer(); @@ -432,7 +435,7 @@ ExtractAndInstallThread(LPVOID Parameter) { const BOOL PerUserModeDefault = TRUE; InstallInfo &Info = *static_cast<InstallInfo *>(g_pInfo); - LPCWSTR AppName = Info.AppName, Archive = Info.ArchivePath, None = L"!"; + LPCWSTR AppName = Info.AppName, Archive = Info.ArchivePath, None = DB_NONE; CStringW installdir, tempdir, files, shortcut, tmp; HRESULT hr; CRegKey arpkey; @@ -534,9 +537,9 @@ ExtractAndInstallThread(LPVOID Parameter) (tmp = tmp.Mid(0, cch)).AppendFormat(unparamsfmt, L" /S", modechar, bitness, arpkeyname); WriteArpEntry(L"QuietUninstallString", tmp); - if (GetCustomIconPath(Info, tmp) != S_OK) - tmp = Info.MainApp; - WriteArpEntry(L"DisplayIcon", tmp); + hr = GetCustomIconPath(Info, tmp); + if (hr != HRESULT_FROM_WIN32(ERROR_CAN_NOT_COMPLETE)) + WriteArpEntry(L"DisplayIcon", hr == S_OK ? tmp : Info.MainApp); if (*GetCommonString(DB_VERSION, tmp)) WriteArpEntry(L"DisplayVersion", tmp);

3 weeks, 1 day

[reactos] 12/12: [PSEH] Use native SEH on clang-cl x64

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96676ca251e053e43742c… commit 96676ca251e053e43742c2eda7de12f9e751ff8b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Nov 29 09:59:48 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 14 13:34:24 2025 +0200 [PSEH] Use native SEH on clang-cl x64 --- drivers/filesystems/fastfat/create.c | 19 ++++++++++--------- sdk/lib/pseh/include/pseh/pseh2.h | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/fastfat/create.c index fa9b651e364..cf2cf85e4c5 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/fastfat/create.c @@ -2356,7 +2356,7 @@ Return Value: if ((CreateDisposition != FILE_OPEN) && (CreateDisposition != FILE_OPEN_IF)) { - try_return( Iosb.Status = STATUS_ACCESS_DENIED ); + try_return( Status = STATUS_ACCESS_DENIED ); } // @@ -2389,7 +2389,7 @@ Return Value: if (!FlagOn(ShareAccess, FILE_SHARE_READ) && !FatIsHandleCountZero( IrpContext, Vcb )) { - try_return( Iosb.Status = STATUS_SHARING_VIOLATION ); + try_return( Status = STATUS_SHARING_VIOLATION ); } // @@ -2412,14 +2412,14 @@ Return Value: if (Vcb->OpenFileCount != 0) { - try_return( Iosb.Status = STATUS_SHARING_VIOLATION ); + try_return( Status = STATUS_SHARING_VIOLATION ); } } else { if (Vcb->ReadOnlyCount != Vcb->OpenFileCount) { - try_return( Iosb.Status = STATUS_SHARING_VIOLATION ); + try_return( Status = STATUS_SHARING_VIOLATION ); } } @@ -2487,13 +2487,13 @@ Return Value: if (Vcb->DirectAccessOpenCount > 0) { - if (!NT_SUCCESS(Iosb.Status = IoCheckShareAccess( *DesiredAccess, + if (!NT_SUCCESS(Status = IoCheckShareAccess( *DesiredAccess, ShareAccess, FileObject, &Vcb->ShareAccess, TRUE ))) { - try_return( Iosb.Status ); + try_return( NOTHING ); } } else { @@ -2546,7 +2546,7 @@ Return Value: // And set our status to success // - Iosb.Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; Iosb.Information = FILE_OPENED; try_exit: NOTHING; @@ -2558,7 +2558,7 @@ Return Value: // If this is an abnormal termination then undo our work // - if (_SEH2_AbnormalTermination() || !NT_SUCCESS(Iosb.Status)) { + if (_SEH2_AbnormalTermination() || !NT_SUCCESS(Status)) { if (UnwindCounts) { Vcb->DirectAccessOpenCount -= 1; @@ -2570,9 +2570,10 @@ Return Value: if (UnwindVolumeLock) { Vcb->VcbState &= ~VCB_STATE_FLAG_LOCKED; } } - DebugTrace(-1, Dbg, "FatOpenVolume -> Iosb.Status = %08lx\n", Iosb.Status); + DebugTrace(-1, Dbg, "FatOpenVolume -> Iosb.Status = %08lx\n", Status); } _SEH2_END; + Iosb.Status = Status; return Iosb; } diff --git a/sdk/lib/pseh/include/pseh/pseh2.h b/sdk/lib/pseh/include/pseh/pseh2.h index a6d0ab5a3a2..a3aed7aed2b 100644 --- a/sdk/lib/pseh/include/pseh/pseh2.h +++ b/sdk/lib/pseh/include/pseh/pseh2.h @@ -25,7 +25,7 @@ #define __USE_PSEH2__ -#if defined(_USE_NATIVE_SEH) || (defined(_MSC_VER) && !(defined(__clang__) && defined(_M_AMD64))) +#if defined(_USE_NATIVE_SEH) || defined(_MSC_VER) #define _SEH2_TRY __try #define _SEH2_FINALLY __finally

3 weeks, 1 day

[reactos] 11/12: [PSEH] Fix SEH compatibility macros for dummy PSEH

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=478317abcb5dbddc90e2d… commit 478317abcb5dbddc90e2dbb27b7bb1e94c429442 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Nov 28 12:25:46 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 14 13:34:24 2025 +0200 [PSEH] Fix SEH compatibility macros for dummy PSEH This is used with Clang, which does have native SEH, but it's broken and can cause the compiler to crash. Previously some code was not handling this and instead used native SEH for clang. Fix this by always using _SEH2_* macros instead of relying on __USE_PSEH2__ to be defined. Try to improve things --- sdk/include/psdk/rpc.h | 4 ---- sdk/include/reactos/wine/exception.h | 7 ++----- sdk/include/vcruntime/excpt.h | 2 +- sdk/lib/pseh/CMakeLists.txt | 1 - sdk/lib/pseh/include/pseh/pseh2.h | 10 ++++++++++ 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/sdk/include/psdk/rpc.h b/sdk/include/psdk/rpc.h index b35c35fcad1..257823505d9 100644 --- a/sdk/include/psdk/rpc.h +++ b/sdk/include/psdk/rpc.h @@ -5,10 +5,6 @@ #endif /* _INC_WINDOWS */ #endif -#if defined(__USE_PSEH2__) && !defined(RC_INVOKED) -#include <pseh/pseh2.h> -#endif - #ifndef __RPC_H__ #define __RPC_H__ diff --git a/sdk/include/reactos/wine/exception.h b/sdk/include/reactos/wine/exception.h index f9333e8ff2a..8d0b3ea46c0 100644 --- a/sdk/include/reactos/wine/exception.h +++ b/sdk/include/reactos/wine/exception.h @@ -3,10 +3,7 @@ #include <setjmp.h> #include <intrin.h> -#ifdef __USE_PSEH2__ -# include <pseh/pseh2.h> -# include <pseh/excpt.h> -#endif +#include <excpt.h> #ifdef __cplusplus extern "C" { @@ -63,7 +60,7 @@ typedef struct _WINE_EXCEPTION_REGISTRATION_RECORD #define __EXCEPT(func) _SEH2_EXCEPT(func(_SEH2_GetExceptionInformation())) #define __EXCEPT_CTX(func, ctx) _SEH2_EXCEPT((func)(GetExceptionInformation(), ctx)) #define __EXCEPT_PAGE_FAULT _SEH2_EXCEPT(_SEH2_GetExceptionCode() == STATUS_ACCESS_VIOLATION) -#define __EXCEPT_ALL _SEH2_EXCEPT(_SEH_EXECUTE_HANDLER) +#define __EXCEPT_ALL _SEH2_EXCEPT(1) #define __ENDTRY _SEH2_END #define __FINALLY(func) _SEH2_FINALLY { func(!_SEH2_AbnormalTermination()); } #define __FINALLY_CTX(func, ctx) _SEH2_FINALLY { func(!_SEH2_AbnormalTermination(), ctx); }; _SEH2_END diff --git a/sdk/include/vcruntime/excpt.h b/sdk/include/vcruntime/excpt.h index 8bd6e90cc46..faf5f2fe405 100644 --- a/sdk/include/vcruntime/excpt.h +++ b/sdk/include/vcruntime/excpt.h @@ -74,7 +74,7 @@ typedef enum _EXCEPTION_DISPOSITION #endif -#if defined(_MSC_VER) || (defined(__clang__) && defined(__SEH__)) +#if (defined(_MSC_VER) || (defined(__clang__) && defined(__SEH__))) && !defined(_exception_code) unsigned long __cdecl _exception_code(void); void *__cdecl _exception_info(void); int __cdecl _abnormal_termination(void); diff --git a/sdk/lib/pseh/CMakeLists.txt b/sdk/lib/pseh/CMakeLists.txt index b2d23bb3588..e36a3f5fd87 100644 --- a/sdk/lib/pseh/CMakeLists.txt +++ b/sdk/lib/pseh/CMakeLists.txt @@ -57,5 +57,4 @@ target_include_directories(pseh INTERFACE include) # Make it clear that we are using PSEH2 if ((CMAKE_C_COMPILER_ID STREQUAL "GNU") OR ((CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (NOT (ARCH STREQUAL "amd64")))) - target_compile_definitions(pseh INTERFACE __USE_PSEH2__) endif() diff --git a/sdk/lib/pseh/include/pseh/pseh2.h b/sdk/lib/pseh/include/pseh/pseh2.h index 523d9ddd161..a6d0ab5a3a2 100644 --- a/sdk/lib/pseh/include/pseh/pseh2.h +++ b/sdk/lib/pseh/include/pseh/pseh2.h @@ -23,6 +23,8 @@ #ifndef KJK_PSEH2_H_ #define KJK_PSEH2_H_ +#define __USE_PSEH2__ + #if defined(_USE_NATIVE_SEH) || (defined(_MSC_VER) && !(defined(__clang__) && defined(_M_AMD64))) #define _SEH2_TRY __try @@ -86,6 +88,14 @@ _Pragma("GCC diagnostic pop") #define _SEH2_LEAVE goto __seh2_scope_end__; #define _SEH2_VOLATILE volatile +#define __try _SEH2_TRY +#define __except _SEH2_EXCEPT +#define __finally _SEH2_FINALLY +#define __endtry _SEH2_END +#define __leave _SEH2_LEAVE +#define _exception_code() 0 +#define _exception_info() ((void*)0) + #elif defined(_USE_PSEH3) #include "pseh3.h"

3 weeks, 1 day

← Newer
1
...
19
20
21
22
23
24
25
...
28
Older →

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