Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[tfaber] 67414: [NTDLL_APITEST] - Add a test for NtQueryKey(KeyFullInformation) CORE-6976
by tfaber＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: tfaber Date: Sat Apr 25 15:05:36 2015 New Revision: 67414 URL: http://svn.reactos.org/svn/reactos?rev=67414&view=rev Log: [NTDLL_APITEST] - Add a test for NtQueryKey(KeyFullInformation) CORE-6976 Modified: trunk/rostests/apitests/ntdll/NtQueryKey.c Modified: trunk/rostests/apitests/ntdll/NtQueryKey.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtQueryKey… ============================================================================== --- trunk/rostests/apitests/ntdll/NtQueryKey.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtQueryKey.c [iso-8859-1] Sat Apr 25 15:05:36 2015 @@ -3,6 +3,7 @@ * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Tests for the NtQueryKey API * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + * Thomas Faber <thomas.faber(a)reactos.org> */ #include <apitest.h> @@ -12,6 +13,181 @@ #include <ndk/cmfuncs.h> #include <ndk/cmtypes.h> #include <ndk/obfuncs.h> + +static +void +Test_KeyFullInformation(void) +{ + UNICODE_STRING HKLM_Name = RTL_CONSTANT_STRING(L"\\Registry\\Machine"); + UNICODE_STRING Software_Name = RTL_CONSTANT_STRING(L"Software"); + UNICODE_STRING Test_Name = RTL_CONSTANT_STRING(L"NtQueryKey_apitest"); + UNICODE_STRING MyClass = RTL_CONSTANT_STRING(L"MyClass"); + HANDLE HKLM_Key, HKLM_Software_Key, Test_Key; + ULONG FullInformationLength; + PKEY_FULL_INFORMATION FullInformation; + ULONG InfoLength; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + + FullInformationLength = FIELD_OFFSET(KEY_FULL_INFORMATION, Class[100]); + FullInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, FullInformationLength); + if (!FullInformation) + { + skip("Out of memory\n"); + return; + } + + InitializeObjectAttributes(&ObjectAttributes, + &HKLM_Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&HKLM_Key, KEY_READ, &ObjectAttributes); + ok_ntstatus(Status, STATUS_SUCCESS); + + InfoLength = 0x55555555; + Status = NtQueryKey(HKLM_Key, KeyFullInformation, NULL, 0, &InfoLength); + ok(Status == STATUS_BUFFER_TOO_SMALL, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "InfoLength = %lu\n", InfoLength); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(HKLM_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class), &InfoLength); + ok(Status == STATUS_SUCCESS, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart != 0x5555555555555555, "LastWriteTime unchanged\n"); + ok(FullInformation->TitleIndex == 0, "TitleIndex = %lu\n", FullInformation->TitleIndex); + ok(FullInformation->ClassOffset == 0xffffffff, "ClassOffset = %lu\n", FullInformation->ClassOffset); + ok(FullInformation->ClassLength == 0, "ClassLength = %lu\n", FullInformation->ClassLength); + ok(FullInformation->SubKeys >= 5 && FullInformation->SubKeys < 20, "SubKeys = %lu\n", FullInformation->SubKeys); + ok(FullInformation->MaxNameLen >= 8 * sizeof(WCHAR) && FullInformation->MaxNameLen < 100 * sizeof(WCHAR), "MaxNameLen = %lu\n", FullInformation->MaxNameLen); + ok(FullInformation->MaxClassLen != 0x55555555 && FullInformation->MaxClassLen % sizeof(WCHAR) == 0, "MaxClassLen = %lu\n", FullInformation->MaxClassLen); + ok(FullInformation->Values != 0x55555555, "Values = %lu\n", FullInformation->Values); + ok(FullInformation->MaxValueNameLen != 0x55555555 && FullInformation->MaxValueNameLen % sizeof(WCHAR) == 0, "MaxValueNameLen = %lu\n", FullInformation->MaxValueNameLen); + ok(FullInformation->MaxValueDataLen != 0x55555555, "MaxValueDataLen = %lu\n", FullInformation->MaxValueDataLen); + ok(FullInformation->Class[0] == 0x5555, "Class[0] = %u\n", FullInformation->Class[0]); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(HKLM_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class) - 1, &InfoLength); + ok(Status == STATUS_BUFFER_TOO_SMALL, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart == 0x5555555555555555, "LastWriteTime changed: %I64d\n", FullInformation->LastWriteTime.QuadPart); + + InitializeObjectAttributes(&ObjectAttributes, + &Software_Name, + OBJ_CASE_INSENSITIVE, + HKLM_Key, + NULL); + Status = NtOpenKey(&HKLM_Software_Key, KEY_READ, &ObjectAttributes); + ok_ntstatus(Status, STATUS_SUCCESS); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(HKLM_Software_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class), &InfoLength); + ok(Status == STATUS_SUCCESS, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart != 0x5555555555555555, "LastWriteTime unchanged\n"); + ok(FullInformation->TitleIndex == 0, "TitleIndex = %lu\n", FullInformation->TitleIndex); + ok(FullInformation->ClassOffset == 0xffffffff, "ClassOffset = %lu\n", FullInformation->ClassOffset); + ok(FullInformation->ClassLength == 0, "ClassLength = %lu\n", FullInformation->ClassLength); + ok(FullInformation->SubKeys >= 5 && FullInformation->SubKeys < 1000, "SubKeys = %lu\n", FullInformation->SubKeys); + ok(FullInformation->MaxNameLen >= 8 * sizeof(WCHAR), "MaxNameLen = %lu\n", FullInformation->MaxNameLen); + ok(FullInformation->MaxClassLen != 0x55555555 && FullInformation->MaxClassLen % sizeof(WCHAR) == 0, "MaxClassLen = %lu\n", FullInformation->MaxClassLen); + ok(FullInformation->Values != 0x55555555, "Values = %lu\n", FullInformation->Values); + ok(FullInformation->MaxValueNameLen != 0x55555555 && FullInformation->MaxValueNameLen % sizeof(WCHAR) == 0, "MaxValueNameLen = %lu\n", FullInformation->MaxValueNameLen); + ok(FullInformation->MaxValueDataLen != 0x55555555, "MaxValueDataLen = %lu\n", FullInformation->MaxValueDataLen); + ok(FullInformation->Class[0] == 0x5555, "Class[0] = %u\n", FullInformation->Class[0]); + + InitializeObjectAttributes(&ObjectAttributes, + &Test_Name, + OBJ_CASE_INSENSITIVE, + HKLM_Software_Key, + NULL); + Status = NtCreateKey(&Test_Key, KEY_ALL_ACCESS, &ObjectAttributes, 0, &MyClass, REG_OPTION_VOLATILE, NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + + InfoLength = 0x55555555; + Status = NtQueryKey(Test_Key, KeyFullInformation, NULL, 0, &InfoLength); + ok(Status == STATUS_BUFFER_TOO_SMALL, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length, "InfoLength = %lu\n", InfoLength); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(Test_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class), &InfoLength); + ok(Status == STATUS_BUFFER_OVERFLOW, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length, "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart != 0x5555555555555555, "LastWriteTime unchanged\n"); + ok(FullInformation->TitleIndex == 0, "TitleIndex = %lu\n", FullInformation->TitleIndex); + ok(FullInformation->ClassOffset == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "ClassOffset = %lu\n", FullInformation->ClassOffset); + ok(FullInformation->ClassLength == MyClass.Length, "ClassLength = %lu\n", FullInformation->ClassLength); + ok(FullInformation->SubKeys == 0, "SubKeys = %lu\n", FullInformation->SubKeys); + ok(FullInformation->MaxNameLen == 0, "MaxNameLen = %lu\n", FullInformation->MaxNameLen); + ok(FullInformation->MaxClassLen == 0, "MaxClassLen = %lu\n", FullInformation->MaxClassLen); + ok(FullInformation->Values == 0, "Values = %lu\n", FullInformation->Values); + ok(FullInformation->MaxValueNameLen == 0, "MaxValueNameLen = %lu\n", FullInformation->MaxValueNameLen); + ok(FullInformation->MaxValueDataLen == 0, "MaxValueDataLen = %lu\n", FullInformation->MaxValueDataLen); + ok(FullInformation->Class[0] == 0x5555, "Class[0] = %u\n", FullInformation->Class[0]); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(Test_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class[1]), &InfoLength); + ok(Status == STATUS_BUFFER_OVERFLOW, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length, "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart != 0x5555555555555555, "LastWriteTime unchanged\n"); + ok(FullInformation->ClassOffset == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "ClassOffset = %lu\n", FullInformation->ClassOffset); + ok(FullInformation->ClassLength == MyClass.Length, "ClassLength = %lu\n", FullInformation->ClassLength); + ok(FullInformation->Class[0] == L'M', "Class[0] = %u\n", FullInformation->Class[0]); + ok(FullInformation->Class[1] == 0x5555, "Class[1] = %u\n", FullInformation->Class[1]); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(Test_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length - 1, &InfoLength); + ok(Status == STATUS_BUFFER_OVERFLOW, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length, "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart != 0x5555555555555555, "LastWriteTime unchanged\n"); + ok(FullInformation->ClassOffset == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "ClassOffset = %lu\n", FullInformation->ClassOffset); + ok(FullInformation->ClassLength == MyClass.Length, "ClassLength = %lu\n", FullInformation->ClassLength); + ok(FullInformation->Class[0] == L'M', "Class[0] = %u\n", FullInformation->Class[0]); + ok(FullInformation->Class[1] == L'y', "Class[1] = %u\n", FullInformation->Class[1]); + ok(FullInformation->Class[6] == (L's' | 0x5500), "Class[6] = %u\n", FullInformation->Class[6]); + ok(FullInformation->Class[7] == 0x5555, "Class[7] = %u\n", FullInformation->Class[7]); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(Test_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length, &InfoLength); + ok(Status == STATUS_SUCCESS, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length, "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart != 0x5555555555555555, "LastWriteTime unchanged\n"); + ok(FullInformation->ClassOffset == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "ClassOffset = %lu\n", FullInformation->ClassOffset); + ok(FullInformation->ClassLength == MyClass.Length, "ClassLength = %lu\n", FullInformation->ClassLength); + ok(FullInformation->Class[0] == L'M', "Class[0] = %u\n", FullInformation->Class[0]); + ok(FullInformation->Class[1] == L'y', "Class[1] = %u\n", FullInformation->Class[1]); + ok(FullInformation->Class[6] == L's', "Class[6] = %u\n", FullInformation->Class[6]); + ok(FullInformation->Class[7] == 0x5555, "Class[7] = %u\n", FullInformation->Class[7]); + + RtlFillMemory(FullInformation, FullInformationLength, 0x55); + InfoLength = 0x55555555; + Status = NtQueryKey(Test_Key, KeyFullInformation, FullInformation, FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length + sizeof(UNICODE_NULL), &InfoLength); + ok(Status == STATUS_SUCCESS, "Status = 0x%lx\n", Status); + ok(InfoLength == FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + MyClass.Length, "InfoLength = %lu\n", InfoLength); + ok(FullInformation->LastWriteTime.QuadPart != 0x5555555555555555, "LastWriteTime unchanged\n"); + ok(FullInformation->ClassOffset == FIELD_OFFSET(KEY_FULL_INFORMATION, Class), "ClassOffset = %lu\n", FullInformation->ClassOffset); + ok(FullInformation->ClassLength == MyClass.Length, "ClassLength = %lu\n", FullInformation->ClassLength); + ok(FullInformation->Class[0] == L'M', "Class[0] = %u\n", FullInformation->Class[0]); + ok(FullInformation->Class[1] == L'y', "Class[1] = %u\n", FullInformation->Class[1]); + ok(FullInformation->Class[6] == L's', "Class[6] = %u\n", FullInformation->Class[6]); + ok(FullInformation->Class[7] == 0x5555, "Class[7] = %u\n", FullInformation->Class[7]); + + RtlFreeHeap(RtlGetProcessHeap(), 0, FullInformation); + + Status = NtDeleteKey(Test_Key); + ok_ntstatus(Status, STATUS_SUCCESS); + + NtClose(Test_Key); + NtClose(HKLM_Software_Key); + NtClose(HKLM_Key); +} static void @@ -44,7 +220,11 @@ /* Get it for real */ NameInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, InfoLength); - ok(NameInformation != NULL, "\n"); + if (!NameInformation) + { + skip("Out of memory\n"); + return; + } Status = NtQueryKey(HKLM_Key, KeyNameInformation, NameInformation, InfoLength, &InfoLength); ok_ntstatus(Status, STATUS_SUCCESS); @@ -97,5 +277,6 @@ START_TEST(NtQueryKey) { + Test_KeyFullInformation(); Test_KeyNameInformation(); }

1 0

[akhaldi] 67413: [PSDK] Update wbemdisp.idl. CORE-9246
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 13:16:43 2015 New Revision: 67413 URL: http://svn.reactos.org/svn/reactos?rev=67413&view=rev Log: [PSDK] Update wbemdisp.idl. CORE-9246 Modified: trunk/reactos/include/psdk/wbemdisp.idl Modified: trunk/reactos/include/psdk/wbemdisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wbemdisp.idl?… ============================================================================== --- trunk/reactos/include/psdk/wbemdisp.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wbemdisp.idl [iso-8859-1] Sat Apr 25 13:16:43 2015 @@ -53,6 +53,85 @@ interface ISWbemSecurity; interface ISWbemServices; +typedef +[ + v1_enum, + uuid(bf078c2a-07d9-11d2-8b21-00600806d9b6) +] +enum WbemTimeout +{ + wbemTimeoutInfinite = 0xffffffff +} WbemTimeout; + +typedef +[ + v1_enum, + uuid(4a249b72-fc9a-11d1-8b1e-00600806d9b6) +] +enum WbemChangeFlagEnum +{ + wbemChangeFlagCreateOrUpdate = 0, + wbemChangeFlagUpdateOnly = 0x00000001, + wbemChangeFlagCreateOnly = 0x00000002, + wbemChangeFlagUpdateCompatible = 0x00000000, + wbemChangeFlagUpdateSafeMode = 0x00000020, + wbemChangeFlagUpdateForceMode = 0x00000040, + wbemChangeFlagStrongValidation = 0x00000080, + wbemChangeFlagAdvisory = 0x00010000 +} WbemChangeFlagEnum; + +typedef +[ + v1_enum, + uuid(4a249b73-fc9a-11d1-8b1e-00600806d9b6) +] +enum WbemFlagEnum +{ + wbemFlagReturnImmediately = 0x00010, + wbemFlagReturnWhenComplete = 0, + wbemFlagBidirectional = 0, + wbemFlagForwardOnly = 0x00020, + wbemFlagNoErrorObject = 0x00040, + wbemFlagReturnErrorObject = 0, + wbemFlagSendStatus = 0x00080, + wbemFlagDontSendStatus = 0, + wbemFlagEnsureLocatable = 0x00100, + wbemFlagDirectRead = 0x00200, + wbemFlagSendOnlySelected = 0, + wbemFlagUseAmendedQualifiers = 0x20000, + wbemFlagGetDefault = 0x0, + wbemFlagSpawnInstance = 0x00001, + wbemFlagUseCurrentTime = 0x00001 +} WbemFlagEnum; + +typedef +[ + v1_enum, + uuid(4a249b76-fc9a-11d1-8b1e-00600806d9b6) +] +enum WbemQueryFlagEnum +{ + wbemQueryFlagDeep, + wbemQueryFlagShallow, + wbemQueryFlagPrototype +} WbemQueryFlagEnum; + +typedef +[ + v1_enum, + uuid(4A249B79-FC9A-11d1-8B1E-00600806D9B6) +] +enum WbemComparisonFlagEnum +{ + wbemComparisonFlagIncludeAll = 0, + wbemComparisonFlagIgnoreQualifiers = 1, + wbemComparisonFlagIgnoreObjectSource = 2, + wbemComparisonFlagIgnoreDefaultValues = 4, + wbemComparisonFlagIgnoreClass = 8, + wbemComparisonFlagIgnoreCase = 16, + wbemComparisonFlagIgnoreFlavor = 32 +} WbemComparisonFlagEnum; + [ object, local, @@ -66,7 +145,7 @@ { [ id(1) ] HRESULT NextEvent( - [in] long iTimeoutMs, + [in, defaultvalue(wbemTimeoutInfinite)] long iTimeoutMs, [out, retval] ISWbemObject **objWbemObject); [ id(2), propget ] @@ -87,19 +166,18 @@ { [ id(1) ] HRESULT ConnectServer( - [in] BSTR strServer, - [in] BSTR strNamespace, - [in] BSTR strUser, - [in] BSTR strPassword, - [in] BSTR strLocale, - [in] BSTR strAuthority, - [in] long iSecurityFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(".")] BSTR strServer, + [in, defaultvalue("")] BSTR strNamespace, + [in, defaultvalue("")] BSTR strUser, + [in, defaultvalue("")] BSTR strPassword, + [in, defaultvalue("")] BSTR strLocale, + [in, defaultvalue("")] BSTR strAuthority, + [in, defaultvalue(0)] long iSecurityFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemServices **objWbemServices); [ id(2), propget ] - HRESULT Security_( - ISWbemSecurity **objWbemSecurity); + HRESULT Security_([out, retval] ISWbemSecurity **objWbemSecurity); }; [ @@ -153,7 +231,7 @@ [ id(DISPID_VALUE) ] HRESULT Item( [in] BSTR strName, - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemMethod **objWbemMethod); [ id(1), propget ] @@ -201,7 +279,7 @@ [ id(DISPID_VALUE) ] HRESULT Item( [in] BSTR strName, - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemNamedValue **objWbemNamedValue); [ id(1), propget ] @@ -212,13 +290,13 @@ HRESULT Add( [in] BSTR strName, [in] VARIANT *varValue, - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemNamedValue **objWbemNamedValue); [ id(3) ] HRESULT Remove( [in] BSTR strName, - [in] long iFlags); + [in, defaultvalue(0)] long iFlags); [ id(4) ] HRESULT Clone( @@ -240,123 +318,123 @@ { [ id(1) ] HRESULT Put_( - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(wbemChangeFlagCreateOrUpdate)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectPath **objWbemObjectPath); [ id(2) ] HRESULT PutAsync_( [in] IDispatch *objWbemSink, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(wbemChangeFlagCreateOrUpdate)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id (3) ] HRESULT Delete_( - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet); + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet); [ id (4) ] HRESULT DeleteAsync_( [in] IDispatch *objWbemSink, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(5) ] HRESULT Instances_( - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(wbemFlagReturnImmediately)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(6) ] HRESULT InstancesAsync_( [in] IDispatch *objWbemSink, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(7) ] HRESULT Subclasses_( - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(wbemFlagReturnImmediately|wbemQueryFlagDeep)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(8) ] HRESULT SubclassesAsync_( [in] IDispatch *objWbemSink, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(wbemQueryFlagDeep)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(9) ] HRESULT Associators_( - [in] BSTR strAssocClass, - [in] BSTR strResultClass, - [in] BSTR strResultRole, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredAssocQualifier, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("")] BSTR strAssocClass, + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strResultRole, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredAssocQualifier, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(wbemFlagReturnImmediately)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(10) ] HRESULT AssociatorsAsync_( [in] IDispatch *objWbemSink, - [in] BSTR strAssocClass, - [in] BSTR strResultClass, - [in] BSTR strResultRole, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredAssocQualifier, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("")] BSTR strAssocClass, + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strResultRole, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredAssocQualifier, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(11) ] HRESULT References_( - [in] BSTR strResultClass, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(wbemFlagReturnImmediately)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(12) ] HRESULT ReferencesAsync_( [in] IDispatch *objWbemSink, - [in] BSTR strResultClass, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(13) ] HRESULT ExecMethod_( [in] BSTR strMethodName, - [in] IDispatch *objWbemInParameters, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemInParameters, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObject **objWbemOutParameters); [ id(14) ] HRESULT ExecMethodAsync_( [in] IDispatch *objWbemSink, [in] BSTR strMethodName, - [in] IDispatch *objWbemInParameters, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(0)] IDispatch *objWbemInParameters, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(15) ] HRESULT Clone_( @@ -364,23 +442,23 @@ [ id(16) ] HRESULT GetObjectText_( - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] BSTR *strObjectText); [ id(17) ] HRESULT SpawnDerivedClass_( - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemObject **objWbemObject); [ id(18) ] HRESULT SpawnInstance_( - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemObject **objWbemObject); [ id(19) ] HRESULT CompareTo_( [in] IDispatch *objWbemObject, - [in] long iFlags, + [in, defaultvalue(wbemComparisonFlagIncludeAll)] long iFlags, [out, retval] VARIANT_BOOL *bResult); [ id(20), propget ] @@ -528,7 +606,7 @@ [ id(DISPID_VALUE) ] HRESULT Item( [in] BSTR strObjectPath, - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemObject **objWbemObject); [ id(1), propget ] @@ -640,7 +718,7 @@ [ id(2) ] HRESULT Add( [in] WbemPrivilegeEnum iPrivilege, - [in] VARIANT_BOOL bIsEnabled, + [in, defaultvalue(TRUE)] VARIANT_BOOL bIsEnabled, [out, retval] ISWbemPrivilege **objWbemPrivilege); [ id(3) ] @@ -653,7 +731,7 @@ [ id(5) ] HRESULT AddAsString( [in] BSTR strPrivilege, - [in] VARIANT_BOOL bIsEnabled, + [in, defaultvalue(TRUE)] VARIANT_BOOL bIsEnabled, [out, retval] ISWbemPrivilege **objWbemPrivilege); }; @@ -743,7 +821,7 @@ [ id(DISPID_VALUE) ] HRESULT Item( [in] BSTR strName, - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemProperty **objWbemProperty); [ id(1), propget ] @@ -754,14 +832,14 @@ HRESULT Add( [in] BSTR strName, [in] WbemCimtypeEnum iCIMType, - [in] VARIANT_BOOL bIsArray, - [in] long iFlags, + [in, defaultvalue(FALSE)] VARIANT_BOOL bIsArray, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemProperty **objWbemProperty); [ id(3) ] HRESULT Remove( [in] BSTR strName, - [in] long iFlags); + [in, defaultvalue(0)] long iFlags); }; [ @@ -839,7 +917,7 @@ [ id(DISPID_VALUE) ] HRESULT Item( [in] BSTR name, - [in] long iFlags, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemQualifier **objWbemQualifier); [ id(1), propget ] @@ -850,16 +928,16 @@ HRESULT Add( [in] BSTR strName, [in] VARIANT *varVal, - [in] VARIANT_BOOL bPropagatesToSubclass, - [in] VARIANT_BOOL bPropagatesToInstance, - [in] VARIANT_BOOL bIsOverridable, - [in] long iFlags, + [in, defaultvalue(TRUE)] VARIANT_BOOL bPropagatesToSubclass, + [in, defaultvalue(TRUE)] VARIANT_BOOL bPropagatesToInstance, + [in, defaultvalue(TRUE)] VARIANT_BOOL bIsOverridable, + [in, defaultvalue(0)] long iFlags, [out, retval] ISWbemQualifier **objWbemQualifier); [ id(3) ] HRESULT Remove( [in] BSTR strName, - [in] long iFlags); + [in, defaultvalue(0)] long iFlags); }; typedef @@ -936,160 +1014,160 @@ { [ id(1) ] HRESULT Get( - [in] BSTR strObjectPath, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("")] BSTR strObjectPath, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObject **objWbemObject); [ id(2) ] HRESULT GetAsync( [in] IDispatch *objWbemSink, - [in] BSTR strObjectPath, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("")] BSTR strObjectPath, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(3) ] HRESULT Delete( [in] BSTR strObjectPath, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet); + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet); [ id(4) ] HRESULT DeleteAsync( [in] IDispatch *objWbemSink, [in] BSTR strObjectPath, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(5) ] HRESULT InstancesOf( [in] BSTR strClass, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(wbemFlagReturnImmediately)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(6) ] HRESULT InstancesOfAsync( [in] IDispatch *objWbemSink, [in] BSTR strClass, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(7) ] HRESULT SubclassesOf( - [in] BSTR strSuperclass, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("")] BSTR strSuperclass, + [in, defaultvalue(wbemFlagReturnImmediately|wbemQueryFlagDeep)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(8) ] HRESULT SubclassesOfAsync( [in] IDispatch *objWbemSink, - [in] BSTR strSuperclass, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("")] BSTR strSuperclass, + [in, defaultvalue(wbemQueryFlagDeep)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(9) ] HRESULT ExecQuery( [in] BSTR strQuery, - [in] BSTR strQueryLanguage, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("WQL")] BSTR strQueryLanguage, + [in, defaultvalue(wbemFlagReturnImmediately)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(10) ] HRESULT ExecQueryAsync( [in] IDispatch *objWbemSink, [in] BSTR strQuery, - [in] BSTR strQueryLanguage, - [in] long lFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("WQL")] BSTR strQueryLanguage, + [in, defaultvalue(0)] long lFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(11) ] HRESULT AssociatorsOf( [in] BSTR strObjectPath, - [in] BSTR strAssocClass, - [in] BSTR strResultClass, - [in] BSTR strResultRole, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredAssocQualifier, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("")] BSTR strAssocClass, + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strResultRole, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredAssocQualifier, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(wbemFlagReturnImmediately)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(12) ] HRESULT AssociatorsOfAsync( [in] IDispatch *objWbemSink, [in] BSTR strObjectPath, - [in] BSTR strAssocClass, - [in] BSTR strResultClass, - [in] BSTR strResultRole, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredAssocQualifier, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("")] BSTR strAssocClass, + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strResultRole, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredAssocQualifier, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(13) ] HRESULT ReferencesTo( [in] BSTR strObjectPath, - [in] BSTR strResultClass, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(wbemFlagReturnImmediately)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObjectSet **objWbemObjectSet); [ id(14) ] HRESULT ReferencesToAsync( [in] IDispatch *objWbemSink, [in] BSTR strObjectPath, - [in] BSTR strResultClass, - [in] BSTR strRole, - [in] VARIANT_BOOL bClassesOnly, - [in] VARIANT_BOOL bSchemaOnly, - [in] BSTR strRequiredQualifier, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("")] BSTR strResultClass, + [in, defaultvalue("")] BSTR strRole, + [in, defaultvalue(FALSE)] VARIANT_BOOL bClassesOnly, + [in, defaultvalue(FALSE)] VARIANT_BOOL bSchemaOnly, + [in, defaultvalue("")] BSTR strRequiredQualifier, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(15) ] HRESULT ExecNotificationQuery( [in] BSTR strQuery, - [in] BSTR strQueryLanguage, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue("WQL")] BSTR strQueryLanguage, + [in, defaultvalue(wbemFlagReturnImmediately|wbemFlagForwardOnly)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemEventSource **objWbemEventSource); [ id(16) ] HRESULT ExecNotificationQueryAsync( [in] IDispatch *objWbemSink, [in] BSTR strQuery, - [in] BSTR strQueryLanguage, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue("WQL")] BSTR strQueryLanguage, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(17) ] HRESULT ExecMethod( [in] BSTR strObjectPath, [in] BSTR strMethodName, - [in] IDispatch *objWbemInParameters, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemInParameters, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, [out, retval] ISWbemObject **objWbemOutParameters); [ id(18) ] @@ -1097,10 +1175,10 @@ [in] IDispatch *objWbemSink, [in] BSTR strObjectPath, [in] BSTR strMethodName, - [in] IDispatch *objWbemInParameters, - [in] long iFlags, - [in] IDispatch *objWbemNamedValueSet, - [in] IDispatch *objWbemAsyncContext); + [in, defaultvalue(0)] IDispatch *objWbemInParameters, + [in, defaultvalue(0)] long iFlags, + [in, defaultvalue(0)] IDispatch *objWbemNamedValueSet, + [in, defaultvalue(0)] IDispatch *objWbemAsyncContext); [ id(19), propget ] HRESULT Security_(

1 0

[akhaldi] 67412: [VERSION] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 13:13:50 2015 New Revision: 67412 URL: http://svn.reactos.org/svn/reactos?rev=67412&view=rev Log: [VERSION] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/version/version.c trunk/reactos/dll/win32/version/version.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/version/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/version.… ============================================================================== --- trunk/reactos/dll/win32/version/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/version/version.c [iso-8859-1] Sat Apr 25 13:13:50 2015 @@ -976,7 +976,7 @@ len = WideCharToMultiByte(CP_ACP, 0, *lplpBuffer, -1, lpBufferA + pos, info->wLength - pos, NULL, NULL); *lplpBuffer = lpBufferA + pos; - *puLen = len; + if (puLen) *puLen = len; } return ret; } @@ -1036,7 +1036,7 @@ len = MultiByteToWideChar(CP_ACP, 0, *lplpBuffer, -1, lpBufferW + pos, max/sizeof(WCHAR) - pos ); *lplpBuffer = lpBufferW + pos; - *puLen = len; + if (puLen) *puLen = len; } return ret; } @@ -1613,3 +1613,40 @@ HeapFree( GetProcessHeap(), 0, wcurd ); return ret; } + +/****************************************************************************** + * GetFileVersionInfoSizeExA [VERSION.@] + */ +DWORD WINAPI GetFileVersionInfoSizeExA(DWORD flags, LPCSTR filename, LPDWORD handle) +{ + FIXME("semi-stub: %u %s %p\n", flags, wine_dbgstr_a(filename), handle); + return GetFileVersionInfoSizeA(filename, handle); + +} + +/****************************************************************************** + * GetFileVersionInfoSizeExW [VERSION.@] + */ +DWORD WINAPI GetFileVersionInfoSizeExW(DWORD flags, LPCWSTR filename, LPDWORD handle) +{ + FIXME("semi-stub: %u %s %p\n", flags, wine_dbgstr_w(filename), handle); + return GetFileVersionInfoSizeW(filename, handle); +} + +/****************************************************************************** + * GetFileVersionInfoExA [VERSION.@] + */ +BOOL WINAPI GetFileVersionInfoExA(DWORD flags, LPCSTR filename, DWORD handle, DWORD len, LPVOID data) +{ + FIXME("semi-stub: %u %s %u %u %p\n", flags, wine_dbgstr_a(filename), handle, len, data); + return GetFileVersionInfoA(filename, handle, len, data); +} + +/****************************************************************************** + * GetFileVersionInfoExW [VERSION.@] + */ +BOOL WINAPI GetFileVersionInfoExW(DWORD flags, LPCWSTR filename, DWORD handle, DWORD len, LPVOID data) +{ + FIXME("semi-stub: %u %s %u %u %p\n", flags, wine_dbgstr_w(filename), handle, len, data); + return GetFileVersionInfoW(filename, handle, len, data); +} Modified: trunk/reactos/dll/win32/version/version.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/version.… ============================================================================== --- trunk/reactos/dll/win32/version/version.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/version/version.spec [iso-8859-1] Sat Apr 25 13:13:50 2015 @@ -1,5 +1,9 @@ @ stdcall GetFileVersionInfoA(str long long ptr) +@ stdcall GetFileVersionInfoExA(long str long long ptr) +@ stdcall GetFileVersionInfoExW(long wstr long long ptr) @ stdcall GetFileVersionInfoSizeA(str ptr) +@ stdcall GetFileVersionInfoSizeExA(long str ptr) +@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) @ stdcall GetFileVersionInfoSizeW(wstr ptr) @ stdcall GetFileVersionInfoW(wstr long long ptr) @ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Apr 25 13:13:50 2015 @@ -199,7 +199,7 @@ reactos/dll/win32/usp10 # Synced to WineStaging-1.7.37 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.7.37 -reactos/dll/win32/version # Synced to Wine-1.7.27 +reactos/dll/win32/version # Synced to WineStaging-1.7.37 reactos/dll/win32/wbemdisp # Synced to Wine-1.7.27 reactos/dll/win32/wbemprox # Synced to WineStaging-1.7.37 reactos/dll/win32/windowscodecs # Synced to Wine-1.7.27

1 0

[spetreolle] 67411: [IPCONFIG] Revert r67318. _tasctime already returns a newline.
by spetreolle＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: spetreolle Date: Sat Apr 25 12:53:50 2015 New Revision: 67411 URL: http://svn.reactos.org/svn/reactos?rev=67411&view=rev Log: [IPCONFIG] Revert r67318. _tasctime already returns a newline. Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] Sat Apr 25 12:53:50 2015 @@ -542,8 +542,8 @@ if (pAdapter->DhcpEnabled) { - _tprintf(_T("\tLease Obtained. . . . . . . . . . : %s\n"), _tasctime(localtime(&pAdapter->LeaseObtained))); - _tprintf(_T("\tLease Expires . . . . . . . . . . : %s\n"), _tasctime(localtime(&pAdapter->LeaseExpires))); + _tprintf(_T("\tLease Obtained. . . . . . . . . . : %s"), _tasctime(localtime(&pAdapter->LeaseObtained))); + _tprintf(_T("\tLease Expires . . . . . . . . . . : %s"), _tasctime(localtime(&pAdapter->LeaseExpires))); } } _tprintf(_T("\n"));

1 0

[akhaldi] 67410: [UXTHEME] Remove unused variable.
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 12:30:45 2015 New Revision: 67410 URL: http://svn.reactos.org/svn/reactos?rev=67410&view=rev Log: [UXTHEME] Remove unused variable. Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] Sat Apr 25 12:30:45 2015 @@ -30,7 +30,6 @@ static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize); static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); -extern HINSTANCE hDllInst; extern int alphaBlendMode; #define MSSTYLES_VERSION 0x0003

1 0

[akhaldi] 67409: [UXTHEME] Apply Wine commit 7aae2d2 by Mark Harmstone: Free properties when theme file closed.
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 12:20:24 2015 New Revision: 67409 URL: http://svn.reactos.org/svn/reactos?rev=67409&view=rev Log: [UXTHEME] Apply Wine commit 7aae2d2 by Mark Harmstone: Free properties when theme file closed. Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] Sat Apr 25 12:20:24 2015 @@ -199,6 +199,13 @@ tf->classes = pcls->next; while(pcls->partstate) { PTHEME_PARTSTATE ps = pcls->partstate; + + while(ps->properties) { + PTHEME_PROPERTY prop = ps->properties; + ps->properties = prop->next; + HeapFree(GetProcessHeap(), 0, prop); + } + pcls->partstate = ps->next; HeapFree(GetProcessHeap(), 0, ps); }

1 0

[akhaldi] 67408: [UXTHEME] Properly initialize transparent.
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 12:14:57 2015 New Revision: 67408 URL: http://svn.reactos.org/svn/reactos?rev=67408&view=rev Log: [UXTHEME] Properly initialize transparent. Modified: trunk/reactos/dll/win32/uxtheme/draw.c Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Sat Apr 25 12:14:57 2015 @@ -463,7 +463,7 @@ HDC hdcSrc = NULL; HGDIOBJ oldSrc = NULL; RECT rcSrc; - INT transparent = FALSE; + INT transparent = 0; COLORREF transparentcolor; int valign = VA_CENTER; int halign = HA_CENTER;

1 0

[akhaldi] 67407: [UXTHEME] Apply Wine commit 2b650fa by Mark Harmstone: Resize source image if destination smaller than margins.
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 12:08:20 2015 New Revision: 67407 URL: http://svn.reactos.org/svn/reactos?rev=67407&view=rev Log: [UXTHEME] Apply Wine commit 2b650fa by Mark Harmstone: Resize source image if destination smaller than margins. Modified: trunk/reactos/dll/win32/uxtheme/draw.c Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Sat Apr 25 12:08:20 2015 @@ -647,9 +647,9 @@ const DTBGOPTS *pOptions) { HRESULT hr = S_OK; - HBITMAP bmpSrc; + HBITMAP bmpSrc, bmpSrcResized = NULL; HGDIOBJ oldSrc; - HDC hdcSrc; + HDC hdcSrc, hdcOrigSrc = NULL; RECT rcSrc; RECT rcDst; POINT dstSize; @@ -712,6 +712,34 @@ dstSize.y = abs(dstSize.y); GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_SIZINGMARGINS, NULL, &sm); + + /* Resize source image if destination smaller than margins */ + if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y || sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { + if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y) { + sm.cyTopHeight = MulDiv(sm.cyTopHeight, dstSize.y, srcSize.y); + sm.cyBottomHeight = dstSize.y - sm.cyTopHeight; + srcSize.y = dstSize.y; + } + + if (sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { + sm.cxLeftWidth = MulDiv(sm.cxLeftWidth, dstSize.x, srcSize.x); + sm.cxRightWidth = dstSize.x - sm.cxLeftWidth; + srcSize.x = dstSize.x; + } + + hdcOrigSrc = hdcSrc; + hdcSrc = CreateCompatibleDC(NULL); + bmpSrcResized = CreateBitmap(srcSize.x, srcSize.y, 1, 32, NULL); + SelectObject(hdcSrc, bmpSrcResized); + + UXTHEME_StretchBlt(hdcSrc, 0, 0, srcSize.x, srcSize.y, hdcOrigSrc, rcSrc.left, rcSrc.top, + rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, transparent, transparentcolor); + + rcSrc.left = 0; + rcSrc.top = 0; + rcSrc.right = srcSize.x; + rcSrc.bottom = srcSize.y; + } hdcDst = hdc; OffsetViewportOrgEx(hdcDst, rcDst.left, rcDst.top, &org); @@ -817,6 +845,8 @@ } SelectObject(hdcSrc, oldSrc); DeleteDC(hdcSrc); + if (bmpSrcResized) DeleteObject(bmpSrcResized); + if (hdcOrigSrc) DeleteDC(hdcOrigSrc); CopyRect(pRect, &rcDst); return hr; }

1 0

[akhaldi] 67406: [UXTHEME] Apply Wine commit b12f73a by Mark Harmstone: Assume imagecount to be 1 if unspecified.
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 12:06:23 2015 New Revision: 67406 URL: http://svn.reactos.org/svn/reactos?rev=67406&view=rev Log: [UXTHEME] Apply Wine commit b12f73a by Mark Harmstone: Assume imagecount to be 1 if unspecified. Modified: trunk/reactos/dll/win32/uxtheme/draw.c Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Sat Apr 25 12:06:23 2015 @@ -241,6 +241,9 @@ imagenum = max (min (imagecount, iStateId), 1) - 1; GetObjectW(*hBmp, sizeof(bmp), &bmp); + + if(imagecount < 1) imagecount = 1; + if(imagelayout == IL_VERTICAL) { int height = bmp.bmHeight/imagecount; bmpRect->left = 0;

1 0

[akhaldi] 67405: [UXTHEME] Apply Wine commit c6b4b4b by Mark Harmstone: Fix colour errors in UXTHEME_StretchBlt.
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 12:04:21 2015 New Revision: 67405 URL: http://svn.reactos.org/svn/reactos?rev=67405&view=rev Log: [UXTHEME] Apply Wine commit c6b4b4b by Mark Harmstone: Fix colour errors in UXTHEME_StretchBlt. Modified: trunk/reactos/dll/win32/uxtheme/draw.c Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Sat Apr 25 12:04:21 2015 @@ -274,22 +274,33 @@ 255, /* SourceConstantAlpha */ AC_SRC_ALPHA /* AlphaFormat */ }; + + BOOL ret = TRUE; + int old_stretch_mode; + POINT old_brush_org; + + old_stretch_mode = SetStretchBltMode(hdcDst, HALFTONE); + SetBrushOrgEx(hdcDst, nXOriginDst, nYOriginDst, &old_brush_org); + if (transparent == ALPHABLEND_BINARY) { /* Ensure we don't pass any negative values to TransparentBlt */ - return TransparentBlt(hdcDst, nXOriginDst, nYOriginDst, abs(nWidthDst), abs(nHeightDst), + ret = TransparentBlt(hdcDst, nXOriginDst, nYOriginDst, abs(nWidthDst), abs(nHeightDst), hdcSrc, nXOriginSrc, nYOriginSrc, abs(nWidthSrc), abs(nHeightSrc), transcolor); - } - if ((transparent == ALPHABLEND_NONE) || + } else if ((transparent == ALPHABLEND_NONE) || !AlphaBlend(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, blendFunc)) { - return StretchBlt(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, + ret = StretchBlt(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, SRCCOPY); } - return TRUE; + + SetBrushOrgEx(hdcDst, old_brush_org.x, old_brush_org.y, NULL); + SetStretchBltMode(hdcDst, old_stretch_mode); + + return ret; } /***********************************************************************

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
49
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2015