Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[hpoussin] 20337: Take care of flag DI_FLAGSEX_NO_DRVREG_MODIFY

by hpoussin＠svn.reactos.com

Take care of flag DI_FLAGSEX_NO_DRVREG_MODIFY Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-26 15:25:47 UTC (rev 20336) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-26 15:55:33 UTC (rev 20337) @@ -7476,7 +7476,9 @@ goto cleanup; /* Install main section */ - DoAction = SPINST_REGISTRY; + DoAction = 0; + if (!(InstallParams.FlagsEx & DI_FLAGSEX_NO_DRVREG_MODIFY)) + DoAction |= SPINST_REGISTRY; if (!(InstallParams.Flags & DI_NOFILECOPY)) { DoAction |= SPINST_FILES; @@ -7579,10 +7581,13 @@ goto cleanup; /* Install .HW section */ + DoAction = 0; + if (!(InstallParams.FlagsEx & DI_FLAGSEX_NO_DRVREG_MODIFY)) + DoAction |= SPINST_REGISTRY; wcscpy(pSectionName, L".HW"); Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, SelectedDriver->InfFileDetails->hInf, SectionName, - SPINST_REGISTRY, hKey, NULL, 0, + DoAction, hKey, NULL, 0, NULL, NULL, DeviceInfoSet, DeviceInfoData); if (!Result)

18 years, 8 months

[hpoussin] 20336: Fix usage of DI_NOVCP flag

by hpoussin＠svn.reactos.com

Fix usage of DI_NOVCP flag Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/install.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-26 15:06:46 UTC (rev 20335) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-26 15:25:47 UTC (rev 20336) @@ -7369,34 +7369,6 @@ return TRUE; } - -static UINT WINAPI -NullInstallMsgHandler( - IN PVOID Context, - UINT Notification, - UINT_PTR Param1, - UINT_PTR Param2) -{ - switch (Notification) - { - case SPFILENOTIFY_STARTQUEUE: return TRUE; - case SPFILENOTIFY_ENDQUEUE: return 0; - case SPFILENOTIFY_STARTSUBQUEUE: return TRUE; - case SPFILENOTIFY_ENDSUBQUEUE: return 0; - case SPFILENOTIFY_STARTDELETE: return FILEOP_SKIP; - case SPFILENOTIFY_ENDDELETE: return 0; - case SPFILENOTIFY_STARTRENAME: return FILEOP_SKIP; - case SPFILENOTIFY_ENDRENAME: return 0; - case SPFILENOTIFY_STARTCOPY: return FILEOP_SKIP; - case SPFILENOTIFY_ENDCOPY: return 0; - case SPFILENOTIFY_NEEDMEDIA: return FILEOP_SKIP; - default: - FIXME("Notification %u params %p, %p\n", Notification, Param1, Param2 ); - break; - } - return 0; -} - /*********************************************************************** * SetupDiInstallDevice (SETUPAPI.@) */ @@ -7516,7 +7488,7 @@ Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, SelectedDriver->InfFileDetails->hInf, SectionName, DoAction, hKey, NULL, SP_COPY_NEWER, - InstallParams.Flags & (DI_NOFILECOPY | DI_NOVCP) ? NullInstallMsgHandler : SetupDefaultQueueCallback, Context, + SetupDefaultQueueCallback, Context, DeviceInfoSet, DeviceInfoData); if (!Result) goto cleanup; _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-12-26 15:06:46 UTC (rev 20335) +++ trunk/reactos/lib/setupapi/install.c 2005-12-26 15:25:47 UTC (rev 20336) @@ -864,20 +864,29 @@ if (flags & SPINST_FILES) { + SP_DEVINSTALL_PARAMS_W install_params; struct files_callback_info info; HSPFILEQ queue; + BOOL use_custom_queue; BOOL ret; - if (!(queue = SetupOpenFileQueue())) return FALSE; - info.queue = queue; + install_params.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + use_custom_queue = SetupDiGetDeviceInstallParamsW(devinfo, devinfo_data, &install_params) && (install_params.Flags & DI_NOVCP); + if (!use_custom_queue && ((queue = SetupOpenFileQueue()) == (HSPFILEQ)INVALID_HANDLE_VALUE )) + return FALSE; + info.queue = use_custom_queue ? install_params.FileQueue : queue; info.src_root = src_root; info.copy_flags = copy_flags; info.layout = hinf; ret = (iterate_section_fields( hinf, section, CopyFiles, copy_files_callback, &info ) && iterate_section_fields( hinf, section, DelFiles, delete_files_callback, &info ) && - iterate_section_fields( hinf, section, RenFiles, rename_files_callback, &info ) && - SetupCommitFileQueueW( owner, queue, callback, context )); - SetupCloseFileQueue( queue ); + iterate_section_fields( hinf, section, RenFiles, rename_files_callback, &info )); + if (!use_custom_queue) + { + if (ret) + ret = SetupCommitFileQueueW( owner, queue, callback, context ); + SetupCloseFileQueue( queue ); + } if (!ret) return FALSE; } if (flags & SPINST_INIFILES)

18 years, 8 months

[ekohl] 20335: -Implement EnumServicesStatusExW.

by ekohl＠svn.reactos.com

-Implement EnumServicesStatusExW. -Add missing [unique] Attributes to svcctrl.idl. Modified: trunk/reactos/include/idl/svcctl.idl Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/system/services/rpcserver.c _____ Modified: trunk/reactos/include/idl/svcctl.idl --- trunk/reactos/include/idl/svcctl.idl 2005-12-26 02:45:49 UTC (rev 20334) +++ trunk/reactos/include/idl/svcctl.idl 2005-12-26 15:06:46 UTC (rev 20335) @@ -12,6 +12,7 @@ #define SC_LOCK unsigned int #define SERVICE_STATUS_HANDLE unsigned long #define SC_STATUS_TYPE unsigned long +#define SC_ENUM_TYPE unsigned long #define LPSTR char* #define LPCSTR char* #define LPWSTR wchar_t* @@ -138,7 +139,7 @@ DWORD ScmrEnumDependentServicesW([in] handle_t BindingHandle, [in] SC_HANDLE hService, [in] DWORD dwServiceState, - [out, size_is(cbBufSize)] LPBYTE lpServices, + [out, unique, size_is(cbBufSize)] LPBYTE lpServices, [in] DWORD cbBufSize, [out] LPDWORD pcbBytesNeeded, [out] LPDWORD lpServicesReturned); @@ -148,7 +149,7 @@ [in] SC_HANDLE hSCManager, [in] DWORD dwServiceType, [in] DWORD dwServiceState, - [out, size_is(dwBufSize)] LPBYTE lpServices, + [out, unique, size_is(dwBufSize)] LPBYTE lpServices, [in] DWORD dwBufSize, [out] LPDWORD pcbBytesNeeded, [out] LPDWORD lpServicesReturned, @@ -178,7 +179,7 @@ /* Function 18 */ DWORD ScmrQueryServiceLockStatusW([in] handle_t BindingHandle, [in] SC_HANDLE hSCManager, - [out, size_is(cbBufSize), unique] LPBYTE lpLockStatus, + [out, unique, size_is(cbBufSize)] LPBYTE lpLockStatus, [in] DWORD cbBufSize, [out] LPDWORD pcbBytesNeeded); @@ -249,7 +250,7 @@ DWORD ScmrEnumDependentServicesA([in] handle_t BindingHandle, [in] SC_HANDLE hService, [in] DWORD dwServiceState, - [out, size_is(cbBufSize)] LPBYTE lpServices, + [out, unique, size_is(cbBufSize)] LPBYTE lpServices, [in] DWORD cbBufSize, [out] LPDWORD pcbBytesNeeded, [out] LPDWORD lpServicesReturned); @@ -259,7 +260,7 @@ [in] SC_HANDLE hSCManager, [in] DWORD dwServiceType, [in] DWORD dwServiceState, - [out, size_is(dwBufSize)] LPBYTE lpServices, + [out, unique, size_is(dwBufSize)] LPBYTE lpServices, [in] DWORD dwBufSize, [out] LPDWORD pcbBytesNeeded, [out] LPDWORD lpServicesReturned, @@ -289,7 +290,7 @@ /* Function 30 */ // DWORD ScmrQueryServiceLockStatusA([in] handle_t BindingHandle, // [in] SC_HANDLE hSCManager, -// [out, size_is(cbBufSize), unique] LPBYTE lpLockStatus, +// [out, unique, size_is(cbBufSize)] LPBYTE lpLockStatus, // [in] DWORD cbBufSize, // [out] LPDWORD pcbBytesNeeded); @@ -297,20 +298,20 @@ // DWORD ScmrStartServiceA([in] handle_t BindingHandle, // [in] SC_HANDLE hService, // [in] DWORD dwNumServiceArgs, -// [in, string, size_is(dwNumServiceArgs, ), unique] LPSTR *lpServiceArgVectors); +// [in, unique, string, size_is(dwNumServiceArgs, )] LPSTR *lpServiceArgVectors); /* Function 32 */ DWORD ScmrGetServiceDisplayNameA([in] handle_t BindingHandle, [in] SC_HANDLE hSCManager, [in, string, ref] LPCSTR lpServiceName, - [out, size_is(*lpcchBuffer), unique] LPSTR lpDisplayName, + [out, unique, size_is(*lpcchBuffer)] LPSTR lpDisplayName, [in, out, ref] LPDWORD lpcchBuffer); /* Function 33 */ DWORD ScmrGetServiceKeyNameA([in] handle_t BindingHandle, [in] SC_HANDLE hSCManager, [in, string, ref] LPCSTR lpDisplayName, - [out, size_is(*lpcchBuffer), unique] LPSTR lpServiceName, + [out, unique, size_is(*lpcchBuffer)] LPSTR lpServiceName, [in, out, ref] LPDWORD lpcchBuffer); /* Function 35 */ @@ -335,15 +336,35 @@ DWORD ScmrQueryServiceStatusEx([in] handle_t BindingHandle, [in] SC_HANDLE hService, [in] SC_STATUS_TYPE InfoLevel, - [out, size_is(cbBufSize)] LPBYTE lpBuffer, + [out, unique, size_is(cbBufSize)] LPBYTE lpBuffer, [in] DWORD cbBufSize, [out] LPDWORD pcbBytesNeeded); /* Function 41 */ - /* ScmrEnumServicesStatusExA */ +// DWORD ScmrEnumServicesStatusExA([in] handle_t BindingHandle, +// [in] SC_HANDLE hService, +// [in] SC_ENUM_TYPE InfoLevel, +// [in] DWORD dwServiceType, +// [in] DWORD dwServiceState, +// [out, unique, size_is(cbBufSize)] LPBYTE lpServices, +// [in] DWORD cbBufSize, +// [out] LPDWORD pcbBytesNeeded, +// [out] LPDWORD lpServicesReturned, +// [in, out, unique] LPDWORD lpResumeHandle, +// [in, string] LPCSTR pszGroupName); /* Function 42 */ - /* ScmrEnumServicesStatusExW */ + DWORD ScmrEnumServicesStatusExW([in] handle_t BindingHandle, + [in] SC_HANDLE hService, + [in] SC_ENUM_TYPE InfoLevel, + [in] DWORD dwServiceType, + [in] DWORD dwServiceState, + [out, unique, size_is(cbBufSize)] LPBYTE lpServices, + [in] DWORD cbBufSize, + [out] LPDWORD pcbBytesNeeded, + [out] LPDWORD lpServicesReturned, + [in, out, unique] LPDWORD lpResumeHandle, + [in, string] LPCWSTR pszGroupName); /* Function 43 */ /* ScmrSendTSMessage */ _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-12-26 02:45:49 UTC (rev 20334) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-12-26 15:06:46 UTC (rev 20335) @@ -708,24 +708,64 @@ /********************************************************************** * EnumServicesStatusExW * - * @unimplemented + * @implemented */ -BOOL -STDCALL -EnumServicesStatusExW(SC_HANDLE hSCManager, - SC_ENUM_TYPE InfoLevel, - DWORD dwServiceType, - DWORD dwServiceState, - LPBYTE lpServices, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded, - LPDWORD lpServicesReturned, - LPDWORD lpResumeHandle, - LPCWSTR pszGroupName) +BOOL STDCALL +EnumServicesStatusExW(SC_HANDLE hSCManager, + SC_ENUM_TYPE InfoLevel, + DWORD dwServiceType, + DWORD dwServiceState, + LPBYTE lpServices, + DWORD cbBufSize, + LPDWORD pcbBytesNeeded, + LPDWORD lpServicesReturned, + LPDWORD lpResumeHandle, + LPCWSTR pszGroupName) { - DPRINT1("EnumServicesStatusExW is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LPENUM_SERVICE_STATUS_PROCESSW lpStatusPtr; + DWORD dwError = ERROR_SUCCESS; + DWORD dwCount; + + DPRINT1("EnumServicesStatusExW() called\n"); + + HandleBind(); + + dwError = ScmrEnumServicesStatusExW(BindingHandle, + (unsigned int)hSCManager, + (unsigned long)InfoLevel, + dwServiceType, + dwServiceState, + (unsigned char *)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned, + lpResumeHandle, + (wchar_t *)pszGroupName); + + lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSW)lpServices; + for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) + { + if (lpStatusPtr->lpServiceName) + lpStatusPtr->lpServiceName = + (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); + + if (lpStatusPtr->lpDisplayName) + lpStatusPtr->lpDisplayName = + (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); + + lpStatusPtr++; + } + + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrEnumServicesStatusExW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + DPRINT1("ScmrEnumServicesStatusExW() done\n"); + + return TRUE; } @@ -1390,7 +1430,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrQueryServiceStatusEx() failed (Error %lu)\n", dwError); + DPRINT("ScmrQueryServiceStatusEx() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-12-26 02:45:49 UTC (rev 20334) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-12-26 15:06:46 UTC (rev 20335) @@ -1393,9 +1393,9 @@ *lpServicesReturned = dwServiceCount; *pcbBytesNeeded = dwRequiredSize; - lpStatusPtr = (LPENUM_SERVICE_STATUS)lpServices; + lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpServices; lpStringPtr = (LPWSTR)((ULONG_PTR)lpServices + - dwServiceCount * sizeof(ENUM_SERVICE_STATUS)); + dwServiceCount * sizeof(ENUM_SERVICE_STATUSW)); dwRequiredSize = 0; for (ServiceEntry = &lpService->ServiceListEntry; @@ -2138,9 +2138,229 @@ /* Function 42 */ -/* ScmrEnumServicesStatusExW */ +unsigned long +ScmrEnumServicesStatusExW(handle_t BindingHandle, + unsigned int hSCManager, + unsigned long InfoLevel, + unsigned long dwServiceType, + unsigned long dwServiceState, + unsigned char *lpServices, + unsigned long dwBufSize, + unsigned long *pcbBytesNeeded, + unsigned long *lpServicesReturned, + unsigned long *lpResumeHandle, + wchar_t *pszGroupName) +{ + PMANAGER_HANDLE hManager; + PSERVICE lpService; + DWORD dwError = ERROR_SUCCESS; + PLIST_ENTRY ServiceEntry; + PSERVICE CurrentService; + DWORD dwState; + DWORD dwRequiredSize; + DWORD dwServiceCount; + DWORD dwSize; + DWORD dwLastResumeCount; + LPENUM_SERVICE_STATUS_PROCESSW lpStatusPtr; + LPWSTR lpStringPtr; + DPRINT("ScmrEnumServicesStatusExW() called\n"); + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + if (InfoLevel != SC_ENUM_PROCESS_INFO) + return ERROR_INVALID_LEVEL; + + hManager = (PMANAGER_HANDLE)hSCManager; + if (hManager->Handle.Tag != MANAGER_TAG) + { + DPRINT1("Invalid manager handle!\n"); + return ERROR_INVALID_HANDLE; + } + + /* Check access rights */ + if (!RtlAreAllAccessesGranted(hManager->Handle.DesiredAccess, + SC_MANAGER_ENUMERATE_SERVICE)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", + hManager->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + *pcbBytesNeeded = 0; + *lpServicesReturned = 0; + + dwLastResumeCount = *lpResumeHandle; + + /* Lock the service list shared */ + + lpService = ScmGetServiceEntryByResumeCount(dwLastResumeCount); + if (lpService == NULL) + { + dwError = ERROR_SUCCESS; + goto Done; + } + + dwRequiredSize = 0; + dwServiceCount = 0; + + for (ServiceEntry = &lpService->ServiceListEntry; + ServiceEntry != &ServiceListHead; + ServiceEntry = ServiceEntry->Flink) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + + if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) + continue; + + dwState = SERVICE_ACTIVE; + if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwState = SERVICE_INACTIVE; + + if ((dwState & dwServiceState) == 0) + continue; + + if (pszGroupName) + { + if (_wcsicmp(pszGroupName, CurrentService->lpServiceGroup)) + continue; + } + + dwSize = sizeof(ENUM_SERVICE_STATUS_PROCESSW) + + ((wcslen(CurrentService->lpServiceName) + 1) * sizeof(WCHAR)) + + ((wcslen(CurrentService->lpDisplayName) + 1) * sizeof(WCHAR)); + + if (dwRequiredSize + dwSize <= dwBufSize) + { + DPRINT("Service name: %S fit\n", CurrentService->lpServiceName); + dwRequiredSize += dwSize; + dwServiceCount++; + dwLastResumeCount = CurrentService->dwResumeCount; + } + else + { + DPRINT("Service name: %S no fit\n", CurrentService->lpServiceName); + break; + } + + } + + DPRINT("dwRequiredSize: %lu\n", dwRequiredSize); + DPRINT("dwServiceCount: %lu\n", dwServiceCount); + + for (; + ServiceEntry != &ServiceListHead; + ServiceEntry = ServiceEntry->Flink) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + + if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) + continue; + + dwState = SERVICE_ACTIVE; + if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwState = SERVICE_INACTIVE; + + if ((dwState & dwServiceState) == 0) + continue; + + if (pszGroupName) + { + if (_wcsicmp(pszGroupName, CurrentService->lpServiceGroup)) + continue; + } + + dwRequiredSize += (sizeof(ENUM_SERVICE_STATUS_PROCESSW) + + ((wcslen(CurrentService->lpServiceName) + 1) * sizeof(WCHAR)) + + ((wcslen(CurrentService->lpDisplayName) + 1) * sizeof(WCHAR))); + + dwError = ERROR_MORE_DATA; + } + + DPRINT("*pcbBytesNeeded: %lu\n", dwRequiredSize); + + *lpResumeHandle = dwLastResumeCount; + *lpServicesReturned = dwServiceCount; + *pcbBytesNeeded = dwRequiredSize; + + lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSW)lpServices; + lpStringPtr = (LPWSTR)((ULONG_PTR)lpServices + + dwServiceCount * sizeof(ENUM_SERVICE_STATUS_PROCESSW)); + + dwRequiredSize = 0; + for (ServiceEntry = &lpService->ServiceListEntry; + ServiceEntry != &ServiceListHead; + ServiceEntry = ServiceEntry->Flink) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + + if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) + continue; + + dwState = SERVICE_ACTIVE; + if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwState = SERVICE_INACTIVE; + + if ((dwState & dwServiceState) == 0) + continue; + + if (pszGroupName) + { + if (_wcsicmp(pszGroupName, CurrentService->lpServiceGroup)) + continue; + } + + dwSize = sizeof(ENUM_SERVICE_STATUS_PROCESSW) + + ((wcslen(CurrentService->lpServiceName) + 1) * sizeof(WCHAR)) + + ((wcslen(CurrentService->lpDisplayName) + 1) * sizeof(WCHAR)); + + if (dwRequiredSize + dwSize <= dwBufSize) + { + /* Copy the service name */ + wcscpy(lpStringPtr, + CurrentService->lpServiceName); + lpStatusPtr->lpServiceName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpServices); + lpStringPtr += (wcslen(CurrentService->lpServiceName) + 1); + + /* Copy the display name */ + wcscpy(lpStringPtr, + CurrentService->lpDisplayName); + lpStatusPtr->lpDisplayName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpServices); + lpStringPtr += (wcslen(CurrentService->lpDisplayName) + 1); + + /* Copy the status information */ + memcpy(&lpStatusPtr->ServiceStatusProcess, + &CurrentService->Status, + sizeof(SERVICE_STATUS)); + lpStatusPtr->ServiceStatusProcess.dwProcessId = CurrentService->ProcessId; /* FIXME */ + lpStatusPtr->ServiceStatusProcess.dwServiceFlags = 0; /* FIXME */ + + lpStatusPtr++; + dwRequiredSize += dwSize; + } + else + { + break; + } + + } + +Done:; + /* Unlock the service list */ + + DPRINT("ScmrEnumServicesStatusExW() done (Error %lu)\n", dwError); + + return dwError; +} + + /* Function 43 */ /* ScmrSendTSMessage */

18 years, 8 months

[turner] 20334: Better page file creation that allows for system managed setting. A lot of thanks to Thomas on this patch.

by turner＠svn.reactos.com

Better page file creation that allows for system managed setting. A lot of thanks to Thomas on this patch. Modified: trunk/reactos/subsys/smss/initpage.c _____ Modified: trunk/reactos/subsys/smss/initpage.c --- trunk/reactos/subsys/smss/initpage.c 2005-12-25 23:57:26 UTC (rev 20333) +++ trunk/reactos/subsys/smss/initpage.c 2005-12-26 02:45:49 UTC (rev 20334) @@ -28,66 +28,207 @@ #define NDEBUG #include <debug.h> +#define GIGABYTE (1024 * 1024 * 1024) /* One Gigabyte */ + static NTSTATUS STDCALL SmpPagingFilesQueryRoutine(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) { UNICODE_STRING FileName; - LARGE_INTEGER InitialSize; - LARGE_INTEGER MaximumSize; - NTSTATUS Status; - LPWSTR p; + LARGE_INTEGER InitialSize = {{0, 0}}; + LARGE_INTEGER MaximumSize = {{0, 0}}; + NTSTATUS Status = STATUS_SUCCESS; + PWSTR p, ValueString = (PWSTR)ValueData; + WCHAR RootDriveLetter[5] = {0}; - DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName, ValueType, ValueLength); - DPRINT("ValueData '%S'\n", (PWSTR)ValueData); + if (ValueLength > 3 * sizeof(WCHAR) && + (ValueLength % sizeof(WCHAR) != 0 || + ValueString[(ValueLength / sizeof(WCHAR)) - 1] != L'\0')) + { + return STATUS_INVALID_PARAMETER; + } if (ValueType != REG_SZ) { - return(STATUS_SUCCESS); + return STATUS_INVALID_PARAMETER_2; } /* - * Format: "<path>[ <initial_size>[ <maximum_size>]]" - */ - if ((p = wcschr(ValueData, ' ')) != NULL) + * Format: "<path>[ <initial_size>[ <maximum_size>]]" + */ + if ((p = wcschr(ValueString, L' ')) != NULL) { *p = L'\0'; InitialSize.QuadPart = wcstoul(p + 1, &p, 0) * 256 * 4096; if (*p == ' ') - { - MaximumSize.QuadPart = wcstoul(p + 1, NULL, 0) * 256 * 4096; - } + { + MaximumSize.QuadPart = wcstoul(p + 1, NULL, 0) * 256 * 4096; + } else - MaximumSize = InitialSize; + { + MaximumSize = InitialSize; + } } - else + + if (!RtlDosPathNameToNtPathName_U (ValueString, + &FileName, + NULL, + NULL)) { - InitialSize.QuadPart = 50 * 4096; - MaximumSize.QuadPart = 80 * 4096; + return STATUS_OBJECT_PATH_INVALID; } - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)ValueData, - &FileName, - NULL, - NULL)) + /* If there is only a file name or if initial and max are both 0 + * the system will pick the sizes. Then it makes intial the size of phyical memory + * and makes max the size of 1.5 * initial. If there isnt enough free space then it will + * fall back to intial 20% of free space and max 25%. There is a max of 1 gig before + * it doesnt make it bigger. */ + if ((InitialSize.QuadPart == 0 && MaximumSize.QuadPart == 0) || p == NULL) { - return (STATUS_SUCCESS); + FILE_FS_SIZE_INFORMATION FileFsSize; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE hFile; + SYSTEM_BASIC_INFORMATION SysBasicInfo; + UNICODE_STRING NtPathU; + LARGE_INTEGER FreeBytes = {{0, 0}}; + OBJECT_ATTRIBUTES ObjectAttributes; + + DPRINT("System managed pagefile...\n"); + /* Make sure the path that is given for the file actually has the drive in it. + At this point if there is not file name, no sizes will be set therefore no page + file will be created */ + if (wcslen(ValueString) <= 3 || + ValueString[1] != L':' || + ValueString[2] != L'\\') + { + DPRINT1("Invalid path for pagefile.\n"); + goto Cleanup; + } + + Status = NtQuerySystemInformation(SystemBasicInformation, + &SysBasicInfo, + sizeof(SysBasicInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not query for physical memory size.\n"); + goto Cleanup; + } + DPRINT("PageSize: %d, PhysicalPages: %d, TotalMem: %d\n", SysBasicInfo.PageSize, SysBasicInfo.NumberOfPhysicalPages, (SysBasicInfo.NumberOfPhysicalPages * SysBasicInfo.PageSize) / 1024); + + InitialSize.QuadPart = SysBasicInfo.NumberOfPhysicalPages * + SysBasicInfo.PageSize; + MaximumSize.QuadPart = InitialSize.QuadPart * 2; + + DPRINT("InitialSize: %I64d PhysicalPages: %lu PageSize: %lu\n",InitialSize.QuadPart,SysBasicInfo.NumberOfPhysicalPages,SysBasicI nfo.PageSize); + + /* copy the drive letter, the colon and the slash, + tack a null on the end */ + RootDriveLetter[0] = ValueString[0]; + RootDriveLetter[1] = L':'; + RootDriveLetter[2] = L'\\'; + RootDriveLetter[3] = L'\0'; + DPRINT("Root drive X:\\...\"%S\"\n",RootDriveLetter); + + if (!RtlDosPathNameToNtPathName_U(RootDriveLetter, + &NtPathU, + NULL, + NULL)) + { + DPRINT1("Invalid path to root of drive\n"); + Status = STATUS_OBJECT_PATH_INVALID; + goto Cleanup; + } + + InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Get a handle to the root to find the free space on the drive */ + Status = NtCreateFile(&hFile, + 0, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + 0, + NULL, + 0); + + RtlFreeUnicodeString(&NtPathU); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not open a handle to the volume.\n"); + goto Cleanup; + } + + Status = NtQueryVolumeInformationFile(hFile, + &IoStatusBlock, + &FileFsSize, + sizeof(FILE_FS_SIZE_INFORMATION), + FileFsSizeInformation); + + NtClose(hFile); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Querying the volume free space failed!\n"); + goto Cleanup; + } + + FreeBytes.QuadPart = FileFsSize.BytesPerSector * + FileFsSize.SectorsPerAllocationUnit * + FileFsSize.AvailableAllocationUnits.QuadPart; + + DPRINT("Free bytes: %I64d Inital Size based on memory: %I64d \n",FreeBytes.QuadPart,InitialSize.QuadPart); + + + if (InitialSize.QuadPart > (FreeBytes.QuadPart / 4) || InitialSize.QuadPart == 0) + { + DPRINT("Inital Size took more then 25%% of free space\n"); + /* Set by percentage of free space + * intial is 20%, and max is 25% */ + InitialSize.QuadPart = FreeBytes.QuadPart / 5; + MaximumSize.QuadPart = FreeBytes.QuadPart / 4; + /* The page file is more then a gig, size it down */ + if (InitialSize.QuadPart > GIGABYTE) + { + InitialSize.QuadPart = GIGABYTE; + MaximumSize.QuadPart = GIGABYTE * 1.5; + } + } + + } - DPRINT("SMSS: Created paging file %wZ with size %dKB\n", - &FileName, InitialSize.QuadPart / 1024); + /* Make sure that max is not smaller then initial */ + if (InitialSize.QuadPart > MaximumSize.QuadPart) + { + DPRINT("Max page file size was bigger then inital.\n"); + MaximumSize.QuadPart = InitialSize.QuadPart; + } + + DPRINT1("SMSS: Created paging file %wZ with size %I64d KB\n", + &FileName, InitialSize.QuadPart / 1024); + Status = NtCreatePagingFile(&FileName, - &InitialSize, - &MaximumSize, - 0); + &InitialSize, + &MaximumSize, + 0); +Cleanup: RtlFreeUnicodeString(&FileName); - return(STATUS_SUCCESS); + return Status; } @@ -97,7 +238,7 @@ RTL_QUERY_REGISTRY_TABLE QueryTable[2]; NTSTATUS Status; - DPRINT("SM: creating system paging files\n"); + DbgPrint("SM: creating system paging files\n"); /* * Disable paging file on MiniNT/Live CD. */

18 years, 8 months

[weiden] 20333: fixed creating property pages

by weiden＠svn.reactos.com

fixed creating property pages Modified: trunk/reactos/lib/cpl/timedate/timedate.c _____ Modified: trunk/reactos/lib/cpl/timedate/timedate.c --- trunk/reactos/lib/cpl/timedate/timedate.c 2005-12-25 21:20:13 UTC (rev 20332) +++ trunk/reactos/lib/cpl/timedate/timedate.c 2005-12-25 23:57:26 UTC (rev 20333) @@ -584,7 +584,7 @@ Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) { PROPSHEETHEADER psh; - PROPSHEETPAGE psp[3]; + PROPSHEETPAGE psp[2]; TCHAR Caption[256]; LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR));

18 years, 8 months

[weiden] 20332: perform asynchronous SID lookups

by weiden＠svn.reactos.com

perform asynchronous SID lookups Modified: trunk/reactos/lib/aclui/aclui.c Modified: trunk/reactos/lib/aclui/aclui.xml Modified: trunk/reactos/lib/aclui/aclui_En.rc Modified: trunk/reactos/lib/aclui/checklist.c Modified: trunk/reactos/lib/aclui/guid.c Modified: trunk/reactos/lib/aclui/misc.c Modified: trunk/reactos/lib/aclui/precomp.h Modified: trunk/reactos/lib/aclui/resource.h Added: trunk/reactos/lib/aclui/sidcache.c _____ Modified: trunk/reactos/lib/aclui/aclui.c --- trunk/reactos/lib/aclui/aclui.c 2005-12-25 21:19:33 UTC (rev 20331) +++ trunk/reactos/lib/aclui/aclui.c 2005-12-25 21:20:13 UTC (rev 20332) @@ -28,8 +28,19 @@ */ #include <precomp.h> +#define NDEBUG +#include <debug.h> + HINSTANCE hDllInstance; +#define SIDN_LOOKUPSUCCEEDED (0x101) +typedef struct _SIDLOOKUPNOTIFYINFO +{ + NMHDR nmh; + PSID Sid; + PSIDREQRESULT SidRequestResult; +} SIDLOOKUPNOTIFYINFO, *PSIDLOOKUPNOTIFYINFO; + static PSID AceHeaderToSID(IN PACE_HEADER AceHeader) { @@ -77,6 +88,8 @@ ImageList_Destroy(sp->hiPrincipals); } + DestroySidCacheMgr(sp->SidCacheMgr); + HeapFree(GetProcessHeap(), 0, sp); @@ -85,7 +98,8 @@ } static VOID -FreePrincipalsList(IN PPRINCIPAL_LISTITEM *PrincipalsListHead) +FreePrincipalsList(IN PSECURITY_PAGE sp, + IN PPRINCIPAL_LISTITEM *PrincipalsListHead) { PPRINCIPAL_LISTITEM CurItem, NextItem; PACE_ENTRY AceEntry, NextAceEntry; @@ -105,6 +119,12 @@ } /* free the SID string if present */ + if (CurItem->SidReqResult != NULL) + { + DereferenceSidReqResult(sp->SidCacheMgr, + CurItem->SidReqResult); + } + if (CurItem->DisplayString != NULL) { LocalFree((HLOCAL)CurItem->DisplayString); @@ -179,43 +199,50 @@ return NULL; } -static BOOL +static VOID +SidLookupCompletion(IN HANDLE SidCacheMgr, + IN PSID Sid, + IN PSIDREQRESULT SidRequestResult, + IN PVOID Context) +{ + PSECURITY_PAGE sp = (PSECURITY_PAGE)Context; + + /* NOTE: this routine may be executed in a different thread + than the GUI! */ + + if (SidRequestResult != NULL) + { + SIDLOOKUPNOTIFYINFO LookupInfo; + + LookupInfo.nmh.hwndFrom = sp->hWnd; + LookupInfo.nmh.idFrom = 0; + LookupInfo.nmh.code = SIDN_LOOKUPSUCCEEDED; + LookupInfo.Sid = Sid; + LookupInfo.SidRequestResult = SidRequestResult; + + /* notify the page that the sid lookup succeeded */ + SendMessage(sp->hWnd, + WM_NOTIFY, + (WPARAM)LookupInfo.nmh.idFrom, + (LPARAM)&LookupInfo.nmh); + } +} + +static PPRINCIPAL_LISTITEM AddPrincipalToList(IN PSECURITY_PAGE sp, IN PSID Sid, - IN PACE_HEADER AceHeader) + IN PACE_HEADER AceHeader, + OUT BOOL *LookupDeferred OPTIONAL) { - PPRINCIPAL_LISTITEM PrincipalListItem = NULL; - PACE_ENTRY AceEntry = NULL; - BOOL Ret = FALSE; + PPRINCIPAL_LISTITEM PrincipalListItem = NULL, *PrincipalLink; + PACE_ENTRY AceEntry; + BOOL Deferred = FALSE; if (!FindSidInPrincipalsListAddAce(sp->PrincipalsListHead, Sid, AceHeader)) { - DWORD SidLength, AccountNameSize, DomainNameSize; - SID_NAME_USE SidNameUse; - DWORD LookupResult; - PPRINCIPAL_LISTITEM PrincipalListItem, *PrincipalLink; - - AccountNameSize = 0; - DomainNameSize = 0; - - /* calculate the size of the buffer we need to calculate */ - if (!LookupAccountSid(sp->ServerName, - Sid, - NULL, - &AccountNameSize, - NULL, - &DomainNameSize, - &SidNameUse)) - { - LookupResult = GetLastError(); - if (LookupResult != ERROR_NONE_MAPPED && - LookupResult != ERROR_INSUFFICIENT_BUFFER) - { - goto Cleanup; - } - } + DWORD SidLength; PrincipalLink = &sp->PrincipalsListHead; while (*PrincipalLink != NULL) @@ -228,232 +255,215 @@ /* allocate the principal */ PrincipalListItem = HeapAlloc(GetProcessHeap(), 0, - sizeof(PRINCIPAL_LISTITEM) + SidLength + - ((AccountNameSize + DomainNameSize) * sizeof(WCHAR))); + sizeof(PRINCIPAL_LISTITEM) + SidLength); if (PrincipalListItem != NULL) { - PrincipalListItem->AccountName = (LPWSTR)((ULONG_PTR)(PrincipalListItem + 1) + SidLength); - PrincipalListItem->DomainName = PrincipalListItem->AccountName + AccountNameSize; + PrincipalListItem->DisplayString = NULL; + PrincipalListItem->SidReqResult = NULL; CopySid(SidLength, (PSID)(PrincipalListItem + 1), Sid); - LookupResult = ERROR_SUCCESS; - if (!LookupAccountSid(sp->ServerName, - Sid, - PrincipalListItem->AccountName, - &AccountNameSize, - PrincipalListItem->DomainName, - &DomainNameSize, - &SidNameUse)) - { - LookupResult = GetLastError(); - if (LookupResult != ERROR_NONE_MAPPED) - { - goto Cleanup; - } - } - - if (AccountNameSize == 0) - { - PrincipalListItem->AccountName = NULL; - } - if (DomainNameSize == 0) - { - PrincipalListItem->DomainName = NULL; - } - /* allocate some memory for the ACE and copy it */ AceEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(ACE_ENTRY) + AceHeader->AceSize); - if (AceEntry == NULL) + if (AceEntry != NULL) { - goto Cleanup; - } - AceEntry->Next = NULL; - CopyMemory(AceEntry + 1, - AceHeader, - AceHeader->AceSize); + AceEntry->Next = NULL; + CopyMemory(AceEntry + 1, + AceHeader, + AceHeader->AceSize); - /* add the ACE to the list */ - PrincipalListItem->ACEs = AceEntry; + /* add the ACE to the list */ + PrincipalListItem->ACEs = AceEntry; - PrincipalListItem->Next = NULL; - Ret = TRUE; + PrincipalListItem->Next = NULL; - if (LookupResult == ERROR_NONE_MAPPED) - { - if (!ConvertSidToStringSid(Sid, - &PrincipalListItem->DisplayString)) - { - PrincipalListItem->DisplayString = NULL; - } + /* append item to the principals list */ + *PrincipalLink = PrincipalListItem; + + /* lookup the SID now */ + Deferred = !LookupSidCache(sp->SidCacheMgr, + Sid, + SidLookupCompletion, + sp); } else { - LSA_HANDLE LsaHandle; - NTSTATUS Status; + HeapFree(GetProcessHeap(), + 0, + PrincipalListItem); + PrincipalListItem = NULL; + } + } + } - PrincipalListItem->DisplayString = NULL; + if (PrincipalListItem != NULL && LookupDeferred != NULL) + { + *LookupDeferred = Deferred; + } - /* read the domain of the SID */ - if (OpenLSAPolicyHandle(sp->ServerName, - POLICY_LOOKUP_NAMES | POLICY_VIEW_LOCAL_INFORMATION, - &LsaHandle)) - { - PLSA_REFERENCED_DOMAIN_LIST ReferencedDomain; - PLSA_TRANSLATED_NAME Names; - PLSA_TRUST_INFORMATION Domain; - PLSA_UNICODE_STRING DomainName; - PPOLICY_ACCOUNT_DOMAIN_INFO PolicyAccountDomainInfo = NULL; + return PrincipalListItem; +} - Status = LsaLookupSids(LsaHandle, - 1, - &Sid, - &ReferencedDomain, - &Names); - if (NT_SUCCESS(Status)) - { - if (ReferencedDomain != NULL && - Names->DomainIndex >= 0) - { - Domain = &ReferencedDomain->Domains[Names->DomainIndex]; - DomainName = &Domain->Name; - } - else - { - Domain = NULL; - DomainName = NULL; - } +static LPWSTR +GetPrincipalDisplayString(IN PPRINCIPAL_LISTITEM PrincipalListItem) +{ + LPWSTR lpDisplayString = NULL; - PrincipalListItem->SidNameUse = Names->Use; + if (PrincipalListItem->SidReqResult != NULL) + { + if (PrincipalListItem->SidReqResult->SidNameUse == SidTypeUser || + PrincipalListItem->SidReqResult->SidNameUse == SidTypeGroup) + { + LoadAndFormatString(hDllInstance, + IDS_USERDOMAINFORMAT, + &lpDisplayString, + PrincipalListItem->SidReqResult->AccountName, + PrincipalListItem->SidReqResult->DomainName, + PrincipalListItem->SidReqResult->AccountName); + } + else + { + LoadAndFormatString(hDllInstance, + IDS_USERFORMAT, + &lpDisplayString, + PrincipalListItem->SidReqResult->AccountName); + } + } + else + { + ConvertSidToStringSid((PSID)(PrincipalListItem + 1), + &lpDisplayString); + } - switch (Names->Use) - { - case SidTypeAlias: - if (Domain != NULL) - { - /* query the domain name for BUILTIN accounts */ - Status = LsaQueryInformationPolicy(LsaHandle, - PolicyAccountDomainInformation, - (PVOID*)&PolicyAccountDomainInfo); - if (NT_SUCCESS(Status)) - { - DomainName = &PolicyAccountDomainInfo->DomainName; + return lpDisplayString; +} - /* make the user believe this is a group */ - PrincipalListItem->SidNameUse = SidTypeGroup; - } - } - /* fall through */ +static VOID +CreatePrincipalListItem(OUT LVITEM *li, + IN PSECURITY_PAGE sp, + IN PPRINCIPAL_LISTITEM PrincipalListItem, + IN INT Index, + IN BOOL Selected) +{ + INT ImageIndex = 2; - case SidTypeUser: - { - if (Domain != NULL) - { - SIZE_T Size = (AccountNameSize + DomainName->Length + - Names->Name.Length + 6) * sizeof(WCHAR); - PrincipalListItem->DisplayString = (LPWSTR)LocalAlloc(LMEM_FIXED, - Size); - if (PrincipalListItem->DisplayString != NULL) - { - WCHAR *s; + if (PrincipalListItem->SidReqResult != NULL) + { + switch (PrincipalListItem->SidReqResult->SidNameUse) + { + case SidTypeUser: + ImageIndex = 0; + break; + case SidTypeWellKnownGroup: + case SidTypeGroup: + ImageIndex = 1; + break; + default: + break; + } + } - /* NOTE: LSA_UNICODE_STRINGs are not always NULL-terminated! */ + li->mask = LVIF_IMAGE | LVIF_PARAM | LVIF_STATE | LVIF_TEXT; + li->iItem = Index; + li->iSubItem = 0; + li->state = (Selected ? LVIS_SELECTED : 0); + li->stateMask = LVIS_SELECTED; + li->pszText = PrincipalListItem->DisplayString; + li->iImage = ImageIndex; + li->lParam = (LPARAM)PrincipalListItem; +} - wcscpy(PrincipalListItem->DisplayString, - PrincipalListItem->AccountName); - wcscat(PrincipalListItem->DisplayString, - L" ("); - s = PrincipalListItem->DisplayString + wcslen(PrincipalListItem->DisplayString); - CopyMemory(s, - DomainName->Buffer, - DomainName->Length); - s += DomainName->Length / sizeof(WCHAR); - *(s++) = L'\\'; - CopyMemory(s, - Names->Name.Buffer, - Names->Name.Length); - s += Names->Name.Length / sizeof(WCHAR); - *(s++) = L')'; - *s = L'\0'; - } - else - { - Ret = FALSE; - break; - } +static INT +AddPrincipalListEntry(IN PSECURITY_PAGE sp, + IN PPRINCIPAL_LISTITEM PrincipalListItem, + IN INT Index, + IN BOOL Selected) +{ + LVITEM li; + INT Ret; - /* mark the ace as a user unless it's a - BUILTIN account */ - if (PolicyAccountDomainInfo == NULL) - { - PrincipalListItem->SidNameUse = SidTypeUser; - } - } - break; - } + if (PrincipalListItem->DisplayString != NULL) + { + LocalFree((HLOCAL)PrincipalListItem->DisplayString); + } + PrincipalListItem->DisplayString = GetPrincipalDisplayString(PrincipalListItem); - case SidTypeWellKnownGroup: - { - /* make the user believe this is a group */ - PrincipalListItem->SidNameUse = SidTypeGroup; - break; - } + CreatePrincipalListItem(&li, + sp, + PrincipalListItem, + Index, + Selected); - default: - { - DPRINT("Unhandled SID type: 0x%x\n", Names->Use); - break; - } - } + Ret = ListView_InsertItem(sp->hWndPrincipalsList, + &li); - if (PolicyAccountDomainInfo != NULL) - { - LsaFreeMemory(PolicyAccountDomainInfo); - } + return Ret; +} - LsaFreeMemory(ReferencedDomain); - LsaFreeMemory(Names); - } - LsaClose(LsaHandle); - } - } +static int CALLBACK +PrincipalCompare(IN LPARAM lParam1, + IN LPARAM lParam2, + IN LPARAM lParamSort) +{ + PPRINCIPAL_LISTITEM Item1 = (PPRINCIPAL_LISTITEM)lParam1; + PPRINCIPAL_LISTITEM Item2 = (PPRINCIPAL_LISTITEM)lParam2; - if (Ret) - { - /* append item to the principals list */ - *PrincipalLink = PrincipalListItem; - } - } + if (Item1->DisplayString != NULL && Item2->DisplayString != NULL) + { + return wcscmp(Item1->DisplayString, + Item2->DisplayString); } - if (!Ret) + return 0; +} + +static VOID +UpdatePrincipalListItem(IN PSECURITY_PAGE sp, + IN INT PrincipalIndex, + IN PPRINCIPAL_LISTITEM PrincipalListItem, + IN PSIDREQRESULT SidReqResult) +{ + LVITEM li; + + /* replace the request result structure */ + if (PrincipalListItem->SidReqResult != NULL) { -Cleanup: - if (PrincipalListItem != NULL) - { - if (PrincipalListItem->DisplayString != NULL) - { - LocalFree((HLOCAL)PrincipalListItem->DisplayString); - } + DereferenceSidReqResult(sp->SidCacheMgr, + PrincipalListItem->SidReqResult); + } - HeapFree(GetProcessHeap(), - 0, - PrincipalListItem); - } + ReferenceSidReqResult(sp->SidCacheMgr, + SidReqResult); + PrincipalListItem->SidReqResult = SidReqResult; - if (AceEntry != NULL) - { - HeapFree(GetProcessHeap(), - 0, - AceEntry); - } + /* update the display string */ + if (PrincipalListItem->DisplayString != NULL) + { + LocalFree((HLOCAL)PrincipalListItem->DisplayString); } + PrincipalListItem->DisplayString = GetPrincipalDisplayString(PrincipalListItem); - return Ret; + /* update the list item */ + CreatePrincipalListItem(&li, + sp, + PrincipalListItem, + PrincipalIndex, + FALSE); + + /* don't change the list item state */ + li.mask &= ~(LVIF_STATE | LVIF_PARAM); + + ListView_SetItem(sp->hWndPrincipalsList, + &li); + + /* sort the principals list view again */ + ListView_SortItems(sp->hWndPrincipalsList, + PrincipalCompare, + (LPARAM)sp); } static VOID @@ -465,7 +475,8 @@ HRESULT hRet; /* delete the cached ACL */ - FreePrincipalsList(&sp->PrincipalsListHead); + FreePrincipalsList(sp, + &sp->PrincipalsListHead); /* query the ACL */ hRet = sp->psi->lpVtbl->GetSecurity(sp->psi, @@ -493,11 +504,23 @@ (LPVOID*)&AceHeader) && AceHeader != NULL) { + BOOL LookupDeferred; + PPRINCIPAL_LISTITEM PrincipalListItem; + Sid = AceHeaderToSID(AceHeader); - AddPrincipalToList(sp, - Sid, - AceHeader); + PrincipalListItem = AddPrincipalToList(sp, + Sid, + AceHeader, + &LookupDeferred); + + if (PrincipalListItem != NULL && LookupDeferred) + { + AddPrincipalListEntry(sp, + PrincipalListItem, + -1, + FALSE); + } } } } @@ -505,75 +528,7 @@ } } -static INT -AddPrincipalListEntry(IN PSECURITY_PAGE sp, - IN PPRINCIPAL_LISTITEM PrincipalListItem, - IN INT Index, - IN BOOL Selected) -{ - LVITEM li; - - li.mask = LVIF_IMAGE | LVIF_PARAM | LVIF_STATE | LVIF_TEXT; - li.iItem = Index; - li.iSubItem = 0; - li.state = (Selected ? LVIS_SELECTED : 0); - li.stateMask = LVIS_SELECTED; - li.pszText = (PrincipalListItem->DisplayString != NULL ? - PrincipalListItem->DisplayString : - PrincipalListItem->AccountName); - - switch (PrincipalListItem->SidNameUse) - { - case SidTypeUser: - li.iImage = 0; - break; - case SidTypeGroup: - li.iImage = 1; - break; - default: - li.iImage = -1; - break; - } - li.lParam = (LPARAM)PrincipalListItem; - - return ListView_InsertItem(sp->hWndPrincipalsList, - &li); -} - static VOID -FillPrincipalsList(IN PSECURITY_PAGE sp) -{ - LPARAM SelLParam; - PPRINCIPAL_LISTITEM CurItem; - RECT rcLvClient; - - SelLParam = ListViewGetSelectedItemData(sp->hWndPrincipalsList); - - DisableRedrawWindow(sp->hWndPrincipalsList); - - ListView_DeleteAllItems(sp->hWndPrincipalsList); - - for (CurItem = sp->PrincipalsListHead; - CurItem != NULL; - CurItem = CurItem->Next) - { - AddPrincipalListEntry(sp, - CurItem, - -1, - (SelLParam == (LPARAM)CurItem)); - } - - EnableRedrawWindow(sp->hWndPrincipalsList); - - GetClientRect(sp->hWndPrincipalsList, - &rcLvClient); - - ListView_SetColumnWidth(sp->hWndPrincipalsList, - 0, - rcLvClient.right); -} - -static VOID UpdateControlStates(IN PSECURITY_PAGE sp) { PPRINCIPAL_LISTITEM Selected = (PPRINCIPAL_LISTITEM)ListViewGetSelectedItemData(sp->hWndPrincipalsList) ; @@ -586,18 +541,22 @@ if (Selected != NULL) { LPWSTR szLabel; + LPWSTR szDisplayString; + szDisplayString = GetPrincipalDisplayString(Selected); if (LoadAndFormatString(hDllInstance, IDS_PERMISSIONS_FOR, &szLabel, - Selected->AccountName)) + szDisplayString)) { SetWindowText(sp->hPermissionsForLabel, szLabel); LocalFree((HLOCAL)szLabel); } - + + LocalFree((HLOCAL)szDisplayString); + /* FIXME - update the checkboxes */ } else @@ -620,6 +579,54 @@ } } +static void +UpdatePrincipalInfo(IN PSECURITY_PAGE sp, + IN PSIDLOOKUPNOTIFYINFO LookupInfo) +{ + PPRINCIPAL_LISTITEM CurItem; + + for (CurItem = sp->PrincipalsListHead; + CurItem != NULL; + CurItem = CurItem->Next) + { + if (EqualSid((PSID)(CurItem + 1), + LookupInfo->Sid)) + { + INT PrincipalIndex; + LVFINDINFO lvfi; + + /* find the principal in the list */ + lvfi.flags = LVFI_PARAM; + lvfi.lParam = (LPARAM)CurItem; + PrincipalIndex = ListView_FindItem(sp->hWndPrincipalsList, + -1, + &lvfi); + + if (PrincipalIndex != -1) + { + /* update the principal in the list view control */ + UpdatePrincipalListItem(sp, + PrincipalIndex, + CurItem, + LookupInfo->SidRequestResult); + + if (ListViewGetSelectedItemData(sp->hWndPrincipalsList) == (LPARAM)CurItem) + { + UpdateControlStates(sp); + } + } + else + { + AddPrincipalListEntry(sp, + CurItem, + -1, + FALSE); + } + break; + } + } +} + static UINT CALLBACK SecurityPageCallback(IN HWND hwnd, IN UINT uMsg, @@ -1058,10 +1065,22 @@ pSid); if (AceHeader != NULL) { - AddPrincipalToList(sp, - pSid, - AceHeader); + PPRINCIPAL_LISTITEM PrincipalListItem; + BOOL LookupDeferred; + PrincipalListItem = AddPrincipalToList(sp, + pSid, + AceHeader, + &LookupDeferred); + + if (PrincipalListItem != NULL && LookupDeferred) + { + AddPrincipalListEntry(sp, + PrincipalListItem, + -1, + FALSE); + } + HeapFree(GetProcessHeap(), 0, AceHeader); @@ -1125,6 +1144,23 @@ } } } + else if (pnmh->hwndFrom == sp->hWnd) + { + switch(pnmh->code) + { + case SIDN_LOOKUPSUCCEEDED: + { + PSIDLOOKUPNOTIFYINFO LookupInfo = CONTAINING_RECORD(lParam, + SIDLOOKUPNOTIFYINFO, + nmh); + + /* a SID lookup succeeded, update the information */ + UpdatePrincipalInfo(sp, + LookupInfo); + break; + } + } + } break; } @@ -1152,9 +1188,6 @@ /* delete the instance */ FreeObjectPicker(sp->pDsObjectPicker); - - /* reload the principal list */ - FillPrincipalsList(sp); } else { @@ -1203,13 +1236,6 @@ sp->hPermissionsForLabel = GetDlgItem(hwndDlg, IDC_LABEL_PERMISSIONS_FOR); sp->SpecialPermCheckIndex = -1; - - if ((sp->ObjectInfo.dwFlags & SI_SERVER_IS_DC) && - sp->ObjectInfo.pszServerName != NULL && - sp->ObjectInfo.pszServerName[0] != L'\0') - { - sp->ServerName = sp->ObjectInfo.pszServerName; - } /* save the pointer to the structure */ SetWindowLongPtr(hwndDlg, @@ -1248,8 +1274,6 @@ &lvc); ReloadPrincipalsList(sp); - - FillPrincipalsList(sp); ListViewSelectItem(sp->hWndPrincipalsList, 0); @@ -1313,6 +1337,8 @@ PROPSHEETPAGE psp = {0}; PSECURITY_PAGE sPage; SI_OBJECT_INFO ObjectInfo = {0}; + HANDLE SidCacheMgr; + LPCWSTR SystemName = NULL; HRESULT hRet; if (psi == NULL) @@ -1336,10 +1362,26 @@ DPRINT("CreateSecurityPage() failed! Failed to query the object information!\n"); return NULL; } - + + if ((ObjectInfo.dwFlags & SI_SERVER_IS_DC) && + ObjectInfo.pszServerName != NULL && + ObjectInfo.pszServerName[0] != L'\0') + { + SystemName = ObjectInfo.pszServerName; + } + + SidCacheMgr = CreateSidCacheMgr(GetProcessHeap(), + SystemName); + if (SidCacheMgr == NULL) + { + DPRINT("Creating the SID cache failed!\n"); + return NULL; + } + hRet = CoInitialize(NULL); if (FAILED(hRet)) { + DestroySidCacheMgr(SidCacheMgr); DPRINT("CoInitialize failed!\n"); return NULL; } @@ -1349,13 +1391,19 @@ sizeof(SECURITY_PAGE)); if (sPage == NULL) { + DestroySidCacheMgr(SidCacheMgr); + CoUninitialize(); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); DPRINT("Not enough memory to allocate a SECURITY_PAGE!\n"); return NULL; } + sPage->psi = psi; sPage->ObjectInfo = ObjectInfo; + sPage->ServerName = SystemName; + sPage->SidCacheMgr = SidCacheMgr; psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwFlags = PSP_USECALLBACK; _____ Modified: trunk/reactos/lib/aclui/aclui.xml --- trunk/reactos/lib/aclui/aclui.xml 2005-12-25 21:19:33 UTC (rev 20331) +++ trunk/reactos/lib/aclui/aclui.xml 2005-12-25 21:20:13 UTC (rev 20332) @@ -20,6 +20,7 @@ <file>checklist.c</file> <file>guid.c</file> <file>misc.c</file> + <file>sidcache.c</file> <file>aclui.rc</file> <pch>precomp.h</pch> </module> _____ Modified: trunk/reactos/lib/aclui/aclui_En.rc --- trunk/reactos/lib/aclui/aclui_En.rc 2005-12-25 21:19:33 UTC (rev 20331) +++ trunk/reactos/lib/aclui/aclui_En.rc 2005-12-25 21:20:13 UTC (rev 20332) @@ -24,5 +24,7 @@ IDS_SPECIAL_PERMISSIONS "Special Permissions" IDS_PERMISSIONS_FOR "Permissions for %1" IDS_PERMISSIONS "Permissions" + IDS_USERDOMAINFORMAT "%1 (%2\\%3)" + IDS_USERFORMAT "%1" } _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-12-25 21:19:33 UTC (rev 20331) +++ trunk/reactos/lib/aclui/checklist.c 2005-12-25 21:20:13 UTC (rev 20332) @@ -28,6 +28,9 @@ */ #include <precomp.h> +#define NDEBUG +#include <debug.h> + #define CI_TEXT_MARGIN_WIDTH (8) #define CI_TEXT_MARGIN_HEIGHT (3) #define CI_TEXT_SELECTIONMARGIN (1) @@ -1476,10 +1479,7 @@ if (infoPtr == NULL && uMsg != WM_CREATE) { - return DefWindowProc(hwnd, - uMsg, - wParam, - lParam); + goto HandleDefaultMessage; } Ret = 0; @@ -2224,11 +2224,7 @@ default: { - Ret = DefWindowProc(hwnd, - uMsg, - wParam, - lParam); - break; + goto HandleDefaultMessage; } } break; @@ -2568,6 +2564,7 @@ default: { +HandleDefaultMessage: Ret = DefWindowProc(hwnd, uMsg, wParam, _____ Modified: trunk/reactos/lib/aclui/guid.c --- trunk/reactos/lib/aclui/guid.c 2005-12-25 21:19:33 UTC (rev 20331) +++ trunk/reactos/lib/aclui/guid.c 2005-12-25 21:20:13 UTC (rev 20332) @@ -17,6 +17,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + #include <initguid.h> #include <windows.h> #include <aclui.h> _____ Modified: trunk/reactos/lib/aclui/misc.c --- trunk/reactos/lib/aclui/misc.c 2005-12-25 21:19:33 UTC (rev 20331) +++ trunk/reactos/lib/aclui/misc.c 2005-12-25 21:20:13 UTC (rev 20332) @@ -28,6 +28,9 @@ */ #include <precomp.h> +#define NDEBUG +#include <debug.h> + static PCWSTR ObjectPickerAttributes[] = { L"ObjectSid", @@ -127,40 +130,6 @@ return Ret; } -BOOL -OpenLSAPolicyHandle(IN LPWSTR SystemName, - IN ACCESS_MASK DesiredAccess, - OUT PLSA_HANDLE PolicyHandle) -{ - LSA_OBJECT_ATTRIBUTES LsaObjectAttributes = {0}; - LSA_UNICODE_STRING LsaSystemName, *psn; - NTSTATUS Status; - - if (SystemName != NULL) - { - LsaSystemName.Buffer = SystemName; - LsaSystemName.Length = wcslen(SystemName) * sizeof(WCHAR); - LsaSystemName.MaximumLength = LsaSystemName.Length + sizeof(WCHAR); - psn = &LsaSystemName; - } - else - { - psn = NULL; - } - - Status = LsaOpenPolicy(psn, - &LsaObjectAttributes, - DesiredAccess, - PolicyHandle); - if (!NT_SUCCESS(Status)) - { [truncated at 1000 lines; 1107 more skipped]

18 years, 8 months

[ekohl] 20331: Implement QueryServiceStatusEx.

by ekohl＠svn.reactos.com

Implement QueryServiceStatusEx. Modified: trunk/reactos/subsys/system/services/rpcserver.c _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-12-25 18:53:39 UTC (rev 20330) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-12-25 21:19:33 UTC (rev 20331) @@ -2081,8 +2081,55 @@ unsigned long cbBufSize, unsigned long *pcbBytesNeeded) /* out */ { - DPRINT1("ScmrQueryServiceStatusEx() is unimplemented\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + LPSERVICE_STATUS_PROCESS lpStatus; + PSERVICE_HANDLE hSvc; + PSERVICE lpService; + + DPRINT("ScmrQueryServiceStatusEx() called\n"); + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + if (InfoLevel != SC_STATUS_PROCESS_INFO) + return ERROR_INVALID_LEVEL; + + *pcbBytesNeeded = sizeof(SERVICE_STATUS_PROCESS); + + if (cbBufSize < sizeof(SERVICE_STATUS_PROCESS)) + return ERROR_INSUFFICIENT_BUFFER; + + hSvc = (PSERVICE_HANDLE)hService; + if (hSvc->Handle.Tag != SERVICE_TAG) + { + DPRINT1("Invalid handle tag!\n"); + return ERROR_INVALID_HANDLE; + } + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + SERVICE_QUERY_STATUS)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + lpStatus = (LPSERVICE_STATUS_PROCESS)lpBuffer; + + /* Return service status information */ + RtlCopyMemory(lpStatus, + &lpService->Status, + sizeof(SERVICE_STATUS)); + + lpStatus->dwProcessId = lpService->ProcessId; /* FIXME */ + lpStatus->dwServiceFlags = 0; /* FIXME */ + + return ERROR_SUCCESS; }

18 years, 8 months

[greatlrd] 20330: do not BSD in some test apps I have. it did not check if input buffer for the convert string was NULL or not.

by greatlrd＠svn.reactos.com

do not BSD in some test apps I have. it did not check if input buffer for the convert string was NULL or not. Modified: trunk/reactos/lib/crt/stdlib/strtod.c _____ Modified: trunk/reactos/lib/crt/stdlib/strtod.c --- trunk/reactos/lib/crt/stdlib/strtod.c 2005-12-25 15:00:05 UTC (rev 20329) +++ trunk/reactos/lib/crt/stdlib/strtod.c 2005-12-25 18:53:39 UTC (rev 20330) @@ -21,6 +21,10 @@ sign = 1; e = 0; esign = 1; + + if (s == NULL) + return r; + while ((*s == ' ') || (*s == '\t')) s++;

18 years, 8 months

[hpoussin] 20329: Copy driver files only once

by hpoussin＠svn.reactos.com

Copy driver files only once Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-25 14:45:30 UTC (rev 20328) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-25 15:00:05 UTC (rev 20329) @@ -29,6 +29,7 @@ static const WCHAR Class[] = {'C','l','a','s','s',0}; static const WCHAR ClassInstall32[] = {'C','l','a','s','s','I','n','s','t','a','l','l','3','2',0}; static const WCHAR DeviceInstance[] = {'D','e','v','i','c','e','I','n','s','t','a','n','c','e',0}; +static const WCHAR DotCoInstallers[] = {'.','C','o','I','n','s','t','a','l','l','e','r','s',0}; static const WCHAR DotServices[] = {'.','S','e','r','v','i','c','e','s',0}; static const WCHAR InterfaceInstall32[] = {'I','n','t','e','r','f','a','c','e','I','n','s','t','a','l','l','3','2' ,0}; static const WCHAR SymbolicLink[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; @@ -7021,6 +7022,9 @@ struct DriverInfoElement *SelectedDriver; WCHAR SectionName[MAX_PATH]; DWORD SectionNameLength = 0; + PVOID InstallMsgHandler; + PVOID InstallMsgHandlerContext; + PVOID Context = NULL; InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); ret = SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); @@ -7037,21 +7041,49 @@ ret = SetupDiGetActualSectionToInstallW( SelectedDriver->InfFileDetails->hInf, SelectedDriver->Details.SectionName, - SectionName, MAX_PATH, &SectionNameLength, NULL); + SectionName, MAX_PATH - strlenW(DotCoInstallers), &SectionNameLength, NULL); if (!ret) goto done; - if (!InstallParams.InstallMsgHandler) + if (InstallParams.InstallMsgHandler) { - InstallParams.InstallMsgHandler = SetupDefaultQueueCallbackW; - InstallParams.InstallMsgHandlerContext = SetupInitDefaultQueueCallback(InstallParams.hwndParent); - SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); + InstallMsgHandler = InstallParams.InstallMsgHandler; + InstallMsgHandlerContext = InstallParams.InstallMsgHandlerContext; } + else + { + Context = SetupInitDefaultQueueCallback(InstallParams.hwndParent); + if (!Context) + goto cleanup; + InstallMsgHandler = SetupDefaultQueueCallback; + InstallMsgHandlerContext = Context; + } ret = SetupInstallFromInfSectionW(InstallParams.hwndParent, SelectedDriver->InfFileDetails->hInf, SectionName, SPINST_FILES, NULL, NULL, SP_COPY_NEWER, - InstallParams.InstallMsgHandler, InstallParams.InstallMsgHandlerContext, + InstallMsgHandler, InstallMsgHandlerContext, DeviceInfoSet, DeviceInfoData); + if (!ret) + goto done; + + /* Install files from .CoInstallers section */ + lstrcatW(SectionName, DotCoInstallers); + ret = SetupInstallFromInfSectionW(InstallParams.hwndParent, + SelectedDriver->InfFileDetails->hInf, SectionName, + SPINST_FILES, NULL, NULL, SP_COPY_NEWER, + InstallMsgHandler, InstallMsgHandlerContext, + DeviceInfoSet, DeviceInfoData); + if (!ret) + goto done; + + /* Set the DI_NOFILECOPY flag to prevent another + * installation during SetupDiInstallDevice */ + InstallParams.Flags |= DI_NOFILECOPY; + ret = SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); + +cleanup: + if (Context) + SetupTermDefaultQueueCallback(Context); } done: @@ -7090,6 +7122,7 @@ WCHAR SectionName[MAX_PATH]; DWORD SectionNameLength = 0; HKEY hKey = INVALID_HANDLE_VALUE; + PVOID Context = NULL; InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); Result = SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); @@ -7108,9 +7141,9 @@ SelectedDriver->InfFileDetails->hInf, SelectedDriver->Details.SectionName, SectionName, MAX_PATH, &SectionNameLength, NULL); - if (!Result || SectionNameLength > MAX_PATH - wcslen(L".CoInstallers") - 1) + if (!Result || SectionNameLength > MAX_PATH - strlenW(DotCoInstallers) - 1) goto cleanup; - wcscat(SectionName, L".CoInstallers"); + lstrcatW(SectionName, DotCoInstallers); /* Open/Create driver key information */ #if _WIN32_WINNT >= 0x502 @@ -7128,17 +7161,14 @@ if (!(InstallParams.Flags & DI_NOFILECOPY)) { DoAction |= SPINST_FILES; - if (!InstallParams.InstallMsgHandler) - { - InstallParams.InstallMsgHandler = SetupDefaultQueueCallbackW; - InstallParams.InstallMsgHandlerContext = SetupInitDefaultQueueCallback(InstallParams.hwndParent); - SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); - } + Context = SetupInitDefaultQueueCallback(InstallParams.hwndParent); + if (!Context) + goto cleanup; } Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, SelectedDriver->InfFileDetails->hInf, SectionName, DoAction, hKey, NULL, SP_COPY_NEWER, - InstallParams.InstallMsgHandler, InstallParams.InstallMsgHandlerContext, + SetupDefaultQueueCallback, Context, DeviceInfoSet, DeviceInfoData); if (!Result) goto cleanup; @@ -7146,6 +7176,8 @@ ret = TRUE; cleanup: + if (Context) + SetupTermDefaultQueueCallback(Context); if (hKey != INVALID_HANDLE_VALUE) RegCloseKey(hKey); } @@ -7337,6 +7369,34 @@ return TRUE; } + +static UINT WINAPI +NullInstallMsgHandler( + IN PVOID Context, + UINT Notification, + UINT_PTR Param1, + UINT_PTR Param2) +{ + switch (Notification) + { + case SPFILENOTIFY_STARTQUEUE: return TRUE; + case SPFILENOTIFY_ENDQUEUE: return 0; + case SPFILENOTIFY_STARTSUBQUEUE: return TRUE; + case SPFILENOTIFY_ENDSUBQUEUE: return 0; + case SPFILENOTIFY_STARTDELETE: return FILEOP_SKIP; + case SPFILENOTIFY_ENDDELETE: return 0; + case SPFILENOTIFY_STARTRENAME: return FILEOP_SKIP; + case SPFILENOTIFY_ENDRENAME: return 0; + case SPFILENOTIFY_STARTCOPY: return FILEOP_SKIP; + case SPFILENOTIFY_ENDCOPY: return 0; + case SPFILENOTIFY_NEEDMEDIA: return FILEOP_SKIP; + default: + FIXME("Notification %u params %p, %p\n", Notification, Param1, Param2 ); + break; + } + return 0; +} + /*********************************************************************** * SetupDiInstallDevice (SETUPAPI.@) */ @@ -7364,6 +7424,7 @@ BOOL NeedtoCopyFile; LARGE_INTEGER fullVersion; LONG rc; + PVOID Context = NULL; BOOL ret = FALSE; /* Return value */ TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); @@ -7447,29 +7508,18 @@ if (!(InstallParams.Flags & DI_NOFILECOPY)) { DoAction |= SPINST_FILES; - if (!InstallParams.InstallMsgHandler) - { - InstallParams.InstallMsgHandler = SetupDefaultQueueCallbackW; - InstallParams.InstallMsgHandlerContext = SetupInitDefaultQueueCallback(InstallParams.hwndParent); - SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); - } + Context = SetupInitDefaultQueueCallback(InstallParams.hwndParent); + if (!Context) + goto cleanup; } *pSectionName = '\0'; Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, SelectedDriver->InfFileDetails->hInf, SectionName, DoAction, hKey, NULL, SP_COPY_NEWER, - InstallParams.InstallMsgHandler, InstallParams.InstallMsgHandlerContext, + InstallParams.Flags & (DI_NOFILECOPY | DI_NOVCP) ? NullInstallMsgHandler : SetupDefaultQueueCallback, Context, DeviceInfoSet, DeviceInfoData); if (!Result) goto cleanup; - if (!(InstallParams.Flags & DI_NOFILECOPY) && !(InstallParams.Flags & DI_NOVCP)) - { - if (Result && InstallParams.InstallMsgHandler == SetupDefaultQueueCallbackW) - { - /* Delete resources allocated by SetupInitDefaultQueueCallback */ - SetupTermDefaultQueueCallback(InstallParams.InstallMsgHandlerContext); - } - } InstallParams.Flags |= DI_NOFILECOPY; SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); @@ -7561,7 +7611,7 @@ Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, SelectedDriver->InfFileDetails->hInf, SectionName, SPINST_REGISTRY, hKey, NULL, 0, - InstallParams.InstallMsgHandler, InstallParams.InstallMsgHandlerContext, + NULL, NULL, DeviceInfoSet, DeviceInfoData); if (!Result) goto cleanup; @@ -7600,7 +7650,8 @@ if (lpGuidString) RpcStringFreeW(&lpGuidString); HeapFree(GetProcessHeap(), 0, lpFullGuidString); - + if (Context) + SetupTermDefaultQueueCallback(Context); TRACE("Returning %d\n", ret); return ret; }

18 years, 8 months

[ekohl] 20328: - Implement EnumServicesStatusW.

by ekohl＠svn.reactos.com

- Implement EnumServicesStatusW. - Add server stubs for ChangeServiceConfigA, GetServiceDisplayNameA, GetServiceKeyNameA and QueryServiceStatusEx. Modified: trunk/reactos/include/idl/svcctl.idl Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/system/services/rpcserver.c Modified: trunk/reactos/subsys/system/services/services.h _____ Modified: trunk/reactos/include/idl/svcctl.idl --- trunk/reactos/include/idl/svcctl.idl 2005-12-25 10:35:23 UTC (rev 20327) +++ trunk/reactos/include/idl/svcctl.idl 2005-12-25 14:45:30 UTC (rev 20328) @@ -11,10 +11,12 @@ #define SC_HANDLE unsigned int #define SC_LOCK unsigned int #define SERVICE_STATUS_HANDLE unsigned long +#define SC_STATUS_TYPE unsigned long #define LPSTR char* #define LPCSTR char* #define LPWSTR wchar_t* #define LPCWSTR wchar_t* +#define LPBYTE unsigned char* #define LPDWORD unsigned long* [ @@ -90,12 +92,12 @@ [in] BOOL BootAcceptable); /* Function 10 */ - DWORD ScmrI_ScSetServiceBitsW([in] handle_t BindingHandle, - [in] SERVICE_STATUS_HANDLE hServiceStatus, - [in] DWORD dwServiceBits, - [in] BOOL bSetBitsOn, - [in] BOOL bUpdateImmediately, - [in, string, unique] LPWSTR lpString); + DWORD ScmrSetServiceBitsW([in] handle_t BindingHandle, + [in] SERVICE_STATUS_HANDLE hServiceStatus, + [in] DWORD dwServiceBits, + [in] BOOL bSetBitsOn, + [in] BOOL bUpdateImmediately, + [in, string, unique] LPWSTR lpString); /* Function 11 */ DWORD ScmrChangeServiceConfigW([in] handle_t BindingHandle, @@ -136,7 +138,7 @@ DWORD ScmrEnumDependentServicesW([in] handle_t BindingHandle, [in] SC_HANDLE hService, [in] DWORD dwServiceState, - [out, size_is(cbBufSize)] BYTE *lpServices, + [out, size_is(cbBufSize)] LPBYTE lpServices, [in] DWORD cbBufSize, [out] LPDWORD pcbBytesNeeded, [out] LPDWORD lpServicesReturned); @@ -146,7 +148,7 @@ [in] SC_HANDLE hSCManager, [in] DWORD dwServiceType, [in] DWORD dwServiceState, - [out, size_is(dwBufSize)] BYTE *lpServices, + [out, size_is(dwBufSize)] LPBYTE lpServices, [in] DWORD dwBufSize, [out] LPDWORD pcbBytesNeeded, [out] LPDWORD lpServicesReturned, @@ -169,11 +171,23 @@ /* Function 17 */ DWORD ScmrQueryServiceConfigW([in] handle_t BindingHandle, [in] SC_HANDLE hService, - [out, unique, size_is(cbBufSize)] BYTE *lpServiceConfig, + [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, [in] DWORD cbBufSize, - [out] DWORD *pcbBytesNeeded); + [out] LPDWORD pcbBytesNeeded); + /* Function 18 */ + DWORD ScmrQueryServiceLockStatusW([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [out, size_is(cbBufSize), unique] LPBYTE lpLockStatus, + [in] DWORD cbBufSize, + [out] LPDWORD pcbBytesNeeded); + /* Function 19 */ +// DWORD ScmrStartServiceW([in] handle_t BindingHandle, +// [in] SC_HANDLE hService, +// [in] DWORD dwNumServiceArgs, +// [in, string, size_is(dwNumServiceArgs, ), unique] LPWSTR *lpServiceArgVectors); + /* Function 20 */ DWORD ScmrGetServiceDisplayNameW([in] handle_t BindingHandle, [in] SC_HANDLE hSCManager, @@ -188,7 +202,69 @@ [out, size_is(*lpcchBuffer), unique] LPWSTR lpServiceName, [in, out, ref] LPDWORD lpcchBuffer); + /* Function 22 */ + DWORD ScmrSetServiceBitsA([in] handle_t BindingHandle, + [in] SERVICE_STATUS_HANDLE hServiceStatus, + [in] DWORD dwServiceBits, + [in] BOOL bSetBitsOn, + [in] BOOL bUpdateImmediately, + [in, string, unique] LPSTR lpString); + /* Function 23 */ + DWORD ScmrChangeServiceConfigA([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [in] DWORD dwServiceType, + [in] DWORD dwStartType, + [in] DWORD dwErrorControl, + [in, string, unique] LPCSTR lpBinaryPathName, + [in, string, unique] LPCSTR lpLoadOrderGroup, + [in, out, unique] LPDWORD lpdwTagId, + [in, size_is(dwDependenciesLength), unique] LPCSTR lpDependencies, + [in] DWORD dwDependenciesLength, + [in, string, unique] LPCSTR lpServiceStartName, + [in, size_is(dwPasswordLength), unique] LPCSTR lpPassword, + [in] DWORD dwPasswordLength, + [in, string, unique] LPCSTR lpDisplayName); + + /* Function 24 */ + DWORD ScmrCreateServiceA([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [in, string, ref] LPCSTR lpServiceName, + [in, string, unique] LPCSTR lpDisplayName, + [in] DWORD dwDesiredAccess, + [in] DWORD dwServiceType, + [in] DWORD dwStartType, + [in] DWORD dwErrorControl, + [in, string, ref] LPCSTR lpBinaryPathName, + [in, string, unique] LPCSTR lpLoadOrderGroup, + [in, out, unique] LPDWORD lpdwTagId, + [in, size_is(dwDependenciesLength), unique] LPCSTR lpDependencies, + [in] DWORD dwDependenciesLength, + [in, string, unique] LPCSTR lpServiceStartName, + [in, size_is(dwPasswordLength), unique] LPCSTR lpPassword, + [in] DWORD dwPasswordLength, + [out] SC_HANDLE *hService); + + /* Function 25 */ + DWORD ScmrEnumDependentServicesA([in] handle_t BindingHandle, + [in] SC_HANDLE hService, + [in] DWORD dwServiceState, + [out, size_is(cbBufSize)] LPBYTE lpServices, + [in] DWORD cbBufSize, + [out] LPDWORD pcbBytesNeeded, + [out] LPDWORD lpServicesReturned); + + /* Function 26 */ + DWORD ScmrEnumServicesStatusA([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [in] DWORD dwServiceType, + [in] DWORD dwServiceState, + [out, size_is(dwBufSize)] LPBYTE lpServices, + [in] DWORD dwBufSize, + [out] LPDWORD pcbBytesNeeded, + [out] LPDWORD lpServicesReturned, + [in, out, unique] LPDWORD lpResumeHandle); + /* Function 27 */ DWORD ScmrOpenSCManagerA([in] handle_t BindingHandle, [in, string, unique] LPCSTR lpMachineName, @@ -202,4 +278,73 @@ [in, string] LPCSTR lpServiceName, [in] DWORD dwDesiredAccess, [out] SC_HANDLE *hScm); + + /* Function 29 */ + DWORD ScmrQueryServiceConfigA([in] handle_t BindingHandle, + [in] SC_HANDLE hService, + [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, + [in] DWORD cbBufSize, + [out] LPDWORD pcbBytesNeeded); + + /* Function 30 */ +// DWORD ScmrQueryServiceLockStatusA([in] handle_t BindingHandle, +// [in] SC_HANDLE hSCManager, +// [out, size_is(cbBufSize), unique] LPBYTE lpLockStatus, +// [in] DWORD cbBufSize, +// [out] LPDWORD pcbBytesNeeded); + + /* Function 31 */ +// DWORD ScmrStartServiceA([in] handle_t BindingHandle, +// [in] SC_HANDLE hService, +// [in] DWORD dwNumServiceArgs, +// [in, string, size_is(dwNumServiceArgs, ), unique] LPSTR *lpServiceArgVectors); + + /* Function 32 */ + DWORD ScmrGetServiceDisplayNameA([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [in, string, ref] LPCSTR lpServiceName, + [out, size_is(*lpcchBuffer), unique] LPSTR lpDisplayName, + [in, out, ref] LPDWORD lpcchBuffer); + + /* Function 33 */ + DWORD ScmrGetServiceKeyNameA([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [in, string, ref] LPCSTR lpDisplayName, + [out, size_is(*lpcchBuffer), unique] LPSTR lpServiceName, + [in, out, ref] LPDWORD lpcchBuffer); + + /* Function 35 */ + /* ScmrGetCurrentGroupStateW */ + + /* Function 35 */ + /* ScmrEnumServiceGroupW */ + + /* Function 36 */ + /* ScmrChangeServiceConfig2A */ + + /* Function 37 */ + /* ScmrChangeServiceConfig2W */ + + /* Function 38 */ + /* ScmrQueryServiceConfig2A */ + + /* Function 39 */ + /* ScmrQueryServiceConfig2W */ + + /* Function 40 */ + DWORD ScmrQueryServiceStatusEx([in] handle_t BindingHandle, + [in] SC_HANDLE hService, + [in] SC_STATUS_TYPE InfoLevel, + [out, size_is(cbBufSize)] LPBYTE lpBuffer, + [in] DWORD cbBufSize, + [out] LPDWORD pcbBytesNeeded); + + /* Function 41 */ + /* ScmrEnumServicesStatusExA */ + + /* Function 42 */ + /* ScmrEnumServicesStatusExW */ + + /* Function 43 */ + /* ScmrSendTSMessage */ } _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-12-25 10:35:23 UTC (rev 20327) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-12-25 14:45:30 UTC (rev 20328) @@ -80,26 +80,68 @@ /********************************************************************** * ChangeServiceConfigA * - * @unimplemented + * @implemented */ -BOOL -STDCALL -ChangeServiceConfigA( - SC_HANDLE hService, - DWORD dwServiceType, - DWORD dwStartType, - DWORD dwErrorControl, - LPCSTR lpBinaryPathName, - LPCSTR lpLoadOrderGroup, - LPDWORD lpdwTagId, - LPCSTR lpDependencies, - LPCSTR lpServiceStartName, - LPCSTR lpPassword, - LPCSTR lpDisplayName) +BOOL STDCALL +ChangeServiceConfigA(SC_HANDLE hService, + DWORD dwServiceType, + DWORD dwStartType, + DWORD dwErrorControl, + LPCSTR lpBinaryPathName, + LPCSTR lpLoadOrderGroup, + LPDWORD lpdwTagId, + LPCSTR lpDependencies, + LPCSTR lpServiceStartName, + LPCSTR lpPassword, + LPCSTR lpDisplayName) { - DPRINT1("ChangeServiceConfigA is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD dwError; + DWORD dwDependenciesLength = 0; + DWORD dwLength; + LPSTR lpStr; + + DPRINT("ChangeServiceConfigA() called\n"); + + /* Calculate the Dependencies length*/ + if (lpDependencies != NULL) + { + lpStr = (LPSTR)lpDependencies; + while (*lpStr) + { + dwLength = strlen(lpStr) + 1; + dwDependenciesLength += dwLength; + lpStr = lpStr + dwLength; + } + dwDependenciesLength++; + } + + /* FIXME: Encrypt the password */ + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrChangeServiceConfigA(BindingHandle, + (unsigned int)hService, + dwServiceType, + dwStartType, + dwErrorControl, + (LPSTR)lpBinaryPathName, + (LPSTR)lpLoadOrderGroup, + lpdwTagId, + (LPSTR)lpDependencies, + dwDependenciesLength, + (LPSTR)lpServiceStartName, + NULL, /* FIXME: lpPassword */ + 0, /* FIXME: dwPasswordLength */ + (LPSTR)lpDisplayName); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrChangeServiceConfigA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + return TRUE; } @@ -540,15 +582,15 @@ BOOL STDCALL EnumServiceGroupW( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6, - DWORD Unknown7, - DWORD Unknown8) + SC_HANDLE hSCManager, + DWORD dwServiceType, + DWORD dwServiceState, + LPENUM_SERVICE_STATUSA lpServices, + DWORD cbBufSize, + LPDWORD pcbBytesNeeded, + LPDWORD lpServicesReturned, + LPDWORD lpResumeHandle, + LPCWSTR lpGroup) { DPRINT1("EnumServiceGroupW is unimplemented\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -582,10 +624,9 @@ /********************************************************************** * EnumServicesStatusW * - * @unimplemented + * @implemented */ -BOOL -STDCALL +BOOL STDCALL EnumServicesStatusW(SC_HANDLE hSCManager, DWORD dwServiceType, DWORD dwServiceState, @@ -595,10 +636,11 @@ LPDWORD lpServicesReturned, LPDWORD lpResumeHandle) { -#if 0 + LPENUM_SERVICE_STATUSW lpStatusPtr; DWORD dwError = ERROR_SUCCESS; + DWORD dwCount; - DPRINT1("EnumServicesStatusW() called\n"); + DPRINT("EnumServicesStatusW() called\n"); HandleBind(); @@ -611,23 +653,31 @@ pcbBytesNeeded, lpServicesReturned, lpResumeHandle); + + lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpServices; + for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) + { + if (lpStatusPtr->lpServiceName) + lpStatusPtr->lpServiceName = + (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); + + if (lpStatusPtr->lpDisplayName) + lpStatusPtr->lpDisplayName = + (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); + + lpStatusPtr++; + } + if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrEnumServicesStatusW() failed (Error %lu)\n", dwError); + DPRINT("ScmrEnumServicesStatusW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } + DPRINT("ScmrEnumServicesStatusW() done\n"); - - DPRINT1("ScmrEnumServicesStatusW() done\n"); - return TRUE; -#endif - - DPRINT1("EnumServicesStatusW is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; } @@ -682,19 +732,35 @@ /********************************************************************** * GetServiceDisplayNameA * - * @unimplemented + * @implemented */ -BOOL -STDCALL -GetServiceDisplayNameA( - SC_HANDLE hSCManager, - LPCSTR lpServiceName, - LPSTR lpDisplayName, - LPDWORD lpcchBuffer) +BOOL STDCALL +GetServiceDisplayNameA(SC_HANDLE hSCManager, + LPCSTR lpServiceName, + LPSTR lpDisplayName, + LPDWORD lpcchBuffer) { - DPRINT1("GetServiceDisplayNameA is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD dwError; + + DPRINT("GetServiceDisplayNameA() called\n"); + + HandleBind(); + + dwError = ScmrGetServiceDisplayNameA(BindingHandle, + (unsigned int)hSCManager, + (LPSTR)lpServiceName, + lpDisplayName, + lpcchBuffer); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrGetServiceDisplayNameA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + (*lpcchBuffer)--; + + return TRUE; } @@ -736,19 +802,35 @@ /********************************************************************** * GetServiceKeyNameA * - * @unimplemented + * @implemented */ -BOOL -STDCALL -GetServiceKeyNameA( - SC_HANDLE hSCManager, - LPCSTR lpDisplayName, - LPSTR lpServiceName, - LPDWORD lpcchBuffer) +BOOL STDCALL +GetServiceKeyNameA(SC_HANDLE hSCManager, + LPCSTR lpDisplayName, + LPSTR lpServiceName, + LPDWORD lpcchBuffer) { - DPRINT1("GetServiceKeyNameA is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD dwError; + + DPRINT("GetServiceKeyNameA() called\n"); + + HandleBind(); + + dwError = ScmrGetServiceKeyNameA(BindingHandle, + (unsigned int)hSCManager, + (LPSTR)lpDisplayName, + lpServiceName, + lpcchBuffer); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrGetServiceKeyNameA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + (*lpcchBuffer)--; + + return TRUE; } @@ -1014,19 +1096,63 @@ /********************************************************************** * QueryServiceConfigA * - * @unimplemented + * @implemented */ -BOOL -STDCALL -QueryServiceConfigA( - SC_HANDLE hService, - LPQUERY_SERVICE_CONFIGA lpServiceConfig, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded) +BOOL STDCALL +QueryServiceConfigA(SC_HANDLE hService, + LPQUERY_SERVICE_CONFIGA lpServiceConfig, + DWORD cbBufSize, + LPDWORD pcbBytesNeeded) { - DPRINT1("QueryServiceConfigA is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD dwError; + + DPRINT("QueryServiceConfigA(%p, %p, %lu, %p)\n", + hService, lpServiceConfig, cbBufSize, pcbBytesNeeded); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrQueryServiceConfigA(BindingHandle, + (unsigned int)hService, + (unsigned char *)lpServiceConfig, + cbBufSize, + pcbBytesNeeded); + if (dwError != ERROR_SUCCESS) + { + DPRINT("ScmrQueryServiceConfigA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + /* Adjust the pointers */ + if (lpServiceConfig->lpBinaryPathName) + lpServiceConfig->lpBinaryPathName = + (LPSTR)((ULONG_PTR)lpServiceConfig + + (ULONG_PTR)lpServiceConfig->lpBinaryPathName); + + if (lpServiceConfig->lpLoadOrderGroup) + lpServiceConfig->lpLoadOrderGroup = + (LPSTR)((ULONG_PTR)lpServiceConfig + + (ULONG_PTR)lpServiceConfig->lpLoadOrderGroup); + + if (lpServiceConfig->lpDependencies) + lpServiceConfig->lpDependencies = + (LPSTR)((ULONG_PTR)lpServiceConfig + + (ULONG_PTR)lpServiceConfig->lpDependencies); + + if (lpServiceConfig->lpServiceStartName) + lpServiceConfig->lpServiceStartName = + (LPSTR)((ULONG_PTR)lpServiceConfig + + (ULONG_PTR)lpServiceConfig->lpServiceStartName); + + if (lpServiceConfig->lpDisplayName) + lpServiceConfig->lpDisplayName = + (LPSTR)((ULONG_PTR)lpServiceConfig + + (ULONG_PTR)lpServiceConfig->lpDisplayName); + + DPRINT("QueryServiceConfigA() done\n"); + + return TRUE; } @@ -1240,19 +1366,36 @@ /********************************************************************** * QueryServiceStatusEx * - * @unimplemented + * @implemented */ -BOOL -STDCALL -QueryServiceStatusEx(SC_HANDLE hService, - SC_STATUS_TYPE InfoLevel, - LPBYTE lpBuffer, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded) +BOOL STDCALL +QueryServiceStatusEx(SC_HANDLE hService, + SC_STATUS_TYPE InfoLevel, + LPBYTE lpBuffer, + DWORD cbBufSize, + LPDWORD pcbBytesNeeded) { - DPRINT1("QueryServiceStatusEx is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD dwError; + + DPRINT("QueryServiceStatusEx() called\n"); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrQueryServiceStatusEx(BindingHandle, + (unsigned int)hService, + InfoLevel, + lpBuffer, + cbBufSize, + pcbBytesNeeded); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrQueryServiceStatusEx() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + return TRUE; } @@ -1350,6 +1493,26 @@ DWORD dwNumServiceArgs, LPCWSTR *lpServiceArgVectors) { +#if 0 + DWORD dwError; + + DPRINT("StartServiceW()\n", ScLock); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrStartServiceW(BindingHandle, + dwNumServiceArgs, + lpServiceArgVectors); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrStartServiceW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + return TRUE; +#endif DPRINT1("StartServiceW is unimplemented, but returns success...\n"); //SetLastError(ERROR_CALL_NOT_IMPLEMENTED); //return FALSE; _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-12-25 10:35:23 UTC (rev 20327) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-12-25 14:45:30 UTC (rev 20328) @@ -444,6 +444,8 @@ SC_MANAGER_LOCK)) return ERROR_ACCESS_DENIED; +// return ScmLockDatabase(0, hMgr->0xC, hLock); + /* FIXME: Lock the database */ *hLock = 0x12345678; /* Dummy! */ @@ -460,6 +462,7 @@ unsigned long dwSecuityDescriptorSize, unsigned long *pcbBytesNeeded) { +#if 0 PSERVICE_HANDLE hSvc; PSERVICE lpService; ULONG DesiredAccess = 0; @@ -467,7 +470,7 @@ DWORD dwBytesNeeded; DWORD dwError; - DPRINT("ScmrQueryServiceSecurity() called\n"); + DPRINT("ScmrQueryServiceObjectSecurity() called\n"); hSvc = (PSERVICE_HANDLE)hService; if (hSvc->Handle.Tag != SERVICE_TAG) @@ -528,6 +531,9 @@ } return dwError; +#endif + DPRINT1("ScmrQueryServiceObjectSecurity() is unimplemented\n"); + return ERROR_CALL_NOT_IMPLEMENTED; } @@ -539,7 +545,114 @@ unsigned char *lpSecurityDescriptor, unsigned long dwSecuityDescriptorSize) { - DPRINT1("ScmrSetServiceSecurity() is unimplemented\n"); +#if 0 + PSERVICE_HANDLE hSvc; + PSERVICE lpService; + ULONG DesiredAccess = 0; + HANDLE hToken = NULL; + HKEY hServiceKey; + NTSTATUS Status; + DWORD dwError; + + DPRINT1("ScmrSetServiceObjectSecurity() called\n"); + + hSvc = (PSERVICE_HANDLE)hService; + if (hSvc->Handle.Tag != SERVICE_TAG) + { + DPRINT1("Invalid handle tag!\n"); + return ERROR_INVALID_HANDLE; + } + + if (dwSecurityInformation == 0 || + dwSecurityInformation & ~0xF) + return 0x57; + + if (!RtlValidSecurityDescriptor((PSECURITY_DESCRIPTOR)lpSecurityDescriptor) ) + return 0x57; + + if (dwSecurityInformation & SACL_SECURITY_INFORMATION) + DesiredAccess |= ACCESS_SYSTEM_SECURITY; + + if (dwSecurityInformation & DACL_SECURITY_INFORMATION) + DesiredAccess |= 0x40000; + + if (dwSecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) + DesiredAccess |= 0x80000; + + if ((dwSecurityInformation & OWNER_SECURITY_INFORMATION) && + (((PSECURITY_DESCRIPTOR)lpSecurityDescriptor)->Owner == NULL)) + return 0x57; + + if ((dwSecurityInformation & GROUP_SECURITY_INFORMATION) && + (((PSECURITY_DESCRIPTOR)lpSecurityDescriptor)->Group == NULL)) + return 0x57; + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + DesiredAccess)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + if (lpService->bDeleted) + return 0x430; + +// RpcImpersonateClient(NULL); + + Status = NtOpenThreadToken(NtCurrentThread(), + 8, + 1, + &hToken); + if (!NT_SUCCESS(Status)) + return RtlNtStatusToDosError(Status); + +// RpcRevertToSelf(); + + /* FIXME: Lock service database */ + + Status = RtlSetSecurityObject(dwSecurityInformation, + (PSECURITY_DESCRIPTOR)lpSecurityDescriptor, + &lpService->lpSecurityDescriptor, + &ScmServiceMapping, + hToken); + if (!NT_SUCCESS(Status)) + { + dwError = RtlNtStatusToDosError(Status); + goto Done; + } + + dwError = ScmOpenServiceKey(lpService->lpServiceName, + 0x20006, + &hServiceKey); + if (dwError != ERROR_SUCCESS) + goto Done; + +// dwError = ScmWriteSecurityDescriptor(hServiceKey, +// lpService->lpSecurityDescriptor); + + RegFlushKey(hServiceKey); + RegCloseKey(hServiceKey); + +Done:; + + if (hToken != NULL) + NtClose(hToken); + + /* FIXME: Unlock service database */ + + DPRINT1("ScmrSetServiceObjectSecurity() done (Error %lu)\n", dwError); + + return dwError; +#endif + + DPRINT1("ScmrSetServiceObjectSecurity() is unimplemented\n"); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -617,22 +730,22 @@ { DPRINT1("ScmrNotifyBootConfigStatus() called\n"); /* FIXME */ - return ERROR_SUCCESS; + return ERROR_CALL_NOT_IMPLEMENTED; } /* Function 10 */ unsigned long -ScmrI_ScSetServiceBitsW(handle_t BindingHandle, - unsigned long hServiceStatus, - unsigned long dwServiceBits, - unsigned long bSetBitsOn, - unsigned long bUpdateImmediately, - wchar_t *lpString) +ScmrSetServiceBitsW(handle_t BindingHandle, + unsigned long hServiceStatus, + unsigned long dwServiceBits, + unsigned long bSetBitsOn, + unsigned long bUpdateImmediately, + wchar_t *lpString) { - DPRINT1("ScmrI_ScSetServiceBitsW() called\n"); + DPRINT1("ScmrSetServiceBitsW() called\n"); /* FIXME */ - return ERROR_SUCCESS; + return ERROR_CALL_NOT_IMPLEMENTED; } @@ -1161,8 +1274,17 @@ PMANAGER_HANDLE hManager; PSERVICE lpService; DWORD dwError = ERROR_SUCCESS; + PLIST_ENTRY ServiceEntry; + PSERVICE CurrentService; + DWORD dwState; + DWORD dwRequiredSize; + DWORD dwServiceCount; + DWORD dwSize; + DWORD dwLastResumeCount; + LPENUM_SERVICE_STATUSW lpStatusPtr; + LPWSTR lpStringPtr; - DPRINT1("ScmrEnumServicesStatusW() called\n"); + DPRINT("ScmrEnumServicesStatusW() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -1186,28 +1308,152 @@ *pcbBytesNeeded = 0; *lpServicesReturned = 0; + dwLastResumeCount = *lpResumeHandle; + /* Lock the service list shared */ - lpService = ScmGetServiceEntryByResumeCount(*lpResumeHandle); + lpService = ScmGetServiceEntryByResumeCount(dwLastResumeCount); if (lpService == NULL) { - dwError = ERROR_MORE_DATA; /* Hack! */ - goto done; + dwError = ERROR_SUCCESS; + goto Done; } - DPRINT1("Service name: %S\n", lpService->lpServiceName); + dwRequiredSize = 0; + dwServiceCount = 0; -// DPRINT1("Display name: %S\n", lpService->lpDisplayName); + for (ServiceEntry = &lpService->ServiceListEntry; + ServiceEntry != &ServiceListHead; + ServiceEntry = ServiceEntry->Flink) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) + continue; - *lpResumeHandle = lpService->dwResumeCount; + dwState = SERVICE_ACTIVE; + if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwState = SERVICE_INACTIVE; -done:; + if ((dwState & dwServiceState) == 0) + continue; + + dwSize = sizeof(ENUM_SERVICE_STATUSW) + + ((wcslen(CurrentService->lpServiceName) + 1) * sizeof(WCHAR)) + + ((wcslen(CurrentService->lpDisplayName) + 1) * sizeof(WCHAR)); + + if (dwRequiredSize + dwSize <= dwBufSize) + { + DPRINT("Service name: %S fit\n", CurrentService->lpServiceName); + dwRequiredSize += dwSize; + dwServiceCount++; + dwLastResumeCount = CurrentService->dwResumeCount; + } + else + { + DPRINT("Service name: %S no fit\n", CurrentService->lpServiceName); + break; + } + + } + + DPRINT("dwRequiredSize: %lu\n", dwRequiredSize); + DPRINT("dwServiceCount: %lu\n", dwServiceCount); + + for (; + ServiceEntry != &ServiceListHead; + ServiceEntry = ServiceEntry->Flink) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + + if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) + continue; + + dwState = SERVICE_ACTIVE; + if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwState = SERVICE_INACTIVE; + + if ((dwState & dwServiceState) == 0) + continue; + + dwRequiredSize += (sizeof(ENUM_SERVICE_STATUSW) + + ((wcslen(CurrentService->lpServiceName) + 1) * sizeof(WCHAR)) + + ((wcslen(CurrentService->lpDisplayName) + 1) * sizeof(WCHAR))); + + dwError = ERROR_MORE_DATA; + } + + DPRINT("*pcbBytesNeeded: %lu\n", dwRequiredSize); + + *lpResumeHandle = dwLastResumeCount; + *lpServicesReturned = dwServiceCount; + *pcbBytesNeeded = dwRequiredSize; + + lpStatusPtr = (LPENUM_SERVICE_STATUS)lpServices; + lpStringPtr = (LPWSTR)((ULONG_PTR)lpServices + + dwServiceCount * sizeof(ENUM_SERVICE_STATUS)); + + dwRequiredSize = 0; + for (ServiceEntry = &lpService->ServiceListEntry; + ServiceEntry != &ServiceListHead; + ServiceEntry = ServiceEntry->Flink) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + + if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) + continue; + + dwState = SERVICE_ACTIVE; + if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwState = SERVICE_INACTIVE; + + if ((dwState & dwServiceState) == 0) + continue; + + dwSize = sizeof(ENUM_SERVICE_STATUSW) + + ((wcslen(CurrentService->lpServiceName) + 1) * sizeof(WCHAR)) + + ((wcslen(CurrentService->lpDisplayName) + 1) * sizeof(WCHAR)); + + if (dwRequiredSize + dwSize <= dwBufSize) + { + /* Copy the service name */ + wcscpy(lpStringPtr, + CurrentService->lpServiceName); + lpStatusPtr->lpServiceName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpServices); + lpStringPtr += (wcslen(CurrentService->lpServiceName) + 1); + + /* Copy the display name */ + wcscpy(lpStringPtr, + CurrentService->lpDisplayName); + lpStatusPtr->lpDisplayName = (LPWSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpServices); + lpStringPtr += (wcslen(CurrentService->lpDisplayName) + 1); + + /* Copy the status information */ + memcpy(&lpStatusPtr->ServiceStatus, + &CurrentService->Status, + sizeof(SERVICE_STATUS)); [truncated at 1000 lines; 283 more skipped]

18 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
...
71
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 December 2005