Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[greatlrd] 20206: swedish translations of roscms
by greatlrd＠svn.reactos.com 16 Dec '05

16 Dec '05

swedish translations of roscms Added: trunk/web/reactos.org/htdocs/roscms/inc/lang/sv.php _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/lang/sv.php --- trunk/web/reactos.org/htdocs/roscms/inc/lang/sv.php 2005-12-16 03:04:02 UTC (rev 20205) +++ trunk/web/reactos.org/htdocs/roscms/inc/lang/sv.php 2005-12-16 09:46:41 UTC (rev 20206) @@ -0,0 +1,77 @@ + <?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> + + 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. + */ + + +// +// The format of this file is ---> $roscms_langres['message'] = 'text'; +// + + +// Language settings +$roscms_langres['charset'] = 'utf-8'; +//$roscms_langres['charset'] = 'iso-8859-1'; +$roscms_langres['lang_code'] = 'SV'; + + +// main menu +$roscms_langres['Navigation'] = 'Navigation'; +$roscms_langres['Home'] = 'Hem'; +$roscms_langres['Dev'] = 'Utveckling'; +$roscms_langres['Community'] = 'Community'; +$roscms_langres['Support'] = 'Support'; +$roscms_langres['myReactOS'] = 'mittReactOS'; + +// Login bar: +$roscms_langres['Account'] = 'Konto'; +$roscms_langres['Login'] = 'Logga in'; +$roscms_langres['Logout'] = 'Logga ut'; +$roscms_langres['Global_Login_System'] = 'Globalt Logg in System'; +$roscms_langres['Register_Account'] = 'Registrera Konto'; +$roscms_langres['Login_Nick'] = ' Nick: '; +$roscms_langres['LoginPwd'] = ' Lösenord: '; + + +// myReactOS menu +$roscms_langres['User_Profil_Overview'] = 'Medlems profil Information'; +$roscms_langres['User_Profil'] = 'Medlems profil'; +$roscms_langres['Overview'] = 'Överblick'; +$roscms_langres['Login_System'] = 'Logg in System'; +$roscms_langres['Messages'] = 'Meddelande'; +$roscms_langres['Contacts'] = 'Kontakt'; +$roscms_langres['Favorites'] = 'Favoriter'; +$roscms_langres['Documentation'] = 'Documentation'; +$roscms_langres['Account_Edit'] = 'Inställningar'; +$roscms_langres['Accountlist'] = 'Medlemslista'; + + +// myReactOS Content +$roscms_langres['myReactOS_description'] = 'Ett kraftfult och lättsätt för hantera ditt ReactOS medlemskap konto och hemsidan.'; +$roscms_langres['Account_Information'] = 'Konto Information'; +$roscms_langres['Account_Information_description'] = 'Sammanställning av konto information ... <placeholder>'; + +// Right side bar: +$roscms_langres['Latest_Release'] = 'Senaste Utgåvan'; +$roscms_langres['myReactOS_Developer_Quotes'] = 'Utvecklarna Citat'; + +// Error 404 +$roscms_langres['Page_not_found'] = 'Sidan hittades inte'; + + +?>

1 0

[amunger] 20205: Merge 20204 from trunk.
by amunger＠svn.reactos.com 16 Dec '05

16 Dec '05

Merge 20204 from trunk. Modified: branches/ros-branch-0_2_9/reactos/subsys/system/cmd/cmd.c _____ Modified: branches/ros-branch-0_2_9/reactos/subsys/system/cmd/cmd.c --- branches/ros-branch-0_2_9/reactos/subsys/system/cmd/cmd.c 2005-12-16 03:00:02 UTC (rev 20204) +++ branches/ros-branch-0_2_9/reactos/subsys/system/cmd/cmd.c 2005-12-16 03:04:02 UTC (rev 20205) @@ -353,6 +353,7 @@ if (first == NULL) { error_out_of_memory(); + nErrorLevel = 1; return ; } @@ -361,6 +362,7 @@ { free (first); error_out_of_memory(); + nErrorLevel = 1; return ; } @@ -370,6 +372,7 @@ free (first); free (rest); error_out_of_memory(); + nErrorLevel = 1; return ; } @@ -380,6 +383,7 @@ free (rest); free (full); error_out_of_memory(); + nErrorLevel = 1; return ; } @@ -450,7 +454,7 @@ free (rest); free (full); free (szFullName); - + nErrorLevel = 1; return; } @@ -463,6 +467,7 @@ free (rest); free (full); free (szFullName); + nErrorLevel = 1; return; } @@ -525,6 +530,10 @@ GetExitCodeProcess (prci.hProcess, &dwExitCode); nErrorLevel = (INT)dwExitCode; } + else + { + nErrorLevel = 0; + } CloseHandle (prci.hThread); CloseHandle (prci.hProcess); } @@ -540,7 +549,12 @@ DebugPrintf (_T("[ShellExecute failed!: %s]\n"), full); #endif error_bad_command (); + nErrorLevel = 1; } + else + { + nErrorLevel = 0; + } } // restore console mode SetConsoleMode ( @@ -1331,7 +1345,7 @@ if (!(ip = ReadBatchLine (&bEchoThisLine))) { if (bFlag) - return 0; + return nErrorLevel; ReadCommand (readline, CMDLINE_LENGTH); ip = readline; @@ -1457,7 +1471,7 @@ } while (!bCanExit || !bExit); - return 0; + return nErrorLevel; }

1 0

[amunger] 20204: Return error codes correctly, fixes 1109. Patch by Hartmut Birr.
by amunger＠svn.reactos.com 16 Dec '05

16 Dec '05

Return error codes correctly, fixes 1109. Patch by Hartmut Birr. Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-12-15 23:24:43 UTC (rev 20203) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-12-16 03:00:02 UTC (rev 20204) @@ -353,6 +353,7 @@ if (first == NULL) { error_out_of_memory(); + nErrorLevel = 1; return ; } @@ -361,6 +362,7 @@ { free (first); error_out_of_memory(); + nErrorLevel = 1; return ; } @@ -370,6 +372,7 @@ free (first); free (rest); error_out_of_memory(); + nErrorLevel = 1; return ; } @@ -380,6 +383,7 @@ free (rest); free (full); error_out_of_memory(); + nErrorLevel = 1; return ; } @@ -450,7 +454,7 @@ free (rest); free (full); free (szFullName); - + nErrorLevel = 1; return; } @@ -463,6 +467,7 @@ free (rest); free (full); free (szFullName); + nErrorLevel = 1; return; } @@ -525,6 +530,10 @@ GetExitCodeProcess (prci.hProcess, &dwExitCode); nErrorLevel = (INT)dwExitCode; } + else + { + nErrorLevel = 0; + } CloseHandle (prci.hThread); CloseHandle (prci.hProcess); } @@ -540,7 +549,12 @@ DebugPrintf (_T("[ShellExecute failed!: %s]\n"), full); #endif error_bad_command (); + nErrorLevel = 1; } + else + { + nErrorLevel = 0; + } } // restore console mode SetConsoleMode ( @@ -1331,7 +1345,7 @@ if (!(ip = ReadBatchLine (&bEchoThisLine))) { if (bFlag) - return 0; + return nErrorLevel; ReadCommand (readline, CMDLINE_LENGTH); ip = readline; @@ -1457,7 +1471,7 @@ } while (!bCanExit || !bExit); - return 0; + return nErrorLevel; }

1 0

[hpoussin] 20203: Implement DICS_FLAG_CONFIGSPECIFIC case in SetupDiOpenDevRegKey, by factorizing some code from SetupDiCreateDevRegKeyW to OpenHardwareProfileKey
by hpoussin＠svn.reactos.com 15 Dec '05

15 Dec '05

Implement DICS_FLAG_CONFIGSPECIFIC case in SetupDiOpenDevRegKey, by factorizing some code from SetupDiCreateDevRegKeyW to OpenHardwareProfileKey Don't ask for KEY_ENUMERATE_SUB_KEYS access right when not needed Implemenent internal function ResetDevice() Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-15 22:13:01 UTC (rev 20202) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-15 23:24:43 UTC (rev 20203) @@ -1619,10 +1619,10 @@ /* Find class GUID associated to the device instance */ rc = RegOpenKeyExW( - HKEY_LOCAL_MACHINE, + list->HKLM, REGSTR_PATH_SYSTEMENUM, 0, /* Options */ - KEY_ENUMERATE_SUB_KEYS, + 0, &hEnumKey); if (rc != ERROR_SUCCESS) { @@ -2670,7 +2670,7 @@ list->HKLM, REGSTR_PATH_SYSTEMENUM, 0, /* Options */ - KEY_ENUMERATE_SUB_KEYS, + 0, &hEnumKey); if (rc != ERROR_SUCCESS) { @@ -3198,7 +3198,7 @@ rc = RegOpenKeyExW(HKLM, lpKeyName, 0, - ClassGuid ? KEY_ENUMERATE_SUB_KEYS : samDesired, + ClassGuid ? 0 : samDesired, &hClassesKey); if (MachineName != NULL) RegCloseKey(HKLM); if (rc != ERROR_SUCCESS) @@ -4304,6 +4304,63 @@ return ret; } +static HKEY +OpenHardwareProfileKey( + IN HKEY HKLM, + IN DWORD HwProfile, + IN DWORD samDesired) +{ + HKEY hHWProfilesKey = INVALID_HANDLE_VALUE; + HKEY hHWProfileKey = INVALID_HANDLE_VALUE; + HKEY ret = INVALID_HANDLE_VALUE; + LONG rc; + + rc = RegOpenKeyExW(HKLM, + REGSTR_PATH_HWPROFILES, + 0, + 0, + &hHWProfilesKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + if (HwProfile == 0) + { + rc = RegOpenKeyExW( + hHWProfilesKey, + REGSTR_KEY_CURRENT, + 0, + KEY_CREATE_SUB_KEY, + &hHWProfileKey); + } + else + { + WCHAR subKey[5]; + snprintfW(subKey, 4, L"%04lu", HwProfile); + subKey[4] = '\0'; + rc = RegOpenKeyExW( + hHWProfilesKey, + subKey, + 0, + KEY_CREATE_SUB_KEY, + &hHWProfileKey); + } + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + ret = hHWProfileKey; + +cleanup: + if (hHWProfilesKey != INVALID_HANDLE_VALUE) + RegCloseKey(hHWProfilesKey); + if (hHWProfileKey != INVALID_HANDLE_VALUE && hHWProfileKey != ret) + RegCloseKey(hHWProfileKey); + return ret; +} + /*********************************************************************** * SetupDiCreateDevRegKeyW (SETUPAPI.@) */ @@ -4345,7 +4402,6 @@ LPWSTR pDeviceInstance; /* Points into DriverKey, on the Index field */ DWORD Index; /* Index used in the DriverKey name */ DWORD rc; - HKEY hHWProfilesKey = INVALID_HANDLE_VALUE; HKEY hHWProfileKey = INVALID_HANDLE_VALUE; HKEY hEnumKey = INVALID_HANDLE_VALUE; HKEY hClassKey = INVALID_HANDLE_VALUE; @@ -4357,42 +4413,9 @@ RootKey = list->HKLM; else /* Scope == DICS_FLAG_CONFIGSPECIFIC */ { - rc = RegOpenKeyExW(list->HKLM, - REGSTR_PATH_HWPROFILES, - 0, - 0, - &hHWProfilesKey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); + hHWProfileKey = OpenHardwareProfileKey(list->HKLM, HwProfile, KEY_CREATE_SUB_KEY); + if (hHWProfileKey == INVALID_HANDLE_VALUE) goto cleanup; - } - if (HwProfile == 0) - { - rc = RegOpenKeyExW( - hHWProfilesKey, - REGSTR_KEY_CURRENT, - 0, - KEY_CREATE_SUB_KEY, - &hHWProfileKey); - } - else - { - WCHAR subKey[5]; - snprintfW(subKey, 4, L"%04lu", HwProfile); - subKey[4] = '\0'; - rc = RegOpenKeyExW( - hHWProfilesKey, - subKey, - 0, - KEY_CREATE_SUB_KEY, - &hHWProfileKey); - } - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } RootKey = hHWProfileKey; } @@ -4522,8 +4545,6 @@ if (lpGuidString) RpcStringFreeW(&lpGuidString); HeapFree(GetProcessHeap(), 0, DriverKey); - if (hHWProfilesKey != INVALID_HANDLE_VALUE) - RegCloseKey(hHWProfilesKey); if (hHWProfileKey != INVALID_HANDLE_VALUE) RegCloseKey(hHWProfileKey); if (hEnumKey != INVALID_HANDLE_VALUE) @@ -4571,104 +4592,113 @@ SetLastError(ERROR_INVALID_PARAMETER); else { - HKEY hKey = INVALID_HANDLE_VALUE; - HKEY hRootKey = INVALID_HANDLE_VALUE; struct DeviceInfoElement *deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; LPWSTR DriverKey = NULL; DWORD dwLength = 0; DWORD dwRegType; DWORD rc; + HKEY hHWProfileKey = INVALID_HANDLE_VALUE; + HKEY hEnumKey = INVALID_HANDLE_VALUE; + HKEY hKey = INVALID_HANDLE_VALUE; + HKEY RootKey; - if (Scope == DICS_FLAG_CONFIGSPECIFIC) + if (Scope == DICS_FLAG_GLOBAL) + RootKey = list->HKLM; + else /* Scope == DICS_FLAG_CONFIGSPECIFIC */ { - FIXME("DICS_FLAG_CONFIGSPECIFIC case unimplemented\n"); + hHWProfileKey = OpenHardwareProfileKey(list->HKLM, HwProfile, 0); + if (hHWProfileKey == INVALID_HANDLE_VALUE) + goto cleanup; + RootKey = hHWProfileKey; } - else /* Scope == DICS_FLAG_GLOBAL */ + + rc = RegOpenKeyExW( + RootKey, + REGSTR_PATH_SYSTEMENUM, + 0, /* Options */ + 0, + &hEnumKey); + if (rc != ERROR_SUCCESS) { - rc = RegOpenKeyExW( - list->HKLM, - REGSTR_PATH_SYSTEMENUM, - 0, /* Options */ - KEY_ENUMERATE_SUB_KEYS, - &hRootKey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - rc = RegOpenKeyExW( - hRootKey, - deviceInfo->DeviceName, - 0, /* Options */ - KeyType == DIREG_DEV ? samDesired : KEY_QUERY_VALUE, - &hKey); - RegCloseKey(hRootKey); - hRootKey = INVALID_HANDLE_VALUE; - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - if (KeyType == DIREG_DEV) - { - /* We're done. Just return the hKey handle */ - ret = hKey; - goto cleanup; - } - /* Read the 'Driver' key */ - rc = RegQueryValueExW(hKey, REGSTR_VAL_DRIVER, NULL, &dwRegType, NULL, &dwLength); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - if (dwRegType != REG_SZ) - { - SetLastError(ERROR_GEN_FAILURE); - goto cleanup; - } - DriverKey = HeapAlloc(GetProcessHeap(), 0, dwLength); - if (!DriverKey) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - rc = RegQueryValueExW(hKey, REGSTR_VAL_DRIVER, NULL, &dwRegType, (LPBYTE)DriverKey, &dwLength); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - RegCloseKey(hKey); - hKey = INVALID_HANDLE_VALUE; - /* Need to open the driver key */ - rc = RegOpenKeyExW( - list->HKLM, - REGSTR_PATH_CLASS_NT, - 0, /* Options */ - KEY_ENUMERATE_SUB_KEYS, - &hRootKey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - rc = RegOpenKeyExW( - hRootKey, - DriverKey, - 0, /* Options */ - samDesired, - &hKey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } + SetLastError(rc); + goto cleanup; + } + rc = RegOpenKeyExW( + hEnumKey, + deviceInfo->DeviceName, + 0, /* Options */ + KeyType == DIREG_DEV ? samDesired : KEY_QUERY_VALUE, + &hKey); + RegCloseKey(hEnumKey); + hEnumKey = INVALID_HANDLE_VALUE; + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + if (KeyType == DIREG_DEV) + { + /* We're done. Just return the hKey handle */ + CHECKPOINT1; ret = hKey; + goto cleanup; } + /* Read the 'Driver' key */ + rc = RegQueryValueExW(hKey, REGSTR_VAL_DRIVER, NULL, &dwRegType, NULL, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + else if (dwRegType != REG_SZ) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + DriverKey = HeapAlloc(GetProcessHeap(), 0, dwLength); + if (!DriverKey) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + rc = RegQueryValueExW(hKey, REGSTR_VAL_DRIVER, NULL, &dwRegType, (LPBYTE)DriverKey, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + RegCloseKey(hKey); + hKey = INVALID_HANDLE_VALUE; + /* Need to open the driver key */ + rc = RegOpenKeyExW( + RootKey, + REGSTR_PATH_CLASS_NT, + 0, /* Options */ + 0, + &hEnumKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + rc = RegOpenKeyExW( + hEnumKey, + DriverKey, + 0, /* Options */ + samDesired, + &hKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + ret = hKey; + cleanup: - if (hRootKey != INVALID_HANDLE_VALUE) - RegCloseKey(hRootKey); + if (hHWProfileKey != INVALID_HANDLE_VALUE) + RegCloseKey(hHWProfileKey); + if (hEnumKey != INVALID_HANDLE_VALUE) + RegCloseKey(hEnumKey); if (hKey != INVALID_HANDLE_VALUE && hKey != ret) RegCloseKey(hKey); } @@ -5717,7 +5747,7 @@ list->HKLM, REGSTR_PATH_SYSTEMENUM, 0, /* Options */ - KEY_ENUMERATE_SUB_KEYS, + 0, &hEnumKey); if (rc != ERROR_SUCCESS) { @@ -6461,11 +6491,39 @@ return hwProfile; } +static BOOL +ResetDevice( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + PLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData; + struct DeviceInfoElement *deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + NTSTATUS Status; + + if (((struct DeviceInfoSet *)DeviceInfoSet)->HKLM != HKEY_LOCAL_MACHINE) + { + /* At the moment, I only know how to start local devices */ + SetLastError(ERROR_INVALID_COMPUTERNAME); + return FALSE; + } + + RtlInitUnicodeString(&ResetDeviceData.DeviceInstance, deviceInfo->DeviceName); + Status = NtPlugPlayControl(PlugPlayControlResetDevice, &ResetDeviceData, sizeof(PLUGPLAY_CONTROL_RESET_DEVICE_DATA)); + SetLastError(RtlNtStatusToDosError(Status)); + return NT_SUCCESS(Status); +} + +static BOOL StopDevice( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + FIXME("Stub %p %p\n", DeviceInfoSet, DeviceInfoData); + return TRUE; +} + /*********************************************************************** * SetupDiChangeState (SETUPAPI.@) */ -static BOOL StartDevice(VOID) { FIXME("Stub"); return TRUE; } -static BOOL StopDevice(VOID) { FIXME("Stub"); return TRUE; } BOOL WINAPI SetupDiChangeState( IN HDEVINFO DeviceInfoSet, @@ -6503,7 +6561,7 @@ /* Enable/disable device in registry */ hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, PropChange->Scope, PropChange->HwProfile, DIREG_DEV, KEY_QUERY_VALUE | KEY_SET_VALUE); if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) - hKey = SetupDiCreateDevRegKey(DeviceInfoSet, DeviceInfoData, PropChange->Scope, PropChange->HwProfile, DIREG_DEV, NULL, NULL); + hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, PropChange->Scope, PropChange->HwProfile, DIREG_DEV, NULL, NULL); if (hKey == INVALID_HANDLE_VALUE) break; dwLength = sizeof(DWORD); @@ -6547,9 +6605,9 @@ || PropChange->HwProfile == GetCurrentHwProfile(DeviceInfoSet)) { if (PropChange->StateChange == DICS_ENABLE) - ret = StartDevice(); + ret = ResetDevice(DeviceInfoSet, DeviceInfoData); else - ret = StopDevice(); + ret = StopDevice(DeviceInfoSet, DeviceInfoData); } else ret = TRUE; @@ -6557,7 +6615,7 @@ } case DICS_PROPCHANGE: { - ret = StopDevice() && StartDevice(); + ret = ResetDevice(DeviceInfoSet, DeviceInfoData); break; } default: @@ -6837,7 +6895,6 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData) { - struct DeviceInfoElement *DevInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; SP_DEVINSTALL_PARAMS_W InstallParams; struct DriverInfoElement *SelectedDriver; SYSTEMTIME DriverDate; @@ -7166,13 +7223,7 @@ /* Start the device */ if (!RebootRequired && !(InstallParams.Flags & (DI_NEEDRESTART | DI_NEEDREBOOT | DI_DONOTCALLCONFIGMG))) - { - PLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData; - NTSTATUS Status; - RtlInitUnicodeString(&ResetDeviceData.DeviceInstance, DevInfo->DeviceName); - Status = NtPlugPlayControl(PlugPlayControlResetDevice, &ResetDeviceData, sizeof(PLUGPLAY_CONTROL_RESET_DEVICE_DATA)); - ret = NT_SUCCESS(Status); - } + ret = ResetDevice(DeviceInfoSet, DeviceInfoData); else ret = TRUE;

1 0

[hpoussin] 20202: Replace some strings by constants
by hpoussin＠svn.reactos.com 15 Dec '05

15 Dec '05

Replace some strings by constants Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/w32api/include/regstr.h _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-15 21:21:38 UTC (rev 20201) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-15 22:13:01 UTC (rev 20202) @@ -30,31 +30,12 @@ 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 InterfaceInstall32[] = {'I','n','t','e','r','f','a','c','e','I','n','s','t','a','l','l','3','2' ,0}; -static const WCHAR NoDisplayClass[] = {'N','o','D','i','s','p','l','a','y','C','l','a','s','s',0}; -static const WCHAR NoInstallClass[] = {'N','o','I','s','t','a','l','l','C','l','a','s','s',0}; -static const WCHAR NoUseClass[] = {'N','o','U','s','e','C','l','a','s','s',0}; static const WCHAR NtExtension[] = {'.','N','T',0}; static const WCHAR NtPlatformExtension[] = {'.','N','T','x','8','6',0}; static const WCHAR SymbolicLink[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; static const WCHAR WinExtension[] = {'.','W','i','n',0}; -/* Registry key and value names */ -static const WCHAR ControlClass[] = {'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\' , - 'C','o','n','t','r','o','l','\\', - 'C','l','a','s','s',0}; - -static const WCHAR DeviceClasses[] = {'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\' , - 'C','o','n','t','r','o','l','\\', - 'D','e','v','i','c','e','C','l','a','s','s','e','s',0}; - -static const WCHAR EnumKeyName[] = {'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\' , - 'E','n','u','m',0}; - - /* FIXME: header mess */ DEFINE_GUID(GUID_NULL, 0x00000000L, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); @@ -256,7 +237,7 @@ } if (!RegQueryValueExW(hClassKey, - NoUseClass, + REGSTR_VAL_NOUSECLASS, NULL, NULL, NULL, @@ -269,7 +250,7 @@ if ((Flags & DIBCI_NOINSTALLCLASS) && (!RegQueryValueExW(hClassKey, - NoInstallClass, + REGSTR_VAL_NOINSTALLCLASS, NULL, NULL, NULL, @@ -282,7 +263,7 @@ if ((Flags & DIBCI_NODISPLAYCLASS) && (!RegQueryValueExW(hClassKey, - NoDisplayClass, + REGSTR_VAL_NODISPLAYCLASS, NULL, NULL, NULL, @@ -1401,7 +1382,7 @@ HKLM = HKEY_LOCAL_MACHINE; rc = RegOpenKeyExW(HKLM, - EnumKeyName, + REGSTR_PATH_SYSTEMENUM, 0, KEY_ENUMERATE_SUB_KEYS, &hEnumKey); @@ -1639,7 +1620,7 @@ /* Find class GUID associated to the device instance */ rc = RegOpenKeyExW( HKEY_LOCAL_MACHINE, - EnumKeyName, + REGSTR_PATH_SYSTEMENUM, 0, /* Options */ KEY_ENUMERATE_SUB_KEYS, &hEnumKey); @@ -1914,8 +1895,8 @@ LONG rc; BOOL ret = FALSE; - /* Read "Icon" registry key */ - rc = RegQueryValueExW(hClassKey, L"Icon", NULL, &dwRegType, NULL, &dwLength); + /* Read icon registry key */ + rc = RegQueryValueExW(hClassKey, REGSTR_VAL_INSICON, NULL, &dwRegType, NULL, &dwLength); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -1931,7 +1912,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } - rc = RegQueryValueExW(hClassKey, L"Icon", NULL, NULL, (LPBYTE)Buffer, &dwLength); + rc = RegQueryValueExW(hClassKey, REGSTR_VAL_INSICON, NULL, NULL, (LPBYTE)Buffer, &dwLength); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -1940,7 +1921,7 @@ /* make sure the returned buffer is NULL-terminated */ Buffer[dwLength / sizeof(WCHAR)] = 0; - /* Transform "Icon" value to a INT */ + /* Transform icon value to a INT */ *ImageIndex = atoiW(Buffer); ret = TRUE; @@ -2122,7 +2103,7 @@ PWCHAR Comma; LONG rc; DWORD dwRegType, dwLength; - rc = RegQueryValueExW(hKey, L"Installer32", NULL, &dwRegType, NULL, &dwLength); + rc = RegQueryValueExW(hKey, REGSTR_VAL_INSTALLER_32, NULL, &dwRegType, NULL, &dwLength); if (rc == ERROR_SUCCESS && dwRegType == REG_SZ) { Buffer = MyMalloc(dwLength + sizeof(WCHAR)); @@ -2131,7 +2112,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } - rc = RegQueryValueExW(hKey, L"Installer32", NULL, NULL, (LPBYTE)Buffer, &dwLength); + rc = RegQueryValueExW(hKey, REGSTR_VAL_INSTALLER_32, NULL, NULL, (LPBYTE)Buffer, &dwLength); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -2141,7 +2122,7 @@ Buffer[dwLength / sizeof(WCHAR)] = 0; } else if - (ERROR_SUCCESS == (rc = RegQueryValueExW(hKey, L"EnumPropPages32", NULL, &dwRegType, NULL, &dwLength)) + (ERROR_SUCCESS == (rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, &dwRegType, NULL, &dwLength)) && dwRegType == REG_SZ) { Buffer = MyMalloc(dwLength + sizeof(WCHAR)); @@ -2150,7 +2131,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } - rc = RegQueryValueExW(hKey, L"EnumPropPages32", NULL, NULL, (LPBYTE)Buffer, &dwLength); + rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, NULL, (LPBYTE)Buffer, &dwLength); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -2646,39 +2627,39 @@ switch (Property) { case SPDRP_CAPABILITIES: - RegistryPropertyName = L"Capabilities"; break; + RegistryPropertyName = REGSTR_VAL_CAPABILITIES; break; case SPDRP_CLASS: - RegistryPropertyName = L"Class"; break; + RegistryPropertyName = REGSTR_VAL_CLASS; break; case SPDRP_CLASSGUID: - RegistryPropertyName = L"ClassGUID"; break; + RegistryPropertyName = REGSTR_VAL_CLASSGUID; break; case SPDRP_COMPATIBLEIDS: - RegistryPropertyName = L"CompatibleIDs"; break; + RegistryPropertyName = REGSTR_VAL_COMPATIBLEIDS; break; case SPDRP_CONFIGFLAGS: - RegistryPropertyName = L"ConfigFlags"; break; + RegistryPropertyName = REGSTR_VAL_CONFIGFLAGS; break; case SPDRP_DEVICEDESC: - RegistryPropertyName = L"DeviceDesc"; break; + RegistryPropertyName = REGSTR_VAL_DEVDESC; break; case SPDRP_DRIVER: - RegistryPropertyName = L"Driver"; break; + RegistryPropertyName = REGSTR_VAL_DRIVER; break; case SPDRP_FRIENDLYNAME: - RegistryPropertyName = L"FriendlyName"; break; + RegistryPropertyName = REGSTR_VAL_FRIENDLYNAME; break; case SPDRP_HARDWAREID: - RegistryPropertyName = L"HardwareID"; break; + RegistryPropertyName = REGSTR_VAL_HARDWAREID; break; case SPDRP_LOCATION_INFORMATION: - RegistryPropertyName = L"LocationInformation"; break; + RegistryPropertyName = REGSTR_VAL_LOCATION_INFORMATION; break; case SPDRP_LOWERFILTERS: - RegistryPropertyName = L"LowerFilters"; break; + RegistryPropertyName = REGSTR_VAL_LOWERFILTERS; break; case SPDRP_MFG: - RegistryPropertyName = L"Mfg"; break; + RegistryPropertyName = REGSTR_VAL_MFG; break; case SPDRP_SECURITY: RegistryPropertyName = L"Security"; break; case SPDRP_SERVICE: - RegistryPropertyName = L"Service"; break; + RegistryPropertyName = REGSTR_VAL_SERVICE; break; case SPDRP_UI_NUMBER: - RegistryPropertyName = L"UINumber"; break; + RegistryPropertyName = REGSTR_VAL_UI_NUMBER; break; case SPDRP_UI_NUMBER_DESC_FORMAT: RegistryPropertyName = L"UINumberDescFormat"; break; case SPDRP_UPPERFILTERS: - RegistryPropertyName = L"UpperFilters"; break; + RegistryPropertyName = REGSTR_VAL_UPPERFILTERS; break; default: /* Should not happen */ RegistryPropertyName = NULL; break; @@ -2687,7 +2668,7 @@ /* Open registry key name */ rc = RegOpenKeyExW( list->HKLM, - EnumKeyName, + REGSTR_PATH_SYSTEMENUM, 0, /* Options */ KEY_ENUMERATE_SUB_KEYS, &hEnumKey); @@ -2846,27 +2827,27 @@ switch (Property) { case SPDRP_COMPATIBLEIDS: - RegistryPropertyName = L"CompatibleIDs"; + RegistryPropertyName = REGSTR_VAL_COMPATIBLEIDS; RegistryDataType = REG_MULTI_SZ; break; case SPDRP_CONFIGFLAGS: - RegistryPropertyName = L"ConfigFlags"; + RegistryPropertyName = REGSTR_VAL_CONFIGFLAGS; RegistryDataType = REG_DWORD; break; case SPDRP_FRIENDLYNAME: - RegistryPropertyName = L"FriendlyName"; + RegistryPropertyName = REGSTR_VAL_FRIENDLYNAME; RegistryDataType = REG_SZ; break; case SPDRP_HARDWAREID: - RegistryPropertyName = L"HardwareID"; + RegistryPropertyName = REGSTR_VAL_HARDWAREID; RegistryDataType = REG_MULTI_SZ; break; case SPDRP_LOCATION_INFORMATION: - RegistryPropertyName = L"LocationInformation"; + RegistryPropertyName = REGSTR_VAL_LOCATION_INFORMATION; RegistryDataType = REG_SZ; break; case SPDRP_LOWERFILTERS: - RegistryPropertyName = L"LowerFilters"; + RegistryPropertyName = REGSTR_VAL_LOWERFILTERS; RegistryDataType = REG_MULTI_SZ; break; case SPDRP_SECURITY: @@ -2874,7 +2855,7 @@ RegistryDataType = REG_BINARY; break; case SPDRP_SERVICE: - RegistryPropertyName = L"Service"; + RegistryPropertyName = REGSTR_VAL_SERVICE; RegistryDataType = REG_SZ; break; case SPDRP_UI_NUMBER_DESC_FORMAT: @@ -2882,7 +2863,7 @@ RegistryDataType = REG_SZ; break; case SPDRP_UPPERFILTERS: - RegistryPropertyName = L"UpperFilters"; + RegistryPropertyName = REGSTR_VAL_UPPERFILTERS; RegistryDataType = REG_MULTI_SZ; break; default: @@ -2976,7 +2957,7 @@ return INVALID_HANDLE_VALUE; } - lstrcpyW(FullBuffer, ControlClass); + lstrcpyW(FullBuffer, REGSTR_PATH_CLASS_NT); lstrcatW(FullBuffer, Buffer); @@ -3189,11 +3170,11 @@ if (Flags == DIOCR_INSTALLER) { - lpKeyName = ControlClass; + lpKeyName = REGSTR_PATH_CLASS_NT; } else if (Flags == DIOCR_INTERFACE) { - lpKeyName = DeviceClasses; + lpKeyName = REGSTR_PATH_DEVICE_CLASSES; } else { @@ -3630,13 +3611,13 @@ hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_QUERY_VALUE); if (hKey != INVALID_HANDLE_VALUE) { - rc = RegQueryValueExW(hKey, L"CoInstallers32", NULL, &dwRegType, NULL, &dwLength); + rc = RegQueryValueExW(hKey, REGSTR_VAL_COINSTALLERS_32, NULL, &dwRegType, NULL, &dwLength); if (rc == ERROR_SUCCESS && dwRegType == REG_MULTI_SZ) { LPWSTR KeyBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength); if (KeyBuffer != NULL) { - rc = RegQueryValueExW(hKey, L"CoInstallers32", NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); + rc = RegQueryValueExW(hKey, REGSTR_VAL_COINSTALLERS_32, NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); if (rc == ERROR_SUCCESS) { LPWSTR ptr; @@ -3665,7 +3646,7 @@ { rc = RegOpenKeyEx( HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Control\\CoDeviceInstallers", + REGSTR_PATH_CODEVICEINSTALLERS, 0, /* Options */ KEY_QUERY_VALUE, &hKey); @@ -3712,13 +3693,13 @@ hKey = SetupDiOpenClassRegKey(&DeviceInfoData->ClassGuid, KEY_QUERY_VALUE); if (hKey != INVALID_HANDLE_VALUE) { - rc = RegQueryValueExW(hKey, L"Installer32", NULL, &dwRegType, NULL, &dwLength); + rc = RegQueryValueExW(hKey, REGSTR_VAL_INSTALLER_32, NULL, &dwRegType, NULL, &dwLength); if (rc == ERROR_SUCCESS && dwRegType == REG_SZ) { LPWSTR KeyBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength); if (KeyBuffer != NULL) { - rc = RegQueryValueExW(hKey, L"Installer32", NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); + rc = RegQueryValueExW(hKey, REGSTR_VAL_INSTALLER_32, NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); if (rc == ERROR_SUCCESS) { /* Get ClassInstaller function pointer */ @@ -4217,7 +4198,7 @@ if (hKey == INVALID_HANDLE_VALUE) goto cleanup; - rc = RegQueryValueExW(hKey, L"EnumPropPages32", NULL, &dwRegType, NULL, &dwLength); + rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, &dwRegType, NULL, &dwLength); if (rc == ERROR_FILE_NOT_FOUND) { /* No registry key. As it is optional, don't say it's a bad error */ @@ -4238,7 +4219,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } - rc = RegQueryValueExW(hKey, L"EnumPropPages32", NULL, NULL, (LPBYTE)PropPageProvider, &dwLength); + rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, NULL, (LPBYTE)PropPageProvider, &dwLength); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -4377,7 +4358,7 @@ else /* Scope == DICS_FLAG_CONFIGSPECIFIC */ { rc = RegOpenKeyExW(list->HKLM, - L"SYSTEM\\CurrentControlSet\\Hardware Profiles", + REGSTR_PATH_HWPROFILES, 0, 0, &hHWProfilesKey); @@ -4421,7 +4402,7 @@ rc = RegCreateKeyExW( RootKey, - EnumKeyName, + REGSTR_PATH_SYSTEMENUM, 0, NULL, REG_OPTION_NON_VOLATILE, @@ -4470,7 +4451,7 @@ wcscat(DriverKey, L"}\\"); pDeviceInstance = &DriverKey[wcslen(DriverKey)]; rc = RegOpenKeyExW(RootKey, - ControlClass, + REGSTR_PATH_CLASS_NT, 0, KEY_CREATE_SUB_KEY, &hClassKey); @@ -4521,7 +4502,7 @@ hDeviceKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, Scope, HwProfile, DIREG_DEV, KEY_SET_VALUE); if (hDeviceKey == INVALID_HANDLE_VALUE) goto cleanup; - rc = RegSetValueEx(hDeviceKey, L"Driver", 0, REG_SZ, (const BYTE *)DriverKey, (wcslen(DriverKey) + 1) * sizeof(WCHAR)); + rc = RegSetValueEx(hDeviceKey, REGSTR_VAL_DRIVER, 0, REG_SZ, (const BYTE *)DriverKey, (wcslen(DriverKey) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -4606,7 +4587,7 @@ { rc = RegOpenKeyExW( list->HKLM, - EnumKeyName, + REGSTR_PATH_SYSTEMENUM, 0, /* Options */ KEY_ENUMERATE_SUB_KEYS, &hRootKey); @@ -4635,7 +4616,7 @@ goto cleanup; } /* Read the 'Driver' key */ - rc = RegQueryValueExW(hKey, L"Driver", NULL, &dwRegType, NULL, &dwLength); + rc = RegQueryValueExW(hKey, REGSTR_VAL_DRIVER, NULL, &dwRegType, NULL, &dwLength); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -4652,7 +4633,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } - rc = RegQueryValueExW(hKey, L"Driver", NULL, &dwRegType, (LPBYTE)DriverKey, &dwLength); + rc = RegQueryValueExW(hKey, REGSTR_VAL_DRIVER, NULL, &dwRegType, (LPBYTE)DriverKey, &dwLength); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -4663,7 +4644,7 @@ /* Need to open the driver key */ rc = RegOpenKeyExW( list->HKLM, - ControlClass, + REGSTR_PATH_CLASS_NT, 0, /* Options */ KEY_ENUMERATE_SUB_KEYS, &hRootKey); @@ -5734,7 +5715,7 @@ /* Open supposed registry key */ rc = RegOpenKeyExW( list->HKLM, - EnumKeyName, + REGSTR_PATH_SYSTEMENUM, 0, /* Options */ KEY_ENUMERATE_SUB_KEYS, &hEnumKey); @@ -7168,15 +7149,15 @@ TRACE("DeviceDesc : '%S'\n", SelectedDriver->Info.Description); TRACE("Mfg : '%S'\n", SelectedDriver->Info.MfgName); TRACE("Service : '%S'\n", AssociatedService); - rc = RegSetValueEx(hKey, L"Class", 0, REG_SZ, (const BYTE *)ClassName, (wcslen(ClassName) + 1) * sizeof(WCHAR)); + rc = RegSetValueEx(hKey, REGSTR_VAL_CLASS, 0, REG_SZ, (const BYTE *)ClassName, (wcslen(ClassName) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, L"ClassGUID", 0, REG_SZ, (const BYTE *)lpFullGuidString, (wcslen(lpFullGuidString) + 1) * sizeof(WCHAR)); + rc = RegSetValueEx(hKey, REGSTR_VAL_CLASSGUID, 0, REG_SZ, (const BYTE *)lpFullGuidString, (wcslen(lpFullGuidString) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, L"DeviceDesc", 0, REG_SZ, (const BYTE *)SelectedDriver->Info.Description, (wcslen(SelectedDriver->Info.Description) + 1) * sizeof(WCHAR)); + 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, L"Mfg", 0, REG_SZ, (const BYTE *)SelectedDriver->Info.MfgName, (wcslen(SelectedDriver->Info.MfgName) + 1) * sizeof(WCHAR)); + 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) - rc = RegSetValueEx(hKey, L"Service", 0, REG_SZ, (const BYTE *)AssociatedService, (wcslen(AssociatedService) + 1) * sizeof(WCHAR)); + rc = RegSetValueEx(hKey, REGSTR_VAL_SERVICE, 0, REG_SZ, (const BYTE *)AssociatedService, (wcslen(AssociatedService) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { SetLastError(rc); _____ Modified: trunk/reactos/w32api/include/regstr.h --- trunk/reactos/w32api/include/regstr.h 2005-12-15 21:21:38 UTC (rev 20201) +++ trunk/reactos/w32api/include/regstr.h 2005-12-15 22:13:01 UTC (rev 20202) @@ -421,6 +421,13 @@ #define EISAFLAG_SLOT_IO_FIRST 2 #define EISA_NO_MAX_FUNCTION 0xFF #define NUM_EISA_RANGES 4 +#define REGSTR_VAL_CAPABILITIES TEXT("Capabilities") +#define REGSTR_VAL_CLASSGUID TEXT("ClassGUID") +#define REGSTR_VAL_LOCATION_INFORMATION TEXT("LocationInformation") +#define REGSTR_VAL_LOWERFILTERS TEXT("LowerFilters") +#define REGSTR_VAL_SERVICE TEXT("Service") +#define REGSTR_VAL_UI_NUMBER TEXT("UINumber") +#define REGSTR_VAL_UPPERFILTERS TEXT("UpperFilters") #define REGSTR_VAL_DRVDESC TEXT("DriverDesc") #define REGSTR_VAL_DEVLOADER TEXT("DevLoader") #define REGSTR_VAL_STATICVXD TEXT("StaticVxD") @@ -434,6 +441,8 @@ #define REGSTR_VAL_PORTNAME TEXT("PortName") #define REGSTR_VAL_INFPATH TEXT("InfPath") #define REGSTR_VAL_INFSECTION TEXT("InfSection") +#define REGSTR_VAL_INFSECTIONEXT TEXT("InfSectionExt") +#define REGSTR_VAL_MATCHINGDEVID TEXT("MatchingDeviceId") #define REGSTR_VAL_POLLING TEXT("Polling") #define REGSTR_VAL_DONTLOADIFCONFLICT TEXT("DontLoadIfConflict") #define REGSTR_VAL_PORTSUBCLASS TEXT("PortSubClass") @@ -470,10 +479,18 @@ #define REGSTR_VAL_PCSSDRIVER TEXT("Driver") #define REGSTR_KEY_PCMTD TEXT("MTD-") #define REGSTR_VAL_PCMTDRIVER TEXT("MTD") +#define REGSTR_PATH_CLASS_NT TEXT("System\\CurrentControlSet\\Control\\Class") +#define REGSTR_PATH_CODEVICEINSTALLERS TEXT("System\\CurrentControlSet\\Control\\CoDeviceInstallers") +#define REGSTR_PATH_DEVICE_CLASSES TEXT("System\\CurrentControlSet\\Control\\DeviceClasses") +#define REGSTR_PATH_HWPROFILES TEXT("System\\CurrentControlSet\\Hardware Profiles") +#define REGSTR_PATH_SYSTEMENUM TEXT("System\\CurrentControlSet\\Enum") +#define REGSTR_VAL_COINSTALLERS_32 TEXT("CoInstallers32") #define REGSTR_VAL_HARDWAREID TEXT("HardwareID") #define REGSTR_VAL_INSTALLER TEXT("Installer") +#define REGSTR_VAL_INSTALLER_32 TEXT("Installer32") #define REGSTR_VAL_INSICON TEXT("Icon") #define REGSTR_VAL_ENUMPROPPAGES TEXT("EnumPropPages") +#define REGSTR_VAL_ENUMPROPPAGES_32 TEXT("EnumPropPages32") #define REGSTR_VAL_BASICPROPERTIES TEXT("BasicProperties") #define REGSTR_VAL_PRIVATEPROBLEM TEXT("PrivateProblem") #define REGSTR_KEY_CURRENT TEXT("Current")

1 0

[hpoussin] 20201: Implement DICS_FLAG_CONFIGSPECIFIC and DIREG_DEV cases in SetupDiCreateDevRegKeyW
by hpoussin＠svn.reactos.com 15 Dec '05

15 Dec '05

Implement DICS_FLAG_CONFIGSPECIFIC and DIREG_DEV cases in SetupDiCreateDevRegKeyW Implement SetupDiChangeState Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi_private.h _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-15 21:01:01 UTC (rev 20200) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-15 21:21:38 UTC (rev 20201) @@ -3397,15 +3397,17 @@ static BOOL PropertyChangeHandler( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DEVINFO_DATA DeviceInfoData, IN PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, IN DWORD ClassInstallParamsSize) { PSP_PROPCHANGE_PARAMS PropChangeParams = (PSP_PROPCHANGE_PARAMS)ClassInstallParams; BOOL ret = FALSE; - if (ClassInstallParamsSize != sizeof(SP_PROPCHANGE_PARAMS)) + if (!DeviceInfoData) SetLastError(ERROR_INVALID_PARAMETER); + else if (ClassInstallParamsSize != sizeof(SP_PROPCHANGE_PARAMS)) + SetLastError(ERROR_INVALID_PARAMETER); else if (PropChangeParams && PropChangeParams->StateChange != DICS_ENABLE && PropChangeParams->StateChange != DICS_DISABLE && PropChangeParams->StateChange != DICS_PROPCHANGE && PropChangeParams->StateChange != DICS_START && PropChangeParams->StateChange != DICS_STOP) @@ -4362,25 +4364,101 @@ LPWSTR pDeviceInstance; /* Points into DriverKey, on the Index field */ DWORD Index; /* Index used in the DriverKey name */ DWORD rc; + HKEY hHWProfilesKey = INVALID_HANDLE_VALUE; + HKEY hHWProfileKey = INVALID_HANDLE_VALUE; + HKEY hEnumKey = INVALID_HANDLE_VALUE; HKEY hClassKey = INVALID_HANDLE_VALUE; HKEY hDeviceKey = INVALID_HANDLE_VALUE; HKEY hKey = INVALID_HANDLE_VALUE; + HKEY RootKey; - if (Scope == DICS_FLAG_CONFIGSPECIFIC) + if (Scope == DICS_FLAG_GLOBAL) + RootKey = list->HKLM; + else /* Scope == DICS_FLAG_CONFIGSPECIFIC */ { - FIXME("DICS_FLAG_CONFIGSPECIFIC case unimplemented\n"); - goto cleanup; + rc = RegOpenKeyExW(list->HKLM, + L"SYSTEM\\CurrentControlSet\\Hardware Profiles", + 0, + 0, + &hHWProfilesKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + if (HwProfile == 0) + { + rc = RegOpenKeyExW( + hHWProfilesKey, + REGSTR_KEY_CURRENT, + 0, + KEY_CREATE_SUB_KEY, + &hHWProfileKey); + } + else + { + WCHAR subKey[5]; + snprintfW(subKey, 4, L"%04lu", HwProfile); + subKey[4] = '\0'; + rc = RegOpenKeyExW( + hHWProfilesKey, + subKey, + 0, + KEY_CREATE_SUB_KEY, + &hHWProfileKey); + } + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + RootKey = hHWProfileKey; } if (KeyType == DIREG_DEV) { - FIXME("DIREG_DEV case unimplemented\n"); + struct DeviceInfoElement *deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + + rc = RegCreateKeyExW( + RootKey, + EnumKeyName, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_CREATE_SUB_KEY, + NULL, + &hEnumKey, + NULL); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + rc = RegCreateKeyExW( + hEnumKey, + deviceInfo->DeviceName, + 0, + NULL, + REG_OPTION_NON_VOLATILE, +#if _WIN32_WINNT >= 0x502 + KEY_READ | KEY_WRITE, +#else + KEY_ALL_ACCESS, +#endif + NULL, + &hKey, + NULL); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } } else /* KeyType == DIREG_DRV */ { if (UuidToStringW((UUID*)&DeviceInfoData->ClassGuid, &lpGuidString) != RPC_S_OK) goto cleanup; - /* The driver key is in HKLM\System\CurrentControlSet\Control\Class\{GUID}\Index */ + /* The driver key is in \System\CurrentControlSet\Control\Class\{GUID}\Index */ DriverKey = HeapAlloc(GetProcessHeap(), 0, (wcslen(lpGuidString) + 7) * sizeof(WCHAR) + sizeof(UNICODE_STRING)); if (!DriverKey) { @@ -4391,7 +4469,7 @@ wcscat(DriverKey, lpGuidString); wcscat(DriverKey, L"}\\"); pDeviceInstance = &DriverKey[wcslen(DriverKey)]; - rc = RegOpenKeyExW(list->HKLM, + rc = RegOpenKeyExW(RootKey, ControlClass, 0, KEY_CREATE_SUB_KEY, @@ -4463,6 +4541,12 @@ if (lpGuidString) RpcStringFreeW(&lpGuidString); HeapFree(GetProcessHeap(), 0, DriverKey); + if (hHWProfilesKey != INVALID_HANDLE_VALUE) + RegCloseKey(hHWProfilesKey); + if (hHWProfileKey != INVALID_HANDLE_VALUE) + RegCloseKey(hHWProfileKey); + if (hEnumKey != INVALID_HANDLE_VALUE) + RegCloseKey(hEnumKey); if (hClassKey != INVALID_HANDLE_VALUE) RegCloseKey(hClassKey); if (hDeviceKey != INVALID_HANDLE_VALUE) @@ -6346,15 +6430,71 @@ return ret; } +/* Return the current hardware profile id, or -1 if error */ +static DWORD +GetCurrentHwProfile( + IN HDEVINFO DeviceInfoSet) +{ + HKEY hKey = INVALID_HANDLE_VALUE; + DWORD dwRegType, dwLength; + DWORD hwProfile; + LONG rc; + DWORD ret = (DWORD)-1; + + rc = RegOpenKeyExW( + ((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, + REGSTR_PATH_IDCONFIGDB, + 0, /* Options */ + KEY_QUERY_VALUE, + &hKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + + dwLength = sizeof(DWORD); + rc = RegQueryValueExW( + hKey, + REGSTR_VAL_CURRENTCONFIG, + NULL, + &dwRegType, + (LPBYTE)&hwProfile, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + else if (dwRegType != REG_DWORD || dwLength != sizeof(DWORD)) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + ret = hwProfile; + +cleanup: + if (hKey != INVALID_HANDLE_VALUE) + RegCloseKey(hKey); + + return hwProfile; +} + /*********************************************************************** * SetupDiChangeState (SETUPAPI.@) */ +static BOOL StartDevice(VOID) { FIXME("Stub"); return TRUE; } +static BOOL StopDevice(VOID) { FIXME("Stub"); return TRUE; } BOOL WINAPI SetupDiChangeState( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) + IN OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { PSP_PROPCHANGE_PARAMS PropChange; + HKEY hKey = INVALID_HANDLE_VALUE; + LPCWSTR RegistryValueName; + DWORD dwConfigFlags, dwLength, dwRegType; + LONG rc; BOOL ret = FALSE; TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); @@ -6366,13 +6506,90 @@ if (!PropChange) { SetLastError(ERROR_INVALID_PARAMETER); - goto done; + goto cleanup; } - FIXME("Stub %p %p\n", DeviceInfoSet, DeviceInfoData); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + if (PropChange->Scope == DICS_FLAG_GLOBAL) + RegistryValueName = REGSTR_VAL_CONFIGFLAGS; + else + RegistryValueName = REGSTR_VAL_CSCONFIGFLAGS; -done: + switch (PropChange->StateChange) + { + case DICS_ENABLE: + case DICS_DISABLE: + { + /* Enable/disable device in registry */ + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, PropChange->Scope, PropChange->HwProfile, DIREG_DEV, KEY_QUERY_VALUE | KEY_SET_VALUE); + if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) + hKey = SetupDiCreateDevRegKey(DeviceInfoSet, DeviceInfoData, PropChange->Scope, PropChange->HwProfile, DIREG_DEV, NULL, NULL); + if (hKey == INVALID_HANDLE_VALUE) + break; + dwLength = sizeof(DWORD); + rc = RegQueryValueExW( + hKey, + RegistryValueName, + NULL, + &dwRegType, + (LPBYTE)&dwConfigFlags, &dwLength); + if (rc == ERROR_FILE_NOT_FOUND) + dwConfigFlags = 0; + else if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + else if (dwRegType != REG_DWORD || dwLength != sizeof(DWORD)) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + if (PropChange->StateChange == DICS_ENABLE) + dwConfigFlags &= ~(PropChange->Scope == DICS_FLAG_GLOBAL ? CONFIGFLAG_DISABLED : CSCONFIGFLAG_DISABLED); + else + dwConfigFlags |= (PropChange->Scope == DICS_FLAG_GLOBAL ? CONFIGFLAG_DISABLED : CSCONFIGFLAG_DISABLED); + rc = RegSetValueEx( + hKey, + RegistryValueName, + 0, + REG_DWORD, + (LPBYTE)&dwConfigFlags, sizeof(DWORD)); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + + /* Enable/disable device if needed */ + if (PropChange->Scope == DICS_FLAG_GLOBAL + || PropChange->HwProfile == 0 + || PropChange->HwProfile == GetCurrentHwProfile(DeviceInfoSet)) + { + if (PropChange->StateChange == DICS_ENABLE) + ret = StartDevice(); + else + ret = StopDevice(); + } + else + ret = TRUE; + break; + } + case DICS_PROPCHANGE: + { + ret = StopDevice() && StartDevice(); + break; + } + default: + { + FIXME("Unknown StateChange 0x%lx\n", PropChange->StateChange); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + } + } + +cleanup: + if (hKey != INVALID_HANDLE_VALUE) + RegCloseKey(hKey); + TRACE("Returning %d\n", ret); return ret; } _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-12-15 21:01:01 UTC (rev 20200) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-12-15 21:21:38 UTC (rev 20201) @@ -29,6 +29,7 @@ #include <windows.h> #include <cfgmgr32.h> #include <fdi.h> +#include <regstr.h> #include <setupapi.h> #include <shlobj.h> #include <wine/debug.h>

1 0

[gvg] 20200: Fix by Royce3:
by gvg＠svn.reactos.com 15 Dec '05

15 Dec '05

Fix by Royce3: Don't wait 10 sec after starting an app via a .lnk file (bug 1107) Modified: trunk/reactos/lib/shell32/shelllink.c _____ Modified: trunk/reactos/lib/shell32/shelllink.c --- trunk/reactos/lib/shell32/shelllink.c 2005-12-15 20:58:51 UTC (rev 20199) +++ trunk/reactos/lib/shell32/shelllink.c 2005-12-15 21:01:01 UTC (rev 20200) @@ -2549,7 +2549,7 @@ memset( &sei, 0, sizeof sei ); sei.cbSize = sizeof sei; - sei.fMask = SEE_MASK_UNICODE | SEE_MASK_NOCLOSEPROCESS; + sei.fMask = SEE_MASK_UNICODE; sei.lpFile = path; sei.nShow = This->iShowCmd; sei.lpIDList = This->pPidl; @@ -2557,15 +2557,8 @@ sei.lpParameters = args; sei.lpVerb = szOpen; - if( ShellExecuteExW( &sei ) ) - { - if ( sei.hProcess ) - { - WaitForSingleObject( sei.hProcess, 10000 ); - CloseHandle( sei.hProcess ); - } + if ( ShellExecuteExW( &sei ) && sei.hInstApp > 32 ) r = S_OK; - } else r = E_FAIL;

1 0

[gvg] 20199: Fix by Royce3:
by gvg＠svn.reactos.com 15 Dec '05

15 Dec '05

Fix by Royce3: Don't wait 10 sec after starting an app via a .lnk file Modified: branches/ros-branch-0_2_9/reactos/lib/shell32/shelllink.c _____ Modified: branches/ros-branch-0_2_9/reactos/lib/shell32/shelllink.c --- branches/ros-branch-0_2_9/reactos/lib/shell32/shelllink.c 2005-12-15 20:50:04 UTC (rev 20198) +++ branches/ros-branch-0_2_9/reactos/lib/shell32/shelllink.c 2005-12-15 20:58:51 UTC (rev 20199) @@ -2549,7 +2549,7 @@ memset( &sei, 0, sizeof sei ); sei.cbSize = sizeof sei; - sei.fMask = SEE_MASK_UNICODE | SEE_MASK_NOCLOSEPROCESS; + sei.fMask = SEE_MASK_UNICODE; sei.lpFile = path; sei.nShow = This->iShowCmd; sei.lpIDList = This->pPidl; @@ -2557,15 +2557,8 @@ sei.lpParameters = args; sei.lpVerb = szOpen; - if( ShellExecuteExW( &sei ) ) - { - if ( sei.hProcess ) - { - WaitForSingleObject( sei.hProcess, 10000 ); - CloseHandle( sei.hProcess ); - } + if ( ShellExecuteExW( &sei ) && sei.hInstApp > 32 ) r = S_OK; - } else r = E_FAIL;

1 0

[gedmurphy] 20198: merge 20197
by gedmurphy＠svn.reactos.com 15 Dec '05

15 Dec '05

merge 20197 Modified: branches/ros-branch-0_2_9/reactos/subsys/system/explorer/taskbar/startme nu.cpp _____ Modified: branches/ros-branch-0_2_9/reactos/subsys/system/explorer/taskbar/startme nu.cpp --- branches/ros-branch-0_2_9/reactos/subsys/system/explorer/taskbar/startme nu.cpp 2005-12-15 20:27:16 UTC (rev 20197) +++ branches/ros-branch-0_2_9/reactos/subsys/system/explorer/taskbar/startme nu.cpp 2005-12-15 20:50:04 UTC (rev 20198) @@ -1824,7 +1824,7 @@ PatBlt(canvas, _logo_size.cx, 0, 1, clnt.bottom, WHITENESS); - BitBlt(canvas, 0, clnt.bottom-h, _logo_size.cx, h, mem_dc, 0, 0, SRCCOPY); + BitBlt(canvas, 0, clnt.bottom-h, _logo_size.cx, h, mem_dc, 0, ( h<_logo_size.cy ? _logo_size.cy-h : 0) , SRCCOPY); super::Paint(canvas); }

1 0

[gedmurphy] 20197: Fixed positioning of graphic in start menu
by gedmurphy＠svn.reactos.com 15 Dec '05

15 Dec '05

Fixed positioning of graphic in start menu by Sebastiaan Roodenburg (KaRaMBa : IRC) Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-12-15 19:49:52 UTC (rev 20196) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-12-15 20:27:16 UTC (rev 20197) @@ -1824,7 +1824,7 @@ PatBlt(canvas, _logo_size.cx, 0, 1, clnt.bottom, WHITENESS); - BitBlt(canvas, 0, clnt.bottom-h, _logo_size.cx, h, mem_dc, 0, 0, SRCCOPY); + BitBlt(canvas, 0, clnt.bottom-h, _logo_size.cx, h, mem_dc, 0, ( h<_logo_size.cy ? _logo_size.cy-h : 0) , SRCCOPY); super::Paint(canvas); }

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
71
Older →

Jump to page:

2025

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