Cleanup

Author: dkhalanskyjb

core/windows/src/internal/TzdbInRegistry.kt

@@ -332,9 +332,7 @@ private class PerYearZoneRulesDataWithTransitions(
     val standardTransition get() =
         RecurringZoneRules.Rule(standardTransitionTime, offsetBefore = daylightOffset, offsetAfter = standardOffset)
 
-    override fun offsetAtYearStart(): UtcOffset =
-        if (daylightTransitionTime.toLocalDateTime(2030) < standardTransitionTime.toLocalDateTime(2030))
-            standardOffset else daylightOffset
+    override fun offsetAtYearStart(): UtcOffset = standardOffset // TODO: not true in all years + all zones
 
     override fun toString(): String = "standard offset is $standardOffset" +
             ", daylight offset is $daylightOffset" +

core/windows/test/TimeZoneRulesCompleteTest.kt

@@ -7,6 +7,7 @@
 package kotlinx.datetime.test
 
 import kotlinx.cinterop.*
+import kotlinx.cinterop.ptr
 import kotlinx.datetime.*
 import kotlinx.datetime.internal.*
 import platform.windows.*
@@ -57,15 +58,17 @@ class TimeZoneRulesCompleteTest {
                                     }
                                 }
                                 val rawData = memScoped {
-                                    alloc<HKEYVar>().withRegistryKey(HKEY_LOCAL_MACHINE!!, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones\\$windowsName", { err ->
-                                        return@memScoped null
-                                    }) { hKey ->
+                                    val hKey = alloc<HKEYVar>()
+                                    RegOpenKeyExW(HKEY_LOCAL_MACHINE!!, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones\\$windowsName", 0u, KEY_READ.toUInt(), hKey.ptr)
+                                    try {
                                         val cbDataBuffer = alloc<DWORDVar>()
                                         val SIZE_BYTES = 44
                                         val zoneInfoBuffer = allocArray<BYTEVar>(SIZE_BYTES)
                                         cbDataBuffer.value = SIZE_BYTES.convert()
-                                        RegQueryValueExW(hKey, "TZI", null, null, zoneInfoBuffer, cbDataBuffer.ptr)
+                                        RegQueryValueExW(hKey.value, "TZI", null, null, zoneInfoBuffer, cbDataBuffer.ptr)
                                         zoneInfoBuffer.readBytes(SIZE_BYTES).toHexString()
+                                    } finally {
+                                        RegCloseKey(hKey.value)
                                     }
                                 }
                                 throw AssertionError(