Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 67431: [KERNEL32_VISTA] - Silence debug prints
by tfaber＠svn.reactos.org 26 Apr '15

26 Apr '15

Author: tfaber Date: Sun Apr 26 06:10:03 2015 New Revision: 67431 URL: http://svn.reactos.org/svn/reactos?rev=67431&view=rev Log: [KERNEL32_VISTA] - Silence debug prints Modified: trunk/reactos/dll/win32/kernel32_vista/IdnToAscii.c trunk/reactos/dll/win32/kernel32_vista/IdnToUnicode.c Modified: trunk/reactos/dll/win32/kernel32_vista/IdnToAscii.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/I… ============================================================================== --- trunk/reactos/dll/win32/kernel32_vista/IdnToAscii.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32_vista/IdnToAscii.c [iso-8859-1] Sun Apr 26 06:10:03 2015 @@ -1,6 +1,8 @@ #define WIN32_NO_STATUS #include <wine/unicode.h> + +#define NDEBUG #include <debug.h> /* Taken from Wine kernel32/locale.c */ Modified: trunk/reactos/dll/win32/kernel32_vista/IdnToUnicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/I… ============================================================================== --- trunk/reactos/dll/win32/kernel32_vista/IdnToUnicode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32_vista/IdnToUnicode.c [iso-8859-1] Sun Apr 26 06:10:03 2015 @@ -1,6 +1,8 @@ #define WIN32_NO_STATUS #include <wine/unicode.h> + +#define NDEBUG #include <debug.h> /* Taken from Wine kernel32/locale.c */

1 0

[tfaber] 67430: [CMD] - Account for null terminator returned from RegQueryInfoKey CORE-6976
by tfaber＠svn.reactos.org 26 Apr '15

26 Apr '15

Author: tfaber Date: Sun Apr 26 05:31:16 2015 New Revision: 67430 URL: http://svn.reactos.org/svn/reactos?rev=67430&view=rev Log: [CMD] - Account for null terminator returned from RegQueryInfoKey CORE-6976 Modified: trunk/reactos/base/shell/cmd/assoc.c Modified: trunk/reactos/base/shell/cmd/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/assoc.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/assoc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/assoc.c [iso-8859-1] Sun Apr 26 05:31:16 2015 @@ -116,6 +116,7 @@ return -2; } + extLength++; extName = cmd_alloc(extLength * sizeof(TCHAR)); for(keyCtr = 0; keyCtr < numKeys; keyCtr++)

1 0

[tfaber] 67429: [DHCPCSVC] - Account for null terminator space after RegQueryInfoKey CORE-6976
by tfaber＠svn.reactos.org 26 Apr '15

26 Apr '15

Author: tfaber Date: Sun Apr 26 04:52:05 2015 New Revision: 67429 URL: http://svn.reactos.org/svn/reactos?rev=67429&view=rev Log: [DHCPCSVC] - Account for null terminator space after RegQueryInfoKey CORE-6976 Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ad… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] Sun Apr 26 04:52:05 2015 @@ -22,6 +22,7 @@ &MaxSubKeys, &MaxSubKeyLen, NULL, NULL, NULL, NULL, NULL, NULL ); + MaxSubKeyLen++; DH_DbgPrint(MID_TRACE,("MaxSubKeys: %d, MaxSubKeyLen %d\n", MaxSubKeys, MaxSubKeyLen));

1 0

[tfaber] 67428: [USERENV] - Add space for terminator to values returned from RegQueryInfoKey CORE-6976
by tfaber＠svn.reactos.org 26 Apr '15

26 Apr '15

Author: tfaber Date: Sun Apr 26 04:10:25 2015 New Revision: 67428 URL: http://svn.reactos.org/svn/reactos?rev=67428&view=rev Log: [USERENV] - Add space for terminator to values returned from RegQueryInfoKey CORE-6976 Modified: trunk/reactos/dll/win32/userenv/environment.c trunk/reactos/dll/win32/userenv/registry.c Modified: trunk/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environm… ============================================================================== --- trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] Sun Apr 26 04:10:25 2015 @@ -340,6 +340,7 @@ } /* Allocate buffers */ + dwMaxValueNameLength++; lpValueName = LocalAlloc(LPTR, dwMaxValueNameLength * sizeof(WCHAR)); if (lpValueName == NULL) Modified: trunk/reactos/dll/win32/userenv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/registry… ============================================================================== --- trunk/reactos/dll/win32/userenv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/registry.c [iso-8859-1] Sun Apr 26 04:10:25 2015 @@ -89,6 +89,9 @@ return FALSE; } + dwMaxSubKeyNameLength++; + dwMaxValueNameLength++; + DPRINT("dwSubKeys %lu\n", dwSubKeys); DPRINT("dwMaxSubKeyNameLength %lu\n", dwMaxSubKeyNameLength); DPRINT("dwValues %lu\n", dwValues);

1 0

[akhaldi] 67427: [NETCFGX] Improve button placements and fix some typos and truncations. By Joachim Henze. CORE-9575
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 22:49:02 2015 New Revision: 67427 URL: http://svn.reactos.org/svn/reactos?rev=67427&view=rev Log: [NETCFGX] Improve button placements and fix some typos and truncations. By Joachim Henze. CORE-9575 Modified: trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc trunk/reactos/dll/win32/netcfgx/lang/en-US.rc trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc trunk/reactos/dll/win32/netcfgx/lang/sq-AL.rc trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/bg-… Modified: trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/cs-… Modified: trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/da-… Modified: trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/de-… Modified: trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/el-… Modified: trunk/reactos/dll/win32/netcfgx/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/en-… Modified: trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/es-… Modified: trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/fr-… Modified: trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/he-… Modified: trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/hu-… Modified: trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/id-… Modified: trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/it-… Modified: trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ja-… Modified: trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/nl-… Modified: trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/no-… Modified: trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/pl-… Modified: trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ro-… Modified: trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ru-… Modified: trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sk-… Modified: trunk/reactos/dll/win32/netcfgx/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sq-… Modified: trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sv-… Modified: trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/tr-… Modified: trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/uk-… Modified: trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/zh-…

1 0

[tfaber] 67426: [ADVAPI32] - Account for RegQueryInfoKey no longer including the null terminator in EnumHKCRKey/EnumHKCRValue CORE-6976
by tfaber＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: tfaber Date: Sat Apr 25 20:34:35 2015 New Revision: 67426 URL: http://svn.reactos.org/svn/reactos?rev=67426&view=rev Log: [ADVAPI32] - Account for RegQueryInfoKey no longer including the null terminator in EnumHKCRKey/EnumHKCRValue CORE-6976 Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/hkc… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] Sat Apr 25 20:34:35 2015 @@ -711,11 +711,12 @@ goto Exit; } + MaxFallbackSubKeyLen++; TRACE("Maxfallbacksubkeylen: %d\n", MaxFallbackSubKeyLen); /* Allocate our buffer */ FallbackSubKeyName = RtlAllocateHeap( - RtlGetProcessHeap(), 0, (MaxFallbackSubKeyLen + 1) * sizeof(WCHAR)); + RtlGetProcessHeap(), 0, MaxFallbackSubKeyLen * sizeof(WCHAR)); if (!FallbackSubKeyName) { ErrorCode = ERROR_NOT_ENOUGH_MEMORY; @@ -925,11 +926,12 @@ goto Exit; } + MaxFallbackValueNameLen++; TRACE("Maxfallbacksubkeylen: %d\n", MaxFallbackValueNameLen); /* Allocate our buffer */ FallbackValueName = RtlAllocateHeap( - RtlGetProcessHeap(), 0, (MaxFallbackValueNameLen + 1) * sizeof(WCHAR)); + RtlGetProcessHeap(), 0, MaxFallbackValueNameLen * sizeof(WCHAR)); if (!FallbackValueName) { ErrorCode = ERROR_NOT_ENOUGH_MEMORY; Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sat Apr 25 20:34:35 2015 @@ -3789,7 +3789,6 @@ lpftLastWriteTime->dwHighDateTime = FullInfo->LastWriteTime.u.HighPart; } - ErrorCode = ERROR_SUCCESS; if (lpClass != NULL) { if (*lpcClass == 0)

1 0

[tfaber] 67425: [ADVAPI32] Fix RegQueryInfoKey - Return a value in lpcClass if lpClass is NULL - Return correct error codes as shown by tests - Correctly name parameters -- most of these are NOT by...
by tfaber＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: tfaber Date: Sat Apr 25 19:57:27 2015 New Revision: 67425 URL: http://svn.reactos.org/svn/reactos?rev=67425&view=rev Log: [ADVAPI32] Fix RegQueryInfoKey - Return a value in lpcClass if lpClass is NULL - Return correct error codes as shown by tests - Correctly name parameters -- most of these are NOT byte counts CORE-6976 Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sat Apr 25 19:57:27 2015 @@ -1961,7 +1961,7 @@ * NOTES * - Unless RRF_NOEXPAND is specified, REG_EXPAND_SZ values are automatically * expanded and pdwType is set to REG_SZ instead. - * - Restrictions are applied after expanding, using RRF_RT_REG_EXPAND_SZ + * - Restrictions are applied after expanding, using RRF_RT_REG_EXPAND_SZ * without RRF_NOEXPAND is thus not allowed. * An exception is the case where RRF_RT_ANY is specified, because then * RRF_NOEXPAND is allowed. @@ -2720,11 +2720,14 @@ if ((lpData && !lpcbData) || lpdwReserved) return ERROR_INVALID_PARAMETER; - /* Get the size of the buffer we must use for the first call ro RegEnumValueW */ + /* Get the size of the buffer we must use for the first call to RegEnumValueW */ ErrorCode = RegQueryInfoKeyW( hKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &NameBufferSize, NULL, NULL, NULL); if (ErrorCode != ERROR_SUCCESS) return ErrorCode; + + /* Add space for the null terminator */ + NameBufferSize++; /* Allocate the buffer for the unicode name */ NameBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, NameBufferSize * sizeof(WCHAR)); @@ -3583,14 +3586,14 @@ LONG WINAPI RegQueryInfoKeyA(HKEY hKey, LPSTR lpClass, - LPDWORD lpcbClass, + LPDWORD lpcClass, LPDWORD lpReserved, LPDWORD lpcSubKeys, - LPDWORD lpcbMaxSubKeyLen, - LPDWORD lpcbMaxClassLen, + LPDWORD lpcMaxSubKeyLen, + LPDWORD lpcMaxClassLen, LPDWORD lpcValues, - LPDWORD lpcbMaxValueNameLen, - LPDWORD lpcbMaxValueLen, + LPDWORD lpcMaxValueNameLen, + LPDWORD lpcMaxValueLen, LPDWORD lpcbSecurityDescriptor, PFILETIME lpftLastWriteTime) { @@ -3598,38 +3601,51 @@ UNICODE_STRING UnicodeString; ANSI_STRING AnsiString; LONG ErrorCode; + NTSTATUS Status; + DWORD cClass = 0; RtlInitUnicodeString(&UnicodeString, NULL); if (lpClass != NULL) { - UnicodeString.Buffer = &ClassName[0]; - UnicodeString.MaximumLength = sizeof(ClassName); - AnsiString.MaximumLength = *lpcbClass; + RtlInitEmptyUnicodeString(&UnicodeString, + ClassName, + sizeof(ClassName)); + cClass = sizeof(ClassName) / sizeof(WCHAR); } ErrorCode = RegQueryInfoKeyW(hKey, UnicodeString.Buffer, - lpcbClass, + &cClass, lpReserved, lpcSubKeys, - lpcbMaxSubKeyLen, - lpcbMaxClassLen, + lpcMaxSubKeyLen, + lpcMaxClassLen, lpcValues, - lpcbMaxValueNameLen, - lpcbMaxValueLen, + lpcMaxValueNameLen, + lpcMaxValueLen, lpcbSecurityDescriptor, lpftLastWriteTime); if ((ErrorCode == ERROR_SUCCESS) && (lpClass != NULL)) { - AnsiString.Buffer = lpClass; - AnsiString.Length = 0; - UnicodeString.Length = *lpcbClass * sizeof(WCHAR); - RtlUnicodeStringToAnsiString(&AnsiString, - &UnicodeString, - FALSE); - *lpcbClass = AnsiString.Length; - lpClass[AnsiString.Length] = 0; + if (*lpcClass == 0) + { + return ErrorCode; + } + + RtlInitEmptyAnsiString(&AnsiString, lpClass, *lpcClass); + UnicodeString.Length = cClass * sizeof(WCHAR); + Status = RtlUnicodeStringToAnsiString(&AnsiString, + &UnicodeString, + FALSE); + ErrorCode = RtlNtStatusToDosError(Status); + cClass = AnsiString.Length; + lpClass[*lpcClass - 1] = 0; + } + + if (lpcClass != NULL) + { + *lpcClass = cClass; } return ErrorCode; @@ -3644,14 +3660,14 @@ LONG WINAPI RegQueryInfoKeyW(HKEY hKey, LPWSTR lpClass, - LPDWORD lpcbClass, + LPDWORD lpcClass, LPDWORD lpReserved, LPDWORD lpcSubKeys, - LPDWORD lpcbMaxSubKeyLen, - LPDWORD lpcbMaxClassLen, + LPDWORD lpcMaxSubKeyLen, + LPDWORD lpcMaxClassLen, LPDWORD lpcValues, - LPDWORD lpcbMaxValueNameLen, - LPDWORD lpcbMaxValueLen, + LPDWORD lpcMaxValueNameLen, + LPDWORD lpcMaxValueLen, LPDWORD lpcbSecurityDescriptor, PFILETIME lpftLastWriteTime) { @@ -3664,7 +3680,7 @@ ULONG Length; LONG ErrorCode = ERROR_SUCCESS; - if ((lpClass) && (!lpcbClass)) + if ((lpClass) && (!lpcClass)) { return ERROR_INVALID_PARAMETER; } @@ -3678,9 +3694,9 @@ if (lpClass != NULL) { - if (*lpcbClass > 0) - { - ClassLength = min(*lpcbClass - 1, REG_MAX_NAME_SIZE) * sizeof(WCHAR); + if (*lpcClass > 0) + { + ClassLength = min(*lpcClass - 1, REG_MAX_NAME_SIZE) * sizeof(WCHAR); } else { @@ -3696,16 +3712,12 @@ ErrorCode = ERROR_OUTOFMEMORY; goto Cleanup; } - - FullInfo->ClassLength = ClassLength; } else { FullInfoSize = sizeof(KEY_FULL_INFORMATION); FullInfo = &FullInfoBuffer; - FullInfo->ClassLength = 0; - } - FullInfo->ClassOffset = FIELD_OFFSET(KEY_FULL_INFORMATION, Class); + } Status = NtQueryKey(KeyHandle, KeyFullInformation, @@ -3713,15 +3725,8 @@ FullInfoSize, &Length); TRACE("NtQueryKey() returned status 0x%X\n", Status); - if (!NT_SUCCESS(Status)) - { - if (lpClass != NULL) - { - RtlFreeHeap(ProcessHeap, - 0, - FullInfo); - } - + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { ErrorCode = RtlNtStatusToDosError(Status); goto Cleanup; } @@ -3733,15 +3738,15 @@ } TRACE("MaxNameLen %lu\n", FullInfo->MaxNameLen); - if (lpcbMaxSubKeyLen != NULL) - { - *lpcbMaxSubKeyLen = FullInfo->MaxNameLen / sizeof(WCHAR) + 1; + if (lpcMaxSubKeyLen != NULL) + { + *lpcMaxSubKeyLen = FullInfo->MaxNameLen / sizeof(WCHAR); } TRACE("MaxClassLen %lu\n", FullInfo->MaxClassLen); - if (lpcbMaxClassLen != NULL) - { - *lpcbMaxClassLen = FullInfo->MaxClassLen / sizeof(WCHAR) + 1; + if (lpcMaxClassLen != NULL) + { + *lpcMaxClassLen = FullInfo->MaxClassLen / sizeof(WCHAR); } TRACE("Values %lu\n", FullInfo->Values); @@ -3751,15 +3756,15 @@ } TRACE("MaxValueNameLen %lu\n", FullInfo->MaxValueNameLen); - if (lpcbMaxValueNameLen != NULL) - { - *lpcbMaxValueNameLen = FullInfo->MaxValueNameLen / sizeof(WCHAR) + 1; + if (lpcMaxValueNameLen != NULL) + { + *lpcMaxValueNameLen = FullInfo->MaxValueNameLen / sizeof(WCHAR); } TRACE("MaxValueDataLen %lu\n", FullInfo->MaxValueDataLen); - if (lpcbMaxValueLen != NULL) - { - *lpcbMaxValueLen = FullInfo->MaxValueDataLen; + if (lpcMaxValueLen != NULL) + { + *lpcMaxValueLen = FullInfo->MaxValueDataLen; } if (lpcbSecurityDescriptor != NULL) @@ -3773,13 +3778,6 @@ lpcbSecurityDescriptor); if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) { - if (lpClass != NULL) - { - RtlFreeHeap(ProcessHeap, - 0, - FullInfo); - } - ErrorCode = RtlNtStatusToDosError(Status); goto Cleanup; } @@ -3791,27 +3789,40 @@ lpftLastWriteTime->dwHighDateTime = FullInfo->LastWriteTime.u.HighPart; } + ErrorCode = ERROR_SUCCESS; if (lpClass != NULL) { + if (*lpcClass == 0) + { + goto Cleanup; + } + if (FullInfo->ClassLength > ClassLength) { - ErrorCode = ERROR_BUFFER_OVERFLOW; + ErrorCode = ERROR_INSUFFICIENT_BUFFER; } else { RtlCopyMemory(lpClass, FullInfo->Class, FullInfo->ClassLength); - *lpcbClass = FullInfo->ClassLength / sizeof(WCHAR); - lpClass[*lpcbClass] = 0; - } - + lpClass[FullInfo->ClassLength / sizeof(WCHAR)] = UNICODE_NULL; + } + } + + if (lpcClass != NULL) + { + *lpcClass = FullInfo->ClassLength / sizeof(WCHAR); + } + +Cleanup: + if (lpClass != NULL) + { RtlFreeHeap(ProcessHeap, 0, FullInfo); } -Cleanup: ClosePredefKey(KeyHandle); return ErrorCode; @@ -3979,9 +3990,9 @@ * Failure: ERROR_INVALID_HANDLE, if hkey is invalid. * ERROR_INVALID_PARAMETER, if any other parameter is invalid. * ERROR_MORE_DATA, if on input *count is too small to hold the contents. - * + * * NOTES - * MSDN states that if data is too small it is partially filled. In reality + * MSDN states that if data is too small it is partially filled. In reality * it remains untouched. */ LONG @@ -4218,15 +4229,15 @@ if (name && name[0]) { ret = RegOpenKeyW( hkey, name, &subkey); - if (ret != ERROR_SUCCESS) + if (ret != ERROR_SUCCESS) { return ret; } } ret = RegQueryValueExW( subkey, NULL, NULL, NULL, (LPBYTE)data, (LPDWORD)count ); - - if (subkey != hkey) + + if (subkey != hkey) { RegCloseKey( subkey ); } @@ -4234,9 +4245,9 @@ if (ret == ERROR_FILE_NOT_FOUND) { /* return empty string if default value not found */ - if (data) + if (data) *data = 0; - if (count) + if (count) *count = sizeof(WCHAR); ret = ERROR_SUCCESS; }

1 0

[tfaber] 67424: [ADVAPI32_WINETEST] - Add a test for RegQueryInfoKey. This serves as a placeholder to be replaced with the upstream version once accepted -- however it tests against Win 2003 behavi...
by tfaber＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: tfaber Date: Sat Apr 25 19:14:03 2015 New Revision: 67424 URL: http://svn.reactos.org/svn/reactos?rev=67424&view=rev Log: [ADVAPI32_WINETEST] - Add a test for RegQueryInfoKey. This serves as a placeholder to be replaced with the upstream version once accepted -- however it tests against Win 2003 behavior, so it can validate changes to our advapi32. CORE-6976 Modified: trunk/rostests/winetests/advapi32/registry.c Modified: trunk/rostests/winetests/advapi32/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/regist… ============================================================================== --- trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] Sat Apr 25 19:14:03 2015 @@ -1665,6 +1665,191 @@ ok(size == sizeof(expected), "Got wrong size: %d\n", size); cleanup: + RegDeleteKeyA(subkey, ""); + RegCloseKey(subkey); +} + +static void test_reg_query_info(void) +{ + HKEY subkey; + HKEY subsubkey; + LONG ret; + char classbuffer[32]; + WCHAR classbufferW[32]; + char subkey_class[] = "subkey class"; + WCHAR subkey_classW[] = {'s','u','b','k','e','y',' ','c','l','a','s','s',0}; + char subsubkey_class[] = "subsubkey class"; + DWORD classlen; + DWORD subkeys, maxsubkeylen, maxclasslen; + DWORD values, maxvaluenamelen, maxvaluelen; + DWORD sdlen; + FILETIME lastwrite; + + ret = RegCreateKeyExA(hkey_main, "subkey", 0, subkey_class, 0, KEY_ALL_ACCESS, NULL, &subkey, NULL); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + /* invalid parameters */ + ret = RegQueryInfoKeyA(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_INVALID_HANDLE, "ret = %d\n", ret); + + ret = RegQueryInfoKeyA(subkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + + /* empty key */ + ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); + ok(subkeys == 0, "subkeys = %u\n", subkeys); + ok(maxsubkeylen == 0, "maxsubkeylen = %u\n", maxsubkeylen); + ok(maxclasslen == 0, "maxclasslen = %u\n", maxclasslen); + ok(values == 0, "values = %u\n", values); + ok(maxvaluenamelen == 0, "maxvaluenamelen = %u\n", maxvaluenamelen); + ok(maxvaluelen == 0, "maxvaluelen = %u\n", maxvaluelen); + ok(sdlen != 0, "sdlen = %u\n", sdlen); + ok(lastwrite.dwLowDateTime != 0, "lastwrite.dwLowDateTime = %u\n", lastwrite.dwLowDateTime); + ok(lastwrite.dwHighDateTime != 0, "lastwrite.dwHighDateTime = %u\n", lastwrite.dwHighDateTime); + + ret = RegQueryInfoKeyW(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); + ok(subkeys == 0, "subkeys = %u\n", subkeys); + ok(maxsubkeylen == 0, "maxsubkeylen = %u\n", maxsubkeylen); + ok(maxclasslen == 0, "maxclasslen = %u\n", maxclasslen); + ok(values == 0, "values = %u\n", values); + ok(maxvaluenamelen == 0, "maxvaluenamelen = %u\n", maxvaluenamelen); + ok(maxvaluelen == 0, "maxvaluelen = %u\n", maxvaluelen); + ok(sdlen != 0, "sdlen = %u\n", sdlen); + ok(lastwrite.dwLowDateTime != 0, "lastwrite.dwLowDateTime = %u\n", lastwrite.dwLowDateTime); + ok(lastwrite.dwHighDateTime != 0, "lastwrite.dwHighDateTime = %u\n", lastwrite.dwHighDateTime); + + ret = RegCreateKeyExA(subkey, "subsubkey", 0, subsubkey_class, 0, KEY_ALL_ACCESS, NULL, &subsubkey, NULL); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegSetValueExA(subkey, NULL, 0, REG_SZ, (BYTE*)"data", 5); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + /* with subkey & default value */ + ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); + ok(subkeys == 1, "subkeys = %u\n", subkeys); + ok(maxsubkeylen == strlen("subsubkey"), "maxsubkeylen = %u\n", maxsubkeylen); + ok(maxclasslen == strlen(subsubkey_class), "maxclasslen = %u\n", maxclasslen); + ok(values == 1, "values = %u\n", values); + ok(maxvaluenamelen == 0, "maxvaluenamelen = %u\n", maxvaluenamelen); + ok(maxvaluelen == sizeof("data") * sizeof(WCHAR), "maxvaluelen = %u\n", maxvaluelen); + ok(sdlen != 0, "sdlen = %u\n", sdlen); + ok(lastwrite.dwLowDateTime != 0, "lastwrite.dwLowDateTime = %u\n", lastwrite.dwLowDateTime); + ok(lastwrite.dwHighDateTime != 0, "lastwrite.dwHighDateTime = %u\n", lastwrite.dwHighDateTime); + + ret = RegQueryInfoKeyW(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); + ok(subkeys == 1, "subkeys = %u\n", subkeys); + ok(maxsubkeylen == strlen("subsubkey"), "maxsubkeylen = %u\n", maxsubkeylen); + ok(maxclasslen == strlen(subsubkey_class), "maxclasslen = %u\n", maxclasslen); + ok(values == 1, "values = %u\n", values); + ok(maxvaluenamelen == 0, "maxvaluenamelen = %u\n", maxvaluenamelen); + ok(maxvaluelen == sizeof("data") * sizeof(WCHAR), "maxvaluelen = %u\n", maxvaluelen); + ok(sdlen != 0, "sdlen = %u\n", sdlen); + ok(lastwrite.dwLowDateTime != 0, "lastwrite.dwLowDateTime = %u\n", lastwrite.dwLowDateTime); + ok(lastwrite.dwHighDateTime != 0, "lastwrite.dwHighDateTime = %u\n", lastwrite.dwHighDateTime); + + ret = RegSetValueExA(subkey, "value one", 0, REG_SZ, (BYTE*)"first value data", 17); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegSetValueExA(subkey, "value 2", 0, REG_SZ, (BYTE*)"second value data", 18); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + /* with named value */ + ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(values == 3, "values = %u\n", values); + ok(maxvaluenamelen == strlen("value one"), "maxvaluenamelen = %u\n", maxvaluenamelen); + ok(maxvaluelen == sizeof("second value data") * sizeof(WCHAR), "maxvaluelen = %u\n", maxvaluelen); + + ret = RegQueryInfoKeyW(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(values == 3, "values = %u\n", values); + ok(maxvaluenamelen == strlen("value one"), "maxvaluenamelen = %u\n", maxvaluenamelen); + ok(maxvaluelen == sizeof("second value data") * sizeof(WCHAR), "maxvaluelen = %u\n", maxvaluelen); + + /* class name with zero size buffer */ + memset(classbuffer, 0x55, sizeof(classbuffer)); + classlen = 0; + ret = RegQueryInfoKeyA(subkey, classbuffer, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == 0, "classlen = %u\n", classlen); + ok(classbuffer[0] == 0x55, "classbuffer[0] = 0x%x\n", classbuffer[0]); + + memset(classbufferW, 0x55, sizeof(classbufferW)); + classlen = 0; + ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == 0, "classlen = %u\n", classlen); + ok(classbufferW[0] == 0x5555, "classbufferW[0] = 0x%x\n", classbufferW[0]); + + /* class name with one char buffer */ + memset(classbuffer, 0x55, sizeof(classbuffer)); + classlen = 1; + ret = RegQueryInfoKeyA(subkey, classbuffer, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_MORE_DATA, "ret = %d\n", ret); + ok(classlen == 0, "classlen = %u\n", classlen); + ok(classbuffer[0] == 0, "classbuffer[0] = 0x%x\n", classbuffer[0]); + ok(classbuffer[1] == 0x55, "classbuffer[1] = 0x%x\n", classbuffer[1]); + + memset(classbufferW, 0x55, sizeof(classbufferW)); + classlen = 1; + ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_INSUFFICIENT_BUFFER, "ret = %d\n", ret); + ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); + ok(classbufferW[0] == 0x5555, "classbufferW[0] = 0x%x\n", classbufferW[0]); + ok(classbufferW[1] == 0x5555, "classbufferW[1] = 0x%x\n", classbufferW[1]); + + /* class name with buffer one char too small */ + memset(classbuffer, 0x55, sizeof(classbuffer)); + classlen = sizeof(subkey_class) - 1; + ret = RegQueryInfoKeyA(subkey, classbuffer, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_MORE_DATA, "ret = %d\n", ret); + ok(classlen == sizeof(subkey_class) - 2, "classlen = %u\n", classlen); + ok(classbuffer[0] == 's', "classbuffer[0] = 0x%x\n", classbuffer[0]); + ok(classbuffer[1] == 'u', "classbuffer[1] = 0x%x\n", classbuffer[1]); + ok(classbuffer[10] == 's', "classbuffer[10] = 0x%x\n", classbuffer[10]); + ok(classbuffer[11] == 0, "classbuffer[11] = 0x%x\n", classbuffer[11]); + ok(classbuffer[12] == 0x55, "classbuffer[12] = 0x%x\n", classbuffer[12]); + + memset(classbufferW, 0x55, sizeof(classbufferW)); + classlen = sizeof(subkey_class) - 1; + ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_INSUFFICIENT_BUFFER, "ret = %d\n", ret); + ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); + ok(classbufferW[0] == 0x5555, "classbufferW[0] = 0x%x\n", classbufferW[0]); + ok(classbufferW[1] == 0x5555, "classbufferW[1] = 0x%x\n", classbufferW[1]); + ok(classbufferW[10] == 0x5555, "classbufferW[10] = 0x%x\n", classbufferW[10]); + ok(classbufferW[11] == 0x5555, "classbufferW[11] = 0x%x\n", classbufferW[11]); + ok(classbufferW[12] == 0x5555, "classbufferW[12] = 0x%x\n", classbufferW[12]); + + /* class name with large enough buffer */ + memset(classbuffer, 0x55, sizeof(classbuffer)); + classlen = sizeof(subkey_class); + ret = RegQueryInfoKeyA(subkey, classbuffer, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == sizeof(subkey_class) - 1, "classlen = %u\n", classlen); + ok(!strcmp(classbuffer, subkey_class), "classbuffer = %s\n", classbuffer); + ok(classbuffer[12] == 0, "classbuffer[12] = 0x%x\n", classbuffer[12]); + ok(classbuffer[13] == 0x55, "classbuffer[13] = 0x%x\n", classbuffer[13]); + + memset(classbufferW, 0x55, sizeof(classbufferW)); + classlen = sizeof(subkey_class); + ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == sizeof(subkey_class) - 1, "classlen = %u\n", classlen); + ok(!lstrcmpW(classbufferW, subkey_classW), "classbufferW = %s\n", wine_dbgstr_w(classbufferW)); + ok(classbufferW[12] == 0, "classbufferW[12] = 0x%x\n", classbufferW[12]); + ok(classbufferW[13] == 0x5555, "classbufferW[13] = 0x%x\n", classbufferW[13]); + + RegDeleteKeyA(subsubkey, ""); + RegCloseKey(subsubkey); RegDeleteKeyA(subkey, ""); RegCloseKey(subkey); } @@ -2962,6 +3147,7 @@ test_reg_close_key(); test_reg_delete_key(); test_reg_query_value(); + test_reg_query_info(); test_string_termination(); test_symlinks(); test_redirection();

1 0

[pschweitzer] 67423: [KERNEL32] Remove hack in PrivMoveFileIdentityW and properly handle failing call to BasepNotifyTrackingService(). Fixes regression brought by r67355
by pschweitzer＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: pschweitzer Date: Sat Apr 25 18:36:41 2015 New Revision: 67423 URL: http://svn.reactos.org/svn/reactos?rev=67423&view=rev Log: [KERNEL32] Remove hack in PrivMoveFileIdentityW and properly handle failing call to BasepNotifyTrackingService(). Fixes regression brought by r67355 Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] Sat Apr 25 18:36:41 2015 @@ -1495,17 +1495,15 @@ &ObjectAttributesSource, DestinationHandle, &NtDestination); -#if 1 // ReactOS HACK - /* FIXME: To be removed once BasepNotifyTrackingService is implemented */ - if (Status == STATUS_NOT_IMPLEMENTED) - Status = STATUS_SUCCESS; -#endif if (!NT_SUCCESS(Status)) { if (dwFlags & PRIV_ALLOW_NON_TRACKABLE) { if (NT_SUCCESS(OldStatus)) OldStatus = Status; + + /* Reset status, we allow non trackable files */ + Status = STATUS_SUCCESS; } } }

1 0

[akhaldi] 67422: [WINED3DCFG] Capitalize all the settings. By Jared Smudde. CORE-9573
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 17:42:34 2015 New Revision: 67422 URL: http://svn.reactos.org/svn/reactos?rev=67422&view=rev Log: [WINED3DCFG] Capitalize all the settings. By Jared Smudde. CORE-9573 Modified: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.h Modified: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/wined3d… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.h [iso-8859-1] Sat Apr 25 17:42:34 2015 @@ -12,13 +12,13 @@ #define MAX_KEY_LENGTH 256 -#define VALUE_GDI L"gdi" -#define VALUE_ENABLED L"enabled" -#define VALUE_DISABLED L"disabled" -#define VALUE_NONE L"none" -#define VALUE_BACKBUFFER L"backbuffer" -#define VALUE_FBO L"fbo" -#define VALUE_DEFAULT L"default" +#define VALUE_GDI L"GDI" +#define VALUE_ENABLED L"Enabled" +#define VALUE_DISABLED L"Disabled" +#define VALUE_NONE L"None" +#define VALUE_BACKBUFFER L"Backbuffer" +#define VALUE_FBO L"FBO" +#define VALUE_DEFAULT L"Default" #define KEY_WINE L"Software\\Wine\\Direct3D"

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