[PATCH v3 2/3] ntdll: Default to Windows 10.

1 Feb 2023

From: Hans Leidekker hans@codeweavers.com
---
 dlls/msi/tests/package.c       | 66 +++++++++++++++++-----------------
 dlls/ntdll/version.c           |  2 +-
 loader/wine.inf.in             | 32 ++++++++---------
 programs/winecfg/appdefaults.c |  2 +-
 4 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index 05633c4b6df..cad396aa05a 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -2137,7 +2137,7 @@ static void test_condition(void)
     DeleteFileA(msifile);
 }
-static void check_prop(MSIHANDLE hpkg, const char *prop, const char *expect, int match_case)
+static void check_prop(MSIHANDLE hpkg, const char *prop, const char *expect, int match_case, int todo_value)
 {
     char buffer[MAX_PATH] = "x";
     DWORD sz = sizeof(buffer);
@@ -2145,9 +2145,9 @@ static void check_prop(MSIHANDLE hpkg, const char *prop, const char *expect, int
     ok(!r, "'%s': got %u\n", prop, r);
     ok(sz == lstrlenA(buffer), "'%s': expected %u, got %lu\n", prop, lstrlenA(buffer), sz);
     if (match_case)
-        ok(!strcmp(buffer, expect), "'%s': expected '%s', got '%s'\n", prop, expect, buffer);
+        todo_wine_if (todo_value) ok(!strcmp(buffer, expect), "'%s': expected '%s', got '%s'\n", prop, expect, buffer);
     else
-        ok(!_stricmp(buffer, expect), "'%s': expected '%s', got '%s'\n", prop, expect, buffer);
+        todo_wine_if (todo_value) ok(!_stricmp(buffer, expect), "'%s': expected '%s', got '%s'\n", prop, expect, buffer);
 }
static void test_props(void)
@@ -2220,29 +2220,29 @@ static void test_props(void)
r = MsiSetPropertyA( hpkg, "=", "asdf" );
     ok(!r, "got %u\n", r);
-    check_prop(hpkg, "=", "asdf", 1);
+    check_prop(hpkg, "=", "asdf", 1, 0);
r = MsiSetPropertyA( hpkg, " ", "asdf" );
     ok(!r, "got %u\n", r);
-    check_prop(hpkg, " ", "asdf", 1);
+    check_prop(hpkg, " ", "asdf", 1, 0);
r = MsiSetPropertyA( hpkg, "'", "asdf" );
     ok(!r, "got %u\n", r);
-    check_prop(hpkg, "'", "asdf", 1);
+    check_prop(hpkg, "'", "asdf", 1, 0);
/* set empty values */
     r = MsiSetPropertyA( hpkg, "boo", NULL );
     ok(!r, "got %u\n", r);
-    check_prop(hpkg, "boo", "", 1);
+    check_prop(hpkg, "boo", "", 1, 0);
r = MsiSetPropertyA( hpkg, "boo", "" );
     ok(!r, "got %u\n", r);
-    check_prop(hpkg, "boo", "", 1);
+    check_prop(hpkg, "boo", "", 1, 0);
/* set a non-empty value */
     r = MsiSetPropertyA( hpkg, "boo", "xyz" );
     ok(!r, "got %u\n", r);
-    check_prop(hpkg, "boo", "xyz", 1);
+    check_prop(hpkg, "boo", "xyz", 1, 0);
r = MsiGetPropertyA(hpkg, "boo", NULL, NULL);
     ok(!r, "got %u\n", r);
@@ -2317,10 +2317,10 @@ static void test_props(void)
     ok(sz == 3, "got size %lu\n", sz);
/* properties are case-sensitive */
-    check_prop(hpkg, "BOO", "", 1);
+    check_prop(hpkg, "BOO", "", 1, 0);
/* properties set in Property table should work */
-    check_prop(hpkg, "MetadataCompName", "Photoshop.dll", 1);
+    check_prop(hpkg, "MetadataCompName", "Photoshop.dll", 1, 0);
MsiCloseHandle( hpkg );
     DeleteFileA(msifile);
@@ -5734,70 +5734,70 @@ static void test_installprops(void)
     GetNativeSystemInfo(&si);
sprintf(buf, "%d", LOBYTE(LOWORD(GetVersion())) * 100 + HIBYTE(LOWORD(GetVersion())));
-    check_prop(hpkg, "VersionNT", buf, 1);
+    check_prop(hpkg, "VersionNT", buf, 1, 1);
if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
     {
         sprintf(buf, "%d", si.wProcessorLevel);
-        check_prop(hpkg, "Intel", buf, 1);
-        check_prop(hpkg, "MsiAMD64", buf, 1);
-        check_prop(hpkg, "Msix64", buf, 1);
+        check_prop(hpkg, "Intel", buf, 1, 0);
+        check_prop(hpkg, "MsiAMD64", buf, 1, 0);
+        check_prop(hpkg, "Msix64", buf, 1, 0);
         sprintf(buf, "%d", LOBYTE(LOWORD(GetVersion())) * 100 + HIBYTE(LOWORD(GetVersion())));
-        check_prop(hpkg, "VersionNT64", buf, 1);
+        check_prop(hpkg, "VersionNT64", buf, 1, 1);
GetSystemDirectoryA(path, MAX_PATH);
         strcat(path, "\");
-        check_prop(hpkg, "System64Folder", path, 0);
+        check_prop(hpkg, "System64Folder", path, 0, 0);
GetSystemWow64DirectoryA(path, MAX_PATH);
         strcat(path, "\");
-        check_prop(hpkg, "SystemFolder", path, 0);
+        check_prop(hpkg, "SystemFolder", path, 0, 0);
size = MAX_PATH;
         r = RegQueryValueExA(pathkey, "ProgramFilesDir (x86)", 0, &type, (BYTE *)path, &size);
         strcat(path, "\");
-        check_prop(hpkg, "ProgramFilesFolder", path, 0);
+        check_prop(hpkg, "ProgramFilesFolder", path, 0, 0);
size = MAX_PATH;
         RegQueryValueExA(pathkey, "ProgramFilesDir", 0, &type, (BYTE *)path, &size);
         strcat(path, "\");
-        check_prop(hpkg, "ProgramFiles64Folder", path, 0);
+        check_prop(hpkg, "ProgramFiles64Folder", path, 0, 0);
size = MAX_PATH;
         RegQueryValueExA(pathkey, "CommonFilesDir (x86)", 0, &type, (BYTE *)path, &size);
         strcat(path, "\");
-        check_prop(hpkg, "CommonFilesFolder", path, 0);
+        check_prop(hpkg, "CommonFilesFolder", path, 0, 0);
size = MAX_PATH;
         RegQueryValueExA(pathkey, "CommonFilesDir", 0, &type, (BYTE *)path, &size);
         strcat(path, "\");
-        check_prop(hpkg, "CommonFiles64Folder", path, 0);
+        check_prop(hpkg, "CommonFiles64Folder", path, 0, 0);
     }
     else if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL)
     {
         sprintf(buf, "%d", si.wProcessorLevel);
-        check_prop(hpkg, "Intel", buf, 1);
+        check_prop(hpkg, "Intel", buf, 1, 0);
GetSystemDirectoryA(path, MAX_PATH);
         strcat(path, "\");
-        check_prop(hpkg, "SystemFolder", path, 0);
+        check_prop(hpkg, "SystemFolder", path, 0, 0);
size = MAX_PATH;
         RegQueryValueExA(pathkey, "ProgramFilesDir", 0, &type, (BYTE *)path, &size);
         strcat(path, "\");
-        check_prop(hpkg, "ProgramFilesFolder", path, 0);
+        check_prop(hpkg, "ProgramFilesFolder", path, 0, 0);
size = MAX_PATH;
         RegQueryValueExA(pathkey, "CommonFilesDir", 0, &type, (BYTE *)path, &size);
         strcat(path, "\");
-        check_prop(hpkg, "CommonFilesFolder", path, 0);
-
-        check_prop(hpkg, "MsiAMD64", "", 1);
-        check_prop(hpkg, "Msix64", "", 1);
-        check_prop(hpkg, "VersionNT64", "", 1);
-        check_prop(hpkg, "System64Folder", "", 0);
-        check_prop(hpkg, "ProgramFiles64Dir", "", 0);
-        check_prop(hpkg, "CommonFiles64Dir", "", 0);
+        check_prop(hpkg, "CommonFilesFolder", path, 0, 0);
+
+        check_prop(hpkg, "MsiAMD64", "", 1, 0);
+        check_prop(hpkg, "Msix64", "", 1, 0);
+        check_prop(hpkg, "VersionNT64", "", 1, 0);
+        check_prop(hpkg, "System64Folder", "", 0, 0);
+        check_prop(hpkg, "ProgramFiles64Dir", "", 0, 0);
+        check_prop(hpkg, "CommonFiles64Dir", "", 0, 0);
     }
CloseHandle(hkey1);
diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index 30480d06fa6..3a903c54c6b 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -473,7 +473,7 @@ void version_init(void)
NtQuerySystemInformation( SystemWineVersionInformation, wine_version, sizeof(wine_version), NULL );
-    current_version = &VersionData[WIN7];
+    current_version = &VersionData[WIN10];
RtlOpenCurrentUser( KEY_ALL_ACCESS, &root );
     attr.Length = sizeof(attr);
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index f1525c4f6dd..3c9cb9bc6dc 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2453,13 +2453,12 @@ HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16
 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16
[VersionInfo]
-HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1"
-HKLM,%CurrentVersionNT%,"CurrentMajorVersionNumber",0x10001,6
-HKLM,%CurrentVersionNT%,"CurrentMinorVersionNumber",0x10001,1
-HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1"
-HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601"
-HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601"
-HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free"
+HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.3"
+HKLM,%CurrentVersionNT%,"CurrentMajorVersionNumber",0x10001,10
+HKLM,%CurrentVersionNT%,"CurrentMinorVersionNumber",0x10001,0
+HKLM,%CurrentVersionNT%,"CurrentBuild",2,"18362"
+HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"18362"
+HKLM,%CurrentVersionNT%,"CurrentType",2,"Multiprocessor Free"
 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,\
@@ -2467,17 +2466,18 @@ 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%,"ProductName",2,"Microsoft Windows 7"
+HKLM,%CurrentVersionNT%,"ProductName",2,"Windows 10 Pro"
 HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT"
-HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100
+HKLM,%Control%\Windows,"CSDVersion",0x10003,0
 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"
[VersionInfo.ntamd64]
-HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1"
-HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1"
-HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601"
-HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601"
-HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free"
+HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.3"
+HKLM,%CurrentVersionNT%,"CurrentMajorVersionNumber",0x10001,10
+HKLM,%CurrentVersionNT%,"CurrentMinorVersionNumber",0x10001,0
+HKLM,%CurrentVersionNT%,"CurrentBuild",2,"18362"
+HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"18362"
+HKLM,%CurrentVersionNT%,"CurrentType",2,"Multiprocessor Free"
 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,\
@@ -2485,9 +2485,9 @@ 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%,"ProductName",2,"Microsoft Windows 7"
+HKLM,%CurrentVersionNT%,"ProductName",2,"Windows 10 Pro"
 HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT"
-HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100
+HKLM,%Control%\Windows,"CSDVersion",0x10003,0
 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"
[Wow64]
diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c
index 3f6b424fed6..0e18d5d2c69 100644
--- a/programs/winecfg/appdefaults.c
+++ b/programs/winecfg/appdefaults.c
@@ -74,7 +74,7 @@ static const struct win_version win_versions[] =
 #endif
 };
-#define DEFAULT_WIN_VERSION   L"win7"
+#define DEFAULT_WIN_VERSION   L"win10"
static const WCHAR szKey9x[] = L"Software\Microsoft\Windows\CurrentVersion";
 static const WCHAR szKeyNT[] = L"Software\Microsoft\Windows NT\CurrentVersion";
-- 
GitLab


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

    

2025

2024

2023

2022

[PATCH v3 2/3] ntdll: Default to Windows 10.