[PATCH 0/1] MR6460: include: Add Calendar runtimeclass in windows.globalization.idl
From: Biswapriyo Nath <nathbappai(a)gmail.com> Required for https://github.com/abseil/abseil-cpp/blob/20240722.0/absl/time/internal/cctz... --- include/windows.globalization.idl | 171 ++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/include/windows.globalization.idl b/include/windows.globalization.idl index 49b484f6467..382cb4d5ac8 100644 --- a/include/windows.globalization.idl +++ b/include/windows.globalization.idl @@ -32,6 +32,9 @@ namespace Windows { namespace Globalization { typedef enum DayOfWeek DayOfWeek; typedef enum LanguageLayoutDirection LanguageLayoutDirection; + interface ICalendar; + interface ICalendarFactory; + interface ICalendarFactory2; interface ILanguage; interface ILanguage2; interface ILanguage3; @@ -43,6 +46,8 @@ namespace Windows { interface IGeographicRegion; interface IGeographicRegionFactory; interface IGeographicRegionStatics; + interface ITimeZoneOnCalendar; + runtimeclass Calendar; runtimeclass Language; runtimeclass GeographicRegion; } @@ -83,6 +88,145 @@ namespace Windows { TtbRtl = 3, }; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Globalization.Calendar), + uuid(ca30221d-86d9-40fb-a26b-d44eb7cf08ea) + ] + interface ICalendar : IInspectable + { + HRESULT Clone([out, retval] Windows.Globalization.Calendar **value); + HRESULT SetToMin(); + HRESULT SetToMax(); + [propget] HRESULT Languages([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING> **value); + [propget] HRESULT NumeralSystem([out, retval] HSTRING *value); + [propput] HRESULT NumeralSystem([in] HSTRING value); + HRESULT GetCalendarSystem([out, retval] HSTRING *value); + HRESULT ChangeCalendarSystem([in] HSTRING value); + HRESULT GetClock([out, retval] HSTRING *value); + HRESULT ChangeClock([in] HSTRING value); + HRESULT GetDateTime([out, retval] Windows.Foundation.DateTime *result); + HRESULT SetDateTime([in] Windows.Foundation.DateTime value); + HRESULT SetToNow(); + [propget] HRESULT FirstEra([out, retval] INT32 *value); + [propget] HRESULT LastEra([out, retval] INT32 *value); + [propget] HRESULT NumberOfEras([out, retval] INT32 *value); + [propget] HRESULT Era([out, retval] INT32 *value); + [propput] HRESULT Era([in] INT32 value); + HRESULT AddEras([in] INT32 eras); + [overload("EraAsString")] HRESULT EraAsFullString([out, retval] HSTRING *result); + [overload("EraAsString")] HRESULT EraAsString([in] INT32 ideal_length, [out, retval] HSTRING *result); + [propget] HRESULT FirstYearInThisEra([out, retval] INT32 *value); + [propget] HRESULT LastYearInThisEra([out, retval] INT32 *value); + [propget] HRESULT NumberOfYearsInThisEra([out, retval] INT32 *value); + [propget] HRESULT Year([out, retval] INT32 *value); + [propput] HRESULT Year([in] INT32 value); + HRESULT AddYears([in] INT32 years); + HRESULT YearAsString([out, retval] HSTRING *result); + HRESULT YearAsTruncatedString([in] INT32 remaining_digits, [out, retval] HSTRING *result); + HRESULT YearAsPaddedString([in] INT32 min_digits, [out, retval] HSTRING *result); + [propget] HRESULT FirstMonthInThisYear([out, retval] INT32 *value); + [propget] HRESULT LastMonthInThisYear([out, retval] INT32 *value); + [propget] HRESULT NumberOfMonthsInThisYear([out, retval] INT32 *value); + [propget] HRESULT Month([out, retval] INT32 *value); + [propput] HRESULT Month([in] INT32 value); + HRESULT AddMonths([in] INT32 months); + [overload("MonthAsString")] HRESULT MonthAsFullString([out, retval] HSTRING *result); + [overload("MonthAsString")] HRESULT MonthAsString([in] INT32 ideal_length, [out, retval] HSTRING *result); + [overload("MonthAsSoloString")] HRESULT MonthAsFullSoloString([out, retval] HSTRING *result); + [overload("MonthAsSoloString")] HRESULT MonthAsSoloString([in] INT32 ideal_length, [out, retval] HSTRING *result); + HRESULT MonthAsNumericString([out, retval] HSTRING *result); + HRESULT MonthAsPaddedNumericString([in] INT32 min_digits, [out, retval] HSTRING *result); + HRESULT AddWeeks([in] INT32 weeks); + [propget] HRESULT FirstDayInThisMonth([out, retval] INT32 *value); + [propget] HRESULT LastDayInThisMonth([out, retval] INT32 *value); + [propget] HRESULT NumberOfDaysInThisMonth([out, retval] INT32 *value); + [propget] HRESULT Day([out, retval] INT32 *value); + [propput] HRESULT Day([in] INT32 value); + HRESULT AddDays([in] INT32 days); + HRESULT DayAsString([out, retval] HSTRING *result); + HRESULT DayAsPaddedString([in] INT32 min_digits, [out, retval] HSTRING *result); + [propget] HRESULT DayOfWeek([out, retval] Windows.Globalization.DayOfWeek *value); + [overload("DayOfWeekAsString")] HRESULT DayOfWeekAsFullString([out, retval] HSTRING *result); + [overload("DayOfWeekAsString")] HRESULT DayOfWeekAsString([in] INT32 ideal_length, [out, retval] HSTRING *result); + [overload("DayOfWeekAsSoloString")] HRESULT DayOfWeekAsFullSoloString([out, retval] HSTRING *result); + [overload("DayOfWeekAsSoloString")] HRESULT DayOfWeekAsSoloString([in] INT32 ideal_length, [out, retval] HSTRING *result); + [propget] HRESULT FirstPeriodInThisDay([out, retval] INT32 *value); + [propget] HRESULT LastPeriodInThisDay([out, retval] INT32 *value); + [propget] HRESULT NumberOfPeriodsInThisDay([out, retval] INT32 *value); + [propget] HRESULT Period([out, retval] INT32 *value); + [propput] HRESULT Period([in] INT32 value); + HRESULT AddPeriods([in] INT32 periods); + [overload("PeriodAsString")] HRESULT PeriodAsFullString([out, retval] HSTRING *result); + [overload("PeriodAsString")] HRESULT PeriodAsString([in] INT32 ideal_length, [out, retval] HSTRING *result); + [propget] HRESULT FirstHourInThisPeriod([out, retval] INT32 *value); + [propget] HRESULT LastHourInThisPeriod([out, retval] INT32 *value); + [propget] HRESULT NumberOfHoursInThisPeriod([out, retval] INT32 *value); + [propget] HRESULT Hour([out, retval] INT32 *value); + [propput] HRESULT Hour([in] INT32 value); + HRESULT AddHours([in] INT32 hours); + HRESULT HourAsString([out, retval] HSTRING *result); + HRESULT HourAsPaddedString([in] INT32 min_digits, [out, retval] HSTRING *result); + [propget] HRESULT Minute([out, retval] INT32 *value); + [propput] HRESULT Minute([in] INT32 value); + HRESULT AddMinutes([in] INT32 minutes); + HRESULT MinuteAsString([out, retval] HSTRING *result); + HRESULT MinuteAsPaddedString([in] INT32 min_digits, [out, retval] HSTRING *result); + [propget] HRESULT Second([out, retval] INT32 *value); + [propput] HRESULT Second([in] INT32 value); + HRESULT AddSeconds([in] INT32 seconds); + HRESULT SecondAsString([out, retval] HSTRING *result); + HRESULT SecondAsPaddedString([in] INT32 min_digits, [out, retval] HSTRING *result); + [propget] HRESULT Nanosecond([out, retval] INT32 *value); + [propput] HRESULT Nanosecond([in] INT32 value); + HRESULT AddNanoseconds([in] INT32 nanoseconds); + HRESULT NanosecondAsString([out, retval] HSTRING *result); + HRESULT NanosecondAsPaddedString([in] INT32 min_digits, [out, retval] HSTRING *result); + HRESULT Compare([in] Windows.Globalization.Calendar *other, [out, retval] INT32 *result); + HRESULT CompareDateTime([in] Windows.Foundation.DateTime other, [out, retval] INT32 *result); + HRESULT CopyTo([in] Windows.Globalization.Calendar *other); + [propget] HRESULT FirstMinuteInThisHour([out, retval] INT32 *value); + [propget] HRESULT LastMinuteInThisHour([out, retval] INT32 *value); + [propget] HRESULT NumberOfMinutesInThisHour([out, retval] INT32 *value); + [propget] HRESULT FirstSecondInThisMinute([out, retval] INT32 *value); + [propget] HRESULT LastSecondInThisMinute([out, retval] INT32 *value); + [propget] HRESULT NumberOfSecondsInThisMinute([out, retval] INT32 *value); + [propget] HRESULT ResolvedLanguage([out, retval] HSTRING *value); + [propget] HRESULT IsDaylightSavingTime([out, retval] boolean *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Globalization.Calendar), + uuid(83f58412-e56b-4c75-a66e-0f63d57758a6) + ] + interface ICalendarFactory : IInspectable + { + HRESULT CreateCalendarDefaultCalendarAndClock( + [in] Windows.Foundation.Collections.IIterable<HSTRING> *languages, + [out, retval] Windows.Globalization.Calendar **result); + HRESULT CreateCalendar( + [in] Windows.Foundation.Collections.IIterable<HSTRING> *languages, + [in] HSTRING calendar, + [in] HSTRING clock, + [out, retval] Windows.Globalization.Calendar **result); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Globalization.Calendar), + uuid(b44b378c-ca7e-4590-9e72-ea2bec1a5115) + ] + interface ICalendarFactory2 : IInspectable + { + HRESULT CreateCalendarWithTimeZone( + [in] Windows.Foundation.Collections.IIterable<HSTRING> *languages, + [in] HSTRING calendar, + [in] HSTRING clock, + [in] HSTRING time_zone_id, + [out, retval] Windows.Globalization.Calendar **result); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Globalization.Language), @@ -203,6 +347,33 @@ namespace Windows { HRESULT IsSupported([in] HSTRING region_code, [out, retval] boolean *result); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Globalization.Calendar), + uuid(bb3c25e5-46cf-4317-a3f5-02621ad54478) + ] + interface ITimeZoneOnCalendar : IInspectable + { + HRESULT GetTimeZone([out, retval] HSTRING *value); + HRESULT ChangeTimeZone([in] HSTRING time_zone_id); + [overload("TimeZoneAsString")] HRESULT TimeZoneAsFullString([out, retval] HSTRING *result); + [overload("TimeZoneAsString")] HRESULT TimeZoneAsString([in] INT32 ideal_length, [out, retval] HSTRING *result); + } + + [ + activatable(Windows.Foundation.UniversalApiContract, 1.0), + activatable(Windows.Globalization.ICalendarFactory, Windows.Foundation.UniversalApiContract, 1.0), + activatable(Windows.Globalization.ICalendarFactory2, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass Calendar + { + [contract(Windows.Foundation.UniversalApiContract, 1.0)] [default] interface Windows.Globalization.ICalendar; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Globalization.ITimeZoneOnCalendar; + } + [ activatable(Windows.Globalization.ILanguageFactory, Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0), -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6460
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=148311 Your paranoid android. === debian11b (64 bit WoW report) === user32: input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 0000000000A300E2, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032 input.c:733: Test failed: peek: raw_legacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey F, message WM_KEYDOWN, extra 0 input.c:733: Test failed: peek: raw_legacy: 0: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYDOWN, wparam 0x46, lparam 0x10001 input.c:733: Test failed: peek: raw_legacy: 0: test->expect 2 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_CHAR, wparam 0x66, lparam 0x10001 input.c:734: Test failed: peek: raw_legacy: 0: got F: 0 input.c:733: Test failed: peek: raw_legacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey F, message WM_KEYUP, extra 0 input.c:733: Test failed: peek: raw_legacy: 1: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYUP, wparam 0x46, lparam 0xffffffffc0020001 input.c:733: Test failed: peek: raw_vk_packet_legacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey 0xe7, message WM_KEYDOWN, extra 0 input.c:733: Test failed: peek: raw_vk_packet_legacy: 0: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYDOWN, wparam 0xe7, lparam 0x10001 input.c:734: Test failed: peek: raw_vk_packet_legacy: 0: got 0xe7: 0 input.c:733: Test failed: peek: raw_vk_packet_legacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey 0xe7, message WM_KEYUP, extra 0 input.c:733: Test failed: peek: raw_vk_packet_legacy: 1: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYUP, wparam 0xe7, lparam 0xffffffffc0020001 input.c:733: Test failed: peek: raw_unicode_legacy: 0: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_CHAR, wparam 0x3c0, lparam 0x1 input.c:734: Test failed: peek: raw_unicode_legacy: 0: got 0xe7: 0 input.c:733: Test failed: peek: raw_unicode_vkey_ctrl_legacy: 0: test->expect 0 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYDOWN, wparam 0x11, lparam 0xc00001 input.c:734: Test failed: peek: raw_unicode_vkey_ctrl_legacy: 0: got VK_CONTROL: 0 input.c:734: Test failed: peek: raw_unicode_vkey_ctrl_legacy: 0: got VK_LCONTROL: 0 input.c:733: Test failed: peek: raw_unicode_vkey_ctrl_legacy: 1: test->expect 0 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYUP, wparam 0x11, lparam 0xffffffffc0c00001 input.c:733: Test failed: peek: raw_nolegacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey F, message WM_KEYDOWN, extra 0 input.c:733: Test failed: peek: raw_nolegacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey F, message WM_KEYUP, extra 0 input.c:733: Test failed: peek: raw_vk_packet_nolegacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey 0xe7, message WM_KEYDOWN, extra 0 input.c:733: Test failed: peek: raw_vk_packet_nolegacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey 0xe7, message WM_KEYUP, extra 0 input.c:733: Test failed: receive: raw_legacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey F, message WM_KEYDOWN, extra 0 input.c:733: Test failed: receive: raw_legacy: 0: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYDOWN, wparam 0x46, lparam 0x10001 input.c:733: Test failed: receive: raw_legacy: 0: test->expect 2 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_CHAR, wparam 0x66, lparam 0x10001 input.c:734: Test failed: receive: raw_legacy: 0: got F: 0 input.c:733: Test failed: receive: raw_legacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey F, message WM_KEYUP, extra 0 input.c:733: Test failed: receive: raw_legacy: 1: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYUP, wparam 0x46, lparam 0xffffffffc0020001 input.c:733: Test failed: receive: raw_vk_packet_legacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey 0xe7, message WM_KEYDOWN, extra 0 input.c:733: Test failed: receive: raw_vk_packet_legacy: 0: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYDOWN, wparam 0xe7, lparam 0x10001 input.c:734: Test failed: receive: raw_vk_packet_legacy: 0: got 0xe7: 0 input.c:733: Test failed: receive: raw_vk_packet_legacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey 0xe7, message WM_KEYUP, extra 0 input.c:733: Test failed: receive: raw_vk_packet_legacy: 1: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYUP, wparam 0xe7, lparam 0xffffffffc0020001 input.c:733: Test failed: receive: raw_unicode_legacy: 0: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_CHAR, wparam 0x3c0, lparam 0x1 input.c:734: Test failed: receive: raw_unicode_legacy: 0: got 0xe7: 0 input.c:733: Test failed: receive: raw_unicode_vkey_ctrl_legacy: 0: test->expect 0 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYDOWN, wparam 0x11, lparam 0xc00001 input.c:734: Test failed: receive: raw_unicode_vkey_ctrl_legacy: 0: got VK_CONTROL: 0 input.c:734: Test failed: receive: raw_unicode_vkey_ctrl_legacy: 0: got VK_LCONTROL: 0 input.c:733: Test failed: receive: raw_unicode_vkey_ctrl_legacy: 1: test->expect 0 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYUP, wparam 0x11, lparam 0xffffffffc0c00001 input.c:733: Test failed: receive: raw_nolegacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey F, message WM_KEYDOWN, extra 0 input.c:733: Test failed: receive: raw_nolegacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey F, message WM_KEYUP, extra 0 input.c:733: Test failed: receive: raw_vk_packet_nolegacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey 0xe7, message WM_KEYDOWN, extra 0 input.c:733: Test failed: receive: raw_vk_packet_nolegacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey 0xe7, message WM_KEYUP, extra 0
participants (3)
-
Biswapriyo Nath -
Biswapriyo Nath (＠Biswa96)
-
Marvin