system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 17:26:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

mscoree: Allow capital for version number.

Browse source
This commit is contained in:
Alistair Leslie-Hughes 2012-03-15 22:40:25 +11:00 committed by Alexandre Julliard
parent 6c6744f800
commit d08e89a8d6
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/mscoree/metahost.c
View file

@ -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))

3
dlls/mscoree/mscoree_main.c
View file

@ -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);
}

6
dlls/mscoree/tests/mscoree.c
View file

@ -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);