Corrected RtlConvertSidToUnicodeString, stub for VerSetConditionMask.

This commit is contained in:
Juergen Schmied 2002-05-09 20:30:52 +00:00 committed by Alexandre Julliard
parent e8449e6028
commit 5ec1b0d121
3 changed files with 34 additions and 14 deletions

View File

@ -737,3 +737,13 @@ NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID Luid)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
/******************************************************************************
* VerSetConditionMask (NTDLL.@)
*/
ULONGLONG WINAPI VerSetConditionMask( ULONGLONG dwlConditionMask, DWORD dwTypeBitMask,
BYTE dwConditionMask)
{
FIXME("%llx %lu %u\n", dwlConditionMask, dwTypeBitMask, dwConditionMask);
return dwlConditionMask;
}

View File

@ -310,7 +310,7 @@ debug_channels (atom cdrom console debug delayhlp dll dosfs dosmem file fixup
@ stub RtlConvertExclusiveToShared @ stub RtlConvertExclusiveToShared
@ stdcall -ret64 RtlConvertLongToLargeInteger(long) RtlConvertLongToLargeInteger @ stdcall -ret64 RtlConvertLongToLargeInteger(long) RtlConvertLongToLargeInteger
@ stub RtlConvertSharedToExclusive @ stub RtlConvertSharedToExclusive
@ stdcall RtlConvertSidToUnicodeString(ptr ptr)RtlConvertSidToUnicodeString @ stdcall RtlConvertSidToUnicodeString(ptr ptr long) RtlConvertSidToUnicodeString
@ stub RtlConvertUiListToApiList @ stub RtlConvertUiListToApiList
@ stdcall -ret64 RtlConvertUlongToLargeInteger(long) RtlConvertUlongToLargeInteger @ stdcall -ret64 RtlConvertUlongToLargeInteger(long) RtlConvertUlongToLargeInteger
@ stub RtlCopyLuid @ stub RtlCopyLuid
@ -1013,6 +1013,7 @@ debug_channels (atom cdrom console debug delayhlp dll dosfs dosmem file fixup
@ stub RtlCreatePropertySet @ stub RtlCreatePropertySet
@ stub RtlSetPropertySetClassId @ stub RtlSetPropertySetClassId
@ stdcall NtPowerInformation(long long long long long) NtPowerInformation @ stdcall NtPowerInformation(long long long long long) NtPowerInformation
@ stdcall -ret64 VerSetConditionMask(long long long long) VerSetConditionMask
################## ##################
# Wine extensions # Wine extensions

View File

@ -23,6 +23,9 @@
#include <time.h> #include <time.h>
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <pwd.h>
#include <unistd.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wine/exception.h" #include "wine/exception.h"
@ -721,23 +724,29 @@ NTSTATUS WINAPI RtlGetControlSecurityDescriptor(
/****************************************************************************** /******************************************************************************
* RtlConvertSidToUnicodeString (NTDLL.@) * RtlConvertSidToUnicodeString (NTDLL.@)
*
* The returned SID is used to access the USER registry hive usually
*
* the native function returns something like
* "S-1-5-21-0000000000-000000000-0000000000-500";
*/ */
NTSTATUS WINAPI RtlConvertSidToUnicodeString( NTSTATUS WINAPI RtlConvertSidToUnicodeString(
PUNICODE_STRING UnicodeSID, PUNICODE_STRING String,
PSID *pSid) PSID Sid,
BOOLEAN AllocateString)
{ {
/* LPSTR GenSID = "S-1-5-21-0000000000-000000000-0000000000-500"; */ const char *p;
NTSTATUS status;
LPSTR GenSID = ".Default"; /* usually the returned SID is used to */
/* access "\\REGISTRY\\USER\\.DEFAULT" */
ANSI_STRING AnsiStr; ANSI_STRING AnsiStr;
FIXME("(%p %p)\n", UnicodeSID, pSid); struct passwd *pwd = getpwuid( getuid() );
if (UnicodeSID) p = (pwd) ? pwd->pw_name : ".Default";
TRACE("%p(<OUT>) (%u %u)\n",
UnicodeSID->Buffer, UnicodeSID->Length, UnicodeSID->MaximumLength);
RtlInitAnsiString(&AnsiStr, GenSID); FIXME("(%p %p %u)\n", String, Sid, AllocateString);
return RtlAnsiStringToUnicodeString(UnicodeSID, &AnsiStr, TRUE);
RtlInitAnsiString(&AnsiStr, p);
status = RtlAnsiStringToUnicodeString(String, &AnsiStr, AllocateString);
TRACE("%s (%u %u)\n",debugstr_w(String->Buffer),String->Length,String->MaximumLength);
return status;
} }