Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
f94784dd
Commit
f94784dd
authored
Oct 04, 2016
by
Hans Leidekker
Committed by
Alexandre Julliard
Oct 04, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: SzCSDVersion is an empty string on Windows 8 and up.
Signed-off-by:
Hans Leidekker
<
hans@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ca862a38
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
version.c
dlls/kernel32/tests/version.c
+3
-0
version.c
dlls/ntdll/version.c
+3
-6
appdefaults.c
programs/winecfg/appdefaults.c
+3
-3
No files found.
dlls/kernel32/tests/version.c
View file @
f94784dd
...
...
@@ -156,6 +156,9 @@ static void test_GetVersionEx(void)
ok
(
ret
||
broken
(
ret
==
0
),
/* win95 */
"Expected GetVersionExA to succeed
\n
"
);
if
(
!
infoExA
.
wServicePackMajor
&&
!
infoExA
.
wServicePackMinor
)
ok
(
!
infoExA
.
szCSDVersion
[
0
],
"got '%s'
\n
"
,
infoExA
.
szCSDVersion
);
}
static
void
test_VerifyVersionInfo
(
void
)
...
...
dlls/ntdll/version.c
View file @
f94784dd
...
...
@@ -176,20 +176,17 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] =
/* WIN8 */
{
sizeof
(
RTL_OSVERSIONINFOEXW
),
6
,
2
,
0x23F0
,
VER_PLATFORM_WIN32_NT
,
{
' '
,
0
},
0
,
0
,
VER_SUITE_SINGLEUSERTS
,
VER_NT_WORKSTATION
,
0
{
0
},
0
,
0
,
VER_SUITE_SINGLEUSERTS
,
VER_NT_WORKSTATION
,
0
},
/* WIN81 */
{
sizeof
(
RTL_OSVERSIONINFOEXW
),
6
,
3
,
0x2580
,
VER_PLATFORM_WIN32_NT
,
{
' '
,
0
},
0
,
0
,
VER_SUITE_SINGLEUSERTS
,
VER_NT_WORKSTATION
,
0
{
0
},
0
,
0
,
VER_SUITE_SINGLEUSERTS
,
VER_NT_WORKSTATION
,
0
},
/* WIN10 */
{
sizeof
(
RTL_OSVERSIONINFOEXW
),
10
,
0
,
0x3839
,
VER_PLATFORM_WIN32_NT
,
{
' '
,
0
},
0
,
0
,
VER_SUITE_SINGLEUSERTS
,
VER_NT_WORKSTATION
,
0
{
0
},
0
,
0
,
VER_SUITE_SINGLEUSERTS
,
VER_NT_WORKSTATION
,
0
},
};
...
...
programs/winecfg/appdefaults.c
View file @
f94784dd
...
...
@@ -48,9 +48,9 @@ static const struct
const
char
*
szProductType
;
}
win_versions
[]
=
{
{
"win10"
,
"Windows 10"
,
10
,
0
,
0x3839
,
VER_PLATFORM_WIN32_NT
,
"
"
,
0
,
0
,
"WinNT"
},
{
"win81"
,
"Windows 8.1"
,
6
,
3
,
0x2580
,
VER_PLATFORM_WIN32_NT
,
"
"
,
0
,
0
,
"WinNT"
},
{
"win8"
,
"Windows 8"
,
6
,
2
,
0x23F0
,
VER_PLATFORM_WIN32_NT
,
"
"
,
0
,
0
,
"WinNT"
},
{
"win10"
,
"Windows 10"
,
10
,
0
,
0x3839
,
VER_PLATFORM_WIN32_NT
,
""
,
0
,
0
,
"WinNT"
},
{
"win81"
,
"Windows 8.1"
,
6
,
3
,
0x2580
,
VER_PLATFORM_WIN32_NT
,
""
,
0
,
0
,
"WinNT"
},
{
"win8"
,
"Windows 8"
,
6
,
2
,
0x23F0
,
VER_PLATFORM_WIN32_NT
,
""
,
0
,
0
,
"WinNT"
},
{
"win2008r2"
,
"Windows 2008 R2"
,
6
,
1
,
0x1DB1
,
VER_PLATFORM_WIN32_NT
,
"Service Pack 1"
,
1
,
0
,
"ServerNT"
},
{
"win7"
,
"Windows 7"
,
6
,
1
,
0x1DB1
,
VER_PLATFORM_WIN32_NT
,
"Service Pack 1"
,
1
,
0
,
"WinNT"
},
{
"win2008"
,
"Windows 2008"
,
6
,
0
,
0x1772
,
VER_PLATFORM_WIN32_NT
,
"Service Pack 2"
,
2
,
0
,
"ServerNT"
},
...
...
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