Calm warning

@@ -1195,0 +1210,4 @@
+  if (!SUCCEEDED(hr))
+    return;
+
+  /* Find the current executable, and see if it's blender.exe if not bail out. */

@@ -1195,0 +1218,4 @@
+    return;
+  }
+
+  /* Set the launcher as the shell command so the console window will not flash.

@@ -52,3 +51,2 @@
   }
-  if (!background) {
-    MessageBox(0, "Could not register file extension.", "Blender error", MB_OK | MB_ICONERROR);
+  printf("%s\n", message);

@@ -62,3 +74,2 @@
   HKEY root = 0;
-  BOOL usr_mode = false;
-  DWORD dwd = 0;
+  HKEY hkey = 0;

@@ -248,6 +253,8 @@ GHOST_TTrackpadInfo GHOST_WindowWin32::getTrackpadInfo()
 
 GHOST_WindowWin32::~GHOST_WindowWin32()
 {
+  unregisterWindowAppUserModelProperties();

@@ -1195,0 +1203,4 @@
+void GHOST_WindowWin32::registerWindowAppUserModelProperties()
+{
+  IPropertyStore *pstore;
+  char BlPath[MAX_PATH];

@@ -1195,0 +1207,4 @@
+  wchar_t shell_command[MAX_PATH];
+
+  HRESULT hr = SHGetPropertyStoreForWindow(m_hWnd, IID_PPV_ARGS(&pstore));
+  if (!SUCCEEDED(hr))

@@ -643,3 +641,1 @@
-        split.alignment = 'RIGHT'
-        split.label(text="")
-        split.operator("preferences.associate_blend", text="Make Default")
+        layout.label(text="Open blend files with this installation")

@@ -137,0 +140,4 @@
+  char BlPath[MAX_PATH];
+  char InstallDir[FILE_MAXDIR];
+  char SysDir[FILE_MAXDIR];
+  const char* ThumbHandlerDLL;

@@ -235,6 +342,41 @@ bool BLI_windows_external_operation_execute(const char *filepath, const char *op
   return ShellExecuteExW(&shellinfo);
 }
 
+bool BLI_windows_execute_self(const char* parameters, bool wait, bool elevated, bool silent)

@@ -281,0 +300,4 @@
+  if (all_users && BLI_windows_execute_self("-ua", true, true, true)) {
+    BKE_report(op->reports, RPT_INFO, "File association unregistered");
+    WM_cursor_wait(false);
+    MessageBox(

@@ -5819,0 +5821,4 @@
+
+  prop = RNA_def_property(srna, "register_all_users", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_REGISTER_ALL_USERS);
+  RNA_def_property_ui_text(prop, "Register for All Users", "Registration/Unregistration for All Users requires elevated privileges");

@@ -631,1 +630,4 @@
   BLI_args_print_arg_doc(ba, "-r");
+  BLI_args_print_arg_doc(ba, "-ra");
+  BLI_args_print_arg_doc(ba, "-u");
+  BLI_args_print_arg_doc(ba, "-ua");

@@ -665,6 +668,22 @@ static void rna_UserDef_viewport_lights_update(Main *bmain, Scene *scene, Pointe
   rna_userdef_update(bmain, scene, ptr);
 }
 
+static int rna_register_all_users_editable(struct PointerRNA *UNUSED(ptr), const char **r_info)

@@ -668,0 +681,4 @@
+
+static bool rna_userdef_is_msstore_installation_get(PointerRNA *UNUSED(ptr))
+{
+  return BLI_windows_is_store_install();

@@ -5819,0 +5848,4 @@
+      "is_msstore_installation",
+      false,
+      "Is MS Store Installation",
+      "Whether this blender installation is a sandboxed Microsoft Store version.");