Ros-diffs May 2021

ros-diffs@reactos.org

21 participants
183 discussions

[reactos] 01/01: [REACTOS] Fix parameter types on some exports (#3217)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=249f2388bd7ce08657811… commit 249f2388bd7ce086578119b50c988ba752169fc1 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat May 1 21:11:34 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat May 1 21:11:34 2021 +0200 [REACTOS] Fix parameter types on some exports (#3217) Fix some wrong parameter types on some exports in NTDLL, KERNEL32, WTSAPI32, and NTOSKRNL. --- dll/ntdll/def/ntdll.spec | 38 +++++++++++++++++++------------------- dll/win32/kernel32/kernel32.spec | 6 +++--- dll/win32/wtsapi32/wtsapi32.spec | 2 +- ntoskrnl/ntoskrnl.spec | 8 ++++---- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index dc9969102e2..63fd851dc8d 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -284,7 +284,7 @@ @ stdcall NtCreateProcessEx(ptr long ptr ptr long ptr ptr ptr long) @ stdcall NtCreateProfile(ptr ptr ptr long long ptr long long long) ; CHECKME @ stub -version=0x600+ NtCreateResourceManager -@ stdcall NtCreateSection(ptr long ptr ptr long long long) +@ stdcall NtCreateSection(ptr long ptr ptr long long ptr) @ stdcall NtCreateSemaphore(ptr long ptr long long) @ stdcall NtCreateSymbolicLinkObject(ptr long ptr ptr) @ stdcall NtCreateThread(ptr long ptr ptr ptr ptr ptr long) @@ -427,13 +427,13 @@ @ stdcall NtQueryFullAttributesFile(ptr ptr) @ stdcall NtQueryInformationAtom(long long ptr long ptr) @ stub -version=0x600+ NtQueryInformationEnlistment -@ stdcall NtQueryInformationFile(long ptr ptr long long) -@ stdcall NtQueryInformationJobObject(long long ptr long ptr) +@ stdcall NtQueryInformationFile(ptr ptr ptr long long) +@ stdcall NtQueryInformationJobObject(ptr long ptr long ptr) @ stdcall NtQueryInformationPort(ptr long ptr long ptr) -@ stdcall NtQueryInformationProcess(long long ptr long ptr) +@ stdcall NtQueryInformationProcess(ptr long ptr long ptr) @ stub -version=0x600+ NtQueryInformationResourceManager -@ stdcall NtQueryInformationThread(long long ptr long ptr) -@ stdcall NtQueryInformationToken(long long ptr long ptr) +@ stdcall NtQueryInformationThread(ptr long ptr long ptr) +@ stdcall NtQueryInformationToken(ptr long ptr long ptr) @ stub -version=0x600+ NtQueryInformationTransaction @ stub -version=0x600+ NtQueryInformationTransactionManager @ stub -version=0x600+ NtQueryInformationWorkerFactory @@ -524,14 +524,14 @@ @ stdcall NtSetHighWaitLowEventPair(ptr) @ stdcall NtSetInformationDebugObject(ptr long ptr long ptr) @ stub -version=0x600+ NtSetInformationEnlistment -@ stdcall NtSetInformationFile(long long long long long) -@ stdcall NtSetInformationJobObject(long long ptr long) -@ stdcall NtSetInformationKey(long long ptr long) -@ stdcall NtSetInformationObject(long long ptr long) -@ stdcall NtSetInformationProcess(long long long long) +@ stdcall NtSetInformationFile(ptr ptr ptr long long) +@ stdcall NtSetInformationJobObject(ptr long ptr long) +@ stdcall NtSetInformationKey(ptr long ptr long) +@ stdcall NtSetInformationObject(ptr long ptr long) +@ stdcall NtSetInformationProcess(ptr long ptr long) @ stub -version=0x600+ NtSetInformationResourceManager -@ stdcall NtSetInformationThread(long long ptr long) -@ stdcall NtSetInformationToken(long long ptr long) +@ stdcall NtSetInformationThread(ptr long ptr long) +@ stdcall NtSetInformationToken(ptr long ptr long) @ stub -version=0x600+ NtSetInformationTransaction @ stub -version=0x600+ NtSetInformationTransactionManager @ stub -version=0x600+ NtSetInformationWorkerFactory @@ -562,9 +562,9 @@ @ stdcall NtSuspendProcess(ptr) @ stdcall NtSuspendThread(long ptr) @ stdcall NtSystemDebugControl(long ptr long ptr long ptr) -@ stdcall NtTerminateJobObject(long long) -@ stdcall NtTerminateProcess(long long) -@ stdcall NtTerminateThread(long long) +@ stdcall NtTerminateJobObject(ptr long) +@ stdcall NtTerminateProcess(ptr long) +@ stdcall NtTerminateThread(ptr long) @ stdcall NtTestAlert() @ stub -version=0x600+ NtThawRegistry @ stub -version=0x600+ NtThawTransactions @@ -1720,9 +1720,9 @@ @ stdcall ZwSuspendProcess(ptr) @ stdcall ZwSuspendThread(long ptr) @ stdcall ZwSystemDebugControl(long ptr long ptr long ptr) -@ stdcall ZwTerminateJobObject(long long) -@ stdcall ZwTerminateProcess(long long) -@ stdcall ZwTerminateThread(long long) +@ stdcall ZwTerminateJobObject(ptr long) +@ stdcall ZwTerminateProcess(ptr long) +@ stdcall ZwTerminateThread(ptr long) @ stdcall ZwTestAlert() @ stub -version=0x600+ ZwThawRegistry @ stub -version=0x600+ ZwThawTransactions diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index 765d5f450bb..1b8dd416be9 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -1109,9 +1109,9 @@ @ stdcall SwitchToThread() @ stdcall SystemTimeToFileTime(ptr ptr) @ stdcall SystemTimeToTzSpecificLocalTime (ptr ptr ptr) -@ stdcall TerminateJobObject(long long) -@ stdcall TerminateProcess(long long) -@ stdcall TerminateThread(long long) +@ stdcall TerminateJobObject(ptr long) +@ stdcall TerminateProcess(ptr long) +@ stdcall TerminateThread(ptr long) @ stdcall TermsrvAppInstallMode() @ stdcall Thread32First(long ptr) @ stdcall Thread32Next(long ptr) diff --git a/dll/win32/wtsapi32/wtsapi32.spec b/dll/win32/wtsapi32/wtsapi32.spec index 37838d5e07a..fe44d07248b 100644 --- a/dll/win32/wtsapi32/wtsapi32.spec +++ b/dll/win32/wtsapi32/wtsapi32.spec @@ -38,7 +38,7 @@ @ stdcall WTSStartRemoteControlSessionA(ptr long long long) @ stdcall WTSStartRemoteControlSessionW(ptr long long long) @ stdcall WTSStopRemoteControlSession(long) -@ stdcall WTSTerminateProcess(long long long) +@ stdcall WTSTerminateProcess(ptr long long) @ stdcall WTSUnRegisterSessionNotification(long) @ stdcall WTSUnRegisterSessionNotificationEx(long long) @ stdcall WTSVirtualChannelClose(long) diff --git a/ntoskrnl/ntoskrnl.spec b/ntoskrnl/ntoskrnl.spec index 96660a3fea1..8d2dc6f4b23 100644 --- a/ntoskrnl/ntoskrnl.spec +++ b/ntoskrnl/ntoskrnl.spec @@ -868,9 +868,9 @@ @ stdcall NtOpenThreadTokenEx(ptr long long long ptr) @ stdcall NtQueryDirectoryFile(ptr ptr ptr ptr ptr ptr long long long ptr long) @ stdcall NtQueryEaFile(ptr ptr ptr long long ptr long ptr long) -@ stdcall NtQueryInformationAtom(ptr long ptr long ptr) +@ stdcall NtQueryInformationAtom(long long ptr long ptr) @ stdcall NtQueryInformationFile(ptr ptr ptr long long) -@ stdcall NtQueryInformationProcess(ptr ptr ptr long ptr) +@ stdcall NtQueryInformationProcess(ptr long ptr long ptr) @ stdcall NtQueryInformationThread(ptr long ptr long ptr) @ stdcall NtQueryInformationToken(ptr long ptr long ptr) @ stdcall NtQueryQuotaInformationFile(ptr ptr ptr long long ptr long ptr long) @@ -883,7 +883,7 @@ @ stdcall NtSetEaFile(ptr ptr ptr long) @ stdcall NtSetEvent(ptr ptr) @ stdcall NtSetInformationFile(ptr ptr ptr long long) -@ stdcall NtSetInformationProcess(ptr ptr ptr long) +@ stdcall NtSetInformationProcess(ptr long ptr long) @ stdcall NtSetInformationThread(ptr long ptr long) @ stdcall NtSetQuotaInformationFile(ptr ptr ptr long) @ stdcall NtSetSecurityObject(ptr long ptr) @@ -1249,7 +1249,7 @@ @ fastcall RtlPrefetchMemoryNonTemporal(ptr long) @ stdcall RtlPrefixString(ptr ptr long) @ stdcall RtlPrefixUnicodeString(ptr ptr long) -@ stdcall RtlQueryAtomInAtomTable(ptr ptr ptr ptr ptr ptr) +@ stdcall RtlQueryAtomInAtomTable(ptr long ptr ptr ptr ptr) @ stdcall RtlQueryRegistryValues(long wstr ptr ptr ptr) @ stdcall RtlQueryTimeZoneInformation(ptr) @ stdcall RtlRaiseException(ptr)

3 years, 7 months

[reactos] 01/01: [NTOS:OB] ObQueryDeviceMapInformation(): Fix annotations

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d8964331131f40be6eb7… commit 5d8964331131f40be6eb748f02378b929508a476 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat May 1 11:26:07 2021 +0200 [NTOS:OB] ObQueryDeviceMapInformation(): Fix annotations --- ntoskrnl/include/internal/ob.h | 6 +++--- ntoskrnl/ob/devicemap.c | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/include/internal/ob.h b/ntoskrnl/include/internal/ob.h index 2ecd936d536..87a5d6901f0 100644 --- a/ntoskrnl/include/internal/ob.h +++ b/ntoskrnl/include/internal/ob.h @@ -299,9 +299,9 @@ ObpSetHandleAttributes( NTSTATUS NTAPI ObQueryDeviceMapInformation( - IN PEPROCESS Process, - OUT PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo, - IN ULONG Flags + _In_opt_ PEPROCESS Process, + _Out_ PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo, + _In_ ULONG Flags ); // diff --git a/ntoskrnl/ob/devicemap.c b/ntoskrnl/ob/devicemap.c index 0c54f6995b8..866ef66482d 100644 --- a/ntoskrnl/ob/devicemap.c +++ b/ntoskrnl/ob/devicemap.c @@ -536,9 +536,10 @@ ObInheritDeviceMap(IN PEPROCESS Parent, NTSTATUS NTAPI -ObQueryDeviceMapInformation(IN PEPROCESS Process, - IN PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo, - IN ULONG Flags) +ObQueryDeviceMapInformation( + _In_opt_ PEPROCESS Process, + _Out_ PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo, + _In_ ULONG Flags) { PDEVICE_MAP DeviceMap = NULL, GlobalDeviceMap; BOOLEAN Dereference;

3 years, 7 months

[reactos] 01/01: [PSDK] UnlockResource(): Improve definition

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1689cdceaf8e2e5c7831… commit f1689cdceaf8e2e5c7831166fd9862902270d88f Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat May 1 09:48:02 2021 +0200 [PSDK] UnlockResource(): Improve definition Sync' with https://source.winehq.org/git/wine.git/commit/a9e50da352e32d4c1bc8d0a686efa… --- sdk/include/psdk/winbase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index b6bda981368..1e7071fda07 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -3225,7 +3225,7 @@ BOOL WINAPI TzSpecificLocalTimeToSystemTime(LPTIME_ZONE_INFORMATION,LPSYSTEMTIME LONG WINAPI UnhandledExceptionFilter(LPEXCEPTION_POINTERS); BOOL WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED); -#define UnlockResource(h) (h) +#define UnlockResource(handle) ((handle), 0) #define UnlockSegment(w) GlobalUnfix((HANDLE)(w)) /* Obsolete: Has no effect. */ BOOL WINAPI UnmapViewOfFile(LPCVOID); #if (_WIN32_WINNT >= 0x0500)

3 years, 7 months

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