Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[gedmurphy] 19042: Add information letting us know creation deletion of services has worked.

by gedmurphy＠svn.reactos.com

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

18 years, 10 months

[OTAnn] Feedback

by shenanigans

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~~ ------------------------------------------------------------------------------------------------------------------------------------------------------------

18 years, 10 months

[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

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;

18 years, 10 months

[ion] 19040: - Implement simple case of RtlInsertUnicodePrefix where a new node entry needs to be created.

by ion＠svn.reactos.com

- 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;

18 years, 10 months

[ion] 19039: - Finish implementation of RtlRemoveUnicodePrefix

by ion＠svn.reactos.com

- 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 {

18 years, 10 months

[greatlrd] 19038: change En.rc to defualt take care of code page error at lest for swedish

by greatlrd＠svn.reactos.com

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

18 years, 10 months

[hpoussin] 19037: Lots of DPRINT1 -> DPRINT changes

by hpoussin＠svn.reactos.com

Lots of DPRINT1 -> DPRINT changes Adjust the image path in ScmrCreateServiceW (just enough for my needs) Modified: trunk/reactos/subsys/system/services/rpcserver.c _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-11-07 10:04:41 UTC (rev 19036) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-11-07 10:53:52 UTC (rev 19037) @@ -281,7 +281,7 @@ PSERVICE_HANDLE hSvc; PSERVICE lpService; - DPRINT1("ScmrControlService() called\n"); + DPRINT("ScmrControlService() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -326,7 +326,7 @@ PSERVICE lpService; DWORD dwError; - DPRINT1("ScmrDeleteService() called\n"); + DPRINT("ScmrDeleteService() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -361,7 +361,7 @@ /* FIXME: Release service database lock */ - DPRINT1("ScmrDeleteService() done\n"); + DPRINT("ScmrDeleteService() done\n"); return dwError; } @@ -509,13 +509,13 @@ PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; - DPRINT1("ScmrChangeServiceConfigW() called\n"); - DPRINT1("dwServiceType = %lu\n", dwServiceType); - DPRINT1("dwStartType = %lu\n", dwStartType); - DPRINT1("dwErrorControl = %lu\n", dwErrorControl); - DPRINT1("lpBinaryPathName = %S\n", lpBinaryPathName); - DPRINT1("lpLoadOrderGroup = %S\n", lpLoadOrderGroup); - DPRINT1("lpDisplayName = %S\n", lpDisplayName); + DPRINT("ScmrChangeServiceConfigW() called\n"); + DPRINT("dwServiceType = %lu\n", dwServiceType); + DPRINT("dwStartType = %lu\n", dwStartType); + DPRINT("dwErrorControl = %lu\n", dwErrorControl); + DPRINT("lpBinaryPathName = %S\n", lpBinaryPathName); + DPRINT("lpLoadOrderGroup = %S\n", lpLoadOrderGroup); + DPRINT("lpDisplayName = %S\n", lpDisplayName); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -554,7 +554,7 @@ /* FIXME: Unlock database */ - DPRINT1("ScmrChangeServiceConfigW() done (Error %lu)\n", dwError); + DPRINT("ScmrChangeServiceConfigW() done (Error %lu)\n", dwError); return dwError; } @@ -587,15 +587,15 @@ LPWSTR lpImagePath = NULL; HKEY hServiceKey = NULL; - DPRINT1("ScmrCreateServiceW() called\n"); - DPRINT1("lpServiceName = %S\n", lpServiceName); - DPRINT1("lpDisplayName = %S\n", lpDisplayName); - DPRINT1("dwDesiredAccess = %lx\n", dwDesiredAccess); - DPRINT1("dwServiceType = %lu\n", dwServiceType); - DPRINT1("dwStartType = %lu\n", dwStartType); - DPRINT1("dwErrorControl = %lu\n", dwErrorControl); - DPRINT1("lpBinaryPathName = %S\n", lpBinaryPathName); - DPRINT1("lpLoadOrderGroup = %S\n", lpLoadOrderGroup); + DPRINT("ScmrCreateServiceW() called\n"); + DPRINT("lpServiceName = %S\n", lpServiceName); + DPRINT("lpDisplayName = %S\n", lpDisplayName); + DPRINT("dwDesiredAccess = %lx\n", dwDesiredAccess); + DPRINT("dwServiceType = %lu\n", dwServiceType); + DPRINT("dwStartType = %lu\n", dwStartType); + DPRINT("dwErrorControl = %lu\n", dwErrorControl); + DPRINT("lpBinaryPathName = %S\n", lpBinaryPathName); + DPRINT("lpLoadOrderGroup = %S\n", lpLoadOrderGroup); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -622,7 +622,11 @@ if (dwServiceType & SERVICE_DRIVER) { - /* FIXME: Adjust the image path */ + /* FIXME: Adjust the image path + * Following line is VERY BAD, because it assumes that the + * first part of full file name is the OS directory */ + if (lpBinaryPathName[1] == ':') lpBinaryPathName += GetWindowsDirectoryW(NULL, 0); + lpImagePath = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(lpBinaryPathName) + 1) * sizeof(WCHAR)); @@ -787,7 +791,7 @@ if (dwError == ERROR_SUCCESS) { - DPRINT1("hService %lx\n", hServiceHandle); + DPRINT("hService %lx\n", hServiceHandle); *hService = (unsigned int)hServiceHandle; if (lpdwTagId != NULL) @@ -814,7 +818,7 @@ if (lpImagePath != NULL) HeapFree(GetProcessHeap(), 0, lpImagePath); - DPRINT1("ScmrCreateServiceW() done (Error %lu)\n", dwError); + DPRINT("ScmrCreateServiceW() done (Error %lu)\n", dwError); return dwError; } @@ -903,7 +907,7 @@ lpService = ScmGetServiceEntryByName(lpServiceName); if (lpService == NULL) { - DPRINT1("Could not find a service!\n"); + DPRINT("Could not find a service!\n"); return ERROR_SERVICE_DOES_NOT_EXIST; }

18 years, 10 months

[hpoussin] 19036: Better stub for QueryServiceConfigW

by hpoussin＠svn.reactos.com

Better stub for QueryServiceConfigW Modified: trunk/reactos/lib/advapi32/service/scm.c _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-11-07 04:42:28 UTC (rev 19035) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-11-07 10:04:41 UTC (rev 19036) @@ -909,8 +909,17 @@ LPDWORD pcbBytesNeeded) { DPRINT1("QueryServiceConfigW is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + if (lpServiceConfig && cbBufSize >= sizeof(QUERY_SERVICE_CONFIGW)) + { + memset(lpServiceConfig, 0, *pcbBytesNeeded); + return TRUE; + } + else + { + *pcbBytesNeeded = sizeof(QUERY_SERVICE_CONFIGW); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } }

18 years, 10 months

[ion] 19035: - Implement PFX_NTC_ROOT/PFX_NTC_CHILD deletions in RtlRemoveUnicodePrefix, if the entry isn't a case match.

by ion＠svn.reactos.com

- Implement PFX_NTC_ROOT/PFX_NTC_CHILD deletions in RtlRemoveUnicodePrefix, if the entry isn't a case match. Modified: trunk/reactos/lib/rtl/unicodeprefix.c _____ Modified: trunk/reactos/lib/rtl/unicodeprefix.c --- trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 04:23:28 UTC (rev 19034) +++ trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 04:42:28 UTC (rev 19035) @@ -175,7 +175,8 @@ RtlRemoveUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable, PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry) { - PUNICODE_PREFIX_TABLE_ENTRY Entry; + PUNICODE_PREFIX_TABLE_ENTRY Entry, RefEntry, NewEntry; + PRTL_SPLAY_LINKS SplayLinks; /* Erase the last entry */ PrefixTable->LastNextEntry = NULL; @@ -186,7 +187,7 @@ /* Get the case match entry */ Entry = PrefixTableEntry->CaseMatch; - /* Now loop until we find the one matching what the caller sent */ + /* 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 */ @@ -195,7 +196,66 @@ else if ((PrefixTableEntry->NodeTypeCode == PFX_NTC_ROOT) || (PrefixTableEntry->NodeTypeCode == PFX_NTC_CHILD)) { - /* FIXME */ + /* Check if this entry is a case match */ + if (PrefixTableEntry->CaseMatch != PrefixTableEntry) + { + /* FIXME */ + } + else + { + /* It's not a case match, so we'll delete the actual entry */ + SplayLinks = &PrefixTableEntry->Links; + + /* Find the root entry */ + while (!RtlIsRoot(SplayLinks)) SplayLinks = RtlParent(SplayLinks); + Entry = CONTAINING_RECORD(SplayLinks, + UNICODE_PREFIX_TABLE_ENTRY, + Links); + + /* Delete the entry and check if the whole tree is gone */ + SplayLinks = RtlDelete(&PrefixTableEntry->Links); + if (!SplayLinks) + { + /* The tree is also gone now, 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 so this entry stops being referenced */ + RefEntry->NextPrefixTree = Entry->NextPrefixTree; + } + else if (&Entry->Links != SplayLinks) + { + /* The tree is still here, but we got moved to a new one */ + NewEntry = CONTAINING_RECORD(SplayLinks, + UNICODE_PREFIX_TABLE_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; + } + + /* Since we got moved, make us the new root entry */ + NewEntry->NodeTypeCode = PFX_NTC_ROOT; + + /* Link us with the entry referencing the old root */ + RefEntry->NextPrefixTree = NewEntry; + + /* And link us with the old tree */ + NewEntry->NextPrefixTree = Entry->NextPrefixTree; + + /* Set the old tree as a child */ + Entry->NodeTypeCode = PFX_NTC_CHILD; + Entry->NextPrefixTree = NULL; + } + } } }

18 years, 10 months

[ion] 19034: - Implement PFX_NTC_CASE_MATCH deletions in RtlRemoveUnicodePrefix

by ion＠svn.reactos.com

- Implement PFX_NTC_CASE_MATCH deletions in RtlRemoveUnicodePrefix Modified: trunk/reactos/lib/rtl/unicodeprefix.c _____ Modified: trunk/reactos/lib/rtl/unicodeprefix.c --- trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 01:01:29 UTC (rev 19033) +++ trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-07 04:23:28 UTC (rev 19034) @@ -175,7 +175,28 @@ RtlRemoveUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable, PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry) { - UNIMPLEMENTED; + PUNICODE_PREFIX_TABLE_ENTRY Entry; + + /* Erase the last entry */ + PrefixTable->LastNextEntry = NULL; + + /* Check if this was a Case Match Entry */ + if (PrefixTableEntry->NodeTypeCode == PFX_NTC_CASE_MATCH) + { + /* Get the case match entry */ + Entry = PrefixTableEntry->CaseMatch; + + /* Now loop until we find the one matching 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; + } + else if ((PrefixTableEntry->NodeTypeCode == PFX_NTC_ROOT) || + (PrefixTableEntry->NodeTypeCode == PFX_NTC_CHILD)) + { + /* FIXME */ + } } /* EOF */

18 years, 10 months

← Newer
1
...
73
74
75
76
77
78
79
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005