December 2017 - Wine-Commits

Jacek Caban : mshtml: Added IDOMEvent::get_type implementation.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: dc5aefcebb6ec4a1dadfc11b928ae3d8246b3b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc5aefcebb6ec4a1dadfc11b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:02:06 2017 +0100 mshtml: Added IDOMEvent::get_type implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 13 +++++++++++-- dlls/mshtml/tests/events.c | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 980b31a..4278d22 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1033,8 +1033,17 @@ static HRESULT WINAPI DOMEvent_get_timeStamp(IDOMEvent *iface, ULONGLONG *p) static HRESULT WINAPI DOMEvent_get_type(IDOMEvent *iface, BSTR *p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->type) { + *p = SysAllocString(This->type); + if(!*p) + return E_OUTOFMEMORY; + }else { + *p = NULL; + } + return S_OK; } static HRESULT WINAPI DOMEvent_initEvent(IDOMEvent *iface, BSTR type, VARIANT_BOOL can_bubble, VARIANT_BOOL cancelable) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index bc8e045..7719dc1 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2693,6 +2693,11 @@ static void test_create_event(IHTMLDocument2 *doc) hres = IDOMEvent_stopPropagation(event); ok(hres == S_OK, "stopPropagation failed: %08x\n", hres); + str = (void*)0xdeadbeef; + hres = IDOMEvent_get_type(event, &str); + ok(hres == S_OK, "get_type failed: %08x\n", hres); + ok(!str, "type = %s\n", wine_dbgstr_w(str)); + IDOMEvent_Release(event); IDocumentEvent_Release(doc_event);

1 0

Jacek Caban : mshtml: Store event type string in DOMEvent object.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: d121009f249af769e445618e756da1375a3502d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d121009f249af769e445618e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:01:59 2017 +0100 mshtml: Store event type string in DOMEvent object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 59 ++++++++++++++++++++++++++++--------------------- dlls/mshtml/htmlevent.h | 1 + 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a046491..980b31a 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -938,6 +938,7 @@ static ULONG WINAPI DOMEvent_Release(IDOMEvent *iface) IDispatchEx_Release(&This->target->dispex.IDispatchEx_iface); nsIDOMEvent_Release(This->nsevent); release_dispex(&This->dispex); + heap_free(This->type); heap_free(This); } @@ -1138,7 +1139,7 @@ static dispex_static_data_t DOMEvent_dispex = { DOMEvent_iface_tids }; -static DOMEvent *alloc_event(nsIDOMEvent *nsevent) +static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) { DOMEvent *event; @@ -1149,34 +1150,42 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent) init_dispex(&event->dispex, (IUnknown*)&event->IDOMEvent_iface, &DOMEvent_dispex); event->IDOMEvent_iface.lpVtbl = &DOMEventVtbl; event->ref = 1; + event->event_id = event_id; + if(event_id != EVENTID_LAST) { + event->type = heap_strdupW(event_info[event_id].name); + if(!event->type) { + IDOMEvent_Release(&event->IDOMEvent_iface); + return NULL; + } + } nsIDOMEvent_AddRef(event->nsevent = nsevent); - event->event_id = EVENTID_LAST; return event; } HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, DOMEvent **ret_event) { + eventid_t event_id = EVENTID_LAST; DOMEvent *event; nsAString nsstr; nsresult nsres; - event = alloc_event(nsevent); - if(!event) - return E_OUTOFMEMORY; - nsAString_Init(&nsstr, NULL); - nsres = nsIDOMEvent_GetType(event->nsevent, &nsstr); + nsres = nsIDOMEvent_GetType(nsevent, &nsstr); if(NS_SUCCEEDED(nsres)) { const WCHAR *type; nsAString_GetData(&nsstr, &type); - event->event_id = str_to_eid(type); - if(event->event_id == EVENTID_LAST) + event_id = str_to_eid(type); + if(event_id == EVENTID_LAST) FIXME("unknown event type %s\n", debugstr_w(type)); }else { ERR("GetType failed: %08x\n", nsres); } nsAString_Finish(&nsstr); + event = alloc_event(nsevent, event_id); + if(!event) + return E_OUTOFMEMORY; + *ret_event = event; return S_OK; } @@ -1196,7 +1205,7 @@ HRESULT create_document_event_str(HTMLDocumentNode *doc, const WCHAR *type, IDOM return E_FAIL; } - event = alloc_event(nsevent); + event = alloc_event(nsevent, EVENTID_LAST); nsIDOMEvent_Release(nsevent); if(!event) return E_OUTOFMEMORY; @@ -1220,7 +1229,7 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven return E_FAIL; } - event = alloc_event(nsevent); + event = alloc_event(nsevent, event_id); if(!event) return E_OUTOFMEMORY; @@ -1301,7 +1310,7 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) static void call_event_handlers(EventTarget *event_target, DOMEvent *event) { const eventid_t eid = event->event_id; - const listener_container_t *container = get_listener_container(event_target, event_info[eid].name, FALSE); + const listener_container_t *container = get_listener_container(event_target, event->type, FALSE); const BOOL cancelable = event_info[eid].flags & EVENT_CANCELABLE; const BOOL use_quirks = use_event_quirks(event_target); event_listener_t *listener, listeners_buf[8], *listeners = listeners_buf; @@ -1323,10 +1332,10 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) V_DISPATCH(&arg) = (IDispatch*)&event_target->dispex.IDispatchEx_iface; V_VT(&v) = VT_EMPTY; - TRACE("%s >>>\n", debugstr_w(event_info[eid].name)); + TRACE("%s >>>\n", debugstr_w(event->type)); hres = call_disp_func(listener->function, &dp, &v); if(hres == S_OK) { - TRACE("%s <<< %s\n", debugstr_w(event_info[eid].name), debugstr_variant(&v)); + TRACE("%s <<< %s\n", debugstr_w(event->type), debugstr_variant(&v)); if(cancelable) { if(V_VT(&v) == VT_BOOL) { @@ -1338,7 +1347,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) } VariantClear(&v); }else { - WARN("%s <<< %08x\n", debugstr_w(event_info[eid].name), hres); + WARN("%s <<< %08x\n", debugstr_w(event->type), hres); } } } @@ -1402,10 +1411,10 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) ? (IDispatch*)event->event_obj : (IDispatch*)&event->IDOMEvent_iface; V_VT(&v) = VT_EMPTY; - TRACE("%s >>>\n", debugstr_w(event_info[event->event_id].name)); + TRACE("%s >>>\n", debugstr_w(event->type)); hres = call_disp_func(listener->function, &dp, &v); if(hres == S_OK) { - TRACE("%s <<< %s\n", debugstr_w(event_info[event->event_id].name), + TRACE("%s <<< %s\n", debugstr_w(event->type), debugstr_variant(&v)); if(cancelable) { @@ -1418,7 +1427,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) } VariantClear(&v); }else { - WARN("%s <<< %08x\n", debugstr_w(event_info[event->event_id].name), hres); + WARN("%s <<< %08x\n", debugstr_w(event->type), hres); } }else { VARIANTARG arg; @@ -1428,10 +1437,10 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) V_DISPATCH(&arg) = (IDispatch*)event->event_obj; V_VT(&v) = VT_EMPTY; - TRACE("%s attached >>>\n", debugstr_w(event_info[eid].name)); + TRACE("%s attached >>>\n", debugstr_w(event->type)); hres = call_disp_func(listener->function, &dp, &v); if(hres == S_OK) { - TRACE("%s attached <<<\n", debugstr_w(event_info[eid].name)); + TRACE("%s attached <<<\n", debugstr_w(event->type)); if(cancelable) { if(V_VT(&v) == VT_BOOL) { @@ -1443,7 +1452,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) } VariantClear(&v); }else { - WARN("%s attached <<< %08x\n", debugstr_w(event_info[eid].name), hres); + WARN("%s attached <<< %08x\n", debugstr_w(event->type), hres); } } } @@ -1474,11 +1483,11 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) V_VT(&v) = VT_EMPTY; - TRACE("cp %s [%u] >>>\n", debugstr_w(event_info[eid].name), i); + TRACE("cp %s [%u] >>>\n", debugstr_w(event->type), i); hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid, cp->data->pass_event_arg ? event->event_obj : NULL, &v); if(hres == S_OK) { - TRACE("cp %s [%u] <<<\n", debugstr_w(event_info[eid].name), i); + TRACE("cp %s [%u] <<<\n", debugstr_w(event->type), i); if(cancelable) { if(V_VT(&v) == VT_BOOL) { @@ -1490,7 +1499,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) } VariantClear(&v); }else { - WARN("cp %s [%u] <<< %08x\n", debugstr_w(event_info[eid].name), i, hres); + WARN("cp %s [%u] <<< %08x\n", debugstr_w(event->type), i, hres); } } } @@ -1515,7 +1524,7 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) return; } - TRACE("(%p) %s\n", event_target, debugstr_w(event_info[event->event_id].name)); + TRACE("(%p) %s\n", event_target, debugstr_w(event->type)); event_flags = event_info[event->event_id].flags; iter = event_target; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 7dfc7ad..33eea21 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -64,6 +64,7 @@ typedef struct { nsIDOMEvent *nsevent; eventid_t event_id; + WCHAR *type; EventTarget *target; BOOL prevent_default; BOOL stop_propagation;

1 0

Hans Leidekker : taskschd: Consistently check for allocation failure.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 77a7094bb899780f09bd1ad4f571a813e0922ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a7094bb899780f09bd1ad4f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 1 12:01:50 2017 +0100 taskschd: Consistently check for allocation failure. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/folder_collection.c | 6 ++++- dlls/taskschd/task.c | 54 +++++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 47c9620..969baec 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -236,7 +236,11 @@ HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **o folders->ITaskFolderCollection_iface.lpVtbl = &TaskFolderCollection_vtbl; folders->ref = 1; - folders->path = heap_strdupW(path); + if (!(folders->path = heap_strdupW(path))) + { + heap_free(folders); + return E_OUTOFMEMORY; + } folders->count = count; folders->list = list; *obj = &folders->ITaskFolderCollection_iface; diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index df75236..9959f04 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -542,7 +542,9 @@ static HRESULT WINAPI RegistrationInfo_get_Description(IRegistrationInfo *iface, if (!description) return E_POINTER; - *description = SysAllocString(reginfo->description); + if (!reginfo->description) *description = NULL; + else if (!(*description = SysAllocString(reginfo->description))) return E_OUTOFMEMORY; + return S_OK; } @@ -568,7 +570,9 @@ static HRESULT WINAPI RegistrationInfo_get_Author(IRegistrationInfo *iface, BSTR if (!author) return E_POINTER; - *author = SysAllocString(reginfo->author); + if (!reginfo->author) *author = NULL; + else if (!(*author = SysAllocString(reginfo->author))) return E_OUTOFMEMORY; + return S_OK; } @@ -594,7 +598,9 @@ static HRESULT WINAPI RegistrationInfo_get_Version(IRegistrationInfo *iface, BST if (!version) return E_POINTER; - *version = SysAllocString(reginfo->version); + if (!reginfo->version) *version = NULL; + else if (!(*version = SysAllocString(reginfo->version))) return E_OUTOFMEMORY; + return S_OK; } @@ -620,7 +626,9 @@ static HRESULT WINAPI RegistrationInfo_get_Date(IRegistrationInfo *iface, BSTR * if (!date) return E_POINTER; - *date = SysAllocString(reginfo->date); + if (!reginfo->date) *date = NULL; + else if (!(*date = SysAllocString(reginfo->date))) return E_OUTOFMEMORY; + return S_OK; } @@ -646,7 +654,9 @@ static HRESULT WINAPI RegistrationInfo_get_Documentation(IRegistrationInfo *ifac if (!doc) return E_POINTER; - *doc = SysAllocString(reginfo->documentation); + if (!reginfo->documentation) *doc = NULL; + else if (!(*doc = SysAllocString(reginfo->documentation))) return E_OUTOFMEMORY; + return S_OK; } @@ -684,7 +694,9 @@ static HRESULT WINAPI RegistrationInfo_get_URI(IRegistrationInfo *iface, BSTR *u if (!uri) return E_POINTER; - *uri = SysAllocString(reginfo->uri); + if (!reginfo->uri) *uri = NULL; + else if (!(*uri = SysAllocString(reginfo->uri))) return E_OUTOFMEMORY; + return S_OK; } @@ -722,7 +734,9 @@ static HRESULT WINAPI RegistrationInfo_get_Source(IRegistrationInfo *iface, BSTR if (!source) return E_POINTER; - *source = SysAllocString(reginfo->source); + if (!reginfo->source) *source = NULL; + else if (!(*source = SysAllocString(reginfo->source))) return E_OUTOFMEMORY; + return S_OK; } @@ -921,8 +935,8 @@ static HRESULT WINAPI TaskSettings_get_RestartInterval(ITaskSettings *iface, BST return S_OK; } - *interval = SysAllocString(taskset->restart_interval); - if (!*interval) return E_OUTOFMEMORY; + if (!taskset->restart_interval) *interval = NULL; + else if (!(*interval = SysAllocString(taskset->restart_interval))) return E_OUTOFMEMORY; return S_OK; } @@ -1135,8 +1149,8 @@ static HRESULT WINAPI TaskSettings_get_ExecutionTimeLimit(ITaskSettings *iface, return S_OK; } - *limit = SysAllocString(taskset->execution_time_limit); - if (!*limit) return E_OUTOFMEMORY; + if (!taskset->execution_time_limit) *limit = NULL; + else if (!(*limit = SysAllocString(taskset->execution_time_limit))) return E_OUTOFMEMORY; return S_OK; } @@ -1187,14 +1201,8 @@ static HRESULT WINAPI TaskSettings_get_DeleteExpiredTaskAfter(ITaskSettings *ifa if (!delay) return E_POINTER; - if (!taskset->delete_expired_task_after) - { - *delay = NULL; - return S_OK; - } - - *delay = SysAllocString(taskset->delete_expired_task_after); - if (!*delay) return E_OUTOFMEMORY; + if (!taskset->delete_expired_task_after) *delay = NULL; + else if (!(*delay = SysAllocString(taskset->delete_expired_task_after))) return E_OUTOFMEMORY; return S_OK; } @@ -1746,13 +1754,9 @@ static HRESULT WINAPI ExecAction_get_Path(IExecAction *iface, BSTR *path) if (!path) return E_POINTER; - if (!action->path) - { - *path = NULL; - return S_OK; - } + if (!action->path) *path = NULL; + else if (!(*path = SysAllocString(action->path))) return E_OUTOFMEMORY; - if (!(*path = SysAllocString(action->path))) return E_OUTOFMEMORY; return S_OK; }

1 0

Piotr Caban : msvcrt: Fix buffer size checks in swscanf_s.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 7aa67f1e5f4e0ecafe9fbeec982326c4d78bf883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa67f1e5f4e0ecafe9fbeec9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 1 12:29:08 2017 +0100 msvcrt: Fix buffer size checks in swscanf_s. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 6 +++--- dlls/msvcrt/tests/scanf.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 2920b9b..cbbcae4 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -540,7 +540,7 @@ _FUNCTION_ { char *str = suppress ? NULL : va_arg(ap, char*); char *pstr = str; #ifdef SECURE - unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned)/sizeof(char); + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned); #else unsigned size = UINT_MAX; #endif @@ -566,7 +566,7 @@ _FUNCTION_ { MSVCRT_wchar_t *str = suppress ? NULL : va_arg(ap, MSVCRT_wchar_t*); MSVCRT_wchar_t *pstr = str; #ifdef SECURE - unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned)/sizeof(MSVCRT_wchar_t); + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned); #else unsigned size = UINT_MAX; #endif @@ -615,7 +615,7 @@ _FUNCTION_ { ULONG *Mask; int invert = 0; /* Set if we are NOT to find the chars */ #ifdef SECURE - unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned)/sizeof(_CHAR_); + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned); #else unsigned size = UINT_MAX; #endif diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 372d2f8..359b079 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -324,9 +324,43 @@ static void test_swscanf( void ) ok(c == 'b', "c = %x\n", c); } +static void test_swscanf_s(void) +{ + static const wchar_t fmt1[] = {'%','c',0}; + static const wchar_t fmt2[] = {'%','[','a','-','z',']',0}; + + int (WINAPIV *pswscanf_s)(const wchar_t*,const wchar_t*,...); + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + wchar_t buf[2], out[2]; + int ret; + + pswscanf_s = (void*)GetProcAddress(hmod, "swscanf_s"); + if(!pswscanf_s) { + win_skip("swscanf_s not available\n"); + return; + } + + buf[0] = 'a'; + buf[1] = '1'; + out[1] = 'b'; + ret = pswscanf_s(buf, fmt1, out, 1); + ok(ret == 1, "swscanf_s returned %d\n", ret); + ok(out[0] == 'a', "out[0] = %x\n", out[0]); + ok(out[1] == 'b', "out[1] = %x\n", out[1]); + + ret = pswscanf_s(buf, fmt2, out, 1); + ok(!ret, "swscanf_s returned %d\n", ret); + + ret = pswscanf_s(buf, fmt2, out, 2); + ok(ret == 1, "swscanf_s returned %d\n", ret); + ok(out[0] == 'a', "out[0] = %x\n", out[0]); + ok(!out[1], "out[1] = %x\n", out[1]); +} + START_TEST(scanf) { test_sscanf(); test_sscanf_s(); test_swscanf(); + test_swscanf_s(); }

1 0

Matteo Bruni : d3d11: Disallow 0-sized buffer shader resource views.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: ee00b90fa45dfbaf912d22886b29e52784ecc19b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee00b90fa45dfbaf912d22886… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 24 23:29:57 2017 +0100 d3d11: Disallow 0-sized buffer shader resource views. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 15 +++++++++++++++ dlls/d3d11/view.c | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2447cd7..f636a85 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18433,6 +18433,21 @@ static void test_buffer_srv(void) cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(cb_size), NULL); ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + buffer_desc.ByteWidth = 256; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + srv_desc.Format = DXGI_FORMAT_R8_UNORM; + srv_desc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER; + U(srv_desc).Buffer.FirstElement = 0; + U(srv_desc).Buffer.NumElements = 0; + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srv); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ID3D11Buffer_Release(buffer); + ps = NULL; srv = NULL; buffer = NULL; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index f747c4b..034a494 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -616,6 +616,11 @@ static HRESULT normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11R WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } + if (!desc->u.Buffer.u2.NumElements) + { + WARN("Zero sized buffer view.\n"); + return E_INVALIDARG; + } return S_OK; }

1 0

Józef Kucia : wined3d: Fix SM4 discard_z instruction.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: f3e612bf16664b44cbbec4b25dc185137e472d7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e612bf16664b44cbbec4b25… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 22 13:11:11 2017 +0100 wined3d: Fix SM4 discard_z instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/shader.c | 3 ++- dlls/wined3d/shader_sm4.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 317152c..568514b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6604,10 +6604,11 @@ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) { if (ins->ctx->reg_maps->shader_version.major >= 4) { + const char *condition = ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ ? "bool" : "!bool"; struct glsl_src_param src_param; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - shader_addline(ins->ctx->buffer, "if (bool(%s)) discard;\n", src_param.param_str); + shader_addline(ins->ctx->buffer, "if (%s(%s)) discard;\n", condition, src_param.param_str); } else { diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3707d15..c4eed76 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2958,7 +2958,8 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe if (ins.handler_idx == WINED3DSIH_BREAKP || ins.handler_idx == WINED3DSIH_CONTINUEP || ins.handler_idx == WINED3DSIH_IF - || ins.handler_idx == WINED3DSIH_RETP) + || ins.handler_idx == WINED3DSIH_RETP + || ins.handler_idx == WINED3DSIH_TEXKILL) { switch (ins.flags) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index a04debe..2665a67 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -894,7 +894,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DEFAULT, WINED3DSIH_DEFAULT, "", ""}, {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, "f", "f"}, {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, "f", "f"}, - {WINED3D_SM4_OP_DISCARD, WINED3DSIH_TEXKILL, "", "u"}, + {WINED3D_SM4_OP_DISCARD, WINED3DSIH_TEXKILL, "", "u", + shader_sm4_read_conditional_op}, {WINED3D_SM4_OP_DIV, WINED3DSIH_DIV, "f", "ff"}, {WINED3D_SM4_OP_DP2, WINED3DSIH_DP2, "f", "ff"}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, "f", "ff"},

1 0

Jacek Caban : mshtml: Use IDOMEvent for IHTMLEventObj:: get_type implementation.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 1508eb484fc7acfc8d0c095ea9d8da272a7c13b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1508eb484fc7acfc8d0c095ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:02:13 2017 +0100 mshtml: Use IDOMEvent for IHTMLEventObj::get_type implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4278d22..940fccc 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -296,7 +296,6 @@ typedef struct { LONG ref; - const event_info_t *type; DOMEvent *event; VARIANT return_value; } HTMLEventObj; @@ -613,13 +612,12 @@ static HRESULT WINAPI HTMLEventObj_get_type(IHTMLEventObj *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - if(!This->type) { + if(!This->event) { *p = NULL; return S_OK; } - *p = SysAllocString(This->type->name); - return *p ? S_OK : E_OUTOFMEMORY; + return IDOMEvent_get_type(&This->event->IDOMEvent_iface, p); } static HRESULT WINAPI HTMLEventObj_get_qualifier(IHTMLEventObj *iface, BSTR *p) @@ -1568,10 +1566,8 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) if(!event->event_obj && !event->no_event_obj) { event_obj_ref = alloc_event_obj(event); - if(event_obj_ref) { - event_obj_ref->type = event_info + event->event_id; + if(event_obj_ref) event->event_obj = &event_obj_ref->IHTMLEventObj_iface; - } } target_vtbl = dispex_get_vtbl(&event_target->dispex); @@ -1671,7 +1667,6 @@ HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_va return E_OUTOFMEMORY; } - event_obj->type = event_info + eid; if(!event_obj->event) hres = create_document_event(node->doc, eid, &event_obj->event);

1 0

Hans Leidekker : taskschd: Implement IDailyTrigger_put_Enabled.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 929272f1397473dd03a0af7202031c73c1c6545b URL: http://source.winehq.org/git/wine.git/?a=commit;h=929272f1397473dd03a0af720… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 1 12:01:53 2017 +0100 taskschd: Implement IDailyTrigger_put_Enabled. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 8b64663..d720d50 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -40,6 +40,7 @@ typedef struct { LONG ref; short interval; WCHAR *start_boundary; + BOOL enabled; } DailyTrigger; static inline DailyTrigger *impl_from_IDailyTrigger(IDailyTrigger *iface) @@ -230,7 +231,10 @@ static HRESULT WINAPI DailyTrigger_get_Enabled(IDailyTrigger *iface, VARIANT_BOO static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOOL enabled) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%x)\n", This, enabled); + + TRACE("(%p)->(%x)\n", This, enabled); + + This->enabled = enabled ? TRUE : FALSE; return S_OK; } @@ -310,6 +314,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->ref = 1; daily_trigger->interval = 1; daily_trigger->start_boundary = NULL; + daily_trigger->enabled = FALSE; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK;

1 0

Hans Leidekker : taskschd: Implement IDailyTrigger_get_StartBoundary.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 179d1ed75b55d6a71ba8a8c0c083a87c432b7d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=179d1ed75b55d6a71ba8a8c0c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 1 12:01:52 2017 +0100 taskschd: Implement IDailyTrigger_get_StartBoundary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 11 +++++++++-- dlls/taskschd/tests/scheduler.c | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index ee5a7dd..8b64663 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -181,8 +181,15 @@ static HRESULT WINAPI DailyTrigger_put_ExecutionTimeLimit(IDailyTrigger *iface, static HRESULT WINAPI DailyTrigger_get_StartBoundary(IDailyTrigger *iface, BSTR *start) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%p)\n", This, start); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, start); + + if (!start) return E_POINTER; + + if (!This->start_boundary) *start = NULL; + else if (!(*start = SysAllocString(This->start_boundary))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI DailyTrigger_put_StartBoundary(IDailyTrigger *iface, BSTR start) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index fb6d626..d0477a8 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1253,12 +1253,29 @@ static void test_daily_trigger(ITrigger *trigger) ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); ok(interval == 2, "interval = %d\n", interval); + hr = IDailyTrigger_get_StartBoundary(daily_trigger, NULL); + ok(hr == E_POINTER, "get_StartBoundary failed: %08x\n", hr); + + start_boundary = (BSTR)0xdeadbeef; + hr = IDailyTrigger_get_StartBoundary(daily_trigger, &start_boundary); + ok(hr == S_OK, "get_StartBoundary failed: %08x\n", hr); + ok(start_boundary == NULL, "start_boundary not set\n"); + for (i = 0; i < sizeof(start_test)/sizeof(start_test[0]); i++) { start_boundary = SysAllocString(start_test[i].str); hr = IDailyTrigger_put_StartBoundary(daily_trigger, start_boundary); ok(hr == start_test[i].hr, "%u: got %08x expected %08x\n", i, hr, start_test[i].hr); SysFreeString(start_boundary); + if (hr == S_OK) + { + start_boundary = NULL; + hr = IDailyTrigger_get_StartBoundary(daily_trigger, &start_boundary); + ok(hr == S_OK, "%u: got %08x\n", i, hr); + ok(start_boundary != NULL, "start_boundary not set\n"); + ok(!lstrcmpW(start_boundary, start_test[i].str), "%u: got %s\n", i, wine_dbgstr_w(start_boundary)); + SysFreeString(start_boundary); + } } hr = IDailyTrigger_put_StartBoundary(daily_trigger, NULL);

1 0

Matteo Bruni : d3d11: Validate D3D11_RESOURCE_MISC_GENERATE_MIPS flag for 2D textures.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 3561645aa30143d213c2dd420381365b5d2ff298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3561645aa30143d213c2dd420… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 24 23:30:01 2017 +0100 d3d11: Validate D3D11_RESOURCE_MISC_GENERATE_MIPS flag for 2D textures. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index ef2c9a2..12186dc 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -472,6 +472,14 @@ static BOOL validate_texture2d_desc(const D3D11_TEXTURE2D_DESC *desc) return FALSE; } + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS + && (~desc->BindFlags & (D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE))) + { + WARN("D3D11_RESOURCE_MISC_GENERATE_MIPS used without D3D11_BIND_RENDER_TARGET and " + "D3D11_BIND_SHADER_RESOURCE.\n"); + return FALSE; + } + return TRUE; }

1 0