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
d08e89a8
Commit
d08e89a8
authored
Mar 15, 2012
by
Alistair Leslie-Hughes
Committed by
Alexandre Julliard
Mar 27, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mscoree: Allow capital for version number.
parent
6c6744f8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletion
+10
-1
metahost.c
dlls/mscoree/metahost.c
+1
-1
mscoree_main.c
dlls/mscoree/mscoree_main.c
+3
-0
mscoree.c
dlls/mscoree/tests/mscoree.c
+6
-0
No files found.
dlls/mscoree/metahost.c
View file @
d08e89a8
...
...
@@ -988,7 +988,7 @@ static BOOL parse_runtime_version(LPCWSTR version, DWORD *major, DWORD *minor, D
*
minor
=
0
;
*
build
=
0
;
if
(
version
[
0
]
==
'v'
)
if
(
version
[
0
]
==
'v'
||
version
[
0
]
==
'V'
)
{
version
++
;
if
(
!
isdigit
(
*
version
))
...
...
dlls/mscoree/mscoree_main.c
View file @
d08e89a8
...
...
@@ -347,6 +347,9 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST
if
(
SUCCEEDED
(
ret
))
{
if
(
pwszVersion
)
pVersion
[
0
]
=
pwszVersion
[
0
];
*
dwDirectoryLength
=
dwDirectory
;
ret
=
ICLRRuntimeInfo_GetRuntimeDirectory
(
info
,
pDirectory
,
dwDirectoryLength
);
}
...
...
dlls/mscoree/tests/mscoree.c
View file @
d08e89a8
...
...
@@ -61,6 +61,7 @@ static BOOL init_functionpointers(void)
static
void
test_versioninfo
(
void
)
{
const
WCHAR
v9_0
[]
=
{
'v'
,
'9'
,
'.'
,
'0'
,
'.'
,
'3'
,
'0'
,
'3'
,
'1'
,
'9'
,
0
};
const
WCHAR
v2_0cap
[]
=
{
'V'
,
'2'
,
'.'
,
'0'
,
'.'
,
'5'
,
'0'
,
'7'
,
'2'
,
'7'
,
0
};
const
WCHAR
v2_0
[]
=
{
'v'
,
'2'
,
'.'
,
'0'
,
'.'
,
'5'
,
'0'
,
'7'
,
'2'
,
'7'
,
0
};
const
WCHAR
v2_0_0
[]
=
{
'v'
,
'2'
,
'.'
,
'0'
,
'.'
,
'0'
,
0
};
const
WCHAR
v1_1
[]
=
{
'v'
,
'1'
,
'.'
,
'1'
,
'.'
,
'4'
,
'3'
,
'2'
,
'2'
,
0
};
...
...
@@ -147,6 +148,11 @@ static void test_versioninfo(void)
ok
(
hr
==
S_OK
,
"GetRequestedRuntimeInfo returned %08x
\n
"
,
hr
);
ok
(
!
winetest_strcmpW
(
version
,
v2_0
),
"version is %s , expected %s
\n
"
,
wine_dbgstr_w
(
version
),
wine_dbgstr_w
(
v2_0
));
memset
(
version
,
0
,
sizeof
(
version
));
hr
=
pGetRequestedRuntimeInfo
(
NULL
,
v2_0cap
,
NULL
,
0
,
0
,
path
,
MAX_PATH
,
&
path_len
,
version
,
MAX_PATH
,
NULL
);
ok
(
hr
==
S_OK
,
"GetRequestedRuntimeInfo returned %08x
\n
"
,
hr
);
ok
(
!
winetest_strcmpW
(
version
,
v2_0cap
),
"version is %s , expected %s
\n
"
,
wine_dbgstr_w
(
version
),
wine_dbgstr_w
(
v2_0cap
));
/* Invalid Version and RUNTIME_INFO_UPGRADE_VERSION flag*/
memset
(
version
,
0
,
sizeof
(
version
));
hr
=
pGetRequestedRuntimeInfo
(
NULL
,
v1_1
,
NULL
,
0
,
RUNTIME_INFO_UPGRADE_VERSION
,
path
,
MAX_PATH
,
&
path_len
,
version
,
MAX_PATH
,
NULL
);
...
...
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