wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Juan Lang : quartz: Don' t crash in SetMediaType if the source media type is NULL.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: a273ce077e6eaee3313a36bfb22a89fdcbc073aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a273ce077e6eaee3313a36bfb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 2 09:23:38 2010 -0800 quartz: Don't crash in SetMediaType if the source media type is NULL. --- dlls/quartz/memallocator.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 3e79a12..575af9d 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -661,8 +661,13 @@ static HRESULT WINAPI StdMediaSample2_SetMediaType(IMediaSample2 * iface, AM_MED TRACE("(%p)->(%p)\n", iface, pMediaType); if (This->props.pMediaType) + { FreeMediaType(This->props.pMediaType); - else if (!(This->props.pMediaType = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) + This->props.pMediaType = NULL; + } + if (!pMediaType) + return S_FALSE; + if (!(This->props.pMediaType = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) return E_OUTOFMEMORY; return CopyMediaType(This->props.pMediaType, pMediaType);

1 0

Thomas Mullaly : urlmon: Implemented PARSE_DOMAIN for CoInternetParseIUri.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 4a9d2d43fe2534c4141599f5f11ae66b2c2db32d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9d2d43fe2534c4141599f5f… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Dec 2 21:45:22 2010 -0500 urlmon: Implemented PARSE_DOMAIN for CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 8 +++++++- dlls/urlmon/uri.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 057850a..1a02f8a 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5966,7 +5966,13 @@ static const uri_parse_test uri_parse_tests[] = { {"http://google.uk.com/",0,PARSE_SITE,0,"google.uk.com",S_OK,FALSE}, {"http://google.com.com/",0,PARSE_SITE,0,"google.com.com",S_OK,FALSE}, {"google.com",Uri_CREATE_ALLOW_RELATIVE,PARSE_SITE,0,"",S_OK,FALSE}, - {"file://server/test",0,PARSE_SITE,0,"server",S_OK,FALSE} + {"file://server/test",0,PARSE_SITE,0,"server",S_OK,FALSE}, + + /* PARSE_DOMAIN tests. */ + {"http://google.com.uk/",0,PARSE_DOMAIN,0,"google.com.uk",S_OK,FALSE}, + {"http://google.com.com/",0,PARSE_DOMAIN,0,"com.com",S_OK,FALSE}, + {"test/test",Uri_CREATE_ALLOW_RELATIVE,PARSE_DOMAIN,0,"",S_OK,FALSE}, + {"file://server/test",0,PARSE_DOMAIN,0,"",S_OK,FALSE} }; static inline LPWSTR a2w(LPCSTR str) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 54f7118..8698266 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6442,6 +6442,34 @@ static HRESULT parse_site(IUri *uri, LPWSTR output, DWORD output_len, DWORD *res return S_OK; } +static HRESULT parse_domain(IUri *uri, LPWSTR output, DWORD output_len, DWORD *result_len) +{ + HRESULT hr; + DWORD len; + BSTR received; + + hr = IUri_GetPropertyLength(uri, Uri_PROPERTY_DOMAIN, &len, 0); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + *result_len = len; + if(len+1 > output_len) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + hr = IUri_GetDomain(uri, &received); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + memcpy(output, received, (len+1)*sizeof(WCHAR)); + SysFreeString(received); + + return S_OK; +} + /*********************************************************************** * CoInternetParseIUri (urlmon.@) */ @@ -6512,6 +6540,9 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d case PARSE_SITE: hr = parse_site(pIUri, pwzResult, cchResult, pcchResult); break; + case PARSE_DOMAIN: + hr = parse_domain(pIUri, pwzResult, cchResult, pcchResult); + break; case PARSE_SECURITY_URL: case PARSE_MIME: case PARSE_SERVER:

1 0

Thomas Mullaly : urlmon: Implemented PARSE_SITE for CoInternetParseIUri.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 500e4fae7ceb7c03a56da39ef222d8731d4b1c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=500e4fae7ceb7c03a56da39ef… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Dec 2 21:32:43 2010 -0500 urlmon: Implemented PARSE_SITE for CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 8 +++++++- dlls/urlmon/uri.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 9ec7288..057850a 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5960,7 +5960,13 @@ static const uri_parse_test uri_parse_tests[] = { /* PARSE_SCHEMA tests. */ {"http://google.com/test",0,PARSE_SCHEMA,0,"http",S_OK,FALSE}, - {"test",Uri_CREATE_ALLOW_RELATIVE,PARSE_SCHEMA,0,"",S_OK,FALSE} + {"test",Uri_CREATE_ALLOW_RELATIVE,PARSE_SCHEMA,0,"",S_OK,FALSE}, + + /* PARSE_SITE tests. */ + {"http://google.uk.com/",0,PARSE_SITE,0,"google.uk.com",S_OK,FALSE}, + {"http://google.com.com/",0,PARSE_SITE,0,"google.com.com",S_OK,FALSE}, + {"google.com",Uri_CREATE_ALLOW_RELATIVE,PARSE_SITE,0,"",S_OK,FALSE}, + {"file://server/test",0,PARSE_SITE,0,"server",S_OK,FALSE} }; static inline LPWSTR a2w(LPCSTR str) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 04cffb1..54f7118 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6414,6 +6414,34 @@ static HRESULT parse_schema(IUri *uri, LPWSTR output, DWORD output_len, return S_OK; } +static HRESULT parse_site(IUri *uri, LPWSTR output, DWORD output_len, DWORD *result_len) +{ + HRESULT hr; + DWORD len; + BSTR received; + + hr = IUri_GetPropertyLength(uri, Uri_PROPERTY_HOST, &len, 0); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + *result_len = len; + if(len+1 > output_len) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + hr = IUri_GetHost(uri, &received); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + memcpy(output, received, (len+1)*sizeof(WCHAR)); + SysFreeString(received); + + return S_OK; +} + /*********************************************************************** * CoInternetParseIUri (urlmon.@) */ @@ -6481,6 +6509,9 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d case PARSE_SCHEMA: hr = parse_schema(pIUri, pwzResult, cchResult, pcchResult); break; + case PARSE_SITE: + hr = parse_site(pIUri, pwzResult, cchResult, pcchResult); + break; case PARSE_SECURITY_URL: case PARSE_MIME: case PARSE_SERVER:

1 0

Thomas Mullaly : urlmon: Implemented PARSE_SCHEMA for CoInternetParseIUri.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: a77f159019c9814ee2379966d5b77e03a729e5f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77f159019c9814ee2379966d… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Dec 2 21:22:50 2010 -0500 urlmon: Implemented PARSE_SCHEMA for CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 6 +++++- dlls/urlmon/uri.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index b135c10..9ec7288 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5956,7 +5956,11 @@ static const uri_parse_test uri_parse_tests[] = { {"/test/test",Uri_CREATE_ALLOW_RELATIVE,PARSE_URL_FROM_PATH,0,"/test/test",S_OK,FALSE}, {"file://c:\\test\\test",Uri_CREATE_FILE_USE_DOS_PATH,PARSE_URL_FROM_PATH,0,"file://c:\\test\\test",S_OK,FALSE}, {"file:c:/test",0,PARSE_URL_FROM_PATH,0,"",S_OK,FALSE}, - {"http:google.com/",0,PARSE_URL_FROM_PATH,0,"",S_OK,FALSE} + {"http:google.com/",0,PARSE_URL_FROM_PATH,0,"",S_OK,FALSE}, + + /* PARSE_SCHEMA tests. */ + {"http://google.com/test",0,PARSE_SCHEMA,0,"http",S_OK,FALSE}, + {"test",Uri_CREATE_ALLOW_RELATIVE,PARSE_SCHEMA,0,"",S_OK,FALSE} }; static inline LPWSTR a2w(LPCSTR str) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e409ebc..04cffb1 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6385,6 +6385,35 @@ static HRESULT parse_url_from_path(IUri *uri, LPWSTR output, DWORD output_len, return S_OK; } +static HRESULT parse_schema(IUri *uri, LPWSTR output, DWORD output_len, + DWORD *result_len) +{ + HRESULT hr; + DWORD len; + BSTR received; + + hr = IUri_GetPropertyLength(uri, Uri_PROPERTY_SCHEME_NAME, &len, 0); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + *result_len = len; + if(len+1 > output_len) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + hr = IUri_GetSchemeName(uri, &received); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + memcpy(output, received, (len+1)*sizeof(WCHAR)); + SysFreeString(received); + + return S_OK; +} + /*********************************************************************** * CoInternetParseIUri (urlmon.@) */ @@ -6449,6 +6478,9 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d case PARSE_URL_FROM_PATH: hr = parse_url_from_path(pIUri, pwzResult, cchResult, pcchResult); break; + case PARSE_SCHEMA: + hr = parse_schema(pIUri, pwzResult, cchResult, pcchResult); + break; case PARSE_SECURITY_URL: case PARSE_MIME: case PARSE_SERVER:

1 0

Thomas Mullaly : urlmon: Implemented PARSE_URL_FROM_PATH for CoInternetParseIUri.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 17880993217ab52d1771bcc5af717186ec0a77fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=17880993217ab52d1771bcc5a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Dec 2 20:58:11 2010 -0500 urlmon: Implemented PARSE_URL_FROM_PATH for CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 10 +++++++++- dlls/urlmon/uri.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 01a0f5a..b135c10 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5948,7 +5948,15 @@ static const uri_parse_test uri_parse_tests[] = { {"file:///c:/t<|>est.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\t<|>est.mp3",S_OK,FALSE}, {"file:///c:/te%XX t/",0,PARSE_PATH_FROM_URL,0,"c:\\te%XX t\\",S_OK,FALSE}, {"file://server/test",0,PARSE_PATH_FROM_URL,0,"\\\\server\\test",S_OK,FALSE}, - {"http://google.com/",0,PARSE_PATH_FROM_URL,0,"",E_INVALIDARG,FALSE} + {"http://google.com/",0,PARSE_PATH_FROM_URL,0,"",E_INVALIDARG,FALSE}, + + /* PARSE_URL_FROM_PATH tests. */ + /* This function almost seems to useless (just returns the absolute uri). */ + {"test.com",Uri_CREATE_ALLOW_RELATIVE,PARSE_URL_FROM_PATH,0,"test.com",S_OK,FALSE}, + {"/test/test",Uri_CREATE_ALLOW_RELATIVE,PARSE_URL_FROM_PATH,0,"/test/test",S_OK,FALSE}, + {"file://c:\\test\\test",Uri_CREATE_FILE_USE_DOS_PATH,PARSE_URL_FROM_PATH,0,"file://c:\\test\\test",S_OK,FALSE}, + {"file:c:/test",0,PARSE_URL_FROM_PATH,0,"",S_OK,FALSE}, + {"http:google.com/",0,PARSE_URL_FROM_PATH,0,"",S_OK,FALSE} }; static inline LPWSTR a2w(LPCSTR str) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index b09a165..e409ebc 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6356,6 +6356,35 @@ static HRESULT parse_path_from_url(const Uri *uri, LPWSTR output, DWORD output_l return S_OK; } +static HRESULT parse_url_from_path(IUri *uri, LPWSTR output, DWORD output_len, + DWORD *result_len) +{ + HRESULT hr; + BSTR received; + DWORD len = 0; + + hr = IUri_GetPropertyLength(uri, Uri_PROPERTY_ABSOLUTE_URI, &len, 0); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + *result_len = len; + if(len+1 > output_len) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + hr = IUri_GetAbsoluteUri(uri, &received); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + memcpy(output, received, (len+1)*sizeof(WCHAR)); + SysFreeString(received); + + return S_OK; +} + /*********************************************************************** * CoInternetParseIUri (urlmon.@) */ @@ -6417,6 +6446,9 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d } hr = parse_path_from_url(uri, pwzResult, cchResult, pcchResult); break; + case PARSE_URL_FROM_PATH: + hr = parse_url_from_path(pIUri, pwzResult, cchResult, pcchResult); + break; case PARSE_SECURITY_URL: case PARSE_MIME: case PARSE_SERVER:

1 0

Thomas Mullaly : urlmon: Implemented PARSE_PATH_FROM_URL for CoInternetParseIUri.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 221331e72b8193ca2b13ace352a7ad41e804681d URL: http://source.winehq.org/git/wine.git/?a=commit;h=221331e72b8193ca2b13ace35… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Nov 30 20:28:36 2010 -0500 urlmon: Implemented PARSE_PATH_FROM_URL for CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 9 +++++- dlls/urlmon/uri.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 706e8b5..01a0f5a 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5941,7 +5941,14 @@ static const uri_parse_test uri_parse_tests[] = { {"file:///c:/test#frag",0,PARSE_DOCUMENT,0,"",S_OK,FALSE}, {"zip://google.com/#frag",0,PARSE_DOCUMENT,0,"",S_OK,FALSE}, {"zip:test#frag",0,PARSE_DOCUMENT,0,"",S_OK,FALSE}, - {"testing#frag",Uri_CREATE_ALLOW_RELATIVE,PARSE_DOCUMENT,0,"",S_OK,FALSE} + {"testing#frag",Uri_CREATE_ALLOW_RELATIVE,PARSE_DOCUMENT,0,"",S_OK,FALSE}, + + /* PARSE_PATH_FROM_URL tests. */ + {"file:///c:/test.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\test.mp3",S_OK,FALSE}, + {"file:///c:/t<|>est.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\t<|>est.mp3",S_OK,FALSE}, + {"file:///c:/te%XX t/",0,PARSE_PATH_FROM_URL,0,"c:\\te%XX t\\",S_OK,FALSE}, + {"file://server/test",0,PARSE_PATH_FROM_URL,0,"\\\\server\\test",S_OK,FALSE}, + {"http://google.com/",0,PARSE_PATH_FROM_URL,0,"",E_INVALIDARG,FALSE} }; static inline LPWSTR a2w(LPCSTR str) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 4247c71..b09a165 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6298,6 +6298,64 @@ static HRESULT parse_document(const Uri *uri, LPWSTR output, DWORD output_len, return S_OK; } +static HRESULT parse_path_from_url(const Uri *uri, LPWSTR output, DWORD output_len, + DWORD *result_len) +{ + const WCHAR *path_ptr; + WCHAR buffer[INTERNET_MAX_URL_LENGTH+1]; + WCHAR *ptr; + + if(uri->scheme_type != URL_SCHEME_FILE) { + *result_len = 0; + if(output_len > 0) + output[0] = 0; + return E_INVALIDARG; + } + + ptr = buffer; + if(uri->host_start > -1) { + static const WCHAR slash_slashW[] = {'\\','\\'}; + + memcpy(ptr, slash_slashW, sizeof(slash_slashW)); + ptr += sizeof(slash_slashW)/sizeof(WCHAR); + memcpy(ptr, uri->canon_uri+uri->host_start, uri->host_len*sizeof(WCHAR)); + ptr += uri->host_len; + } + + path_ptr = uri->canon_uri+uri->path_start; + if(uri->path_len > 3 && *path_ptr == '/' && is_drive_path(path_ptr+1)) + /* Skip past the '/' in front of the drive path. */ + ++path_ptr; + + for(; path_ptr < uri->canon_uri+uri->path_start+uri->path_len; ++path_ptr, ++ptr) { + BOOL do_default_action = TRUE; + + if(*path_ptr == '%') { + const WCHAR decoded = decode_pct_val(path_ptr); + if(decoded) { + *ptr = decoded; + path_ptr += 2; + do_default_action = FALSE; + } + } else if(*path_ptr == '/') { + *ptr = '\\'; + do_default_action = FALSE; + } + + if(do_default_action) + *ptr = *path_ptr; + } + + *ptr = 0; + + *result_len = ptr-buffer; + if(*result_len+1 > output_len) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + memcpy(output, buffer, (*result_len+1)*sizeof(WCHAR)); + return S_OK; +} + /*********************************************************************** * CoInternetParseIUri (urlmon.@) */ @@ -6350,6 +6408,15 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d } hr = parse_document(uri, pwzResult, cchResult, pcchResult); break; + case PARSE_PATH_FROM_URL: + if(!(uri = get_uri_obj(pIUri))) { + *pcchResult = 0; + FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n", + pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); + return E_NOTIMPL; + } + hr = parse_path_from_url(uri, pwzResult, cchResult, pcchResult); + break; case PARSE_SECURITY_URL: case PARSE_MIME: case PARSE_SERVER:

1 0

Henri Verbeet : wined3d: shader_get_registers_used() is only called during shader initialization.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 6a646ac25d55b20e41f2a554d374274c200811e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a646ac25d55b20e41f2a554d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 3 00:55:48 2010 +0100 wined3d: shader_get_registers_used() is only called during shader initialization. --- dlls/wined3d/shader.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 25ed2cf..ef6816f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -461,13 +461,6 @@ static HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct memset(reg_maps, 0, sizeof(*reg_maps)); reg_maps->min_rel_offset = ~0U; - /* get_registers_used() is called on every compile on some 1.x shaders, - * which can result in stacking up a collection of local constants. - * Delete the old constants if existing. */ - shader_delete_constant_list(&shader->baseShader.constantsF); - shader_delete_constant_list(&shader->baseShader.constantsB); - shader_delete_constant_list(&shader->baseShader.constantsI); - fe->shader_read_header(fe_data, &ptr, &shader_version); reg_maps->shader_version = shader_version;

1 0

Henri Verbeet : wined3d: Explicitly pass shader_data and reg_maps to need_rel_addr_const().
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 8c1e326e3cf0c7c8faaceea6c01905c486f1c21f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c1e326e3cf0c7c8faaceea6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 3 00:55:47 2010 +0100 wined3d: Explicitly pass shader_data and reg_maps to need_rel_addr_const(). --- dlls/wined3d/arb_program_shader.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2e5424e..d16ea28 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -316,11 +316,11 @@ struct shader_arb_priv }; /* GL locking for state handlers is done by the caller. */ -static BOOL need_rel_addr_const(IWineD3DVertexShaderImpl *shader, const struct wined3d_gl_info *gl_info) +static BOOL need_rel_addr_const(const struct arb_vshader_private *shader_data, + const struct shader_reg_maps *reg_maps, const struct wined3d_gl_info *gl_info) { - const struct arb_vshader_private *shader_data = shader->baseShader.backend_data; if (shader_data->rel_offset) return TRUE; - if (!shader->baseShader.reg_maps.usesmova) return FALSE; + if (!reg_maps->usesmova) return FALSE; return !gl_info->supported[NV_VERTEX_PROGRAM2_OPTION]; } @@ -333,7 +333,8 @@ static inline BOOL use_nv_clip(const struct wined3d_gl_info *gl_info) static BOOL need_helper_const(IWineD3DVertexShaderImpl *shader, const struct wined3d_gl_info *gl_info) { - if (need_rel_addr_const(shader, gl_info)) return TRUE; + if (need_rel_addr_const(shader->baseShader.backend_data, + &shader->baseShader.reg_maps, gl_info)) return TRUE; if (!gl_info->supported[NV_VERTEX_PROGRAM]) return TRUE; /* Need to init colors. */ if (gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT) return TRUE; /* Load the immval offset. */ if (gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) return TRUE; /* Have to init texcoords. */ @@ -349,7 +350,8 @@ static unsigned int reserved_vs_const(IWineD3DVertexShaderImpl *shader, const st /* We use one PARAM for the pos fixup, and in some cases one to load * some immediate values into the shader. */ if (need_helper_const(shader, gl_info)) ++ret; - if (need_rel_addr_const(shader, gl_info)) ++ret; + if (need_rel_addr_const(shader->baseShader.backend_data, + &shader->baseShader.reg_maps, gl_info)) ++ret; return ret; } @@ -4106,7 +4108,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct { shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %1.10f};\n", eps); } - if (need_rel_addr_const(This, gl_info)) + if (need_rel_addr_const(shader_data, reg_maps, gl_info)) { shader_addline(buffer, "PARAM rel_addr_const = { 0.5, %d.0, 0.0, 0.0 };\n", shader_data->rel_offset); shader_addline(buffer, "TEMP A0_SHADOW;\n");

1 0

Henri Verbeet : wined3d: need_rel_addr_const() is only ever called for vertex shaders.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: e43cd744b61aaec4ecef341caaa0d98689d48ef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e43cd744b61aaec4ecef341ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 3 00:55:46 2010 +0100 wined3d: need_rel_addr_const() is only ever called for vertex shaders. --- dlls/wined3d/arb_program_shader.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bb338bf..2e5424e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -316,13 +316,10 @@ struct shader_arb_priv }; /* GL locking for state handlers is done by the caller. */ -static BOOL need_rel_addr_const(IWineD3DBaseShaderImpl *shader, const struct wined3d_gl_info *gl_info) +static BOOL need_rel_addr_const(IWineD3DVertexShaderImpl *shader, const struct wined3d_gl_info *gl_info) { - if (shader->baseShader.reg_maps.shader_version.type == WINED3D_SHADER_TYPE_VERTEX) - { - const struct arb_vshader_private *shader_data = shader->baseShader.backend_data; - if (shader_data->rel_offset) return TRUE; - } + const struct arb_vshader_private *shader_data = shader->baseShader.backend_data; + if (shader_data->rel_offset) return TRUE; if (!shader->baseShader.reg_maps.usesmova) return FALSE; return !gl_info->supported[NV_VERTEX_PROGRAM2_OPTION]; } @@ -334,7 +331,7 @@ static inline BOOL use_nv_clip(const struct wined3d_gl_info *gl_info) && !(gl_info->quirks & WINED3D_QUIRK_NV_CLIP_BROKEN); } -static BOOL need_helper_const(IWineD3DBaseShaderImpl *shader, const struct wined3d_gl_info *gl_info) +static BOOL need_helper_const(IWineD3DVertexShaderImpl *shader, const struct wined3d_gl_info *gl_info) { if (need_rel_addr_const(shader, gl_info)) return TRUE; if (!gl_info->supported[NV_VERTEX_PROGRAM]) return TRUE; /* Need to init colors. */ @@ -346,7 +343,7 @@ static BOOL need_helper_const(IWineD3DBaseShaderImpl *shader, const struct wined return FALSE; } -static unsigned int reserved_vs_const(IWineD3DBaseShaderImpl *shader, const struct wined3d_gl_info *gl_info) +static unsigned int reserved_vs_const(IWineD3DVertexShaderImpl *shader, const struct wined3d_gl_info *gl_info) { unsigned int ret = 1; /* We use one PARAM for the pos fixup, and in some cases one to load @@ -735,7 +732,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s if(This->baseShader.reg_maps.usesrelconstF) { DWORD highest_constf = 0, clip_limit; - max_constantsF -= reserved_vs_const(This, gl_info); + max_constantsF -= reserved_vs_const((IWineD3DVertexShaderImpl *)This, gl_info); max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); for(i = 0; i < This->baseShader.limits.constant_float; i++) @@ -3171,7 +3168,8 @@ static void vshader_add_footer(IWineD3DVertexShaderImpl *This, struct wined3d_sh /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * and the glsl equivalent */ - if(need_helper_const((IWineD3DBaseShaderImpl *) This, gl_info)) { + if (need_helper_const(This, gl_info)) + { const char *two = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_TWO); shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, %s, -TMP_OUT.w;\n", two); } else { @@ -4104,10 +4102,11 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct } shader_addline(buffer, "TEMP TMP_OUT;\n"); - if(need_helper_const((IWineD3DBaseShaderImpl *) This, gl_info)) { + if (need_helper_const(This, gl_info)) + { shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %1.10f};\n", eps); } - if (need_rel_addr_const((IWineD3DBaseShaderImpl *) This, gl_info)) + if (need_rel_addr_const(This, gl_info)) { shader_addline(buffer, "PARAM rel_addr_const = { 0.5, %d.0, 0.0, 0.0 };\n", shader_data->rel_offset); shader_addline(buffer, "TEMP A0_SHADOW;\n");

1 0

Henri Verbeet : wined3d: Move the rel_offset vertex shader field to the ARB shader backend.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: fe47ba8fa296b17d28afcb53eed21c392c511732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe47ba8fa296b17d28afcb53e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 3 00:55:45 2010 +0100 wined3d: Move the rel_offset vertex shader field to the ARB shader backend. --- dlls/wined3d/arb_program_shader.c | 122 ++++++++++++++++++++++--------------- dlls/wined3d/shader.c | 25 -------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 72 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe47ba8fa296b17d28afc…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010