Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [SETUPAPI] Replace the remaining internal calls to SetupDiOpenDevRegKey and SetupDiCreateDevRegKeyW by calls to SETUPDI_OpenDrvKey, SETUPDI_CreateDevKey or SETUPDI_CreateDrvKey.
by Eric Kohl 23 Sep '18

23 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df36ee9fe24de5e9d7498… commit df36ee9fe24de5e9d7498ea3927c8c724bd0c0e3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 23 20:17:35 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 23 20:19:26 2018 +0200 [SETUPAPI] Replace the remaining internal calls to SetupDiOpenDevRegKey and SetupDiCreateDevRegKeyW by calls to SETUPDI_OpenDrvKey, SETUPDI_CreateDevKey or SETUPDI_CreateDrvKey. --- dll/win32/setupapi/devinst.c | 389 +++++++++++++++++++--------------- dll/win32/setupapi/setupapi_private.h | 2 + 2 files changed, 218 insertions(+), 173 deletions(-) diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index a4d102e3b8..10ffd29251 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -1414,17 +1414,8 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; struct DeviceInfo *deviceInfo; HKEY key = INVALID_HANDLE_VALUE; - LPWSTR lpGuidString = NULL; - LPWSTR DriverKey = NULL; /* {GUID}\Index */ - LPWSTR pDeviceInstance; /* Points into DriverKey, on the Index field */ - DWORD Index; /* Index used in the DriverKey name */ - DWORD dwSize; - DWORD Disposition; DWORD rc; HKEY hHWProfileKey = INVALID_HANDLE_VALUE; - HKEY hEnumKey = NULL; - HKEY hClassKey = NULL; - HKEY hDeviceKey = INVALID_HANDLE_VALUE; HKEY hKey = NULL; HKEY RootKey; @@ -1482,41 +1473,13 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( if (KeyType == DIREG_DEV) { - - rc = RegCreateKeyExW( - RootKey, - REGSTR_PATH_SYSTEMENUM, - 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->instanceId, - 0, - NULL, - REG_OPTION_NON_VOLATILE, #if _WIN32_WINNT >= 0x502 - KEY_READ | KEY_WRITE, + hKey = SETUPDI_CreateDevKey(RootKey, deviceInfo, KEY_READ | KEY_WRITE); #else - KEY_ALL_ACCESS, + hKey = SETUPDI_CreateDevKey(RootKey, deviceInfo, KEY_ALL_ACCESS); #endif - NULL, - &hKey, - NULL); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); + if (hKey == INVALID_HANDLE_VALUE) goto cleanup; - } if (Scope == DICS_FLAG_GLOBAL) { @@ -1541,123 +1504,13 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( } else /* KeyType == DIREG_DRV */ { - /* Open device key, to read Driver value */ - hDeviceKey = SETUPDI_OpenDevKey(RootKey, deviceInfo, KEY_QUERY_VALUE | KEY_SET_VALUE); - if (hDeviceKey == INVALID_HANDLE_VALUE) - goto cleanup; - - rc = RegOpenKeyExW(RootKey, REGSTR_PATH_CLASS_NT, 0, KEY_CREATE_SUB_KEY, &hClassKey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - - rc = RegQueryValueExW(hDeviceKey, REGSTR_VAL_DRIVER, NULL, NULL, NULL, &dwSize); - if (rc != ERROR_SUCCESS) - { - /* Create a new driver key */ - - if (UuidToStringW((UUID*)&DeviceInfoData->ClassGuid, &lpGuidString) != RPC_S_OK) - goto cleanup; - - /* The driver key is in \System\CurrentControlSet\Control\Class\{GUID}\Index */ - DriverKey = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpGuidString) + 7) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); - if (!DriverKey) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - - DriverKey[0] = '{'; - strcpyW(&DriverKey[1], lpGuidString); - pDeviceInstance = &DriverKey[strlenW(DriverKey)]; - *pDeviceInstance++ = '}'; - *pDeviceInstance++ = '\\'; - - /* Try all values for Index between 0 and 9999 */ - Index = 0; - while (Index <= 9999) - { - sprintfW(pDeviceInstance, InstanceKeyFormat, Index); - rc = RegCreateKeyExW(hClassKey, - DriverKey, - 0, - NULL, - REG_OPTION_NON_VOLATILE, #if _WIN32_WINNT >= 0x502 - KEY_READ | KEY_WRITE, + hKey = SETUPDI_CreateDrvKey(RootKey, deviceInfo, (UUID*)&DeviceInfoData->ClassGuid, KEY_READ | KEY_WRITE); #else - KEY_ALL_ACCESS, + hKey = SETUPDI_CreateDrvKey(RootKey, deviceInfo, (UUID*)&DeviceInfoData->ClassGuid, KEY_ALL_ACCESS); #endif - NULL, - &hKey, - &Disposition); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - if (Disposition == REG_CREATED_NEW_KEY) - break; - RegCloseKey(hKey); - hKey = NULL; - Index++; - } - - if (Index > 9999) - { - /* Unable to create more than 9999 devices within the same class */ - SetLastError(ERROR_GEN_FAILURE); - goto cleanup; - } - - /* Write the new Driver value */ - rc = RegSetValueExW(hDeviceKey, REGSTR_VAL_DRIVER, 0, REG_SZ, (const BYTE *)DriverKey, (strlenW(DriverKey) + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - - } - else - { - /* Open the existing driver key */ - - DriverKey = HeapAlloc(GetProcessHeap(), 0, dwSize); - if (!DriverKey) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - - rc = RegQueryValueExW(hDeviceKey, REGSTR_VAL_DRIVER, NULL, NULL, (LPBYTE)DriverKey, &dwSize); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - - rc = RegCreateKeyExW(hClassKey, - DriverKey, - 0, - NULL, - REG_OPTION_NON_VOLATILE, -#if _WIN32_WINNT >= 0x502 - KEY_READ | KEY_WRITE, -#else - KEY_ALL_ACCESS, -#endif - NULL, - &hKey, - &Disposition); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - } + if (hKey == INVALID_HANDLE_VALUE) + goto cleanup; } /* Do installation of the specified section */ @@ -1669,17 +1522,8 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( key = hKey; cleanup: - if (lpGuidString) - RpcStringFreeW(&lpGuidString); - HeapFree(GetProcessHeap(), 0, DriverKey); if (hHWProfileKey != INVALID_HANDLE_VALUE) RegCloseKey(hHWProfileKey); - if (hEnumKey != NULL) - RegCloseKey(hEnumKey); - if (hClassKey != NULL) - RegCloseKey(hClassKey); - if (hDeviceKey != INVALID_HANDLE_VALUE) - RegCloseKey(hDeviceKey); if (hKey != NULL && hKey != key) RegCloseKey(hKey); @@ -4315,7 +4159,6 @@ BOOL WINAPI SetupDiCallClassInstaller( if (CanHandle & DEVICE_COINSTALLER) { -// hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_QUERY_VALUE); hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_QUERY_VALUE); if (hKey != INVALID_HANDLE_VALUE) { @@ -5218,8 +5061,10 @@ SetupDiChangeState( IN HDEVINFO DeviceInfoSet, IN OUT PSP_DEVINFO_DATA DeviceInfoData) { + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; PSP_PROPCHANGE_PARAMS PropChange; - HKEY hKey = INVALID_HANDLE_VALUE; + HKEY hRootKey = INVALID_HANDLE_VALUE, hKey = INVALID_HANDLE_VALUE; LPCWSTR RegistryValueName; DWORD dwConfigFlags, dwLength, dwRegType; LONG rc; @@ -5247,10 +5092,19 @@ SetupDiChangeState( case DICS_ENABLE: case DICS_DISABLE: { + if (PropChange->Scope == DICS_FLAG_GLOBAL) + hRootKey = set->HKLM; + else /* PropChange->Scope == DICS_FLAG_CONFIGSPECIFIC */ + { + hRootKey = OpenHardwareProfileKey(set->HKLM, PropChange->HwProfile, KEY_CREATE_SUB_KEY); + if (hRootKey == INVALID_HANDLE_VALUE) + goto cleanup; + } + /* Enable/disable device in registry */ - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, PropChange->Scope, PropChange->HwProfile, DIREG_DEV, KEY_QUERY_VALUE | KEY_SET_VALUE); + hKey = SETUPDI_OpenDrvKey(hRootKey, deviceInfo, KEY_QUERY_VALUE | KEY_SET_VALUE); if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) - hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, PropChange->Scope, PropChange->HwProfile, DIREG_DEV, NULL, NULL); + hKey = SETUPDI_CreateDevKey(hRootKey, deviceInfo, KEY_QUERY_VALUE | KEY_SET_VALUE); if (hKey == INVALID_HANDLE_VALUE) break; dwLength = sizeof(DWORD); @@ -5315,6 +5169,9 @@ SetupDiChangeState( } cleanup: + if (hRootKey != INVALID_HANDLE_VALUE && hRootKey != set->HKLM) + RegCloseKey(hRootKey); + if (hKey != INVALID_HANDLE_VALUE) RegCloseKey(hKey); @@ -5344,6 +5201,8 @@ SetupDiRegisterCoDeviceInstallers( IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData) { + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *deviceInfo; BOOL ret = FALSE; /* Return value */ TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); @@ -5390,14 +5249,20 @@ SetupDiRegisterCoDeviceInstallers( goto cleanup; lstrcatW(SectionName, DotCoInstallers); + deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + /* Open/Create driver key information */ #if _WIN32_WINNT >= 0x502 - hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_READ | KEY_WRITE); + hKey = SETUPDI_OpenDrvKey(set->HKLM, deviceInfo, KEY_READ | KEY_WRITE); #else - hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_ALL_ACCESS); + hKey = SETUPDI_OpenDrvKey(set->HKLM, deviceInfo, KEY_ALL_ACCESS); #endif if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) - hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); +#if _WIN32_WINNT >= 0x502 + hKey = SETUPDI_CreateDrvKey(set->HKLM, deviceInfo, (UUID*)&DeviceInfoData->ClassGuid, KEY_READ | KEY_WRITE); +#else + hKey = SETUPDI_CreateDrvKey(set->HKLM, deviceInfo, (UUID*)&DeviceInfoData->ClassGuid, KEY_ALL_ACCESS); +#endif if (hKey == INVALID_HANDLE_VALUE) goto cleanup; @@ -5490,6 +5355,8 @@ SetupDiInstallDevice( IN HDEVINFO DeviceInfoSet, IN OUT PSP_DEVINFO_DATA DeviceInfoData) { + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *deviceInfo; SP_DEVINSTALL_PARAMS_W InstallParams; struct DriverInfoElement *SelectedDriver; SYSTEMTIME DriverDate; @@ -5633,14 +5500,20 @@ SetupDiInstallDevice( strcpyW(SelectedDriver->Details.InfFileName, NewFileName); } + deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + /* Open/Create driver key information */ #if _WIN32_WINNT >= 0x502 - hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_READ | KEY_WRITE); + hKey = SETUPDI_OpenDrvKey(set->HKLM, deviceInfo, KEY_READ | KEY_WRITE); #else - hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_ALL_ACCESS); + hKey = SETUPDI_OpenDrvKey(set->HKLM, deviceInfo, KEY_ALL_ACCESS); #endif if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) - hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); +#if _WIN32_WINNT >= 0x502 + hKey = SETUPDI_CreateDrvKey(set->HKLM, deviceInfo, (UUID*)&DeviceInfoData->ClassGuid, KEY_READ | KEY_WRITE); +#else + hKey = SETUPDI_CreateDrvKey(set->HKLM, deviceInfo, (UUID*)&DeviceInfoData->ClassGuid, KEY_ALL_ACCESS); +#endif if (hKey == INVALID_HANDLE_VALUE) goto cleanup; @@ -5780,6 +5653,176 @@ cleanup: return ret; } +HKEY SETUPDI_CreateDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired) +{ + HKEY enumKey, key = INVALID_HANDLE_VALUE; + LONG l; + + l = RegCreateKeyExW(RootKey, REGSTR_PATH_SYSTEMENUM, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &enumKey, NULL); + if (!l) + { + l = RegCreateKeyExW(enumKey, devInfo->instanceId, 0, NULL, REG_OPTION_NON_VOLATILE, samDesired, NULL, &key, NULL); + RegCloseKey(enumKey); + } + if (l) + SetLastError(l); + return key; +} + +HKEY SETUPDI_CreateDrvKey(HKEY RootKey, struct DeviceInfo *devInfo, UUID *ClassGuid, REGSAM samDesired) +{ + HKEY key = INVALID_HANDLE_VALUE; + LPWSTR lpGuidString = NULL; + LPWSTR DriverKey = NULL; /* {GUID}\Index */ + LPWSTR pDeviceInstance; /* Points into DriverKey, on the Index field */ + DWORD Index; /* Index used in the DriverKey name */ + DWORD dwSize; + DWORD Disposition; + DWORD rc; + HKEY hHWProfileKey = INVALID_HANDLE_VALUE; + HKEY hEnumKey = NULL; + HKEY hClassKey = NULL; + HKEY hDeviceKey = INVALID_HANDLE_VALUE; + HKEY hKey = NULL; + + /* Open device key, to read Driver value */ + hDeviceKey = SETUPDI_OpenDevKey(RootKey, devInfo, KEY_QUERY_VALUE | KEY_SET_VALUE); + if (hDeviceKey == INVALID_HANDLE_VALUE) + goto cleanup; + + rc = RegOpenKeyExW(RootKey, REGSTR_PATH_CLASS_NT, 0, KEY_CREATE_SUB_KEY, &hClassKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + + rc = RegQueryValueExW(hDeviceKey, REGSTR_VAL_DRIVER, NULL, NULL, NULL, &dwSize); + if (rc != ERROR_SUCCESS) + { + /* Create a new driver key */ + + if (UuidToStringW(ClassGuid, &lpGuidString) != RPC_S_OK) + goto cleanup; + + /* The driver key is in \System\CurrentControlSet\Control\Class\{GUID}\Index */ + DriverKey = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpGuidString) + 7) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!DriverKey) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + DriverKey[0] = '{'; + strcpyW(&DriverKey[1], lpGuidString); + pDeviceInstance = &DriverKey[strlenW(DriverKey)]; + *pDeviceInstance++ = '}'; + *pDeviceInstance++ = '\\'; + + /* Try all values for Index between 0 and 9999 */ + Index = 0; + while (Index <= 9999) + { + sprintfW(pDeviceInstance, InstanceKeyFormat, Index); + rc = RegCreateKeyExW(hClassKey, + DriverKey, + 0, + NULL, + REG_OPTION_NON_VOLATILE, +#if _WIN32_WINNT >= 0x502 + KEY_READ | KEY_WRITE, +#else + KEY_ALL_ACCESS, +#endif + NULL, + &hKey, + &Disposition); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + if (Disposition == REG_CREATED_NEW_KEY) + break; + RegCloseKey(hKey); + hKey = NULL; + Index++; + } + + if (Index > 9999) + { + /* Unable to create more than 9999 devices within the same class */ + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + /* Write the new Driver value */ + rc = RegSetValueExW(hDeviceKey, REGSTR_VAL_DRIVER, 0, REG_SZ, (const BYTE *)DriverKey, (strlenW(DriverKey) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + } + else + { + /* Open the existing driver key */ + + DriverKey = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (!DriverKey) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + rc = RegQueryValueExW(hDeviceKey, REGSTR_VAL_DRIVER, NULL, NULL, (LPBYTE)DriverKey, &dwSize); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + + rc = RegCreateKeyExW(hClassKey, + DriverKey, + 0, + NULL, + REG_OPTION_NON_VOLATILE, +#if _WIN32_WINNT >= 0x502 + KEY_READ | KEY_WRITE, +#else + KEY_ALL_ACCESS, +#endif + NULL, + &hKey, + &Disposition); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + } + + key = hKey; + +cleanup: + if (lpGuidString) + RpcStringFreeW(&lpGuidString); + HeapFree(GetProcessHeap(), 0, DriverKey); + if (hHWProfileKey != INVALID_HANDLE_VALUE) + RegCloseKey(hHWProfileKey); + if (hEnumKey != NULL) + RegCloseKey(hEnumKey); + if (hClassKey != NULL) + RegCloseKey(hClassKey); + if (hDeviceKey != INVALID_HANDLE_VALUE) + RegCloseKey(hDeviceKey); + if (hKey != NULL && hKey != key) + RegCloseKey(hKey); + + TRACE("Returning 0x%p\n", hKey); + return hKey; +} + HKEY SETUPDI_OpenDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired) { HKEY enumKey, key = INVALID_HANDLE_VALUE; diff --git a/dll/win32/setupapi/setupapi_private.h b/dll/win32/setupapi/setupapi_private.h index 8625ae7d2c..63c391867b 100644 --- a/dll/win32/setupapi/setupapi_private.h +++ b/dll/win32/setupapi/setupapi_private.h @@ -312,6 +312,8 @@ SETUP_CreateDevicesList( IN CONST GUID *Class OPTIONAL, IN PCWSTR Enumerator OPTIONAL); +HKEY SETUPDI_CreateDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired); +HKEY SETUPDI_CreateDrvKey(HKEY RootKey, struct DeviceInfo *devInfo, UUID *ClassGuid, REGSAM samDesired); HKEY SETUPDI_OpenDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired); HKEY SETUPDI_OpenDrvKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired);

1 0

02/02: [WIN32K] Work around GCC builds inventing dead keys. CORE-14948
by Mark Jansen 23 Sep '18

23 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d3bd4e77e71e96699589… commit 3d3bd4e77e71e96699589d642d8c6e903df6219b Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 23 19:28:09 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 23 20:03:14 2018 +0200 [WIN32K] Work around GCC builds inventing dead keys. CORE-14948 --- win32ss/user/ntuser/keyboard.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/win32ss/user/ntuser/keyboard.c b/win32ss/user/ntuser/keyboard.c index 6167f9d6ff..f72e275cf2 100644 --- a/win32ss/user/ntuser/keyboard.c +++ b/win32ss/user/ntuser/keyboard.c @@ -467,17 +467,30 @@ IntToUnicodeEx(UINT wVirtKey, WCHAR wchFirst, wchSecond; TRACE("Previous dead char: %lc (%x)\n", wchDead, wchDead); - for (i = 0; pKbdTbl->pDeadKey[i].dwBoth; i++) + if (pKbdTbl->pDeadKey) { - wchFirst = pKbdTbl->pDeadKey[i].dwBoth >> 16; - wchSecond = pKbdTbl->pDeadKey[i].dwBoth & 0xFFFF; - if (wchFirst == wchDead && wchSecond == wchTranslatedChar) + for (i = 0; pKbdTbl->pDeadKey[i].dwBoth; i++) { - wchTranslatedChar = pKbdTbl->pDeadKey[i].wchComposed; + wchFirst = pKbdTbl->pDeadKey[i].dwBoth >> 16; + wchSecond = pKbdTbl->pDeadKey[i].dwBoth & 0xFFFF; + if (wchFirst == wchDead && wchSecond == wchTranslatedChar) + { + wchTranslatedChar = pKbdTbl->pDeadKey[i].wchComposed; + wchDead = 0; + bDead = FALSE; + break; + } + } + } + else + { +#if defined(__GNUC__) + if (wchDead == 0x8000) + { + ERR("GCC is inventing bits, ignoring fake dead key\n"); wchDead = 0; - bDead = FALSE; - break; } +#endif } TRACE("Final char: %lc (%x)\n", wchTranslatedChar, wchTranslatedChar);

1 0

01/02: [SHELL32_APITEST] Speed up the CUserNotification test in the failure case.
by Mark Jansen 23 Sep '18

23 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7882b6cfe34885170ab0f… commit 7882b6cfe34885170ab0fc34310805362fc2e12d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 23 19:27:02 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 23 20:03:08 2018 +0200 [SHELL32_APITEST] Speed up the CUserNotification test in the failure case. --- modules/rostests/apitests/shell32/CUserNotification.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/shell32/CUserNotification.cpp b/modules/rostests/apitests/shell32/CUserNotification.cpp index acfd6023a8..ec40f42584 100644 --- a/modules/rostests/apitests/shell32/CUserNotification.cpp +++ b/modules/rostests/apitests/shell32/CUserNotification.cpp @@ -200,8 +200,8 @@ START_TEST(CUserNotification) return; } - /* Wait a maximum of 1:30 for the thread to finish (the timeout tests take some time) */ - dwWait = WaitForSingleObject(hThread, 90 * 1000); + /* Wait a maximum of 60 seconds for the thread to finish (the timeout tests take some time) */ + dwWait = WaitForSingleObject(hThread, 60 * 1000); ok(dwWait == WAIT_OBJECT_0, "WaitForSingleObject returned %lu, expected WAIT_OBJECT_0\n", dwWait); /* Cleanup and return */

1 0

01/01: [SERVICES] Simplify the implementation of RGetServiceDisplayNameA/W() and RGetServiceKeyNameA/W().
by Hermès Bélusca-Maïto 23 Sep '18

23 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf164caae8670898de159… commit bf164caae8670898de1594dc0e30f9c7c2c97891 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 22 15:41:17 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 23 18:09:10 2018 +0200 [SERVICES] Simplify the implementation of RGetServiceDisplayNameA/W() and RGetServiceKeyNameA/W(). Also comment about the observed behaviour of the returned number of "characters" returned by the ANSI versions of these APIs (which is tested by advapi32_winetest:service). [ADVAPI32:SCM] Add a comment concerning wide characters vs. bytes mismatch. --- base/system/services/rpcserver.c | 315 +++++++++++++++++++++------------------ dll/win32/advapi32/service/scm.c | 10 ++ 2 files changed, 181 insertions(+), 144 deletions(-) diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index 454181bb66..f21df10e57 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -2947,7 +2947,7 @@ ROpenServiceW( lpService = ScmGetServiceEntryByName(lpServiceName); if (lpService == NULL) { - DPRINT("Could not find a service!\n"); + DPRINT("Could not find the service!\n"); dwError = ERROR_SERVICE_DOES_NOT_EXIST; goto Done; } @@ -3310,8 +3310,9 @@ RGetServiceDisplayNameW( LPWSTR lpDisplayName, DWORD *lpcchBuffer) { -// PMANAGER_HANDLE hManager; + // PMANAGER_HANDLE hManager; PSERVICE lpService; + LPCWSTR lpSvcDisplayName; DWORD dwLength; DWORD dwError; @@ -3321,56 +3322,42 @@ RGetServiceDisplayNameW( DPRINT("lpDisplayName: %p\n", lpDisplayName); DPRINT("*lpcchBuffer: %lu\n", *lpcchBuffer); -// hManager = (PMANAGER_HANDLE)hSCManager; -// if (hManager->Handle.Tag != MANAGER_TAG) -// { -// DPRINT("Invalid manager handle!\n"); -// return ERROR_INVALID_HANDLE; -// } +#if 0 + hManager = (PMANAGER_HANDLE)hSCManager; + if (hManager->Handle.Tag != MANAGER_TAG) + { + DPRINT("Invalid manager handle!\n"); + return ERROR_INVALID_HANDLE; + } +#endif /* Get service database entry */ lpService = ScmGetServiceEntryByName(lpServiceName); if (lpService == NULL) { - DPRINT("Could not find a service!\n"); - - /* If the service could not be found and lpcchBuffer is less than 2, windows - puts null in lpDisplayName and puts 2 in lpcchBuffer */ - if (*lpcchBuffer < sizeof(WCHAR)) - { - *lpcchBuffer = sizeof(WCHAR); - if (lpDisplayName != NULL) - { - *lpDisplayName = 0; - } - } - + DPRINT("Could not find the service!\n"); return ERROR_SERVICE_DOES_NOT_EXIST; } - if (!lpService->lpDisplayName) + if (lpService->lpDisplayName) + lpSvcDisplayName = lpService->lpDisplayName; + else + lpSvcDisplayName = lpService->lpServiceName; + + dwLength = (DWORD)wcslen(lpSvcDisplayName); + + if (*lpcchBuffer > dwLength) { - dwLength = (DWORD)wcslen(lpService->lpServiceName); + if (lpDisplayName != NULL) + wcscpy(lpDisplayName, lpSvcDisplayName); - if (lpDisplayName != NULL && - *lpcchBuffer > dwLength) - { - wcscpy(lpDisplayName, lpService->lpServiceName); - } + dwError = ERROR_SUCCESS; } else { - dwLength = (DWORD)wcslen(lpService->lpDisplayName); - - if (lpDisplayName != NULL && - *lpcchBuffer > dwLength) - { - wcscpy(lpDisplayName, lpService->lpDisplayName); - } + dwError = ERROR_INSUFFICIENT_BUFFER; } - dwError = (*lpcchBuffer > dwLength) ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER; - *lpcchBuffer = dwLength; return dwError; @@ -3386,7 +3373,7 @@ RGetServiceKeyNameW( LPWSTR lpServiceName, DWORD *lpcchBuffer) { -// PMANAGER_HANDLE hManager; + // PMANAGER_HANDLE hManager; PSERVICE lpService; DWORD dwLength; DWORD dwError; @@ -3397,44 +3384,36 @@ RGetServiceKeyNameW( DPRINT("lpServiceName: %p\n", lpServiceName); DPRINT("*lpcchBuffer: %lu\n", *lpcchBuffer); -// hManager = (PMANAGER_HANDLE)hSCManager; -// if (hManager->Handle.Tag != MANAGER_TAG) -// { -// DPRINT("Invalid manager handle!\n"); -// return ERROR_INVALID_HANDLE; -// } +#if 0 + hManager = (PMANAGER_HANDLE)hSCManager; + if (hManager->Handle.Tag != MANAGER_TAG) + { + DPRINT("Invalid manager handle!\n"); + return ERROR_INVALID_HANDLE; + } +#endif /* Get service database entry */ lpService = ScmGetServiceEntryByDisplayName(lpDisplayName); if (lpService == NULL) { - DPRINT("Could not find a service!\n"); - - /* If the service could not be found and lpcchBuffer is less than 2, windows - puts null in lpDisplayName and puts 2 in lpcchBuffer */ - if (*lpcchBuffer < sizeof(WCHAR)) - { - *lpcchBuffer = sizeof(WCHAR); - if (lpServiceName != NULL) - { - *lpServiceName = 0; - } - } - + DPRINT("Could not find the service!\n"); return ERROR_SERVICE_DOES_NOT_EXIST; } dwLength = (DWORD)wcslen(lpService->lpServiceName); - if (lpServiceName != NULL && - *lpcchBuffer > dwLength) + if (*lpcchBuffer > dwLength) { - wcscpy(lpServiceName, lpService->lpServiceName); - *lpcchBuffer = dwLength; - return ERROR_SUCCESS; - } + if (lpServiceName != NULL) + wcscpy(lpServiceName, lpService->lpServiceName); - dwError = (*lpcchBuffer > dwLength) ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER; + dwError = ERROR_SUCCESS; + } + else + { + dwError = ERROR_INSUFFICIENT_BUFFER; + } *lpcchBuffer = dwLength; @@ -4474,11 +4453,11 @@ RGetServiceDisplayNameA( LPSTR lpDisplayName, LPBOUNDED_DWORD_4K lpcchBuffer) { -// PMANAGER_HANDLE hManager; + // PMANAGER_HANDLE hManager; PSERVICE lpService = NULL; - DWORD dwLength; - DWORD dwError; + LPCWSTR lpSvcDisplayName; LPWSTR lpServiceNameW; + DWORD dwLength; DPRINT("RGetServiceDisplayNameA() called\n"); DPRINT("hSCManager = %p\n", hSCManager); @@ -4486,13 +4465,16 @@ RGetServiceDisplayNameA( DPRINT("lpDisplayName: %p\n", lpDisplayName); DPRINT("*lpcchBuffer: %lu\n", *lpcchBuffer); -// hManager = (PMANAGER_HANDLE)hSCManager; -// if (hManager->Handle.Tag != MANAGER_TAG) -// { -// DPRINT("Invalid manager handle!\n"); -// return ERROR_INVALID_HANDLE; -// } +#if 0 + hManager = (PMANAGER_HANDLE)hSCManager; + if (hManager->Handle.Tag != MANAGER_TAG) + { + DPRINT("Invalid manager handle!\n"); + return ERROR_INVALID_HANDLE; + } +#endif + /* Get service database entry */ if (lpServiceName != NULL) { dwLength = (DWORD)(strlen(lpServiceName) + 1); @@ -4516,61 +4498,71 @@ RGetServiceDisplayNameA( if (lpService == NULL) { - DPRINT("Could not find a service!\n"); - - /* If the service could not be found and lpcchBuffer is 0, windows - puts null in lpDisplayName and puts 1 in lpcchBuffer */ - if (*lpcchBuffer == 0) - { - *lpcchBuffer = sizeof(CHAR); - if (lpDisplayName != NULL) - { - *lpDisplayName = 0; - } - } + DPRINT("Could not find the service!\n"); return ERROR_SERVICE_DOES_NOT_EXIST; } - if (!lpService->lpDisplayName) + if (lpService->lpDisplayName) + lpSvcDisplayName = lpService->lpDisplayName; + else + lpSvcDisplayName = lpService->lpServiceName; + + /* + * NOTE: On Windows the comparison on *lpcchBuffer is made against + * the number of (wide) characters of the UNICODE display name, and + * not against the number of bytes needed to store the ANSI string. + */ + dwLength = (DWORD)wcslen(lpSvcDisplayName); + + if (*lpcchBuffer > dwLength) { - dwLength = (DWORD)wcslen(lpService->lpServiceName); if (lpDisplayName != NULL && - *lpcchBuffer > dwLength) - { WideCharToMultiByte(CP_ACP, 0, - lpService->lpServiceName, - (int)wcslen(lpService->lpServiceName), + lpSvcDisplayName, + -1, lpDisplayName, - dwLength + 1, + (int)*lpcchBuffer, NULL, - NULL); - return ERROR_SUCCESS; + NULL) == 0) + { + /* + * But then, if *lpcchBuffer was greater than the number of + * (wide) characters of the UNICODE display name, yet smaller + * than the number of bytes needed due to the possible presence + * of DBCS characters, the *exact* number of bytes is returned + * (without the NULL terminator). + */ + dwLength = (DWORD)WideCharToMultiByte(CP_ACP, + 0, + lpSvcDisplayName, + (int)dwLength, + NULL, + 0, + NULL, + NULL); + *lpDisplayName = 0; + *lpcchBuffer = dwLength; + return ERROR_INSUFFICIENT_BUFFER; } + + /* + * NOTE: On Windows, RGetServiceDisplayNameA() does not update + * *lpcchBuffer on success, contrary to RGetServiceDisplayNameW(). + */ + return ERROR_SUCCESS; } else { - dwLength = (DWORD)wcslen(lpService->lpDisplayName); - if (lpDisplayName != NULL && - *lpcchBuffer > dwLength) - { - WideCharToMultiByte(CP_ACP, - 0, - lpService->lpDisplayName, - (int)wcslen(lpService->lpDisplayName), - lpDisplayName, - dwLength + 1, - NULL, - NULL); - return ERROR_SUCCESS; - } + /* + * NOTE: On Windows, if *lpcchBuffer is smaller than the number of + * (wide) characters of the UNICODE display name, only an upper + * estimation is returned by doubling the string length, to account + * for the presence of any possible DBCS characters. + */ + *lpcchBuffer = dwLength * sizeof(WCHAR); + return ERROR_INSUFFICIENT_BUFFER; } - - dwError = (*lpcchBuffer > dwLength) ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER; - - *lpcchBuffer = dwLength * 2; - - return dwError; } @@ -4583,10 +4575,10 @@ RGetServiceKeyNameA( LPSTR lpServiceName, LPBOUNDED_DWORD_4K lpcchBuffer) { + // PMANAGER_HANDLE hManager; PSERVICE lpService; - DWORD dwLength; - DWORD dwError; LPWSTR lpDisplayNameW; + DWORD dwLength; DPRINT("RGetServiceKeyNameA() called\n"); DPRINT("hSCManager = %p\n", hSCManager); @@ -4594,6 +4586,17 @@ RGetServiceKeyNameA( DPRINT("lpServiceName: %p\n", lpServiceName); DPRINT("*lpcchBuffer: %lu\n", *lpcchBuffer); +#if 0 + hManager = (PMANAGER_HANDLE)hSCManager; + if (hManager->Handle.Tag != MANAGER_TAG) + { + DPRINT("Invalid manager handle!\n"); + return ERROR_INVALID_HANDLE; + } +#endif + + /* Get service database entry */ + dwLength = (DWORD)(strlen(lpDisplayName) + 1); lpDisplayNameW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -4615,41 +4618,65 @@ RGetServiceKeyNameA( if (lpService == NULL) { DPRINT("Could not find the service!\n"); - - /* If the service could not be found and lpcchBuffer is 0, - put null in lpDisplayName and puts 1 in lpcchBuffer, verified WINXP. */ - if (*lpcchBuffer == 0) - { - *lpcchBuffer = sizeof(CHAR); - if (lpServiceName != NULL) - { - *lpServiceName = 0; - } - } - return ERROR_SERVICE_DOES_NOT_EXIST; } + /* + * NOTE: On Windows the comparison on *lpcchBuffer is made against + * the number of (wide) characters of the UNICODE service name, and + * not against the number of bytes needed to store the ANSI string. + */ dwLength = (DWORD)wcslen(lpService->lpServiceName); - if (lpServiceName != NULL && - *lpcchBuffer > dwLength) + + if (*lpcchBuffer > dwLength) { - WideCharToMultiByte(CP_ACP, - 0, - lpService->lpServiceName, - (int)wcslen(lpService->lpServiceName), - lpServiceName, - dwLength + 1, - NULL, - NULL); + if (lpServiceName != NULL && + WideCharToMultiByte(CP_ACP, + 0, + lpService->lpServiceName, + -1, + lpServiceName, + (int)*lpcchBuffer, + NULL, + NULL) == 0) + { + /* + * But then, if *lpcchBuffer was greater than the number of + * (wide) characters of the UNICODE service name, yet smaller + * than the number of bytes needed due to the possible presence + * of DBCS characters, the *exact* number of bytes is returned + * (without the NULL terminator). + */ + dwLength = (DWORD)WideCharToMultiByte(CP_ACP, + 0, + lpService->lpServiceName, + (int)dwLength, + NULL, + 0, + NULL, + NULL); + *lpServiceName = 0; + *lpcchBuffer = dwLength; + return ERROR_INSUFFICIENT_BUFFER; + } + + /* + * NOTE: On Windows, RGetServiceKeyNameA() does not update + * *lpcchBuffer on success, contrary to RGetServiceKeyNameW(). + */ return ERROR_SUCCESS; } - - dwError = (*lpcchBuffer > dwLength) ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER; - - *lpcchBuffer = dwLength * 2; - - return dwError; + else + { + /* + * NOTE: On Windows, if *lpcchBuffer is smaller than the number of + * (wide) characters of the UNICODE service name, only an upper + * estimation is returned by doubling the string length, to account + * for the presence of any possible DBCS characters. + */ + *lpcchBuffer = dwLength * sizeof(WCHAR); + return ERROR_INSUFFICIENT_BUFFER; + } } diff --git a/dll/win32/advapi32/service/scm.c b/dll/win32/advapi32/service/scm.c index b28055a968..1fe96213a1 100644 --- a/dll/win32/advapi32/service/scm.c +++ b/dll/win32/advapi32/service/scm.c @@ -1693,6 +1693,11 @@ GetServiceDisplayNameW(SC_HANDLE hSCManager, return FALSE; } + /* + * NOTE: A size of 1 character would be enough, but tests show that + * Windows returns 2 characters instead, certainly due to a WCHAR/bytes + * mismatch in their code. + */ if (!lpDisplayName || *lpcchBuffer < sizeof(WCHAR)) { lpNameBuffer = szEmptyName; @@ -1810,6 +1815,11 @@ GetServiceKeyNameW(SC_HANDLE hSCManager, return FALSE; } + /* + * NOTE: A size of 1 character would be enough, but tests show that + * Windows returns 2 characters instead, certainly due to a WCHAR/bytes + * mismatch in their code. + */ if (!lpServiceName || *lpcchBuffer < sizeof(WCHAR)) { lpNameBuffer = szEmptyName;

1 0

01/01: [SETUPAPI] Do not use SetupDiOpenDevRegKey in other SetupDi functions. Use SETUPDI_OpenDevKey or SETUPDI_OpenDrvKey instead.
by Eric Kohl 23 Sep '18

23 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60e166535ae2cf95dda33… commit 60e166535ae2cf95dda330f236ae723b4f4a1ba2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 23 16:15:14 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 23 16:16:12 2018 +0200 [SETUPAPI] Do not use SetupDiOpenDevRegKey in other SetupDi functions. Use SETUPDI_OpenDevKey or SETUPDI_OpenDrvKey instead. Note: The remaining calls to SetupDiOpenDevRegKey and SetupDiCreateDevRegKey will be fixed in another patch. Fixes CORE-15091 --- dll/win32/setupapi/devclass.c | 2 +- dll/win32/setupapi/devinst.c | 31 +++++++++++++++++++------------ dll/win32/setupapi/driver.c | 8 +------- dll/win32/setupapi/setupapi_private.h | 3 +++ 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c index 4982e67290..5f88f40ab8 100644 --- a/dll/win32/setupapi/devclass.c +++ b/dll/win32/setupapi/devclass.c @@ -1279,7 +1279,7 @@ SetupDiGetClassDevPropertySheetsW( DWORD rc; if (DeviceInfoData) - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_QUERY_VALUE); + hKey = SETUPDI_OpenDrvKey(list->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_QUERY_VALUE); else { hKey = SetupDiOpenClassRegKeyExW(&list->ClassGuid, KEY_QUERY_VALUE, diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index 91356c3f54..a4d102e3b8 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -1412,6 +1412,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( PCWSTR InfSectionName) { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *deviceInfo; HKEY key = INVALID_HANDLE_VALUE; LPWSTR lpGuidString = NULL; LPWSTR DriverKey = NULL; /* {GUID}\Index */ @@ -1467,6 +1468,8 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( return INVALID_HANDLE_VALUE; } + deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (Scope == DICS_FLAG_GLOBAL) RootKey = set->HKLM; else /* Scope == DICS_FLAG_CONFIGSPECIFIC */ @@ -1479,7 +1482,6 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( if (KeyType == DIREG_DEV) { - struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; rc = RegCreateKeyExW( RootKey, @@ -1540,7 +1542,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( else /* KeyType == DIREG_DRV */ { /* Open device key, to read Driver value */ - hDeviceKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, Scope, HwProfile, DIREG_DEV, KEY_QUERY_VALUE | KEY_SET_VALUE); + hDeviceKey = SETUPDI_OpenDevKey(RootKey, deviceInfo, KEY_QUERY_VALUE | KEY_SET_VALUE); if (hDeviceKey == INVALID_HANDLE_VALUE) goto cleanup; @@ -3429,7 +3431,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( { HKEY hKey; size = PropertyBufferSize; - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_QUERY_VALUE); + hKey = SETUPDI_OpenDevKey(set->HKLM, devInfo, KEY_QUERY_VALUE); if (hKey == INVALID_HANDLE_VALUE) return FALSE; lError = RegQueryValueExW(hKey, PropertyMap[Property].nameW, @@ -3524,6 +3526,7 @@ BOOL WINAPI IntSetupDiSetDeviceRegistryPropertyAW( { BOOL ret = FALSE; struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *deviceInfo; TRACE("%p %p %d %p %d\n", DeviceInfoSet, DeviceInfoData, Property, PropertyBuffer, PropertyBufferSize); @@ -3544,13 +3547,16 @@ BOOL WINAPI IntSetupDiSetDeviceRegistryPropertyAW( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + + deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) && PropertyMap[Property].nameW && PropertyMap[Property].nameA) { HKEY hKey; LONG l; - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_SET_VALUE); + hKey = SETUPDI_OpenDevKey(set->HKLM, deviceInfo, KEY_SET_VALUE); if (hKey == INVALID_HANDLE_VALUE) return FALSE; /* Write new data */ @@ -4309,7 +4315,8 @@ BOOL WINAPI SetupDiCallClassInstaller( if (CanHandle & DEVICE_COINSTALLER) { - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_QUERY_VALUE); +// hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_QUERY_VALUE); + hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_QUERY_VALUE); if (hKey != INVALID_HANDLE_VALUE) { rc = RegQueryValueExW(hKey, REGSTR_VAL_COINSTALLERS_32, NULL, &dwRegType, NULL, &dwLength); @@ -5385,9 +5392,9 @@ SetupDiRegisterCoDeviceInstallers( /* Open/Create driver key information */ #if _WIN32_WINNT >= 0x502 - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ | KEY_WRITE); + hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_READ | KEY_WRITE); #else - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); + hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_ALL_ACCESS); #endif if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); @@ -5628,9 +5635,9 @@ SetupDiInstallDevice( /* Open/Create driver key information */ #if _WIN32_WINNT >= 0x502 - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ | KEY_WRITE); + hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_READ | KEY_WRITE); #else - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); + hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_ALL_ACCESS); #endif if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); @@ -5718,7 +5725,7 @@ SetupDiInstallDevice( RebootRequired = TRUE; /* Open device registry key */ - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_SET_VALUE); + hKey = SETUPDI_OpenDevKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_SET_VALUE); if (hKey == INVALID_HANDLE_VALUE) goto cleanup; @@ -5773,7 +5780,7 @@ cleanup: return ret; } -static HKEY SETUPDI_OpenDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired) +HKEY SETUPDI_OpenDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired) { HKEY enumKey, key = INVALID_HANDLE_VALUE; LONG l; @@ -5789,7 +5796,7 @@ static HKEY SETUPDI_OpenDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM return key; } -static HKEY SETUPDI_OpenDrvKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired) +HKEY SETUPDI_OpenDrvKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired) { LPWSTR DriverKey = NULL; DWORD dwLength = 0; diff --git a/dll/win32/setupapi/driver.c b/dll/win32/setupapi/driver.c index 356a95c08d..2b4476df1a 100644 --- a/dll/win32/setupapi/driver.c +++ b/dll/win32/setupapi/driver.c @@ -808,13 +808,7 @@ SetupDiBuildDriverInfoList( strcatW(InfFileName, InfDirectory); /* Read some information from registry, before creating the driver structure */ - hDriverKey = SetupDiOpenDevRegKey( - DeviceInfoSet, - DeviceInfoData, - DICS_FLAG_GLOBAL, - 0, - DIREG_DRV, - KEY_QUERY_VALUE); + hDriverKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, devInfo, KEY_QUERY_VALUE); if (hDriverKey == INVALID_HANDLE_VALUE) goto done; RequiredSize = (len - strlenW(InfFileName)) * sizeof(WCHAR); diff --git a/dll/win32/setupapi/setupapi_private.h b/dll/win32/setupapi/setupapi_private.h index 8bb89b56f9..8625ae7d2c 100644 --- a/dll/win32/setupapi/setupapi_private.h +++ b/dll/win32/setupapi/setupapi_private.h @@ -312,6 +312,9 @@ SETUP_CreateDevicesList( IN CONST GUID *Class OPTIONAL, IN PCWSTR Enumerator OPTIONAL); +HKEY SETUPDI_OpenDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired); +HKEY SETUPDI_OpenDrvKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired); + /* driver.c */ struct InfFileDetails *

1 0

01/01: [NTOSKRNL] Properly align VACB writes
by Pierre Schweitzer 23 Sep '18

23 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a80ae2bb6fdb4135d412… commit 2a80ae2bb6fdb4135d41244335caa2dadb6c8fa9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Sep 23 10:31:01 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Sep 23 10:32:14 2018 +0200 [NTOSKRNL] Properly align VACB writes Also simplify VACB reads alignment code. Also add some sanity ASSERTs. --- ntoskrnl/cc/copy.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 78c6553d8a..4509e2e43b 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -81,7 +81,7 @@ NTAPI CcReadVirtualAddress ( PROS_VACB Vacb) { - ULONG Size, Pages; + ULONG Size; PMDL Mdl; NTSTATUS Status; IO_STATUS_BLOCK IoStatus; @@ -95,10 +95,11 @@ CcReadVirtualAddress ( } Size = LargeSize.LowPart; - Pages = BYTES_TO_PAGES(Size); - ASSERT(Pages * PAGE_SIZE <= VACB_MAPPING_GRANULARITY); + Size = ROUND_TO_PAGES(Size); + ASSERT(Size <= VACB_MAPPING_GRANULARITY); + ASSERT(Size > 0); - Mdl = IoAllocateMdl(Vacb->BaseAddress, Pages * PAGE_SIZE, FALSE, FALSE, NULL); + Mdl = IoAllocateMdl(Vacb->BaseAddress, Size, FALSE, FALSE, NULL); if (!Mdl) { return STATUS_INSUFFICIENT_RESOURCES; @@ -177,6 +178,10 @@ CcWriteVirtualAddress ( } while (++i < (Size >> PAGE_SHIFT)); } + Size = ROUND_TO_PAGES(Size); + ASSERT(Size <= VACB_MAPPING_GRANULARITY); + ASSERT(Size > 0); + Mdl = IoAllocateMdl(Vacb->BaseAddress, Size, FALSE, FALSE, NULL); if (!Mdl) {

1 0

01/01: [BOOTDATA] Factorize the creation of user profile directories inside a helper function that can be called with different parameters.
by Hermès Bélusca-Maïto 22 Sep '18

22 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7b9db0f66ae3b4e51c27… commit f7b9db0f66ae3b4e51c273ac66ae953afb036d23 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 23 00:12:24 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 23 00:38:12 2018 +0200 [BOOTDATA] Factorize the creation of user profile directories inside a helper function that can be called with different parameters. --- boot/CMakeLists.txt | 99 +++++++++++++++++++++++------------------------------ 1 file changed, 42 insertions(+), 57 deletions(-) diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt index 0bff234030..727f75a7ff 100644 --- a/boot/CMakeLists.txt +++ b/boot/CMakeLists.txt @@ -53,10 +53,45 @@ ${_isobtrt_file} 2 ${_efisys_file} 1 ") -# ISO image identificator names +# ISO image identifier names set(ISO_MANUFACTURER "ReactOS Foundation") # For both the publisher and the preparer set(ISO_VOLNAME "ReactOS") # For both the Volume ID and the Volume set ID + +# Create user profile directories in the LiveImage +function(add_allusers_profile_dirs _image_filelist _rootdir) + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +endfunction() +function(add_user_profile_dirs _image_filelist _rootdir _username) + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Application Data/Microsoft/Internet Explorer/Quick Launch=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +endfunction() + + ## BootCD # Create the file list file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake.lst "") @@ -92,34 +127,9 @@ add_custom_target(bootcdregtest file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") -# Create the empty Desktop, Favorites, and Start Menu folders. And many more. -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Application Data/Microsoft/Internet Explorer/Quick Launch=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles/Default User/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +# Create user profile directories +add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles") +add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles" "Default User") add_custom_target(livecd COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/livecd.iso -iso-level 4 @@ -136,34 +146,9 @@ add_custom_target(livecd file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") -# Create the empty Desktop, Favorites, and Start Menu folders. And many more. -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Application Data/Microsoft/Internet Explorer/Quick Launch=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles/Default User/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +# Create user profile directories +add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles") +add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles" "Default User") add_custom_target(hybridcd COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/hybridcd.iso -iso-level 4

1 0

01/01: [SHELL32] In _SHExpandEnvironmentStrings(), fall back to SHExpandEnvironmentStringsForUserW() if the simplified code paths failed.
by Hermès Bélusca-Maïto 22 Sep '18

22 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ee298bbfc3838e7fbf92… commit 7ee298bbfc3838e7fbf92d775206ca9f4d0c38dc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 23 00:07:07 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 23 00:18:57 2018 +0200 [SHELL32] In _SHExpandEnvironmentStrings(), fall back to SHExpandEnvironmentStringsForUserW() if the simplified code paths failed. This allows the code to give a last chance for expanding the string. And if it still fails, we bail out as expected and the caller will take appropriate actions. As a by-product, this commit (together with the previous one e2960914) fixes the regression CORE-14981 (Quick-Launch bar couldn't be opened in LiveCD). --- dll/win32/shell32/wine/shellpath.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 96e47b288a..b247fd3bf3 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -1986,7 +1986,7 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR #else DWORD cchSize = cchDest; if (!GetAllUsersProfileDirectoryW(szDest, &cchSize)) - return HRESULT_FROM_WIN32(GetLastError()); + goto fallback_expand; #endif PathAppendW(szDest, szTemp + strlenW(AllUsersProfileW)); } @@ -2015,7 +2015,7 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR #else DWORD cchSize = cchDest; if (!_SHGetUserProfileDirectoryW(hToken, szDest, &cchSize)) - return HRESULT_FROM_WIN32(GetLastError()); + goto fallback_expand; #endif PathAppendW(szDest, szTemp + strlenW(UserProfileW)); } @@ -2025,16 +2025,19 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR GetSystemDirectoryW(szDest, MAX_PATH); #else if (!GetSystemDirectoryW(szDest, cchDest)) - return HRESULT_FROM_WIN32(GetLastError()); + goto fallback_expand; #endif strcpyW(szDest + 3, szTemp + strlenW(SystemDriveW) + 1); } else +#ifdef __REACTOS__ +fallback_expand: +#endif { #ifndef __REACTOS__ DWORD ret = ExpandEnvironmentStringsW(szTemp, szDest, MAX_PATH); #else - DWORD ret = SHExpandEnvironmentStringsForUserW(hToken, szSrc, szDest, cchDest); + DWORD ret = SHExpandEnvironmentStringsForUserW(hToken, szTemp, szDest, cchDest); #endif #ifndef __REACTOS__

1 0

02/02: [SHELL32] In _SHGetUserShellFolderPath(), check the return value of _SHExpandEnvironmentStrings() and bail out if it failed. That way we won't use and cache in the registry an invalid-expanded string.
by Hermès Bélusca-Maïto 22 Sep '18

22 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e29609147b6da48f4a016… commit e29609147b6da48f4a0166b39be8664a996b06b8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 22 23:37:43 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 23 00:16:06 2018 +0200 [SHELL32] In _SHGetUserShellFolderPath(), check the return value of _SHExpandEnvironmentStrings() and bail out if it failed. That way we won't use and cache in the registry an invalid-expanded string. CORE-14981 --- dll/win32/shell32/wine/shellpath.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 6396641a15..96e47b288a 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -1480,7 +1480,9 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, HANDLE hToken, LPCWSTR us #ifndef __REACTOS__ _SHExpandEnvironmentStrings(path, szTemp); #else - _SHExpandEnvironmentStrings(hToken, path, szTemp, _countof(szTemp)); + hr = _SHExpandEnvironmentStrings(hToken, path, szTemp, _countof(szTemp)); + if (FAILED(hr)) + goto end; #endif lstrcpynW(path, szTemp, MAX_PATH); } @@ -1493,6 +1495,9 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, HANDLE hToken, LPCWSTR us } else hr = E_FAIL; +#ifdef __REACTOS__ +end: +#endif RegCloseKey(shellFolderKey); RegCloseKey(userShellFolderKey); TRACE("returning 0x%08x\n", hr);

1 0

01/02: [SHELL32] Partially synchronize wine/shellpath.c with Wine.
by Hermès Bélusca-Maïto 22 Sep '18

22 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41a5b11fcd3e6cae64185… commit 41a5b11fcd3e6cae64185d7e51b8ed9800d87ecd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 22 22:19:14 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 23 00:16:02 2018 +0200 [SHELL32] Partially synchronize wine/shellpath.c with Wine. - Adjust the code with respect to: "shell32: Re-add support for expanding ALLUSERSPROFILE for backward compatibility." 4a6855a575c02aa1569aab8b2e96720fc02f3f26 (Alexandre Julliard) - "shell32: Avoid infinite loop in _SHExpandEnvironmentStrings." ceea5bda14ecf4c8ce262fc7ab88df49e500bc38 (Alexandre Julliard) - "shell32: Assume that system directory always contains a drive letter." 54530bc4933ae1014c3697c95e22b8ca5a275bc4 (Alexandre Julliard) - "shell32: Use ARRAY_SIZE macro." 612a1941331485725952d34f3dcd5866fc318dc2 (Nikolay Sivov) - "shell32: Fix a trace message." bb09bb5750d617047aa23635731519a2f9486159 (Nikolay Sivov) - "shell32: Fix SHGetFolderPathAndSubDir() trace message." f75d5625966933562b974540a3f29dfcd720ad50 (Nikolay Sivov) - "shell32: Pass correct buffer length to RegQueryValueExW()." 0bfb97dcba29552b51d8609fcc6e7bbc04bb8320 (Nikolay Sivov) - "shell32: Remove unused string (Clang)." 8d50a8a246960749afba21eac117b4fcbbf2c79d (André Hentschel) - "shell32: Use E_NOT_SUFFICIENT_BUFFER definition." 730e744e3bd6b706612fe0f90a7efb2e600f114f (Nikolay Sivov) --- dll/win32/shell32/wine/shell32_main.h | 2 + dll/win32/shell32/wine/shellpath.c | 80 +++++++++++++++++++---------------- 2 files changed, 46 insertions(+), 36 deletions(-) diff --git a/dll/win32/shell32/wine/shell32_main.h b/dll/win32/shell32/wine/shell32_main.h index 170d844b4b..1653697538 100644 --- a/dll/win32/shell32/wine/shell32_main.h +++ b/dll/win32/shell32/wine/shell32_main.h @@ -26,6 +26,8 @@ extern "C" { #endif +#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a))) + /******************************************* * global SHELL32.DLL variables */ diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index d1a3ada74e..6396641a15 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -578,7 +578,6 @@ static const WCHAR MusicW[] = {'M','u','s','i','c','\0'}; static const WCHAR Music_PlaylistsW[] = {'M','u','s','i','c','\\','P','l','a','y','l','i','s','t','s','\0'}; static const WCHAR Music_Sample_MusicW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','M','u','s','i','c','\0'}; static const WCHAR Music_Sample_PlaylistsW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','P','l','a','y','l','i','s','t','s','\0'}; -static const WCHAR My_DocumentsW[] = {'M','y',' ','D','o','c','u','m','e','n','t','s','\0'}; #endif static const WCHAR My_MusicW[] = {'M','y',' ','M','u','s','i','c','\0'}; static const WCHAR My_PicturesW[] = {'M','y',' ','P','i','c','t','u','r','e','s','\0'}; @@ -601,6 +600,9 @@ static const WCHAR Program_Files_x86_Common_FilesW[] = {'P','r','o','g','r','a', static const WCHAR ProgramFilesDirW[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r','\0'}; static const WCHAR ProgramFilesDirX86W[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',' ','(','x','8','6',')','\0'}; static const WCHAR ProgramsW[] = {'P','r','o','g','r','a','m','s','\0'}; +#ifndef __REACTOS__ +static const WCHAR PublicW[] = {'P','u','b','l','i','c',0}; +#endif static const WCHAR RecentW[] = {'R','e','c','e','n','t','\0'}; static const WCHAR ResourcesW[] = {'R','e','s','o','u','r','c','e','s','\0'}; #ifndef __REACTOS__ @@ -624,6 +626,9 @@ static const WCHAR Videos_Sample_VideosW[] = {'V','i','d','e','o','s','\\','S',' #endif static const WCHAR DefaultW[] = {'.','D','e','f','a','u','l','t','\0'}; static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'}; +#ifndef __REACTOS__ +static const WCHAR PublicProfileW[] = {'%','P','U','B','L','I','C','%',0}; +#endif static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'}; static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'}; #ifndef __REACTOS__ @@ -1425,8 +1430,8 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, HANDLE hToken, LPCWSTR us HRESULT hr; WCHAR shellFolderPath[MAX_PATH], userShellFolderPath[MAX_PATH]; LPCWSTR pShellFolderPath, pUserShellFolderPath; - DWORD dwType, dwPathLen = MAX_PATH; HKEY userShellFolderKey, shellFolderKey; + DWORD dwType, dwPathLen; TRACE("%p,%s,%s,%p\n",rootKey, debugstr_w(userPrefix), debugstr_w(value), path); @@ -1461,6 +1466,7 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, HANDLE hToken, LPCWSTR us return E_FAIL; } + dwPathLen = MAX_PATH * sizeof(WCHAR); if (!RegQueryValueExW(userShellFolderKey, value, NULL, &dwType, (LPBYTE)path, &dwPathLen) && (dwType == REG_EXPAND_SZ || dwType == REG_SZ)) { @@ -1539,8 +1545,9 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath) TRACE("0x%02x,%p\n", folder, pszPath); - if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; + if (!pszPath) return E_INVALIDARG; @@ -1576,7 +1583,11 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath) strcpyW(pszPath, UserProfileW); break; case CSIDL_Type_AllUsers: +#ifndef __REACTOS__ + strcpyW(pszPath, PublicProfileW); +#else strcpyW(pszPath, AllUsersProfileW); +#endif break; case CSIDL_Type_CurrVer: strcpyW(pszPath, SystemDriveW); @@ -1624,7 +1635,7 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder, TRACE("0x%08x,0x%02x,%p\n", dwFlags, folder, pszPath); - if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; if (CSIDL_Data[folder].type != CSIDL_Type_CurrVer) return E_INVALIDARG; @@ -1736,7 +1747,7 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, TRACE("%p,0x%08x,0x%02x,%p\n", hToken, dwFlags, folder, pszPath); - if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; if (CSIDL_Data[folder].type != CSIDL_Type_User) return E_INVALIDARG; @@ -1815,7 +1826,7 @@ static HRESULT _SHGetAllUsersProfilePath(DWORD dwFlags, BYTE folder, TRACE("0x%08x,0x%02x,%p\n", dwFlags, folder, pszPath); - if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; if (CSIDL_Data[folder].type != CSIDL_Type_AllUsers) return E_INVALIDARG; @@ -1946,8 +1957,7 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR /* get the system drive */ GetSystemDirectoryW(def_val, MAX_PATH); - if (def_val[1] == ':') strcpyW( def_val + 3, szDefaultProfileDirW ); - else FIXME("non-drive system paths unsupported\n"); + strcpyW( def_val + 3, szDefaultProfileDirW ); hr = _SHGetProfilesValue(key, ProfilesDirectoryW, szProfilesPrefix, def_val ); } @@ -1966,7 +1976,7 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR strcpyW(szDest, szProfilesPrefix); hr = _SHGetProfilesValue(key, AllUsersProfileValueW, - szAllUsers, AllUsersW); + szAllUsers, AllUsersW); PathAppendW(szDest, szAllUsers); #else DWORD cchSize = cchDest; @@ -1975,6 +1985,19 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR #endif PathAppendW(szDest, szTemp + strlenW(AllUsersProfileW)); } +#ifndef __REACTOS__ + else if (!strncmpiW(szTemp, PublicProfileW, strlenW(PublicProfileW))) + { + WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH]; + + GetSystemDirectoryW(def_val, MAX_PATH); + strcpyW( def_val + 3, UsersPublicW ); + + hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val); + PathAppendW(szDest, szAllUsers); + PathAppendW(szDest, szTemp + strlenW(PublicProfileW)); + } +#endif else if (!strncmpiW(szTemp, UserProfileW, strlenW(UserProfileW))) { #ifndef __REACTOS__ @@ -1999,21 +2022,12 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR if (!GetSystemDirectoryW(szDest, cchDest)) return HRESULT_FROM_WIN32(GetLastError()); #endif - if (szDest[1] != ':') - { - FIXME("non-drive system paths unsupported\n"); - hr = E_FAIL; - } - else - { - strcpyW(szDest + 3, szTemp + strlenW(SystemDriveW) + 1); - hr = S_OK; - } + strcpyW(szDest + 3, szTemp + strlenW(SystemDriveW) + 1); } else { #ifndef __REACTOS__ - DWORD ret = ExpandEnvironmentStringsW(szSrc, szDest, MAX_PATH); + DWORD ret = ExpandEnvironmentStringsW(szTemp, szDest, MAX_PATH); #else DWORD ret = SHExpandEnvironmentStringsForUserW(hToken, szSrc, szDest, cchDest); #endif @@ -2023,19 +2037,12 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR #else if (ret > cchDest) #endif - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + hr = E_NOT_SUFFICIENT_BUFFER; else if (ret == 0) hr = HRESULT_FROM_WIN32(GetLastError()); - else - hr = S_OK; - } - if (SUCCEEDED(hr) && szDest[0] == '%') - strcpyW(szTemp, szDest); - else - { - /* terminate loop */ - szTemp[0] = '\0'; + else if (!strcmpW( szTemp, szDest )) break; /* nothing expanded */ } + if (SUCCEEDED(hr)) strcpyW(szTemp, szDest); } end: #ifndef __REACTOS__ @@ -2092,7 +2099,8 @@ HRESULT WINAPI SHGetFolderPathAndSubDirA( HRESULT hr = S_OK; LPWSTR pszSubPathW = NULL; LPWSTR pszPathW = NULL; - TRACE("%08x,%08x,%s\n",nFolder, dwFlags, debugstr_w(pszSubPathW)); + + TRACE("%p,%#x,%p,%#x,%s,%p\n", hwndOwner, nFolder, hToken, dwFlags, debugstr_a(pszSubPath), pszPath); if(pszPath) { pszPathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); @@ -2145,7 +2153,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( CSIDL_Type type; int ret; - TRACE("%p,%p,nFolder=0x%04x,%s\n", hwndOwner,pszPath,nFolder,debugstr_w(pszSubPath)); + TRACE("%p,%#x,%p,%#x,%s,%p\n", hwndOwner, nFolder, hToken, dwFlags, debugstr_w(pszSubPath), pszPath); /* Windows always NULL-terminates the resulting path regardless of success * or failure, so do so first @@ -2153,7 +2161,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( if (pszPath) *pszPath = '\0'; - if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; if ((SHGFP_TYPE_CURRENT != dwFlags) && (SHGFP_TYPE_DEFAULT != dwFlags)) return E_INVALIDARG; @@ -2317,7 +2325,7 @@ HRESULT WINAPI SHGetFolderPathA( WCHAR szTemp[MAX_PATH]; HRESULT hr; - TRACE("%p,%p,nFolder=0x%04x\n",hwndOwner,pszPath,nFolder); + TRACE("%p,%d,%p,%#x,%p\n", hwndOwner, nFolder, hToken, dwFlags, pszPath); if (pszPath) *pszPath = '\0'; @@ -2486,7 +2494,7 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) } hr = _SHRegisterFolders(hRootKey, hToken, pUserShellFolderPath, - pShellFolderPath, folders, sizeof(folders) / sizeof(folders[0])); + pShellFolderPath, folders, ARRAY_SIZE(folders)); TRACE("returning 0x%08x\n", hr); return hr; } @@ -2511,7 +2519,7 @@ static HRESULT _SHRegisterCommonShellFolders(void) TRACE("\n"); hr = _SHRegisterFolders(HKEY_LOCAL_MACHINE, NULL, szSHUserFolders, - szSHFolders, folders, sizeof(folders) / sizeof(folders[0])); + szSHFolders, folders, ARRAY_SIZE(folders)); TRACE("returning 0x%08x\n", hr); return hr; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs