June 2018 - Wine-commits - list.winehq.org

Jacek Caban : mshtml.idl: Added IHTMLPerformance declaration.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: 47f92ec07aea3d0b4d25958c118dcbd8cba9c059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47f92ec07aea3d0b4d25958c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 13 14:23:39 2018 +0200 mshtml.idl: Added IHTMLPerformance declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 40 +++++++++++++++++ include/mshtml.idl | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 3b1fac6..fa63b6e 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -112,6 +112,9 @@ #define DISPID_RULESAPPLIED_COLLECTION DISPID_NORMAL_FIRST #define DISPID_STYLESHEETRULESAPPLIED_COLLECTION DISPID_NORMAL_FIRST #define DISPID_PROCESSINGINSTRUCTION DISPID_NORMAL_FIRST +#define DISPID_PERFORMANCE DISPID_NORMAL_FIRST +#define DISPID_PERFORMANCENAVIGATION DISPID_NORMAL_FIRST +#define DISPID_PERFORMANCETIMING DISPID_NORMAL_FIRST #define DISPID_HTMLSELECTION DISPID_NORMAL_FIRST #define DISPID_DOMRANGE DISPID_NORMAL_FIRST #define DISPID_MEDIA DISPID_NORMAL_FIRST @@ -4025,6 +4028,43 @@ #define DISPID_IDOMPROCESSINGINSTRUCTION_TARGET DISPID_PROCESSINGINSTRUCTION #define DISPID_IDOMPROCESSINGINSTRUCTION_DATA DISPID_PROCESSINGINSTRUCTION+1 +/* IHTMLPerformanceNavigation */ +#define DISPID_IHTMLPERFORMANCENAVIGATION_TYPE DISPID_PERFORMANCENAVIGATION +#define DISPID_IHTMLPERFORMANCENAVIGATION_REDIRECTCOUNT DISPID_PERFORMANCENAVIGATION+1 +#define DISPID_IHTMLPERFORMANCENAVIGATION_TOSTRING DISPID_PERFORMANCENAVIGATION+2 +#define DISPID_IHTMLPERFORMANCENAVIGATION_TOJSON DISPID_PERFORMANCENAVIGATION+3 + +/* IHTMLPerformanceTiming */ +#define DISPID_IHTMLPERFORMANCETIMING_NAVIGATIONSTART DISPID_PERFORMANCETIMING +#define DISPID_IHTMLPERFORMANCETIMING_UNLOADEVENTSTART DISPID_PERFORMANCETIMING+1 +#define DISPID_IHTMLPERFORMANCETIMING_UNLOADEVENTEND DISPID_PERFORMANCETIMING+2 +#define DISPID_IHTMLPERFORMANCETIMING_REDIRECTSTART DISPID_PERFORMANCETIMING+3 +#define DISPID_IHTMLPERFORMANCETIMING_REDIRECTEND DISPID_PERFORMANCETIMING+4 +#define DISPID_IHTMLPERFORMANCETIMING_FETCHSTART DISPID_PERFORMANCETIMING+5 +#define DISPID_IHTMLPERFORMANCETIMING_DOMAINLOOKUPSTART DISPID_PERFORMANCETIMING+6 +#define DISPID_IHTMLPERFORMANCETIMING_DOMAINLOOKUPEND DISPID_PERFORMANCETIMING+7 +#define DISPID_IHTMLPERFORMANCETIMING_CONNECTSTART DISPID_PERFORMANCETIMING+8 +#define DISPID_IHTMLPERFORMANCETIMING_CONNECTEND DISPID_PERFORMANCETIMING+9 +#define DISPID_IHTMLPERFORMANCETIMING_REQUESTSTART DISPID_PERFORMANCETIMING+10 +#define DISPID_IHTMLPERFORMANCETIMING_RESPONSESTART DISPID_PERFORMANCETIMING+11 +#define DISPID_IHTMLPERFORMANCETIMING_RESPONSEEND DISPID_PERFORMANCETIMING+12 +#define DISPID_IHTMLPERFORMANCETIMING_DOMLOADING DISPID_PERFORMANCETIMING+13 +#define DISPID_IHTMLPERFORMANCETIMING_DOMINTERACTIVE DISPID_PERFORMANCETIMING+14 +#define DISPID_IHTMLPERFORMANCETIMING_DOMCONTENTLOADEDEVENTSTART DISPID_PERFORMANCETIMING+15 +#define DISPID_IHTMLPERFORMANCETIMING_DOMCONTENTLOADEDEVENTEND DISPID_PERFORMANCETIMING+16 +#define DISPID_IHTMLPERFORMANCETIMING_DOMCOMPLETE DISPID_PERFORMANCETIMING+17 +#define DISPID_IHTMLPERFORMANCETIMING_LOADEVENTSTART DISPID_PERFORMANCETIMING+18 +#define DISPID_IHTMLPERFORMANCETIMING_LOADEVENTEND DISPID_PERFORMANCETIMING+19 +#define DISPID_IHTMLPERFORMANCETIMING_MSFIRSTPAINT DISPID_PERFORMANCETIMING+20 +#define DISPID_IHTMLPERFORMANCETIMING_TOSTRING DISPID_PERFORMANCETIMING+21 +#define DISPID_IHTMLPERFORMANCETIMING_TOJSON DISPID_PERFORMANCETIMING+22 + +/* IHTMLPerformance */ +#define DISPID_IHTMLPERFORMANCE_NAVIGATION DISPID_PERFORMANCE +#define DISPID_IHTMLPERFORMANCE_TIMING DISPID_PERFORMANCE+1 +#define DISPID_IHTMLPERFORMANCE_TOSTRING DISPID_PERFORMANCE+2 +#define DISPID_IHTMLPERFORMANCE_TOJSON DISPID_PERFORMANCE+3 + /* IDocumentEvent */ #define DISPID_IDOCUMENTEVENT_CREATEEVENT DISPID_OMDOCUMENT+108 diff --git a/include/mshtml.idl b/include/mshtml.idl index 6c0bd26..ea5d42d 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -17092,6 +17092,135 @@ interface IDOMProcessingInstruction : IDispatch } /***************************************************************************** + * IHTMLPerformanceNavigation interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510750-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLPerformanceNavigation : IDispatch +{ + [propget, id(DISPID_IHTMLPERFORMANCENAVIGATION_TYPE)] + HRESULT type([out, retval] ULONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCENAVIGATION_REDIRECTCOUNT)] + HRESULT redirectCount([out, retval] ULONG *p); + + [id(DISPID_IHTMLPERFORMANCENAVIGATION_TOSTRING)] + HRESULT toString([out, retval] BSTR *string); + + [id(DISPID_IHTMLPERFORMANCENAVIGATION_TOJSON)] + HRESULT toJSON([out, retval] VARIANT *pVar); +} + +/***************************************************************************** + * IHTMLPerformanceTiming interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510752-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLPerformanceTiming : IDispatch +{ + [propget, id(DISPID_IHTMLPERFORMANCETIMING_NAVIGATIONSTART)] + HRESULT navigationStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_UNLOADEVENTSTART)] + HRESULT unloadEventStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_UNLOADEVENTEND)] + HRESULT unloadEventEnd([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_REDIRECTSTART)] + HRESULT redirectStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_REDIRECTEND)] + HRESULT redirectEnd([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_FETCHSTART)] + HRESULT fetchStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_DOMAINLOOKUPSTART)] + HRESULT domainLookupStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_DOMAINLOOKUPEND)] + HRESULT domainLookupEnd([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_CONNECTSTART)] + HRESULT connectStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_CONNECTEND)] + HRESULT connectEnd([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_REQUESTSTART)] + HRESULT requestStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_RESPONSESTART)] + HRESULT responseStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_RESPONSEEND)] + HRESULT responseEnd([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_DOMLOADING)] + HRESULT domLoading([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_DOMINTERACTIVE)] + HRESULT domInteractive([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_DOMCONTENTLOADEDEVENTSTART)] + HRESULT domContentLoadedEventStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_DOMCONTENTLOADEDEVENTEND)] + HRESULT domContentLoadedEventEnd([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_DOMCOMPLETE)] + HRESULT domComplete([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_LOADEVENTSTART)] + HRESULT loadEventStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_LOADEVENTEND)] + HRESULT loadEventEnd([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_MSFIRSTPAINT)] + HRESULT msFirstPaint([out, retval] ULONGLONG *p); + + [id(DISPID_IHTMLPERFORMANCETIMING_TOSTRING)] + HRESULT toString([out, retval] BSTR *string); + + [id(DISPID_IHTMLPERFORMANCETIMING_TOJSON)] + HRESULT toJSON([out, retval] VARIANT *pVar); +} + +/***************************************************************************** + * IHTMLPerformance interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051074e-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLPerformance : IDispatch +{ + [propget, id(DISPID_IHTMLPERFORMANCE_NAVIGATION)] + HRESULT navigation([out, retval] IHTMLPerformanceNavigation **p); + + [propget, id(DISPID_IHTMLPERFORMANCE_TIMING)] + HRESULT timing([out, retval] IHTMLPerformanceTiming **p); + + [id(DISPID_IHTMLPERFORMANCE_TOSTRING)] + HRESULT toString([out, retval] BSTR *string); + + [id(DISPID_IHTMLPERFORMANCE_TOJSON)] + HRESULT toJSON([out, retval] VARIANT *pVar); +} + +/***************************************************************************** * IHTMLDocument interface */ [

1 0

Jacek Caban : mshtml.idl: Added IHTMLPerformance test.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: 8c48c632fc66c8420331ed9c14f7fd3764aa8a0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c48c632fc66c8420331ed9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 13 14:23:55 2018 +0200 mshtml.idl: Added IHTMLPerformance test. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b120b47..3f08a23 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6742,6 +6742,7 @@ static void test_window(IHTMLDocument2 *doc) { IHTMLWindow2 *window, *window2, *self, *parent; IHTMLWindow5 *window5; + IHTMLWindow7 *window7; IHTMLDocument2 *doc2 = NULL; IDispatch *disp; IUnknown *unk; @@ -6843,6 +6844,29 @@ static void test_window(IHTMLDocument2 *doc) win_skip("IHTMLWindow5 not supported!\n"); } + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow7, (void**)&window7); + if(SUCCEEDED(hres)) { + IHTMLPerformance *performance; + + ok(window7 != NULL, "window7 == NULL\n"); + + hres = IHTMLWindow7_get_performance(window7, &v); + todo_wine + ok(hres == S_OK, "get_performance failed: %08x\n", hres); + if(SUCCEEDED(hres)) { + ok(V_VT(&v) == VT_DISPATCH, "V_VT(performance) = %u\n", V_VT(&v)); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IHTMLPerformance, + (void**)&performance); + ok(hres == S_OK, "Could not get IHTMLPerformance iface: %08x\n", hres); + + IHTMLPerformance_Release(performance); + IHTMLWindow7_Release(window7); + } + }else { + win_skip("IHTMLWindow7 not supported\n"); + } + IHTMLWindow2_Release(window); }

1 0

Zebediah Figura : rpcrt4: Use publicly defined NDR constants.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: 69cd52875ab9b412ad771ef76ca8eb4ba9c8816e URL: https://source.winehq.org/git/wine.git/?a=commit;h=69cd52875ab9b412ad771ef7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 12 21:19:10 2018 -0500 rpcrt4: Use publicly defined NDR constants. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_contexthandle.c | 2 - dlls/rpcrt4/ndr_es.c | 15 +- dlls/rpcrt4/ndr_marshall.c | 1420 +++++++++++++++++++-------------------- dlls/rpcrt4/ndr_ole.c | 6 +- dlls/rpcrt4/ndr_stubless.c | 241 ++++--- dlls/rpcrt4/ndr_stubless.h | 16 +- 6 files changed, 846 insertions(+), 854 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=69cd52875ab9b412ad77…

1 0

Zebediah Figura : widl: Use publicly defined NDR constants.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: f9c8c2029871f8d771e9069d8a19ecbf85343ec6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9c8c2029871f8d771e9069d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 12 21:19:11 2018 -0500 widl: Use publicly defined NDR constants. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/rpcfc.h | 205 ------------- tools/widl/client.c | 12 +- tools/widl/expr.c | 6 +- tools/widl/header.c | 12 +- tools/widl/parser.y | 20 +- tools/widl/proxy.c | 2 +- tools/widl/server.c | 2 +- tools/widl/typegen.c | 798 ++++++++++++++++++++++++------------------------- tools/widl/widltypes.h | 2 +- 9 files changed, 427 insertions(+), 632 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9c8c2029871f8d771e9…

1 0

Dmitry Timoshkov : mstask: Implement ITask::SetWorkItemData().
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: c00fbb5c0e2296758db9c7481ef0cf4df31a5c30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c00fbb5c0e2296758db9c748… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 13 12:04:15 2018 +0800 mstask: Implement ITask::SetWorkItemData(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 69f1e5f..54e4912 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -58,6 +58,8 @@ typedef struct LONG ref; ITaskDefinition *task; IExecAction *action; + BYTE *data; + WORD data_count; UUID uuid; LPWSTR task_name; HRESULT status; @@ -87,6 +89,7 @@ static void TaskDestructor(TaskImpl *This) if (This->action) IExecAction_Release(This->action); ITaskDefinition_Release(This->task); + heap_free(This->data); heap_free(This->task_name); heap_free(This->accountName); heap_free(This->trigger); @@ -809,13 +812,32 @@ static HRESULT WINAPI MSTASK_ITask_GetCreator(ITask *iface, LPWSTR *creator) return hr; } -static HRESULT WINAPI MSTASK_ITask_SetWorkItemData( - ITask* iface, - WORD cBytes, - BYTE rgbData[]) +static HRESULT WINAPI MSTASK_ITask_SetWorkItemData(ITask *iface, WORD count, BYTE data[]) { - FIXME("(%p, %d, %p): stub\n", iface, cBytes, rgbData); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %u, %p)\n", iface, count, data); + + if (count) + { + if (!data) return E_INVALIDARG; + + heap_free(This->data); + This->data = heap_alloc(count); + if (!This->data) return E_OUTOFMEMORY; + memcpy(This->data, data, count); + This->data_count = count; + } + else + { + if (data) return E_INVALIDARG; + + heap_free(This->data); + This->data = NULL; + This->data_count = 0; + } + + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetWorkItemData( @@ -1865,6 +1887,8 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->IPersistFile_iface.lpVtbl = &MSTASK_IPersistFileVtbl; This->ref = 1; This->task = taskdef; + This->data = NULL; + This->data_count = 0; This->task_name = heap_strdupW(task_name); This->flags = 0; This->status = SCHED_S_TASK_NOT_SCHEDULED;

1 0

Dmitry Timoshkov : mstask: Implement ITask::GetWorkItemData().
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: c5d945c9f7c54ad552028eec4385a7662788ab7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5d945c9f7c54ad552028eec… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 13 12:04:41 2018 +0800 mstask: Implement ITask::GetWorkItemData(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 54e4912..490229a 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -840,13 +840,26 @@ static HRESULT WINAPI MSTASK_ITask_SetWorkItemData(ITask *iface, WORD count, BYT return S_OK; } -static HRESULT WINAPI MSTASK_ITask_GetWorkItemData( - ITask* iface, - WORD *pcBytes, - BYTE **ppBytes) +static HRESULT WINAPI MSTASK_ITask_GetWorkItemData(ITask *iface, WORD *count, BYTE **data) { - FIXME("(%p, %p, %p): stub\n", iface, pcBytes, ppBytes); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %p, %p)\n", iface, count, data); + + if (!This->data) + { + *count = 0; + *data = NULL; + } + else + { + *data = CoTaskMemAlloc(This->data_count); + if (!*data) return E_OUTOFMEMORY; + memcpy(*data, This->data, This->data_count); + *count = This->data_count; + } + + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetErrorRetryCount(

1 0

Dmitry Timoshkov : mstask/tests: Add some tests for workitem data.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: 14ff4bfefe5a15ccc3ba4640de3b7959bd43c014 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14ff4bfefe5a15ccc3ba4640… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 13 12:05:21 2018 +0800 mstask/tests: Add some tests for workitem data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/task.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 0e2b433..4e8386a 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -720,6 +720,60 @@ static void test_SetFlags(void) ITask_Release(task); } +static void test_workitem_data(void) +{ + static BYTE hello[] = "Hello World!"; + HRESULT hr; + ITask *task; + WORD count; + BYTE *data; + + hr = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + + if (0) /* crashes under Windows */ + hr = ITask_GetWorkItemData(task, &count, NULL); + if (0) /* crashes under Windows */ + hr = ITask_GetWorkItemData(task, NULL, &data); + + count = 0xdead; + data = (BYTE *)0xdeadbeef; + hr = ITask_GetWorkItemData(task, &count, &data); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 0, "got %u\n", count); + ok(data == NULL, "got %p\n", data); + + hr = ITask_SetWorkItemData(task, sizeof(hello), NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + hr = ITask_SetWorkItemData(task, 0, hello); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + hr = ITask_SetWorkItemData(task, sizeof(hello), hello); + ok(hr == S_OK, "got %#x\n", hr); + + count = 0xdead; + data = NULL; + hr = ITask_GetWorkItemData(task, &count, &data); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == sizeof(hello), "got %u\n", count); + ok(data != NULL, "got NULL\n"); + ok(!memcmp(data, hello, sizeof(hello)), "data mismatch\n"); + + hr = ITask_SetWorkItemData(task, 0, NULL); + ok(hr == S_OK, "got %#x\n", hr); + + count = 0xdead; + data = (BYTE *)0xdeadbeef; + hr = ITask_GetWorkItemData(task, &count, &data); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 0, "got %u\n", count); + ok(data == NULL, "got %p\n", data); + + ITask_Release(task); +} + START_TEST(task) { HRESULT hr; @@ -738,6 +792,7 @@ START_TEST(task) test_task_state(); test_Run(); test_SetFlags(); + test_workitem_data(); ITaskScheduler_Release(scheduler); CoUninitialize();

1 0

Zebediah Figura : winedbg: Make be_cpu process-specific.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: 42bbeedbe40985fc6629b9c05469a89f838ac8f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42bbeedbe40985fc6629b9c0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jun 12 17:53:16 2018 -0500 winedbg: Make be_cpu process-specific. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_cpu.h | 2 -- programs/winedbg/break.c | 40 ++++++++++++++-------------- programs/winedbg/db_disasm.c | 4 +-- programs/winedbg/dbg.y | 4 +-- programs/winedbg/debugger.h | 3 ++- programs/winedbg/expr.c | 4 +-- programs/winedbg/gdbproxy.c | 17 ++++++------ programs/winedbg/info.c | 2 +- programs/winedbg/memory.c | 26 +++++++++--------- programs/winedbg/stack.c | 10 +++---- programs/winedbg/symbol.c | 2 +- programs/winedbg/tgt_active.c | 9 ++++--- programs/winedbg/tgt_minidump.c | 4 +-- programs/winedbg/types.c | 17 ++++++------ programs/winedbg/winedbg.c | 58 ++++++++++++++++++++--------------------- 15 files changed, 101 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=42bbeedbe40985fc6629…

1 0

Zebediah Figura : winedbg/gdbproxy: Remove unnecessary checks for supported context flags.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: b459c88caa07f3b60f976289670960ae7d107d14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b459c88caa07f3b60f976289… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jun 12 17:53:17 2018 -0500 winedbg/gdbproxy: Remove unnecessary checks for supported context flags. And simplify the assignment to use CONTEXT_ALL instead. If we don't support reading from a register then we just ignore its value. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 480 ++++++++++++++++++++------------------------ 1 file changed, 223 insertions(+), 257 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b459c88caa07f3b60f97…

1 0

Zebediah Figura : winedbg: Use WOW64_CONTEXT instead of CONTEXT for i386 backend.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: 45e06545910a02e2cfbb7632d436f1a56d1c78d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45e06545910a02e2cfbb7632… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jun 12 17:53:18 2018 -0500 winedbg: Use WOW64_CONTEXT instead of CONTEXT for i386 backend. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_cpu.h | 22 ++--- programs/winedbg/be_i386.c | 211 ++++++++++++++++++++-------------------- programs/winedbg/be_x86_64.c | 73 +++++++------- programs/winedbg/debugger.h | 12 ++- programs/winedbg/gdbproxy.c | 35 ++++--- programs/winedbg/memory.c | 2 +- programs/winedbg/stack.c | 16 +-- programs/winedbg/tgt_active.c | 10 +- programs/winedbg/tgt_minidump.c | 2 +- programs/winedbg/winedbg.c | 2 +- 10 files changed, 199 insertions(+), 186 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=45e06545910a02e2cfbb…

1 0