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

Bruno Jesus : ws2_32: Fix return value when receiving with MSG_OOB without data to read.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: e845bded34247dda124a6355dfd9beda2f17dd01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e845bded34247dda124a6355d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Mar 31 00:06:52 2015 -0300 ws2_32: Fix return value when receiving with MSG_OOB without data to read. --- dlls/ws2_32/socket.c | 5 +++++ dlls/ws2_32/tests/sock.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4444011..52fd03b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6837,6 +6837,11 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, n = WS2_recv( fd, wsa, flags ); if (n == -1) { + /* Unix-like systems return EINVAL when attempting to read OOB data from + * an empty socket buffer, convert that to a Windows expected return. */ + if ((flags & MSG_OOB) && errno == EINVAL) + errno = EWOULDBLOCK; + if (errno != EAGAIN) { int loc_errno = errno; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 533e58c..287a24b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4712,14 +4712,12 @@ static void test_ioctlsocket(void) ret = recv(dst, &data, 1, i); ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); ret = GetLastError(); -todo_wine ok(ret == WSAEWOULDBLOCK, "expected 10035, got %d\n", ret); bufs.len = sizeof(char); bufs.buf = &data; ret = WSARecv(dst, &bufs, 1, &bytes_rec, &i, NULL, NULL); ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); ret = GetLastError(); -todo_wine ok(ret == WSAEWOULDBLOCK, "expected 10035, got %d\n", ret); optval = 1; ret = setsockopt(dst, SOL_SOCKET, SO_OOBINLINE, (void *)&optval, sizeof(optval));

1 0

Bruno Jesus : ws2_32/tests: Add more WSAEnumNetworkEvents tests.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: 5103291645f50261694c45281744c15121ff99d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5103291645f50261694c45281… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Mar 31 00:06:37 2015 -0300 ws2_32/tests: Add more WSAEnumNetworkEvents tests. --- dlls/ws2_32/tests/sock.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b7bc006..188e25c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2648,6 +2648,98 @@ static void test_WSADuplicateSocket(void) closesocket(source); } +static void test_WSAEnumNetworkEvents(void) +{ + SOCKET s, s2; + int sock_type[] = {SOCK_STREAM, SOCK_DGRAM, SOCK_STREAM}, i, j, k, l; + struct sockaddr_in address; + HANDLE event; + WSANETWORKEVENTS net_events; + /* Windows 2000 Pro without SP installed (testbot) will crash if + * WSAEnumNetworkEvents have a NULL event, so skip this test in <= 2000 */ + DWORD ver = GetVersion() & 0xFFFF; + BOOL supports_null = ((ver & 0xFF) << 8 | (ver >> 8)) > 0x0500; + + memset(&address, 0, sizeof(address)); + address.sin_addr.s_addr = htonl(INADDR_ANY); + address.sin_family = AF_INET; + + /* This test follows the steps from bugs 10204 and 24946 */ + for (l = 0; l < 2; l++) + { + if (l == 1 && !supports_null && broken(1)) continue; + + for (i = 0; i < sizeof(sock_type) / sizeof(sock_type[0]); i++) + { + if (i == 2) + ok(!tcp_socketpair(&s, &s2), "Test[%d]: creating socket pair failed\n", i); + else + { + s = socket(AF_INET, sock_type[i], 0); + ok (s != SOCKET_ERROR, "Test[%d]: failed to create socket\n", i); + ok (!bind(s, (struct sockaddr*) &address, sizeof(address)), "Test[%d]: bind failed\n", i); + } + event = WSACreateEvent(); + ok (event != NULL, "Test[%d]: failed to create event\n", i); + for (j = 0; j < 5; j++) /* Repeat sometimes and the result must be the same */ + { + /* When the TCP socket is not connected NO events will be returned. + * When connected and no data pending it will get the write event. + * UDP sockets don't have connections so as soon as they are bound + * they can read/write data. Since nobody is sendind us data only + * the write event will be returned and ONLY once. + */ + ok (!WSAEventSelect(s, event, FD_READ | FD_WRITE), "Test[%d]: WSAEventSelect failed\n", i); + memset(&net_events, 0xAB, sizeof(net_events)); + ok (!WSAEnumNetworkEvents(s, l == 0 ? event : NULL, &net_events), + "Test[%d]: WSAEnumNetworkEvents failed\n", i); + if (i >= 1 && j == 0) /* FD_WRITE is SET on first try for UDP and connected TCP */ + { + if (i == 0) /* Remove when fixed */ + { + todo_wine + ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n", + i, net_events.lNetworkEvents); + } + else + ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n", + i, net_events.lNetworkEvents); + } + else + { + if (i != 0) /* Remove when fixed */ + { + todo_wine + ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", + i, net_events.lNetworkEvents); + } + else + ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", + i, net_events.lNetworkEvents); + } + for (k = 0; k < FD_MAX_EVENTS; k++) + { + if (i >= 1 && j == 0 && k == 1) /* first UDP and connected TCP test, FD_WRITE bit no error*/ + { + ok (net_events.iErrorCode[k] == 0x0, "Test[%d][%d]: expected 0x0, got 0x%x\n", + i, k, net_events.iErrorCode[k]); + } + else + { + /* Bits that are not set in lNetworkEvents MUST not be changed */ + todo_wine + ok (net_events.iErrorCode[k] == 0xABABABAB, "Test[%d][%d]: expected 0xABABABAB, got 0x%x\n", + i, k, net_events.iErrorCode[k]); + } + } + } + closesocket(s); + WSACloseEvent(event); + if (i == 2) closesocket(s2); + } + } +} + static void test_WSAAddressToStringA(void) { SOCKET v6 = INVALID_SOCKET; @@ -8454,6 +8546,7 @@ START_TEST( sock ) test_getservbyname(); test_WSASocket(); test_WSADuplicateSocket(); + test_WSAEnumNetworkEvents(); test_WSAAddressToStringA(); test_WSAAddressToStringW();

1 0

Sebastian Lackner : advapi32/tests: Add tests for NtCreateFile inheritance when security descriptor is set.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: 3e47270b6843d0ee906694f39e2feda60923c347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e47270b6843d0ee906694f39… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 31 03:33:56 2015 +0200 advapi32/tests: Add tests for NtCreateFile inheritance when security descriptor is set. --- dlls/advapi32/tests/security.c | 55 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 065dd9a..4bee951 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3132,7 +3132,7 @@ static void test_CreateDirectoryA(void) DWORD error; PACL pDacl; - if (!pGetNamedSecurityInfoA || !pCreateWellKnownSid) + if (!pGetSecurityInfo || !pGetNamedSecurityInfoA || !pCreateWellKnownSid) { win_skip("Required functions are not available\n"); return; @@ -3324,6 +3324,59 @@ static void test_CreateDirectoryA(void) LocalFree(pSD); CloseHandle(hTemp); + /* When a security descriptor is set, then inheritance doesn't take effect */ + pSD = &sd; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL)); + bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); + ok(bret, "Failed to initialize ACL\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor\n"); + + strcpy(tmpfile, tmpdir); + lstrcatA(tmpfile, "/tmpfile"); + get_nt_pathW(tmpfile, &tmpfileW); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &tmpfileW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = pSD; + attr.SecurityQualityOfService = NULL; + + status = pNtCreateFile(&hTemp, GENERIC_WRITE | DELETE, &attr, &io, NULL, 0, + FILE_SHARE_READ, FILE_CREATE, FILE_DELETE_ON_CLOSE, NULL, 0); + ok(!status, "NtCreateFile failed with %08x\n", status); + RtlFreeUnicodeString(&tmpfileW); + HeapFree(GetProcessHeap(), 0, pDacl); + + error = pGetSecurityInfo(hTemp, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine + ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", + acl_size.AceCount); + LocalFree(pSD); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + todo_wine + ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); + if (error == ERROR_SUCCESS) + { + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine + ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", + acl_size.AceCount); + LocalFree(pSD); + } + CloseHandle(hTemp); + done: HeapFree(GetProcessHeap(), 0, user); bret = RemoveDirectoryA(tmpdir);

1 0

Henri Verbeet : d3d10core/tests: Port the d3d9 vPos test to d3d10.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: f35cc97911b1d52d704b8900bfb1a471defdb094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35cc97911b1d52d704b8900b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 10:24:59 2015 +0200 d3d10core/tests: Port the d3d9 vPos test to d3d10. --- dlls/d3d10core/tests/device.c | 217 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 4 +- 2 files changed, 219 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f35cc97911b1d52d704b8…

1 0

Matteo Bruni : ddraw: Make sure AddLight properly activates lights.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: b41a3ad2193fe59a16a830bf4205fc204ef9405c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b41a3ad2193fe59a16a830bf4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 30 20:18:01 2015 +0200 ddraw: Make sure AddLight properly activates lights. --- dlls/ddraw/viewport.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 84c1b14..5ebc41e 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -672,8 +672,8 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface, This->background->mat.u.diffuse.u4.a); } - /* Need to temporarily activate viewport to clear it. Previously active one will be restored - afterwards. */ + /* Need to temporarily activate the viewport to clear it. The previously + * active one will be restored afterwards. */ viewport_activate(This, TRUE); hr = IDirect3DDevice7_Clear(&This->active_device->IDirect3DDevice7_iface, rect_count, rects, @@ -740,8 +740,12 @@ static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *iface, IDirect3D light_impl->active_viewport = This; /* If active, activate the light */ - if (This->active_device) + if (This->active_device && light_impl->light.dwFlags & D3DLIGHT_ACTIVE) + { + /* Disable the flag so that light_activate actually does its job. */ + light_impl->light.dwFlags &= ~D3DLIGHT_ACTIVE; light_activate(light_impl); + } wined3d_mutex_unlock();

1 0

Henri Verbeet : d2d1: Fix a typo in the determinant calculation in d2d_d3d_render_target_FillRectangle ().
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: efe777c8ac9957c1a02282367ca1b597b5ab2d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe777c8ac9957c1a02282367… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 10:25:00 2015 +0200 d2d1: Fix a typo in the determinant calculation in d2d_d3d_render_target_FillRectangle(). --- dlls/d2d1/render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index c078989..fe7b947 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -617,7 +617,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar /* Invert the matrix. (Because the matrix is applied to the sampling * coordinates. I.e., to scale the bitmap by 2 we need to divide the * coordinates by 2.) */ - d = transform._11 * transform._22 - transform._21 * transform._22; + d = transform._11 * transform._22 - transform._21 * transform._12; if (d != 0.0f) { transform_inverse._11 = transform._22 / d;

1 0

Nikolay Sivov : taskmgr: Set column order through listview.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: db4dd8cd382631cdce799b3d8f7bc1c0718e0dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4dd8cd382631cdce799b3d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 23:49:44 2015 +0300 taskmgr: Set column order through listview. --- programs/taskmgr/column.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/taskmgr/column.c b/programs/taskmgr/column.c index 4fd02dd..35ba2a0 100644 --- a/programs/taskmgr/column.c +++ b/programs/taskmgr/column.c @@ -171,7 +171,7 @@ void AddColumns(void) InsertColumn(24, wszIOOtherBytes, LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[24], -1); size = SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); - SendMessageW(hProcessPageHeaderCtrl, HDM_SETORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); + SendMessageW(hProcessPageListCtrl, LVM_SETCOLUMNORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); UpdateColumnDataHints(); }

1 0

Piotr Caban : msvcr120: Add some missing exports on i386 architecture.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: ccea6c60599e5c2e46d3b5596c4ba167792de649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccea6c60599e5c2e46d3b5596… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 30 16:31:38 2015 +0200 msvcr120: Add some missing exports on i386 architecture. --- dlls/msvcr120/msvcr120.spec | 8 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/math.c | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c7df42f..b79e32c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -893,8 +893,8 @@ @ stub -arch=i386,win64 __crtCompareStringEx @ cdecl __crtCompareStringW(long long wstr long wstr long) @ stub __crtCreateEventExW -@ stub -arch=i386 ___crtCreateSemaphoreExW -@ stub -arch=x86_64 __crtCreateSymbolicLinkW +@ stub -arch=i386 __crtCreateSemaphoreExW +@ stub __crtCreateSymbolicLinkW @ stub -arch=i386,win64 __crtEnumSystemLocalesEx @ stub -arch=i386,win64 __crtFlsAlloc @ stub -arch=i386,win64 __crtFlsFree @@ -1057,7 +1057,7 @@ @ cdecl _chdir(str) MSVCRT__chdir @ cdecl _chdrive(long) MSVCRT__chdrive @ cdecl _chgsign(double) MSVCRT__chgsign -@ cdecl -arch=arm,x86_64 _chgsignf(float) MSVCRT__chgsignf +@ cdecl _chgsignf(float) MSVCRT__chgsignf @ cdecl -arch=i386 -norelay _chkesp() @ cdecl _chmod(str long) MSVCRT__chmod @ cdecl _chsize(long long) MSVCRT__chsize @@ -1071,7 +1071,7 @@ @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) @ cdecl _copysign(double double) MSVCRT__copysign -@ cdecl -arch=arm,x86_64 _copysignf(float float) MSVCRT__copysignf +@ cdecl _copysignf(float float) MSVCRT__copysignf @ varargs _cprintf(str) @ stub _cprintf_l @ stub _cprintf_p diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 71a6347..f67e414 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1021,7 +1021,7 @@ @ cdecl _calloc_crt(long long) msvcr120._calloc_crt @ cdecl _cexit() msvcr120._cexit @ cdecl _chgsign(double) msvcr120._chgsign -@ cdecl -arch=arm,x86_64 _chgsignf(float) msvcr120._chgsignf +@ cdecl _chgsignf(float) msvcr120._chgsignf @ cdecl -arch=i386 -norelay _chkesp() msvcr120._chkesp @ cdecl _chmod(str long) msvcr120._chmod @ cdecl _chsize(long long) msvcr120._chsize @@ -1035,7 +1035,7 @@ @ cdecl _controlfp(long long) msvcr120._controlfp @ cdecl _controlfp_s(ptr long long) msvcr120._controlfp_s @ cdecl _copysign(double double) msvcr120._copysign -@ cdecl -arch=arm,x86_64 _copysignf(float float) msvcr120._copysignf +@ cdecl _copysignf(float float) msvcr120._copysignf @ cdecl _creat(str long) msvcr120._creat @ cdecl _create_locale(long str) msvcr120._create_locale @ stub -arch=i386 _crt_debugger_hook diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0cd69da..7c971d3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -73,7 +73,7 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } -#if defined(__x86_64__) || defined(__arm__) +#if defined(__x86_64__) || defined(__arm__) || _MSVCR_VER>=120 /********************************************************************* * _chgsignf (MSVCRT.@) @@ -94,6 +94,9 @@ float CDECL MSVCRT__copysignf( float num, float sign ) return signbit(num) ? -num : num; } +#endif +#if defined(__x86_64__) || defined(__arm__) + /********************************************************************* * _finitef (MSVCRT.@) */

1 0

Vincent Povirk : windowscodecs: Implement PngDecoder_Block_GetReaderByIndex.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: f2f5cd831bdda21deef1fca67febe78fb174d582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f5cd831bdda21deef1fca67… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 25 14:42:15 2015 -0500 windowscodecs: Implement PngDecoder_Block_GetReaderByIndex. --- dlls/windowscodecs/pngformat.c | 47 +++++++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/metadata.c | 6 ++--- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 53a2122..679ad3d 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1062,8 +1062,51 @@ static HRESULT WINAPI PngDecoder_Block_GetCount(IWICMetadataBlockReader *iface, static HRESULT WINAPI PngDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader *iface, UINT nIndex, IWICMetadataReader **ppIMetadataReader) { - FIXME("%p,%d,%p\n", iface, nIndex, ppIMetadataReader); - return E_NOTIMPL; + PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); + HRESULT hr; + IWICComponentFactory* factory; + IWICStream* stream; + + TRACE("%p,%d,%p\n", iface, nIndex, ppIMetadataReader); + + if (nIndex >= This->metadata_count || !ppIMetadataReader) + return E_INVALIDARG; + + if (!This->metadata_blocks[nIndex].reader) + { + hr = StreamImpl_Create(&stream); + + if (SUCCEEDED(hr)) + { + hr = IWICStream_InitializeFromIStreamRegion(stream, This->stream, + This->metadata_blocks[nIndex].ofs, This->metadata_blocks[nIndex].len); + + if (SUCCEEDED(hr)) + hr = ComponentFactory_CreateInstance(&IID_IWICComponentFactory, (void**)&factory); + + if (SUCCEEDED(hr)) + { + hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, + &GUID_ContainerFormatPng, NULL, WICMetadataCreationAllowUnknown, + (IStream*)stream, &This->metadata_blocks[nIndex].reader); + + IWICComponentFactory_Release(factory); + } + + IWICStream_Release(stream); + } + + if (FAILED(hr)) + { + *ppIMetadataReader = NULL; + return hr; + } + } + + *ppIMetadataReader = This->metadata_blocks[nIndex].reader; + IWICMetadataReader_AddRef(*ppIMetadataReader); + + return S_OK; } static HRESULT WINAPI PngDecoder_Block_GetEnumerator(IWICMetadataBlockReader *iface, diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 1a7587f..6e629fb 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -960,19 +960,19 @@ static void test_metadata_png(void) } hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 0, &reader); - todo_wine ok(hr == S_OK, "GetReaderByIndex failed, hr=%x\n", hr); + ok(hr == S_OK, "GetReaderByIndex failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { hr = IWICMetadataReader_GetMetadataFormat(reader, &containerformat); ok(hr == S_OK, "GetMetadataFormat failed, hr=%#x\n", hr); - ok(IsEqualGUID(&containerformat, &GUID_MetadataFormatChunktIME) || + todo_wine ok(IsEqualGUID(&containerformat, &GUID_MetadataFormatChunktIME) || broken(IsEqualGUID(&containerformat, &GUID_MetadataFormatUnknown)) /* Windows XP */, "unexpected container format\n"); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == 6 || broken(count == 1) /* XP */, "expected 6, got %u\n", count); + todo_wine ok(count == 6 || broken(count == 1) /* XP */, "expected 6, got %u\n", count); if (count == 6) compare_metadata(reader, td, count);

1 0

André Hentschel : loader: Run checks also on ARM Linux.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 9a1fab59e7d5d993760224b250a8b52d30f58952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a1fab59e7d5d993760224b25… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 27 21:22:01 2015 +0100 loader: Run checks also on ARM Linux. --- loader/main.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/loader/main.c b/loader/main.c index ce21173..bb752b5 100644 --- a/loader/main.c +++ b/loader/main.c @@ -109,8 +109,9 @@ static void check_command_line( int argc, char *argv[] ) } -#if defined(__linux__) && defined(__i386__) +#if defined(__linux__) && (defined(__i386__) || defined(__arm__)) +#ifdef __i386__ /* separate thread to check for NPTL and TLS features */ static void *needs_pthread( void *arg ) { @@ -140,6 +141,11 @@ static void check_threading(void) pthread_join( id, &ret ); if (!ret) exit(1); } +#else +static void check_threading(void) +{ +} +#endif static void check_vmsplit( void *stack ) { @@ -171,7 +177,11 @@ static int pre_exec(void) check_threading(); check_vmsplit( &temp ); set_max_limit( RLIMIT_AS ); - return 1; +#ifdef __i386__ + return 1; /* we have a preloader on x86 */ +#else + return 0; +#endif } #elif defined(__linux__) && defined(__x86_64__)

1 0