Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
69154f03
Commit
69154f03
authored
Jan 23, 2023
by
Hans Leidekker
Committed by
Alexandre Julliard
Feb 01, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Default to Windows 10.
parent
2ccc2a42
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
51 deletions
+51
-51
package.c
dlls/msi/tests/package.c
+33
-33
version.c
dlls/ntdll/version.c
+1
-1
wine.inf.in
loader/wine.inf.in
+16
-16
appdefaults.c
programs/winecfg/appdefaults.c
+1
-1
No files found.
dlls/msi/tests/package.c
View file @
69154f03
...
...
@@ -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
);
...
...
dlls/ntdll/version.c
View file @
69154f03
...
...
@@ -473,7 +473,7 @@ void version_init(void)
NtQuerySystemInformation
(
SystemWineVersionInformation
,
wine_version
,
sizeof
(
wine_version
),
NULL
);
current_version
=
&
VersionData
[
WIN
7
];
current_version
=
&
VersionData
[
WIN
10
];
RtlOpenCurrentUser
(
KEY_ALL_ACCESS
,
&
root
);
attr
.
Length
=
sizeof
(
attr
);
...
...
loader/wine.inf.in
View file @
69154f03
...
...
@@ -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,0
x100
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,0
x100
HKLM,%Control%\Windows,"CSDVersion",0x10003,0
HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"
[Wow64]
...
...
programs/winecfg/appdefaults.c
View file @
69154f03
...
...
@@ -74,7 +74,7 @@ static const struct win_version win_versions[] =
#endif
};
#define DEFAULT_WIN_VERSION L"win
7
"
#define DEFAULT_WIN_VERSION L"win
10
"
static
const
WCHAR
szKey9x
[]
=
L"Software
\\
Microsoft
\\
Windows
\\
CurrentVersion"
;
static
const
WCHAR
szKeyNT
[]
=
L"Software
\\
Microsoft
\\
Windows NT
\\
CurrentVersion"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment