- wine-devel - winehq.org

[PATCH 6/9] mshtml: Ignore preverntDefault calls for non-cancelable events.
by Jacek Caban 01 Dec '17

01 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[PATCH 5/9] mshtml: Added IDOMEvent::get_cancelable implementation.
by Jacek Caban 01 Dec '17

01 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 17 ++++++++++------- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.c | 5 +++++ 3 files changed, 16 insertions(+), 7 deletions(-)

1 0

[PATCH 4/9] mshtml: Added IDOMEvent::get_bubbles implementation.
by Jacek Caban 01 Dec '17

01 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 14 ++++++++------ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.c | 6 ++++++ 3 files changed, 15 insertions(+), 6 deletions(-)

1 0

[PATCH 3/9] mshtml: Use IDOMEvent for IHTMLEventObj::get_type implementation.
by Jacek Caban 01 Dec '17

01 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)

1 0

[PATCH 2/9] mshtml: Added IDOMEvent::get_type implementation.
by Jacek Caban 01 Dec '17

01 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 13 +++++++++++-- dlls/mshtml/tests/events.c | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[PATCH 1/9] mshtml: Store event type string in DOMEvent object.
by Jacek Caban 01 Dec '17

01 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 59 ++++++++++++++++++++++++++++--------------------- dlls/mshtml/htmlevent.h | 1 + 2 files changed, 35 insertions(+), 25 deletions(-)

1 0

[PATCH v4 resend 5/5] loader: Add LNXEV to the critical event database
by Aric Stewart 01 Dec '17

01 Dec '17

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH v4 resend 4/5] winebus.sys: Process device reports for linux event devices
by Aric Stewart 01 Dec '17

01 Dec '17

v2: Updates from Sebastian Lackner v3: Suggestions from Roderick Colenbrander v3: Do not force axis ranges, handle SYN_DROPPED Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 235 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 229 insertions(+), 6 deletions(-)

1 0

[PATCH v4 resend 3/5] winebus.sys: Implement get_string for linux event devices
by Aric Stewart 01 Dec '17

01 Dec '17

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)

1 0

[PATCH v4 resend 2/5] winebus.sys: Build device reports for linux event devices
by Aric Stewart 01 Dec '17

01 Dec '17

v2: Updates from Sebastian Lackner v3: Suggestions from Roderick Colenbrander v3: Do not hardcode min/max for axis Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 457 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 455 insertions(+), 2 deletions(-)

1 0

[PATCH v4 resend 1/5] winebus.sys: Handle linux input event device via udev
by Aric Stewart 01 Dec '17

01 Dec '17

v2: Updates from Sebastian Lackner v3: Cross bus duplicate device detection added for udev devices v4: Further refinements from Sebastian Lackner Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus.h | 6 ++ dlls/winebus.sys/bus_udev.c | 172 +++++++++++++++++++++++++++++++++++++++++--- dlls/winebus.sys/main.c | 48 +++++++++++++ 3 files changed, 218 insertions(+), 8 deletions(-)

1 0

[PATCH v2] msvcrt: Fix buffer size checks in swscanf_s
by Piotr Caban 01 Dec '17

01 Dec '17

For bug #44075 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/scanf.h | 6 +++--- dlls/msvcrt/tests/scanf.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-)

1 0

[PATCH 2/5] taskschd: Implement IDailyTrigger_put_StartBoundary.
by Hans Leidekker 01 Dec '17

01 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 15 ++++++++++++++- dlls/taskschd/tests/scheduler.c | 11 +++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 9959f042a2..a469e12347 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 && !(This->start_boundary = 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 c7de7c7041..0f3010e30f 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1195,7 +1195,10 @@ 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}; IDailyTrigger *daily_trigger; + BSTR start_boundary; short interval; HRESULT hr; @@ -1225,6 +1228,14 @@ static void test_daily_trigger(ITrigger *trigger) ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); ok(interval == 2, "interval = %d\n", interval); + start_boundary = SysAllocString(startW); + hr = IDailyTrigger_put_StartBoundary(daily_trigger, start_boundary); + ok(hr == S_OK, "put_StartBoundary failed: %08x\n", 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); } -- 2.11.0

2 3

[PATCH v2 5/5] taskschd: Implement IDailyTrigger_get_Enabled.
by Hans Leidekker 01 Dec '17

01 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 d720d50f87..a8b819c360 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 d0477a82a4..c60fd1d9d7 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); } -- 2.11.0

1 0

[PATCH v2 4/5] taskschd: Implement IDailyTrigger_put_Enabled.
by Hans Leidekker 01 Dec '17

01 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 8b64663814..d720d50f87 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; -- 2.11.0

1 0

[PATCH v2 3/5] taskschd: Implement IDailyTrigger_get_StartBoundary.
by Hans Leidekker 01 Dec '17

01 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 ee5a7dd4b6..8b64663814 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 fb6d626e14..d0477a82a4 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); -- 2.11.0

1 0

[PATCH v2 2/5] taskschd: Implement IDailyTrigger_put_StartBoundary.
by Hans Leidekker 01 Dec '17

01 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 9959f042a2..ee5a7dd4b6 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 c7de7c7041..fb6d626e14 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); } -- 2.11.0

1 0

[PATCH v2 1/5] taskschd: Consistently check for allocation failure.
by Hans Leidekker 01 Dec '17

01 Dec '17

v2: Fix split and add more tests for the StartBoundary property. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 47c962015d..969baec831 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 df75236d9d..9959f042a2 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; } -- 2.11.0

1 0

[PATCH] v2: shell32: add stub for Shell_NotifyIconGetRect
by Louis Lenders 01 Dec '17

01 Dec '17

Now with signed-off line v2: - removed SetLastError (ERROR_CALL_NOT_IMPLEMENTED) - corrected prototype for Shell_NotifyIconGetRect in shellapi.h

1 0

[PATCH] msvcrt: Fix buffer size checks in swscanf_s
by Piotr Caban 01 Dec '17

01 Dec '17

For bug #44075 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/scanf.h | 6 +++--- dlls/msvcrt/tests/scanf.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-)

1 0

[PATCH 3/5] taskschd: Implement IDailyTrigger_put_Enabled.
by Hans Leidekker 01 Dec '17

01 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index a469e12347..84e84913fc 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) @@ -192,7 +193,7 @@ static HRESULT WINAPI DailyTrigger_put_StartBoundary(IDailyTrigger *iface, BSTR TRACE("(%p)->(%s)\n", This, debugstr_w(start)); - if (start && !(This->start_boundary = heap_strdupW(start))) return E_OUTOFMEMORY; + if (start && !(str = heap_strdupW(start))) return E_OUTOFMEMORY; heap_free(This->start_boundary); This->start_boundary = str; @@ -223,7 +224,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; } @@ -303,6 +307,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; -- 2.11.0

2 1

[PATCH 5/5] taskschd: Implement IDailyTrigger_get_Enabled.
by Hans Leidekker 01 Dec '17

01 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 11 ++++++++--- dlls/taskschd/tests/scheduler.c | 16 +++++++++++++++- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d720d50f87..a8b819c360 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 a9bf615dc3..60e5943fbe 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1199,6 +1199,7 @@ static void test_daily_trigger(ITrigger *trigger) {'2','0','0','4','-','0','1','-','0','1','T','0','0',':','0','0',':','0','0',0}; IDailyTrigger *daily_trigger; BSTR start_boundary; + VARIANT_BOOL enabled; short interval; HRESULT hr; @@ -1250,9 +1251,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_put_Enabled(daily_trigger, VARIANT_TRUE); + 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); } -- 2.11.0

1 0

[PATCH 4/5] taskschd: Implement IDailyTrigger_get_StartBoundary.
by Hans Leidekker 01 Dec '17

01 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 84e84913fc..d720d50f87 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -182,8 +182,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 0f3010e30f..a9bf615dc3 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1228,14 +1228,31 @@ 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"); + start_boundary = SysAllocString(startW); hr = IDailyTrigger_put_StartBoundary(daily_trigger, start_boundary); ok(hr == S_OK, "put_StartBoundary failed: %08x\n", hr); SysFreeString(start_boundary); + start_boundary = NULL; + 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"); + ok(!lstrcmpW(start_boundary, startW), "wrong string\n"); + hr = IDailyTrigger_put_StartBoundary(daily_trigger, NULL); ok(hr == S_OK, "put_StartBoundary failed: %08x\n", hr); + hr = IDailyTrigger_put_Enabled(daily_trigger, VARIANT_TRUE); + ok(hr == S_OK, "put_Enabled failed: %08x\n", hr); + IDailyTrigger_Release(daily_trigger); } -- 2.11.0

1 0

[PATCH 1/5] taskschd: Consistently check for allocation failure.
by Hans Leidekker 01 Dec '17

01 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 47c962015d..969baec831 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 df75236d9d..9959f042a2 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; } -- 2.11.0

1 0

[PATCH 1/2] comctl32/tests: Some cleanup for SysLink tests
by Nikolay Sivov 01 Dec '17

01 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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 94569d6f20..382c89d208 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); -- 2.15.0

1 1

wdscore: Add stub DLL.
by Stefan Leichter 30 Nov '17

30 Nov '17

The wdscore.dll is used from the Windows 10 MediaCreationTool.exe Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- configure.ac | 1 + dlls/wdscore/Makefile.in | 4 ++ dlls/wdscore/wdscore.spec | 161 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wdscore/wdscore_main.c | 43 ++++++++++++ 4 files changed, 209 insertions(+) create mode 100644 dlls/wdscore/Makefile.in create mode 100644 dlls/wdscore/wdscore.spec create mode 100644 dlls/wdscore/wdscore_main.c

1 0

[PATCH] gdiplus/tests: Check more return values (Coverity)
by Nikolay Sivov 30 Nov '17

30 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/tests/font.c | 6 ++++-- dlls/gdiplus/tests/graphics.c | 12 ++++++++---- dlls/gdiplus/tests/image.c | 5 +++-- dlls/gdiplus/tests/pathiterator.c | 15 ++++++++++----- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 6c7738cf90..2c7b21b6e8 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -83,7 +83,8 @@ static void test_createfont(void) for (i = UnitWorld; i <=UnitMillimeter; i++) { if (i == UnitDisplay) continue; /* Crashes WindowsXP, wtf? */ - GdipCreateFont(fontfamily, 24, FontStyleRegular, i, &font); + stat = GdipCreateFont(fontfamily, 24, FontStyleRegular, i, &font); + expect(Ok, stat); GdipGetFontSize (font, &size); ok (size == 24, "Expected 24, got %f (with unit: %d)\n", size, i); GdipGetFontUnit (font, &unit); @@ -107,7 +108,8 @@ static void test_logfont(void) UINT16 em_height, line_spacing; Unit unit; - GdipCreateFromHDC(hdc, &graphics); + stat = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, stat); memset(&lfa, 0, sizeof(LOGFONTA)); memset(&lfa2, 0xff, sizeof(LOGFONTA)); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index a96050b06d..96df1a2743 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -365,7 +365,8 @@ static void test_save_restore(void) log_state(state_a, &state_log); /* BeginContainer and SaveGraphics use the same stack. */ - GdipCreateFromHDC(hdc, &graphics1); + stat = GdipCreateFromHDC(hdc, &graphics1); + expect(Ok, stat); GdipSetInterpolationMode(graphics1, InterpolationModeBilinear); stat = GdipBeginContainer2(graphics1, &state_a); expect(Ok, stat); @@ -731,7 +732,8 @@ static void test_BeginContainer2(void) status = GdipCreateMatrix(&transform); expect(Ok, status); GdipGetWorldTransform(graphics, transform); - GdipGetMatrixElements(transform, elems); + status = GdipGetMatrixElements(transform, elems); + expect(Ok, status); ok(fabs(defTrans[0] - elems[0]) < 0.0001 && fabs(defTrans[1] - elems[1]) < 0.0001 && fabs(defTrans[2] - elems[2]) < 0.0001 && @@ -1600,10 +1602,12 @@ static void test_Get_Release_DC(void) status = GdipCreateMatrix(&m); expect(Ok, status); - GdipCreateRegion(&region); + status = GdipCreateRegion(&region); + expect(Ok, status); GdipCreateSolidFill((ARGB)0xdeadbeef, &brush); GdipCreatePath(FillModeAlternate, &path); - GdipCreateRegion(&clip); + status = GdipCreateRegion(&clip); + expect(Ok, status); status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0b444effb1..28f0fcec93 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -367,7 +367,8 @@ static void test_GdipImageGetFrameDimensionsCount(void) /* SelectActiveFrame has no effect on image data of memory bitmaps */ color = 0xdeadbeef; - GdipBitmapGetPixel(bm, 0, 0, &color); + stat = GdipBitmapGetPixel(bm, 0, 0, &color); + expect(Ok, stat); expect(0xffffffff, color); GdipDisposeImage((GpImage*)bm); @@ -2724,7 +2725,7 @@ static void test_multiframegif(void) expect(Ok, stat); color = 0xdeadbeef; - GdipBitmapGetPixel(bmp, 0, 0, &color); + stat = GdipBitmapGetPixel(bmp, 0, 0, &color); expect(Ok, stat); expect(0xffffffff, color); diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c index 3f6292c6cc..9bd3ac5452 100644 --- a/dlls/gdiplus/tests/pathiterator.c +++ b/dlls/gdiplus/tests/pathiterator.c @@ -80,7 +80,8 @@ static void test_hascurve(void) GdipDeletePathIter(iter); - GdipAddPathEllipse(path, 0.0, 0.0, 35.0, 70.0); + stat = GdipAddPathEllipse(path, 0.0, 0.0, 35.0, 70.0); + expect(Ok, stat); stat = GdipCreatePathIter(&iter, path); expect(Ok, stat); @@ -330,9 +331,12 @@ static void test_isvalid(void) GdipDeletePathIter(iter); /* no markers */ - GdipAddPathLine(path, 50.0, 50.0, 110.0, 40.0); - GdipCreatePathIter(&iter, path); - GdipPathIterNextMarker(iter, &result, &start, &end); + stat = GdipAddPathLine(path, 50.0, 50.0, 110.0, 40.0); + expect(Ok, stat); + stat = GdipCreatePathIter(&iter, path); + expect(Ok, stat); + stat = GdipPathIterNextMarker(iter, &result, &start, &end); + expect(Ok, stat); isvalid = FALSE; stat = GdipPathIterIsValid(iter, &isvalid); expect(Ok, stat); @@ -527,7 +531,8 @@ static void test_nextpathtype(void) todo_wine expect(0, result); GdipDeletePathIter(iter); - GdipAddPathEllipse(path, 0.0, 0.0, 35.0, 70.0); + stat = GdipAddPathEllipse(path, 0.0, 0.0, 35.0, 70.0); + expect(Ok, stat); GdipCreatePathIter(&iter, path); start = end = result = (INT)0xdeadbeef; type = 255; /* out of range */ -- 2.15.0

2 1

[PATCH v6 1/2] gdi32: In AddFaceToList allow fonts with long names and add tests
by Fabian Maurer 30 Nov '17

30 Nov '17

v4 remove global variable don't check if functions are available fix RemoveFontResourceExA test properly release dc add another test for completeness sake v6 Don't truncate strings, instead only compare up to LF_FACESIZE - 1 characters Also fix copying of the strings if they should be too long Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdi32/freetype.c | 45 +++++++++++-------------- dlls/gdi32/tests/font.c | 54 ++++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 3 ++ dlls/gdi32/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_longname.ttf | Bin 0 -> 2252 bytes 5 files changed, 142 insertions(+), 26 deletions(-) create mode 100644 dlls/gdi32/tests/wine_longname.sfd create mode 100644 dlls/gdi32/tests/wine_longname.ttf diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 346e21dc21..7c5a7ef979 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1027,7 +1027,7 @@ static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_n LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) { const struct list *face_list; - if(face_name && strcmpiW(face_name, family->FamilyName)) + if(face_name && strncmpiW(face_name, family->FamilyName, LF_FACESIZE - 1)) continue; face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) @@ -1053,7 +1053,7 @@ static Family *find_family_from_name(const WCHAR *name) LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) { - if(!strcmpiW(family->FamilyName, name)) + if(!strncmpiW(family->FamilyName, name, LF_FACESIZE -1)) return family; } @@ -1066,9 +1066,9 @@ static Family *find_family_from_any_name(const WCHAR *name) LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) { - if(!strcmpiW(family->FamilyName, name)) + if(!strncmpiW(family->FamilyName, name, LF_FACESIZE - 1)) return family; - if(family->EnglishName && !strcmpiW(family->EnglishName, name)) + if(family->EnglishName && !strncmpiW(family->EnglishName, name, LF_FACESIZE - 1)) return family; } @@ -2141,13 +2141,6 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags ); family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); - if (strlenW(family->FamilyName) >= LF_FACESIZE) - { - WARN("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); - release_face( face ); - release_family( family ); - return; - } if (insert_face_in_family_list( face, family )) { @@ -2471,7 +2464,7 @@ static SYSTEM_LINKS *find_font_link(const WCHAR *name) LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) { - if(!strcmpiW(font_link->font_name, name)) + if(!strncmpiW(font_link->font_name, name, LF_FACESIZE - 1)) return font_link; } @@ -4320,7 +4313,7 @@ static BOOL move_to_front(const WCHAR *name) Family *family, *cursor2; LIST_FOR_EACH_ENTRY_SAFE(family, cursor2, &font_list, Family, entry) { - if(!strcmpiW(family->FamilyName, name)) + if(!strncmpiW(family->FamilyName, name, LF_FACESIZE - 1)) { list_remove(&family->entry); list_add_head(&font_list, &family->entry); @@ -5476,8 +5469,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) or if that's unavailable the first charset that the font supports. */ LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { - if (!strcmpiW(family->FamilyName, FaceName) || - (psub && !strcmpiW(family->FamilyName, psub->to.name))) + if (!strncmpiW(family->FamilyName, FaceName, LF_FACESIZE - 1) || + (psub && !strncmpiW(family->FamilyName, psub->to.name, LF_FACESIZE - 1))) { font_link = find_font_link(family->FamilyName); face_list = get_face_list_from_family(family); @@ -5499,7 +5492,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY( face, face_list, Face, entry ) { - if(face->FullName && !strcmpiW(face->FullName, FaceName) && + if(face->FullName && !strncmpiW(face->FullName, FaceName, LF_FACESIZE - 1) && (face->scalable || can_use_bitmap)) { if (csi.fs.fsCsb[0] & face->fs.fsCsb[0] || !csi.fs.fsCsb[0]) @@ -5518,8 +5511,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) */ LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) { - if(!strcmpiW(font_link->font_name, FaceName) || - (psub && !strcmpiW(font_link->font_name,psub->to.name))) + if(!strncmpiW(font_link->font_name, FaceName, LF_FACESIZE - 1) || + (psub && !strncmpiW(font_link->font_name,psub->to.name, LF_FACESIZE - 1))) { TRACE("found entry in system list\n"); LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) @@ -5569,7 +5562,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) else strcpyW(lf.lfFaceName, defSans); LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { - if(!strcmpiW(family->FamilyName, lf.lfFaceName)) { + if(!strncmpiW(family->FamilyName, lf.lfFaceName, LF_FACESIZE - 1)) { font_link = find_font_link(family->FamilyName); face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY( face, face_list, Face, entry ) { @@ -6037,20 +6030,20 @@ static BOOL family_matches(Family *family, const WCHAR *face_name) Face *face; const struct list *face_list; - if (!strcmpiW(face_name, family->FamilyName)) return TRUE; + if (!strncmpiW(face_name, family->FamilyName, LF_FACESIZE - 1)) return TRUE; face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) - if (face->FullName && !strcmpiW(face_name, face->FullName)) return TRUE; + if (face->FullName && !strncmpiW(face_name, face->FullName, LF_FACESIZE - 1)) return TRUE; return FALSE; } static BOOL face_matches(const WCHAR *family_name, Face *face, const WCHAR *face_name) { - if (!strcmpiW(face_name, family_name)) return TRUE; + if (!strncmpiW(face_name, family_name, LF_FACESIZE - 1)) return TRUE; - return (face->FullName && !strcmpiW(face_name, face->FullName)); + return (face->FullName && !strncmpiW(face_name, face->FullName, LF_FACESIZE - 1)); } static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_charset_list *list, @@ -6082,11 +6075,11 @@ static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_cha /* Font Replacement */ if (family != face->family) { - strcpyW(elf.elfLogFont.lfFaceName, family->FamilyName); + lstrcpynW(elf.elfLogFont.lfFaceName, family->FamilyName, LF_FACESIZE); if (face->FullName) - strcpyW(elf.elfFullName, face->FullName); + lstrcpynW(elf.elfFullName, face->FullName, LF_FULLFACESIZE); else - strcpyW(elf.elfFullName, family->FamilyName); + lstrcpynW(elf.elfFullName, family->FamilyName, LF_FULLFACESIZE); } if (subst) strcpyW(elf.elfLogFont.lfFaceName, subst); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 299fadbab1..bd04a8b6b1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6679,6 +6679,59 @@ static void test_GetCharWidthI(void) ReleaseDC(0, hdc); } +static INT CALLBACK long_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lparam) +{ + BOOL *found_font = (BOOL *)lparam; + *found_font = TRUE; + return 1; +} + +static void test_long_names(void) +{ + char ttf_name[MAX_PATH]; + LOGFONTA font = {0}; + HFONT handle_font; + BOOL found_font; + int ret; + HDC dc; + + if (!write_ttf_file("wine_longname.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + dc = GetDC(NULL); + + ret = AddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + strcpy(font.lfFaceName, "wine_3_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(dc, &font, long_enum_proc, (LPARAM)&found_font, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_2_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(dc, &font, long_enum_proc, (LPARAM)&found_font, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_1_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(dc, &font, long_enum_proc, (LPARAM)&found_font, 0); + ok(found_font == FALSE, "EnumFontFamiliesExA must not find font.\n"); + + handle_font = CreateFontIndirectA(&font); + ok(handle_font != NULL, "CreateFontIndirectA failed\n"); + DeleteObject(handle_font); + + ret = RemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "RemoveFontResourceEx() failed\n"); + + DeleteFileA(ttf_name); + ReleaseDC(NULL, dc); +} + START_TEST(font) { init(); @@ -6742,6 +6795,7 @@ START_TEST(font) test_fake_bold_font(); test_bitmap_font_glyph_index(); test_GetCharWidthI(); + test_long_names(); /* These tests should be last test until RemoveFontResource * is properly implemented. diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index fdd95f687a..6dcbd42ab5 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -28,3 +28,6 @@ wine_vdmx.ttf RCDATA wine_vdmx.ttf /* @makedep: vertical.ttf */ vertical.ttf RCDATA vertical.ttf + +/* @makedep: wine_longname.ttf */ +wine_longname.ttf RCDATA wine_longname.ttf diff --git a/dlls/gdi32/tests/wine_longname.sfd b/dlls/gdi32/tests/wine_longname.sfd new file mode 100644 index 0000000000..998d7cc01f --- /dev/null +++ b/dlls/gdi32/tests/wine_longname.sfd @@ -0,0 +1,66 @@ +SplineFontDB: 3.0 +FontName: wine_1_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FullName: wine_2_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FamilyName: wine_3_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +Weight: Regular +Copyright: Copyright (c) 2017, Fabian Maurer +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102.4 +UnderlineWidth: 51.2 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 48 28337276 3092883] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1510948643 +ModificationTime: 1510949092 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +MarkAttachClasses: 1 +DEI: 91125 +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 64 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: at +Encoding: 64 64 0 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +259 332 m 29 + 468 664 l 29 + 514 332 l 29 + 259 332 l 29 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_longname.ttf b/dlls/gdi32/tests/wine_longname.ttf new file mode 100644 index 0000000000000000000000000000000000000000..59d9517560592e9578f1510f99f4fb65065c1195 GIT binary patch literal 2252 zcmdT`J!~6Q9RIz$vy(ze6NyY%=$Z!6pv1io)Gv83{V*L80j0`9(dA;F&nMYF>wHP- zEn;Fof`I`fHnvbz#A0FuAu(hCArJ#BOqEKh7`jo+@4dUk$yy{T-ueID|MR{7*WEJ& zfGKQ4$6Bp+W96OM-;M#3pOag9^~%*6X7McP4<-HDn`fNWg1-fb7U{Km$M4}p@gC`) z376`dsfju5T|h5UZiIfnHyUwgOuk2YGHef;-|P-8$`?uZT7lnq=Jxy@;=dElw#Xc#zZw1cxedX4gzAY&y=efL?(J5hOvrwuZIpI(0OX}12^z#O1y+79VSXp+l88^yVq z>1&$WDU)Thp*Y5YjkFYsS4CN=7*zQHj7|Gkqlb7uTg5%Nf*IFP;G7TX=fQZrd9}g% zR8iI4k&Bzk6Xnx^iU~o_=sBZSAeeKRcLk-~+X^YUbBRhOSA&nFtE`clM_=cf5XJEU zLdGKD@Hpb(VZj)e$N$fV>Sgwge9ki#P3BlQtbmRQly?QrRE84<?mN51!Y`Gft`Wtq zF4+ai9!?a+UzH(Kc;9hnPR_jO&YYSP(|_#kX*-Wr=d>ob6S`Pt$9*JoES@9zeOWAv z<-fm>$(zER{hHt;uH?8t6?b!7!-Tky<2v3Jk8<2VRr@u^3z*icIbLKR{UAHRko|Uv zkl}(o*35AYQ(_^<b$lsa$#DbQ+FLnZfT=&9<3()iZ{RXw^e{kz2q9WX*=46u#{yRe z7HpiuBJmpJTO4ujl3L-qL7RYp%W-dzL}4p6PuCYr$Fk2Ynl*nt^1J4WzmWt~*`j5a z+8$g&%5x(0iDk1-Y*XzuAl9ZwUHam2_R&#R(!!^mM|$5+kN(IVQ|iY@?3$z#azZqy z?J^E*Mcu%2y|fkeJ^p-eGe`zrJMM;_`~Xqlr(Q<};jNR3<4o3!6EAE;E_b-j!$Jn# zrX!5#dJt~3eIhmGZmQOV8i7h&nW-~zkuVP3QO^F?p=Vy$d=-{hOq=t5Sy79-X)R8| zz;w!%dC^o!avncP+`>M;WZO%!2M!ng$wZzN{a?fbtg@U5J2g^8Hd$2pM#$pI$D~4# z^rN_IT9#e5EQ_3Rz3nGb?<{Kj@vF#>%l^$V+UDEC51eEj8S=ss)H<cOf_KsQc0JDj V9#YOPqq5Ab)%@daq1MB9_dm8?dc^<$ literal 0 HcmV?d00001 -- 2.15.0

3 5

[PATCH] msvcrt: Don't report error in fclose on already closed stream
by Piotr Caban 30 Nov '17

30 Nov '17

For bug #44091. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 6 ++++++ dlls/msvcrt/tests/file.c | 3 +++ 2 files changed, 9 insertions(+)

1 0

[PATCH] msvcrt: Change how fread splits reading into chunks
by Piotr Caban 30 Nov '17

30 Nov '17

It affects fd stream position and buffer content on unsuccessul reads. For bug #43116. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 6 +++--- dlls/msvcrt/tests/file.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 5 deletions(-)

1 0

[PATCH 01/1] dlls/wined3d/: remove outdated comment
by Austin English 30 Nov '17

30 Nov '17

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- 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 0ff9ee44bb..317152ceec 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 */ -- 2.13.6

1 0

[PATCH 3/3] ntdll: Don't require full-page reads in NtReadFileScatter
by Andrew Eikum 30 Nov '17

30 Nov '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 21 ++++++++++++++++++++- dlls/ntdll/file.c | 5 ++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 75b56e5d41..40cc66dd03 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1, rbuf2; + char *wbuf = NULL, *rbuf1, *rbuf2; BOOL br; ret = GetTempPathA( MAX_PATH, temp_path ); @@ -4454,6 +4454,25 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, "data should not have been read into buffer\n" ); + /* partial page read */ + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + br = ReadFileScatter( hfile, fse, si.dwPageSize / 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + memset( rbuf2, 0, si.dwPageSize ); + ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 6c3b571638..db45a5bcf3 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1041,7 +1041,6 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", file, event, apc, apc_user, io_status, segments, length, offset, key); - if (length % page_size) return STATUS_INVALID_PARAMETER; if (!io_status) return STATUS_ACCESS_VIOLATION; status = server_get_unix_fd( file, FILE_READ_DATA, &unix_handle, @@ -1060,9 +1059,9 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap { if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pread( unix_handle, (char *)segments->Buffer + pos, - page_size - pos, offset->QuadPart + total ); + min( length - pos, page_size - pos ), offset->QuadPart + total ); else - result = read( unix_handle, (char *)segments->Buffer + pos, page_size - pos ); + result = read( unix_handle, (char *)segments->Buffer + pos, min( length - pos, page_size - pos ) ); if (result == -1) { -- 2.15.0

1 0

[PATCH 2/3] ntdll: Don't return an error when reading past EOF in NtReadFileScatter
by Andrew Eikum 30 Nov '17

30 Nov '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 27 ++++++++++++++++++++++++++- dlls/ntdll/file.c | 8 +++----- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 8f5f392822..75b56e5d41 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1; + LPVOID wbuf = NULL, rbuf1, rbuf2; BOOL br; ret = GetTempPathA( MAX_PATH, temp_path ); @@ -4378,6 +4378,9 @@ static void test_WriteFileGather(void) rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + rbuf2 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf2 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); memset( wbuf, 0x42, si.dwPageSize ); @@ -4430,11 +4433,33 @@ static void test_WriteFileGather(void) ok( povl == NULL, "wrong ovl %p\n", povl ); } + /* read past EOF */ + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + fse[1].Buffer = rbuf2; + memset( rbuf1, 0, si.dwPageSize ); + memset( rbuf2, 0x17, si.dwPageSize ); + br = ReadFileScatter( hfile, fse, si.dwPageSize * 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + memset( rbuf1, 0x17, si.dwPageSize ); + ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, + "data should not have been read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); VirtualFree( wbuf, 0, MEM_RELEASE ); VirtualFree( rbuf1, 0, MEM_RELEASE ); + VirtualFree( rbuf2, 0, MEM_RELEASE ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 12b1d0f6c5..6c3b571638 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1070,11 +1070,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap status = FILE_GetNtStatus(); break; } - if (!result) - { - status = STATUS_END_OF_FILE; - break; - } + if (!result) break; total += result; length -= result; if ((pos += result) == page_size) @@ -1084,6 +1080,8 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap } } + if (total == 0) status = STATUS_END_OF_FILE; + send_completion = cvalue != 0; error: -- 2.15.0

1 0

[PATCH 1/2] hlink/tests: Add tests for navigating from a string reference.
by Zebediah Figura 30 Nov '17

30 Nov '17

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: use test.winehq.org instead of www.winehq.org v4: disable failing tests on Wine dlls/hlink/tests/hlink.c | 79 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 12 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 50f61d57f7e..c19de13ca81 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -67,6 +67,9 @@ DEFINE_EXPECT(GetClassID); DEFINE_EXPECT(Save); DEFINE_EXPECT(HBC_QueryInterface_IHlinkHistory); +DEFINE_EXPECT(HBC_QueryInterface_IMarshal); +DEFINE_EXPECT(HBC_QueryInterface_IdentityUnmarshal); +DEFINE_EXPECT(HBC_QueryInterface_IUnknown); DEFINE_EXPECT(HBC_GetObject); DEFINE_EXPECT(HBC_UpdateHlink); @@ -77,8 +80,16 @@ DEFINE_EXPECT(HT_GetFriendlyName); DEFINE_EXPECT(HLF_UpdateHlink); +DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IHlinkHistory,0x79eac9c8,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); +static const WCHAR winehq_urlW[] = + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g', + '/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; +static const WCHAR winehq_404W[] = + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g', + '/','t','e','s','t','s','/','f','a','k','e','u','r','l',0}; + static void test_HlinkIsShortcut(void) { UINT i; @@ -627,9 +638,6 @@ static void test_HlinkParseDisplayName(void) IBindCtx *bctx; HRESULT hres; - static const WCHAR winehq_urlW[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', - '/','s','i','t','e','/','a','b','o','u','t',0}; static const WCHAR invalid_urlW[] = {'t','e','s','t',':','1','2','3','a','b','c',0}; static const WCHAR clsid_nameW[] = {'c','l','s','i','d',':', '2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8', @@ -829,12 +837,17 @@ static HRESULT WINAPI HlinkBrowseContext_QueryInterface( { *ppv = NULL; - if(IsEqualGUID(&IID_IHlinkHistory, riid)) { + if (IsEqualGUID(&IID_IHlinkHistory, riid)) CHECK_EXPECT(HBC_QueryInterface_IHlinkHistory); - return E_NOINTERFACE; - } + else if (IsEqualGUID(&IID_IMarshal, riid)) + CHECK_EXPECT2(HBC_QueryInterface_IMarshal); + else if (IsEqualGUID(&CLSID_IdentityUnmarshal, riid)) + CHECK_EXPECT(HBC_QueryInterface_IdentityUnmarshal); + else if (IsEqualGUID(&IID_IUnknown, riid)) + CHECK_EXPECT(HBC_QueryInterface_IUnknown); + else + ok(0, "unexpected interface: %s\n", wine_dbgstr_guid(riid)); - ok(0, "unexpected interface: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -859,9 +872,17 @@ static IMoniker Moniker; static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, IMoniker *pimk, BOOL fBindIfRootRegistered, IUnknown **ppiunk) { + IBindCtx *bctx; + WCHAR *name; + CHECK_EXPECT(HBC_GetObject); - ok(pimk == &Moniker, "pimk != &Moniker\n"); + CreateBindCtx(0, &bctx); + IMoniker_GetDisplayName(pimk, bctx, NULL, &name); + ok(!lstrcmpW(winehq_urlW, name) || !lstrcmpW(winehq_404W, name), "got unexpected url\n"); + CoTaskMemFree(name); + IBindCtx_Release(bctx); + ok(fBindIfRootRegistered == 1, "fBindIfRootRegistered = %x\n", fBindIfRootRegistered); *ppiunk = NULL; return S_FALSE; @@ -1205,10 +1226,6 @@ static HRESULT WINAPI Moniker_RelativePathTo(IMoniker *iface, IMoniker *pmkOther static HRESULT WINAPI Moniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName) { - static const WCHAR winehq_urlW[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', - '/','s','i','t','e','/','a','b','o','u','t',0}; - CHECK_EXPECT2(GetDisplayName); ok(pbc != NULL, "pbc == NULL\n"); @@ -2206,6 +2223,44 @@ static void test_Hlink_Navigate(void) CHECK_CALLED(HT_Navigate); todo_wine CHECK_CALLED(HT_GetFriendlyName); +if (0) { /* these currently open a browser window on wine */ + /* Test from string */ + SET_EXPECT(HBC_GetObject); + hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, pbc, NULL, &HlinkBrowseContext); + todo_wine ok(hres == INET_E_OBJECT_NOT_FOUND, "Expected INET_E_OBJECT_NOT_FOUND, got %08x\n", hres); + todo_wine CHECK_CALLED(HBC_GetObject); + + /* MSDN claims browse context and bind context can't be null, but they can */ + SET_EXPECT(HBC_GetObject); + hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, NULL, NULL, &HlinkBrowseContext); + todo_wine ok(hres == INET_E_OBJECT_NOT_FOUND, "Expected INET_E_OBJECT_NOT_FOUND, got %08x\n", hres); + todo_wine CHECK_CALLED(HBC_GetObject); +} + + /* these open a browser window, so mark them interactive only */ + if (winetest_interactive) + { + /* both parameters null */ + hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL); + todo_wine ok(hres == DRAGDROP_S_DROP, "Expected DRAGDROP_S_DROP, got %08x\n", hres); + + /* try basic test with valid URL */ + SET_EXPECT(HBC_GetObject); + SET_EXPECT(HBC_QueryInterface_IHlinkHistory); + SET_EXPECT(HBC_QueryInterface_IMarshal); + SET_EXPECT(HBC_QueryInterface_IdentityUnmarshal); + SET_EXPECT(HBC_QueryInterface_IUnknown); + hres = HlinkNavigateToStringReference(winehq_urlW, NULL, NULL, 0, NULL, 0, pbc, NULL, &HlinkBrowseContext); + ok(hres == S_OK, "Expected S_OK, got %08x\n", hres); + todo_wine CHECK_CALLED(HBC_GetObject); + todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); + todo_wine CHECK_CALLED(HBC_QueryInterface_IMarshal); + todo_wine CHECK_CALLED(HBC_QueryInterface_IdentityUnmarshal); + todo_wine CHECK_CALLED(HBC_QueryInterface_IUnknown); + } + else + skip("interactive IHlink_Navigate tests\n"); + IHlink_Release(hlink); IBindCtx_Release(pbc); _bctx = NULL; -- 2.15.0

1 1

[PATCH 5/5] mshtml: Silence some noisy FIXMEs.
by Jacek Caban 30 Nov '17

30 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 4/5] mshtml: Pass listener type as a string to remove_event_listener.
by Jacek Caban 30 Nov '17

30 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)

1 0

[PATCH 3/5] mshtml: Pass listener type as a string to get_listener_container.
by Jacek Caban 30 Nov '17

30 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-)

1 0

[PATCH 2/5] mshtml: Store listener container type as a string.
by Jacek Caban 30 Nov '17

30 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)

1 0

[PATCH 1/5] mshtml: Removed unused impl_from_DispatchEx.
by Jacek Caban 30 Nov '17

30 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 5 ----- 1 file changed, 5 deletions(-)

1 0

[PATCH] xaudio2: Ignore buffers returned from OpenAL after Stop
by Andrew Eikum 30 Nov '17

30 Nov '17

For bug 40963. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/tests/xaudio2.c | 78 +++++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 77 +++++++++++++++++++++++++--------------- dlls/xaudio2_7/xaudio_private.h | 2 +- 3 files changed, 127 insertions(+), 30 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 54176eaf86..ff402f87c4 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -841,6 +841,82 @@ static void test_submix(IXAudio2 *xa) IXAudio2MasteringVoice_DestroyVoice(master); } +static void test_flush(IXAudio2 *xa) +{ + HRESULT hr; + IXAudio2MasteringVoice *master; + IXAudio2SourceVoice *src; + WAVEFORMATEX fmt; + XAUDIO2_BUFFER buf; + XAUDIO2_VOICE_STATE state; + + XA2CALL_0V(StopEngine); + + if(xaudio27) + hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); + else + hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + + fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + fmt.nChannels = 2; + fmt.nSamplesPerSec = 44100; + fmt.wBitsPerSample = 32; + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign; + fmt.cbSize = 0; + + XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, NULL, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + memset(&buf, 0, sizeof(buf)); + buf.AudioBytes = 22050 * fmt.nBlockAlign; + buf.pAudioData = HeapAlloc(GetProcessHeap(), 0, buf.AudioBytes); + fill_buf((float*)buf.pAudioData, &fmt, 440, 22050); + + hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + XA2CALL_0(StartEngine); + ok(hr == S_OK, "StartEngine failed: %08x\n", hr); + + while(1){ + if(xaudio27) + IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); + else + IXAudio2SourceVoice_GetState(src, &state, 0); + if(state.SamplesPlayed >= 2205) + break; + Sleep(10); + } + + hr = IXAudio2SourceVoice_Stop(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Stop failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_FlushSourceBuffers(src); + ok(hr == S_OK, "FlushSourceBuffers failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + Sleep(100); + + hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + + if(xaudio27){ + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); + }else{ + IXAudio2SourceVoice_DestroyVoice(src); + } + IXAudio2MasteringVoice_DestroyVoice(master); + + HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); +} + static UINT32 test_DeviceDetails(IXAudio27 *xa) { HRESULT hr; @@ -1136,6 +1212,7 @@ START_TEST(xaudio2) test_buffer_callbacks((IXAudio2*)xa27); test_looping((IXAudio2*)xa27); test_submix((IXAudio2*)xa27); + test_flush((IXAudio2*)xa27); }else skip("No audio devices available\n"); @@ -1159,6 +1236,7 @@ START_TEST(xaudio2) test_buffer_callbacks(xa); test_looping(xa); test_submix(xa); + test_flush(xa); }else skip("No audio devices available\n"); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 13f591630f..8f15ded023 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -414,6 +414,7 @@ static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface) This->nbufs = 0; This->first_buf = 0; This->cur_buf = 0; + This->abandoned_albufs = 0; LeaveCriticalSection(&This->lock); } @@ -438,11 +439,18 @@ static HRESULT WINAPI XA2SRC_Stop(IXAudio2SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + ALint bufs; TRACE("%p, 0x%x, 0x%x\n", This, Flags, OperationSet); + palcSetThreadContext(This->xa2->al_ctx); + EnterCriticalSection(&This->lock); + alGetSourcei(This->al_src, AL_BUFFERS_QUEUED, &bufs); + + This->abandoned_albufs = bufs; + This->running = FALSE; LeaveCriticalSection(&This->lock); @@ -2273,44 +2281,53 @@ static void update_source_state(XA2SourceImpl *src) ALuint al_buffers[XAUDIO2_MAX_QUEUED_BUFFERS]; alSourceUnqueueBuffers(src->al_src, processed, al_buffers); + src->first_al_buf += processed; src->first_al_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; src->al_bufs_used -= processed; - for(i = 0; i < processed; ++i){ - ALint bufsize; + if(processed > src->abandoned_albufs){ + for(i = src->abandoned_albufs; i < processed; ++i){ + ALint bufsize; - alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); + alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); - src->in_al_bytes -= bufsize; - src->played_frames += bufsize / src->submit_blocksize; + src->in_al_bytes -= bufsize; + src->played_frames += bufsize / src->submit_blocksize; - if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ - DWORD old_buf = src->first_buf; + if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ + DWORD old_buf = src->first_buf; - src->first_buf++; - src->first_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; - src->nbufs--; + src->first_buf++; + src->first_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; + src->nbufs--; - TRACE("%p: done with buffer %u\n", src, old_buf); + TRACE("%p: done with buffer %u\n", src, old_buf); - if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) - src->played_frames = 0; - - if(src->cb){ - IXAudio2VoiceCallback_OnBufferEnd(src->cb, - src->buffers[old_buf].xa2buffer.pContext); if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) - IXAudio2VoiceCallback_OnStreamEnd(src->cb); + src->played_frames = 0; - if(src->nbufs > 0) - IXAudio2VoiceCallback_OnBufferStart(src->cb, - src->buffers[src->first_buf].xa2buffer.pContext); + if(src->cb){ + IXAudio2VoiceCallback_OnBufferEnd(src->cb, + src->buffers[old_buf].xa2buffer.pContext); + if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) + IXAudio2VoiceCallback_OnStreamEnd(src->cb); + + if(src->nbufs > 0) + IXAudio2VoiceCallback_OnBufferStart(src->cb, + src->buffers[src->first_buf].xa2buffer.pContext); + } } } - } + + src->abandoned_albufs = 0; + }else + src->abandoned_albufs -= processed; } + if(!src->running) + return; + alGetSourcei(src->al_src, AL_BYTE_OFFSET, &bufpos); /* maintain IN_AL_PERIODS periods in AL */ @@ -2384,12 +2401,12 @@ static void do_engine_tick(IXAudio2Impl *This) EnterCriticalSection(&src->lock); - if(!src->in_use || !src->running){ + if(!src->in_use){ LeaveCriticalSection(&src->lock); continue; } - if(src->cb){ + if(src->cb && This->running){ #if XAUDIO2_VER == 0 IXAudio20VoiceCallback_OnVoiceProcessingPassStart((IXAudio20VoiceCallback*)src->cb); #else @@ -2403,12 +2420,14 @@ static void do_engine_tick(IXAudio2Impl *This) update_source_state(src); - alGetSourcei(src->al_src, AL_SOURCE_STATE, &st); - if(st != AL_PLAYING) - alSourcePlay(src->al_src); + if(This->running){ + alGetSourcei(src->al_src, AL_SOURCE_STATE, &st); + if(st != AL_PLAYING) + alSourcePlay(src->al_src); - if(src->cb) - IXAudio2VoiceCallback_OnVoiceProcessingPassEnd(src->cb); + if(src->cb) + IXAudio2VoiceCallback_OnVoiceProcessingPassEnd(src->cb); + } LeaveCriticalSection(&src->lock); } diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index f28a0aec47..1a4aa08ce5 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -81,7 +81,7 @@ typedef struct _XA2SourceImpl { /* most cases will only need about 4 AL buffers, but some corner cases * could require up to MAX_QUEUED_BUFFERS */ ALuint al_bufs[XAUDIO2_MAX_QUEUED_BUFFERS]; - DWORD first_al_buf, al_bufs_used; + DWORD first_al_buf, al_bufs_used, abandoned_albufs; struct list entry; } XA2SourceImpl; -- 2.15.0

1 0

[PATCH 2/3] ntdll: Don't return an error when reading past EOF in NtReadFileScatter
by Andrew Eikum 30 Nov '17

30 Nov '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 27 ++++++++++++++++++++++++++- dlls/ntdll/file.c | 3 --- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 44fbf7a4b1..e1cf268817 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4354,7 +4354,7 @@ static void test_WriteFileGather(void) OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; BOOL br; - char *wbuf = NULL, *rbuf1; + char *wbuf = NULL, *rbuf1, *rbuf2; ret = GetTempPathA( MAX_PATH, temp_path ); ok( ret != 0, "GetTempPathA error %d\n", GetLastError() ); @@ -4378,6 +4378,9 @@ static void test_WriteFileGather(void) rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + rbuf2 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf2 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); memset( wbuf, 0x42, si.dwPageSize ); @@ -4405,11 +4408,33 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, "data was not read into buffer\n" ); + /* read past EOF */ + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + fse[1].Buffer = rbuf2; + memset( rbuf1, 0, si.dwPageSize ); + memset( rbuf2, 0x17, si.dwPageSize ); + br = ReadFileScatter( hfile, fse, si.dwPageSize * 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + memset( rbuf1, 0x17, si.dwPageSize ); + ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, + "data should not have been read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); VirtualFree( wbuf, 0, MEM_RELEASE ); VirtualFree( rbuf1, 0, MEM_RELEASE ); + VirtualFree( rbuf2, 0, MEM_RELEASE ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index bdfc383d7e..f7db24cc8b 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1071,10 +1071,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap break; } if (!result) - { - status = STATUS_END_OF_FILE; break; - } total += result; length -= result; if ((pos += result) == page_size) -- 2.15.0

2 2

A dead condition in dlls/oleaut32/variant.c
by Gerald Pfeifer 30 Nov '17

30 Nov '17

dlls/oleaut32/variant.c has the following code else if ((dwVtBits & REAL_VTBITS) == VTBIT_DECIMAL) where REAL_VTBITS is defined as VTBIT_R4|VTBIT_R8|VTBIT_CY with VTBIT_R4 := 1 << VT_R4 and VT_R4 := 4 in wtypes.h, VTBIT_R8 := 1 << VT_R8 and VT_R8 := 5, VTBIT_CY := 1 << VT_CY and VT_CY := 6. VTBIT_DECIMAL, on the other hand is 1 << VT_DECIMAL with VT_DECIMAL = 14. Now perhaps I am missing something quite obvious, but isn't that condition always false since REAL_VTBITS are disjoint from VTBIT_DECIMAL and we are first masking bits 5, 6, and 7 and then comparing with bit 15? (If you fix this, you may want to give credit to GCC 8 for pointing me towards that code.) Gerald

1 0

[PATCH 8/8] taskschd: Implement IExecAction_get_Path.
by Hans Leidekker 30 Nov '17

30 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 16 ++++++++++++++-- dlls/taskschd/tests/scheduler.c | 13 +++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 01e7c2d6bb..df75236d9d 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1740,8 +1740,20 @@ static HRESULT WINAPI ExecAction_get_Type(IExecAction *iface, TASK_ACTION_TYPE * static HRESULT WINAPI ExecAction_get_Path(IExecAction *iface, BSTR *path) { - FIXME("%p,%p: stub\n", iface, path); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, path); + + if (!path) return E_POINTER; + + if (!action->path) + { + *path = NULL; + return S_OK; + } + + if (!(*path = SysAllocString(action->path))) return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI ExecAction_put_Path(IExecAction *iface, BSTR path) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 22854d917c..c7de7c7041 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1236,6 +1236,7 @@ static void create_action(ITaskDefinition *taskdef) IAction *action; IExecAction *exec_action; TASK_ACTION_TYPE type; + BSTR path; hr = ITaskDefinition_get_Actions(taskdef, &actions); ok(hr == S_OK, "get_Actions error %#x\n", hr); @@ -1251,9 +1252,21 @@ static void create_action(ITaskDefinition *taskdef) ok(hr == S_OK, "get_Type error %#x\n", hr); ok(type == TASK_ACTION_EXEC, "got %u\n", type ); + path = (BSTR)0xdeadbeef; + hr = IExecAction_get_Path(exec_action, &path); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(path == NULL, "path not set\n"); + hr = IExecAction_put_Path(exec_action, task1_exe); ok(hr == S_OK, "put_Path error %#x\n", hr); + path = NULL; + hr = IExecAction_get_Path(exec_action, &path); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(path != NULL, "path not set\n"); + ok(!lstrcmpW(path, task1_exe), "wrong path\n" ); + SysFreeString(path); + IExecAction_Release(exec_action); IAction_Release(action); IActionCollection_Release(actions); -- 2.11.0

1 0

[PATCH 7/8] taskschd: Implement IExecAction_put_Path.
by Hans Leidekker 30 Nov '17

30 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index f32d3d28e1..01e7c2d6bb 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1638,6 +1638,7 @@ typedef struct { IExecAction IExecAction_iface; LONG ref; + WCHAR *path; } ExecAction; static inline ExecAction *impl_from_IExecAction(IExecAction *iface) @@ -1659,6 +1660,7 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) if (!ref) { TRACE("destroying %p\n", iface); + heap_free(action->path); heap_free(action); } @@ -1744,7 +1746,15 @@ static HRESULT WINAPI ExecAction_get_Path(IExecAction *iface, BSTR *path) static HRESULT WINAPI ExecAction_put_Path(IExecAction *iface, BSTR path) { - FIXME("%p,%s: stub\n", iface, debugstr_w(path)); + ExecAction *action = impl_from_IExecAction(iface); + WCHAR *str = NULL; + + TRACE("%p,%s\n", iface, debugstr_w(path)); + + if (path && !(str = heap_strdupW((path)))) return E_OUTOFMEMORY; + heap_free(action->path); + action->path = str; + return S_OK; } @@ -1801,6 +1811,7 @@ static HRESULT ExecAction_create(IExecAction **obj) action->IExecAction_iface.lpVtbl = &Action_vtbl; action->ref = 1; + action->path = NULL; *obj = &action->IExecAction_iface; -- 2.11.0

1 0

[PATCH 6/8] taskschd: Implement IActionCollection_Create.
by Hans Leidekker 30 Nov '17

30 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 188 +++++++++++++++++++++++++++++++++++++++- dlls/taskschd/tests/scheduler.c | 13 ++- 2 files changed, 192 insertions(+), 9 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 1c20f837c2..f32d3d28e1 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1636,6 +1636,181 @@ static HRESULT Principal_create(IPrincipal **obj) typedef struct { + IExecAction IExecAction_iface; + LONG ref; +} ExecAction; + +static inline ExecAction *impl_from_IExecAction(IExecAction *iface) +{ + return CONTAINING_RECORD(iface, ExecAction, IExecAction_iface); +} + +static ULONG WINAPI ExecAction_AddRef(IExecAction *iface) +{ + ExecAction *action = impl_from_IExecAction(iface); + return InterlockedIncrement(&action->ref); +} + +static ULONG WINAPI ExecAction_Release(IExecAction *iface) +{ + ExecAction *action = impl_from_IExecAction(iface); + LONG ref = InterlockedDecrement(&action->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(action); + } + + return ref; +} + +static HRESULT WINAPI ExecAction_QueryInterface(IExecAction *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IExecAction) || + IsEqualGUID(riid, &IID_IAction) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IExecAction_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI ExecAction_GetTypeInfoCount(IExecAction *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_GetTypeInfo(IExecAction *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_GetIDsOfNames(IExecAction *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_Invoke(IExecAction *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_get_Id(IExecAction *iface, BSTR *id) +{ + FIXME("%p,%p: stub\n", iface, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_put_Id(IExecAction *iface, BSTR id) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(id)); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_get_Type(IExecAction *iface, TASK_ACTION_TYPE *type) +{ + TRACE("%p,%p\n", iface, type); + + if (!type) return E_POINTER; + + *type = TASK_ACTION_EXEC; + + return S_OK; +} + +static HRESULT WINAPI ExecAction_get_Path(IExecAction *iface, BSTR *path) +{ + FIXME("%p,%p: stub\n", iface, path); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_put_Path(IExecAction *iface, BSTR path) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(path)); + return S_OK; +} + +static HRESULT WINAPI ExecAction_get_Arguments(IExecAction *iface, BSTR *arguments) +{ + FIXME("%p,%p: stub\n", iface, arguments); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR arguments) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(arguments)); + return S_OK; +} + +static HRESULT WINAPI ExecAction_get_WorkingDirectory(IExecAction *iface, BSTR *directory) +{ + FIXME("%p,%p: stub\n", iface, directory); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_put_WorkingDirectory(IExecAction *iface, BSTR directory) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(directory)); + return E_NOTIMPL; +} + +static const IExecActionVtbl Action_vtbl = +{ + ExecAction_QueryInterface, + ExecAction_AddRef, + ExecAction_Release, + ExecAction_GetTypeInfoCount, + ExecAction_GetTypeInfo, + ExecAction_GetIDsOfNames, + ExecAction_Invoke, + ExecAction_get_Id, + ExecAction_put_Id, + ExecAction_get_Type, + ExecAction_get_Path, + ExecAction_put_Path, + ExecAction_get_Arguments, + ExecAction_put_Arguments, + ExecAction_get_WorkingDirectory, + ExecAction_put_WorkingDirectory +}; + +static HRESULT ExecAction_create(IExecAction **obj) +{ + ExecAction *action; + + action = heap_alloc(sizeof(*action)); + if (!action) return E_OUTOFMEMORY; + + action->IExecAction_iface.lpVtbl = &Action_vtbl; + action->ref = 1; + + *obj = &action->IExecAction_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} + +typedef struct +{ IActionCollection IActionCollection_iface; LONG ref; } Actions; @@ -1744,8 +1919,17 @@ static HRESULT WINAPI Actions_put_XmlText(IActionCollection *iface, BSTR xml) static HRESULT WINAPI Actions_Create(IActionCollection *iface, TASK_ACTION_TYPE type, IAction **action) { - FIXME("%p,%u,%p: stub\n", iface, type, action); - return E_NOTIMPL; + TRACE("%p,%u,%p\n", iface, type, action); + + switch (type) + { + case TASK_ACTION_EXEC: + return ExecAction_create((IExecAction **)action); + + default: + FIXME("unimplemented type %u\n", type); + return E_NOTIMPL; + } } static HRESULT WINAPI Actions_Remove(IActionCollection *iface, VARIANT index) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 1df79d5a99..22854d917c 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1235,23 +1235,22 @@ static void create_action(ITaskDefinition *taskdef) IActionCollection *actions; IAction *action; IExecAction *exec_action; + TASK_ACTION_TYPE type; hr = ITaskDefinition_get_Actions(taskdef, &actions); ok(hr == S_OK, "get_Actions error %#x\n", hr); hr = IActionCollection_Create(actions, TASK_ACTION_EXEC, &action); -todo_wine ok(hr == S_OK, "Create action error %#x\n", hr); - /* FIXME: Remove once implemented */ - if (hr != S_OK) - { - IActionCollection_Release(actions); - return; - } hr = IAction_QueryInterface(action, &IID_IExecAction, (void **)&exec_action); ok(hr == S_OK, "QueryInterface error %#x\n", hr); + type = 0xdeadbeef; + hr = IExecAction_get_Type(exec_action, &type); + ok(hr == S_OK, "get_Type error %#x\n", hr); + ok(type == TASK_ACTION_EXEC, "got %u\n", type ); + hr = IExecAction_put_Path(exec_action, task1_exe); ok(hr == S_OK, "put_Path error %#x\n", hr); -- 2.11.0

1 0

[PATCH 5/8] taskschd: Implement ITaskDefinition_put_Actions.
by Hans Leidekker 30 Nov '17

30 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 15 +++++++++++++-- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 166e58774d..1c20f837c2 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -2093,8 +2093,19 @@ static HRESULT WINAPI TaskDefinition_get_Actions(ITaskDefinition *iface, IAction static HRESULT WINAPI TaskDefinition_put_Actions(ITaskDefinition *iface, IActionCollection *actions) { - FIXME("%p,%p: stub\n", iface, actions); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + + TRACE("%p,%p\n", iface, actions); + + if (!actions) return E_POINTER; + + if (taskdef->actions) + IActionCollection_Release(taskdef->actions); + + IActionCollection_AddRef(actions); + taskdef->actions = actions; + + return S_OK; } static const WCHAR Task[] = {'T','a','s','k',0}; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 3d1d18ee5e..1df79d5a99 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1096,6 +1096,7 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ITaskSettings *set; ITriggerCollection *triggers; IPrincipal *principal; + IActionCollection *actions; hr = ITaskDefinition_get_Settings(taskdef, &set); ok(hr == S_OK, "get_Settings error %#x\n", hr); @@ -1178,6 +1179,15 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); if (principal) IPrincipal_Release(principal); + actions = NULL; + hr = ITaskDefinition_get_Actions(taskdef, &actions); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + ok(actions != NULL, "actions not set\n"); + + hr = ITaskDefinition_put_Actions(taskdef, actions); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + if (actions) IActionCollection_Release(actions); + /* FIXME: set IIdleSettings and INetworkSettings */ ITaskSettings_Release(set); -- 2.11.0

1 0

[PATCH 4/8] taskschd: Implement ITaskDefinition_get_Actions.
by Hans Leidekker 30 Nov '17

30 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 203 ++++++++++++++++++++++++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 10 +- 2 files changed, 204 insertions(+), 9 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 6828c987c0..166e58774d 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1636,6 +1636,182 @@ static HRESULT Principal_create(IPrincipal **obj) typedef struct { + IActionCollection IActionCollection_iface; + LONG ref; +} Actions; + +static inline Actions *impl_from_IActionCollection(IActionCollection *iface) +{ + return CONTAINING_RECORD(iface, Actions, IActionCollection_iface); +} + +static ULONG WINAPI Actions_AddRef(IActionCollection *iface) +{ + Actions *actions = impl_from_IActionCollection(iface); + return InterlockedIncrement(&actions->ref); +} + +static ULONG WINAPI Actions_Release(IActionCollection *iface) +{ + Actions *actions = impl_from_IActionCollection(iface); + LONG ref = InterlockedDecrement(&actions->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(actions); + } + + return ref; +} + +static HRESULT WINAPI Actions_QueryInterface(IActionCollection *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IActionCollection) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IActionCollection_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI Actions_GetTypeInfoCount(IActionCollection *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_GetTypeInfo(IActionCollection *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_GetIDsOfNames(IActionCollection *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_Invoke(IActionCollection *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_get_Count(IActionCollection *iface, LONG *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_get_Item(IActionCollection *iface, LONG index, IAction **action) +{ + FIXME("%p,%d,%p: stub\n", iface, index, action); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_get__NewEnum(IActionCollection *iface, IUnknown **penum) +{ + FIXME("%p,%p: stub\n", iface, penum); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_get_XmlText(IActionCollection *iface, BSTR *xml) +{ + FIXME("%p,%p: stub\n", iface, xml); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_put_XmlText(IActionCollection *iface, BSTR xml) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(xml)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_Create(IActionCollection *iface, TASK_ACTION_TYPE type, IAction **action) +{ + FIXME("%p,%u,%p: stub\n", iface, type, action); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_Remove(IActionCollection *iface, VARIANT index) +{ + FIXME("%p,%s: stub\n", iface, debugstr_variant(&index)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_Clear(IActionCollection *iface) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_get_Context(IActionCollection *iface, BSTR *ctx) +{ + FIXME("%p,%p: stub\n", iface, ctx); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_put_Context(IActionCollection *iface, BSTR ctx) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(ctx)); + return S_OK; +} + +static const IActionCollectionVtbl Actions_vtbl = +{ + Actions_QueryInterface, + Actions_AddRef, + Actions_Release, + Actions_GetTypeInfoCount, + Actions_GetTypeInfo, + Actions_GetIDsOfNames, + Actions_Invoke, + Actions_get_Count, + Actions_get_Item, + Actions_get__NewEnum, + Actions_get_XmlText, + Actions_put_XmlText, + Actions_Create, + Actions_Remove, + Actions_Clear, + Actions_get_Context, + Actions_put_Context +}; + +static HRESULT Actions_create(IActionCollection **obj) +{ + Actions *actions; + + actions = heap_alloc(sizeof(*actions)); + if (!actions) return E_OUTOFMEMORY; + + actions->IActionCollection_iface.lpVtbl = &Actions_vtbl; + actions->ref = 1; + + *obj = &actions->IActionCollection_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} + +typedef struct +{ ITaskDefinition ITaskDefinition_iface; LONG ref; IRegistrationInfo *reginfo; @@ -1896,8 +2072,23 @@ static HRESULT WINAPI TaskDefinition_put_Principal(ITaskDefinition *iface, IPrin static HRESULT WINAPI TaskDefinition_get_Actions(ITaskDefinition *iface, IActionCollection **actions) { - FIXME("%p,%p: stub\n", iface, actions); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + HRESULT hr; + + TRACE("%p,%p\n", iface, actions); + + if (!actions) return E_POINTER; + + if (!taskdef->actions) + { + hr = Actions_create(&taskdef->actions); + if (hr != S_OK) return hr; + } + + IActionCollection_AddRef(taskdef->actions); + *actions = taskdef->actions; + + return S_OK; } static HRESULT WINAPI TaskDefinition_put_Actions(ITaskDefinition *iface, IActionCollection *actions) @@ -1938,7 +2129,7 @@ static const WCHAR S4U[] = {'S','4','U',0}; static const WCHAR InteractiveToken[] = {'I','n','t','e','r','a','c','t','i','v','e','T','o','k','e','n',0}; static const WCHAR RunLevel[] = {'R','u','n','L','e','v','e','l',0}; static const WCHAR LeastPrivilege[] = {'L','e','a','s','t','P','r','i','v','i','l','e','g','e',0}; -static const WCHAR Actions[] = {'A','c','t','i','o','n','s',0}; +static const WCHAR actionsW[] = {'A','c','t','i','o','n','s',0}; static const WCHAR Exec[] = {'E','x','e','c',0}; static const WCHAR MultipleInstancesPolicy[] = {'M','u','l','t','i','p','l','e','I','n','s','t','a','n','c','e','s','P','o','l','i','c','y',0}; static const WCHAR IgnoreNew[] = {'I','g','n','o','r','e','N','e','w',0}; @@ -2298,11 +2489,11 @@ static HRESULT write_actions(IStream *stream, IActionCollection *actions) { if (!actions) { - write_element(stream, Actions); + write_element(stream, actionsW); push_indent(); write_empty_element(stream, Exec); pop_indent(); - return write_element_end(stream, Actions); + return write_element_end(stream, actionsW); } FIXME("stub\n"); @@ -2958,7 +3149,7 @@ static HRESULT read_task(IXmlReader *reader, ITaskDefinition *taskdef) hr = read_triggers(reader, taskdef); else if (!lstrcmpW(name, Principals)) hr = read_principals(reader, taskdef); - else if (!lstrcmpW(name, Actions)) + else if (!lstrcmpW(name, actionsW)) hr = read_actions(reader, taskdef); else FIXME("unhandled Task element %s\n", debugstr_w(name)); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 244c28df01..3d1d18ee5e 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1227,13 +1227,17 @@ static void create_action(ITaskDefinition *taskdef) IExecAction *exec_action; hr = ITaskDefinition_get_Actions(taskdef, &actions); -todo_wine ok(hr == S_OK, "get_Actions error %#x\n", hr); - /* FIXME: Remove once implemented */ - if (hr != S_OK) return; hr = IActionCollection_Create(actions, TASK_ACTION_EXEC, &action); +todo_wine ok(hr == S_OK, "Create action error %#x\n", hr); + /* FIXME: Remove once implemented */ + if (hr != S_OK) + { + IActionCollection_Release(actions); + return; + } hr = IAction_QueryInterface(action, &IID_IExecAction, (void **)&exec_action); ok(hr == S_OK, "QueryInterface error %#x\n", hr); -- 2.11.0

1 0

[PATCH 3/8] taskschd: Implement ITaskDefinition_put_Principal.
by Hans Leidekker 30 Nov '17

30 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 15 +++++++++++++-- dlls/taskschd/tests/scheduler.c | 3 +++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 185f5c2123..6828c987c0 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1879,8 +1879,19 @@ static HRESULT WINAPI TaskDefinition_get_Principal(ITaskDefinition *iface, IPrin static HRESULT WINAPI TaskDefinition_put_Principal(ITaskDefinition *iface, IPrincipal *principal) { - FIXME("%p,%p: stub\n", iface, principal); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + + TRACE("%p,%p\n", iface, principal); + + if (!principal) return E_POINTER; + + if (taskdef->principal) + IPrincipal_Release(taskdef->principal); + + IPrincipal_AddRef(principal); + taskdef->principal = principal; + + return S_OK; } static HRESULT WINAPI TaskDefinition_get_Actions(ITaskDefinition *iface, IActionCollection **actions) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index ad0755650e..244c28df01 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1173,6 +1173,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskDefinition_get_Principal(taskdef, &principal); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(principal != NULL, "principal not set\n"); + + hr = ITaskDefinition_put_Principal(taskdef, principal); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); if (principal) IPrincipal_Release(principal); /* FIXME: set IIdleSettings and INetworkSettings */ -- 2.11.0

1 0

[PATCH 2/8] taskschd: Implement ITaskDefinition_get_Principal.
by Hans Leidekker 30 Nov '17

30 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 221 ++++++++++++++++++++++++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 7 ++ 2 files changed, 220 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d4e0d5688d..185f5c2123 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1446,6 +1446,196 @@ static HRESULT TaskSettings_create(ITaskSettings **obj) typedef struct { + IPrincipal IPrincipal_iface; + LONG ref; +} Principal; + +static inline Principal *impl_from_IPrincipal(IPrincipal *iface) +{ + return CONTAINING_RECORD(iface, Principal, IPrincipal_iface); +} + +static ULONG WINAPI Principal_AddRef(IPrincipal *iface) +{ + Principal *principal = impl_from_IPrincipal(iface); + return InterlockedIncrement(&principal->ref); +} + +static ULONG WINAPI Principal_Release(IPrincipal *iface) +{ + Principal *principal = impl_from_IPrincipal(iface); + LONG ref = InterlockedDecrement(&principal->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(principal); + } + + return ref; +} + +static HRESULT WINAPI Principal_QueryInterface(IPrincipal *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IPrincipal) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IPrincipal_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI Principal_GetTypeInfoCount(IPrincipal *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_GetTypeInfo(IPrincipal *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_GetIDsOfNames(IPrincipal *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_Invoke(IPrincipal *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_get_Id(IPrincipal *iface, BSTR *id) +{ + FIXME("%p,%p: stub\n", iface, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_Id(IPrincipal *iface, BSTR id) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(id)); + return S_OK; +} + +static HRESULT WINAPI Principal_get_DisplayName(IPrincipal *iface, BSTR *name) +{ + FIXME("%p,%p: stub\n", iface, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_DisplayName(IPrincipal *iface, BSTR name) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_get_UserId(IPrincipal *iface, BSTR *user_id) +{ + FIXME("%p,%p: stub\n", iface, user_id); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_UserId(IPrincipal *iface, BSTR user_id) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(user_id)); + return S_OK; +} + +static HRESULT WINAPI Principal_get_LogonType(IPrincipal *iface, TASK_LOGON_TYPE *logon_type) +{ + FIXME("%p,%p: stub\n", iface, logon_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_LogonType(IPrincipal *iface, TASK_LOGON_TYPE logon_type) +{ + FIXME("%p,%u: stub\n", iface, logon_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_get_GroupId(IPrincipal *iface, BSTR *group_id) +{ + FIXME("%p,%p: stub\n", iface, group_id); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_GroupId(IPrincipal *iface, BSTR group_id) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(group_id)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_get_RunLevel(IPrincipal *iface, TASK_RUNLEVEL_TYPE *run_level) +{ + FIXME("%p,%p: stub\n", iface, run_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_RunLevel(IPrincipal *iface, TASK_RUNLEVEL_TYPE run_level) +{ + FIXME("%p,%u: stub\n", iface, run_level); + return E_NOTIMPL; +} + +static const IPrincipalVtbl Principal_vtbl = +{ + Principal_QueryInterface, + Principal_AddRef, + Principal_Release, + Principal_GetTypeInfoCount, + Principal_GetTypeInfo, + Principal_GetIDsOfNames, + Principal_Invoke, + Principal_get_Id, + Principal_put_Id, + Principal_get_DisplayName, + Principal_put_DisplayName, + Principal_get_UserId, + Principal_put_UserId, + Principal_get_LogonType, + Principal_put_LogonType, + Principal_get_GroupId, + Principal_put_GroupId, + Principal_get_RunLevel, + Principal_put_RunLevel +}; + +static HRESULT Principal_create(IPrincipal **obj) +{ + Principal *principal; + + principal = heap_alloc(sizeof(*principal)); + if (!principal) return E_OUTOFMEMORY; + + principal->IPrincipal_iface.lpVtbl = &Principal_vtbl; + principal->ref = 1; + + *obj = &principal->IPrincipal_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} + +typedef struct +{ ITaskDefinition ITaskDefinition_iface; LONG ref; IRegistrationInfo *reginfo; @@ -1668,8 +1858,23 @@ static HRESULT WINAPI TaskDefinition_put_Data(ITaskDefinition *iface, BSTR data) static HRESULT WINAPI TaskDefinition_get_Principal(ITaskDefinition *iface, IPrincipal **principal) { - FIXME("%p,%p: stub\n", iface, principal); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + HRESULT hr; + + TRACE("%p,%p\n", iface, principal); + + if (!principal) return E_POINTER; + + if (!taskdef->principal) + { + hr = Principal_create(&taskdef->principal); + if (hr != S_OK) return hr; + } + + IPrincipal_AddRef(taskdef->principal); + *principal = taskdef->principal; + + return S_OK; } static HRESULT WINAPI TaskDefinition_put_Principal(ITaskDefinition *iface, IPrincipal *principal) @@ -1710,7 +1915,7 @@ static const WCHAR SecurityDescriptor[] = {'S','e','c','u','r','i','t','y','D',' static const WCHAR Settings[] = {'S','e','t','t','i','n','g','s',0}; static const WCHAR Triggers[] = {'T','r','i','g','g','e','r','s',0}; static const WCHAR Principals[] = {'P','r','i','n','c','i','p','a','l','s',0}; -static const WCHAR Principal[] = {'P','r','i','n','c','i','p','a','l',0}; +static const WCHAR principalW[] = {'P','r','i','n','c','i','p','a','l',0}; static const WCHAR id[] = {'i','d',0}; static const WCHAR UserId[] = {'U','s','e','r','I','d',0}; static const WCHAR LogonType[] = {'L','o','g','o','n','T','y','p','e',0}; @@ -1964,7 +2169,7 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) { write_indent(stream); write_stringW(stream, start_element); - write_stringW(stream, Principal); + write_stringW(stream, principalW); write_stringW(stream, spaceW); write_stringW(stream, id); write_stringW(stream, equalW); @@ -1976,7 +2181,7 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) SysFreeString(bstr); } else - write_element(stream, Principal); + write_element(stream, principalW); push_indent(); @@ -2054,7 +2259,7 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) } pop_indent(); - write_element_end(stream, Principal); + write_element_end(stream, principalW); pop_indent(); return write_element_end(stream, Principals); @@ -2275,7 +2480,7 @@ static HRESULT read_principal(IXmlReader *reader, IPrincipal *principal) TRACE("/%s\n", debugstr_w(name)); - if (!lstrcmpW(name, Principal)) + if (!lstrcmpW(name, principalW)) return S_OK; break; @@ -2374,7 +2579,7 @@ static HRESULT read_principals(IXmlReader *reader, ITaskDefinition *taskdef) TRACE("Element: %s\n", debugstr_w(name)); - if (!lstrcmpW(name, Principal)) + if (!lstrcmpW(name, principalW)) { IPrincipal *principal; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c58a5076bf..ad0755650e 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1095,6 +1095,7 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) HRESULT hr; ITaskSettings *set; ITriggerCollection *triggers; + IPrincipal *principal; hr = ITaskDefinition_get_Settings(taskdef, &set); ok(hr == S_OK, "get_Settings error %#x\n", hr); @@ -1168,6 +1169,12 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); if (triggers) ITriggerCollection_Release(triggers); + principal = NULL; + hr = ITaskDefinition_get_Principal(taskdef, &principal); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + ok(principal != NULL, "principal not set\n"); + if (principal) IPrincipal_Release(principal); + /* FIXME: set IIdleSettings and INetworkSettings */ ITaskSettings_Release(set); -- 2.11.0

1 0

[PATCH 1/8] taskschd: Implement ITaskDefinition_put_Triggers.
by Hans Leidekker 30 Nov '17

30 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 15 +++++++++++++-- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 731c22d86b..d4e0d5688d 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1601,8 +1601,19 @@ static HRESULT WINAPI TaskDefinition_get_Triggers(ITaskDefinition *iface, ITrigg static HRESULT WINAPI TaskDefinition_put_Triggers(ITaskDefinition *iface, ITriggerCollection *triggers) { - FIXME("%p,%p: stub\n", iface, triggers); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + + TRACE("%p,%p\n", iface, triggers); + + if (!triggers) return E_POINTER; + + if (taskdef->triggers) + ITriggerCollection_Release(taskdef->triggers); + + ITriggerCollection_AddRef(triggers); + taskdef->triggers = triggers; + + return S_OK; } static HRESULT WINAPI TaskDefinition_get_Settings(ITaskDefinition *iface, ITaskSettings **settings) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 07083afcd3..c58a5076bf 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1094,6 +1094,7 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) { HRESULT hr; ITaskSettings *set; + ITriggerCollection *triggers; hr = ITaskDefinition_get_Settings(taskdef, &set); ok(hr == S_OK, "get_Settings error %#x\n", hr); @@ -1158,6 +1159,15 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskSettings_put_AllowDemandStart(set, test->allow_on_demand_start); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + triggers = NULL; + hr = ITaskDefinition_get_Triggers(taskdef, &triggers); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + ok(triggers != NULL, "triggers not set\n"); + + hr = ITaskDefinition_put_Triggers(taskdef, triggers); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + if (triggers) ITriggerCollection_Release(triggers); + /* FIXME: set IIdleSettings and INetworkSettings */ ITaskSettings_Release(set); -- 2.11.0

1 0

[PATCH v2] configure: Remove l_intl.nls before removing created directories.
by Zebediah Figura 30 Nov '17

30 Nov '17

Fixes a bug where running 'make uninstall' would leave behind an empty wine/ directory. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: add .PHONY configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index dd19098..5c43aed 100644 --- a/configure.ac +++ b/configure.ac @@ -3906,8 +3906,10 @@ else WINE_APPEND_RULE( [install install-lib:: \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls]) +.PHONY: l_intl.nls/uninstall +l_intl.nls/uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls +__uninstall__: l_intl.nls/uninstall]) case $host_os in cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; *) WINE_APPEND_RULE( -- 2.7.4

1 0

[PATCH] configure: Remove l_intl.nls before removing created directories.
by Zebediah Figura 30 Nov '17

30 Nov '17

Fixes a bug where running 'make uninstall' would leave behind an empty wine/ directory. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index dd19098..3db65e3 100644 --- a/configure.ac +++ b/configure.ac @@ -3906,8 +3906,9 @@ else WINE_APPEND_RULE( [install install-lib:: \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls]) +l_intl.nls/uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls +__uninstall__: l_intl.nls/uninstall]) case $host_os in cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; *) WINE_APPEND_RULE( -- 2.7.4

1 0

[PATCH 2/2] mlang: Fix font name of code page families.
by Ziqing Hui 30 Nov '17

30 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/mlang.c | 24 ++++++++++++------------ dlls/mlang/tests/mlang.c | 18 ++++++------------ 2 files changed, 18 insertions(+), 24 deletions(-)

1 0

[PATCH 1/2] mlang/tests: Add a test code page for each code page family.
by Ziqing Hui 30 Nov '17

30 Nov '17

These test data are added to prove that the changes of font names in the next patch is correct. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/tests/mlang.c | 193 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+)

1 0

[PATCH 1/4] shell32: Add a parser for DDE commands.
by Zebediah Figura 29 Nov '17

29 Nov '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/shell32/dde.c | 115 +++++++++++++++++++++++++++++++++++++++++--- dlls/shell32/shell32_main.h | 13 +++++ 2 files changed, 121 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index c44f05d..ae1143b 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -26,7 +26,10 @@ #include "ddeml.h" #include "shellapi.h" +#include "shell32_main.h" + #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -94,21 +97,119 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, return NULL; } -static inline DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) +static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) { - WCHAR * pszCommand; + FIXME("unhandled command %s\n", debugstr_w(command)); + return DDE_FNOTPROCESSED; +} + +static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) +{ + static const WCHAR opcode_end[] = {' ',',','(',')','[',']','"',0}; + static const WCHAR param_end[] = {',','(',')','[',']',0}; + + WCHAR *original = command; + WCHAR *opcode = NULL, **argv = NULL, *p; + int argc = 0, i; + DWORD ret = DDE_FACK; + + while (*command == ' ') command++; + + if (*command != '[') goto error; + while (*command == '[') + { + argc = 0; + argv = HeapAlloc(GetProcessHeap(), 0, sizeof(*argv)); + + command++; + while (*command == ' ') command++; + if (!(p = strpbrkW(command, opcode_end))) goto error; + + opcode = strndupW(command, p - command); + + command = p; + while (*command == ' ') command++; + if (*command == '(') + { + command++; + + while (*command != ')') + { + while (*command == ' ') command++; + if (*command == '"') + { + command++; + if (!(p = strchrW(command, '"'))) goto error; + } + else + { + if (!(p = strpbrkW(command, param_end))) goto error; + while (p[-1] == ' ') p--; + } - pszCommand = (WCHAR *)DdeAccessData(hdata, NULL); - if (!pszCommand) - return DDE_FNOTPROCESSED; + argc++; + argv = HeapReAlloc(GetProcessHeap(), 0, argv, argc * sizeof(*argv)); + argv[argc-1] = strndupW(command, p - command); - FIXME("stub: %s %s\n", debugstr_hsz(hszTopic), debugstr_w(pszCommand)); + command = p; + if (*command == '"') command++; + while (*command == ' ') command++; + if (*command == ',') command++; + else if (*command != ')') goto error; + } + command++; - DdeUnaccessData(hdata); + while (*command == ' ') command++; + } + if (*command != ']') goto error; + command++; + while (*command == ' ') command++; + + if (hszTopic == hszProgmanTopic) + ret = PROGMAN_OnExecute(opcode, argc, argv); + else + { + FIXME("unhandled topic %s, command %s\n", debugstr_hsz(hszTopic), debugstr_w(opcode)); + ret = DDE_FNOTPROCESSED; + } + + HeapFree(GetProcessHeap(), 0, opcode); + for (i = 0; i < argc; i++) HeapFree(GetProcessHeap(), 0, argv[i]); + HeapFree(GetProcessHeap(), 0, argv); + + if (ret == DDE_FNOTPROCESSED) break; + } + + return ret; + +error: + ERR("failed to parse command %s\n", debugstr_w(original)); + HeapFree(GetProcessHeap(), 0, opcode); + for (i = 0; i < argc; i++) HeapFree(GetProcessHeap(), 0, argv[i]); + HeapFree(GetProcessHeap(), 0, argv); return DDE_FNOTPROCESSED; } +static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) +{ + WCHAR *command; + DWORD len; + DWORD ret; + + len = DdeGetData(hdata, NULL, 0, 0); + if (!len) return DDE_FNOTPROCESSED; + command = HeapAlloc(GetProcessHeap(), 0, len); + DdeGetData(hdata, (BYTE *)command, len, 0); + + TRACE("conv=%p topic=%s data=%s\n", hconv, debugstr_hsz(hszTopic), debugstr_w(command)); + + ret = parse_dde_command(hszTopic, command); + + HeapFree(GetProcessHeap(), 0, command); + return ret; +} + static inline void Dde_OnDisconnect(HCONV hconv) { TRACE( "%p\n", hconv ); diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 368c0e0..b65141f 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -238,6 +238,19 @@ static inline WCHAR *strdupW(const WCHAR *src) return dest; } +static inline WCHAR *strndupW(const WCHAR *src, DWORD len) +{ + WCHAR *dest; + if (!src) return NULL; + dest = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(*dest)); + if (dest) + { + memcpy(dest, src, len * sizeof(WCHAR)); + dest[len] = '\0'; + } + return dest; +} + static inline WCHAR *strdupAtoW(const char *str) { WCHAR *ret; -- 2.7.4

1 3

[PATCH 1/3] ntdll: NtReadFileScatter always returns asynchronously
by Andrew Eikum 29 Nov '17

29 Nov '17

This patch sequence fixes Wolfenstein II, Bug 43935. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 28 ++++++++++++++++++++-------- dlls/ntdll/file.c | 4 +++- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0b8cef23f8..44fbf7a4b1 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,8 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID buf = NULL; + BOOL br; + char *wbuf = NULL, *rbuf1; ret = GetTempPathA( MAX_PATH, temp_path ); ok( ret != 0, "GetTempPathA error %d\n", GetLastError() ); @@ -4371,12 +4372,16 @@ static void test_WriteFileGather(void) ok( hiocp2 != 0, "CreateIoCompletionPort failed err %u\n", GetLastError() ); GetSystemInfo( &si ); - buf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); - ok( buf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + wbuf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( wbuf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + + rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; + memset( wbuf, 0x42, si.dwPageSize ); + fse[0].Buffer = wbuf; if (!WriteFileGather( hfile, fse, si.dwPageSize, NULL, &ovl )) ok( GetLastError() == ERROR_IO_PENDING, "WriteFileGather failed err %u\n", GetLastError() ); @@ -4384,20 +4389,27 @@ static void test_WriteFileGather(void) ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + /* read exact size */ memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; - if (!ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl )) - ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); - VirtualFree( buf, 0, MEM_RELEASE ); + VirtualFree( wbuf, 0, MEM_RELEASE ); + VirtualFree( rbuf1, 0, MEM_RELEASE ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ca2afa0e89..bdfc383d7e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1090,7 +1090,9 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap if (needs_close) close( unix_handle ); if (status == STATUS_SUCCESS) { - io_status->u.Status = status; + /* report status asynchronously */ + status = STATUS_PENDING; + io_status->u.Status = STATUS_SUCCESS; io_status->Information = total; TRACE("= SUCCESS (%u)\n", total); if (event) NtSetEvent( event, NULL ); -- 2.15.0

2 1

[PATCH 3/3] ntdll: Don't require full-page reads in NtReadFileScatter
by Andrew Eikum 29 Nov '17

29 Nov '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 19 +++++++++++++++++++ dlls/ntdll/file.c | 5 ++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index e1cf268817..a3d6e8f71e 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4429,6 +4429,25 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, "data should not have been read into buffer\n" ); + /* partial page read */ + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + br = ReadFileScatter( hfile, fse, si.dwPageSize / 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + memset( rbuf2, 0, si.dwPageSize ); + ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index f7db24cc8b..152ad7498c 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1041,7 +1041,6 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", file, event, apc, apc_user, io_status, segments, length, offset, key); - if (length % page_size) return STATUS_INVALID_PARAMETER; if (!io_status) return STATUS_ACCESS_VIOLATION; status = server_get_unix_fd( file, FILE_READ_DATA, &unix_handle, @@ -1060,9 +1059,9 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap { if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pread( unix_handle, (char *)segments->Buffer + pos, - page_size - pos, offset->QuadPart + total ); + min( length - pos, page_size - pos ), offset->QuadPart + total ); else - result = read( unix_handle, (char *)segments->Buffer + pos, page_size - pos ); + result = read( unix_handle, (char *)segments->Buffer + pos, min( length - pos, page_size - pos ) ); if (result == -1) { -- 2.15.0

1 0

[PATCH] v2: shell32: add stub for Shell_NotifyIconGetRect
by Louis Lenders 29 Nov '17

29 Nov '17

v2: - removed SetLastError (ERROR_CALL_NOT_IMPLEMENTED) - corrected prototype for Shell_NotifyIconGetRect in shellapi.h

1 0

[PATCH] wininet: Use case-insensitive comparison for server name.
by Daniel Lehman 29 Nov '17

29 Nov '17

2 1

[PATCH 2/2] ole32/tests: Show that the storage's CLSID is not modified when saving.
by Huw Davies 29 Nov '17

29 Nov '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/tests/ole2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 88ad207521..ca6756a6e5 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4194,7 +4194,7 @@ static void test_data_cache_save_data(void) }, 1, 1, &CLSID_WineTest, { - &CLSID_WineTest, 1, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 } } } }, { @@ -4203,7 +4203,7 @@ static void test_data_cache_save_data(void) }, 1, 1, &CLSID_WineTest, { - &CLSID_WineTest, 1, { { "\2OlePres000", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 } } } }, { @@ -4238,7 +4238,7 @@ static void test_data_cache_save_data(void) hr = StgCreateDocfileOnILockBytes(ilb, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &doc); ok(hr == S_OK, "unexpected %#x\n", hr); ILockBytes_Release(ilb); - hr = IStorage_SetClass(doc, pdata->clsid); + hr = IStorage_SetClass(doc, &CLSID_WineTestOld); ok(hr == S_OK, "unexpected %#x\n", hr); hr = IOleCache2_QueryInterface(cache, &IID_IPersistStorage, (void **)&persist); -- 2.12.0

1 0

[PATCH 1/2] ole32: Make the synthesize helpers return a STGMEDIUM.
by Huw Davies 29 Nov '17

29 Nov '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 61 +++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index da7a536835..c550c75cd3 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -958,12 +958,12 @@ static HRESULT copy_stg_medium(CLIPFORMAT cf, STGMEDIUM *dest_stgm, return S_OK; } -static HGLOBAL synthesize_dib( HBITMAP bm ) +static HRESULT synthesize_dib( HBITMAP bm, STGMEDIUM *med ) { HDC hdc = GetDC( 0 ); BITMAPINFOHEADER header; BITMAPINFO *bmi; - HGLOBAL ret = 0; + HRESULT hr = E_FAIL; DWORD header_size; memset( &header, 0, sizeof(header) ); @@ -971,55 +971,64 @@ static HGLOBAL synthesize_dib( HBITMAP bm ) if (!GetDIBits( hdc, bm, 0, 0, NULL, (BITMAPINFO *)&header, DIB_RGB_COLORS )) goto done; header_size = bitmap_info_size( (BITMAPINFO *)&header, DIB_RGB_COLORS ); - if (!(ret = GlobalAlloc( GMEM_MOVEABLE, header_size + header.biSizeImage ))) goto done; - bmi = GlobalLock( ret ); + if (!(med->u.hGlobal = GlobalAlloc( GMEM_MOVEABLE, header_size + header.biSizeImage ))) goto done; + bmi = GlobalLock( med->u.hGlobal ); memset( bmi, 0, header_size ); memcpy( bmi, &header, header.biSize ); GetDIBits( hdc, bm, 0, abs(header.biHeight), (char *)bmi + header_size, bmi, DIB_RGB_COLORS ); - GlobalUnlock( ret ); + GlobalUnlock( med->u.hGlobal ); + med->tymed = TYMED_HGLOBAL; + med->pUnkForRelease = NULL; + hr = S_OK; done: ReleaseDC( 0, hdc ); - return ret; + return hr; } -static HBITMAP synthesize_bitmap( HGLOBAL dib ) +static HRESULT synthesize_bitmap( HGLOBAL dib, STGMEDIUM *med ) { - HBITMAP ret = 0; + HRESULT hr = E_FAIL; BITMAPINFO *bmi; HDC hdc = GetDC( 0 ); if ((bmi = GlobalLock( dib ))) { /* FIXME: validate data size */ - ret = CreateDIBitmap( hdc, &bmi->bmiHeader, CBM_INIT, - (char *)bmi + bitmap_info_size( bmi, DIB_RGB_COLORS ), - bmi, DIB_RGB_COLORS ); + med->u.hBitmap = CreateDIBitmap( hdc, &bmi->bmiHeader, CBM_INIT, + (char *)bmi + bitmap_info_size( bmi, DIB_RGB_COLORS ), + bmi, DIB_RGB_COLORS ); GlobalUnlock( dib ); + med->tymed = TYMED_GDI; + med->pUnkForRelease = NULL; + hr = S_OK; } ReleaseDC( 0, hdc ); - return ret; + return hr; } -static HENHMETAFILE synthesize_emf( HMETAFILEPICT data ) +static HRESULT synthesize_emf( HMETAFILEPICT data, STGMEDIUM *med ) { METAFILEPICT *pict; - HENHMETAFILE emf = 0; + HRESULT hr = E_FAIL; UINT size; void *bits; - if (!(pict = GlobalLock( data ))) return 0; + if (!(pict = GlobalLock( data ))) return hr; size = GetMetaFileBitsEx( pict->hMF, 0, NULL ); if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) { GetMetaFileBitsEx( pict->hMF, size, bits ); - emf = SetWinMetaFileBits( size, bits, NULL, pict ); + med->u.hEnhMetaFile = SetWinMetaFileBits( size, bits, NULL, pict ); HeapFree( GetProcessHeap(), 0, bits ); + med->tymed = TYMED_ENHMF; + med->pUnkForRelease = NULL; + hr = S_OK; } GlobalUnlock( data ); - return emf; + return hr; } static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, @@ -1028,6 +1037,7 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, BOOL fRelease) { STGMEDIUM copy; + HRESULT hr; if ((!cache_entry->fmtetc.cfFormat && !formatetc->cfFormat) || (cache_entry->fmtetc.tymed == TYMED_NULL && formatetc->tymed == TYMED_NULL) || @@ -1042,17 +1052,16 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, if (formatetc->cfFormat == CF_BITMAP) { - copy.tymed = TYMED_HGLOBAL; - copy.u.hGlobal = synthesize_dib( stgmedium->u.hBitmap ); - copy.pUnkForRelease = NULL; + hr = synthesize_dib( stgmedium->u.hBitmap, &copy ); + if (FAILED(hr)) return hr; if (fRelease) ReleaseStgMedium(stgmedium); stgmedium = © fRelease = TRUE; } else if (formatetc->cfFormat == CF_METAFILEPICT && cache_entry->fmtetc.cfFormat == CF_ENHMETAFILE) { - copy.tymed = TYMED_ENHMF; - copy.u.hEnhMetaFile = synthesize_emf( stgmedium->u.hMetaFilePict ); + hr = synthesize_emf( stgmedium->u.hMetaFilePict, &copy ); + if (FAILED(hr)) return hr; if (fRelease) ReleaseStgMedium(stgmedium); stgmedium = © fRelease = TRUE; @@ -1079,12 +1088,8 @@ static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, FORMATETC *fm return OLE_E_BLANK; if (fmt->cfFormat == CF_BITMAP) - { - stgmedium->tymed = TYMED_GDI; - stgmedium->u.hBitmap = synthesize_bitmap( cache_entry->stgmedium.u.hGlobal ); - stgmedium->pUnkForRelease = NULL; - return S_OK; - } + return synthesize_bitmap( cache_entry->stgmedium.u.hGlobal, stgmedium ); + return copy_stg_medium(cache_entry->fmtetc.cfFormat, stgmedium, &cache_entry->stgmedium); } -- 2.12.0

1 0

[PATCH 7/7] taskschd: Implement ITaskSettings_put_AllowDemandStart.
by Hans Leidekker 29 Nov '17

29 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 4172b37c09..731c22d86b 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -898,8 +898,13 @@ static HRESULT WINAPI TaskSettings_get_AllowDemandStart(ITaskSettings *iface, VA static HRESULT WINAPI TaskSettings_put_AllowDemandStart(ITaskSettings *iface, VARIANT_BOOL allow) { - FIXME("%p,%d: stub\n", iface, allow); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, allow); + + taskset->allow_on_demand_start = allow ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_RestartInterval(ITaskSettings *iface, BSTR *interval) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index dfa4f1a9a6..07083afcd3 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1156,7 +1156,6 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_AllowDemandStart(set, test->allow_on_demand_start); -todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: set IIdleSettings and INetworkSettings */ -- 2.11.0

1 0

[PATCH 6/7] taskschd: Implement ITaskSettings_put_WakeToRun.
by Hans Leidekker 29 Nov '17

29 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 8 +------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index e64abde8a0..4172b37c09 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1331,8 +1331,13 @@ static HRESULT WINAPI TaskSettings_get_WakeToRun(ITaskSettings *iface, VARIANT_B static HRESULT WINAPI TaskSettings_put_WakeToRun(ITaskSettings *iface, VARIANT_BOOL wake) { - FIXME("%p,%d: stub\n", iface, wake); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, wake); + + taskset->wake_to_run = wake ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_NetworkSettings(ITaskSettings *iface, INetworkSettings **settings) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 9054c54936..dfa4f1a9a6 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1153,16 +1153,10 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_WakeToRun(set, test->wake_to_run); -todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - /* FIXME: Remove once implemented */ - if (hr != S_OK) - { - ITaskSettings_Release(set); - return; - } hr = ITaskSettings_put_AllowDemandStart(set, test->allow_on_demand_start); +todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: set IIdleSettings and INetworkSettings */ -- 2.11.0

1 0

[PATCH 5/7] taskschd: Implement ITaskSettings_put_RunOnlyIfIdle.
by Hans Leidekker 29 Nov '17

29 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d2b5d585c6..e64abde8a0 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1307,8 +1307,13 @@ static HRESULT WINAPI TaskSettings_get_RunOnlyIfIdle(ITaskSettings *iface, VARIA static HRESULT WINAPI TaskSettings_put_RunOnlyIfIdle(ITaskSettings *iface, VARIANT_BOOL run) { - FIXME("%p,%d: stub\n", iface, run); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, run); + + taskset->run_only_if_idle = run ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_WakeToRun(ITaskSettings *iface, VARIANT_BOOL *wake) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index a2acda3ee7..9054c54936 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1150,6 +1150,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_RunOnlyIfIdle(set, test->run_only_if_idle); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_WakeToRun(set, test->wake_to_run); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1159,9 +1162,6 @@ todo_wine return; } - hr = ITaskSettings_put_WakeToRun(set, test->wake_to_run); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_AllowDemandStart(set, test->allow_on_demand_start); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 4/7] taskschd: Implement ITaskSettings_put_Hidden.
by Hans Leidekker 29 Nov '17

29 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 32baaae117..d2b5d585c6 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1271,8 +1271,13 @@ static HRESULT WINAPI TaskSettings_get_Hidden(ITaskSettings *iface, VARIANT_BOOL static HRESULT WINAPI TaskSettings_put_Hidden(ITaskSettings *iface, VARIANT_BOOL hidden) { - FIXME("%p,%d: stub\n", iface, hidden); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, hidden); + + taskset->hidden = hidden ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_IdleSettings(ITaskSettings *iface, IIdleSettings **settings) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 5d39766610..a2acda3ee7 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1147,6 +1147,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_Hidden(set, test->hidden); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_RunOnlyIfIdle(set, test->run_only_if_idle); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1156,9 +1159,6 @@ todo_wine return; } - hr = ITaskSettings_put_RunOnlyIfIdle(set, test->run_only_if_idle); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_WakeToRun(set, test->wake_to_run); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 3/7] taskschd: Implement ITaskSettings_put_Compatibility.
by Hans Leidekker 29 Nov '17

29 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 33ec2b45d1..32baaae117 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1247,8 +1247,13 @@ static HRESULT WINAPI TaskSettings_get_Compatibility(ITaskSettings *iface, TASK_ static HRESULT WINAPI TaskSettings_put_Compatibility(ITaskSettings *iface, TASK_COMPATIBILITY level) { - FIXME("%p,%d: stub\n", iface, level); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, level); + + taskset->compatibility = level; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_Hidden(ITaskSettings *iface, VARIANT_BOOL *hidden) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 74c3ae4c05..5d39766610 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1144,6 +1144,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_Compatibility(set, test->compatibility); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_Hidden(set, test->hidden); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1153,9 +1156,6 @@ todo_wine return; } - hr = ITaskSettings_put_Hidden(set, test->hidden); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_RunOnlyIfIdle(set, test->run_only_if_idle); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 2/7] taskschd: Implement ITaskSettings_put_Priority.
by Hans Leidekker 29 Nov '17

29 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 894f4c4ce6..33ec2b45d1 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1223,8 +1223,13 @@ static HRESULT WINAPI TaskSettings_get_Priority(ITaskSettings *iface, INT *prior static HRESULT WINAPI TaskSettings_put_Priority(ITaskSettings *iface, INT priority) { - FIXME("%p,%d: stub\n", iface, priority); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, priority); + + taskset->priority = priority; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_Compatibility(ITaskSettings *iface, TASK_COMPATIBILITY *level) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index f15e214200..74c3ae4c05 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1141,6 +1141,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_Priority(set, test->priority); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_Compatibility(set, test->compatibility); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1150,9 +1153,6 @@ todo_wine return; } - hr = ITaskSettings_put_Compatibility(set, test->compatibility); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_Hidden(set, test->hidden); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 1/7] taskschd: Implement ITaskSettings_put_DeleteExpiredTaskAfter.
by Hans Leidekker 29 Nov '17

29 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 10 +++++++++- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 7c5dca36df..894f4c4ce6 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1196,8 +1196,16 @@ static HRESULT WINAPI TaskSettings_get_DeleteExpiredTaskAfter(ITaskSettings *ifa static HRESULT WINAPI TaskSettings_put_DeleteExpiredTaskAfter(ITaskSettings *iface, BSTR delay) { + TaskSettings *taskset = impl_from_ITaskSettings(iface); + WCHAR *str = NULL; + TRACE("%p,%s\n", iface, debugstr_w(delay)); - return E_NOTIMPL; + + if (delay && !(str = heap_strdupW(delay))) return E_OUTOFMEMORY; + heap_free(taskset->delete_expired_task_after); + taskset->delete_expired_task_after = str; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_Priority(ITaskSettings *iface, INT *priority) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index fe54bff809..f15e214200 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1138,6 +1138,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, NULL); else hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, test->delete_expired_task_after); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_Priority(set, test->priority); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1147,9 +1150,6 @@ todo_wine return; } - hr = ITaskSettings_put_Priority(set, test->priority); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_Compatibility(set, test->compatibility); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH] msvcrt: Set errno when close() is called on already closed fd
by Piotr Caban 28 Nov '17

28 Nov '17

Based on a patch by Olly Betts. For bug #43902. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/tests/file.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[PATCH] msvcp90: Use correct locale in basic_ios::narrow and basic_ios::widen
by Piotr Caban 28 Nov '17

28 Nov '17

For bug #43905 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/ios.c | 8 ++++---- dlls/msvcp90/tests/ios.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] ole32/tests: Add some tests for testing metafiles.
by Sergio Gómez Del Real 28 Nov '17

28 Nov '17

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/ole32/tests/ole2.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index a72985e239..59a0fe172f 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -229,6 +229,24 @@ static void create_bitmap( STGMEDIUM *med ) med->pUnkForRelease = NULL; } +static void create_mfpict(STGMEDIUM *med) +{ + METAFILEPICT *mf; + HDC hdc = CreateMetaFileW(NULL); + + Rectangle(hdc, 0, 0, 100, 200); + + med->tymed = TYMED_MFPICT; + U(med)->hMetaFilePict = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); + mf = GlobalLock(U(med)->hMetaFilePict); + mf->mm = MM_ANISOTROPIC; + mf->xExt = 100; + mf->yExt = 200; + mf->hMF = CloseMetaFile(hdc); + GlobalUnlock(U(med)->hMetaFilePict); + med->pUnkForRelease = NULL; +} + static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, void **ppv) { CHECK_EXPECTED_METHOD("OleObject_QueryInterface"); @@ -3939,7 +3957,7 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ int clipformat = -1; PresentationDataHeader header; char name[32]; - BYTE data[256]; + BYTE data[1024]; memset(&header, 0, sizeof(header)); @@ -4074,6 +4092,143 @@ static IStorage *create_storage_from_def(const struct storage_def *stg_def) return stg; } +static const BYTE mf_rec[] = +{ + 0xd7, 0xcd, 0xc6, 0x9a, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x16, 0x00, 0x2d, 0x00, 0x40, 0x02, + 0x00, 0x00, 0x00, 0x00, 0x6a, 0x55 +}; + +static void get_stgdef(struct storage_def *stg_def, CLIPFORMAT cf, STGMEDIUM *stg_med, int stm_idx) +{ + BYTE *data; + int data_size; + METAFILEPICT *mfpict; + + switch (cf) + { + case CF_METAFILEPICT: + mfpict = GlobalLock(U(stg_med)->hMetaFilePict); + data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); + if (!strcmp(stg_def->stream[stm_idx].name, "CONTENTS")) + { + data = HeapAlloc(GetProcessHeap(), 0, data_size + sizeof(mf_rec)); + memcpy(data, mf_rec, sizeof(mf_rec)); + GetMetaFileBitsEx(mfpict->hMF, data_size, data + sizeof(mf_rec)); + data_size += sizeof(mf_rec); + } + else + { + data = HeapAlloc(GetProcessHeap(), 0, data_size); + GetMetaFileBitsEx(mfpict->hMF, data_size, data); + } + GlobalUnlock(U(stg_med)->hMetaFilePict); + stg_def->stream[stm_idx].data_size = data_size; + stg_def->stream[stm_idx].data = data; + break; + } +} + +static void get_stgmedium(CLIPFORMAT cfFormat, STGMEDIUM *stgmedium) +{ + switch (cfFormat) + { + case CF_METAFILEPICT: + create_mfpict(stgmedium); + break; + default: + ok(0, "cf %x not implemented\n", cfFormat); + } +} + +#define MAX_FMTS 5 +static void test_data_cache_save_data(void) +{ + HRESULT hr; + STGMEDIUM stgmed; + ILockBytes *ilb; + IStorage *doc; + IOleCache2 *cache; + IPersistStorage *persist; + int enumerated_streams, matched_streams, i; + DWORD dummy; + struct tests_data_cache + { + FORMATETC fmts[MAX_FMTS]; + int num_fmts, num_set; + const CLSID *clsid; + struct storage_def stg_def; + }; + + static struct tests_data_cache *pdata, data[] = + { + { + { + { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, + }, + 1, 1, &CLSID_WineTest, + { + &CLSID_WineTest, 1, { { "\2OlePres000", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 } } + } + }, + { + { + { 0 } + } + } + }; + + /* test _Save after caching directly through _Cache + _SetData */ + for (pdata = data; pdata->clsid != NULL; pdata++) + { + hr = CreateDataCache(NULL, pdata->clsid, &IID_IOleCache2, (void **)&cache); + ok(hr == S_OK, "unexpected %#x\n", hr); + + for (i = 0; i < pdata->num_fmts; i++) + { + hr = IOleCache2_Cache(cache, &pdata->fmts[i], 0, &dummy); + ok(SUCCEEDED(hr), "unexpected %#x\n", hr); + if (i < pdata->num_set) + { + get_stgmedium(pdata->fmts[i].cfFormat, &stgmed); + get_stgdef(&pdata->stg_def, pdata->fmts[i].cfFormat, &stgmed, i); + hr = IOleCache2_SetData(cache, &pdata->fmts[i], &stgmed, TRUE); + ok(hr == S_OK, "unexpected %#x\n", hr); + } + } + + /* create Storage in memory where we'll save cache */ + hr = CreateILockBytesOnHGlobal(0, TRUE, &ilb); + ok(hr == S_OK, "unexpected %#x\n", hr); + hr = StgCreateDocfileOnILockBytes(ilb, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &doc); + ok(hr == S_OK, "unexpected %#x\n", hr); + ILockBytes_Release(ilb); + hr = IStorage_SetClass(doc, pdata->clsid); + ok(hr == S_OK, "unexpected %#x\n", hr); + + hr = IOleCache2_QueryInterface(cache, &IID_IPersistStorage, (void **)&persist); + ok(hr == S_OK, "unexpected %#x\n", hr); + + /* cache entries are dirty. test saving them to stg */ + trace("IPersistStorage_Save:\n"); + hr = IPersistStorage_Save(persist, doc, FALSE); + ok(hr == S_OK, "unexpected %#x\n", hr); + + check_storage_contents(doc, &pdata->stg_def, &enumerated_streams, &matched_streams); + ok(enumerated_streams == matched_streams, "enumerated %d != matched %d\n", + enumerated_streams, matched_streams); + ok(enumerated_streams == pdata->stg_def.stream_count, "created %d != def streams %d\n", + enumerated_streams, pdata->stg_def.stream_count); + + for (i = 0; i < pdata->num_set; i++) + HeapFree(GetProcessHeap(), 0, (void *)pdata->stg_def.stream[i].data); + + IPersistStorage_Release(persist); + IStorage_Release(doc); + IOleCache2_Release(cache); + } +} + static void test_data_cache_contents(void) { HRESULT hr; @@ -4199,6 +4354,7 @@ START_TEST(ole2) test_OleDraw(); test_OleDoAutoConvert(); test_data_cache_save(); + test_data_cache_save_data(); test_data_cache_contents(); CoUninitialize(); -- 2.14.1

2 3

[PATCH 1/5] wevtapi: Add EvtOpenChannelEnum stub.
by Alex Henrie 28 Nov '17

28 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Needed by FullEventLogView, http://www.nirsoft.net/utils/full_event_log_view.html --- dlls/wevtapi/main.c | 6 ++++++ dlls/wevtapi/wevtapi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 0b88165aba..aa23c77f8a 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -74,6 +74,12 @@ EVT_HANDLE WINAPI EvtSubscribe(EVT_HANDLE Session, HANDLE SignalEvent, LPCWSTR C return NULL; } +EVT_HANDLE WINAPI EvtOpenChannelEnum(EVT_HANDLE session, DWORD flags) +{ + FIXME("(%p %u) stub\n", session, flags); + return NULL; +} + EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags) { FIXME("(%p %s %u) stub\n", Session, debugstr_w(ChannelPath), Flags); diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index 328b0dbcd9..149fe255ad 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -30,7 +30,7 @@ @ stub EvtNextEventMetadata @ stub EvtNextPublisherId @ stdcall EvtOpenChannelConfig(ptr wstr long) -@ stub EvtOpenChannelEnum +@ stdcall EvtOpenChannelEnum(ptr long) @ stub EvtOpenEventMetadataEnum @ stub EvtOpenLog @ stub EvtOpenPublisherEnum -- 2.15.0

1 4

[PATCH] kernel32/tests: Silence noisy debug traces.
by Jacek Caban 28 Nov '17

28 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 132 ++++++++++++++++++++++----------------------- 1 file changed, 66 insertions(+), 66 deletions(-)

1 0

[PATCH] server: Use default_fd_signaled for named pipe client.
by Jacek Caban 28 Nov '17

28 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)

1 0

[PATCH 2/2] mshtml: Return S_OK in IHTMLStyle2::put_behavior.
by Jacek Caban 28 Nov '17

28 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/2] mshtml: Added support for default removeEventListener capture argument.
by Jacek Caban 28 Nov '17

28 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 22 ++++++++++++++++++++++ dlls/mshtml/tests/events.js | 8 ++++++++ 2 files changed, 30 insertions(+)

1 0

[PATCH] mshtml/tests: Test return values in more places (Coverity)
by Nikolay Sivov 28 Nov '17

28 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 6 ++++-- dlls/mshtml/tests/events.c | 7 +++++-- dlls/mshtml/tests/script.c | 13 +++++++++---- dlls/mshtml/tests/style.c | 7 +++++-- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 48262bbc83..5128d2ff26 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7742,7 +7742,8 @@ static void doc_write(IHTMLDocument2 *doc, BOOL ln, const char *text) dim.lLbound = 0; dim.cElements = 1; sa = SafeArrayCreate(VT_VARIANT, 1, &dim); - SafeArrayAccessData(sa, (void**)&var); + hres = SafeArrayAccessData(sa, (void**)&var); + ok(hres == S_OK, "Failed to access array data: %08x\n", hres); V_VT(var) = VT_BSTR; V_BSTR(var) = a2bstr(text); SafeArrayUnaccessData(sa); @@ -7764,7 +7765,8 @@ static void doc_complex_write(IHTMLDocument2 *doc) HRESULT hres; sa = SafeArrayCreate(VT_VARIANT, 1, &dim); - SafeArrayAccessData(sa, (void**)&args); + hres = SafeArrayAccessData(sa, (void**)&args); + ok(hres == S_OK, "Failed to access array data: %08x\n", hres); V_VT(args) = VT_BSTR; V_BSTR(args) = a2bstr("<body i4val=\""); diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 4f577459c9..bc8e045434 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -3129,6 +3129,7 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) { IPersistStreamInit *init; IStream *stream; + HRESULT hres; HGLOBAL mem; SIZE_T len; @@ -3138,9 +3139,11 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hres = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream, hr %#x.\n", hres); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hres == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hres); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 243c10c07a..b07cce1f3d 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1259,6 +1259,7 @@ static void load_string(IHTMLDocument2 *doc, const char *str) { IPersistStreamInit *init; IStream *stream; + HRESULT hres; HGLOBAL mem; SIZE_T len; @@ -1266,9 +1267,11 @@ static void load_string(IHTMLDocument2 *doc, const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hres = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream, hr %#x.\n", hres); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hres == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hres); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); @@ -2325,7 +2328,8 @@ static void test_script_run(void) V_VT(&var) = VT_BSTR; V_BSTR(&var) = NULL; - dispex_propput(document, id, 0, &var, NULL); + hres = dispex_propput(document, id, 0, &var, NULL); + ok(hres == S_OK, "dispex_propput failed: %08x\n", hres); VariantInit(&var); memset(&dp, 0, sizeof(dp)); @@ -2823,7 +2827,8 @@ static void report_data(ProtocolHandler *This) IServiceProvider_Release(service_provider); ok(hres == S_OK, "Could not get IHttpNegotiate interface: %08x\n", hres); - IUri_GetDisplayUri(This->uri, &url); + hres = IUri_GetDisplayUri(This->uri, &url); + ok(hres == S_OK, "Failed to get display uri: %08x\n", hres); hres = IHttpNegotiate_BeginningTransaction(http_negotiate, url, emptyW, 0, &addl_headers); ok(hres == S_OK, "BeginningTransaction failed: %08x\n", hres); SysFreeString(url); diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 7fc04a485e..73c074e729 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -3144,6 +3144,7 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) IPersistStreamInit *init; IStream *stream; IHTMLDocument2 *doc; + HRESULT hres; HGLOBAL mem; SIZE_T len; @@ -3155,9 +3156,11 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hres = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream, hr %#x.\n", hres); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hres == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hres); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); -- 2.15.0

2 1

[PATCH 7/7] taskschd: Implement ITaskSettings_put_Enabled.
by Hans Leidekker 28 Nov '17

28 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 12 ++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 7d0d8fa3b7..7c5dca36df 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1165,8 +1165,13 @@ static HRESULT WINAPI TaskSettings_get_Enabled(ITaskSettings *iface, VARIANT_BOO static HRESULT WINAPI TaskSettings_put_Enabled(ITaskSettings *iface, VARIANT_BOOL enabled) { - FIXME("%p,%d: stub\n", iface, enabled); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, enabled); + + taskset->enabled = enabled ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_DeleteExpiredTaskAfter(ITaskSettings *iface, BSTR *delay) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index f710219e98..fe54bff809 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1132,6 +1132,12 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_Enabled(set, test->enabled); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + if (!test->delete_expired_task_after[0]) + hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, NULL); + else + hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, test->delete_expired_task_after); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1141,12 +1147,6 @@ todo_wine return; } - if (!test->delete_expired_task_after[0]) - hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, NULL); - else - hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, test->delete_expired_task_after); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_Priority(set, test->priority); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 6/7] taskschd: Implement ITaskSettings_put_ExecutionTimeLimit.
by Hans Leidekker 28 Nov '17

28 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 10 +++++++++- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 188944fe7e..7d0d8fa3b7 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1138,8 +1138,16 @@ static HRESULT WINAPI TaskSettings_get_ExecutionTimeLimit(ITaskSettings *iface, static HRESULT WINAPI TaskSettings_put_ExecutionTimeLimit(ITaskSettings *iface, BSTR limit) { + TaskSettings *taskset = impl_from_ITaskSettings(iface); + WCHAR *str = NULL; + TRACE("%p,%s\n", iface, debugstr_w(limit)); - return E_NOTIMPL; + + if (limit && !(str = heap_strdupW(limit))) return E_OUTOFMEMORY; + heap_free(taskset->execution_time_limit); + taskset->execution_time_limit = str; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_Enabled(ITaskSettings *iface, VARIANT_BOOL *enabled) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 9e3e3811c4..f710219e98 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1129,6 +1129,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); else hr = ITaskSettings_put_ExecutionTimeLimit(set, test->execution_time_limit); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_Enabled(set, test->enabled); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1138,9 +1141,6 @@ todo_wine return; } - hr = ITaskSettings_put_Enabled(set, test->enabled); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - if (!test->delete_expired_task_after[0]) hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, NULL); else -- 2.11.0

1 0

[PATCH 5/7] taskschd: Implement ITaskSettings_put_RunOnlyIfNetworkAvailable.
by Hans Leidekker 28 Nov '17

28 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 12 ++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 0903526866..188944fe7e 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1107,8 +1107,13 @@ static HRESULT WINAPI TaskSettings_get_RunOnlyIfNetworkAvailable(ITaskSettings * static HRESULT WINAPI TaskSettings_put_RunOnlyIfNetworkAvailable(ITaskSettings *iface, VARIANT_BOOL run) { - FIXME("%p,%d: stub\n", iface, run); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, run); + + taskset->run_only_if_network_available = run ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_ExecutionTimeLimit(ITaskSettings *iface, BSTR *limit) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 8a9099384c..9e3e3811c4 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1123,6 +1123,12 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_RunOnlyIfNetworkAvailable(set, test->run_only_if_network_available); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + if (!test->execution_time_limit[0]) + hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); + else + hr = ITaskSettings_put_ExecutionTimeLimit(set, test->execution_time_limit); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1132,12 +1138,6 @@ todo_wine return; } - if (!test->execution_time_limit[0]) - hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); - else - hr = ITaskSettings_put_ExecutionTimeLimit(set, test->execution_time_limit); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_Enabled(set, test->enabled); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 4/7] taskschd: Implement ITaskSettings_put_StartWhenAvailable.
by Hans Leidekker 28 Nov '17

28 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 508b23384e..0903526866 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1071,8 +1071,13 @@ static HRESULT WINAPI TaskSettings_get_StartWhenAvailable(ITaskSettings *iface, static HRESULT WINAPI TaskSettings_put_StartWhenAvailable(ITaskSettings *iface, VARIANT_BOOL start) { - FIXME("%p,%d: stub\n", iface, start); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, start); + + taskset->start_when_available = start ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_XmlText(ITaskSettings *iface, BSTR *xml) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index ab061d543d..8a9099384c 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1120,6 +1120,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_StartWhenAvailable(set, test->start_when_available); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_RunOnlyIfNetworkAvailable(set, test->run_only_if_network_available); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1129,9 +1132,6 @@ todo_wine return; } - hr = ITaskSettings_put_RunOnlyIfNetworkAvailable(set, test->run_only_if_network_available); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - if (!test->execution_time_limit[0]) hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); else -- 2.11.0

1 0

[PATCH 3/7] taskschd: Implement ITaskSettings_put_AllowHardTerminate.
by Hans Leidekker 28 Nov '17

28 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 0419ed0e99..508b23384e 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1047,8 +1047,13 @@ static HRESULT WINAPI TaskSettings_get_AllowHardTerminate(ITaskSettings *iface, static HRESULT WINAPI TaskSettings_put_AllowHardTerminate(ITaskSettings *iface, VARIANT_BOOL allow) { - FIXME("%p,%d: stub\n", iface, allow); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, allow); + + taskset->allow_hard_terminate = allow ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_StartWhenAvailable(ITaskSettings *iface, VARIANT_BOOL *start) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 4d038e11d8..ab061d543d 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1117,6 +1117,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_AllowHardTerminate(set, test->allow_hard_terminate); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_StartWhenAvailable(set, test->start_when_available); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1126,9 +1129,6 @@ todo_wine return; } - hr = ITaskSettings_put_StartWhenAvailable(set, test->start_when_available); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_RunOnlyIfNetworkAvailable(set, test->run_only_if_network_available); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 2/7] taskschd: Implement ITaskSettings_put_DisallowStartIfOnBatteries.
by Hans Leidekker 28 Nov '17

28 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 70340beaad..0419ed0e99 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1023,8 +1023,13 @@ static HRESULT WINAPI TaskSettings_get_DisallowStartIfOnBatteries(ITaskSettings static HRESULT WINAPI TaskSettings_put_DisallowStartIfOnBatteries(ITaskSettings *iface, VARIANT_BOOL disallow) { - FIXME("%p,%d: stub\n", iface, disallow); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, disallow); + + taskset->disallow_start_if_on_batteries = disallow ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_AllowHardTerminate(ITaskSettings *iface, VARIANT_BOOL *allow) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index e2f85b1b73..4d038e11d8 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1114,6 +1114,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_DisallowStartIfOnBatteries(set, test->disallow_start_if_on_batteries); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_AllowHardTerminate(set, test->allow_hard_terminate); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1123,9 +1126,6 @@ todo_wine return; } - hr = ITaskSettings_put_AllowHardTerminate(set, test->allow_hard_terminate); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_StartWhenAvailable(set, test->start_when_available); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 1/7] taskschd: Use heap_strdupW to allocate the interval in TaskSettings_put_RestartInterval.
by Hans Leidekker 28 Nov '17

28 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index e417c05382..70340beaad 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -925,12 +925,12 @@ static HRESULT WINAPI TaskSettings_get_RestartInterval(ITaskSettings *iface, BST static HRESULT WINAPI TaskSettings_put_RestartInterval(ITaskSettings *iface, BSTR interval) { TaskSettings *taskset = impl_from_ITaskSettings(iface); - BSTR str = NULL; + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(interval)); - if (interval && !(str = SysAllocString(interval))) return E_OUTOFMEMORY; - SysFreeString(taskset->restart_interval); + if (interval && !(str = heap_strdupW(interval))) return E_OUTOFMEMORY; + heap_free(taskset->restart_interval); taskset->restart_interval = str; return S_OK; -- 2.11.0

1 0

[PATCH] msvcp: Fix the _Thrd_equal spec entry.
by Stefan Dösinger 28 Nov '17

28 Nov '17

This fixes +relay logs in World of Warplanes. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 7cf350e0c0..c30b6b5412 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3859,7 +3859,7 @@ @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() @ cdecl _Thrd_detach(ptr) -@ cdecl _Thrd_equal(ptr ptr) +@ cdecl _Thrd_equal(ptr long ptr long) @ stub _Thrd_exit @ cdecl _Thrd_join(ptr long) @ cdecl _Thrd_lt(ptr ptr) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 5285adafb8..0f9d830795 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3806,7 +3806,7 @@ @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() @ cdecl _Thrd_detach(ptr) -@ cdecl _Thrd_equal(ptr ptr) +@ cdecl _Thrd_equal(ptr long ptr long) @ stub _Thrd_exit @ cdecl _Thrd_join(ptr long) @ cdecl _Thrd_lt(ptr ptr) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index f33a2ec78e..3e269dd109 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3806,7 +3806,7 @@ @ cdecl _Thrd_create(ptr ptr ptr) msvcp120._Thrd_create @ cdecl _Thrd_current() msvcp120._Thrd_current @ cdecl _Thrd_detach(ptr) msvcp120._Thrd_detach -@ cdecl _Thrd_equal(ptr ptr) msvcp120._Thrd_equal +@ cdecl _Thrd_equal(ptr long ptr long) msvcp120._Thrd_equal @ stub _Thrd_exit @ cdecl _Thrd_join(ptr long) msvcp120._Thrd_join @ cdecl _Thrd_lt(ptr ptr) msvcp120._Thrd_lt diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 1f61afb550..c05e9fd665 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3723,7 +3723,7 @@ @ cdecl _Thrd_create(ptr ptr ptr) _Thrd_create @ cdecl _Thrd_current() _Thrd_current @ cdecl _Thrd_detach(ptr) _Thrd_detach -@ cdecl _Thrd_equal(ptr ptr) _Thrd_equal +@ cdecl _Thrd_equal(ptr long ptr long) _Thrd_equal @ stub _Thrd_exit @ cdecl _Thrd_hardware_concurrency() _Thrd_hardware_concurrency @ cdecl _Thrd_id() _Thrd_id -- 2.13.6

3 4

Release plans
by Alexandre Julliard 28 Nov '17

28 Nov '17

Folks, As we get into the holiday season, it's time for another code freeze... My plan is that the next release (on December 8) will be 3.0-rc1, marking the start of the code freeze towards 3.0. The freeze should last 4-6 weeks (depending on how many of you are out on vacation...), with rc releases every week as usual. This should put the final 3.0 release around mid-January. -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH v5] msvcrt: Don't crash if _vsnwprintf gets NULL as format string and add test
by Fabian Maurer 28 Nov '17

28 Nov '17

v2 Fix crash on older test machines v3 Check for dll function instead of OS version Add test for errno Moved test to msvcrt90 to be able to use _set_invalid_parameter_handler v4 proper patch name v5 use MSVCRT_CHECK_PMT remove unneeded XP check Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msvcr90/tests/msvcr90.c | 31 +++++++++++++++++++++++++++++++ dlls/msvcrt/printf.h | 3 +++ 2 files changed, 34 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 0975d00331..d106243e5c 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -133,6 +133,7 @@ static char* (__cdecl *p_setlocale)(int, const char*); static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *handler)(_FPIEEE_RECORD*)); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); +static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, va_list valist); /* make sure we use the correct errno */ #undef errno @@ -401,6 +402,7 @@ static BOOL init(void) SET(p__fpieee_flt, "_fpieee_flt"); SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); + SET(p__vsnwprintf, "_vsnwprintf"); if (sizeof(void *) == 8) { @@ -1864,6 +1866,34 @@ static void test__memicmp_l(void) ok(ret == -1, "got %d\n", ret); } +static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vsnwprintf(str, len, format, valist); + __ms_va_end(valist); + return ret; +} + +void test__vsnwprintf(void) +{ + int ret; + WCHAR str[2] = {0}; + + _invalid_parameter_handler old_handler = p_set_invalid_parameter_handler(test_invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + str[0] = 'x'; + ret = _vsnwprintf_wrapper(str, 0, NULL); + ok(ret == -1, "got %d, expected -1\n", ret); + ok(str[0] == 'x', "Expected string to be unchanged.\n"); + CHECK_CALLED(invalid_parameter_handler, EINVAL); + + ok(p_set_invalid_parameter_handler(old_handler) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); +} + START_TEST(msvcr90) { if(!init()) @@ -1897,6 +1927,7 @@ START_TEST(msvcr90) test__mbstok_s(); test__memicmp(); test__memicmp_l(); + test__vsnwprintf(); #ifdef __i386__ test__fpieee_flt(); #endif diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 4ba02bafdb..ee8120e149 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -376,6 +376,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API TRACE("Format is: %s\n", FUNC_NAME(debugstr)(fmt)); + if (!MSVCRT_CHECK_PMT(fmt != NULL)) + return -1; + if(!locale) locinfo = get_locinfo(); else -- 2.15.0

2 1

[PATCH 1/9] d2d1: ID2D1Factory1 test
by Lucian Poston 28 Nov '17

28 Nov '17

https://bugs.winehq.org/show_bug.cgi?id=44052 Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> --- dlls/d2d1/tests/Makefile.in | 2 +- dlls/d2d1/tests/d2d1.c | 145 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/Makefile.in b/dlls/d2d1/tests/Makefile.in index 91ede7888a..5eeb815e07 100644 --- a/dlls/d2d1/tests/Makefile.in +++ b/dlls/d2d1/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d2d1.dll -IMPORTS = d2d1 d3d10_1 dwrite dxguid uuid user32 advapi32 ole32 gdi32 +IMPORTS = d2d1 d3d10_1 d3d11 dwrite dxguid uuid user32 advapi32 ole32 gdi32 C_SRCS = \ d2d1.c diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a0f22128fa..9c7c875b74 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -20,6 +20,8 @@ #include <limits.h> #include <math.h> #include "d2d1.h" +#include "d2d1_1.h" +#include "d3d11.h" #include "wincrypt.h" #include "wine/test.h" #include "initguid.h" @@ -609,6 +611,37 @@ static BOOL compare_figure(IDXGISurface *surface, unsigned int x, unsigned int y return diff <= max_diff; } +static ID3D11Device *create_d11device(ID3D11DeviceContext **outContext) +{ + ID3D11Device *device; + ID3D11DeviceContext *context; + D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_10_0; + + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, + D3D11_CREATE_DEVICE_BGRA_SUPPORT, &feature_level, + 1, D3D11_SDK_VERSION, &device, NULL, &context))) + { + if (outContext) *outContext = context; + return device; + } + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, + D3D11_CREATE_DEVICE_BGRA_SUPPORT, &feature_level, + 1, D3D11_SDK_VERSION, &device, NULL, &context))) + { + if (outContext) *outContext = context; + return device; + } + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, + D3D11_CREATE_DEVICE_BGRA_SUPPORT, &feature_level, + 1, D3D11_SDK_VERSION, &device, NULL, &context))) + { + if (outContext) *outContext = context; + return device; + } + + return NULL; +} + static ID3D10Device1 *create_device(void) { ID3D10Device1 *device; @@ -636,6 +669,47 @@ static HWND create_window(void) 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); } +static IDXGISwapChain *create_swapchain_d3d11(ID3D11Device *device, HWND window, BOOL windowed) +{ + IDXGISwapChain *swapchain; + DXGI_SWAP_CHAIN_DESC desc; + IDXGIDevice *dxgi_device; + IDXGIAdapter *adapter; + IDXGIFactory *factory; + HRESULT hr; + + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); + IDXGIDevice_Release(dxgi_device); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to get factory, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + desc.BufferDesc.Width = 640; + desc.BufferDesc.Height = 480; + desc.BufferDesc.RefreshRate.Numerator = 60; + desc.BufferDesc.RefreshRate.Denominator = 1; + desc.BufferDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + desc.BufferCount = 1; + desc.OutputWindow = window; + desc.Windowed = windowed; + desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + desc.Flags = 0; + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &desc, &swapchain); + ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); + IDXGIFactory_Release(factory); + + return swapchain; +} + static IDXGISwapChain *create_swapchain(ID3D10Device1 *device, HWND window, BOOL windowed) { IDXGISwapChain *swapchain; @@ -4625,6 +4699,76 @@ todo_wine DestroyWindow(window); } +static void test_draw_text_layout_with_ID2D1Factory1(void) +{ + HRESULT hr; + ID2D1Factory1 *factory; + ID2D1Device *device; + ID3D11Device *d3d11_device; + IDXGIDevice *dxgi_device; + ID2D1DeviceContext *context; + IDXGISurface *dxgi_surface; + ID2D1Bitmap1 *bitmap; + D2D1_BITMAP_PROPERTIES1 bitmap_properties; + IDXGISwapChain *swapchain; + HWND window; + ID2D1SolidColorBrush *brush; + D2D1_COLOR_F c; + D2D1_RECT_F r; + c.r = .5; c.g = .5; c.b = .5; c.a = .5; + r.top = 10; r.left = 10; r.bottom = 90; r.right = 90; + + if (!(d3d11_device = create_d11device(NULL))) + { + skip("Failed to create device, skipping test.\n"); + return; + } + + window = create_window(); + swapchain = create_swapchain_d3d11(d3d11_device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&dxgi_surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, + &IID_ID2D1Factory1, NULL, (void**)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + hr = ID3D11Device_QueryInterface(d3d11_device, &IID_IDXGIDevice, + (void**)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to create dxgi_device, hr %#x.\n", hr); + hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + ok(SUCCEEDED(hr), "Failed to create device, hr %#x.\n", hr); + hr = ID2D1Device_CreateDeviceContext(device, + D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &context); + ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); + bitmap_properties.pixelFormat.format = DXGI_FORMAT_UNKNOWN; + bitmap_properties.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_properties.dpiX = 96.0; + bitmap_properties.dpiY = 96.0; + bitmap_properties.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(context, dxgi_surface, + &bitmap_properties, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + ID2D1DeviceContext_SetTarget(context, (ID2D1Image *)bitmap); + ID2D1DeviceContext_CreateSolidColorBrush(context, &c, NULL, &brush); + ID2D1DeviceContext_BeginDraw(context); + ID2D1DeviceContext_DrawRectangle(context, &r, (ID2D1Brush *)brush, 1.0f, NULL); + hr = ID2D1DeviceContext_EndDraw(context, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(SUCCEEDED(hr), "Failed to present image, hr %#x.\n", hr); + + ID2D1SolidColorBrush_Release(brush); + DestroyWindow(window); + IDXGISwapChain_Release(swapchain); + ID2D1Bitmap1_Release(bitmap); + IDXGISurface_Release(dxgi_surface); + ID2D1DeviceContext_Release(context); + IDXGIDevice_Release(dxgi_device); + ID3D11Device_Release(d3d11_device); + ID2D1Device_Release(device); + ID2D1Factory1_Release(factory); +} + static void create_target_dibsection(HDC hdc, UINT32 width, UINT32 height) { char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; @@ -6402,6 +6546,7 @@ START_TEST(d2d1) test_opacity_brush(); test_create_target(); test_draw_text_layout(); + test_draw_text_layout_with_ID2D1Factory1(); test_dc_target(); test_hwnd_target(); test_bitmap_target(); -- 2.13.6

4 16

[Tools] testbot/WineSendLog: Fix the message warning there is no log.
by Francois Gouget 28 Nov '17

28 Nov '17

Email it to the patch author instead of printing it to stdout where it will be lost. Also distinguish the 'empty test log' message from the 'no test log' one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index eadfe77c..2e239765 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -284,7 +284,7 @@ EOF { if (! $HasLogEntries) { - print SENDMAIL "Empty log\n"; + print SENDMAIL "Empty test log and no error message\n"; } elsif ($StepTask->Type eq "build") { @@ -313,7 +313,7 @@ EOF close ERRFILE; if (! $HasErrEntries) { - print "Empty log"; + print SENDMAIL "No test log and no error message"; } else { -- 2.15.0

1 0

[PATCH] [PATCH v2] ntdll: Implement set_cpu_context for ARM64
by André Hentschel 28 Nov '17

28 Nov '17

We need a scratch register to set PC at the end, this version uses LR Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/signal_arm64.c | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 5b3e887..e3fcf92 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -231,10 +231,43 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, * * Set the new CPU context. */ -static void set_cpu_context( const CONTEXT *context ) -{ - FIXME( "Not implemented on ARM64\n" ); -} +void set_cpu_context( const CONTEXT *context ); +__ASM_GLOBAL_FUNC( set_cpu_context, + "ldr x1, [x0, #0x10]\n\t" /* context->X1 */ + "ldr x2, [x0, #0x18]\n\t" /* context->X2 */ + "ldr x3, [x0, #0x20]\n\t" /* context->X3 */ + "ldr x4, [x0, #0x28]\n\t" /* context->X4 */ + "ldr x5, [x0, #0x30]\n\t" /* context->X5 */ + "ldr x6, [x0, #0x38]\n\t" /* context->X6 */ + "ldr x7, [x0, #0x40]\n\t" /* context->X7 */ + "ldr x8, [x0, #0x48]\n\t" /* context->X8 */ + "ldr x9, [x0, #0x50]\n\t" /* context->X9 */ + "ldr x10, [x0, #0x58]\n\t" /* context->X10 */ + "ldr x11, [x0, #0x60]\n\t" /* context->X11 */ + "ldr x12, [x0, #0x68]\n\t" /* context->X12 */ + "ldr x13, [x0, #0x70]\n\t" /* context->X13 */ + "ldr x14, [x0, #0x78]\n\t" /* context->X14 */ + "ldr x15, [x0, #0x80]\n\t" /* context->X15 */ + "ldr x16, [x0, #0x88]\n\t" /* context->X16 */ + "ldr x17, [x0, #0x90]\n\t" /* context->X17 */ + "ldr x18, [x0, #0x98]\n\t" /* context->X18 */ + "ldr x19, [x0, #0xa0]\n\t" /* context->X19 */ + "ldr x20, [x0, #0xa8]\n\t" /* context->X20 */ + "ldr x21, [x0, #0xb0]\n\t" /* context->X21 */ + "ldr x22, [x0, #0xb8]\n\t" /* context->X22 */ + "ldr x23, [x0, #0xc0]\n\t" /* context->X23 */ + "ldr x24, [x0, #0xc8]\n\t" /* context->X24 */ + "ldr x25, [x0, #0xd0]\n\t" /* context->X25 */ + "ldr x26, [x0, #0xd8]\n\t" /* context->X26 */ + "ldr x27, [x0, #0xe0]\n\t" /* context->X27 */ + "ldr x28, [x0, #0xe8]\n\t" /* context->X28 */ + "ldr x29, [x0, #0xf0]\n\t" /* context->Fp */ + "ldr x30, [x0, #0x100]\n\t" /* context->Sp -> tmp */ + "mov sp, x30\n\t" + "ldr x30, [x0, #0x108]\n\t" /* context->Pc -> LR */ + "ldr x0, [x0, #0x8]\n\t" /* context->X0 */ + "ret\n\t" + ) /*********************************************************************** * copy_context -- 2.7.4

2 1

[PATCH] mmsystem.dll16: Pass through MCI_LIST, MCI_SETAUDIO, and MCI_SETVIDEO.
by Alex Henrie 28 Nov '17

28 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- The lParam for all of these messages is an MCI_GENERIC_PARMS pointer, which does not require any special translation. This gets Wine closer to running the science game "What's the Secret?" by 3M Learning Software without warnings. --- dlls/mmsystem.dll16/mci16.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index b356a4431b..d7a356d527 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -134,8 +134,7 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l if (*lParam == 0) return MMSYSTEM_MAP_OK; /* FIXME: to add also (with seg/linear modifications to do): - * MCI_LIST, MCI_LOAD, MCI_QUALITY, MCI_RESERVE, MCI_RESTORE, MCI_SAVE - * MCI_SETAUDIO, MCI_SETTUNER, MCI_SETVIDEO + * MCI_LOAD, MCI_QUALITY, MCI_RESERVE, MCI_RESTORE, MCI_SAVE, MCI_SETTUNER */ switch (wMsg) { /* case MCI_CAPTURE */ @@ -148,6 +147,7 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l case MCI_DELETE: case MCI_GETDEVCAPS: /* case MCI_INDEX: */ + case MCI_LIST: /* case MCI_MARK: */ /* case MCI_MONITOR: */ case MCI_PASTE: @@ -158,6 +158,8 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l case MCI_RESUME: case MCI_SEEK: case MCI_SET: + case MCI_SETAUDIO: + case MCI_SETVIDEO: /* case MCI_SETTIMECODE:*/ /* case MCI_SIGNAL:*/ case MCI_SPIN: -- 2.15.0

1 0

[Testbot] Run make_makefiles when a file is added or removed.
by Zebediah Figura 27 Nov '17

27 Nov '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- testbot/bin/build/Build.pl | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 051039f..474cb84 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -74,6 +74,7 @@ sub ApplyPatch($$$) { my ($PatchFile, $PatchType, $BaseName) = @_; + my $NeedMakeMakefiles = !1; my $NeedMakefile = 0; my $NeedMakeInclude = !1; my $NeedBuildDeps = !1; @@ -84,7 +85,7 @@ sub ApplyPatch($$$) { my $Line; while (defined($Line = <FH>) && - ($NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || + (! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) { if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) @@ -111,6 +112,10 @@ sub ApplyPatch($$$) { $NeedConfigure = 1; } + elsif ($Line =~ m=^new file= || $Line =~ m=^deleted file= || $Line =~ m=^rename=) + { + $NeedMakeMakefiles = 1; + } } close FH; } @@ -125,6 +130,20 @@ sub ApplyPatch($$$) return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); } + if ($NeedMakeMakefiles) + { + InfoMsg "Running make_makefiles\n"; + system("( cd $DataDir/wine && set -x && " . + " ./tools/make_makefiles " . + ") >> $LogDir/Build.log 2>&1"); + if ($? != 0) + { + LogMsg "make_makefiles failed\n"; + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); + } + $NeedConfigure = 1; + } + if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n"; -- 2.7.4

2 3

[PATCH v4] msvcrt: Don't crash if _vsnwprintf gets NULL as format string and add test
by Fabian Maurer 27 Nov '17

27 Nov '17

v2 Fix crash on older test machines v3 Check for dll function instead of OS version Add test for errno Moved test to msvcrt90 to be able to use _set_invalid_parameter_handler v4 proper patch name Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msvcr90/tests/msvcr90.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/printf.h | 7 +++++++ 2 files changed, 50 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 0975d00331..851c9c0a23 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -133,6 +133,7 @@ static char* (__cdecl *p_setlocale)(int, const char*); static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *handler)(_FPIEEE_RECORD*)); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); +static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, va_list valist); /* make sure we use the correct errno */ #undef errno @@ -401,6 +402,7 @@ static BOOL init(void) SET(p__fpieee_flt, "_fpieee_flt"); SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); + SET(p__vsnwprintf, "_vsnwprintf"); if (sizeof(void *) == 8) { @@ -1864,6 +1866,46 @@ static void test__memicmp_l(void) ok(ret == -1, "got %d\n", ret); } +static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vsnwprintf(str, len, format, valist); + __ms_va_end(valist); + return ret; +} + +static BOOL is_vista_or_newer(void) +{ + return GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_vsnwprintf_s") != NULL; +} + +void test__vsnwprintf(void) +{ + int ret; + WCHAR str[2] = {0}; + + /* Test with format string set to NULL, we should not crash on vista or newer. */ + if(is_vista_or_newer()) + { + _invalid_parameter_handler old_handler = p_set_invalid_parameter_handler(test_invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + str[0] = 'x'; + ret = _vsnwprintf_wrapper(str, 0, NULL); + ok(ret == -1, "got %d, expected -1\n", ret); + ok(str[0] == 'x', "Expected string to be unchanged.\n"); + CHECK_CALLED(invalid_parameter_handler, EINVAL); + + ok(p_set_invalid_parameter_handler(old_handler) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); + } + else + win_skip("_vsnwprintf would crash with a NULL argument.\n"); +} + START_TEST(msvcr90) { if(!init()) @@ -1897,6 +1939,7 @@ START_TEST(msvcr90) test__mbstok_s(); test__memicmp(); test__memicmp_l(); + test__vsnwprintf(); #ifdef __i386__ test__fpieee_flt(); #endif diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 4ba02bafdb..def5342252 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -376,6 +376,13 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API TRACE("Format is: %s\n", FUNC_NAME(debugstr)(fmt)); + if(!fmt) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + return -1; + } + if(!locale) locinfo = get_locinfo(); else -- 2.15.0

2 2

[PATCH v2] msvcrt: Call cdecl functions with empty FPU stack in _CI* functions
by Piotr Caban 27 Nov '17

27 Nov '17

The FPU stack should be empty on cdecl function call. Failing to do so breaks GCC 6.4.0 -O2 optimized code. For bug #43940. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 263 ++++++++++++++++++++++------------------------------- 1 file changed, 108 insertions(+), 155 deletions(-)

1 0

[PATCH 1/5] d3d11: Disallow 0-sized buffer shader resource views.
by Matteo Bruni 27 Nov '17

27 Nov '17

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- While writing more tests for the mipmap generation stuff I stumbled upon a couple of missing checks in our implementation. I decided to add those checks rather than changing the tests... 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 2447cd771c..f636a85db2 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 f747c4bfde..034a4940b0 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; } -- 2.13.6

1 5

[PATCH 1/2] dwrite: test font collection fallback logic
by Lucian Poston 27 Nov '17

27 Nov '17

https://bugs.winehq.org/show_bug.cgi?id=44052 Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> --- dlls/dwrite/tests/font.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7a14180979..744ae18445 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2934,6 +2934,51 @@ todo_wine ok(ref == 0, "factory not released, %u\n", ref); } +static void test_CustomFontCollection_fallback(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + static const WCHAR enusW[] = {'e','n','-','u','s',0}; + IDWriteFontCollectionLoader *loader; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory *factory; + LONG font_coll_key = 1; + IDWriteFontCollection *font_collection; + DWRITE_TEXT_METRICS metrics; + HRESULT hr; + + factory = create_factory(); + loader = create_collection_loader(); + hr = IDWriteFactory_RegisterFontCollectionLoader(factory, loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateCustomFontCollection(factory, loader, + &font_coll_key, sizeof(font_coll_key), &font_collection); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, font_collection, + DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, + 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_UnregisterFontCollectionLoader(factory, loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDWriteFontCollectionLoader_Release(loader); + IDWriteFontCollection_Release(font_collection); + IDWriteTextFormat_Release(format); + IDWriteTextLayout_Release(layout); + IDWriteFactory_Release(factory); +} + static HRESULT WINAPI fontfileloader_QueryInterface(IDWriteFontFileLoader *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteFontFileLoader)) @@ -8467,6 +8512,7 @@ START_TEST(font) test_system_fontcollection(); test_ConvertFontFaceToLOGFONT(); test_CustomFontCollection(); + test_CustomFontCollection_fallback(); test_CreateCustomFontFileReference(); test_CreateFontFileReference(); test_shared_isolated(); -- 2.13.6

3 4

[PATCH] msvcrt: Call cdecl functions with empty FPU stack in _CI* functions
by Piotr Caban 27 Nov '17

27 Nov '17

The FPU stack should be empty on cdecl function call. Failing to do so breaks GCC 6.4.0 -O2 optimized code. New code is still calling cdecl functions with non empty FPU stack. Is it better to reimplement _CI* functions in assembler? For bug #43940. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 123 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 69 insertions(+), 54 deletions(-)

2 1

Bundle private ld-linux.so.2
by probono 27 Nov '17

27 Nov '17

Dear all, I am trying to bundle a 32-bit Windows executable with WINE in a standalone directory (like a macOS bundle) that should be able to run on any 64-bit Linux distribution without needing the user to install anything special on the host system. While this appears to work well for 64-bit Windows executable with 64-bit WINE, it appears that in order to run 32-bit Windows applications, 32-bit Windows must be used, which in turn requires 32-bit ld-linux.so.2 and glibc. But most 64-bit systems these days don't have the 32-bit compatibility libraries installed anymore. With other programs it is usually possible to manually load the 32-bit ELF file with a private, bundled version of ld-linux.so.2 like so: wget -c http://security.ubuntu.com/ubuntu/pool/main/g/glibc/libc6-i386_2.24-9ubuntu… dpkg -x ./libc6*.deb . HERE="$(dirname "$(readlink -f "${0}")")" WINEPREFIX="$HERE/wineprefix/" \ "$HERE/lib32/ld-linux.so.2" --library-path "$HERE/lib32" "$HERE/wine-stable/bin/wine" \ "$WINEPREFIX/drive_c/Program Files/App/App.exe" "$@" However, with WINE, this does not work. My guess is that WINE launches other WINE instances through other mechanisms in the background, which in turn don't get loaded using the specified "$HERE/lib32/ld-linux.so.2" and --library-path "$HERE/lib32" 1.) Can you confirm? 2.) Is there any way to tell WINE to use a private, bundled ld-linux.so.2 (and related glibc and other libraries) instead of looking for it in the host system? Reference: http://www.wildmediaserver.com/download.php (not developed by me) offers Linux versions which are basically Windows versions that bundle a minimal WINE subset but here the application is a 64-bit Windows executable whereas I am interested in 32-bit. Thanks, probono

2 1

[PATCH] user32/tests: Don't mark the SW_SHOWMINIMIZED overlapped test as todo.
by Zebediah Figura 27 Nov '17

27 Nov '17

This is window manager-dependent, but it succeeds on fvwm2 which the testbot machines use. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 64c7967..a816919 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5087,7 +5087,7 @@ static void test_messages(void) ShowWindow(hwnd, SW_MINIMIZE); flush_events(); - ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); + ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", FALSE); flush_sequence(); if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE) -- 2.7.4

2 3

[PATCH] dwrite: Stub SetIncrementalTabStop with S_OK
by Lucian Poston 27 Nov '17

27 Nov '17

https://bugs.winehq.org/show_bug.cgi?id=44052 Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> --- dlls/dwrite/layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index eda90ec784..104b039231 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -4263,7 +4263,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetIncrementalTabStop(IDWriteTextF { struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); FIXME("(%p)->(%f): stub\n", This, tabstop); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI dwritetextformat_layout_SetTrimming(IDWriteTextFormat1 *iface, DWRITE_TRIMMING const *trimming, @@ -5272,7 +5272,7 @@ static HRESULT WINAPI dwritetextformat_SetIncrementalTabStop(IDWriteTextFormat2 { struct dwrite_textformat *This = impl_from_IDWriteTextFormat2(iface); FIXME("(%p)->(%f): stub\n", This, tabstop); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI dwritetextformat_SetTrimming(IDWriteTextFormat2 *iface, DWRITE_TRIMMING const *trimming, -- 2.13.6

2 1

[PATCH 3/3] mlang/tests: Add MapFont tests.
by Ziqing Hui 27 Nov '17

27 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/tests/Makefile.in | 2 +- dlls/mlang/tests/mlang.c | 99 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 2 deletions(-)

3 3

[PATCH 2/3] mlang: Implement IMLangFontLink_MapFont, IMLangFontLink_ReleaseFont and IMLangFontLink_ResetFont.
by Ziqing Hui 27 Nov '17

27 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/mlang.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)

3 2

[PATCH 1/3] mlang: Implement IMLangFontLink2_MapFont, IMLangFontLink2_ReleaseFont and IMLangFontLink2_ResetFont.
by Ziqing Hui 27 Nov '17

27 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/mlang.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 156 insertions(+), 7 deletions(-)

2 1

Re: [PATCH 2/3] mlang: Implement IMLangFontLink_MapFont, IMLangFontLink_ReleaseFont and IMLangFontLink_ResetFont.
by Ziqing Hui 27 Nov '17

27 Nov '17

>> @@ -2055,23 +2055,26 @@ static HRESULT WINAPI fnIMLangFontLink_MapFont( >> HFONT hSrcFont, >> HFONT* phDestFont) >> { >> - FIXME("\n"); >> - return E_NOTIMPL; >> + TRACE("(%p)->%p %08x %p %p\n",iface, hDC, dwCodePages, hSrcFont, phDestFont); >> + >> + return map_font(hDC, dwCodePages, hSrcFont, phDestFont); >> } >Is it correct that IMLangFontLink method does not give FIXME same way >IMLangFontLink2 does? It is correct. IMLangFontLink2 need a FIXME for the reason that it has a parameter "chSrc" which I just ignore in the implementation. While IMLangFontLink doesn't have this parameter. So it doesn't need a FIXME.

1 0

[PATCH] ucrtbase/tests: Properly use quotes
by Fabian Maurer 27 Nov '17

27 Nov '17

Don't know why it was like this, but it outputs "" #func "", which is wrong Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ucrtbase/tests/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 96de238848..ab86f46810 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -36,7 +36,7 @@ #define CHECK_EXPECT2(func) \ do { \ - ok(expect_ ##func, "unexpected call " #func "\n"); \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ called_ ## func = TRUE; \ }while(0) @@ -48,7 +48,7 @@ #define CHECK_CALLED(func) \ do { \ - ok(called_ ## func, "expected " #func "\n"); \ + ok(called_ ## func, "expected " #func "\n"); \ expect_ ## func = called_ ## func = FALSE; \ }while(0) -- 2.15.0

2 1

[PATCH 5/5] taskschd: Implement ITaskSettings_put_StopIfGoingOnBatteries.
by Hans Leidekker 27 Nov '17

27 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 12b2cb5d17..e417c05382 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -999,8 +999,13 @@ static HRESULT WINAPI TaskSettings_get_StopIfGoingOnBatteries(ITaskSettings *ifa static HRESULT WINAPI TaskSettings_put_StopIfGoingOnBatteries(ITaskSettings *iface, VARIANT_BOOL stop) { - FIXME("%p,%d: stub\n", iface, stop); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, stop); + + taskset->stop_if_going_on_batteries = stop ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_DisallowStartIfOnBatteries(ITaskSettings *iface, VARIANT_BOOL *disallow) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 906d033d56..e2f85b1b73 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1111,6 +1111,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_StopIfGoingOnBatteries(set, test->stop_if_going_on_batteries); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_DisallowStartIfOnBatteries(set, test->disallow_start_if_on_batteries); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1120,9 +1123,6 @@ todo_wine return; } - hr = ITaskSettings_put_DisallowStartIfOnBatteries(set, test->disallow_start_if_on_batteries); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_AllowHardTerminate(set, test->allow_hard_terminate); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 4/5] taskschd: Implement ITaskSettings_put_MultipleInstances.
by Hans Leidekker 27 Nov '17

27 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 683a20c114..12b2cb5d17 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -975,8 +975,13 @@ static HRESULT WINAPI TaskSettings_get_MultipleInstances(ITaskSettings *iface, T static HRESULT WINAPI TaskSettings_put_MultipleInstances(ITaskSettings *iface, TASK_INSTANCES_POLICY policy) { - FIXME("%p,%d: stub\n", iface, policy); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, policy); + + taskset->policy = policy; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_StopIfGoingOnBatteries(ITaskSettings *iface, VARIANT_BOOL *stop) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index eac17340cd..906d033d56 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1108,6 +1108,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_MultipleInstances(set, test->policy); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_StopIfGoingOnBatteries(set, test->stop_if_going_on_batteries); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1117,9 +1120,6 @@ todo_wine return; } - hr = ITaskSettings_put_StopIfGoingOnBatteries(set, test->stop_if_going_on_batteries); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_DisallowStartIfOnBatteries(set, test->disallow_start_if_on_batteries); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 3/5] taskschd: Implement ITaskSettings_put_RestartCount.
by Hans Leidekker 27 Nov '17

27 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index e184ca813a..683a20c114 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -951,8 +951,13 @@ static HRESULT WINAPI TaskSettings_get_RestartCount(ITaskSettings *iface, INT *c static HRESULT WINAPI TaskSettings_put_RestartCount(ITaskSettings *iface, INT count) { - FIXME("%p,%d: stub\n", iface, count); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, count); + + taskset->restart_count = count; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_MultipleInstances(ITaskSettings *iface, TASK_INSTANCES_POLICY *policy) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 0e1c2ebc3d..eac17340cd 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1105,6 +1105,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_RestartCount(set, test->restart_count); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_MultipleInstances(set, test->policy); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1114,9 +1117,6 @@ todo_wine return; } - hr = ITaskSettings_put_MultipleInstances(set, test->policy); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_StopIfGoingOnBatteries(set, test->stop_if_going_on_batteries); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 2/5] taskschd: Implement ITaskSettings_put_RestartInterval.
by Hans Leidekker 27 Nov '17

27 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 10 +++++++++- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index cca5414a3a..e184ca813a 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -924,8 +924,16 @@ static HRESULT WINAPI TaskSettings_get_RestartInterval(ITaskSettings *iface, BST static HRESULT WINAPI TaskSettings_put_RestartInterval(ITaskSettings *iface, BSTR interval) { + TaskSettings *taskset = impl_from_ITaskSettings(iface); + BSTR str = NULL; + TRACE("%p,%s\n", iface, debugstr_w(interval)); - return E_NOTIMPL; + + if (interval && !(str = SysAllocString(interval))) return E_OUTOFMEMORY; + SysFreeString(taskset->restart_interval); + taskset->restart_interval = str; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_RestartCount(ITaskSettings *iface, INT *count) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 65287b3f24..0e1c2ebc3d 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1102,6 +1102,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskSettings_put_RestartInterval(set, NULL); else hr = ITaskSettings_put_RestartInterval(set, test->restart_interval); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_RestartCount(set, test->restart_count); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1111,9 +1114,6 @@ todo_wine return; } - hr = ITaskSettings_put_RestartCount(set, test->restart_count); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_MultipleInstances(set, test->policy); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 1/5] taskschd: Return success from a couple of stubs.
by Hans Leidekker 27 Nov '17

27 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/regtask.c | 2 +- dlls/taskschd/task.c | 6 +++--- dlls/taskschd/tests/scheduler.c | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 10562fe08d..5c81821e69 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -181,7 +181,7 @@ static HRESULT WINAPI regtask_get_Enabled(IRegisteredTask *iface, VARIANT_BOOL * static HRESULT WINAPI regtask_put_Enabled(IRegisteredTask *iface, VARIANT_BOOL enabled) { FIXME("%p,%d: stub\n", iface, enabled); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI regtask_Run(IRegisteredTask *iface, VARIANT params, IRunningTask **task) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 6a1acc81eb..cca5414a3a 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -184,7 +184,7 @@ static HRESULT WINAPI DailyTrigger_put_StartBoundary(IDailyTrigger *iface, BSTR { DailyTrigger *This = impl_from_IDailyTrigger(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(start)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI DailyTrigger_get_EndBoundary(IDailyTrigger *iface, BSTR *end) @@ -212,7 +212,7 @@ static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOO { DailyTrigger *This = impl_from_IDailyTrigger(iface); FIXME("(%p)->(%x)\n", This, enabled); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI DailyTrigger_get_DaysInterval(IDailyTrigger *iface, short *days) @@ -711,7 +711,7 @@ static HRESULT WINAPI RegistrationInfo_get_SecurityDescriptor(IRegistrationInfo static HRESULT WINAPI RegistrationInfo_put_SecurityDescriptor(IRegistrationInfo *iface, VARIANT sddl) { FIXME("%p,%s: stub\n", iface, debugstr_variant(&sddl)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_Source(IRegistrationInfo *iface, BSTR *source) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index a71e1c151b..65287b3f24 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -890,7 +890,6 @@ todo_wine ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); hr = IRegisteredTask_put_Enabled(task1, VARIANT_TRUE); -todo_wine ok(hr == S_OK, "put_Enabled error %#x\n", hr); hr = IRegisteredTask_get_State(task1, &state); ok(hr == S_OK, "get_State error %#x\n", hr); -- 2.11.0

1 0

[PATCH] shell32: add stub for Shell_NotifyIconGetRect
by Louis Lenders 27 Nov '17

27 Nov '17

This is part of bug https://bugs.winehq.org/attachment.cgi?id=59745

2 1

[PATCH] winemac: Fix test for simple non-restrictive window region optimization.
by Ken Thomases 26 Nov '17

26 Nov '17

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/window.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 2e24405..e49a445 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -402,7 +402,8 @@ static void sync_window_region(struct macdrv_win_data *data, HRGN win_region) window, it's the same as there being no region. It's potentially hard/slow to test this for arbitrary regions, so we just check for very simple regions. */ - if (count == 1 && CGRectContainsRect(rects[0], cgrect_from_rect(data->whole_rect))) + if (count == 1 && CGRectContainsRect(rects[0], + CGRectOffset(cgrect_from_rect(data->whole_rect), -data->whole_rect.left, -data->whole_rect.top))) { TRACE("optimizing for simple region that contains Cocoa content rect\n"); rects = NULL; -- 2.10.2

1 0

[=PATCH v5 1/2] gdi32: In AddFaceToList allow fonts with long names and add tests
by Fabian Maurer 26 Nov '17

26 Nov '17

v4 remove global variable don't check if functions are available fix RemoveFontResourceExA test properly release dc add another test for completeness sake Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdi32/freetype.c | 9 ++--- dlls/gdi32/tests/font.c | 54 ++++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 3 ++ dlls/gdi32/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_longname.ttf | Bin 0 -> 2252 bytes 5 files changed, 128 insertions(+), 4 deletions(-) create mode 100644 dlls/gdi32/tests/wine_longname.sfd create mode 100644 dlls/gdi32/tests/wine_longname.ttf diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 346e21dc21..8be1bfe22e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1571,6 +1571,9 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) face->family = family; family->refcount++; face->refcount++; + /* GDI32 can't deal with long names, truncate them */ + if (face->FullName && lstrlenW(face->FullName) > LF_FACESIZE - 1) + face->FullName[LF_FACESIZE - 1] = 0; return TRUE; } @@ -2143,10 +2146,8 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (strlenW(family->FamilyName) >= LF_FACESIZE) { - WARN("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); - release_face( face ); - release_family( family ); - return; + WARN("Truncating %s because name is too long\n", debugstr_w(family->FamilyName)); + family->FamilyName[LF_FACESIZE - 1] = 0; } if (insert_face_in_family_list( face, family )) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 299fadbab1..bd04a8b6b1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6679,6 +6679,59 @@ static void test_GetCharWidthI(void) ReleaseDC(0, hdc); } +static INT CALLBACK long_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lparam) +{ + BOOL *found_font = (BOOL *)lparam; + *found_font = TRUE; + return 1; +} + +static void test_long_names(void) +{ + char ttf_name[MAX_PATH]; + LOGFONTA font = {0}; + HFONT handle_font; + BOOL found_font; + int ret; + HDC dc; + + if (!write_ttf_file("wine_longname.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + dc = GetDC(NULL); + + ret = AddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + strcpy(font.lfFaceName, "wine_3_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(dc, &font, long_enum_proc, (LPARAM)&found_font, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_2_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(dc, &font, long_enum_proc, (LPARAM)&found_font, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_1_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(dc, &font, long_enum_proc, (LPARAM)&found_font, 0); + ok(found_font == FALSE, "EnumFontFamiliesExA must not find font.\n"); + + handle_font = CreateFontIndirectA(&font); + ok(handle_font != NULL, "CreateFontIndirectA failed\n"); + DeleteObject(handle_font); + + ret = RemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "RemoveFontResourceEx() failed\n"); + + DeleteFileA(ttf_name); + ReleaseDC(NULL, dc); +} + START_TEST(font) { init(); @@ -6742,6 +6795,7 @@ START_TEST(font) test_fake_bold_font(); test_bitmap_font_glyph_index(); test_GetCharWidthI(); + test_long_names(); /* These tests should be last test until RemoveFontResource * is properly implemented. diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index fdd95f687a..6dcbd42ab5 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -28,3 +28,6 @@ wine_vdmx.ttf RCDATA wine_vdmx.ttf /* @makedep: vertical.ttf */ vertical.ttf RCDATA vertical.ttf + +/* @makedep: wine_longname.ttf */ +wine_longname.ttf RCDATA wine_longname.ttf diff --git a/dlls/gdi32/tests/wine_longname.sfd b/dlls/gdi32/tests/wine_longname.sfd new file mode 100644 index 0000000000..998d7cc01f --- /dev/null +++ b/dlls/gdi32/tests/wine_longname.sfd @@ -0,0 +1,66 @@ +SplineFontDB: 3.0 +FontName: wine_1_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FullName: wine_2_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FamilyName: wine_3_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +Weight: Regular +Copyright: Copyright (c) 2017, Fabian Maurer +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102.4 +UnderlineWidth: 51.2 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 48 28337276 3092883] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1510948643 +ModificationTime: 1510949092 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +MarkAttachClasses: 1 +DEI: 91125 +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 64 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: at +Encoding: 64 64 0 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +259 332 m 29 + 468 664 l 29 + 514 332 l 29 + 259 332 l 29 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_longname.ttf b/dlls/gdi32/tests/wine_longname.ttf new file mode 100644 index 0000000000000000000000000000000000000000..59d9517560592e9578f1510f99f4fb65065c1195 GIT binary patch literal 2252 zcmdT`J!~6Q9RIz$vy(ze6NyY%=$Z!6pv1io)Gv83{V*L80j0`9(dA;F&nMYF>wHP- zEn;Fof`I`fHnvbz#A0FuAu(hCArJ#BOqEKh7`jo+@4dUk$yy{T-ueID|MR{7*WEJ& zfGKQ4$6Bp+W96OM-;M#3pOag9^~%*6X7McP4<-HDn`fNWg1-fb7U{Km$M4}p@gC`) z376`dsfju5T|h5UZiIfnHyUwgOuk2YGHef;-|P-8$`?uZT7lnq=Jxy@;=dElw#Xc#zZw1cxedX4gzAY&y=efL?(J5hOvrwuZIpI(0OX}12^z#O1y+79VSXp+l88^yVq z>1&$WDU)Thp*Y5YjkFYsS4CN=7*zQHj7|Gkqlb7uTg5%Nf*IFP;G7TX=fQZrd9}g% zR8iI4k&Bzk6Xnx^iU~o_=sBZSAeeKRcLk-~+X^YUbBRhOSA&nFtE`clM_=cf5XJEU zLdGKD@Hpb(VZj)e$N$fV>Sgwge9ki#P3BlQtbmRQly?QrRE84<?mN51!Y`Gft`Wtq zF4+ai9!?a+UzH(Kc;9hnPR_jO&YYSP(|_#kX*-Wr=d>ob6S`Pt$9*JoES@9zeOWAv z<-fm>$(zER{hHt;uH?8t6?b!7!-Tky<2v3Jk8<2VRr@u^3z*icIbLKR{UAHRko|Uv zkl}(o*35AYQ(_^<b$lsa$#DbQ+FLnZfT=&9<3()iZ{RXw^e{kz2q9WX*=46u#{yRe z7HpiuBJmpJTO4ujl3L-qL7RYp%W-dzL}4p6PuCYr$Fk2Ynl*nt^1J4WzmWt~*`j5a z+8$g&%5x(0iDk1-Y*XzuAl9ZwUHam2_R&#R(!!^mM|$5+kN(IVQ|iY@?3$z#azZqy z?J^E*Mcu%2y|fkeJ^p-eGe`zrJMM;_`~Xqlr(Q<};jNR3<4o3!6EAE;E_b-j!$Jn# zrX!5#dJt~3eIhmGZmQOV8i7h&nW-~zkuVP3QO^F?p=Vy$d=-{hOq=t5Sy79-X)R8| zz;w!%dC^o!avncP+`>M;WZO%!2M!ng$wZzN{a?fbtg@U5J2g^8Hd$2pM#$pI$D~4# z^rN_IT9#e5EQ_3Rz3nGb?<{Kj@vF#>%l^$V+UDEC51eEj8S=ss)H<cOf_KsQc0JDj V9#YOPqq5Ab)%@daq1MB9_dm8?dc^<$ literal 0 HcmV?d00001 -- 2.15.0

4 8

[PATCH 1/2] include: Add optional ANSI color codes for winetests.
by Rafał Harabień 25 Nov '17

25 Nov '17

By default colors are disabled. Use WINETEST_COLOR=1 to enable colors in tests. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- include/wine/test.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index 4ec66d5..3388414 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -206,6 +206,9 @@ const char *winetest_platform = "windows"; /* report successful tests (BOOL) */ static int report_success = 0; +/* use ANSI escape codes for output coloring */ +static int winetest_color = 0; + /* passing arguments around */ static int winetest_argc; static char** winetest_argv; @@ -303,14 +306,20 @@ int broken( int condition ) int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { struct tls_data *data = get_tls_data(); + const char *color_red = "\e[91m"; + const char *color_reset = "\e[39m"; if (data->todo_level) { if (condition) { + if (winetest_color) + printf("%s", color_red); printf( "%s:%d: Test succeeded inside todo block: ", data->current_file, data->current_line ); vprintf(msg, args); + if (winetest_color) + printf("%s", color_reset); InterlockedIncrement(&todo_failures); return 0; } @@ -330,9 +339,13 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { + if (winetest_color) + printf("%s", color_red); printf( "%s:%d: Test failed: ", data->current_file, data->current_line ); vprintf(msg, args); + if (winetest_color) + printf("%s", color_reset); InterlockedIncrement(&failures); return 0; } @@ -669,6 +682,7 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_COLOR", p, sizeof(p) )) winetest_color = atoi(p); if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); -- 2.7.4

1 1

[PATCH v4] user32: Reimplement TrackMouseEvent.
by Rafał Harabień 25 Nov '17

25 Nov '17

Improvements: - Don't use timer for TME_LEAVE and react immediately on mouse motion. It improves user experience for controls depending on this API like toolbar. - Fail when called with invalid flags - Hold tracking info for each win32 thread independently - Merge tracking requests if possible (leave+hover) - Return hover time 0 when hover tracking is disabled Patch v4 adds test for window in thread not handling messages. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/user32/input.c | 234 +++++++++++++++++---------------- dlls/user32/message.c | 5 + dlls/user32/tests/msg.c | 314 +++++++++++++++++++++++++++++++++++++++++++-- dlls/user32/user_private.h | 11 ++ dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 29 +++++ dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + 8 files changed, 476 insertions(+), 122 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index c475b19..5b589a5 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1243,48 +1243,59 @@ BOOL WINAPI UnloadKeyboardLayout(HKL hkl) return USER_Driver->pUnloadKeyboardLayout(hkl); } -typedef struct __TRACKINGLIST { - TRACKMOUSEEVENT tme; - POINT pos; /* center of hover rectangle */ -} _TRACKINGLIST; -/* FIXME: move tracking stuff into a per thread data */ -static _TRACKINGLIST tracking_info; -static UINT_PTR timer; +void maybe_clean_tracking_info(struct tracking_info *tracking_info) +{ + if (!(tracking_info->tme.dwFlags & (TME_HOVER | TME_LEAVE))) + { + tracking_info->tme.hwndTrack = 0; + tracking_info->tme.dwFlags = 0; + } + if (!(tracking_info->tme.dwFlags & TME_HOVER)) + tracking_info->tme.dwHoverTime = 0; +} -static void check_mouse_leave(HWND hwnd, int hittest) +void check_mouse_leave(HWND hwnd, int hittest) { - if (tracking_info.tme.hwndTrack != hwnd) + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; + + TRACE("hwnd %p hittest %d\n", hwnd, hittest); + + if (!(tracking_info->tme.dwFlags & TME_LEAVE)) + return; + + if (tracking_info->tme.hwndTrack != hwnd) { - if (tracking_info.tme.dwFlags & TME_NONCLIENT) - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + if (tracking_info->tme.dwFlags & TME_NONCLIENT) + PostMessageW(tracking_info->tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); else - PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0); + PostMessageW(tracking_info->tme.hwndTrack, WM_MOUSELEAVE, 0, 0); /* remove the TME_LEAVE flag */ - tracking_info.tme.dwFlags &= ~TME_LEAVE; + tracking_info->tme.dwFlags &= ~TME_LEAVE; } else { if (hittest == HTCLIENT) { - if (tracking_info.tme.dwFlags & TME_NONCLIENT) + if (tracking_info->tme.dwFlags & TME_NONCLIENT) { - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + PostMessageW(tracking_info->tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); /* remove the TME_LEAVE flag */ - tracking_info.tme.dwFlags &= ~TME_LEAVE; + tracking_info->tme.dwFlags &= ~TME_LEAVE; } } else { - if (!(tracking_info.tme.dwFlags & TME_NONCLIENT)) + if (!(tracking_info->tme.dwFlags & TME_NONCLIENT)) { - PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0); + PostMessageW(tracking_info->tme.hwndTrack, WM_MOUSELEAVE, 0, 0); /* remove the TME_LEAVE flag */ - tracking_info.tme.dwFlags &= ~TME_LEAVE; + tracking_info->tme.dwFlags &= ~TME_LEAVE; } } } + maybe_clean_tracking_info(tracking_info); } static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, @@ -1292,6 +1303,7 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, { POINT pos; INT hoverwidth = 0, hoverheight = 0, hittest; + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; TRACE("hwnd %p, msg %04x, id %04lx, time %u\n", hwnd, uMsg, idEvent, dwTime); @@ -1304,31 +1316,24 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, SystemParametersInfoW(SPI_GETMOUSEHOVERHEIGHT, 0, &hoverheight, 0); TRACE("tracked pos %s, current pos %s, hover width %d, hover height %d\n", - wine_dbgstr_point(&tracking_info.pos), wine_dbgstr_point(&pos), + wine_dbgstr_point(&tracking_info->pos), wine_dbgstr_point(&pos), hoverwidth, hoverheight); - /* see if this tracking event is looking for TME_LEAVE and that the */ - /* mouse has left the window */ - if (tracking_info.tme.dwFlags & TME_LEAVE) - { - check_mouse_leave(hwnd, hittest); - } - - if (tracking_info.tme.hwndTrack != hwnd) + if (tracking_info->tme.hwndTrack != hwnd) { /* mouse is gone, stop tracking mouse hover */ - tracking_info.tme.dwFlags &= ~TME_HOVER; + tracking_info->tme.dwFlags &= ~TME_HOVER; } /* see if we are tracking hovering for this hwnd */ - if (tracking_info.tme.dwFlags & TME_HOVER) + if (tracking_info->tme.dwFlags & TME_HOVER) { /* has the cursor moved outside the rectangle centered around pos? */ - if ((abs(pos.x - tracking_info.pos.x) > (hoverwidth / 2)) || - (abs(pos.y - tracking_info.pos.y) > (hoverheight / 2))) + if ((abs(pos.x - tracking_info->pos.x) > (hoverwidth / 2)) || + (abs(pos.y - tracking_info->pos.y) > (hoverheight / 2))) { /* record this new position as the current position */ - tracking_info.pos = pos; + tracking_info->pos = pos; } else { @@ -1337,29 +1342,88 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, ScreenToClient(hwnd, &pos); TRACE("client cursor pos %s\n", wine_dbgstr_point(&pos)); - PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSEHOVER, + PostMessageW(tracking_info->tme.hwndTrack, WM_MOUSEHOVER, get_key_state(), MAKELPARAM( pos.x, pos.y )); } else { - if (tracking_info.tme.dwFlags & TME_NONCLIENT) - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSEHOVER, + if (tracking_info->tme.dwFlags & TME_NONCLIENT) + PostMessageW(tracking_info->tme.hwndTrack, WM_NCMOUSEHOVER, hittest, MAKELPARAM( pos.x, pos.y )); } /* stop tracking mouse hover */ - tracking_info.tme.dwFlags &= ~TME_HOVER; + tracking_info->tme.dwFlags &= ~TME_HOVER; } } /* stop the timer if the tracking list is empty */ - if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) + if (!(tracking_info->tme.dwFlags & TME_HOVER)) + { + KillSystemTimer(tracking_info->tme.hwndTrack, tracking_info->timer); + tracking_info->timer = 0; + } + maybe_clean_tracking_info(tracking_info); +} + +void track_mouse_event_internal(HWND hwnd_track, DWORD flags, DWORD hover_time) +{ + HWND hwnd; + POINT pos; + INT hittest; + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; + + if (flags & TME_HOVER) + { + /* if HOVER_DEFAULT or 0 was specified replace this with the system's current value. */ + if (hover_time == HOVER_DEFAULT || hover_time == 0) + SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); + } + + if (flags & TME_CANCEL) + { + if (tracking_info->tme.hwndTrack == hwnd_track) + { + /* cancel old tracking request */ + tracking_info->tme.dwFlags &= ~(flags & ~TME_CANCEL); + + /* if we aren't tracking on hover or leave remove this entry */ + if (!(tracking_info->tme.dwFlags & TME_HOVER) && tracking_info->timer) + { + KillSystemTimer(tracking_info->tme.hwndTrack, tracking_info->timer); + tracking_info->timer = 0; + } + maybe_clean_tracking_info(tracking_info); + } + } + else { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; + /* check what window is under cursor */ + GetCursorPos(&pos); + hwnd = WINPOS_WindowFromPoint(hwnd_track, pos, &hittest); + TRACE("point %s hwnd %p hittest %d\n", wine_dbgstr_point(&pos), hwnd, hittest); + + if (hwnd_track != hwnd) + PostMessageW(hwnd_track, WM_MOUSELEAVE, 0, 0); + else + { + /* save tracking request */ + tracking_info->tme.hwndTrack = hwnd_track; + tracking_info->tme.dwFlags |= flags; + if (flags & TME_HOVER) + tracking_info->tme.dwHoverTime = hover_time; + + /* Initialize HoverInfo variables even if not hover tracking */ + tracking_info->pos = pos; + + if (flags & TME_HOVER) + { + /* recreate timer */ + if (tracking_info->timer) + KillSystemTimer(tracking_info->tme.hwndTrack, tracking_info->timer); + tracking_info->timer = SetSystemTimer(tracking_info->tme.hwndTrack, (UINT_PTR)&tracking_info->tme, hover_time, TrackMouseEventProc); + } + } } } @@ -1389,23 +1453,30 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, BOOL WINAPI TrackMouseEvent (TRACKMOUSEEVENT *ptme) { - HWND hwnd; - POINT pos; - DWORD hover_time; - INT hittest; + DWORD invalid_flags; + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; TRACE("%x, %x, %p, %u\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); - if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) { + if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) + { WARN("wrong TRACKMOUSEEVENT size from app\n"); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + invalid_flags = ptme->dwFlags & ~(TME_QUERY | TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT); + if (invalid_flags != 0) + { + WARN("Unknown flag(s) %08x\n", invalid_flags); + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + /* fill the TRACKMOUSEEVENT struct with the current tracking for the given hwnd */ - if (ptme->dwFlags & TME_QUERY ) + if (ptme->dwFlags & TME_QUERY) { - *ptme = tracking_info.tme; + *ptme = tracking_info->tme; /* set cbSize in the case it's not initialized yet */ ptme->cbSize = sizeof(TRACKMOUSEEVENT); @@ -1418,68 +1489,11 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) return FALSE; } - hover_time = (ptme->dwFlags & TME_HOVER) ? ptme->dwHoverTime : HOVER_DEFAULT; - - /* if HOVER_DEFAULT was specified replace this with the system's current value. - * TME_LEAVE doesn't need to specify hover time so use default */ - if (hover_time == HOVER_DEFAULT || hover_time == 0) - SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); - - GetCursorPos(&pos); - hwnd = WINPOS_WindowFromPoint(ptme->hwndTrack, pos, &hittest); - TRACE("point %s hwnd %p hittest %d\n", wine_dbgstr_point(&pos), hwnd, hittest); - - if (ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)) - FIXME("Unknown flag(s) %08x\n", ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)); - - if (ptme->dwFlags & TME_CANCEL) - { - if (tracking_info.tme.hwndTrack == ptme->hwndTrack) - { - tracking_info.tme.dwFlags &= ~(ptme->dwFlags & ~TME_CANCEL); - - /* if we aren't tracking on hover or leave remove this entry */ - if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) - { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; - } - } - } else { - /* In our implementation it's possible that another window will receive a - * WM_MOUSEMOVE and call TrackMouseEvent before TrackMouseEventProc is - * called. In such a situation post the WM_MOUSELEAVE now */ - if (tracking_info.tme.dwFlags & TME_LEAVE && tracking_info.tme.hwndTrack != NULL) - check_mouse_leave(hwnd, hittest); - - if (timer) - { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; - } - - if (ptme->hwndTrack == hwnd) - { - /* Adding new mouse event to the tracking list */ - tracking_info.tme = *ptme; - tracking_info.tme.dwHoverTime = hover_time; - - /* Initialize HoverInfo variables even if not hover tracking */ - tracking_info.pos = pos; - - timer = SetSystemTimer(tracking_info.tme.hwndTrack, (UINT_PTR)&tracking_info.tme, hover_time, TrackMouseEventProc); - } - } - - return TRUE; + /* use internal message to get access to user_thread_info for tracked window */ + return SendNotifyMessageW(ptme->hwndTrack, WM_WINE_TRACKMOUSEEVENT, ptme->dwFlags, ptme->dwHoverTime); } + /*********************************************************************** * GetMouseMovePointsEx [USER32] * diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 406eff3..21710c3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1888,6 +1888,9 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return USER_Driver->pClipCursor( &rect ); } return USER_Driver->pClipCursor( NULL ); + case WM_WINE_TRACKMOUSEEVENT: + track_mouse_event_internal(hwnd, (DWORD)wparam, (DWORD)lparam); + return 0; default: if (msg >= WM_WINE_FIRST_DRIVER_MSG && msg <= WM_WINE_LAST_DRIVER_MSG) return USER_Driver->pWindowMessage( hwnd, msg, wparam, lparam ); @@ -2503,6 +2506,8 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H else { msg->hwnd = WINPOS_WindowFromPoint( msg->hwnd, msg->pt, &hittest ); + /* TrackMouseEvent support */ + check_mouse_leave(msg->hwnd, hittest); } if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd )) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 64c7967..cfc1cde 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7817,6 +7817,18 @@ static DWORD WINAPI thread_proc(void *param) while (GetMessageA(&msg, 0, 0, 0)) { + if ((msg.message == WM_TIMER || msg.message == WM_SYSTIMER) && msg.lParam) + { + struct recvd_message s_msg; + + s_msg.hwnd = msg.hwnd; + s_msg.message = msg.message; + s_msg.flags = sent|wparam|lparam; + s_msg.wParam = msg.wParam; + s_msg.lParam = msg.lParam; + s_msg.descr = "msg_loop"; + add_message(&s_msg); + } TranslateMessage(&msg); DispatchMessageA(&msg); } @@ -11938,6 +11950,11 @@ static const struct message WmMouseHoverSeq[] = { { 0 } }; +static const struct message WmMouseLeaveSeq[] = { + { WM_MOUSELEAVE, sent|wparam, 0 }, + { 0 } +}; + static void pump_msg_loop_timeout(DWORD timeout, BOOL inject_mouse_move) { MSG msg; @@ -11982,14 +11999,6 @@ static void pump_msg_loop_timeout(DWORD timeout, BOOL inject_mouse_move) } while (start_ticks + timeout >= end_ticks); } -static void test_TrackMouseEvent(void) -{ - TRACKMOUSEEVENT tme; - BOOL ret; - HWND hwnd, hchild; - RECT rc_parent, rc_child; - UINT default_hover_time, hover_width = 0, hover_height = 0; - #define track_hover(track_hwnd, track_hover_time) \ tme.cbSize = sizeof(tme); \ tme.dwFlags = TME_HOVER; \ @@ -11999,6 +12008,15 @@ static void test_TrackMouseEvent(void) ret = pTrackMouseEvent(&tme); \ ok(ret, "TrackMouseEvent(TME_HOVER) error %d\n", GetLastError()) +#define track_leave(track_hwnd) \ + tme.cbSize = sizeof(tme); \ + tme.dwFlags = TME_LEAVE; \ + tme.hwndTrack = track_hwnd; \ + tme.dwHoverTime = 0xdeadbeef; \ + SetLastError(0xdeadbeef); \ + ret = pTrackMouseEvent(&tme); \ + ok(ret, "TrackMouseEvent(TME_LEAVE) error %d\n", GetLastError()); + #define track_query(expected_track_flags, expected_track_hwnd, expected_hover_time) \ tme.cbSize = sizeof(tme); \ tme.dwFlags = TME_QUERY; \ @@ -12024,6 +12042,114 @@ static void test_TrackMouseEvent(void) ret = pTrackMouseEvent(&tme); \ ok(ret, "TrackMouseEvent(TME_HOVER | TME_CANCEL) error %d\n", GetLastError()) +#define track_leave_cancel(track_hwnd) \ + tme.cbSize = sizeof(tme); \ + tme.dwFlags = TME_LEAVE | TME_CANCEL; \ + tme.hwndTrack = track_hwnd; \ + tme.dwHoverTime = 0xdeadbeef; \ + SetLastError(0xdeadbeef); \ + ret = pTrackMouseEvent(&tme); \ + ok(ret, "TrackMouseEvent(TME_LEAVE | TME_CANCEL) error %d\n", GetLastError()) + +static DWORD WINAPI thread_proc_tme(void *param) +{ + BOOL ret; + TRACKMOUSEEVENT tme; + MSG msg; + struct wnd_event *wnd_event = param; + + wnd_event->hwnd = CreateWindowExA(0, "TestWindowClass", "window caption text", WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(wnd_event->hwnd != 0, "Failed to create overlapped window\n"); + + SetEvent(wnd_event->start_event); + + while (GetMessageA(&msg, 0, 0, 0)) + { + if ((msg.message == WM_TIMER || msg.message == WM_SYSTIMER) && msg.lParam) + { + struct recvd_message s_msg; + + s_msg.hwnd = msg.hwnd; + s_msg.message = msg.message; + s_msg.flags = sent|wparam|lparam; + s_msg.wParam = msg.wParam; + s_msg.lParam = msg.lParam; + s_msg.descr = "msg_loop"; + add_message(&s_msg); + } + if (msg.message == WM_USER) + { + if (msg.wParam) + { + track_query((DWORD)msg.wParam, wnd_event->hwnd, (DWORD)msg.lParam); + } + else + { + track_query(0, NULL, 0); + } + continue; + } + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + ok(IsWindow(wnd_event->hwnd), "window should still exist\n"); + + return 0; +} + +static DWORD WINAPI thread_proc_tme_no_msg(void *param) +{ + BOOL ret; + TRACKMOUSEEVENT tme; + struct wnd_event *wnd_event = param; + UINT default_hover_time; + + wnd_event->hwnd = CreateWindowExA(0, "TestWindowClass", "window caption text", WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(wnd_event->hwnd != 0, "Failed to create overlapped window\n"); + ShowWindow(wnd_event->hwnd, SW_SHOW); + flush_events(); + + ret = SystemParametersInfoA(SPI_GETMOUSEHOVERTIME, 0, &default_hover_time, 0); + if (!ret) default_hover_time = 400; + + SetEvent(wnd_event->start_event); + + /* Sleep without handling messages */ + Sleep(1000); + + /* TME_QUERY should return flags even if message loop is not running. + It doesn't work in Wine (for other thread) because WM_WINE_TRACKMOUSEEVENT is used by TrackMouseEvent function. */ + tme.cbSize = sizeof(tme); + tme.dwFlags = TME_QUERY; + tme.hwndTrack = (HWND)0xdeadbeef; + tme.dwHoverTime = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pTrackMouseEvent(&tme); + ok(ret, "TrackMouseEvent(TME_QUERY) error %d\n", GetLastError()); + ok(tme.cbSize == sizeof(tme), "wrong tme.cbSize %u\n", tme.cbSize); + todo_wine { + ok(tme.dwFlags == (TME_LEAVE|TME_HOVER), "wrong tme.dwFlags %08x, expected %08x\n", tme.dwFlags, TME_LEAVE|TME_HOVER); + ok(tme.hwndTrack == wnd_event->hwnd, "wrong tme.hwndTrack %p, expected %p\n", tme.hwndTrack, wnd_event->hwnd); + ok(tme.dwHoverTime == default_hover_time,"wrong tme.dwHoverTime %u, expected %u\n", tme.dwHoverTime, default_hover_time); + } + + return 0; +} + +static void test_TrackMouseEvent(void) +{ + TRACKMOUSEEVENT tme; + BOOL ret; + HWND hwnd, hchild; + RECT rc_parent, rc_child; + UINT default_hover_time, hover_width = 0, hover_height = 0; + struct wnd_event wnd_event; + HANDLE hthread; + DWORD tid; + default_hover_time = 0xdeadbeef; SetLastError(0xdeadbeef); ret = SystemParametersInfoA(SPI_GETMOUSEHOVERTIME, 0, &default_hover_time, 0); @@ -12090,6 +12216,17 @@ static void test_TrackMouseEvent(void) ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || broken(GetLastError() == 0xdeadbeef), "not expected error %u\n", GetLastError()); + /* Invalid flags */ + tme.cbSize = sizeof(tme); + tme.dwFlags = ~TME_CANCEL; + tme.hwndTrack = hwnd; + tme.dwHoverTime = HOVER_DEFAULT; + SetLastError(0xdeadbeef); + ret = pTrackMouseEvent(&tme); + ok(!ret, "TrackMouseEvent should fail\n"); + ok(GetLastError() == ERROR_INVALID_FLAGS, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + GetWindowRect(hwnd, &rc_parent); GetWindowRect(hchild, &rc_child); SetCursorPos(rc_child.left - 10, rc_child.top - 10); @@ -12159,13 +12296,170 @@ static void test_TrackMouseEvent(void) track_query(TME_HOVER, hwnd, default_hover_time); track_hover_cancel(hwnd); + /* cursor is over child window */ + mouse_event(MOUSEEVENTF_MOVE, 20, 20, 0, 0); /* rc_child.left + 10, rc_child.top + 10 */ + flush_events(); + flush_sequence(); + + /* cancel TME_LEAVE */ + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(TME_LEAVE, hchild, 0); + track_leave_cancel(hchild); + track_query(0, NULL, 0); + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE); + + /* requests for the same window are merged */ + track_hover(hchild, HOVER_DEFAULT); + track_query(TME_HOVER, hchild, default_hover_time); + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(TME_LEAVE|TME_HOVER, hchild, default_hover_time); + track_hover_cancel(hchild); + track_query(TME_LEAVE, hchild, 0); + /* TME_LEAVE for window not being under cursor doesn't change TME_QUERY result */ + track_leave(hwnd); + track_query(TME_LEAVE, hchild, 0); + track_leave_cancel(hchild); + track_query(0, NULL, 0); + flush_events(); + flush_sequence(); + + /* try changing hover time */ + track_hover(hchild, 0); + track_query(TME_HOVER, hchild, default_hover_time); + track_hover(hchild, 1); + track_query(TME_HOVER, hchild, 1); + track_hover(hchild, HOVER_DEFAULT); + track_query(TME_HOVER, hchild, default_hover_time); + track_hover(hchild, default_hover_time*2); + track_query(TME_HOVER, hchild, default_hover_time*2); + track_hover_cancel(hchild); + + /* test TME_LEAVE */ + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(TME_LEAVE, hchild, 0); + ok(!GetCapture(), "expected NULL\n"); + mouse_event(MOUSEEVENTF_MOVE, -20, 0, 0, 0); /* rc_child.left - 10, rc_child.top + 10 */ + pump_msg_loop_timeout(0, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + track_query(0, NULL, 0); + + /* window is not under cursor - immediate WM_MOUSELEAVE is expected */ + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + pump_msg_loop_timeout(0, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + mouse_event(MOUSEEVENTF_MOVE, 20, 0, 0, 0); /* rc_child.left + 10, rc_child.top + 10 */ + flush_events(); + flush_sequence(); + + /* move cursor outside top-window */ + track_leave(hchild); + track_query(TME_LEAVE, hchild, 0); + mouse_event(MOUSEEVENTF_MOVE, 500, 0, 0, 0); /* rc_child.left + 510, rc_child.top + 10 */ + pump_msg_loop_timeout(0, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + track_query(0, NULL, 0); + DestroyWindow(hwnd); + /* Try tracking cursor over window from other thread */ + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + if (!wnd_event.start_event) + { + win_skip("CreateEventW failed\n"); + return; + } + SetCursorPos(150, 150); + hthread = CreateThread(NULL, 0, thread_proc_tme, &wnd_event, 0, &tid); + ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); + ShowWindow(wnd_event.hwnd, SW_SHOW); + flush_events(); + flush_sequence(); + + /* window is under cursor */ + track_hover(wnd_event.hwnd, HOVER_DEFAULT); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + PostMessageW(wnd_event.hwnd, WM_USER, TME_HOVER, default_hover_time); + Sleep(default_hover_time/2); + track_query(0, NULL, 0); + Sleep(default_hover_time); + flush_events(); + ok_sequence(WmMouseHoverSeq, "WmMouseHoverSeq", FALSE); + + track_leave(wnd_event.hwnd); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + PostMessageW(wnd_event.hwnd, WM_USER, TME_LEAVE, 0); + Sleep(default_hover_time/2); + track_query(0, NULL, 0); + Sleep(default_hover_time); + flush_events(); + ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE); + + /* window is not under cursor */ + SetCursorPos(600, 150); + flush_events(); + track_query(0, NULL, 0); + PostMessageW(wnd_event.hwnd, WM_USER, 0, 0); + Sleep(default_hover_time/2); + flush_events(); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + track_leave(wnd_event.hwnd); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + PostMessageW(wnd_event.hwnd, WM_USER, 0, 0); + Sleep(default_hover_time/2); + flush_events(); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + ret = PostMessageW(wnd_event.hwnd, WM_QUIT, 0, 0); + ok( ret, "PostMessageW(WM_QUIT) error %d\n", GetLastError()); + ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hthread); + + /* Window from other thread; no message loop is running */ + SetCursorPos(150, 150); + flush_events(); + flush_sequence(); + + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + if (!wnd_event.start_event) + { + win_skip("CreateEventW failed\n"); + return; + } + + hthread = CreateThread(NULL, 0, thread_proc_tme_no_msg, &wnd_event, 0, &tid); + ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); + + /* window is under cursor */ + track_leave(wnd_event.hwnd); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_hover(wnd_event.hwnd, HOVER_DEFAULT); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + + ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hthread); +} + #undef track_hover #undef track_query +#undef track_leave #undef track_hover_cancel -} - +#undef track_leave_cancel static const struct message WmSetWindowRgn[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE }, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 052fdd8..efff279 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -53,6 +53,7 @@ enum wine_internal_message WM_WINE_KEYBOARD_LL_HOOK, WM_WINE_MOUSE_LL_HOOK, WM_WINE_CLIPCURSOR, + WM_WINE_TRACKMOUSEEVENT, WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ WM_WINE_LAST_DRIVER_MSG = 0x80001fff }; @@ -163,6 +164,13 @@ struct wm_char_mapping_data MSG get_msg; }; +/* data for TrackMouseEvent */ +struct tracking_info { + TRACKMOUSEEVENT tme; + POINT pos; /* center of hover rectangle */ + UINT_PTR timer; +}; + /* this is the structure stored in TEB->Win32ClientInfo */ /* no attempt is made to keep the layout compatible with the Windows one */ struct user_thread_info @@ -185,6 +193,7 @@ struct user_thread_info HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ RAWINPUT *rawinput; + struct tracking_info tracking_info; }; C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); @@ -225,6 +234,8 @@ struct tagWND; extern void CLIPBOARD_ReleaseOwner( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; +extern void check_mouse_leave(HWND hwnd, int hittest) DECLSPEC_HIDDEN; +extern void track_mouse_event_internal(HWND hwnd, DWORD flags, DWORD hover_time) DECLSPEC_HIDDEN; extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN; extern void invalidate_dce( struct tagWND *win, const RECT *rect ) DECLSPEC_HIDDEN; extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a0bfe05..cc8dac8 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -114,7 +114,7 @@ static x11drv_event_handler handlers[MAX_EVENT_HANDLERS] = X11DRV_ButtonRelease, /* 5 ButtonRelease */ X11DRV_MotionNotify, /* 6 MotionNotify */ X11DRV_EnterNotify, /* 7 EnterNotify */ - NULL, /* 8 LeaveNotify */ + X11DRV_LeaveNotify, /* 8 LeaveNotify */ X11DRV_FocusIn, /* 9 FocusIn */ X11DRV_FocusOut, /* 10 FocusOut */ X11DRV_KeymapNotify, /* 11 KeymapNotify */ diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5ace405..092c381 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1447,6 +1447,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) *pos = root_to_virtual_screen( winX, winY ); TRACE( "pointer at %s server pos %s\n", wine_dbgstr_point(pos), wine_dbgstr_point(&old) ); } + return ret; } @@ -1690,6 +1691,34 @@ BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) return TRUE; } +/*********************************************************************** + * X11DRV_LeaveNotify + */ +BOOL X11DRV_LeaveNotify( HWND hwnd, XEvent *xev ) +{ + XCrossingEvent *event = &xev->xcrossing; + INPUT input; + + TRACE( "hwnd %p/%lx pos %d,%d detail %d\n", hwnd, event->window, event->x, event->y, event->detail ); + + if (event->detail == NotifyVirtual) return FALSE; + if (hwnd == x11drv_thread_data()->grab_hwnd) return FALSE; + + /* simulate a mouse motion event - needed for TrackMouseEvent */ + input.u.mi.dx = event->x; + input.u.mi.dy = event->y; + input.u.mi.mouseData = 0; + input.u.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; + + /* Note: not calling is_old_motion_event because leave message is not simulated when warping cursor */ + + send_mouse_input( hwnd, event->window, event->state, &input ); + return TRUE; +} + + #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H /*********************************************************************** diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d35328c..2626c93 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -326,7 +326,7 @@ static int get_window_attributes( struct x11drv_win_data *data, XSetWindowAttrib attr->backing_store = NotUseful; attr->border_pixel = 0; attr->event_mask = (ExposureMask | PointerMotionMask | - ButtonPressMask | ButtonReleaseMask | EnterWindowMask | + ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | KeyPressMask | KeyReleaseMask | FocusChangeMask | KeymapStateMask | StructureNotifyMask); if (data->managed) attr->event_mask |= PropertyChangeMask; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 938ff22..1ee1c15 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -508,6 +508,7 @@ extern BOOL X11DRV_ButtonPress( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ButtonRelease( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_MotionNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_LeaveNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_DestroyNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; -- 2.7.4

1 0

[PATCH v3] msvcrt90: Don't crash if _vsnwprintf gets NULL as format string and add test
by Fabian Maurer 25 Nov '17

25 Nov '17

v2 Fix crash on older test machines v3 Check for dll function instead of OS version Add test for errno Moved test to be able to msvcrt90 to use _set_invalid_parameter_handler Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msvcr90/tests/msvcr90.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/printf.h | 7 +++++++ 2 files changed, 50 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 0975d00331..851c9c0a23 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -133,6 +133,7 @@ static char* (__cdecl *p_setlocale)(int, const char*); static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *handler)(_FPIEEE_RECORD*)); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); +static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, va_list valist); /* make sure we use the correct errno */ #undef errno @@ -401,6 +402,7 @@ static BOOL init(void) SET(p__fpieee_flt, "_fpieee_flt"); SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); + SET(p__vsnwprintf, "_vsnwprintf"); if (sizeof(void *) == 8) { @@ -1864,6 +1866,46 @@ static void test__memicmp_l(void) ok(ret == -1, "got %d\n", ret); } +static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vsnwprintf(str, len, format, valist); + __ms_va_end(valist); + return ret; +} + +static BOOL is_vista_or_newer(void) +{ + return GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_vsnwprintf_s") != NULL; +} + +void test__vsnwprintf(void) +{ + int ret; + WCHAR str[2] = {0}; + + /* Test with format string set to NULL, we should not crash on vista or newer. */ + if(is_vista_or_newer()) + { + _invalid_parameter_handler old_handler = p_set_invalid_parameter_handler(test_invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + str[0] = 'x'; + ret = _vsnwprintf_wrapper(str, 0, NULL); + ok(ret == -1, "got %d, expected -1\n", ret); + ok(str[0] == 'x', "Expected string to be unchanged.\n"); + CHECK_CALLED(invalid_parameter_handler, EINVAL); + + ok(p_set_invalid_parameter_handler(old_handler) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); + } + else + win_skip("_vsnwprintf would crash with a NULL argument.\n"); +} + START_TEST(msvcr90) { if(!init()) @@ -1897,6 +1939,7 @@ START_TEST(msvcr90) test__mbstok_s(); test__memicmp(); test__memicmp_l(); + test__vsnwprintf(); #ifdef __i386__ test__fpieee_flt(); #endif diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 4ba02bafdb..def5342252 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -376,6 +376,13 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API TRACE("Format is: %s\n", FUNC_NAME(debugstr)(fmt)); + if(!fmt) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + return -1; + } + if(!locale) locinfo = get_locinfo(); else -- 2.15.0

1 0

[PATCH] advapi32: Include <stdarg.h> since winbase.h expects va_list
by Gerald Pfeifer 25 Nov '17

25 Nov '17

The addition of dlls/advapi32/perf.c about a week ago broke my nightly FreeBSD builder as follows: In file included from perf.c:24: ../../include/windef.h:106:24: error: unknown type name ‘va_list’ # define __ms_va_list va_list ^~~~~~~ ../../include/winbase.h:2002:84: note: in expansion of macro ‘__ms_va_list’ in WINBASEAPI DWORD WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,DWORD,__ms_va_list*); This is a typical failure mode I've seen on FreeBSD, which is more parsimonious than GNU/Linux when it comes to include files pulling in others, though our peak with Wine running into this was more than a decade ago. ;-) Investigating this case a little I found that indeed winbase.h and in turn windef.h assume va_list is known and indeed many other files in dlls/advapi32 already include stdarg.h. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/advapi32/perf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/perf.c b/dlls/advapi32/perf.c index 754af2a89b..6712eae492 100644 --- a/dlls/advapi32/perf.c +++ b/dlls/advapi32/perf.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> #include <stdio.h> #include "windef.h" -- 2.15.0

1 0

[PATCH 1/2] ntdll: Implement set_cpu_context for ARM64
by André Hentschel 24 Nov '17

24 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/signal_arm64.c | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 5b3e887..50903a9 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -231,10 +231,43 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, * * Set the new CPU context. */ -static void set_cpu_context( const CONTEXT *context ) -{ - FIXME( "Not implemented on ARM64\n" ); -} +void set_cpu_context( const CONTEXT *context ); +__ASM_GLOBAL_FUNC( set_cpu_context, + "ldr x1, [x0, #0x10]\n\t" /* context->X1 */ + "ldr x2, [x0, #0x18]\n\t" /* context->X2 */ + "ldr x3, [x0, #0x20]\n\t" /* context->X3 */ + "ldr x4, [x0, #0x28]\n\t" /* context->X4 */ + "ldr x5, [x0, #0x30]\n\t" /* context->X5 */ + "ldr x6, [x0, #0x38]\n\t" /* context->X6 */ + "ldr x7, [x0, #0x40]\n\t" /* context->X7 */ + "ldr x8, [x0, #0x48]\n\t" /* context->X8 */ + "ldr x9, [x0, #0x50]\n\t" /* context->X9 */ + "ldr x10, [x0, #0x58]\n\t" /* context->X10 */ + "ldr x11, [x0, #0x60]\n\t" /* context->X11 */ + "ldr x12, [x0, #0x68]\n\t" /* context->X12 */ + "ldr x13, [x0, #0x70]\n\t" /* context->X13 */ + "ldr x14, [x0, #0x78]\n\t" /* context->X14 */ + "ldr x16, [x0, #0x88]\n\t" /* context->X16 */ + "ldr x17, [x0, #0x90]\n\t" /* context->X17 */ + "ldr x18, [x0, #0x98]\n\t" /* context->X18 */ + "ldr x19, [x0, #0xa0]\n\t" /* context->X19 */ + "ldr x20, [x0, #0xa8]\n\t" /* context->X20 */ + "ldr x21, [x0, #0xb0]\n\t" /* context->X21 */ + "ldr x22, [x0, #0xb8]\n\t" /* context->X22 */ + "ldr x23, [x0, #0xc0]\n\t" /* context->X23 */ + "ldr x24, [x0, #0xc8]\n\t" /* context->X24 */ + "ldr x25, [x0, #0xd0]\n\t" /* context->X25 */ + "ldr x26, [x0, #0xd8]\n\t" /* context->X26 */ + "ldr x27, [x0, #0xe0]\n\t" /* context->X27 */ + "ldr x28, [x0, #0xe8]\n\t" /* context->X28 */ + "ldr x29, [x0, #0xf0]\n\t" /* context->Fp */ + "ldr x30, [x0, #0xf8]\n\t" /* context->Lr */ + "ldr x15, [x0, #0x100]\n\t" /* context->Sp */ + "mov sp, x15\n\t" + "ldr x15, [x0, #0x108]\n\t" /* context->Pc */ + "ldr x0, [x0, #0x8]\n\t" /* context->X0 */ + "br x15\n\t" + ) /*********************************************************************** * copy_context -- 2.7.4

2 1

[PATCH 2/2] ntdll: Set the initial process context on ARM64
by André Hentschel 24 Nov '17

24 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/signal_arm64.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 50903a9..cfb13cf 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -915,7 +915,12 @@ void signal_init_process( CONTEXT *context, LPTHREAD_START_ROUTINE entry ) if (sigaction( SIGTRAP, &sig_act, NULL ) == -1) goto error; #endif - /* FIXME: set the initial context */ + /* set the initial context */ + context->ContextFlags = CONTEXT_FULL; + context->X0 = (ULONGLONG)kernel32_start_process; + context->X1 = (ULONGLONG)entry; + context->Sp = (ULONGLONG)NtCurrentTeb()->Tib.StackBase; + context->Pc = (ULONGLONG)call_thread_entry_point; return; error: -- 2.7.4

1 0

[PATCH] msvcrt: Added _get_purecall_handler()
by Nikolay Sivov 24 Nov '17

24 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For https://bugs.winehq.org/show_bug.cgi?id=44064 .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/exit.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 10 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 2ce5311e29..5e67f92d56 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -55,7 +55,7 @@ @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) ucrtbase._except_handler3 @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) ucrtbase._except_handler4_common -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() ucrtbase._get_purecall_handler @ cdecl _get_unexpected() ucrtbase._get_unexpected @ cdecl -arch=i386 _global_unwind2(ptr) ucrtbase._global_unwind2 @ stub _is_exception_typeof diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a04bedfbf8..685e11bd74 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -883,7 +883,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a0aebc047c..ae866784d6 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1230,7 +1230,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b7c31599c6..969451febc 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1230,7 +1230,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index cd8554c77e..8c3d96e41e 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1158,7 +1158,7 @@ @ cdecl _get_output_format() msvcr120._get_output_format @ cdecl _get_pgmptr(ptr) msvcr120._get_pgmptr @ cdecl _get_printf_count_output() msvcr120._get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() msvcr120._get_purecall_handler @ cdecl _get_terminate() msvcr120._get_terminate @ cdecl _get_timezone(ptr) msvcr120._get_timezone @ cdecl _get_tzname(ptr str long long) msvcr120._get_tzname diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d9c29fd09b..dd80131464 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -552,7 +552,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_sbh_threshold() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b76a353f52..4f67f1468e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -533,7 +533,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_sbh_threshold() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 1d190817df..44b29c133c 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -474,6 +474,15 @@ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler func return ret; } +/********************************************************************* + * _get_purecall_handler + */ +MSVCRT_purecall_handler CDECL _get_purecall_handler(void) +{ + TRACE("\n"); + return purecall_handler; +} + /********************************************************************* * _purecall (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a2c16e4e32..7878acbda8 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -372,7 +372,7 @@ @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) MSVCRT__get_stream_buffer_pointers @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_thread_local_invalid_parameter_handler() diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 7dbc8cab57..b2d11bc2b4 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -57,7 +57,7 @@ @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) ucrtbase._except_handler3 @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) ucrtbase._except_handler4_common -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() ucrtbase._get_purecall_handler @ cdecl _get_unexpected() ucrtbase._get_unexpected @ cdecl -arch=i386 _global_unwind2(ptr) ucrtbase._global_unwind2 @ stub _is_exception_typeof -- 2.15.0

2 1

[PATCH resend 1/5] makedep: Add build framework for building DLLs in test directories.
by Zebediah Figura 24 Nov '17

24 Nov '17

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Patch resent with configure changes. Changes from staging version: * use .cross.res extension for cross-compiled resource * use replace_extension() instead of defining a new function * use phony targets in the tests makefile so that the custom DLL is always built * enforce directory name the same way we do for other targets aclocal.m4 | 25 +++++++++ configure | 18 +++++++ tools/make_makefiles | 11 +++- tools/makedep.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 193 insertions(+), 3 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 9364188..a711b20 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -540,6 +540,22 @@ $ac_dir/crosstest: __builddeps__ dummy fi } +wine_fn_config_resource () +{ + ac_dir=$[1] + ac_name=$[2] + ac_flags=$[3] + + ac_clean= + test -n "$CROSSTARGET" && ac_clean=`expr $ac_dir/$ac_name : "\$.*\$\\."`_crossres.`expr $ac_name : ".*\\.\$.*\$"` + test -n "$DLLEXT" || ac_clean="$ac_dir/$ac_name" + + AS_VAR_IF([enable_tests],[no],[wine_fn_disabled_rules $ac_clean; return]) + + wine_fn_append_file SUBDIRS $ac_dir + wine_fn_clean_rules $ac_clean +} + wine_fn_config_tool () { ac_dir=$[1] @@ -643,6 +659,15 @@ wine_fn_config_test $1 ac_name[]ac_suffix [$2]dnl m4_popdef([ac_suffix])dnl m4_popdef([ac_name])]) +dnl **** Create a test resource makefile from config.status **** +dnl +dnl Usage: WINE_CONFIG_RESOURCE(dir,flags) +dnl +AC_DEFUN([WINE_CONFIG_RESOURCE],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl +m4_pushdef([ac_name],[m4_bpatsubst([$1],[.*/$[^/\]*$$],[\1])])dnl +wine_fn_config_resource $1 ac_name [$2]dnl +m4_popdef([ac_name])]) + dnl **** Create a static lib makefile from config.status **** dnl dnl Usage: WINE_CONFIG_LIB(name,flags) diff --git a/configure b/configure index 83f9b30..8ad89bd 100755 --- a/configure +++ b/configure @@ -8036,6 +8036,24 @@ $ac_dir/crosstest: __builddeps__ dummy fi } +wine_fn_config_resource () +{ + ac_dir=$1 + ac_name=$2 + ac_flags=$3 + + ac_clean= + test -n "$CROSSTARGET" && ac_clean=`expr $ac_dir/$ac_name : "\$.*\$\\."`_crossres.`expr $ac_name : ".*\\.\$.*\$"` + test -n "$DLLEXT" || ac_clean="$ac_dir/$ac_name" + + if test "x$enable_tests" = xno; then : + wine_fn_disabled_rules $ac_clean; return +fi + + wine_fn_append_file SUBDIRS $ac_dir + wine_fn_clean_rules $ac_clean +} + wine_fn_config_tool () { ac_dir=$1 diff --git a/tools/make_makefiles b/tools/make_makefiles index f57a7e2..44f0fc2 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -224,7 +224,7 @@ sub parse_makefile($) { die "Configure substitution is not allowed in $file" unless $file eq "Makefile"; } - if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE)\s*=\s*(.*)/) + if (/^\s*(MODULE|IMPORTLIB|TESTDLL|RESOURCE|PARENTSRC|APPMODE)\s*=\s*(.*)/) { my $var = $1; $make{$var} = $2; @@ -466,6 +466,15 @@ sub update_makefiles(@) (my $dir = $file) =~ s/^(.*)\/Makefile/$1/; push @lines, "WINE_CONFIG_TEST($dir$flag_args)\n"; } + elsif (defined($make{"RESOURCE"})) # test resource + { + die "MODULE should not be defined in $file" if defined $make{"MODULE"}; + die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; + (my $dir = $file) =~ s/^(.*)\/Makefile/$1/; + (my $name = $dir) =~ s/^.*\/(.*)$/$1/; + die "Invalid RESOURCE in $file" unless $make{"RESOURCE"} eq $name; + push @lines, "WINE_CONFIG_RESOURCE($dir$flag_args)\n"; + } elsif (defined($make{"MODULE"}) && $make{"MODULE"} =~ /\.a$/) # import lib { die "MODULE should not be defined as static lib in $file" unless $file =~ /^dlls\//; diff --git a/tools/makedep.c b/tools/makedep.c index ec339e0..afa061a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -174,6 +174,7 @@ struct makefile const char *parent_dir; const char *module; const char *testdll; + const char *resource; const char *sharedlib; const char *staticlib; const char *staticimplib; @@ -2345,6 +2346,7 @@ static struct strarray output_sources( const struct makefile *make ) struct strarray includes = empty_strarray; struct strarray phony_targets = empty_strarray; struct strarray all_targets = empty_strarray; + struct strarray resource_dlls = get_expanded_make_var_array( make, "RC_DLLS" ); struct strarray install_rules[NB_INSTALL_RULES]; char *ldrpath_local = get_expanded_make_variable( make, "LDRPATH_LOCAL" ); char *ldrpath_install = get_expanded_make_variable( make, "LDRPATH_INSTALL" ); @@ -2642,7 +2644,7 @@ static struct strarray output_sources( const struct makefile *make ) } else { - int need_cross = make->testdll || + int need_cross = make->testdll || make->resource || (source->file->flags & FLAG_C_IMPLIB) || (make->module && make->staticlib); @@ -2656,7 +2658,7 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames( includes ); output_filenames( make->define_args ); output_filenames( extradefs ); - if (make->module || make->staticlib || make->sharedlib || make->testdll) + if (make->module || make->staticlib || make->sharedlib || make->testdll || make->resource) { output_filenames( dll_flags ); if (make->use_msvcrt) output_filenames( msvcrt_flags ); @@ -2710,6 +2712,66 @@ static struct strarray output_sources( const struct makefile *make ) output( "\n" ); } + /* rules for resource dlls, call Makefile in subdirectory */ + + if (resource_dlls.count) + { + for (i = 0; i < resource_dlls.count; i++) + { + output( ".PHONY: %s\n", resource_dlls.str[i] ); + output( "%s:\n", resource_dlls.str[i] ); + output( "\t@cd %s && $(MAKE) %s%s\n", resource_dlls.str[i], + resource_dlls.str[i], dll_ext ); + } + + output( "%s:", obj_dir_path( make, "resource_dlls.res" )); + for (i = 0; i < resource_dlls.count; i++) + output( " %s", resource_dlls.str[i] ); + output( "\n" ); + output( "\t(" ); + for (i = 0; i < resource_dlls.count; i++) + { + if (i != 0) output( "; \\\n " ); + output( "echo \"%s RCDATA %s/%s%s\"", resource_dlls.str[i], + resource_dlls.str[i], resource_dlls.str[i], dll_ext ); + } + output( ") | %s -o $@\n", tools_path( make, "wrc" ) ); + strarray_add( &clean_files, "resource_dlls.res" ); + strarray_add( &object_files, "resource_dlls.res" ); + + if (crosstarget && (make->testdll || (make->module && make->staticlib))) + { + for (i = 0; i < resource_dlls.count; i++) + { + char *name = replace_extension( resource_dlls.str[i], ".dll", "_crossres.dll" ); + output( ".PHONY: %s/crossres\n", resource_dlls.str[i] ); + output( "%s/crossres:\n", resource_dlls.str[i] ); + output( "\t@cd %s && $(MAKE) %s\n", resource_dlls.str[i], name ); + free( name ); + } + + output( "%s:", obj_dir_path( make, "resource_dlls.cross.res" )); + for (i = 0; i < resource_dlls.count; i++) + { + char *name = replace_extension( resource_dlls.str[i], ".dll", "_crossres.dll" ); + output( " %s/crossres", resource_dlls.str[i] ); + free( name ); + } + output( "\n" ); + output( "\t(" ); + for (i = 0; i < resource_dlls.count; i++) + { + char *name = replace_extension( resource_dlls.str[i], ".dll", "_crossres.dll" ); + if (i != 0) output( "; \\\n " ); + output( "echo \"%s RCDATA %s/%s\"", resource_dlls.str[i], resource_dlls.str[i], name ); + free( name ); + } + output( ") | %s -o $@\n", tools_path( make, "wrc" ) ); + strarray_add( &clean_files, "resource_dlls.cross.res" ); + strarray_add( &crossobj_files, "resource_dlls.cross.res" ); + } + } + if (make->module && !make->staticlib) { struct strarray all_libs = empty_strarray; @@ -3101,6 +3163,81 @@ static struct strarray output_sources( const struct makefile *make ) add_install_rule( make, install_rules, make->scripts.str[i], make->scripts.str[i], strmake( "S$(bindir)/%s", make->scripts.str[i] )); + if (make->resource) + { + char *extra_wine_flags = get_expanded_make_variable( make, "WINEFLAGS" ); + char *extra_cross_flags = get_expanded_make_variable( make, "CROSSFLAGS" ); + struct strarray all_libs = empty_strarray; + char *module_path = obj_dir_path( make, make->resource ); + char *spec_file = NULL; + + if (!make->appmode.count) + spec_file = src_dir_path( make, replace_extension( make->resource, ".dll", ".spec" )); + for (i = 0; i < make->imports.count; i++) + strarray_add( &all_libs, strmake( "-l%s", make->imports.str[i] )); + strarray_addall( &all_libs, get_expanded_make_var_array( make, "LIBS" )); + + if (*dll_ext) + { + strarray_add( &all_targets, strmake( "%s%s", make->resource, dll_ext )); + strarray_add( &all_targets, strmake( "%s.fake", make->resource )); + output( "%s%s %s.fake:", module_path, dll_ext, module_path ); + } + else + { + strarray_add( &all_targets, make->resource ); + output( "%s:", module_path ); + } + if (spec_file) output_filename( spec_file ); + output_filenames_obj_dir( make, object_files ); + output_filenames_obj_dir( make, res_files ); + output( "\n" ); + output( "\t%s -o $@", tools_path( make, "winegcc" )); + output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); + output_filenames( target_flags ); + output_filenames( unwind_flags ); + if (spec_file) + { + output( " -shared %s", spec_file ); + output_filenames( make->extradllflags ); + } + else output_filenames( make->appmode ); + if (extra_wine_flags) output( " %s", extra_wine_flags ); + output_filenames_obj_dir( make, object_files ); + output_filenames_obj_dir( make, res_files ); + output_filenames( all_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); + + if (crosstarget) + { + char *crossres = replace_extension( make->resource, ".dll", "_crossres.dll" ); + + strarray_add( &clean_files, crossres ); + output( "%s:", obj_dir_path( make, crossres )); + output_filenames_obj_dir( make, crossobj_files ); + output_filenames_obj_dir( make, res_files ); + output( "\n" ); + output( "\t%s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); + output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); + output_filename( "--lib-suffix=.cross.a" ); + if (spec_file) + { + output( " -shared %s", spec_file ); + output_filenames( make->extradllflags ); + } + else output_filenames( make->appmode ); + if (extra_cross_flags) output( " %s", extra_cross_flags ); + output_filenames_obj_dir( make, crossobj_files ); + output_filenames_obj_dir( make, res_files ); + output_filenames( all_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); + } + } + if (!make->disabled) { if (all_targets.count) @@ -3476,6 +3613,7 @@ static void load_sources( struct makefile *make ) make->parent_dir = get_expanded_make_variable( make, "PARENTSRC" ); make->module = get_expanded_make_variable( make, "MODULE" ); make->testdll = get_expanded_make_variable( make, "TESTDLL" ); + make->resource = get_expanded_make_variable( make, "RESOURCE" ); make->sharedlib = get_expanded_make_variable( make, "SHAREDLIB" ); make->staticlib = get_expanded_make_variable( make, "STATICLIB" ); make->importlib = get_expanded_make_variable( make, "IMPORTLIB" ); -- 2.7.4

2 8

[PATCH 1/5] makedep: Add build framework for building DLLs in test directories.
by Zebediah Figura 24 Nov '17

24 Nov '17

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Changes from staging version: * use .cross.res extension for cross-compiled resource * use replace_extension() instead of defining a new function * use phony targets in the tests makefile so that the custom DLL is always built * enforce directory name the same way we do for other targets aclocal.m4 | 25 +++++++++ tools/make_makefiles | 11 +++- tools/makedep.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 175 insertions(+), 3 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 9364188..a711b20 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -540,6 +540,22 @@ $ac_dir/crosstest: __builddeps__ dummy fi } +wine_fn_config_resource () +{ + ac_dir=$[1] + ac_name=$[2] + ac_flags=$[3] + + ac_clean= + test -n "$CROSSTARGET" && ac_clean=`expr $ac_dir/$ac_name : "\$.*\$\\."`_crossres.`expr $ac_name : ".*\\.\$.*\$"` + test -n "$DLLEXT" || ac_clean="$ac_dir/$ac_name" + + AS_VAR_IF([enable_tests],[no],[wine_fn_disabled_rules $ac_clean; return]) + + wine_fn_append_file SUBDIRS $ac_dir + wine_fn_clean_rules $ac_clean +} + wine_fn_config_tool () { ac_dir=$[1] @@ -643,6 +659,15 @@ wine_fn_config_test $1 ac_name[]ac_suffix [$2]dnl m4_popdef([ac_suffix])dnl m4_popdef([ac_name])]) +dnl **** Create a test resource makefile from config.status **** +dnl +dnl Usage: WINE_CONFIG_RESOURCE(dir,flags) +dnl +AC_DEFUN([WINE_CONFIG_RESOURCE],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl +m4_pushdef([ac_name],[m4_bpatsubst([$1],[.*/$[^/\]*$$],[\1])])dnl +wine_fn_config_resource $1 ac_name [$2]dnl +m4_popdef([ac_name])]) + dnl **** Create a static lib makefile from config.status **** dnl dnl Usage: WINE_CONFIG_LIB(name,flags) diff --git a/tools/make_makefiles b/tools/make_makefiles index f57a7e2..44f0fc2 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -224,7 +224,7 @@ sub parse_makefile($) { die "Configure substitution is not allowed in $file" unless $file eq "Makefile"; } - if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE)\s*=\s*(.*)/) + if (/^\s*(MODULE|IMPORTLIB|TESTDLL|RESOURCE|PARENTSRC|APPMODE)\s*=\s*(.*)/) { my $var = $1; $make{$var} = $2; @@ -466,6 +466,15 @@ sub update_makefiles(@) (my $dir = $file) =~ s/^(.*)\/Makefile/$1/; push @lines, "WINE_CONFIG_TEST($dir$flag_args)\n"; } + elsif (defined($make{"RESOURCE"})) # test resource + { + die "MODULE should not be defined in $file" if defined $make{"MODULE"}; + die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; + (my $dir = $file) =~ s/^(.*)\/Makefile/$1/; + (my $name = $dir) =~ s/^.*\/(.*)$/$1/; + die "Invalid RESOURCE in $file" unless $make{"RESOURCE"} eq $name; + push @lines, "WINE_CONFIG_RESOURCE($dir$flag_args)\n"; + } elsif (defined($make{"MODULE"}) && $make{"MODULE"} =~ /\.a$/) # import lib { die "MODULE should not be defined as static lib in $file" unless $file =~ /^dlls\//; diff --git a/tools/makedep.c b/tools/makedep.c index ec339e0..afa061a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -174,6 +174,7 @@ struct makefile const char *parent_dir; const char *module; const char *testdll; + const char *resource; const char *sharedlib; const char *staticlib; const char *staticimplib; @@ -2345,6 +2346,7 @@ static struct strarray output_sources( const struct makefile *make ) struct strarray includes = empty_strarray; struct strarray phony_targets = empty_strarray; struct strarray all_targets = empty_strarray; + struct strarray resource_dlls = get_expanded_make_var_array( make, "RC_DLLS" ); struct strarray install_rules[NB_INSTALL_RULES]; char *ldrpath_local = get_expanded_make_variable( make, "LDRPATH_LOCAL" ); char *ldrpath_install = get_expanded_make_variable( make, "LDRPATH_INSTALL" ); @@ -2642,7 +2644,7 @@ static struct strarray output_sources( const struct makefile *make ) } else { - int need_cross = make->testdll || + int need_cross = make->testdll || make->resource || (source->file->flags & FLAG_C_IMPLIB) || (make->module && make->staticlib); @@ -2656,7 +2658,7 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames( includes ); output_filenames( make->define_args ); output_filenames( extradefs ); - if (make->module || make->staticlib || make->sharedlib || make->testdll) + if (make->module || make->staticlib || make->sharedlib || make->testdll || make->resource) { output_filenames( dll_flags ); if (make->use_msvcrt) output_filenames( msvcrt_flags ); @@ -2710,6 +2712,66 @@ static struct strarray output_sources( const struct makefile *make ) output( "\n" ); } + /* rules for resource dlls, call Makefile in subdirectory */ + + if (resource_dlls.count) + { + for (i = 0; i < resource_dlls.count; i++) + { + output( ".PHONY: %s\n", resource_dlls.str[i] ); + output( "%s:\n", resource_dlls.str[i] ); + output( "\t@cd %s && $(MAKE) %s%s\n", resource_dlls.str[i], + resource_dlls.str[i], dll_ext ); + } + + output( "%s:", obj_dir_path( make, "resource_dlls.res" )); + for (i = 0; i < resource_dlls.count; i++) + output( " %s", resource_dlls.str[i] ); + output( "\n" ); + output( "\t(" ); + for (i = 0; i < resource_dlls.count; i++) + { + if (i != 0) output( "; \\\n " ); + output( "echo \"%s RCDATA %s/%s%s\"", resource_dlls.str[i], + resource_dlls.str[i], resource_dlls.str[i], dll_ext ); + } + output( ") | %s -o $@\n", tools_path( make, "wrc" ) ); + strarray_add( &clean_files, "resource_dlls.res" ); + strarray_add( &object_files, "resource_dlls.res" ); + + if (crosstarget && (make->testdll || (make->module && make->staticlib))) + { + for (i = 0; i < resource_dlls.count; i++) + { + char *name = replace_extension( resource_dlls.str[i], ".dll", "_crossres.dll" ); + output( ".PHONY: %s/crossres\n", resource_dlls.str[i] ); + output( "%s/crossres:\n", resource_dlls.str[i] ); + output( "\t@cd %s && $(MAKE) %s\n", resource_dlls.str[i], name ); + free( name ); + } + + output( "%s:", obj_dir_path( make, "resource_dlls.cross.res" )); + for (i = 0; i < resource_dlls.count; i++) + { + char *name = replace_extension( resource_dlls.str[i], ".dll", "_crossres.dll" ); + output( " %s/crossres", resource_dlls.str[i] ); + free( name ); + } + output( "\n" ); + output( "\t(" ); + for (i = 0; i < resource_dlls.count; i++) + { + char *name = replace_extension( resource_dlls.str[i], ".dll", "_crossres.dll" ); + if (i != 0) output( "; \\\n " ); + output( "echo \"%s RCDATA %s/%s\"", resource_dlls.str[i], resource_dlls.str[i], name ); + free( name ); + } + output( ") | %s -o $@\n", tools_path( make, "wrc" ) ); + strarray_add( &clean_files, "resource_dlls.cross.res" ); + strarray_add( &crossobj_files, "resource_dlls.cross.res" ); + } + } + if (make->module && !make->staticlib) { struct strarray all_libs = empty_strarray; @@ -3101,6 +3163,81 @@ static struct strarray output_sources( const struct makefile *make ) add_install_rule( make, install_rules, make->scripts.str[i], make->scripts.str[i], strmake( "S$(bindir)/%s", make->scripts.str[i] )); + if (make->resource) + { + char *extra_wine_flags = get_expanded_make_variable( make, "WINEFLAGS" ); + char *extra_cross_flags = get_expanded_make_variable( make, "CROSSFLAGS" ); + struct strarray all_libs = empty_strarray; + char *module_path = obj_dir_path( make, make->resource ); + char *spec_file = NULL; + + if (!make->appmode.count) + spec_file = src_dir_path( make, replace_extension( make->resource, ".dll", ".spec" )); + for (i = 0; i < make->imports.count; i++) + strarray_add( &all_libs, strmake( "-l%s", make->imports.str[i] )); + strarray_addall( &all_libs, get_expanded_make_var_array( make, "LIBS" )); + + if (*dll_ext) + { + strarray_add( &all_targets, strmake( "%s%s", make->resource, dll_ext )); + strarray_add( &all_targets, strmake( "%s.fake", make->resource )); + output( "%s%s %s.fake:", module_path, dll_ext, module_path ); + } + else + { + strarray_add( &all_targets, make->resource ); + output( "%s:", module_path ); + } + if (spec_file) output_filename( spec_file ); + output_filenames_obj_dir( make, object_files ); + output_filenames_obj_dir( make, res_files ); + output( "\n" ); + output( "\t%s -o $@", tools_path( make, "winegcc" )); + output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); + output_filenames( target_flags ); + output_filenames( unwind_flags ); + if (spec_file) + { + output( " -shared %s", spec_file ); + output_filenames( make->extradllflags ); + } + else output_filenames( make->appmode ); + if (extra_wine_flags) output( " %s", extra_wine_flags ); + output_filenames_obj_dir( make, object_files ); + output_filenames_obj_dir( make, res_files ); + output_filenames( all_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); + + if (crosstarget) + { + char *crossres = replace_extension( make->resource, ".dll", "_crossres.dll" ); + + strarray_add( &clean_files, crossres ); + output( "%s:", obj_dir_path( make, crossres )); + output_filenames_obj_dir( make, crossobj_files ); + output_filenames_obj_dir( make, res_files ); + output( "\n" ); + output( "\t%s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); + output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); + output_filename( "--lib-suffix=.cross.a" ); + if (spec_file) + { + output( " -shared %s", spec_file ); + output_filenames( make->extradllflags ); + } + else output_filenames( make->appmode ); + if (extra_cross_flags) output( " %s", extra_cross_flags ); + output_filenames_obj_dir( make, crossobj_files ); + output_filenames_obj_dir( make, res_files ); + output_filenames( all_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); + } + } + if (!make->disabled) { if (all_targets.count) @@ -3476,6 +3613,7 @@ static void load_sources( struct makefile *make ) make->parent_dir = get_expanded_make_variable( make, "PARENTSRC" ); make->module = get_expanded_make_variable( make, "MODULE" ); make->testdll = get_expanded_make_variable( make, "TESTDLL" ); + make->resource = get_expanded_make_variable( make, "RESOURCE" ); make->sharedlib = get_expanded_make_variable( make, "SHAREDLIB" ); make->staticlib = get_expanded_make_variable( make, "STATICLIB" ); make->importlib = get_expanded_make_variable( make, "IMPORTLIB" ); -- 2.7.4

3 10

[PATCH] mshtml: Hook addEventListener InvokeEx calls to allow capture default value.
by Jacek Caban 24 Nov '17

24 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/dispex.c | 33 +++++++++++++++++++++++---------- dlls/mshtml/htmlelem.c | 7 +++++-- dlls/mshtml/htmlevent.c | 33 ++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 10 +++++++++- dlls/mshtml/tests/events.js | 13 +++++++------ 5 files changed, 76 insertions(+), 20 deletions(-)

1 0

Re: [PATCH 1/1] rasapi32: Add stub for RasGetConnectionStatistics
by Станислав Мотыльков 24 Nov '17

24 Nov '17

Hello! Any build logs available? Regards, Stas'M. On 11/23/17, Marvin <testbot(a)winehq.org> wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Build failure". > > This means that the patched code doesn't compile. It could also be > because you forgot to include some changes or new files required for > compilation, or that the patch causes compiler warnings (maintainer > mode implies -Werror). You need to resend a fixed patch. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email. >

2 2

[PATCH 1/1] rasapi32: Add stub for RasGetConnectionStatistics
by Станислав Мотыльков 24 Nov '17

24 Nov '17

Hello! I attached a patch for consideration. Regards, Stas'M.

2 7

[PATCH 3/3] advapi32: Fix size returned from ConvertStringSecurityDescriptorToSecurityDescriptor on 64-bit.
by Hans Leidekker 24 Nov '17

24 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- Fixes these failures: http://test.winehq.org/data/664e861cdafbf3e6b34a1dab9428d2c234a9eb80/linux_… Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 7281e01d79..f0c133ebb0 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4652,7 +4652,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( LPBYTE lpNext = NULL; DWORD len; - *cBytes = sizeof(SECURITY_DESCRIPTOR); + *cBytes = sizeof(SECURITY_DESCRIPTOR_RELATIVE); tok = heap_alloc( (lstrlenW(StringSecurityDescriptor) + 1) * sizeof(WCHAR)); -- 2.11.0

1 0

[PATCH 2/3] advapi32/tests: Add tests for MakeSelfRelativeSD.
by Hans Leidekker 24 Nov '17

24 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/tests/security.c | 48 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e86fe21fed..51dcf90851 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2731,12 +2731,12 @@ static void test_LookupAccountName(void) static void test_security_descriptor(void) { - SECURITY_DESCRIPTOR sd; + SECURITY_DESCRIPTOR sd, *sd_rel, *sd_rel2, *sd_abs; char buf[8192]; - DWORD size; + DWORD size, size_dacl, size_sacl, size_owner, size_group; BOOL isDefault, isPresent, ret; - PACL pacl; - PSID psid; + PACL pacl, dacl, sacl; + PSID psid, owner, group; SetLastError(0xdeadbeef); ret = InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION); @@ -2774,6 +2774,46 @@ static void test_security_descriptor(void) expect_eq(psid, NULL, PSID, "%p"); expect_eq(isDefault, FALSE, BOOL, "%d"); } + + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( + "O:SYG:S-1-5-21-93476-23408-4576D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)" + "(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)" + "(AU;NPSA;0x12019f;;;SU)", SDDL_REVISION_1, (void **)&sd_rel, NULL); + ok(ret, "got %u\n", GetLastError()); + + size = 0; + ret = MakeSelfRelativeSD(sd_rel, NULL, &size); + todo_wine ok(!ret && GetLastError() == ERROR_BAD_DESCRIPTOR_FORMAT, "got %u\n", GetLastError()); + + /* convert to absolute form */ + size = size_dacl = size_sacl = size_owner = size_group = 0; + ret = MakeAbsoluteSD(sd_rel, NULL, &size, NULL, &size_dacl, NULL, &size_sacl, NULL, &size_owner, NULL, + &size_group); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + sd_abs = HeapAlloc(GetProcessHeap(), 0, size + size_dacl + size_sacl + size_owner + size_group); + dacl = (PACL)(sd_abs + 1); + sacl = (PACL)((char *)dacl + size_dacl); + owner = (PSID)((char *)sacl + size_sacl); + group = (PSID)((char *)owner + size_owner); + ret = MakeAbsoluteSD(sd_rel, sd_abs, &size, dacl, &size_dacl, sacl, &size_sacl, owner, &size_owner, + group, &size_group); + ok(ret, "got %u\n", GetLastError()); + + size = 0; + ret = MakeSelfRelativeSD(sd_abs, NULL, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(size == 184, "got %u\n", size); + + size += 4; + sd_rel2 = HeapAlloc(GetProcessHeap(), 0, size); + ret = MakeSelfRelativeSD(sd_abs, sd_rel2, &size); + ok(ret, "got %u\n", GetLastError()); + ok(size == 188, "got %u\n", size); + + HeapFree(GetProcessHeap(), 0, sd_abs); + HeapFree(GetProcessHeap(), 0, sd_rel2); + LocalFree(sd_rel); } #define TEST_GRANTED_ACCESS(a,b) test_granted_access(a,b,0,__LINE__) -- 2.11.0

1 0

[PATCH 1/3] ntdll: Fix size returned from RtlMakeSelfRelativeSD on 64-bit.
by Hans Leidekker 24 Nov '17

24 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/sec.c | 1 + dlls/ntdll/tests/rtl.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 5c858b5bcb..02fc77dc1c 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -860,6 +860,7 @@ NTSTATUS WINAPI RtlMakeSelfRelativeSD( return STATUS_INVALID_PARAMETER; length = RtlLengthSecurityDescriptor(pAbs); + if (!(pAbs->Control & SE_SELF_RELATIVE)) length -= (sizeof(*pAbs) - sizeof(*pRel)); if (*lpdwBufferLength < length) { *lpdwBufferLength = length; diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 7333ab8935..2e3a7de75d 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -99,6 +99,8 @@ static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *); static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *); static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG); static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); +static NTSTATUS (WINAPI *pRtlMakeSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD); +static NTSTATUS (WINAPI *pRtlAbsoluteToSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PULONG); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -153,6 +155,8 @@ static void InitFunctionPtrs(void) pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread"); pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx"); pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); + pRtlMakeSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlMakeSelfRelativeSD"); + pRtlAbsoluteToSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlAbsoluteToSelfRelativeSD"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -2209,6 +2213,52 @@ static void test_LdrEnumerateLoadedModules(void) ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08x\n", status); } +static void test_RtlMakeSelfRelativeSD(void) +{ + char buf[sizeof(SECURITY_DESCRIPTOR_RELATIVE) + 4]; + SECURITY_DESCRIPTOR_RELATIVE *sd_rel = (SECURITY_DESCRIPTOR_RELATIVE *)buf; + SECURITY_DESCRIPTOR sd; + NTSTATUS status; + DWORD len; + + if (!pRtlMakeSelfRelativeSD || !pRtlAbsoluteToSelfRelativeSD) + { + win_skip( "RtlMakeSelfRelativeSD/RtlAbsoluteToSelfRelativeSD not available\n" ); + return; + } + + memset( &sd, 0, sizeof(sd) ); + sd.Revision = SECURITY_DESCRIPTOR_REVISION; + + len = 0; + status = pRtlMakeSelfRelativeSD( &sd, NULL, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "got %08x\n", status ); + ok( len == sizeof(*sd_rel), "got %u\n", len ); + + len += 4; + status = pRtlMakeSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_SUCCESS, "got %08x\n", status ); + ok( len == sizeof(*sd_rel) + 4, "got %u\n", len ); + + len = 0; + status = pRtlAbsoluteToSelfRelativeSD( &sd, NULL, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "got %08x\n", status ); + ok( len == sizeof(*sd_rel), "got %u\n", len ); + + len += 4; + status = pRtlAbsoluteToSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_SUCCESS, "got %08x\n", status ); + ok( len == sizeof(*sd_rel) + 4, "got %u\n", len ); + + sd.Control = SE_SELF_RELATIVE; + status = pRtlMakeSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_SUCCESS, "got %08x\n", status ); + ok( len == sizeof(*sd_rel) + 4, "got %u\n", len ); + + status = pRtlAbsoluteToSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_BAD_DESCRIPTOR_FORMAT, "got %08x\n", status ); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -2242,4 +2292,5 @@ START_TEST(rtl) test_RtlInitializeCriticalSectionEx(); test_RtlLeaveCriticalSection(); test_LdrEnumerateLoadedModules(); + test_RtlMakeSelfRelativeSD(); } -- 2.11.0

1 0

[Tools] testbot: Improve the $VM::GetHost() documentation.
by Francois Gouget 24 Nov '17

24 Nov '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 7bd6d64b..b9313429 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -179,7 +179,9 @@ sub GetHost($) { my ($self) = @_; - # The URI is of the form protocol://user@hostname/hypervisor-specific-data + # VirtURI is of the form proto://user@hostname:port/hypervisor-specific-data + # This returns the 'hostname:port' part. Note that the port can be used to + # tunnel connections to different VM hosts and thus must be included. return $1 if ($self->VirtURI =~ m%^[^:]+://(?:[^/@]*@)?([^/]+)/%); return "localhost"; } -- 2.15.0

1 0

[Tools] testbot: Fix the $Tunnel configuration setting prefix.
by Francois Gouget 24 Nov '17

24 Nov '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl index 1b1a62ef..6ac6b44c 100644 --- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl +++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl @@ -90,7 +90,7 @@ $WineTestBot::Config::AgentPort = undef; # - If set to an SSH URI, then tunneling is performed using these parameters. # - Any other setting disables SSH tunneling. In particular to disable # tunneling for SSH VirtURIs it is recommended to set this to 'never'. -$Tunnel = undef; +$WineTestBot::Config::Tunnel = undef; # If set this specifies the SSH tunnel parameters to be used for the # TestAgent connection. This is mostly useful for parameters that cannot be -- 2.15.0

1 0

[Tools] testbot: Don't check idle and off VMs on the Engine shutdown.
by Francois Gouget 24 Nov '17

24 Nov '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 598d2bd7..ad492f61 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -96,9 +96,9 @@ In all other cases the VM is powered off and marked as such. =back =cut -sub Cleanup(;$$) +sub Cleanup($;$$) { - my ($KillTasks, $KillVMs) = @_; + my ($Starting, $KillTasks, $KillVMs) = @_; # Verify that the running tasks are still alive and requeue them if not. # Ignore the Job and Step status fields because they may be a bit out of date. @@ -128,7 +128,7 @@ sub Cleanup(;$$) } elsif ($KillTasks) { - # We will kill the Task's process so requeue the Task. + # We will kill the child process so requeue the Task. $Requeue = 1; } else @@ -193,7 +193,7 @@ sub Cleanup(;$$) } # else let the process finish its work } - else + elsif ($Starting) { if ($VM->Status eq "idle") { @@ -241,7 +241,7 @@ sub HandleShutdown($$) return "0Invalid KillVMs shutdown parameter\n"; } - Cleanup($KillTasks, $KillVMs); + Cleanup(0, $KillTasks, $KillVMs); $RunEngine = 0; LogMsg "Waiting for the last clients to disconnect...\n"; @@ -715,7 +715,7 @@ sub main() LogMsg "Capping MaxRevertsWhileRunningVMs to MaxRevertingVMs ($MaxRevertsWhileRunningVMs)\n"; } $MaxVMsWhenIdle ||= $MaxActiveVMs; - Cleanup(); + Cleanup(1); # Check for patches that arrived while the server was off. HandleWinePatchMLSubmission(); -- 2.15.0

1 0

[PATCH 1/4] wined3d: Fix SM4 discard_z instruction.
by Józef Kucia 24 Nov '17

24 Nov '17

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=43131 --- 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 0ff9ee44bb26..31810d6ddf29 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6606,10 +6606,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 3707d1587f9d..c4eed76d78f0 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 a04debe264d9..2665a67b80a6 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"}, -- 2.13.6

2 4

[PATCH 1/2] d3d11: Test shader class instance count
by Lucian Poston 23 Nov '17

23 Nov '17

https://bugs.winehq.org/show_bug.cgi?id=44052 Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 59f2e6ef9f..615d7c1096 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -8622,7 +8622,7 @@ static void test_clear_state(void) UINT sample_mask; UINT stencil_ref; ULONG refcount; - UINT count, i; + UINT count, i, instance_count; HRESULT hr; device_desc.feature_level = &feature_level; @@ -8653,8 +8653,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, &instance_count); ok(!tmp_vs, "Got unexpected vertex shader %p.\n", tmp_vs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_HSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -8672,8 +8675,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, &instance_count); ok(!tmp_hs, "Got unexpected hull shader %p.\n", tmp_hs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_DSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -8691,8 +8697,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, &instance_count); ok(!tmp_ds, "Got unexpected domain shader %p.\n", tmp_ds); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_GSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -8710,8 +8719,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, &instance_count); ok(!tmp_gs, "Got unexpected geometry shader %p.\n", tmp_gs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_PSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -8730,8 +8742,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, &instance_count); ok(!tmp_ps, "Got unexpected pixel shader %p.\n", tmp_ps); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -8750,8 +8765,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, &instance_count); ok(!tmp_cs, "Got unexpected compute shader %p.\n", tmp_cs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetUnorderedAccessViews(context, 0, D3D11_PS_CS_UAV_REGISTER_COUNT, tmp_uav); for (i = 0; i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) { -- 2.13.6

1 1

[PATCH 3/3] mshtml: Added IHTMLDOMNode3::compareDocumentPosition implementation.
by Jacek Caban 23 Nov '17

23 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlnode.c | 21 +++++++++++++++++++-- dlls/mshtml/tests/elements.js | 27 ++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 3 deletions(-)

1 0

[PATCH 2/3] mshtml: Store task_magic in HTMLDocumentObj instead of HTMLDocument.
by Jacek Caban 23 Nov '17

23 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/editor.c | 2 +- dlls/mshtml/htmldoc.c | 14 ++++---------- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/persist.c | 4 ++-- 4 files changed, 8 insertions(+), 15 deletions(-)

1 0

[PATCH 1/3] mshtml: Removed no longer needed flush_pending_tasks.
by Jacek Caban 23 Nov '17

23 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsevents.c | 2 -- dlls/mshtml/task.c | 19 ------------------- 3 files changed, 22 deletions(-)

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 23 Nov '17

23 Nov '17

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 58 +++++++++++++--------------------------------------------- 1 file changed, 13 insertions(+), 45 deletions(-) diff --git a/po/fi.po b/po/fi.po index 1056482d06..e6df9dedf3 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8914,10 +8914,8 @@ msgid " sec" msgstr " s" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Valitse kansio" +msgstr "Valitse lähde" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -10576,6 +10574,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Luo symbolinen linkki.\n" +"\n" +"Syntaksi: MKLINK [valitsimet] linkin_nimi kohde\n" +"\n" +"Valitsimet:\n" +"/d Luo symbolinen linkki hakemistoon.\n" +"/h Luo kova linkki.\n" +"/j Luo hakemistoliitos.\n" +"linkin_nimi on uuden symbolisen linkin nimi.\n" +"kohde on polku, johon linkki osoittaa.\n" #: cmd.rc:312 msgid "" @@ -10586,47 +10594,6 @@ msgstr "" "komentoriville, jolta kutsuit cmd:tä.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10685,6 +10652,7 @@ msgstr "" "FTYPE\t\tNäytä tai muuta tiedostotyyppeihin liitettyjä avoimia komentoja\n" "HELP\t\tNäytä aiheeseen liittyviä lyhyitä yksityiskohtia\n" "MD (MKDIR)\tLuo alihakemisto\n" +"MKLINK\t\tLuo symbolinen linkki\n" "MORE\t\tNäytä tuloste sivuina\n" "MOVE\t\tSiirrä tiedostoa, tiedostojoukkoa tai hakemistopuuta\n" "PATH\t\tAseta tai näytä hakupolku\n" @@ -14961,7 +14929,7 @@ msgstr "Miinoja" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Kaikki tulokset hävitetään. Oletko varma?" #: winemine.rc:30 msgid "WineMine" -- 2.15.0

1 0

[PATCH] regedit: Do not abort if the /m switch is used
by Hugh McMaster 23 Nov '17

23 Nov '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/regedit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 2d724f9bdf..fe0163c56e 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -209,6 +209,7 @@ BOOL ProcessCmdLine(WCHAR *cmdline) break; case 'C': case 'L': + case 'M': case 'R': /* unhandled */; break; -- 2.15.0

1 0

[PATCH] reg/tests: Properly escape the backslashes in an export test
by Hugh McMaster 23 Nov '17

23 Nov '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e0ff5f0e55..0bab8bc2af 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4391,7 +4391,7 @@ static void test_export(void) run_reg_exe("reg export /?", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg export \\remote-pc\\HKLM\\Wine file.reg", &r); + run_reg_exe("reg export \\\\remote-pc\\HKLM\\Wine file.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg export HKEY_DYN_DATA file.reg", &r); -- 2.15.0

1 0

[PATCH] kernel32: Adjust data directories in UpdateResource API.
by David Collett 23 Nov '17

23 Nov '17

When adding resources to a PE file using the UpdateResource API and the resource section is not the last section (i.e. we had to move existing sections), ensure any data directory entries pointing into moved sections is adjusted. Fixes issue where binaries commonly have relocations section after the resource section. If the resources section is extended, the base relocations data directory entry will no longer be valid and the binary will fail to be loaded (assuming relocation is required). Signed-off-by: David Collett <david.collett(a)gmail.com> --- dlls/kernel32/resource.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index c88c921..d526b39 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -1615,15 +1615,29 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) sec->SizeOfRawData = section_size; sec->Misc.VirtualSize = virtual_section_size; if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) { + DWORD i; nt64->OptionalHeader.SizeOfImage += rva_delta; nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; nt64->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + + for (i=0; i<nt64->OptionalHeader.NumberOfRvaAndSizes; i++) { + if (nt64->OptionalHeader.DataDirectory[i].VirtualAddress > sec->VirtualAddress) { + nt64->OptionalHeader.DataDirectory[i].VirtualAddress += rva_delta; + } + } } else { + DWORD i; nt->OptionalHeader.SizeOfImage += rva_delta; nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; nt->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + + for (i=0; i<nt->OptionalHeader.NumberOfRvaAndSizes; i++) { + if (nt->OptionalHeader.DataDirectory[i].VirtualAddress > sec->VirtualAddress) { + nt->OptionalHeader.DataDirectory[i].VirtualAddress += rva_delta; + } + } } } -- 2.7.4

1 0

[v2 PATCH 0/6] Add d2d device context
by Lucian Poston 23 Nov '17

23 Nov '17

The final 6/6 patch with ID2D1Bitmap1 implementation will come later once these first ones are ready. Changes since v1, * Fixed idl issues pointed out by nsivov. * Squashed stub and implementation patches together into one commit. * Reorganized patch series so that each patch individually passes tests. * Switched internal implementations to use ID2D1Factory1 e.g. in geometry.c. * In test, replaced d3d11 device with d3d10 in order to reuse existing helper functions in other d2d1 tests, as requested in v1 review. * Removed NULL checks as requested in v1 review. * Reordered interface conditional check in QueryInterface per v1 review. * Renamed several identifiers as requested in v1 review. Lucian Poston (5): d2d1: Add d2d1_1.idl d2d1: Add test that draws using d2d device context d2d1: Stub ID2D1Factory1 d2d1: Partially implement ID2D1Device d2d1: Partially implement ID2D1DeviceContext dlls/d2d1/Makefile.in | 2 + dlls/d2d1/d2d1_private.h | 36 +- dlls/d2d1/device.c | 191 +++++++ dlls/d2d1/device_context.c | 1180 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/factory.c | 193 ++++++-- dlls/d2d1/geometry.c | 30 +- dlls/d2d1/render_target.c | 82 ++- dlls/d2d1/tests/d2d1.c | 105 ++++ dlls/uuid/d2d.c | 1 + include/Makefile.in | 1 + include/d2d1_1.idl | 655 ++++++++++++++++++++++++ include/dcommon.idl | 15 + 12 files changed, 2420 insertions(+), 71 deletions(-) create mode 100644 dlls/d2d1/device.c create mode 100644 dlls/d2d1/device_context.c create mode 100644 include/d2d1_1.idl -- 2.13.6

2 9

[PATCH] user32: Reimplement TrackMouseEvent.
by Rafał Harabień 22 Nov '17

22 Nov '17

Improvements: - Don't use timer for TME_LEAVE and react immediately on mouse motion. It improves user experience for controls depending on this API like toolbar. - Fail when called with invalid flags - Hold tracking info for each win32 thread independently - Merge tracking requests if possible (leave+hover) - Return hover time 0 when hover tracking is disabled Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/user32/input.c | 228 ++++++++++++++++++++++++--------------------- dlls/user32/message.c | 5 + dlls/user32/tests/msg.c | 165 ++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 11 +++ dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 29 ++++++ dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + 8 files changed, 335 insertions(+), 108 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index c475b19..82c1d4f 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1243,48 +1243,59 @@ BOOL WINAPI UnloadKeyboardLayout(HKL hkl) return USER_Driver->pUnloadKeyboardLayout(hkl); } -typedef struct __TRACKINGLIST { - TRACKMOUSEEVENT tme; - POINT pos; /* center of hover rectangle */ -} _TRACKINGLIST; -/* FIXME: move tracking stuff into a per thread data */ -static _TRACKINGLIST tracking_info; -static UINT_PTR timer; +void maybe_clean_tracking_info(struct tracking_info *tracking_info) +{ + if (!(tracking_info->tme.dwFlags & (TME_HOVER | TME_LEAVE))) + { + tracking_info->tme.hwndTrack = 0; + tracking_info->tme.dwFlags = 0; + } + if (!(tracking_info->tme.dwFlags & TME_HOVER)) + tracking_info->tme.dwHoverTime = 0; +} -static void check_mouse_leave(HWND hwnd, int hittest) +void check_mouse_leave(HWND hwnd, int hittest) { - if (tracking_info.tme.hwndTrack != hwnd) + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; + + TRACE("hwnd %p hittest %d\n", hwnd, hittest); + + if (!(tracking_info->tme.dwFlags & TME_LEAVE)) + return; + + if (tracking_info->tme.hwndTrack != hwnd) { - if (tracking_info.tme.dwFlags & TME_NONCLIENT) - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + if (tracking_info->tme.dwFlags & TME_NONCLIENT) + PostMessageW(tracking_info->tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); else - PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0); + PostMessageW(tracking_info->tme.hwndTrack, WM_MOUSELEAVE, 0, 0); /* remove the TME_LEAVE flag */ - tracking_info.tme.dwFlags &= ~TME_LEAVE; + tracking_info->tme.dwFlags &= ~TME_LEAVE; } else { if (hittest == HTCLIENT) { - if (tracking_info.tme.dwFlags & TME_NONCLIENT) + if (tracking_info->tme.dwFlags & TME_NONCLIENT) { - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + PostMessageW(tracking_info->tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); /* remove the TME_LEAVE flag */ - tracking_info.tme.dwFlags &= ~TME_LEAVE; + tracking_info->tme.dwFlags &= ~TME_LEAVE; } } else { - if (!(tracking_info.tme.dwFlags & TME_NONCLIENT)) + if (!(tracking_info->tme.dwFlags & TME_NONCLIENT)) { - PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0); + PostMessageW(tracking_info->tme.hwndTrack, WM_MOUSELEAVE, 0, 0); /* remove the TME_LEAVE flag */ - tracking_info.tme.dwFlags &= ~TME_LEAVE; + tracking_info->tme.dwFlags &= ~TME_LEAVE; } } } + maybe_clean_tracking_info(tracking_info); } static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, @@ -1292,6 +1303,7 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, { POINT pos; INT hoverwidth = 0, hoverheight = 0, hittest; + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; TRACE("hwnd %p, msg %04x, id %04lx, time %u\n", hwnd, uMsg, idEvent, dwTime); @@ -1304,31 +1316,24 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, SystemParametersInfoW(SPI_GETMOUSEHOVERHEIGHT, 0, &hoverheight, 0); TRACE("tracked pos %s, current pos %s, hover width %d, hover height %d\n", - wine_dbgstr_point(&tracking_info.pos), wine_dbgstr_point(&pos), + wine_dbgstr_point(&tracking_info->pos), wine_dbgstr_point(&pos), hoverwidth, hoverheight); - /* see if this tracking event is looking for TME_LEAVE and that the */ - /* mouse has left the window */ - if (tracking_info.tme.dwFlags & TME_LEAVE) - { - check_mouse_leave(hwnd, hittest); - } - - if (tracking_info.tme.hwndTrack != hwnd) + if (tracking_info->tme.hwndTrack != hwnd) { /* mouse is gone, stop tracking mouse hover */ - tracking_info.tme.dwFlags &= ~TME_HOVER; + tracking_info->tme.dwFlags &= ~TME_HOVER; } /* see if we are tracking hovering for this hwnd */ - if (tracking_info.tme.dwFlags & TME_HOVER) + if (tracking_info->tme.dwFlags & TME_HOVER) { /* has the cursor moved outside the rectangle centered around pos? */ - if ((abs(pos.x - tracking_info.pos.x) > (hoverwidth / 2)) || - (abs(pos.y - tracking_info.pos.y) > (hoverheight / 2))) + if ((abs(pos.x - tracking_info->pos.x) > (hoverwidth / 2)) || + (abs(pos.y - tracking_info->pos.y) > (hoverheight / 2))) { /* record this new position as the current position */ - tracking_info.pos = pos; + tracking_info->pos = pos; } else { @@ -1337,29 +1342,88 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, ScreenToClient(hwnd, &pos); TRACE("client cursor pos %s\n", wine_dbgstr_point(&pos)); - PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSEHOVER, + PostMessageW(tracking_info->tme.hwndTrack, WM_MOUSEHOVER, get_key_state(), MAKELPARAM( pos.x, pos.y )); } else { - if (tracking_info.tme.dwFlags & TME_NONCLIENT) - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSEHOVER, + if (tracking_info->tme.dwFlags & TME_NONCLIENT) + PostMessageW(tracking_info->tme.hwndTrack, WM_NCMOUSEHOVER, hittest, MAKELPARAM( pos.x, pos.y )); } /* stop tracking mouse hover */ - tracking_info.tme.dwFlags &= ~TME_HOVER; + tracking_info->tme.dwFlags &= ~TME_HOVER; } } /* stop the timer if the tracking list is empty */ - if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) + if (!(tracking_info->tme.dwFlags & TME_HOVER)) { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; + KillSystemTimer(tracking_info->tme.hwndTrack, tracking_info->timer); + tracking_info->timer = 0; + } + maybe_clean_tracking_info(tracking_info); +} + +void track_mouse_event_internal(HWND hwnd_track, DWORD flags, DWORD hover_time) +{ + HWND hwnd; + POINT pos; + INT hittest; + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; + + if (flags & TME_HOVER) + { + /* if HOVER_DEFAULT was specified replace this with the system's current value. + * TME_LEAVE doesn't need to specify hover time so use default */ + if (hover_time == HOVER_DEFAULT || hover_time == 0) + SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); + } + else + hover_time = 0; + + if (flags & TME_CANCEL) + { + if (tracking_info->tme.hwndTrack == hwnd_track) + { + /* cancel old tracking request */ + tracking_info->tme.dwFlags &= ~(flags & ~TME_CANCEL); + + /* if we aren't tracking on hover or leave remove this entry */ + if (!(tracking_info->tme.dwFlags & TME_HOVER) && tracking_info->timer) + { + KillSystemTimer(tracking_info->tme.hwndTrack, tracking_info->timer); + tracking_info->timer = 0; + } + maybe_clean_tracking_info(tracking_info); + } + } else { + GetCursorPos(&pos); + hwnd = WINPOS_WindowFromPoint(hwnd_track, pos, &hittest); + TRACE("point %s hwnd %p hittest %d\n", wine_dbgstr_point(&pos), hwnd, hittest); + + if (hwnd_track != hwnd) + PostMessageW(hwnd_track, WM_MOUSELEAVE, 0, 0); + else + { + /* save tracking request */ + tracking_info->tme.hwndTrack = hwnd_track; + tracking_info->tme.dwFlags |= flags; + if (flags & TME_HOVER) + tracking_info->tme.dwHoverTime = hover_time; + + /* Initialize HoverInfo variables even if not hover tracking */ + tracking_info->pos = pos; + + if (flags & TME_HOVER) + { + /* recreate timer */ + if (tracking_info->timer) + KillSystemTimer(tracking_info->tme.hwndTrack, tracking_info->timer); + tracking_info->timer = SetSystemTimer(tracking_info->tme.hwndTrack, (UINT_PTR)&tracking_info->tme, hover_time, TrackMouseEventProc); + } + } } } @@ -1391,8 +1455,9 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) { HWND hwnd; POINT pos; - DWORD hover_time; + DWORD hover_time, invalid_flags; INT hittest; + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; TRACE("%x, %x, %p, %u\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); @@ -1402,10 +1467,18 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) return FALSE; } + invalid_flags = ptme->dwFlags & ~(TME_QUERY | TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT); + if (invalid_flags != 0) + { + WARN("Unknown flag(s) %08x\n", invalid_flags); + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + /* fill the TRACKMOUSEEVENT struct with the current tracking for the given hwnd */ - if (ptme->dwFlags & TME_QUERY ) + if (ptme->dwFlags & TME_QUERY) { - *ptme = tracking_info.tme; + *ptme = tracking_info->tme; /* set cbSize in the case it's not initialized yet */ ptme->cbSize = sizeof(TRACKMOUSEEVENT); @@ -1418,68 +1491,11 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) return FALSE; } - hover_time = (ptme->dwFlags & TME_HOVER) ? ptme->dwHoverTime : HOVER_DEFAULT; - - /* if HOVER_DEFAULT was specified replace this with the system's current value. - * TME_LEAVE doesn't need to specify hover time so use default */ - if (hover_time == HOVER_DEFAULT || hover_time == 0) - SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); - - GetCursorPos(&pos); - hwnd = WINPOS_WindowFromPoint(ptme->hwndTrack, pos, &hittest); - TRACE("point %s hwnd %p hittest %d\n", wine_dbgstr_point(&pos), hwnd, hittest); - - if (ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)) - FIXME("Unknown flag(s) %08x\n", ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)); - - if (ptme->dwFlags & TME_CANCEL) - { - if (tracking_info.tme.hwndTrack == ptme->hwndTrack) - { - tracking_info.tme.dwFlags &= ~(ptme->dwFlags & ~TME_CANCEL); - - /* if we aren't tracking on hover or leave remove this entry */ - if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) - { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; - } - } - } else { - /* In our implementation it's possible that another window will receive a - * WM_MOUSEMOVE and call TrackMouseEvent before TrackMouseEventProc is - * called. In such a situation post the WM_MOUSELEAVE now */ - if (tracking_info.tme.dwFlags & TME_LEAVE && tracking_info.tme.hwndTrack != NULL) - check_mouse_leave(hwnd, hittest); - - if (timer) - { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; - } - - if (ptme->hwndTrack == hwnd) - { - /* Adding new mouse event to the tracking list */ - tracking_info.tme = *ptme; - tracking_info.tme.dwHoverTime = hover_time; - - /* Initialize HoverInfo variables even if not hover tracking */ - tracking_info.pos = pos; - - timer = SetSystemTimer(tracking_info.tme.hwndTrack, (UINT_PTR)&tracking_info.tme, hover_time, TrackMouseEventProc); - } - } - - return TRUE; + /* use internal message to get access to user_thread_info for tracked window */ + return SendNotifyMessageW(ptme->hwndTrack, WM_WINE_TRACKMOUSEEVENT, ptme->dwFlags, ptme->dwHoverTime); } + /*********************************************************************** * GetMouseMovePointsEx [USER32] * diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 406eff3..21710c3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1888,6 +1888,9 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return USER_Driver->pClipCursor( &rect ); } return USER_Driver->pClipCursor( NULL ); + case WM_WINE_TRACKMOUSEEVENT: + track_mouse_event_internal(hwnd, (DWORD)wparam, (DWORD)lparam); + return 0; default: if (msg >= WM_WINE_FIRST_DRIVER_MSG && msg <= WM_WINE_LAST_DRIVER_MSG) return USER_Driver->pWindowMessage( hwnd, msg, wparam, lparam ); @@ -2503,6 +2506,8 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H else { msg->hwnd = WINPOS_WindowFromPoint( msg->hwnd, msg->pt, &hittest ); + /* TrackMouseEvent support */ + check_mouse_leave(msg->hwnd, hittest); } if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd )) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 64c7967..3d4d7b0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7817,6 +7817,18 @@ static DWORD WINAPI thread_proc(void *param) while (GetMessageA(&msg, 0, 0, 0)) { + if ((msg.message == WM_TIMER || msg.message == WM_SYSTIMER) && msg.lParam) + { + struct recvd_message s_msg; + + s_msg.hwnd = msg.hwnd; + s_msg.message = msg.message; + s_msg.flags = sent|wparam|lparam; + s_msg.wParam = msg.wParam; + s_msg.lParam = msg.lParam; + s_msg.descr = "msg_loop"; + add_message(&s_msg); + } TranslateMessage(&msg); DispatchMessageA(&msg); } @@ -11938,6 +11950,11 @@ static const struct message WmMouseHoverSeq[] = { { 0 } }; +static const struct message WmMouseLeaveSeq[] = { + { WM_MOUSELEAVE, sent|wparam, 0 }, + { 0 } +}; + static void pump_msg_loop_timeout(DWORD timeout, BOOL inject_mouse_move) { MSG msg; @@ -11989,6 +12006,9 @@ static void test_TrackMouseEvent(void) HWND hwnd, hchild; RECT rc_parent, rc_child; UINT default_hover_time, hover_width = 0, hover_height = 0; + struct wnd_event wnd_event; + HANDLE hthread; + DWORD tid; #define track_hover(track_hwnd, track_hover_time) \ tme.cbSize = sizeof(tme); \ @@ -11999,6 +12019,15 @@ static void test_TrackMouseEvent(void) ret = pTrackMouseEvent(&tme); \ ok(ret, "TrackMouseEvent(TME_HOVER) error %d\n", GetLastError()) +#define track_leave(track_hwnd) \ + tme.cbSize = sizeof(tme); \ + tme.dwFlags = TME_LEAVE; \ + tme.hwndTrack = track_hwnd; \ + tme.dwHoverTime = 0xdeadbeef; \ + SetLastError(0xdeadbeef); \ + ret = pTrackMouseEvent(&tme); \ + ok(ret, "TrackMouseEvent(TME_LEAVE) error %d\n", GetLastError()); + #define track_query(expected_track_flags, expected_track_hwnd, expected_hover_time) \ tme.cbSize = sizeof(tme); \ tme.dwFlags = TME_QUERY; \ @@ -12024,6 +12053,15 @@ static void test_TrackMouseEvent(void) ret = pTrackMouseEvent(&tme); \ ok(ret, "TrackMouseEvent(TME_HOVER | TME_CANCEL) error %d\n", GetLastError()) +#define track_leave_cancel(track_hwnd) \ + tme.cbSize = sizeof(tme); \ + tme.dwFlags = TME_LEAVE | TME_CANCEL; \ + tme.hwndTrack = track_hwnd; \ + tme.dwHoverTime = 0xdeadbeef; \ + SetLastError(0xdeadbeef); \ + ret = pTrackMouseEvent(&tme); \ + ok(ret, "TrackMouseEvent(TME_LEAVE | TME_CANCEL) error %d\n", GetLastError()) + default_hover_time = 0xdeadbeef; SetLastError(0xdeadbeef); ret = SystemParametersInfoA(SPI_GETMOUSEHOVERTIME, 0, &default_hover_time, 0); @@ -12090,6 +12128,17 @@ static void test_TrackMouseEvent(void) ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || broken(GetLastError() == 0xdeadbeef), "not expected error %u\n", GetLastError()); + /* Invalid flags */ + tme.cbSize = sizeof(tme); + tme.dwFlags = ~TME_CANCEL; + tme.hwndTrack = hwnd; + tme.dwHoverTime = HOVER_DEFAULT; + SetLastError(0xdeadbeef); + ret = pTrackMouseEvent(&tme); + ok(!ret, "TrackMouseEvent should fail\n"); + ok(GetLastError() == ERROR_INVALID_FLAGS, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + GetWindowRect(hwnd, &rc_parent); GetWindowRect(hchild, &rc_child); SetCursorPos(rc_child.left - 10, rc_child.top - 10); @@ -12159,11 +12208,127 @@ static void test_TrackMouseEvent(void) track_query(TME_HOVER, hwnd, default_hover_time); track_hover_cancel(hwnd); + /* cursor is over child window */ + mouse_event(MOUSEEVENTF_MOVE, 20, 20, 0, 0); /* rc_child.left + 10, rc_child.top + 10 */ + flush_events(); + flush_sequence(); + + /* cancel TME_LEAVE */ + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(TME_LEAVE, hchild, 0); + track_leave_cancel(hchild); + track_query(0, NULL, 0); + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE); + + /* requests for the same window are merged */ + track_hover(hchild, HOVER_DEFAULT); + track_query(TME_HOVER, hchild, default_hover_time); + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(TME_LEAVE|TME_HOVER, hchild, default_hover_time); + track_hover_cancel(hchild); + track_query(TME_LEAVE, hchild, 0); + /* TME_LEAVE for window not being under cursor doesn't change TME_QUERY result */ + track_leave(hwnd); + track_query(TME_LEAVE, hchild, 0); + track_leave_cancel(hchild); + track_query(0, 0, 0); + flush_events(); + flush_sequence(); + + /* try changing hover time */ + track_hover(hchild, 0); + track_query(TME_HOVER, hchild, default_hover_time); + track_hover(hchild, 1); + track_query(TME_HOVER, hchild, 1); + track_hover(hchild, HOVER_DEFAULT); + track_query(TME_HOVER, hchild, default_hover_time); + track_hover(hchild, default_hover_time*2); + track_query(TME_HOVER, hchild, default_hover_time*2); + track_hover_cancel(hchild); + + /* test TME_LEAVE */ + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(TME_LEAVE, hchild, 0); + ok(!GetCapture(), "expected NULL\n"); + mouse_event(MOUSEEVENTF_MOVE, -20, 0, 0, 0); /* rc_child.left - 10, rc_child.top + 10 */ + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + track_query(0, NULL, 0); + + /* window is not under cursor - immediate WM_MOUSELEAVE is expected */ + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + mouse_event(MOUSEEVENTF_MOVE, 20, 0, 0, 0); /* rc_child.left + 10, rc_child.top + 10 */ + flush_events(); + flush_sequence(); + + /* move cursor outside top-window */ + track_leave(hchild); + track_query(TME_LEAVE, hchild, 0); + mouse_event(MOUSEEVENTF_MOVE, 500, 0, 0, 0); /* rc_child.left + 510, rc_child.top + 10 */ + pump_msg_loop_timeout(default_hover_time, FALSE); //flush_events(); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + track_query(0, NULL, 0); + DestroyWindow(hwnd); + /* Try tracking cursor over window from other thread */ + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + if (!wnd_event.start_event) + { + win_skip("CreateEventW failed\n"); + return; + } + hthread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); + ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); + SetCursorPos(150, 150); + ShowWindow(wnd_event.hwnd, SW_SHOW); + flush_events(); + flush_sequence(); + + /* window is under cursor */ + track_hover(wnd_event.hwnd, HOVER_DEFAULT); + track_query(0, 0, 0); + pump_msg_loop_timeout(default_hover_time, TRUE); + ok_sequence(WmMouseHoverSeq, "WmMouseHoverSeq", FALSE); + + track_leave(wnd_event.hwnd); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, 0, 0); + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE); + + /* window is not under cursor */ + SetCursorPos(600, 150); + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + track_leave(wnd_event.hwnd); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, 0, 0); + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + ret = PostMessageA(wnd_event.hwnd, WM_QUIT, 0, 0); + ok( ret, "PostMessageA(WM_QUIT) error %d\n", GetLastError()); + ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hthread); + #undef track_hover #undef track_query +#undef track_leave #undef track_hover_cancel +#undef track_leave_cancel } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 052fdd8..efff279 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -53,6 +53,7 @@ enum wine_internal_message WM_WINE_KEYBOARD_LL_HOOK, WM_WINE_MOUSE_LL_HOOK, WM_WINE_CLIPCURSOR, + WM_WINE_TRACKMOUSEEVENT, WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ WM_WINE_LAST_DRIVER_MSG = 0x80001fff }; @@ -163,6 +164,13 @@ struct wm_char_mapping_data MSG get_msg; }; +/* data for TrackMouseEvent */ +struct tracking_info { + TRACKMOUSEEVENT tme; + POINT pos; /* center of hover rectangle */ + UINT_PTR timer; +}; + /* this is the structure stored in TEB->Win32ClientInfo */ /* no attempt is made to keep the layout compatible with the Windows one */ struct user_thread_info @@ -185,6 +193,7 @@ struct user_thread_info HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ RAWINPUT *rawinput; + struct tracking_info tracking_info; }; C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); @@ -225,6 +234,8 @@ struct tagWND; extern void CLIPBOARD_ReleaseOwner( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; +extern void check_mouse_leave(HWND hwnd, int hittest) DECLSPEC_HIDDEN; +extern void track_mouse_event_internal(HWND hwnd, DWORD flags, DWORD hover_time) DECLSPEC_HIDDEN; extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN; extern void invalidate_dce( struct tagWND *win, const RECT *rect ) DECLSPEC_HIDDEN; extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a0bfe05..cc8dac8 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -114,7 +114,7 @@ static x11drv_event_handler handlers[MAX_EVENT_HANDLERS] = X11DRV_ButtonRelease, /* 5 ButtonRelease */ X11DRV_MotionNotify, /* 6 MotionNotify */ X11DRV_EnterNotify, /* 7 EnterNotify */ - NULL, /* 8 LeaveNotify */ + X11DRV_LeaveNotify, /* 8 LeaveNotify */ X11DRV_FocusIn, /* 9 FocusIn */ X11DRV_FocusOut, /* 10 FocusOut */ X11DRV_KeymapNotify, /* 11 KeymapNotify */ diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5ace405..092c381 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1447,6 +1447,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) *pos = root_to_virtual_screen( winX, winY ); TRACE( "pointer at %s server pos %s\n", wine_dbgstr_point(pos), wine_dbgstr_point(&old) ); } + return ret; } @@ -1690,6 +1691,34 @@ BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) return TRUE; } +/*********************************************************************** + * X11DRV_LeaveNotify + */ +BOOL X11DRV_LeaveNotify( HWND hwnd, XEvent *xev ) +{ + XCrossingEvent *event = &xev->xcrossing; + INPUT input; + + TRACE( "hwnd %p/%lx pos %d,%d detail %d\n", hwnd, event->window, event->x, event->y, event->detail ); + + if (event->detail == NotifyVirtual) return FALSE; + if (hwnd == x11drv_thread_data()->grab_hwnd) return FALSE; + + /* simulate a mouse motion event - needed for TrackMouseEvent */ + input.u.mi.dx = event->x; + input.u.mi.dy = event->y; + input.u.mi.mouseData = 0; + input.u.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; + + /* Note: not calling is_old_motion_event because leave message is not simulated when warping cursor */ + + send_mouse_input( hwnd, event->window, event->state, &input ); + return TRUE; +} + + #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H /*********************************************************************** diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d35328c..2626c93 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -326,7 +326,7 @@ static int get_window_attributes( struct x11drv_win_data *data, XSetWindowAttrib attr->backing_store = NotUseful; attr->border_pixel = 0; attr->event_mask = (ExposureMask | PointerMotionMask | - ButtonPressMask | ButtonReleaseMask | EnterWindowMask | + ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | KeyPressMask | KeyReleaseMask | FocusChangeMask | KeymapStateMask | StructureNotifyMask); if (data->managed) attr->event_mask |= PropertyChangeMask; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 938ff22..1ee1c15 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -508,6 +508,7 @@ extern BOOL X11DRV_ButtonPress( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ButtonRelease( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_MotionNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_LeaveNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_DestroyNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; -- 2.7.4

3 6

[PATCH] shell32: stub GetRedirectionCapabilities with S_OK
by Lucian Poston 22 Nov '17

22 Nov '17

https://bugs.winehq.org/show_bug.cgi?id=42307 Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> --- dlls/shell32/shellpath.c | 6 ++++-- dlls/shell32/tests/shellpath.c | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index c5ba6295cd..4f1cdc01b2 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5555,8 +5555,10 @@ static HRESULT WINAPI knownfolder_GetRedirectionCapabilities( IKnownFolder *iface, KF_REDIRECTION_CAPABILITIES *pCapabilities) { - FIXME("%p\n", pCapabilities); - return E_NOTIMPL; + FIXME("%p stub\n", pCapabilities); + if(!pCapabilities) return E_INVALIDARG; + *pCapabilities = KF_REDIRECTION_CAPABILITIES_DENY_ALL; + return S_OK; } static HRESULT WINAPI knownfolder_GetFolderDefinition( diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 9fea876e8b..387eecbd3e 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2121,7 +2121,6 @@ static void test_knownFolders(void) CoTaskMemFree(folderPath); hr = IKnownFolder_GetRedirectionCapabilities(folder, &redirectionCapabilities); - todo_wine ok(hr == S_OK, "failed to get redirection capabilities: 0x%08x\n", hr); todo_wine ok(redirectionCapabilities==0, "invalid redirection capabilities returned: %d\n", redirectionCapabilities); -- 2.13.6

1 0

[PATCH] kernel32: Add CreateThreadpoolIo stub.
by Andrey Gusev 22 Nov '17

22 Nov '17

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- .../api-ms-win-core-threadpool-l1-1-0.spec | 2 +- .../api-ms-win-core-threadpool-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/thread.c | 10 ++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec b/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec index dcf954a427..4f4580a293 100644 --- a/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec +++ b/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec @@ -10,7 +10,7 @@ @ stdcall CloseThreadpoolWork(ptr) kernel32.CloseThreadpoolWork @ stdcall CreateThreadpool(ptr) kernel32.CreateThreadpool @ stdcall CreateThreadpoolCleanupGroup() kernel32.CreateThreadpoolCleanupGroup -@ stub CreateThreadpoolIo +@ stdcall CreateThreadpoolIo(ptr ptr ptr ptr) kernel32.CreateThreadpoolIo @ stdcall CreateThreadpoolTimer(ptr ptr ptr) kernel32.CreateThreadpoolTimer @ stdcall CreateThreadpoolWait(ptr ptr ptr) kernel32.CreateThreadpoolWait @ stdcall CreateThreadpoolWork(ptr ptr ptr) kernel32.CreateThreadpoolWork diff --git a/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec b/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec index 870becce4d..dc110ef9ed 100644 --- a/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec +++ b/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec @@ -9,7 +9,7 @@ @ stdcall CloseThreadpoolWork(ptr) kernel32.CloseThreadpoolWork @ stdcall CreateThreadpool(ptr) kernel32.CreateThreadpool @ stdcall CreateThreadpoolCleanupGroup() kernel32.CreateThreadpoolCleanupGroup -@ stub CreateThreadpoolIo +@ stdcall CreateThreadpoolIo(ptr ptr ptr ptr) kernel32.CreateThreadpoolIo @ stdcall CreateThreadpoolTimer(ptr ptr ptr) kernel32.CreateThreadpoolTimer @ stdcall CreateThreadpoolWait(ptr ptr ptr) kernel32.CreateThreadpoolWait @ stdcall CreateThreadpoolWork(ptr ptr ptr) kernel32.CreateThreadpoolWork diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index cf27aea766..2c719d437e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -333,7 +333,7 @@ @ stdcall CreateThread(ptr long ptr long long ptr) @ stdcall CreateThreadpool(ptr) @ stdcall CreateThreadpoolCleanupGroup() -# @ stub CreateThreadpoolIo +@ stdcall CreateThreadpoolIo(ptr ptr ptr ptr) @ stdcall CreateThreadpoolTimer(ptr ptr ptr) @ stdcall CreateThreadpoolWait(ptr ptr ptr) @ stdcall CreateThreadpoolWork(ptr ptr ptr) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index a30428fb27..6a89993f92 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -1001,6 +1001,16 @@ PTP_CLEANUP_GROUP WINAPI CreateThreadpoolCleanupGroup( void ) } /*********************************************************************** + * CreateThreadpoolIo (KERNEL32.@) + */ +PTP_IO WINAPI CreateThreadpoolIo( HANDLE handle, PTP_WIN32_IO_CALLBACK callback, + PVOID userdata, TP_CALLBACK_ENVIRON *environment ) +{ + FIXME("(%p, %p, %p, %p): stub\n", handle, callback, userdata, environment); + return FALSE; +} + +/*********************************************************************** * CreateThreadpoolTimer (KERNEL32.@) */ PTP_TIMER WINAPI CreateThreadpoolTimer( PTP_TIMER_CALLBACK callback, PVOID userdata, diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 1e57fe8744..b9eb4fcf87 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -225,7 +225,7 @@ @ stdcall CreateThread(ptr long ptr long long ptr) kernel32.CreateThread @ stdcall CreateThreadpool(ptr) kernel32.CreateThreadpool @ stdcall CreateThreadpoolCleanupGroup() kernel32.CreateThreadpoolCleanupGroup -@ stub CreateThreadpoolIo +@ stdcall CreateThreadpoolIo(ptr ptr ptr ptr) kernel32.CreateThreadpoolIo @ stdcall CreateThreadpoolTimer(ptr ptr ptr) kernel32.CreateThreadpoolTimer @ stdcall CreateThreadpoolWait(ptr ptr ptr) kernel32.CreateThreadpoolWait @ stdcall CreateThreadpoolWork(ptr ptr ptr) kernel32.CreateThreadpoolWork diff --git a/include/winbase.h b/include/winbase.h index a4d545ecf3..cc719c696c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1832,6 +1832,7 @@ WINADVAPI BOOL WINAPI CreatePrivateObjectSecurityEx(PSECURITY_DESCRIPTOR WINADVAPI BOOL WINAPI CreatePrivateObjectSecurityWithMultipleInheritance(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,GUID**,ULONG,BOOL,ULONG,HANDLE,PGENERIC_MAPPING); WINBASEAPI PTP_POOL WINAPI CreateThreadpool(PVOID); WINBASEAPI PTP_CLEANUP_GROUP WINAPI CreateThreadpoolCleanupGroup(void); +WINBASEAPI PTP_IO WINAPI CreateThreadpoolIo(HANDLE,PTP_WIN32_IO_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); WINBASEAPI PTP_TIMER WINAPI CreateThreadpoolTimer(PTP_TIMER_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); WINBASEAPI PTP_WAIT WINAPI CreateThreadpoolWait(PTP_WAIT_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); WINBASEAPI PTP_WORK WINAPI CreateThreadpoolWork(PTP_WORK_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); -- 2.13.6

1 0

[v2 PATCH] mshtml: Make sure actual host length matches returned BSTR length
by Nikolay Sivov 22 Nov '17

22 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: now with a test dlls/mshtml/htmllocation.c | 7 +++++-- dlls/mshtml/tests/htmllocation.c | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index de66ff5670..59b20f614d 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -351,13 +351,16 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) if(url.nPort) { /* <hostname>:<port> */ const WCHAR format[] = {'%','u',0}; - DWORD len = url.dwHostNameLength + 1 + 5; + DWORD len, port_len; + WCHAR portW[6]; WCHAR *buf; + port_len = snprintfW(portW, sizeof(portW)/sizeof(portW[0]), format, url.nPort); + len = url.dwHostNameLength + 1 /* ':' */ + port_len; buf = *p = SysAllocStringLen(NULL, len); memcpy(buf, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); buf[url.dwHostNameLength] = ':'; - snprintfW(buf + url.dwHostNameLength + 1, 6, format, url.nPort); + memcpy(buf + url.dwHostNameLength + 1, portW, port_len * sizeof(WCHAR)); }else *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength); diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index ee241e79af..458960a8d3 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -168,10 +168,15 @@ static void test_host(IHTMLLocation *loc, const struct location_test *test) hres = IHTMLLocation_get_host(loc, &str); ok(hres == S_OK, "%s: get_host failed: 0x%08x\n", test->name, hres); - if(hres == S_OK) + if(hres == S_OK){ + int len = test->host ? strlen(test->host) : 0; ok(str_eq_wa(str, test->host), "%s: expected retrieved host to be L\"%s\", was: %s\n", test->name, test->host, wine_dbgstr_w(str)); + ok(SysStringLen(str) == len, "%s: unexpected string length %u, expected %u\n", + test->name, SysStringLen(str), len); + } + SysFreeString(str); } -- 2.15.0

2 1

[PATCH v2] msvcrt: Don't crash if _vsnwprintf gets NULL as format string and add test
by Fabian Maurer 22 Nov '17

22 Nov '17

v2: Fix crash on older test machines Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msvcrt/printf.h | 3 +++ dlls/msvcrt/tests/printf.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 4ba02bafdb..a88097232d 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -376,6 +376,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API TRACE("Format is: %s\n", FUNC_NAME(debugstr)(fmt)); + if(!fmt) + return -1; + if(!locale) locinfo = get_locinfo(); else diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 64658ce25f..5cbc1c31a1 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -1204,6 +1204,14 @@ static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t * return ret; } +static BOOL is_vista_or_newer(void) +{ + OSVERSIONINFOA version; + version.dwOSVersionInfoSize = sizeof(version); + GetVersionExA(&version); + return version.dwMajorVersion > 5; +} + static void test_vsnwprintf(void) { const wchar_t format[] = {'%','w','s','%','w','s','%','w','s',0}; @@ -1226,6 +1234,17 @@ static void test_vsnwprintf(void) ret = _vsnwprintf_wrapper( NULL, 0, format, one, two, three ); ok( ret == 11 || broken(ret == -1 /* Win2k */), "got %d, expected 11\n", ret ); + + /* Test with format string set to NULL, we should not crash on vista or newer. */ + if(is_vista_or_newer()) + { + str[0] = 'x'; + ret = _vsnwprintf_wrapper( str, 0, NULL ); + ok( ret == -1, "got %d, expected -1\n", ret ); + ok( str[0] == 'x', "Expected string to be unchanged.\n" ); + } + else + win_skip("_vsnwprintf would crash with a NULL argument.\n"); } static int WINAPIV vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...) -- 2.15.0

2 1

[PATCH v3] user32: Reimplement TrackMouseEvent.
by Rafał Harabień 22 Nov '17

22 Nov '17

Improvements: - Don't use timer for TME_LEAVE and react immediately on mouse motion. It improves user experience for controls depending on this API like toolbar. - Fail when called with invalid flags - Hold tracking info for each win32 thread independently - Merge tracking requests if possible (leave+hover) - Return hover time 0 when hover tracking is disabled Patch v2 fixes compiler warnings and some style issues. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/user32/input.c | 234 ++++++++++++++++++++++-------------------- dlls/user32/message.c | 5 + dlls/user32/tests/msg.c | 248 +++++++++++++++++++++++++++++++++++++++++++-- dlls/user32/user_private.h | 11 ++ dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 29 ++++++ dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + 8 files changed, 410 insertions(+), 122 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index c475b19..5b589a5 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1243,48 +1243,59 @@ BOOL WINAPI UnloadKeyboardLayout(HKL hkl) return USER_Driver->pUnloadKeyboardLayout(hkl); } -typedef struct __TRACKINGLIST { - TRACKMOUSEEVENT tme; - POINT pos; /* center of hover rectangle */ -} _TRACKINGLIST; -/* FIXME: move tracking stuff into a per thread data */ -static _TRACKINGLIST tracking_info; -static UINT_PTR timer; +void maybe_clean_tracking_info(struct tracking_info *tracking_info) +{ + if (!(tracking_info->tme.dwFlags & (TME_HOVER | TME_LEAVE))) + { + tracking_info->tme.hwndTrack = 0; + tracking_info->tme.dwFlags = 0; + } + if (!(tracking_info->tme.dwFlags & TME_HOVER)) + tracking_info->tme.dwHoverTime = 0; +} -static void check_mouse_leave(HWND hwnd, int hittest) +void check_mouse_leave(HWND hwnd, int hittest) { - if (tracking_info.tme.hwndTrack != hwnd) + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; + + TRACE("hwnd %p hittest %d\n", hwnd, hittest); + + if (!(tracking_info->tme.dwFlags & TME_LEAVE)) + return; + + if (tracking_info->tme.hwndTrack != hwnd) { - if (tracking_info.tme.dwFlags & TME_NONCLIENT) - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + if (tracking_info->tme.dwFlags & TME_NONCLIENT) + PostMessageW(tracking_info->tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); else - PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0); + PostMessageW(tracking_info->tme.hwndTrack, WM_MOUSELEAVE, 0, 0); /* remove the TME_LEAVE flag */ - tracking_info.tme.dwFlags &= ~TME_LEAVE; + tracking_info->tme.dwFlags &= ~TME_LEAVE; } else { if (hittest == HTCLIENT) { - if (tracking_info.tme.dwFlags & TME_NONCLIENT) + if (tracking_info->tme.dwFlags & TME_NONCLIENT) { - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + PostMessageW(tracking_info->tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); /* remove the TME_LEAVE flag */ - tracking_info.tme.dwFlags &= ~TME_LEAVE; + tracking_info->tme.dwFlags &= ~TME_LEAVE; } } else { - if (!(tracking_info.tme.dwFlags & TME_NONCLIENT)) + if (!(tracking_info->tme.dwFlags & TME_NONCLIENT)) { - PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0); + PostMessageW(tracking_info->tme.hwndTrack, WM_MOUSELEAVE, 0, 0); /* remove the TME_LEAVE flag */ - tracking_info.tme.dwFlags &= ~TME_LEAVE; + tracking_info->tme.dwFlags &= ~TME_LEAVE; } } } + maybe_clean_tracking_info(tracking_info); } static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, @@ -1292,6 +1303,7 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, { POINT pos; INT hoverwidth = 0, hoverheight = 0, hittest; + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; TRACE("hwnd %p, msg %04x, id %04lx, time %u\n", hwnd, uMsg, idEvent, dwTime); @@ -1304,31 +1316,24 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, SystemParametersInfoW(SPI_GETMOUSEHOVERHEIGHT, 0, &hoverheight, 0); TRACE("tracked pos %s, current pos %s, hover width %d, hover height %d\n", - wine_dbgstr_point(&tracking_info.pos), wine_dbgstr_point(&pos), + wine_dbgstr_point(&tracking_info->pos), wine_dbgstr_point(&pos), hoverwidth, hoverheight); - /* see if this tracking event is looking for TME_LEAVE and that the */ - /* mouse has left the window */ - if (tracking_info.tme.dwFlags & TME_LEAVE) - { - check_mouse_leave(hwnd, hittest); - } - - if (tracking_info.tme.hwndTrack != hwnd) + if (tracking_info->tme.hwndTrack != hwnd) { /* mouse is gone, stop tracking mouse hover */ - tracking_info.tme.dwFlags &= ~TME_HOVER; + tracking_info->tme.dwFlags &= ~TME_HOVER; } /* see if we are tracking hovering for this hwnd */ - if (tracking_info.tme.dwFlags & TME_HOVER) + if (tracking_info->tme.dwFlags & TME_HOVER) { /* has the cursor moved outside the rectangle centered around pos? */ - if ((abs(pos.x - tracking_info.pos.x) > (hoverwidth / 2)) || - (abs(pos.y - tracking_info.pos.y) > (hoverheight / 2))) + if ((abs(pos.x - tracking_info->pos.x) > (hoverwidth / 2)) || + (abs(pos.y - tracking_info->pos.y) > (hoverheight / 2))) { /* record this new position as the current position */ - tracking_info.pos = pos; + tracking_info->pos = pos; } else { @@ -1337,29 +1342,88 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, ScreenToClient(hwnd, &pos); TRACE("client cursor pos %s\n", wine_dbgstr_point(&pos)); - PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSEHOVER, + PostMessageW(tracking_info->tme.hwndTrack, WM_MOUSEHOVER, get_key_state(), MAKELPARAM( pos.x, pos.y )); } else { - if (tracking_info.tme.dwFlags & TME_NONCLIENT) - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSEHOVER, + if (tracking_info->tme.dwFlags & TME_NONCLIENT) + PostMessageW(tracking_info->tme.hwndTrack, WM_NCMOUSEHOVER, hittest, MAKELPARAM( pos.x, pos.y )); } /* stop tracking mouse hover */ - tracking_info.tme.dwFlags &= ~TME_HOVER; + tracking_info->tme.dwFlags &= ~TME_HOVER; } } /* stop the timer if the tracking list is empty */ - if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) + if (!(tracking_info->tme.dwFlags & TME_HOVER)) + { + KillSystemTimer(tracking_info->tme.hwndTrack, tracking_info->timer); + tracking_info->timer = 0; + } + maybe_clean_tracking_info(tracking_info); +} + +void track_mouse_event_internal(HWND hwnd_track, DWORD flags, DWORD hover_time) +{ + HWND hwnd; + POINT pos; + INT hittest; + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; + + if (flags & TME_HOVER) + { + /* if HOVER_DEFAULT or 0 was specified replace this with the system's current value. */ + if (hover_time == HOVER_DEFAULT || hover_time == 0) + SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); + } + + if (flags & TME_CANCEL) + { + if (tracking_info->tme.hwndTrack == hwnd_track) + { + /* cancel old tracking request */ + tracking_info->tme.dwFlags &= ~(flags & ~TME_CANCEL); + + /* if we aren't tracking on hover or leave remove this entry */ + if (!(tracking_info->tme.dwFlags & TME_HOVER) && tracking_info->timer) + { + KillSystemTimer(tracking_info->tme.hwndTrack, tracking_info->timer); + tracking_info->timer = 0; + } + maybe_clean_tracking_info(tracking_info); + } + } + else { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; + /* check what window is under cursor */ + GetCursorPos(&pos); + hwnd = WINPOS_WindowFromPoint(hwnd_track, pos, &hittest); + TRACE("point %s hwnd %p hittest %d\n", wine_dbgstr_point(&pos), hwnd, hittest); + + if (hwnd_track != hwnd) + PostMessageW(hwnd_track, WM_MOUSELEAVE, 0, 0); + else + { + /* save tracking request */ + tracking_info->tme.hwndTrack = hwnd_track; + tracking_info->tme.dwFlags |= flags; + if (flags & TME_HOVER) + tracking_info->tme.dwHoverTime = hover_time; + + /* Initialize HoverInfo variables even if not hover tracking */ + tracking_info->pos = pos; + + if (flags & TME_HOVER) + { + /* recreate timer */ + if (tracking_info->timer) + KillSystemTimer(tracking_info->tme.hwndTrack, tracking_info->timer); + tracking_info->timer = SetSystemTimer(tracking_info->tme.hwndTrack, (UINT_PTR)&tracking_info->tme, hover_time, TrackMouseEventProc); + } + } } } @@ -1389,23 +1453,30 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, BOOL WINAPI TrackMouseEvent (TRACKMOUSEEVENT *ptme) { - HWND hwnd; - POINT pos; - DWORD hover_time; - INT hittest; + DWORD invalid_flags; + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; TRACE("%x, %x, %p, %u\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); - if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) { + if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) + { WARN("wrong TRACKMOUSEEVENT size from app\n"); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + invalid_flags = ptme->dwFlags & ~(TME_QUERY | TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT); + if (invalid_flags != 0) + { + WARN("Unknown flag(s) %08x\n", invalid_flags); + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + /* fill the TRACKMOUSEEVENT struct with the current tracking for the given hwnd */ - if (ptme->dwFlags & TME_QUERY ) + if (ptme->dwFlags & TME_QUERY) { - *ptme = tracking_info.tme; + *ptme = tracking_info->tme; /* set cbSize in the case it's not initialized yet */ ptme->cbSize = sizeof(TRACKMOUSEEVENT); @@ -1418,68 +1489,11 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) return FALSE; } - hover_time = (ptme->dwFlags & TME_HOVER) ? ptme->dwHoverTime : HOVER_DEFAULT; - - /* if HOVER_DEFAULT was specified replace this with the system's current value. - * TME_LEAVE doesn't need to specify hover time so use default */ - if (hover_time == HOVER_DEFAULT || hover_time == 0) - SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); - - GetCursorPos(&pos); - hwnd = WINPOS_WindowFromPoint(ptme->hwndTrack, pos, &hittest); - TRACE("point %s hwnd %p hittest %d\n", wine_dbgstr_point(&pos), hwnd, hittest); - - if (ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)) - FIXME("Unknown flag(s) %08x\n", ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)); - - if (ptme->dwFlags & TME_CANCEL) - { - if (tracking_info.tme.hwndTrack == ptme->hwndTrack) - { - tracking_info.tme.dwFlags &= ~(ptme->dwFlags & ~TME_CANCEL); - - /* if we aren't tracking on hover or leave remove this entry */ - if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) - { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; - } - } - } else { - /* In our implementation it's possible that another window will receive a - * WM_MOUSEMOVE and call TrackMouseEvent before TrackMouseEventProc is - * called. In such a situation post the WM_MOUSELEAVE now */ - if (tracking_info.tme.dwFlags & TME_LEAVE && tracking_info.tme.hwndTrack != NULL) - check_mouse_leave(hwnd, hittest); - - if (timer) - { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; - } - - if (ptme->hwndTrack == hwnd) - { - /* Adding new mouse event to the tracking list */ - tracking_info.tme = *ptme; - tracking_info.tme.dwHoverTime = hover_time; - - /* Initialize HoverInfo variables even if not hover tracking */ - tracking_info.pos = pos; - - timer = SetSystemTimer(tracking_info.tme.hwndTrack, (UINT_PTR)&tracking_info.tme, hover_time, TrackMouseEventProc); - } - } - - return TRUE; + /* use internal message to get access to user_thread_info for tracked window */ + return SendNotifyMessageW(ptme->hwndTrack, WM_WINE_TRACKMOUSEEVENT, ptme->dwFlags, ptme->dwHoverTime); } + /*********************************************************************** * GetMouseMovePointsEx [USER32] * diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 406eff3..21710c3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1888,6 +1888,9 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return USER_Driver->pClipCursor( &rect ); } return USER_Driver->pClipCursor( NULL ); + case WM_WINE_TRACKMOUSEEVENT: + track_mouse_event_internal(hwnd, (DWORD)wparam, (DWORD)lparam); + return 0; default: if (msg >= WM_WINE_FIRST_DRIVER_MSG && msg <= WM_WINE_LAST_DRIVER_MSG) return USER_Driver->pWindowMessage( hwnd, msg, wparam, lparam ); @@ -2503,6 +2506,8 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H else { msg->hwnd = WINPOS_WindowFromPoint( msg->hwnd, msg->pt, &hittest ); + /* TrackMouseEvent support */ + check_mouse_leave(msg->hwnd, hittest); } if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd )) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 64c7967..c65ded7 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7817,6 +7817,18 @@ static DWORD WINAPI thread_proc(void *param) while (GetMessageA(&msg, 0, 0, 0)) { + if ((msg.message == WM_TIMER || msg.message == WM_SYSTIMER) && msg.lParam) + { + struct recvd_message s_msg; + + s_msg.hwnd = msg.hwnd; + s_msg.message = msg.message; + s_msg.flags = sent|wparam|lparam; + s_msg.wParam = msg.wParam; + s_msg.lParam = msg.lParam; + s_msg.descr = "msg_loop"; + add_message(&s_msg); + } TranslateMessage(&msg); DispatchMessageA(&msg); } @@ -11938,6 +11950,11 @@ static const struct message WmMouseHoverSeq[] = { { 0 } }; +static const struct message WmMouseLeaveSeq[] = { + { WM_MOUSELEAVE, sent|wparam, 0 }, + { 0 } +}; + static void pump_msg_loop_timeout(DWORD timeout, BOOL inject_mouse_move) { MSG msg; @@ -11982,14 +11999,6 @@ static void pump_msg_loop_timeout(DWORD timeout, BOOL inject_mouse_move) } while (start_ticks + timeout >= end_ticks); } -static void test_TrackMouseEvent(void) -{ - TRACKMOUSEEVENT tme; - BOOL ret; - HWND hwnd, hchild; - RECT rc_parent, rc_child; - UINT default_hover_time, hover_width = 0, hover_height = 0; - #define track_hover(track_hwnd, track_hover_time) \ tme.cbSize = sizeof(tme); \ tme.dwFlags = TME_HOVER; \ @@ -11999,6 +12008,15 @@ static void test_TrackMouseEvent(void) ret = pTrackMouseEvent(&tme); \ ok(ret, "TrackMouseEvent(TME_HOVER) error %d\n", GetLastError()) +#define track_leave(track_hwnd) \ + tme.cbSize = sizeof(tme); \ + tme.dwFlags = TME_LEAVE; \ + tme.hwndTrack = track_hwnd; \ + tme.dwHoverTime = 0xdeadbeef; \ + SetLastError(0xdeadbeef); \ + ret = pTrackMouseEvent(&tme); \ + ok(ret, "TrackMouseEvent(TME_LEAVE) error %d\n", GetLastError()); + #define track_query(expected_track_flags, expected_track_hwnd, expected_hover_time) \ tme.cbSize = sizeof(tme); \ tme.dwFlags = TME_QUERY; \ @@ -12024,6 +12042,74 @@ static void test_TrackMouseEvent(void) ret = pTrackMouseEvent(&tme); \ ok(ret, "TrackMouseEvent(TME_HOVER | TME_CANCEL) error %d\n", GetLastError()) +#define track_leave_cancel(track_hwnd) \ + tme.cbSize = sizeof(tme); \ + tme.dwFlags = TME_LEAVE | TME_CANCEL; \ + tme.hwndTrack = track_hwnd; \ + tme.dwHoverTime = 0xdeadbeef; \ + SetLastError(0xdeadbeef); \ + ret = pTrackMouseEvent(&tme); \ + ok(ret, "TrackMouseEvent(TME_LEAVE | TME_CANCEL) error %d\n", GetLastError()) + +static DWORD WINAPI thread_proc_tme(void *param) +{ + BOOL ret; + TRACKMOUSEEVENT tme; + MSG msg; + struct wnd_event *wnd_event = param; + + wnd_event->hwnd = CreateWindowExA(0, "TestWindowClass", "window caption text", WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(wnd_event->hwnd != 0, "Failed to create overlapped window\n"); + + SetEvent(wnd_event->start_event); + + while (GetMessageA(&msg, 0, 0, 0)) + { + if ((msg.message == WM_TIMER || msg.message == WM_SYSTIMER) && msg.lParam) + { + struct recvd_message s_msg; + + s_msg.hwnd = msg.hwnd; + s_msg.message = msg.message; + s_msg.flags = sent|wparam|lparam; + s_msg.wParam = msg.wParam; + s_msg.lParam = msg.lParam; + s_msg.descr = "msg_loop"; + add_message(&s_msg); + } + if (msg.message == WM_USER) + { + if (msg.wParam) + { + track_query((DWORD)msg.wParam, wnd_event->hwnd, (DWORD)msg.lParam); + } + else + { + track_query(0, NULL, 0); + } + continue; + } + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + ok(IsWindow(wnd_event->hwnd), "window should still exist\n"); + + return 0; +} + +static void test_TrackMouseEvent(void) +{ + TRACKMOUSEEVENT tme; + BOOL ret; + HWND hwnd, hchild; + RECT rc_parent, rc_child; + UINT default_hover_time, hover_width = 0, hover_height = 0; + struct wnd_event wnd_event; + HANDLE hthread; + DWORD tid; + default_hover_time = 0xdeadbeef; SetLastError(0xdeadbeef); ret = SystemParametersInfoA(SPI_GETMOUSEHOVERTIME, 0, &default_hover_time, 0); @@ -12090,6 +12176,17 @@ static void test_TrackMouseEvent(void) ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || broken(GetLastError() == 0xdeadbeef), "not expected error %u\n", GetLastError()); + /* Invalid flags */ + tme.cbSize = sizeof(tme); + tme.dwFlags = ~TME_CANCEL; + tme.hwndTrack = hwnd; + tme.dwHoverTime = HOVER_DEFAULT; + SetLastError(0xdeadbeef); + ret = pTrackMouseEvent(&tme); + ok(!ret, "TrackMouseEvent should fail\n"); + ok(GetLastError() == ERROR_INVALID_FLAGS, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + GetWindowRect(hwnd, &rc_parent); GetWindowRect(hchild, &rc_child); SetCursorPos(rc_child.left - 10, rc_child.top - 10); @@ -12159,13 +12256,144 @@ static void test_TrackMouseEvent(void) track_query(TME_HOVER, hwnd, default_hover_time); track_hover_cancel(hwnd); + /* cursor is over child window */ + mouse_event(MOUSEEVENTF_MOVE, 20, 20, 0, 0); /* rc_child.left + 10, rc_child.top + 10 */ + flush_events(); + flush_sequence(); + + /* cancel TME_LEAVE */ + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(TME_LEAVE, hchild, 0); + track_leave_cancel(hchild); + track_query(0, NULL, 0); + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE); + + /* requests for the same window are merged */ + track_hover(hchild, HOVER_DEFAULT); + track_query(TME_HOVER, hchild, default_hover_time); + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(TME_LEAVE|TME_HOVER, hchild, default_hover_time); + track_hover_cancel(hchild); + track_query(TME_LEAVE, hchild, 0); + /* TME_LEAVE for window not being under cursor doesn't change TME_QUERY result */ + track_leave(hwnd); + track_query(TME_LEAVE, hchild, 0); + track_leave_cancel(hchild); + track_query(0, NULL, 0); + flush_events(); + flush_sequence(); + + /* try changing hover time */ + track_hover(hchild, 0); + track_query(TME_HOVER, hchild, default_hover_time); + track_hover(hchild, 1); + track_query(TME_HOVER, hchild, 1); + track_hover(hchild, HOVER_DEFAULT); + track_query(TME_HOVER, hchild, default_hover_time); + track_hover(hchild, default_hover_time*2); + track_query(TME_HOVER, hchild, default_hover_time*2); + track_hover_cancel(hchild); + + /* test TME_LEAVE */ + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(TME_LEAVE, hchild, 0); + ok(!GetCapture(), "expected NULL\n"); + mouse_event(MOUSEEVENTF_MOVE, -20, 0, 0, 0); /* rc_child.left - 10, rc_child.top + 10 */ + pump_msg_loop_timeout(0, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + track_query(0, NULL, 0); + + /* window is not under cursor - immediate WM_MOUSELEAVE is expected */ + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + pump_msg_loop_timeout(0, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + mouse_event(MOUSEEVENTF_MOVE, 20, 0, 0, 0); /* rc_child.left + 10, rc_child.top + 10 */ + flush_events(); + flush_sequence(); + + /* move cursor outside top-window */ + track_leave(hchild); + track_query(TME_LEAVE, hchild, 0); + mouse_event(MOUSEEVENTF_MOVE, 500, 0, 0, 0); /* rc_child.left + 510, rc_child.top + 10 */ + pump_msg_loop_timeout(0, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + track_query(0, NULL, 0); + DestroyWindow(hwnd); + /* Try tracking cursor over window from other thread */ + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + if (!wnd_event.start_event) + { + win_skip("CreateEventW failed\n"); + return; + } + SetCursorPos(150, 150); + hthread = CreateThread(NULL, 0, thread_proc_tme, &wnd_event, 0, &tid); + ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); + ShowWindow(wnd_event.hwnd, SW_SHOW); + flush_events(); + flush_sequence(); + + /* window is under cursor */ + track_hover(wnd_event.hwnd, HOVER_DEFAULT); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + PostMessageW(wnd_event.hwnd, WM_USER, TME_HOVER, default_hover_time); + Sleep(default_hover_time/2); + track_query(0, NULL, 0); + Sleep(default_hover_time); + flush_events(); + ok_sequence(WmMouseHoverSeq, "WmMouseHoverSeq", FALSE); + + track_leave(wnd_event.hwnd); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + PostMessageW(wnd_event.hwnd, WM_USER, TME_LEAVE, 0); + Sleep(default_hover_time/2); + track_query(0, NULL, 0); + Sleep(default_hover_time); + flush_events(); + ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE); + + /* window is not under cursor */ + SetCursorPos(600, 150); + flush_events(); + track_query(0, NULL, 0); + PostMessageW(wnd_event.hwnd, WM_USER, 0, 0); + Sleep(default_hover_time/2); + flush_events(); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + track_leave(wnd_event.hwnd); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + PostMessageW(wnd_event.hwnd, WM_USER, 0, 0); + Sleep(default_hover_time/2); + flush_events(); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + ret = PostMessageW(wnd_event.hwnd, WM_QUIT, 0, 0); + ok( ret, "PostMessageW(WM_QUIT) error %d\n", GetLastError()); + ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hthread); + +} + #undef track_hover #undef track_query +#undef track_leave #undef track_hover_cancel -} - +#undef track_leave_cancel static const struct message WmSetWindowRgn[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE }, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 052fdd8..efff279 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -53,6 +53,7 @@ enum wine_internal_message WM_WINE_KEYBOARD_LL_HOOK, WM_WINE_MOUSE_LL_HOOK, WM_WINE_CLIPCURSOR, + WM_WINE_TRACKMOUSEEVENT, WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ WM_WINE_LAST_DRIVER_MSG = 0x80001fff }; @@ -163,6 +164,13 @@ struct wm_char_mapping_data MSG get_msg; }; +/* data for TrackMouseEvent */ +struct tracking_info { + TRACKMOUSEEVENT tme; + POINT pos; /* center of hover rectangle */ + UINT_PTR timer; +}; + /* this is the structure stored in TEB->Win32ClientInfo */ /* no attempt is made to keep the layout compatible with the Windows one */ struct user_thread_info @@ -185,6 +193,7 @@ struct user_thread_info HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ RAWINPUT *rawinput; + struct tracking_info tracking_info; }; C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); @@ -225,6 +234,8 @@ struct tagWND; extern void CLIPBOARD_ReleaseOwner( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; +extern void check_mouse_leave(HWND hwnd, int hittest) DECLSPEC_HIDDEN; +extern void track_mouse_event_internal(HWND hwnd, DWORD flags, DWORD hover_time) DECLSPEC_HIDDEN; extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN; extern void invalidate_dce( struct tagWND *win, const RECT *rect ) DECLSPEC_HIDDEN; extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a0bfe05..cc8dac8 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -114,7 +114,7 @@ static x11drv_event_handler handlers[MAX_EVENT_HANDLERS] = X11DRV_ButtonRelease, /* 5 ButtonRelease */ X11DRV_MotionNotify, /* 6 MotionNotify */ X11DRV_EnterNotify, /* 7 EnterNotify */ - NULL, /* 8 LeaveNotify */ + X11DRV_LeaveNotify, /* 8 LeaveNotify */ X11DRV_FocusIn, /* 9 FocusIn */ X11DRV_FocusOut, /* 10 FocusOut */ X11DRV_KeymapNotify, /* 11 KeymapNotify */ diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5ace405..092c381 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1447,6 +1447,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) *pos = root_to_virtual_screen( winX, winY ); TRACE( "pointer at %s server pos %s\n", wine_dbgstr_point(pos), wine_dbgstr_point(&old) ); } + return ret; } @@ -1690,6 +1691,34 @@ BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) return TRUE; } +/*********************************************************************** + * X11DRV_LeaveNotify + */ +BOOL X11DRV_LeaveNotify( HWND hwnd, XEvent *xev ) +{ + XCrossingEvent *event = &xev->xcrossing; + INPUT input; + + TRACE( "hwnd %p/%lx pos %d,%d detail %d\n", hwnd, event->window, event->x, event->y, event->detail ); + + if (event->detail == NotifyVirtual) return FALSE; + if (hwnd == x11drv_thread_data()->grab_hwnd) return FALSE; + + /* simulate a mouse motion event - needed for TrackMouseEvent */ + input.u.mi.dx = event->x; + input.u.mi.dy = event->y; + input.u.mi.mouseData = 0; + input.u.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; + + /* Note: not calling is_old_motion_event because leave message is not simulated when warping cursor */ + + send_mouse_input( hwnd, event->window, event->state, &input ); + return TRUE; +} + + #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H /*********************************************************************** diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d35328c..2626c93 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -326,7 +326,7 @@ static int get_window_attributes( struct x11drv_win_data *data, XSetWindowAttrib attr->backing_store = NotUseful; attr->border_pixel = 0; attr->event_mask = (ExposureMask | PointerMotionMask | - ButtonPressMask | ButtonReleaseMask | EnterWindowMask | + ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | KeyPressMask | KeyReleaseMask | FocusChangeMask | KeymapStateMask | StructureNotifyMask); if (data->managed) attr->event_mask |= PropertyChangeMask; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 938ff22..1ee1c15 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -508,6 +508,7 @@ extern BOOL X11DRV_ButtonPress( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ButtonRelease( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_MotionNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_LeaveNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_DestroyNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; -- 2.7.4

1 0

[PATCH 3/3] mshtml: Get rid of unneeded parent from NSContainer.
by Jacek Caban 22 Nov '17

22 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsembed.c | 2 -- 2 files changed, 3 deletions(-)

1 0

[PATCH 2/3] mshtml: Pass document as HTMLDocumentObj to update_doc.
by Jacek Caban 22 Nov '17

22 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/editor.c | 44 ++++++++++++++++++++++---------------------- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/olecmd.c | 2 +- dlls/mshtml/persist.c | 4 ++-- dlls/mshtml/view.c | 12 ++++++------ 6 files changed, 33 insertions(+), 33 deletions(-)

1 0

[PATCH 1/3] mshtml: Store IOleAdviseHolder in HTMLDocumentObj instead of HTMLDocument.
by Jacek Caban 22 Nov '17

22 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/oleobj.c | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-)

1 0

[v2 PATCH 1/2] d2d1: Respond to ID2D1Image query
by Nikolay Sivov 22 Nov '17

22 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed test failure on Vista 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 6d9c352924..b03482ae43 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 3a28e38d67..5116d78d08 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); -- 2.15.0

1 1

[PATCH 02/10] taskschd: Implement ITaskSettings_put_RestartCount.
by Hans Leidekker 22 Nov '17

22 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 10 +++++++++- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index cca5414a3a..e184ca813a 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -924,8 +924,16 @@ static HRESULT WINAPI TaskSettings_get_RestartInterval(ITaskSettings *iface, BST static HRESULT WINAPI TaskSettings_put_RestartInterval(ITaskSettings *iface, BSTR interval) { + TaskSettings *taskset = impl_from_ITaskSettings(iface); + BSTR str = NULL; + TRACE("%p,%s\n", iface, debugstr_w(interval)); - return E_NOTIMPL; + + if (interval && !(str = SysAllocString(interval))) return E_OUTOFMEMORY; + SysFreeString(taskset->restart_interval); + taskset->restart_interval = str; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_RestartCount(ITaskSettings *iface, INT *count) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 65287b3f24..0e1c2ebc3d 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1102,6 +1102,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskSettings_put_RestartInterval(set, NULL); else hr = ITaskSettings_put_RestartInterval(set, test->restart_interval); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_RestartCount(set, test->restart_count); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1111,9 +1114,6 @@ todo_wine return; } - hr = ITaskSettings_put_RestartCount(set, test->restart_count); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_MultipleInstances(set, test->policy); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

2 1

[PATCH 10/10] taskschd: Implement ITaskSettings_put_Enabled.
by Hans Leidekker 22 Nov '17

22 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 12 ++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 3b02cb9dbc..6b1aa55c92 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1165,8 +1165,13 @@ static HRESULT WINAPI TaskSettings_get_Enabled(ITaskSettings *iface, VARIANT_BOO static HRESULT WINAPI TaskSettings_put_Enabled(ITaskSettings *iface, VARIANT_BOOL enabled) { - FIXME("%p,%d: stub\n", iface, enabled); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, enabled); + + taskset->enabled = enabled ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_DeleteExpiredTaskAfter(ITaskSettings *iface, BSTR *delay) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index f710219e98..fe54bff809 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1132,6 +1132,12 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_Enabled(set, test->enabled); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + if (!test->delete_expired_task_after[0]) + hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, NULL); + else + hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, test->delete_expired_task_after); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1141,12 +1147,6 @@ todo_wine return; } - if (!test->delete_expired_task_after[0]) - hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, NULL); - else - hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, test->delete_expired_task_after); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_Priority(set, test->priority); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 09/10] taskschd: Implement ITaskSettings_put_ExecutionTimeLimit.
by Hans Leidekker 22 Nov '17

22 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 10 +++++++++- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 7f44d383d5..3b02cb9dbc 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1138,8 +1138,16 @@ static HRESULT WINAPI TaskSettings_get_ExecutionTimeLimit(ITaskSettings *iface, static HRESULT WINAPI TaskSettings_put_ExecutionTimeLimit(ITaskSettings *iface, BSTR limit) { + TaskSettings *taskset = impl_from_ITaskSettings(iface); + BSTR str = NULL; + TRACE("%p,%s\n", iface, debugstr_w(limit)); - return E_NOTIMPL; + + if (limit && !(str = SysAllocString(limit))) return E_OUTOFMEMORY; + SysFreeString(taskset->execution_time_limit); + taskset->execution_time_limit = str; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_Enabled(ITaskSettings *iface, VARIANT_BOOL *enabled) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 9e3e3811c4..f710219e98 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1129,6 +1129,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); else hr = ITaskSettings_put_ExecutionTimeLimit(set, test->execution_time_limit); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_Enabled(set, test->enabled); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1138,9 +1141,6 @@ todo_wine return; } - hr = ITaskSettings_put_Enabled(set, test->enabled); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - if (!test->delete_expired_task_after[0]) hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, NULL); else -- 2.11.0

1 0

[PATCH 08/10] taskschd: Implement ITaskSettings_put_RunOnlyIfNetworkAvailable.
by Hans Leidekker 22 Nov '17

22 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 12 ++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 760a16ac2b..7f44d383d5 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1107,8 +1107,13 @@ static HRESULT WINAPI TaskSettings_get_RunOnlyIfNetworkAvailable(ITaskSettings * static HRESULT WINAPI TaskSettings_put_RunOnlyIfNetworkAvailable(ITaskSettings *iface, VARIANT_BOOL run) { - FIXME("%p,%d: stub\n", iface, run); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, run); + + taskset->run_only_if_network_available = run ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_ExecutionTimeLimit(ITaskSettings *iface, BSTR *limit) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 8a9099384c..9e3e3811c4 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1123,6 +1123,12 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_RunOnlyIfNetworkAvailable(set, test->run_only_if_network_available); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + if (!test->execution_time_limit[0]) + hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); + else + hr = ITaskSettings_put_ExecutionTimeLimit(set, test->execution_time_limit); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1132,12 +1138,6 @@ todo_wine return; } - if (!test->execution_time_limit[0]) - hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); - else - hr = ITaskSettings_put_ExecutionTimeLimit(set, test->execution_time_limit); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_Enabled(set, test->enabled); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 07/10] taskschd: Implement ITaskSettings_put_StartWhenAvailable.
by Hans Leidekker 22 Nov '17

22 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index c9e5bc67a9..760a16ac2b 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1071,8 +1071,13 @@ static HRESULT WINAPI TaskSettings_get_StartWhenAvailable(ITaskSettings *iface, static HRESULT WINAPI TaskSettings_put_StartWhenAvailable(ITaskSettings *iface, VARIANT_BOOL start) { - FIXME("%p,%d: stub\n", iface, start); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, start); + + taskset->start_when_available = start ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_XmlText(ITaskSettings *iface, BSTR *xml) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index ab061d543d..8a9099384c 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1120,6 +1120,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_StartWhenAvailable(set, test->start_when_available); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_RunOnlyIfNetworkAvailable(set, test->run_only_if_network_available); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1129,9 +1132,6 @@ todo_wine return; } - hr = ITaskSettings_put_RunOnlyIfNetworkAvailable(set, test->run_only_if_network_available); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - if (!test->execution_time_limit[0]) hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); else -- 2.11.0

1 0

[PATCH 06/10] taskschd: Implement ITaskSettings_put_AllowHardTerminate.
by Hans Leidekker 22 Nov '17

22 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index efb9b2bc0f..c9e5bc67a9 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1047,8 +1047,13 @@ static HRESULT WINAPI TaskSettings_get_AllowHardTerminate(ITaskSettings *iface, static HRESULT WINAPI TaskSettings_put_AllowHardTerminate(ITaskSettings *iface, VARIANT_BOOL allow) { - FIXME("%p,%d: stub\n", iface, allow); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, allow); + + taskset->allow_hard_terminate = allow ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_StartWhenAvailable(ITaskSettings *iface, VARIANT_BOOL *start) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 4d038e11d8..ab061d543d 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1117,6 +1117,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_AllowHardTerminate(set, test->allow_hard_terminate); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_StartWhenAvailable(set, test->start_when_available); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1126,9 +1129,6 @@ todo_wine return; } - hr = ITaskSettings_put_StartWhenAvailable(set, test->start_when_available); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_RunOnlyIfNetworkAvailable(set, test->run_only_if_network_available); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 05/10] taskschd: Implement ITaskSettings_put_DisallowStartIfOnBatteries.
by Hans Leidekker 22 Nov '17

22 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index e417c05382..efb9b2bc0f 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1023,8 +1023,13 @@ static HRESULT WINAPI TaskSettings_get_DisallowStartIfOnBatteries(ITaskSettings static HRESULT WINAPI TaskSettings_put_DisallowStartIfOnBatteries(ITaskSettings *iface, VARIANT_BOOL disallow) { - FIXME("%p,%d: stub\n", iface, disallow); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, disallow); + + taskset->disallow_start_if_on_batteries = disallow ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_AllowHardTerminate(ITaskSettings *iface, VARIANT_BOOL *allow) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index e2f85b1b73..4d038e11d8 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1114,6 +1114,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_DisallowStartIfOnBatteries(set, test->disallow_start_if_on_batteries); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_AllowHardTerminate(set, test->allow_hard_terminate); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1123,9 +1126,6 @@ todo_wine return; } - hr = ITaskSettings_put_AllowHardTerminate(set, test->allow_hard_terminate); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_StartWhenAvailable(set, test->start_when_available); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 04/10] taskschd: Implement ITaskSettings_put_StopIfGoingOnBatteries.
by Hans Leidekker 22 Nov '17

22 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 18 ++++++++++++++---- dlls/taskschd/tests/scheduler.c | 12 ++++++------ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 683a20c114..e417c05382 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -975,8 +975,13 @@ static HRESULT WINAPI TaskSettings_get_MultipleInstances(ITaskSettings *iface, T static HRESULT WINAPI TaskSettings_put_MultipleInstances(ITaskSettings *iface, TASK_INSTANCES_POLICY policy) { - FIXME("%p,%d: stub\n", iface, policy); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, policy); + + taskset->policy = policy; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_StopIfGoingOnBatteries(ITaskSettings *iface, VARIANT_BOOL *stop) @@ -994,8 +999,13 @@ static HRESULT WINAPI TaskSettings_get_StopIfGoingOnBatteries(ITaskSettings *ifa static HRESULT WINAPI TaskSettings_put_StopIfGoingOnBatteries(ITaskSettings *iface, VARIANT_BOOL stop) { - FIXME("%p,%d: stub\n", iface, stop); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, stop); + + taskset->stop_if_going_on_batteries = stop ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_DisallowStartIfOnBatteries(ITaskSettings *iface, VARIANT_BOOL *disallow) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index eac17340cd..e2f85b1b73 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1108,6 +1108,12 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_MultipleInstances(set, test->policy); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_StopIfGoingOnBatteries(set, test->stop_if_going_on_batteries); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_DisallowStartIfOnBatteries(set, test->disallow_start_if_on_batteries); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1117,12 +1123,6 @@ todo_wine return; } - hr = ITaskSettings_put_StopIfGoingOnBatteries(set, test->stop_if_going_on_batteries); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - - hr = ITaskSettings_put_DisallowStartIfOnBatteries(set, test->disallow_start_if_on_batteries); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_AllowHardTerminate(set, test->allow_hard_terminate); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 03/10] taskschd: Implement ITaskSettings_put_RestartCount.
by Hans Leidekker 22 Nov '17

22 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index e184ca813a..683a20c114 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -951,8 +951,13 @@ static HRESULT WINAPI TaskSettings_get_RestartCount(ITaskSettings *iface, INT *c static HRESULT WINAPI TaskSettings_put_RestartCount(ITaskSettings *iface, INT count) { - FIXME("%p,%d: stub\n", iface, count); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, count); + + taskset->restart_count = count; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_MultipleInstances(ITaskSettings *iface, TASK_INSTANCES_POLICY *policy) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 0e1c2ebc3d..eac17340cd 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1105,6 +1105,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_RestartCount(set, test->restart_count); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_MultipleInstances(set, test->policy); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1114,9 +1117,6 @@ todo_wine return; } - hr = ITaskSettings_put_MultipleInstances(set, test->policy); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_StopIfGoingOnBatteries(set, test->stop_if_going_on_batteries); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 01/10] taskschd: Return success from a couple of stubs.
by Hans Leidekker 22 Nov '17

22 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/regtask.c | 2 +- dlls/taskschd/task.c | 6 +++--- dlls/taskschd/tests/scheduler.c | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 10562fe08d..5c81821e69 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -181,7 +181,7 @@ static HRESULT WINAPI regtask_get_Enabled(IRegisteredTask *iface, VARIANT_BOOL * static HRESULT WINAPI regtask_put_Enabled(IRegisteredTask *iface, VARIANT_BOOL enabled) { FIXME("%p,%d: stub\n", iface, enabled); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI regtask_Run(IRegisteredTask *iface, VARIANT params, IRunningTask **task) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 6a1acc81eb..cca5414a3a 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -184,7 +184,7 @@ static HRESULT WINAPI DailyTrigger_put_StartBoundary(IDailyTrigger *iface, BSTR { DailyTrigger *This = impl_from_IDailyTrigger(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(start)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI DailyTrigger_get_EndBoundary(IDailyTrigger *iface, BSTR *end) @@ -212,7 +212,7 @@ static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOO { DailyTrigger *This = impl_from_IDailyTrigger(iface); FIXME("(%p)->(%x)\n", This, enabled); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI DailyTrigger_get_DaysInterval(IDailyTrigger *iface, short *days) @@ -711,7 +711,7 @@ static HRESULT WINAPI RegistrationInfo_get_SecurityDescriptor(IRegistrationInfo static HRESULT WINAPI RegistrationInfo_put_SecurityDescriptor(IRegistrationInfo *iface, VARIANT sddl) { FIXME("%p,%s: stub\n", iface, debugstr_variant(&sddl)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_Source(IRegistrationInfo *iface, BSTR *source) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index a71e1c151b..65287b3f24 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -890,7 +890,6 @@ todo_wine ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); hr = IRegisteredTask_put_Enabled(task1, VARIANT_TRUE); -todo_wine ok(hr == S_OK, "put_Enabled error %#x\n", hr); hr = IRegisteredTask_get_State(task1, &state); ok(hr == S_OK, "get_State error %#x\n", hr); -- 2.11.0

1 0

[PATCH] mshtml: Make sure actual host length matches returned BSTR length
by Nikolay Sivov 22 Nov '17

22 Nov '17

The issue our jscript gets confused by embedded NULs, something like --- var a = "prefix://" + document.location.host + "suffix"; --- can give "prefix://host:80\0\0\0suffix". Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/htmllocation.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index de66ff5670..59b20f614d 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -351,13 +351,16 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) if(url.nPort) { /* <hostname>:<port> */ const WCHAR format[] = {'%','u',0}; - DWORD len = url.dwHostNameLength + 1 + 5; + DWORD len, port_len; + WCHAR portW[6]; WCHAR *buf; + port_len = snprintfW(portW, sizeof(portW)/sizeof(portW[0]), format, url.nPort); + len = url.dwHostNameLength + 1 /* ':' */ + port_len; buf = *p = SysAllocStringLen(NULL, len); memcpy(buf, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); buf[url.dwHostNameLength] = ':'; - snprintfW(buf + url.dwHostNameLength + 1, 6, format, url.nPort); + memcpy(buf + url.dwHostNameLength + 1, portW, port_len * sizeof(WCHAR)); }else *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength); -- 2.15.0

2 1

[PATCH] wintrust: Version to 6.1.7601.23769.
by Jactry Zeng 22 Nov '17

22 Nov '17

Installer of Google drive will check wintrust's version to make sure Windows security update was installed. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/wintrust/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH] ole32: Rename structure member to target device size.
by Huw Davies 22 Nov '17

22 Nov '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 5 +++-- dlls/ole32/tests/ole2.c | 13 +++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 48453b4d52..0256957419 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -79,7 +79,8 @@ typedef struct PresentationDataHeader * DWORD length; * CHAR format_name[length]; (null-terminated) */ - DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ + DWORD tdSize; /* This is actually a truncated DVTARGETDEVICE, if tdSize > sizeof(DWORD) + then there are tdSize - sizeof(DWORD) more bytes before dvAspect */ DVASPECT dvAspect; DWORD lindex; DWORD advf; @@ -808,7 +809,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag if (cache_entry->fmtetc.ptd) FIXME("ptd not serialized\n"); - header.unknown3 = 4; + header.tdSize = sizeof(header.tdSize); header.dvAspect = cache_entry->fmtetc.dwAspect; header.lindex = cache_entry->fmtetc.lindex; header.advf = cache_entry->advise_flags; diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 07157a7dd6..a72985e239 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -143,7 +143,8 @@ typedef struct PresentationDataHeader * DWORD length; * CHAR format_name[length]; (null-terminated) */ - DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ + DWORD tdSize; /* This is actually a truncated DVTARGETDEVICE, if tdSize > sizeof(DWORD) + then there are tdSize - sizeof(DWORD) more bytes before dvAspect */ DVASPECT dvAspect; DWORD lindex; DWORD advf; @@ -1279,7 +1280,7 @@ static void test_OleLoad(IStorage *pStorage) break; } - header.unknown3 = 4; + header.tdSize = sizeof(header.tdSize); header.dvAspect = DVASPECT_CONTENT; header.lindex = -1; header.advf = 1 << i; @@ -3691,7 +3692,7 @@ static void test_data_cache_save(void) hr = IStream_Write(stm, clipformat, sizeof(clipformat), NULL); ok(hr == S_OK, "unexpected %#x\n", hr); - hdr.unknown3 = 4; + hdr.tdSize = sizeof(hdr.tdSize); hdr.dvAspect = DVASPECT_CONTENT; hdr.lindex = -1; hdr.advf = ADVF_PRIMEFIRST; @@ -3966,8 +3967,8 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ ok(bytes >= 24, "read %u bytes\n", bytes); if (winetest_debug > 1) - trace("header: unknown3 %#x, dvAspect %#x, lindex %#x, advf %#x, unknown7 %#x, dwObjectExtentX %#x, dwObjectExtentY %#x, dwSize %#x\n", - header.unknown3, header.dvAspect, header.lindex, header.advf, header.unknown7, + trace("header: tdSize %#x, dvAspect %#x, lindex %#x, advf %#x, unknown7 %#x, dwObjectExtentX %#x, dwObjectExtentY %#x, dwSize %#x\n", + header.tdSize, header.dvAspect, header.lindex, header.advf, header.unknown7, header.dwObjectExtentX, header.dwObjectExtentY, header.dwSize); } @@ -4049,7 +4050,7 @@ static IStorage *create_storage_from_def(const struct storage_def *stg_def) } ok(hr == S_OK, "unexpected %#x\n", hr); - hdr.unknown3 = 4; + hdr.tdSize = sizeof(hdr.tdSize); hdr.dvAspect = stg_def->stream[i].dvAspect; hdr.lindex = -1; hdr.advf = stg_def->stream[i].advf; -- 2.12.0

1 0

Wine Vulkan ICD repository
by Roderick Colenbrander 22 Nov '17

22 Nov '17

Hi all, I have created a temporary Wine fork containing my Vulkan ICD work at: https://github.com/roderickc/wine-vulkan The repo is meant to show the current design without having to spam wine-devel with a ton of patches. I rebased all my code and split it up well. There are a few hacky patches like x11 window support just for me to get some actual applications to work to test the ICD design. The last 3 or so patches contain a proof-of-concept for some of the 32-bit struct handling support. I have 32-bit support mostly working, but it required some changes to my script which I need to cleanup before I share it. Obviously the 32-bit work will be rebased across earlier patches in the series. The patches also include the Vulkan generation script I wrote. Parsing Vulkan is quite a pain due to all the structures and its object design. For this reason my parser is quite stateful, which made it more work to write, but now it is easy to generate code and do awful things like the 32-bit generation. Feel free to play around with the code. I added some instructions to the project. Currently 64-bit applications such as cube.exe, vulkaninfo.exe and vkquake.exe are known to work. 32-bit support is in progress, vulkaninfo.exe kind of works, but anything needing structure conversion will currently fail. Let me know your thoughts. Thanks, Roderick

2 3

[PATCH 7/7] wsdapi: Add body elements to Hello message.
by Owen Rudge 21 Nov '17

21 Nov '17

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-)

1 0

[PATCH 6/7] wsdapi: Add support for building types, scopes and xaddrs lists.
by Owen Rudge 21 Nov '17

21 Nov '17

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+)

1 0

[PATCH 5/7] wsdapi: Add support for duplicating XML elements passed into PublishEx function.
by Owen Rudge 21 Nov '17

21 Nov '17

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 114 ++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/wsdapi_internal.h | 5 ++ dlls/wsdapi/xml.c | 4 +- 3 files changed, 121 insertions(+), 2 deletions(-)

1 0

[PATCH 4/7] wsdapi: Build up SOAP message elements for Hello message.
by Owen Rudge 21 Nov '17

21 Nov '17

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-)

1 0

[PATCH 3/7] wsdapi: Populate SOAP header structure.
by Owen Rudge 21 Nov '17

21 Nov '17

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/Makefile.in | 2 +- dlls/wsdapi/soap.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 2 deletions(-)

1 0

[PATCH 2/7] wsdapi: Add stub implementation of IWSDiscoveryPublisher_PublishEx.
by Owen Rudge 21 Nov '17

21 Nov '17

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/Makefile.in | 1 + dlls/wsdapi/discovery.c | 64 ++++++++++++++++++------------------------- dlls/wsdapi/soap.c | 38 +++++++++++++++++++++++++ dlls/wsdapi/wsdapi_internal.h | 24 ++++++++++++++++ 4 files changed, 89 insertions(+), 38 deletions(-) create mode 100644 dlls/wsdapi/soap.c

1 0

[PATCH 1/7] wsdapi: Add wsdapi_internal.h for shared internal function and macro definitions.
by Owen Rudge 21 Nov '17

21 Nov '17

This patch series adds the initial implementation of the PublishEx function for the IWSDiscoveryPublisher interface. A large XML structure needs to be built up to create the message - the actual sending will follow in a further series. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/address.c | 6 +----- dlls/wsdapi/wsdapi_internal.h | 35 +++++++++++++++++++++++++++++++++++ dlls/wsdapi/xml.c | 7 +------ 3 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 dlls/wsdapi/wsdapi_internal.h

1 0

[PATCH] gphoto2.ds: Send notifications through the DSM.
by Vincent Povirk 21 Nov '17

21 Nov '17

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gphoto2.ds/gphoto2_i.h | 6 ++-- dlls/gphoto2.ds/gphoto2_main.c | 64 +++++++++++++++++++++++++++++++----------- 2 files changed, 49 insertions(+), 21 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index edc4d919fe8..9ab8bbbf33b 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -73,12 +73,10 @@ struct gphoto2_file { /* internal information about an active data source */ struct tagActiveDS { - TW_IDENTITY identity; /* identity */ + TW_IDENTITY identity; /* identity of the data source */ + TW_IDENTITY appIdentity; /* identity of the app */ TW_UINT16 currentState; /* current state */ - TW_EVENT pendingEvent; /* pending event to be sent to - application */ TW_UINT16 twCC; /* condition code */ - HWND hwndOwner; /* window handle of the app */ HWND progressWnd; /* window handle of the scanning window */ #ifdef HAVE_GPHOTO2 diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index acc3aa67892..28100414cc7 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +DSMENTRYPROC GPHOTO2_dsmentry; #ifdef HAVE_GPHOTO2 static char* GPHOTO2_StrDup(const char* str) @@ -295,11 +296,25 @@ static TW_UINT16 GPHOTO2_FileSystemRename (pTW_IDENTITY pOrigin, return TWRC_FAILURE; } +static void GPHOTO2_Notify (TW_UINT16 message) +{ + GPHOTO2_dsmentry (&activeDS.identity, &activeDS.appIdentity, DG_CONTROL, DAT_NULL, message, NULL); +} + +/* DG_CONTROL/DAT_ENTRYPOINT/MSG_SET */ +static TW_UINT16 GPHOTO2_SetEntryPoint (pTW_IDENTITY pOrigin, TW_MEMREF pData) +{ + TW_ENTRYPOINT *entry = (TW_ENTRYPOINT*)pData; + + GPHOTO2_dsmentry = entry->DSM_Entry; + + return TWRC_SUCCESS; +} + /* DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT */ static TW_UINT16 GPHOTO2_ProcessEvent (pTW_IDENTITY pOrigin, TW_MEMREF pData) { - TW_UINT16 twRC = TWRC_SUCCESS; pTW_EVENT pEvent = (pTW_EVENT) pData; TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT\n"); @@ -309,16 +324,9 @@ static TW_UINT16 GPHOTO2_ProcessEvent (pTW_IDENTITY pOrigin, return TWRC_FAILURE; } - if (activeDS.pendingEvent.TWMessage != MSG_NULL) { - pEvent->TWMessage = activeDS.pendingEvent.TWMessage; - activeDS.pendingEvent.TWMessage = MSG_NULL; - twRC = TWRC_SUCCESS; - } else { - pEvent->TWMessage = MSG_NULL; /* no message to the application */ - twRC = TWRC_NOTDSEVENT; - } + pEvent->TWMessage = MSG_NULL; /* no message to the application */ activeDS.twCC = TWCC_SUCCESS; - return twRC; + return TWRC_NOTDSEVENT; } /* DG_CONTROL/DAT_PASSTHRU/MSG_PASSTHRU */ @@ -356,7 +364,7 @@ static TW_UINT16 GPHOTO2_PendingXfersEndXfer (pTW_IDENTITY pOrigin, } else { activeDS.currentState = 5; /* Notify the application that it can close the data source */ - activeDS.pendingEvent.TWMessage = MSG_CLOSEDSREQ; + GPHOTO2_Notify(MSG_CLOSEDSREQ); /* close any Transferring dialog */ TransferringDialogBox(activeDS.progressWnd,-1); activeDS.progressWnd = 0; @@ -502,25 +510,23 @@ static TW_UINT16 GPHOTO2_EnableDSUserInterface (pTW_IDENTITY pOrigin, activeDS.twCC = TWCC_SEQERROR; return TWRC_FAILURE; } - activeDS.hwndOwner = pUserInterface->hParent; if (pUserInterface->ShowUI) { BOOL rc; activeDS.currentState = 5; /* Transitions to state 5 */ rc = DoCameraUI(); if (!rc) { - activeDS.pendingEvent.TWMessage = MSG_CLOSEDSREQ; + GPHOTO2_Notify(MSG_CLOSEDSREQ); } else { /* FIXME: The GUI should have marked the files to download... */ - activeDS.pendingEvent.TWMessage = MSG_XFERREADY; + GPHOTO2_Notify(MSG_XFERREADY); activeDS.currentState = 6; /* Transitions to state 6 directly */ } } else { /* no UI will be displayed, so source is ready to transfer data */ - activeDS.pendingEvent.TWMessage = MSG_XFERREADY; + GPHOTO2_Notify(MSG_XFERREADY); activeDS.currentState = 6; /* Transitions to state 6 directly */ } - activeDS.hwndOwner = pUserInterface->hParent; activeDS.twCC = TWCC_SUCCESS; return TWRC_SUCCESS; } @@ -704,6 +710,13 @@ static TW_UINT16 GPHOTO2_SourceControlHandler ( } break; + case DAT_ENTRYPOINT: + if (MSG == MSG_SET) + twRC = GPHOTO2_SetEntryPoint (pOrigin, pData); + else + twRC = TWRC_FAILURE; + break; + case DAT_EVENT: if (MSG == MSG_PROCESSEVENT) twRC = GPHOTO2_ProcessEvent (pOrigin, pData); @@ -1086,7 +1099,7 @@ GPHOTO2_GetIdentity( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { TRACE("%d cameras detected.\n", count); self->ProtocolMajor = TWON_PROTOCOLMAJOR; self->ProtocolMinor = TWON_PROTOCOLMINOR; - self->SupportedGroups = DG_CONTROL | DG_IMAGE; + self->SupportedGroups = DG_CONTROL | DG_IMAGE | DF_DS2; lstrcpynA (self->Manufacturer, "The Wine Team", sizeof(self->Manufacturer) - 1); lstrcpynA (self->ProductFamily, "GPhoto2 Camera", sizeof(self->ProductFamily) - 1); @@ -1111,6 +1124,21 @@ GPHOTO2_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { GPPortInfo info; const char *model, *port; + if (GPHOTO2_dsmentry == NULL) + { + static const WCHAR twain32W[] = {'t','w','a','i','n','_','3','2',0}; + HMODULE moddsm = GetModuleHandleW(twain32W); + + if (moddsm) + GPHOTO2_dsmentry = (void*)GetProcAddress(moddsm, "DSM_Entry"); + + if (!GPHOTO2_dsmentry) + { + ERR("can't find DSM entry point\n"); + return TWRC_FAILURE; + } + } + if (TWRC_SUCCESS != gphoto2_auto_detect()) return TWRC_FAILURE; @@ -1193,6 +1221,8 @@ GPHOTO2_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { activeDS.pixelflavor = TWPF_CHOCOLATE; activeDS.pixeltype = TWPT_RGB; activeDS.capXferMech = TWSX_MEMORY; + activeDS.identity.Id = self->Id; + activeDS.appIdentity = *pOrigin; TRACE("OK!\n"); return TWRC_SUCCESS; } -- 2.11.0

2 1

[PATCH] po: Wine Mono Installer - Change Mono to wine-mono for clarity
by Fabian Maurer 21 Nov '17

21 Nov '17

Tell the user that a "wine-mono package" is missing instead of a "Mono package" to make clear that not native mono is meant. Fixed Bug 44054. Note that I could fix the arabic translation, and that a few of the messages in other languages seem to be mistakenly about gecko. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/appwiz.cpl/appwiz.rc | 2 +- po/ar.po | 2 +- po/bg.po | 2 +- po/ca.po | 4 ++-- po/cs.po | 4 ++-- po/da.po | 2 +- po/de.po | 4 ++-- po/el.po | 2 +- po/en.po | 4 ++-- po/en_US.po | 4 ++-- po/eo.po | 2 +- po/es.po | 2 +- po/fa.po | 2 +- po/fi.po | 4 ++-- po/fr.po | 4 ++-- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 4 ++-- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 4 ++-- po/ko.po | 4 ++-- po/lt.po | 4 ++-- po/ml.po | 2 +- po/nb_NO.po | 4 ++-- po/nl.po | 4 ++-- po/or.po | 2 +- po/pa.po | 2 +- po/pl.po | 4 ++-- po/pt_BR.po | 4 ++-- po/pt_PT.po | 4 ++-- po/rm.po | 2 +- po/ro.po | 2 +- po/ru.po | 4 ++-- po/sk.po | 2 +- po/sl.po | 2 +- po/sr_RS(a)cyrillic.po | 2 +- po/sr_RS(a)latin.po | 2 +- po/sv.po | 4 ++-- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 4 ++-- po/uk.po | 4 ++-- po/wa.po | 2 +- po/wine.pot | 2 +- po/zh_CN.po | 4 ++-- po/zh_TW.po | 4 ++-- 47 files changed, 69 insertions(+), 69 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 049e1d88ef..5c8b31b525 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -114,7 +114,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Wine Mono Installer" FONT 8, "MS Shell Dlg" { - CONTROL "Wine could not find a Mono package which is needed for .NET applications " \ + CONTROL "Wine could not find a wine-mono package which is needed for .NET applications " \ "to work correctly. Wine can automatically download and install it for you.\n\n" \ "Note: it is recommended to use your distribution's packages instead. " \ "See <a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for details.", diff --git a/po/ar.po b/po/ar.po index a0d34bc16a..dc6d1e5771 100644 --- a/po/ar.po +++ b/po/ar.po @@ -158,7 +158,7 @@ msgstr "مُثبّت آلة مونو" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/bg.po b/po/bg.po index 8b8110e1eb..cd6bc0d95c 100644 --- a/po/bg.po +++ b/po/bg.po @@ -167,7 +167,7 @@ msgstr "" #: appwiz.rc:118 #, fuzzy msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/ca.po b/po/ca.po index 4421ec976d..11e3bcf172 100644 --- a/po/ca.po +++ b/po/ca.po @@ -165,14 +165,14 @@ msgstr "Instal·lador del Wine Mono" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"El Wine no ha pogut trobar un paquet del Mono que es necessita perquè les " +"El Wine no ha pogut trobar un paquet del wine-mono que es necessita perquè les " "aplicacions .NET funcionin correctament. El Wine el pot baixar i instal·lar " "automàticament per vós.\n" "\n" diff --git a/po/cs.po b/po/cs.po index 1f23cb570f..263bb6f1e2 100644 --- a/po/cs.po +++ b/po/cs.po @@ -163,14 +163,14 @@ msgstr "Instalátor Wine Mono" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine se nepodařilo najít balíček Mono potřebný pro správnou funkčnost .NET " +"Wine se nepodařilo najít balíček wine-mono potřebný pro správnou funkčnost .NET " "aplikací. Wine ho pro Vás může automaticky stáhnout a nainstalovat.\n" "\n" "Poznámka: Je doporučeno využít namísto toho balíček Vaší distribuce. Pro " diff --git a/po/da.po b/po/da.po index bff20ef8f9..75c78e1673 100644 --- a/po/da.po +++ b/po/da.po @@ -172,7 +172,7 @@ msgstr "Wine Gecko Installationsprogram" #| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " #| "for details." msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/de.po b/po/de.po index 8e8fe3de62..a5248c53d9 100644 --- a/po/de.po +++ b/po/de.po @@ -165,14 +165,14 @@ msgstr "Wine-Mono-Installation" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine konnte das Mono-Paket nicht finden. Es wird von .NET-Programmen " +"Wine konnte das wine-mono-Paket nicht finden. Es wird von .NET-Programmen " "benötigt, damit diese richtig funktionieren. Wine kann das Paket für Sie " "herunterladen und installieren.\n" "\n" diff --git a/po/el.po b/po/el.po index f20d19d286..3f2d9b7266 100644 --- a/po/el.po +++ b/po/el.po @@ -155,7 +155,7 @@ msgstr "" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/en.po b/po/en.po index 5a0695b732..54c82e3385 100644 --- a/po/en.po +++ b/po/en.po @@ -162,14 +162,14 @@ msgstr "Wine Mono Installer" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/en_US.po b/po/en_US.po index b5b19c3c54..019110477b 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -162,14 +162,14 @@ msgstr "Wine Mono Installer" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/eo.po b/po/eo.po index 22a251113a..8716f665ab 100644 --- a/po/eo.po +++ b/po/eo.po @@ -162,7 +162,7 @@ msgstr "Instalilo de Wine-Gecko" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/es.po b/po/es.po index f7c03701b6..46f02081d7 100644 --- a/po/es.po +++ b/po/es.po @@ -174,7 +174,7 @@ msgstr "Instalador Wine Gecko" #| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " #| "for details." msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/fa.po b/po/fa.po index bcb78c7427..f4b1651a92 100644 --- a/po/fa.po +++ b/po/fa.po @@ -155,7 +155,7 @@ msgstr "" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/fi.po b/po/fi.po index a0d39c0cb8..9cf9034aea 100644 --- a/po/fi.po +++ b/po/fi.po @@ -160,14 +160,14 @@ msgstr "Wine Mono -asennusohjelma" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine ei löytänyt Mono-pakettia, jota tarvitaan, jotta .NET-sovellukset " +"Wine ei löytänyt wine-mono-pakettia, jota tarvitaan, jotta .NET-sovellukset " "toimisivat oikein. Wine voi ladata ja asentaa sen puolestasi.\n" "\n" "Huomaa, että on suositeltavampaa käyttää oman jakelusi paketteja. " diff --git a/po/fr.po b/po/fr.po index cd923cbabf..ff8d965d07 100644 --- a/po/fr.po +++ b/po/fr.po @@ -164,14 +164,14 @@ msgstr "Programme d'installation de Mono pour Wine" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine n'a pu trouver de paquet Mono, qui est nécessaire pour que les " +"Wine n'a pu trouver de paquet wine-mono, qui est nécessaire pour que les " "applications .NET fonctionnent correctement. Wine peut automatiquement le " "télécharger et l'installer pour vous.\n" "\n" diff --git a/po/he.po b/po/he.po index f5b8771cde..f5f01e9e06 100644 --- a/po/he.po +++ b/po/he.po @@ -171,7 +171,7 @@ msgstr "התקנת Gecko על Wine" #: appwiz.rc:118 #, fuzzy msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/hi.po b/po/hi.po index 09aae732f5..e52b483f32 100644 --- a/po/hi.po +++ b/po/hi.po @@ -152,7 +152,7 @@ msgstr "" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/hr.po b/po/hr.po index 2c82d50691..604c45d6b7 100644 --- a/po/hr.po +++ b/po/hr.po @@ -162,14 +162,14 @@ msgstr "Wine Mono instalacijski program" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine nije uspio pronaći Mono paket koji je neophodan za ispravno " +"Wine nije uspio pronaći wine-mono paket koji je neophodan za ispravno " "funkcioniranje .NET aplikacija. Wine može automatski preuzeti i instalirati " "program.\n" "\n" diff --git a/po/hu.po b/po/hu.po index ab37d74986..29400cc318 100644 --- a/po/hu.po +++ b/po/hu.po @@ -175,7 +175,7 @@ msgstr "Wine Gecko telepítő" #| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " #| "for details." msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/it.po b/po/it.po index 5cba4110d2..e7ca3f76b5 100644 --- a/po/it.po +++ b/po/it.po @@ -180,7 +180,7 @@ msgstr "Installer di Wine Gecko" #| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " #| "for details." msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/ja.po b/po/ja.po index 4e7a24fc82..7cb1cace2a 100644 --- a/po/ja.po +++ b/po/ja.po @@ -163,14 +163,14 @@ msgstr "Wine Mono インストーラ" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Mono パッケージを見つけられません。このパッケージは .NET アプリケーションが正" +"wine-mono パッケージを見つけられません。このパッケージは .NET アプリケーションが正" "しく動作するために必要です。 Wine で Mono パッケージを自動的にダウンロード" "し、インストールできます。\n" "\n" diff --git a/po/ko.po b/po/ko.po index 26642216de..3af6b01984 100644 --- a/po/ko.po +++ b/po/ko.po @@ -161,14 +161,14 @@ msgstr "Wine Mono 설치관리자" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine은 닷넷 응용프로그램을 제대로 실행시키기 위해 필요한 Mono 패키지를 찾을 " +"Wine은 닷넷 응용프로그램을 제대로 실행시키기 위해 필요한 wine-mono 패키지를 찾을 " "수없습니다. Wine은 당신을 위해서 자동으로 다운로드하고 설치할 것입니다.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/lt.po b/po/lt.po index 6c4fc9cdf4..a4ec212b02 100644 --- a/po/lt.po +++ b/po/lt.po @@ -164,14 +164,14 @@ msgstr "„Wine“ „Mono“ diegimo programa" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"„Wine“ nepavyko rasti „Mono“ paketo reikalingo .NET programoms teisingai " +"„Wine“ nepavyko rasti „wine-mono“ paketo reikalingo .NET programoms teisingai " "veikti. „Wine“ gali automatiškai atsiųsti ir įdiegti šį paketą.\n" "\n" "Pastaba: rekomenduojama naudoti distribucijos paketus. Daugiau informacijos " diff --git a/po/ml.po b/po/ml.po index 9da616115f..243858d3d3 100644 --- a/po/ml.po +++ b/po/ml.po @@ -152,7 +152,7 @@ msgstr "" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/nb_NO.po b/po/nb_NO.po index 631f95faa5..192cc63996 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -163,14 +163,14 @@ msgstr "Installere Wine Mono" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine fant ikke Mono-pakken, som er nødvendig for at .NET programmer skal " +"Wine fant ikke wine-mono-pakken, som er nødvendig for at .NET programmer skal " "fungere ordentlig. Wine kan laste ned og installere denne pakken for deg.\n" "\n" "Merk: det anbefales at du bruker Mono-pakken som følger med operativsystemet " diff --git a/po/nl.po b/po/nl.po index 616dafa965..94bc1ea531 100644 --- a/po/nl.po +++ b/po/nl.po @@ -164,14 +164,14 @@ msgstr "Wine-Mono-Installatie" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine kon geen Mono-pakket vinden. Mono is nodig voor programma's die gebruik " +"Wine kon geen wine-mono-pakket vinden. Mono is nodig voor programma's die gebruik " "maken van het .NET raamwerk . Wine kan het automatisch voor u downloaden en " "installeren.\n" "\n" diff --git a/po/or.po b/po/or.po index f2cea1d5fe..c856b4b7f2 100644 --- a/po/or.po +++ b/po/or.po @@ -152,7 +152,7 @@ msgstr "" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/pa.po b/po/pa.po index 9ccdc45aff..4b31087c93 100644 --- a/po/pa.po +++ b/po/pa.po @@ -152,7 +152,7 @@ msgstr "" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/pl.po b/po/pl.po index 49316642a7..a889ce4c13 100644 --- a/po/pl.po +++ b/po/pl.po @@ -169,14 +169,14 @@ msgstr "Instalator Wine Mono" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Nie znaleziono paczki Mono potrzebnej do prawidłowego działania " +"Nie znaleziono paczki wine-mono potrzebnej do prawidłowego działania " "aplikacjiNET. Wine może sam pobrać i zainstalować tę paczkę dla ciebie.\n" "\n" "Uwaga: Zalecamy użycie paczki z twojej dystrybucji. Po szczegóły zajrzyj na " diff --git a/po/pt_BR.po b/po/pt_BR.po index f13e069883..80c045fef7 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -163,14 +163,14 @@ msgstr "Instalador Wine Mono" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"O Wine não pôde encontrar o pacote Mono que é necessário para aplicativos ." +"O Wine não pôde encontrar o pacote wine-mono que é necessário para aplicativos ." "NET funcionarem corretamente. O Wine pode automaticamente efetuar o download " "e instalá-lo para você.\n" "\n" diff --git a/po/pt_PT.po b/po/pt_PT.po index dc103da78c..b3c2d9ea76 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -163,14 +163,14 @@ msgstr "Instalador Wine Mono" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"O Wine não conseguiu encontrar o pacote Mono que é necessário para " +"O Wine não conseguiu encontrar o pacote wine-mono que é necessário para " "aplicações com HTML embutido funcionarem corretamente. O Wine pode " "automaticamente efetuar o download e instalá-lo por si.\n" "\n" diff --git a/po/rm.po b/po/rm.po index 565e31330d..61c6a494a2 100644 --- a/po/rm.po +++ b/po/rm.po @@ -157,7 +157,7 @@ msgstr "" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/ro.po b/po/ro.po index f8e6643c02..80f829849d 100644 --- a/po/ro.po +++ b/po/ro.po @@ -157,7 +157,7 @@ msgstr "Instalator Wine Mono" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/ru.po b/po/ru.po index 33c03756e7..412e00c31f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -165,14 +165,14 @@ msgstr "Установка Wine Mono" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine не может найти пакет Mono, который необходим для корректной работы .NET " +"Wine не может найти пакет wine-mono, который необходим для корректной работы .NET " "приложений. Wine может автоматически загрузить и установить его.\n" "\n" "Примечание: рекомендуется использовать пакет, предоставляемый вашим " diff --git a/po/sk.po b/po/sk.po index 894e057ee8..b02643089a 100644 --- a/po/sk.po +++ b/po/sk.po @@ -180,7 +180,7 @@ msgstr "Wine Gecko inštalátor" #| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " #| "for details." msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/sl.po b/po/sl.po index a76dbbf163..6622431efa 100644 --- a/po/sl.po +++ b/po/sl.po @@ -179,7 +179,7 @@ msgstr "Namestitev Wine Gecko" #| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " #| "for details." msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/sr_RS(a)cyrillic.po b/po/sr_RS(a)cyrillic.po index fea02fcf6f..12b0a1e0f0 100644 --- a/po/sr_RS(a)cyrillic.po +++ b/po/sr_RS(a)cyrillic.po @@ -165,7 +165,7 @@ msgstr "Wine Gecko инсталациони програм" #: appwiz.rc:118 #, fuzzy msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/sr_RS(a)latin.po b/po/sr_RS(a)latin.po index ce31e7ec76..a5f69674ec 100644 --- a/po/sr_RS(a)latin.po +++ b/po/sr_RS(a)latin.po @@ -165,7 +165,7 @@ msgstr "Wine Gecko instalacioni program" #: appwiz.rc:118 #, fuzzy msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/sv.po b/po/sv.po index 1cf205d819..d65aae8916 100644 --- a/po/sv.po +++ b/po/sv.po @@ -162,14 +162,14 @@ msgstr "Wine Mono Installationsprogram" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine kunde inte hitta paketet Mono vilket krävs för att .NET-program ska " +"Wine kunde inte hitta paketet wine-mono vilket krävs för att .NET-program ska " "fungera korrekt. Wine kan hämta och installera det automatiskt åt dig.\n" "\n" "Obs: Du rekommenderas att använda din distributions paket i stället. Se <a " diff --git a/po/te.po b/po/te.po index c570afc262..07d9814fb5 100644 --- a/po/te.po +++ b/po/te.po @@ -152,7 +152,7 @@ msgstr "" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/th.po b/po/th.po index 7803202cd8..eb576babed 100644 --- a/po/th.po +++ b/po/th.po @@ -156,7 +156,7 @@ msgstr "" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/tr.po b/po/tr.po index a41a663298..5cdc74a980 100644 --- a/po/tr.po +++ b/po/tr.po @@ -164,14 +164,14 @@ msgstr "Wine Mono Yükleyicisi" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine, .NET uygulamalarının düzgün çalışması için gerekli olan Mono paketini " +"Wine, .NET uygulamalarının düzgün çalışması için gerekli olan wine-mono paketini " "bulamadı. Wine, paketi sizin için otomatik indirip yükleyebilir.\n" "\n" "Not: kendi dağıtımınızın paketlerini kullanmanız önerilir. Ayrıntılar için " diff --git a/po/uk.po b/po/uk.po index 807b89a125..a5f036f7d1 100644 --- a/po/uk.po +++ b/po/uk.po @@ -161,14 +161,14 @@ msgstr "Встановлювач Wine Mono" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine не може знайти пакунок Mono, який потрібний для коректної роботи .NET " +"Wine не може знайти пакунок wine-mono, який потрібний для коректної роботи .NET " "додатків. Wine може автоматично завантажити та встановити його для Вас.\n" "\n" "Зауважте: Рекомендується використати пакет з вашого дистрибутиву. Детальніше " diff --git a/po/wa.po b/po/wa.po index 57f3192439..71f5fce284 100644 --- a/po/wa.po +++ b/po/wa.po @@ -159,7 +159,7 @@ msgstr "" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/wine.pot b/po/wine.pot index 856f3a255c..b91a85224b 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -147,7 +147,7 @@ msgstr "" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " diff --git a/po/zh_CN.po b/po/zh_CN.po index ba25385ae2..feffd4adec 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -156,14 +156,14 @@ msgstr "Wine Mono 安装器" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine 未找到到用于支持 .NET 应用的 Mono 组件。Wine 可以自动并下载安装它。\n" +"Wine 未找到到用于支持 .NET 应用的 wine-mono 组件。Wine 可以自动并下载安装它。\n" "\n" "注意: 推荐您安装为发行版定制的软件包。具体请参看 <a href=\"http://wiki." "winehq.org/Mono\">http://wiki.winehq.org/Mono</a>。" diff --git a/po/zh_TW.po b/po/zh_TW.po index 5ab509e821..9a1ad62005 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -158,14 +158,14 @@ msgstr "Wine Mono 安裝程式" #: appwiz.rc:118 msgid "" -"Wine could not find a Mono package which is needed for .NET applications to " +"Wine could not find a wine-mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" "\n" "Note: it is recommended to use your distribution's packages instead. See <a " "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine 需要安裝 Mono 套件才能正確執行 .NET 應用程式。Wine 可以自動幫您下載並安" +"Wine 需要安裝 wine-mono 套件才能正確執行 .NET 應用程式。Wine 可以自動幫您下載並安" "裝它。\n" "\n" "備註：建議您使用發行版所附的套件。詳情請見 <a href=\"http://wiki.winehq.org/" -- 2.15.0

1 0

[PATCH] hidclass: Properlly NULL terminate device_deviceid_fmtW
by Aric Stewart 21 Nov '17

21 Nov '17

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] gdiplus/tests: Some tests for GdipGetFontCollectionFamilyList() and system collection
by Nikolay Sivov 21 Nov '17

21 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/tests/font.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 2cae48192e..6c7738cf90 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -1110,6 +1110,60 @@ todo_wine DeleteDC(hdc); } +static void test_GdipGetFontCollectionFamilyList(void) +{ + GpFontFamily *family, *family2; + GpFontCollection *collection; + INT found, count; + GpStatus status; + + status = GdipNewInstalledFontCollection(&collection); + ok(status == Ok, "Failed to get system collection, status %d.\n", status); + + count = 0; + status = GdipGetFontCollectionFamilyCount(collection, &count); + ok(status == Ok, "Failed to get family count, status %d.\n", status); + ok(count > 0, "Unexpected empty collection.\n"); + + status = GdipGetFontCollectionFamilyList(NULL, 0, NULL, NULL); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + + found = 123; + status = GdipGetFontCollectionFamilyList(NULL, 0, NULL, &found); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + ok(found == 123, "Unexpected list count %d.\n", found); + + status = GdipGetFontCollectionFamilyList(collection, 0, NULL, NULL); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + + found = 123; + status = GdipGetFontCollectionFamilyList(collection, 0, NULL, &found); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + ok(found == 123, "Unexpected list count %d.\n", found); + + found = 123; + status = GdipGetFontCollectionFamilyList(collection, 1, NULL, &found); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + ok(found == 123, "Unexpected list count %d.\n", found); + + family = NULL; + found = 0; + status = GdipGetFontCollectionFamilyList(collection, 1, &family, &found); + ok(status == Ok, "Failed to get family list, status %d.\n", status); + ok(found == 1, "Unexpected list count %d.\n", found); + ok(family != NULL, "Expected family instance.\n"); + + family = NULL; + found = 0; + status = GdipGetFontCollectionFamilyList(collection, 1, &family2, &found); + ok(status == Ok, "Failed to get family list, status %d.\n", status); + ok(found == 1, "Unexpected list count %d.\n", found); + ok(family2 != family, "Unexpected family instance.\n"); + + GdipDeleteFontFamily(family); + GdipDeleteFontFamily(family2); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1139,6 +1193,7 @@ START_TEST(font) test_getgenerics(); test_installedfonts(); test_heightgivendpi(); + test_GdipGetFontCollectionFamilyList(); GdiplusShutdown(gdiplusToken); } -- 2.15.0

2 1

[PATCH] d2d1: Respond to ID2D1Image query
by Nikolay Sivov 21 Nov '17

21 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 1 + dlls/d2d1/tests/d2d1.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 6d9c352924..b03482ae43 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 3a28e38d67..4cc90b6272 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,10 @@ 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), "Failed to get ID2D1Image, hr %#x.\n", hr); + 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); -- 2.15.0

2 1

[PATCH] ole32/tests: Use a separate data source for the file dib to avoid confusion.
by Huw Davies 21 Nov '17

21 Nov '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/tests/ole2.c | 51 ++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 1a982b404c..07157a7dd6 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -199,19 +199,14 @@ static void inline check_expected_method_fmt(const char *method_name, const FORM } while (0) /* 2 x 1 x 32 bpp dib. PelsPerMeter = 200x400 */ -static BYTE dib[] = -{ - 0x42, 0x4d, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x28, 0x00, - - 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x00, - 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +static const BYTE dib[] = +{ + 0x28, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc8, 0x00, 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; static void create_dib( STGMEDIUM *med ) @@ -219,9 +214,9 @@ static void create_dib( STGMEDIUM *med ) void *ptr; med->tymed = TYMED_HGLOBAL; - U(med)->hGlobal = GlobalAlloc( GMEM_MOVEABLE, sizeof(dib) - sizeof(BITMAPFILEHEADER) ); + U(med)->hGlobal = GlobalAlloc( GMEM_MOVEABLE, sizeof(dib) ); ptr = GlobalLock( U(med)->hGlobal ); - memcpy( ptr, dib + sizeof(BITMAPFILEHEADER), sizeof(dib) - sizeof(BITMAPFILEHEADER) ); + memcpy( ptr, dib, sizeof(dib) ); GlobalUnlock( U(med)->hGlobal ); med->pUnkForRelease = NULL; } @@ -2038,9 +2033,21 @@ static void test_data_cache(void) IStorage_Release(pStorage); } - static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; +/* 2 x 1 x 32 bpp dib. PelsPerMeter = 200x400 */ +static BYTE file_dib[] = +{ + 0x42, 0x4d, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x28, 0x00, + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x00, + 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +}; + static IStorage *create_storage( int num ) { IStorage *stg; @@ -2056,10 +2063,10 @@ static IStorage *create_storage( int num ) ok( hr == S_OK, "got %08x\n", hr); if (num == 1) /* Set biXPelsPerMeter = 0 */ { - dib[0x26] = 0; - dib[0x27] = 0; + file_dib[0x26] = 0; + file_dib[0x27] = 0; } - hr = IStream_Write( stm, dib, sizeof(dib), &written ); + hr = IStream_Write( stm, file_dib, sizeof(file_dib), &written ); ok( hr == S_OK, "got %08x\n", hr); IStream_Release( stm ); return stg; @@ -2114,7 +2121,7 @@ static void test_data_cache_dib_contents_stream(int num) "got %lu\n", GlobalSize( U(med).hGlobal ) ); ptr = GlobalLock( U(med).hGlobal ); - expect_info = *(BITMAPINFOHEADER *)(dib + sizeof(BITMAPFILEHEADER)); + expect_info = *(BITMAPINFOHEADER *)(file_dib + sizeof(BITMAPFILEHEADER)); if (expect_info.biXPelsPerMeter == 0 || expect_info.biYPelsPerMeter == 0) { HDC hdc = GetDC( 0 ); @@ -2123,8 +2130,8 @@ static void test_data_cache_dib_contents_stream(int num) ReleaseDC( 0, hdc ); } ok( !memcmp( ptr, &expect_info, sizeof(expect_info) ), "mismatch\n" ); - ok( !memcmp( ptr + sizeof(expect_info), dib + sizeof(BITMAPFILEHEADER) + sizeof(expect_info), - sizeof(dib) - sizeof(BITMAPFILEHEADER) - sizeof(expect_info) ), "mismatch\n" ); + ok( !memcmp( ptr + sizeof(expect_info), file_dib + sizeof(BITMAPFILEHEADER) + sizeof(expect_info), + sizeof(file_dib) - sizeof(BITMAPFILEHEADER) - sizeof(expect_info) ), "mismatch\n" ); GlobalUnlock( U(med).hGlobal ); ReleaseStgMedium( &med ); -- 2.12.0

1 0

[PATCH] gdiplus/tests: Don't ignore successful tests.
by Zebediah Figura 21 Nov '17

21 Nov '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/gdiplus/tests/image.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0b444effb1..9aed7919a7 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4397,7 +4397,7 @@ static void test_DrawImage_scale(void) { 1.2, PixelOffsetModeHalf, image_120_half, TRUE }, { 1.5, PixelOffsetModeHalf, image_150_half, TRUE }, { 1.8, PixelOffsetModeHalf, image_180 }, - { 2.0, PixelOffsetModeHalf, image_200_half, TRUE }, + { 2.0, PixelOffsetModeHalf, image_200_half }, { 2.5, PixelOffsetModeHalf, image_250_half, TRUE }, { 0.8, PixelOffsetModeHighQuality, image_080 }, /* 21 */ @@ -4405,7 +4405,7 @@ static void test_DrawImage_scale(void) { 1.2, PixelOffsetModeHighQuality, image_120_half, TRUE }, { 1.5, PixelOffsetModeHighQuality, image_150_half, TRUE }, { 1.8, PixelOffsetModeHighQuality, image_180 }, - { 2.0, PixelOffsetModeHighQuality, image_200_half, TRUE }, + { 2.0, PixelOffsetModeHighQuality, image_200_half }, { 2.5, PixelOffsetModeHighQuality, image_250_half, TRUE }, }; BYTE src_2x1[6] = { 0x80,0x80,0x80,0x80,0x80,0x80 }; @@ -4450,15 +4450,15 @@ static void test_DrawImage_scale(void) expect(Ok, status); match = memcmp(dst_8x1, td[i].image, sizeof(dst_8x1)) == 0; - todo_wine_if (!match && td[i].todo) - ok(match, "%d: data should match\n", i); + todo_wine_if (td[i].todo) + ok(match, "%d: data didn't match:", i); if (!match) { UINT i, size = sizeof(dst_8x1); const BYTE *bits = dst_8x1; for (i = 0; i < size; i++) - trace(" %02x", bits[i]); - trace("\n"); + printf(" %02x", bits[i]); + printf("\n"); } } -- 2.15.0

3 4

[PATCH v2] user32: Reimplement TrackMouseEvent.
by Rafał Harabień 21 Nov '17

21 Nov '17

Improvements: - Don't use timer for TME_LEAVE and react immediately on mouse motion. It improves user experience for controls depending on this API like toolbar. - Fail when called with invalid flags - Hold tracking info for each win32 thread independently - Merge tracking requests if possible (leave+hover) - Return hover time 0 when hover tracking is disabled Patch v2 fixes compiler warnings and some style issues. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/user32/input.c | 234 ++++++++++++++++++++++++--------------------- dlls/user32/message.c | 5 + dlls/user32/tests/msg.c | 165 ++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 11 +++ dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 29 ++++++ dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + 8 files changed, 337 insertions(+), 112 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index c475b19..5b589a5 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1243,48 +1243,59 @@ BOOL WINAPI UnloadKeyboardLayout(HKL hkl) return USER_Driver->pUnloadKeyboardLayout(hkl); } -typedef struct __TRACKINGLIST { - TRACKMOUSEEVENT tme; - POINT pos; /* center of hover rectangle */ -} _TRACKINGLIST; -/* FIXME: move tracking stuff into a per thread data */ -static _TRACKINGLIST tracking_info; -static UINT_PTR timer; +void maybe_clean_tracking_info(struct tracking_info *tracking_info) +{ + if (!(tracking_info->tme.dwFlags & (TME_HOVER | TME_LEAVE))) + { + tracking_info->tme.hwndTrack = 0; + tracking_info->tme.dwFlags = 0; + } + if (!(tracking_info->tme.dwFlags & TME_HOVER)) + tracking_info->tme.dwHoverTime = 0; +} -static void check_mouse_leave(HWND hwnd, int hittest) +void check_mouse_leave(HWND hwnd, int hittest) { - if (tracking_info.tme.hwndTrack != hwnd) + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; + + TRACE("hwnd %p hittest %d\n", hwnd, hittest); + + if (!(tracking_info->tme.dwFlags & TME_LEAVE)) + return; + + if (tracking_info->tme.hwndTrack != hwnd) { - if (tracking_info.tme.dwFlags & TME_NONCLIENT) - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + if (tracking_info->tme.dwFlags & TME_NONCLIENT) + PostMessageW(tracking_info->tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); else - PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0); + PostMessageW(tracking_info->tme.hwndTrack, WM_MOUSELEAVE, 0, 0); /* remove the TME_LEAVE flag */ - tracking_info.tme.dwFlags &= ~TME_LEAVE; + tracking_info->tme.dwFlags &= ~TME_LEAVE; } else { if (hittest == HTCLIENT) { - if (tracking_info.tme.dwFlags & TME_NONCLIENT) + if (tracking_info->tme.dwFlags & TME_NONCLIENT) { - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + PostMessageW(tracking_info->tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); /* remove the TME_LEAVE flag */ - tracking_info.tme.dwFlags &= ~TME_LEAVE; + tracking_info->tme.dwFlags &= ~TME_LEAVE; } } else { - if (!(tracking_info.tme.dwFlags & TME_NONCLIENT)) + if (!(tracking_info->tme.dwFlags & TME_NONCLIENT)) { - PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0); + PostMessageW(tracking_info->tme.hwndTrack, WM_MOUSELEAVE, 0, 0); /* remove the TME_LEAVE flag */ - tracking_info.tme.dwFlags &= ~TME_LEAVE; + tracking_info->tme.dwFlags &= ~TME_LEAVE; } } } + maybe_clean_tracking_info(tracking_info); } static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, @@ -1292,6 +1303,7 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, { POINT pos; INT hoverwidth = 0, hoverheight = 0, hittest; + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; TRACE("hwnd %p, msg %04x, id %04lx, time %u\n", hwnd, uMsg, idEvent, dwTime); @@ -1304,31 +1316,24 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, SystemParametersInfoW(SPI_GETMOUSEHOVERHEIGHT, 0, &hoverheight, 0); TRACE("tracked pos %s, current pos %s, hover width %d, hover height %d\n", - wine_dbgstr_point(&tracking_info.pos), wine_dbgstr_point(&pos), + wine_dbgstr_point(&tracking_info->pos), wine_dbgstr_point(&pos), hoverwidth, hoverheight); - /* see if this tracking event is looking for TME_LEAVE and that the */ - /* mouse has left the window */ - if (tracking_info.tme.dwFlags & TME_LEAVE) - { - check_mouse_leave(hwnd, hittest); - } - - if (tracking_info.tme.hwndTrack != hwnd) + if (tracking_info->tme.hwndTrack != hwnd) { /* mouse is gone, stop tracking mouse hover */ - tracking_info.tme.dwFlags &= ~TME_HOVER; + tracking_info->tme.dwFlags &= ~TME_HOVER; } /* see if we are tracking hovering for this hwnd */ - if (tracking_info.tme.dwFlags & TME_HOVER) + if (tracking_info->tme.dwFlags & TME_HOVER) { /* has the cursor moved outside the rectangle centered around pos? */ - if ((abs(pos.x - tracking_info.pos.x) > (hoverwidth / 2)) || - (abs(pos.y - tracking_info.pos.y) > (hoverheight / 2))) + if ((abs(pos.x - tracking_info->pos.x) > (hoverwidth / 2)) || + (abs(pos.y - tracking_info->pos.y) > (hoverheight / 2))) { /* record this new position as the current position */ - tracking_info.pos = pos; + tracking_info->pos = pos; } else { @@ -1337,29 +1342,88 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, ScreenToClient(hwnd, &pos); TRACE("client cursor pos %s\n", wine_dbgstr_point(&pos)); - PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSEHOVER, + PostMessageW(tracking_info->tme.hwndTrack, WM_MOUSEHOVER, get_key_state(), MAKELPARAM( pos.x, pos.y )); } else { - if (tracking_info.tme.dwFlags & TME_NONCLIENT) - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSEHOVER, + if (tracking_info->tme.dwFlags & TME_NONCLIENT) + PostMessageW(tracking_info->tme.hwndTrack, WM_NCMOUSEHOVER, hittest, MAKELPARAM( pos.x, pos.y )); } /* stop tracking mouse hover */ - tracking_info.tme.dwFlags &= ~TME_HOVER; + tracking_info->tme.dwFlags &= ~TME_HOVER; } } /* stop the timer if the tracking list is empty */ - if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) + if (!(tracking_info->tme.dwFlags & TME_HOVER)) + { + KillSystemTimer(tracking_info->tme.hwndTrack, tracking_info->timer); + tracking_info->timer = 0; + } + maybe_clean_tracking_info(tracking_info); +} + +void track_mouse_event_internal(HWND hwnd_track, DWORD flags, DWORD hover_time) +{ + HWND hwnd; + POINT pos; + INT hittest; + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; + + if (flags & TME_HOVER) + { + /* if HOVER_DEFAULT or 0 was specified replace this with the system's current value. */ + if (hover_time == HOVER_DEFAULT || hover_time == 0) + SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); + } + + if (flags & TME_CANCEL) + { + if (tracking_info->tme.hwndTrack == hwnd_track) + { + /* cancel old tracking request */ + tracking_info->tme.dwFlags &= ~(flags & ~TME_CANCEL); + + /* if we aren't tracking on hover or leave remove this entry */ + if (!(tracking_info->tme.dwFlags & TME_HOVER) && tracking_info->timer) + { + KillSystemTimer(tracking_info->tme.hwndTrack, tracking_info->timer); + tracking_info->timer = 0; + } + maybe_clean_tracking_info(tracking_info); + } + } + else { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; + /* check what window is under cursor */ + GetCursorPos(&pos); + hwnd = WINPOS_WindowFromPoint(hwnd_track, pos, &hittest); + TRACE("point %s hwnd %p hittest %d\n", wine_dbgstr_point(&pos), hwnd, hittest); + + if (hwnd_track != hwnd) + PostMessageW(hwnd_track, WM_MOUSELEAVE, 0, 0); + else + { + /* save tracking request */ + tracking_info->tme.hwndTrack = hwnd_track; + tracking_info->tme.dwFlags |= flags; + if (flags & TME_HOVER) + tracking_info->tme.dwHoverTime = hover_time; + + /* Initialize HoverInfo variables even if not hover tracking */ + tracking_info->pos = pos; + + if (flags & TME_HOVER) + { + /* recreate timer */ + if (tracking_info->timer) + KillSystemTimer(tracking_info->tme.hwndTrack, tracking_info->timer); + tracking_info->timer = SetSystemTimer(tracking_info->tme.hwndTrack, (UINT_PTR)&tracking_info->tme, hover_time, TrackMouseEventProc); + } + } } } @@ -1389,23 +1453,30 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, BOOL WINAPI TrackMouseEvent (TRACKMOUSEEVENT *ptme) { - HWND hwnd; - POINT pos; - DWORD hover_time; - INT hittest; + DWORD invalid_flags; + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; TRACE("%x, %x, %p, %u\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); - if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) { + if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) + { WARN("wrong TRACKMOUSEEVENT size from app\n"); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + invalid_flags = ptme->dwFlags & ~(TME_QUERY | TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT); + if (invalid_flags != 0) + { + WARN("Unknown flag(s) %08x\n", invalid_flags); + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + /* fill the TRACKMOUSEEVENT struct with the current tracking for the given hwnd */ - if (ptme->dwFlags & TME_QUERY ) + if (ptme->dwFlags & TME_QUERY) { - *ptme = tracking_info.tme; + *ptme = tracking_info->tme; /* set cbSize in the case it's not initialized yet */ ptme->cbSize = sizeof(TRACKMOUSEEVENT); @@ -1418,68 +1489,11 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) return FALSE; } - hover_time = (ptme->dwFlags & TME_HOVER) ? ptme->dwHoverTime : HOVER_DEFAULT; - - /* if HOVER_DEFAULT was specified replace this with the system's current value. - * TME_LEAVE doesn't need to specify hover time so use default */ - if (hover_time == HOVER_DEFAULT || hover_time == 0) - SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); - - GetCursorPos(&pos); - hwnd = WINPOS_WindowFromPoint(ptme->hwndTrack, pos, &hittest); - TRACE("point %s hwnd %p hittest %d\n", wine_dbgstr_point(&pos), hwnd, hittest); - - if (ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)) - FIXME("Unknown flag(s) %08x\n", ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)); - - if (ptme->dwFlags & TME_CANCEL) - { - if (tracking_info.tme.hwndTrack == ptme->hwndTrack) - { - tracking_info.tme.dwFlags &= ~(ptme->dwFlags & ~TME_CANCEL); - - /* if we aren't tracking on hover or leave remove this entry */ - if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) - { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; - } - } - } else { - /* In our implementation it's possible that another window will receive a - * WM_MOUSEMOVE and call TrackMouseEvent before TrackMouseEventProc is - * called. In such a situation post the WM_MOUSELEAVE now */ - if (tracking_info.tme.dwFlags & TME_LEAVE && tracking_info.tme.hwndTrack != NULL) - check_mouse_leave(hwnd, hittest); - - if (timer) - { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; - } - - if (ptme->hwndTrack == hwnd) - { - /* Adding new mouse event to the tracking list */ - tracking_info.tme = *ptme; - tracking_info.tme.dwHoverTime = hover_time; - - /* Initialize HoverInfo variables even if not hover tracking */ - tracking_info.pos = pos; - - timer = SetSystemTimer(tracking_info.tme.hwndTrack, (UINT_PTR)&tracking_info.tme, hover_time, TrackMouseEventProc); - } - } - - return TRUE; + /* use internal message to get access to user_thread_info for tracked window */ + return SendNotifyMessageW(ptme->hwndTrack, WM_WINE_TRACKMOUSEEVENT, ptme->dwFlags, ptme->dwHoverTime); } + /*********************************************************************** * GetMouseMovePointsEx [USER32] * diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 406eff3..21710c3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1888,6 +1888,9 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return USER_Driver->pClipCursor( &rect ); } return USER_Driver->pClipCursor( NULL ); + case WM_WINE_TRACKMOUSEEVENT: + track_mouse_event_internal(hwnd, (DWORD)wparam, (DWORD)lparam); + return 0; default: if (msg >= WM_WINE_FIRST_DRIVER_MSG && msg <= WM_WINE_LAST_DRIVER_MSG) return USER_Driver->pWindowMessage( hwnd, msg, wparam, lparam ); @@ -2503,6 +2506,8 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H else { msg->hwnd = WINPOS_WindowFromPoint( msg->hwnd, msg->pt, &hittest ); + /* TrackMouseEvent support */ + check_mouse_leave(msg->hwnd, hittest); } if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd )) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 64c7967..0c7eb8e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7817,6 +7817,18 @@ static DWORD WINAPI thread_proc(void *param) while (GetMessageA(&msg, 0, 0, 0)) { + if ((msg.message == WM_TIMER || msg.message == WM_SYSTIMER) && msg.lParam) + { + struct recvd_message s_msg; + + s_msg.hwnd = msg.hwnd; + s_msg.message = msg.message; + s_msg.flags = sent|wparam|lparam; + s_msg.wParam = msg.wParam; + s_msg.lParam = msg.lParam; + s_msg.descr = "msg_loop"; + add_message(&s_msg); + } TranslateMessage(&msg); DispatchMessageA(&msg); } @@ -11938,6 +11950,11 @@ static const struct message WmMouseHoverSeq[] = { { 0 } }; +static const struct message WmMouseLeaveSeq[] = { + { WM_MOUSELEAVE, sent|wparam, 0 }, + { 0 } +}; + static void pump_msg_loop_timeout(DWORD timeout, BOOL inject_mouse_move) { MSG msg; @@ -11989,6 +12006,9 @@ static void test_TrackMouseEvent(void) HWND hwnd, hchild; RECT rc_parent, rc_child; UINT default_hover_time, hover_width = 0, hover_height = 0; + struct wnd_event wnd_event; + HANDLE hthread; + DWORD tid; #define track_hover(track_hwnd, track_hover_time) \ tme.cbSize = sizeof(tme); \ @@ -11999,6 +12019,15 @@ static void test_TrackMouseEvent(void) ret = pTrackMouseEvent(&tme); \ ok(ret, "TrackMouseEvent(TME_HOVER) error %d\n", GetLastError()) +#define track_leave(track_hwnd) \ + tme.cbSize = sizeof(tme); \ + tme.dwFlags = TME_LEAVE; \ + tme.hwndTrack = track_hwnd; \ + tme.dwHoverTime = 0xdeadbeef; \ + SetLastError(0xdeadbeef); \ + ret = pTrackMouseEvent(&tme); \ + ok(ret, "TrackMouseEvent(TME_LEAVE) error %d\n", GetLastError()); + #define track_query(expected_track_flags, expected_track_hwnd, expected_hover_time) \ tme.cbSize = sizeof(tme); \ tme.dwFlags = TME_QUERY; \ @@ -12024,6 +12053,15 @@ static void test_TrackMouseEvent(void) ret = pTrackMouseEvent(&tme); \ ok(ret, "TrackMouseEvent(TME_HOVER | TME_CANCEL) error %d\n", GetLastError()) +#define track_leave_cancel(track_hwnd) \ + tme.cbSize = sizeof(tme); \ + tme.dwFlags = TME_LEAVE | TME_CANCEL; \ + tme.hwndTrack = track_hwnd; \ + tme.dwHoverTime = 0xdeadbeef; \ + SetLastError(0xdeadbeef); \ + ret = pTrackMouseEvent(&tme); \ + ok(ret, "TrackMouseEvent(TME_LEAVE | TME_CANCEL) error %d\n", GetLastError()) + default_hover_time = 0xdeadbeef; SetLastError(0xdeadbeef); ret = SystemParametersInfoA(SPI_GETMOUSEHOVERTIME, 0, &default_hover_time, 0); @@ -12090,6 +12128,17 @@ static void test_TrackMouseEvent(void) ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || broken(GetLastError() == 0xdeadbeef), "not expected error %u\n", GetLastError()); + /* Invalid flags */ + tme.cbSize = sizeof(tme); + tme.dwFlags = ~TME_CANCEL; + tme.hwndTrack = hwnd; + tme.dwHoverTime = HOVER_DEFAULT; + SetLastError(0xdeadbeef); + ret = pTrackMouseEvent(&tme); + ok(!ret, "TrackMouseEvent should fail\n"); + ok(GetLastError() == ERROR_INVALID_FLAGS, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + GetWindowRect(hwnd, &rc_parent); GetWindowRect(hchild, &rc_child); SetCursorPos(rc_child.left - 10, rc_child.top - 10); @@ -12159,11 +12208,127 @@ static void test_TrackMouseEvent(void) track_query(TME_HOVER, hwnd, default_hover_time); track_hover_cancel(hwnd); + /* cursor is over child window */ + mouse_event(MOUSEEVENTF_MOVE, 20, 20, 0, 0); /* rc_child.left + 10, rc_child.top + 10 */ + flush_events(); + flush_sequence(); + + /* cancel TME_LEAVE */ + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(TME_LEAVE, hchild, 0); + track_leave_cancel(hchild); + track_query(0, NULL, 0); + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE); + + /* requests for the same window are merged */ + track_hover(hchild, HOVER_DEFAULT); + track_query(TME_HOVER, hchild, default_hover_time); + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(TME_LEAVE|TME_HOVER, hchild, default_hover_time); + track_hover_cancel(hchild); + track_query(TME_LEAVE, hchild, 0); + /* TME_LEAVE for window not being under cursor doesn't change TME_QUERY result */ + track_leave(hwnd); + track_query(TME_LEAVE, hchild, 0); + track_leave_cancel(hchild); + track_query(0, NULL, 0); + flush_events(); + flush_sequence(); + + /* try changing hover time */ + track_hover(hchild, 0); + track_query(TME_HOVER, hchild, default_hover_time); + track_hover(hchild, 1); + track_query(TME_HOVER, hchild, 1); + track_hover(hchild, HOVER_DEFAULT); + track_query(TME_HOVER, hchild, default_hover_time); + track_hover(hchild, default_hover_time*2); + track_query(TME_HOVER, hchild, default_hover_time*2); + track_hover_cancel(hchild); + + /* test TME_LEAVE */ + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(TME_LEAVE, hchild, 0); + ok(!GetCapture(), "expected NULL\n"); + mouse_event(MOUSEEVENTF_MOVE, -20, 0, 0, 0); /* rc_child.left - 10, rc_child.top + 10 */ + pump_msg_loop_timeout(0, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + track_query(0, NULL, 0); + + /* window is not under cursor - immediate WM_MOUSELEAVE is expected */ + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + pump_msg_loop_timeout(0, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + mouse_event(MOUSEEVENTF_MOVE, 20, 0, 0, 0); /* rc_child.left + 10, rc_child.top + 10 */ + flush_events(); + flush_sequence(); + + /* move cursor outside top-window */ + track_leave(hchild); + track_query(TME_LEAVE, hchild, 0); + mouse_event(MOUSEEVENTF_MOVE, 500, 0, 0, 0); /* rc_child.left + 510, rc_child.top + 10 */ + pump_msg_loop_timeout(0, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + track_query(0, NULL, 0); + DestroyWindow(hwnd); + /* Try tracking cursor over window from other thread */ + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + if (!wnd_event.start_event) + { + win_skip("CreateEventW failed\n"); + return; + } + hthread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); + ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); + SetCursorPos(150, 150); + ShowWindow(wnd_event.hwnd, SW_SHOW); + flush_events(); + flush_sequence(); + + /* window is under cursor */ + track_hover(wnd_event.hwnd, HOVER_DEFAULT); + track_query(0, NULL, 0); + pump_msg_loop_timeout(default_hover_time, TRUE); + ok_sequence(WmMouseHoverSeq, "WmMouseHoverSeq", FALSE); + + track_leave(wnd_event.hwnd); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE); + + /* window is not under cursor */ + SetCursorPos(600, 150); + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + track_leave(wnd_event.hwnd); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + ret = PostMessageA(wnd_event.hwnd, WM_QUIT, 0, 0); + ok( ret, "PostMessageA(WM_QUIT) error %d\n", GetLastError()); + ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hthread); + #undef track_hover #undef track_query +#undef track_leave #undef track_hover_cancel +#undef track_leave_cancel } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 052fdd8..efff279 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -53,6 +53,7 @@ enum wine_internal_message WM_WINE_KEYBOARD_LL_HOOK, WM_WINE_MOUSE_LL_HOOK, WM_WINE_CLIPCURSOR, + WM_WINE_TRACKMOUSEEVENT, WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ WM_WINE_LAST_DRIVER_MSG = 0x80001fff }; @@ -163,6 +164,13 @@ struct wm_char_mapping_data MSG get_msg; }; +/* data for TrackMouseEvent */ +struct tracking_info { + TRACKMOUSEEVENT tme; + POINT pos; /* center of hover rectangle */ + UINT_PTR timer; +}; + /* this is the structure stored in TEB->Win32ClientInfo */ /* no attempt is made to keep the layout compatible with the Windows one */ struct user_thread_info @@ -185,6 +193,7 @@ struct user_thread_info HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ RAWINPUT *rawinput; + struct tracking_info tracking_info; }; C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); @@ -225,6 +234,8 @@ struct tagWND; extern void CLIPBOARD_ReleaseOwner( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; +extern void check_mouse_leave(HWND hwnd, int hittest) DECLSPEC_HIDDEN; +extern void track_mouse_event_internal(HWND hwnd, DWORD flags, DWORD hover_time) DECLSPEC_HIDDEN; extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN; extern void invalidate_dce( struct tagWND *win, const RECT *rect ) DECLSPEC_HIDDEN; extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a0bfe05..cc8dac8 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -114,7 +114,7 @@ static x11drv_event_handler handlers[MAX_EVENT_HANDLERS] = X11DRV_ButtonRelease, /* 5 ButtonRelease */ X11DRV_MotionNotify, /* 6 MotionNotify */ X11DRV_EnterNotify, /* 7 EnterNotify */ - NULL, /* 8 LeaveNotify */ + X11DRV_LeaveNotify, /* 8 LeaveNotify */ X11DRV_FocusIn, /* 9 FocusIn */ X11DRV_FocusOut, /* 10 FocusOut */ X11DRV_KeymapNotify, /* 11 KeymapNotify */ diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5ace405..092c381 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1447,6 +1447,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) *pos = root_to_virtual_screen( winX, winY ); TRACE( "pointer at %s server pos %s\n", wine_dbgstr_point(pos), wine_dbgstr_point(&old) ); } + return ret; } @@ -1690,6 +1691,34 @@ BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) return TRUE; } +/*********************************************************************** + * X11DRV_LeaveNotify + */ +BOOL X11DRV_LeaveNotify( HWND hwnd, XEvent *xev ) +{ + XCrossingEvent *event = &xev->xcrossing; + INPUT input; + + TRACE( "hwnd %p/%lx pos %d,%d detail %d\n", hwnd, event->window, event->x, event->y, event->detail ); + + if (event->detail == NotifyVirtual) return FALSE; + if (hwnd == x11drv_thread_data()->grab_hwnd) return FALSE; + + /* simulate a mouse motion event - needed for TrackMouseEvent */ + input.u.mi.dx = event->x; + input.u.mi.dy = event->y; + input.u.mi.mouseData = 0; + input.u.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; + + /* Note: not calling is_old_motion_event because leave message is not simulated when warping cursor */ + + send_mouse_input( hwnd, event->window, event->state, &input ); + return TRUE; +} + + #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H /*********************************************************************** diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d35328c..2626c93 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -326,7 +326,7 @@ static int get_window_attributes( struct x11drv_win_data *data, XSetWindowAttrib attr->backing_store = NotUseful; attr->border_pixel = 0; attr->event_mask = (ExposureMask | PointerMotionMask | - ButtonPressMask | ButtonReleaseMask | EnterWindowMask | + ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | KeyPressMask | KeyReleaseMask | FocusChangeMask | KeymapStateMask | StructureNotifyMask); if (data->managed) attr->event_mask |= PropertyChangeMask; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 938ff22..1ee1c15 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -508,6 +508,7 @@ extern BOOL X11DRV_ButtonPress( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ButtonRelease( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_MotionNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_LeaveNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_DestroyNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; -- 2.7.4

2 1

[PATCH v2] comctl32/tests: Detect and handle an RTL locale.
by Alex Henrie 21 Nov '17

21 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes failures on Arabic and Hebrew Windows. v2: Use LOCALE_IREADINGLAYOUT, a Windows 7 feature, to detect RTL locales because it looks like Hebrew and Arabic propsheet resources didn't exist until Windows 7 anyway. --- dlls/comctl32/tests/propsheet.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index a3f910d2d5..ec53e6bc7c 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -29,11 +29,19 @@ static HWND parenthwnd; static HWND sheethwnd; +static BOOL rtl; static LONG active_page = -1; #define IDC_APPLY_BUTTON 12321 +static void detect_locale(void) +{ + DWORD reading_layout; + rtl = GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IREADINGLAYOUT | LOCALE_RETURN_NUMBER, + (void *)&reading_layout, sizeof(reading_layout)) && reading_layout == 1; +} + /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) { @@ -496,19 +504,28 @@ static void test_buttons(void) button = GetDlgItem(hdlg, IDCANCEL); GetWindowRect(button, &rc); ok(rc.top == top, "Cancel button should have same top as OK button\n"); - ok(rc.left > prevRight, "Cancel button should be to the right of OK button\n"); + if (rtl) + ok(rc.left < prevRight, "Cancel button should be to the left of OK button\n"); + else + ok(rc.left > prevRight, "Cancel button should be to the right of OK button\n"); prevRight = rc.right; button = GetDlgItem(hdlg, IDC_APPLY_BUTTON); GetWindowRect(button, &rc); ok(rc.top == top, "Apply button should have same top as OK button\n"); - ok(rc.left > prevRight, "Apply button should be to the right of Cancel button\n"); + if (rtl) + ok(rc.left < prevRight, "Apply button should be to the left of Cancel button\n"); + else + ok(rc.left > prevRight, "Apply button should be to the right of Cancel button\n"); prevRight = rc.right; button = GetDlgItem(hdlg, IDHELP); GetWindowRect(button, &rc); ok(rc.top == top, "Help button should have same top as OK button\n"); - ok(rc.left > prevRight, "Help button should be to the right of Apply button\n"); + if (rtl) + ok(rc.left < prevRight, "Help button should be to the left of Apply button\n"); + else + ok(rc.left > prevRight, "Help button should be to the right of Apply button\n"); DestroyWindow(hdlg); } @@ -1124,6 +1141,15 @@ static void test_CreatePropertySheetPage(void) START_TEST(propsheet) { + detect_locale(); + if (rtl) + { + /* use locale-specific RTL resources when on an RTL locale */ + /* without this, propsheets on RTL locales use English LTR resources */ + trace("RTL locale detected\n"); + SetProcessDefaultLayout(LAYOUT_RTL); + } + test_title(); test_nopage(); test_disableowner(); -- 2.15.0

1 0

[PATCH] comctl32/tests: Detect and handle an RTL locale.
by Alex Henrie 21 Nov '17

21 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes failures on Arabic and Hebrew Windows. I decided to check LOCALE_FONTSIGNATURE instead of LOCALE_IREADINGLAYOUT because LOCALE_FONTSIGNATURE is available on Windows XP. --- dlls/comctl32/tests/propsheet.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index a3f910d2d5..15ea083b63 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -29,11 +29,19 @@ static HWND parenthwnd; static HWND sheethwnd; +static BOOL rtl; static LONG active_page = -1; #define IDC_APPLY_BUTTON 12321 +static void detect_locale() +{ + LOCALESIGNATURE locale_sig; + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_FONTSIGNATURE, (void *)&locale_sig, sizeof(locale_sig)/sizeof(WCHAR)); + rtl = !!(locale_sig.lsUsb[3] & 0x08000000); +} + /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) { @@ -496,19 +504,28 @@ static void test_buttons(void) button = GetDlgItem(hdlg, IDCANCEL); GetWindowRect(button, &rc); ok(rc.top == top, "Cancel button should have same top as OK button\n"); - ok(rc.left > prevRight, "Cancel button should be to the right of OK button\n"); + if (rtl) + ok(rc.left < prevRight, "Cancel button should be to the left of OK button\n"); + else + ok(rc.left > prevRight, "Cancel button should be to the right of OK button\n"); prevRight = rc.right; button = GetDlgItem(hdlg, IDC_APPLY_BUTTON); GetWindowRect(button, &rc); ok(rc.top == top, "Apply button should have same top as OK button\n"); - ok(rc.left > prevRight, "Apply button should be to the right of Cancel button\n"); + if (rtl) + ok(rc.left < prevRight, "Apply button should be to the left of Cancel button\n"); + else + ok(rc.left > prevRight, "Apply button should be to the right of Cancel button\n"); prevRight = rc.right; button = GetDlgItem(hdlg, IDHELP); GetWindowRect(button, &rc); ok(rc.top == top, "Help button should have same top as OK button\n"); - ok(rc.left > prevRight, "Help button should be to the right of Apply button\n"); + if (rtl) + ok(rc.left < prevRight, "Help button should be to the left of Apply button\n"); + else + ok(rc.left > prevRight, "Help button should be to the right of Apply button\n"); DestroyWindow(hdlg); } @@ -1124,6 +1141,15 @@ static void test_CreatePropertySheetPage(void) START_TEST(propsheet) { + detect_locale(); + if (rtl) + { + /* use locale-specific RTL resources when on an RTL locale */ + /* without this, propsheets on RTL locales use English LTR resources */ + trace("RTL locale detected\n"); + SetProcessDefaultLayout(LAYOUT_RTL); + } + test_title(); test_nopage(); test_disableowner(); -- 2.15.0

2 1

[PATCH 1/3] winemac: Keep the result string in the IME UI window procedure.
by Akihiro Sagawa 20 Nov '17

20 Nov '17

This is winemac.drv port from winex11.drv. Please refer b8dc1e7cde64c212882958c0806b50911a360fb9. I've not tested this code, but I believe it works. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winemac.drv/ime.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)

3 4

[PATCH] wbemprox: Support NULL tests that use equality operators.
by Hans Leidekker 20 Nov '17

20 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/tests/query.c | 8 +++++++- dlls/wbemprox/wql.y | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 083a717185..79b09c0966 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -106,8 +106,14 @@ static void test_select( IWbemServices *services ) {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', 'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',' ','w','h','e','r','e',' ', 'a','v','a','i','l','a','b','i','l','i','t','y',' ','=',' ','\'','3','\'',0}; + static const WCHAR query12[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','I','O','S', + ' ','W','H','E','R','E',' ','N','A','M','E',' ','<','>',' ','N','U','L','L', 0}; + static const WCHAR query13[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','I','O','S', + ' ','W','H','E','R','E',' ','N','U','L','L',' ','=',' ','N','A','M','E', 0}; static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9, query10, - query11 }; + query11, query12, query13 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW ); diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 98b0378677..88da2b9b0f 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -414,6 +414,30 @@ expr: if (!$$) YYABORT; } + | prop_val TK_EQ TK_NULL + { + $$ = expr_unary( ctx, $1, OP_ISNULL ); + if (!$$) + YYABORT; + } + | TK_NULL TK_EQ prop_val + { + $$ = expr_unary( ctx, $3, OP_ISNULL ); + if (!$$) + YYABORT; + } + | prop_val TK_NE TK_NULL + { + $$ = expr_unary( ctx, $1, OP_NOTNULL ); + if (!$$) + YYABORT; + } + | TK_NULL TK_NE prop_val + { + $$ = expr_unary( ctx, $3, OP_NOTNULL ); + if (!$$) + YYABORT; + } ; string_val: -- 2.11.0

1 0

Re: [v1] kernel32/tests: Test suspended process with new thread
by Marvin 20 Nov '17

20 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=34265 Your paranoid android. === w7u (32 bit process) === process.c:2868: Test failed: WaitForSingleObject returned 258

1 0

[PATCH v2] comctl32: Don't create a masked imagelist if CLR_NONE is specified.
by Huw Davies 20 Nov '17

20 Nov '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/imagelist.c | 3 ++- dlls/comctl32/tests/imagelist.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 157344c633..70457c78f5 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2037,7 +2037,8 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow, nImageCount = dib.dsBm.bmWidth / cx; - himl = ImageList_Create (cx, dib.dsBm.bmHeight, ILC_MASK | color, nImageCount, cGrow); + if (clrMask != CLR_NONE) color |= ILC_MASK; + himl = ImageList_Create (cx, dib.dsBm.bmHeight, color, nImageCount, cGrow); if (!himl) { DeleteObject (handle); return NULL; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 20be1ea02f..a489176e01 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -39,6 +39,7 @@ #include "wine/test.h" #include "v6util.h" +#include "resources.h" #define IMAGELIST_MAGIC (('L' << 8) | 'I') @@ -67,6 +68,7 @@ static HRESULT (WINAPI *pImageList_CoCreateInstance)(REFCLSID,const IUnknown *, REFIID,void **); static HRESULT (WINAPI *pHIMAGELIST_QueryInterface)(HIMAGELIST,REFIID,void **); static int (WINAPI *pImageList_SetColorTable)(HIMAGELIST,int,int,RGBQUAD*); +static DWORD (WINAPI *pImageList_GetFlags)(HIMAGELIST); static HINSTANCE hinst; @@ -2237,6 +2239,26 @@ static void test_copy(void) ImageList_Destroy(src); } +static void test_loadimage(void) +{ + HIMAGELIST list; + DWORD flags; + + list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_DEFAULT, + IMAGE_BITMAP, LR_CREATEDIBSECTION ); + ok( list != NULL, "got %p\n", list ); + flags = pImageList_GetFlags( list ); + ok( flags == (ILC_COLOR4 | ILC_MASK), "got %08x\n", flags ); + ImageList_Destroy( list ); + + list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_NONE, + IMAGE_BITMAP, LR_CREATEDIBSECTION ); + ok( list != NULL, "got %p\n", list ); + flags = pImageList_GetFlags( list ); + ok( flags == ILC_COLOR4, "got %08x\n", flags ); + ImageList_Destroy( list ); +} + static void test_IImageList_Clone(void) { IImageList *imgl, *imgl2; @@ -2370,6 +2392,7 @@ START_TEST(imagelist) pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); pImageList_SetImageCount = (void*)GetProcAddress(hComCtl32, "ImageList_SetImageCount"); pImageList_SetColorTable = (void*)GetProcAddress(hComCtl32, (const char*)390); + pImageList_GetFlags = (void*)GetProcAddress(hComCtl32, "ImageList_GetFlags"); hinst = GetModuleHandleA(NULL); @@ -2388,6 +2411,7 @@ START_TEST(imagelist) test_color_table(ILC_COLOR4); test_color_table(ILC_COLOR8); test_copy(); + test_loadimage(); FreeLibrary(hComCtl32); -- 2.12.0

1 0

[PATCH] comctl32: Don't create a masked imagelist if CLR_NONE is specified.
by Huw Davies 20 Nov '17

20 Nov '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/imagelist.c | 9 +++++---- dlls/comctl32/tests/imagelist.c | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 157344c633..49151145cf 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2018,10 +2018,10 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow, if (uType == IMAGE_BITMAP) { DIBSECTION dib; - UINT color; + UINT flags; - if (GetObjectW (handle, sizeof(dib), &dib) == sizeof(BITMAP)) color = ILC_COLOR; - else color = dib.dsBm.bmBitsPixel; + if (GetObjectW (handle, sizeof(dib), &dib) == sizeof(BITMAP)) flags = ILC_COLOR; + else flags = dib.dsBm.bmBitsPixel; /* To match windows behavior, if cx is set to zero and the flag DI_DEFAULTSIZE is specified, cx becomes the @@ -2037,7 +2037,8 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow, nImageCount = dib.dsBm.bmWidth / cx; - himl = ImageList_Create (cx, dib.dsBm.bmHeight, ILC_MASK | color, nImageCount, cGrow); + if (clrMask != CLR_NONE) flags |= ILC_MASK; + himl = ImageList_Create (cx, dib.dsBm.bmHeight, flags, nImageCount, cGrow); if (!himl) { DeleteObject (handle); return NULL; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 20be1ea02f..a489176e01 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -39,6 +39,7 @@ #include "wine/test.h" #include "v6util.h" +#include "resources.h" #define IMAGELIST_MAGIC (('L' << 8) | 'I') @@ -67,6 +68,7 @@ static HRESULT (WINAPI *pImageList_CoCreateInstance)(REFCLSID,const IUnknown *, REFIID,void **); static HRESULT (WINAPI *pHIMAGELIST_QueryInterface)(HIMAGELIST,REFIID,void **); static int (WINAPI *pImageList_SetColorTable)(HIMAGELIST,int,int,RGBQUAD*); +static DWORD (WINAPI *pImageList_GetFlags)(HIMAGELIST); static HINSTANCE hinst; @@ -2237,6 +2239,26 @@ static void test_copy(void) ImageList_Destroy(src); } +static void test_loadimage(void) +{ + HIMAGELIST list; + DWORD flags; + + list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_DEFAULT, + IMAGE_BITMAP, LR_CREATEDIBSECTION ); + ok( list != NULL, "got %p\n", list ); + flags = pImageList_GetFlags( list ); + ok( flags == (ILC_COLOR4 | ILC_MASK), "got %08x\n", flags ); + ImageList_Destroy( list ); + + list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_NONE, + IMAGE_BITMAP, LR_CREATEDIBSECTION ); + ok( list != NULL, "got %p\n", list ); + flags = pImageList_GetFlags( list ); + ok( flags == ILC_COLOR4, "got %08x\n", flags ); + ImageList_Destroy( list ); +} + static void test_IImageList_Clone(void) { IImageList *imgl, *imgl2; @@ -2370,6 +2392,7 @@ START_TEST(imagelist) pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); pImageList_SetImageCount = (void*)GetProcAddress(hComCtl32, "ImageList_SetImageCount"); pImageList_SetColorTable = (void*)GetProcAddress(hComCtl32, (const char*)390); + pImageList_GetFlags = (void*)GetProcAddress(hComCtl32, "ImageList_GetFlags"); hinst = GetModuleHandleA(NULL); @@ -2388,6 +2411,7 @@ START_TEST(imagelist) test_color_table(ILC_COLOR4); test_color_table(ILC_COLOR8); test_copy(); + test_loadimage(); FreeLibrary(hComCtl32); -- 2.12.0

1 1

[PATCH] comctl32/tests: Fix propsheet template buffer size test on RTL locales
by Alex Henrie 20 Nov '17

20 Nov '17

Fixes test failures on Arabic and Hebrew Windows. For some reason, on these locales Windows uses a different formula for allocating the template buffer, allocating a little more than 2 times the resource size on Hebrew and a little less on Arabic. Because we don't know how exactly the buffer size is determined on these locales, just accept a size near 2 times the resource size. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/comctl32/tests/propsheet.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index a3f910d2d5..68dce519bb 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -58,16 +58,21 @@ static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) case PSCB_PRECREATE: { HMODULE module = GetModuleHandleA("comctl32.dll"); + HMODULE kernel32 = GetModuleHandleA("kernel32.dll"); + LANGID (WINAPI *pGetThreadUILanguage)(void) = (void *)GetProcAddress(kernel32, "GetThreadUILanguage"); DWORD size, buffer_size; HRSRC hrsrc; + int reading_layout; hrsrc = FindResourceA(module, MAKEINTRESOURCEA(1006 /* IDD_PROPSHEET */), (LPSTR)RT_DIALOG); size = SizeofResource(module, hrsrc); ok(size != 0, "Failed to get size of propsheet dialog resource\n"); buffer_size = HeapSize(GetProcessHeap(), 0, (void *)lparam); - ok(buffer_size == 2 * size, "Unexpected template buffer size %u, resource size %u\n", - buffer_size, size); + GetLocaleInfoA(pGetThreadUILanguage ? pGetThreadUILanguage() : GetUserDefaultUILanguage(), + LOCALE_IREADINGLAYOUT | LOCALE_RETURN_NUMBER, (void *)&reading_layout, sizeof(reading_layout)); + ok(reading_layout == 2 /* RTL */ ? abs(buffer_size - 2 * size) <= 32 : buffer_size == 2 * size, + "Unexpected template buffer size %u, resource size %u\n", buffer_size, size); break; } case PSCB_INITIALIZED: -- 2.15.0

4 7

[PATCH v4 1/2] gdi32: In AddFaceToList allow fonts with long names and add tests
by Fabian Maurer 19 Nov '17

19 Nov '17

v4 remove global variable don't check if functions are available fix RemoveFontResourceExA test properly release dc add another test for completeness sake Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdi32/freetype.c | 9 ++--- dlls/gdi32/tests/font.c | 54 ++++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 3 ++ dlls/gdi32/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_longname.ttf | Bin 0 -> 2252 bytes 5 files changed, 128 insertions(+), 4 deletions(-) create mode 100644 dlls/gdi32/tests/wine_longname.sfd create mode 100644 dlls/gdi32/tests/wine_longname.ttf diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 346e21dc21..8be1bfe22e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1571,6 +1571,9 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) face->family = family; family->refcount++; face->refcount++; + /* GDI32 can't deal with long names, truncate them */ + if (face->FullName && lstrlenW(face->FullName) > LF_FACESIZE - 1) + face->FullName[LF_FACESIZE - 1] = 0; return TRUE; } @@ -2143,10 +2146,8 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (strlenW(family->FamilyName) >= LF_FACESIZE) { - WARN("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); - release_face( face ); - release_family( family ); - return; + WARN("Truncating %s because name is too long\n", debugstr_w(family->FamilyName)); + family->FamilyName[LF_FACESIZE - 1] = 0; } if (insert_face_in_family_list( face, family )) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 299fadbab1..bd04a8b6b1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6679,6 +6679,59 @@ static void test_GetCharWidthI(void) ReleaseDC(0, hdc); } +static INT CALLBACK long_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lparam) +{ + BOOL *found_font = (BOOL *)lparam; + *found_font = TRUE; + return 1; +} + +static void test_long_names(void) +{ + char ttf_name[MAX_PATH]; + LOGFONTA font = {0}; + HFONT handle_font; + BOOL found_font; + int ret; + HDC dc; + + if (!write_ttf_file("wine_longname.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + dc = GetDC(NULL); + + ret = AddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + strcpy(font.lfFaceName, "wine_3_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(dc, &font, long_enum_proc, (LPARAM)&found_font, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_2_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(dc, &font, long_enum_proc, (LPARAM)&found_font, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_1_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(dc, &font, long_enum_proc, (LPARAM)&found_font, 0); + ok(found_font == FALSE, "EnumFontFamiliesExA must not find font.\n"); + + handle_font = CreateFontIndirectA(&font); + ok(handle_font != NULL, "CreateFontIndirectA failed\n"); + DeleteObject(handle_font); + + ret = RemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "RemoveFontResourceEx() failed\n"); + + DeleteFileA(ttf_name); + ReleaseDC(NULL, dc); +} + START_TEST(font) { init(); @@ -6742,6 +6795,7 @@ START_TEST(font) test_fake_bold_font(); test_bitmap_font_glyph_index(); test_GetCharWidthI(); + test_long_names(); /* These tests should be last test until RemoveFontResource * is properly implemented. diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index fdd95f687a..6dcbd42ab5 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -28,3 +28,6 @@ wine_vdmx.ttf RCDATA wine_vdmx.ttf /* @makedep: vertical.ttf */ vertical.ttf RCDATA vertical.ttf + +/* @makedep: wine_longname.ttf */ +wine_longname.ttf RCDATA wine_longname.ttf diff --git a/dlls/gdi32/tests/wine_longname.sfd b/dlls/gdi32/tests/wine_longname.sfd new file mode 100644 index 0000000000..998d7cc01f --- /dev/null +++ b/dlls/gdi32/tests/wine_longname.sfd @@ -0,0 +1,66 @@ +SplineFontDB: 3.0 +FontName: wine_1_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FullName: wine_2_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FamilyName: wine_3_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +Weight: Regular +Copyright: Copyright (c) 2017, Fabian Maurer +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102.4 +UnderlineWidth: 51.2 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 48 28337276 3092883] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1510948643 +ModificationTime: 1510949092 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +MarkAttachClasses: 1 +DEI: 91125 +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 64 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: at +Encoding: 64 64 0 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +259 332 m 29 + 468 664 l 29 + 514 332 l 29 + 259 332 l 29 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_longname.ttf b/dlls/gdi32/tests/wine_longname.ttf new file mode 100644 index 0000000000000000000000000000000000000000..59d9517560592e9578f1510f99f4fb65065c1195 GIT binary patch literal 2252 zcmdT`J!~6Q9RIz$vy(ze6NyY%=$Z!6pv1io)Gv83{V*L80j0`9(dA;F&nMYF>wHP- zEn;Fof`I`fHnvbz#A0FuAu(hCArJ#BOqEKh7`jo+@4dUk$yy{T-ueID|MR{7*WEJ& zfGKQ4$6Bp+W96OM-;M#3pOag9^~%*6X7McP4<-HDn`fNWg1-fb7U{Km$M4}p@gC`) z376`dsfju5T|h5UZiIfnHyUwgOuk2YGHef;-|P-8$`?uZT7lnq=Jxy@;=dElw#Xc#zZw1cxedX4gzAY&y=efL?(J5hOvrwuZIpI(0OX}12^z#O1y+79VSXp+l88^yVq z>1&$WDU)Thp*Y5YjkFYsS4CN=7*zQHj7|Gkqlb7uTg5%Nf*IFP;G7TX=fQZrd9}g% zR8iI4k&Bzk6Xnx^iU~o_=sBZSAeeKRcLk-~+X^YUbBRhOSA&nFtE`clM_=cf5XJEU zLdGKD@Hpb(VZj)e$N$fV>Sgwge9ki#P3BlQtbmRQly?QrRE84<?mN51!Y`Gft`Wtq zF4+ai9!?a+UzH(Kc;9hnPR_jO&YYSP(|_#kX*-Wr=d>ob6S`Pt$9*JoES@9zeOWAv z<-fm>$(zER{hHt;uH?8t6?b!7!-Tky<2v3Jk8<2VRr@u^3z*icIbLKR{UAHRko|Uv zkl}(o*35AYQ(_^<b$lsa$#DbQ+FLnZfT=&9<3()iZ{RXw^e{kz2q9WX*=46u#{yRe z7HpiuBJmpJTO4ujl3L-qL7RYp%W-dzL}4p6PuCYr$Fk2Ynl*nt^1J4WzmWt~*`j5a z+8$g&%5x(0iDk1-Y*XzuAl9ZwUHam2_R&#R(!!^mM|$5+kN(IVQ|iY@?3$z#azZqy z?J^E*Mcu%2y|fkeJ^p-eGe`zrJMM;_`~Xqlr(Q<};jNR3<4o3!6EAE;E_b-j!$Jn# zrX!5#dJt~3eIhmGZmQOV8i7h&nW-~zkuVP3QO^F?p=Vy$d=-{hOq=t5Sy79-X)R8| zz;w!%dC^o!avncP+`>M;WZO%!2M!ng$wZzN{a?fbtg@U5J2g^8Hd$2pM#$pI$D~4# z^rN_IT9#e5EQ_3Rz3nGb?<{Kj@vF#>%l^$V+UDEC51eEj8S=ss)H<cOf_KsQc0JDj V9#YOPqq5Ab)%@daq1MB9_dm8?dc^<$ literal 0 HcmV?d00001 -- 2.15.0

2 2

[PATCH v2] include: Add optional ANSI color codes for winetests and debug macros.
by Rafał Harabień 19 Nov '17

19 Nov '17

By default colors are disabled. Use WINETEST_COLOR=1 to enable colors in tests. Use WINEDEBUG_COLOR=1 to enable colors in debug messages. Second version of the patch fixes compiler warnings. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- include/wine/test.h | 14 ++++++++++++++ libs/wine/debug.c | 14 +++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 4ec66d5..3388414 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -206,6 +206,9 @@ const char *winetest_platform = "windows"; /* report successful tests (BOOL) */ static int report_success = 0; +/* use ANSI escape codes for output coloring */ +static int winetest_color = 0; + /* passing arguments around */ static int winetest_argc; static char** winetest_argv; @@ -303,14 +306,20 @@ int broken( int condition ) int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { struct tls_data *data = get_tls_data(); + const char *color_red = "\e[91m"; + const char *color_reset = "\e[39m"; if (data->todo_level) { if (condition) { + if (winetest_color) + printf("%s", color_red); printf( "%s:%d: Test succeeded inside todo block: ", data->current_file, data->current_line ); vprintf(msg, args); + if (winetest_color) + printf("%s", color_reset); InterlockedIncrement(&todo_failures); return 0; } @@ -330,9 +339,13 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { + if (winetest_color) + printf("%s", color_red); printf( "%s:%d: Test failed: ", data->current_file, data->current_line ); vprintf(msg, args); + if (winetest_color) + printf("%s", color_reset); InterlockedIncrement(&failures); return 0; } @@ -669,6 +682,7 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_COLOR", p, sizeof(p) )) winetest_color = atoi(p); if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 8b04ef9..af84e67 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -39,12 +39,14 @@ WINE_DECLARE_DEBUG_CHANNEL(pid); #endif static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; +static const char * const debug_classes_color[] = { "\e[93m", "\e[91m", "\e[93m", "" }; #define MAX_DEBUG_OPTIONS 256 static unsigned char default_flags = (1 << __WINE_DBCL_ERR) | (1 << __WINE_DBCL_FIXME); static int nb_debug_options = -1; static struct __wine_debug_channel debug_options[MAX_DEBUG_OPTIONS]; +static int debug_color = 0; static struct __wine_debug_functions funcs; @@ -193,7 +195,7 @@ static void debug_usage(void) /* initialize all options at startup */ static void debug_init(void) { - char *wine_debug; + char *wine_debug, *color; struct stat st1, st2; if (nb_debug_options != -1) return; /* already initialized */ @@ -212,6 +214,8 @@ static void debug_init(void) if (!strcmp( wine_debug, "help" )) debug_usage(); parse_options( wine_debug ); } + color = getenv("WINEDEBUG_COLOR"); + if (color != NULL) debug_color = atoi(color); } /* varargs wrapper for funcs.dbg_vprintf */ @@ -406,6 +410,7 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch const char *func, const char *format, va_list args ) { int ret = 0; + const char *color_reset = "\e[39m"; #if defined(__MINGW32__) || defined(_MSC_VER) if (TRACE_ON(pid)) @@ -414,9 +419,16 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); #endif if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) + { + if (debug_color) + ret += wine_dbg_printf( "%s", debug_classes_color[cls] ); ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func ); + } if (format) ret += funcs.dbg_vprintf( format, args ); + if (debug_color) + ret += wine_dbg_printf( "%s", color_reset ); + return ret; } -- 2.7.4

1 0

[PATCH v2 1/2] gdi32: In AddFaceToList allow fonts with long names and add tests
by Fabian Maurer 19 Nov '17

19 Nov '17

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdi32/freetype.c | 9 ++--- dlls/gdi32/tests/font.c | 51 ++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 3 ++ dlls/gdi32/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_longname.ttf | Bin 0 -> 2252 bytes 5 files changed, 125 insertions(+), 4 deletions(-) create mode 100644 dlls/gdi32/tests/wine_longname.sfd create mode 100644 dlls/gdi32/tests/wine_longname.ttf diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 346e21dc21..8be1bfe22e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1571,6 +1571,9 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) face->family = family; family->refcount++; face->refcount++; + /* GDI32 can't deal with long names, truncate them */ + if (face->FullName && lstrlenW(face->FullName) > LF_FACESIZE - 1) + face->FullName[LF_FACESIZE - 1] = 0; return TRUE; } @@ -2143,10 +2146,8 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (strlenW(family->FamilyName) >= LF_FACESIZE) { - WARN("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); - release_face( face ); - release_family( family ); - return; + WARN("Truncating %s because name is too long\n", debugstr_w(family->FamilyName)); + family->FamilyName[LF_FACESIZE - 1] = 0; } if (insert_face_in_family_list( face, family )) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 299fadbab1..acdaa02123 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6679,10 +6679,61 @@ static void test_GetCharWidthI(void) ReleaseDC(0, hdc); } +static BOOL found_font; +static INT CALLBACK long_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lparam) +{ + found_font = TRUE; + return 1; +} + +static void test_long_names(void) +{ + char ttf_name[MAX_PATH]; + LOGFONTA font = {0}; + HFONT handle_font; + int ret; + + if (!pAddFontResourceExA || !pRemoveFontResourceExA) + { + win_skip("AddFontResourceExA is not available on this platform\n"); + return; + } + + if (!write_ttf_file("wine_longname.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + ret = pAddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + strcpy(font.lfFaceName, "wine_3_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(GetDC(0), &font, long_enum_proc, 0, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_2_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(GetDC(0), &font, long_enum_proc, 0, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + handle_font = CreateFontIndirectA(&font); + ok(handle_font != NULL, "CreateFontIndirectA failed\n"); + DeleteObject(handle_font); + + + ret = pRemoveFontResourceExA(ttf_name, 0, 0); + ok(!ret, "RemoveFontResourceEx() should fail\n"); + + DeleteFileA(ttf_name); +} + START_TEST(font) { init(); + test_long_names(); test_stock_fonts(); test_logfont(); test_bitmap_font(); diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index fdd95f687a..6dcbd42ab5 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -28,3 +28,6 @@ wine_vdmx.ttf RCDATA wine_vdmx.ttf /* @makedep: vertical.ttf */ vertical.ttf RCDATA vertical.ttf + +/* @makedep: wine_longname.ttf */ +wine_longname.ttf RCDATA wine_longname.ttf diff --git a/dlls/gdi32/tests/wine_longname.sfd b/dlls/gdi32/tests/wine_longname.sfd new file mode 100644 index 0000000000..998d7cc01f --- /dev/null +++ b/dlls/gdi32/tests/wine_longname.sfd @@ -0,0 +1,66 @@ +SplineFontDB: 3.0 +FontName: wine_1_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FullName: wine_2_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FamilyName: wine_3_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +Weight: Regular +Copyright: Copyright (c) 2017, Fabian Maurer +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102.4 +UnderlineWidth: 51.2 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 48 28337276 3092883] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1510948643 +ModificationTime: 1510949092 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +MarkAttachClasses: 1 +DEI: 91125 +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 64 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: at +Encoding: 64 64 0 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +259 332 m 29 + 468 664 l 29 + 514 332 l 29 + 259 332 l 29 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_longname.ttf b/dlls/gdi32/tests/wine_longname.ttf new file mode 100644 index 0000000000000000000000000000000000000000..59d9517560592e9578f1510f99f4fb65065c1195 GIT binary patch literal 2252 zcmdT`J!~6Q9RIz$vy(ze6NyY%=$Z!6pv1io)Gv83{V*L80j0`9(dA;F&nMYF>wHP- zEn;Fof`I`fHnvbz#A0FuAu(hCArJ#BOqEKh7`jo+@4dUk$yy{T-ueID|MR{7*WEJ& zfGKQ4$6Bp+W96OM-;M#3pOag9^~%*6X7McP4<-HDn`fNWg1-fb7U{Km$M4}p@gC`) z376`dsfju5T|h5UZiIfnHyUwgOuk2YGHef;-|P-8$`?uZT7lnq=Jxy@;=dElw#Xc#zZw1cxedX4gzAY&y=efL?(J5hOvrwuZIpI(0OX}12^z#O1y+79VSXp+l88^yVq z>1&$WDU)Thp*Y5YjkFYsS4CN=7*zQHj7|Gkqlb7uTg5%Nf*IFP;G7TX=fQZrd9}g% zR8iI4k&Bzk6Xnx^iU~o_=sBZSAeeKRcLk-~+X^YUbBRhOSA&nFtE`clM_=cf5XJEU zLdGKD@Hpb(VZj)e$N$fV>Sgwge9ki#P3BlQtbmRQly?QrRE84<?mN51!Y`Gft`Wtq zF4+ai9!?a+UzH(Kc;9hnPR_jO&YYSP(|_#kX*-Wr=d>ob6S`Pt$9*JoES@9zeOWAv z<-fm>$(zER{hHt;uH?8t6?b!7!-Tky<2v3Jk8<2VRr@u^3z*icIbLKR{UAHRko|Uv zkl}(o*35AYQ(_^<b$lsa$#DbQ+FLnZfT=&9<3()iZ{RXw^e{kz2q9WX*=46u#{yRe z7HpiuBJmpJTO4ujl3L-qL7RYp%W-dzL}4p6PuCYr$Fk2Ynl*nt^1J4WzmWt~*`j5a z+8$g&%5x(0iDk1-Y*XzuAl9ZwUHam2_R&#R(!!^mM|$5+kN(IVQ|iY@?3$z#azZqy z?J^E*Mcu%2y|fkeJ^p-eGe`zrJMM;_`~Xqlr(Q<};jNR3<4o3!6EAE;E_b-j!$Jn# zrX!5#dJt~3eIhmGZmQOV8i7h&nW-~zkuVP3QO^F?p=Vy$d=-{hOq=t5Sy79-X)R8| zz;w!%dC^o!avncP+`>M;WZO%!2M!ng$wZzN{a?fbtg@U5J2g^8Hd$2pM#$pI$D~4# z^rN_IT9#e5EQ_3Rz3nGb?<{Kj@vF#>%l^$V+UDEC51eEj8S=ss)H<cOf_KsQc0JDj V9#YOPqq5Ab)%@daq1MB9_dm8?dc^<$ literal 0 HcmV?d00001 -- 2.15.0

4 11

[PATCH v3 1/2] gdi32: In AddFaceToList allow fonts with long names and add tests
by Fabian Maurer 18 Nov '17

18 Nov '17

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdi32/freetype.c | 9 ++--- dlls/gdi32/tests/font.c | 51 ++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 3 ++ dlls/gdi32/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_longname.ttf | Bin 0 -> 2252 bytes 5 files changed, 125 insertions(+), 4 deletions(-) create mode 100644 dlls/gdi32/tests/wine_longname.sfd create mode 100644 dlls/gdi32/tests/wine_longname.ttf diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 346e21dc21..8be1bfe22e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1571,6 +1571,9 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) face->family = family; family->refcount++; face->refcount++; + /* GDI32 can't deal with long names, truncate them */ + if (face->FullName && lstrlenW(face->FullName) > LF_FACESIZE - 1) + face->FullName[LF_FACESIZE - 1] = 0; return TRUE; } @@ -2143,10 +2146,8 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (strlenW(family->FamilyName) >= LF_FACESIZE) { - WARN("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); - release_face( face ); - release_family( family ); - return; + WARN("Truncating %s because name is too long\n", debugstr_w(family->FamilyName)); + family->FamilyName[LF_FACESIZE - 1] = 0; } if (insert_face_in_family_list( face, family )) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 299fadbab1..acdaa02123 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6679,10 +6679,61 @@ static void test_GetCharWidthI(void) ReleaseDC(0, hdc); } +static BOOL found_font; +static INT CALLBACK long_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lparam) +{ + found_font = TRUE; + return 1; +} + +static void test_long_names(void) +{ + char ttf_name[MAX_PATH]; + LOGFONTA font = {0}; + HFONT handle_font; + int ret; + + if (!pAddFontResourceExA || !pRemoveFontResourceExA) + { + win_skip("AddFontResourceExA is not available on this platform\n"); + return; + } + + if (!write_ttf_file("wine_longname.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + ret = pAddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + strcpy(font.lfFaceName, "wine_3_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(GetDC(0), &font, long_enum_proc, 0, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_2_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(GetDC(0), &font, long_enum_proc, 0, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + handle_font = CreateFontIndirectA(&font); + ok(handle_font != NULL, "CreateFontIndirectA failed\n"); + DeleteObject(handle_font); + + + ret = pRemoveFontResourceExA(ttf_name, 0, 0); + ok(!ret, "RemoveFontResourceEx() should fail\n"); + + DeleteFileA(ttf_name); +} + START_TEST(font) { init(); + test_long_names(); test_stock_fonts(); test_logfont(); test_bitmap_font(); diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index fdd95f687a..6dcbd42ab5 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -28,3 +28,6 @@ wine_vdmx.ttf RCDATA wine_vdmx.ttf /* @makedep: vertical.ttf */ vertical.ttf RCDATA vertical.ttf + +/* @makedep: wine_longname.ttf */ +wine_longname.ttf RCDATA wine_longname.ttf diff --git a/dlls/gdi32/tests/wine_longname.sfd b/dlls/gdi32/tests/wine_longname.sfd new file mode 100644 index 0000000000..998d7cc01f --- /dev/null +++ b/dlls/gdi32/tests/wine_longname.sfd @@ -0,0 +1,66 @@ +SplineFontDB: 3.0 +FontName: wine_1_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FullName: wine_2_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FamilyName: wine_3_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +Weight: Regular +Copyright: Copyright (c) 2017, Fabian Maurer +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102.4 +UnderlineWidth: 51.2 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 48 28337276 3092883] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1510948643 +ModificationTime: 1510949092 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +MarkAttachClasses: 1 +DEI: 91125 +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 64 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: at +Encoding: 64 64 0 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +259 332 m 29 + 468 664 l 29 + 514 332 l 29 + 259 332 l 29 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_longname.ttf b/dlls/gdi32/tests/wine_longname.ttf new file mode 100644 index 0000000000000000000000000000000000000000..59d9517560592e9578f1510f99f4fb65065c1195 GIT binary patch literal 2252 zcmdT`J!~6Q9RIz$vy(ze6NyY%=$Z!6pv1io)Gv83{V*L80j0`9(dA;F&nMYF>wHP- zEn;Fof`I`fHnvbz#A0FuAu(hCArJ#BOqEKh7`jo+@4dUk$yy{T-ueID|MR{7*WEJ& zfGKQ4$6Bp+W96OM-;M#3pOag9^~%*6X7McP4<-HDn`fNWg1-fb7U{Km$M4}p@gC`) z376`dsfju5T|h5UZiIfnHyUwgOuk2YGHef;-|P-8$`?uZT7lnq=Jxy@;=dElw#Xc#zZw1cxedX4gzAY&y=efL?(J5hOvrwuZIpI(0OX}12^z#O1y+79VSXp+l88^yVq z>1&$WDU)Thp*Y5YjkFYsS4CN=7*zQHj7|Gkqlb7uTg5%Nf*IFP;G7TX=fQZrd9}g% zR8iI4k&Bzk6Xnx^iU~o_=sBZSAeeKRcLk-~+X^YUbBRhOSA&nFtE`clM_=cf5XJEU zLdGKD@Hpb(VZj)e$N$fV>Sgwge9ki#P3BlQtbmRQly?QrRE84<?mN51!Y`Gft`Wtq zF4+ai9!?a+UzH(Kc;9hnPR_jO&YYSP(|_#kX*-Wr=d>ob6S`Pt$9*JoES@9zeOWAv z<-fm>$(zER{hHt;uH?8t6?b!7!-Tky<2v3Jk8<2VRr@u^3z*icIbLKR{UAHRko|Uv zkl}(o*35AYQ(_^<b$lsa$#DbQ+FLnZfT=&9<3()iZ{RXw^e{kz2q9WX*=46u#{yRe z7HpiuBJmpJTO4ujl3L-qL7RYp%W-dzL}4p6PuCYr$Fk2Ynl*nt^1J4WzmWt~*`j5a z+8$g&%5x(0iDk1-Y*XzuAl9ZwUHam2_R&#R(!!^mM|$5+kN(IVQ|iY@?3$z#azZqy z?J^E*Mcu%2y|fkeJ^p-eGe`zrJMM;_`~Xqlr(Q<};jNR3<4o3!6EAE;E_b-j!$Jn# zrX!5#dJt~3eIhmGZmQOV8i7h&nW-~zkuVP3QO^F?p=Vy$d=-{hOq=t5Sy79-X)R8| zz;w!%dC^o!avncP+`>M;WZO%!2M!ng$wZzN{a?fbtg@U5J2g^8Hd$2pM#$pI$D~4# z^rN_IT9#e5EQ_3Rz3nGb?<{Kj@vF#>%l^$V+UDEC51eEj8S=ss)H<cOf_KsQc0JDj V9#YOPqq5Ab)%@daq1MB9_dm8?dc^<$ literal 0 HcmV?d00001 -- 2.15.0

3 3

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 18 Nov '17

18 Nov '17

1 0

[PATCH] po: Update Russian translation
by Nikolay Sivov 18 Nov '17

18 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index c807f01858..33c03756e7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-11-15 17:25+0300\n" +"PO-Revision-Date: 2017-11-18 12:12+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -8922,10 +8922,8 @@ msgid " sec" msgstr " сек" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Выберите папку" +msgstr "Выберите источник" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" -- 2.15.0

1 0

[PATCH 2/2] gphoto2.ds: Set supported groups.
by Vincent Povirk 18 Nov '17

18 Nov '17

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gphoto2.ds/gphoto2_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index 437709001a5..acc3aa67892 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -1086,6 +1086,7 @@ GPHOTO2_GetIdentity( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { TRACE("%d cameras detected.\n", count); self->ProtocolMajor = TWON_PROTOCOLMAJOR; self->ProtocolMinor = TWON_PROTOCOLMINOR; + self->SupportedGroups = DG_CONTROL | DG_IMAGE; lstrcpynA (self->Manufacturer, "The Wine Team", sizeof(self->Manufacturer) - 1); lstrcpynA (self->ProductFamily, "GPhoto2 Camera", sizeof(self->ProductFamily) - 1); -- 2.11.0

2 1

What causes .NET Framework 4.5 to "subtly fail" on Windows Vista and higher?
by Alex Henrie 18 Nov '17

18 Nov '17

Hello, This question is mostly for Austin, but I am CC'ing the list in case anyone else knows the answer. I am trying to open a file created by ProPresenter <https://renewedvision.com/propresenter/download/>, a freely downloadable .NET Framework 4.5 app that requires Windows 8 or later. Mono is not good enough for this program. When Winetricks installs .NET 4.5 or 4.5.2, it prints the warning "Setting Windows version to 2003, otherwise applications using .NET 4.5 will subtly fail" <https://github.com/Winetricks/winetricks/blob/master/src/winetricks#L7095>. Indeed, setting the Windows version to 2003 allows ProPresenter to run just long enough to complain that Windows 8 or later is required and exit. With the Windows version set to 8, ProPresenter goes into an infinite loop calling Context_CC_ContextCallback. What is the subtle bug here? Does it have to do with Context_CC_ContextCallback, or is that just a distraction? -Alex

2 2

[PATCH] advapi32: add initial Perf* stubs (try 2)
by Austin English 17 Nov '17

17 Nov '17

This time, with missing perflib.h Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/advapi32/Makefile.in | 1 + dlls/advapi32/advapi32.spec | 14 ++++----- dlls/advapi32/perf.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ include/perflib.h | 63 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 142 insertions(+), 7 deletions(-) create mode 100644 dlls/advapi32/perf.c create mode 100644 include/perflib.h diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index ff6452a91b..224286f28c 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ crypt_sha.c \ eventlog.c \ lsa.c \ + perf.c \ registry.c \ security.c \ service.c \ diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 359efc9ad1..4645f3c573 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -553,11 +553,11 @@ # @ stub OperationStart # @ stub PerfAddCounters # @ stub PerfCloseQueryHandle -# @ stub PerfCreateInstance +@ stdcall PerfCreateInstance(long ptr wstr long) # @ stub PerfDecrementULongCounterValue # @ stub PerfDecrementULongLongCounterValue # @ stub PerfDeleteCounters -# @ stub PerfDeleteInstance +@ stdcall PerfDeleteInstance(long ptr) # @ stub PerfEnumerateCounterSet # @ stub PerfEnumerateCounterSetInstances # @ stub PerfIncrementULongCounterValue @@ -573,13 +573,13 @@ # @ stub PerfRegQueryInfoKey # @ stub PerfRegQueryValue # @ stub PerfRegSetValue -# @ stub PerfSetCounterRefValue -# @ stub PerfSetCounterSetInfo +@ stdcall PerfSetCounterRefValue(long ptr long ptr) +@ stdcall PerfSetCounterSetInfo(long ptr long) # @ stub PerfSetULongCounterValue # @ stub PerfSetULongLongCounterValue -# @ stub PerfStartProvider -# @ stub PerfStartProviderEx -# @ stub PerfStopProvider +@ stdcall PerfStartProvider(ptr ptr ptr) +@ stdcall PerfStartProviderEx(ptr ptr ptr) +@ stdcall PerfStopProvider(long) @ stdcall PrivilegeCheck(ptr ptr ptr) @ stdcall PrivilegedServiceAuditAlarmA(str str long ptr long) @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) diff --git a/dlls/advapi32/perf.c b/dlls/advapi32/perf.c new file mode 100644 index 0000000000..754af2a89b --- /dev/null +++ b/dlls/advapi32/perf.c @@ -0,0 +1,71 @@ +/* + * advapi32 perf functions + * + * Copyright 2017 Austin English + * + * 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 <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "perflib.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); + +PPERF_COUNTERSET_INSTANCE WINAPI PerfCreateInstance(HANDLE handle, LPCGUID guid, const WCHAR *name, ULONG id) +{ + FIXME("%p %s %s %u: stub\n", handle, debugstr_guid(guid), debugstr_w(name), id); + return NULL; +} + +ULONG WINAPI PerfDeleteInstance(HANDLE provider, PPERF_COUNTERSET_INSTANCE block) +{ + FIXME("%p %p: stub\n", provider, block); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfSetCounterSetInfo(HANDLE handle, PPERF_COUNTERSET_INFO template, ULONG size) +{ + FIXME("%p %p %u: stub\n", handle, template, size); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PPERF_COUNTERSET_INSTANCE instance, ULONG counterid, void *address) +{ + FIXME("%p %p %u %p: stub\n", provider, instance, counterid, address); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfStartProvider(GUID *guid, PERFLIBREQUEST callback, HANDLE *provider) +{ + FIXME("%s %p %p: stub\n", debugstr_guid(guid), callback, provider); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HANDLE *provider) +{ + FIXME("%s %p %p: stub\n", debugstr_guid(guid), context, provider); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfStopProvider(HANDLE handle) +{ + FIXME("%p: stub\n", handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/perflib.h b/include/perflib.h new file mode 100644 index 0000000000..9a4d8db64b --- /dev/null +++ b/include/perflib.h @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2017 Austin English + * + * 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 + */ + +#ifndef _PERFLIB_H_ +#define _PERFLIB_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef LPVOID (* PERF_MEM_ALLOC)(IN SIZE_T AllocSize, IN LPVOID pContext); +typedef void (* PERF_MEM_FREE)(IN LPVOID pBuffer, IN LPVOID pContext); + +typedef ULONG (WINAPI* PERFLIBREQUEST)( + IN ULONG RequestCode, + IN PVOID Buffer, + IN ULONG BufferSize +); + +typedef struct _PERF_COUNTERSET_INFO { + GUID CounterSetGuid; + GUID ProviderGuid; + ULONG NumCounters; + ULONG InstanceType; +} PERF_COUNTERSET_INFO, * PPERF_COUNTERSET_INFO; + +typedef struct _PERF_COUNTERSET_INSTANCE { + GUID CounterSetGuid; + ULONG dwSize; + ULONG InstanceId; + ULONG InstanceNameOffset; + ULONG InstanceNameSize; +} PERF_COUNTERSET_INSTANCE, * PPERF_COUNTERSET_INSTANCE; + +typedef struct _PROVIDER_CONTEXT { + DWORD ContextSize; + DWORD Reserved; + PERFLIBREQUEST ControlCallback; + PERF_MEM_ALLOC MemAllocRoutine; + PERF_MEM_FREE MemFreeRoutine; + LPVOID pMemContext; +} PERF_PROVIDER_CONTEXT, * PPERF_PROVIDER_CONTEXT; + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _PERFLIB_H_ */ -- 2.13.6

1 0

[PATCH] gdiplus: In GdipPrivateAddMemoryFont allow loading fonts with long names
by Fabian Maurer 17 Nov '17

17 Nov '17

Fixes Bug 43956. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdiplus/font.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index ccf93ed395..f99b026b25 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1393,33 +1393,36 @@ static int match_name_table_language( const tt_name_record *name, LANGID lang ) return 0; } -static WCHAR *copy_name_table_string( const tt_name_record *name, const BYTE *data, WCHAR *ret, DWORD len ) +static WCHAR *copy_name_table_string( const tt_name_record *name, const BYTE *data ) { WORD name_len = GET_BE_WORD(name->length); WORD codepage; + WCHAR *ret; + int len; switch (GET_BE_WORD(name->platform_id)) { case TT_PLATFORM_APPLE_UNICODE: case TT_PLATFORM_MICROSOFT: - if (name_len >= len*sizeof(WCHAR)) - return NULL; + ret = heap_alloc((name_len / 2 + 1) * sizeof(WCHAR)); for (len = 0; len < name_len / 2; len++) ret[len] = (data[len * 2] << 8) | data[len * 2 + 1]; ret[len] = 0; return ret; case TT_PLATFORM_MACINTOSH: codepage = get_mac_code_page( name ); - len = MultiByteToWideChar( codepage, 0, (char *)data, name_len, ret, len-1 ); + len = MultiByteToWideChar( codepage, 0, (char *)data, name_len, NULL, 0 ) + 1; if (!len) return NULL; + ret = heap_alloc(len * sizeof(WCHAR)); + len = MultiByteToWideChar( codepage, 0, (char *)data, name_len, ret, len - 1 ); ret[len] = 0; return ret; } return NULL; } -static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id, WCHAR *ret, DWORD len ) +static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) { LANGID lang = GetSystemDefaultLangID(); const tt_header *header; @@ -1480,8 +1483,9 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id, WCHAR if (best_lang) { + WCHAR *ret; name_record = (const tt_name_record*)(name_table + 1) + best_index; - ret = copy_name_table_string( name_record, mem+ofs+GET_BE_WORD(name_record->offset), ret, len ); + ret = copy_name_table_string( name_record, mem+ofs+GET_BE_WORD(name_record->offset) ); TRACE( "name %u found platform %u lang %04x %s\n", GET_BE_WORD(name_record->name_id), GET_BE_WORD(name_record->platform_id), GET_BE_WORD(name_record->language_id), debugstr_w( ret )); return ret; @@ -1497,43 +1501,45 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, D GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, GDIPCONST void* memory, INT length) { - WCHAR buf[32], *name; + WCHAR *name; DWORD count = 0; HANDLE font; + GpStatus ret = Ok; TRACE("%p, %p, %d\n", fontCollection, memory, length); if (!fontCollection || !memory || !length) return InvalidParameter; - name = load_ttf_name_id(memory, length, NAME_ID_FULL_FONT_NAME, buf, sizeof(buf)/sizeof(*buf)); + name = load_ttf_name_id(memory, length, NAME_ID_FULL_FONT_NAME); if (!name) return OutOfMemory; font = AddFontMemResourceEx((void*)memory, length, NULL, &count); TRACE("%s: %p/%u\n", debugstr_w(name), font, count); if (!font || !count) - return InvalidParameter; - - if (count) + ret = InvalidParameter; + else { HDC hdc; LOGFONTW lfw; hdc = CreateCompatibleDC(0); + /* Truncate name if necessary, GDI32 can't deal with long names */ + if(lstrlenW(name) > LF_FACESIZE - 1) + name[LF_FACESIZE - 1] = 0; + lfw.lfCharSet = DEFAULT_CHARSET; lstrcpyW(lfw.lfFaceName, name); lfw.lfPitchAndFamily = 0; if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)fontCollection, 0)) - { - DeleteDC(hdc); - return OutOfMemory; - } + ret = OutOfMemory; DeleteDC(hdc); } - return Ok; + heap_free(name); + return ret; } /***************************************************************************** -- 2.15.0

2 2

[PATCH v2] shell32/tests: Add test for IAutoComplete2 with custom source
by Fabian Maurer 17 Nov '17

17 Nov '17

v2: Send more characters to fix timing issues Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/shell32/tests/autocomplete.c | 173 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 63a2eb2b11..7dcecb2088 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -225,6 +225,177 @@ static void createMainWnd(void) CW_USEDEFAULT, CW_USEDEFAULT, 130, 105, NULL, NULL, GetModuleHandleA(NULL), 0); } +struct string_enumerator +{ + IEnumString IEnumString_iface; + LONG ref; + WCHAR **data; + int data_len; + int cur; +}; + +static struct string_enumerator *impl_from_IEnumString(IEnumString *iface) +{ + return CONTAINING_RECORD(iface, struct string_enumerator, IEnumString_iface); +} + +static HRESULT WINAPI string_enumerator_QueryInterface(IEnumString *iface, REFIID riid, void **ppv) +{ + if (IsEqualGUID(riid, &IID_IEnumString) || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI string_enumerator_AddRef(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + ULONG ref = InterlockedIncrement(&this->ref); + + return ref; +} + +static ULONG WINAPI string_enumerator_Release(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + ULONG ref = InterlockedDecrement(&this->ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, this); + + return ref; +} + +static HRESULT WINAPI string_enumerator_Next(IEnumString *iface, ULONG num, LPOLESTR *strings, ULONG *num_returned) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + int i, len; + + *num_returned = 0; + for (i = 0; i < num; i++) + { + if (this->cur >= this->data_len) + return S_FALSE; + + len = lstrlenW(this->data[this->cur]) + 1; + + strings[i] = CoTaskMemAlloc(len * sizeof(WCHAR)); + memcpy(strings[i], this->data[this->cur], len * sizeof(WCHAR)); + + (*num_returned)++; + this->cur++; + } + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Reset(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + this->cur = 0; + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Skip(IEnumString *iface, ULONG num) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + this->cur += num; + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Clone(IEnumString *iface, IEnumString **out) +{ + *out = NULL; + return E_NOTIMPL; +} + +static IEnumStringVtbl string_enumerator_vtlb = +{ + string_enumerator_QueryInterface, + string_enumerator_AddRef, + string_enumerator_Release, + string_enumerator_Next, + string_enumerator_Skip, + string_enumerator_Reset, + string_enumerator_Clone +}; + +static HRESULT string_enumerator_create(void **ppv, WCHAR **suggestions, int count) +{ + struct string_enumerator *object; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IEnumString_iface.lpVtbl = &string_enumerator_vtlb; + object->ref = 1; + object->data = suggestions; + object->data_len = count; + object->cur = 0; + + *ppv = &object->IEnumString_iface; + + return S_OK; +} + +static void test_custom_source(void) +{ + static WCHAR str_alpha[] = {'t','e','s','t','1',0}; + static WCHAR str_alpha2[] = {'t','e','s','t','2',0}; + static WCHAR str_beta[] = {'a','u','t','o',' ','c','o','m','p','l','e','t','e',0}; + static WCHAR *suggestions[] = { str_alpha, str_alpha2, str_beta }; + IUnknown *enumerator; + IAutoComplete2 *autocomplete; + HWND hwnd_edit; + WCHAR buffer[20]; + HRESULT hr; + MSG msg; + + ShowWindow(hMainWnd, SW_SHOW); + + hwnd_edit = CreateWindowA("Edit", "", WS_OVERLAPPED | WS_VISIBLE | WS_CHILD | WS_BORDER, 50, 5, 200, 20, hMainWnd, 0, NULL, 0); + + hr = CoCreateInstance(&CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, &IID_IAutoComplete2, (void**)&autocomplete); + ok(hr == S_OK, "CoCreateInstance failed: %x\n", hr); + + string_enumerator_create((void**)&enumerator, suggestions, sizeof(suggestions) / sizeof(*suggestions)); + + hr = IAutoComplete2_SetOptions(autocomplete, ACO_AUTOSUGGEST | ACO_AUTOAPPEND); + ok(hr == S_OK, "IAutoComplete2_SetOptions failed: %x\n", hr); + hr = IAutoComplete2_Init(autocomplete, hwnd_edit, enumerator, NULL, NULL); + ok(hr == S_OK, "IAutoComplete_Init failed: %x\n", hr); + + /* Send a few characters to make sure autocomplete is always activated */ + SendMessageW(hwnd_edit, WM_CHAR, 'a', 1); + SendMessageW(hwnd_edit, WM_CHAR, 'u', 1); + SendMessageW(hwnd_edit, WM_CHAR, 't', 1); + SendMessageW(hwnd_edit, WM_CHAR, 'o', 1); + /* Send a random keyup message since wine doesn't handle WM_CHAR yet */ + SendMessageW(hwnd_edit, WM_KEYUP, 'x', 1); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + SendMessageW(hwnd_edit, WM_GETTEXT, sizeof(buffer) / sizeof(*buffer), (LPARAM)buffer); + ok(lstrcmpW(str_beta, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_beta), wine_dbgstr_w(buffer)); + + ShowWindow(hMainWnd, SW_HIDE); + DestroyWindow(hwnd_edit); +} + START_TEST(autocomplete) { HRESULT r; @@ -246,6 +417,8 @@ START_TEST(autocomplete) goto cleanup; test_killfocus(); + test_custom_source(); + PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { TranslateMessage(&msg); -- 2.15.0

2 1

[PATCH v5 2/2] combase: Add RoGetParameterizedTypeInstanceIID stub
by Alex Henrie 17 Nov '17

17 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=42701 v5: Trace GUID as a pointer instead of as a string --- .../api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec | 2 +- dlls/combase/Makefile.in | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec b/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec index 9fb16ab225..68db3e90a9 100644 --- a/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec @@ -1,3 +1,3 @@ @ stub RoFreeParameterizedTypeExtra -@ stub RoGetParameterizedTypeInstanceIID +@ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr) combase.RoGetParameterizedTypeInstanceIID @ stub RoParameterizedTypeExtraGetTypeSignature diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index c5ab8d205d..b1d759e49a 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -1,5 +1,5 @@ MODULE = combase.dll -IMPORTS = ole32 +IMPORTS = ole32 uuid C_SRCS = \ roapi.c \ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 493e7968d1..c238eb82db 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -253,7 +253,7 @@ @ stub RoGetApartmentIdentifier @ stub RoGetErrorReportingFlags @ stub RoGetMatchingRestrictedErrorInfo -@ stub RoGetParameterizedTypeInstanceIID +@ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr) @ stub RoGetServerActivatableClasses @ stdcall RoInitialize(long) @ stub RoInspectCapturedStackBackTrace diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index a2dfd548f2..a2d625202d 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -18,6 +18,7 @@ #include "objbase.h" #include "roapi.h" +#include "roparameterizediid.h" #include "hstring.h" #include "wine/debug.h" @@ -55,3 +56,16 @@ HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **factor FIXME("stub: %p %p %p\n", classid, iid, factory); return E_NOTIMPL; } + +/*********************************************************************** + * RoGetParameterizedTypeInstanceIID (combase.@) + */ +HRESULT WINAPI RoGetParameterizedTypeInstanceIID(UINT32 name_element_count, const WCHAR **name_elements, + const IRoMetaDataLocator *meta_data_locator, GUID *iid, + ROPARAMIIDHANDLE *hiid) +{ + FIXME("stub: %d %p %p %p %p\n", name_element_count, name_elements, meta_data_locator, iid, hiid); + if (iid) *iid = GUID_NULL; + if (hiid) *hiid = INVALID_HANDLE_VALUE; + return E_NOTIMPL; +} -- 2.15.0

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-devel