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
a99d8cb2
Commit
a99d8cb2
authored
Oct 16, 2014
by
Nikolay Sivov
Committed by
Alexandre Julliard
Oct 16, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mscoree: Use E_NOT_SUFFICIENT_BUFFER definition.
parent
5cb10c96
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
metahost.c
dlls/mscoree/metahost.c
+3
-3
metahost.c
dlls/mscoree/tests/metahost.c
+1
-1
mscoree.c
dlls/mscoree/tests/mscoree.c
+4
-4
No files found.
dlls/mscoree/metahost.c
View file @
a99d8cb2
...
...
@@ -360,7 +360,7 @@ static HRESULT WINAPI CLRRuntimeInfo_GetVersionString(ICLRRuntimeInfo* iface,
if
(
buffer_size
>=
*
pcchBuffer
)
MultiByteToWideChar
(
CP_UTF8
,
0
,
version
,
-
1
,
pwzBuffer
,
buffer_size
);
else
hr
=
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
)
;
hr
=
E_NOT_SUFFICIENT_BUFFER
;
}
return
hr
;
...
...
@@ -421,7 +421,7 @@ static HRESULT WINAPI CLRRuntimeInfo_GetRuntimeDirectory(ICLRRuntimeInfo* iface,
if
(
buffer_size
>=
size
)
strcpyW
(
pwzBuffer
,
system_dir
);
else
hr
=
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
)
;
hr
=
E_NOT_SUFFICIENT_BUFFER
;
}
return
hr
;
...
...
@@ -1051,7 +1051,7 @@ HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface,
if
(
buffer_size
>=
*
pcchBuffer
)
MultiByteToWideChar
(
CP_UTF8
,
0
,
version
,
-
1
,
pwzBuffer
,
buffer_size
);
else
hr
=
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
)
;
hr
=
E_NOT_SUFFICIENT_BUFFER
;
}
}
...
...
dlls/mscoree/tests/metahost.c
View file @
a99d8cb2
...
...
@@ -122,7 +122,7 @@ static void test_enumruntimes(void)
count
=
1
;
hr
=
ICLRRuntimeInfo_GetVersionString
(
runtime_info
,
buf
,
&
count
);
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
)
,
"GetVersionString returned %x
\n
"
,
hr
);
ok
(
hr
==
E_NOT_SUFFICIENT_BUFFER
,
"GetVersionString returned %x
\n
"
,
hr
);
ok
(
count
>
1
,
"GetVersionString returned count %u
\n
"
,
count
);
count
=
0xdeadbeef
;
...
...
dlls/mscoree/tests/mscoree.c
View file @
a99d8cb2
...
...
@@ -92,7 +92,7 @@ static void test_versioninfo(void)
return
;
}
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
),
"GetCORVersion returned %08x
\n
"
,
hr
);
ok
(
hr
==
E_NOT_SUFFICIENT_BUFFER
,
"GetCORVersion returned %08x
\n
"
,
hr
);
hr
=
pGetCORVersion
(
version
,
MAX_PATH
,
&
size
);
ok
(
hr
==
S_OK
,
"GetCORVersion returned %08x
\n
"
,
hr
);
...
...
@@ -107,12 +107,12 @@ static void test_versioninfo(void)
path_len
=
size
;
hr
=
pGetCORSystemDirectory
(
path
,
path_len
-
1
,
&
size
);
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
)
,
"GetCORSystemDirectory returned %08x
\n
"
,
hr
);
ok
(
hr
==
E_NOT_SUFFICIENT_BUFFER
,
"GetCORSystemDirectory returned %08x
\n
"
,
hr
);
if
(
0
)
/* crashes on <= w2k3 */
{
hr
=
pGetCORSystemDirectory
(
NULL
,
MAX_PATH
,
&
size
);
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
)
,
"GetCORSystemDirectory returned %08x
\n
"
,
hr
);
ok
(
hr
==
E_NOT_SUFFICIENT_BUFFER
,
"GetCORSystemDirectory returned %08x
\n
"
,
hr
);
}
hr
=
pGetCORSystemDirectory
(
path
,
MAX_PATH
,
NULL
);
...
...
@@ -140,7 +140,7 @@ static void test_versioninfo(void)
ok
(
hr
==
S_OK
,
"GetRequestedRuntimeInfo returned %08x
\n
"
,
hr
);
hr
=
pGetRequestedRuntimeInfo
(
NULL
,
v2_0
,
NULL
,
0
,
0
,
path
,
1
,
&
path_len
,
version
,
MAX_PATH
,
&
size
);
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
)
,
"GetRequestedRuntimeInfo returned %08x
\n
"
,
hr
);
ok
(
hr
==
E_NOT_SUFFICIENT_BUFFER
,
"GetRequestedRuntimeInfo returned %08x
\n
"
,
hr
);
/* if one of the buffers is NULL, the other one is still happily filled */
memset
(
version
,
0
,
sizeof
(
version
));
...
...
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