Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 19046: - Finished implementing RtlInsertUnicodePrefix: handle greater and less than insertions.
by ion＠svn.reactos.com 07 Nov '05

07 Nov '05

- Finished implementing RtlInsertUnicodePrefix: handle greater and less than insertions. Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/lib/rtl/unicodeprefix.c _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-11-07 21:57:50 UTC (rev 19045) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-11-07 22:05:46 UTC (rev 19046) @@ -36,13 +36,29 @@ #define RtlParent(Links) \ (PRTL_SPLAY_LINKS)(Links)->Parent -#define RtlInitializeSplayLinks(Links) \ - PRTL_SPLAY_LINKS _SplayLinks; \ - _SplayLinks = (PRTL_SPLAY_LINKS)(Links); \ - _SplayLinks->Parent = _SplayLinks; \ - _SplayLinks->LeftChild = NULL; \ +#define RtlInitializeSplayLinks(Links) \ + PRTL_SPLAY_LINKS _SplayLinks; \ + _SplayLinks = (PRTL_SPLAY_LINKS)(Links); \ + _SplayLinks->Parent = _SplayLinks; \ + _SplayLinks->LeftChild = NULL; \ _SplayLinks->RightChild = NULL; +#define RtlInsertAsLeftChild(ParentLinks,ChildLinks) \ + PRTL_SPLAY_LINKS _SplayParent; \ + PRTL_SPLAY_LINKS _SplayChild; \ + _SplayParent = (PRTL_SPLAY_LINKS)(ParentLinks); \ + _SplayChild = (PRTL_SPLAY_LINKS)(ChildLinks); \ + _SplayParent->LeftChild = _SplayChild; \ + _SplayChild->Parent = _SplayParent; + +#define RtlInsertAsRightChild(ParentLinks,ChildLinks) \ + PRTL_SPLAY_LINKS _SplayParent; \ + PRTL_SPLAY_LINKS _SplayChild; \ + _SplayParent = (PRTL_SPLAY_LINKS)(ParentLinks); \ + _SplayChild = (PRTL_SPLAY_LINKS)(ChildLinks); \ + _SplayParent->RightChild = _SplayChild; \ + _SplayChild->Parent = _SplayParent; + /* PROTOTYPES ****************************************************************/ /* _____ Modified: trunk/reactos/lib/rtl/unicodeprefix.c --- trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 21:57:50 UTC (rev 19045) +++ trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 22:05:46 UTC (rev 19046) @@ -139,7 +139,7 @@ } /* - * @unimplemented + * @implemented */ BOOLEAN NTAPI @@ -147,17 +147,6 @@ PUNICODE_STRING Prefix, PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry) { - /* - * implementation notes: - * - get name length (number of names) DONE - * - init splay links DONE - * - find a matching tree DONE - * - if !found, insert a new NTC_ROOT entry and return TRUE; DONE - * - if found, loop tree and compare strings: DONE - * if equal, handle casematch/nomatch DONE - * if greater or lesser equal, then add left/right childs accordingly - * - splay the tree DONE - */ PUNICODE_PREFIX_TABLE_ENTRY CurrentEntry, PreviousEntry, Entry, NextEntry; ULONG NameCount; RTL_GENERIC_COMPARE_RESULTS Result; @@ -237,11 +226,49 @@ } else if (Result == GenericGreaterThan) { - /* TODO: Check out the left child and add us */ + /* Check out if we have a left child */ + if (RtlLeftChild(&Entry->Links)) + { + /* We do, enter it and restart the loop */ + SplayLinks = RtlLeftChild(&Entry->Links); + Entry = CONTAINING_RECORD(SplayLinks, + UNICODE_PREFIX_TABLE_ENTRY, + Links); + } + else + { + /* We don't, set this entry as a child */ + PrefixTableEntry->NodeTypeCode = PFX_NTC_CHILD; + PrefixTableEntry->NextPrefixTree = NULL; + PrefixTableEntry->CaseMatch = PrefixTableEntry; + + /* Insert us into the tree */ + RtlInsertAsLeftChild(&Entry->Links, &PrefixTableEntry->Links); + break; + } } else { - /* TODO: Check out the right child and add us */ + /* Check out if we have a right child */ + if (RtlRightChild(&Entry->Links)) + { + /* We do, enter it and restart the loop */ + SplayLinks = RtlLeftChild(&Entry->Links); + Entry = CONTAINING_RECORD(SplayLinks, + UNICODE_PREFIX_TABLE_ENTRY, + Links); + } + else + { + /* We don't, set this entry as a child */ + PrefixTableEntry->NodeTypeCode = PFX_NTC_CHILD; + PrefixTableEntry->NextPrefixTree = NULL; + PrefixTableEntry->CaseMatch = PrefixTableEntry; + + /* Insert us into the tree */ + RtlInsertAsRightChild(&Entry->Links, &PrefixTableEntry->Links); + break; + } } }

1 0

[ion] 19045: - Implement more of RtlInsertUnicodePrefix: handle case where tree was found, and a match in the tree was found (handle case-sensitive and case-insensitve match).
by ion＠svn.reactos.com 07 Nov '05

07 Nov '05

- Implement more of RtlInsertUnicodePrefix: handle case where tree was found, and a match in the tree was found (handle case-sensitive and case-insensitve match). - Partially umplement CompareUnicodeStrings to scan the two strings (Can't use RtlCompareUnicodeString because we want control over how many chars to case-compare. Modified: trunk/reactos/lib/rtl/unicodeprefix.c _____ Modified: trunk/reactos/lib/rtl/unicodeprefix.c --- trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 21:17:49 UTC (rev 19044) +++ trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 21:57:50 UTC (rev 19045) @@ -44,6 +44,73 @@ return NamesFound; } + +STATIC +RTL_GENERIC_COMPARE_RESULTS +NTAPI +CompareUnicodeStrings(IN PUNICODE_STRING String, + IN PUNICODE_STRING Prefix, + IN ULONG CaseCheckChar) +{ + ULONG StringLength = String->Length / sizeof(WCHAR); + ULONG PrefixLength = Prefix->Length / sizeof(WCHAR); + ULONG ScanLength = min(StringLength, PrefixLength); + ULONG i; + WCHAR FoundPrefix, FoundString; + + /* Validate the Case Check Character Position */ + if (CaseCheckChar > ScanLength) CaseCheckChar = ScanLength; + + /* Do the case sensitive comparison first */ + for (i = 0; i < CaseCheckChar; i++) + { + /* Compare the two characters */ + if (Prefix->Buffer[i] != String->Buffer[i]) break; + } + + /* Save the characters we found */ + FoundPrefix = Prefix->Buffer[i]; + FoundString = String->Buffer[i]; + + /* Check if we exausted the search above */ + if (i == CaseCheckChar) + { + /* FIXME: Do a case-insensitive search */ + } + + /* Check if we weren't able to find a match in the loops */ + if (i < ScanLength) + { + /* If the prefix character found was a backslash, this is a less */ + if (FoundPrefix == '\\') return GenericLessThan; + + /* If the string character found was a backslack, then this is a more */ + if (FoundString == '\\') return GenericGreaterThan; + + /* None of those two special cases, do a normal check */ + if (FoundPrefix < FoundString) return GenericLessThan; + + /* The only choice left is that Prefix > String */ + return GenericGreaterThan; + } + + /* If we got here, a match was found. Check if the prefix is smaller */ + if (PrefixLength < StringLength) + { + /* Check if the string is actually a prefix */ + if (String->Buffer[PrefixLength] == '\\') return -1; + + /* It's not a prefix, and it's shorter, so it's a less */ + return GenericLessThan; + } + + /* Check if the prefix is longer */ + if (PrefixLength > StringLength) return GenericGreaterThan; + + /* If we got here, then they are 100% equal */ + return GenericEqual; +} + /* * @unimplemented */ @@ -86,13 +153,15 @@ * - init splay links DONE * - find a matching tree DONE * - if !found, insert a new NTC_ROOT entry and return TRUE; DONE - * - if found, loop tree and compare strings: - * if equal, handle casematch/nomatch + * - if found, loop tree and compare strings: DONE + * if equal, handle casematch/nomatch DONE * if greater or lesser equal, then add left/right childs accordingly - * - splay the tree + * - splay the tree DONE */ - PUNICODE_PREFIX_TABLE_ENTRY CurrentEntry, PreviousEntry; + PUNICODE_PREFIX_TABLE_ENTRY CurrentEntry, PreviousEntry, Entry, NextEntry; ULONG NameCount; + RTL_GENERIC_COMPARE_RESULTS Result; + PRTL_SPLAY_LINKS SplayLinks; /* Find out how many names there are */ NameCount = ComputeUnicodeNameLength(Prefix); @@ -127,9 +196,77 @@ return TRUE; } - /* FIXME */ - UNIMPLEMENTED; - return FALSE; + /* We found a tree, so star thte search loop */ + Entry = CurrentEntry; + while (TRUE) + { + /* Do a case-insensitive comparison to find out the match level */ + Result = CompareUnicodeStrings(Entry->Prefix, Prefix, 0); + if (Result == GenericEqual) + { + /* We have a match, start doing a case-sensitive search */ + NextEntry = Entry; + + /* Search the circular case-match list */ + do + { + /* Check if we found a match */ + if (CompareUnicodeStrings(NextEntry->Prefix, Prefix, -1) == + (GenericEqual)) + { + /* We must fail the insert: it already exists */ + return FALSE; + } + + /* Move to the next entry in the circular list */ + NextEntry = NextEntry->CaseMatch; + } + while (NextEntry != Entry); + + /* + * No match found, so we can safely insert it. Remember that a + * case insensitive match was found, so this is not a ROOT NTC + * but a Case Match NTC instead. + */ + PrefixTableEntry->NodeTypeCode = PFX_NTC_CASE_MATCH; + PrefixTableEntry->NextPrefixTree = NULL; + + /* Insert it into the circular list */ + PrefixTableEntry->CaseMatch = Entry->CaseMatch; + Entry->CaseMatch = PrefixTableEntry; + } + else if (Result == GenericGreaterThan) + { + /* TODO: Check out the left child and add us */ + } + else + { + /* TODO: Check out the right child and add us */ + } + } + + /* Get the next tree entry */ + NextEntry = CurrentEntry->NextPrefixTree; + + /* Set what was the current entry to a child entry */ + CurrentEntry->NodeTypeCode = PFX_NTC_CHILD; + CurrentEntry->NextPrefixTree = NULL; + + /* Splay the tree */ + SplayLinks = RtlSplay(&Entry->Links); + + /* The link points to the root, get it */ + Entry = CONTAINING_RECORD(SplayLinks, UNICODE_PREFIX_TABLE_ENTRY, Links); + + /* Mark the root as a root entry */ + Entry->NodeTypeCode = PFX_NTC_ROOT; + + /* Add it to the tree list */ + PreviousEntry->NextPrefixTree = Entry; + Entry->NextPrefixTree = NextEntry; + + /* Return success */ + return TRUE; } /*

1 0

[ion] 19044: - Correct which entry was being modified.
by ion＠svn.reactos.com 07 Nov '05

07 Nov '05

- Correct which entry was being modified. Modified: trunk/reactos/lib/rtl/unicodeprefix.c _____ Modified: trunk/reactos/lib/rtl/unicodeprefix.c --- trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 21:16:30 UTC (rev 19043) +++ trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 21:17:49 UTC (rev 19044) @@ -269,12 +269,12 @@ else if (RtlIsLeftChild(&PrefixTableEntry->Links)) { /* We were the left child, so make us as well */ - Entry->Links.LeftChild = &Entry->Links; + PrefixTableEntry->Links.LeftChild = &Entry->Links; } else { /* We were the right child, so make us as well */ - Entry->Links.RightChild = &Entry->Links; + PrefixTableEntry->Links.RightChild = &Entry->Links; } /* Check if we have a left child */

1 0

[gedmurphy] 19043: Should have checked it built OK with mingw first.
by gedmurphy＠svn.reactos.com 07 Nov '05

07 Nov '05

Should have checked it built OK with mingw first. Modified: trunk/reactos/subsys/system/sc/create.c _____ Modified: trunk/reactos/subsys/system/sc/create.c --- trunk/reactos/subsys/system/sc/create.c 2005-11-07 21:14:03 UTC (rev 19042) +++ trunk/reactos/subsys/system/sc/create.c 2005-11-07 21:16:30 UTC (rev 19043) @@ -15,7 +15,7 @@ { SC_HANDLE hSc; LPCTSTR BinaryPathName = *++ServiceArgs; - LPCTSTR *Options = ++ServiceArgs; +// LPCTSTR *Options = ++ServiceArgs; if ((! ServiceName) || (! BinaryPathName)) return CreateUsage();

1 0

[gedmurphy] 19042: Add information letting us know creation deletion of services has worked.
by gedmurphy＠svn.reactos.com 07 Nov '05

07 Nov '05

Add information letting us know creation deletion of services has worked. comment out testing debug info. Modified: trunk/reactos/subsys/system/sc/control.c Modified: trunk/reactos/subsys/system/sc/create.c Modified: trunk/reactos/subsys/system/sc/delete.c Modified: trunk/reactos/subsys/system/sc/sc.c Modified: trunk/reactos/subsys/system/sc/sc.h Modified: trunk/reactos/subsys/system/sc/start.c _____ Modified: trunk/reactos/subsys/system/sc/control.c --- trunk/reactos/subsys/system/sc/control.c 2005-11-07 20:32:17 UTC (rev 19041) +++ trunk/reactos/subsys/system/sc/control.c 2005-11-07 21:14:03 UTC (rev 19042) @@ -20,7 +20,8 @@ { SC_HANDLE hSc; SERVICE_STATUS Status; - + +#ifdef SCDBG /* testing */ _tprintf(_T("service to control - %s\n\n"), ServiceName); _tprintf(_T("command - %lu\n\n"), Control); @@ -30,8 +31,8 @@ printf("%s\n", *Args); Args++; } +#endif /* SCDBG */ - hSc = OpenService(hSCManager, ServiceName, SERVICE_INTERROGATE | SERVICE_PAUSE_CONTINUE | SERVICE_STOP | SERVICE_USER_DEFINED_CONTROL | @@ -46,7 +47,7 @@ if (! ControlService(hSc, Control, &Status)) { - _tprintf(_T("controlService failed\n")); + _tprintf(_T("[SC] controlService FAILED %lu:\n\n"), GetLastError()); ReportLastError(); return FALSE; } _____ Modified: trunk/reactos/subsys/system/sc/create.c --- trunk/reactos/subsys/system/sc/create.c 2005-11-07 20:32:17 UTC (rev 19041) +++ trunk/reactos/subsys/system/sc/create.c 2005-11-07 21:14:03 UTC (rev 19042) @@ -19,7 +19,8 @@ if ((! ServiceName) || (! BinaryPathName)) return CreateUsage(); - + +#ifdef SCDBG /* testing */ printf("service to create - %s\n", ServiceName); printf("Binary path - %s\n", BinaryPathName); @@ -29,7 +30,7 @@ printf("%s\n", *Options); Options++; } - +#endif hSc = CreateService(hSCManager, ServiceName, ServiceName, @@ -50,9 +51,8 @@ ReportLastError(); return FALSE; } - else - { - CloseServiceHandle(hSc); - return TRUE; - } + + _tprintf(_T("[SC] CreateService SUCCESS\n")); + CloseServiceHandle(hSc); + return TRUE; } _____ Modified: trunk/reactos/subsys/system/sc/delete.c --- trunk/reactos/subsys/system/sc/delete.c 2005-11-07 20:32:17 UTC (rev 19041) +++ trunk/reactos/subsys/system/sc/delete.c 2005-11-07 21:14:03 UTC (rev 19042) @@ -15,8 +15,10 @@ { SC_HANDLE hSc; +#ifdef SCDBG /* testing */ printf("service to delete - %s\n\n", ServiceName); +#endif hSc = OpenService(hSCManager, ServiceName, DELETE); @@ -34,6 +36,7 @@ return FALSE; } + _tprintf(_T("[SC] DeleteService SUCCESS\n")); CloseServiceHandle(hSc); return TRUE; } _____ Modified: trunk/reactos/subsys/system/sc/sc.c --- trunk/reactos/subsys/system/sc/sc.c 2005-11-07 20:32:17 UTC (rev 19041) +++ trunk/reactos/subsys/system/sc/sc.c 2005-11-07 21:14:03 UTC (rev 19042) @@ -58,8 +58,12 @@ _tprintf(_T("Remote service control is not yet implemented\n")); return 2; } - - hSCManager = OpenSCManager(MachineName, NULL, SC_MANAGER_ALL_ACCESS); + + /* if we are emurating the services, we don't need administrator access */ + if ( (_tcsicmp(Command, _T("query")) == 0) || (_tcsicmp(Command, _T("queryex")) == 0) ) + hSCManager = OpenSCManager(MachineName, NULL, SC_MANAGER_ENUMERATE_SERVICE); + else + hSCManager = OpenSCManager(MachineName, NULL, SC_MANAGER_ALL_ACCESS); if (hSCManager == NULL) { _tprintf(_T("[SC] OpenSCManager FAILED %lu:\n\n"), GetLastError()); _____ Modified: trunk/reactos/subsys/system/sc/sc.h --- trunk/reactos/subsys/system/sc/sc.h 2005-11-07 20:32:17 UTC (rev 19041) +++ trunk/reactos/subsys/system/sc/sc.h 2005-11-07 21:14:03 UTC (rev 19042) @@ -4,7 +4,7 @@ extern SC_HANDLE hSCManager; // declared in sc.c -//#define DBG +//#define SCDBG /* control functions */ BOOL Query(LPCTSTR ServiceName, LPCTSTR *ServiceArgs, BOOL bExtended); _____ Modified: trunk/reactos/subsys/system/sc/start.c --- trunk/reactos/subsys/system/sc/start.c 2005-11-07 20:32:17 UTC (rev 19041) +++ trunk/reactos/subsys/system/sc/start.c 2005-11-07 21:14:03 UTC (rev 19042) @@ -14,9 +14,10 @@ BOOL Start(LPCTSTR ServiceName, LPCTSTR *ServiceArgs, INT ArgCount) { SC_HANDLE hSc; - SERVICE_STATUS_PROCESS ServiceStatus; + SERVICE_STATUS_PROCESS ServiceStatus, ServiceStatus2; DWORD BytesNeeded; +#ifdef SCDBG /* testing */ _tprintf(_T("service to start - %s\n\n"), ServiceName); _tprintf(_T("Arguments :\n")); @@ -25,7 +26,7 @@ printf("%s\n", *ServiceArgs); ServiceArgs++; } - +#endif /* get a handle to the service requested for starting */ hSc = OpenService(hSCManager, ServiceName, SERVICE_ALL_ACCESS); @@ -40,7 +41,7 @@ /* start the service opened */ if (! StartService(hSc, ArgCount, ServiceArgs)) { - _tprintf(_T("StartService failed\n")); + _tprintf(_T("[SC] StartService FAILED %lu:\n\n"), GetLastError()); ReportLastError(); return FALSE; } @@ -77,11 +78,22 @@ } } + QueryServiceStatusEx(hSc, SC_STATUS_PROCESS_INFO, (LPBYTE)&ServiceStatus2, + sizeof(SERVICE_STATUS_PROCESS), &BytesNeeded); + CloseServiceHandle(hSc); if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) { - _tprintf(_T("%s is running\n"), ServiceName); + _tprintf(_T("\nSERVICE_NAME: %s\n"), ServiceName); + _tprintf(_T("\tTYPE : %lu\n"), ServiceStatus2.dwServiceType); + _tprintf(_T("\tSTATE : %lu\n"), ServiceStatus2.dwCurrentState); + _tprintf(_T("\tWIN32_EXIT_CODE : %lu\n"), ServiceStatus2.dwWin32ExitCode); + _tprintf(_T("\tCHECKPOINT : %lu\n"), ServiceStatus2.dwCheckPoint); + _tprintf(_T("\tWAIT_HINT : %lu\n"), ServiceStatus2.dwWaitHint); + _tprintf(_T("\tPID : %lu\n"), ServiceStatus2.dwProcessId); + _tprintf(_T("\tFLAGS : %lu\n"), ServiceStatus2.dwServiceFlags); + return TRUE; } else

1 0

[OTAnn] Feedback
by shenanigans 07 Nov '05

07 Nov '05

I was interested in getting feedback from current mail group users. We have mirrored your mail list in a new application that provides a more aggregated and safe environment which utilizes the power of broadband. Roomity.com v 1.5 is a web 2.01 community webapp. Our newest version adds broadcast video and social networking such as favorite authors and an html editor. It?s free to join and any feedback would be appreciated. S. ------------------------------------------------------------------------------------------------------------------------------------------------------------ Broadband interface (RIA) + mail box saftey = <a href="http://React_OS_Differences_Commit_List.roomity.com">React_OS_Differences_Commit_List.roomity.com</a> *Your* clubs, no sign up to read, ad supported; try broadband internet. ~~1131397873277~~ ------------------------------------------------------------------------------------------------------------------------------------------------------------

1 0

[greatlrd] 19041: Fixed bug 954 rbuild devcpp generates mixed slashes and backslashes in some pathnames in the file makefile.auto
by greatlrd＠svn.reactos.com 07 Nov '05

07 Nov '05

Fixed bug 954 rbuild devcpp generates mixed slashes and backslashes in some pathnames in the file makefile.auto Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp --- trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-11-07 19:31:15 UTC (rev 19040) +++ trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-11-07 20:32:17 UTC (rev 19041) @@ -158,16 +158,18 @@ return; // Change the \ to / + for(size_t i = 0; i < filepath.length(); i++) { - if(filepath[i] == '\\') - filepath[i] = '/'; + if(filepath[i] == '/') + filepath[i] = '\\'; } + // Remove the filename from the path string folder = ""; - size_t pos = filepath.rfind(string("/"), filepath.length() - 1); + size_t pos = filepath.rfind(string("\\"), filepath.length() - 1); if(pos != string::npos) { @@ -206,7 +208,7 @@ m_folders.push_back(folder); - size_t pos = folder.rfind(string("/"), folder.length() - 1); + size_t pos = folder.rfind(string("\\"), folder.length() - 1); if(pos == string::npos) return;

1 0

[ion] 19040: - Implement simple case of RtlInsertUnicodePrefix where a new node entry needs to be created.
by ion＠svn.reactos.com 07 Nov '05

07 Nov '05

- Implement simple case of RtlInsertUnicodePrefix where a new node entry needs to be created. Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/lib/rtl/unicodeprefix.c _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-11-07 19:14:38 UTC (rev 19039) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-11-07 19:31:15 UTC (rev 19040) @@ -36,6 +36,13 @@ #define RtlParent(Links) \ (PRTL_SPLAY_LINKS)(Links)->Parent +#define RtlInitializeSplayLinks(Links) \ + PRTL_SPLAY_LINKS _SplayLinks; \ + _SplayLinks = (PRTL_SPLAY_LINKS)(Links); \ + _SplayLinks->Parent = _SplayLinks; \ + _SplayLinks->LeftChild = NULL; \ + _SplayLinks->RightChild = NULL; + /* PROTOTYPES ****************************************************************/ /* _____ Modified: trunk/reactos/lib/rtl/unicodeprefix.c --- trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 19:14:38 UTC (rev 19039) +++ trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 19:31:15 UTC (rev 19040) @@ -25,7 +25,7 @@ /* FUNCTIONS ***************************************************************/ -/*STATIC*/ +STATIC ULONG NTAPI ComputeUnicodeNameLength(IN PUNICODE_STRING UnicodeName) @@ -82,15 +82,52 @@ { /* * implementation notes: - * - get name length (number of names) - * - init splay links - * - find a matching tree - * - if !found, insert a new NTC_ROOT entry and return TRUE; + * - get name length (number of names) DONE + * - init splay links DONE + * - find a matching tree DONE + * - if !found, insert a new NTC_ROOT entry and return TRUE; DONE * - if found, loop tree and compare strings: * if equal, handle casematch/nomatch * if greater or lesser equal, then add left/right childs accordingly * - splay the tree */ + PUNICODE_PREFIX_TABLE_ENTRY CurrentEntry, PreviousEntry; + ULONG NameCount; + + /* Find out how many names there are */ + NameCount = ComputeUnicodeNameLength(Prefix); + + /* Set up the initial entry data */ + PrefixTableEntry->NameLength = NameCount; + PrefixTableEntry->Prefix = Prefix; + RtlInitializeSplayLinks(&PrefixTableEntry->Links); + + /* Find the right spot where to insert this entry */ + PreviousEntry = (PUNICODE_PREFIX_TABLE_ENTRY)PrefixTable; + CurrentEntry = PreviousEntry->NextPrefixTree; + while (CurrentEntry->NameLength > NameCount) + { + /* Not a match, move to the next entry */ + PreviousEntry = CurrentEntry; + CurrentEntry = CurrentEntry->NextPrefixTree; + } + + /* Check if we did find a tree by now */ + if (CurrentEntry->NameLength != NameCount) + { + /* We didn't, so insert a new entry in the list */ + PreviousEntry->NextPrefixTree = PrefixTableEntry; + PrefixTableEntry->NextPrefixTree = CurrentEntry; + + /* This is now a root entry with case match */ + PrefixTableEntry->NodeTypeCode = PFX_NTC_ROOT; + PrefixTableEntry->CaseMatch = PrefixTableEntry; + + /* Quick return */ + return TRUE; + } + + /* FIXME */ UNIMPLEMENTED; return FALSE; } @@ -104,8 +141,7 @@ BOOLEAN Restart) { PRTL_SPLAY_LINKS SplayLinks; - PUNICODE_PREFIX_TABLE_ENTRY Entry; - PUNICODE_PREFIX_TABLE_ENTRY CaseMatchEntry; + PUNICODE_PREFIX_TABLE_ENTRY Entry, CaseMatchEntry; /* We might need this entry 2/3rd of the time, so cache it now */ CaseMatchEntry = PrefixTable->LastNextEntry->CaseMatch;

1 0

[ion] 19039: - Finish implementation of RtlRemoveUnicodePrefix
by ion＠svn.reactos.com 07 Nov '05

07 Nov '05

- Finish implementation of RtlRemoveUnicodePrefix Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/lib/rtl/unicodeprefix.c _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-11-07 17:35:10 UTC (rev 19038) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-11-07 19:14:38 UTC (rev 19039) @@ -24,6 +24,9 @@ #define RtlIsLeftChild(Links) \ (RtlLeftChild(RtlParent(Links)) == (PRTL_SPLAY_LINKS)(Links)) +#define RtlRightChild(Links) \ + (PRTL_SPLAY_LINKS)(Links)->RightChild + #define RtlIsRoot(Links) \ (RtlParent(Links) == (PRTL_SPLAY_LINKS)(Links)) _____ Modified: trunk/reactos/lib/rtl/unicodeprefix.c --- trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 17:35:10 UTC (rev 19038) +++ trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 19:14:38 UTC (rev 19039) @@ -45,8 +45,8 @@ } /* -* @unimplemented -*/ + * @unimplemented + */ PUNICODE_PREFIX_TABLE_ENTRY NTAPI RtlFindUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable, @@ -58,8 +58,8 @@ } /* -* @implemented -*/ + * @implemented + */ VOID NTAPI RtlInitializeUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable) @@ -72,8 +72,8 @@ } /* -* @unimplemented -*/ + * @unimplemented + */ BOOLEAN NTAPI RtlInsertUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable, @@ -168,8 +168,8 @@ } /* -* @unimplemented -*/ + * @implemented + */ VOID NTAPI RtlRemoveUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable, @@ -199,7 +199,60 @@ /* Check if this entry is a case match */ if (PrefixTableEntry->CaseMatch != PrefixTableEntry) { - /* FIXME */ + /* Get the case match entry */ + Entry = PrefixTableEntry->CaseMatch; + + /* Now loop until we find one referencing what the caller sent */ + while (Entry->CaseMatch != PrefixTableEntry) Entry = Entry->CaseMatch; + + /* We found the entry that was sent, link them to delete this entry */ + Entry->CaseMatch = PrefixTableEntry->CaseMatch; + + /* Copy the data */ + Entry->NodeTypeCode = PrefixTableEntry->NodeTypeCode; + Entry->NextPrefixTree = PrefixTableEntry->NextPrefixTree; + Entry->Links = PrefixTableEntry->Links; + + /* Now check if we are a root entry */ + if (RtlIsRoot(&PrefixTableEntry->Links)) + { + /* We are, so make this entry root as well */ + Entry->Links.Parent = &Entry->Links; + + /* Find the entry referencing us */ + RefEntry = Entry->NextPrefixTree; + while (RefEntry->NextPrefixTree != Entry) + { + /* Not this one, move to the next entry */ + RefEntry = RefEntry->NextPrefixTree; + } + + /* Link them to us now */ + RefEntry->NextPrefixTree = Entry; + } + else if (RtlIsLeftChild(&PrefixTableEntry->Links)) + { + /* We were the left child, so make us as well */ + Entry->Links.LeftChild = &Entry->Links; + } + else + { + /* We were the right child, so make us as well */ + Entry->Links.RightChild = &Entry->Links; + } + + /* Check if we have a left child */ + if (RtlLeftChild(&Entry->Links)) + { + /* Update its parent link */ + RtlLeftChild(&Entry->Links)->Parent = &Entry->Links; + } + /* Check if we have a right child */ + if (RtlRightChild(&Entry->Links)) + { + /* Update its parent link */ + RtlRightChild(&Entry->Links)->Parent = &Entry->Links; + } } else {

1 0

[greatlrd] 19038: change En.rc to defualt take care of code page error at lest for swedish
by greatlrd＠svn.reactos.com 07 Nov '05

07 Nov '05

change En.rc to defualt take care of code page error at lest for swedish Modified: trunk/reactos/boot/freeldr/fdebug/En.rc _____ Modified: trunk/reactos/boot/freeldr/fdebug/En.rc --- trunk/reactos/boot/freeldr/fdebug/En.rc 2005-11-07 10:53:52 UTC (rev 19037) +++ trunk/reactos/boot/freeldr/fdebug/En.rc 2005-11-07 17:35:10 UTC (rev 19038) @@ -3,7 +3,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT #pragma code_page(1252) #endif //_WIN32

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