Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
1e7cd2c8
Commit
1e7cd2c8
authored
Aug 03, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DMO: use FromWide(), fix charset
On Windows, wcstombs() converts
UTF-16
to ANSI, not to
UTF-8
.
parent
9b62ffa0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
3 deletions
+8
-3
modules/codec/dmo/dmo.c
modules/codec/dmo/dmo.c
+8
-3
No files found.
modules/codec/dmo/dmo.c
View file @
1e7cd2c8
...
...
@@ -38,6 +38,7 @@
# define LOADER
#else
# include <objbase.h>
# include <vlc_charset.h>
#endif
#ifdef LOADER
...
...
@@ -728,8 +729,7 @@ static int LoadDMO( vlc_object_t *p_this, HINSTANCE *p_hmsdmo_dll,
while
(
(
S_OK
==
p_enum_dmo
->
vt
->
Next
(
p_enum_dmo
,
1
,
&
clsid_dmo
,
&
psz_dmo_name
,
&
i_dummy
/* NULL doesn't work */
)
)
)
{
char
psz_temp
[
MAX_PATH
];
wcstombs
(
psz_temp
,
psz_dmo_name
,
MAX_PATH
);
char
*
psz_temp
=
FromWide
(
psz_dmo_name
);
msg_Dbg
(
p_this
,
"found DMO: %s"
,
psz_temp
);
CoTaskMemFree
(
psz_dmo_name
);
...
...
@@ -738,9 +738,14 @@ static int LoadDMO( vlc_object_t *p_this, HINSTANCE *p_hmsdmo_dll,
&
IID_IMediaObject
,
(
void
**
)
pp_dmo
)
)
{
msg_Warn
(
p_this
,
"can't create DMO: %s"
,
psz_temp
);
free
(
psz_temp
);
*
pp_dmo
=
0
;
}
else
break
;
else
{
free
(
psz_temp
);
break
;
}
}
p_enum_dmo
->
vt
->
Release
(
(
IUnknown
*
)
p_enum_dmo
);
...
...
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