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

Michael Müller : wininet: Fix memory leak by not calling get_cookie_header twice.
by Alexandre Julliard May 18, 2015

May 18, 2015

Module: wine Branch: master Commit: 81b136fe1cb19230d51e99f19d22c2c124e9aed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b136fe1cb19230d51e99f19… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 15 19:55:13 2015 +0200 wininet: Fix memory leak by not calling get_cookie_header twice. --- dlls/wininet/http.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index cd2cdcf..45183cf 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4244,7 +4244,6 @@ static void HTTP_InsertCookies(http_request_t *request) if(res != ERROR_SUCCESS || !cookies) return; - get_cookie_header(request->server->name, request->path, &cookies); HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE); heap_free(cookies); }

1 0

Alexandre Julliard : server: Add an intermediate file object for file handles opened on devices.
by Alexandre Julliard May 18, 2015

May 18, 2015

Module: wine Branch: master Commit: 6260aa6cd2af689ba8f550862ffc2cf56ac3d7f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6260aa6cd2af689ba8f550862… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 18 16:42:03 2015 +0900 server: Add an intermediate file object for file handles opened on devices. --- server/device.c | 252 +++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 165 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6260aa6cd2af689ba8f55…

1 0

Sebastian Lackner : ntdll/tests: Add tests for accessing \\Device\\Null.
by Alexandre Julliard May 18, 2015

May 18, 2015

Module: wine Branch: master Commit: b3913c4f77f224accbe549066f456ac2bb661d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3913c4f77f224accbe549066… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri May 15 19:57:42 2015 +0200 ntdll/tests: Add tests for accessing \\Device\\Null. --- dlls/ntdll/tests/om.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 96e1e6e..8939758 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1032,6 +1032,105 @@ static void test_keyed_events(void) NtClose( event ); } +static void test_null_device(void) +{ + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK iosb; + UNICODE_STRING str; + NTSTATUS status; + DWORD num_bytes; + OVERLAPPED ov; + char buf[64]; + HANDLE null; + BOOL ret; + + memset(buf, 0xAA, sizeof(buf)); + memset(&ov, 0, sizeof(ov)); + ov.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + + pRtlCreateUnicodeStringFromAsciiz(&str, "\\Device\\Null"); + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); + status = pNtOpenSymbolicLinkObject(&null, SYMBOLIC_LINK_QUERY, &attr); + todo_wine + ok(status == STATUS_OBJECT_TYPE_MISMATCH, + "expected STATUS_OBJECT_TYPE_MISMATCH, got %08x\n", status); + + status = pNtOpenFile(&null, GENERIC_READ | GENERIC_WRITE, &attr, &iosb, + FILE_SHARE_READ | FILE_SHARE_WRITE, 0); + todo_wine + ok(status == STATUS_SUCCESS, + "expected STATUS_SUCCESS, got %08x\n", status); + if (status != STATUS_SUCCESS) + { + skip("opening \\Device\\Null failed, skipping read/write tests\n"); + goto out; + } + + SetLastError(0xdeadbeef); + ret = WriteFile(null, buf, sizeof(buf), &num_bytes, NULL); + ok(!ret, "WriteFile unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = ReadFile(null, buf, sizeof(buf), &num_bytes, NULL); + ok(!ret, "ReadFile unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + num_bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WriteFile(null, buf, sizeof(buf), &num_bytes, &ov); + if (ret || GetLastError() != ERROR_IO_PENDING) + { + ok(ret, "WriteFile failed with error %u\n", GetLastError()); + } + else + { + num_bytes = 0xdeadbeef; + ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE); + ok(ret, "GetOverlappedResult failed with error %u\n", GetLastError()); + } + ok(num_bytes == sizeof(buf), "expected num_bytes = %u, got %u\n", + (DWORD)sizeof(buf), num_bytes); + + num_bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(null, buf, sizeof(buf), &num_bytes, &ov); + if (ret || GetLastError() != ERROR_IO_PENDING) + { + ok(!ret, "ReadFile unexpectedly succeeded\n"); + } + else + { + num_bytes = 0xdeadbeef; + ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE); + ok(!ret, "GetOverlappedResult unexpectedly succeeded\n"); + } + ok(GetLastError() == ERROR_HANDLE_EOF, + "expected ERROR_HANDLE_EOF, got %u\n", GetLastError()); + + pNtClose(null); + +out: + null = CreateFileA("\\\\.\\Null", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(null == INVALID_HANDLE_VALUE, "CreateFileA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "expected ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + null = CreateFileA("\\\\.\\Device\\Null", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(null == INVALID_HANDLE_VALUE, "CreateFileA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_PATH_NOT_FOUND, + "expected ERROR_PATH_NOT_FOUND, got %u\n", GetLastError()); + + pRtlFreeUnicodeString(&str); + CloseHandle(ov.hEvent); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -1081,4 +1180,5 @@ START_TEST(om) test_type_mismatch(); test_event(); test_keyed_events(); + test_null_device(); }

1 0

Nikolay Sivov : riched20: Implement SetEnd().
by Alexandre Julliard May 18, 2015

May 18, 2015

Module: wine Branch: master Commit: f0959dc1759a8434ccab66eecd0b671693a1a96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0959dc1759a8434ccab66eec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 17 17:30:06 2015 +0300 riched20: Implement SetEnd(). --- dlls/riched20/richole.c | 23 ++++++++++++-- dlls/riched20/tests/richole.c | 70 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 1cb47c2..4f85325 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -948,14 +948,31 @@ static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim) return S_OK; } -static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG cpLim) +static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG end) { ITextRangeImpl *This = impl_from_ITextRange(me); + int len; + + TRACE("(%p)->(%d)\n", This, end); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + if (end == This->end) + return S_FALSE; + + if (end < This->start) { + This->start = This->end = max(0, end); + return S_OK; + } + + len = ME_GetTextLength(This->reOle->editor); + if (end > len) + This->end = len + 1; + else + This->end = end; + + return S_OK; } static HRESULT WINAPI ITextRange_fnGetFont(ITextRange *me, ITextFont **font) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 2d46729..0af617b 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -759,6 +759,76 @@ static void test_ITextRange_GetStart_GetEnd(void) ok(hres == S_OK, "got 0x%08x\n", hres); ok(end == 12, "got %d\n", end); + /* SetEnd */ + hres = ITextRange_SetStart(txtRge, 0); + ok(hres == S_OK, "got 0x%08x\n", hres); + + /* same value */ + hres = ITextRange_SetEnd(txtRge, 5); + ok(hres == S_OK, "got 0x%08x\n", hres); + + hres = ITextRange_SetEnd(txtRge, 5); + ok(hres == S_FALSE, "got 0x%08x\n", hres); + + /* negative resets to 0 */ + hres = ITextRange_SetEnd(txtRge, -1); + ok(hres == S_OK, "got 0x%08x\n", hres); + + end = -1; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 0, "got %d\n", end); + + start = -1; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 0, "got %d\n", start); + + /* greater than initial end, but less than total char count */ + hres = ITextRange_SetStart(txtRge, 3); + ok(hres == S_OK, "got 0x%08x\n", hres); + + hres = ITextRange_SetEnd(txtRge, 1); + ok(hres == S_OK, "got 0x%08x\n", hres); + + start = 0; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 1, "got %d\n", start); + + end = 0; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 1, "got %d\n", end); + + /* more than total count */ + hres = ITextRange_SetEnd(txtRge, 50); + ok(hres == S_OK, "got 0x%08x\n", hres); + + start = 0; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 1, "got %d\n", start); + + end = 0; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 13, "got %d\n", end); + + /* zero */ + hres = ITextRange_SetEnd(txtRge, 0); + ok(hres == S_OK, "got 0x%08x\n", hres); + + start = 0; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 0, "got %d\n", start); + + end = 0; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 0, "got %d\n", end); + ITextRange_Release(txtRge); release_interfaces(&w, &reOle, &txtDoc, NULL);

1 0

Nikolay Sivov : riched20: Added stub ITextPara.
by Alexandre Julliard May 18, 2015

May 18, 2015

Module: wine Branch: master Commit: 6d19ac5cb361e2d1b1f839fb06a6be754bde1e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d19ac5cb361e2d1b1f839fb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 17 17:27:42 2015 +0300 riched20: Added stub ITextPara. --- dlls/riched20/richole.c | 519 +++++++++++++++++++++++++++++++++++++++++- dlls/riched20/tests/richole.c | 51 +++++ 2 files changed, 566 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d19ac5cb361e2d1b1f83…

1 0

Grazvydas Ignotas : kernel32: Don't leak an event handle on errors.
by Alexandre Julliard May 18, 2015

May 18, 2015

Module: wine Branch: master Commit: 2e21381177c4ae5c1abb02cd8db364075f901444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e21381177c4ae5c1abb02cd8… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sat May 16 22:29:42 2015 +0300 kernel32: Don't leak an event handle on errors. --- dlls/kernel32/change.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/change.c b/dlls/kernel32/change.c index f3aec8d..781ccfe 100644 --- a/dlls/kernel32/change.c +++ b/dlls/kernel32/change.c @@ -190,12 +190,14 @@ BOOL WINAPI ReadDirectoryChangesW( HANDLE handle, LPVOID buffer, DWORD len, BOOL return TRUE; WaitForSingleObjectEx( ov.hEvent, INFINITE, TRUE ); - CloseHandle( ov.hEvent ); if (returned) *returned = ios->Information; status = ios->u.Status; } + if (!overlapped) + CloseHandle( ov.hEvent ); + if (status != STATUS_SUCCESS) { SetLastError( RtlNtStatusToDosError(status) );

1 0

Piotr Caban : msvcrt: Fix functions table reallocation in _onexit.
by Alexandre Julliard May 18, 2015

May 18, 2015

Module: wine Branch: master Commit: 70bff7377dbe9bdaaac5e86c49ee45130e65e5d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70bff7377dbe9bdaaac5e86c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 15 20:44:19 2015 +0200 msvcrt: Fix functions table reallocation in _onexit. --- dlls/msvcrt/exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 0d2992d..3d79a4d 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -280,7 +280,7 @@ MSVCRT__onexit_t CDECL MSVCRT__onexit(MSVCRT__onexit_t func) UNLOCK_EXIT; return NULL; } - memcpy (newtable, MSVCRT_atexit_table, MSVCRT_atexit_table_size); + memcpy (newtable, MSVCRT_atexit_table, MSVCRT_atexit_table_size*sizeof(void *)); MSVCRT_atexit_table_size += 32; MSVCRT_free (MSVCRT_atexit_table); MSVCRT_atexit_table = newtable;

1 0

Jacek Caban : mshtml: Removed unneeded argument from ensure_nsevent_handler.
by Alexandre Julliard May 18, 2015

May 18, 2015

Module: wine Branch: master Commit: 4686f3d761eaeeaf14cd25b394fa132043b691fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4686f3d761eaeeaf14cd25b39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 15 17:59:35 2015 +0200 mshtml: Removed unneeded argument from ensure_nsevent_handler. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlevent.c | 17 ++++++----------- dlls/mshtml/htmlevent.h | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1b72a32..e377d55 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3962,7 +3962,7 @@ static void HTMLDocument_on_advise(IUnknown *iface, cp_static_data_t *cp) HTMLDocument *This = impl_from_IHTMLDocument2((IHTMLDocument2*)iface); if(This->window) - update_cp_events(This->window->base.inner_window, &This->doc_node->node.event_target, cp); + update_doc_cp_events(This->doc_node, cp); } static inline HTMLDocument *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 037010e..897350f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1336,7 +1336,7 @@ static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid, in return TRUE; } -static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, event_target_t *event_target, eventid_t eid) +static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) { nsIDOMNode *nsnode = NULL; @@ -1410,7 +1410,7 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, HTMLDocumentNod data->event_table[eid]->handler_prop = disp; IDispatch_AddRef(disp); - return ensure_nsevent_handler(doc, data, eid); + return ensure_nsevent_handler(doc, eid); } HRESULT set_event_handler(EventTarget *event_target, HTMLDocumentNode *doc, eventid_t eid, VARIANT *var) @@ -1509,7 +1509,7 @@ HRESULT attach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name, data->event_table[eid]->handlers[i] = disp; *res = VARIANT_TRUE; - return ensure_nsevent_handler(doc->doc_node, data, eid); + return ensure_nsevent_handler(doc->doc_node, eid); } HRESULT detach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name, IDispatch *disp) @@ -1557,18 +1557,13 @@ void bind_target_event(HTMLDocumentNode *doc, EventTarget *event_target, const W set_event_handler_disp(event_target, doc, eid, disp); } -void update_cp_events(HTMLInnerWindow *window, EventTarget *event_target, cp_static_data_t *cp) +void update_doc_cp_events(HTMLDocumentNode *doc, cp_static_data_t *cp) { - event_target_t *data; int i; - data = get_event_target_data(event_target, FALSE); - if(!data) - return; /* FIXME */ - for(i=0; i < EVENTID_LAST; i++) { if((event_info[i].flags & EVENT_DEFAULTLISTENER) && is_cp_event(cp, event_info[i].dispid)) - ensure_nsevent_handler(window->doc, data, i); + ensure_nsevent_handler(doc, i); } } @@ -1617,7 +1612,7 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) for(i=0; i < EVENTID_LAST; i++) { if(event_info[i].flags & EVENT_HASDEFAULTHANDLERS) { - hres = ensure_nsevent_handler(doc, NULL, i); + hres = ensure_nsevent_handler(doc, i); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 6133737..62e808f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -60,7 +60,7 @@ HRESULT attach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) D HRESULT detach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN; HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; -void update_cp_events(HTMLInnerWindow*,EventTarget*,cp_static_data_t*) DECLSPEC_HIDDEN; +void update_doc_cp_events(HTMLDocumentNode*,cp_static_data_t*) DECLSPEC_HIDDEN; HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN;

1 0

Christian Faure : kernel32: Fix a crash in GetStringTypeW() on NULL input string.
by Alexandre Julliard May 18, 2015

May 18, 2015

Module: wine Branch: master Commit: 9cffed782fd447445d4de21394815bf944e507f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cffed782fd447445d4de2139… Author: Christian Faure <christian.faurebouvard(a)gmail.com> Date: Sat May 16 16:52:18 2015 +0300 kernel32: Fix a crash in GetStringTypeW() on NULL input string. --- dlls/kernel32/locale.c | 6 ++++++ dlls/kernel32/tests/locale.c | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index bcdcdba..bf4ace5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2732,6 +2732,12 @@ BOOL WINAPI GetStringTypeW( DWORD type, LPCWSTR src, INT count, LPWORD chartype C2_OTHERNEUTRAL /* LRE, LRO, RLE, RLO, PDF */ }; + if (!src) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (count == -1) count = strlenW(src) + 1; switch(type) { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e2ec152..9920dfc 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3582,9 +3582,26 @@ static void test_GetStringTypeW(void) static const WCHAR space_special[] = {0x09, 0x0d, 0x85}; WORD types[20]; + BOOL ret; WCHAR ch; int i; + /* NULL src */ + SetLastError(0xdeadbeef); + ret = GetStringTypeW(CT_CTYPE1, NULL, 0, NULL); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetStringTypeW(CT_CTYPE1, NULL, 0, types); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetStringTypeW(CT_CTYPE1, NULL, 5, types); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n", GetLastError()); + memset(types,0,sizeof(types)); GetStringTypeW(CT_CTYPE1, blanks, 5, types); for (i = 0; i < 5; i++)

1 0

Nikolay Sivov : quartz: Implement a trivial case of ConvertTimeFormat().
by Alexandre Julliard May 18, 2015

May 18, 2015

Module: wine Branch: master Commit: 5120fa9090cecb705fb8cdd1e5cb81fcabfd3fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5120fa9090cecb705fb8cdd1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 15 19:35:25 2015 +0300 quartz: Implement a trivial case of ConvertTimeFormat(). --- dlls/quartz/filtergraph.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index fcdd05b..26a4080 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2500,8 +2500,16 @@ static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, LONGL { IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - FIXME("(%p/%p)->(%p, %p, 0x%s, %p): stub !!!\n", This, iface, pTarget, - pTargetFormat, wine_dbgstr_longlong(Source), pSourceFormat); + TRACE("(%p/%p)->(%p, %s, 0x%s, %s)\n", This, iface, pTarget, + debugstr_guid(pTargetFormat), wine_dbgstr_longlong(Source), debugstr_guid(pSourceFormat)); + + if (!pSourceFormat) + pSourceFormat = &This->timeformatseek; + + if (IsEqualGUID(pTargetFormat, pSourceFormat)) + *pTarget = Source; + else + FIXME("conversion %s->%s not supported\n", debugstr_guid(pSourceFormat), debugstr_guid(pTargetFormat)); return S_OK; }

1 0