July 2011 - Wine-commits - list.winehq.org

Austin English : ole32/tests: Make sure to use a return value (LLVM/Clang).
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 94f63d768135d8a6ba8b8ef5d9e2c9e8f7c5ea18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f63d768135d8a6ba8b8ef5d… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 25 19:28:13 2011 -0700 ole32/tests: Make sure to use a return value (LLVM/Clang). --- dlls/ole32/tests/marshal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 87b2006..33e074c 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1870,6 +1870,7 @@ static LRESULT CALLBACK window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM l /* note the use of the magic IID_IWineTest value to tell remote thread * to try to send a message back to us */ hr = IClassFactory_CreateInstance(proxy, NULL, &IID_IWineTest, (void **)&object); + ok(hr == S_FALSE, "expected S_FALSE, got %d\n", hr); IClassFactory_Release(proxy);

1 0

Austin English : kernel32/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 19f58e889f7487c75427c85882bdb7315fcc89be URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f58e889f7487c75427c8588… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 25 18:39:58 2011 -0700 kernel32/tests: Make sure return values are used (LLVM/Clang). --- dlls/kernel32/tests/profile.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index e3f7156..07b351c 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -146,6 +146,8 @@ static void test_profile_string(void) ret=GetPrivateProfileStringW(emptyW, keyW, emptyW, bufW, sizeof(bufW)/sizeof(bufW[0]), TESTFILE2W); todo_wine + ok(ret == 13, "expected 13, got %u\n", ret); + todo_wine ok(!lstrcmpW(valsectionW,bufW), "expected %s, got %s\n", wine_dbgstr_w(valsectionW), wine_dbgstr_w(bufW) ); @@ -153,6 +155,8 @@ static void test_profile_string(void) ret=GetPrivateProfileStringW(sW, emptyW, emptyW, bufW, sizeof(bufW)/sizeof(bufW[0]), TESTFILE2W); todo_wine + ok(ret == 10, "expected 10, got %u\n", ret); + todo_wine ok(!lstrcmpW(valnokeyW,bufW), "expected %s, got %s\n", wine_dbgstr_w(valnokeyW), wine_dbgstr_w(bufW) );

1 0

Austin English : msctf/tests: Make sure return values are used (LLVM/Clang) .
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 24eaf19300f7c6c627e16a1682c48fb04117c98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=24eaf19300f7c6c627e16a168… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 25 18:42:58 2011 -0700 msctf/tests: Make sure return values are used (LLVM/Clang). --- dlls/msctf/tests/inputprocessor.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 47065d1..312d3b2 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1453,7 +1453,7 @@ static void test_startSession(void) ok(SUCCEEDED(hr),"GetFocus Failed\n"); ok(g_dm == dmtest,"Expected DocumentMgr not focused\n"); - cnt = ITfDocumentMgr_Release(g_dm); + ITfDocumentMgr_Release(g_dm); hr = ITfThreadMgr_GetFocus(g_tm,&dmtest); ok(SUCCEEDED(hr),"GetFocus Failed\n"); @@ -1807,6 +1807,7 @@ TfEditCookie ec) selection.style.fInterimChar = FALSE; test_ACP_SetSelection = SINK_EXPECTED; hr = ITfContext_SetSelection(cxt, ec, 1, &selection); + ok(SUCCEEDED(hr),"ITfContext_SetSelection failed\n"); sink_check_ok(&test_ACP_SetSelection,"SetSelection"); ITfRange_Release(range); @@ -2010,6 +2011,7 @@ static void test_AssociateFocus(void) test_OnSetFocus = SINK_OPTIONAL; /* Doesn't always fire on Win7 */ test_ACP_GetStatus = SINK_OPTIONAL; hr = ITfThreadMgr_SetFocus(g_tm,NULL); + ok(SUCCEEDED(hr),"ITfThreadMgr_SetFocus failed\n"); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); test_ACP_GetStatus = SINK_UNEXPECTED; ITfDocumentMgr_Release(dmorig);

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::SetProxy.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 9237479d2235679f4c718faabef8056fc2be162a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9237479d2235679f4c718faab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 26 09:25:49 2011 +0200 winhttp: Implement IWinHttpRequest::SetProxy. --- dlls/winhttp/request.c | 38 ++++++++++++++++++++++++++++++- dlls/winhttp/tests/winhttp.c | 50 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 18fc89c..15979c3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2168,6 +2168,7 @@ struct winhttp_request LONG connect_timeout; LONG send_timeout; LONG receive_timeout; + WINHTTP_PROXY_INFO proxy; }; static inline struct winhttp_request *impl_from_IWinHttpRequest( IWinHttpRequest *iface ) @@ -2355,8 +2356,34 @@ static HRESULT WINAPI winhttp_request_SetProxy( VARIANT proxy_server, VARIANT bypass_list ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + + TRACE("%p, %u, %s, %s\n", request, proxy_setting, debugstr_variant(&proxy_server), + debugstr_variant(&bypass_list)); + + switch (proxy_setting) + { + case HTTPREQUEST_PROXYSETTING_DEFAULT: + request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; + request->proxy.lpszProxy = NULL; + request->proxy.lpszProxyBypass = NULL; + break; + + case HTTPREQUEST_PROXYSETTING_DIRECT: + request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NO_PROXY; + request->proxy.lpszProxy = NULL; + request->proxy.lpszProxyBypass = NULL; + break; + + case HTTPREQUEST_PROXYSETTING_PROXY: + request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; + request->proxy.lpszProxy = V_BSTR( &proxy_server ); + request->proxy.lpszProxyBypass = V_BSTR( &bypass_list ); + break; + + default: return E_INVALIDARG; + } + return S_OK; } static HRESULT WINAPI winhttp_request_SetCredentials( @@ -2557,6 +2584,10 @@ static HRESULT WINAPI winhttp_request_Send( } if (request->state >= REQUEST_STATE_SENT) return ERROR_SUCCESS; + if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_PROXY, &request->proxy, sizeof(request->proxy) )) + { + return HRESULT_FROM_WIN32( get_last_error() ); + } if (!WinHttpSetTimeouts( request->hrequest, request->resolve_timeout, request->connect_timeout, @@ -2855,6 +2886,9 @@ static HRESULT WINAPI winhttp_request_Abort( request->bytes_available = 0; request->bytes_read = 0; request->error = ERROR_SUCCESS; + request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; + request->proxy.lpszProxy = NULL; + request->proxy.lpszProxyBypass = NULL; return S_OK; } diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 28ab72d..f70b554 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2110,10 +2110,12 @@ static void test_IWinHttpRequest(void) static const WCHAR url2W[] = {'w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR method1W[] = {'G','E','T',0}; static const WCHAR method2W[] = {'I','N','V','A','L','I','D',0}; + static const WCHAR proxy_serverW[] = {'p','r','o','x','y','s','e','r','v','e','r',0}; + static const WCHAR bypas_listW[] = {'b','y','p','a','s','s','l','i','s','t',0}; HRESULT hr; IWinHttpRequest *req; BSTR method, url, username, password, response = NULL, status_text = NULL; - VARIANT async, empty, timeout, body; + VARIANT async, empty, timeout, body, proxy_server, bypass_list; VARIANT_BOOL succeeded; LONG status; @@ -2198,6 +2200,19 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetCredentials( req, NULL, NULL, 0xdeadbeef ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + VariantInit( &proxy_server ); + V_VT( &proxy_server ) = VT_ERROR; + VariantInit( &bypass_list ); + V_VT( &bypass_list ) = VT_ERROR; + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( method ); method = SysAllocString( method1W ); SysFreeString( url ); @@ -2228,6 +2243,19 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); ok( hr == S_OK, "got %08x\n", hr ); + V_VT( &proxy_server ) = VT_BSTR; + V_BSTR( &proxy_server ) = SysAllocString( proxy_serverW ); + V_VT( &bypass_list ) = VT_BSTR; + V_BSTR( &bypass_list ) = SysAllocString( bypas_listW ); + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, 0xdeadbeef, proxy_server, bypass_list ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2247,6 +2275,12 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + VariantInit( &timeout ); V_VT( &timeout ) = VT_I4; V_I4( &timeout ) = 10; @@ -2263,6 +2297,12 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2279,6 +2319,12 @@ static void test_IWinHttpRequest(void) hr = VariantClear( &body ); ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2295,6 +2341,8 @@ static void test_IWinHttpRequest(void) SysFreeString( url ); SysFreeString( username ); SysFreeString( password ); + VariantClear( &proxy_server ); + VariantClear( &bypass_list ); CoUninitialize(); }

1 0

Hans Leidekker : winhttp: Add accept types to the request headers.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 050058c5bfa668e28bd6f53043126025943ee0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=050058c5bfa668e28bd6f5304… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 26 09:26:07 2011 +0200 winhttp: Add accept types to the request headers. --- dlls/winhttp/request.c | 11 +++++++++-- dlls/winhttp/session.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/winhttp/winhttp_private.h | 2 ++ 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 15979c3..00f5caf 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1031,8 +1031,13 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len WCHAR *req = NULL; char *req_ascii; int bytes_sent; - DWORD len; + DWORD len, i, flags; + flags = WINHTTP_ADDREQ_FLAG_ADD|WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA; + for (i = 0; i < request->num_accept_types; i++) + { + process_header( request, attr_accept, request->accept_types[i], flags, TRUE ); + } if (session->agent) process_header( request, attr_user_agent, session->agent, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); @@ -2422,6 +2427,8 @@ static HRESULT WINAPI winhttp_request_Open( BSTR url, VARIANT async ) { + static const WCHAR typeW[] = {'*','/','*',0}; + static const WCHAR *acceptW[] = {typeW, NULL}; struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); HINTERNET hsession = NULL, hconnect = NULL, hrequest; URL_COMPONENTS uc; @@ -2461,7 +2468,7 @@ static HRESULT WINAPI winhttp_request_Open( err = get_last_error(); goto error; } - if (!(hrequest = WinHttpOpenRequest( hconnect, method, path, NULL, NULL, NULL, 0 ))) + if (!(hrequest = WinHttpOpenRequest( hconnect, method, path, NULL, NULL, acceptW, 0 ))) { err = get_last_error(); goto error; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 14f3940..1fe1889 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -527,7 +527,7 @@ end: static void request_destroy( object_header_t *hdr ) { request_t *request = (request_t *)hdr; - DWORD i; + unsigned int i; TRACE("%p\n", request); @@ -544,6 +544,8 @@ static void request_destroy( object_header_t *hdr ) heap_free( request->headers[i].value ); } heap_free( request->headers ); + for (i = 0; i < request->num_accept_types; i++) heap_free( request->accept_types[i] ); + heap_free( request->accept_types ); heap_free( request ); } @@ -859,6 +861,39 @@ static const object_vtbl_t request_vtbl = request_set_option }; +static BOOL store_accept_types( request_t *request, const WCHAR **accept_types ) +{ + const WCHAR **types = accept_types; + int i; + + if (!types) return TRUE; + while (*types) + { + request->num_accept_types++; + types++; + } + if (!request->num_accept_types) return TRUE; + if (!(request->accept_types = heap_alloc( request->num_accept_types * sizeof(WCHAR *)))) + { + request->num_accept_types = 0; + return FALSE; + } + types = accept_types; + for (i = 0; i < request->num_accept_types; i++) + { + if (!(request->accept_types[i] = strdupW( *types ))) + { + for (; i >= 0; i--) heap_free( request->accept_types[i] ); + heap_free( request->accept_types ); + request->accept_types = NULL; + request->num_accept_types = 0; + return FALSE; + } + types++; + } + return TRUE; +} + /*********************************************************************** * WinHttpOpenRequest (winhttp.@) */ @@ -926,6 +961,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (!version || !version[0]) version = http1_1; if (!(request->version = strdupW( version ))) goto end; + if (!(store_accept_types( request, types ))) goto end; if (!(hrequest = alloc_handle( &request->hdr ))) goto end; request->hdr.handle = hrequest; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 4bac24f..fbd5032 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -157,6 +157,8 @@ typedef struct DWORD content_read; /* bytes read so far */ header_t *headers; DWORD num_headers; + WCHAR **accept_types; + DWORD num_accept_types; } request_t; typedef struct _task_header_t task_header_t;

1 0

Hans Leidekker : winhttp: Add a default user agent header.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 7227c29a09473f27cd009775cea34b1822ca8075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7227c29a09473f27cd009775c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 26 09:26:20 2011 +0200 winhttp: Add a default user agent header. --- dlls/winhttp/request.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 00f5caf..611e8e0 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2429,6 +2429,10 @@ static HRESULT WINAPI winhttp_request_Open( { static const WCHAR typeW[] = {'*','/','*',0}; static const WCHAR *acceptW[] = {typeW, NULL}; + static const WCHAR user_agentW[] = { + 'M','o','z','i','l','l','a','/','4','.','0',' ','(','c','o','m','p','a','t','i','b','l','e',';',' ', + 'W','i','n','3','2',';',' ','W','i','n','H','t','t','p','.','W','i','n','H','t','t','p', + 'R','e','q','u','e','s','t','.','5',')',0}; struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); HINTERNET hsession = NULL, hconnect = NULL, hrequest; URL_COMPONENTS uc; @@ -2458,7 +2462,7 @@ static HRESULT WINAPI winhttp_request_Open( path[uc.dwUrlPathLength] = 0; if (V_BOOL( &async ) == VARIANT_TRUE) flags |= WINHTTP_FLAG_ASYNC; - if (!(hsession = WinHttpOpen( NULL, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags ))) + if (!(hsession = WinHttpOpen( user_agentW, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags ))) { err = get_last_error(); goto error;

1 0

Matteo Bruni : d3d8/tests: Rename a variable.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 94750652737fffcf318f2886e44e140c9a37968e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94750652737fffcf318f2886e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 25 16:47:39 2011 +0200 d3d8/tests: Rename a variable. --- dlls/d3d8/tests/visual.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ae8276d..2c04ce7 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -358,14 +358,14 @@ static void fog_test(IDirect3DDevice8 *device) float start = 0.0, end = 1.0; /* Gets full z based fog with linear fog, no fog with specular color */ - struct sVertex unstransformed_1[] = { + struct sVertex untransformed_1[] = { {-1, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, {-1, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, { 0, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, { 0, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, }; /* Ok, I am too lazy to deal with transform matrices */ - struct sVertex unstransformed_2[] = { + struct sVertex untransformed_2[] = { {-1, 0, 1.0f, 0xFFFF0000, 0xFF000000 }, {-1, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, { 0, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, @@ -417,8 +417,8 @@ static void fog_test(IDirect3DDevice8 *device) ok( hr == D3D_OK, "SetVertexShader returned %#08x\n", hr); /* Untransformed, vertex fog = NONE, table fog = NONE: Read the fog weighting from the specular color */ hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /*PrimCount */, Indices, D3DFMT_INDEX16, unstransformed_1, - sizeof(unstransformed_1[0])); + 2 /*PrimCount */, Indices, D3DFMT_INDEX16, untransformed_1, + sizeof(untransformed_1[0])); ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %#08x\n", hr); /* That makes it use the Z value */ @@ -428,8 +428,8 @@ static void fog_test(IDirect3DDevice8 *device) * Use the Z value as input into the equation */ hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /*PrimCount */, Indices, D3DFMT_INDEX16, unstransformed_2, - sizeof(unstransformed_1[0])); + 2 /*PrimCount */, Indices, D3DFMT_INDEX16, untransformed_2, + sizeof(untransformed_2[0])); ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %#08x\n", hr); /* transformed verts */

1 0

Matteo Bruni : d3d8/tests: Fix some error messages.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 8e522b7fb8adf83679fe8ffdfc9629fe68c66419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e522b7fb8adf83679fe8ffdf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 25 16:47:59 2011 +0200 d3d8/tests: Fix some error messages. --- dlls/d3d8/tests/visual.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 2c04ce7..595b6bb 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -397,13 +397,13 @@ static void fog_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, TRUE); ok(hr == D3D_OK, "Turning on fog calculations returned %#08x\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGCOLOR, 0xFF00FF00 /* A nice green */); - ok(hr == D3D_OK, "Turning on fog calculations returned %#08x\n", hr); + ok(hr == D3D_OK, "Setting fog color returned %#08x\n", hr); /* First test: Both table fog and vertex fog off */ hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_NONE); ok(hr == D3D_OK, "Turning off table fog returned %#08x\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_NONE); - ok(hr == D3D_OK, "Turning off table fog returned %#08x\n", hr); + ok(hr == D3D_OK, "Turning off vertex fog returned %#08x\n", hr); /* Start = 0, end = 1. Should be default, but set them */ hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); @@ -423,7 +423,7 @@ static void fog_test(IDirect3DDevice8 *device) /* That makes it use the Z value */ hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok(hr == D3D_OK, "Turning off table fog returned %#08x\n", hr); + ok(hr == D3D_OK, "Setting fog vertex mode to D3DFOG_LINEAR returned %#08x\n", hr); /* Untransformed, vertex fog != none (or table fog != none): * Use the Z value as input into the equation */

1 0

Matteo Bruni : d3d8/tests: Add a couple of fog tests.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 332a2c05cb36037cd49dea22ed4a18027e0292e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=332a2c05cb36037cd49dea22e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 22 15:49:21 2011 +0200 d3d8/tests: Add a couple of fog tests. --- dlls/d3d8/tests/visual.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 138 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 595b6bb..33e9841 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -388,6 +388,55 @@ static void fog_test(IDirect3DDevice8 *device) }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; + D3DCAPS8 caps; + float ident_mat[16] = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; + float world_mat1[16] = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, -0.5f, 1.0f + }; + float world_mat2[16] = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 1.0f + }; + float proj_mat[16] = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, -1.0f, 1.0f + }; + + struct sVertex far_quad1[] = + { + {-1.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, + {-1.0f, 0.0f, 0.5f, 0xffff0000, 0xff000000}, + { 0.0f, 0.0f, 0.5f, 0xffff0000, 0xff000000}, + { 0.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, + }; + struct sVertex far_quad2[] = + { + {-1.0f, 0.0f, 1.5f, 0xffff0000, 0xff000000}, + {-1.0f, 1.0f, 1.5f, 0xffff0000, 0xff000000}, + { 0.0f, 1.0f, 1.5f, 0xffff0000, 0xff000000}, + { 0.0f, 0.0f, 1.5f, 0xffff0000, 0xff000000}, + }; + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "IDirect3DDevice8_GetDeviceCaps returned %08x\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice8_Clear returned %#08x\n", hr); @@ -470,6 +519,95 @@ static void fog_test(IDirect3DDevice8 *device) IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + if (caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE) + { + /* A simple fog + non-identity world matrix test */ + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLDMATRIX(0), (D3DMATRIX *) world_mat1); + ok(hr == D3D_OK, "IDirect3DDevice8_SetTransform returned %#08x\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR); + ok(hr == D3D_OK, "Setting fog table mode to D3DFOG_LINEAR returned %#08x\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_NONE); + ok(hr == D3D_OK, "Turning off vertex fog returned %#08x\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice8_Clear returned %#08x\n", hr); + + if (IDirect3DDevice8_BeginScene(device) == D3D_OK) + { + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR); + ok(hr == D3D_OK, "SetVertexShader returned %#08x\n", hr); + + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, Indices, D3DFMT_INDEX16, far_quad1, sizeof(far_quad1[0])); + ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %#08x\n", hr); + + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, Indices, D3DFMT_INDEX16, far_quad2, sizeof(far_quad2[0])); + ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %#08x\n", hr); + + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "EndScene returned %#08x\n", hr); + } + else + { + ok(FALSE, "BeginScene failed\n"); + } + + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00ff0000, 4), "Unfogged quad has color %08x\n", color); + color = getPixelColor(device, 160, 120); + ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + + /* Test fog behavior with an orthogonal (but not identity) projection matrix */ + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLDMATRIX(0), (D3DMATRIX *) world_mat2); + ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, (D3DMATRIX *) proj_mat); + ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + ok(hr == D3D_OK, "Clear returned %#08x\n", hr); + + if (IDirect3DDevice8_BeginScene(device) == D3D_OK) + { + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR); + ok(hr == D3D_OK, "SetVertexShader returned %#08x\n", hr); + + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, Indices, D3DFMT_INDEX16, untransformed_1, sizeof(untransformed_1[0])); + ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %#08x\n", hr); + + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, Indices, D3DFMT_INDEX16, untransformed_2, sizeof(untransformed_2[0])); + ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %#08x\n", hr); + + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "EndScene returned %#08x\n", hr); + } + else + { + ok(FALSE, "BeginScene failed\n"); + } + + color = getPixelColor(device, 160, 360); + todo_wine ok(color_match(color, 0x00e51900, 4), "Partially fogged quad has color %08x\n", color); + color = getPixelColor(device, 160, 120); + ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLDMATRIX(0), (D3DMATRIX *) ident_mat); + ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, (D3DMATRIX *) ident_mat); + ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); + } + else + { + skip("D3DPRASTERCAPS_FOGTABLE not supported, skipping some fog tests\n"); + } + /* Turn off the fog master switch to avoid confusing other tests */ hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); ok(hr == D3D_OK, "Turning off fog calculations returned %#08x\n", hr);

1 0

Austin English : mmdevapi/tests: Remove a dead assignment (LLVM/Clang).
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 910b3580a3cb23eb4b39630fe23417abd6c5e161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=910b3580a3cb23eb4b39630fe… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 25 18:35:52 2011 -0700 mmdevapi/tests: Remove a dead assignment (LLVM/Clang). --- dlls/mmdevapi/tests/render.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 4274e83..ce5247d 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -571,7 +571,6 @@ static void test_clock(void) ok(hr == S_OK, "GetPosition failed: %08x\n", hr); ok(pos == 0, "GetPosition returned non-zero pos before being started\n"); ok(pcpos != 0, "GetPosition returned zero pcpos\n"); - last = pos; hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); ok(hr == S_OK, "GetService(IAudioRenderClient) failed: %08x\n", hr);

1 0