[SHELL32] Set ShellState registry entry when default is needed

Doug-Lyons · Doug-Lyons · commit 9e4962a120df · 2026-05-17T21:16:25.000-05:00
CORE-20585
diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c
@@ -379,6 +379,10 @@ VOID WINAPI SHGetSetSettings(LPSHELLSTATE lpss, DWORD dwMask, BOOL bSet)
                 SHELL32_GetDefaultShellState(gpss);
                 read = 0; // The advanced items we read are no longer valid in gpss
                 g_CachedSSF = SSF_STRUCTONLY;
+                /* HACKFIX: This should not be needed. Defaults should be used
+                 * until an override option is selected. See CORE-20585. */
+                rss.ss = *gpss;
+                SHELL32_WriteRegShellState(&rss);
             }
         }
         SHGSS_GetSetStruct(SHGSS_GetField); // Copy requested items from gpss to output

Original file line number	Diff line number	Diff line change
`@@ -379,6 +379,10 @@ VOID WINAPI SHGetSetSettings(LPSHELLSTATE lpss, DWORD dwMask, BOOL bSet)`
`379`	`379`	`SHELL32_GetDefaultShellState(gpss);`
`380`	`380`	`read = 0; // The advanced items we read are no longer valid in gpss`
`381`	`381`	`g_CachedSSF = SSF_STRUCTONLY;`
	`382`	`+ /* HACKFIX: This should not be needed. Defaults should be used`
	`383`	`+ * until an override option is selected. See CORE-20585. */`
	`384`	`+ rss.ss = *gpss;`
	`385`	`+ SHELL32_WriteRegShellState(&rss);`
`382`	`386`	`}`
`383`	`387`	`}`
`384`	`388`	`SHGSS_GetSetStruct(SHGSS_GetField); // Copy requested items from gpss to output`