[PATCH v2 0/2] MR2438: wine.inf.in: Add EditionID to HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion

[Louis Lenders (＠xe)]

https://bugs.winehq.org/show_bug.cgi?id=54675

--
  v2: wine.inf.in: Add EditionID to HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion (v2)

https://gitlab.winehq.org/wine/wine/-/merge_requests/2438

[PATCH v2 1/2] wine.inf.in: Add EditionID to HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion

[Louis Lenders]

From: Louis Lenders

https://bugs.winehq.org/show_bug.cgi?id=54675
---
 loader/wine.inf.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index c5850d1e205..2aeda7e4ef8 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2512,6 +2512,7 @@ HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\
 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\
 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\
 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
+HKLM,%CurrentVersionNT%,"EditionId",2,"Core"
 HKLM,%CurrentVersionNT%,"ProductName",2,"Windows 10 Pro"
 HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT"
 HKLM,%Control%\Windows,"CSDVersion",0x10003,0

[PATCH v2 2/2] wine.inf.in: Add EditionID to HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion (v2)

[Louis Lenders]

From: Louis Lenders

---
 loader/wine.inf.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 2aeda7e4ef8..9aaf2124ee3 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2512,7 +2512,7 @@ HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\
 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\
 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\
 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
-HKLM,%CurrentVersionNT%,"EditionId",2,"Core"
+HKLM,%CurrentVersionNT%,"EditionId",2,"Professional"
 HKLM,%CurrentVersionNT%,"ProductName",2,"Windows 10 Pro"
 HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT"
 HKLM,%Control%\Windows,"CSDVersion",0x10003,0

[Hans Leidekker (＠hans)]

Looks good. Can you squash the two commits and force push?

[Louis Lenders (＠xe)]

So how do I do that?

[PATCH v2 0/2] MR2438: wine.inf.in: Add EditionID to HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion - closed

[Louis Lenders (＠xe)]

This merge request was closed by Louis Lenders.

[Hans Leidekker (＠hans)]

Run 'git rebase -i origin' and use 's' to squash the commits. When you push, pass the --force option to overwrite the remote branch.

[Louis Lenders (＠xe)]

I already messed up everything. And when I opened a new merge request there was again those 2 commits. I`ll give it one more try, if that fails i give up.