Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
6ee1e193
Commit
6ee1e193
authored
Sep 10, 2007
by
Rafaël Carré
Browse files
Removes trailing spaces. Removes tabs.
parent
3305b049
Changes
589
Expand all
Hide whitespace changes
Inline
Side-by-side
activex/axvlc_idl.c
View file @
6ee1e193
...
...
@@ -11,8 +11,8 @@
/* Compiler settings for axvlc.idl:
Oicf, W1, Zp8, env=Win32 (32b run)
protocol : dce , ms_ext, c_ext, robust
error checks: allocation ref bounds_check enum stub_data
VC __declspec() decoration level:
error checks: allocation ref bounds_check enum stub_data
VC __declspec() decoration level:
__declspec(uuid()), __declspec(selectany), __declspec(novtable)
DECLSPEC_UUID(), MIDL_INTERFACE()
*/
...
...
@@ -26,7 +26,7 @@
#ifdef __cplusplus
extern
"C"
{
#endif
#endif
#include
<rpc.h>
...
...
activex/axvlc_idl.h
View file @
6ee1e193
This diff is collapsed.
Click to expand it.
activex/connectioncontainer.h
View file @
6ee1e193
...
...
@@ -42,7 +42,7 @@ public:
{
if
(
NULL
==
ppv
)
return
E_POINTER
;
if
(
(
IID_IUnknown
==
riid
)
if
(
(
IID_IUnknown
==
riid
)
||
(
IID_IConnectionPoint
==
riid
)
)
{
AddRef
();
...
...
@@ -100,7 +100,7 @@ public:
{
if
(
NULL
==
ppv
)
return
E_POINTER
;
if
(
(
IID_IUnknown
==
riid
)
if
(
(
IID_IUnknown
==
riid
)
||
(
IID_IConnectionPointContainer
==
riid
)
)
{
AddRef
();
...
...
activex/dataobject.cpp
View file @
6ee1e193
...
...
@@ -162,7 +162,7 @@ HRESULT VLCDataObject::getMetaFileData(LPFORMATETC pFormatEtc, LPSTGMEDIUM pMedi
if
(
NULL
==
hicTargetDev
)
return
E_FAIL
;
HDC
hdcMeta
=
CreateMetaFile
(
NULL
);
HDC
hdcMeta
=
CreateMetaFile
(
NULL
);
if
(
NULL
!=
hdcMeta
)
{
LPMETAFILEPICT
pMetaFilePict
=
(
LPMETAFILEPICT
)
CoTaskMemAlloc
(
sizeof
(
METAFILEPICT
));
...
...
@@ -202,7 +202,7 @@ HRESULT VLCDataObject::getEnhMetaFileData(LPFORMATETC pFormatEtc, LPSTGMEDIUM pM
SIZEL
size
=
_p_instance
->
getExtent
();
HDC
hdcMeta
=
CreateEnhMetaFile
(
hicTargetDev
,
NULL
,
NULL
,
NULL
);
HDC
hdcMeta
=
CreateEnhMetaFile
(
hicTargetDev
,
NULL
,
NULL
,
NULL
);
if
(
NULL
!=
hdcMeta
)
{
RECTL
wBounds
=
{
0L
,
0L
,
size
.
cx
,
size
.
cy
};
...
...
@@ -237,7 +237,7 @@ STDMETHODIMP VLCDataObject::QueryGetData(LPFORMATETC pFormatEtc)
default:
return
DV_E_FORMATETC
;
}
if
(
pFormatEtc
->
dwAspect
!=
formatEtc
->
dwAspect
)
return
DV_E_DVASPECT
;
...
...
activex/dataobject.h
View file @
6ee1e193
...
...
@@ -39,7 +39,7 @@ public:
{
if
(
NULL
==
ppv
)
return
E_POINTER
;
if
(
(
IID_IUnknown
==
riid
)
if
(
(
IID_IUnknown
==
riid
)
||
(
IID_IDataObject
==
riid
)
)
{
AddRef
();
*
ppv
=
reinterpret_cast
<
LPVOID
>
(
this
);
...
...
activex/main.cpp
View file @
6ee1e193
...
...
@@ -147,7 +147,7 @@ STDAPI DllUnregisterServer(VOID)
// remove component categories we supports
ICatRegister
*
pcr
;
if
(
SUCCEEDED
(
CoCreateInstance
(
CLSID_StdComponentCategoriesMgr
,
if
(
SUCCEEDED
(
CoCreateInstance
(
CLSID_StdComponentCategoriesMgr
,
NULL
,
CLSCTX_INPROC_SERVER
,
IID_ICatRegister
,
(
void
**
)
&
pcr
))
)
{
CATID
implCategories
[]
=
{
CATID_Control
,
...
...
@@ -314,7 +314,7 @@ STDAPI DllRegisterServer(VOID)
// indicate which component categories we support
ICatRegister
*
pcr
;
if
(
SUCCEEDED
(
CoCreateInstance
(
CLSID_StdComponentCategoriesMgr
,
if
(
SUCCEEDED
(
CoCreateInstance
(
CLSID_StdComponentCategoriesMgr
,
NULL
,
CLSCTX_INPROC_SERVER
,
IID_ICatRegister
,
(
void
**
)
&
pcr
))
)
{
CATID
implCategories
[]
=
{
CATID_Control
,
...
...
activex/objectsafety.cpp
View file @
6ee1e193
...
...
@@ -26,13 +26,13 @@
#include
"axvlc_idl.h"
#if 0
const GUID IID_IObjectSafety =
{0xCB5BDC81,0x93C1,0x11cf,{0x8F,0x20,0x00,0x80,0x5F,0x2C,0xD0,0x64}};
const GUID IID_IObjectSafety =
{0xCB5BDC81,0x93C1,0x11cf,{0x8F,0x20,0x00,0x80,0x5F,0x2C,0xD0,0x64}};
#endif
using
namespace
std
;
STDMETHODIMP
VLCObjectSafety
::
GetInterfaceSafetyOptions
(
STDMETHODIMP
VLCObjectSafety
::
GetInterfaceSafetyOptions
(
REFIID
riid
,
DWORD
*
pdwSupportedOptions
,
DWORD
*
pdwEnabledOptions
...
...
@@ -61,7 +61,7 @@ STDMETHODIMP VLCObjectSafety::GetInterfaceSafetyOptions(
return
E_NOINTERFACE
;
};
STDMETHODIMP
VLCObjectSafety
::
SetInterfaceSafetyOptions
(
STDMETHODIMP
VLCObjectSafety
::
SetInterfaceSafetyOptions
(
REFIID
riid
,
DWORD
dwOptionSetMask
,
DWORD
dwEnabledOptions
...
...
activex/objectsafety.h
View file @
6ee1e193
...
...
@@ -70,7 +70,7 @@ public:
if
(
NULL
==
ppv
)
return
E_POINTER
;
if
(
(
IID_IUnknown
==
riid
)
||
(
IID_IObjectSafety
==
riid
)
)
||
(
IID_IObjectSafety
==
riid
)
)
{
AddRef
();
*
ppv
=
reinterpret_cast
<
LPVOID
>
(
this
);
...
...
activex/olecontrol.h
View file @
6ee1e193
...
...
@@ -39,7 +39,7 @@ public:
if
(
NULL
==
ppv
)
return
E_POINTER
;
if
(
(
IID_IUnknown
==
riid
)
||
(
IID_IOleControl
==
riid
)
)
||
(
IID_IOleControl
==
riid
)
)
{
AddRef
();
*
ppv
=
reinterpret_cast
<
LPVOID
>
(
this
);
...
...
activex/oleinplaceactiveobject.h
View file @
6ee1e193
...
...
@@ -38,8 +38,8 @@ public:
{
if
(
NULL
==
ppv
)
return
E_POINTER
;
if
(
(
IID_IUnknown
==
riid
)
||
(
IID_IOleWindow
==
riid
)
if
(
(
IID_IUnknown
==
riid
)
||
(
IID_IOleWindow
==
riid
)
||
(
IID_IOleInPlaceActiveObject
==
riid
)
)
{
AddRef
();
...
...
activex/oleinplaceobject.cpp
View file @
6ee1e193
...
...
@@ -55,7 +55,7 @@ STDMETHODIMP VLCOleInPlaceObject::InPlaceDeactivate(void)
_p_instance
->
onInPlaceDeactivate
();
LPOLEOBJECT
p_oleObject
;
if
(
SUCCEEDED
(
QueryInterface
(
IID_IOleObject
,
(
void
**
)
&
p_oleObject
))
)
if
(
SUCCEEDED
(
QueryInterface
(
IID_IOleObject
,
(
void
**
)
&
p_oleObject
))
)
{
LPOLECLIENTSITE
p_clientSite
;
if
(
SUCCEEDED
(
p_oleObject
->
GetClientSite
(
&
p_clientSite
))
)
...
...
@@ -84,7 +84,7 @@ STDMETHODIMP VLCOleInPlaceObject::UIDeactivate(void)
_p_instance
->
setFocus
(
FALSE
);
LPOLEOBJECT
p_oleObject
;
if
(
SUCCEEDED
(
QueryInterface
(
IID_IOleObject
,
(
void
**
)
&
p_oleObject
))
)
if
(
SUCCEEDED
(
QueryInterface
(
IID_IOleObject
,
(
void
**
)
&
p_oleObject
))
)
{
LPOLECLIENTSITE
p_clientSite
;
if
(
SUCCEEDED
(
p_oleObject
->
GetClientSite
(
&
p_clientSite
))
)
...
...
activex/oleobject.cpp
View file @
6ee1e193
...
...
@@ -157,7 +157,7 @@ HRESULT VLCOleObject::doInPlaceActivate(LPMSG lpMsg, LPOLECLIENTSITE pActiveSite
if
(
!
_p_instance
->
isInPlaceActive
()
)
{
if
(
((
NULL
==
p_inPlaceSite
)
||
(
S_OK
==
p_inPlaceSite
->
CanInPlaceActivate
()))
&&
SUCCEEDED
(
_p_instance
->
onActivateInPlace
(
lpMsg
,
hwndParent
,
lprcPosRect
,
lprcClipRect
))
)
&&
SUCCEEDED
(
_p_instance
->
onActivateInPlace
(
lpMsg
,
hwndParent
,
lprcPosRect
,
lprcClipRect
))
)
{
if
(
p_inPlaceSiteEx
)
{
...
...
@@ -180,7 +180,7 @@ HRESULT VLCOleObject::doInPlaceActivate(LPMSG lpMsg, LPOLECLIENTSITE pActiveSite
p_inPlaceUIWindow
->
Release
();
}
return
OLEOBJ_S_CANNOT_DOVERB_NOW
;
}
}
}
if
(
p_inPlaceSite
)
...
...
@@ -190,7 +190,7 @@ HRESULT VLCOleObject::doInPlaceActivate(LPMSG lpMsg, LPOLECLIENTSITE pActiveSite
{
if
(
(
NULL
==
p_inPlaceSiteEx
)
||
(
S_OK
==
p_inPlaceSiteEx
->
RequestUIActivate
())
)
{
if
(
p_inPlaceSite
)
if
(
p_inPlaceSite
)
{
p_inPlaceSite
->
OnUIActivate
();
...
...
@@ -244,7 +244,7 @@ STDMETHODIMP VLCOleObject::GetClientSite(LPOLECLIENTSITE *ppClientSite)
return
E_POINTER
;
if
(
NULL
!=
_p_clientsite
)
_p_clientsite
->
AddRef
();
_p_clientsite
->
AddRef
();
*
ppClientSite
=
_p_clientsite
;
return
S_OK
;
...
...
@@ -304,7 +304,7 @@ STDMETHODIMP VLCOleObject::GetUserClassID(LPCLSID pClsid)
if
(
NULL
==
pClsid
)
return
E_POINTER
;
*
pClsid
=
_p_instance
->
getClassID
();
*
pClsid
=
_p_instance
->
getClassID
();
return
S_OK
;
};
...
...
@@ -363,7 +363,7 @@ STDMETHODIMP VLCOleObject::SetExtent(DWORD dwDrawAspect, SIZEL *pSizel)
if
(
SUCCEEDED
(
p_inPlaceSite
->
GetWindow
(
&
hwnd
))
)
{
// use HIMETRIC to pixel transform
// use HIMETRIC to pixel transform
RECT
posRect
=
_p_instance
->
getPosRect
();
HDC
hDC
=
GetDC
(
hwnd
);
posRect
.
right
=
(
pSizel
->
cx
*
GetDeviceCaps
(
hDC
,
LOGPIXELSX
)
/
2540L
)
+
posRect
.
left
;
...
...
activex/persistpropbag.h
View file @
6ee1e193
...
...
@@ -39,7 +39,7 @@ public:
if
(
NULL
==
ppv
)
return
E_POINTER
;
if
(
(
IID_IUnknown
==
riid
)
||
(
IID_IPersist
==
riid
)
||
(
IID_IPersist
==
riid
)
||
(
IID_IPersistPropertyBag
==
riid
)
)
{
AddRef
();
...
...
activex/persiststorage.h
View file @
6ee1e193
...
...
@@ -39,7 +39,7 @@ public:
if
(
NULL
==
ppv
)
return
E_POINTER
;
if
(
(
IID_IUnknown
==
riid
)
||
(
IID_IPersist
==
riid
)
||
(
IID_IPersist
==
riid
)
||
(
IID_IPersistStorage
==
riid
)
)
{
AddRef
();
...
...
activex/persiststreaminit.cpp
View file @
6ee1e193
...
...
@@ -31,7 +31,7 @@
using
namespace
std
;
class
AxVLCVariant
class
AxVLCVariant
{
public:
...
...
@@ -95,7 +95,7 @@ private:
VARIANTARG
_v
;
};
class
AxVLCWSTR
class
AxVLCWSTR
{
public:
...
...
@@ -211,7 +211,7 @@ public:
{
if
(
NULL
==
ppv
)
return
E_POINTER
;
if
(
(
IID_IUnknown
==
riid
)
if
(
(
IID_IUnknown
==
riid
)
||
(
IID_IPropertyBag
==
riid
)
)
{
AddRef
();
...
...
@@ -262,7 +262,7 @@ public:
else
return
E_INVALIDARG
;
};
STDMETHODIMP
Write
(
LPCOLESTR
pszPropName
,
VARIANT
*
pVar
)
{
if
(
(
NULL
==
pszPropName
)
||
(
NULL
==
pVar
)
)
...
...
@@ -389,7 +389,7 @@ private:
if
(
FAILED
(
result
)
)
return
result
;
if
(
len
>
0
)
{
{
result
=
pStm
->
Write
(
V_BSTR
(
propValue
),
len
*
sizeof
(
OLECHAR
),
NULL
);
if
(
FAILED
(
result
)
)
return
result
;
...
...
activex/persiststreaminit.h
View file @
6ee1e193
...
...
@@ -39,7 +39,7 @@ public:
if
(
NULL
==
ppv
)
return
E_POINTER
;
if
(
(
IID_IUnknown
==
riid
)
||
(
IID_IPersist
==
riid
)
||
(
IID_IPersist
==
riid
)
||
(
IID_IPersistStreamInit
==
riid
)
)
{
AddRef
();
...
...
activex/plugin.cpp
View file @
6ee1e193
...
...
@@ -192,7 +192,7 @@ STDMETHODIMP VLCPluginClass::LockServer(BOOL fLock)
{
if
(
fLock
)
AddRef
();
else
else
Release
();
return
S_OK
;
...
...
@@ -370,7 +370,7 @@ HRESULT VLCPlugin::onLoad(void)
{
/*
** try to retreive the base URL using the client site moniker, which for Internet Explorer
** is the URL of the page the plugin is embedded into.
** is the URL of the page the plugin is embedded into.
*/
LPOLECLIENTSITE
pClientSite
;
if
(
SUCCEEDED
(
vlcOleObject
->
GetClientSite
(
&
pClientSite
))
&&
(
NULL
!=
pClientSite
)
)
...
...
@@ -651,7 +651,7 @@ HRESULT VLCPlugin::onClose(DWORD dwSaveOption)
libvlc_instance_t
*
p_libvlc
=
_p_libvlc
;
IVLCLog
*
p_log
;
if
(
SUCCEEDED
(
vlcControl2
->
get_log
(
&
p_log
))
)
if
(
SUCCEEDED
(
vlcControl2
->
get_log
(
&
p_log
))
)
{
// make sure the log is disabled
p_log
->
put_verbosity
(
-
1
);
...
...
@@ -677,7 +677,7 @@ HRESULT VLCPlugin::onActivateInPlace(LPMSG lpMesg, HWND hwndParent, LPCRECT lprc
/*
** record keeping of control geometry within container
*/
*/
_posRect
=
*
lprcPosRect
;
/*
...
...
@@ -901,7 +901,7 @@ void VLCPlugin::onDraw(DVTARGETDEVICE * ptd, HDC hicTargetDev,
pict
->
Render
(
hdcDraw
,
dstX
,
dstY
,
picSize
.
cx
,
picSize
.
cy
,
0L
,
picHeight
,
picWidth
,
-
picHeight
,
&
wBounds
);
}
else
else
pict
->
Render
(
hdcDraw
,
dstX
,
dstY
,
picSize
.
cx
,
picSize
.
cy
,
0L
,
picHeight
,
picWidth
,
-
picHeight
,
NULL
);
...
...
@@ -1009,23 +1009,23 @@ void VLCPlugin::freezeEvents(BOOL freeze)
void
VLCPlugin
::
firePropChangedEvent
(
DISPID
dispid
)
{
vlcConnectionPointContainer
->
firePropChangedEvent
(
dispid
);
vlcConnectionPointContainer
->
firePropChangedEvent
(
dispid
);
};
void
VLCPlugin
::
fireOnPlayEvent
(
void
)
{
DISPPARAMS
dispparamsNoArgs
=
{
NULL
,
NULL
,
0
,
0
};
vlcConnectionPointContainer
->
fireEvent
(
DISPID_PlayEvent
,
&
dispparamsNoArgs
);
vlcConnectionPointContainer
->
fireEvent
(
DISPID_PlayEvent
,
&
dispparamsNoArgs
);
};
void
VLCPlugin
::
fireOnPauseEvent
(
void
)
{
DISPPARAMS
dispparamsNoArgs
=
{
NULL
,
NULL
,
0
,
0
};
vlcConnectionPointContainer
->
fireEvent
(
DISPID_PauseEvent
,
&
dispparamsNoArgs
);
vlcConnectionPointContainer
->
fireEvent
(
DISPID_PauseEvent
,
&
dispparamsNoArgs
);
};
void
VLCPlugin
::
fireOnStopEvent
(
void
)
{
DISPPARAMS
dispparamsNoArgs
=
{
NULL
,
NULL
,
0
,
0
};
vlcConnectionPointContainer
->
fireEvent
(
DISPID_StopEvent
,
&
dispparamsNoArgs
);
vlcConnectionPointContainer
->
fireEvent
(
DISPID_StopEvent
,
&
dispparamsNoArgs
);
};
activex/plugin.h
View file @
6ee1e193
...
...
@@ -28,10 +28,10 @@
#include
<vlc/libvlc.h>
extern
const
GUID
CLSID_VLCPlugin
;
extern
const
GUID
CLSID_VLCPlugin2
;
extern
const
GUID
LIBID_AXVLC
;
extern
const
GUID
DIID_DVLCEvents
;
extern
const
GUID
CLSID_VLCPlugin
;
extern
const
GUID
CLSID_VLCPlugin2
;
extern
const
GUID
LIBID_AXVLC
;
extern
const
GUID
DIID_DVLCEvents
;
class
VLCPluginClass
:
public
IClassFactory
{
...
...
@@ -104,7 +104,7 @@ public:
};
inline
BOOL
getAutoPlay
(
void
)
{
return
_b_autoplay
;
};
inline
void
setAutoLoop
(
BOOL
autoloop
)
inline
void
setAutoLoop
(
BOOL
autoloop
)
{
_b_autoloop
=
autoloop
;
setDirty
(
TRUE
);
...
...
@@ -147,7 +147,7 @@ public:
};
const
SIZEL
&
getExtent
(
void
)
{
return
_extent
;
};
// transient properties
// transient properties
inline
void
setMute
(
BOOL
mute
)
{
_b_mute
=
mute
;
};
inline
void
setPicture
(
LPPICTURE
pict
)
...
...
@@ -191,7 +191,7 @@ public:
void
setErrorInfo
(
REFIID
riid
,
const
char
*
description
);
// control geometry within container
RECT
getPosRect
(
void
)
{
return
_posRect
;
};
RECT
getPosRect
(
void
)
{
return
_posRect
;
};
inline
HWND
getInPlaceWindow
(
void
)
const
{
return
_inplacewnd
;
};
BOOL
isInPlaceActive
(
void
);
...
...
activex/provideclassinfo.h
View file @
6ee1e193
...
...
@@ -39,7 +39,7 @@ public:
if
(
NULL
==
ppv
)
return
E_POINTER
;
if
(
(
IID_IUnknown
==
riid
)
||
(
IID_IProvideClassInfo
==
riid
)
||
(
IID_IProvideClassInfo
==
riid
)
||
(
IID_IProvideClassInfo2
==
riid
)
)
{
AddRef
();
...
...
activex/utils.cpp
View file @
6ee1e193
...
...
@@ -273,7 +273,7 @@ relativeurl:
return
href
;
}
/* find last path component and replace it */
/* find last path component and replace it */
while
(
L'/'
!=
*
pathend
)
--
pathend
;
...
...
@@ -300,7 +300,7 @@ relativeurl:
url
=
++
p
;
continue
;
}
if
(
L'.'
!=
*
p
)
if
(
L'.'
!=
*
p
)
break
;
++
p
;
if
(
L'\0'
==
*
p
)
...
...
@@ -309,7 +309,7 @@ relativeurl:
}
else
{
if
(
L'/'
!=
*
p
)
if
(
L'/'
!=
*
p
)
break
;
/* relative url starts with '../' */
++
p
;
...
...
Prev
1
2
3
4
5
…
30
Next
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment