Module: wine Branch: refs/heads/master Commit: 46d2886dd06b87c8ceec021a3584fb3356ddfd4e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46d2886dd06b87c8ceec021a...
Author: Robert Reif reif@earthlink.net Date: Thu Aug 3 18:54:14 2006 -0400
ntdll: Fix some function arguments.
---
dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/rtl.c | 22 ++++++++++++++++------ include/winternl.h | 4 ++-- 3 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4b5549f..5a75cec 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -517,7 +517,7 @@ # @ stub RtlDecodeSystemPointer @ stub RtlDeleteRange @ stdcall RtlDeleteRegistryValue(long ptr ptr) @ stdcall RtlDeleteResource(ptr) -@ stdcall RtlDeleteSecurityObject(long) +@ stdcall RtlDeleteSecurityObject(ptr) # @ stub RtlDeleteTimer # @ stub RtlDeleteTimerQueue # @ stub RtlDeleteTimerQueueEx @@ -738,7 +738,7 @@ # @ stub RtlMultiAppendUnicodeStringBuff @ stdcall RtlMultiByteToUnicodeSize(ptr str long) @ stub RtlNewInstanceSecurityObject @ stub RtlNewSecurityGrantedAccess -@ stdcall RtlNewSecurityObject(long long long long long long) +@ stdcall RtlNewSecurityObject(ptr ptr ptr long ptr ptr) # @ stub RtlNewSecurityObjectEx # @ stub RtlNewSecurityObjectWithMultipleInheritance @ stdcall RtlNormalizeProcessParams(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index ca02cdb..f4c52c9 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -372,17 +372,27 @@ VOID WINAPI RtlReleasePebLock(void) /****************************************************************************** * RtlNewSecurityObject [NTDLL.@] */ -DWORD WINAPI RtlNewSecurityObject(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6) { - FIXME("(0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx),stub!\n",x1,x2,x3,x4,x5,x6); - return 0; +NTSTATUS WINAPI +RtlNewSecurityObject( PSECURITY_DESCRIPTOR ParentDescriptor, + PSECURITY_DESCRIPTOR CreatorDescriptor, + PSECURITY_DESCRIPTOR *NewDescriptor, + BOOLEAN IsDirectoryObject, + HANDLE Token, + PGENERIC_MAPPING GenericMapping ) +{ + FIXME("(%p %p %p %d %p %p) stub!\n", ParentDescriptor, CreatorDescriptor, + NewDescriptor, IsDirectoryObject, Token, GenericMapping); + return STATUS_NOT_IMPLEMENTED; }
/****************************************************************************** * RtlDeleteSecurityObject [NTDLL.@] */ -DWORD WINAPI RtlDeleteSecurityObject(DWORD x1) { - FIXME("(0x%08lx),stub!\n",x1); - return 0; +NTSTATUS WINAPI +RtlDeleteSecurityObject( PSECURITY_DESCRIPTOR *ObjectDescriptor ) +{ + FIXME("(%p) stub!\n", ObjectDescriptor); + return STATUS_NOT_IMPLEMENTED; }
/************************************************************************** diff --git a/include/winternl.h b/include/winternl.h index 5177348..193e02a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2006,7 +2006,7 @@ NTSTATUS WINAPI RtlDeleteAtomFromAtomTa NTSTATUS WINAPI RtlDeleteCriticalSection(RTL_CRITICAL_SECTION *); NTSTATUS WINAPI RtlDeleteRegistryValue(ULONG, PCWSTR, PCWSTR); void WINAPI RtlDeleteResource(LPRTL_RWLOCK); -DWORD WINAPI RtlDeleteSecurityObject(DWORD); +NTSTATUS WINAPI RtlDeleteSecurityObject(PSECURITY_DESCRIPTOR*); PRTL_USER_PROCESS_PARAMETERS WINAPI RtlDeNormalizeProcessParams(RTL_USER_PROCESS_PARAMETERS*); NTSTATUS WINAPI RtlDestroyAtomTable(RTL_ATOM_TABLE); NTSTATUS WINAPI RtlDestroyEnvironment(PWSTR); @@ -2133,7 +2133,7 @@ void WINAPI RtlMapGenericMask(PACCE NTSTATUS WINAPI RtlMultiByteToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); NTSTATUS WINAPI RtlMultiByteToUnicodeSize(DWORD*,LPCSTR,UINT);
-DWORD WINAPI RtlNewSecurityObject(DWORD,DWORD,DWORD,DWORD,DWORD,DWORD); +NTSTATUS WINAPI RtlNewSecurityObject(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,BOOLEAN,HANDLE,PGENERIC_MAPPING); PRTL_USER_PROCESS_PARAMETERS WINAPI RtlNormalizeProcessParams(RTL_USER_PROCESS_PARAMETERS*); ULONG WINAPI RtlNtStatusToDosError(NTSTATUS); ULONG WINAPI RtlNtStatusToDosErrorNoTeb(NTSTATUS);