Merge branch 'valinet-master'

CHANGELOG.md

@@ -36,7 +36,16 @@ OSビルド 22000.708 でテストされました。
 * sws: デスクトップがフォアグラウンドにあるときにスイッチャーが識別できないバグを修正
 * sws: スイッチャーがフォアグラウンドウィンドウの変更を適切に検出することを妨げる意図しない影響を修正しました。
 * sws: 非常に小さなウィンドウで、矩形領域が小さいためにスイッチャーで正しく動作しないバグを修正。
-
+
+##### 5
+
+* コントロールパネルのリンクリダイレクトが正しく動作しない場合がある不具合を修正しました。
+* 天気予報:WebView2 Runtime >= 102.0.1245.33 の場合、ウィジェットが動作しないバグを修正。
+
+##### 6
+
+* デフォルトの設定で、一部のセクションが表示されない不具合を修正しました。
+
 ## 22000.675.45
 
 OSビルド 22000.675 でテストされました。

ExplorerPatcher/GUI.c

@@ -1074,12 +1074,12 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
                 DWORD dwRes = 0, dwSize = sizeof(DWORD);
                 if (!_stricmp(funcName, "DoesOSBuildSupportSpotlight") && !DoesOSBuildSupportSpotlight()) bSkipLines = TRUE;
                 else if (!_stricmp(funcName, "IsSpotlightEnabled") && !IsSpotlightEnabled()) bSkipLines = TRUE;
-                else if (!_stricmp(funcName, "IsSWSEnabled") && (RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", L"AltTabSettings", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes != 2))) bSkipLines = TRUE;
-                else if (!_stricmp(funcName, "IsOldTaskbar") && (RegGetValueW(HKEY_CURRENT_USER, _T(REGPATH), L"OldTaskbar", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes != 1))) bSkipLines = TRUE;
-                else if (!_stricmp(funcName, "!IsOldTaskbar") && (RegGetValueW(HKEY_CURRENT_USER, _T(REGPATH), L"OldTaskbar", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes == 1))) bSkipLines = TRUE;
-                else if (!_stricmp(funcName, "IsWindows10StartMenu") && (RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"Start_ShowClassicMode", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes != 1))) bSkipLines = TRUE;
-                else if (!_stricmp(funcName, "!IsWindows10StartMenu") && (RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"Start_ShowClassicMode", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes == 1))) bSkipLines = TRUE;
-                else if (!_stricmp(funcName, "IsWeatherEnabled") && (RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced\\People", L"PeopleBand", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes != 1))) bSkipLines = TRUE;
+                else if (!_stricmp(funcName, "IsSWSEnabled") && (dwRes = 0, RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", L"AltTabSettings", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes != 2))) bSkipLines = TRUE;
+                else if (!_stricmp(funcName, "IsOldTaskbar") && (dwRes = 1, RegGetValueW(HKEY_CURRENT_USER, _T(REGPATH), L"OldTaskbar", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes != 1))) bSkipLines = TRUE;
+                else if (!_stricmp(funcName, "!IsOldTaskbar") && (dwRes = 1, RegGetValueW(HKEY_CURRENT_USER, _T(REGPATH), L"OldTaskbar", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes == 1))) bSkipLines = TRUE;
+                else if (!_stricmp(funcName, "IsWindows10StartMenu") && (dwRes = 0, RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"Start_ShowClassicMode", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes != 1))) bSkipLines = TRUE;
+                else if (!_stricmp(funcName, "!IsWindows10StartMenu") && (dwRes = 0, RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"Start_ShowClassicMode", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes == 1))) bSkipLines = TRUE;
+                else if (!_stricmp(funcName, "IsWeatherEnabled") && (dwRes = 0, RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced\\People", L"PeopleBand", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes != 1))) bSkipLines = TRUE;
                 if (bSkipLines)
                 {
                     do

ExplorerPatcher/dllmain.c

@@ -7863,14 +7863,18 @@ int ExplorerFrame_CompareStringOrdinal(const WCHAR* a1, int a2, const WCHAR* a3,
         NULL
     };
     int ret = CompareStringOrdinal(a1, a2, a3, a4, bIgnoreCase);
-    if ((!bDoNotRedirectSystemToSettingsApp && !bDoNotRedirectProgramsAndFeaturesToSettingsApp) || ret != CSTR_EQUAL)
+    if (ret != CSTR_EQUAL)
     {
         return ret;
     }
 
     int i = 0;
-    while (CompareStringOrdinal(a3, -1, pRedirects[i], -1, FALSE) != CSTR_EQUAL)
+    while (1)
     {
+        BOOL bCond = FALSE;
+        if (i == 0) bCond = bDoNotRedirectSystemToSettingsApp;
+        else if (i == 1) bCond = bDoNotRedirectProgramsAndFeaturesToSettingsApp;
+        if (CompareStringOrdinal(a3, -1, pRedirects[i], -1, FALSE) == CSTR_EQUAL && bCond) break;
         i++;
         if (pRedirects[i] == NULL)
         {

ep_weather_host/ep_weather_host.c

@@ -100,10 +100,85 @@ ULONG STDMETHODCALLTYPE epw_Weather_static_AddRefRelease(void* _this)
     return 1;
 }
 
-HRESULT STDMETHODCALLTYPE epw_Weather_static_QueryInterface(void* _this, REFIID riid, void** ppv)
+HRESULT STDMETHODCALLTYPE ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler_QueryInterface(void* _this, REFIID riid, void** ppv)
 {
-    *ppv = _this;
-    return S_OK;
+    if (IsEqualIID(riid, &IID_ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler) || IsEqualIID(riid, &IID_IUnknown))
+    {
+        *ppv = _this;
+        return S_OK;
+    }
+    return E_NOINTERFACE;
+
+}
+
+HRESULT STDMETHODCALLTYPE ICoreWebView2CreateCoreWebView2ControllerCompletedHandler_QueryInterface(void* _this, REFIID riid, void** ppv)
+{
+    if (IsEqualIID(riid, &IID_ICoreWebView2CreateCoreWebView2ControllerCompletedHandler) || IsEqualIID(riid, &IID_IUnknown))
+    {
+        *ppv = _this;
+        return S_OK;
+    }
+    return E_NOINTERFACE;
+}
+
+HRESULT STDMETHODCALLTYPE ICoreWebView2NavigationStartingEventHandler_QueryInterface(void* _this, REFIID riid, void** ppv)
+{
+    if (IsEqualIID(riid, &IID_ICoreWebView2NavigationStartingEventHandler) || IsEqualIID(riid, &IID_IUnknown))
+    {
+        *ppv = _this;
+        return S_OK;
+    }
+    return E_NOINTERFACE;
+}
+
+HRESULT STDMETHODCALLTYPE ICoreWebView2NavigationCompletedEventHandler_QueryInterface(void* _this, REFIID riid, void** ppv)
+{
+    if (IsEqualIID(riid, &IID_ICoreWebView2NavigationCompletedEventHandler) || IsEqualIID(riid, &IID_IUnknown))
+    {
+        *ppv = _this;
+        return S_OK;
+    }
+    return E_NOINTERFACE;
+}
+
+HRESULT STDMETHODCALLTYPE ICoreWebView2ExecuteScriptCompletedHandler_QueryInterface(void* _this, REFIID riid, void** ppv)
+{
+    if (IsEqualIID(riid, &IID_ICoreWebView2ExecuteScriptCompletedHandler) || IsEqualIID(riid, &IID_IUnknown))
+    {
+        *ppv = _this;
+        return S_OK;
+    }
+    return E_NOINTERFACE;
+}
+
+HRESULT STDMETHODCALLTYPE ICoreWebView2EnvironmentOptions_QueryInterface(void* _this, REFIID riid, void** ppv)
+{
+    if (IsEqualIID(riid, &IID_ICoreWebView2EnvironmentOptions) || IsEqualIID(riid, &IID_IUnknown))
+    {
+        *ppv = _this;
+        return S_OK;
+    }
+    return E_NOINTERFACE;
+}
+
+HRESULT STDMETHODCALLTYPE ICoreWebView2CallDevToolsProtocolMethodCompletedHandler_QueryInterface(void* _this, REFIID riid, void** ppv)
+{
+    if (IsEqualIID(riid, &IID_ICoreWebView2CallDevToolsProtocolMethodCompletedHandler) || IsEqualIID(riid, &IID_IUnknown))
+    {
+        *ppv = _this;
+        return S_OK;
+    }
+    return E_NOINTERFACE;
+}
+
+HRESULT STDMETHODCALLTYPE ICoreWebView2PermissionRequestedEventHandler_QueryInterface(void* _this, REFIID riid, void** ppv)
+{
+    if (IsEqualIID(riid, &IID_ICoreWebView2PermissionRequestedEventHandler) || IsEqualIID(riid, &IID_IUnknown))
+    {
+        *ppv = _this;
+        return S_OK;
+    }
+    return E_NOINTERFACE;
 }
 
 HRESULT STDMETHODCALLTYPE ICoreWebView2_get_AdditionalBrowserArguments(ICoreWebView2EnvironmentOptions* _this, LPWSTR* value)

ep_weather_host/ep_weather_host.h

@@ -165,7 +165,6 @@ static void epw_Weather_SetTextScaleFactorFromRegistry(EPWeather* _this, HKEY hK
 
 HRESULT STDMETHODCALLTYPE epw_Weather_static_Stub(void* _this);
 ULONG   STDMETHODCALLTYPE epw_Weather_static_AddRefRelease(EPWeather* _this);
-HRESULT STDMETHODCALLTYPE epw_Weather_static_QueryInterface(EPWeather* _this, REFIID riid, void** ppv);
 
 HRESULT STDMETHODCALLTYPE ICoreWebView2_CreateCoreWebView2EnvironmentCompleted(ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler* _this, HRESULT errorCode, ICoreWebView2Environment* pCoreWebView2Environment);
 HRESULT STDMETHODCALLTYPE ICoreWebView2_CreateCoreWebView2ControllerCompleted(ICoreWebView2CreateCoreWebView2ControllerCompletedHandler* _this, HRESULT hr, ICoreWebView2Controller* pCoreWebView2Controller);
@@ -181,8 +180,9 @@ HRESULT STDMETHODCALLTYPE ICoreWebView2_CallDevToolsProtocolMethodCompleted(ICor
 
 HRESULT STDMETHODCALLTYPE ICoreWebView2_PermissionRequested(ICoreWebView2PermissionRequestedEventHandler* _this2, ICoreWebView2* pCoreWebView2, ICoreWebView2PermissionRequestedEventArgs* pCoreWebView2PermissionRequestedEventArgs);
 
+HRESULT STDMETHODCALLTYPE ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler_QueryInterface(void* _this, REFIID riid, void** ppv);
 static const ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandlerVtbl EPWeather_ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandlerVtbl = {
-    .QueryInterface = epw_Weather_static_QueryInterface,
+    .QueryInterface = ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler_QueryInterface,
     .AddRef = epw_Weather_static_AddRefRelease,
     .Release = epw_Weather_static_AddRefRelease,
     .Invoke = ICoreWebView2_CreateCoreWebView2EnvironmentCompleted,
@@ -192,8 +192,9 @@ static const ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler EPWeathe
     .lpVtbl = &EPWeather_ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandlerVtbl
 };
 
+HRESULT STDMETHODCALLTYPE ICoreWebView2CreateCoreWebView2ControllerCompletedHandler_QueryInterface(void* _this, REFIID riid, void** ppv);
 static const ICoreWebView2CreateCoreWebView2ControllerCompletedHandlerVtbl EPWeather_ICoreWebView2CreateCoreWebView2ControllerCompletedHandlerVtbl = {
-    .QueryInterface = epw_Weather_static_QueryInterface,
+    .QueryInterface = ICoreWebView2CreateCoreWebView2ControllerCompletedHandler_QueryInterface,
     .AddRef = epw_Weather_static_AddRefRelease,
     .Release = epw_Weather_static_AddRefRelease,
     .Invoke = ICoreWebView2_CreateCoreWebView2ControllerCompleted,
@@ -203,8 +204,9 @@ static const ICoreWebView2CreateCoreWebView2ControllerCompletedHandler EPWeather
     .lpVtbl = &EPWeather_ICoreWebView2CreateCoreWebView2ControllerCompletedHandlerVtbl
 };
 
+HRESULT STDMETHODCALLTYPE ICoreWebView2NavigationStartingEventHandler_QueryInterface(void* _this, REFIID riid, void** ppv);
 static const ICoreWebView2NavigationStartingEventHandlerVtbl EPWeather_ICoreWebView2NavigationStartingEventHandlerVtbl = {
-    .QueryInterface = epw_Weather_static_QueryInterface,
+    .QueryInterface = ICoreWebView2NavigationStartingEventHandler_QueryInterface,
     .AddRef = epw_Weather_static_AddRefRelease,
     .Release = epw_Weather_static_AddRefRelease,
     .Invoke = ICoreWebView2_NavigationStarting,
@@ -214,8 +216,9 @@ static const ICoreWebView2NavigationStartingEventHandler EPWeather_ICoreWebView2
     .lpVtbl = &EPWeather_ICoreWebView2NavigationStartingEventHandlerVtbl
 };
 
+HRESULT STDMETHODCALLTYPE ICoreWebView2NavigationCompletedEventHandler_QueryInterface(void* _this, REFIID riid, void** ppv);
 static const ICoreWebView2NavigationCompletedEventHandlerVtbl EPWeather_ICoreWebView2NavigationCompletedEventHandlerVtbl = {
-    .QueryInterface = epw_Weather_static_QueryInterface,
+    .QueryInterface = ICoreWebView2NavigationCompletedEventHandler_QueryInterface,
     .AddRef = epw_Weather_static_AddRefRelease,
     .Release = epw_Weather_static_AddRefRelease,
     .Invoke = ICoreWebView2_NavigationCompleted,
@@ -225,8 +228,9 @@ static const ICoreWebView2NavigationCompletedEventHandler EPWeather_ICoreWebView
     .lpVtbl = &EPWeather_ICoreWebView2NavigationCompletedEventHandlerVtbl
 };
 
+HRESULT STDMETHODCALLTYPE ICoreWebView2ExecuteScriptCompletedHandler_QueryInterface(void* _this, REFIID riid, void** ppv);
 static const ICoreWebView2ExecuteScriptCompletedHandlerVtbl EPWeather_ICoreWebView2ExecuteScriptCompletedHandlerVtbl = {
-    .QueryInterface = epw_Weather_static_QueryInterface,
+    .QueryInterface = ICoreWebView2ExecuteScriptCompletedHandler_QueryInterface,
     .AddRef = epw_Weather_static_AddRefRelease,
     .Release = epw_Weather_static_AddRefRelease,
     .Invoke = ICoreWebView2_ExecuteScriptCompleted,
@@ -236,8 +240,9 @@ static const ICoreWebView2ExecuteScriptCompletedHandler EPWeather_ICoreWebView2E
     .lpVtbl = &EPWeather_ICoreWebView2ExecuteScriptCompletedHandlerVtbl
 };
 
+HRESULT STDMETHODCALLTYPE ICoreWebView2EnvironmentOptions_QueryInterface(void* _this, REFIID riid, void** ppv);
 static const ICoreWebView2EnvironmentOptionsVtbl EPWeather_ICoreWebView2EnvironmentOptionsVtbl = {
-    .QueryInterface = epw_Weather_static_QueryInterface,
+    .QueryInterface = ICoreWebView2EnvironmentOptions_QueryInterface,
     .AddRef = epw_Weather_static_AddRefRelease,
     .Release = epw_Weather_static_AddRefRelease,
     .get_AdditionalBrowserArguments = ICoreWebView2_get_AdditionalBrowserArguments,
@@ -254,8 +259,9 @@ static const ICoreWebView2EnvironmentOptions EPWeather_ICoreWebView2EnvironmentO
     .lpVtbl = &EPWeather_ICoreWebView2EnvironmentOptionsVtbl
 };
 
+HRESULT STDMETHODCALLTYPE ICoreWebView2CallDevToolsProtocolMethodCompletedHandler_QueryInterface(void* _this, REFIID riid, void** ppv);
 static ICoreWebView2CallDevToolsProtocolMethodCompletedHandlerVtbl EPWeather_ICoreWebView2CallDevToolsProtocolMethodCompletedHandlerVtbl = {
-    .QueryInterface = epw_Weather_static_QueryInterface,
+    .QueryInterface = ICoreWebView2CallDevToolsProtocolMethodCompletedHandler_QueryInterface,
     .AddRef = epw_Weather_static_AddRefRelease,
     .Release = epw_Weather_static_AddRefRelease,
     .Invoke = ICoreWebView2_CallDevToolsProtocolMethodCompleted
@@ -265,8 +271,9 @@ static const ICoreWebView2CallDevToolsProtocolMethodCompletedHandler EPWeather_I
     .lpVtbl = &EPWeather_ICoreWebView2CallDevToolsProtocolMethodCompletedHandlerVtbl
 };
 
+HRESULT STDMETHODCALLTYPE ICoreWebView2PermissionRequestedEventHandler_QueryInterface(void* _this, REFIID riid, void** ppv);
 static const ICoreWebView2PermissionRequestedEventHandlerVtbl EPWeather_ICoreWebView2PermissionRequestedEventHandlerVtbl = {
-    .QueryInterface = epw_Weather_static_QueryInterface,
+    .QueryInterface = ICoreWebView2PermissionRequestedEventHandler_QueryInterface,
     .AddRef = epw_Weather_static_AddRefRelease,
     .Release = epw_Weather_static_AddRefRelease,
     .Invoke = ICoreWebView2_PermissionRequested,

version.h

@@ -1,7 +1,7 @@
 #define VER_MAJOR 22000
 #define VER_MINOR 708
 #define VER_BUILD_HI    46
-#define VER_BUILD_LO 4
+#define VER_BUILD_LO 6
 #define VER_FLAGS   VS_FF_PRERELEASE
 
 
@@ -12,5 +12,5 @@
 #define VER_STR(arg) #arg
 
 // The String form of the version numbers
-#define VER_FILE_STRING VALUE "FileVersion", "22000.708.46.4"
-#define VER_PRODUCT_STRING VALUE "ProductVersion", "22000.708.46.4"
+#define VER_FILE_STRING VALUE "FileVersion", "22000.708.46.6"
+#define VER_PRODUCT_STRING VALUE "ProductVersion", "22000.708.46.6"