January 2020 - Wine-devel - list.winehq.org

[PATCH] testbot/UpdateTaskLogs: Fix reporting log access errors.
by Francois Gouget 22 Jan '20

22 Jan '20

Use the error message returned by ParseWineTestReport() when it could not open the report instead of recreating it from scratch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is the same fix as the previous WineRun* patch. But I had already copy/pasted the bad code apparently :-( testbot/bin/UpdateTaskLogs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index ae3b305388..ca9bf44a37 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -193,7 +193,7 @@ sub BuildErrFile($$$$) my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$Dir/$ReportName", $IsWineTest, $TaskTimedOut); if (!defined $LogFailures and @$LogErrors == 1) { - return "Unable to open '$TaskKey/$ReportName' for reading: $!"; + return "$TaskKey: $LogErrors->[0]"; } return undef if (!@$LogErrors); -- 2.20.1

1 0

[PATCH 1/2] ole32: Fix bind speed used in BindToObject() of item moniker.
by Nikolay Sivov 22 Jan '20

22 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/itemmoniker.c | 32 +++++++++++++++++++++----------- dlls/ole32/tests/moniker.c | 3 --- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index bd6fd6fd87..c37d7a87c5 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -329,6 +329,18 @@ static HRESULT WINAPI ItemMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER return S_OK; } +static DWORD get_bind_speed_from_bindctx(IBindCtx *pbc) +{ + DWORD bind_speed = BINDSPEED_INDEFINITE; + BIND_OPTS bind_opts; + + bind_opts.cbStruct = sizeof(bind_opts); + if (SUCCEEDED(IBindCtx_GetBindOptions(pbc, &bind_opts)) && bind_opts.dwTickCountDeadline) + bind_speed = bind_opts.dwTickCountDeadline < 2500 ? BINDSPEED_IMMEDIATE : BINDSPEED_MODERATE; + + return bind_speed; +} + /****************************************************************************** * ItemMoniker_BindToObject ******************************************************************************/ @@ -339,9 +351,8 @@ static HRESULT WINAPI ItemMonikerImpl_BindToObject(IMoniker* iface, VOID** ppvResult) { ItemMonikerImpl *This = impl_from_IMoniker(iface); - HRESULT res; - IID refid=IID_IOleItemContainer; - IOleItemContainer *poic=0; + IOleItemContainer *container; + HRESULT hr; TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); @@ -353,16 +364,15 @@ static HRESULT WINAPI ItemMonikerImpl_BindToObject(IMoniker* iface, *ppvResult=0; - res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&refid,(void**)&poic); - - if (SUCCEEDED(res)){ - - res=IOleItemContainer_GetObject(poic,This->itemName,BINDSPEED_MODERATE,pbc,riid,ppvResult); - - IOleItemContainer_Release(poic); + hr = IMoniker_BindToObject(pmkToLeft, pbc, NULL, &IID_IOleItemContainer, (void **)&container); + if (SUCCEEDED(hr)) + { + hr = IOleItemContainer_GetObject(container, This->itemName, get_bind_speed_from_bindctx(pbc), pbc, + riid, ppvResult); + IOleItemContainer_Release(container); } - return res; + return hr; } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 9a61be4f47..bbd964e723 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2105,7 +2105,6 @@ todo_wine container_moniker = create_test_moniker(); hr = IMoniker_BindToObject(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_INDEFINITE), "Unexpected hr %#x.\n", hr); bind_opts.cbStruct = sizeof(bind_opts); @@ -2116,14 +2115,12 @@ todo_wine hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); bind_opts.dwTickCountDeadline = 2499; hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); bind_opts.dwTickCountDeadline = 2500; -- 2.24.1

1 1

[PATCH 1/5] quartz: Simplify FilterGraph2_AddFilter().
by Zebediah Figura 22 Jan '20

22 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 94 +++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 49 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 1ed41bdcec..1ef9c6e3af 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -184,7 +184,9 @@ typedef struct _IFilterGraphImpl { LONG ref; IUnknown *punkFilterMapper2; struct list filters; - LONG nameIndex; + + unsigned int name_index; + IReferenceClock *refClock; IBaseFilter *refClockProvider; EventsQueue evqueue; @@ -554,74 +556,68 @@ static IBaseFilter *find_filter_by_name(IFilterGraphImpl *graph, const WCHAR *na } /*** IFilterGraph methods ***/ -static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter *pFilter, - LPCWSTR pName) +static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, + IBaseFilter *filter, const WCHAR *name) { - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); + BOOL duplicate_name = FALSE; struct filter *entry; + unsigned int i; HRESULT hr; - int j; - WCHAR* wszFilterName = NULL; - BOOL duplicate_name = FALSE; - TRACE("(%p/%p)->(%p, %s (%p))\n", This, iface, pFilter, debugstr_w(pName), pName); + TRACE("graph %p, filter %p, name %s.\n", graph, filter, debugstr_w(name)); - if (!pFilter) + if (!filter) return E_POINTER; - wszFilterName = CoTaskMemAlloc( (pName ? lstrlenW(pName) + 6 : 5) * sizeof(WCHAR) ); + if (!(entry = heap_alloc(sizeof(*entry)))) + return E_OUTOFMEMORY; - if (pName && find_filter_by_name(This, pName)) + if (!(entry->name = CoTaskMemAlloc((name ? wcslen(name) + 6 : 5) * sizeof(WCHAR)))) + { + heap_free(entry); + return E_OUTOFMEMORY; + } + + if (name && find_filter_by_name(graph, name)) duplicate_name = TRUE; - /* If no name given or name already existing, generate one */ - if (!pName || duplicate_name) + if (!name || duplicate_name) { - static const WCHAR wszFmt1[] = {'%','s',' ','%','0','4','d',0}; - static const WCHAR wszFmt2[] = {'%','0','4','d',0}; - - for (j = 0; j < 10000 ; j++) - { - /* Create name */ - if (pName) - swprintf(wszFilterName, pName ? lstrlenW(pName) + 6 : 5, wszFmt1, pName, This->nameIndex); - else - swprintf(wszFilterName, pName ? lstrlenW(pName) + 6 : 5, wszFmt2, This->nameIndex); - TRACE("Generated name %s\n", debugstr_w(wszFilterName)); + for (i = 0; i < 10000 ; ++i) + { + if (name) + swprintf(entry->name, name ? wcslen(name) + 6 : 5, L"%s %04u", name, graph->name_index); + else + swprintf(entry->name, name ? wcslen(name) + 6 : 5, L"%04u", graph->name_index); - if (This->nameIndex++ == 10000) - This->nameIndex = 1; + graph->name_index = (graph->name_index + 1) % 10000; - if (!find_filter_by_name(This, wszFilterName)) + if (!find_filter_by_name(graph, entry->name)) break; - } - /* Unable to find a suitable name */ - if (j == 10000) - { - CoTaskMemFree(wszFilterName); - return VFW_E_DUPLICATE_NAME; - } + } + + if (i == 10000) + { + CoTaskMemFree(entry->name); + heap_free(entry); + return VFW_E_DUPLICATE_NAME; + } } else - memcpy(wszFilterName, pName, (lstrlenW(pName) + 1) * sizeof(WCHAR)); + wcscpy(entry->name, name); - hr = IBaseFilter_JoinFilterGraph(pFilter, (IFilterGraph *)&This->IFilterGraph2_iface, wszFilterName); - if (FAILED(hr)) + if (FAILED(hr = IBaseFilter_JoinFilterGraph(filter, + (IFilterGraph *)&graph->IFilterGraph2_iface, entry->name))) { - CoTaskMemFree(wszFilterName); + CoTaskMemFree(entry->name); + heap_free(entry); return hr; } - if (!(entry = heap_alloc(sizeof(*entry)))) - { - CoTaskMemFree(wszFilterName); - return E_OUTOFMEMORY; - } - - IBaseFilter_AddRef(entry->filter = pFilter); - entry->name = wszFilterName; - list_add_head(&This->filters, &entry->entry); - This->version++; + IBaseFilter_AddRef(entry->filter = filter); + list_add_head(&graph->filters, &entry->entry); + ++graph->version; return duplicate_name ? VFW_S_DUPLICATE_NAME : hr; } @@ -5706,7 +5702,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, void **out, BOOL thre fimpl->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; fimpl->ref = 1; list_init(&fimpl->filters); - fimpl->nameIndex = 1; + fimpl->name_index = 1; fimpl->refClock = NULL; fimpl->hEventCompletion = CreateEventW(0, TRUE, FALSE, 0); fimpl->HandleEcComplete = TRUE; -- 2.25.0

1 4

[PATCH 4/4] include: Add XACT defines
by Alistair Leslie-Hughes 21 Jan '20

21 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xact3.idl | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/include/xact3.idl b/include/xact3.idl index a77afff6d4..cfa9e00fdc 100644 --- a/include/xact3.idl +++ b/include/xact3.idl @@ -19,6 +19,9 @@ import "unknwn.idl"; import "xaudio2.idl"; +cpp_quote("#include <limits.h>") +cpp_quote("#include <float.h>") + [ uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) ] @@ -313,6 +316,40 @@ cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKPREPARED = 17;") cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT = 18;") +cpp_quote("static const XACTTIME XACTTIME_MIN = INT_MIN;") +cpp_quote("static const XACTTIME XACTTIME_MAX = INT_MAX;") +cpp_quote("static const XACTTIME XACTTIME_INFINITE = INT_MAX;") +cpp_quote("static const XACTINSTANCELIMIT XACTINSTANCELIMIT_INFINITE = 0xff;") +cpp_quote("static const XACTINSTANCELIMIT XACTINSTANCELIMIT_MIN = 0x00;") +cpp_quote("static const XACTINSTANCELIMIT XACTINSTANCELIMIT_MAX = 0xfe;") +cpp_quote("static const XACTINDEX XACTINDEX_MIN = 0x00;") +cpp_quote("static const XACTINDEX XACTINDEX_MAX = 0xfffe;") +cpp_quote("static const XACTINDEX XACTINDEX_INVALID = 0xffff;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_MIN = 0x00;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_MAX = 0xff;") +cpp_quote("static const XACTVARIABLEVALUE XACTVARIABLEVALUE_MIN = -FLT_MAX;") +cpp_quote("static const XACTVARIABLEVALUE XACTVARIABLEVALUE_MAX = FLT_MAX;") +cpp_quote("static const XACTVARIABLEINDEX XACTVARIABLEINDEX_MIN = 0x0000;") +cpp_quote("static const XACTVARIABLEINDEX XACTVARIABLEINDEX_MAX = 0xfffe;") +cpp_quote("static const XACTVARIABLEINDEX XACTVARIABLEINDEX_INVALID = 0xffff;") +cpp_quote("static const XACTCATEGORY XACTCATEGORY_MIN = 0x0;") +cpp_quote("static const XACTCATEGORY XACTCATEGORY_MAX = 0xfffe;") +cpp_quote("static const XACTCATEGORY XACTCATEGORY_INVALID = 0xffff;") +cpp_quote("static const XACTCHANNEL XACTCHANNEL_MIN = 0;") +cpp_quote("static const XACTCHANNEL XACTCHANNEL_MAX = 0xff;") +cpp_quote("static const XACTPITCH XACTPITCH_MIN = -1200;") +cpp_quote("static const XACTPITCH XACTPITCH_MAX = 1200;") +cpp_quote("static const XACTPITCH XACTPITCH_MIN_TOTAL = -2400;") +cpp_quote("static const XACTPITCH XACTPITCH_MAX_TOTAL = 2400;") +cpp_quote("static const XACTVOLUME XACTVOLUME_MIN = 0.0f;") +cpp_quote("static const XACTVOLUME XACTVOLUME_MAX = 16777216.0f;") +cpp_quote("static const XACTVARIABLEVALUE XACTPARAMETERVALUE_MIN = -FLT_MAX;") +cpp_quote("static const XACTVARIABLEVALUE XACTPARAMETERVALUE_MAX = FLT_MAX;") +cpp_quote("static const XACTLOOPCOUNT XACTLOOPCOUNT_MIN = 0x00;") +cpp_quote("static const XACTLOOPCOUNT XACTLOOPCOUNT_MAX = 0xfe;") +cpp_quote("static const XACTLOOPCOUNT XACTLOOPCOUNT_INFINITE = 0xff;") +cpp_quote("static const DWORD XACTWAVEALIGNMENT_MIN = 2048;") + [ object, uuid(b1ee676a-d9cd-4d2a-89a8-fa53eb9e480b), -- 2.24.1

1 0

[PATCH 3/4] include: Add XACTENGINE_* error codes
by Alistair Leslie-Hughes 21 Jan '20

21 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xact3.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/include/xact3.idl b/include/xact3.idl index 7743d131f6..a77afff6d4 100644 --- a/include/xact3.idl +++ b/include/xact3.idl @@ -572,3 +572,49 @@ interface IXACT3Wave HRESULT GetProperties([out] XACT_WAVE_INSTANCE_PROPERTIES *pProperties); } + +cpp_quote("#define FACILITY_XACTENGINE 0xAC7") +cpp_quote("#define XACTENGINEERROR(n) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_XACTENGINE, n)") + +cpp_quote("#define XACTENGINE_E_OUTOFMEMORY E_OUTOFMEMORY") +cpp_quote("#define XACTENGINE_E_INVALIDARG E_INVALIDARG") +cpp_quote("#define XACTENGINE_E_NOTIMPL E_NOTIMPL") +cpp_quote("#define XACTENGINE_E_FAIL E_FAIL") + +cpp_quote("#define XACTENGINE_E_ALREADYINITIALIZED XACTENGINEERROR(0x001)") +cpp_quote("#define XACTENGINE_E_NOTINITIALIZED XACTENGINEERROR(0x002)") +cpp_quote("#define XACTENGINE_E_EXPIRED XACTENGINEERROR(0x003)") +cpp_quote("#define XACTENGINE_E_NONOTIFICATIONCALLBACK XACTENGINEERROR(0x004)") +cpp_quote("#define XACTENGINE_E_NOTIFICATIONREGISTERED XACTENGINEERROR(0x005)") +cpp_quote("#define XACTENGINE_E_INVALIDUSAGE XACTENGINEERROR(0x006)") +cpp_quote("#define XACTENGINE_E_INVALIDDATA XACTENGINEERROR(0x007)") +cpp_quote("#define XACTENGINE_E_INSTANCELIMITFAILTOPLAY XACTENGINEERROR(0x008)") +cpp_quote("#define XACTENGINE_E_NOGLOBALSETTINGS XACTENGINEERROR(0x009)") +cpp_quote("#define XACTENGINE_E_INVALIDVARIABLEINDEX XACTENGINEERROR(0x00a)") +cpp_quote("#define XACTENGINE_E_INVALIDCATEGORY XACTENGINEERROR(0x00b)") +cpp_quote("#define XACTENGINE_E_INVALIDCUEINDEX XACTENGINEERROR(0x00c)") +cpp_quote("#define XACTENGINE_E_INVALIDWAVEINDEX XACTENGINEERROR(0x00d)") +cpp_quote("#define XACTENGINE_E_INVALIDTRACKINDEX XACTENGINEERROR(0x00e)") +cpp_quote("#define XACTENGINE_E_INVALIDSOUNDOFFSETORINDEX XACTENGINEERROR(0x00f)") +cpp_quote("#define XACTENGINE_E_READFILE XACTENGINEERROR(0x010)") +cpp_quote("#define XACTENGINE_E_UNKNOWNEVENT XACTENGINEERROR(0x011)") +cpp_quote("#define XACTENGINE_E_INCALLBACK XACTENGINEERROR(0x012)") +cpp_quote("#define XACTENGINE_E_NOWAVEBANK XACTENGINEERROR(0x013)") +cpp_quote("#define XACTENGINE_E_SELECTVARIATION XACTENGINEERROR(0x014)") +cpp_quote("#define XACTENGINE_E_MULTIPLEAUDITIONENGINES XACTENGINEERROR(0x015)") +cpp_quote("#define XACTENGINE_E_WAVEBANKNOTPREPARED XACTENGINEERROR(0x016)") +cpp_quote("#define XACTENGINE_E_NORENDERER XACTENGINEERROR(0x017)") +cpp_quote("#define XACTENGINE_E_INVALIDENTRYCOUNT XACTENGINEERROR(0x018)") +cpp_quote("#define XACTENGINE_E_SEEKTIMEBEYONDCUEEND XACTENGINEERROR(0x019)") +cpp_quote("#define XACTENGINE_E_SEEKTIMEBEYONDWAVEEND XACTENGINEERROR(0x01a)") +cpp_quote("#define XACTENGINE_E_NOFRIENDLYNAMES XACTENGINEERROR(0x01b)") + +cpp_quote("#define XACTENGINE_E_AUDITION_WRITEFILE XACTENGINEERROR(0x101)") +cpp_quote("#define XACTENGINE_E_AUDITION_NOSOUNDBANK XACTENGINEERROR(0x102)") +cpp_quote("#define XACTENGINE_E_AUDITION_INVALIDRPCINDEX XACTENGINEERROR(0x103)") +cpp_quote("#define XACTENGINE_E_AUDITION_MISSINGDATA XACTENGINEERROR(0x104)") +cpp_quote("#define XACTENGINE_E_AUDITION_UNKNOWNCOMMAND XACTENGINEERROR(0x105)") +cpp_quote("#define XACTENGINE_E_AUDITION_INVALIDDSPINDEX XACTENGINEERROR(0x106)") +cpp_quote("#define XACTENGINE_E_AUDITION_MISSINGWAVE XACTENGINEERROR(0x107)") +cpp_quote("#define XACTENGINE_E_AUDITION_CREATEDIRECTORYFAILED XACTENGINEERROR(0x108)") +cpp_quote("#define XACTENGINE_E_AUDITION_INVALIDSESSION XACTENGINEERROR(0x109)") -- 2.24.1

1 0

[PATCH 2/4] include: Add XACTNOTIFICATIONTYPE_* values
by Alistair Leslie-Hughes 21 Jan '20

21 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xact3.idl | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/include/xact3.idl b/include/xact3.idl index eaab56203c..7743d131f6 100644 --- a/include/xact3.idl +++ b/include/xact3.idl @@ -294,10 +294,24 @@ struct XACT_NOTIFICATION cpp_quote("#include <poppack.h>") -static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEDESTROYED = 4; -static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED = 6; -static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED = 7; -static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED = 16; +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEPREPARED = 1;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEPLAY = 2;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUESTOP = 3;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEDESTROYED = 4;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_MARKER = 5;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED = 6;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED = 7;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_LOCALVARIABLECHANGED = 8;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_GLOBALVARIABLECHANGED = 9;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_GUICONNECTED = 10;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_GUIDISCONNECTED = 11;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEPREPARED = 12;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEPLAY = 13;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVESTOP = 14;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVELOOPED = 15;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED = 16;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKPREPARED = 17;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT = 18;") [ object, -- 2.24.1

1 0

[PATCH] include: Add enum DBPROPFLAGSENUM
by Alistair Leslie-Hughes 21 Jan '20

21 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbs.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index d04aa09ff1..65fd5b1d36 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -95,6 +95,24 @@ typedef struct tagDBPROPSET { typedef DWORD DBPROPFLAGS; +enum DBPROPFLAGSENUM +{ + DBPROPFLAGS_NOTSUPPORTED = 0x0000, + DBPROPFLAGS_COLUMN = 0x0001, + DBPROPFLAGS_DATASOURCE = 0x0002, + DBPROPFLAGS_DATASOURCECREATE = 0x0004, + DBPROPFLAGS_DATASOURCEINFO = 0x0008, + DBPROPFLAGS_DBINIT = 0x0010, + DBPROPFLAGS_INDEX = 0x0020, + DBPROPFLAGS_ROWSET = 0x0040, + DBPROPFLAGS_TABLE = 0x0080, + DBPROPFLAGS_COLUMNOK = 0x0100, + DBPROPFLAGS_READ = 0x0200, + DBPROPFLAGS_WRITE = 0x0400, + DBPROPFLAGS_REQUIRED = 0x0800, + DBPROPFLAGS_SESSION = 0x1000, +}; + typedef struct tagDBPROPINFO { LPOLESTR pwszDescription; DBPROPID dwPropertyID; -- 2.24.1

1 0

[PATCH] include: Add remaining DBPROPSET_* GUID's.
by Alistair Leslie-Hughes 21 Jan '20

21 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbs.idl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/dbs.idl b/include/dbs.idl index 53cadedf65..d04aa09ff1 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -482,12 +482,26 @@ cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN") cpp_quote("#endif") cpp_quote("DEFINE_DBGUID(DB_NULLGUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);") -cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_STREAM, 0xc8b522f9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_COLUMN, 0xc8b522b9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCE, 0xc8b522ba, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_INDEX, 0xc8b522bd, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_TABLE, 0xc8b522bf, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCEALL, 0xc8b522c0, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCEINFOALL, 0xc8b522c1, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_ROWSETALL, 0xc8b522c2, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_SESSION, 0xc8b522c6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_SESSIONALL, 0xc8b522c7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") + cpp_quote("#define DBPROMPT_PROMPT 0x01") cpp_quote("#define DBPROMPT_COMPLETE 0x02") cpp_quote("#define DBPROMPT_COMPLETEREQUIRED 0x03") -- 2.24.1

1 0

[PATCH] include: Add _Inout_updates_bytes_opt_ define
by Alistair Leslie-Hughes 21 Jan '20

21 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index 823361af17..81a828dd97 100644 --- a/include/sal.h +++ b/include/sal.h @@ -97,6 +97,7 @@ #define _Inout_updates_(count) #define _Inout_updates_bytes_(count) #define _Inout_updates_bytes_all_opt_(count) +#define _Inout_updates_bytes_opt_(count) #define _Inout_updates_opt_(count) #define _Inout_updates_z_(count) #define _Inout_updates_opt_z_(count) -- 2.24.1

1 0

[PATCH] include: Add directmanipulation.idl
by Alistair Leslie-Hughes 21 Jan '20

21 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/directmanipulation.idl | 416 +++++++++++++++++++++++++++++++++ 2 files changed, 417 insertions(+) create mode 100644 include/directmanipulation.idl diff --git a/include/Makefile.in b/include/Makefile.in index 8a05f5d01c..8284d6fdf3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -200,6 +200,7 @@ SOURCES = \ dimm.idl \ dinput.h \ dinputd.h \ + directmanipulation.idl \ dispdib.h \ dispex.idl \ dlgs.h \ diff --git a/include/directmanipulation.idl b/include/directmanipulation.idl new file mode 100644 index 0000000000..a49f368d11 --- /dev/null +++ b/include/directmanipulation.idl @@ -0,0 +1,416 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +cpp_quote("#if 0") +typedef void* HWND; +cpp_quote("#endif") + +interface IDirectManipulationViewportEventHandler; + +typedef enum DIRECTMANIPULATION_HITTEST_TYPE +{ + DIRECTMANIPULATION_HITTEST_TYPE_ASYNCHRONOUS = 0x00000000, + DIRECTMANIPULATION_HITTEST_TYPE_SYNCHRONOUS = 0x00000001, + DIRECTMANIPULATION_HITTEST_TYPE_AUTO_SYNCHRONOUS = 0x00000002 +} DIRECTMANIPULATION_HITTEST_TYPE; + +typedef enum DIRECTMANIPULATION_STATUS +{ + DIRECTMANIPULATION_BUILDING = 0, + DIRECTMANIPULATION_ENABLED = 1, + DIRECTMANIPULATION_DISABLED = 2, + DIRECTMANIPULATION_RUNNING = 3, + DIRECTMANIPULATION_INERTIA = 4, + DIRECTMANIPULATION_READY = 5, + DIRECTMANIPULATION_SUSPENDED = 6 +} DIRECTMANIPULATION_STATUS; + +typedef enum DIRECTMANIPULATION_VIEWPORT_OPTIONS +{ + DIRECTMANIPULATION_VIEWPORT_OPTIONS_DEFAULT = 0x0000, + DIRECTMANIPULATION_VIEWPORT_OPTIONS_AUTODISABLE = 0x0001, + DIRECTMANIPULATION_VIEWPORT_OPTIONS_MANUALUPDATE = 0x0002, + DIRECTMANIPULATION_VIEWPORT_OPTIONS_INPUT = 0x0004, + DIRECTMANIPULATION_VIEWPORT_OPTIONS_EXPLICITHITTEST = 0x0008, + DIRECTMANIPULATION_VIEWPORT_OPTIONS_DISABLEPIXELSNAPPING = 0x0010, +} DIRECTMANIPULATION_VIEWPORT_OPTIONS; + +typedef enum DIRECTMANIPULATION_CONFIGURATION +{ + DIRECTMANIPULATION_CONFIGURATION_NONE = 0x00000000, + DIRECTMANIPULATION_CONFIGURATION_INTERACTION = 0x00000001, + DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_X = 0x00000002, + DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_Y = 0x00000004, + DIRECTMANIPULATION_CONFIGURATION_SCALING = 0x00000010, + DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_INERTIA = 0x00000020, + DIRECTMANIPULATION_CONFIGURATION_SCALING_INERTIA = 0x00000080, + DIRECTMANIPULATION_CONFIGURATION_RAILS_X = 0x00000100, + DIRECTMANIPULATION_CONFIGURATION_RAILS_Y = 0x00000200, +} DIRECTMANIPULATION_CONFIGURATION; + +typedef enum DIRECTMANIPULATION_GESTURE_CONFIGURATION +{ + DIRECTMANIPULATION_GESTURE_NONE = 0x00000000, + DIRECTMANIPULATION_GESTURE_DEFAULT = 0x00000000, + DIRECTMANIPULATION_GESTURE_CROSS_SLIDE_VERTICAL = 0x00000008, + DIRECTMANIPULATION_GESTURE_CROSS_SLIDE_HORIZONTAL = 0x00000010, + DIRECTMANIPULATION_GESTURE_PINCH_ZOOM = 0x00000020, +} DIRECTMANIPULATION_GESTURE_CONFIGURATION; + +typedef enum DIRECTMANIPULATION_MOTION_TYPES +{ + DIRECTMANIPULATION_MOTION_NONE = 0x0000, + DIRECTMANIPULATION_MOTION_TRANSLATEX = 0x0001, + DIRECTMANIPULATION_MOTION_TRANSLATEY = 0x0002, + DIRECTMANIPULATION_MOTION_ZOOM = 0x0004, + DIRECTMANIPULATION_MOTION_CENTERX = 0x0010, + DIRECTMANIPULATION_MOTION_CENTERY = 0x0020, + DIRECTMANIPULATION_MOTION_ALL = DIRECTMANIPULATION_MOTION_TRANSLATEX | DIRECTMANIPULATION_MOTION_TRANSLATEY | + DIRECTMANIPULATION_MOTION_ZOOM | DIRECTMANIPULATION_MOTION_CENTERX | + DIRECTMANIPULATION_MOTION_CENTERY +} DIRECTMANIPULATION_MOTION_TYPES; + +typedef enum DIRECTMANIPULATION_SNAPPOINT_TYPE +{ + DIRECTMANIPULATION_SNAPPOINT_MANDATORY = 0, + DIRECTMANIPULATION_SNAPPOINT_OPTIONAL = 1, + DIRECTMANIPULATION_SNAPPOINT_MANDATORY_SINGLE = 2, + DIRECTMANIPULATION_SNAPPOINT_OPTIONAL_SINGLE = 3 +} DIRECTMANIPULATION_SNAPPOINT_TYPE; + +typedef enum DIRECTMANIPULATION_SNAPPOINT_COORDINATE +{ + DIRECTMANIPULATION_COORDINATE_BOUNDARY = 0x00, + DIRECTMANIPULATION_COORDINATE_ORIGIN = 0x01, + DIRECTMANIPULATION_COORDINATE_MIRRORED = 0x10 +} DIRECTMANIPULATION_SNAPPOINT_COORDINATE; + +typedef enum DIRECTMANIPULATION_HORIZONTALALIGNMENT +{ + DIRECTMANIPULATION_HORIZONTALALIGNMENT_NONE = 0x00, + DIRECTMANIPULATION_HORIZONTALALIGNMENT_LEFT = 0x01, + DIRECTMANIPULATION_HORIZONTALALIGNMENT_CENTER = 0x02, + DIRECTMANIPULATION_HORIZONTALALIGNMENT_RIGHT = 0x04, + DIRECTMANIPULATION_HORIZONTALALIGNMENT_UNLOCKCENTER = 0x08 +} DIRECTMANIPULATION_HORIZONTALALIGNMENT; + +typedef enum DIRECTMANIPULATION_VERTICALALIGNMENT +{ + DIRECTMANIPULATION_VERTICALALIGNMENT_NONE = 0x00, + DIRECTMANIPULATION_VERTICALALIGNMENT_TOP = 0x01, + DIRECTMANIPULATION_VERTICALALIGNMENT_CENTER = 0x02, + DIRECTMANIPULATION_VERTICALALIGNMENT_BOTTOM = 0x04, + DIRECTMANIPULATION_VERTICALALIGNMENT_UNLOCKCENTER = 0x08 +} DIRECTMANIPULATION_VERTICALALIGNMENT; + +typedef enum DIRECTMANIPULATION_INPUT_MODE +{ + DIRECTMANIPULATION_INPUT_MODE_AUTOMATIC = 0, + DIRECTMANIPULATION_INPUT_MODE_MANUAL = 1 +} DIRECTMANIPULATION_INPUT_MODE; + +[ + local, + object, + uuid(fb759dba-6f4c-4c01-874e-19c8a05907f9), + pointer_default(unique) +] +interface IDirectManipulationFrameInfoProvider : IUnknown +{ + HRESULT GetNextFrameInfo([out] ULONGLONG *time, [out] ULONGLONG *process, [out] ULONGLONG *composition); +} + +[ + local, + object, + uuid(fbf5d3b4-70c7-4163-9322-5a6f660d6fbc), + pointer_default(unique) +] +interface IDirectManipulationManager : IUnknown +{ + HRESULT Activate([in] HWND window); + + HRESULT Deactivate([in] HWND window); + + HRESULT RegisterHitTestTarget([in] HWND window, [in] HWND hittest, [in] DIRECTMANIPULATION_HITTEST_TYPE type); + + HRESULT ProcessInput([in] const MSG *msg, [out, retval] BOOL *handled); + + HRESULT GetUpdateManager([in] REFIID riid, [out, iid_is(riid), retval,] void **obj); + + HRESULT CreateViewport([in] IDirectManipulationFrameInfoProvider *frame, [in] HWND window, + [in] REFIID riid, [out, iid_is(riid), retval] void **obj); + + HRESULT CreateContent([in] IDirectManipulationFrameInfoProvider *frame, [in] REFCLSID clsid, + [in] REFIID riid, [out, iid_is(riid), retval] void **obj); +} + +[ + local, + object, + uuid(b89962cb-3d89-442b-bb58-5098fa0f9f16), + pointer_default(unique) +] +interface IDirectManipulationContent : IUnknown +{ + HRESULT GetContentRect([out] RECT *size); + + HRESULT SetContentRect([in] const RECT *size); + + HRESULT GetViewport([in] REFIID riid, [out, iid_is(riid)] void **object); + + HRESULT GetTag([in] REFIID riid, [out, iid_is(riid)] void **object, [out] UINT32 *id); + + HRESULT SetTag([in, unique] IUnknown *object, [in] UINT32 id); + + HRESULT GetOutputTransform([out] float *matrix, [in] DWORD count); + + HRESULT GetContentTransform([out] float *matrix, [in] DWORD count); + + HRESULT SyncContentTransform([in] const float *matrix, [in] DWORD count); +} + +[ + local, + object, + uuid(790b6337-64f8-4ff5-a269-b32bc2af27a7), + pointer_default(unique) +] +interface IDirectManipulationUpdateHandler : IUnknown +{ + HRESULT Update(); +} + +[ + local, + object, + uuid(b0ae62fd-be34-46e7-9caa-d361facbb9cc), + pointer_default(unique) +] +interface IDirectManipulationUpdateManager : IUnknown +{ + HRESULT RegisterWaitHandleCallback([in] HANDLE handle, [in] IDirectManipulationUpdateHandler *handler, + [out] DWORD *cookie); + + HRESULT UnregisterWaitHandleCallback([in] DWORD cookie); + + HRESULT Update([in] IDirectManipulationFrameInfoProvider *provider); +} + +[ + local, + object, + uuid(537a0825-0387-4efa-b62f-71eb1f085a7e), + pointer_default(unique) +] +interface IDirectManipulationCompositor : IUnknown +{ + HRESULT AddContent([in] IDirectManipulationContent *content, [in] IUnknown *device, + [in] IUnknown *parent, [in] IUnknown *child); + + HRESULT RemoveContent([in] IDirectManipulationContent *content); + + HRESULT SetUpdateManager([in] IDirectManipulationUpdateManager *manager); + + HRESULT Flush(); +} + +[ + local, + object, + uuid(28b85a3d-60a0-48bd-9ba1-5ce8d9ea3a6d), + pointer_default(unique) +] +interface IDirectManipulationViewport : IUnknown +{ + HRESULT Enable(); + + HRESULT Disable(); + + HRESULT SetContact([in] UINT32 id); + + HRESULT ReleaseContact([in] UINT32 id); + + HRESULT ReleaseAllContacts(); + + HRESULT GetStatus([out] DIRECTMANIPULATION_STATUS *status); + + HRESULT GetTag([in] REFIID riid, [out, iid_is(riid)] void **object, [out] UINT32 *id); + + HRESULT SetTag([in, unique] IUnknown *object, [in] UINT32 id); + + HRESULT GetViewportRect([out, retval] RECT *viewport); + + HRESULT SetViewportRect([in] const RECT *viewport); + + HRESULT ZoomToRect([in] const float left, [in] const float top, [in] const float right, + [in] const float bottom, [in] BOOL animate); + + HRESULT SetViewportTransform([in] const float *matrix, [in] DWORD count); + + HRESULT SyncDisplayTransform([in] const float *matrix, [in] DWORD count); + + HRESULT GetPrimaryContent([in] REFIID riid, [out, iid_is(riid)] void **object); + + HRESULT AddContent([in, unique] IDirectManipulationContent *content); + + HRESULT RemoveContent([in, unique] IDirectManipulationContent *content); + + HRESULT SetViewportOptions([in] DIRECTMANIPULATION_VIEWPORT_OPTIONS options); + + HRESULT AddConfiguration([in] DIRECTMANIPULATION_CONFIGURATION configuration); + + HRESULT RemoveConfiguration([in] DIRECTMANIPULATION_CONFIGURATION configuration); + + HRESULT ActivateConfiguration([in] DIRECTMANIPULATION_CONFIGURATION configuration); + + HRESULT SetManualGesture([in] DIRECTMANIPULATION_GESTURE_CONFIGURATION configuration); + + HRESULT SetChaining([in] DIRECTMANIPULATION_MOTION_TYPES enabledTypes); + + HRESULT AddEventHandler([in] HWND window, [in] IDirectManipulationViewportEventHandler *eventHandler, + [out, retval] DWORD *cookie); + + HRESULT RemoveEventHandler([in] DWORD cookie); + + HRESULT SetInputMode([in] DIRECTMANIPULATION_INPUT_MODE mode); + + HRESULT SetUpdateMode([in] DIRECTMANIPULATION_INPUT_MODE mode); + + HRESULT Stop(); + + HRESULT Abandon(); +} + +[ + local, + object, + uuid(923ccaac-61e1-4385-b726-017af189882a), + pointer_default(unique) +] +interface IDirectManipulationViewport2 : IDirectManipulationViewport +{ + HRESULT AddBehavior([in] IUnknown *behavior, [out, retval] DWORD *cookie); + + HRESULT RemoveBehavior([in] DWORD cookie); + + HRESULT RemoveAllBehaviors(); +} + +[ + local, + object, + uuid(952121DA-D69F-45F9-B0F9-F23944321A6D), + pointer_default(unique) +] +interface IDirectManipulationViewportEventHandler : IUnknown +{ + HRESULT OnViewportStatusChanged([in] IDirectManipulationViewport *viewport, [in] DIRECTMANIPULATION_STATUS current, + [in] DIRECTMANIPULATION_STATUS previous); + + HRESULT OnViewportUpdated([in] IDirectManipulationViewport *viewport); + + HRESULT OnContentUpdated([in] IDirectManipulationViewport *viewport, [in] IDirectManipulationContent *content); +} + +[ + local, + object, + uuid(fa1005e9-3d16-484c-bfc9-62b61e56ec4e), + pointer_default(unique) +] +interface IDirectManipulationManager2 : IDirectManipulationManager +{ + HRESULT CreateBehavior([in] REFCLSID clsid, [in] REFIID riid, [out, iid_is(riid), retval] void **obj); +} + +[ + local, + object, + uuid(c12851e4-1698-4625-b9b1-7ca3ec18630b), + pointer_default(unique) +] +interface IDirectManipulationPrimaryContent : IUnknown +{ + HRESULT SetSnapInterval([in] DIRECTMANIPULATION_MOTION_TYPES motion, [in] float interval, [in] float offset); + + HRESULT SetSnapPoints([in] DIRECTMANIPULATION_MOTION_TYPES motion, [in] const float *points, [in] DWORD count); + + HRESULT SetSnapType([in] DIRECTMANIPULATION_MOTION_TYPES motion, [in] DIRECTMANIPULATION_SNAPPOINT_TYPE type); + + HRESULT SetSnapCoordinate([in] DIRECTMANIPULATION_MOTION_TYPES motion, [in] DIRECTMANIPULATION_SNAPPOINT_COORDINATE coordinate, + [in] float origin); + + HRESULT SetZoomBoundaries([in] float minimum, [in] float maximum); + + HRESULT SetHorizontalAlignment([in] DIRECTMANIPULATION_HORIZONTALALIGNMENT alignment); + + HRESULT SetVerticalAlignment([in] DIRECTMANIPULATION_VERTICALALIGNMENT alignment); + + HRESULT GetInertiaEndTransform([out] float *matrix, [in] DWORD count); + + HRESULT GetCenterPoint([out] float *x, [out] float *y); +} + +[ + uuid(9fbedf98-f6d8-4e3b-b488-fa66dbf5e9f3), + version(1.0) +] +library DirectManipulation +{ + [ + uuid(54e211b6-3650-4f75-8334-fa359598e1c5) + ] + coclass DirectManipulationManager + { + interface IDirectManipulationManager2; + [default] interface IDirectManipulationManager; + } + + [ + uuid(99793286-77cc-4b57-96db-3b354f6f9fb5) + ] + coclass DirectManipulationSharedManager + { + interface IDirectManipulationManager2; + [default] interface IDirectManipulationManager; + } + + [ + uuid(79dea627-a08a-43ac-8ef5-6900b9299126) + ] + coclass DCompManipulationCompositor + { + [default] interface IDirectManipulationCompositor; + interface IDirectManipulationFrameInfoProvider; + } + + [ + noncreatable, + hidden, + uuid(34e211b6-3650-4f75-8334-fa359598e1c5) + ] + coclass DirectManipulationViewport + { + interface IDirectManipulationViewport2; + [default] interface IDirectManipulationViewport; + } +} -- 2.24.1

1 0