Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 57466: [NTOSKRNL] - Add an ASSERT in KeRundownThread
by tfaber＠svn.reactos.org 03 Oct '12

03 Oct '12

Author: tfaber Date: Wed Oct 3 19:01:47 2012 New Revision: 57466 URL: http://svn.reactos.org/svn/reactos?rev=57466&view=rev Log: [NTOSKRNL] - Add an ASSERT in KeRundownThread Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Wed Oct 3 19:01:47 2012 @@ -241,7 +241,7 @@ { /* Lock the thread */ KiAcquireThreadLock(Thread); - + /* Check again, and make sure there's not already a boost */ if ((Thread->Priority < LOW_REALTIME_PRIORITY) && !(Thread->PriorityDecrement)) @@ -266,7 +266,7 @@ /* Release thread lock */ KiReleaseThreadLock(Thread); } - + /* Release the dispatcher lokc */ KiReleaseDispatcherLock(OldIrql); } @@ -457,6 +457,7 @@ { /* Get the Mutant */ Mutant = CONTAINING_RECORD(NextEntry, KMUTANT, MutantListEntry); + ASSERT_MUTANT(Mutant); /* Make sure it's not terminating with APCs off */ if (Mutant->ApcDisable)

1 0

[mnordell] 57465: [NTOSKERNEL] Refactoring KiSatisfyObjectWait macro to prevent code duplication.
by mnordell＠svn.reactos.org 03 Oct '12

03 Oct '12

Author: mnordell Date: Wed Oct 3 17:57:14 2012 New Revision: 57465 URL: http://svn.reactos.org/svn/reactos?rev=57465&view=rev Log: [NTOSKERNEL] Refactoring KiSatisfyObjectWait macro to prevent code duplication. Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Wed Oct 3 17:57:14 2012 @@ -683,55 +683,6 @@ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); KeReleaseInStackQueuedSpinLockFromDpcLevel(DeviceLock); } -} - -// -// Satisfies the wait of any dispatcher object -// -#define KiSatisfyObjectWait(Object, Thread) \ -{ \ - /* Special case for Mutants */ \ - if ((Object)->Header.Type == MutantObject) \ - { \ - /* Decrease the Signal State */ \ - (Object)->Header.SignalState--; \ - \ - /* Check if it's now non-signaled */ \ - if (!(Object)->Header.SignalState) \ - { \ - /* Set the Owner Thread */ \ - (Object)->OwnerThread = Thread; \ - \ - /* Disable APCs if needed */ \ - Thread->KernelApcDisable = Thread->KernelApcDisable - \ - (Object)->ApcDisable; \ - \ - /* Check if it's abandoned */ \ - if ((Object)->Abandoned) \ - { \ - /* Unabandon it */ \ - (Object)->Abandoned = FALSE; \ - \ - /* Return Status */ \ - Thread->WaitStatus = STATUS_ABANDONED; \ - } \ - \ - /* Insert it into the Mutant List */ \ - InsertHeadList(Thread->MutantListHead.Blink, \ - &(Object)->MutantListEntry); \ - } \ - } \ - else if (((Object)->Header.Type & TIMER_OR_EVENT_TYPE) == \ - EventSynchronizationObject) \ - { \ - /* Synchronization Timers and Events just get un-signaled */ \ - (Object)->Header.SignalState = 0; \ - } \ - else if ((Object)->Header.Type == SemaphoreObject) \ - { \ - /* These ones can have multiple states, so we only decrease it */ \ - (Object)->Header.SignalState--; \ - } \ } // @@ -787,6 +738,22 @@ } // +// Satisfies the wait of any dispatcher object +// +#define KiSatisfyObjectWait(Object, Thread) \ +{ \ + /* Special case for Mutants */ \ + if ((Object)->Header.Type == MutantObject) \ + { \ + KiSatisfyMutantWait((Object), (Thread)); \ + } \ + else \ + { \ + KiSatisfyNonMutantWait(Object); \ + } \ +} + +// // Recalculates the due time // FORCEINLINE

1 0

[ekohl] 57464: [LSASRV] Fixes several bugs in the current implementation of LsapSplitNames and LsapLookupNames. This fixes the crashing lsa advapi32 wintest. LsapLookupNames is still WIP.
by ekohl＠svn.reactos.org 03 Oct '12

03 Oct '12

Author: ekohl Date: Wed Oct 3 13:05:06 2012 New Revision: 57464 URL: http://svn.reactos.org/svn/reactos?rev=57464&view=rev Log: [LSASRV] Fixes several bugs in the current implementation of LsapSplitNames and LsapLookupNames. This fixes the crashing lsa advapi32 wintest. LsapLookupNames is still WIP. Modified: trunk/reactos/dll/win32/lsasrv/sids.c Modified: trunk/reactos/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.c?re… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] Wed Oct 3 13:05:06 2012 @@ -676,8 +676,7 @@ PWELL_KNOWN_SID -LsapLookupWellKnownName(LPWSTR Domain, - LPWSTR Account) +LsapLookupWellKnownName(PUNICODE_STRING Name) { PLIST_ENTRY ListEntry; PWELL_KNOWN_SID Ptr; @@ -688,7 +687,7 @@ Ptr = CONTAINING_RECORD(ListEntry, WELL_KNOWN_SID, ListEntry); - if (_wcsicmp(Account, Ptr->Name.Buffer) == 0) + if (RtlEqualUnicodeString(Name, &Ptr->Name, TRUE)) return Ptr; ListEntry = ListEntry->Flink; @@ -708,6 +707,7 @@ PRPC_UNICODE_STRING DomainsBuffer = NULL; PRPC_UNICODE_STRING AccountsBuffer = NULL; ULONG DomainLength; + ULONG AccountLength; ULONG i; LPWSTR Ptr; NTSTATUS Status = STATUS_SUCCESS; @@ -728,13 +728,15 @@ for (i = 0; i < Count; i++) { -TRACE("Name: %S\n", Names[i].Buffer); +//TRACE("Name: %wZ\n", &Names[i]); Ptr = wcschr(Names[i].Buffer, L'\\'); if (Ptr == NULL) { + AccountLength = Names[i].Length / sizeof(WCHAR); + AccountsBuffer[i].Length = Names[i].Length; - AccountsBuffer[i].MaximumLength = Names[i].MaximumLength; + AccountsBuffer[i].MaximumLength = AccountsBuffer[i].Length + sizeof(WCHAR); AccountsBuffer[i].Buffer = MIDL_user_allocate(AccountsBuffer[i].MaximumLength); if (AccountsBuffer[i].Buffer == NULL) { @@ -745,13 +747,17 @@ CopyMemory(AccountsBuffer[i].Buffer, Names[i].Buffer, AccountsBuffer[i].Length); - AccountsBuffer[i].Buffer[AccountsBuffer[i].Length / sizeof(WCHAR)] = UNICODE_NULL; - -TRACE("Account name: %S\n", AccountsBuffer[i].Buffer); + AccountsBuffer[i].Buffer[AccountLength] = UNICODE_NULL; + +//TRACE("Account name: %wZ\n", &AccountsBuffer[i]); } else { - DomainLength = (ULONG)((ULONG_PTR)Ptr - (ULONG_PTR)Names[i].Buffer); + DomainLength = (ULONG)(ULONG_PTR)(Ptr - Names[i].Buffer); + AccountLength = (Names[i].Length / sizeof(WCHAR)) - DomainLength - 1; +//TRACE("DomainLength: %u\n", DomainLength); +//TRACE("AccountLength: %u\n", AccountLength); + if (DomainLength > 0) { DomainsBuffer[i].Length = (USHORT)DomainLength * sizeof(WCHAR); @@ -766,12 +772,12 @@ CopyMemory(DomainsBuffer[i].Buffer, Names[i].Buffer, DomainsBuffer[i].Length); - DomainsBuffer[i].Buffer[DomainsBuffer[i].Length / sizeof(WCHAR)] = UNICODE_NULL; - -TRACE("Domain name: %S\n", DomainsBuffer[i].Buffer); + DomainsBuffer[i].Buffer[DomainLength] = UNICODE_NULL; + +//TRACE("Domain name: %wZ\n", &DomainsBuffer[i]); } - AccountsBuffer[i].Length = Names[i].Length - (USHORT)((DomainLength + 1) * sizeof(WCHAR)); + AccountsBuffer[i].Length = (USHORT)AccountLength * sizeof(WCHAR); AccountsBuffer[i].MaximumLength = AccountsBuffer[i].Length + sizeof(WCHAR); AccountsBuffer[i].Buffer = MIDL_user_allocate(AccountsBuffer[i].MaximumLength); if (AccountsBuffer[i].Buffer == NULL) @@ -783,9 +789,9 @@ CopyMemory(AccountsBuffer[i].Buffer, &(Names[i].Buffer[DomainLength + 1]), AccountsBuffer[i].Length); - AccountsBuffer[i].Buffer[AccountsBuffer[i].Length / sizeof(WCHAR)] = UNICODE_NULL; - -TRACE("Account name: %S\n", AccountsBuffer[i].Buffer); + AccountsBuffer[i].Buffer[AccountLength] = UNICODE_NULL; + +//TRACE("Account name: %wZ\n", &AccountsBuffer[i]); } } @@ -849,9 +855,9 @@ PWELL_KNOWN_SID ptr; -TRACE("\n"); - - TranslatedSids->Entries = Count; +//TRACE("()\n"); + + TranslatedSids->Entries = 0; TranslatedSids->Sids = NULL; *ReferencedDomains = NULL; @@ -859,7 +865,7 @@ SidsBuffer = MIDL_user_allocate(SidsBufferLength); if (SidsBuffer == NULL) { -TRACE("\n"); +//TRACE("\n"); Status = STATUS_INSUFFICIENT_RESOURCES; goto done; } @@ -867,18 +873,26 @@ DomainsBuffer = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); if (DomainsBuffer == NULL) { -TRACE("\n"); +//TRACE("\n"); Status = STATUS_INSUFFICIENT_RESOURCES; goto done; } - DomainsBuffer->Entries = Count; + DomainsBuffer->Entries = 0; //Count; DomainsBuffer->Domains = MIDL_user_allocate(Count * sizeof(LSA_TRUST_INFORMATION)); if (DomainsBuffer->Domains == NULL) { -TRACE("\n"); +//TRACE("\n"); Status = STATUS_INSUFFICIENT_RESOURCES; goto done; + } + + for (i = 0; i < Count; i++) + { + SidsBuffer[i].Use = SidTypeUnknown; + SidsBuffer[i].Sid = NULL; + SidsBuffer[i].DomainIndex = -1; + SidsBuffer[i].Flags = 0; } Status = LsapSplitNames(Count, @@ -893,22 +907,39 @@ for (i = 0; i < Count; i++) { -TRACE("Name: %S\n", Names[i].Buffer); - -TRACE("Domain name: %S\n", DomainNames[i].Buffer); -TRACE("Account name: %S\n", AccountNames[i].Buffer); - - ptr = LsapLookupWellKnownName(DomainNames[i].Buffer, - AccountNames[i].Buffer); +//TRACE("Name: %wZ\n", &Names[i]); + +//TRACE("Domain name: %wZ\n", &DomainNames[i]); +//TRACE("Account name: %wZ\n", &AccountNames[i]); + + ptr = LsapLookupWellKnownName((PUNICODE_STRING)&AccountNames[i]); if (ptr != NULL) { -TRACE("Found well known account!\n"); +//TRACE("Found well known account!\n"); SidsBuffer[i].Use = ptr->Use; SidsBuffer[i].Sid = ptr->Sid; SidsBuffer[i].DomainIndex = -1; SidsBuffer[i].Flags = 0; +#if 0 + if (DomainNames[i].Buffer != NULL) + { + ptr2= LsapLookupWellKnownName((PUNICODE_STRING)&DomainNames[i].Buffer); + if (ptr2 != NULL) + { + + } + } + else if (ptr->Domain.Length != 0) + { + + } + else + { + + } +#endif Mapped++; continue; @@ -919,10 +950,11 @@ } done: - TRACE("done: Status %lx\n", Status); +// TRACE("done: Status %lx\n", Status); if (DomainNames != NULL) { +//TRACE("Free DomainNames\n"); for (i = 0; i < Count; i++) { if (DomainNames[i].Buffer != NULL) @@ -934,10 +966,14 @@ if (AccountNames != NULL) { +//TRACE("Free AccountNames\n"); for (i = 0; i < Count; i++) { +//TRACE("i: %lu\n", i); if (AccountNames[i].Buffer != NULL) + { MIDL_user_free(AccountNames[i].Buffer); + } } MIDL_user_free(AccountNames); @@ -945,6 +981,9 @@ if (!NT_SUCCESS(Status)) { +//TRACE("Failure!\n"); + +//TRACE("Free DomainsBuffer\n"); if (DomainsBuffer != NULL) { if (DomainsBuffer->Domains != NULL) @@ -953,11 +992,17 @@ MIDL_user_free(DomainsBuffer); } +//TRACE("Free SidsBuffer\n"); if (SidsBuffer != NULL) MIDL_user_free(SidsBuffer); } else { +//TRACE("Success!\n"); + + *ReferencedDomains = DomainsBuffer; + TranslatedSids->Entries = Count; + TranslatedSids->Sids = SidsBuffer; *MappedCount = Mapped; if (Mapped == 0) @@ -966,6 +1011,8 @@ Status = STATUS_SOME_NOT_MAPPED; } +// TRACE("done: Status %lx\n", Status); + return Status; }

1 0

[hbelusca] 57463: [REGEDIT] - Don't forget to close the file handle.
by hbelusca＠svn.reactos.org 02 Oct '12

02 Oct '12

Author: hbelusca Date: Tue Oct 2 23:43:55 2012 New Revision: 57463 URL: http://svn.reactos.org/svn/reactos?rev=57463&view=rev Log: [REGEDIT] - Don't forget to close the file handle. Modified: trunk/reactos/base/applications/regedit/regedit.c Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Tue Oct 2 23:43:55 2012 @@ -175,6 +175,8 @@ LoadString(hInst, IDS_IMPORT_OK, szText, COUNT_OF(szText)); InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, szTitle, szText, filename); } + + fclose(fp); } else {

1 0

[hbelusca] 57462: [REGEDIT] - WCHAR ==> TCHAR in (before a REALLY conversion of regedit into UNICODE) - Correct some mistakes in displayed strings - Improve informative / warning / error messages w...
by hbelusca＠svn.reactos.org 02 Oct '12

02 Oct '12

Author: hbelusca Date: Tue Oct 2 23:29:22 2012 New Revision: 57462 URL: http://svn.reactos.org/svn/reactos?rev=57462&view=rev Log: [REGEDIT] - WCHAR ==> TCHAR in (before a REALLY conversion of regedit into UNICODE) - Correct some mistakes in displayed strings - Improve informative / warning / error messages when importing registry files - Now, try to import each registry file specified in the command line and don't fail miserably when one of them is missing, but continue with the next one (as Windows' regedit does). Patch by Edijs Kolesnikovičs (2/2) adapted by me. CORE-6239 #comment Fixed in r57462 with some adaptations. Thanks ;) #resolve Modified: trunk/reactos/base/applications/regedit/regedit.c Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Tue Oct 2 23:29:22 2012 @@ -23,30 +23,31 @@ static const char *usage = "Usage:\n" - " regedit filename\n" + " regedit filenames\n" " regedit /E filename [regpath]\n" " regedit /D regpath\n" "\n" - "filename - registry file name\n" - "regpath - name of the registry key\n" + "filenames - List of registry files names\n" + "filename - Registry file name\n" + "regpath - Name of the registry key\n" "\n" "When is called without any switches adds contents of the specified\n" - "registry file to the registry\n" + "registry files to the registry.\n" "\n" "Switches:\n" - " /E - exports contents of the specified registry key to the specified\n" - " file. Exports the whole registry if no key is specified.\n" - " /D - deletes specified registry key\n" - " /S - silent execution, can be used with any other switch.\n" - " The only existing mode, exists for compatibility with Windows regedit.\n" - " /V - advanced mode, can be used with any other switch.\n" - " Ignored, exists for compatibility with Windows regedit.\n" - " /L - location of system.dat file. Can be used with any other switch.\n" - " Ignored. Exists for compatibility with Windows regedit.\n" - " /R - location of user.dat file. Can be used with any other switch.\n" - " Ignored. Exists for compatibility with Windows regedit.\n" - " /? - print this help. Any other switches are ignored.\n" - " /C - create registry from. Not implemented.\n" + " /E - Exports contents of the specified registry key to the specified\n" + " file. Exports the whole registry if no key is specified.\n" + " /D - Deletes specified registry key\n" + " /S - Silent execution, can be used with any other switch.\n" + " The only existing mode, exists for compatibility with Windows regedit.\n" + " /V - Advanced mode, can be used with any other switch.\n" + " Ignored, exists for compatibility with Windows regedit.\n" + " /L - Location of system.dat file. Can be used with any other switch.\n" + " Ignored. Exists for compatibility with Windows regedit.\n" + " /R - Location of user.dat file. Can be used with any other switch.\n" + " Ignored. Exists for compatibility with Windows regedit.\n" + " /? - Print this help. Any other switches are ignored.\n" + " /C - Create registry from. Not implemented.\n" "\n" "The switches are case-insensitive, can be prefixed either by '-' or '/'.\n" "This program is command-line compatible with Microsoft Windows\n" @@ -74,10 +75,10 @@ * where *s[0] is the first symbol of the file name. * file_name - buffer to write the file name to. */ -void get_file_name(LPWSTR *command_line, LPWSTR file_name) -{ - WCHAR *s = *command_line; - int pos = 0; /* position of pointer "s" in *command_line */ +void get_file_name(LPTSTR *command_line, LPTSTR file_name) +{ + TCHAR *s = *command_line; + int pos = 0; /* position of pointer "s" in *command_line */ file_name[0] = 0; if (!s[0]) @@ -85,11 +86,11 @@ return; } - if (s[0] == L'"') + if (s[0] == _T('"')) { s++; (*command_line)++; - while(s[0] != L'"') + while(s[0] != _T('"')) { if (!s[0]) { @@ -102,7 +103,7 @@ } else { - while(s[0] && !iswspace(s[0])) + while(s[0] && !_istspace(s[0])) { s++; pos++; @@ -110,13 +111,13 @@ } memcpy(file_name, *command_line, pos * sizeof(WCHAR)); /* remove the last backslash */ - if (file_name[pos - 1] == L'\\') - { - file_name[pos - 1] = L'\0'; + if (file_name[pos - 1] == _T('\\')) + { + file_name[pos - 1] = _T('\0'); } else { - file_name[pos] = L'\0'; + file_name[pos] = _T('\0'); } if (s[0]) @@ -124,7 +125,7 @@ s++; pos++; } - while(s[0] && iswspace(s[0])) + while(s[0] && _istspace(s[0])) { s++; pos++; @@ -132,88 +133,116 @@ (*command_line) += pos; } -BOOL PerformRegAction(REGEDIT_ACTION action, LPWSTR s, BOOL silent) -{ - TCHAR szTitle[256], szText[256]; +BOOL PerformRegAction(REGEDIT_ACTION action, LPTSTR s, BOOL silent) +{ switch (action) { - case ACTION_ADD: - { - WCHAR filename[MAX_PATH]; - FILE *fp; - - get_file_name(&s, filename); - if (!filename[0]) - { - fprintf(stderr, "%s: No file name is specified\n", getAppName()); - fprintf(stderr, usage); - exit(4); - } - - while(filename[0]) - { - fp = _wfopen(filename, L"r"); - if (fp == NULL) - { - LPSTR p = GetMultiByteString(filename); - perror(""); - fprintf(stderr, "%s: Can't open file \"%s\"\n", getAppName(), p); - HeapFree(GetProcessHeap(), 0, p); - exit(5); - } - import_registry_file(fp); + case ACTION_ADD: + { + TCHAR szTitle[512], szText[512]; + TCHAR filename[MAX_PATH]; + FILE *fp; + get_file_name(&s, filename); + if (!filename[0]) + { + fprintf(stderr, "%s: No file name is specified\n", getAppName()); + fprintf(stderr, usage); + exit(4); + } + LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); - LoadString(hInst, IDS_IMPORT_OK, szText, COUNT_OF(szText)); - /* show successful import */ - if (!silent) - MessageBox(NULL, szText, szTitle, MB_OK); - } - break; - } - case ACTION_DELETE: - { - WCHAR reg_key_name[KEY_MAX_LEN]; - get_file_name(&s, reg_key_name); - if (!reg_key_name[0]) - { - fprintf(stderr, "%s: No registry key is specified for removal\n", getAppName()); - fprintf(stderr, usage); - exit(6); - } - delete_registry_key(reg_key_name); - break; - } - case ACTION_EXPORT: - { - WCHAR filename[MAX_PATH]; - - filename[0] = _T('\0'); - get_file_name(&s, filename); - if (!filename[0]) - { - fprintf(stderr, "%s: No file name is specified\n", getAppName()); - fprintf(stderr, usage); - exit(7); - } - - if (s[0]) - { - WCHAR reg_key_name[KEY_MAX_LEN]; + + while (filename[0]) + { + /* Request import confirmation */ + if (!silent) + { + LoadString(hInst, IDS_IMPORT_PROMPT, szText, COUNT_OF(szText)); + + if (InfoMessageBox(NULL, MB_YESNO | MB_ICONWARNING, szTitle, szText, filename) != IDYES) + goto cont; + } + + fp = _tfopen(filename, _T("r")); + if (fp != NULL) + { + import_registry_file(fp); + + /* Show successful import */ + if (!silent) + { + LoadString(hInst, IDS_IMPORT_OK, szText, COUNT_OF(szText)); + InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, szTitle, szText, filename); + } + } + else + { + LPSTR p = GetMultiByteString(filename); + perror(""); + fprintf(stderr, "%s: Can't open file \"%s\"\n", getAppName(), p); + HeapFree(GetProcessHeap(), 0, p); + + /* Error opening the file */ + if (!silent) + { + LoadString(hInst, IDS_IMPORT_ERROR, szText, COUNT_OF(szText)); + InfoMessageBox(NULL, MB_OK | MB_ICONERROR, szTitle, szText, filename); + } + } + +cont: + get_file_name(&s, filename); + } + break; + } + + case ACTION_DELETE: + { + TCHAR reg_key_name[KEY_MAX_LEN]; get_file_name(&s, reg_key_name); - export_registry_key(filename, reg_key_name, REG_FORMAT_4); - } - else - { - export_registry_key(filename, NULL, REG_FORMAT_4); - } - break; - } - default: - fprintf(stderr, "%s: Unhandled action!\n", getAppName()); - exit(8); - break; - } + if (!reg_key_name[0]) + { + fprintf(stderr, "%s: No registry key is specified for removal\n", getAppName()); + fprintf(stderr, usage); + exit(6); + } + delete_registry_key(reg_key_name); + break; + } + + case ACTION_EXPORT: + { + TCHAR filename[MAX_PATH]; + + filename[0] = _T('\0'); + get_file_name(&s, filename); + if (!filename[0]) + { + fprintf(stderr, "%s: No file name is specified\n", getAppName()); + fprintf(stderr, usage); + exit(7); + } + + if (s[0]) + { + TCHAR reg_key_name[KEY_MAX_LEN]; + get_file_name(&s, reg_key_name); + export_registry_key(filename, reg_key_name, REG_FORMAT_4); + } + else + { + export_registry_key(filename, NULL, REG_FORMAT_4); + } + break; + } + + default: + fprintf(stderr, "%s: Unhandled action!\n", getAppName()); + exit(8); + break; + } + return TRUE; } @@ -233,35 +262,35 @@ else { fprintf(stderr, "%s: Alphabetic character is expected after '%c' " - "in swit ch specification\n", getAppName(), *(s - 1)); + "in switch specification\n", getAppName(), *(s - 1)); } exit(1); } -BOOL ProcessCmdLine(LPWSTR lpCmdLine) +BOOL ProcessCmdLine(LPTSTR lpCmdLine) { BOOL silent = FALSE; REGEDIT_ACTION action = ACTION_UNDEF; - LPWSTR s = lpCmdLine; /* command line pointer */ - WCHAR ch = *s; /* current character */ - - while (ch && ((ch == L'-') || (ch == L'/'))) - { - WCHAR chu; - WCHAR ch2; + LPTSTR s = lpCmdLine; /* command line pointer */ + TCHAR ch = *s; /* current character */ + + while (ch && ((ch == _T('-')) || (ch == _T('/')))) + { + TCHAR chu; + TCHAR ch2; s++; ch = *s; ch2 = *(s + 1); - chu = (WCHAR)towupper(ch); - if (!ch2 || iswspace(ch2)) - { - if (chu == L'S') + chu = _totupper(ch); + if (!ch2 || _istspace(ch2)) + { + if (chu == _T('S')) { /* Silence dialogs */ silent = TRUE; } - else if (chu == L'V') + else if (chu == _T('V')) { /* Ignore this switch */ } @@ -269,41 +298,41 @@ { switch (chu) { - case L'D': - action = ACTION_DELETE; - break; - case L'E': - action = ACTION_EXPORT; - break; - case L'?': - fprintf(stderr, usage); - exit(3); - break; - default: - error_unknown_switch(chu, s); - break; + case _T('D'): + action = ACTION_DELETE; + break; + case _T('E'): + action = ACTION_EXPORT; + break; + case _T('?'): + fprintf(stderr, usage); + exit(3); + break; + default: + error_unknown_switch(chu, s); + break; } } s++; } else { - if (ch2 == L':') + if (ch2 == _T(':')) { switch (chu) { - case L'L': - /* fall through */ - case L'R': - s += 2; - while (*s && !iswspace(*s)) - { - s++; - } - break; - default: - error_unknown_switch(chu, s); - break; + case _T('L'): + /* fall through */ + case _T('R'): + s += 2; + while (*s && !_istspace(*s)) + { + s++; + } + break; + default: + error_unknown_switch(chu, s); + break; } } else @@ -315,7 +344,7 @@ } /* skip spaces to the next parameter */ ch = *s; - while (ch && iswspace(ch)) + while (ch && _istspace(ch)) { s++; ch = *s; @@ -323,25 +352,10 @@ } if (*s && action == ACTION_UNDEF) - { - if (!silent) - { - TCHAR szTitle[256], szText[256]; - LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); - LoadString(hInst, IDS_IMPORT_PROMPT, szText, COUNT_OF(szText)); - /* request import confirmation */ - if (MessageBox(NULL, szText, szTitle, MB_YESNO) == IDYES) - action = ACTION_ADD; - else - return TRUE; - } - else - { - action = ACTION_ADD; - } - } - if (action == ACTION_UNDEF) + action = ACTION_ADD; + + if (action != ACTION_UNDEF) + return PerformRegAction(action, s, silent); + else return FALSE; - - return PerformRegAction(action, s, silent); -} +}

1 0

[ekohl] 57461: [LSASRV] LsarLookupNames3: Use the existing list of well known SIDs to look-up well known account names.
by ekohl＠svn.reactos.org 02 Oct '12

02 Oct '12

Author: ekohl Date: Tue Oct 2 23:14:38 2012 New Revision: 57461 URL: http://svn.reactos.org/svn/reactos?rev=57461&view=rev Log: [LSASRV] LsarLookupNames3: Use the existing list of well known SIDs to look-up well known account names. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/sids.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Tue Oct 2 23:14:38 2012 @@ -2009,126 +2009,29 @@ DWORD LookupOptions, DWORD ClientRevision) { - SID_IDENTIFIER_AUTHORITY IdentifierAuthority = {SECURITY_NT_AUTHORITY}; - static const UNICODE_STRING DomainName = RTL_CONSTANT_STRING(L"DOMAIN"); - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer = NULL; - PLSAPR_TRANSLATED_SID_EX2 SidsBuffer = NULL; - ULONG SidsBufferLength; - ULONG DomainSidLength; - ULONG AccountSidLength; - PSID DomainSid; - PSID AccountSid; - ULONG i; NTSTATUS Status; TRACE("LsarLookupNames3(%p, %lu, %p, %p, %p, %d, %p, %lu, %lu)\n", PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids, LookupLevel, MappedCount, LookupOptions, ClientRevision); + TranslatedSids->Entries = 0; + TranslatedSids->Sids = NULL; + *ReferencedDomains = NULL; + if (Count == 0) return STATUS_NONE_MAPPED; - TranslatedSids->Entries = Count; - TranslatedSids->Sids = NULL; - *ReferencedDomains = NULL; - - SidsBufferLength = Count * sizeof(LSAPR_TRANSLATED_SID_EX2); - SidsBuffer = MIDL_user_allocate(SidsBufferLength); - if (SidsBuffer == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - for (i = 0; i < Count; i++) - { - SidsBuffer[i].Use = SidTypeUser; - SidsBuffer[i].Sid = NULL; - SidsBuffer[i].DomainIndex = -1; - SidsBuffer[i].Flags = 0; - } - - DomainsBuffer = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); - if (DomainsBuffer == NULL) - { - MIDL_user_free(SidsBuffer); - return STATUS_INSUFFICIENT_RESOURCES; - } - - DomainsBuffer->Entries = Count; - DomainsBuffer->Domains = MIDL_user_allocate(Count * sizeof(LSA_TRUST_INFORMATION)); - if (DomainsBuffer->Domains == NULL) - { - MIDL_user_free(DomainsBuffer); - MIDL_user_free(SidsBuffer); - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, - &DomainSid); - if (!NT_SUCCESS(Status)) - { - MIDL_user_free(DomainsBuffer->Domains); - MIDL_user_free(DomainsBuffer); - MIDL_user_free(SidsBuffer); - return Status; - } - - DomainSidLength = RtlLengthSid(DomainSid); - - for (i = 0; i < Count; i++) - { - DomainsBuffer->Domains[i].Sid = MIDL_user_allocate(DomainSidLength); - RtlCopyMemory(DomainsBuffer->Domains[i].Sid, - DomainSid, - DomainSidLength); - - DomainsBuffer->Domains[i].Name.Buffer = MIDL_user_allocate(DomainName.MaximumLength); - DomainsBuffer->Domains[i].Name.Length = DomainName.Length; - DomainsBuffer->Domains[i].Name.MaximumLength = DomainName.MaximumLength; - RtlCopyMemory(DomainsBuffer->Domains[i].Name.Buffer, - DomainName.Buffer, - DomainName.MaximumLength); - } - - Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, - 3, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - DOMAIN_USER_RID_ADMIN, - 0, 0, 0, 0, 0, - &AccountSid); - if (!NT_SUCCESS(Status)) - { - MIDL_user_free(DomainsBuffer->Domains); - MIDL_user_free(DomainsBuffer); - MIDL_user_free(SidsBuffer); - return Status; - } - - AccountSidLength = RtlLengthSid(AccountSid); - - for (i = 0; i < Count; i++) - { - SidsBuffer[i].Use = SidTypeWellKnownGroup; - SidsBuffer[i].Sid = MIDL_user_allocate(AccountSidLength); - - RtlCopyMemory(SidsBuffer[i].Sid, - AccountSid, - AccountSidLength); - - SidsBuffer[i].DomainIndex = i; - SidsBuffer[i].Flags = 0; - } - - *ReferencedDomains = DomainsBuffer; - *MappedCount = Count; - - TranslatedSids->Entries = Count; - TranslatedSids->Sids = SidsBuffer; - - return STATUS_SUCCESS; + Status = LsapLookupNames(Count, + Names, + ReferencedDomains, + TranslatedSids, + LookupLevel, + MappedCount, + LookupOptions, + ClientRevision); + + return Status; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Tue Oct 2 23:14:38 2012 @@ -196,3 +196,14 @@ LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_TRANSLATED_NAME OutputNames); +NTSTATUS +LsapLookupNames(DWORD Count, + PRPC_UNICODE_STRING Names, + PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + PLSAPR_TRANSLATED_SIDS_EX2 TranslatedSids, + LSAP_LOOKUP_LEVEL LookupLevel, + DWORD *MappedCount, + DWORD LookupOptions, + DWORD ClientRevision); + +/* EOF */ Modified: trunk/reactos/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.c?re… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] Tue Oct 2 23:14:38 2012 @@ -17,7 +17,7 @@ PSID Sid; UNICODE_STRING Name; UNICODE_STRING Domain; - SID_NAME_USE NameUse; + SID_NAME_USE Use; } WELL_KNOWN_SID, *PWELL_KNOWN_SID; @@ -155,7 +155,7 @@ PULONG SubAuthorities, PWSTR Name, PWSTR Domain, - SID_NAME_USE NameUse) + SID_NAME_USE Use) { PWELL_KNOWN_SID SidEntry; PULONG p; @@ -192,7 +192,7 @@ RtlInitUnicodeString(&SidEntry->Domain, Domain); - SidEntry->NameUse = NameUse; + SidEntry->Use = Use; InsertTailList(&WellKnownSidListHead, &SidEntry->ListEntry); @@ -275,8 +275,8 @@ LsapCreateSid(&NtAuthority, 0, NULL, - L"NT Pseudo Domain", - L"NT Pseudo Domain", + L"NT AUTHORITY", + L"NT AUTHORITY", SidTypeDomain); /* Dialup Sid */ @@ -625,7 +625,7 @@ ptr = LsapLookupWellKnownSid(Sids[i]); if (ptr != NULL) { - OutputNames[i].Use = ptr->NameUse; + OutputNames[i].Use = ptr->Use; OutputNames[i].DomainIndex = i; /* Fixme */ @@ -635,18 +635,33 @@ RtlCopyMemory(OutputNames[i].Name.Buffer, ptr->Name.Buffer, ptr->Name.MaximumLength); Mapped++; + continue; } - else - { - OutputNames[i].Use = SidTypeWellKnownGroup; - OutputNames[i].DomainIndex = i; - OutputNames[i].Name.Buffer = MIDL_user_allocate(UserName.MaximumLength); - OutputNames[i].Name.Length = UserName.Length; - OutputNames[i].Name.MaximumLength = UserName.MaximumLength; - RtlCopyMemory(OutputNames[i].Name.Buffer, UserName.Buffer, UserName.MaximumLength); - - Mapped++; - } + + /* Check for buildin domain SID */ + + /* Check for account domain SID */ + + /* Check for primary domain SID (later) */ + + /* Check for trusted domain SID (later) */ + + /* Check for builtin domain account SID */ + + /* Check for account domain account SID */ + + /* Check for primary domain account SID (later) */ + + + /* Unknown SID */ + OutputNames[i].Use = SidTypeWellKnownGroup; + OutputNames[i].DomainIndex = i; + OutputNames[i].Name.Buffer = MIDL_user_allocate(UserName.MaximumLength); + OutputNames[i].Name.Length = UserName.Length; + OutputNames[i].Name.MaximumLength = UserName.MaximumLength; + RtlCopyMemory(OutputNames[i].Name.Buffer, UserName.Buffer, UserName.MaximumLength); + + Mapped++; } if (Mapped == 0) @@ -659,4 +674,299 @@ return Status; } + +PWELL_KNOWN_SID +LsapLookupWellKnownName(LPWSTR Domain, + LPWSTR Account) +{ + PLIST_ENTRY ListEntry; + PWELL_KNOWN_SID Ptr; + + ListEntry = WellKnownSidListHead.Flink; + while (ListEntry != &WellKnownSidListHead) + { + Ptr = CONTAINING_RECORD(ListEntry, + WELL_KNOWN_SID, + ListEntry); + if (_wcsicmp(Account, Ptr->Name.Buffer) == 0) + return Ptr; + + ListEntry = ListEntry->Flink; + } + + return NULL; +} + + +static +NTSTATUS +LsapSplitNames(DWORD Count, + PRPC_UNICODE_STRING Names, + PRPC_UNICODE_STRING *DomainNames, + PRPC_UNICODE_STRING *AccountNames) +{ + PRPC_UNICODE_STRING DomainsBuffer = NULL; + PRPC_UNICODE_STRING AccountsBuffer = NULL; + ULONG DomainLength; + ULONG i; + LPWSTR Ptr; + NTSTATUS Status = STATUS_SUCCESS; + + DomainsBuffer = MIDL_user_allocate(Count * sizeof(RPC_UNICODE_STRING)); + if (DomainsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + AccountsBuffer = MIDL_user_allocate(Count * sizeof(RPC_UNICODE_STRING)); + if (AccountsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + for (i = 0; i < Count; i++) + { +TRACE("Name: %S\n", Names[i].Buffer); + + Ptr = wcschr(Names[i].Buffer, L'\\'); + if (Ptr == NULL) + { + AccountsBuffer[i].Length = Names[i].Length; + AccountsBuffer[i].MaximumLength = Names[i].MaximumLength; + AccountsBuffer[i].Buffer = MIDL_user_allocate(AccountsBuffer[i].MaximumLength); + if (AccountsBuffer[i].Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + CopyMemory(AccountsBuffer[i].Buffer, + Names[i].Buffer, + AccountsBuffer[i].Length); + AccountsBuffer[i].Buffer[AccountsBuffer[i].Length / sizeof(WCHAR)] = UNICODE_NULL; + +TRACE("Account name: %S\n", AccountsBuffer[i].Buffer); + } + else + { + DomainLength = (ULONG)((ULONG_PTR)Ptr - (ULONG_PTR)Names[i].Buffer); + if (DomainLength > 0) + { + DomainsBuffer[i].Length = (USHORT)DomainLength * sizeof(WCHAR); + DomainsBuffer[i].MaximumLength = DomainsBuffer[i].Length + sizeof(WCHAR); + DomainsBuffer[i].Buffer = MIDL_user_allocate(DomainsBuffer[i].MaximumLength); + if (DomainsBuffer[i].Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + CopyMemory(DomainsBuffer[i].Buffer, + Names[i].Buffer, + DomainsBuffer[i].Length); + DomainsBuffer[i].Buffer[DomainsBuffer[i].Length / sizeof(WCHAR)] = UNICODE_NULL; + +TRACE("Domain name: %S\n", DomainsBuffer[i].Buffer); + } + + AccountsBuffer[i].Length = Names[i].Length - (USHORT)((DomainLength + 1) * sizeof(WCHAR)); + AccountsBuffer[i].MaximumLength = AccountsBuffer[i].Length + sizeof(WCHAR); + AccountsBuffer[i].Buffer = MIDL_user_allocate(AccountsBuffer[i].MaximumLength); + if (AccountsBuffer[i].Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + CopyMemory(AccountsBuffer[i].Buffer, + &(Names[i].Buffer[DomainLength + 1]), + AccountsBuffer[i].Length); + AccountsBuffer[i].Buffer[AccountsBuffer[i].Length / sizeof(WCHAR)] = UNICODE_NULL; + +TRACE("Account name: %S\n", AccountsBuffer[i].Buffer); + } + } + +done: + if (!NT_SUCCESS(Status)) + { + if (AccountsBuffer != NULL) + { + for (i = 0; i < Count; i++) + { + if (AccountsBuffer[i].Buffer != NULL) + MIDL_user_free(AccountsBuffer[i].Buffer); + } + + MIDL_user_free(AccountsBuffer); + } + + if (DomainsBuffer != NULL) + { + for (i = 0; i < Count; i++) + { + if (DomainsBuffer[i].Buffer != NULL) + MIDL_user_free(DomainsBuffer[i].Buffer); + } + + MIDL_user_free(DomainsBuffer); + } + } + else + { + *DomainNames = DomainsBuffer; + *AccountNames = AccountsBuffer; + } + + return Status; +} + + +NTSTATUS +LsapLookupNames(DWORD Count, + PRPC_UNICODE_STRING Names, + PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + PLSAPR_TRANSLATED_SIDS_EX2 TranslatedSids, + LSAP_LOOKUP_LEVEL LookupLevel, + DWORD *MappedCount, + DWORD LookupOptions, + DWORD ClientRevision) +{ + PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer = NULL; + PLSAPR_TRANSLATED_SID_EX2 SidsBuffer = NULL; + PRPC_UNICODE_STRING DomainNames = NULL; + PRPC_UNICODE_STRING AccountNames = NULL; + ULONG SidsBufferLength; +// ULONG DomainSidLength; +// ULONG AccountSidLength; +// PSID DomainSid; +// PSID AccountSid; + ULONG i; + ULONG Mapped = 0; + NTSTATUS Status = STATUS_SUCCESS; + + PWELL_KNOWN_SID ptr; + +TRACE("\n"); + + TranslatedSids->Entries = Count; + TranslatedSids->Sids = NULL; + *ReferencedDomains = NULL; + + SidsBufferLength = Count * sizeof(LSAPR_TRANSLATED_SID_EX2); + SidsBuffer = MIDL_user_allocate(SidsBufferLength); + if (SidsBuffer == NULL) + { +TRACE("\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + DomainsBuffer = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); + if (DomainsBuffer == NULL) + { +TRACE("\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + DomainsBuffer->Entries = Count; + DomainsBuffer->Domains = MIDL_user_allocate(Count * sizeof(LSA_TRUST_INFORMATION)); + if (DomainsBuffer->Domains == NULL) + { +TRACE("\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = LsapSplitNames(Count, + Names, + &DomainNames, + &AccountNames); + if (!NT_SUCCESS(Status)) + { + TRACE("LsapSplitNames failed! (Status %lx)\n", Status); + goto done; + } + + for (i = 0; i < Count; i++) + { +TRACE("Name: %S\n", Names[i].Buffer); + +TRACE("Domain name: %S\n", DomainNames[i].Buffer); +TRACE("Account name: %S\n", AccountNames[i].Buffer); + + ptr = LsapLookupWellKnownName(DomainNames[i].Buffer, + AccountNames[i].Buffer); + if (ptr != NULL) + { +TRACE("Found well known account!\n"); + SidsBuffer[i].Use = ptr->Use; + SidsBuffer[i].Sid = ptr->Sid; + + SidsBuffer[i].DomainIndex = -1; + SidsBuffer[i].Flags = 0; + + + Mapped++; + continue; + } + + + + } + +done: + TRACE("done: Status %lx\n", Status); + + if (DomainNames != NULL) + { + for (i = 0; i < Count; i++) + { + if (DomainNames[i].Buffer != NULL) + MIDL_user_free(DomainNames[i].Buffer); + } + + MIDL_user_free(DomainNames); + } + + if (AccountNames != NULL) + { + for (i = 0; i < Count; i++) + { + if (AccountNames[i].Buffer != NULL) + MIDL_user_free(AccountNames[i].Buffer); + } + + MIDL_user_free(AccountNames); + } + + if (!NT_SUCCESS(Status)) + { + if (DomainsBuffer != NULL) + { + if (DomainsBuffer->Domains != NULL) + MIDL_user_free(DomainsBuffer->Domains); + + MIDL_user_free(DomainsBuffer); + } + + if (SidsBuffer != NULL) + MIDL_user_free(SidsBuffer); + } + else + { + *MappedCount = Mapped; + + if (Mapped == 0) + Status = STATUS_NONE_MAPPED; + else if (Mapped < Count) + Status = STATUS_SOME_NOT_MAPPED; + } + + return Status; +} + /* EOF */

1 0

[tkreuzer] 57460: [LIBCNTPR] Add atan2 [WIN32K] Remove duplicated floating point math functions [CPORTLIB] Fix an MSVC warning
by tkreuzer＠svn.reactos.org 02 Oct '12

02 Oct '12

Author: tkreuzer Date: Tue Oct 2 21:43:47 2012 New Revision: 57460 URL: http://svn.reactos.org/svn/reactos?rev=57460&view=rev Log: [LIBCNTPR] Add atan2 [WIN32K] Remove duplicated floating point math functions [CPORTLIB] Fix an MSVC warning Removed: trunk/reactos/win32ss/user/ntuser/misc/i386/ Modified: trunk/reactos/lib/cportlib/cport.c trunk/reactos/lib/sdk/crt/libcntpr.cmake trunk/reactos/win32ss/CMakeLists.txt Modified: trunk/reactos/lib/cportlib/cport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cportlib/cport.c?rev=5… ============================================================================== --- trunk/reactos/lib/cportlib/cport.c [iso-8859-1] (original) +++ trunk/reactos/lib/cportlib/cport.c [iso-8859-1] Tue Oct 2 21:43:47 2012 @@ -23,7 +23,7 @@ - Make this serial-port specific (NS16550 vs other serial port types) - Get x64 KDCOM, KDBG, FREELDR, and other current code to use this */ - + /* INCLUDES *******************************************************************/ #include <cportlib/cportlib.h> @@ -76,18 +76,18 @@ /* * See "Building Hardware and Firmware to Complement Microsoft Windows Headless Operation" * Out-of-Band Management Port Device Requirements: - * The device must act as a 16550 or 16450 UART. + * The device must act as a 16550 or 16450 UART. * Windows Server 2003 will test this device using the following process. * 1. Save off the current modem status register. * 2. Place the UART into diagnostic mode (The UART is placed into loopback mode * by writing SERIAL_MCR_LOOP to the modem control register). * 3. The modem status register is read and the high bits are checked. This means - * SERIAL_MSR_CTS, SERIAL_MSR_DSR, SERIAL_MSR_RI and SERIAL_MSR_DCD should + * SERIAL_MSR_CTS, SERIAL_MSR_DSR, SERIAL_MSR_RI and SERIAL_MSR_DCD should * all be clear. * 4. Place the UART in diagnostic mode and turn on OUTPUT (Loopback Mode and * OUTPUT are both turned on by writing (SERIAL_MCR_LOOP | SERIAL_MCR_OUT1) * to the modem control register). - * 5. The modem status register is read and the ring indicator is checked. + * 5. The modem status register is read and the ring indicator is checked. * This means SERIAL_MSR_RI should be set. * 6. Restore original modem status register. */ @@ -144,7 +144,7 @@ WRITE_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER, Lcr | SERIAL_LCR_DLAB); /* Set baud rate */ - Mode = 115200 / Rate; + Mode = (USHORT)(115200 / Rate); WRITE_PORT_UCHAR(Port->Address + DIVISOR_LATCH_MSB, (UCHAR)((Mode >> 8) & 0xff)); WRITE_PORT_UCHAR(Port->Address + DIVISOR_LATCH_LSB, (UCHAR)(Mode & 0xff)); @@ -168,7 +168,7 @@ /* Handle early read-before-init */ if (!Port->Address) return CP_GET_NODATA; - + /* If "wait" mode enabled, spin many times, otherwise attempt just once */ i = Wait ? 204800 : 1; while (i--) Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Tue Oct 2 21:43:47 2012 @@ -80,6 +80,7 @@ math/i386/allshl_asm.s math/i386/allshr_asm.s math/i386/atan_asm.s + math/i386/atan2_asm.s math/i386/aulldiv_asm.s math/i386/aulldvrm_asm.s math/i386/aullrem_asm.s Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Tue Oct 2 21:43:47 2012 @@ -194,12 +194,7 @@ gdi/dib/i386/dib24bpp_hline.s gdi/dib/i386/dib32bpp_hline.s gdi/dib/i386/dib32bpp_colorfill.s - gdi/eng/i386/floatobj.S - user/ntuser/misc/i386/cos_asm.s - user/ntuser/misc/i386/sin_asm.s - user/ntuser/misc/i386/atan2_asm.s - user/ntuser/misc/i386/floor_asm.s - user/ntuser/misc/i386/ceil_asm.s) + gdi/eng/i386/floatobj.S) else() list(APPEND SOURCE gdi/dib/dib24bppc.c

1 0

[tkreuzer] 57459: [WIN32K] Move gdi kdbg extension into a separate file, prefix names with ! to match WinDbg extensions more closely (e.g. "!gdi.help"), imlement help, dumpht, handle, entry and eve...
by tkreuzer＠svn.reactos.org 02 Oct '12

02 Oct '12

Author: tkreuzer Date: Tue Oct 2 21:20:28 2012 New Revision: 57459 URL: http://svn.reactos.org/svn/reactos?rev=57459&view=rev Log: [WIN32K] Move gdi kdbg extension into a separate file, prefix names with ! to match WinDbg extensions more closely (e.g. "!gdi.help"), imlement help, dumpht, handle, entry and eventlist commands. Added: trunk/reactos/win32ss/gdi/ntgdi/gdikdbgext.c (with props) Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Tue Oct 2 21:20:28 2012 @@ -206,6 +206,11 @@ gdi/dib/dib32bppc.c) endif() +if(KDBG) + list(APPEND SOURCE + gdi/ntgdi/gdikdbgext.c) +endif() + add_library(win32k SHARED ${CMAKE_CURRENT_BINARY_DIR}/win32k.def ${SOURCE}) Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] Tue Oct 2 21:20:28 2012 @@ -423,6 +423,7 @@ #define REL_ADDR(va) ((ULONG_PTR)va - (ULONG_PTR)&__ImageBase) VOID +NTAPI DbgPrintEvent(PLOGENTRY pLogEntry) { PSTR pstr; @@ -465,7 +466,6 @@ pLogEntry = CONTAINING_RECORD(psle, LOGENTRY, sleLink); DbgPrintEvent(pLogEntry); } - } VOID @@ -730,35 +730,6 @@ } -#if KDBG - -BOOLEAN -NTAPI -DbgGdiKdbgCliCallback( - IN PCHAR pszCommand, - IN ULONG argc, - IN PCH argv[]) -{ - - if (stricmp(argv[0], "gdi!dumpht") == 0) - { - DbgDumpGdiHandleTable(argc - 1, argv + 1); - } - else if (stricmp(argv[0], "gdi!handle") == 0) - { - DbgDumpHandleInfo(argv[1]); - } - else - { - /* Not handled */ - return FALSE; - } - - return TRUE; -} - -#endif // KDBG - #endif // DBG /* EOF */ Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidebug… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] Tue Oct 2 21:20:28 2012 @@ -41,6 +41,7 @@ VOID NTAPI DbgDumpEventList(PSLIST_HEADER pslh); VOID NTAPI DbgLogEvent(PSLIST_HEADER pslh, LOG_EVENT_TYPE nEventType, LPARAM lParam); VOID NTAPI DbgCleanupEventList(PSLIST_HEADER pslh); +VOID NTAPI DbgPrintEvent(PLOGENTRY pLogEntry); #define DBG_LOGEVENT(pslh, type, val) DbgLogEvent(pslh, type, (ULONG_PTR)val) #define DBG_INITLOG(pslh) InitializeSListHead(pslh) #define DBG_DUMP_EVENT_LIST(pslh) DbgDumpEventList(pslh) Added: trunk/reactos/win32ss/gdi/ntgdi/gdikdbgext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdikdbge… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdikdbgext.c (added) +++ trunk/reactos/win32ss/gdi/ntgdi/gdikdbgext.c [iso-8859-1] Tue Oct 2 21:20:28 2012 @@ -1,0 +1,369 @@ +/* + * PROJECT: ReactOS win32 kernel mode subsystem + * LICENSE: GPL - See COPYING in the top level directory + * FILE: win32ss/gdi/ntgdi/gdikdbgext.x + * PURPOSE: KDBG extension for GDI + * PROGRAMMERS: Timo Kreuzer + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +//#define NDEBUG +//#include <debug.h> + +extern PENTRY gpentHmgr; +extern PULONG gpaulRefCount; +extern PEPROCESS gpepCSRSS; +extern ULONG gulFirstUnused; + + +static const char * gpszObjectTypes[] = +{ + "FREE", "DC", "UNUSED1", "UNUSED2", "RGN", "SURF", "CLIENTOBJ", "PATH", + "PAL", "ICMLCS", "LFONT", "RFONT", "PFE", "PFT", "ICMCXF", "SPRITE", + "BRUSH", "UMPD", "UNUSED4", "SPACE", "UNUSED5", "META", "EFSTATE", + "BMFD", "VTFD", "TTFD", "RC", "TEMP", "DRVOBJ", "DCIOBJ", "SPOOL", + "RESERVED", "ALL" +}; + + +BOOLEAN +KdbIsMemoryValid(PVOID pvBase, ULONG cjSize) +{ + PUCHAR pjAddress; + + pjAddress = ALIGN_DOWN_POINTER_BY(pvBase, PAGE_SIZE); + + while (pjAddress < (PUCHAR)pvBase + cjSize) + { + if (!MmIsAddressValid(pjAddress)) return FALSE; + pjAddress += PAGE_SIZE; + } + + return TRUE; +} + +static +BOOL +KdbGetHexNumber(char *pszNum, ULONG_PTR *pulValue) +{ + char *endptr; + + /* Skip optional '0x' prefix */ + if ((pszNum[0] == '0') && ((pszNum[1] == 'x') || (pszNum[1] == 'X'))) + pszNum += 2; + + /* Make a number from the string (hex) */ + *pulValue = strtoul(pszNum, &endptr, 16); + + return (*endptr == '\0'); +} + +static +VOID +KdbCommand_Gdi_help(VOID) +{ + DbgPrint("GDI KDBG extension.\nAvailable commands:\n" + "- help - Displays this screen.\n" + "- dumpht [<type>] - Dumps all handles of <type> or lists all types\n" + "- handle <handle> - Displays information about a handle\n" + "- entry <entry> - Displays an ENTRY, <entry> can be a pointer or index\n" + "- baseobject <object> - Displays a BASEOBJECT\n" +#if DBG_ENABLE_EVENT_LOGGING + "- eventlist <object> - Displays the eventlist for an object\n" +#endif + ); +} + +static +VOID +KdbCommand_Gdi_dumpht(ULONG argc, char *argv[]) +{ + ULONG i; + UCHAR Objt, jReqestedType; + PENTRY pentry; + POBJ pobj; + KAPC_STATE ApcState; + ULONG_PTR ulArg; + + /* No CSRSS, no handle table */ + if (!gpepCSRSS) return; + KeStackAttachProcess(&gpepCSRSS->Pcb, &ApcState); + + if (argc == 0) + { + USHORT Counts[GDIObjType_MAX_TYPE + 2] = {0}; + + /* Loop all possibly used entries in the handle table */ + for (i = RESERVE_ENTRIES_COUNT; i < gulFirstUnused; i++) + { + if (KdbIsMemoryValid(&gpentHmgr[i], sizeof(ENTRY))) + { + Objt = gpentHmgr[i].Objt & 0x1F; + Counts[Objt]++; + } + } + + DbgPrint("Type Count\n"); + DbgPrint("-------------------\n"); + for (i = 0; i <= GDIObjType_MAX_TYPE; i++) + { + DbgPrint("%02x %-9s %d\n", + i, gpszObjectTypes[i], Counts[i]); + } + DbgPrint("\n"); + } + else + { + /* Loop all object types */ + for (i = 0; i <= GDIObjType_MAX_TYPE + 1; i++) + { + /* Check if this object type was requested */ + if (stricmp(argv[0], gpszObjectTypes[i]) == 0) break; + } + + /* Check if we didn't find it yet */ + if (i > GDIObjType_MAX_TYPE + 1) + { + /* Try if it's a number */ + if (!KdbGetHexNumber(argv[0], &ulArg)) + { + DbgPrint("Invalid parameter: %s\n", argv[0]); + return; + } + + /* Check if it's inside the allowed range */ + if (i > GDIObjType_MAX_TYPE) + { + DbgPrint("Unknown object type: %s\n", argv[0]); + goto leave; + } + } + + jReqestedType = i; + + /* Print header */ + DbgPrint("Index Handle Type pObject ThreadId cLocks ulRefCount\n"); + DbgPrint("---------------------------------------------------------------\n"); + + /* Loop all possibly used entries in the handle table */ + for (i = RESERVE_ENTRIES_COUNT; i < gulFirstUnused; i++) + { + /* Get the entry and the object */ + pentry = &gpentHmgr[i]; + + if (!MmIsAddressValid(pentry)) continue; + + pobj = pentry->einfo.pobj; + Objt = pentry->Objt & 0x1F; + + /* Check if ALL objects are requested, or the object type matches */ + if ((jReqestedType == GDIObjType_MAX_TYPE + 1) || + (Objt == jReqestedType)) + { + DbgPrint("%04lx %p %-9s 0x%p 0x%06lx %-6ld ", + i, pobj->hHmgr, gpszObjectTypes[Objt], pobj, + pobj->dwThreadId, pobj->cExclusiveLock); + if (MmIsAddressValid(&gpaulRefCount[i])) + DbgPrint("0x%08lx\n", gpaulRefCount[i]); + else + DbgPrint("??????????\n"); + } + } + } + +leave: + KeUnstackDetachProcess(&ApcState); +} + +static +VOID +KdbCommand_Gdi_handle(char *argv) +{ + ULONG_PTR ulObject; + BASEOBJECT *pobj; + ENTRY *pentry; + USHORT usIndex; + KAPC_STATE ApcState; + + /* Convert the parameter into a number */ + if (!KdbGetHexNumber(argv, &ulObject)) + { + DbgPrint("Invalid parameter: %s\n", argv); + return; + } + + /* No CSRSS, no handle table */ + if (!gpepCSRSS) return; + KeStackAttachProcess(&gpepCSRSS->Pcb, &ApcState); + + usIndex = ulObject & 0xFFFF; + pentry = &gpentHmgr[usIndex]; + + if (MmIsAddressValid(pentry)) + { + pobj = pentry->einfo.pobj; + + DbgPrint("GDI handle=%p, type=%s, index=0x%lx, pentry=%p.\n", + ulObject, gpszObjectTypes[(ulObject >> 16) & 0x1f], + usIndex, pentry); + DbgPrint(" ENTRY = {.pobj = %p, ObjectOwner = 0x%lx, FullUnique = 0x%04x,\n" + " Objt=0x%02x, Flags = 0x%02x, pUser = 0x%p}\n", + pentry->einfo.pobj, pentry->ObjectOwner.ulObj, pentry->FullUnique, + pentry->Objt, pentry->Flags, pentry->pUser); + DbgPrint(" BASEOBJECT = {hHmgr = %p, dwThreadId = 0x%lx,\n" + " cExclusiveLock = %ld, BaseFlags = 0x%lx}\n", + pobj->hHmgr, pobj->dwThreadId, + pobj->cExclusiveLock, pobj->BaseFlags); + if (MmIsAddressValid(&gpaulRefCount[usIndex])) + DbgPrint(" gpaulRefCount[idx] = %ld\n", gpaulRefCount[usIndex]); + } + else + { + DbgPrint("Coudn't access ENTRY. Probably paged out.\n"); + } + + KeUnstackDetachProcess(&ApcState); +} + +static +VOID +KdbCommand_Gdi_entry(char *argv) +{ + ULONG_PTR ulValue; + PENTRY pentry; + KAPC_STATE ApcState; + + /* Convert the parameter into a number */ + if (!KdbGetHexNumber(argv, &ulValue)) + { + DbgPrint("Invalid parameter: %s\n", argv); + return; + } + + /* No CSRSS, no handle table */ + if (!gpepCSRSS) return; + KeStackAttachProcess(&gpepCSRSS->Pcb, &ApcState); + + /* If the parameter is smaller than 0x10000, it's an index */ + pentry = (ulValue <= 0xFFFF) ? &gpentHmgr[ulValue] : (PENTRY)ulValue; + + /* Check if the address is readable */ + if (!MmIsAddressValid(pentry)) + { + DbgPrint("Cannot access entry at %p\n", pentry); + goto cleanup; + } + + /* print the entry */ + DbgPrint("Dumping ENTRY #%ld, @%p:\n", (pentry - gpentHmgr), pentry); + if (pentry->Objt != 0) + DbgPrint(" pobj = 0x%p\n", pentry->einfo.pobj); + else + DbgPrint(" hFree = 0x%p\n", pentry->einfo.hFree); + DbgPrint(" ObjectOwner = 0x%p\n", pentry->ObjectOwner.ulObj); + DbgPrint(" FullUnique = 0x%x\n", pentry->FullUnique); + DbgPrint(" Objt = 0x%x (%s)\n", pentry->Objt, + pentry->Objt <= 0x1E ? gpszObjectTypes[pentry->Objt] : "invalid"); + DbgPrint(" Flags = 0x%x\n", pentry->Flags); + DbgPrint(" pUser = 0x%p\n", pentry->pUser); + +cleanup: + KeUnstackDetachProcess(&ApcState); +} + +static +VOID +KdbCommand_Gdi_baseobject(char *argv) +{ +} + +#if DBG_ENABLE_EVENT_LOGGING +static +VOID +KdbCommand_Gdi_eventlist(char *argv) +{ + ULONG_PTR ulValue; + POBJ pobj; + PSLIST_ENTRY psle, psleFirst; + PLOGENTRY pLogEntry; + + /* Convert the parameter into a number */ + if (!KdbGetHexNumber(argv, &ulValue)) + { + DbgPrint("Invalid parameter: %s\n", argv); + return; + } + + pobj = (POBJ)ulValue; + + /* Check if the address is readable */ + if (!KdbIsMemoryValid(pobj, sizeof(BASEOBJECT))) + { + DbgPrint("Cannot access BASEOBJECT at %p\n", pobj); + return; + } + + /* The kernel doesn't export RtlFirstEntrySList :( */ + psleFirst = InterlockedFlushSList(&pobj->slhLog); + + /* Loop all events, but don't remove them */ + for (psle = psleFirst; psle != NULL; psle = psle->Next) + { + pLogEntry = CONTAINING_RECORD(psle, LOGENTRY, sleLink); + DbgPrintEvent(pLogEntry); + } + + /* Put the log back in place */ + InterlockedPushEntrySList(&pobj->slhLog, psleFirst); +} +#endif + +BOOLEAN +NTAPI +DbgGdiKdbgCliCallback( + IN PCHAR pszCommand, + IN ULONG argc, + IN PCH argv[]) +{ + + if (stricmp(argv[0], "!gdi.help") == 0) + { + KdbCommand_Gdi_help(); + } + else if (stricmp(argv[0], "!gdi.dumpht") == 0) + { + KdbCommand_Gdi_dumpht(argc - 1, argv + 1); + } + else if (stricmp(argv[0], "!gdi.handle") == 0) + { + KdbCommand_Gdi_handle(argv[1]); + } + else if (stricmp(argv[0], "!gdi.entry") == 0) + { + KdbCommand_Gdi_entry(argv[1]); + } + else if (stricmp(argv[0], "!gdi.baseobject") == 0) + { + KdbCommand_Gdi_baseobject(argv[1]); + } +#if DBG_ENABLE_EVENT_LOGGING + else if (stricmp(argv[0], "!gdi.eventlist") == 0) + { + KdbCommand_Gdi_eventlist(argv[1]); + } +#endif + else + { + /* Not handled */ + return FALSE; + } + + return TRUE; +} + + + + + Propchange: trunk/reactos/win32ss/gdi/ntgdi/gdikdbgext.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Tue Oct 2 21:20:28 2012 @@ -79,8 +79,8 @@ /* Per session handle table globals */ static PVOID gpvGdiHdlTblSection = NULL; -static PENTRY gpentHmgr; -static PULONG gpaulRefCount; +PENTRY gpentHmgr; +PULONG gpaulRefCount; ULONG gulFirstFree; ULONG gulFirstUnused; static PPAGED_LOOKASIDE_LIST gpaLookasideList; @@ -1341,170 +1341,5 @@ return TRUE; } -#if DBG && KDBG -static const char * gpszObjectTypes[] = -{ - "FREE", "DC", "UNUSED1", "UNUSED2", "RGN", "SURF", "CLIENTOBJ", "PATH", - "PAL", "ICMLCS", "LFONT", "RFONT", "PFE", "PFT", "ICMCXF", "SPRITE", - "BRUSH", "UMPD", "UNUSED4", "SPACE", "UNUSED5", "META", "EFSTATE", - "BMFD", "VTFD", "TTFD", "RC", "TEMP", "DRVOBJ", "DCIOBJ", "SPOOL", - "RESERVED", "ALL" -}; - -extern PEPROCESS gpepCSRSS;; - -VOID -NTAPI -DbgDumpGdiHandleTable(ULONG argc, char *argv[]) -{ - ULONG i; - UCHAR Objt, jReqestedType; - PENTRY pentry; - POBJ pobj; - KAPC_STATE ApcState; - - /* No CSRSS, no handle table */ - if (!gpepCSRSS) return; - KeStackAttachProcess(&gpepCSRSS->Pcb, &ApcState); - - if (argc == 0) - { - USHORT Counts[GDIObjType_MAX_TYPE + 2] = {0}; - - /* Loop all possibly used entries in the handle table */ - for (i = RESERVE_ENTRIES_COUNT; i < gulFirstUnused; i++) - { - if (MmIsAddressValid(&gpentHmgr[i])) - { - Objt = gpentHmgr[i].Objt & 0x1F; - Counts[Objt]++; - } - } - - DbgPrint("Type Count\n"); - DbgPrint("-------------------\n"); - for (i = 0; i <= GDIObjType_MAX_TYPE; i++) - { - DbgPrint("%02x %-9s %d\n", - i, gpszObjectTypes[i], Counts[i]); - } - DbgPrint("\n"); - } - else - { - /* Loop all object types */ - for (i = 0; i <= GDIObjType_MAX_TYPE + 1; i++) - { - /* Check if this object type was requested */ - if (stricmp(argv[0], gpszObjectTypes[i]) == 0) - { - jReqestedType = i; - break; - } - } - - /* Check if we didn't find it yet */ - if (i > GDIObjType_MAX_TYPE) - { - /* Try if it's a number */ - i = atoi(argv[0]); - - /* Check for "0" */ - if ((i > GDIObjType_MAX_TYPE) || - ((i == 0) && (stricmp(argv[0], "0") == 0))) - { - DbgPrint("Unknown object type: %s\n", argv[0]); - goto leave; - } - - jReqestedType = i; - } - - /* Print header */ - DbgPrint("Index Handle Type ThreadId cLocks ulRefCount\n"); - DbgPrint("----------------------------------------------------\n"); - - /* Loop all possibly used entries in the handle table */ - for (i = RESERVE_ENTRIES_COUNT; i < gulFirstUnused; i++) - { - /* Get the entry and the object */ - pentry = &gpentHmgr[i]; - - if (!MmIsAddressValid(pentry)) continue; - - pobj = pentry->einfo.pobj; - Objt = pentry->Objt & 0x1F; - - if ((jReqestedType == GDIObjType_MAX_TYPE + 1) || - (Objt == jReqestedType)) - { - DbgPrint("%04lx %p %-9s 0x%06lx %-7ld ", - i, pobj->hHmgr, gpszObjectTypes[Objt], - pobj->dwThreadId, pobj->cExclusiveLock); - if (MmIsAddressValid(&gpaulRefCount[i])) - DbgPrint("0x%06lx\n", gpaulRefCount[i]); - else - DbgPrint("????????\n"); - } - } - } - -leave: - KeUnstackDetachProcess(&ApcState); -} - -VOID -NTAPI -DbgDumpHandleInfo(char *argv) -{ - ULONG_PTR ulObject; - BASEOBJECT *pobj; - ENTRY *pentry; - USHORT usIndex; - char *endptr; - KAPC_STATE ApcState; - - /* Skip optional '0x' prefix */ - if ((argv[0] == '0') && ((argv[1] == 'x') || (argv[1] == 'X'))) - argv += 2; - - /* Make a number from the string (hex) */ - ulObject = strtol(argv, &endptr, 16); - if (*endptr != '\0') - return; - - /* No CSRSS, no handle table */ - if (!gpepCSRSS) return; - KeStackAttachProcess(&gpepCSRSS->Pcb, &ApcState); - - usIndex = ulObject & 0xFFFF; - pentry = &gpentHmgr[usIndex]; - - if (MmIsAddressValid(pentry)) - { - pobj = pentry->einfo.pobj; - - DbgPrint("GDI handle=%p, type=%s, index=0x%lx, pentry=%p.\n", - ulObject, gpszObjectTypes[(ulObject >> 16) & 0x1f], - usIndex, pentry); - DbgPrint(" ENTRY = {.pobj = %p, ObjectOwner = 0x%lx, FullUnique = 0x%04x,\n" - " Objt=0x%02x, Flags = 0x%02x, pUser = 0x%p}\n", - pentry->einfo.pobj, pentry->ObjectOwner.ulObj, pentry->FullUnique, - pentry->Objt, pentry->Flags, pentry->pUser); - DbgPrint(" BASEOBJECT = {hHmgr = %p, dwThreadId = 0x%lx,\n" - " cExclusiveLock = %ld, BaseFlags = 0x%lx}\n", - pobj->hHmgr, pobj->dwThreadId, - pobj->cExclusiveLock, pobj->BaseFlags); - if (MmIsAddressValid(&gpaulRefCount[usIndex])) - DbgPrint(" gpaulRefCount[idx] = %ld\n", gpaulRefCount[usIndex]); - } - else - { - DbgPrint("Coudn't access ENTRY. Probably paged out.\n"); - } - - KeUnstackDetachProcess(&ApcState); -} -#endif // DBG && KDBG /* EOF */ Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] Tue Oct 2 21:20:28 2012 @@ -179,16 +179,3 @@ POBJ NTAPI GDIOBJ_AllocObjWithHandle(ULONG ObjectType, ULONG cjSize); PGDIOBJ NTAPI GDIOBJ_ShareLockObj(HGDIOBJ hObj, DWORD ObjectType); PVOID NTAPI GDI_MapHandleTable(PEPROCESS Process); - -#if DBG && KDBG -VOID -NTAPI -DbgDumpGdiHandleTable( - ULONG argc, - char *argv[]); - -VOID -NTAPI -DbgDumpHandleInfo( - char *argv); -#endif

1 0

[ion] 57458: [RTL]: Fix bugs in SD rewrite, bringing tests back to 73 failures instead of 117 (back to their normal).
by ion＠svn.reactos.org 02 Oct '12

02 Oct '12

Author: ion Date: Tue Oct 2 16:05:26 2012 New Revision: 57458 URL: http://svn.reactos.org/svn/reactos?rev=57458&view=rev Log: [RTL]: Fix bugs in SD rewrite, bringing tests back to 73 failures instead of 117 (back to their normal). Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=57458&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sd.c [iso-8859-1] Tue Oct 2 16:05:26 2012 @@ -147,6 +147,7 @@ /* Setup an empty SD */ RtlZeroMemory(SecurityDescriptor, sizeof(*SecurityDescriptor)); SecurityDescriptor->Revision = SECURITY_DESCRIPTOR_REVISION; + SecurityDescriptor->Control = SE_SELF_RELATIVE; /* All good */ return STATUS_SUCCESS; @@ -560,14 +561,14 @@ if (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; /* Mask out flags which are not attributes */ - Control &= ~SE_DACL_UNTRUSTED | - SE_SERVER_SECURITY | - SE_DACL_AUTO_INHERIT_REQ | - SE_SACL_AUTO_INHERIT_REQ | - SE_DACL_AUTO_INHERITED | - SE_SACL_AUTO_INHERITED | - SE_DACL_PROTECTED | - SE_SACL_PROTECTED; + Control &= SE_DACL_UNTRUSTED | + SE_SERVER_SECURITY | + SE_DACL_AUTO_INHERIT_REQ | + SE_SACL_AUTO_INHERIT_REQ | + SE_DACL_AUTO_INHERITED | + SE_SACL_AUTO_INHERITED | + SE_DACL_PROTECTED | + SE_SACL_PROTECTED; /* Call the newer API */ return RtlSetControlSecurityDescriptor(SecurityDescriptor, Control, Control); @@ -1153,7 +1154,7 @@ } /* Read the group, check if it's valid and if the buffer contains it */ - Group = (PSID)((ULONG_PTR)Sd->Owner + (ULONG_PTR)Sd); + Group = (PSID)((ULONG_PTR)Sd->Group + (ULONG_PTR)Sd); if (!RtlValidSid(Group) || (Length < RtlLengthSid(Group))) return FALSE; } else if (RequiredInformation & GROUP_SECURITY_INFORMATION)

1 0

[ekohl] 57457: [ADVAPI32] - Implement LsaQueryForestTrustInformation and LsaSetForestTrustInformation.
by ekohl＠svn.reactos.org 02 Oct '12

02 Oct '12

Author: ekohl Date: Tue Oct 2 11:43:50 2012 New Revision: 57457 URL: http://svn.reactos.org/svn/reactos?rev=57457&view=rev Log: [ADVAPI32] - Implement LsaQueryForestTrustInformation and LsaSetForestTrustInformation. Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Tue Oct 2 11:43:50 2012 @@ -1292,7 +1292,7 @@ /* - * @unimplemented + * @implemented */ NTSTATUS WINAPI @@ -1300,9 +1300,25 @@ IN PLSA_UNICODE_STRING TrustedDomainName, OUT PLSA_FOREST_TRUST_INFORMATION *ForestTrustInfo) { - FIXME("LsaQueryForestTrustInformation(%p %p %p) stub\n", + NTSTATUS Status; + + TRACE("LsaQueryForestTrustInformation(%p %p %p)\n", PolicyHandle, TrustedDomainName, ForestTrustInfo); - return STATUS_NOT_IMPLEMENTED; + + RpcTryExcept + { + Status = LsarQueryForestTrustInformation((LSAPR_HANDLE)PolicyHandle, + TrustedDomainName, + ForestTrustDomainInfo, + ForestTrustInfo); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } @@ -1701,7 +1717,7 @@ /* - * @unimplemented + * @implemented */ NTSTATUS WINAPI @@ -1711,9 +1727,27 @@ IN BOOL CheckOnly, OUT PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo) { - FIXME("LsaSetForestTrustInformation(%p %p %p %d %p) stub\n", + NTSTATUS Status; + + TRACE("LsaSetForestTrustInformation(%p %p %p %d %p)\n", PolicyHandle, TrustedDomainName, ForestTrustInfo, CheckOnly, CollisionInfo); - return STATUS_NOT_IMPLEMENTED; + + RpcTryExcept + { + Status = LsarSetForestTrustInformation((LSAPR_HANDLE)PolicyHandle, + TrustedDomainName, + ForestTrustDomainInfo, + ForestTrustInfo, + CheckOnly, + CollisionInfo); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs