Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
f32b795e
Commit
f32b795e
authored
Sep 26, 2006
by
Damien Fouilleul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- activex: fix plugin path search, now relative to DLL location & registry settings
parent
2cfffefb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
6 deletions
+19
-6
activex/main.cpp
activex/main.cpp
+7
-1
activex/plugin.cpp
activex/plugin.cpp
+12
-5
No files found.
activex/main.cpp
View file @
f32b795e
...
...
@@ -51,13 +51,19 @@ extern const CATID CATID_SafeForScripting;
static
LONG
i_class_ref
=
0
;
static
HINSTANCE
h_instance
=
0
;
HMODULE
DllGetModule
()
{
return
h_instance
;
};
STDAPI
DllGetClassObject
(
REFCLSID
rclsid
,
REFIID
riid
,
LPVOID
*
ppv
)
{
HRESULT
hr
=
CLASS_E_CLASSNOTAVAILABLE
;
*
ppv
=
NULL
;
if
(
CLSID_VLCPlugin2
==
rclsid
)
if
(
(
CLSID_VLCPlugin
==
rclsid
)
||
(
CLSID_VLCPlugin2
==
rclsid
)
)
{
VLCPluginClass
*
plugin
=
new
VLCPluginClass
(
&
i_class_ref
,
h_instance
,
rclsid
);
hr
=
plugin
->
QueryInterface
(
riid
,
ppv
);
...
...
activex/plugin.cpp
View file @
f32b795e
...
...
@@ -549,6 +549,8 @@ HRESULT VLCPlugin::getVLCObject(int* i_vlc)
HRESULT
VLCPlugin
::
getVLC
(
libvlc_instance_t
**
pp_libvlc
)
{
extern
HMODULE
DllGetModule
();
if
(
!
isRunning
()
)
{
/*
...
...
@@ -568,16 +570,21 @@ HRESULT VLCPlugin::getVLC(libvlc_instance_t** pp_libvlc)
{
if
(
i_type
==
REG_SZ
)
{
strcat
(
p_data
,
"
\\
vlc"
);
ppsz_argv
[
0
]
=
p_data
;
strcat
(
p_data
,
"
\\
plugins"
);
ppsz_argv
[
ppsz_argc
++
]
=
"--plugin-path"
;
ppsz_argv
[
ppsz_argc
++
]
=
p_data
;
}
}
RegCloseKey
(
h_key
);
}
#if 0
ppsz_argv[0] = "C:\\cygwin\\home\\damienf\\vlc-trunk\\vlc";
#endif
char
p_path
[
MAX_PATH
+
1
];
DWORD
len
=
GetModuleFileNameA
(
DllGetModule
(),
p_path
,
sizeof
(
p_path
));
if
(
len
>
0
)
{
p_path
[
len
]
=
'\0'
;
ppsz_argv
[
0
]
=
p_path
;
}
// make sure plugin isn't affected with VLC single instance mode
ppsz_argv
[
ppsz_argc
++
]
=
"--no-one-instance"
;
...
...
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