wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: a26119d21d93c214331b17d640d05cc3bef8e0e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26119d21d93c214331b17d64… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 23 18:12:06 2012 +0200 msvcp: Sync implementations. --- dlls/msvcp100/ios.c | 42 +++++++++++++++++++++--------------------- dlls/msvcp60/ios.c | 44 ++++++++++++++++++++++---------------------- dlls/msvcp71/ios.c | 44 ++++++++++++++++++++++---------------------- 3 files changed, 65 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a26119d21d93c214331b1…

1 0

Piotr Caban : msvcp90: Convert characters to unsigned char before passing them to functions operating on integers .
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 4a566ed3d6acd8a6e18eeaeb41d55d0f793029de URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a566ed3d6acd8a6e18eeaeb4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 23 18:11:06 2012 +0200 msvcp90: Convert characters to unsigned char before passing them to functions operating on integers. --- dlls/msvcp90/ios.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a3c44f2..c577f77 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1055,7 +1055,7 @@ int __thiscall basic_streambuf_char_uflow(basic_streambuf_char *this) if(call_basic_streambuf_char_underflow(this)==EOF) return EOF; - ret = **this->prpos; + ret = (unsigned char)**this->prpos; (*this->prsize)--; (*this->prpos)++; return ret; @@ -1393,10 +1393,10 @@ int __thiscall basic_streambuf_char_sputbackc(basic_streambuf_char *this, char c if(*this->prpos && *this->prpos>*this->prbuf && (*this->prpos)[-1]==ch) { (*this->prsize)++; (*this->prpos)--; - return ch; + return (unsigned char)ch; } - return call_basic_streambuf_char_pbackfail(this, ch); + return call_basic_streambuf_char_pbackfail(this, (unsigned char)ch); } /* ?sputc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAEHD@Z */ @@ -1407,7 +1407,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? (*basic_streambuf_char__Pninc(this) = ch) : - call_basic_streambuf_char_overflow(this, ch); + call_basic_streambuf_char_overflow(this, (unsigned char)ch); } /* ?sungetc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAEHXZ */ @@ -1419,7 +1419,7 @@ int __thiscall basic_streambuf_char_sungetc(basic_streambuf_char *this) if(*this->prpos && *this->prpos>*this->prbuf) { (*this->prsize)++; (*this->prpos)--; - return **this->prpos; + return (unsigned char)**this->prpos; } return call_basic_streambuf_char_pbackfail(this, EOF); @@ -1444,7 +1444,7 @@ int __thiscall basic_streambuf_char_sbumpc(basic_streambuf_char *this) { TRACE("(%p)\n", this); return basic_streambuf_char__Gnavail(this) ? - *basic_streambuf_char__Gninc(this) : call_basic_streambuf_char_uflow(this); + (int)(unsigned char)*basic_streambuf_char__Gninc(this) : call_basic_streambuf_char_uflow(this); } /* ?sgetc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAEHXZ */ @@ -1454,7 +1454,7 @@ int __thiscall basic_streambuf_char_sgetc(basic_streambuf_char *this) { TRACE("(%p)\n", this); return basic_streambuf_char__Gnavail(this) ? - *basic_streambuf_char_gptr(this) : call_basic_streambuf_char_underflow(this); + (int)(unsigned char)*basic_streambuf_char_gptr(this) : call_basic_streambuf_char_underflow(this); } /* ?snextc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAEHXZ */ @@ -1465,7 +1465,7 @@ int __thiscall basic_streambuf_char_snextc(basic_streambuf_char *this) TRACE("(%p)\n", this); if(basic_streambuf_char__Gnavail(this) > 1) - return *basic_streambuf_char__Gnpreinc(this); + return (unsigned char)*basic_streambuf_char__Gnpreinc(this); return basic_streambuf_char_sbumpc(this)==EOF ? EOF : basic_streambuf_char_sgetc(this); } @@ -1502,7 +1502,7 @@ streamsize __thiscall basic_streambuf_char_xsputn(basic_streambuf_char *this, co *this->pwpos += chunk; *this->pwsize -= chunk; copied += chunk; - }else if(call_basic_streambuf_char_overflow(this, ptr[copied]) != EOF) { + }else if(call_basic_streambuf_char_overflow(this, (unsigned char)ptr[copied]) != EOF) { copied++; }else { break; @@ -2714,7 +2714,7 @@ int __thiscall basic_filebuf_char_pbackfail(basic_filebuf_char *this, int c) return EOF; if(basic_streambuf_char_gptr(&this->base)>basic_streambuf_char_eback(&this->base) - && (c==EOF || basic_streambuf_char_gptr(&this->base)[-1]==(char)c)) { + && (c==EOF || (int)(unsigned char)basic_streambuf_char_gptr(&this->base)[-1]==c)) { basic_streambuf_char__Gndec(&this->base); return c==EOF ? !c : c; }else if(c!=EOF && !this->cvt) { @@ -2739,7 +2739,7 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this) return EOF; if(basic_streambuf_char_gptr(&this->base) < basic_streambuf_char_egptr(&this->base)) - return *basic_streambuf_char__Gninc(&this->base); + return (unsigned char)*basic_streambuf_char__Gninc(&this->base); c = fgetc(this->file); if(!this->cvt || c==EOF) @@ -2764,7 +2764,7 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this) ungetc(buf[i], this->file); return ch; case CODECVT_noconv: - return buf[0]; + return (unsigned char)buf[0]; default: return EOF; } @@ -2784,7 +2784,7 @@ int __thiscall basic_filebuf_char_underflow(basic_filebuf_char *this) TRACE("(%p)\n", this); if(basic_streambuf_char_gptr(&this->base) < basic_streambuf_char_egptr(&this->base)) - return *basic_streambuf_char_gptr(&this->base); + return (unsigned char)*basic_streambuf_char_gptr(&this->base); ret = call_basic_streambuf_char_uflow(&this->base); if(ret != EOF) @@ -3312,7 +3312,7 @@ unsigned short __thiscall basic_filebuf_wchar_pbackfail(basic_filebuf_wchar *thi return WEOF; if(basic_streambuf_wchar_gptr(&this->base)>basic_streambuf_wchar_eback(&this->base) - && (c==WEOF || basic_streambuf_wchar_gptr(&this->base)[-1]==(wchar_t)c)) { + && (c==WEOF || basic_streambuf_wchar_gptr(&this->base)[-1]==c)) { basic_streambuf_wchar__Gndec(&this->base); return c==WEOF ? !c : c; }else if(c!=WEOF && !this->cvt) { @@ -3784,7 +3784,7 @@ int __thiscall basic_stringbuf_char_underflow(basic_stringbuf_char *this) basic_streambuf_char_setg(&this->base, basic_streambuf_char_eback(&this->base), cur, this->seekhigh); if(cur < this->seekhigh) - return *cur; + return (unsigned char)*cur; return EOF; } @@ -7444,7 +7444,7 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_getline_delim, 16) basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_char *this, char *str, streamsize count, char delim) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); - int ch = delim; + int ch = (unsigned char)delim; TRACE("(%p %p %ld %c)\n", this, str, count, delim); @@ -7456,7 +7456,7 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch while(count > 1) { ch = basic_streambuf_char_sbumpc(strbuf); - if(ch==EOF || ch==delim) + if(ch==EOF || ch==(unsigned char)delim) break; *str++ = ch; @@ -7464,12 +7464,12 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch count--; } - if(ch == delim) + if(ch == (unsigned char)delim) this->count++; else if(ch != EOF) { ch = basic_streambuf_char_sgetc(strbuf); - if(ch == delim) { + if(ch == (unsigned char)delim) { basic_streambuf_char__Gninc(strbuf); this->count++; } @@ -7478,7 +7478,7 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch basic_istream_char_sentry_destroy(this); basic_ios_char_setstate(base, (ch==EOF ? IOSTATE_eofbit : IOSTATE_goodbit) | - (!this->count || (ch!=delim && ch!=EOF) ? IOSTATE_failbit : IOSTATE_goodbit)); + (!this->count || (ch!=(unsigned char)delim && ch!=EOF) ? IOSTATE_failbit : IOSTATE_goodbit)); if(count > 0) *str = 0; return this; @@ -8128,7 +8128,7 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( basic_istream_char *istream, basic_string_char *str, char delim) { IOSB_iostate state = IOSTATE_failbit; - int c = delim; + int c = (unsigned char)delim; TRACE("(%p %p %c)\n", istream, str, delim); @@ -8139,7 +8139,7 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( if(c != EOF) state = IOSTATE_goodbit; - for(; c!=delim && c!=EOF; c = basic_istream_char_get(istream)) { + for(; c!=(unsigned char)delim && c!=EOF; c = basic_istream_char_get(istream)) { state = IOSTATE_goodbit; MSVCP_basic_string_char_append_ch(str, c); }

1 0

Piotr Caban : msvcrt: Fixed _ungetwc implementation.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 39345a1b15ed4870b5ce49fbdf877ad226c836f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39345a1b15ed4870b5ce49fbd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 23 18:09:48 2012 +0200 msvcrt: Fixed _ungetwc implementation. --- dlls/msvcrt/file.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d9ce987..185b1e2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3995,9 +3995,12 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) MSVCRT_wint_t CDECL MSVCRT_ungetwc(MSVCRT_wint_t wc, MSVCRT_FILE * file) { MSVCRT_wchar_t mwc = wc; - char * pp = (char *)&mwc; + unsigned char * pp = (unsigned char *)&mwc; int i; + if (wc == MSVCRT_WEOF) + return MSVCRT_WEOF; + MSVCRT__lock_file(file); for(i=sizeof(MSVCRT_wchar_t)-1;i>=0;i--) { if(pp[i] != MSVCRT_ungetc(pp[i],file)) {

1 0

Christian Costa : d3dxof: Fix remaining 'objects.txt' filename.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 82dd739064bea6732c44f81fdf6309d8c206d5b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82dd739064bea6732c44f81fd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 23 23:14:34 2012 +0200 d3dxof: Fix remaining 'objects.txt' filename. --- dlls/d3dxof/tests/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 182bf33..9ff76b2 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -756,7 +756,7 @@ static void test_dump(void) hr = IDirectXFile_RegisterTemplates(lpDirectXFile, pvData, cbSize); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); - hr = IDirectXFile_CreateEnumObject(lpDirectXFile, (LPVOID)"objects.txt", DXFILELOAD_FROMFILE, &lpDirectXFileEnumObject); + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, (LPVOID)"objects.x", DXFILELOAD_FROMFILE, &lpDirectXFileEnumObject); ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); while (SUCCEEDED(hr = IDirectXFileEnumObject_GetNextDataObject(lpDirectXFileEnumObject, &lpDirectXFileData)))

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DVOLUMETEXTURE9.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 80382486aa65d41b170473f02698b943da4a60f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80382486aa65d41b170473f02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 21:01:08 2012 +0200 d3dx9: Avoid LPDIRECT3DVOLUMETEXTURE9. --- dlls/d3dx9_36/texture.c | 15 +---- include/d3dx9tex.h | 162 +++++++++++----------------------------------- 2 files changed, 42 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80382486aa65d41b17047…

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DVERTEXSHADER9.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 0c84de4455e354b85ac5c0af1c3090fc5b4051b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c84de4455e354b85ac5c0af1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 21:01:07 2012 +0200 d3dx9: Avoid LPDIRECT3DVERTEXSHADER9. --- dlls/d3dx9_36/effect.c | 26 ++++++++++++++------------ include/d3dx9effect.h | 8 ++++---- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index dcd12d4..7fde7fd 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2717,18 +2717,19 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetPixelShader(ID3DXBaseEffect *iface, return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXBaseEffectImpl_GetVertexShader(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 *vshader) +static HRESULT WINAPI ID3DXBaseEffectImpl_GetVertexShader(struct ID3DXBaseEffect *iface, + D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, parameter); - TRACE("iface %p, parameter %p, vshader %p\n", This, parameter, vshader); + TRACE("iface %p, parameter %p, shader %p.\n", This, parameter, shader); - if (vshader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER) + if (shader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER) { - *vshader = *(LPDIRECT3DVERTEXSHADER9 *)param->data; - if (*vshader) IDirect3DVertexShader9_AddRef(*vshader); - TRACE("Returning %p\n", *vshader); + if ((*shader = *(struct IDirect3DVertexShader9 **)param->data)) + IDirect3DVertexShader9_AddRef(*shader); + TRACE("Returning %p.\n", *shader); return D3D_OK; } @@ -3379,14 +3380,15 @@ static HRESULT WINAPI ID3DXEffectImpl_GetPixelShader(ID3DXEffect *iface, return ID3DXBaseEffectImpl_GetPixelShader(base, parameter, shader); } -static HRESULT WINAPI ID3DXEffectImpl_GetVertexShader(ID3DXEffect *iface, D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 *vshader) +static HRESULT WINAPI ID3DXEffectImpl_GetVertexShader(struct ID3DXEffect *iface, + D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); ID3DXBaseEffect *base = This->base_effect; TRACE("Forward iface %p, base %p\n", This, base); - return ID3DXBaseEffectImpl_GetVertexShader(base, parameter, vshader); + return ID3DXBaseEffectImpl_GetVertexShader(base, parameter, shader); } static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) @@ -4345,14 +4347,15 @@ static HRESULT WINAPI ID3DXEffectCompilerImpl_GetPixelShader(ID3DXEffectCompiler return ID3DXBaseEffectImpl_GetPixelShader(base, parameter, shader); } -static HRESULT WINAPI ID3DXEffectCompilerImpl_GetVertexShader(ID3DXEffectCompiler *iface, D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 *vshader) +static HRESULT WINAPI ID3DXEffectCompilerImpl_GetVertexShader(struct ID3DXEffectCompiler *iface, + D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { struct ID3DXEffectCompilerImpl *This = impl_from_ID3DXEffectCompiler(iface); ID3DXBaseEffect *base = This->base_effect; TRACE("Forward iface %p, base %p\n", This, base); - return ID3DXBaseEffectImpl_GetVertexShader(base, parameter, vshader); + return ID3DXBaseEffectImpl_GetVertexShader(base, parameter, shader); } static HRESULT WINAPI ID3DXEffectCompilerImpl_SetArrayRange(ID3DXEffectCompiler *iface, D3DXHANDLE parameter, UINT start, UINT end) @@ -4737,8 +4740,7 @@ static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr, break; case D3DXPT_VERTEXSHADER: - hr = IDirect3DDevice9_CreateVertexShader(device, (DWORD *)*ptr, (LPDIRECT3DVERTEXSHADER9 *)param->data); - if (hr != D3D_OK) + if (FAILED(hr = IDirect3DDevice9_CreateVertexShader(device, (DWORD *)*ptr, param->data))) { WARN("Failed to create vertex shader\n"); return hr; diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index bae911f..b3a16d7 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -151,7 +151,7 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown) STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) PURE; - STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; + STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; }; #undef INTERFACE @@ -179,7 +179,7 @@ DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown) STDMETHOD(SetSamplerState)(THIS_ DWORD sampler, D3DSAMPLERSTATETYPE type, DWORD value) PURE; STDMETHOD(SetNPatchMode)(THIS_ FLOAT num_segments) PURE; STDMETHOD(SetFVF)(THIS_ DWORD format) PURE; - STDMETHOD(SetVertexShader)(THIS_ LPDIRECT3DVERTEXSHADER9 shader) PURE; + STDMETHOD(SetVertexShader)(THIS_ struct IDirect3DVertexShader9 *shader) PURE; STDMETHOD(SetVertexShaderConstantF)(THIS_ UINT register_index, CONST FLOAT* constant_data, UINT register_count) PURE; STDMETHOD(SetVertexShaderConstantI)(THIS_ UINT register_index, CONST INT* constant_data, UINT register_count) PURE; STDMETHOD(SetVertexShaderConstantB)(THIS_ UINT register_index, CONST BOOL* constant_data, UINT register_count) PURE; @@ -255,7 +255,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) PURE; - STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; + STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; /*** ID3DXEffect methods ***/ STDMETHOD(GetPool)(THIS_ LPD3DXEFFECTPOOL* pool) PURE; @@ -348,7 +348,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) PURE; - STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; + STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; /*** ID3DXEffectCompiler methods ***/ STDMETHOD(SetLiteral)(THIS_ D3DXHANDLE parameter, BOOL literal) PURE;

1 0

Henri Verbeet : wined3d: Remove some dead code from gen_ffp_instr().
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 41c8f1ef8a8c785a16cddb5cbafc9a8e3e7e0267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c8f1ef8a8c785a16cddb5cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 21:01:06 2012 +0200 wined3d: Remove some dead code from gen_ffp_instr(). --- dlls/wined3d/arb_program_shader.c | 25 ++++--------------------- 1 files changed, 4 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2a74171..0c0b22a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5939,7 +5939,6 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta { const char *dstmask, *dstreg, *arg0, *arg1, *arg2; unsigned int mul = 1; - BOOL mul_final_dest = FALSE; if(color && alpha) dstmask = ""; else if(color) dstmask = ".xyz"; @@ -5971,11 +5970,6 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta /* FALLTHROUGH */ case WINED3D_TOP_MODULATE_2X: mul *= 2; - if (!strcmp(dstreg, "result.color")) - { - dstreg = "ret"; - mul_final_dest = TRUE; - } /* FALLTHROUGH */ case WINED3D_TOP_MODULATE: shader_addline(buffer, "MUL %s%s, %s, %s;\n", dstreg, dstmask, arg1, arg2); @@ -5983,11 +5977,6 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta case WINED3D_TOP_ADD_SIGNED_2X: mul = 2; - if (!strcmp(dstreg, "result.color")) - { - dstreg = "ret"; - mul_final_dest = TRUE; - } /* FALLTHROUGH */ case WINED3D_TOP_ADD_SIGNED: shader_addline(buffer, "SUB arg2, %s, const.w;\n", arg2); @@ -6048,11 +6037,6 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta case WINED3D_TOP_DOTPRODUCT3: mul = 4; - if (!strcmp(dstreg, "result.color")) - { - dstreg = "ret"; - mul_final_dest = TRUE; - } shader_addline(buffer, "SUB arg1, %s, const.w;\n", arg1); shader_addline(buffer, "SUB arg2, %s, const.w;\n", arg2); shader_addline(buffer, "DP3_SAT %s%s, arg1, arg2;\n", dstreg, dstmask); @@ -6076,11 +6060,10 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta FIXME("Unhandled texture op %08x\n", op); } - if(mul == 2) { - shader_addline(buffer, "MUL_SAT %s%s, %s, const.y;\n", mul_final_dest ? "result.color" : dstreg, dstmask, dstreg); - } else if(mul == 4) { - shader_addline(buffer, "MUL_SAT %s%s, %s, const.z;\n", mul_final_dest ? "result.color" : dstreg, dstmask, dstreg); - } + if (mul == 2) + shader_addline(buffer, "MUL_SAT %s%s, %s, const.y;\n", dstreg, dstmask, dstreg); + else if (mul == 4) + shader_addline(buffer, "MUL_SAT %s%s, %s, const.z;\n", dstreg, dstmask, dstreg); } static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, const struct wined3d_gl_info *gl_info)

1 0

Henri Verbeet : wined3d: Set texture_level in surface_set_texture_target() as well.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: ddbe791d37a7b01cb602dab4862fe707eff2cd28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbe791d37a7b01cb602dab48… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 21:01:05 2012 +0200 wined3d: Set texture_level in surface_set_texture_target() as well. --- dlls/d3d10core/device.c | 4 +- dlls/d3d8/d3d8_private.h | 6 ++-- dlls/d3d8/device.c | 48 ++++++++++++++------------------------- dlls/d3d8/surface.c | 8 +++--- dlls/d3d9/d3d9_private.h | 6 ++-- dlls/d3d9/device.c | 33 ++++++++++----------------- dlls/d3d9/surface.c | 8 +++--- dlls/ddraw/ddraw.c | 17 +++++-------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 10 +++----- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 29 ++++++++++------------- dlls/wined3d/texture.c | 6 ++-- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 2 +- 16 files changed, 77 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ddbe791d37a7b01cb602d…

1 0

Henri Verbeet : d3d10: Implement D3D10DisassembleShader().
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: cb876cdb97df011b87c527550a5129cac63631c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb876cdb97df011b87c527550… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 21:01:04 2012 +0200 d3d10: Implement D3D10DisassembleShader(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/shader.c | 9 +++++++++ include/d3d10shader.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 9f6210b..1e6eb36 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -7,7 +7,7 @@ @ stub D3D10CreateEffectPoolFromMemory @ stdcall D3D10CreateStateBlock(ptr ptr ptr) @ stub D3D10DisassembleEffect -@ stub D3D10DisassembleShader +@ stdcall D3D10DisassembleShader(ptr long long ptr ptr) @ stdcall D3D10GetGeometryShaderProfile(ptr) @ stdcall D3D10GetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob @ stdcall D3D10GetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index 499da12..864f21f 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -147,3 +147,12 @@ HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char return D3DCompile(data, data_size, filename, defines, include, entrypoint, profile, flags, 0, shader, error_messages); } + +HRESULT WINAPI D3D10DisassembleShader(const void *data, SIZE_T data_size, + BOOL color_code, const char *comments, ID3D10Blob **disassembly) +{ + TRACE("data %p, data_size %#lx, color_code %#x, comments %p, disassembly %p.\n", + data, data_size, color_code, comments, disassembly); + + return D3DDisassemble(data, data_size, color_code ? D3D_DISASM_ENABLE_COLOR_CODE : 0, comments, disassembly); +} diff --git a/include/d3d10shader.h b/include/d3d10shader.h index af32539..06b4c3e 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -214,6 +214,8 @@ extern "C" { HRESULT WINAPI D3D10CompileShader(LPCSTR data, SIZE_T data_size, LPCSTR filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, LPCSTR entrypoint, LPCSTR profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages); +HRESULT WINAPI D3D10DisassembleShader(const void *data, SIZE_T data_size, + BOOL color_code, const char *comments, ID3D10Blob **disassembly); LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);

1 0

Francois Gouget : testbot/RevertVM: Only send an email if the VM has been marked as offline.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: tools Branch: master Commit: 1f9f5654928f20791b023ecf75a0f3d71b2724a2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1f9f5654928f20791b023ecf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 24 12:16:42 2012 +0200 testbot/RevertVM: Only send an email if the VM has been marked as offline. --- testbot/bin/RevertVM.pl | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 743760f..ee46218 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -39,25 +39,29 @@ sub FatalError { my ($ErrMessage, $VM) = @_; - my $VMKey = defined($VM) ? $VM->GetKey() : ""; - LogMsg $ErrMessage, "\n"; if ($VM) { $VM->Status("offline"); $VM->Save(); - } - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL <<"EOF"; + my $VMKey = $VM->GetKey(); + my $VMSnapshot = $VM->IdleSnapshot; + open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); + print SENDMAIL <<"EOF"; From: <$RobotEMail> (Marvin) To: $AdminEMail Subject: VM $VMKey offline -Reverting $VMKey resulted in error "$ErrMessage". The VM has been put offline. +Reverting $VMKey to $VMSnapshot failed: + +$ErrMessage + +The VM has been put offline. EOF - close(SENDMAIL); + close(SENDMAIL); + } exit 1; }

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
96
Older →

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 October 2012