Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[jimtabor] 20286: Fix compiling. Thanks to filip.

by jimtabor＠svn.reactos.com

Fix compiling. Thanks to filip. Modified: trunk/reactos/lib/rtl/sd.c _____ Modified: trunk/reactos/lib/rtl/sd.c --- trunk/reactos/lib/rtl/sd.c 2005-12-21 15:38:51 UTC (rev 20285) +++ trunk/reactos/lib/rtl/sd.c 2005-12-21 18:03:28 UTC (rev 20286) @@ -425,8 +425,8 @@ * @implemented */ NTSTATUS NTAPI -RtlMakeSelfRelativeSD(PISECURITY_DESCRIPTOR AbsSD, - PISECURITY_DESCRIPTOR_RELATIVE RelSD, +RtlMakeSelfRelativeSD(PSECURITY_DESCRIPTOR _AbsSD, + PSECURITY_DESCRIPTOR _RelSD, PULONG BufferLength) { PSID Owner; @@ -439,7 +439,9 @@ ULONG DaclLength; ULONG TotalLength; ULONG_PTR Current; - + PISECURITY_DESCRIPTOR AbsSD = (PISECURITY_DESCRIPTOR)_AbsSD; + PISECURITY_DESCRIPTOR_RELATIVE RelSD = (PISECURITY_DESCRIPTOR_RELATIVE)_RelSD; + PAGED_CODE_RTL(); RtlpQuerySecurityDescriptor(AbsSD, @@ -522,7 +524,7 @@ return STATUS_BAD_DESCRIPTOR_FORMAT; } - return RtlMakeSelfRelativeSD(AbsSD, (PISECURITY_DESCRIPTOR_RELATIVE)RelSD, BufferLength); + return RtlMakeSelfRelativeSD(AbsSD, (PSECURITY_DESCRIPTOR)RelSD, BufferLength); }

18 years, 9 months

[mbosma] 20285: Add a link to the new faq entry in the "You are already logged in" error message. (Untested)

by mbosma＠svn.reactos.com

Add a link to the new faq entry in the "You are already logged in" error message. (Untested) Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_login.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_login.php --- trunk/web/reactos.org/htdocs/roscms/inc/user_login.php 2005-12-21 14:43:02 UTC (rev 20284) +++ trunk/web/reactos.org/htdocs/roscms/inc/user_login.php 2005-12-21 15:38:51 UTC (rev 20285) @@ -338,7 +338,8 @@ if ($roscms_currentuser_login_user_lastsession_counter > 0) { create_login_page("Your account settings only allow you to login once. \n" . - "You are already logged in so you cannot login again"); + "You are already logged in so you cannot login again. \n". + "For more informations please have a look at the <a href=\"http://www.reactos.org/xhtml/de/about_userfaq.html#multilogin\">F AQ</a>"); exit; } }

18 years, 9 months

[hpoussin] 20284: Partly implement SetupDiInstallDeviceInterfaces

by hpoussin＠svn.reactos.com

Partly implement SetupDiInstallDeviceInterfaces Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/install.c Modified: trunk/reactos/lib/setupapi/setupapi_private.h _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-21 12:28:55 UTC (rev 20283) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-21 14:43:02 UTC (rev 20284) @@ -7154,6 +7154,24 @@ return ret; } +static BOOL +InstallOneInterface( + IN LPGUID InterfaceGuid, + IN LPCWSTR ReferenceString, + IN LPCWSTR InterfaceSection, + IN UINT InterfaceFlags) +{ + if (InterfaceFlags != 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + FIXME("Need to AddInterface(%s %s %s %u)\n", debugstr_guid(InterfaceGuid), + debugstr_w(ReferenceString), debugstr_w(InterfaceSection), InterfaceFlags); + return TRUE; +} + /*********************************************************************** * SetupDiInstallDeviceInterfaces (SETUPAPI.@) */ @@ -7162,12 +7180,122 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData) { + struct DeviceInfoSet *list = NULL; + BOOL ret = FALSE; + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); - FIXME("SetupDiInstallDeviceInterfaces not implemented. Doing nothing\n"); - //SetLastError(ERROR_GEN_FAILURE); - //return FALSE; - return TRUE; + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (!DeviceInfoData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + struct DriverInfoElement *SelectedDriver; + SP_DEVINSTALL_PARAMS_W InstallParams; + WCHAR SectionName[MAX_PATH]; + DWORD SectionNameLength = 0; + INFCONTEXT ContextInterface; + LPWSTR InterfaceGuidString = NULL; + LPWSTR ReferenceString = NULL; + LPWSTR InterfaceSection = NULL; + UINT InterfaceFlags; + GUID InterfaceGuid; + BOOL Result; + + InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + Result = SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); + if (!Result) + goto cleanup; + + SelectedDriver = (struct DriverInfoElement *)InstallParams.Reserved; + if (SelectedDriver == NULL) + { + SetLastError(ERROR_NO_DRIVER_SELECTED); + ret = FALSE; + goto cleanup; + } + + /* Get .Interfaces section name */ + Result = SetupDiGetActualSectionToInstallW( + SelectedDriver->InfFileDetails->hInf, + SelectedDriver->Details.SectionName, + SectionName, MAX_PATH, &SectionNameLength, NULL); + if (!Result || SectionNameLength > MAX_PATH - wcslen(L".Interfaces") - 1) + goto cleanup; + wcscat(SectionName, L".Interfaces"); + + ret = TRUE; + Result = SetupFindFirstLineW( + SelectedDriver->InfFileDetails->hInf, + SectionName, + L"AddInterface", + &ContextInterface); + while (ret && Result) + { + ret = GetStringField(&ContextInterface, 1, &InterfaceGuidString); + if (!ret) + goto cleanup; + else if (strlenW(InterfaceGuidString) != MAX_GUID_STRING_LEN - 1) + { + SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + goto cleanup; + } + + InterfaceGuidString[MAX_GUID_STRING_LEN - 2] = '\0'; /* Replace the } by a NULL character */ + if (UuidFromStringW(&InterfaceGuidString[1], &InterfaceGuid) != RPC_S_OK) + { + /* Bad GUID, skip the entry */ + SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + goto cleanup; + } + + ret = GetStringField(&ContextInterface, 2, &ReferenceString); + if (!ret) + goto cleanup; + + ret = GetStringField(&ContextInterface, 3, &InterfaceSection); + if (!ret) + goto cleanup; + + ret = SetupGetIntField( + &ContextInterface, + 4, /* Field index */ + &InterfaceFlags); + if (!ret) + { + if (GetLastError() == ERROR_INVALID_PARAMETER) + { + /* The field may be empty. Ignore the error */ + InterfaceFlags = 0; + ret = TRUE; + } + else + goto cleanup; + } + + /* Install Interface */ + ret = InstallOneInterface(&InterfaceGuid, ReferenceString, InterfaceSection, InterfaceFlags); + +cleanup: + MyFree(InterfaceGuidString); + MyFree(ReferenceString); + MyFree(InterfaceSection); + InterfaceGuidString = ReferenceString = InterfaceSection = NULL; + Result = SetupFindNextMatchLineW(&ContextInterface, L"AddInterface", &ContextInterface); + } + } + + TRACE("Returning %d\n", ret); + return ret; } BOOL _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-12-21 12:28:55 UTC (rev 20283) +++ trunk/reactos/lib/setupapi/install.c 2005-12-21 14:43:02 UTC (rev 20284) @@ -1109,7 +1109,7 @@ } -static BOOL GetStringField( PINFCONTEXT context, DWORD index, PWSTR *value) +BOOL GetStringField( PINFCONTEXT context, DWORD index, PWSTR *value) { DWORD RequiredSize; BOOL ret; _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-12-21 12:28:55 UTC (rev 20283) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-12-21 14:43:02 UTC (rev 20284) @@ -216,4 +216,6 @@ DWORD WINAPI CaptureAndConvertAnsiArg(LPCSTR pSrc, LPWSTR *pDst); +BOOL GetStringField( PINFCONTEXT context, DWORD index, PWSTR *value); + #endif /* __SETUPAPI_PRIVATE_H */

18 years, 9 months

[hpoussin] 20283: - Fix horribly broken implementation of SetupInstallServicesFromInfSectionExW, which should install a whole Services section and not a particular service.

by hpoussin＠svn.reactos.com

- Fix horribly broken implementation of SetupInstallServicesFromInfSectionExW, which should install a whole Services section and not a particular service. - Simplify handling of Include and Needs directives 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-20 23:54:21 UTC (rev 20282) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-21 12:28:55 UTC (rev 20283) @@ -3174,182 +3174,6 @@ } -static BOOL -InstallServicesSection( - IN HINF hInf, - IN PCWSTR SectionName, - IN HDEVINFO DeviceInfoSet OPTIONAL, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, - OUT PCWSTR* pAssociatedService OPTIONAL, - OUT PBOOL pRebootRequired OPTIONAL) -{ - INFCONTEXT ContextService; - INFCONTEXT ContextInclude; - DWORD RequiredSize; - INT Flags; - BOOL ret = FALSE; - - /* Parse 'Include' line */ - if (SetupFindFirstLineW(hInf, SectionName, L"Include", &ContextInclude)) - { - DWORD Index = 1; - while (TRUE) - { - static WCHAR szBuffer[MAX_PATH]; - PWSTR pBuffer = NULL; - DWORD required; - - ret = SetupGetStringFieldW(&ContextInclude, Index, szBuffer, MAX_PATH, &required); - if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) - break; - else if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - pBuffer = MyMalloc(required); - ret = SetupGetStringFieldW(&ContextInclude, Index, pBuffer, required, &required); - } - if (ret) - ret = SetupOpenAppendInfFileW(pBuffer ? pBuffer : szBuffer, hInf, NULL); - - MyFree(pBuffer); - if (!ret) - goto done; - Index++; - } - } - - /* Parse 'Needs' line */ - if (SetupFindFirstLineW(hInf, SectionName, L"Needs", &ContextInclude)) - { - DWORD Index = 1; - while (TRUE) - { - static WCHAR szBuffer[MAX_PATH]; - PWSTR pBuffer = NULL; - DWORD required; - - ret = SetupGetStringFieldW(&ContextInclude, Index, szBuffer, MAX_PATH, &required); - if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) - break; - else if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - pBuffer = MyMalloc(required); - ret = SetupGetStringFieldW(&ContextInclude, Index, pBuffer, required, &required); - } - if (ret) - { - ret = InstallServicesSection(hInf, pBuffer ? pBuffer : szBuffer, - DeviceInfoSet, DeviceInfoData, pAssociatedService, pRebootRequired); - } - - MyFree(pBuffer); - if (!ret) - goto done; - Index++; - } - } - - ret = SetupFindFirstLineW(hInf, SectionName, NULL, &ContextService); - while (ret) - { - LPWSTR ServiceName = NULL; - LPWSTR ServiceSection = NULL; - - ret = SetupGetStringFieldW( - &ContextService, - 1, /* Field index */ - NULL, 0, - &RequiredSize); - if (!ret) - goto nextservice; - if (RequiredSize > 0) - { - /* We got the needed size for the buffer */ - ServiceName = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); - if (!ServiceName) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto nextservice; - } - ret = SetupGetStringFieldW( - &ContextService, - 1, /* Field index */ - ServiceName, RequiredSize, - &RequiredSize); - if (!ret) - goto nextservice; - } - ret = SetupGetIntField( - &ContextService, - 2, /* Field index */ - &Flags); - if (!ret) - { - /* The field may be empty. Ignore the error */ - Flags = 0; - } - ret = SetupGetStringFieldW( - &ContextService, - 3, /* Field index */ - NULL, 0, - &RequiredSize); - if (!ret) - { - if (GetLastError() == ERROR_INVALID_PARAMETER) - { - /* This first is probably missing. It is not - * required, so ignore the error */ - RequiredSize = 0; - ret = TRUE; - } - else - goto nextservice; - } - if (RequiredSize > 0) - { - /* We got the needed size for the buffer */ - ServiceSection = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); - if (!ServiceSection) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto nextservice; - } - ret = SetupGetStringFieldW( - &ContextService, - 3, /* Field index */ - ServiceSection, RequiredSize, - &RequiredSize); - if (!ret) - goto nextservice; - - SetLastError(ERROR_SUCCESS); - ret = SetupInstallServicesFromInfSectionExW( - hInf, - ServiceSection, Flags, DeviceInfoSet, DeviceInfoData, ServiceName, NULL); - } - if (ret && (Flags & SPSVCINST_ASSOCSERVICE)) - { - if (pAssociatedService) - { - *pAssociatedService = ServiceName; - ServiceName = NULL; - } - if (pRebootRequired && GetLastError() == ERROR_SUCCESS_REBOOT_REQUIRED) - *pRebootRequired = TRUE; - } -nextservice: - HeapFree(GetProcessHeap(), 0, ServiceName); - HeapFree(GetProcessHeap(), 0, ServiceSection); - if (!ret) - goto done; - ret = SetupFindNextLine(&ContextService, &ContextService); - } - - ret = TRUE; - -done: - return ret; -} - /*********************************************************************** * SetupDiInstallClassExW (SETUPAPI.@) */ @@ -3451,7 +3275,7 @@ /* Install .Services section */ lstrcatW(SectionName, DotServices); - ret = InstallServicesSection(hInf, SectionName, NULL, NULL, NULL, NULL); + ret = SetupInstallServicesFromInfSectionW(hInf, SectionName, 0); if (!ret) goto cleanup; @@ -5585,8 +5409,6 @@ SetLastError(ERROR_INVALID_HANDLE); else if (DriverType != SPDIT_CLASSDRIVER && DriverType != SPDIT_COMPATDRIVER) SetLastError(ERROR_INVALID_PARAMETER); - else if (DriverType == SPDIT_CLASSDRIVER && DeviceInfoData) - SetLastError(ERROR_INVALID_PARAMETER); else if (DriverType == SPDIT_COMPATDRIVER && !DeviceInfoData) SetLastError(ERROR_INVALID_PARAMETER); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) @@ -7404,7 +7226,6 @@ BOOL Result = FALSE; ULONG DoAction; DWORD RequiredSize; - LPCWSTR AssociatedService = NULL; LPWSTR pSectionName = NULL; WCHAR ClassName[MAX_CLASS_NAME_LEN]; GUID ClassGuid; @@ -7569,15 +7390,18 @@ /* Install .Services section */ wcscpy(pSectionName, DotServices); - Result = InstallServicesSection( + Result = SetupInstallServicesFromInfSectionExW( SelectedDriver->InfFileDetails->hInf, SectionName, + 0, DeviceInfoSet, DeviceInfoData, - &AssociatedService, - &RebootRequired); + NULL, + NULL); if (!Result) goto cleanup; + if (GetLastError() == ERROR_SUCCESS_REBOOT_REQUIRED) + RebootRequired = TRUE; /* Copy .inf file to Inf\ directory (if needed) */ Result = InfIsFromOEMLocation(SelectedDriver->InfFileDetails->FullInfFileName, &NeedtoCopyFile); @@ -7620,7 +7444,6 @@ TRACE("ClassGUID : '%S'\n", lpFullGuidString); TRACE("DeviceDesc : '%S'\n", SelectedDriver->Info.Description); TRACE("Mfg : '%S'\n", SelectedDriver->Info.MfgName); - TRACE("Service : '%S'\n", AssociatedService); rc = RegSetValueEx(hKey, REGSTR_VAL_CLASS, 0, REG_SZ, (const BYTE *)ClassName, (wcslen(ClassName) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) rc = RegSetValueEx(hKey, REGSTR_VAL_CLASSGUID, 0, REG_SZ, (const BYTE *)lpFullGuidString, (wcslen(lpFullGuidString) + 1) * sizeof(WCHAR)); @@ -7628,8 +7451,6 @@ rc = RegSetValueEx(hKey, REGSTR_VAL_DEVDESC, 0, REG_SZ, (const BYTE *)SelectedDriver->Info.Description, (wcslen(SelectedDriver->Info.Description) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) rc = RegSetValueEx(hKey, REGSTR_VAL_MFG, 0, REG_SZ, (const BYTE *)SelectedDriver->Info.MfgName, (wcslen(SelectedDriver->Info.MfgName) + 1) * sizeof(WCHAR)); - if (rc == ERROR_SUCCESS && AssociatedService && *AssociatedService) - rc = RegSetValueEx(hKey, REGSTR_VAL_SERVICE, 0, REG_SZ, (const BYTE *)AssociatedService, (wcslen(AssociatedService) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -7650,7 +7471,6 @@ RegCloseKey(hKey); if (lpGuidString) RpcStringFreeW(&lpGuidString); - HeapFree(GetProcessHeap(), 0, (LPWSTR)AssociatedService); HeapFree(GetProcessHeap(), 0, lpFullGuidString); TRACE("Returning %d\n", ret); _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-12-20 23:54:21 UTC (rev 20282) +++ trunk/reactos/lib/setupapi/install.c 2005-12-21 12:28:55 UTC (rev 20283) @@ -47,9 +47,28 @@ BOOL unregister; }; +/* info passed to callback functions dealing with Needs directives */ +struct needs_callback_info +{ + UINT type; + + HWND owner; + UINT flags; + HKEY key_root; + LPCWSTR src_root; + UINT copy_flags; + PVOID callback; + PVOID context; + HDEVINFO devinfo; + PSP_DEVINFO_DATA devinfo_data; + PVOID reserved1; + PVOID reserved2; +}; + typedef BOOL (*iterate_fields_func)( HINF hinf, PCWSTR field, void *arg ); /* Unicode constants */ +static const WCHAR AddService[] = {'A','d','d','S','e','r','v','i','c','e',0}; static const WCHAR CopyFiles[] = {'C','o','p','y','F','i','l','e','s',0}; static const WCHAR DelFiles[] = {'D','e','l','F','i','l','e','s',0}; static const WCHAR RenFiles[] = {'R','e','n','F','i','l','e','s',0}; @@ -784,73 +803,64 @@ /*********************************************************************** - * SetupInstallFromInfSectionW (SETUPAPI.@) + * include_callback + * + * Called once for each Include entry in a given section. */ -BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, UINT flags, - HKEY key_root, PCWSTR src_root, UINT copy_flags, - PSP_FILE_CALLBACK_W callback, PVOID context, - HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data ) +static BOOL include_callback( HINF hinf, PCWSTR field, void *arg ) { - INFCONTEXT include_context; + return SetupOpenAppendInfFileW( field, hinf, NULL ); +} - /* Parse 'Include' line */ - if (SetupFindFirstLineW( hinf, section, Include, &include_context )) - { - DWORD index = 1; - while (TRUE) - { - static WCHAR szBuffer[MAX_PATH]; - PWSTR pBuffer = NULL; - DWORD required; - BOOL ok; - ok = SetupGetStringFieldW( &include_context, index, szBuffer, MAX_PATH, &required ); - if (!ok && GetLastError() == ERROR_INVALID_PARAMETER) - break; - else if (!ok && GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - pBuffer = MyMalloc(required); - ok = SetupGetStringFieldW( &include_context, index, pBuffer, required, &required ); - } - if (ok) - ok = SetupOpenAppendInfFileW( pBuffer ? pBuffer : szBuffer, hinf, NULL ); +/********************************************************************** * + * needs_callback + * + * Called once for each Needs entry in a given section. + */ +static BOOL needs_callback( HINF hinf, PCWSTR field, void *arg ) +{ + struct needs_callback_info *info = arg; - MyFree(pBuffer); - if (!ok) return FALSE; - index++; - } + switch (info->type) + { + case 0: + return SetupInstallFromInfSectionW(info->owner, hinf, field, info->flags, + info->key_root, info->src_root, info->copy_flags, info->callback, + info->context, info->devinfo, info->devinfo_data); + case 1: + return SetupInstallServicesFromInfSectionExW(hinf, field, info->flags, + info->devinfo, info->devinfo_data, info->reserved1, info->reserved2); + default: + ERR("Unknown info type %ld\n", info->type); + return FALSE; } +} - /* Parse 'Needs' line */ - if (SetupFindFirstLineW( hinf, section, Needs, &include_context )) - { - DWORD index = 1; - while (TRUE) - { - static WCHAR szBuffer[MAX_PATH]; - PWSTR pBuffer = NULL; - DWORD required; - BOOL ok; - ok = SetupGetStringFieldW( &include_context, index, szBuffer, MAX_PATH, &required ); - if (!ok && GetLastError() == ERROR_INVALID_PARAMETER) - break; - else if (!ok && GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - pBuffer = MyMalloc(required); - ok = SetupGetStringFieldW( &include_context, index, pBuffer, required, &required ); - } - if (ok) - { - ok = SetupInstallFromInfSectionW( owner, hinf, pBuffer ? pBuffer : szBuffer, - flags, key_root, src_root, copy_flags, callback, context, devinfo, devinfo_data ); - } +/********************************************************************** * + * SetupInstallFromInfSectionW (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, UINT flags, + HKEY key_root, PCWSTR src_root, UINT copy_flags, + PSP_FILE_CALLBACK_W callback, PVOID context, + HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data ) +{ + struct needs_callback_info needs_info; - MyFree(pBuffer); - if (!ok) return FALSE; - index++; - } - } + /* Parse 'Include' and 'Needs' directives */ + iterate_section_fields( hinf, section, Include, include_callback, NULL); + needs_info.type = 0; + needs_info.owner = owner; + needs_info.flags = flags; + needs_info.key_root = key_root; + needs_info.src_root = src_root; + needs_info.copy_flags = copy_flags; + needs_info.callback = callback; + needs_info.context = context; + needs_info.devinfo = devinfo; + needs_info.devinfo_data = devinfo_data; + iterate_section_fields( hinf, section, Needs, needs_callback, &needs_info); if (flags & SPINST_FILES) { @@ -1099,258 +1109,368 @@ } -/********************************************************************** * - * SetupInstallServicesFromInfSectionExW (SETUPAPI.@) - */ -BOOL WINAPI SetupInstallServicesFromInfSectionExW( HINF hinf, PCWSTR sectionname, DWORD flags, HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, PVOID reserved1, PVOID reserved2 ) +static BOOL GetStringField( PINFCONTEXT context, DWORD index, PWSTR *value) { + DWORD RequiredSize; + BOOL ret; + + ret = SetupGetStringFieldW( + context, + index, + NULL, 0, + &RequiredSize); + if (!ret) + return FALSE; + else if (RequiredSize == 0) + { + *value = NULL; + return TRUE; + } + + /* We got the needed size for the buffer */ + *value = MyMalloc(RequiredSize * sizeof(WCHAR)); + if (!*value) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + ret = SetupGetStringFieldW( + context, + index, + *value, RequiredSize, NULL); + if (!ret) + MyFree(*value); + + return ret; +} + + +static BOOL InstallOneService( + struct DeviceInfoSet *list, + IN HINF hInf, + IN LPCWSTR ServiceSection, + IN LPCWSTR ServiceName, + IN UINT ServiceFlags) +{ SC_HANDLE hSCManager = NULL; SC_HANDLE hService = NULL; LPDWORD GroupOrder = NULL; LPQUERY_SERVICE_CONFIG ServiceConfig = NULL; - struct DeviceInfoSet *list; BOOL ret = FALSE; - TRACE("%p, %s, 0x%lx, %p, %p, %p, %p\n", hinf, debugstr_w(sectionname), - flags, DeviceInfoSet, DeviceInfoData, reserved1, reserved2); + HKEY hGroupOrderListKey = INVALID_HANDLE_VALUE; + LPWSTR ServiceBinary = NULL; + LPWSTR LoadOrderGroup = NULL; + LPWSTR DisplayName = NULL; + LPWSTR Description = NULL; + LPWSTR Dependencies = NULL; + INT ServiceType, StartType, ErrorControl; + DWORD dwRegType; + DWORD tagId = (DWORD)-1; + BOOL useTag; - if (!DeviceInfoSet) - SetLastError(ERROR_INVALID_PARAMETER); - else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) - SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) - SetLastError(ERROR_INVALID_HANDLE); - else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) - SetLastError(ERROR_INVALID_USER_BUFFER); - else if (!reserved1) + if (!GetIntField(hInf, ServiceSection, L"ServiceType", &ServiceType)) + goto cleanup; + if (!GetIntField(hInf, ServiceSection, L"StartType", &StartType)) + goto cleanup; + if (!GetIntField(hInf, ServiceSection, L"ErrorControl", &ErrorControl)) + goto cleanup; + useTag = (ServiceType == SERVICE_BOOT_START || ServiceType == SERVICE_SYSTEM_START); + + hSCManager = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_CREATE_SERVICE); + if (hSCManager == NULL) + goto cleanup; + + if (!GetLineText(hInf, ServiceSection, L"ServiceBinary", &ServiceBinary)) + goto cleanup; + + /* Don't check return value, as these fields are optional and + * GetLineText initialize output parameter even on failure */ + GetLineText(hInf, ServiceSection, L"LoadOrderGroup", &LoadOrderGroup); + GetLineText(hInf, ServiceSection, L"DisplayName", &DisplayName); + GetLineText(hInf, ServiceSection, L"Description", &Description); + GetLineText(hInf, ServiceSection, L"Dependencies", &Dependencies); + + hService = OpenServiceW( + hSCManager, + ServiceName, + GENERIC_READ | GENERIC_WRITE); + if (hService == NULL && GetLastError() != ERROR_SERVICE_DOES_NOT_EXIST) + goto cleanup; + + if (hService && (ServiceFlags & SPSVCINST_DELETEEVENTLOGENTRY)) { - /* FIXME: I don't know how to get the service name. ATM, just fail the call */ - /* Maybe find it in DeviceInfoSet/DeviceInfoData? */ - FIXME("Service name not specified!\n"); - SetLastError(ERROR_GEN_FAILURE); - goto cleanup; + ret = DeleteService(hService); + if (!ret && GetLastError() != ERROR_SERVICE_MARKED_FOR_DELETE) + goto cleanup; } + + if (hService == NULL) + { + /* Create new service */ + hService = CreateServiceW( + hSCManager, + ServiceName, + DisplayName, + 0, + ServiceType, + StartType, + ErrorControl, + ServiceBinary, + LoadOrderGroup, + useTag ? &tagId : NULL, + Dependencies, + NULL, NULL); + if (hService == NULL) + goto cleanup; + } else { - HKEY hGroupOrderListKey = INVALID_HANDLE_VALUE; - LPWSTR ServiceBinary = NULL; - LPWSTR LoadOrderGroup = NULL; - LPWSTR DisplayName = NULL; - LPWSTR Description = NULL; - LPWSTR Dependencies = NULL; - INT ServiceType, StartType, ErrorControl; - DWORD dwRegType; - DWORD tagId = (DWORD)-1; - BOOL useTag; + DWORD bufferSize; + /* Read current configuration */ + if (!QueryServiceConfigW(hService, NULL, 0, &bufferSize)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + goto cleanup; + ServiceConfig = MyMalloc(bufferSize); + if (!ServiceConfig) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + if (!QueryServiceConfigW(hService, ServiceConfig, bufferSize, &bufferSize)) + goto cleanup; + } + tagId = ServiceConfig->dwTagId; - if (!GetIntField(hinf, sectionname, L"ServiceType", &ServiceType)) + /* Update configuration */ + ret = ChangeServiceConfigW( + hService, + ServiceType, + (ServiceFlags & SPSVCINST_NOCLOBBER_STARTTYPE) ? SERVICE_NO_CHANGE : StartType, + (ServiceFlags & SPSVCINST_NOCLOBBER_ERRORCONTROL) ? SERVICE_NO_CHANGE : ErrorControl, + ServiceBinary, + (ServiceFlags & SPSVCINST_NOCLOBBER_LOADORDERGROUP && ServiceConfig->lpLoadOrderGroup) ? NULL : LoadOrderGroup, + useTag ? &tagId : NULL, + (ServiceFlags & SPSVCINST_NOCLOBBER_DEPENDENCIES && ServiceConfig->lpDependencies) ? NULL : Dependencies, + NULL, NULL, + (ServiceFlags & SPSVCINST_NOCLOBBER_DISPLAYNAME && ServiceConfig->lpDisplayName) ? NULL : DisplayName); + if (!ret) goto cleanup; - if (!GetIntField(hinf, sectionname, L"StartType", &StartType)) - goto cleanup; - if (!GetIntField(hinf, sectionname, L"ErrorControl", &ErrorControl)) - goto cleanup; - useTag = (ServiceType == SERVICE_BOOT_START || ServiceType == SERVICE_SYSTEM_START); + } - hSCManager = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_CREATE_SERVICE); - if (hSCManager == NULL) - goto cleanup; + /* FIXME: use Description and SPSVCINST_NOCLOBBER_DESCRIPTION */ - if (!GetLineText(hinf, sectionname, L"ServiceBinary", &ServiceBinary)) - goto cleanup; + if (useTag) + { + /* Add the tag to SYSTEM\CurrentControlSet\Control\GroupOrderList key */ + LONG rc; + LPCWSTR lpLoadOrderGroup; + DWORD bufferSize; - /* Don't check return value, as these fields are optional and - * GetLineText initialize output parameter even on failure */ - GetLineText(hinf, sectionname, L"LoadOrderGroup", &LoadOrderGroup); - GetLineText(hinf, sectionname, L"DisplayName", &DisplayName); - GetLineText(hinf, sectionname, L"Description", &Description); - GetLineText(hinf, sectionname, L"Dependencies", &Dependencies); + lpLoadOrderGroup = LoadOrderGroup; + if ((ServiceFlags & SPSVCINST_NOCLOBBER_LOADORDERGROUP) && ServiceConfig && ServiceConfig->lpLoadOrderGroup) + lpLoadOrderGroup = ServiceConfig->lpLoadOrderGroup; - hService = OpenServiceW( - hSCManager, - reserved1, - GENERIC_READ | GENERIC_WRITE); - if (hService == NULL && GetLastError() != ERROR_SERVICE_DOES_NOT_EXIST) + rc = RegOpenKey( + list ? list->HKLM : HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\GroupOrderList", + &hGroupOrderListKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); goto cleanup; - - if (flags & (SPSVCINST_STOPSERVICE | SPSVCINST_DELETEEVENTLOGENTRY)) + } + rc = RegQueryValueExW(hGroupOrderListKey, lpLoadOrderGroup, NULL, &dwRegType, NULL, &bufferSize); + if (rc == ERROR_FILE_NOT_FOUND) + bufferSize = sizeof(DWORD); + else if (rc != ERROR_SUCCESS) { - if (hService == NULL) + SetLastError(rc); + goto cleanup; + } + else if (dwRegType != REG_BINARY || bufferSize == 0 || bufferSize % sizeof(DWORD) != 0) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + /* Allocate buffer to store existing data + the new tag */ + GroupOrder = MyMalloc(bufferSize + sizeof(DWORD)); + if (!GroupOrder) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + if (rc == ERROR_SUCCESS) + { + /* Read existing data */ + rc = RegQueryValueExW( + hGroupOrderListKey, + lpLoadOrderGroup, + NULL, + NULL, + (BYTE*)GroupOrder, + &bufferSize); + if (rc != ERROR_SUCCESS) { - SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); + SetLastError(rc); goto cleanup; } - if (flags & SPSVCINST_STOPSERVICE) - { - SERVICE_STATUS ServiceStatus; - ret = ControlService(hService, SERVICE_CONTROL_STOP, &ServiceStatus); - if (!ret && GetLastError() != ERROR_SERVICE_NOT_ACTIVE) - goto cleanup; - if (ServiceStatus.dwCurrentState != SERVICE_STOP_PENDING && ServiceStatus.dwCurrentState != SERVICE_STOPPED) - { - SetLastError(ERROR_INSTALL_SERVICE_FAILURE); - goto cleanup; - } - } - if (flags & SPSVCINST_DELETEEVENTLOGENTRY) - { - ret = DeleteService(hService); - if (!ret) - goto cleanup; - } - ret = FALSE; + if (ServiceFlags & SPSVCINST_TAGTOFRONT) + memmove(&GroupOrder[2], &GroupOrder[1], bufferSize - sizeof(DWORD)); } - - if (hService == NULL) + else { - /* Create new service */ - hService = CreateServiceW( - hSCManager, - reserved1, - DisplayName, - 0, - ServiceType, - StartType, - ErrorControl, - ServiceBinary, - LoadOrderGroup, - useTag ? &tagId : NULL, - Dependencies, - NULL, NULL); - if (hService == NULL) - goto cleanup; + GroupOrder[0] = 0; } + GroupOrder[0]++; + if (ServiceFlags & SPSVCINST_TAGTOFRONT) + GroupOrder[1] = tagId; else + GroupOrder[bufferSize / sizeof(DWORD)] = tagId; + + rc = RegSetValueExW( + hGroupOrderListKey, + lpLoadOrderGroup, + 0, + REG_BINARY, + (BYTE*)GroupOrder, + bufferSize + sizeof(DWORD)); + if (rc != ERROR_SUCCESS) { - DWORD bufferSize; - /* Read current configuration */ - if (!QueryServiceConfigW(hService, NULL, 0, &bufferSize)) - { - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - goto cleanup; - ServiceConfig = HeapAlloc(GetProcessHeap(), 0, bufferSize); - if (!ServiceConfig) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - if (!QueryServiceConfigW(hService, ServiceConfig, bufferSize, &bufferSize)) - goto cleanup; - } - tagId = ServiceConfig->dwTagId; - - /* Update configuration */ - ret = ChangeServiceConfigW( - hService, - ServiceType, - (flags & SPSVCINST_NOCLOBBER_STARTTYPE) ? SERVICE_NO_CHANGE : StartType, - (flags & SPSVCINST_NOCLOBBER_ERRORCONTROL) ? SERVICE_NO_CHANGE : ErrorControl, - ServiceBinary, - (flags & SPSVCINST_NOCLOBBER_LOADORDERGROUP && ServiceConfig->lpLoadOrderGroup) ? NULL : LoadOrderGroup, - useTag ? &tagId : NULL, - (flags & SPSVCINST_NOCLOBBER_DEPENDENCIES && ServiceConfig->lpDependencies) ? NULL : Dependencies, - NULL, NULL, - (flags & SPSVCINST_NOCLOBBER_DISPLAYNAME && ServiceConfig->lpDisplayName) ? NULL : DisplayName); - if (!ret) - goto cleanup; + SetLastError(rc); + goto cleanup; } + } - /* FIXME: use Description and SPSVCINST_NOCLOBBER_DESCRIPTION */ + ret = TRUE; - if (useTag) - { - /* Add the tag to SYSTEM\CurrentControlSet\Control\GroupOrderList key */ - LONG rc; - LPCWSTR lpLoadOrderGroup; - DWORD bufferSize; +cleanup: + if (hSCManager != NULL) + CloseServiceHandle(hSCManager); + if (hService != NULL) + CloseServiceHandle(hService); + if (hGroupOrderListKey != INVALID_HANDLE_VALUE) + RegCloseKey(hGroupOrderListKey); + MyFree(ServiceConfig); + MyFree(ServiceBinary); + MyFree(LoadOrderGroup); + MyFree(DisplayName); + MyFree(Description); + MyFree(Dependencies); + MyFree(GroupOrder); - lpLoadOrderGroup = LoadOrderGroup; - if ((flags & SPSVCINST_NOCLOBBER_LOADORDERGROUP) && ServiceConfig && ServiceConfig->lpLoadOrderGroup) - lpLoadOrderGroup = ServiceConfig->lpLoadOrderGroup; + TRACE("Returning %d\n", ret); + return ret; +} - rc = RegOpenKey(list->HKLM, L"SYSTEM\\CurrentControlSet\\Control\\GroupOrderList", &hGroupOrderListKey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); + +/********************************************************************** * + * SetupInstallServicesFromInfSectionExW (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallServicesFromInfSectionExW( HINF hinf, PCWSTR sectionname, DWORD flags, HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, PVOID reserved1, PVOID reserved2 ) +{ + struct DeviceInfoSet *list = NULL; + BOOL ret = FALSE; + + TRACE("%p, %s, 0x%lx, %p, %p, %p, %p\n", hinf, debugstr_w(sectionname), + flags, DeviceInfoSet, DeviceInfoData, reserved1, reserved2); + + if (!sectionname) + SetLastError(ERROR_INVALID_PARAMETER); + else if (flags & ~(SPSVCINST_TAGTOFRONT | SPSVCINST_DELETEEVENTLOGENTRY | SPSVCINST_NOCLOBBER_DISPLAYNAME | SPSVCINST_NOCLOBBER_STARTTYPE | SPSVCINST_NOCLOBBER_ERRORCONTROL | SPSVCINST_NOCLOBBER_LOADORDERGROUP | SPSVCINST_NOCLOBBER_DEPENDENCIES | SPSVCINST_STOPSERVICE)) + { + TRACE("Unknown flags: 0x%08lx\n", flags & ~(SPSVCINST_TAGTOFRONT | SPSVCINST_DELETEEVENTLOGENTRY | SPSVCINST_NOCLOBBER_DISPLAYNAME | SPSVCINST_NOCLOBBER_STARTTYPE | SPSVCINST_NOCLOBBER_ERRORCONTROL | SPSVCINST_NOCLOBBER_LOADORDERGROUP | SPSVCINST_NOCLOBBER_DEPENDENCIES | SPSVCINST_STOPSERVICE)); + SetLastError(ERROR_INVALID_FLAGS); + } + else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInfoSet && (list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (reserved1 != NULL || reserved2 != NULL) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + struct needs_callback_info needs_info; + LPWSTR ServiceName = NULL; + LPWSTR ServiceSection = NULL; + UINT ServiceFlags; + INFCONTEXT ContextService; + BOOL bNeedReboot = FALSE; + + /* Parse 'Include' and 'Needs' directives */ + iterate_section_fields( hinf, sectionname, Include, include_callback, NULL); + needs_info.type = 1; + needs_info.flags = flags; + needs_info.devinfo = DeviceInfoSet; + needs_info.devinfo_data = DeviceInfoData; + needs_info.reserved1 = reserved1; + needs_info.reserved2 = reserved2; + iterate_section_fields( hinf, sectionname, Needs, needs_callback, &needs_info); + + if (flags & SPSVCINST_STOPSERVICE) + { + FIXME("Stopping the device not implemented\n"); + /* This may lead to require a reboot */ + /* bNeedReboot = TRUE; */ +#if 0 + SERVICE_STATUS ServiceStatus; + ret = ControlService(hService, SERVICE_CONTROL_STOP, &ServiceStatus); + if (!ret && GetLastError() != ERROR_SERVICE_NOT_ACTIVE) goto cleanup; - } - rc = RegQueryValueExW(hGroupOrderListKey, lpLoadOrderGroup, NULL, &dwRegType, NULL, &bufferSize); - if (rc == ERROR_FILE_NOT_FOUND) - bufferSize = sizeof(DWORD); - else if (rc != ERROR_SUCCESS) + if (ServiceStatus.dwCurrentState != SERVICE_STOP_PENDING && ServiceStatus.dwCurrentState != SERVICE_STOPPED) { - SetLastError(rc); + SetLastError(ERROR_INSTALL_SERVICE_FAILURE); goto cleanup; } - else if (dwRegType != REG_BINARY || bufferSize == 0 || bufferSize % sizeof(DWORD) != 0) +#endif + flags &= ~SPSVCINST_STOPSERVICE; + } + + ret = SetupFindFirstLineW(hinf, sectionname, AddService, &ContextService); + while (ret) + { + if (!GetStringField(&ContextService, 1, &ServiceName)) + goto nextservice; + + ret = SetupGetIntField( + &ContextService, + 2, /* Field index */ + &ServiceFlags); + if (!ret) { - SetLastError(ERROR_GEN_FAILURE); - goto cleanup; + /* The field may be empty. Ignore the error */ + ServiceFlags = 0; } - /* Allocate buffer to store existing data + the new tag */ - GroupOrder = HeapAlloc(GetProcessHeap(), 0, bufferSize + sizeof(DWORD)); - if (!GroupOrder) + + if (!GetStringField(&ContextService, 3, &ServiceSection)) + goto nextservice; + + ret = InstallOneService(list, hinf, ServiceSection, ServiceName, (ServiceFlags & ~SPSVCINST_ASSOCSERVICE) | flags); + if (!ret) + goto nextservice; + + if (ServiceFlags & SPSVCINST_ASSOCSERVICE) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; + ret = SetupDiSetDeviceRegistryPropertyW(DeviceInfoSet, DeviceInfoData, SPDRP_SERVICE, (LPBYTE)ServiceName, (strlenW(ServiceName) + 1) * sizeof(WCHAR)); + if (!ret) + goto nextservice; } - if (rc == ERROR_SUCCESS) - { - /* Read existing data */ - rc = RegQueryValueExW( - hGroupOrderListKey, - lpLoadOrderGroup, - NULL, - NULL, - (BYTE*)GroupOrder, - &bufferSize); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - if (flags & SPSVCINST_TAGTOFRONT) - memmove(&GroupOrder[2], &GroupOrder[1], bufferSize - sizeof(DWORD)); - } - else - { - GroupOrder[0] = 0; - } - GroupOrder[0]++; - if (flags & SPSVCINST_TAGTOFRONT) - GroupOrder[1] = tagId; - else - GroupOrder[bufferSize / sizeof(DWORD)] = tagId; - rc = RegSetValueExW( - hGroupOrderListKey, - lpLoadOrderGroup, - 0, - REG_BINARY, - (BYTE*)GroupOrder, - bufferSize + sizeof(DWORD)); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } +nextservice: + HeapFree(GetProcessHeap(), 0, ServiceName); + HeapFree(GetProcessHeap(), 0, ServiceSection); + ServiceName = ServiceSection = NULL; + ret = SetupFindNextMatchLineW(&ContextService, AddService, &ContextService); } + if (bNeedReboot) + SetLastError(ERROR_SUCCESS_REBOOT_REQUIRED); + else + SetLastError(ERROR_SUCCESS); ret = TRUE; - -cleanup: - if (hSCManager != NULL) - CloseServiceHandle(hSCManager); - if (hService != NULL) - CloseServiceHandle(hService); - if (hGroupOrderListKey != INVALID_HANDLE_VALUE) - RegCloseKey(hGroupOrderListKey); - HeapFree(GetProcessHeap(), 0, ServiceConfig); - HeapFree(GetProcessHeap(), 0, ServiceBinary); - HeapFree(GetProcessHeap(), 0, LoadOrderGroup); - HeapFree(GetProcessHeap(), 0, DisplayName); - HeapFree(GetProcessHeap(), 0, Description); - HeapFree(GetProcessHeap(), 0, Dependencies); - HeapFree(GetProcessHeap(), 0, GroupOrder); } TRACE("Returning %d\n", ret);

18 years, 9 months

[gedmurphy] 20282: missed an error check

by gedmurphy＠svn.reactos.com

missed an error check Modified: trunk/reactos/apps/utils/net/netstat/netstat.c _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.c --- trunk/reactos/apps/utils/net/netstat/netstat.c 2005-12-20 23:16:09 UTC (rev 20281) +++ trunk/reactos/apps/utils/net/netstat/netstat.c 2005-12-20 23:54:21 UTC (rev 20282) @@ -1,34 +1,10 @@ /* - * ReactOS Win32 Applications - * Copyright (C) 2005 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS netstat utility + * LICENSE: GPL - See COPYING in the top level directory * FILE: apps/utils/net/netstat/netstat.c * PURPOSE: display IP stack statistics - * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) - * REVISIONS: - * Ged Murphy 19/09/05 Created - * Some ideas/code taken from Rob Dickinson's original app - * + * COPYRIGHT: Copyright 2005 Ged Murphy <gedmurphy(a)gmail.com> */ - /* * TODO: * sort function return values. @@ -588,14 +564,15 @@ (nIpAddr >> 8) & 0xFF, (nIpAddr) & 0xFF); } else { - gethostname(Name, NameLen); + if (gethostname(Name, NameLen) != 0) + DoFormatMessage(WSAGetLastError()); } } else if (IpAddr == 0x0100007f) { if (Local) { if (gethostname(Name, NameLen) != 0) DoFormatMessage(WSAGetLastError()); } else { - strcpy(Name, "localhost"); + _tcsncpy(Name, _T("localhost"), 10); } // } else if (phostent = gethostbyaddr((char*)&ipaddr, sizeof(nipaddr), PF_INET)) { // strcpy(name, phostent->h_name);

18 years, 9 months

[ekohl] 20281: Add missing RtlMakeSelfRelatedSd prototype.

by ekohl＠svn.reactos.com

Add missing RtlMakeSelfRelatedSd prototype. Modified: trunk/reactos/include/ndk/rtlfuncs.h _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-12-20 20:42:30 UTC (rev 20280) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-12-20 23:16:09 UTC (rev 20281) @@ -734,6 +734,14 @@ RtlLengthSid(IN PSID Sid); NTSYSAPI +NTSTATUS +NTAPI +RtlMakeSelfRelativeSD( + IN PSECURITY_DESCRIPTOR AbsoluteSD, + OUT PSECURITY_DESCRIPTOR SelfRelativeSD, + IN OUT PULONG BufferLength); + +NTSYSAPI VOID NTAPI RtlMapGenericMask( @@ -1471,7 +1479,7 @@ RtlPinAtomInAtomTable( IN PRTL_ATOM_TABLE AtomTable, IN RTL_ATOM Atom -); +); NTSYSAPI NTSTATUS

18 years, 9 months

[gvg] 20280: The function epilog is responsible for removing the final exception frame

by gvg＠svn.reactos.com

The function epilog is responsible for removing the final exception frame Modified: trunk/reactos/lib/rtl/i386/exception.c _____ Modified: trunk/reactos/lib/rtl/i386/exception.c --- trunk/reactos/lib/rtl/i386/exception.c 2005-12-20 20:36:38 UTC (rev 20279) +++ trunk/reactos/lib/rtl/i386/exception.c 2005-12-20 20:42:30 UTC (rev 20280) @@ -333,7 +333,10 @@ RegistrationFrame2 = RegistrationFrame2->Next; /* Remove this handler */ - RtlpSetExceptionList(OldFrame); + if (RegistrationFrame2 != RegistrationFrame) + { + RtlpSetExceptionList(OldFrame); + } } }

18 years, 9 months

[gedmurphy] 20279: fix output for local connections

by gedmurphy＠svn.reactos.com

fix output for local connections Modified: trunk/reactos/apps/utils/net/netstat/netstat.c Modified: trunk/reactos/apps/utils/net/netstat/netstat.h _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.c --- trunk/reactos/apps/utils/net/netstat/netstat.c 2005-12-20 20:34:03 UTC (rev 20278) +++ trunk/reactos/apps/utils/net/netstat/netstat.c 2005-12-20 20:36:38 UTC (rev 20279) @@ -125,6 +125,9 @@ case 'a' : bDoShowAllCons = TRUE; break; + case 'b' : + bDoShowProcName = TRUE; + break; case 'e' : bDoShowEthStats = TRUE; break; @@ -198,9 +201,9 @@ if (bDoShowRouteTable) { + /* mingw doesn't have lib for _tsystem */ if (system("route print") == -1) { - //mingw doesn't have lib for _tsystem _tprintf(_T("cannot find 'route.exe'\n")); return EXIT_FAILURE; } @@ -574,7 +577,7 @@ return Name; } - Name[0] = L'\0'; + Name[0] = _T('\0'); // Try to translate to a name if (!IpAddr) { @@ -585,11 +588,12 @@ (nIpAddr >> 8) & 0xFF, (nIpAddr) & 0xFF); } else { - //gethostname(name, namelen); + gethostname(Name, NameLen); } } else if (IpAddr == 0x0100007f) { if (Local) { - //gethostname(name, namelen); + if (gethostname(Name, NameLen) != 0) + DoFormatMessage(WSAGetLastError()); } else { strcpy(Name, "localhost"); } @@ -627,7 +631,6 @@ - /* * * Parse command line parameters and set any options @@ -636,6 +639,14 @@ */ int main(int argc, char *argv[]) { + WSADATA wsaData; + + if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) + { + _tprintf(_T("WSAStartup() failed : %d\n"), WSAGetLastError()); + return -1; + } + if (ParseCmdline(argc, argv)) return -1; _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.h --- trunk/reactos/apps/utils/net/netstat/netstat.h 2005-12-20 20:34:03 UTC (rev 20278) +++ trunk/reactos/apps/utils/net/netstat/netstat.h 2005-12-20 20:36:38 UTC (rev 20279) @@ -7,6 +7,7 @@ /* command line options */ BOOL bNoOptions = FALSE; // print default BOOL bDoShowAllCons = FALSE; // -a +BOOL bDoShowProcName = FALSE; // -b BOOL bDoShowEthStats = FALSE; // -e BOOL bDoShowNumbers = FALSE; // -n BOOL bDoShowProtoCons = FALSE; // -p

18 years, 9 months

[frik85] 20278: RosCMS update:

by frik85＠svn.reactos.com

RosCMS update: Admin Interface: * membership page: improved the interface and sql queries, outsourced the color settings * account page: outsourced the color settings Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php 2005-12-20 20:07:40 UTC (rev 20277) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php 2005-12-20 20:34:03 UTC (rev 20278) @@ -459,24 +459,24 @@ ORDER BY '$ros_cms_intern_users_sortby' $ros_cms_intern_users_sort LIMIT ". $roscms_SET_curpos ." , ". $roscms_intern_items_per_page ." ;") ; }*/ - $farbe1=$roscms_intern_color1; - $farbe2=$roscms_intern_color2; - $zaehler="0"; + $color1=$roscms_intern_color1; + $color2=$roscms_intern_color2; + $colorcounter="0"; //$farbe="#CCCCC"; while($result_page = mysql_fetch_array($query_page)) { // users ?> <tr> <td width="9%" valign="middle" bgcolor="<?php - $zaehler++; - if ($zaehler == "1") { - echo $farbe1; - $farbe = $farbe1; + $colorcounter++; + if ($colorcounter == "1") { + echo $color1; + $farbe = $color1; } - elseif ($zaehler == "2") { - $zaehler="0"; - echo $farbe2; - $farbe = $farbe2; + elseif ($colorcounter == "2") { + $colorcounter="0"; + echo $color2; + $farbe = $color2; } ?>"> <div align="center"><a href="<?php echo "?page=user&sec=profil&sec2=".$result_page['user_id']; ?>"><img src="images/view.gif" alt="Profil" width="19" height="18" border="0"></a>  _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php 2005-12-20 20:07:40 UTC (rev 20277) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php 2005-12-20 20:34:03 UTC (rev 20278) @@ -23,123 +23,340 @@ filters & sort</a> <?php - if ($rpm_lang_id == "") { $rpm_lang_id="all"; } - //echo 'Language: '; - //echo 'All'; - $ros_cms_intern_users_lang = " "; - //echo ''; - - if ($rpm_filt == "") { - $rpm_filt="active"; + echo 'Language: '; + if ($rpm_lang_id == "all") { + echo 'All'; + $ros_cms_intern_users_lang = "AND A1.user_language LIKE '%'"; } - //echo 'Filter: '; - //echo 'active'; - $ros_cms_intern_users_filt = " "; - //echo ''; + else { + echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid=all">All</a>'; + } + // Languages + $sql_lang="SELECT * + FROM languages + WHERE lang_level != '0' + ORDER BY 'lang_level' DESC"; + $sql_query_lang=mysql_query($sql_lang); + while($myrow_lang=mysql_fetch_row($sql_query_lang)) { + $roscms_sel_lang = $myrow_lang[0]; + echo ' | '; + if ($rpm_lang_id == $roscms_sel_lang) { + echo ''.$myrow_lang[1].''; + $ros_cms_intern_users_lang = "AND A1.user_language = '".$roscms_sel_lang."'"; + } + else { + echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$roscms_sel_la ng.'">'.$myrow_lang[1].'</a>'; + } + } + if ($rpm_filt == "") { $rpm_filt="active"; } echo 'Filter: '; if ($rpm_filt == "active") { + echo 'active users'; + $ros_cms_intern_users_filt = "AND A1.user_account_enabled = 'yes'"; + } + else { + echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt=active&langid='.$rpm_lang_id.'">active users</a>'; + } + echo ' | '; + if ($rpm_filt == "all") { + echo 'all users'; + $ros_cms_intern_users_filt = "AND A1.user_account_enabled != ''"; + } + else { + echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt=all&langid='.$rpm_lang_id.'">all users</a>'; + } + echo ''; + + if ($rpm_sort == "") { + $rpm_sort="all"; + } + echo 'Filter by Group: '; + if ($rpm_sort == "all") { echo 'all'; - $ros_cms_intern_users_filt = " "; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid LIKE '%'"; } else { - echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt=active&langid='.$rpm_lang_id.'">all</a>'; + echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort=all&filt= '.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'">all</a>' ; } echo ' | '; - if ($rpm_filt == "sadmin") { + if ($rpm_sort == "ros_sadmin") { echo 'super admin'; - $ros_cms_intern_users_filt = " WHERE `usergroupmember_usergroupid` = 'ros_sadmin' "; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'ros_sadmin'"; } else { - echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt=sadmin&langid='.$rpm_lang_id.'">super admin</a>'; + echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort=ros_sadmin&am p;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'">s uper admin</a>'; } echo ' | '; - if ($rpm_filt == "admin") { + if ($rpm_sort == "ros_admin") { echo 'admin'; - $ros_cms_intern_users_filt = " WHERE `usergroupmember_usergroupid` = 'ros_admin' "; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'ros_admin'"; } else { - echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt=admin&langid='.$rpm_lang_id.'">admin</a>'; + echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort=ros_admin&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'">ad min</a>'; } echo ' | '; - if ($rpm_filt == "dev") { + if ($rpm_sort == "developer") { echo 'developer'; - $ros_cms_intern_users_filt = " WHERE `usergroupmember_usergroupid` = 'developer' "; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'developer'"; } else { - echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt=dev&langid='.$rpm_lang_id.'">developer</a>'; + echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort=developer&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'">de veloper</a>'; } echo ' | '; - if ($rpm_filt == "mod") { + if ($rpm_sort == "moderator") { echo 'moderator'; - $ros_cms_intern_users_filt = " WHERE `usergroupmember_usergroupid` = 'moderator' "; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'moderator'"; } else { - echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt=mod&langid='.$rpm_lang_id.'">moderator</a>'; + echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort=moderator&amp ;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'">mo derator</a>'; } echo ' | '; - if ($rpm_filt == "trans") { + if ($rpm_sort == "translator") { echo 'translator'; - $ros_cms_intern_users_filt = " WHERE `usergroupmember_usergroupid` = 'translator' "; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'translator'"; } else { - echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt=trans&langid='.$rpm_lang_id.'">translator</a>'; + echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort=translator&am p;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'">t ranslator</a>'; } echo ' | '; - if ($rpm_filt == "user") { - echo 'normal user'; - $ros_cms_intern_users_filt = " WHERE `usergroupmember_usergroupid` = 'user' "; + if ($rpm_sort == "user") { + echo 'user'; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'user'"; } else { - echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt=user&langid='.$rpm_lang_id.'">normal user</a>'; + echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort=user&filt ='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'">user</a >'; } + echo ''; - if ($rpm_sort == "") { - $rpm_sort="id"; +?> + <?php + +// Setting: +$roscms_intern_items_per_page = 50; + +$roscms_SET_curpos = ""; +$roscms_SET_letter = ""; +if (array_key_exists("curpos", $_GET)) $roscms_SET_curpos=htmlspecialchars($_GET["curpos"]); +if (array_key_exists("letter", $_GET)) $roscms_SET_letter=htmlspecialchars($_GET["letter"]); + + + + echo ''; + + if ($roscms_SET_letter == "all" || $roscms_SET_letter == "") { + echo ' All '; } - echo 'Sorted by: '; - if ($rpm_sort == "id") { - echo 'user ID'; - $ros_cms_intern_users_sortby="usergroupmember_userid"; - $ros_cms_intern_users_sort="ASC"; + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=all" class="letterbarlink">All</a> '; } + + if ($roscms_SET_letter == "a") { + echo ' A '; + } else { - echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort=id&filt=' .$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'">user ID</a>'; + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=a" class="letterbarlink">A</a> '; } - echo ' | '; - if ($rpm_sort == "group") { - echo 'group ID'; - $ros_cms_intern_users_sortby="usergroupmember_usergroupid"; - $ros_cms_intern_users_sort="ASC"; + + if ($roscms_SET_letter == "b") { + echo ' B '; } else { - echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort=group&fil t='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'">group ID</a>'; + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=b" class="letterbarlink">B</a> '; } - echo ''; -?> -<?php + if ($roscms_SET_letter == "c") { + echo ' C '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=c" class="letterbarlink">C</a> '; + } -// Setting: -$roscms_intern_items_per_page = 50; + if ($roscms_SET_letter == "d") { + echo ' D '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=d" class="letterbarlink">D</a> '; + } + if ($roscms_SET_letter == "e") { + echo ' E '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=e" class="letterbarlink">E</a> '; + } -$roscms_SET_curpos = ""; -if (array_key_exists("curpos", $_GET)) $roscms_SET_curpos=htmlspecialchars($_GET["curpos"]); + if ($roscms_SET_letter == "f") { + echo ' F '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=f" class="letterbarlink">F</a> '; + } + + if ($roscms_SET_letter == "g") { + echo ' G '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=g" class="letterbarlink">G</a> '; + } + + if ($roscms_SET_letter == "h") { + echo ' H '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=h" class="letterbarlink">H</a> '; + } + + if ($roscms_SET_letter == "i") { + echo ' I '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=i" class="letterbarlink">I</a> '; + } + + if ($roscms_SET_letter == "j") { + echo ' J '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=j" class="letterbarlink">J</a> '; + } + + if ($roscms_SET_letter == "k") { + echo ' K '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=k" class="letterbarlink">K</a> '; + } + + if ($roscms_SET_letter == "l") { + echo ' L '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=l" class="letterbarlink">L</a> '; + } + + if ($roscms_SET_letter == "m") { + echo ' M '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=m" class="letterbarlink">M</a> '; + } + + if ($roscms_SET_letter == "n") { + echo ' N '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=n" class="letterbarlink">N</a> '; + } + + if ($roscms_SET_letter == "o") { + echo ' O '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=o" class="letterbarlink">O</a> '; + } + + if ($roscms_SET_letter == "p") { + echo ' P '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=p" class="letterbarlink">P</a> '; + } + + if ($roscms_SET_letter == "q") { + echo ' Q '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=q" class="letterbarlink">Q</a> '; + } + + if ($roscms_SET_letter == "r") { + echo ' R '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=r" class="letterbarlink">R</a> '; + } + + if ($roscms_SET_letter == "s") { + echo ' S '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=s" class="letterbarlink">S</a> '; + } + + if ($roscms_SET_letter == "t") { + echo ' T '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=t" class="letterbarlink">T</a> '; + } + + if ($roscms_SET_letter == "u") { + echo ' U '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=u" class="letterbarlink">U</a> '; + } + + if ($roscms_SET_letter == "v") { + echo ' V '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=v" class="letterbarlink">V</a> '; + } + + if ($roscms_SET_letter == "w") { + echo ' W '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=w" class="letterbarlink">W</a> '; + } + + if ($roscms_SET_letter == "x") { + echo ' X '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=x" class="letterbarlink">X</a> '; + } + + if ($roscms_SET_letter == "y") { + echo ' Y '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=y" class="letterbarlink">Y</a> '; + } + + if ($roscms_SET_letter == "z") { + echo ' Z '; + } + else { + echo ' <a href="?page=admin&sec=usrgrpmbr&sec2=view&sort='.$rpm_sort.' &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' &letter=z" class="letterbarlink">Z</a> '; + } + + echo ""; + + + if (!$roscms_SET_curpos) { $roscms_SET_curpos = 0; } -$query_count_cat=mysql_query("SELECT COUNT('usergroupmember_userid') - FROM `usergroup_members` - " . $ros_cms_intern_users_filt . " - ORDER BY `usergroupmember_userid` ASC ;"); +if ($roscms_SET_letter == "all") { + $roscms_SET_letter = "%"; +} + +$query_count_cat=mysql_query("SELECT COUNT('user_id') + FROM `users` + WHERE `user_account_enabled` = 'yes' + AND `user_account_hidden` = 'no' + AND `user_name` LIKE '" . $roscms_SET_letter . "%' + ORDER BY `user_name` ASC ;"); $result_count_cat = mysql_fetch_row($query_count_cat); echo ""; @@ -150,84 +367,75 @@ echo "".$j." "; } else { - echo "<a href='?page=admin&sec=usrgrpmbr&sec2=view&sort=".$rpm_sort." &filt=".$rpm_filt."&opt=".$rpm_opt."&langid=".$rpm_lang_id." &curpos=".$i."'>".$j."</a> "; + echo "<a href='?page=admin&sec=usrgrpmbr&sec2=view&sort=".$rpm_sort." &filt=".$rpm_filt."&opt=".$rpm_opt."&langid=".$rpm_lang_id." &letter=".$roscms_SET_letter."&curpos=".$i."'>".$j."</a> "; } } $j=0; echo ""; -?> -<table width="100%" border="0" cellpadding="1" cellspacing="1"> +?> + <table width="100%" border="0" cellpadding="1" cellspacing="1"> <tr bgcolor="#5984C3"> - <td width="6%"> + <td width="10%"> <div align="center">Action</div></td> - <td width="4%" bgcolor="#5984C3"> + <td width="10%" bgcolor="#5984C3"> <div align="center">ID</div></td> - <td width="20%" bgcolor="#5984C3"> + <td width="40%" bgcolor="#5984C3"> <div align="center">Nick</div></td> - <td width="20%"> + <td width="40%"> <div align="center">Usergroup</div></td> - <td width="50%" bgcolor="#5984C3"> - <div align="center">Usergroup - description</div></td> </tr> <?php - if($roscms_intern_account_level==100) { - $query_page = mysql_query("SELECT * - FROM usergroup_members - $ros_cms_intern_users_filt $ros_cms_intern_users_lang - ORDER BY '$ros_cms_intern_users_sortby' $ros_cms_intern_users_sort LIMIT ". $roscms_SET_curpos ." , ". $roscms_intern_items_per_page ." ;") ; - } - else { - //AND user_account_hidden != 0 - $query_page = mysql_query("SELECT * - FROM usergroup_members - $ros_cms_intern_users_filt $ros_cms_intern_users_lang - ORDER BY '$ros_cms_intern_users_sortby' $ros_cms_intern_users_sort LIMIT ". $roscms_SET_curpos ." , ". $roscms_intern_items_per_page ." ;") ; - } + $roscms_TEMP_sql = "SELECT A1.user_id, A1.user_name, A2.usergroupmember_userid, A2.usergroupmember_usergroupid + FROM users A1, usergroup_members A2 + WHERE A1.user_id = A2.usergroupmember_userid + AND A1.user_name LIKE '" . $roscms_SET_letter . "%' + $ros_cms_intern_users_filt $ros_cms_intern_users_lang $ros_cms_intern_users_sortby + GROUP BY A1.user_name + LIMIT ". $roscms_SET_curpos ." , ". $roscms_intern_items_per_page ." + ;"; +// echo $roscms_TEMP_sql; + $query_page = mysql_query($roscms_TEMP_sql) ; - $farbe1="#E2E2E2"; - $farbe2="#EEEEEE"; - $zaehler="0"; + $color1=$roscms_intern_color1; + $color2=$roscms_intern_color2; + $colorcounter="0"; //$farbe="#CCCCC"; while($result_page = mysql_fetch_array($query_page)) { // users ?> <tr> - <td width="9%" valign="middle" bgcolor="<?php - $zaehler++; - if ($zaehler == "1") { - echo $farbe1; - $farbe = $farbe1; + <td valign="middle" bgcolor="<?php + $colorcounter++; + if ($colorcounter == "1") { + echo $color1; + $farbe = $color1; } - elseif ($zaehler == "2") { - $zaehler="0"; - echo $farbe2; - $farbe = $farbe2; + elseif ($colorcounter == "2") { + $colorcounter="0"; + echo $color2; + $farbe = $color2; } ?>"> - <div align="center"><a href="?page=admin&sec=usrgrpmbr&sec2=edit&sec3=<?php echo $result_page['usergroupmember_usergroupid']; ?>&db_id=<?php echo $result_page['usergroupmember_userid']; ?>"><img src="images/view.gif" alt="Edit Membership" width="19" height="18" border="0"></a> <a href="?page=admin&sec=usrgrpmbr&sec2=add&sec3=new&db_id= <?php echo $result_page['usergroupmember_userid']; ?>"><img src="images/tool.gif" alt="Add Membership" width="19" height="18" border="0"></a> <a href="?page=admin&sec=usrgrpmbr&sec2=delete&sec3=<?php echo $result_page['usergroupmember_usergroupid']; ?>&db_id=<?php echo $result_page['usergroupmember_userid']; ?>"><img src="images/delete.gif" alt="Delete Membership" width="19" height="18" border="0"></a></div></td> - <td width="7%" valign="middle" bgcolor="<?php echo $farbe; ?>"> <div align="center"><?php echo "".$result_page['usergroupmember_userid'].""; ?></div></td> - <td width="10%" valign="middle" bgcolor="<?php echo $farbe; ?>"><?php - $query_usra = mysql_query("SELECT user_id, user_name FROM users WHERE user_id = '".$result_page['usergroupmember_userid']."'") or die('DB error (membership script)!'); + <div align="center"><a href="?page=admin&sec=usrgrpmbr&sec2=edit&sec3=<?php echo $result_page['usergroupmember_usergroupid']; ?>&db_id=<?php echo $result_page['user_id']; ?>"><img src="images/view.gif" alt="Edit Membership" width="19" height="18" border="0"></a> <a href="?page=admin&sec=usrgrpmbr&sec2=add&sec3=new&db_id= <?php echo $result_page['usergroupmember_userid']; ?>"><img src="images/tool.gif" alt="Add Membership" width="19" height="18" border="0"></a> <a href="?page=admin&sec=usrgrpmbr&sec2=delete&sec3=<?php echo $result_page['usergroupmember_usergroupid']; ?>&db_id=<?php echo $result_page['usergroupmember_userid']; ?>"><img src="images/delete.gif" alt="Delete Membership" width="19" height="18" border="0"></a></div></td> + <td valign="middle" bgcolor="<?php echo $farbe; ?>"> <div align="center"><?php echo "".$result_page['user_id'].""; ?></div></td> + <td valign="middle" bgcolor="<?php echo $farbe; ?>"><?php + $query_usra = mysql_query("SELECT user_id, user_name FROM users WHERE user_id = '".$result_page['user_id']."'") or die('DB error (membership script)!'); $result_usra = mysql_fetch_array($query_usra); // or die('DB error (show_sessions script)'); - echo $result_usra['user_name']." <a href='?page=user&sec=profil&sec2=".$result_page['usergroupmember _userid']."'>[Profil]</a>"; ?> + echo $result_usra['user_name']." <a href='?page=user&sec=profil&sec2=".$result_page['user_id']."'>[P rofil]</a>"; ?> </td> - <td width="13%" valign="middle" bgcolor="<?php echo $farbe; ?>" title="<?php echo $result_page['usergroupmember_usergroupid']; ?>"><div align="left"> + <td valign="middle" bgcolor="<?php echo $farbe; ?>" title="<?php echo $result_page['usergroupmember_usergroupid']; ?>"><div align="left"> <?php - //echo "SELECT usrgroup_name_id, usrgroup_name FROM usergroups WHERE usrgroup_name_id = '".$result_page['usergroupmember_usergroupid']."' "; $query_grpb = mysql_query("SELECT usrgroup_name_id, usrgroup_name, usrgroup_description FROM usergroups WHERE usrgroup_name_id = '".$result_page['usergroupmember_usergroupid']."'") or die('DB error (membership script)!'); $result_grpb = mysql_fetch_array($query_grpb) or die('DB error (membership script)'); - echo $result_grpb['usrgroup_name']; + echo $result_grpb['usrgroup_name']; ?> </div></td> - <td width="15%" valign="middle" bgcolor="<?php echo $farbe; ?>"> <?php - echo substr(htmlentities($result_grpb['usrgroup_description'], ENT_QUOTES), 0, 50)."..."; - ?></tr> + </tr> <?php } // end while ?>

18 years, 9 months

[hpoussin] 20277: Don't try to dereference possible NULL pointers

by hpoussin＠svn.reactos.com

Don't try to dereference possible NULL pointers Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-20 19:54:25 UTC (rev 20276) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-20 20:07:40 UTC (rev 20277) @@ -5311,13 +5311,18 @@ NULL); /* Copy MatchingId information */ - driverInfo->MatchingId = HeapAlloc(GetProcessHeap(), 0, (wcslen(MatchingId) + 1) * sizeof(WCHAR)); - if (!driverInfo->MatchingId) + if (MatchingId) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; + driverInfo->MatchingId = HeapAlloc(GetProcessHeap(), 0, (wcslen(MatchingId) + 1) * sizeof(WCHAR)); + if (!driverInfo->MatchingId) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + RtlCopyMemory(driverInfo->MatchingId, MatchingId, (wcslen(MatchingId) + 1) * sizeof(WCHAR)); } - RtlCopyMemory(driverInfo->MatchingId, MatchingId, (wcslen(MatchingId) + 1) * sizeof(WCHAR)); + else + driverInfo->MatchingId = NULL; /* Get inf install section */ Result = FALSE; @@ -6313,10 +6318,12 @@ SetLastError(ERROR_INVALID_USER_BUFFER); else { - struct DeviceInfoElement *devInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + struct DeviceInfoElement *devInfo = NULL; PLIST_ENTRY ItemList; + if (DeviceInfoData) + devInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; if (DriverType == SPDIT_CLASSDRIVER || - devInfo->CreationFlags & DICD_INHERIT_CLASSDRVS) + (devInfo && devInfo->CreationFlags & DICD_INHERIT_CLASSDRVS)) { ListHead = &((struct DeviceInfoSet *)DeviceInfoSet)->DriverListHead; }

18 years, 9 months

← Newer
1
...
19
20
21
22
23
24
25
...
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