[PATCH v3 0/1] MR5251: ntdll: Add stubs for Rtl*GenericTable*Avl functions
Those are required to stop Fortnite from crashing during runtime -- v3: ntdll: Add stubs for Rtl*GenericTable*Avl functions https://gitlab.winehq.org/wine/wine/-/merge_requests/5251
From: Infinite Loop <teardown(a)inbox.ru> Those are required to stop Fortnite from crashing during runtime Signed-off-by: Infinite Loop <teardown(a)inbox.ru> --- dlls/ntdll/ntdll.spec | 10 +++--- dlls/ntdll/rtl.c | 52 +++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 10 +++--- include/ddk/ntddk.h | 7 +++- 4 files changed, 65 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 66995346e57..1d3f67a9d02 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -602,7 +602,7 @@ @ stdcall RtlDeleteCriticalSection(ptr) @ stdcall -arch=!i386 RtlDeleteGrowableFunctionTable(ptr) @ stub RtlDeleteElementGenericTable -@ stub RtlDeleteElementGenericTableAvl +@ stdcall RtlDeleteElementGenericTableAvl(ptr ptr) @ cdecl -arch=!i386 RtlDeleteFunctionTable(ptr) @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @@ -646,7 +646,7 @@ @ stdcall RtlEnterCriticalSection(ptr) @ stub RtlEnumProcessHeaps @ stub RtlEnumerateGenericTable -# @ stub RtlEnumerateGenericTableAvl +@ stdcall RtlEnumerateGenericTableAvl(ptr long) # @ stub RtlEnumerateGenericTableLikeADirectory @ stdcall RtlEnumerateGenericTableWithoutSplaying(ptr ptr) # @ stub RtlEnumerateGenericTableWithoutSplayingAvl @@ -725,7 +725,7 @@ @ stdcall RtlGetCurrentTransaction() @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) @ stdcall RtlGetElementGenericTable(ptr long) -# @ stub RtlGetElementGenericTableAvl +@ stdcall RtlGetElementGenericTableAvl(ptr long) @ stdcall RtlGetEnabledExtendedFeatures(int64) @ stdcall RtlGetExePath(wstr ptr) @ stdcall RtlGetExtendedContextLength(long ptr) @@ -876,7 +876,7 @@ # @ stub RtlLogStackBackTrace @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stdcall RtlLookupElementGenericTable(ptr ptr) -# @ stub RtlLookupElementGenericTableAvl +@ stdcall RtlLookupElementGenericTableAvl(ptr ptr) @ stdcall -arch=!i386 RtlLookupFunctionEntry(long ptr ptr) @ stdcall -arch=!i386 RtlLookupFunctionTable(long ptr ptr) @ stdcall RtlMakeSelfRelativeSD(ptr ptr ptr) @@ -898,7 +898,7 @@ @ stdcall RtlNtStatusToDosError(long) @ stdcall RtlNtStatusToDosErrorNoTeb(long) @ stdcall RtlNumberGenericTableElements(ptr) -# @ stub RtlNumberGenericTableElementsAvl +@ stdcall RtlNumberGenericTableElementsAvl(ptr) @ stdcall RtlNumberOfClearBits(ptr) @ stdcall RtlNumberOfSetBits(ptr) @ stdcall RtlOemStringToUnicodeSize(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 3d482ec2f92..08b584a8dec 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -2164,15 +2164,61 @@ BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE table, PRTL_AVL_COMPARE_ROUTINE compare, PRTL_AVL_ALLOCATE_ROUTINE allocate, PRTL_AVL_FREE_ROUTINE free, void *context) { - FIXME("%p %p %p %p %p: stub\n", table, compare, allocate, free, context); + FIXME("(%p, %p, %p, %p, %p): stub\n", table, compare, allocate, free, context); } /*********************************************************************** * RtlInsertElementGenericTableAvl (NTDLL.@) */ -void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer, ULONG size, BOOL *element) +void * WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer, ULONG size, BOOLEAN *element) { - FIXME("%p %p %lu %p: stub\n", table, buffer, size, element); + FIXME("(%p, %p, %lu, %p): stub\n", table, buffer, size, element); + return NULL; +} + +/*********************************************************************** + * RtlGetElementGenericTableAvl (NTDLL.@) + */ +void * WINAPI RtlGetElementGenericTableAvl(PRTL_AVL_TABLE table, ULONG index) +{ + FIXME("(%p, %lu): stub\n", table, index); + return NULL; +} + +/*********************************************************************** + * RtlLookupElementGenericTableAvl (NTDLL.@) + */ +void * WINAPI RtlLookupElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer) +{ + FIXME("(%p, %p): stub\n", table, buffer); + return NULL; +} + +/*********************************************************************** + * RtlDeleteElementGenericTableAvl (NTDLL.@) + */ +BOOLEAN WINAPI RtlDeleteElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer) +{ + FIXME("(%p, %p): stub\n", table, buffer); + return FALSE; +} + +/*********************************************************************** + * RtlEnumerateGenericTableAvl (NTDLL.@) + */ +void * WINAPI RtlEnumerateGenericTableAvl(PRTL_AVL_TABLE table, BOOLEAN restart) +{ + FIXME("(%p, %s): stub\n", table, restart ? "TRUE" : "FALSE"); + return NULL; +} + +/*********************************************************************** + * RtlNumberGenericTableElementsAvl (NTDLL.@) + */ +ULONG WINAPI RtlNumberGenericTableElementsAvl(PRTL_AVL_TABLE table) +{ + FIXME("(%p): stub\n", table); + return 0UL; } /********************************************************************* diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d098cf19c78..cbdc0a098b2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1054,7 +1054,7 @@ @ stdcall RtlDeleteAce(ptr long) @ stdcall RtlDeleteAtomFromAtomTable(ptr long) @ stub RtlDeleteElementGenericTable -@ stub RtlDeleteElementGenericTableAvl +@ stdcall RtlDeleteElementGenericTableAvl(ptr ptr) @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @ stub RtlDeleteRange @@ -1070,7 +1070,7 @@ @ stdcall -arch=win32 RtlEnlargedUnsignedDivide(int64 long ptr) @ stdcall -arch=win32 -ret64 RtlEnlargedUnsignedMultiply(long long) @ stub RtlEnumerateGenericTable -@ stub RtlEnumerateGenericTableAvl +@ stdcall RtlEnumerateGenericTableAvl(ptr long) @ stub RtlEnumerateGenericTableLikeADirectory @ stdcall RtlEnumerateGenericTableWithoutSplaying(ptr ptr) @ stub RtlEnumerateGenericTableWithoutSplayingAvl @@ -1115,7 +1115,7 @@ @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) @ stub RtlGetDefaultCodePage @ stdcall RtlGetElementGenericTable(ptr long) -@ stub RtlGetElementGenericTableAvl +@ stdcall RtlGetElementGenericTableAvl(ptr long) @ stdcall RtlGetExtendedContextLength(long ptr) @ stdcall RtlGetExtendedContextLength2(long ptr int64) @ stub RtlGetFirstRange @@ -1200,7 +1200,7 @@ @ stub RtlLockBootStatusData @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stdcall RtlLookupElementGenericTable(ptr ptr) -@ stub RtlLookupElementGenericTableAvl +@ stdcall RtlLookupElementGenericTableAvl(ptr ptr) @ stub RtlLookupElementGenericTableFull @ stub RtlLookupElementGenericTableFullAvl @ stdcall -arch=!i386 RtlLookupFunctionEntry(long ptr ptr) @@ -1215,7 +1215,7 @@ @ stdcall RtlNtStatusToDosError(long) @ stdcall RtlNtStatusToDosErrorNoTeb(long) @ stdcall RtlNumberGenericTableElements(ptr) -@ stub RtlNumberGenericTableElementsAvl +@ stdcall RtlNumberGenericTableElementsAvl(ptr) @ stdcall RtlNumberOfClearBits(ptr) @ stdcall RtlNumberOfSetBits(ptr) @ stub RtlOemStringToCountedUnicodeString diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 471c27c27ba..a245312ced6 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -272,7 +272,12 @@ BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN); void * WINAPI RtlGetElementGenericTable(PRTL_GENERIC_TABLE,ULONG); void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); -void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); +void * WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOLEAN*); +void * WINAPI RtlGetElementGenericTableAvl(PRTL_AVL_TABLE,ULONG); +void * WINAPI RtlLookupElementGenericTableAvl(PRTL_AVL_TABLE,void *); +BOOLEAN WINAPI RtlDeleteElementGenericTableAvl(PRTL_AVL_TABLE,void *); +void * WINAPI RtlEnumerateGenericTableAvl(PRTL_AVL_TABLE,BOOLEAN); +ULONG WINAPI RtlNumberGenericTableElementsAvl(PRTL_AVL_TABLE); void * WINAPI RtlLookupElementGenericTable(PRTL_GENERIC_TABLE,void *); void WINAPI RtlMapGenericMask(ACCESS_MASK*,const GENERIC_MAPPING*); ULONG WINAPI RtlNumberGenericTableElements(PRTL_GENERIC_TABLE); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5251
it would be a good idea to split all of this into separate commits. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5251#note_63729
Always use real name to signoff the patches -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5251#note_63730
participants (4)
-
Etaash Mathamsetty (＠etaash.mathamsetty) -
Infinite Loop
-
Infinite Loop (＠infiniteloop)
-
Vijay Kiran Kamuju (＠infyquest)