May 2016 - Wine-Commits - list.winehq.org

Piotr Caban : mshtml: Fix HTMLWindow3_setInterval behavior on 0 msec intervals.
by Alexandre Julliard May 2, 2016

May 2, 2016

Module: wine Branch: master Commit: 4e77355f3a94e00a826fd91c564c1a524d0b7093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e77355f3a94e00a826fd91c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 2 15:39:28 2016 +0200 mshtml: Fix HTMLWindow3_setInterval behavior on 0 msec intervals. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/task.c | 5 ++++- dlls/mshtml/tests/events.c | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9fe8a75..8c522c2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1096,7 +1096,7 @@ HRESULT push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN; void remove_target_tasks(LONG) DECLSPEC_HIDDEN; void flush_pending_tasks(LONG) DECLSPEC_HIDDEN; -HRESULT set_task_timer(HTMLInnerWindow*,DWORD,BOOL,IDispatch*,LONG*) DECLSPEC_HIDDEN; +HRESULT set_task_timer(HTMLInnerWindow*,LONG,BOOL,IDispatch*,LONG*) DECLSPEC_HIDDEN; HRESULT clear_task_timer(HTMLInnerWindow*,BOOL,DWORD) DECLSPEC_HIDDEN; const char *debugstr_mshtml_guid(const GUID*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index a821031..2a520b7 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -183,7 +183,7 @@ static BOOL queue_timer(thread_data_t *thread_data, task_timer_t *timer) return FALSE; } -HRESULT set_task_timer(HTMLInnerWindow *window, DWORD msec, BOOL interval, IDispatch *disp, LONG *id) +HRESULT set_task_timer(HTMLInnerWindow *window, LONG msec, BOOL interval, IDispatch *disp, LONG *id) { thread_data_t *thread_data; task_timer_t *timer; @@ -199,6 +199,9 @@ HRESULT set_task_timer(HTMLInnerWindow *window, DWORD msec, BOOL interval, IDisp if(!timer) return E_OUTOFMEMORY; + if(msec < 1) + msec = 1; + timer->id = id_cnt++; timer->window = window; timer->time = tc + msec; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 78fdb70..c9dedf3 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2259,6 +2259,25 @@ static void test_timeout(IHTMLDocument2 *doc) hres = IHTMLWindow2_clearTimeout(window, id); ok(hres == S_OK, "clearTimeout failed: %08x\n", hres); + V_VT(&expr) = VT_DISPATCH; + V_DISPATCH(&expr) = (IDispatch*)&timeoutFunc; + V_VT(&var) = VT_EMPTY; + id = 0; + hres = IHTMLWindow3_setInterval(win3, &expr, 1, &var, &id); + ok(hres == S_OK, "setInterval failed: %08x\n", hres); + ok(id, "id = 0\n"); + + SET_EXPECT(timeout); + pump_msgs(&called_timeout); + CHECK_CALLED(timeout); + + SET_EXPECT(timeout); + pump_msgs(&called_timeout); + CHECK_CALLED(timeout); + + hres = IHTMLWindow2_clearInterval(window, id); + ok(hres == S_OK, "clearTimeout failer: %08x\n", hres); + IHTMLWindow3_Release(win3); }

1 0

Jacek Caban : mshtml: Added IHTMLElement2:: oncontextmenu property implementation.
by Alexandre Julliard May 2, 2016

May 2, 2016

Module: wine Branch: master Commit: c766386f360b56608c45e3b4c0b2a5ebbdffa80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c766386f360b56608c45e3b4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 14:17:40 2016 +0200 mshtml: Added IHTMLElement2::oncontextmenu property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 033800b..9456759 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2925,15 +2925,19 @@ static HRESULT WINAPI HTMLElement2_mergeAttributes(IHTMLElement2 *iface, IHTMLEl static HRESULT WINAPI HTMLElement2_put_oncontextmenu(IHTMLElement2 *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_node_event(&This->node, EVENTID_CONTEXTMENU, &v); } static HRESULT WINAPI HTMLElement2_get_oncontextmenu(IHTMLElement2 *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_CONTEXTMENU, p); } static HRESULT WINAPI HTMLElement2_insertAdjacentElement(IHTMLElement2 *iface, BSTR where,

1 0

Jacek Caban : mshtml: Ensure that bind_event is not called multiple times for the same event.
by Alexandre Julliard May 2, 2016

May 2, 2016

Module: wine Branch: master Commit: 60538b4cd96a14eb25e78fdf6230dcc9734fbd38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60538b4cd96a14eb25e78fdf6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 14:05:08 2016 +0200 mshtml: Ensure that bind_event is not called multiple times for the same event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2226278..27b6c39 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1386,6 +1386,7 @@ void detach_events(HTMLDocumentNode *doc) release_nsevents(doc); } +/* Caller should ensure that it's called only once for given event in the target. */ static void bind_event(EventTarget *event_target, eventid_t eid) { if(event_target->dispex.data->vtbl->bind_event) @@ -1423,13 +1424,17 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, eventid_t eid, if(!data) return E_OUTOFMEMORY; - if(!alloc_handler_vector(data, eid, 0)) - return E_OUTOFMEMORY; + if(!data->event_table[eid]) { + if(!alloc_handler_vector(data, eid, 0)) + return E_OUTOFMEMORY; + + bind_event(event_target, eid); + }else if(data->event_table[eid]->handler_prop) { + IDispatch_Release(data->event_table[eid]->handler_prop); + } data->event_table[eid]->handler_prop = disp; IDispatch_AddRef(disp); - - bind_event(event_target, eid); return S_OK; } @@ -1522,15 +1527,15 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI i++; if(i == data->event_table[eid]->handler_cnt && !alloc_handler_vector(data, eid, i+1)) return E_OUTOFMEMORY; - }else if(!alloc_handler_vector(data, eid, i+1)) { + }else if(alloc_handler_vector(data, eid, i+1)) { + bind_event(event_target, eid); + }else { return E_OUTOFMEMORY; } IDispatch_AddRef(disp); data->event_table[eid]->handlers[i] = disp; - bind_event(event_target, eid); - *res = VARIANT_TRUE; return S_OK; }

1 0

Alistair Leslie-Hughes : inetcomm: Implement IMimeBody GetProp.
by Alexandre Julliard May 2, 2016

May 2, 2016

Module: wine Branch: master Commit: c74a53951d99472fa8a71bc670a3e75992c93064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74a53951d99472fa8a71bc67… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 28 08:15:07 2016 +0000 inetcomm: Implement IMimeBody GetProp. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 17 ++++++++++++++--- dlls/inetcomm/tests/mimeole.c | 15 ++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 86d03cf..eb6c829 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -642,7 +642,13 @@ static HRESULT WINAPI MimeBody_GetProp( LPPROPVARIANT pValue) { MimeBody *This = impl_from_IMimeBody(iface); - TRACE("(%p)->(%s, 0x%x, %p)\n", This, pszName, dwFlags, pValue); + header_t *header; + HRESULT hr; + + TRACE("(%p)->(%s, 0x%x, %p)\n", This, debugstr_a(pszName), dwFlags, pValue); + + if(!pszName || !pValue) + return E_INVALIDARG; if(!strcasecmp(pszName, "att:pri-content-type")) { @@ -652,8 +658,13 @@ static HRESULT WINAPI MimeBody_GetProp( return S_OK; } - FIXME("stub!\n"); - return E_FAIL; + hr = find_prop(This, pszName, &header); + if(hr == S_OK) + { + PropVariantCopy(pValue, &header->value); + } + + return hr; } static HRESULT WINAPI MimeBody_SetProp( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index b317116..498bbb7 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -361,12 +361,21 @@ static void test_MessageSetProp(void) ok(hr == S_OK, "ret %08x\n", hr); PropVariantClear(&prop); + hr = IMimeBody_GetProp(body, NULL, 0, &prop); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + hr = IMimeBody_GetProp(body, "Thread-Topic", 0, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + hr = IMimeBody_GetProp(body, "Wine-Topic", 0, &prop); + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); + hr = IMimeBody_GetProp(body, "Thread-Topic", 0, &prop); - todo_wine ok(hr == S_OK, "ret %08x\n", hr); + ok(hr == S_OK, "ret %08x\n", hr); if(hr == S_OK) { - todo_wine ok(prop.vt == VT_LPSTR, "type %d\n", prop.vt); - todo_wine ok(!strcmp(prop.u.pszVal, topic), "got %s\n", prop.u.pszVal); + ok(prop.vt == VT_LPSTR, "type %d\n", prop.vt); + ok(!strcmp(prop.u.pszVal, topic), "got %s\n", prop.u.pszVal); PropVariantClear(&prop); }

1 0

Alistair Leslie-Hughes : inetcomm: Implement IMimeBody SetProp.
by Alexandre Julliard May 2, 2016

May 2, 2016

Module: wine Branch: master Commit: ed9a8a22cadb265b359db548f7c7a4b4e24fd629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9a8a22cadb265b359db548f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 28 08:14:55 2016 +0000 inetcomm: Implement IMimeBody SetProp. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 56 +++++++++++++++++++++++++++++++++++++++++-- dlls/inetcomm/tests/mimeole.c | 43 +++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 7a0b5bf..86d03cf 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -663,8 +663,60 @@ static HRESULT WINAPI MimeBody_SetProp( LPCPROPVARIANT pValue) { MimeBody *This = impl_from_IMimeBody(iface); - FIXME("(%p)->(%s, 0x%x, %p) stub\n", This, debugstr_a(pszName), dwFlags, pValue); - return E_NOTIMPL; + header_t *header; + HRESULT hr; + + TRACE("(%p)->(%s, 0x%x, %p)\n", This, debugstr_a(pszName), dwFlags, pValue); + + if(!pszName || !pValue) + return E_INVALIDARG; + + hr = find_prop(This, pszName, &header); + if(hr != S_OK) + { + property_list_entry_t *prop_entry; + const property_t *prop = NULL; + + LIST_FOR_EACH_ENTRY(prop_entry, &This->new_props, property_list_entry_t, entry) + { + if(!strcasecmp(pszName, prop_entry->prop.name)) + { + TRACE("Found match with already added new property id %d\n", prop_entry->prop.id); + prop = &prop_entry->prop; + break; + } + } + + header = HeapAlloc(GetProcessHeap(), 0, sizeof(*header)); + if(!header) + return E_OUTOFMEMORY; + + if(!prop) + { + prop_entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*prop_entry)); + if(!prop_entry) + { + HeapFree(GetProcessHeap(), 0, header); + return E_OUTOFMEMORY; + } + prop_entry->prop.name = strdupA(pszName); + prop_entry->prop.id = This->next_prop_id++; + prop_entry->prop.flags = 0; + prop_entry->prop.default_vt = pValue->vt; + list_add_tail(&This->new_props, &prop_entry->entry); + prop = &prop_entry->prop; + TRACE("Allocating new prop id %d\n", prop_entry->prop.id); + } + + header->prop = prop; + PropVariantInit(&header->value); + list_init(&header->params); + list_add_tail(&This->headers, &header->entry); + } + + PropVariantCopy(&header->value, pValue); + + return S_OK; } static HRESULT WINAPI MimeBody_AppendProp( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index a0fc695..b317116 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -332,6 +332,48 @@ static void test_CreateMessage(void) IStream_Release(stream); } +static void test_MessageSetProp(void) +{ + static const char topic[] = "wine topic"; + HRESULT hr; + IMimeMessage *msg; + IMimeBody *body; + PROPVARIANT prop; + + hr = MimeOleCreateMessage(NULL, &msg); + ok(hr == S_OK, "ret %08x\n", hr); + + PropVariantInit(&prop); + + hr = IMimeMessage_BindToObject(msg, HBODY_ROOT, &IID_IMimeBody, (void**)&body); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_SetProp(body, NULL, 0, &prop); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + hr = IMimeBody_SetProp(body, "Thread-Topic", 0, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + prop.vt = VT_LPSTR; + prop.u.pszVal = CoTaskMemAlloc(strlen(topic)+1); + strcpy(prop.u.pszVal, topic); + hr = IMimeBody_SetProp(body, "Thread-Topic", 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + PropVariantClear(&prop); + + hr = IMimeBody_GetProp(body, "Thread-Topic", 0, &prop); + todo_wine ok(hr == S_OK, "ret %08x\n", hr); + if(hr == S_OK) + { + todo_wine ok(prop.vt == VT_LPSTR, "type %d\n", prop.vt); + todo_wine ok(!strcmp(prop.u.pszVal, topic), "got %s\n", prop.u.pszVal); + PropVariantClear(&prop); + } + + IMimeBody_Release(body); + IMimeMessage_Release(msg); +} + static void test_MessageOptions(void) { static const char string[] = "XXXXX"; @@ -434,6 +476,7 @@ START_TEST(mimeole) test_CreateBody(); test_Allocator(); test_CreateMessage(); + test_MessageSetProp(); test_MessageOptions(); test_BindToObject(); test_MimeOleGetPropertySchema();

1 0

Jacek Caban : user32/tests: Added PrivateExtractIcons test.
by Alexandre Julliard May 2, 2016

May 2, 2016

Module: wine Branch: master Commit: 912d7474c00f911ca4682d6273ce3ce213c156e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=912d7474c00f911ca4682d627… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 29 21:00:42 2016 +0200 user32/tests: Added PrivateExtractIcons test. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 90e0d84..5138c56 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2517,6 +2517,25 @@ static void test_DestroyCursor(void) ok(cursor2 != cursor, "cursor == %p, cursor2 == %p\n", cursor, cursor2); } +static void test_PrivateExtractIcons(void) +{ + HICON icon; + UINT ret; + + static const test_icon_entries_t icon_desc[] = {{0,0,TRUE}, {16,16,TRUE}, {32,32}, {64,64,TRUE}}; + + create_ico_file("extract.ico", icon_desc, sizeof(icon_desc)/sizeof(*icon_desc)); + + ret = PrivateExtractIconsA("extract.ico", 0, 32, 32, &icon, NULL, 1, 0); + ok(ret == 1, "PrivateExtractIconsA returned %u\n", ret); + ok(icon != NULL, "icon == NULL\n"); + + test_icon_info(icon, 32, 32, 32, 32); + DestroyIcon(icon); + + DeleteFileA("extract.ico"); +} + static void test_monochrome_icon(void) { HANDLE handle; @@ -2670,6 +2689,7 @@ START_TEST(cursoricon) test_SetCursor(); test_ShowCursor(); test_DestroyCursor(); + test_PrivateExtractIcons(); test_monochrome_icon(); do_parent(); test_child_process();

1 0

Jacek Caban : mshtml: Bind load event directly to the target.
by Alexandre Julliard May 2, 2016

May 2, 2016

Module: wine Branch: master Commit: 67cb39b270b4a6d78c43aeebd5109b8aca597b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=67cb39b270b4a6d78c43aeebd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 14:05:38 2016 +0200 mshtml: Bind load event directly to the target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d5729b1..033800b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4267,7 +4267,16 @@ static event_target_t **HTMLElement_get_event_target_ptr(DispatchEx *dispex) static void HTMLElement_bind_event(DispatchEx *dispex, int eid) { HTMLElement *This = impl_from_DispatchEx(dispex); - This->node.doc->node.event_target.dispex.data->vtbl->bind_event(&This->node.doc->node.event_target.dispex, eid); + + static const WCHAR loadW[] = {'l','o','a','d',0}; + + switch(eid) { + case EVENTID_LOAD: + add_nsevent_listener(This->node.doc, This->node.nsnode, loadW); + return; + default: + This->node.doc->node.event_target.dispex.data->vtbl->bind_event(&This->node.doc->node.event_target.dispex, eid); + } } static const tid_t HTMLElement_iface_tids[] = {

1 0

Olivier F. R. Dierick : shell32/tests: Tests for broken apps that check GetLastError() after SHFileOperation().
by Alexandre Julliard May 2, 2016

May 2, 2016

Module: wine Branch: master Commit: 07156ad007dead9b8eb535c8c76969fe6a427ea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07156ad007dead9b8eb535c8c… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Sat Apr 23 16:04:01 2016 +0200 shell32/tests: Tests for broken apps that check GetLastError() after SHFileOperation(). Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfileop.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index d33ad5b..0e502fc 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1819,6 +1819,30 @@ static void test_copy(void) ok(DeleteFileA("abcdefgh.abc"), "Expected file to exist\n"); ok(DeleteFileA("dir\\abcdefgh.abc"), "Expected file to exist\n"); ok(RemoveDirectoryA("dir"), "Expected dir to exist\n"); + + /* Check last error after a successful file operation. */ + clean_after_shfo_tests(); + init_shfo_tests(); + shfo.pFrom = "test1.txt\0"; + shfo.pTo = "testdir2\0"; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + SetLastError(0xdeadbeef); + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_SUCCESS, "File copy failed with %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + + /* Check last error after a failed file operation. */ + clean_after_shfo_tests(); + init_shfo_tests(); + shfo.pFrom = "nonexistent\0"; + shfo.pTo = "testdir2\0"; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + SetLastError(0xdeadbeef); + retval = SHFileOperationA(&shfo); + ok(retval != ERROR_SUCCESS, "Unexpected ERROR_SUCCESS\n"); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); } /* tests the FO_MOVE action */ @@ -2464,6 +2488,7 @@ static void test_unicode(void) SHFILEOPSTRUCTW shfoW; int ret; HANDLE file; + static const WCHAR UNICODE_PATH_TO[] = {'c',':','\\',0x00ae,0x00ae,'\0'}; if (!pSHFileOperationW) { @@ -2530,6 +2555,36 @@ static void test_unicode(void) ret = pSHFileOperationW(&shfoW); ok(!ret, "Directory is not removed, ErrorCode: %d\n", ret); ok(!file_existsW(UNICODE_PATH), "The directory should have been removed\n"); + + shfoW.hwnd = NULL; + shfoW.wFunc = FO_COPY; + shfoW.pFrom = UNICODE_PATH; + shfoW.pTo = UNICODE_PATH_TO; + shfoW.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + shfoW.hNameMappings = NULL; + shfoW.lpszProgressTitle = NULL; + + /* Check last error after a successful file operation. */ + createTestFileW(UNICODE_PATH); + ok(file_existsW(UNICODE_PATH), "The file does not exist\n"); + SetLastError(0xdeadbeef); + ret = SHFileOperationW(&shfoW); + ok(ret == ERROR_SUCCESS, "File copy failed with %d\n", ret); + ok(!shfoW.fAnyOperationsAborted, "Didn't expect aborted operations\n"); + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == ERROR_INVALID_HANDLE), /* WinXp, win2k3 */ + "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + + /* Check last error after a failed file operation. */ + DeleteFileW(UNICODE_PATH); + ok(!file_existsW(UNICODE_PATH), "The file should have been removed\n"); + SetLastError(0xdeadbeef); + ret = SHFileOperationW(&shfoW); + ok(ret != ERROR_SUCCESS, "Unexpected ERROR_SUCCESS\n"); + ok(!shfoW.fAnyOperationsAborted, "Didn't expect aborted operations\n"); + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == ERROR_INVALID_HANDLE), /* WinXp, win2k3 */ + "Expected ERROR_SUCCESS, got %d\n", GetLastError()); } static void

1 0

Alistair Leslie-Hughes : inetcomm: Add MimeGetAddressFormatW stub.
by Alexandre Julliard May 2, 2016

May 2, 2016

Module: wine Branch: master Commit: 27ae15ccfe9ff2a98523c14c61c48accaa5f3c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ae15ccfe9ff2a98523c14c6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 28 08:15:19 2016 +0000 inetcomm: Add MimeGetAddressFormatW stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/inetcomm.spec | 2 +- dlls/inetcomm/mimeole.c | 8 ++++++++ include/mimeole.idl | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/inetcomm.spec b/dlls/inetcomm/inetcomm.spec index 86eb9bd..bfd115c 100644 --- a/dlls/inetcomm/inetcomm.spec +++ b/dlls/inetcomm/inetcomm.spec @@ -42,7 +42,7 @@ @ stub MimeEditGetBackgroundImageUrl @ stub MimeEditIsSafeToRun @ stub MimeEditViewSource -@ stub MimeGetAddressFormatW +@ stdcall MimeGetAddressFormatW(ptr ptr long long ptr) @ stub MimeOleAlgNameFromSMimeCap @ stub MimeOleAlgStrengthFromSMimeCap @ stub MimeOleClearDirtyTree diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index eb6c829..d2db23b 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -3221,3 +3221,11 @@ HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema **schema) return S_OK; } + +HRESULT WINAPI MimeGetAddressFormatW(REFIID riid, void *object, DWORD addr_type, + ADDRESSFORMAT addr_format, WCHAR **address) +{ + FIXME("(%s, %p, %d, %d, %p) stub\n", debugstr_guid(riid), object, addr_type, addr_format, address); + + return E_NOTIMPL; +} diff --git a/include/mimeole.idl b/include/mimeole.idl index bc1f3ac..5990c29 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -1435,7 +1435,7 @@ cpp_quote("HRESULT WINAPI MimeEditGetBackgroundImageUrl(IUnknown*,BSTR*);") cpp_quote("HRESULT WINAPI MimeEditDocumentFromStream(IStream*,REFIID,void**);") cpp_quote("HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema**);") - +cpp_quote("HRESULT WINAPI MimeGetAddressFormatW(REFIID,void*,DWORD,ADDRESSFORMAT,WCHAR**);") cpp_quote("#ifdef __cplusplus") cpp_quote("}") cpp_quote("#endif")

1 0

Jacek Caban : user32: Use proper types in ICO_GetIconDirectory.
by Alexandre Julliard May 2, 2016

May 2, 2016

Module: wine Branch: master Commit: 03b93eeeff304fadf1b11c622777cd75bb5e7f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b93eeeff304fadf1b11c622… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 29 21:00:34 2016 +0200 user32: Use proper types in ICO_GetIconDirectory. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 23 ----------------------- dlls/user32/exticon.c | 4 ++-- dlls/user32/user_private.h | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 4de6b28..4f93195 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -48,29 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cursor); WINE_DECLARE_DEBUG_CHANNEL(icon); WINE_DECLARE_DEBUG_CHANNEL(resource); -#include "pshpack1.h" - -typedef struct { - BYTE bWidth; - BYTE bHeight; - BYTE bColorCount; - BYTE bReserved; - WORD xHotspot; - WORD yHotspot; - DWORD dwDIBSize; - DWORD dwDIBOffset; -} CURSORICONFILEDIRENTRY; - -typedef struct -{ - WORD idReserved; - WORD idType; - WORD idCount; - CURSORICONFILEDIRENTRY idEntries[1]; -} CURSORICONFILEDIR; - -#include "poppack.h" - static HDC screen_dc; static const WCHAR DISPLAYW[] = {'D','I','S','P','L','A','Y',0}; diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index 0dbbef1..a428ae7 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -218,13 +218,13 @@ static BYTE * ICO_LoadIcon( LPBYTE peimage, LPicoICONDIRENTRY lpiIDE, ULONG *uSi */ static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG *uSize ) { - CURSORICONDIR * lpcid; /* icon resource in resource-dir format */ + CURSORICONFILEDIR *lpcid; /* icon resource in resource-dir format */ CURSORICONDIR * lpID; /* icon resource in resource format */ int i; TRACE("%p %p\n", peimage, lplpiID); - lpcid = (CURSORICONDIR*)peimage; + lpcid = (CURSORICONFILEDIR*)peimage; if( lpcid->idReserved || (lpcid->idType != 1) || (!lpcid->idCount) ) return 0; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index ead7a53..e4a2ed1 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -318,6 +318,25 @@ typedef struct CURSORICONDIRENTRY idEntries[1]; } CURSORICONDIR; +typedef struct { + BYTE bWidth; + BYTE bHeight; + BYTE bColorCount; + BYTE bReserved; + WORD xHotspot; + WORD yHotspot; + DWORD dwDIBSize; + DWORD dwDIBOffset; +} CURSORICONFILEDIRENTRY; + +typedef struct +{ + WORD idReserved; + WORD idType; + WORD idCount; + CURSORICONFILEDIRENTRY idEntries[1]; +} CURSORICONFILEDIR; + #include "poppack.h" extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN;

1 0