Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
James Carthew
wine
Commits
d92d108a
Commit
d92d108a
authored
10 years ago
by
Nikolay Sivov
Committed by
Alexandre Julliard
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fusion: Use E_NOT_SUFFICIENT_BUFFER definition.
parent
477dfbca
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dlls/fusion/asmname.c
+1
-1
1 addition, 1 deletion
dlls/fusion/asmname.c
dlls/fusion/fusion.c
+1
-1
1 addition, 1 deletion
dlls/fusion/fusion.c
dlls/fusion/tests/asmcache.c
+5
-8
5 additions, 8 deletions
dlls/fusion/tests/asmcache.c
dlls/fusion/tests/fusion.c
+3
-6
3 additions, 6 deletions
dlls/fusion/tests/fusion.c
with
10 additions
and
16 deletions
dlls/fusion/asmname.c
+
1
−
1
View file @
d92d108a
...
...
@@ -497,7 +497,7 @@ HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len)
if
(
*
len
<=
buffer_size
)
lstrcpyW
(
buf
,
name
->
path
);
else
return
HRESULT_FROM_WIN32
(
ERROR_IN
SUFFICIENT_BUFFER
)
;
return
E_NOT_
SUFFICIENT_BUFFER
;
return
S_OK
;
}
...
...
This diff is collapsed.
Click to expand it.
dlls/fusion/fusion.c
+
1
−
1
View file @
d92d108a
...
...
@@ -161,7 +161,7 @@ HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath,
len
++
;
if
(
*
pcchPath
<=
len
||
!
pwzCachePath
)
hr
=
HRESULT_FROM_WIN32
(
ERROR_IN
SUFFICIENT_BUFFER
)
;
hr
=
E_NOT_
SUFFICIENT_BUFFER
;
else
if
(
pwzCachePath
)
strcpyW
(
pwzCachePath
,
path
);
...
...
This diff is collapsed.
Click to expand it.
dlls/fusion/tests/asmcache.c
+
5
−
8
View file @
d92d108a
...
...
@@ -1235,8 +1235,7 @@ static void test_QueryAssemblyInfo(void)
"Expected ASSEMBLYINFO_FLAG_INSTALLED, got %08x
\n
"
,
info
.
dwAssemblyFlags
);
ok
(
info
.
uliAssemblySizeInKB
.
u
.
HighPart
==
0
,
"Expected 0, got %d
\n
"
,
info
.
uliAssemblySizeInKB
.
u
.
HighPart
);
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
),
"Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x
\n
"
,
hr
);
ok
(
hr
==
E_NOT_SUFFICIENT_BUFFER
,
"Expected E_NOT_SUFFICIENT_BUFFER, got %08x
\n
"
,
hr
);
todo_wine
{
ok
((
info
.
uliAssemblySizeInKB
.
u
.
LowPart
==
4
),
...
...
@@ -1258,8 +1257,7 @@ static void test_QueryAssemblyInfo(void)
"Expected 0, got %d
\n
"
,
info
.
uliAssemblySizeInKB
.
u
.
HighPart
);
ok
(
!
lstrcmpW
(
info
.
pszCurrentAssemblyPathBuf
,
empty
),
"Assembly path was changed
\n
"
);
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
),
"Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x
\n
"
,
hr
);
ok
(
hr
==
E_NOT_SUFFICIENT_BUFFER
,
"Expected E_NOT_SUFFICIENT_BUFFER, got %08x
\n
"
,
hr
);
todo_wine
{
ok
((
info
.
uliAssemblySizeInKB
.
u
.
LowPart
==
4
),
...
...
@@ -1321,7 +1319,7 @@ static void test_QueryAssemblyInfo(void)
lstrcatW
(
name
,
otherver
);
hr
=
IAssemblyCache_QueryAssemblyInfo
(
cache
,
QUERYASMINFO_FLAG_VALIDATE
,
name
,
&
info
);
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_IN
SUFFICIENT_BUFFER
)
,
"got %08x
\n
"
,
hr
);
ok
(
hr
==
E_NOT_
SUFFICIENT_BUFFER
,
"got %08x
\n
"
,
hr
);
ok
(
info
.
dwAssemblyFlags
==
ASSEMBLYINFO_FLAG_INSTALLED
,
"got %08x
\n
"
,
info
.
dwAssemblyFlags
);
/* short buffer, QUERYASMINFO_FLAG_GETSIZE */
...
...
@@ -1331,7 +1329,7 @@ static void test_QueryAssemblyInfo(void)
lstrcatW
(
name
,
otherver
);
hr
=
IAssemblyCache_QueryAssemblyInfo
(
cache
,
QUERYASMINFO_FLAG_GETSIZE
,
name
,
&
info
);
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_IN
SUFFICIENT_BUFFER
)
,
"got %08x
\n
"
,
hr
);
ok
(
hr
==
E_NOT_
SUFFICIENT_BUFFER
,
"got %08x
\n
"
,
hr
);
ok
(
info
.
dwAssemblyFlags
==
ASSEMBLYINFO_FLAG_INSTALLED
,
"got %08x
\n
"
,
info
.
dwAssemblyFlags
);
/* display name is "wine, Version=1.0.0.00000" */
...
...
@@ -1525,8 +1523,7 @@ static void test_QueryAssemblyInfo(void)
lstrcatW
(
name
,
commasep
);
lstrcatW
(
name
,
ver
);
hr
=
IAssemblyCache_QueryAssemblyInfo
(
cache
,
0
,
name
,
&
info
);
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
),
"Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x
\n
"
,
hr
);
ok
(
hr
==
E_NOT_SUFFICIENT_BUFFER
,
"Expected E_NOT_SUFFICIENT_BUFFER, got %08x
\n
"
,
hr
);
ok
(
info
.
cbAssemblyInfo
==
sizeof
(
ASSEMBLY_INFO
),
"Expected sizeof(ASSEMBLY_INFO), got %d
\n
"
,
info
.
cbAssemblyInfo
);
ok
(
info
.
dwAssemblyFlags
==
ASSEMBLYINFO_FLAG_INSTALLED
,
...
...
This diff is collapsed.
Click to expand it.
dlls/fusion/tests/fusion.c
+
3
−
6
View file @
d92d108a
...
...
@@ -98,16 +98,14 @@ static void test_GetCachePath(void)
/* NULL pwzCachePath, pcchPath is 0 */
size
=
0
;
hr
=
pGetCachePath
(
ASM_CACHE_GAC
,
NULL
,
&
size
);
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
),
"Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x
\n
"
,
hr
);
ok
(
hr
==
E_NOT_SUFFICIENT_BUFFER
,
"Expected E_NOT_SUFFICIENT_BUFFER, got %08x
\n
"
,
hr
);
ok
(
size
==
lstrlenW
(
cachepath
)
+
1
,
"Expected %d, got %d
\n
"
,
lstrlenW
(
cachepath
)
+
1
,
size
);
/* NULL pwszCachePath, pcchPath is MAX_PATH */
size
=
MAX_PATH
;
hr
=
pGetCachePath
(
ASM_CACHE_GAC
,
NULL
,
&
size
);
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
),
"Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x
\n
"
,
hr
);
ok
(
hr
==
E_NOT_SUFFICIENT_BUFFER
,
"Expected E_NOT_SUFFICIENT_BUFFER, got %08x
\n
"
,
hr
);
ok
(
size
==
lstrlenW
(
cachepath
)
+
1
,
"Expected %d, got %d
\n
"
,
lstrlenW
(
cachepath
)
+
1
,
size
);
...
...
@@ -132,8 +130,7 @@ static void test_GetCachePath(void)
lstrcpyW
(
path
,
nochange
);
size
=
lstrlenW
(
cachepath
);
hr
=
pGetCachePath
(
ASM_CACHE_GAC
,
path
,
&
size
);
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
),
"Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x
\n
"
,
hr
);
ok
(
hr
==
E_NOT_SUFFICIENT_BUFFER
,
"Expected E_NOT_SUFFICIENT_BUFFER, got %08x
\n
"
,
hr
);
ok
(
!
lstrcmpW
(
nochange
,
path
),
"Expected %s, got %s
\n
"
,
wine_dbgstr_w
(
nochange
),
wine_dbgstr_w
(
path
));
lstrcpyW
(
cachepath
,
windir
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment