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

Piotr Caban : jscript: Added RegExp_test stub.
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: f421746980a53a95f5b255d99e62dee7ad9dbc2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f421746980a53a95f5b255d99… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 15 12:51:43 2009 +0200 jscript: Added RegExp_test stub. --- dlls/jscript/regexp.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 0acc478..9722919 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -96,6 +96,7 @@ static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; static const WCHAR execW[] = {'e','x','e','c',0}; +static const WCHAR testW[] = {'t','e','s','t',0}; static const WCHAR emptyW[] = {0}; @@ -3505,6 +3506,13 @@ static HRESULT RegExp_exec(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS return E_NOTIMPL; } +static HRESULT RegExp_test(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT RegExp_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -3532,6 +3540,7 @@ static const builtin_prop_t RegExp_props[] = { {multilineW, RegExp_multiline, 0}, {propertyIsEnumerableW, RegExp_propertyIsEnumerable, PROPF_METHOD}, {sourceW, RegExp_source, 0}, + {testW, RegExp_test, PROPF_METHOD}, {toLocaleStringW, RegExp_toLocaleString, PROPF_METHOD}, {toStringW, RegExp_toString, PROPF_METHOD} };

1 0

Piotr Caban : jscript: Improve Number_toString implementation.
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: 1cffc0eb73dc479ea83da847c342926d55028b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cffc0eb73dc479ea83da847c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 15 12:51:21 2009 +0200 jscript: Improve Number_toString implementation. --- dlls/jscript/number.c | 113 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 50 +++++++++++++++++-- 2 files changed, 151 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index d6591d0..5399c91 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> + #include "jscript.h" #include "wine/debug.h" @@ -39,11 +41,14 @@ static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; +#define NUMBER_TOSTRING_BUF_SIZE 64 /* ECMA-262 3rd Edition 15.7.4.2 */ static HRESULT Number_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { NumberInstance *number; + INT radix = 10; + DOUBLE val; BSTR str; HRESULT hres; @@ -56,14 +61,110 @@ static HRESULT Number_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA number = (NumberInstance*)dispex; - if(arg_cnt(dp) != 0) { - FIXME("unsupported args\n"); - return E_NOTIMPL; + if(arg_cnt(dp)) { + hres = to_int32(dispex->ctx, get_arg(dp, 0), ei, &radix); + if(FAILED(hres)) + return hres; + + if(radix<2 || radix>36) { + FIXME("throw TypeError\n"); + return E_FAIL; + } } - hres = to_string(dispex->ctx, &number->num, ei, &str); - if(FAILED(hres)) - return hres; + if(V_VT(&number->num) == VT_I4) + val = V_I4(&number->num); + else + val = V_R8(&number->num); + + if(radix==10 || isnan(val) || isinf(val)) { + hres = to_string(dispex->ctx, &number->num, ei, &str); + if(FAILED(hres)) + return hres; + } + else { + INT idx = 0; + DOUBLE integ, frac, log_radix = 0; + WCHAR buf[NUMBER_TOSTRING_BUF_SIZE+16]; + BOOL exp = FALSE; + + if(val<0) { + val = -val; + buf[idx++] = '-'; + } + + while(1) { + integ = floor(val); + frac = val-integ; + + if(integ == 0) + buf[idx++] = '0'; + while(integ>=1 && idx<NUMBER_TOSTRING_BUF_SIZE) { + buf[idx] = fmod(integ, radix); + if(buf[idx]<10) buf[idx] += '0'; + else buf[idx] += 'a'-10; + integ /= radix; + idx++; + } + + if(idx<NUMBER_TOSTRING_BUF_SIZE) { + INT beg = buf[0]=='-'?1:0; + INT end = idx-1; + WCHAR wch; + + while(end > beg) { + wch = buf[beg]; + buf[beg++] = buf[end]; + buf[end--] = wch; + } + } + + if(idx != NUMBER_TOSTRING_BUF_SIZE) buf[idx++] = '.'; + + while(frac>0 && idx<NUMBER_TOSTRING_BUF_SIZE) { + frac *= radix; + buf[idx] = fmod(frac, radix); + frac -= buf[idx]; + if(buf[idx]<10) buf[idx] += '0'; + else buf[idx] += 'a'-10; + idx++; + } + + if(idx==NUMBER_TOSTRING_BUF_SIZE && !exp) { + exp = TRUE; + idx = (buf[0]=='-') ? 1 : 0; + log_radix = floor(log(val)/log(radix)); + val *= pow(radix, -log_radix); + continue; + } + + break; + } + + while(buf[idx-1] == '0') idx--; + if(buf[idx-1] == '.') idx--; + + if(exp) { + if(log_radix==0) + buf[idx++] = '\0'; + else { + static const WCHAR formatW[] = {'(','e','%','c','%','d',')',0}; + WCHAR ch; + + if(log_radix<0) { + log_radix = -log_radix; + ch = '-'; + } + else ch = '+'; + sprintfW(&buf[idx], formatW, ch, (int)log_radix); + } + } + else buf[idx] = '\0'; + + str = SysAllocString(buf); + if(!str) + return E_OUTOFMEMORY; + } if(retv) { V_VT(retv) = VT_BSTR; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f4dd74b..b347846 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -566,12 +566,50 @@ ok(tmp === 0, "(new Number()).valueOf = " + tmp); tmp = Number.prototype.valueOf(); ok(tmp === 0, "Number.prototype.valueOf = " + tmp); -num = new Number(NaN); -ok(num.toString() === "NaN", "num.toString() = " + num.toString()); -num = new Number(-Infinity); -ok(num.toString() === "-Infinity", "num.toString() = " + num.toString()); -num = new Number(Infinity); -ok(num.toString() === "Infinity", "num.toString() = " + num.toString()); +function equals(val, base) { + var i; + var num = 0; + var str = val.toString(base); + + for(i=0; i<str.length; i++) { + if(str.substring(i, i+1) == '(') break; + if(str.substring(i, i+1) == '.') break; + num = num*base + parseInt(str.substring(i, i+1)); + } + + if(str.substring(i, i+1) == '.') { + var mult = base; + for(i++; i<str.length; i++) { + if(str.substring(i, i+1) == '(') break; + num += parseInt(str.substring(i, i+1))/mult; + mult *= base; + } + } + + if(str.substring(i, i+1) == '(') { + exp = parseInt(str.substring(i+2)); + num *= Math.pow(base, exp); + } + + ok(num>val-val/1000 && num<val+val/1000, "equals: num = " + num); +} + +ok((10).toString(11) === "a", "(10).toString(11) = " + (10).toString(11)); +ok((213213433).toString(17) === "8e2ddcb", "(213213433).toString(17) = " + (213213433).toString(17)); +ok((-3254343).toString(33) === "-2oicf", "(-3254343).toString(33) = " + (-3254343).toString(33)); +ok((NaN).toString(12) === "NaN", "(NaN).toString(11) = " + (NaN).toString(11)); +ok((Infinity).toString(13) === "Infinity", "(Infinity).toString(11) = " + (Infinity).toString(11)); +for(i=2; i<10; i++) { + equals(1.123, i); + equals(2305843009200000000, i); + equals(5.123, i); + equals(1/(1024*1024*1024*1024*1024*1024*1.9), i); + equals(1024*1024*1024*1024*1024*1024*1.9999, i); + equals(0.0000000000000000001, i); + equals(0.6, i); + equals(4.65661287308e-10, i); + ok((0).toString(i) === "0", "(0).toString("+i+") = " + (0).toString(i)); +} tmp = Math.min(1); ok(tmp === 1, "Math.min(1) = " + tmp);

1 0

Piotr Caban : jscript: Improve to_string implementation.
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: 15b07c2a36eee94ecbd3bf94df7cd9717a945a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b07c2a36eee94ecbd3bf94d… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 15 12:50:43 2009 +0200 jscript: Improve to_string implementation. --- dlls/jscript/jsutils.c | 27 ++++++++++++++++++--------- dlls/jscript/tests/api.js | 7 +++++++ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 4a885a5..d5ffa7f 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -512,6 +512,8 @@ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) const WCHAR nullW[] = {'n','u','l','l',0}; const WCHAR trueW[] = {'t','r','u','e',0}; const WCHAR falseW[] = {'f','a','l','s','e',0}; + const WCHAR NaNW[] = {'N','a','N',0}; + const WCHAR InfinityW[] = {'-','I','n','f','i','n','i','t','y',0}; switch(V_VT(v)) { case VT_EMPTY: @@ -524,16 +526,23 @@ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) *str = int_to_bstr(V_I4(v)); break; case VT_R8: { - VARIANT strv; - HRESULT hres; - - V_VT(&strv) = VT_EMPTY; - hres = VariantChangeTypeEx(&strv, v, MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT), 0, VT_BSTR); - if(FAILED(hres)) - return hres; + if(isnan(V_R8(v))) + *str = SysAllocString(NaNW); + else if(isinf(V_R8(v))) + *str = SysAllocString(V_R8(v)<0 ? InfinityW : InfinityW+1); + else { + VARIANT strv; + HRESULT hres; + + V_VT(&strv) = VT_EMPTY; + hres = VariantChangeTypeEx(&strv, v, MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT), 0, VT_BSTR); + if(FAILED(hres)) + return hres; - *str = V_BSTR(&strv); - return S_OK; + *str = V_BSTR(&strv); + return S_OK; + } + break; } case VT_BSTR: *str = SysAllocString(V_BSTR(v)); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index cf70ebc..f4dd74b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -566,6 +566,13 @@ ok(tmp === 0, "(new Number()).valueOf = " + tmp); tmp = Number.prototype.valueOf(); ok(tmp === 0, "Number.prototype.valueOf = " + tmp); +num = new Number(NaN); +ok(num.toString() === "NaN", "num.toString() = " + num.toString()); +num = new Number(-Infinity); +ok(num.toString() === "-Infinity", "num.toString() = " + num.toString()); +num = new Number(Infinity); +ok(num.toString() === "Infinity", "num.toString() = " + num.toString()); + tmp = Math.min(1); ok(tmp === 1, "Math.min(1) = " + tmp);

1 0

Henri Verbeet : d3d10: Implement ID3D10Effect::GetVariableByName().
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: a5d953654248a206ddd68b12ac6c32fa5ea292bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d953654248a206ddd68b12a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 15 12:21:21 2009 +0200 d3d10: Implement ID3D10Effect::GetVariableByName(). --- dlls/d3d10/d3d10_private.h | 3 + dlls/d3d10/effect.c | 254 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 256 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 1dde1c8..60f2aa0 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -58,8 +58,11 @@ struct d3d10_effect_shader_variable } shader; }; +/* ID3D10EffectVariable */ struct d3d10_effect_variable { + const struct ID3D10EffectVariableVtbl *vtbl; + char *name; DWORD buffer_offset; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 6ee77b0..37d2dcb 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl; static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl; +static const struct ID3D10EffectVariableVtbl d3d10_effect_variable_vtbl; static inline void read_dword(const char **ptr, DWORD *d) { @@ -455,6 +456,8 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons struct d3d10_effect_variable *v = &l->variables[i]; HRESULT hr; + v->vtbl = &d3d10_effect_variable_vtbl; + hr = parse_fx10_variable(v, ptr, data); if (FAILED(hr)) return hr; } @@ -822,7 +825,27 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByName(ID3D10Effect *iface, LPCSTR name) { - FIXME("iface %p, name \"%s\" stub!\n", iface, name); + struct d3d10_effect *This = (struct d3d10_effect *)iface; + unsigned int i; + + TRACE("iface %p, name \"%s\"\n", iface, name); + + for (i = 0; i < This->local_buffer_count; ++i) + { + struct d3d10_effect_local_buffer *l = &This->local_buffers[i]; + unsigned int j; + + for (j = 0; j < l->variable_count; ++j) + { + struct d3d10_effect_variable *v = &l->variables[j]; + + if (!strcmp(v->name, name)) + { + TRACE("Returning variable %p.\n", v); + return (ID3D10EffectVariable *)v; + } + } + } return NULL; } @@ -1128,3 +1151,232 @@ static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl = d3d10_effect_pass_Apply, d3d10_effect_pass_ComputeStateBlockMask, }; + +/* ID3D10EffectVariable methods */ + +static BOOL STDMETHODCALLTYPE d3d10_effect_variable_IsValid(ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return FALSE; +} + +static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_variable_GetType(ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetDesc(ID3D10EffectVariable *iface, + D3D10_EFFECT_VARIABLE_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetAnnotationByIndex( + ID3D10EffectVariable *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetAnnotationByName( + ID3D10EffectVariable *iface, LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetMemberByIndex( + ID3D10EffectVariable *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetMemberByName( + ID3D10EffectVariable *iface, LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetMemberBySemantic( + ID3D10EffectVariable *iface, LPCSTR semantic) +{ + FIXME("iface %p, semantic \"%s\" stub!\n", iface, semantic); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetElement( + ID3D10EffectVariable *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_variable_GetParentConstantBuffer( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectScalarVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsScalar( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectVectorVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsVector( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectMatrixVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsMatrix( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectStringVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsString( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectShaderResourceVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsShaderResource( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectRenderTargetViewVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsRenderTargetView( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectDepthStencilViewVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsDepthStencilView( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_variable_AsConstantBuffer( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectShaderVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsShader( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectBlendVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsBlend(ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectDepthStencilVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsDepthStencil( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectRasterizerVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsRasterizer( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectSamplerVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsSampler( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_SetRawValue(ID3D10EffectVariable *iface, + void *data, UINT offset, UINT count) +{ + FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetRawValue(ID3D10EffectVariable *iface, + void *data, UINT offset, UINT count) +{ + FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); + + return E_NOTIMPL; +} + +static const struct ID3D10EffectVariableVtbl d3d10_effect_variable_vtbl = +{ + /* ID3D10EffectVariable methods */ + d3d10_effect_variable_IsValid, + d3d10_effect_variable_GetType, + d3d10_effect_variable_GetDesc, + d3d10_effect_variable_GetAnnotationByIndex, + d3d10_effect_variable_GetAnnotationByName, + d3d10_effect_variable_GetMemberByIndex, + d3d10_effect_variable_GetMemberByName, + d3d10_effect_variable_GetMemberBySemantic, + d3d10_effect_variable_GetElement, + d3d10_effect_variable_GetParentConstantBuffer, + d3d10_effect_variable_AsScalar, + d3d10_effect_variable_AsVector, + d3d10_effect_variable_AsMatrix, + d3d10_effect_variable_AsString, + d3d10_effect_variable_AsShaderResource, + d3d10_effect_variable_AsRenderTargetView, + d3d10_effect_variable_AsDepthStencilView, + d3d10_effect_variable_AsConstantBuffer, + d3d10_effect_variable_AsShader, + d3d10_effect_variable_AsBlend, + d3d10_effect_variable_AsDepthStencil, + d3d10_effect_variable_AsRasterizer, + d3d10_effect_variable_AsSampler, + d3d10_effect_variable_SetRawValue, + d3d10_effect_variable_GetRawValue, +};

1 0

Henri Verbeet : d3d10: Parse effect variables.
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: f58405f647049bddde4c602fc6dd5703df91ccd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58405f647049bddde4c602fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 15 12:21:20 2009 +0200 d3d10: Parse effect variables. --- dlls/d3d10/d3d10_private.h | 7 +++++ dlls/d3d10/effect.c | 57 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index b43666e..1dde1c8 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -58,11 +58,18 @@ struct d3d10_effect_shader_variable } shader; }; +struct d3d10_effect_variable +{ + char *name; + DWORD buffer_offset; +}; + struct d3d10_effect_local_buffer { char *name; DWORD data_size; DWORD variable_count; + struct d3d10_effect_variable *variables; }; /* ID3D10EffectPass */ diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 0750069..6ee77b0 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -389,6 +389,34 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char return S_OK; } +static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char **ptr, const char *data) +{ + DWORD offset; + + read_dword(ptr, &offset); + TRACE("Variable name at offset %#x.\n", offset); + + v->name = copy_name(data + offset); + if (!v->name) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } + TRACE("Variable name: %s.\n", v->name); + + read_dword(ptr, &offset); + TRACE("Variable type info at offset %#x.\n", offset); + + skip_dword_unknown(ptr, 1); + + read_dword(ptr, &v->buffer_offset); + TRACE("Variable offset in buffer: %#x.\n", v->buffer_offset); + + skip_dword_unknown(ptr, 3); + + return S_OK; +} + static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, const char **ptr, const char *data) { unsigned int i; @@ -415,9 +443,20 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons skip_dword_unknown(ptr, 2); + l->variables = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, l->variable_count * sizeof(*l->variables)); + if (!l->variables) + { + ERR("Failed to allocate variables memory.\n"); + return E_OUTOFMEMORY; + } + for (i = 0; i < l->variable_count; ++i) { - skip_dword_unknown(ptr, 7); + struct d3d10_effect_variable *v = &l->variables[i]; + HRESULT hr; + + hr = parse_fx10_variable(v, ptr, data); + if (FAILED(hr)) return hr; } return S_OK; @@ -634,11 +673,27 @@ static void d3d10_effect_technique_destroy(struct d3d10_effect_technique *t) } } +static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) +{ + TRACE("variable %p.\n", v); + + HeapFree(GetProcessHeap(), 0, v->name); +} + static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_local_buffer *l) { TRACE("local buffer %p.\n", l); HeapFree(GetProcessHeap(), 0, l->name); + if (l->variables) + { + unsigned int i; + for (i = 0; i < l->variable_count; ++i) + { + d3d10_effect_variable_destroy(&l->variables[i]); + } + HeapFree(GetProcessHeap(), 0, l->variables); + } } /* IUnknown methods */

1 0

Henri Verbeet : d3d10: Do all effect object parsing in parse_fx10_object().
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: ddc948b974b9ad8e1ff6dc6e176293431c82aa2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc948b974b9ad8e1ff6dc6e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 15 12:21:19 2009 +0200 d3d10: Do all effect object parsing in parse_fx10_object(). --- dlls/d3d10/effect.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ba62cfc..0750069 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -248,43 +248,51 @@ static HRESULT parse_shader(struct d3d10_effect_object *o, const char *data) return parse_dxbc(ptr, dxbc_size, shader_chunk_handler, s); } -static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char *data) +static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr, const char *data) { - const char *ptr; + const char *data_ptr; DWORD offset; HRESULT hr; - ptr = data + o->idx_offset; - read_dword(&ptr, &offset); + read_dword(ptr, &o->type); + TRACE("Effect object is of type %#x.\n", o->type); - TRACE("Effect object of type %#x starts at offset %#x.\n", o->type, offset); + skip_dword_unknown(ptr, 2); + + read_dword(ptr, &offset); + TRACE("Effect object idx is at offset %#x.\n", offset); + + data_ptr = data + offset; + read_dword(&data_ptr, &offset); + + TRACE("Effect object starts at offset %#x.\n", offset); /* FIXME: This probably isn't completely correct. */ if (offset == 1) { WARN("Skipping effect object.\n"); - ptr = NULL; + data_ptr = NULL; } else { - ptr = data + offset; + data_ptr = data + offset; } switch (o->type) { case D3D10_EOT_VERTEXSHADER: TRACE("Vertex shader\n"); - hr = parse_shader(o, ptr); + hr = parse_shader(o, data_ptr); break; case D3D10_EOT_PIXELSHADER: TRACE("Pixel shader\n"); - hr = parse_shader(o, ptr); + hr = parse_shader(o, data_ptr); break; case D3D10_EOT_GEOMETRYSHADER: TRACE("Geometry shader\n"); - hr = parse_shader(o, ptr); + hr = parse_shader(o, data_ptr); break; default: @@ -331,15 +339,7 @@ static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char **ptr, co o->pass = p; - read_dword(ptr, &o->type); - TRACE("Effect object %u is of type %#x.\n", i, o->type); - - skip_dword_unknown(ptr, 2); - - read_dword(ptr, &o->idx_offset); - TRACE("Effect object %u idx is at offset %#x.\n", i, o->idx_offset); - - hr = parse_fx10_object(o, data); + hr = parse_fx10_object(o, ptr, data); if (FAILED(hr)) return hr; }

1 0

Rico Schüller : d3d10: Rename struct d3d10_effect_variable to struct d3d10_effect_object.
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: 2dd1b37922559bc452032e14739fc8399dbd9fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd1b37922559bc452032e147… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 15 12:21:18 2009 +0200 d3d10: Rename struct d3d10_effect_variable to struct d3d10_effect_object. The name d3d10_effect_variable is somewhat misleading, since these aren't actually effect variables as returned by e.g. ID3D10Effect::GetVariableByName(), but effect objects as referenced by effect passes. --- dlls/d3d10/d3d10_private.h | 16 +++--- dlls/d3d10/effect.c | 126 ++++++++++++++++++++++---------------------- 2 files changed, 71 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2dd1b37922559bc452032…

1 0

Henri Verbeet : wined3d: Check the return values for some wgl calls.
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: ae8e8ac73f05a4070c85c1b2f43409f197410362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8e8ac73f05a4070c85c1b2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 15 12:21:17 2009 +0200 wined3d: Check the return values for some wgl calls. --- dlls/wined3d/context.c | 16 ++++++++++++++-- dlls/wined3d/directx.c | 7 ++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 577f235..1fd7ea2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -944,7 +944,15 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } ctx = pwglCreateContext(hdc); - if(This->numContexts) pwglShareLists(This->contexts[0]->glCtx, ctx); + if (This->numContexts) + { + if (!pwglShareLists(This->contexts[0]->glCtx, ctx)) + { + DWORD err = GetLastError(); + ERR("wglShareLists(%p, %p) failed, last error %#x.\n", + This->contexts[0]->glCtx, ctx, err); + } + } if(!ctx) { ERR("Failed to create a WGL context\n"); @@ -957,7 +965,11 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar ret = AddContextToArray(This, win_handle, hdc, ctx, pbuffer); if(!ret) { ERR("Failed to add the newly created context to the context list\n"); - pwglDeleteContext(ctx); + if (!pwglDeleteContext(ctx)) + { + DWORD err = GetLastError(); + ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, err); + } if(create_pbuffer) { GL_EXTCALL(wglReleasePbufferDCARB(pbuffer, hdc)); GL_EXTCALL(wglDestroyPbufferARB(pbuffer)); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1ba7ca5..f296cbe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -213,7 +213,12 @@ static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) ERR_(d3d_caps)("Failed to disable fake GL context.\n"); } - pwglDeleteContext(ctx->gl_ctx); + if (!pwglDeleteContext(ctx->gl_ctx)) + { + DWORD err = GetLastError(); + ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx->gl_ctx, err); + } + ReleaseDC(ctx->wnd, ctx->dc); DestroyWindow(ctx->wnd); }

1 0

Henri Verbeet : wined3d: Remove the remains of an ATI_fragment_shader hack.
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: 476c83522b0b8401ef6883d5aafd23e58c1b439c URL: http://source.winehq.org/git/wine.git/?a=commit;h=476c83522b0b8401ef6883d5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 15 12:21:16 2009 +0200 wined3d: Remove the remains of an ATI_fragment_shader hack. This was originally added as a workaround for a Mesa bug by commit ddf52dda15e83eae639ef2ce0ec4071b321ce34f. The other half of the hack has since been removed. This code causes problems when wglDeleteContext() from a different thread causes our current context to be destroyed, since wglGetCurrentContext() will return a destroyed context in that case. That is a flaw in our wgl implementation, since wglDeleteContext() shouldn't allow a context that's current in a different thread to be destroyed, but this hack is a bad idea regardless. --- dlls/wined3d/context.c | 22 +++------------------- 1 files changed, 3 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6971e68..577f235 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -791,11 +791,11 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, * *****************************************************************************/ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win_handle, BOOL create_pbuffer, const WINED3DPRESENT_PARAMETERS *pPresentParms) { - HDC oldDrawable, hdc; HPBUFFERARB pbuffer = NULL; - HGLRC ctx = NULL, oldCtx; WineD3DContext *ret = NULL; unsigned int s; + HGLRC ctx; + HDC hdc; TRACE("(%p): Creating a %s context for render target %p\n", This, create_pbuffer ? "offscreen" : "onscreen", target); @@ -984,12 +984,6 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar list_init(&ret->fbo_list); /* Set up the context defaults */ - oldCtx = pwglGetCurrentContext(); - oldDrawable = pwglGetCurrentDC(); - if(oldCtx && oldDrawable) { - /* See comment in ActivateContext context switching */ - This->frag_pipe->enable_extension((IWineD3DDevice *) This, FALSE); - } if(pwglMakeCurrent(hdc, ctx) == FALSE) { ERR("Cannot activate context to set up defaults\n"); goto out; @@ -1074,17 +1068,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } LEAVE_GL(); - /* Never keep GL_FRAGMENT_SHADER_ATI enabled on a context that we switch away from, - * but enable it for the first context we create, and reenable it on the old context - */ - if(oldDrawable && oldCtx) { - if (!pwglMakeCurrent(oldDrawable, oldCtx)) - { - ERR("Failed to make previous GL context %p current.\n", oldCtx); - } - } else { - context_set_last_device(This); - } + context_set_last_device(This); This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE); return ret;

1 0

Paul Vriens : winedbg: Remove an unneeded pragma from the Swedish translation.
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: 3c876de7a4a4ab711dd9a3510bf0f849e586cd31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c876de7a4a4ab711dd9a3510… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 15 12:19:05 2009 +0200 winedbg: Remove an unneeded pragma from the Swedish translation. --- programs/winedbg/rsrc_Sv.rc | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/rsrc_Sv.rc b/programs/winedbg/rsrc_Sv.rc index 7a24982..7d7da32 100644 --- a/programs/winedbg/rsrc_Sv.rc +++ b/programs/winedbg/rsrc_Sv.rc @@ -56,5 +56,3 @@ BEGIN IDS_INVALID_PARAMS "Interna fel - ogiltiga parametrar mottogs" IDS_UNIDENTIFIED "(oidentifierad)" END - -#pragma code_page(default)

1 0