November 2016 - Wine-Commits

Józef Kucia : d3d11/tests: Add test for occlusion query.
by Alexandre Julliard Nov. 22, 2016

Nov. 22, 2016

Module: wine Branch: master Commit: eacb2f91aad77c9c4e850a1edca9e370f758d54c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eacb2f91aad77c9c4e850a1ed… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 21 15:15:52 2016 +0100 d3d11/tests: Add test for occlusion query. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 123676d..50f58cc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4623,6 +4623,119 @@ static void test_create_query(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_occlusion_query(void) +{ + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + D3D11_QUERY_DESC query_desc; + ID3D11Asynchronous *query; + unsigned int data_size, i; + ID3D11Device *device; + union + { + UINT64 uint; + DWORD dword[2]; + } data; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + + query_desc.Query = D3D11_QUERY_OCCLUSION; + query_desc.MiscFlags = 0; + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D11Asynchronous_GetDataSize(query); + todo_wine ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); + + hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_End(context, query); + ID3D11DeviceContext_Begin(context, query); + ID3D11DeviceContext_Begin(context, query); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, + "Data was modified 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + draw_color_quad(&test_context, &red); + + ID3D11DeviceContext_End(context, query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(data.uint == 640 * 480, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(DWORD), 0); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(WORD), 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data) - 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data) + 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo_wine ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, + "Data was modified 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D11DeviceContext_GetData(context, query, &data, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, + "Data was modified 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + hr = ID3D11DeviceContext_GetData(context, query, NULL, sizeof(DWORD), 0); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, NULL, sizeof(data), 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_Begin(context, query); + ID3D11DeviceContext_End(context, query); + ID3D11DeviceContext_End(context, query); + + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + data.dword[0] = 0x12345678; + data.dword[1] = 0x12345678; + hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!data.uint, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + ID3D11Asynchronous_Release(query); + release_test_context(&test_context); +} + static void test_timestamp_query(void) { static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; @@ -10926,6 +11039,7 @@ START_TEST(d3d11) test_create_depthstencil_state(); test_create_rasterizer_state(); test_create_query(); + test_occlusion_query(); test_timestamp_query(); test_device_removed_reason(); test_private_data();

1 0

Hans Leidekker : rpcrt4: Handle NULL binding in RpcBindingInqAuthClient{, Ex}.
by Alexandre Julliard Nov. 22, 2016

Nov. 22, 2016

Module: wine Branch: master Commit: f8450fae23d3f87f220cdd1212500900925328c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8450fae23d3f87f220cdd121… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 22 16:27:06 2016 +0100 rpcrt4: Handle NULL binding in RpcBindingInqAuthClient{,Ex}. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_binding.c | 6 +++++- dlls/rpcrt4/tests/server.c | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 07eddbe..f2b1d59 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1621,11 +1621,15 @@ RpcBindingInqAuthClientExW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE * RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, ULONG *AuthzSvc, ULONG Flags ) { - RpcBinding *bind = ClientBinding; + RpcBinding *bind; TRACE("%p %p %p %p %p %p 0x%x\n", ClientBinding, Privs, ServerPrincName, AuthnLevel, AuthnSvc, AuthzSvc, Flags); + if (!ClientBinding) ClientBinding = I_RpcGetCurrentCallHandle(); + if (!ClientBinding) return RPC_S_INVALID_BINDING; + + bind = ClientBinding; if (!bind->FromConn) return RPC_S_INVALID_BINDING; return rpcrt4_conn_inquire_auth_client(bind->FromConn, Privs, diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index ee28703..89dc27a 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1525,6 +1525,15 @@ void __cdecl s_authinfo_test(unsigned int protseq, int secure) } ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "level unchanged\n"); ok(authnsvc == RPC_C_AUTHN_WINNT, "authnsvc unchanged\n"); + RpcStringFreeA(&principal); + + status = RpcBindingInqAuthClientA(NULL, &privs, &principal, &level, &authnsvc, NULL); + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + RpcStringFreeA(&principal); + + status = RpcBindingInqAuthClientExA(NULL, &privs, &principal, &level, &authnsvc, NULL, 0); + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + RpcStringFreeA(&principal); status = RpcImpersonateClient(NULL); ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status);

1 0

Nikolay Sivov : d2d1: Implement DrawLine() over DrawGeometry() for a linear path.
by Alexandre Julliard Nov. 22, 2016

Nov. 22, 2016

Module: wine Branch: master Commit: 7159479e11b4ad0970236039bb2544e5bec4fb2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7159479e11b4ad0970236039b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 21 15:10:33 2016 +0300 d2d1: Implement DrawLine() over DrawGeometry() for a linear path. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index d4c812b..3deb6e3 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -471,8 +471,36 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTar static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawLine(ID2D1RenderTarget *iface, D2D1_POINT_2F p0, D2D1_POINT_2F p1, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) { - FIXME("iface %p, p0 {%.8e, %.8e}, p1 {%.8e, %.8e}, brush %p, stroke_width %.8e, stroke_style %p stub!\n", + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + ID2D1PathGeometry *geometry; + ID2D1GeometrySink *sink; + HRESULT hr; + + TRACE("iface %p, p0 {%.8e, %.8e}, p1 {%.8e, %.8e}, brush %p, stroke_width %.8e, stroke_style %p.\n", iface, p0.x, p0.y, p1.x, p1.y, brush, stroke_width, stroke_style); + + if (FAILED(hr = ID2D1Factory_CreatePathGeometry(render_target->factory, &geometry))) + { + WARN("Failed to create path geometry, %#x.\n", hr); + return; + } + + if (FAILED(hr = ID2D1PathGeometry_Open(geometry, &sink))) + { + WARN("Open() failed, %#x.\n", hr); + ID2D1PathGeometry_Release(geometry); + return; + } + + ID2D1GeometrySink_BeginFigure(sink, p0, D2D1_FIGURE_BEGIN_FILLED); + ID2D1GeometrySink_AddLine(sink, p1); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + if (FAILED(hr = ID2D1GeometrySink_Close(sink))) + WARN("Close() failed, %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + + ID2D1RenderTarget_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); + ID2D1PathGeometry_Release(geometry); } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRectangle(ID2D1RenderTarget *iface,

1 0

Bruno Jesus : msvfw32: Allow ICInfo to enumerate codecs when fccType is zero.
by Alexandre Julliard Nov. 22, 2016

Nov. 22, 2016

Module: wine Branch: master Commit: ca2420c0ea4e7cc56520e07fd4c1e18e46de503e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2420c0ea4e7cc56520e07fd… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 22 03:52:54 2016 -0200 msvfw32: Allow ICInfo to enumerate codecs when fccType is zero. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 4 ++-- dlls/msvfw32/tests/msvfw.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 0ae33ed..8ed6917 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -248,7 +248,7 @@ static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) lRet = RegEnumValueA(hKey, i++, buf, &name, 0, &type, (LPBYTE)(buf+name), &data); if (lRet == ERROR_NO_MORE_ITEMS) break; if (lRet != ERROR_SUCCESS) continue; - if (name != 9 || strncasecmp(buf, fccTypeStr, 5)) continue; + if (fccType && (name != 9 || strncasecmp(buf, fccTypeStr, 5))) continue; buf[name] = '='; if ((result = handler(buf, cnt++, param))) break; } @@ -262,7 +262,7 @@ static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) for (s = buf; *s; s += strlen(s) + 1) { TRACE("got %s\n", s); - if (strncasecmp(s, fccTypeStr, 5) || s[9] != '=') continue; + if (fccType && (strncasecmp(s, fccTypeStr, 5) || s[9] != '=')) continue; if ((result = handler(s, cnt++, param))) break; } } diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 507d003..d621da2 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -318,7 +318,6 @@ todo_wine "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); } } -todo_wine ok(found != 0, "expected at least one codec\n"); }

1 0

Huw Davies : kernel32/tests: VerifyConsoleIoHandle() always returns FALSE on Windows 8 and 10.
by Alexandre Julliard Nov. 22, 2016

Nov. 22, 2016

Module: wine Branch: master Commit: 5dd0c7fa7b3b5e4307fab31e1140c8502ea1ec1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd0c7fa7b3b5e4307fab31e1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 22 12:00:10 2016 +0000 kernel32/tests: VerifyConsoleIoHandle() always returns FALSE on Windows 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 79e1772..a14bc45 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1319,7 +1319,9 @@ static void test_VerifyConsoleIoHandle( HANDLE handle ) SetLastError(0xdeadbeef); ret = pVerifyConsoleIoHandle(handle); error = GetLastError(); - ok(ret, "expected VerifyConsoleIoHandle to succeed\n"); + ok(ret || + broken(!ret), /* Windows 8 and 10 */ + "expected VerifyConsoleIoHandle to succeed\n"); ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); }

1 0

Huw Davies : kernel32/tests: Add some GetLastError() values for Windows 8 and 10.
by Alexandre Julliard Nov. 22, 2016

Nov. 22, 2016

Module: wine Branch: master Commit: f1b5e98ad8bc51e6781a012d4aa29ff25c9fc5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b5e98ad8bc51e6781a012d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 22 12:00:08 2016 +0000 kernel32/tests: Add some GetLastError() values for Windows 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index d8584c4..cdcfa15 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2616,27 +2616,35 @@ static void test_ReadConsole(void) SetLastError(0xdeadbeef); ret = GetFileSize(std_input, NULL); ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_INVALID_FUNCTION, /* Win 8, 10 */ + "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(std_input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); - ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ + "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); ok(!bytes, "expected 0, got %u\n", bytes); bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadConsoleA(std_input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); - ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ + "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", bytes); bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadConsoleW(std_input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); - ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ + "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", bytes); }

1 0

Hans Leidekker : shell32: Implement IKnownFolderManager::GetFolderByName.
by Alexandre Julliard Nov. 22, 2016

Nov. 22, 2016

Module: wine Branch: master Commit: 567b52cd933d4ce2646d58b7cb9943c08949e6ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=567b52cd933d4ce2646d58b7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 22 16:27:07 2016 +0100 shell32: Implement IKnownFolderManager::GetFolderByName. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 45 ++++++++++++++++++++++++++++++++++++++++-- dlls/shell32/tests/shellpath.c | 20 ++++++++++++++++++- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 2072814..aa2742d 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5549,8 +5549,49 @@ static HRESULT WINAPI foldermanager_GetFolderByName( LPCWSTR pszCanonicalName, IKnownFolder **ppkf) { - FIXME("%s, %p\n", debugstr_w(pszCanonicalName), ppkf); - return E_NOTIMPL; + struct foldermanager *fm = impl_from_IKnownFolderManager( iface ); + struct knownfolder *kf; + BOOL found = FALSE; + HRESULT hr; + UINT i; + + TRACE( "%s, %p\n", debugstr_w(pszCanonicalName), ppkf ); + + for (i = 0; i < fm->num_ids; i++) + { + WCHAR *path, *name; + hr = get_known_folder_registry_path( &fm->ids[i], NULL, &path ); + if (FAILED( hr )) return hr; + + hr = get_known_folder_wstr( path, szName, &name ); + HeapFree( GetProcessHeap(), 0, path ); + if (FAILED( hr )) return hr; + + found = !strcmpiW( pszCanonicalName, name ); + CoTaskMemFree( name ); + if (found) break; + } + + if (found) + { + hr = knownfolder_create( &kf ); + if (FAILED( hr )) return hr; + + hr = knownfolder_set_id( kf, &fm->ids[i] ); + if (FAILED( hr )) + { + IKnownFolder_Release( &kf->IKnownFolder_iface ); + return hr; + } + *ppkf = &kf->IKnownFolder_iface; + } + else + { + hr = HRESULT_FROM_WIN32( ERROR_FILE_NOT_FOUND ); + *ppkf = NULL; + } + + return hr; } static HRESULT register_folder(const KNOWNFOLDERID *rfid, const KNOWNFOLDER_DEFINITION *pKFD) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 2125092..fa391c2 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2033,9 +2033,11 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId static void test_knownFolders(void) { static const WCHAR sWindows[] = {'W','i','n','d','o','w','s',0}; + static const WCHAR sWindows2[] = {'w','i','n','d','o','w','s',0}; static const WCHAR sExample[] = {'E','x','a','m','p','l','e',0}; static const WCHAR sExample2[] = {'E','x','a','m','p','l','e','2',0}; static const WCHAR sSubFolder[] = {'S','u','b','F','o','l','d','e','r',0}; + static const WCHAR sNoSuch[] = {'N','o','S','u','c','h',0}; static const WCHAR sBackslash[] = {'\\',0}; static const KNOWNFOLDERID newFolderId = {0x01234567, 0x89AB, 0xCDEF, {0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x01} }; static const KNOWNFOLDERID subFolderId = {0xFEDCBA98, 0x7654, 0x3210, {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF} }; @@ -2137,7 +2139,6 @@ static void test_knownFolders(void) } hr = IKnownFolderManager_GetFolderByName(mgr, sWindows, &folder); - todo_wine ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); if(SUCCEEDED(hr)) { @@ -2149,6 +2150,23 @@ static void test_knownFolders(void) ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); } + hr = IKnownFolderManager_GetFolderByName(mgr, sWindows2, &folder); + ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IKnownFolder_GetId(folder, &folderId); + ok(hr == S_OK, "failed to get folder id: 0x%08x\n", hr); + ok(IsEqualGUID(&folderId, &FOLDERID_Windows)==TRUE, "invalid KNOWNFOLDERID returned\n"); + + hr = IKnownFolder_Release(folder); + ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); + } + + folder = (IKnownFolder *)0xdeadbeef; + hr = IKnownFolderManager_GetFolderByName(mgr, sNoSuch, &folder); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(folder == NULL, "got %p\n", folder); + for(i=0; i<sizeof(known_folder_found)/sizeof(known_folder_found[0]); ++i) known_folder_found[i] = FALSE;

1 0

Stefan Silviu : msvcrt: Implement nearbyint and nearbyintf.
by Alexandre Julliard Nov. 22, 2016

Nov. 22, 2016

Module: wine Branch: master Commit: 4d37b87219b17049e7b1928bc8148a561382f513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d37b87219b17049e7b1928bc… Author: Stefan Silviu <sylviu44(a)gmail.com> Date: Tue Nov 22 09:39:50 2016 +0100 msvcrt: Implement nearbyint and nearbyintf. Signed-off-by: Stefan Silviu <sylviu44(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 24 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +++--- include/config.h.in | 6 ++++++ include/msvcrt/math.h | 3 +++ 9 files changed, 49 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 3feca3f..783332b 100755 --- a/configure +++ b/configure @@ -17130,6 +17130,8 @@ for ac_func in \ lrintf \ lround \ lroundf \ + nearbyint \ + nearbyintf \ powl \ remainder \ remainderf \ diff --git a/configure.ac b/configure.ac index 1c42e2d..353f271 100644 --- a/configure.ac +++ b/configure.ac @@ -2554,6 +2554,8 @@ AC_CHECK_FUNCS(\ lrintf \ lround \ lroundf \ + nearbyint \ + nearbyintf \ powl \ remainder \ remainderf \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index f886b97..87937ea 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -291,9 +291,9 @@ @ stub nan @ stub nanf @ stub nanl -@ stub nearbyint -@ stub nearbyintf -@ stub nearbyintl +@ cdecl nearbyint(double) ucrtbase.nearbyint +@ cdecl nearbyintf(float) ucrtbase.nearbyintf +@ cdecl nearbyintl(double) ucrtbase.nearbyintl @ cdecl nextafter(double double) ucrtbase.nextafter @ cdecl nextafterf(float float) ucrtbase.nextafterf @ cdecl nextafterl(double double) ucrtbase.nextafterl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7ce5dfb..f305062 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2296,9 +2296,9 @@ @ stub nan @ stub nanf @ stub nanl -@ stub nearbyint -@ stub nearbyintf -@ stub nearbyintl +@ cdecl nearbyint(double) MSVCRT_nearbyint +@ cdecl nearbyintf(float) MSVCRT_nearbyintf +@ cdecl nearbyintl(double) MSVCRT_nearbyint @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 1acaf7c..449e8e1 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1959,9 +1959,9 @@ @ stub nan @ stub nanf @ stub nanl -@ stub nearbyint -@ stub nearbyintf -@ stub nearbyintl +@ cdecl nearbyint(double) msvcr120.nearbyint +@ cdecl nearbyintf(float) msvcr120.nearbyintf +@ cdecl nearbyintl(double) msvcr120.nearbyintl @ cdecl nextafter(double double) msvcr120.nextafter @ cdecl nextafterf(float float) msvcr120.nextafterf @ cdecl nextafterl(double double) msvcr120.nextafterl diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e87151a..6880d6c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1354,6 +1354,30 @@ double CDECL MSVCRT__yn(int order, double num) } /********************************************************************* + * _nearbyint (MSVCRT.@) + */ +double CDECL MSVCRT_nearbyint(double num) +{ +#ifdef HAVE_NEARBYINT + return nearbyint(num); +#else + return num >= 0 ? floor(num + 0.5) : ceil(num - 0.5); +#endif +} + +/********************************************************************* + * _nearbyintf (MSVCRT.@) + */ +float CDECL MSVCRT_nearbyintf(float num) +{ +#ifdef HAVE_NEARBYINTF + return nearbyintf(num); +#else + return MSVCRT_nearbyint(num); +#endif +} + +/********************************************************************* * _nextafter (MSVCRT.@) */ double CDECL MSVCRT__nextafter(double num, double next) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2aa0563..0005850 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2432,9 +2432,9 @@ @ stub nan @ stub nanf @ stub nanl -@ stub nearbyint -@ stub nearbyintf -@ stub nearbyintl +@ cdecl nearbyint(double) MSVCRT_nearbyint +@ cdecl nearbyintf(float) MSVCRT_nearbyintf +@ cdecl nearbyintl(double) MSVCRT_nearbyint @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter diff --git a/include/config.h.in b/include/config.h.in index 40909fe..5dcd90b 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -564,6 +564,12 @@ /* Define to 1 if you have the <ncurses.h> header file. */ #undef HAVE_NCURSES_H +/* Define to 1 if you have the `nearbyint' function. */ +#undef HAVE_NEARBYINT + +/* Define to 1 if you have the `nearbyintf' function. */ +#undef HAVE_NEARBYINTF + /* Define to 1 if you have the <netdb.h> header file. */ #undef HAVE_NETDB_H diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index c76fe0d..5b42b4d 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -148,6 +148,9 @@ float __cdecl fmodf(float, float); #define ldexpf(x,y) ((float)ldexp((double)(x),(y))) +double __cdecl nearbyint(double); +float __cdecl nearbyintf(float); + float __cdecl _hypotf(float, float); int __cdecl _matherr(struct _exception*);

1 0

Bruno Jesus : quartz: Take MP3 padding bit into account when calculating the block size.
by Alexandre Julliard Nov. 22, 2016

Nov. 22, 2016

Module: wine Branch: master Commit: 89d4e14c0a87cae4b2a92013db7f7890f075f30f URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d4e14c0a87cae4b2a92013d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 22 04:14:59 2016 -0200 quartz: Take MP3 padding bit into account when calculating the block size. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/mpegsplit.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 8d42bd8..41221d4 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -367,6 +367,7 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade int freq_index; int mode_ext; int emphasis; + int padding; int lsf = 1; int mpeg1; int layer; @@ -391,6 +392,7 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade layer = 4-((header[1]>>1)&0x3); bitrate_index = ((header[2]>>4)&0xf); + padding = ((header[2]>>1)&0x1); freq_index = ((header[2]>>2)&0x3) + (mpeg1?(lsf*3):6); mode = ((header[3]>>6)&0x3); mode_ext = ((header[3]>>4)&0x3); @@ -419,12 +421,12 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade if (layer == 3) format->nBlockAlign = format->nAvgBytesPerSec * 8 * 144 / - (format->nSamplesPerSec<<lsf) + 1; + (format->nSamplesPerSec<<lsf) + padding; else if (layer == 2) format->nBlockAlign = format->nAvgBytesPerSec * 8 * 144 / - format->nSamplesPerSec + 1; + format->nSamplesPerSec + padding; else - format->nBlockAlign = 4 * (format->nAvgBytesPerSec * 8 * 12 / format->nSamplesPerSec + 1); + format->nBlockAlign = 4 * (format->nAvgBytesPerSec * 8 * 12 / format->nSamplesPerSec + padding); format->wBitsPerSample = 0;

1 0

Bruno Jesus : krnl386.exe16: Honour segment prefix override for outs[bwd] instruction.
by Alexandre Julliard Nov. 22, 2016

Nov. 22, 2016

Module: wine Branch: master Commit: 01ecb5834b3c27777ca40e4b977e4917b52e93ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ecb5834b3c27777ca40e4b9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 22 04:03:01 2016 -0200 krnl386.exe16: Honour segment prefix override for outs[bwd] instruction. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/instr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/instr.c b/dlls/krnl386.exe16/instr.c index b0de30f..f59ce90 100644 --- a/dlls/krnl386.exe16/instr.c +++ b/dlls/krnl386.exe16/instr.c @@ -645,14 +645,17 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) (long_addr ? context->Ecx : LOWORD(context->Ecx)) : 1; int opsize = (typ & 1) ? (long_op ? 4 : 2) : 1; int step = (context->EFlags & 0x400) ? -opsize : +opsize; - int seg = outp ? context->SegDs : context->SegEs; /* FIXME: is this right? */ + int seg; if (outp) { + /* Check if there is a segment prefix override and honour it */ + seg = segprefix == -1 ? context->SegDs : segprefix; /* FIXME: Check segment is readable. */ } else { + seg = context->SegEs; /* FIXME: Check segment is writable. */ }

1 0