RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

droptarget: fix style and refactor 

This makes the code more closely match mpv's style. Specifically, it
changes some names from camelCase to snake_case, removes some Hungarian
notation, replaces direct vtbl access with COM macros, makes use of the
SAFE_RELEASE macro, moves some declarations closer to their first use,
and fixes the brace style, as well as a few other things.

This also makes the IDropTargetVtbl static and it fixes the buggy
QueryInterface implementation.
This commit is contained in:
James Ross-Gowan 2017-03-26 00:13:51 +11:00
parent 0af8ec08f8
commit dbec486add
1 changed files with 105 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

227
video/out/win32/droptarget.c
View File

@ -25,145 +25,130 @@
#include "input/event.h" #include "input/event.h"
#include "osdep/atomic.h" #include "osdep/atomic.h"
#include "osdep/io.h" #include "osdep/io.h"
#include "osdep/windows_utils.h"
#include "mpv_talloc.h" #include "mpv_talloc.h"
#include "droptarget.h" #include "droptarget.h"
typedef struct tagDropTarget { struct droptarget {
IDropTarget iface; IDropTarget iface;
atomic_int refCnt; atomic_int ref_cnt;
DWORD lastEffect;
IDataObject* dataObj;
struct mp_log *log; struct mp_log *log;
struct input_ctx *input_ctx; struct input_ctx *input_ctx;
} DropTarget; DWORD last_effect;
IDataObject *data_obj;
};
static FORMATETC fmtetc_file = { CF_HDROP, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; static FORMATETC fmtetc_file = {
static FORMATETC fmtetc_url = { 0, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; .cfFormat = CF_HDROP,
.dwAspect = DVASPECT_CONTENT,
.lindex = -1,
.tymed = TYMED_HGLOBAL,
};
static void DropTarget_Destroy(DropTarget* This) static FORMATETC fmtetc_url = {
.dwAspect = DVASPECT_CONTENT,
.lindex = -1,
.tymed = TYMED_HGLOBAL,
};
static void DropTarget_Destroy(struct droptarget *t)
{ {
if (This->dataObj != NULL) { SAFE_RELEASE(t->data_obj);
This->dataObj->lpVtbl->Release(This->dataObj); talloc_free(t);
This->dataObj->lpVtbl = NULL; }
static STDMETHODIMP DropTarget_QueryInterface(IDropTarget *self, REFIID riid,
void **ppvObject)
{
if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDropTarget)) {
*ppvObject = self;
IDropTarget_AddRef(self);
return S_OK;
} }
talloc_free(This); *ppvObject = NULL;
return E_NOINTERFACE;
} }
static HRESULT STDMETHODCALLTYPE DropTarget_QueryInterface(IDropTarget* This, static STDMETHODIMP_(ULONG) DropTarget_AddRef(IDropTarget *self)
REFIID riid,
void** ppvObject)
{ {
if (!IsEqualGUID(riid, &IID_IUnknown) || struct droptarget *t = (struct droptarget *)self;
!IsEqualGUID(riid, &IID_IDataObject)) { return atomic_fetch_add(&t->ref_cnt, 1) + 1;
*ppvObject = NULL;
return E_NOINTERFACE;
}
*ppvObject = This;
This->lpVtbl->AddRef(This);
return S_OK;
} }
static ULONG STDMETHODCALLTYPE DropTarget_AddRef(IDropTarget* This) static STDMETHODIMP_(ULONG) DropTarget_Release(IDropTarget *self)
{ {
DropTarget* t = (DropTarget*)This; struct droptarget *t = (struct droptarget *)self;
return atomic_fetch_add(&t->refCnt, 1) + 1;
}
static ULONG STDMETHODCALLTYPE DropTarget_Release(IDropTarget* This) ULONG ref_cnt = atomic_fetch_add(&t->ref_cnt, -1) - 1;
{ if (ref_cnt == 0)
DropTarget* t = (DropTarget*)This;
ULONG cRef = atomic_fetch_add(&t->refCnt, -1) - 1;
if (cRef == 0) {
DropTarget_Destroy(t); DropTarget_Destroy(t);
} return ref_cnt;
return cRef;
} }
static HRESULT STDMETHODCALLTYPE DropTarget_DragEnter(IDropTarget* This, static STDMETHODIMP DropTarget_DragEnter(IDropTarget *self,
IDataObject* pDataObj, IDataObject *pDataObj,
DWORD grfKeyState, DWORD grfKeyState, POINTL pt,
POINTL pt, DWORD *pdwEffect)
DWORD* pdwEffect)
{ {
DropTarget* t = (DropTarget*)This; struct droptarget *t = (struct droptarget *)self;
pDataObj->lpVtbl->AddRef(pDataObj);
if (pDataObj->lpVtbl->QueryGetData(pDataObj, &fmtetc_file) != S_OK &&
pDataObj->lpVtbl->QueryGetData(pDataObj, &fmtetc_url) != S_OK) {
IDataObject_AddRef(pDataObj);
if (FAILED(IDataObject_QueryGetData(pDataObj, &fmtetc_file)) &&
FAILED(IDataObject_QueryGetData(pDataObj, &fmtetc_url)))
{
*pdwEffect = DROPEFFECT_NONE; *pdwEffect = DROPEFFECT_NONE;
} }
if (t->dataObj != NULL) { SAFE_RELEASE(t->data_obj);
t->dataObj->lpVtbl->Release(t->dataObj); t->data_obj = pDataObj;
} t->last_effect = *pdwEffect;
t->dataObj = pDataObj;
t->lastEffect = *pdwEffect;
return S_OK; return S_OK;
} }
static HRESULT STDMETHODCALLTYPE DropTarget_DragOver(IDropTarget* This, static STDMETHODIMP DropTarget_DragOver(IDropTarget *self, DWORD grfKeyState,
DWORD grfKeyState, POINTL pt, DWORD *pdwEffect)
POINTL pt,
DWORD* pdwEffect)
{ {
DropTarget* t = (DropTarget*)This; struct droptarget *t = (struct droptarget *)self;
*pdwEffect = t->lastEffect; *pdwEffect = t->last_effect;
return S_OK; return S_OK;
} }
static HRESULT STDMETHODCALLTYPE DropTarget_DragLeave(IDropTarget* This) static STDMETHODIMP DropTarget_DragLeave(IDropTarget *self)
{ {
DropTarget* t = (DropTarget*)This; struct droptarget *t = (struct droptarget *)self;
if (t->dataObj != NULL) {
t->dataObj->lpVtbl->Release(t->dataObj);
t->dataObj = NULL;
}
SAFE_RELEASE(t->data_obj);
return S_OK; return S_OK;
} }
static HRESULT STDMETHODCALLTYPE DropTarget_Drop(IDropTarget* This, static STDMETHODIMP DropTarget_Drop(IDropTarget *self, IDataObject *pDataObj,
IDataObject* pDataObj, DWORD grfKeyState, POINTL pt,
DWORD grfKeyState, POINTL pt, DWORD *pdwEffect)
DWORD* pdwEffect)
{ {
DropTarget* t = (DropTarget*)This; struct droptarget *t = (struct droptarget *)self;
STGMEDIUM medium;
if (t->dataObj != NULL) {
t->dataObj->lpVtbl->Release(t->dataObj);
t->dataObj = NULL;
}
enum mp_dnd_action action = (grfKeyState & MK_SHIFT) ? DND_APPEND : DND_REPLACE; enum mp_dnd_action action = (grfKeyState & MK_SHIFT) ? DND_APPEND : DND_REPLACE;
pDataObj->lpVtbl->AddRef(pDataObj); SAFE_RELEASE(t->data_obj);
if (pDataObj->lpVtbl->GetData(pDataObj, &fmtetc_file, &medium) == S_OK) { STGMEDIUM medium;
if (GlobalLock(medium.hGlobal) != NULL) { if (SUCCEEDED(IDataObject_GetData(pDataObj, &fmtetc_file, &medium))) {
HDROP hDrop = (HDROP)medium.hGlobal; if (GlobalLock(medium.hGlobal)) {
HDROP drop = medium.hGlobal;
UINT numFiles = DragQueryFileW(hDrop, 0xFFFFFFFF, NULL, 0); UINT files_num = DragQueryFileW(drop, 0xFFFFFFFF, NULL, 0);
char** files = talloc_zero_array(NULL, char*, numFiles); char **files = talloc_zero_array(NULL, char*, files_num);
UINT nrecvd_files = 0; UINT recvd_files = 0;
for (UINT i = 0; i < numFiles; i++) { for (UINT i = 0; i < files_num; i++) {
UINT len = DragQueryFileW(hDrop, i, NULL, 0); UINT len = DragQueryFileW(drop, i, NULL, 0);
wchar_t* buf = talloc_array(NULL, wchar_t, len + 1); wchar_t *buf = talloc_array(NULL, wchar_t, len + 1);
if (DragQueryFileW(hDrop, i, buf, len + 1) == len) { if (DragQueryFileW(drop, i, buf, len + 1) == len) {
char* fname = mp_to_utf8(files, buf); char *fname = mp_to_utf8(files, buf);
files[nrecvd_files++] = fname; files[recvd_files++] = fname;
MP_VERBOSE(t, "received dropped file: %s\n", fname); MP_VERBOSE(t, "received dropped file: %s\n", fname);
} else { } else {
@ -174,21 +159,18 @@ static HRESULT STDMETHODCALLTYPE DropTarget_Drop(IDropTarget* This,
} }
GlobalUnlock(medium.hGlobal); GlobalUnlock(medium.hGlobal);
mp_event_drop_files(t->input_ctx, nrecvd_files, files, mp_event_drop_files(t->input_ctx, recvd_files, files, action);
action);
talloc_free(files); talloc_free(files);
} }
ReleaseStgMedium(&medium); ReleaseStgMedium(&medium);
} else if (pDataObj->lpVtbl->GetData(pDataObj, } else if (SUCCEEDED(IDataObject_GetData(pDataObj, &fmtetc_url, &medium))) {
&fmtetc_url, &medium) == S_OK) { wchar_t *wurl = GlobalLock(medium.hGlobal);
// get the URL encoded in US-ASCII if (wurl) {
wchar_t* wurl = GlobalLock(medium.hGlobal);
if (wurl != NULL) {
char *url = mp_to_utf8(NULL, wurl); char *url = mp_to_utf8(NULL, wurl);
if (mp_event_drop_mime_data(t->input_ctx, "text/uri-list", if (mp_event_drop_mime_data(t->input_ctx, "text/uri-list",
bstr0(url), action) > 0) { bstr0(url), action) > 0)
{
MP_VERBOSE(t, "received dropped URL: %s\n", url); MP_VERBOSE(t, "received dropped URL: %s\n", url);
} else { } else {
MP_ERR(t, "error getting dropped URL\n"); MP_ERR(t, "error getting dropped URL\n");
@ -199,35 +181,36 @@ static HRESULT STDMETHODCALLTYPE DropTarget_Drop(IDropTarget* This,
} }
ReleaseStgMedium(&medium); ReleaseStgMedium(&medium);
} } else {
else { t->last_effect = DROPEFFECT_NONE;
t->lastEffect = DROPEFFECT_NONE;
} }
pDataObj->lpVtbl->Release(pDataObj); *pdwEffect = t->last_effect;
*pdwEffect = t->lastEffect;
return S_OK; return S_OK;
} }
static IDropTargetVtbl idroptarget_vtbl = {
.QueryInterface = DropTarget_QueryInterface,
.AddRef = DropTarget_AddRef,
.Release = DropTarget_Release,
.DragEnter = DropTarget_DragEnter,
.DragOver = DropTarget_DragOver,
.DragLeave = DropTarget_DragLeave,
.Drop = DropTarget_Drop,
};
IDropTarget *mp_w32_droptarget_create(struct mp_log *log, IDropTarget *mp_w32_droptarget_create(struct mp_log *log,
struct input_ctx *input_ctx) struct input_ctx *input_ctx)
{ {
DropTarget* dropTarget = talloc(NULL, DropTarget); fmtetc_url.cfFormat = RegisterClipboardFormatW(L"UniformResourceLocatorW");
IDropTargetVtbl* vtbl = talloc(dropTarget, IDropTargetVtbl);
*vtbl = (IDropTargetVtbl){
DropTarget_QueryInterface, DropTarget_AddRef, DropTarget_Release,
DropTarget_DragEnter, DropTarget_DragOver, DropTarget_DragLeave,
DropTarget_Drop
};
fmtetc_url.cfFormat = (CLIPFORMAT)RegisterClipboardFormat(TEXT("UniformResourceLocatorW")); struct droptarget *dt = talloc(NULL, struct droptarget);
dt->iface.lpVtbl = &idroptarget_vtbl;
atomic_store(&dt->ref_cnt, 0);
dt->last_effect = 0;
dt->data_obj = NULL;
dt->log = mp_log_new(dt, log, "droptarget");
dt->input_ctx = input_ctx;
dropTarget->iface.lpVtbl = vtbl; return &dt->iface;
atomic_store(&dropTarget->refCnt, 0);
dropTarget->lastEffect = 0;
dropTarget->dataObj = NULL;
dropTarget->log = mp_log_new(dropTarget, log, "droptarget");
dropTarget->input_ctx = input_ctx;
return &dropTarget->iface;
} }