September 2019 - Wine-commits

Hans Leidekker : ws2_32: Call the completion routine in GetAddrInfoExW.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: c3bcf83d14e79bc8202d7d22fe773842a42240fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3bcf83d14e79bc8202d7d22… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 27 12:47:28 2019 +0200 ws2_32: Call the completion routine in GetAddrInfoExW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 20 ++++++++++---- dlls/ws2_32/tests/sock.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d82172aa5b..aa0a164ff9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6997,6 +6997,7 @@ static struct WS_addrinfo *addrinfo_WtoA(const struct WS_addrinfoW *ai) struct getaddrinfo_args { OVERLAPPED *overlapped; + LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine; ADDRINFOEXW **result; char *nodename; char *servname; @@ -7007,6 +7008,7 @@ static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *co struct getaddrinfo_args *args = context; OVERLAPPED *overlapped = args->overlapped; HANDLE event = overlapped->hEvent; + LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine = args->completion_routine; struct WS_addrinfo *res; int ret; @@ -7023,10 +7025,12 @@ static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *co HeapFree(GetProcessHeap(), 0, args); overlapped->Internal = ret; + if (completion_routine) completion_routine(ret, 0, overlapped); if (event) SetEvent(event); } -static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, ADDRINFOEXW **res, OVERLAPPED *overlapped) +static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, ADDRINFOEXW **res, + OVERLAPPED *overlapped, LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine) { int ret = EAI_MEMORY, len, i; char *nodenameA = NULL, *servnameA = NULL; @@ -7082,8 +7086,15 @@ static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const s { struct getaddrinfo_args *args; + if (overlapped->hEvent && completion_routine) + { + ret = WSAEINVAL; + goto end; + } + if (!(args = HeapAlloc(GetProcessHeap(), 0, sizeof(*args)))) goto end; args->overlapped = overlapped; + args->completion_routine = completion_routine; args->result = res; args->nodename = nodenameA; args->servname = servnameA; @@ -7096,7 +7107,6 @@ static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const s goto end; } - if (local_nodenameW != nodename) HeapFree(GetProcessHeap(), 0, local_nodenameW); WSASetLastError(ERROR_IO_PENDING); @@ -7138,12 +7148,10 @@ int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namesp FIXME("Unsupported hints\n"); if (timeout) FIXME("Unsupported timeout\n"); - if (completion_routine) - FIXME("Unsupported completion_routine\n"); if (handle) FIXME("Unsupported cancel handle\n"); - ret = WS_getaddrinfoW(name, servname, NULL, result, overlapped); + ret = WS_getaddrinfoW(name, servname, NULL, result, overlapped, completion_routine); if (ret) return ret; if (handle) *handle = (HANDLE)0xdeadbeef; return 0; @@ -7181,7 +7189,7 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hin *res = NULL; if (hints) hintsA = addrinfo_WtoA(hints); - ret = WS_getaddrinfoW(nodename, servname, hintsA, &resex, NULL); + ret = WS_getaddrinfoW(nodename, servname, hintsA, &resex, NULL, NULL); WS_freeaddrinfo(hintsA); if (ret) return ret; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e97cd381d0..e4b57cfdda 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7617,11 +7617,36 @@ static void test_GetAddrInfoW(void) ok(result2 == NULL, "got %p\n", result2); } +static struct completion_routine_test +{ + WSAOVERLAPPED *overlapped; + DWORD error; + ADDRINFOEXW **result; + HANDLE event; + DWORD called; +} completion_routine_test; + +static void CALLBACK completion_routine(DWORD error, DWORD byte_count, WSAOVERLAPPED *overlapped) +{ + struct completion_routine_test *test = &completion_routine_test; + + ok(error == test->error, "got %u\n", error); + ok(!byte_count, "got %u\n", byte_count); + ok(overlapped == test->overlapped, "got %p\n", overlapped); + ok(overlapped->Internal == test->error, "got %lu\n", overlapped->Internal); + ok(overlapped->Pointer == test->result, "got %p\n", overlapped->Pointer); + ok(overlapped->hEvent == NULL, "got %p\n", overlapped->hEvent); + + test->called++; + SetEvent(test->event); +} + static void test_GetAddrInfoExW(void) { static const WCHAR empty[] = {0}; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; static const WCHAR winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR nxdomain[] = {'n','x','d','o','m','a','i','n','.','w','i','n','e','h','q','.','o','r','g',0}; ADDRINFOEXW *result; OVERLAPPED overlapped; HANDLE event; @@ -7706,6 +7731,53 @@ static void test_GetAddrInfoExW(void) todo_wine_if(ret != WAIT_TIMEOUT) /* Remove when abowe todo_wines are fixed */ ok(ret == WAIT_TIMEOUT, "wait failed\n"); + /* event + completion routine */ + result = (void*)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + overlapped.hEvent = event; + ResetEvent(event); + ret = pGetAddrInfoExW(localhost, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, completion_routine, NULL); + ok(ret == WSAEINVAL, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + + /* completion routine, existing domain */ + result = (void *)0xdeadbeef; + overlapped.hEvent = NULL; + completion_routine_test.overlapped = &overlapped; + completion_routine_test.error = ERROR_SUCCESS; + completion_routine_test.result = &result; + completion_routine_test.event = event; + completion_routine_test.called = 0; + ResetEvent(event); + ret = pGetAddrInfoExW(winehq, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, completion_routine, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(!result, "result != NULL\n"); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(!ret, "overlapped result is %d\n", ret); + ok(overlapped.hEvent == NULL, "hEvent changed %p\n", overlapped.hEvent); + ok(overlapped.Internal == ERROR_SUCCESS, "overlapped.Internal = %lx\n", overlapped.Internal); + ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); + ok(completion_routine_test.called == 1, "got %u\n", completion_routine_test.called); + pFreeAddrInfoExW(result); + + /* completion routine, non-existing domain */ + result = (void *)0xdeadbeef; + completion_routine_test.overlapped = &overlapped; + completion_routine_test.error = WSAHOST_NOT_FOUND; + completion_routine_test.called = 0; + ResetEvent(event); + ret = pGetAddrInfoExW(nxdomain, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, completion_routine, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(!result, "result != NULL\n"); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(ret == WSAHOST_NOT_FOUND, "overlapped result is %d\n", ret); + ok(overlapped.hEvent == NULL, "hEvent changed %p\n", overlapped.hEvent); + ok(overlapped.Internal == WSAHOST_NOT_FOUND, "overlapped.Internal = %lx\n", overlapped.Internal); + ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); + ok(completion_routine_test.called == 1, "got %u\n", completion_routine_test.called); + ok(result == NULL, "got %p\n", result); + WSACloseEvent(event); }

1 0

Nikolay Sivov : mf: Fix stream IID loader should be testing for.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: e578ee3b0ad4d75ea486c6146b5d261bf88afbf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e578ee3b0ad4d75ea486c614… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 27 17:00:44 2019 +0300 mf: Fix stream IID loader should be testing for. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index e48792eab6..926fd48747 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1726,7 +1726,7 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in IMFTopology **output_topology, IMFTopology *current_topology) { struct topology *topology = unsafe_impl_from_IMFTopology(input_topology); - IMFMediaSink *sink; + IMFStreamSink *sink; HRESULT hr; size_t i; @@ -1745,9 +1745,9 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in if (node->object) { /* Sinks must be bound beforehand. */ - if (FAILED(IUnknown_QueryInterface(node->object, &IID_IMFMediaSink, (void **)&sink))) + if (FAILED(IUnknown_QueryInterface(node->object, &IID_IMFStreamSink, (void **)&sink))) return MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED; - IMFMediaSink_Release(sink); + IMFStreamSink_Release(sink); } break; case MF_TOPOLOGY_SOURCESTREAM_NODE:

1 0

Nikolay Sivov : mf: Add initial async implementation of SetTopology().
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: d2bd44992e0b863c7623d9147d4538991da5601f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2bd44992e0b863c7623d914… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 27 17:00:45 2019 +0300 mf: Add initial async implementation of SetTopology(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 237 +++++++++++++++++++++++++++++++++++++++++++++++------- include/mfapi.h | 10 +++ 2 files changed, 219 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d2bd44992e0b863c7623…

1 0

Andrew Eikum : msvcrt: Implement %T format for strftime.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: bfe02fc747611b6f7bb70ae1f2bbba175eb7382d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfe02fc747611b6f7bb70ae1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 27 09:28:26 2019 -0500 msvcrt: Implement %T format for strftime. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 12 ++++++++++++ dlls/ucrtbase/tests/misc.c | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 2b1c781b05..fea7ca19db 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -608,6 +608,11 @@ static void test_strftime(void) gmt_tm = p_gmtime(&gmt); ok(gmt_tm != NULL, "gmtime failed\n"); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%T", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(NULL, 0, "copy", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index e6493b09af..b7d11e0543 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1193,6 +1193,18 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) return 0; break; +#if _MSVCR_VER>=140 + case 'T': + if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) + return 0; + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_min, alternate ? 0 : 2, 0, 59)) + return 0; + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) + return 0; + break; +#endif case 'w': if(!strftime_int(str, &ret, max, mstm->tm_wday, 0, 0, 6)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 4da6abff73..bb0c2e3a0a 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -136,6 +136,7 @@ static int (CDECL *p_fesetround)(int); static void (CDECL *p___setusermatherr)(MSVCRT_matherr_func); static int* (CDECL *p_errno)(void); static char* (CDECL *p_asctime)(const struct tm *); +static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); static void (CDECL *p_exit)(int); static int (CDECL *p__crt_atexit)(void (CDECL*)(void)); static int (__cdecl *p_crt_at_quick_exit)(void (__cdecl *func)(void)); @@ -499,6 +500,7 @@ static BOOL init(void) p___setusermatherr = (void*)GetProcAddress(module, "__setusermatherr"); p_errno = (void*)GetProcAddress(module, "_errno"); p_asctime = (void*)GetProcAddress(module, "asctime"); + p_strftime = (void*)GetProcAddress(module, "strftime"); p__crt_atexit = (void*)GetProcAddress(module, "_crt_atexit"); p_exit = (void*)GetProcAddress(module, "exit"); p_crt_at_quick_exit = (void*)GetProcAddress(module, "_crt_at_quick_exit"); @@ -887,6 +889,21 @@ static void test_asctime(void) ok(!strcmp(ret, "Thu Jan 1 00:00:00 1970\n"), "asctime returned %s\n", ret); } +static void test_strftime(void) +{ + const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; + char bufA[256]; + size_t retA; + + retA = p_strftime(bufA, sizeof(bufA), "%T", &epoch); + ok(retA == 8, "expected 8, got %d\n", (int)retA); + ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%#T", &epoch); + ok(retA == 5, "expected 5, got %d\n", (int)retA); + ok(!strcmp(bufA, "0:0:0"), "got %s\n", bufA); +} + static LONG* get_failures_counter(HANDLE *map) { *map = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, @@ -1132,6 +1149,7 @@ START_TEST(misc) test_isblank(); test_math_errors(); test_asctime(); + test_strftime(); test_exit(arg_v[0]); test_quick_exit(arg_v[0]); test__stat32();

1 0

Sven Baars : httpapi/tests: Use CancelIo to avoid a test failure on Windows XP.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 5df86351f0f42a654fe4eb70fde5eb7faa5d71c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5df86351f0f42a654fe4eb70… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Sep 27 17:13:51 2019 +0200 httpapi/tests: Use CancelIo to avoid a test failure on Windows XP. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index abc5c95f0c..5c3b4ec13c 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -534,7 +534,7 @@ static void test_v1_short_buffer(void) ok(!ret, "Got error %u.\n", ret); ok(req->RequestId == req_id, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); - CancelIoEx(queue, &ovl); + CancelIo(queue); ret = HttpRemoveUrl(queue, localhost_urlW); ok(!ret, "Got error %u.\n", ret);

1 0

Piotr Caban : msxml3: Don't return NULL namespace and local name in saxreader callbacks.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 78259fceb3c591f91471ad8bd98d843e0d030bae URL: https://source.winehq.org/git/wine.git/?a=commit;h=78259fceb3c591f91471ad8b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 24 19:04:55 2019 +0200 msxml3: Don't return NULL namespace and local name in saxreader callbacks. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/saxreader.c | 10 ++++++---- dlls/msxml3/tests/saxreader.c | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 04fab81708..fc27260cc2 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -149,6 +149,8 @@ static saxreader_feature get_saxreader_feature(const WCHAR *name) return FeatureUnknown; } +static const WCHAR empty_str; + struct bstrpool { BSTR *pool; @@ -1665,8 +1667,8 @@ static void libxmlStartElementNS( &uri, &local, &element->qname, &This->IVBSAXAttributes_iface); else hr = ISAXContentHandler_startElement(handler->handler, - uri, SysStringLen(uri), - local, SysStringLen(local), + uri ? uri : &empty_str, SysStringLen(uri), + local ? local : &empty_str, SysStringLen(local), element->qname, SysStringLen(element->qname), &This->ISAXAttributes_iface); @@ -1739,8 +1741,8 @@ static void libxmlEndElementNS( else hr = ISAXContentHandler_endElement( handler->handler, - uri, SysStringLen(uri), - local, SysStringLen(local), + uri ? uri : &empty_str, SysStringLen(uri), + local ? local : &empty_str, SysStringLen(local), element->qname, SysStringLen(element->qname)); free_attribute_values(This); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index d1076f58ea..4e77b00a63 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1162,6 +1162,9 @@ static HRESULT WINAPI contentHandler_startPrefixMapping( { struct call_entry call; + ok(prefix != NULL, "prefix == NULL\n"); + ok(uri != NULL, "uri == NULL\n"); + init_call_entry(locator, &call); call.id = CH_STARTPREFIXMAPPING; call.arg1W = SysAllocStringLen(prefix, prefix_len); @@ -1177,6 +1180,8 @@ static HRESULT WINAPI contentHandler_endPrefixMapping( { struct call_entry call; + ok(prefix != NULL, "prefix == NULL\n"); + init_call_entry(locator, &call); call.id = CH_ENDPREFIXMAPPING; call.arg1W = SysAllocStringLen(prefix, len); @@ -1197,6 +1202,10 @@ static HRESULT WINAPI contentHandler_startElement( HRESULT hr; int len; + ok(uri != NULL, "uri == NULL\n"); + ok(localname != NULL, "localname == NULL\n"); + ok(qname != NULL, "qname == NULL\n"); + hr = ISAXAttributes_QueryInterface(saxattr, &IID_IMXAttributes, (void**)&mxattr); EXPECT_HR(hr, E_NOINTERFACE); @@ -1272,6 +1281,10 @@ static HRESULT WINAPI contentHandler_endElement( { struct call_entry call; + ok(uri != NULL, "uri == NULL\n"); + ok(localname != NULL, "localname == NULL\n"); + ok(qname != NULL, "qname == NULL\n"); + init_call_entry(locator, &call); call.id = CH_ENDELEMENT; call.arg1W = SysAllocStringLen(uri, uri_len); @@ -1289,6 +1302,8 @@ static HRESULT WINAPI contentHandler_characters( { struct call_entry call; + ok(chars != NULL, "chars == NULL\n"); + init_call_entry(locator, &call); call.id = CH_CHARACTERS; call.arg1W = SysAllocStringLen(chars, len); @@ -1303,6 +1318,8 @@ static HRESULT WINAPI contentHandler_ignorableWhitespace( { struct call_entry call; + ok(chars != NULL, "chars == NULL\n"); + init_call_entry(locator, &call); call.id = CH_IGNORABLEWHITESPACE; call.arg1W = SysAllocStringLen(chars, len); @@ -1318,6 +1335,9 @@ static HRESULT WINAPI contentHandler_processingInstruction( { struct call_entry call; + ok(target != NULL, "target == NULL\n"); + ok(data != NULL, "data == NULL\n"); + init_call_entry(locator, &call); call.id = CH_PROCESSINGINSTRUCTION; call.arg1W = SysAllocStringLen(target, target_len); @@ -1333,6 +1353,8 @@ static HRESULT WINAPI contentHandler_skippedEntity( { struct call_entry call; + ok(name != NULL, "name == NULL\n"); + init_call_entry(locator, &call); call.id = CH_SKIPPEDENTITY; call.arg1W = SysAllocStringLen(name, len);

1 0

Matteo Bruni : d3dx9: Move the source rect alignment check into the condition for simple copy.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: a9c158b72aae1efed159d40fde086cdc608bc62e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c158b72aae1efed159d40f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 27 20:40:01 2019 +0200 d3dx9: Move the source rect alignment check into the condition for simple copy. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 36 +++++++++++++++--------------------- dlls/d3dx9_36/tests/surface.c | 2 +- dlls/d3dx9_36/tests/texture.c | 34 ++++++++++++++++------------------ 3 files changed, 32 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index a2eca9cbdb..e85805df8e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1848,10 +1848,10 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, DWORD filter, D3DCOLOR color_key) { const struct pixel_format_desc *srcformatdesc, *destformatdesc; + struct volume src_size, dst_size; IDirect3DSurface9 *surface; D3DSURFACE_DESC surfdesc; D3DLOCKED_RECT lockrect; - struct volume src_size, dst_size; HRESULT hr; TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s, %#x, 0x%08x)\n", @@ -1871,14 +1871,18 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, return E_FAIL; } - if (filter == D3DX_DEFAULT) - filter = D3DX_FILTER_TRIANGLE | D3DX_FILTER_DITHER; - - IDirect3DSurface9_GetDesc(dst_surface, &surfdesc); + srcformatdesc = get_format_info(src_format); + if (srcformatdesc->type == FORMAT_UNKNOWN) + { + FIXME("Unsupported format %#x.\n", src_format); + return E_NOTIMPL; + } src_size.width = src_rect->right - src_rect->left; src_size.height = src_rect->bottom - src_rect->top; src_size.depth = 1; + + IDirect3DSurface9_GetDesc(dst_surface, &surfdesc); if (!dst_rect) { dst_size.width = surfdesc.Width; @@ -1899,14 +1903,10 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, return D3D_OK; } dst_size.depth = 1; - - srcformatdesc = get_format_info(src_format); destformatdesc = get_format_info(surfdesc.Format); - if (srcformatdesc->type == FORMAT_UNKNOWN) - { - FIXME("Unsupported format %#x.\n", src_format); - return E_NOTIMPL; - } + + if (filter == D3DX_DEFAULT) + filter = D3DX_FILTER_TRIANGLE | D3DX_FILTER_DITHER; if (FAILED(hr = lock_surface(dst_surface, dst_rect, &lockrect, &surface, TRUE))) return hr; @@ -1914,16 +1914,10 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, if (src_format == surfdesc.Format && dst_size.width == src_size.width && dst_size.height == src_size.height - && color_key == 0) /* Simple copy. */ + && color_key == 0 + && !(src_rect->left & (srcformatdesc->block_width - 1)) + && !(src_rect->top & (srcformatdesc->block_height - 1))) /* Simple copy. */ { - if (src_rect->left & (srcformatdesc->block_width - 1) - || src_rect->top & (srcformatdesc->block_height - 1)) - { - WARN("Source rect %s is misaligned.\n", wine_dbgstr_rect(src_rect)); - unlock_surface(dst_surface, dst_rect, surface, FALSE); - return D3DXERR_INVALIDDATA; - } - copy_pixels(src_memory, src_pitch, 0, lockrect.pBits, lockrect.Pitch, 0, &src_size, srcformatdesc); } diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 04ce57fa4f..ba44187959 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1351,7 +1351,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = D3DXLoadSurfaceFromMemory(newsurf, NULL, &rect, &dds_dxt5_8_8[128], D3DFMT_DXT5, 16 * 2, NULL, &rect, D3DX_FILTER_POINT, 0); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); check_release((IUnknown *)newsurf, 1); check_release((IUnknown *)tex, 0); diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index fc1589d25e..49aed94a17 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1804,28 +1804,26 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) hr = D3DXLoadSurfaceFromMemory(surface, NULL, &rect, &dds_dxt5_8_8[128], D3DFMT_DXT5, 16 * 2, NULL, &rect, D3DX_FILTER_POINT, 0); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - hr = D3DXLoadSurfaceFromSurface(uncompressed_surface, NULL, NULL, surface, NULL, NULL, D3DX_FILTER_NONE, 0); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = D3DXLoadSurfaceFromSurface(uncompressed_surface, NULL, NULL, surface, NULL, NULL, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface9_LockRect(uncompressed_surface, &lock_rect, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - for (y = 0; y < 8; ++y) + hr = IDirect3DSurface9_LockRect(uncompressed_surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (y = 0; y < 8; ++y) + { + for (x = 0; x < 8; ++x) { - for (x = 0; x < 8; ++x) - { - ok(compare_color(((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], - dds_dxt5_8_8_expected_misaligned_3[y * 8 + x], 0), - "Color at position %u, %u is 0x%08x, expected 0x%08x.\n", - x, y, ((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], - dds_dxt5_8_8_expected_misaligned_3[y * 8 + x]); - } + todo_wine_if (x >= 2 && x < 6 && y >= 2 && y < 6) + ok(compare_color(((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], + dds_dxt5_8_8_expected_misaligned_3[y * 8 + x], 0), + "Color at position %u, %u is 0x%08x, expected 0x%08x.\n", + x, y, ((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], + dds_dxt5_8_8_expected_misaligned_3[y * 8 + x]); } - hr = IDirect3DSurface9_UnlockRect(uncompressed_surface); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + hr = IDirect3DSurface9_UnlockRect(uncompressed_surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3DSurface9_Release(uncompressed_surface); IDirect3DSurface9_Release(surface);

1 0

Matteo Bruni : d3dx9: Implement DXTn compression for offset destination rect.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: a838e144dcaa55e227d7e99566a59f7a31d97227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a838e144dcaa55e227d7e995… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 27 20:40:03 2019 +0200 d3dx9: Implement DXTn compression for offset destination rect. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 116 ++++++++++++++++++++++++++---------------- dlls/d3dx9_36/tests/texture.c | 11 ++-- 2 files changed, 77 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a838e144dcaa55e227d7…

1 0

Matteo Bruni : d3dx9: Handle non-zero source rect position in D3DXLoadSurfaceFromMemory().
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 88d8ae383932ad1c292c74da7dcc19f00d8423f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88d8ae383932ad1c292c74da… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 27 20:40:02 2019 +0200 d3dx9: Handle non-zero source rect position in D3DXLoadSurfaceFromMemory(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41936 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 3 +++ dlls/d3dx9_36/tests/surface.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index e85805df8e..5cc9b39acf 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1911,6 +1911,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, if (FAILED(hr = lock_surface(dst_surface, dst_rect, &lockrect, &surface, TRUE))) return hr; + src_memory = (BYTE *)src_memory + src_rect->top / srcformatdesc->block_height * src_pitch + + src_rect->left / srcformatdesc->block_width * srcformatdesc->block_byte_count; + if (src_format == surfdesc.Format && dst_size.width == src_size.width && dst_size.height == src_size.height diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index ba44187959..1a39d82961 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -942,8 +942,19 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) check_release((IUnknown*)surf, 0); + SetRect(&rect, 1, 1, 2, 2); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 1, 1, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8b8g8r8, + D3DFMT_A8R8G8B8, 8, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); + check_pixel_4bpp(&lockrect, 0, 0, 0x8dc32bf6); + IDirect3DSurface9_UnlockRect(surf); + check_release((IUnknown *)surf, 0); /* test color conversion */ + SetRect(&rect, 0, 0, 2, 2); /* A8R8G8B8 */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf, NULL); if(FAILED(hr)) skip("Failed to create a surface (%#x)\n", hr);

1 0

Matteo Bruni : d3dx9: Don't pass the D3DLOCK_DISCARD flag when mapping a texture.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 536fce7f3b887fcc087d4c00106ceb2f0ff93c01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=536fce7f3b887fcc087d4c00… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 27 20:40:04 2019 +0200 d3dx9: Don't pass the D3DLOCK_DISCARD flag when mapping a texture. We aren't necessarily rewriting the whole surface (e.g. rect smaller than the whole surface, color key). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 5665bdc3b4..bd2055d54d 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -209,7 +209,7 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO DWORD lock_flag; HRESULT hr; - lock_flag = write ? D3DLOCK_DISCARD : D3DLOCK_READONLY; + lock_flag = write ? 0 : D3DLOCK_READONLY; *temp_surface = NULL; if (FAILED(hr = IDirect3DSurface9_LockRect(surface, lock, surface_rect, lock_flag))) {

1 0