Ros-diffs August 2023

ros-diffs@reactos.org

30 participants
167 discussions

[reactos] 01/01: [NTUSER] Whitspace-fixes winpos.c

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49dbc8fbbb090812d21ac… commit 49dbc8fbbb090812d21ac10e79d42c787638e2ec Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Aug 20 01:41:28 2023 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Aug 20 01:41:28 2023 +0200 [NTUSER] Whitspace-fixes winpos.c I just can't stand that whitespace-diff at those 2 if-conditions any longer, which was introduced into co_WinPosSetWindowPos() by 0.4.13-dev-8-g cfdf36e44250048b3377f333c93bc311e424ac3d Everytime I port something back, I don't know where to put that diff temporarily. And I don't want to make the older branches worse as well. So finally squeeze it out at right-hand-side in master head. --- win32ss/user/ntuser/winpos.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 45c721de368..2ec319505d1 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Windows - * FILE: win32ss/user/ntuser/winpos.c - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Windows + * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include <win32k.h> @@ -2175,7 +2174,7 @@ co_WinPosSetWindowPos( } IntInvalidateWindows(Window, DirtyRgn, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } - else if ( RgnType != ERROR && RgnType == NULLREGION ) // Must be the same. See CORE-7166 & CORE-15934, NC HACK fix. + else if (RgnType != ERROR && RgnType == NULLREGION) // Must be the same. See CORE-7166 & CORE-15934, NC HACK fix. { if ( !PosChanged && !(WinPos.flags & SWP_DEFERERASE) && @@ -2224,7 +2223,7 @@ co_WinPosSetWindowPos( } /* Expose what was covered before but not covered anymore */ - if ( VisBefore != NULL ) + if (VisBefore != NULL) { PREGION ExposedRgn = IntSysCreateRectpRgn(0, 0, 0, 0); if (ExposedRgn) @@ -2234,7 +2233,7 @@ co_WinPosSetWindowPos( OldWindowRect.left - NewWindowRect.left, OldWindowRect.top - NewWindowRect.top); - if ( VisAfter != NULL ) + if (VisAfter != NULL) RgnType = IntGdiCombineRgn(ExposedRgn, ExposedRgn, VisAfter, RGN_DIFF); if (RgnType != ERROR && RgnType != NULLREGION) @@ -2282,7 +2281,7 @@ co_WinPosSetWindowPos( if ( !(Window->style & WS_CHILD) && (Parent) && (Parent->style & WS_CLIPCHILDREN)) { TRACE("SWP_FRAMECHANGED Parent %p WS_CLIPCHILDREN %p\n",Parent,Window); - UserSyncAndPaintWindows( Parent, RDW_CLIPCHILDREN); // NC should redraw here, see NC HACK fix. + UserSyncAndPaintWindows(Parent, RDW_CLIPCHILDREN); // NC should redraw here, see NC HACK fix. } }

1 year, 4 months

[reactos] 01/01: [RTL][NTDLL] Implement and export RtlCompareUnicodeStrings

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d00d883a21c9308fa9c96… commit d00d883a21c9308fa9c96300e7e182c13f444da9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 12 17:47:38 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:52:21 2023 +0300 [RTL][NTDLL] Implement and export RtlCompareUnicodeStrings --- dll/ntdll/def/ntdll.spec | 2 +- sdk/lib/rtl/unicode.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 99fcbc96ed3..ee2598f8040 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -682,7 +682,7 @@ @ stdcall RtlCompareMemoryUlong(ptr long long) @ stdcall RtlCompareString(ptr ptr long) @ stdcall RtlCompareUnicodeString (ptr ptr long) -@ stub -version=0x600+ RtlCompareUnicodeStrings +@ stdcall -version=0x600+ RtlCompareUnicodeStrings(wstr long wstr long long) @ stub -version=0x600+ -arch=x86_64 RtlCompleteProcessCloning @ stdcall RtlCompressBuffer(long ptr long ptr long long ptr ptr) @ stdcall RtlComputeCrc32(long ptr long) diff --git a/sdk/lib/rtl/unicode.c b/sdk/lib/rtl/unicode.c index c29dfa4f3b8..6cd70dda1e7 100644 --- a/sdk/lib/rtl/unicode.c +++ b/sdk/lib/rtl/unicode.c @@ -2222,6 +2222,53 @@ RtlCompareUnicodeString( return ret; } +/* + * @implemented + */ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ +NTSYSAPI +LONG +NTAPI +RtlCompareUnicodeStrings( + _In_reads_(String1Length) PCWCH String1, + _In_ SIZE_T String1Length, + _In_reads_(String2Length) PCWCH String2, + _In_ SIZE_T String2Length, + _In_ BOOLEAN CaseInSensitive) +{ + LONG Result = 0; + SIZE_T MinStringLength = min(String1Length, String2Length); + SIZE_T Index; + + if (CaseInSensitive) + { + for (Index = 0; Index < MinStringLength; Index++) + { + WCHAR Char1 = RtlpUpcaseUnicodeChar(String1[Index]); + WCHAR Char2 = RtlpUpcaseUnicodeChar(String2[Index]); + Result = Char1 - Char2; + if (Result != 0) + { + return Result; + } + } + } + else + { + for (Index = 0; Index < MinStringLength; Index++) + { + Result = String1[Index] - String2[Index]; + if (Result != 0) + { + return Result; + } + } + } + + return String1Length - String2Length; +} + /* * @implemented */

1 year, 4 months

[reactos] 06/06: [CRT] Reduce diff to wine-5.0

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c332b917dccf7b3c9563c… commit c332b917dccf7b3c9563c24f02a1550b8a5ab600 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Aug 10 12:12:22 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [CRT] Reduce diff to wine-5.0 --- sdk/lib/crt/except/i386/cpp.s | 16 ++++++++++++++++ sdk/lib/crt/wine/cpp.c | 2 -- sdk/lib/crt/wine/cxx.h | 6 +++++- sdk/lib/crt/wine/except_i386.c | 20 -------------------- sdk/lib/crt/wine/undname.c | 14 ++++++++------ 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/sdk/lib/crt/except/i386/cpp.s b/sdk/lib/crt/except/i386/cpp.s index 0a553936060..7985dc1d9fe 100644 --- a/sdk/lib/crt/except/i386/cpp.s +++ b/sdk/lib/crt/except/i386/cpp.s @@ -5,6 +5,8 @@ .code .align 4 +EXTERN _cxx_frame_handler:PROC + MACRO(DEFINE_THISCALL_ALIAS, cxxname, target) #ifdef _USE_ML EXTERN ___thiscall&target:PROC @@ -166,5 +168,19 @@ _call_handler: pop ebp ret + +PUBLIC ___CxxFrameHandler +___CxxFrameHandler: + push 0 + push 0 + push eax + push[esp + 28] + push[esp + 28] + push[esp + 28] + push[esp + 28] + call _cxx_frame_handler + add esp, 28 + ret + END diff --git a/sdk/lib/crt/wine/cpp.c b/sdk/lib/crt/wine/cpp.c index 4b12b2dfbe1..b5636b1fb1a 100644 --- a/sdk/lib/crt/wine/cpp.c +++ b/sdk/lib/crt/wine/cpp.c @@ -995,7 +995,6 @@ void __thiscall MSVCRT_improper_scheduler_detach_dtor( #endif /* _MSVCR_VER >= 100 */ -#ifndef _MSC_VER #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif @@ -1049,7 +1048,6 @@ __ASM_VTABLE(improper_scheduler_detach, #ifndef __GNUC__ } #endif -#endif /* !_MSC_VER */ DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) #if _MSVCR_VER >= 80 diff --git a/sdk/lib/crt/wine/cxx.h b/sdk/lib/crt/wine/cxx.h index b22ff22cc85..58afc75bd15 100644 --- a/sdk/lib/crt/wine/cxx.h +++ b/sdk/lib/crt/wine/cxx.h @@ -18,6 +18,9 @@ #include "wine/asm.h" +#ifdef _MSC_VER +#define __ASM_VTABLE(name,funcs) +#else #ifdef _WIN64 #define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" @@ -43,6 +46,7 @@ funcs "\n\t.text") #endif /* _WIN64 */ +#endif // _MSC_VER #ifndef __x86_64__ @@ -264,4 +268,4 @@ extern void *vtbl_wrapper_48; #endif -//exception* __thiscall MSVCRT_exception_ctor(exception*, const char**); +exception* __thiscall MSVCRT_exception_ctor(exception*, const char**); diff --git a/sdk/lib/crt/wine/except_i386.c b/sdk/lib/crt/wine/except_i386.c index 7512196c096..68f6c75c1b3 100644 --- a/sdk/lib/crt/wine/except_i386.c +++ b/sdk/lib/crt/wine/except_i386.c @@ -652,25 +652,6 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame */ extern DWORD CDECL __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ); -#ifdef _MSC_VER -DWORD _declspec(naked) __CxxFrameHandler(PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, - PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch) -{ - __asm - { - push 0 - push 0 - push eax - push[esp + 28] - push[esp + 28] - push[esp + 28] - push[esp + 28] - call cxx_frame_handler - add esp, 28 - ret - } -} -#else __ASM_GLOBAL_FUNC( __CxxFrameHandler, "pushl $0\n\t" /* nested_trylevel */ __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -690,7 +671,6 @@ __ASM_GLOBAL_FUNC( __CxxFrameHandler, "add $28,%esp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -28\n\t") "ret" ) -#endif /********************************************************************* diff --git a/sdk/lib/crt/wine/undname.c b/sdk/lib/crt/wine/undname.c index c81dfcc273a..df3e4e8cc80 100644 --- a/sdk/lib/crt/wine/undname.c +++ b/sdk/lib/crt/wine/undname.c @@ -19,12 +19,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define __WINE_DEBUG_CHANNEL__ -#include <precomp.h> +#include "config.h" +#include "wine/port.h" + #include <assert.h> +#include <stdio.h> +#include <stdlib.h> +#include "msvcrt.h" -#include <internal/wine/msvcrt.h> -#include <internal/wine/cppexcept.h> +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -199,8 +202,7 @@ static BOOL str_array_push(struct parsed_symbol* sym, const char* ptr, int len, c = '>'; if (i < a->start) c = '-'; else if (i >= a->num) c = '}'; - /* This check is as useless as the unused-but-set gcc warning that we want to silence here */ - if (c != 0) TRACE("%p\t%d%c %s\n", a, i, c, debugstr_a(a->elts[i])); + TRACE("%p\t%d%c %s\n", a, i, c, debugstr_a(a->elts[i])); } }

1 year, 4 months

[reactos] 05/06: [WINESYNC]: crt is now in sync with wine-staging wine-5.0

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e04b79653441e3d8d78d9… commit e04b79653441e3d8d78d943271fd4b9b3b327767 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Aug 10 11:14:57 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [WINESYNC]: crt is now in sync with wine-staging wine-5.0 --- sdk/tools/winesync/crt.cfg | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sdk/tools/winesync/crt.cfg b/sdk/tools/winesync/crt.cfg new file mode 100644 index 00000000000..81308194937 --- /dev/null +++ b/sdk/tools/winesync/crt.cfg @@ -0,0 +1,16 @@ +directories: null +files: + dlls/msvcrt/cpp.c: sdk/lib/crt/wine/cpp.c + dlls/msvcrt/cppexcept.h: sdk/lib/crt/wine/cppexcept.h + dlls/msvcrt/cxx.h: sdk/lib/crt/wine/cxx.h + dlls/msvcrt/except.c: sdk/lib/crt/wine/except.c + dlls/msvcrt/except_arm.c: sdk/lib/crt/wine/except_arm.c + dlls/msvcrt/except_arm64.c: sdk/lib/crt/wine/except_arm64.c + dlls/msvcrt/except_i386.c: sdk/lib/crt/wine/except_i386.c + dlls/msvcrt/except_x86_64.c: sdk/lib/crt/wine/except_x86_64.c + dlls/msvcrt/heap.c: sdk/lib/crt/wine/heap.c + dlls/msvcrt/msvcrt.h: sdk/lib/crt/wine/msvcrt.h + dlls/msvcrt/mtdll.h: sdk/lib/crt/wine/mtdll.h + dlls/msvcrt/undname.c: sdk/lib/crt/wine/undname.c +tags: + wine: wine-5.0

1 year, 4 months

[reactos] 04/06: [WINESYNC] msvcrt: Fix handling tryblocks inside current catch block on nested exception.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f8eda78537507e5b3ec4… commit 1f8eda78537507e5b3ec41941ef896d72a87aea8 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Jan 9 22:08:05 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [WINESYNC] msvcrt: Fix handling tryblocks inside current catch block on nested exception. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48335 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 6babdb5508bd2f1b659218483f5df76859898712 by Piotr Caban <piotr(a)codeweavers.com> --- sdk/lib/crt/wine/except_i386.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/lib/crt/wine/except_i386.c b/sdk/lib/crt/wine/except_i386.c index d3bcc3aaadd..7512196c096 100644 --- a/sdk/lib/crt/wine/except_i386.c +++ b/sdk/lib/crt/wine/except_i386.c @@ -389,7 +389,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG /* returns the address to continue execution to after the catch block was called */ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, cxx_exception_frame *frame, - const cxx_function_descr *descr, int nested_trylevel, + const cxx_function_descr *descr, catch_func_nested_frame *catch_frame, cxx_exception_type *info ) { @@ -407,7 +407,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, const tryblock_info *tryblock = &descr->tryblock[i]; /* only handle try blocks inside current catch block */ - if (catch_frame && nested_trylevel > tryblock->start_level) continue; + if (catch_frame && catch_frame->trylevel > tryblock->start_level) continue; if (trylevel < tryblock->start_level) continue; if (trylevel > tryblock->end_level) continue; @@ -458,7 +458,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, nested_frame.frame.Handler = catch_function_nested_handler; nested_frame.cxx_frame = frame; nested_frame.descr = descr; - nested_frame.trylevel = nested_trylevel + 1; + nested_frame.trylevel = tryblock->end_level + 1; __wine_push_frame( &nested_frame.frame ); addr = call_handler( catchblock->handler, &frame->ebp ); @@ -545,7 +545,7 @@ static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c ) exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; call_catch_block( rec, ep->ContextRecord, ctx->frame, ctx->descr, - ctx->frame->trylevel, ctx->nested_frame, exc_type ); + ctx->nested_frame, exc_type ); __DestructExceptionObject( rec ); return ExceptionContinueSearch; @@ -642,7 +642,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } call_catch_block( rec, context, frame, descr, - frame->trylevel, nested_frame, exc_type ); + nested_frame, exc_type ); return ExceptionContinueSearch; }

1 year, 4 months

[reactos] 03/06: [WINESYNC] msvcrt: Pass catch_func_nested_frame struct to call_catch_block.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4df4baa391ee4f9801ffd… commit 4df4baa391ee4f9801ffd6b50617bc1a416effbb Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Jan 9 22:08:05 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [WINESYNC] msvcrt: Pass catch_func_nested_frame struct to call_catch_block. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 48a447c5eb238d673ce5db4eeacf3ba4c1a9da90 by Piotr Caban <piotr(a)codeweavers.com> --- sdk/lib/crt/wine/except_i386.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/lib/crt/wine/except_i386.c b/sdk/lib/crt/wine/except_i386.c index 5c1c9df3368..d3bcc3aaadd 100644 --- a/sdk/lib/crt/wine/except_i386.c +++ b/sdk/lib/crt/wine/except_i386.c @@ -110,7 +110,7 @@ typedef struct { cxx_exception_frame *frame; const cxx_function_descr *descr; - EXCEPTION_REGISTRATION_RECORD *nested_frame; + catch_func_nested_frame *nested_frame; } se_translator_ctx; typedef struct _SCOPETABLE @@ -390,7 +390,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, cxx_exception_frame *frame, const cxx_function_descr *descr, int nested_trylevel, - EXCEPTION_REGISTRATION_RECORD *catch_frame, + catch_func_nested_frame *catch_frame, cxx_exception_type *info ) { UINT i; @@ -440,7 +440,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, (void*)rec->ExceptionInformation[1]); /* unwind the stack */ - RtlUnwind( catch_frame ? catch_frame : &frame->frame, 0, rec, 0 ); + RtlUnwind( catch_frame ? &catch_frame->frame : &frame->frame, 0, rec, 0 ); cxx_local_unwind( frame, descr, tryblock->start_level ); frame->trylevel = tryblock->end_level + 1; @@ -627,7 +627,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame ctx.frame = frame; ctx.descr = descr; - ctx.nested_frame = nested_frame ? &nested_frame->frame : NULL; + ctx.nested_frame = nested_frame; __TRY { except_ptrs.ExceptionRecord = rec; @@ -642,7 +642,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } call_catch_block( rec, context, frame, descr, - frame->trylevel, nested_frame ? &nested_frame->frame : NULL, exc_type ); + frame->trylevel, nested_frame, exc_type ); return ExceptionContinueSearch; }

1 year, 4 months

[reactos] 02/06: [WINESYNC] msvcrt: Pass catch_func_nested_frame struct to cxx_frame_handler.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c7dc46702a9615065372… commit 6c7dc46702a96150653721431dc3f27da0f28922 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Jan 9 22:07:07 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [WINESYNC] msvcrt: Pass catch_func_nested_frame struct to cxx_frame_handler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id ea20974cdd7457715bf4d758818d03bff664f62b by Piotr Caban <piotr(a)codeweavers.com> --- sdk/lib/crt/wine/except_i386.c | 43 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/sdk/lib/crt/wine/except_i386.c b/sdk/lib/crt/wine/except_i386.c index 746ddad77da..5c1c9df3368 100644 --- a/sdk/lib/crt/wine/except_i386.c +++ b/sdk/lib/crt/wine/except_i386.c @@ -96,6 +96,16 @@ typedef struct __cxx_function_descr UINT flags; /* flags when magic >= VC8 */ } cxx_function_descr; +/* exception frame for nested exceptions in catch block */ +typedef struct +{ + EXCEPTION_REGISTRATION_RECORD frame; /* standard exception frame */ + cxx_exception_frame *cxx_frame; /* frame of parent exception */ + const cxx_function_descr *descr; /* descriptor of parent exception */ + int trylevel; /* current try level */ + cxx_frame_info frame_info; +} catch_func_nested_frame; + typedef struct { cxx_exception_frame *frame; @@ -135,7 +145,7 @@ typedef struct DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, const cxx_function_descr *descr, - EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ) DECLSPEC_HIDDEN; + catch_func_nested_frame* nested_frame ) DECLSPEC_HIDDEN; /* call a copy constructor */ extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); @@ -332,21 +342,11 @@ static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_des frame->trylevel = last_level; } -/* exception frame for nested exceptions in catch block */ -struct catch_func_nested_frame -{ - EXCEPTION_REGISTRATION_RECORD frame; /* standard exception frame */ - cxx_exception_frame *cxx_frame; /* frame of parent exception */ - const cxx_function_descr *descr; /* descriptor of parent exception */ - int trylevel; /* current try level */ - cxx_frame_info frame_info; -}; - /* handler for exceptions happening while calling a catch function */ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { - struct catch_func_nested_frame *nested_frame = (struct catch_func_nested_frame *)frame; + catch_func_nested_frame *nested_frame = (catch_func_nested_frame *)frame; if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) { @@ -382,8 +382,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG } return cxx_frame_handler( rec, nested_frame->cxx_frame, context, - NULL, nested_frame->descr, &nested_frame->frame, - nested_frame->trylevel ); + NULL, nested_frame->descr, nested_frame ); } /* find and call the appropriate catch block for an exception */ @@ -397,7 +396,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, UINT i; int j; void *addr, *object = (void *)rec->ExceptionInformation[1]; - struct catch_func_nested_frame nested_frame; + catch_func_nested_frame nested_frame; int trylevel = frame->trylevel; DWORD save_esp = ((DWORD*)frame)[-1]; thread_data_t *data = msvcrt_get_thread_data(); @@ -560,8 +559,7 @@ static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c ) DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, const cxx_function_descr *descr, - EXCEPTION_REGISTRATION_RECORD* nested_frame, - int nested_trylevel ) + catch_func_nested_frame* nested_frame ) { cxx_exception_type *exc_type; @@ -577,7 +575,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) { - if (descr->unwind_count && !nested_trylevel) cxx_local_unwind( frame, descr, -1 ); + if (descr->unwind_count && !nested_frame) cxx_local_unwind( frame, descr, -1 ); return ExceptionContinueSearch; } if (!descr->tryblock_count) return ExceptionContinueSearch; @@ -602,8 +600,9 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8 && exc_type->custom_handler) { - return exc_type->custom_handler( rec, frame, context, dispatch, - descr, nested_trylevel, nested_frame, 0 ); + return exc_type->custom_handler( rec, frame, context, dispatch, descr, + nested_frame ? nested_frame->trylevel : 0, + nested_frame ? &nested_frame->frame : NULL, 0 ); } if (TRACE_ON(seh)) @@ -628,7 +627,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame ctx.frame = frame; ctx.descr = descr; - ctx.nested_frame = nested_frame; + ctx.nested_frame = nested_frame ? &nested_frame->frame : NULL; __TRY { except_ptrs.ExceptionRecord = rec; @@ -643,7 +642,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } call_catch_block( rec, context, frame, descr, - frame->trylevel, nested_frame, exc_type ); + frame->trylevel, nested_frame ? &nested_frame->frame : NULL, exc_type ); return ExceptionContinueSearch; }

1 year, 4 months

[reactos] 01/06: [WINESYNC] Allow directories to be None

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b5a555161d01102db86f… commit 4b5a555161d01102db86f230548e6ec37c757813 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 9 22:07:53 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [WINESYNC] Allow directories to be None --- sdk/tools/winesync/winesync.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index 8547ee97306..cdee060db52 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -100,6 +100,9 @@ class wine_sync: # root files should have a direct mapping return None + if self.module_cfg['directories'] is None: + return None + wine_dir, wine_file = os.path.split(wine_path) if wine_dir in self.module_cfg['directories']: # we have a mapping for the directory

1 year, 4 months

[reactos] 02/02: [NTOS:MM] MiResolveImageReferences: Use boolean values for GdiLink and NormalLink.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5472c3e85356b3b37a0b9… commit 5472c3e85356b3b37a0b9023b2db3c9f45a05c5f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Aug 19 19:06:20 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 19 19:06:20 2023 +0200 [NTOS:MM] MiResolveImageReferences: Use boolean values for GdiLink and NormalLink. --- ntoskrnl/mm/ARM3/sysldr.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 3ea6662cc28..22aef1d7110 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -996,7 +996,8 @@ MiResolveImageReferences(IN PVOID ImageBase, PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor, CurrentImport; ULONG ImportSize, ImportCount = 0, LoadedImportsSize, ExportSize; PLOAD_IMPORTS LoadedImports, NewImports; - ULONG GdiLink, NormalLink, i; + ULONG i; + BOOLEAN GdiLink, NormalLink; BOOLEAN ReferenceNeeded, Loaded; ANSI_STRING TempString; UNICODE_STRING NameString, DllName; @@ -1006,7 +1007,9 @@ MiResolveImageReferences(IN PVOID ImageBase, PIMAGE_EXPORT_DIRECTORY ExportDirectory; NTSTATUS Status; PIMAGE_THUNK_DATA OrigThunk, FirstThunk; + PAGED_CODE(); + DPRINT("%s - ImageBase: %p. ImageFileDirectory: %wZ\n", __FUNCTION__, ImageBase, ImageFileDirectory); @@ -1054,25 +1057,26 @@ MiResolveImageReferences(IN PVOID ImageBase, } /* Reset the import count and loop descriptors again */ - ImportCount = GdiLink = NormalLink = 0; + GdiLink = NormalLink = FALSE; + ImportCount = 0; while ((ImportDescriptor->Name) && (ImportDescriptor->OriginalFirstThunk)) { /* Get the name */ ImportName = (PCHAR)((ULONG_PTR)ImageBase + ImportDescriptor->Name); /* Check if this is a GDI driver */ - GdiLink = GdiLink | + GdiLink = GdiLink || !(_strnicmp(ImportName, "win32k", sizeof("win32k") - 1)); /* We can also allow dxapi (for Windows compat, allow IRT and coverage) */ - NormalLink = NormalLink | + NormalLink = NormalLink || ((_strnicmp(ImportName, "win32k", sizeof("win32k") - 1)) && (_strnicmp(ImportName, "dxapi", sizeof("dxapi") - 1)) && (_strnicmp(ImportName, "coverage", sizeof("coverage") - 1)) && (_strnicmp(ImportName, "irt", sizeof("irt") - 1))); /* Check if this is a valid GDI driver */ - if ((GdiLink) && (NormalLink)) + if (GdiLink && NormalLink) { /* It's not, it's importing stuff it shouldn't be! */ Status = STATUS_PROCEDURE_NOT_FOUND;

1 year, 4 months

[reactos] 01/02: [NTDLL] .spec file: First parameter in RtlImageDirectoryEntryToData should be 'ptr'.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df0349b49f6a23fc4a6de… commit df0349b49f6a23fc4a6de70afe8124c1358b9d25 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 29 00:35:23 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 19 19:01:00 2023 +0200 [NTDLL] .spec file: First parameter in RtlImageDirectoryEntryToData should be 'ptr'. --- dll/ntdll/def/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 801feeca335..99fcbc96ed3 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -917,7 +917,7 @@ @ stub -version=0x600+ RtlIdnToAscii @ stub -version=0x600+ RtlIdnToNameprepUnicode @ stub -version=0x600+ RtlIdnToUnicode -@ stdcall RtlImageDirectoryEntryToData(long long long ptr) +@ stdcall RtlImageDirectoryEntryToData(ptr long long ptr) @ stdcall RtlImageNtHeader(long) @ stdcall RtlImageNtHeaderEx(long ptr double ptr) @ stdcall RtlImageRvaToSection(ptr long long)

1 year, 4 months

← Newer
1
...
4
5
6
7
8
9
10
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2023