December 2017 - wine-commits

Jacek Caban : mshtml: Use IDOMEvent for IHTMLEventObj:: get_type implementation.
by Alexandre Julliard 01 Dec '17

01 Dec '17

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

Jacek Caban : mshtml: Added IDOMEvent::get_type implementation.
by Alexandre Julliard 01 Dec '17

01 Dec '17

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 01 Dec '17

01 Dec '17

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: Implement IDailyTrigger_get_Enabled.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 3c2d8dc3aef7d0f0a42eff89f82aceb2bf4df41e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c2d8dc3aef7d0f0a42eff89f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 1 12:01:54 2017 +0100 taskschd: Implement IDailyTrigger_get_Enabled. 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, 25 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d720d50..a8b819c 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -224,8 +224,13 @@ static HRESULT WINAPI DailyTrigger_put_EndBoundary(IDailyTrigger *iface, BSTR en static HRESULT WINAPI DailyTrigger_get_Enabled(IDailyTrigger *iface, VARIANT_BOOL *enabled) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%p)\n", This, enabled); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, enabled); + + if (!enabled) return E_POINTER; + + *enabled = This->enabled ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOOL enabled) @@ -314,7 +319,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->ref = 1; daily_trigger->interval = 1; daily_trigger->start_boundary = NULL; - daily_trigger->enabled = FALSE; + daily_trigger->enabled = TRUE; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index d0477a8..c60fd1d 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1223,6 +1223,7 @@ static void test_daily_trigger(ITrigger *trigger) }; IDailyTrigger *daily_trigger; BSTR start_boundary; + VARIANT_BOOL enabled; short interval; HRESULT hr; ULONG i; @@ -1281,6 +1282,22 @@ static void test_daily_trigger(ITrigger *trigger) hr = IDailyTrigger_put_StartBoundary(daily_trigger, NULL); ok(hr == S_OK, "put_StartBoundary failed: %08x\n", hr); + hr = IDailyTrigger_get_Enabled(daily_trigger, NULL); + ok(hr == E_POINTER, "get_Enabled failed: %08x\n", hr); + + enabled = VARIANT_FALSE; + hr = IDailyTrigger_get_Enabled(daily_trigger, &enabled); + ok(hr == S_OK, "get_Enabled failed: %08x\n", hr); + ok(enabled == VARIANT_TRUE, "got %d\n", enabled); + + hr = IDailyTrigger_put_Enabled(daily_trigger, VARIANT_FALSE); + ok(hr == S_OK, "put_Enabled failed: %08x\n", hr); + + enabled = VARIANT_TRUE; + hr = IDailyTrigger_get_Enabled(daily_trigger, &enabled); + ok(hr == S_OK, "get_Enabled failed: %08x\n", hr); + ok(enabled == VARIANT_FALSE, "got %d\n", enabled); + IDailyTrigger_Release(daily_trigger); }

1 0

Hans Leidekker : taskschd: Implement IDailyTrigger_put_Enabled.
by Alexandre Julliard 01 Dec '17

01 Dec '17

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 01 Dec '17

01 Dec '17

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

Hans Leidekker : taskschd: Implement IDailyTrigger_put_StartBoundary.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: adad0705b0a68f47150527c9d7c3380aea6dbcd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adad0705b0a68f47150527c9d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 1 12:01:51 2017 +0100 taskschd: Implement IDailyTrigger_put_StartBoundary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 15 ++++++++++++++- dlls/taskschd/tests/scheduler.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 9959f04..ee5a7dd 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -39,6 +39,7 @@ typedef struct { IDailyTrigger IDailyTrigger_iface; LONG ref; short interval; + WCHAR *start_boundary; } DailyTrigger; static inline DailyTrigger *impl_from_IDailyTrigger(IDailyTrigger *iface) @@ -88,7 +89,11 @@ static ULONG WINAPI DailyTrigger_Release(IDailyTrigger *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) + { + TRACE("destroying %p\n", iface); + heap_free(This->start_boundary); heap_free(This); + } return ref; } @@ -183,7 +188,14 @@ static HRESULT WINAPI DailyTrigger_get_StartBoundary(IDailyTrigger *iface, BSTR static HRESULT WINAPI DailyTrigger_put_StartBoundary(IDailyTrigger *iface, BSTR start) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(start)); + WCHAR *str = NULL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(start)); + + if (start && !(str = heap_strdupW(start))) return E_OUTOFMEMORY; + heap_free(This->start_boundary); + This->start_boundary = str; + return S_OK; } @@ -290,6 +302,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->IDailyTrigger_iface.lpVtbl = &DailyTrigger_vtbl; daily_trigger->ref = 1; daily_trigger->interval = 1; + daily_trigger->start_boundary = NULL; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c7de7c7..fb6d626 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1195,9 +1195,37 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) static void test_daily_trigger(ITrigger *trigger) { + static const WCHAR startW[] = + {'2','0','0','4','-','0','1','-','0','1','T','0','0',':','0','0',':','0','0',0}; + static const WCHAR start2W[] = + {'2','0','0','4','-','0','1','-','0','1','T','0','0',':','0','0',':','0','0','Z',0}; + static const WCHAR start3W[] = + {'2','0','0','4','-','0','1','-','0','1','T','0','0',':','0','0',':','0','0','+','0','1',':','0','0',0}; + static const WCHAR start4W[] = + {'2','0','0','4','.','0','1','.','0','1','T','0','0','.','0','0','.','0','0',0}; + static const WCHAR start5W[] = + {'9','9','9','9','-','9','9','-','9','9','T','9','9',':','9','9',':','9','9',0}; + static const WCHAR start6W[] = + {'i','n','v','a','l','i','d',0}; + static const struct + { + const WCHAR *str; + HRESULT hr; + } + start_test[] = + { + {startW, S_OK}, + {start2W, S_OK}, + {start3W, S_OK}, + {start4W, S_OK}, + {start5W, S_OK}, + {start6W, S_OK}, + }; IDailyTrigger *daily_trigger; + BSTR start_boundary; short interval; HRESULT hr; + ULONG i; hr = ITrigger_QueryInterface(trigger, &IID_IDailyTrigger, (void**)&daily_trigger); ok(hr == S_OK, "Could not get IDailyTrigger iface: %08x\n", hr); @@ -1225,6 +1253,17 @@ static void test_daily_trigger(ITrigger *trigger) ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); ok(interval == 2, "interval = %d\n", interval); + 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); + } + + hr = IDailyTrigger_put_StartBoundary(daily_trigger, NULL); + ok(hr == S_OK, "put_StartBoundary failed: %08x\n", hr); + IDailyTrigger_Release(daily_trigger); }

1 0

Hans Leidekker : taskschd: Consistently check for allocation failure.
by Alexandre Julliard 01 Dec '17

01 Dec '17

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 01 Dec '17

01 Dec '17

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: Validate D3D11_RESOURCE_MISC_GENERATE_MIPS flag for 2D textures.
by Alexandre Julliard 01 Dec '17

01 Dec '17

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

Matteo Bruni : wined3d: Add texture flag for mipmap generation.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 22eabf1db797178ffb2fe3132a96166bd1eb8a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=22eabf1db797178ffb2fe3132… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 24 23:30:00 2017 +0100 wined3d: Add texture flag for mipmap generation. 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/wined3d/texture.c | 16 +++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ef8545d..7a8e1fb 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -384,6 +384,15 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_GET_DC; if (flags & WINED3D_TEXTURE_CREATE_DISCARD) texture->flags |= WINED3D_TEXTURE_DISCARD; + if (flags & WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS) + { + if (~format->flags[WINED3D_GL_RES_TYPE_TEX_2D] + & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) + WARN("Format doesn't support mipmaps generation, " + "ignoring WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS flag.\n"); + else + texture->flags |= WINED3D_TEXTURE_GENERATE_MIPMAPS; + } return WINED3D_OK; } @@ -1573,8 +1582,13 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned void CDECL wined3d_texture_generate_mipmaps(struct wined3d_texture *texture) { - /* TODO: Implement filters using GL_SGI_generate_mipmaps. */ FIXME("texture %p stub!\n", texture); + + if (!(texture->flags & WINED3D_TEXTURE_GENERATE_MIPMAPS)) + { + WARN("Texture without the WINED3D_TEXTURE_GENERATE_MIPMAPS flag, ignoring.\n"); + return; + } } static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(struct wined3d_texture *texture, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bd4a210..0daa861 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3074,6 +3074,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_DC_IN_USE 0x00001000 #define WINED3D_TEXTURE_DISCARD 0x00002000 #define WINED3D_TEXTURE_GET_DC 0x00004000 +#define WINED3D_TEXTURE_GENERATE_MIPMAPS 0x00008000 #define WINED3D_TEXTURE_ASYNC_COLOR_KEY 0x00000001 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f35d980..a0ac7ba 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1538,6 +1538,7 @@ enum wined3d_shader_byte_code_format #define WINED3D_TEXTURE_CREATE_DISCARD 0x00000002 #define WINED3D_TEXTURE_CREATE_GET_DC_LENIENT 0x00000004 #define WINED3D_TEXTURE_CREATE_GET_DC 0x00000008 +#define WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS 0x00000010 #define WINED3D_APPEND_ALIGNED_ELEMENT 0xffffffff

1 0

Matteo Bruni : d3d11/tests: Add a couple of testcases for UINT format SRVs.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 9f11f4adf1d76f9e819ae4e6888e3dc7735ed84a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f11f4adf1d76f9e819ae4e68… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 24 23:29:59 2017 +0100 d3d11/tests: Add a couple of testcases for UINT format SRVs. 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f636a85..906761d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3274,6 +3274,7 @@ static void test_create_shader_resource_view(void) #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN #define RGBA8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM +#define RGBA8_UINT DXGI_FORMAT_R8G8B8A8_UINT #define RGBA8_TL DXGI_FORMAT_R8G8B8A8_TYPELESS #define DIM_UNKNOWN D3D11_SRV_DIMENSION_UNKNOWN #define TEX_1D D3D11_SRV_DIMENSION_TEXTURE1D @@ -3344,6 +3345,8 @@ static void test_create_shader_resource_view(void) {{ 1, 13, RGBA8_UNORM}, {0}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, {{ 1, 14, RGBA8_UNORM}, {0}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, {{ 1, 18, RGBA8_UNORM}, {0}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 3}}, + {{ 1, 1, RGBA8_UINT}, {0}, {RGBA8_UINT, TEX_2D, 0, 1, 0, 1}}, + {{ 1, 1, RGBA8_TL}, {RGBA8_UINT, TEX_2D, 0, ~0u}, {RGBA8_UINT, TEX_2D, 0, 1, 0, 1}}, }; static const struct { @@ -3394,6 +3397,8 @@ static void test_create_shader_resource_view(void) {{TEX_2D, 1, 7, RGBA8_UNORM}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 2, ~0u}}, {{TEX_2D, 1, 7, RGBA8_UNORM}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, {{TEX_2D, 1, 9, RGBA8_UNORM}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, + {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_UINT, TEX_2D, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_UINT}, {RGBA8_UNORM, TEX_2D, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D_ARRAY, 0, 1, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D, 0, 1}},

1 0

Matteo Bruni : d3d11: Disallow 0-sized buffer shader resource views.
by Alexandre Julliard 01 Dec '17

01 Dec '17

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

Matteo Bruni : wined3d: Refuse to create texture views changing format from non-typeless.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 21c7b94c810c4722e060a105dbb66958b058f7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c7b94c810c4722e060a105d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 27 20:17:32 2017 +0100 wined3d: Refuse to create texture views changing format from non-typeless. 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/wined3d/utils.c | 14 ++++++++++++++ dlls/wined3d/view.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 24 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5eda92a..f739685 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3815,6 +3815,20 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT ali return slice_pitch * depth; } +BOOL wined3d_formats_are_srgb_variants(enum wined3d_format_id format1, enum wined3d_format_id format2) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(format_srgb_info); ++i) + { + if (format1 == format_srgb_info[i].srgb_format_id) + return format2 == format_srgb_info[i].base_format_id; + if (format1 == format_srgb_info[i].base_format_id) + return format2 == format_srgb_info[i].srgb_format_id; + } + return FALSE; +} + /***************************************************************************** * Trace formatting of useful values */ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 62f087b..b35b66b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -128,6 +128,14 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ struct wined3d_texture *texture = texture_from_resource(resource); unsigned int depth_or_layer_count; + if (resource->format->id != format->id && !wined3d_format_is_typeless(resource->format) + && !wined3d_formats_are_srgb_variants(resource->format->id, format->id)) + { + WARN("Trying to create incompatible view for non typeless format %s.\n", + debug_d3dformat(format->id)); + return NULL; + } + if (mip_slice && resource->type == WINED3D_RTYPE_TEXTURE_3D) depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3a9ac2e..bd4a210 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4251,6 +4251,8 @@ BOOL wined3d_format_is_depth_view(enum wined3d_format_id resource_format_id, enum wined3d_format_id view_format_id) DECLSPEC_HIDDEN; const struct wined3d_color_key_conversion * wined3d_format_get_color_key_conversion( const struct wined3d_texture *texture, BOOL need_alpha_ck) DECLSPEC_HIDDEN; +BOOL wined3d_formats_are_srgb_variants(enum wined3d_format_id format1, + enum wined3d_format_id format2) DECLSPEC_HIDDEN; BOOL wined3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) DECLSPEC_HIDDEN;

1 0

Józef Kucia : d3d10core/tests: Add test for SM4 discard instruction.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 7afbeb5dddaecdafeecb52fd96ed5acfe08d2029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7afbeb5dddaecdafeecb52fd9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 22 13:11:14 2017 +0100 d3d10core/tests: Add test for SM4 discard 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/d3d10core/tests/device.c | 93 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f947811..4228773 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9715,6 +9715,98 @@ static void test_sm4_continuec_instruction(void) release_test_context(&test_context); } +static void test_sm4_discard_instruction(void) +{ + ID3D10PixelShader *ps_discard_nz, *ps_discard_z; + struct d3d10core_test_context test_context; + ID3D10Device *device; + ID3D10Buffer *cb; + unsigned int i; + HRESULT hr; + + static const DWORD ps_discard_nz_code[] = + { +#if 0 + uint data; + + float4 main() : SV_Target + { + if (data) + discard; + return float4(0.0f, 0.5f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0xfa7e5758, 0xd8716ffc, 0x5ad6a940, 0x2b99bba2, 0x00000001, 0x000000d0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, 0x00000040, 0x00000016, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0404000d, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f000000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const DWORD ps_discard_z_code[] = + { +#if 0 + uint data; + + float4 main() : SV_Target + { + if (!data) + discard; + return float4(0.0f, 1.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x5c4dd108, 0x1eb43558, 0x7c02c98c, 0xd81eb34c, 0x00000001, 0x000000d0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, 0x00000040, 0x00000016, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0400000d, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct uvec4 values[] = + { + {0x0000000}, + {0x0000001}, + {0x8000000}, + {0xfffffff}, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(*values), NULL); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + hr = ID3D10Device_CreatePixelShader(device, ps_discard_nz_code, sizeof(ps_discard_nz_code), &ps_discard_nz); + ok(SUCCEEDED(hr), "Failed to create discard_nz pixel shader, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_discard_z_code, sizeof(ps_discard_z_code), &ps_discard_z); + ok(SUCCEEDED(hr), "Failed to create discard_z pixel shader, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(values); ++i) + { + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &values[i], 0, 0); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + ID3D10Device_PSSetShader(device, ps_discard_nz); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, values[i].x ? 0xffffffff : 0xff007f00, 1); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + ID3D10Device_PSSetShader(device, ps_discard_z); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, values[i].x ? 0xff00ff00 : 0xffffffff, 1); + } + + ID3D10Buffer_Release(cb); + ID3D10PixelShader_Release(ps_discard_nz); + ID3D10PixelShader_Release(ps_discard_z); + release_test_context(&test_context); +} + static void test_create_input_layout(void) { D3D10_INPUT_ELEMENT_DESC layout_desc[] = @@ -12979,6 +13071,7 @@ START_TEST(device) test_sm4_if_instruction(); test_sm4_breakc_instruction(); test_sm4_continuec_instruction(); + test_sm4_discard_instruction(); test_create_input_layout(); test_input_assembler(); test_null_sampler();

1 0

Józef Kucia : d3d11/tests: Add test for SM4 discard instruction.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 8fd53fe015f6cf33ca79fe5ac1415d74913154d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd53fe015f6cf33ca79fe5ac… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 22 13:11:13 2017 +0100 d3d11/tests: Add test for SM4 discard 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/d3d11/tests/d3d11.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 59f2e6e..2447cd7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12991,6 +12991,102 @@ static void test_sm4_continuec_instruction(void) release_test_context(&test_context); } +static void test_sm4_discard_instruction(void) +{ + ID3D11PixelShader *ps_discard_nz, *ps_discard_z; + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11Device *device; + ID3D11Buffer *cb; + unsigned int i; + HRESULT hr; + + static const DWORD ps_discard_nz_code[] = + { +#if 0 + uint data; + + float4 main() : SV_Target + { + if (data) + discard; + return float4(0.0f, 0.5f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0xfa7e5758, 0xd8716ffc, 0x5ad6a940, 0x2b99bba2, 0x00000001, 0x000000d0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, 0x00000040, 0x00000016, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0404000d, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f000000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const DWORD ps_discard_z_code[] = + { +#if 0 + uint data; + + float4 main() : SV_Target + { + if (!data) + discard; + return float4(0.0f, 1.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x5c4dd108, 0x1eb43558, 0x7c02c98c, 0xd81eb34c, 0x00000001, 0x000000d0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, 0x00000040, 0x00000016, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0400000d, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct uvec4 values[] = + { + {0x0000000}, + {0x0000001}, + {0x8000000}, + {0xfffffff}, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(*values), NULL); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + hr = ID3D11Device_CreatePixelShader(device, ps_discard_nz_code, sizeof(ps_discard_nz_code), + NULL, &ps_discard_nz); + ok(SUCCEEDED(hr), "Failed to create discard_nz pixel shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_discard_z_code, sizeof(ps_discard_z_code), + NULL, &ps_discard_z); + ok(SUCCEEDED(hr), "Failed to create discard_z pixel shader, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(values); ++i) + { + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &values[i], 0, 0); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_PSSetShader(context, ps_discard_nz, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, values[i].x ? 0xffffffff : 0xff007f00, 1); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_PSSetShader(context, ps_discard_z, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, values[i].x ? 0xff00ff00 : 0xffffffff, 1); + } + + ID3D11Buffer_Release(cb); + ID3D11PixelShader_Release(ps_discard_nz); + ID3D11PixelShader_Release(ps_discard_z); + release_test_context(&test_context); +} + static void test_sm5_swapc_instruction(void) { struct input @@ -22506,6 +22602,7 @@ START_TEST(d3d11) test_sm4_if_instruction(); test_sm4_breakc_instruction(); test_sm4_continuec_instruction(); + test_sm4_discard_instruction(); test_sm5_swapc_instruction(); test_create_input_layout(); test_input_assembler();

1 0

Józef Kucia : wined3d: Introduce helper function to generate conditional instructions.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 577ccfdda991156028496772645ac1f592d03e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=577ccfdda9911560284967726… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 22 13:11:12 2017 +0100 wined3d: Introduce helper function to generate conditional instructions. 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 | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 568514b..98cd321 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5068,13 +5068,20 @@ static void shader_glsl_default(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "default:\n"); } -static void shader_glsl_if(const struct wined3d_shader_instruction *ins) +static void shader_glsl_generate_conditional_op(const struct wined3d_shader_instruction *ins, + const char *op) { - const char *condition = (ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ) ? "bool" : "!bool"; - struct glsl_src_param src0_param; + struct glsl_src_param src_param; + const char *condition; - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); - shader_addline(ins->ctx->buffer, "if (%s(%s)) {\n", condition, src0_param.param_str); + condition = ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ ? "bool" : "!bool"; + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); + shader_addline(ins->ctx->buffer, "if (%s(%s)) %s\n", condition, src_param.param_str, op); +} + +static void shader_glsl_if(const struct wined3d_shader_instruction *ins) +{ + shader_glsl_generate_conditional_op(ins, "{"); } static void shader_glsl_ifc(const struct wined3d_shader_instruction *ins) @@ -5128,22 +5135,19 @@ static void shader_glsl_breakc(const struct wined3d_shader_instruction *ins) static void shader_glsl_conditional_op(const struct wined3d_shader_instruction *ins) { - const char *condition = (ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ) ? "bool" : "!bool"; - struct glsl_src_param src_param; const char *op; switch (ins->handler_idx) { - case WINED3DSIH_BREAKP: op = "break"; break; - case WINED3DSIH_CONTINUEP: op = "continue"; break; - case WINED3DSIH_RETP: op = "return"; break; + case WINED3DSIH_BREAKP: op = "break;"; break; + case WINED3DSIH_CONTINUEP: op = "continue;"; break; + case WINED3DSIH_RETP: op = "return;"; break; default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); return; } - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - shader_addline(ins->ctx->buffer, "if (%s(%s)) %s;\n", condition, src_param.param_str, op); + shader_glsl_generate_conditional_op(ins, op); } static void shader_glsl_continue(const struct wined3d_shader_instruction *ins) @@ -6604,11 +6608,7 @@ 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 (%s(%s)) discard;\n", condition, src_param.param_str); + shader_glsl_generate_conditional_op(ins, "discard;"); } else {

1 0

Józef Kucia : wined3d: Fix SM4 discard_z instruction.
by Alexandre Julliard 01 Dec '17

01 Dec '17

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

Nikolay Sivov : d2d1: Respond to ID2D1Image query.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 4e610f059dc070296bcfc9e71cecde793385a77c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e610f059dc070296bcfc9e71… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 22 17:21:05 2017 +0300 d2d1: Respond to ID2D1Image query. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 1 + dlls/d2d1/tests/d2d1.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 6d9c352..b03482a 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -34,6 +34,7 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_QueryInterface(ID2D1Bitmap *iface, R TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_ID2D1Bitmap) + || IsEqualGUID(iid, &IID_ID2D1Image) || IsEqualGUID(iid, &IID_ID2D1Resource) || IsEqualGUID(iid, &IID_IUnknown)) { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3a28e38..5116d78 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1476,6 +1476,7 @@ static void test_bitmap_brush(void) IDXGISurface *surface; ID2D1Factory *factory; D2D1_COLOR_F color; + ID2D1Image *image; D2D1_SIZE_U size; unsigned int i; ULONG refcount; @@ -1535,6 +1536,11 @@ static void test_bitmap_brush(void) hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Image, (void **)&image); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get ID2D1Image, hr %#x.\n", hr); + if (hr == S_OK) + ID2D1Image_Release(image); + /* Creating a brush with a NULL bitmap crashes on Vista, but works fine on * Windows 7+. */ hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &brush);

1 0

Stefan Dösinger : d3d8/tests: Test mode change messages.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 90c7e55190377f3e2643daae60f6cf6066606a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=90c7e55190377f3e2643daae6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 15 23:21:17 2017 +0100 d3d8/tests: Test mode change messages. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9cebd17..94b3e2e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2435,6 +2435,7 @@ struct message enum message_window window; BOOL check_wparam; WPARAM expect_wparam; + WINDOWPOS *store_wp; }; static const struct message *expect_messages; @@ -2483,6 +2484,9 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM "Got unexpected wparam %lx for message %x, expected %lx.\n", wparam, message, expect_messages->expect_wparam); + if (expect_messages->store_wp) + *expect_messages->store_wp = *(WINDOWPOS *)lparam; + ++expect_messages; } } @@ -2549,8 +2553,9 @@ static void test_wndproc(void) D3DDISPLAYMODE d3ddm; DWORD d3d_width = 0, d3d_height = 0, user32_width = 0, user32_height = 0; DEVMODEW devmode; - LONG change_ret; + LONG change_ret, device_style; BOOL ret; + WINDOWPOS windowpos; static const struct message create_messages[] = { @@ -2649,6 +2654,31 @@ static void test_wndproc(void) {WM_SIZE, FOCUS_WINDOW, TRUE, SIZE_MAXIMIZED}, {0, 0, FALSE, 0}, }; + struct message mode_change_messages[] = + { + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_SIZE, DEVICE_WINDOW, FALSE, 0}, + /* TODO: WM_DISPLAYCHANGE is sent to the focus window too, but the order is + * differs between Wine and Windows. */ + /* TODO 2: Windows sends a second WM_WINDOWPOSCHANGING(SWP_NOMOVE | SWP_NOSIZE + * | SWP_NOACTIVATE) in this situation, suggesting a difference in their ShowWindow + * implementation. This SetWindowPos call could in theory affect the Z order. Wine's + * ShowWindow does not send such a message because the window is already visible. */ + {0, 0, FALSE, 0}, + }; + struct message mode_change_messages_hidden[] = + { + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_SIZE, DEVICE_WINDOW, FALSE, 0}, + {WM_SHOWWINDOW, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0, &windowpos}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + /* TODO: WM_DISPLAYCHANGE is sent to the focus window too, but the order is + * differs between Wine and Windows. */ + {0, 0, FALSE, 0}, + }; d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); @@ -3010,13 +3040,63 @@ static void test_wndproc(void) ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + filter_messages = NULL; + + ShowWindow(device_window, SW_RESTORE); + SetForegroundWindow(focus_window); + flush_events(); + filter_messages = focus_window; device_desc.device_window = device_window; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; } + filter_messages = NULL; + flush_events(); + + device_desc.width = user32_width; + device_desc.height = user32_height; + + expect_messages = mode_change_messages; + filter_messages = focus_window; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + filter_messages = NULL; + + flush_events(); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + expect_messages->message, expect_messages->window, i); + + /* World of Warplanes hides the window by removing WS_VISIBLE and expects Reset() to show it again. */ + device_style = GetWindowLongA(device_window, GWL_STYLE); + SetWindowLongA(device_window, GWL_STYLE, device_style & ~WS_VISIBLE); + + flush_events(); + device_desc.width = d3d_width; + device_desc.height = d3d_height; + memset(&windowpos, 0, sizeof(windowpos)); + + expect_messages = mode_change_messages_hidden; + filter_messages = focus_window; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + filter_messages = NULL; + + flush_events(); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + + ok(windowpos.hwnd == device_window && !windowpos.hwndInsertAfter + && !windowpos.x && !windowpos.y && !windowpos.cx && !windowpos.cy + && windowpos.flags == (SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE), + "Got unexpected WINDOWPOS hwnd=%p, insertAfter=%p, x=%d, y=%d, cx=%d, cy=%d, flags=%x\n", + windowpos.hwnd, windowpos.hwndInsertAfter, windowpos.x, windowpos.y, windowpos.cx, + windowpos.cy, windowpos.flags); + + device_style = GetWindowLongA(device_window, GWL_STYLE); + ok(device_style & WS_VISIBLE, "Expected the device window to be visible.\n"); proc = SetWindowLongPtrA(focus_window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);

1 0

Stefan Dösinger : wined3d: Show the device window when changing fullscreen resolutions.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 04d4584deadbd4dd7627be46f7447a6d4b087f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=04d4584deadbd4dd7627be46f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 15 23:21:16 2017 +0100 wined3d: Show the device window when changing fullscreen resolutions. World of Warplanes calls SetWindowLong(window, GWL_STYLE, WS_POPUP) before calling reset, effectively hiding the window. It does not call SetWindowPos(SWP_FRAMECHANGED), so the effect isn't visible and the game displays fine after the reset. However, after the next mouse click WINPOS_WindowFromPoint skips the window because it doesn't have WS_VISIBLE and returns the desktop window. This in turn triggers a focus loss and d3d9 minimizes the game. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 118 +++++++++++++++++++++++++++++++++++++++++++-- dlls/d3d9/tests/device.c | 121 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/swapchain.c | 1 + 3 files changed, 232 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04d4584deadbd4dd7627b…

1 0

Alexandre Julliard : configure: Replace AC_HEADER_MAJOR macro to handle glibc 2.25 sys/types.h breakage.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 4100c9210dba2ba280b08e474f67d139a4a6a571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4100c9210dba2ba280b08e474… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 1 12:43:19 2017 +0100 configure: Replace AC_HEADER_MAJOR macro to handle glibc 2.25 sys/types.h breakage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 16 ++++++++++++++++ configure | 36 ++---------------------------------- configure.ac | 2 +- 3 files changed, 19 insertions(+), 35 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 9364188..2c11de0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -35,6 +35,22 @@ AS_VAR_IF([ac_cv_prog_$1],[], AC_CHECK_PROG([$1],[$2],[$2],[$3],[$4])])], [AS_VAR_COPY([$1],[ac_cv_prog_$1])])]) +dnl WINE_HEADER_MAJOR() +dnl +dnl Same as AC_HEADER_MAJOR but fixed to handle the glibc 2.25 sys/types.h breakage +dnl +AC_DEFUN([WINE_HEADER_MAJOR], +[AC_CHECK_HEADER(sys/mkdev.h, + [AC_DEFINE(MAJOR_IN_MKDEV, 1, + [Define to 1 if `major', `minor', and `makedev' are + declared in <mkdev.h>.])]) +if test $ac_cv_header_sys_mkdev_h = no; then + AC_CHECK_HEADER(sys/sysmacros.h, + [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, + [Define to 1 if `major', `minor', and `makedev' + are declared in <sysmacros.h>.])]) +fi]) + dnl **** Initialize the programs used by other checks **** dnl dnl Usage: WINE_PATH_SONAME_TOOLS diff --git a/configure b/configure index e12fc0b..1da4efa 100755 --- a/configure +++ b/configure @@ -7051,35 +7051,6 @@ fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5 -$as_echo_n "checking whether sys/types.h defines makedev... " >&6; } -if ${ac_cv_header_sys_types_h_makedev+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> -int -main () -{ -return makedev(0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_header_sys_types_h_makedev=yes -else - ac_cv_header_sys_types_h_makedev=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5 -$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; } - -if test $ac_cv_header_sys_types_h_makedev = no; then ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" if test "x$ac_cv_header_sys_mkdev_h" = xyes; then : @@ -7088,9 +7059,8 @@ $as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h fi - - if test $ac_cv_header_sys_mkdev_h = no; then - ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" +if test $ac_cv_header_sys_mkdev_h = no; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then : $as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h @@ -7098,9 +7068,7 @@ $as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 $as_echo_n "checking whether stat file-mode macros are broken... " >&6; } if ${ac_cv_header_stat_broken+:} false; then : diff --git a/configure.ac b/configure.ac index 4eafce1..6cba83b 100644 --- a/configure.ac +++ b/configure.ac @@ -525,7 +525,7 @@ AC_CHECK_HEADERS(\ valgrind/valgrind.h \ zlib.h ) -AC_HEADER_MAJOR() +WINE_HEADER_MAJOR() AC_HEADER_STAT() dnl **** Checks for headers that depend on other ones ****

1 0

Stefan Leichter : wdscore: Add stub DLL.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: ff061b9edfc28a4f15b018b8a843a307ccedecc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff061b9edfc28a4f15b018b8a… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Thu Nov 30 21:54:11 2017 +0100 wdscore: Add stub DLL. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/wdscore/Makefile.in | 4 ++ dlls/wdscore/wdscore.spec | 161 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wdscore/wdscore_main.c | 43 ++++++++++++ 5 files changed, 211 insertions(+) diff --git a/configure b/configure index afe9492..e12fc0b 100755 --- a/configure +++ b/configure @@ -1500,6 +1500,7 @@ enable_virtdisk enable_vssapi enable_wbemdisp enable_wbemprox +enable_wdscore enable_webservices enable_wer enable_wevtapi @@ -18978,6 +18979,7 @@ wine_fn_config_dll wbemdisp enable_wbemdisp clean wine_fn_config_test dlls/wbemdisp/tests wbemdisp_test wine_fn_config_dll wbemprox enable_wbemprox clean wine_fn_config_test dlls/wbemprox/tests wbemprox_test +wine_fn_config_dll wdscore enable_wdscore wine_fn_config_dll webservices enable_webservices implib wine_fn_config_test dlls/webservices/tests webservices_test wine_fn_config_dll wer enable_wer implib diff --git a/configure.ac b/configure.ac index 6bae4e3..4eafce1 100644 --- a/configure.ac +++ b/configure.ac @@ -3593,6 +3593,7 @@ WINE_CONFIG_DLL(wbemdisp,,[clean]) WINE_CONFIG_TEST(dlls/wbemdisp/tests) WINE_CONFIG_DLL(wbemprox,,[clean]) WINE_CONFIG_TEST(dlls/wbemprox/tests) +WINE_CONFIG_DLL(wdscore) WINE_CONFIG_DLL(webservices,,[implib]) WINE_CONFIG_TEST(dlls/webservices/tests) WINE_CONFIG_DLL(wer,,[implib]) diff --git a/dlls/wdscore/Makefile.in b/dlls/wdscore/Makefile.in new file mode 100644 index 0000000..5bcdb2c --- /dev/null +++ b/dlls/wdscore/Makefile.in @@ -0,0 +1,4 @@ +MODULE = wdscore.dll + +C_SRCS = \ + wdscore_main.c diff --git a/dlls/wdscore/wdscore.spec b/dlls/wdscore/wdscore.spec new file mode 100644 index 0000000..ab4aeb7 --- /dev/null +++ b/dlls/wdscore/wdscore.spec @@ -0,0 +1,161 @@ +@ stub ??0?$CDynamicArray@EPAE@@QAE@I@Z +@ stub ??0?$CDynamicArray@EPAUSkey@@@@QAE@I@Z +@ stub ??0?$CDynamicArray@EPAUSValue@@@@QAE@I@Z +@ stub ??0?$CDynamicArray@GPAG@QAE@I@Z +@ stub ??0?$CDynamicArray@PAUSEnumBinContext@@PAPAU1@@@QAE@I@Z +@ stub ??0?$CDynamicArray@USKeepEntry@CBlackboardFactory@@PAU12@@@QAE@I@Z +@ stub ??0?$CDynamicArray@_KPA_K@@QAE@I@Z +@ stub ??1?$CDynamicArray@EPAE@@QAE@XZ +@ stub ??1?$CDynamicArray@EPAUSKey@@@@QAE@XZ +@ stub ??1?$CDynamicArray@EPAUSValue@@@@QAE@XZ +@ stub ??1?$CDynamicArray@GPAG@@QAE@XZ +@ stub ??1?$CDynamicArray@PAUSEnumBinContext@@PAPAU1@@@QAE@XZ +@ stub ??1?$CDynamicArray@USKeepEntry@CBlackboardFactory@@PAU12@@@QAE@XZ +@ stub ??4?$CDynamicArray@_KPA_K@@QAE@XZ +@ stub ??4?$CDynamicArray@EPAE@@QAEAAV@ABV@@Z +@ stub ??4?$CDynamicArray@EPAUSKey@@@@@QAEAAV0@ABV0@@Z +@ stub ??4?$CDynamicArray@EPAUSValue@@@@@QAEAAV0@ABV0@@Z +@ stub ??4?$CDynamicArray@GPAG@@QAEAAV@ABV@@Z +@ stub ??4?$CDynamicArray@PAUSEnumBinContext@@PAPAU1@@@QAEAAV@ABV@@Z +@ stub ??4?$CDynamicArray@USKeepEntry@CBlackboardFactory@@PAU12@@@QAEAAV@ABV@@Z +@ stub ??4?$CDynamicArray@_KPA_K@@QAEAAV@ABV@@Z +@ stub ??A?$CDynamicArray@PAUSEnumBinContext@@PAPAU1@@@QAEAAPAUSEnumBinContext@@I@Z +@ stub ??A?$CDynamicArray@_KPA_K@QAEAA_KI@Z +@ stub ??B?$CDynamicArray@EPAUSKey@@@@@QBEPAUSKey@@XZ +@ stub ??B?$CDynamicArray@EPAUSValue@@@@@QBEPAUSValue@@XZ +@ stub ??B?$CDynamicArray@GPAG@@QBEPAGXZ +@ stub ??C?$CDynamicArray@EPAUSKey@@@@@QBEPAUSKey@@XZ +@ stub ??C?$CDynamicArray@EPAUSValue@@@@@QBEPAUSValue@@XZ +@ stub ??_F?$CDynamicArray@EPAE@@QAEXXZ +@ stub ??_F?$CDynamicArray@EPAUSKey@@@@@QAEXXZ +@ stub ??_F?$CDynamicArray@EPAUSValue@@@@@QAEXXZ +@ stub ??_F?$CDynamicArray@GPAG@@QAEXXZ +@ stub ??_F?$CDynamicArray@PAUSEnumBinContext@@PAPAU1@@@QAEXXZ +@ stub ??_F?$CDynamicArray@USKeepEntry@CBlackboardFactory@@PAU12@@@QAEXXZ +@ stub ??_F?$CDynamicArray@_KPA_K@@QAEXXZ +@ stub ?Add@?$CDynamicArray@PAUSEnumBinContext@@PAPAU1@@@QAEHAAPAUSEnumBinContext@@@Z +@ stub ?Add@?$CDynamicArray@USKeepEntry@CBlackboardFactory@@PAU12@@@QAEHAAUSKeeperEntry@CBlackboardFactory@@@Z +@ stub ?Add@?$CDynamicArray@USKeepEntry@CBlackboardFactory@@PAU12@@@QAEHAAUSKeeperEntry@CBlackboardFactory@@AAI@Z +@ stub ?Add@?$CDynamicArray@_KPA_K@@QAEHAA_K@Z +@ stub ?ElementAt@?$CDynamicArray@GPAG@@QAEAAGI@Z +@ stub ?ElementAt@?$CDynamicArray@USKeepEntry@CBlackboardFactory@@PAU12@@@QAEHAAUSKeeperEntry@CBlackboardFactory@@I@Z +@ stub ?GetBuffer@?$CDynamicArray@EPAE@@QAEPAEI@Z +@ stub ?GetBuffer@?$CDynamicArray@EPAUSValue@@@@QAEPAUSValue@@I@Z +@ stub ?GetBuffer@?$CDynamicArray@GPAG@@QAEPAGI@Z +@ stub ?GetSize@?$CDynamicArray@EPAE@@QBEIXZ +@ stub ?GetSize@?$CDynamicArray@@GPAG@@QBEIXZ +@ stub ?GetSize@?$CDynamicArray@@PAUSEnumBinContext@@PAPAU1@@@QBEIXZ +@ stub ?GetSize@?$CDynamicArray@USKeepEntry@CBlackboardFactory@@PAU12@@@QBEIXZ +@ stub ?GetSize@?$CDynamicArray@_KPA_K@@QBEIXZ +@ stub ?Init@?$CDynamicArray@EPAE@@QBEIXZ +@ stub ?Init@?$CDynamicArray@EPAUSKey@@@@IAEXI@Z +@ stub ?Init@?$CDynamicArray@EPAUSValue@@@@IAEXI@Z +@ stub ?Init@?$CDynamicArray@GPAG@@IAEXI@Z +@ stub ?Init@?$CDynamicArray@PAUSEnumBinContext@@PAPAU1@IAEXI@Z +@ stub ?Init@?$CDynamicArray@USKeepEntry@CBlackboardFactory@@PAU12@@@IAEXI@Z +@ stub ?Init@?$CDynamicArray@_KPA_K@@IAEXI@Z +@ stub ?RemoveAll@?$CDynamicArray@USKeepEntry@CBlackboardFactory@@PAU12@@@QAEXXZ +@ stub ?RemoveAll@?$CDynamicArray@_KPA_K@@QAEXXZ +@ stub ?RemoveItemFromTail@?$CDynamicArray@PAUSEnumBinContext@@PAPAU1@@@QAEXXZ +@ stub ?SetSize@?$CDynamicArray@EPAE@@QAEHK@Z +@ stub ?SetSize@?$CDynamicArray@EPAUSKey@@@@QAEHK@Z +@ stub ?SetSize@?$CDynamicArray@EPAUSValue@@@@QAEHK@Z +@ stub ?SetSize@?$CDynamicArray@GPAG@@QAEHK@Z +@ stub ?SetSize@?$CDynamicArray@PAUSEnumBinContext@@PAPAU1@@@QAEHK@Z +@ stub ?SetSize@?$CDynamicArray@USKeepEntry@CBlackboardFactory@@PAU12@@@QAEHK@Z +@ stub ?SetSize@?$CDynamicArray@_KPA_K@@AEHK@Z +@ stub WdsGetPointer +#@ extern g_Kernel32 +#@ extern g_bEnableDiagnosticMode +@ stub ConstructPartialMsgIfA +@ stub ConstructPartialMsgIfW +@ stub ConstructPartialMsgVA +@ stub ConstructPartialMsgVW +@ stub CurrentIP +@ stub EndMajorTask +@ stub EndMinorTask +@ stub GetMajorTask +@ stub GetMajorTaskA +@ stub GetMinorTask +@ stub GetMinorTaskA +@ stub StartMajorTask +@ stub StartMinorTask +@ stub WdsAbortBlackboardItemEnum +@ stub WdsAddModule +@ stub WdsAddUsmtLogStack +@ stub WdsAllocCollection +@ stub WdsCollectionAddValue +@ stub WdsCollectionGetValue +@ stub WdsCopyBlackboardItems +@ stub WdsCopyBlackboardItemsEx +@ stub WdsCreateBlackboard +@ stub WdsDeleteBlackboardValue +@ stub WdsDeleteEvent +@ stub WdsDestroyBlackboard +@ stub WdsDuplicateData +@ stub WdsEnableDiagnosticMode +@ stub WdsEnableExit +@ stub WdsEnableExitEx +@ stub WdsEnumFirstBlackboardItem +@ stub WdsEnumFirstCollectionValue +@ stub WdsEnumNextBlackboardItem +@ stub WdsEnumNextCollectionValue +@ stub WdsExecuteWorkQueue +@ stub WdsExecuteWorkQueue2 +@ stub WdsExecuteWorkQueueEx +@ stub WdsExitImmediately +@ stub WdsExitImmediatelyEx +@ stub WdsFreeCollection +@ stub WdsFreeData +@ stub WdsGenericSetupLogInit +@ stub WdsGetAssertFlags +@ stub WdsGetBlackboardBinaryData +@ stub WdsGetBlackboardStringA +@ stub WdsGetBlackboardStringW +@ stub WdsGetBlackboardUintPtr +@ stub WdsGetBlackboardValue +@ stub WdsGetCurrentExecutionGroup +@ stub WdsGetSetupLog +@ stub WdsTempDir +@ stub WdsInitialize +@ stub WdsInitializeCallbackArray +@ stub WdsInitializeDataBinary +@ stub WdsInitializeDataStringA +@ stub WdsInitializeDataStringW +@ stub WdsInitializeDataUInt32 +@ stub WdsInitializeDataUInt64 +@ stub WdsIsDiagnosticModeEnabled +@ stub WdsInterateOfflineQueue +@ stub WdsInterateQueue +@ stub WdsLockBlackboardValue +@ stub WdsLockExecutionGroup +@ stub WdsLogCreate +@ stub WdsLogDestroy +@ stub WdsLogRegStockProviders +@ stub WdsLogRegisterProvider +@ stub WdsLogStructuredException +@ stub WdsLogUnRegStockProviders +@ stub WdsLogUnRegisterProvider +@ stub WdsPackCollection +@ stub WdsPublish +@ stub WdsPublishEx +@ stub WdsPublishImmediateAsynch +@ stub WdsPublishImmediateEx +@ stub WdsPublishOffline +@ stub WdsSeqAlloc +@ stub WdsSeqFree +@ stub WdsSetAssertFlags +@ stub WdsSetBlackboardValue +@ stub WdsSetNextExecutionGroup +@ stub WdsSetUILanguage +@ stub WdsSetupLogDestroy +@ stub WdsSetupLogInit +@ stub WdsSetLogMessageA +@ stub WdsSetLogMessageW +@ stub WdsSubscribeEx +@ stub WdsTerminate +@ stub WdsUnlockExecutionGroup +@ stub WdsUnpackCollection +@ stub WdsUnsubscribe +@ stub WdsUnsubscribeEx +@ stub WdsValidBlackboard diff --git a/dlls/wdscore/wdscore_main.c b/dlls/wdscore/wdscore_main.c new file mode 100644 index 0000000..f9a3154 --- /dev/null +++ b/dlls/wdscore/wdscore_main.c @@ -0,0 +1,43 @@ +/* + * Copyright 2017 Stefan Leichter + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wdscore); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

Nikolay Sivov : comctl32/syslink: Fix return value for LM_GETIDEALSIZE.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 57dec7677816446763d280f55a9b1a5cebef6436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57dec7677816446763d280f55… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 1 08:30:17 2017 +0300 comctl32/syslink: Fix return value for LM_GETIDEALSIZE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/syslink.c | 12 ++++++------ dlls/comctl32/tests/syslink.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 339c728..67a1a60 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -1472,7 +1472,7 @@ static BOOL SYSLINK_NoNextLink (const SYSLINK_INFO *infoPtr, BOOL Prev) * SYSLINK_GetIdealSize * Calculates the ideal size of a link control at a given maximum width. */ -static VOID SYSLINK_GetIdealSize (const SYSLINK_INFO *infoPtr, int cxMaxWidth, LPSIZE lpSize) +static LONG SYSLINK_GetIdealSize (const SYSLINK_INFO *infoPtr, int cxMaxWidth, SIZE *lpSize) { RECT rc; HDC hdc; @@ -1493,6 +1493,8 @@ static VOID SYSLINK_GetIdealSize (const SYSLINK_INFO *infoPtr, int cxMaxWidth, L lpSize->cx = rc.right; lpSize->cy = rc.bottom; } + + return rc.bottom; } /*********************************************************************** @@ -1664,11 +1666,9 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, case LM_GETIDEALHEIGHT: if (lParam) - { - /* LM_GETIDEALSIZE */ - SYSLINK_GetIdealSize(infoPtr, (int)wParam, (LPSIZE)lParam); - } - return SYSLINK_GetIdealHeight(infoPtr); + return SYSLINK_GetIdealSize(infoPtr, (int)wParam, (SIZE *)lParam); + else + return SYSLINK_GetIdealHeight(infoPtr); case WM_SETFOCUS: return SYSLINK_SetFocus(infoPtr); diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c index 382c89d..a6b90b6 100644 --- a/dlls/comctl32/tests/syslink.c +++ b/dlls/comctl32/tests/syslink.c @@ -205,6 +205,43 @@ static void test_create_syslink(void) DestroyWindow(hWndSysLink); } +static void test_LM_GETIDEALHEIGHT(void) +{ + HWND hwnd; + LONG ret; + + hwnd = create_syslink(WS_CHILD | WS_TABSTOP | WS_VISIBLE, hWndParent); + ok(hwnd != NULL, "Failed to create SysLink window.\n"); + + ret = SendMessageA(hwnd, LM_GETIDEALHEIGHT, 0, 0); + ok(ret > 0, "Unexpected ideal height, %d.\n", ret); + + DestroyWindow(hwnd); +} + +static void test_LM_GETIDEALSIZE(void) +{ + HWND hwnd; + LONG ret; + SIZE sz; + + hwnd = create_syslink(WS_CHILD | WS_TABSTOP | WS_VISIBLE, hWndParent); + ok(hwnd != NULL, "Failed to create SysLink window.\n"); + + memset(&sz, 0, sizeof(sz)); + ret = SendMessageA(hwnd, LM_GETIDEALSIZE, 0, (LPARAM)&sz); + ok(ret > 0, "Unexpected return value, %d.\n", ret); + if (sz.cy == 0) + win_skip("LM_GETIDEALSIZE is not supported.\n"); + else + { + ok(sz.cx > 5, "Unexpected ideal width, %d.\n", sz.cx); + ok(sz.cy == ret, "Unexpected ideal height, %d.\n", sz.cy); + } + + DestroyWindow(hwnd); +} + START_TEST(syslink) { ULONG_PTR ctx_cookie; @@ -231,6 +268,8 @@ START_TEST(syslink) flush_events(); test_create_syslink(); + test_LM_GETIDEALHEIGHT(); + test_LM_GETIDEALSIZE(); DestroyWindow(hWndParent); unload_v6_module(ctx_cookie, hCtx);

1 0

Nikolay Sivov : comctl32/tests: Some cleanup for SysLink tests.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 8138ac9a3c67c548aef0983d7b85cc15d988063e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8138ac9a3c67c548aef0983d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 1 08:30:16 2017 +0300 comctl32/tests: Some cleanup for SysLink tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/syslink.c | 75 ++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 48 deletions(-) diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c index 94569d6..382c89d 100644 --- a/dlls/comctl32/tests/syslink.c +++ b/dlls/comctl32/tests/syslink.c @@ -180,39 +180,44 @@ static HWND create_syslink(DWORD style, HWND parent) return hWndSysLink; } +static void test_create_syslink(void) +{ + HWND hWndSysLink; + LONG oldstyle; + + /* Create an invisible SysLink control */ + flush_sequences(sequences, NUM_MSG_SEQUENCE); + hWndSysLink = create_syslink(WS_CHILD | WS_TABSTOP, hWndParent); + ok(hWndSysLink != NULL, "Expected non NULL value (le %u)\n", GetLastError()); + flush_events(); + ok_sequence(sequences, SYSLINK_SEQ_INDEX, empty_wnd_seq, "create SysLink", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_syslink_wnd_seq, "create SysLink (parent)", TRUE); + + /* Make the SysLink control visible */ + flush_sequences(sequences, NUM_MSG_SEQUENCE); + oldstyle = GetWindowLongA(hWndSysLink, GWL_STYLE); + SetWindowLongA(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE); + RedrawWindow(hWndSysLink, NULL, NULL, RDW_INVALIDATE); + flush_events(); + ok_sequence(sequences, SYSLINK_SEQ_INDEX, visible_syslink_wnd_seq, "visible SysLink", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_visible_syslink_wnd_seq, "visible SysLink (parent)", TRUE); + + DestroyWindow(hWndSysLink); +} START_TEST(syslink) { ULONG_PTR ctx_cookie; - HANDLE hCtx; HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - INITCOMMONCONTROLSEX iccex; - BOOL rc; - HWND hWndSysLink; - LONG oldstyle; POINT orig_pos; + HANDLE hCtx; if (!load_v6_module(&ctx_cookie, &hCtx)) return; /* LoadLibrary is needed. This file has no reference to functions in comctl32 */ hComctl32 = LoadLibraryA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return; - } - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_LINK_CLASS; - rc = pInitCommonControlsEx(&iccex); - ok(rc, "InitCommonControlsEx failed (le %u)\n", GetLastError()); - if (!rc) - { - skip("Could not register ICC_LINK_CLASS\n"); - return; - } + ok(hComctl32 != NULL, "Failed to load comctl32.dll.\n"); /* Move the cursor off the parent window */ GetCursorPos(&orig_pos); @@ -223,36 +228,10 @@ START_TEST(syslink) /* Create parent window */ hWndParent = create_parent_window(); ok(hWndParent != NULL, "Failed to create parent Window!\n"); - if (!hWndParent) - { - skip("Parent window not present\n"); - return; - } - flush_events(); - - /* Create an invisible SysLink control */ - flush_sequences(sequences, NUM_MSG_SEQUENCE); - hWndSysLink = create_syslink(WS_CHILD | WS_TABSTOP, hWndParent); - ok(hWndSysLink != NULL, "Expected non NULL value (le %u)\n", GetLastError()); - if (!hWndSysLink) - { - skip("SysLink control not present?\n"); - return; - } flush_events(); - ok_sequence(sequences, SYSLINK_SEQ_INDEX, empty_wnd_seq, "create SysLink", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_syslink_wnd_seq, "create SysLink (parent)", TRUE); - /* Make the SysLink control visible */ - flush_sequences(sequences, NUM_MSG_SEQUENCE); - oldstyle = GetWindowLongA(hWndSysLink, GWL_STYLE); - SetWindowLongA(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE); - RedrawWindow(hWndSysLink, NULL, NULL, RDW_INVALIDATE); - flush_events(); - ok_sequence(sequences, SYSLINK_SEQ_INDEX, visible_syslink_wnd_seq, "visible SysLink", TRUE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_visible_syslink_wnd_seq, "visible SysLink (parent)", TRUE); + test_create_syslink(); - DestroyWindow(hWndSysLink); DestroyWindow(hWndParent); unload_v6_module(ctx_cookie, hCtx); SetCursorPos(orig_pos.x, orig_pos.y);

1 0

Austin English : winedbg: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

1 0

Austin English : winefile: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 6def373884f26919ac594aedefcf2c02d009b601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6def373884f26919ac594aede… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:17 2017 -0600 winefile: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winefile/winefile.man.in b/programs/winefile/winefile.man.in index afa4798..0221f16 100644 --- a/programs/winefile/winefile.man.in +++ b/programs/winefile/winefile.man.in @@ -15,19 +15,19 @@ You can pass winefile either a Unix or Win32 path, for example: .SH BUGS Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B winefile is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : winecfg: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 78b16ca4312572991ea5162793c9c53e9c74482e URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b16ca4312572991ea516279… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:14 2017 -0600 winecfg: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/winecfg.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/winecfg.man.in b/programs/winecfg/winecfg.man.in index 4fa677e..522d2a0 100644 --- a/programs/winecfg/winecfg.man.in +++ b/programs/winecfg/winecfg.man.in @@ -11,19 +11,19 @@ among others. Many of these settings can be made on a per application basis, for riched20.dll for wordpad.exe, but not for notepad.exe. .SH BUGS Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B winecfg is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : wineboot: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: cd4da7f8a4dd4ad656ea522df195b32dc339acd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4da7f8a4dd4ad656ea522df… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:13 2017 -0600 wineboot: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wineboot/wineboot.man.in b/programs/wineboot/wineboot.man.in index a5c7b53..870e611 100644 --- a/programs/wineboot/wineboot.man.in +++ b/programs/wineboot/wineboot.man.in @@ -27,19 +27,19 @@ Shutdown only, don't reboot. Update the WINEPREFIX. .SH BUGS Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B wineboot is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : regsvr32: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: b7a36b4b440cd0bf72b41c69135f78ef918d6489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a36b4b440cd0bf72b41c691… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:12 2017 -0600 regsvr32: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regsvr32/regsvr32.man.in b/programs/regsvr32/regsvr32.man.in index 173e586..6263fae 100644 --- a/programs/regsvr32/regsvr32.man.in +++ b/programs/regsvr32/regsvr32.man.in @@ -19,19 +19,19 @@ Call DllInstall passing it an optional \fIcmdline\fR. When used with \fB/u\fR ca Do not call DllRegisterServer; this option must be used with \fB/i\fR. .SH BUGS Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B regsvr32 is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : wineconsole: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 863b446c50492c542843f807dc874ab96bc90f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=863b446c50492c542843f807d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:15 2017 -0600 wineconsole: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wineconsole/wineconsole.man.in b/programs/wineconsole/wineconsole.man.in index 9c38989..0e9895d 100644 --- a/programs/wineconsole/wineconsole.man.in +++ b/programs/wineconsole/wineconsole.man.in @@ -14,19 +14,19 @@ If \fIuser\fR is chosen, a new window will be created for the console. The \fIcu wineconsole try to setup the current terminal as a Wine console. .SH BUGS Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B wineconsole is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : winepath: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: cc35213a8de135dea48ed8c89a3a6aeb5d670f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc35213a8de135dea48ed8c89… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:19 2017 -0600 winepath: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winepath/winepath.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winepath/winepath.man.in b/programs/winepath/winepath.man.in index 5fc5012..5548e40 100644 --- a/programs/winepath/winepath.man.in +++ b/programs/winepath/winepath.man.in @@ -31,19 +31,19 @@ shows winepath help message and exit. shows version information and exit. .SH BUGS Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B winepath is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : winemine: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 5293c8a1a3da6eab4b3c0b19ad53cdd78bb326ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5293c8a1a3da6eab4b3c0b19a… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:18 2017 -0600 winemine: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/winemine.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winemine/winemine.man.in b/programs/winemine/winemine.man.in index 27fe210..6ce68b4 100644 --- a/programs/winemine/winemine.man.in +++ b/programs/winemine/winemine.man.in @@ -9,19 +9,19 @@ is the Wine Minesweeper game. The object of the game is to try to find all the h uncovering the tiles to see how many mines each tile is adjacent to, without uncovering a mine. .SH BUGS Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B winemine is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : regedit: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 79f2a7815b3b781058591ca71c2e12af7c7231af URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f2a7815b3b781058591ca71… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:11 2017 -0600 regedit: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regedit.man.in b/programs/regedit/regedit.man.in index 06c0395..bd86c66 100644 --- a/programs/regedit/regedit.man.in +++ b/programs/regedit/regedit.man.in @@ -31,19 +31,19 @@ Prints a help message. Any other options are ignored. Create registry from \fIfile.reg\fR (unimplemented). .SH BUGS Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B regedit is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : notepad: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: b696a122ac63a38a490cce94b102bb69d6a7bc26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b696a122ac63a38a490cce94b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:10 2017 -0600 notepad: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/notepad/notepad.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/notepad/notepad.man.in b/programs/notepad/notepad.man.in index 1dda516..9f17d29 100644 --- a/programs/notepad/notepad.man.in +++ b/programs/notepad/notepad.man.in @@ -10,19 +10,19 @@ is the Wine text editor, designed to be compatible with its Microsoft Windows co It supports ANSI, UTF-8 and UTF-16 files, and can read (but not write) files with Unix line endings. .SH BUGS Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B notepad is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : msiexec: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: fbcfe3eb171c414706c94a4063d5c8214b7fdc21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbcfe3eb171c414706c94a406… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:09 2017 -0600 msiexec: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/msiexec.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/msiexec/msiexec.man.in b/programs/msiexec/msiexec.man.in index f24c226..28b3963 100644 --- a/programs/msiexec/msiexec.man.in +++ b/programs/msiexec/msiexec.man.in @@ -110,19 +110,19 @@ Same as \fB/h\fR. .SH BUGS Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B msiexec is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : c2man.pl: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 5284144cb3347a5f8c22835c9bacc2febcc889c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5284144cb3347a5f8c22835c9… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:00 2017 -0600 c2man.pl: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/c2man.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index e405684..c736c84 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w # -# Generate API documentation. See http://www.winehq.org/docs/winedev-guide/api-docs for details. +# Generate API documentation. See https://www.winehq.org/docs/winedev-guide/api-docs for details. # # Copyright (C) 2000 Mike McCormack # Copyright (C) 2003 Jon Griffiths @@ -1367,7 +1367,7 @@ sub output_api_header($) if ($opt_output_format eq "h") { print OUTPUT "\n"; - print OUTPUT "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\n"; + print OUTPUT "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"https://www.w3.org/TR/html4/strict.dtd\">\n"; print OUTPUT "<HTML>\n<HEAD>\n"; print OUTPUT "<LINK REL=\"StyleSheet\" href=\"apidoc.css\" type=\"text/css\">\n"; print OUTPUT "<META NAME=\"GENERATOR\" CONTENT=\"tools/c2man.pl\">\n"; @@ -1394,7 +1394,7 @@ sub output_api_footer($) { print OUTPUT "<hr><p><i class=\"copy\">Copyright &copy ".$year." The Wine Project.". " All trademarks are the property of their respective owners.". - " Visit <a href=\"http://www.winehq.org\">WineHQ</a> for license details.". + " Visit <a href=\"https://www.winehq.org\">WineHQ</a> for license details.". " Generated $date.</i></p>\n</body>\n</html>\n"; } elsif ($opt_output_format eq "s" || $opt_output_format eq "x") @@ -1620,9 +1620,9 @@ sub output_api_comment($) { if ($opt_output_format eq "h") { - # Link to the file in WineHQ cvs - s/^(Implemented in \")(.+?)(\"\.)/$1$2$3 http:\/\/source.winehq.org\/source\/$2/g; - s/^(Declared in \")(.+?)(\"\.)/$1$2$3 http:\/\/source.winehq.org\/source\/include\/$2/g; + # Link to the file in WineHQ git + s/^(Implemented in \")(.+?)(\"\.)/$1$2$3 https:\/\/source.winehq.org\/source\/$2/g; + s/^(Declared in \")(.+?)(\"\.)/$1$2$3 https:\/\/source.winehq.org\/source\/include\/$2/g; } # Highlight strings s/(\".+?\")/$fmt[2]$1$fmt[3]/g;

1 0

Austin English : winedump: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 4651e9e0cd3a976868f35e84e916c21bd7c1b5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4651e9e0cd3a976868f35e84e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:03 2017 -0600 winedump: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/winedump.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winedump/winedump.man.in b/tools/winedump/winedump.man.in index d8dbd95..a915ff4 100644 --- a/tools/winedump/winedump.man.in +++ b/tools/winedump/winedump.man.in @@ -214,7 +214,7 @@ C++ name demangling is not fully in sync with the implementation in msvcrt. It might be useful to submit your C++ name to the testsuite for msvcrt. .PP Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AUTHORS @@ -225,12 +225,12 @@ Michael Stefaniuc <mstefani at redhat dot com> .B winedump is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wine (1) .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : winebuild: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: b54cf0571419af463ae3bcdd5e59edf0702bd8cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54cf0571419af463ae3bcdd5… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:02 2017 -0600 winebuild: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/winebuild.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index d99fb57..564f312 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -487,14 +487,14 @@ It is not yet possible to use a PE-format dll in an import specification; only Wine dlls can be imported. .PP Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B winebuild is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" @@ -502,6 +502,6 @@ the .BR winegcc (1), .BR wrc (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : wmc: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 3a8f1c86ea1d848bfdf5390fd335bcc2650e193a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a8f1c86ea1d848bfdf5390fd… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:06 2017 -0600 wmc: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/po.c | 2 +- tools/wmc/wmc.man.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/wmc/po.c b/tools/wmc/po.c index b604ac7..6db02c8 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -418,7 +418,7 @@ static po_file_t create_po_file(void) po_message_set_msgid( msg, "" ); po_message_set_msgstr( msg, "Project-Id-Version: Wine\n" - "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" + "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" "PO-Revision-Date: N/A\n" "Last-Translator: Automatically generated\n" diff --git a/tools/wmc/wmc.man.in b/tools/wmc/wmc.man.in index 39356d6..242604c 100644 --- a/tools/wmc/wmc.man.in +++ b/tools/wmc/wmc.man.in @@ -104,20 +104,20 @@ implemented because it is a, well, non-informative format change. It is recognized on the commandline for some form of compatibility. .PP Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B wmc is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wine (1), .BR wrc (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : winemaker: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 6a269557eef8fda27dc0611f91446530c4da73e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a269557eef8fda27dc0611f9… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:05 2017 -0600 winemaker: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winemaker/winemaker.de.UTF-8.man.in | 6 +++--- tools/winemaker/winemaker.fr.UTF-8.man.in | 6 +++--- tools/winemaker/winemaker.man.in | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/winemaker/winemaker.de.UTF-8.man.in b/tools/winemaker/winemaker.de.UTF-8.man.in index 388a516..8b2f144 100644 --- a/tools/winemaker/winemaker.de.UTF-8.man.in +++ b/tools/winemaker/winemaker.de.UTF-8.man.in @@ -240,7 +240,7 @@ die Anwendung enthält: Sie muss entweder im aktuellen Verzeichnis oder im \fBwinemaker\fR unterstützt noch keine Messagedateien und deren Compiler. .PP Fehler können im -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine Bugtracker .UE gemeldet werden. @@ -253,12 +253,12 @@ André Hentschel .SH VERFÜGBARKEIT .B winemaker ist Teil der Wine-Distribution, verfügbar im WineHQ, dem -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Hauptquartier der Wine-Entwicklung .UE . .SH SIEHE AUCH .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine-Dokumentation und Support .UE . diff --git a/tools/winemaker/winemaker.fr.UTF-8.man.in b/tools/winemaker/winemaker.fr.UTF-8.man.in index 75ed9fd..b0b1da1 100644 --- a/tools/winemaker/winemaker.fr.UTF-8.man.in +++ b/tools/winemaker/winemaker.fr.UTF-8.man.in @@ -266,7 +266,7 @@ ne prend pas encore en charge les fichiers de messages, ni le compilateur de messages. .PP Les bugs peuvent être signalés (en anglais) sur le -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B système de suivi des problèmes de Wine .UE . .SH AUTEURS @@ -277,12 +277,12 @@ Dimitrie O. Paun André Hentschel .SH DISPONIBILITÉ \fBwinemaker\fR fait partie de la distribution de Wine, qui est disponible sur WineHQ, le -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B quartier général du développement de Wine .UE . .SH VOIR AUSSI .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Documentation et support de Wine .UE . diff --git a/tools/winemaker/winemaker.man.in b/tools/winemaker/winemaker.man.in index 9d03e65..5572cdd 100644 --- a/tools/winemaker/winemaker.man.in +++ b/tools/winemaker/winemaker.man.in @@ -225,7 +225,7 @@ executable: it must either be in the current directory or in the \fBwinemaker\fR does not support message files and the message compiler yet. .PP Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AUTHORS @@ -238,12 +238,12 @@ André Hentschel .B winemaker is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH SEE ALSO .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : wrc: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

1 0

Austin English : winegcc: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 159b6d928001f76380de412615956bc06ba23049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=159b6d928001f76380de41261… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:04 2017 -0600 winegcc: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index b4fc12d..5bbb2fd 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -87,7 +87,7 @@ result, the -static, --static, and -Wl,-static options will generate an error. .PP Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AUTHORS @@ -97,7 +97,7 @@ was written by Dimitrie O. Paun. .B winegcc is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" @@ -106,6 +106,6 @@ the .BR wrc (1), .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : widl: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 500bcfb1c0229405d21346726f1e40f5988e5c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=500bcfb1c0229405d21346726… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:01 2017 -0600 widl: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 9259afd..d8b665e 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -135,7 +135,7 @@ Debug level \fIn\fR is a bitmask with the following meaning: * 0x20 Preprocessor yacc trace .SH BUGS Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AUTHORS @@ -148,10 +148,10 @@ Dan Hipschman. .B widl is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : server: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 2723f70a4a5b298632953e3422a2fdb73a1fa332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2723f70a4a5b298632953e342… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:56:59 2017 -0600 server: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/wineserver.de.UTF-8.man.in | 4 ++-- server/wineserver.fr.UTF-8.man.in | 6 +++--- server/wineserver.man.in | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/wineserver.de.UTF-8.man.in b/server/wineserver.de.UTF-8.man.in index 26d0deb..df10c7a 100644 --- a/server/wineserver.de.UTF-8.man.in +++ b/server/wineserver.de.UTF-8.man.in @@ -98,13 +98,13 @@ ist Alexandre Julliard. Viele andere Personen haben neue Funktionen hinzugefügt und Fehler behoben. Details finden Sie in der Datei Changelog. .SH FEHLER Wenn Sie einen Fehler finden, melden Sie ihn bitte im -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine Bugtracker .UE . .SH VERFÜGBARKEIT .B wineserver ist Teil der Wine-Distribution, verfügbar im WineHQ, dem -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Hauptquartier der Wine-Entwicklung .UE . .SH "SIEHE AUCH" diff --git a/server/wineserver.fr.UTF-8.man.in b/server/wineserver.fr.UTF-8.man.in index 22893b2..a78fe84 100644 --- a/server/wineserver.fr.UTF-8.man.in +++ b/server/wineserver.fr.UTF-8.man.in @@ -98,18 +98,18 @@ est Alexandre Julliard. Beaucoup d'autres personnes ont contribué des nouvelles et des corrections de bugs. Pour une liste complète, consultez l'historique git. .SH BUGS Les bugs peuvent être signalés (en anglais) sur le -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B système de suivi des problèmes de Wine .UE . .SH DISPONIBILITÉ .B wineserver fait partie de la distribution de Wine, disponible depuis WineHQ, le -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B quartier général des développeurs de Wine .UE . .SH "VOIR AUSSI" .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Documentation et support de Wine .UE . diff --git a/server/wineserver.man.in b/server/wineserver.man.in index 82136a3..b10907b 100644 --- a/server/wineserver.man.in +++ b/server/wineserver.man.in @@ -98,19 +98,19 @@ is Alexandre Julliard. Many other people have contributed new features and bug fixes. For a complete list, see the git commit logs. .SH BUGS Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B wineserver is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : loader: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 3bc68c24b972643aba2b96dcdcf97ea2f9fb82bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc68c24b972643aba2b96dcd… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:56:57 2017 -0600 loader: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.de.UTF-8.man.in | 16 ++++++++-------- loader/wine.fr.UTF-8.man.in | 8 ++++---- loader/wine.man.in | 8 ++++---- loader/wine.pl.UTF-8.man.in | 16 ++++++++-------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/loader/wine.de.UTF-8.man.in b/loader/wine.de.UTF-8.man.in index 25dff94..3933fea 100644 --- a/loader/wine.de.UTF-8.man.in +++ b/loader/wine.de.UTF-8.man.in @@ -279,36 +279,36 @@ im obersten Ordner der Quellcodedistribution. .SH FEHLER .PP Statusberichte für viele Anwendungen sind unter -.I http://appdb.winehq.org +.I https://appdb.winehq.org verfügbar. Bitte fügen Sie Anwendungen, die Sie mit Wine nutzen, der Liste hinzu, sofern noch kein Eintrag existiert. .PP Fehler können unter -.I http://bugs.winehq.org +.I https://bugs.winehq.org gemeldet werden. Wenn Sie einen Fehler melden möchten, lesen Sie bitte vorher -.I http://wiki.winehq.org/Bugs +.I https://wiki.winehq.org/Bugs im .B wine -Quellcode, um zu sehen, welche Informationen benötigt werden. .PP Probleme und Hinweise mit/zu dieser Manpage können auch auf -.I http://bugs.winehq.org +.I https://bugs.winehq.org gemeldet werden. .SH VERFÜGBARKEIT Die aktuellste öffentliche Wine-Version kann auf -.I http://www.winehq.org/download +.I https://www.winehq.org/download bezogen werden. .PP Ein Schnappschuss des Entwicklungscodes kann via GIT besorgt werden, siehe dazu .I -http://www.winehq.org/site/git +https://www.winehq.org/git .PP WineHQ, die Hauptseite der .B wine -Entwicklung, befindet sich auf -.IR http://www.winehq.org . +.IR https://www.winehq.org . Diese Website bietet viele Informationen und Ressourcen zu .BR wine . .PP @@ -317,7 +317,7 @@ Für nähere Informationen zur Entwicklung von können Sie sich als Abonnement bei der .B wine -Mailingliste auf -.I http://www.winehq.org/forums +.I https://www.winehq.org/forums eintragen. .SH "SIEHE AUCH" .BR wineserver (1),\ winedbg (1) diff --git a/loader/wine.fr.UTF-8.man.in b/loader/wine.fr.UTF-8.man.in index c2a2ae6..0016f16 100644 --- a/loader/wine.fr.UTF-8.man.in +++ b/loader/wine.fr.UTF-8.man.in @@ -273,25 +273,25 @@ licence se trouve dans le fichier .SH BUGS .PP Un rapport sur la compatibilité de nombreuses applications est disponible sur la -.UR http://appdb.winehq.org +.UR https://appdb.winehq.org .B base de données d'applications de Wine .UE . N'hésitez pas à y ajouter des entrées pour les applications que vous exécutez actuellement, si nécessaire. .PP Les bugs peuvent être signalés (en anglais) sur le -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B système de suivi des problèmes de Wine .UE . .SH DISPONIBILITÉ La version publique la plus récente de Wine est disponible sur WineHQ, le -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B quartier général du développement de Wine .UE . .SH "VOIR AUSSI" .BR wineserver (1), .BR winedbg (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Documentation et support de Wine .UE . diff --git a/loader/wine.man.in b/loader/wine.man.in index 5482896..ff37586 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -287,27 +287,27 @@ in the top-level directory of the source distribution. .SH BUGS .PP A status report on many applications is available from the -.UR http://appdb.winehq.org +.UR https://appdb.winehq.org .B Wine Application Database .UE . Please add entries to this list for applications you currently run, if necessary. .PP Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY The most recent public version of .B wine is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wineserver (1), .BR winedbg (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE . diff --git a/loader/wine.pl.UTF-8.man.in b/loader/wine.pl.UTF-8.man.in index 1718d65..9f1f2cf 100644 --- a/loader/wine.pl.UTF-8.man.in +++ b/loader/wine.pl.UTF-8.man.in @@ -282,35 +282,35 @@ w głównym katalogu dystrybucyjnym źródła. .SH BŁĘDY .PP Raporty stanu działania programów są dostępne na stronie -.IR http://appdb.winehq.org . +.IR https://appdb.winehq.org . Jeżeli brakuje na liście aplikacji, której używasz, to nie wahaj się dodać jej samodzielnie. .PP Raporty błędów mogą być wysyłane do Wine Bugzilla -.I http://bugs.winehq.org +.I https://bugs.winehq.org Jeżeli chcesz zgłosić błąd zapoznaj się z -.I http://wiki.winehq.org/Bugs +.I https://wiki.winehq.org/Bugs w źródle .B wine , aby dowiedzieć się jakie informacje są niezbędne .PP Sugestie i problemy dotyczące tej instrukcji również przesyłaj do -.I http://bugs.winehq.org +.I https://bugs.winehq.org .SH DOSTĘPNOŚĆ Najaktualniejszą publiczną wersję .B wine można pobrać ze strony -.I http://www.winehq.org/download +.I https://www.winehq.org/download .PP Najaktualnieszy zrzut kodu można pobrać przez GIT. Aby dowiedzieć się jak to zrobić, odwiedź stronę .I -http://www.winehq.org/site/git +http://www.winehq.org/git .PP WineHQ, siedziba rozwoju .B wine , mieści się na stronie -.IR http://www.winehq.org . +.IR https://www.winehq.org . Strona ta zawiera wiele informacji o .BR wine . .PP @@ -319,7 +319,7 @@ Po dalsze informacje na temat rozwoju zapisz się na listę mailingową .B wine na stronie -.I http://www.winehq.org/forums +.I https://www.winehq.org/forums .SH "ZOBACZ TAKŻE" .BR wineserver (1),

1 0

Austin English : configure: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: cc597686c2b79cb1010003709ab5ed3d5a8b1257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc597686c2b79cb1010003709… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:56:53 2017 -0600 configure: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 +++--- configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 28c456d..afe9492 100755 --- a/configure +++ b/configure @@ -583,7 +583,7 @@ PACKAGE_TARNAME='wine' PACKAGE_VERSION='2.22' PACKAGE_STRING='Wine 2.22' PACKAGE_BUGREPORT='wine-devel(a)winehq.org' -PACKAGE_URL='http://www.winehq.org' +PACKAGE_URL='https://www.winehq.org' ac_unique_file="server/atom.c" # Factoring default headers for most tests. @@ -2514,7 +2514,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to <wine-devel(a)winehq.org>. -Wine home page: <http://www.winehq.org>. +Wine home page: <https://www.winehq.org>. _ACEOF ac_status=$? fi @@ -19859,7 +19859,7 @@ Configuration commands: $config_commands Report bugs to <wine-devel(a)winehq.org>. -Wine home page: <http://www.winehq.org>." +Wine home page: <https://www.winehq.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 diff --git a/configure.ac b/configure.ac index e9a7b2b..6bae4e3 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ m4_define(WINE_VERSION,regexp(m4_include(VERSION),[version $[-.0-9A-Za-z]+$],[ dnl autoconf versions before 2.62 don't handle source dir symlinks correctly AC_PREREQ(2.62) -AC_INIT([Wine],[WINE_VERSION],[wine-devel@winehq.org],[wine],[http://www.winehq.org]) +AC_INIT([Wine],[WINE_VERSION],[wine-devel@winehq.org],[wine],[https://www.winehq.org]) AC_CONFIG_SRCDIR(server/atom.c) AC_CONFIG_HEADERS(include/config.h) AC_CONFIG_AUX_DIR(tools) @@ -23,8 +23,8 @@ m4_ifdef([AS_VAR_IF],,[AC_DEFUN([AS_VAR_IF], AS_IF([test "x$as_val" = x""$2], [$3], [$4])])])])dnl dnl autoconf versions before 2.64 don't have AC_PACKAGE_URL m4_ifdef([AC_PACKAGE_URL],, - [AC_DEFINE([PACKAGE_URL], ["http://www.winehq.org"], [Define to the home page for this package.]) - AC_SUBST([PACKAGE_URL], ["http://www.winehq.org"])])dnl + [AC_DEFINE([PACKAGE_URL], ["https://www.winehq.org"], [Define to the home page for this package.]) + AC_SUBST([PACKAGE_URL], ["https://www.winehq.org"])])dnl dnl **** Command-line arguments ****

1 0

Austin English : readme: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 92734380a5de8d4b3bf8f79888de6ed2777fde8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=92734380a5de8d4b3bf8f7988… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:56:52 2017 -0600 readme: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README b/README index 7e0f171..9761f66 100644 --- a/README +++ b/README @@ -29,7 +29,7 @@ Or run Wine directly from the build directory: Run programs as "wine program". For more information and problem resolution, read the rest of this file, the Wine man page, and -especially the wealth of information found at http://www.winehq.org. +especially the wealth of information found at https://www.winehq.org. 3. REQUIREMENTS @@ -48,7 +48,7 @@ support kernel threads may be supported in the future. FreeBSD info: Wine will generally not work properly on versions before FreeBSD 8.0. - See http://wiki.freebsd.org/Wine for more information. + See https://wiki.freebsd.org/Wine for more information. Solaris info: You will most likely need to build Wine with the GNU toolchain @@ -81,7 +81,7 @@ Basic requirements: Optional support libraries: Configure will display notices when optional libraries are not found - on your system. See http://wiki.winehq.org/Recommended_Packages for + on your system. See https://wiki.winehq.org/Recommended_Packages for hints about the packages you should install. On 64-bit platforms, you have to make sure to install the 32-bit versions of these libraries. @@ -115,7 +115,7 @@ first. Try either "dpkg -r wine" or "rpm -e wine" or "make uninstall" before installing. Once installed, you can run the "winecfg" configuration tool. See the -Support area at http://www.winehq.org/ for configuration hints. +Support area at https://www.winehq.org/ for configuration hints. 6. RUNNING PROGRAMS @@ -142,25 +142,25 @@ a bug. 7. GETTING MORE INFORMATION WWW: A great deal of information about Wine is available from WineHQ at - http://www.winehq.org/ : various Wine Guides, application database, + https://www.winehq.org/ : various Wine Guides, application database, bug tracking. This is probably the best starting point. -FAQ: The Wine FAQ is located at http://www.winehq.org/FAQ +FAQ: The Wine FAQ is located at https://www.winehq.org/FAQ -Wiki: The Wine Wiki is located at http://wiki.winehq.org +Wiki: The Wine Wiki is located at https://wiki.winehq.org Mailing lists: There are several mailing lists for Wine users and developers; - see http://www.winehq.org/forums for more information. + see https://www.winehq.org/forums for more information. -Bugs: Report bugs to Wine Bugzilla at http://bugs.winehq.org +Bugs: Report bugs to Wine Bugzilla at https://bugs.winehq.org Please search the bugzilla database to check whether your problem is already known or fixed before posting a bug report. IRC: Online help is available at channel #WineHQ on irc.freenode.net. Git: The current Wine development tree is available through Git. - Go to http://www.winehq.org/git for more information. + Go to https://www.winehq.org/git for more information. If you add something, or fix a bug, please send a patch (preferably using git-format-patch) to the wine-devel(a)winehq.org list for

1 0

Austin English : announce: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 6c8f985b7694c99287b953a0a6f0e64b4c5dc79a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8f985b7694c99287b953a0a… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:56:51 2017 -0600 announce: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 16368ac..c06b330 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -10,17 +10,17 @@ What's new in this release (see below for details): The source is available from the following locations: - http://dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz + https://dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz http://mirrors.ibiblio.org/wine/source/2.x/wine-2.22.tar.xz Binary packages for various distributions will be available from: - http://www.winehq.org/download + https://www.winehq.org/download -You will find documentation on http://www.winehq.org/documentation +You will find documentation on https://www.winehq.org/documentation You can also get the current source directly from the git -repository. Check http://www.winehq.org/git for details. +repository. Check https://www.winehq.org/git for details. Wine is available thanks to the work of many people. See the file AUTHORS in the distribution for the complete list.

1 0

Austin English : wined3d: Remove outdated comment.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 96288ce94a9b944a43b5440b1bd29a6da4cf7195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96288ce94a9b944a43b5440b1… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:45:23 2017 -0600 wined3d: Remove outdated comment. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0ff9ee4..317152c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2715,8 +2715,6 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont /***************************************************************************** * Functions to generate GLSL strings from DirectX Shader bytecode begin here. - * - * For more information, see http://wiki.winehq.org/DirectX-Shaders ****************************************************************************/ /* Prototypes */

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2017