From b41332349ab557ffd032cd995a4feb0bd05ade41 Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Wed, 3 Jul 2024 23:01:50 +0900
Subject: [PATCH] [SHELL32] Refresh UI on assoc change (SHOpenWithDialog)
 (#7076)

Fix file association UX.
JIRA issue: CORE-19670
- Check the return value of
  shell32!SHOpenWithDialog function.
- If changed, then update the UI display
  and internal data.
- Use OAIF_FORCE_REGISTRATION flag.
---
 dll/win32/shell32/COpenWithMenu.cpp      |  6 +++++-
 dll/win32/shell32/dialogs/filedefext.cpp |  9 +++++++--
 dll/win32/shell32/dialogs/filetypes.cpp  | 22 ++++++++++++++++++++--
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/dll/win32/shell32/COpenWithMenu.cpp b/dll/win32/shell32/COpenWithMenu.cpp
index feb30a3a091..7aab4771f39 100644
--- a/dll/win32/shell32/COpenWithMenu.cpp
+++ b/dll/win32/shell32/COpenWithMenu.cpp
@@ -1049,8 +1049,12 @@ VOID COpenWithDialog::Accept()
     if (pApp)
     {
         /* Set programm as default handler */
-        if (SendDlgItemMessage(m_hDialog, 14003, BM_GETCHECK, 0, 0) == BST_CHECKED)
+        if (IsDlgButtonChecked(m_hDialog, 14003) == BST_CHECKED)
+        {
             m_pAppList->SetDefaultHandler(pApp, m_pInfo->pcszFile);
+            // FIXME: Update DefaultIcon registry
+            SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_FLUSHNOWAIT, NULL, NULL);
+        }
 
         /* Execute program */
         if (m_pInfo->oaifInFlags & OAIF_EXEC)
diff --git a/dll/win32/shell32/dialogs/filedefext.cpp b/dll/win32/shell32/dialogs/filedefext.cpp
index 959b708ad1d..dd3c5cd0b1e 100644
--- a/dll/win32/shell32/dialogs/filedefext.cpp
+++ b/dll/win32/shell32/dialogs/filedefext.cpp
@@ -742,8 +742,13 @@ CFileDefExt::GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
                 OPENASINFO oainfo;
                 oainfo.pcszFile = pFileDefExt->m_wszPath;
                 oainfo.pcszClass = NULL;
-                oainfo.oaifInFlags = OAIF_REGISTER_EXT|OAIF_FORCE_REGISTRATION;
-                return SUCCEEDED(SHOpenWithDialog(hwndDlg, &oainfo));
+                oainfo.oaifInFlags = OAIF_REGISTER_EXT | OAIF_FORCE_REGISTRATION;
+                if (SHOpenWithDialog(hwndDlg, &oainfo) == S_OK)
+                {
+                    pFileDefExt->InitGeneralPage(hwndDlg);
+                    PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+                }
+                break;
             }
             else if (LOWORD(wParam) == 14021 || LOWORD(wParam) == 14022 || LOWORD(wParam) == 14023) /* checkboxes */
                 PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
diff --git a/dll/win32/shell32/dialogs/filetypes.cpp b/dll/win32/shell32/dialogs/filetypes.cpp
index 1f8403971da..47bdd00179f 100644
--- a/dll/win32/shell32/dialogs/filetypes.cpp
+++ b/dll/win32/shell32/dialogs/filetypes.cpp
@@ -1673,6 +1673,19 @@ FileTypesDlg_OnItemChanging(HWND hwndDlg, PFILE_TYPE_ENTRY pEntry)
         EnableWindow(GetDlgItem(hwndDlg, IDC_FILETYPES_DELETE), TRUE);
 }
 
+static VOID
+FileTypesDlg_UpdateAppInfo(HWND hwndDlg, PFILE_TYPE_ENTRY pEntry)
+{
+    pEntry->ProgramPath[0] = pEntry->AppName[0] = UNICODE_NULL;
+
+    DWORD cch = _countof(pEntry->ProgramPath);
+    if (S_OK == AssocQueryStringW(ASSOCF_INIT_IGNOREUNKNOWN, ASSOCSTR_EXECUTABLE,
+                                  pEntry->FileExtension, NULL, pEntry->ProgramPath, &cch))
+    {
+        QueryFileDescription(pEntry->ProgramPath, pEntry->AppName, _countof(pEntry->AppName));
+    }
+}
+
 // IDD_FOLDER_OPTIONS_FILETYPES
 INT_PTR CALLBACK
 FolderOptionsFileTypesDlg(
@@ -1719,10 +1732,15 @@ FolderOptionsFileTypesDlg(
                     if (pEntry)
                     {
                         ZeroMemory(&Info, sizeof(Info));
-                        Info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_REGISTER_EXT;
+                        Info.oaifInFlags = OAIF_FORCE_REGISTRATION | OAIF_REGISTER_EXT;
                         Info.pcszFile = pEntry->FileExtension;
                         Info.pcszClass = NULL;
-                        SHOpenWithDialog(hwndDlg, &Info);
+                        if (SHOpenWithDialog(hwndDlg, &Info) == S_OK)
+                        {
+                            FileTypesDlg_UpdateAppInfo(hwndDlg, pEntry);
+                            FileTypesDlg_OnItemChanging(hwndDlg, pEntry);
+                            PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+                        }
                     }
                     break;