Rebase against 126363ea5f9056449e8bd22cc69b51bd2d7dd9aa.

patches/wineboot-HKEY_DYN_DATA/0001-wineboot-Add-some-generic-hardware-in-HKEY_DYN_DATA-.patch

@@ -1,4 +1,4 @@
-From a84eae8891c0ad4558842c63c8279b270e6e1767 Mon Sep 17 00:00:00 2001
+From 5e22907c02cb6778555995421a0b8eb8e382ff3a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 16 Mar 2014 03:19:39 +0100
 Subject: [PATCH] wineboot: Add some generic hardware in HKEY_DYN_DATA\Config
@@ -9,11 +9,11 @@ Subject: [PATCH] wineboot: Add some generic hardware in HKEY_DYN_DATA\Config
  1 file changed, 100 insertions(+)
 
 diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
-index 09925bfa235..1c2731b977f 100644
+index 728c41fffa9..beb29db4653 100644
 --- a/programs/wineboot/wineboot.c
 +++ b/programs/wineboot/wineboot.c
-@@ -595,16 +595,116 @@ static void create_hardware_registry_keys(void)
-     HeapFree( GetProcessHeap(), 0, power_info );
+@@ -763,16 +763,116 @@ static void create_hardware_registry_keys(void)
+     free( power_info );
  }
  
 +struct dyndata_enum_key{
@@ -130,5 +130,5 @@ index 09925bfa235..1c2731b977f 100644
  
  /* create the platform-specific environment registry keys */
 -- 
-2.26.2
+2.40.1
 

patches/winemenubuilder-associations/0001-winemenubuilder-Create-.desktop-files-for-programs-t.patch

@@ -1,4 +1,4 @@
-From 88814d059f53ba2575568d252f4da7539ee50c01 Mon Sep 17 00:00:00 2001
+From f8f76a379516681dd481dd6634f2ea8a4b0f130e Mon Sep 17 00:00:00 2001
 From: Alex Henrie <alexhenrie24@gmail.com>
 Date: Sun, 7 May 2023 22:34:15 -0600
 Subject: [PATCH] winemenubuilder: Create .desktop files for programs that open
@@ -6,27 +6,27 @@ Subject: [PATCH] winemenubuilder: Create .desktop files for programs that open
 
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22904
 ---
- programs/winemenubuilder/winemenubuilder.c | 164 ++++++++++++---------
- 1 file changed, 96 insertions(+), 68 deletions(-)
+ programs/winemenubuilder/winemenubuilder.c | 163 ++++++++++++---------
+ 1 file changed, 95 insertions(+), 68 deletions(-)
 
 diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
-index c16d22e2a57..b06eae422ff 100644
+index 9459b77b502..77acf943c42 100644
 --- a/programs/winemenubuilder/winemenubuilder.c
 +++ b/programs/winemenubuilder/winemenubuilder.c
 @@ -1831,10 +1831,13 @@ static BOOL has_association_changed(LPCWSTR extensionW, const WCHAR *mimeType, c
              ret = TRUE;
-         heap_free(value);
+         free(value);
  
 -        value = reg_get_valW(assocKey, extensionW, L"ProgID");
 -        if (!value || wcscmp(value, progId))
 -            ret = TRUE;
--        heap_free(value);
+-        free(value);
 +        if (progId)
 +        {
 +            value = reg_get_valW(assocKey, extensionW, L"ProgID");
 +            if (!value || wcscmp(value, progId))
 +                ret = TRUE;
-+            heap_free(value);
++            free(value);
 +        }
  
          value = reg_get_valW(assocKey, extensionW, L"AppName");
@@ -111,7 +111,7 @@ index c16d22e2a57..b06eae422ff 100644
              if (commandW == NULL)
                  /* no command => no application is associated */
                  goto end;
-@@ -2101,78 +2119,88 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic
+@@ -2101,78 +2119,87 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic
                  /* command is on the exclude list => desktop integration is not desirable */
                  goto end;
  
@@ -180,8 +180,7 @@ index c16d22e2a57..b06eae422ff 100644
 +                        heap_free(flattened_mime);
                      }
 -                    extract_icon(iconW, index, flattened_mime, FALSE);
--                    heap_free(flattened_mime);
-+
+-                    free(flattened_mime);
 +                    write_freedesktop_mime_type_entry(packages_dir, winTypeW, mimeType, friendlyDocNameW);
 +                    hasChanged = TRUE;
                  }
@@ -224,7 +223,7 @@ index c16d22e2a57..b06eae422ff 100644
 -            if (wine_rb_get(&mimeProgidTree, mimeProgId))
 +            if (has_association_changed(winTypeW, mimeType, progIdW, friendlyAppName, openWithIcon))
              {
--                heap_free(mimeProgId);
+-                free(mimeProgId);
 -                goto end;
 -            }
 -            entry = xmalloc(sizeof(struct rb_string_entry));
@@ -250,14 +249,14 @@ index c16d22e2a57..b06eae422ff 100644
 -                    update_association(extensionW, mimeType, progIdW, friendlyAppName, desktopPath, openWithIcon);
 +                    update_association(winTypeW, mimeType, progIdW, friendlyAppName, desktopPath, openWithIcon);
                  }
-                 heap_free(desktopPath);
+                 free(desktopPath);
              }
-@@ -2189,7 +2217,7 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic
-             heap_free(mimeType);
-             heap_free(progIdW);
+@@ -2189,7 +2216,7 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic
+             free(mimeType);
+             free(progIdW);
          }
--        heap_free(extensionW);
-+        heap_free(winTypeW);
+-        free(extensionW);
++        free(winTypeW);
      }
  
      wine_rb_destroy(&mimeProgidTree, winemenubuilder_rb_destroy, NULL);

staging/upstream-commit

@@ -1 +1 @@
-87b1cd12d609d8359dab10af976d20269912e196
+126363ea5f9056449e8bd22cc69b51bd2d7dd9aa