Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
daec7207
Commit
daec7207
authored
Jul 05, 2002
by
Jason Edmeades
Committed by
Alexandre Julliard
Jul 05, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure VarBstrCat handles null parms as per windows and actually does
the concatenation even for null args.
parent
0bb6fdda
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
9 deletions
+11
-9
variant.c
dlls/oleaut32/variant.c
+11
-9
No files found.
dlls/oleaut32/variant.c
View file @
daec7207
...
...
@@ -4916,18 +4916,22 @@ HRESULT WINAPI VarBstrCmp(BSTR left, BSTR right, LCID lcid, DWORD flags)
HRESULT
WINAPI
VarBstrCat
(
BSTR
left
,
BSTR
right
,
BSTR
*
out
)
{
BSTR
result
;
int
size
=
0
;
TRACE
(
"( %s %s %p )
\n
"
,
debugstr_w
(
left
),
debugstr_w
(
right
),
out
);
if
(
(
!
left
)
||
(
!
right
)
||
(
!
out
)
)
return
0
;
result
=
SysAllocStringLen
(
left
,
lstrlenW
(
left
)
+
lstrlenW
(
right
));
lstrcatW
(
result
,
right
);
/* On Windows, NULL parms are still handled (as empty strings) */
if
(
left
)
size
=
size
+
lstrlenW
(
left
);
if
(
right
)
size
=
size
+
lstrlenW
(
right
);
if
(
out
)
{
result
=
SysAllocStringLen
(
NULL
,
size
);
*
out
=
result
;
return
1
;
if
(
left
)
lstrcatW
(
result
,
left
);
if
(
right
)
lstrcatW
(
result
,
right
);
TRACE
(
"result = %s, [%p]
\n
"
,
debugstr_w
(
result
),
result
);
}
return
S_OK
;
}
/**********************************************************************
...
...
@@ -5529,5 +5533,3 @@ HRESULT WINAPI VarFormat(LPVARIANT varIn, LPOLESTR format,
TRACE
(
"result: '%s'
\n
"
,
debugstr_w
(
*
pbstrOut
));
return
rc
;
}
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