Parcourir la source

Prepare upstream PR branches; export as git bundles

- wine: branch modern-toolchain-build-fixes (b55e972) based on
  hacking/validiy-sensor; patch slimmed to the 3 files that are actually
  needed (dropped the redundant secrets.h hunk, dlls/bcrypt rebuilds clean)
- sandbox: branch argv-dispatch (28b3454) based on master
- both exported as small, verified-fetchable bundles under work/patches/
- work/contrib/README.md documents push + PR steps and compare URLs
Johannes Zellner il y a 1 mois
Parent
commit
4d1ecc1afb

+ 3 - 0
README.md

@@ -344,6 +344,9 @@ Restore after a wipe:
 - `work/patches/synaTudor-work.patch` — the 12-file delta of the (blocked)
   native synaTudor route; may be of interest to that project.
 
+Prepared PR branches + git bundles (wine, sandbox): see
+`work/contrib/README.md`.
+
 Legal note: `drivers/` and `driverdlls/` contain Synaptics vendor binaries
 from the Microsoft Update Catalog. Check redistribution terms before making
 this repository public; drop them with `git rm -r --cached drivers driverdlls`.

+ 34 - 0
work/contrib/README.md

@@ -32,6 +32,40 @@ PR; the clean way is:
 `../patches/synaTudor-work.patch` into the description box (GitHub issues
 accept file attachments).
 
+## Prepared branches (2026-10-13)
+
+Both PR branches are committed locally with the patches applied, and exported
+as small git bundles (verified fetchable):
+
+| Target | Branch | Base | Bundle |
+|---|---|---|---|
+| uunicorn/wine | `modern-toolchain-build-fixes` (clone: `/tmp/opencode/wine-validity`) | `hacking/validiy-sensor` @ `7a69a82` | `../patches/uunicorn-wine-modern-toolchain.bundle` |
+| uunicorn/synaWudfBioUsb-sandbox | `argv-dispatch` (clone: `work/synaWudfBioUsb-sandbox`) | `master` @ `f7b31df` | `../patches/uunicorn-sandbox-argv-dispatch.bundle` |
+
+The wine clone lives in `/tmp` (volatile) — if it is gone, re-clone and
+`git apply` the `.patch`, or fetch the branch from the bundle.
+
+### Push / open the PRs
+
+1. Fork both repos on GitHub.
+2. wine (set the PR base branch to `hacking/validiy-sensor`):
+   ```sh
+   cd /tmp/opencode/wine-validity            # or your own clone of the fork
+   git remote add fork git@github.com:<you>/wine.git
+   # only if /tmp was cleared:
+   # git fetch /path/to/uunicorn-wine-modern-toolchain.bundle modern-toolchain-build-fixes:modern-toolchain-build-fixes
+   git push -u fork modern-toolchain-build-fixes
+   ```
+   PR: https://github.com/uunicorn/wine/compare/hacking/validiy-sensor...<you>:wine:modern-toolchain-build-fixes?expand=1
+3. sandbox:
+   ```sh
+   cd work/synaWudfBioUsb-sandbox
+   git remote add fork git@github.com:<you>/synaWudfBioUsb-sandbox.git
+   git push -u fork argv-dispatch
+   ```
+   PR: https://github.com/uunicorn/synaWudfBioUsb-sandbox/compare/master...<you>:synaWudfBioUsb-sandbox:argv-dispatch?expand=1
+4. Paste the title/body from `01-...` / `02-...` above into each PR form.
+
 ## Notes
 
 - None of the drafts are submitted yet; review/edit the wording first.

BIN
work/patches/uunicorn-sandbox-argv-dispatch.bundle


BIN
work/patches/uunicorn-wine-modern-toolchain.bundle


+ 0 - 14
work/patches/uunicorn-wine-modern-toolchain.patch

@@ -38,20 +38,6 @@ index a3f7922..c8a88f0 100644
  
      pECDSA_SIG_get0(sig, &r, &s);
  
-diff --git a/dlls/bcrypt/secrets.h b/dlls/bcrypt/secrets.h
-index d1d8d83..56b4e11 100644
---- a/dlls/bcrypt/secrets.h
-+++ b/dlls/bcrypt/secrets.h
-@@ -9,3 +9,9 @@ int ecc_sign(
-             PUCHAR d, ULONG sd,
-             PUCHAR src, ULONG src_len, 
-             PUCHAR dst);
-+
-+/* from gnutls.c - declared here so secrets.c can use it */
-+#include <gnutls/abstract.h>
-+NTSTATUS get_gnutls_ecc_key_params(BCRYPT_KEY_HANDLE hKey,
-+                                   gnutls_ecc_curve_t *curve,
-+                                   gnutls_datum_t *x, gnutls_datum_t *y, gnutls_datum_t *d);
 diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h
 index 3d0129e..d92eb1a 100644
 --- a/dlls/crypt32/crypt32_private.h