wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Piotr Caban : msvcp: Prevent overflows while operating on string sizes.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 39e9ac03179363d0586e65a753c50d9791af5673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e9ac03179363d0586e65a75… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 11 16:08:56 2012 +0200 msvcp: Prevent overflows while operating on string sizes. --- dlls/msvcp100/string.c | 12 ++++++------ dlls/msvcp60/string.c | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp100/string.c b/dlls/msvcp100/string.c index bbd01b4..5fb117f 100644 --- a/dlls/msvcp100/string.c +++ b/dlls/msvcp100/string.c @@ -977,7 +977,7 @@ int __thiscall MSVCP_basic_string_char_compare_substr_cstr_len( if(this->size < pos) MSVCP__String_base_Xran(); - if(pos+num > this->size) + if(num > this->size-pos) num = this->size-pos; ans = MSVCP_char_traits_char_compare(basic_string_char_const_ptr(this)+pos, @@ -1024,7 +1024,7 @@ int __thiscall MSVCP_basic_string_char_compare_substr_substr( if(compare->size < off) MSVCP__String_base_Xran(); - if(off+count > compare->size) + if(count > compare->size-off) count = compare->size-off; return MSVCP_basic_string_char_compare_substr_cstr_len(this, pos, num, @@ -1512,7 +1512,7 @@ basic_string_char* __thiscall basic_string_char_replace_substr(basic_string_char if(str->size < str_off) MSVCP__String_base_Xran(); - if(str_off+str_len > str->size) + if(str_len > str->size-str_off) str_len = str->size-str_off; return basic_string_char_replace_cstr_len(this, off, len, @@ -2690,7 +2690,7 @@ int __thiscall MSVCP_basic_string_wchar_compare_substr_cstr_len( if(this->size < pos) MSVCP__String_base_Xran(); - if(pos+num > this->size) + if(num > this->size-pos) num = this->size-pos; ans = MSVCP_char_traits_wchar_compare(basic_string_wchar_const_ptr(this)+pos, @@ -2743,7 +2743,7 @@ int __thiscall MSVCP_basic_string_wchar_compare_substr_substr( if(compare->size < off) MSVCP__String_base_Xran(); - if(off+count > compare->size) + if(count > compare->size-off) count = compare->size-off; return MSVCP_basic_string_wchar_compare_substr_cstr_len(this, pos, num, @@ -3218,7 +3218,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_substr(basic_string_wc if(str->size < str_off) MSVCP__String_base_Xran(); - if(str_off+str_len > str->size) + if(str_len > str->size-str_off) str_len = str->size-str_off; return basic_string_wchar_replace_cstr_len(this, off, len, diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 2553e5b..2180149 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -549,7 +549,7 @@ int __thiscall basic_string_char_compare_substr_cstr_len( if(this->size < pos) _Xran(); - if(pos+num > this->size) + if(num > this->size-pos) num = this->size-pos; ans = char_traits_char_compare(this->ptr+pos, @@ -586,7 +586,7 @@ int __thiscall basic_string_char_compare_substr_substr( if(compare->size < off) _Xran(); - if(off+count > compare->size) + if(count > compare->size-off) count = compare->size-off; return basic_string_char_compare_substr_cstr_len(this, pos, num, @@ -1338,7 +1338,7 @@ basic_string_char* __thiscall basic_string_char_replace_cstr_len(basic_string_ch if(this->size < off) _Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(basic_string_char_npos-str_len <= this->size-len) @@ -1388,7 +1388,7 @@ basic_string_char* __thiscall basic_string_char_replace_substr(basic_string_char if(str->size < str_off) _Xran(); - if(str_off+str_len > str->size) + if(str_len > str->size-str_off) str_len = str->size-str_off; return basic_string_char_replace_cstr_len(this, off, len, @@ -1418,7 +1418,7 @@ basic_string_char* __thiscall basic_string_char_replace_ch(basic_string_char *th if(this->size < off) _Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(basic_string_char_npos-count <= this->size-len) @@ -2239,7 +2239,7 @@ int __thiscall basic_string_wchar_compare_substr_cstr_len( if(this->size < pos) _Xran(); - if(pos+num > this->size) + if(num > this->size-pos) num = this->size-pos; ans = char_traits_wchar_compare(this->ptr+pos, @@ -2276,7 +2276,7 @@ int __thiscall basic_string_wchar_compare_substr_substr( if(compare->size < off) _Xran(); - if(off+count > compare->size) + if(count > compare->size-off) count = compare->size-off; return basic_string_wchar_compare_substr_cstr_len(this, pos, num, @@ -3028,7 +3028,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_cstr_len(basic_string_ if(this->size < off) _Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(basic_string_wchar_npos-str_len <= this->size-len) @@ -3078,7 +3078,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_substr(basic_string_wc if(str->size < str_off) _Xran(); - if(str_off+str_len > str->size) + if(str_len > str->size-str_off) str_len = str->size-str_off; return basic_string_wchar_replace_cstr_len(this, off, len, @@ -3108,7 +3108,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_ch(basic_string_wchar if(this->size < off) _Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(basic_string_wchar_npos-count <= this->size-len)

1 0

Piotr Caban : msvcp90: Fixed copied buffer siezes in functions operating on wchar_t.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 5258b3a219c310175e32b837b39214dd37c5d061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5258b3a219c310175e32b837b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 11 16:08:21 2012 +0200 msvcp90: Fixed copied buffer siezes in functions operating on wchar_t. --- dlls/msvcp100/ios.c | 8 ++++---- dlls/msvcp90/ios.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 9d6ad67..57c1aa4 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -1822,11 +1822,11 @@ streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *thi chunk = count-copied; if(chunk > 0) { - memcpy_s(ptr+copied, size, *this->prpos, chunk); + memcpy_s(ptr+copied, size, *this->prpos, chunk*sizeof(wchar_t)); *this->prpos += chunk; *this->prsize -= chunk; copied += chunk; - size -= chunk; + size -= chunk*sizeof(wchar_t); }else if((c = call_basic_streambuf_wchar_uflow(this)) != WEOF) { ptr[copied] = c; copied++; @@ -2315,7 +2315,7 @@ streamsize __thiscall basic_streambuf_wchar_xsputn(basic_streambuf_wchar *this, chunk = count-copied; if(chunk > 0) { - memcpy(*this->pwpos, ptr+copied, chunk); + memcpy(*this->pwpos, ptr+copied, chunk*sizeof(wchar_t)); *this->pwpos += chunk; *this->pwsize -= chunk; copied += chunk; @@ -3948,7 +3948,7 @@ void __thiscall basic_stringbuf_wchar__Init(basic_stringbuf_wchar *this, const w throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - memcpy(buf, str, count); + memcpy(buf, str, count*sizeof(wchar_t)); this->seekhigh = buf + count; this->state |= STRINGBUF_allocated; diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 82010c6..699ac98 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1812,11 +1812,11 @@ streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *thi chunk = count-copied; if(chunk > 0) { - memcpy_s(ptr+copied, size, *this->prpos, chunk); + memcpy_s(ptr+copied, size, *this->prpos, chunk*sizeof(wchar_t)); *this->prpos += chunk; *this->prsize -= chunk; copied += chunk; - size -= chunk; + size -= chunk*sizeof(wchar_t); }else if((c = call_basic_streambuf_wchar_uflow(this)) != WEOF) { ptr[copied] = c; copied++; @@ -2305,7 +2305,7 @@ streamsize __thiscall basic_streambuf_wchar_xsputn(basic_streambuf_wchar *this, chunk = count-copied; if(chunk > 0) { - memcpy(*this->pwpos, ptr+copied, chunk); + memcpy(*this->pwpos, ptr+copied, chunk*sizeof(wchar_t)); *this->pwpos += chunk; *this->pwsize -= chunk; copied += chunk; @@ -3938,7 +3938,7 @@ void __thiscall basic_stringbuf_wchar__Init(basic_stringbuf_wchar *this, const w throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - memcpy(buf, str, count); + memcpy(buf, str, count*sizeof(wchar_t)); this->seekhigh = buf + count; this->state |= STRINGBUF_allocated;

1 0

Piotr Caban : msvcp90: Fixed reading lines containing only delimiter in basic_istream:: getline_bstr_delim.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: cba2102b7e39bc2d4476bc35e5c137c8c3d8099c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cba2102b7e39bc2d4476bc35e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 11 16:07:57 2012 +0200 msvcp90: Fixed reading lines containing only delimiter in basic_istream::getline_bstr_delim. --- dlls/msvcp90/ios.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7cf646b..82010c6 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8103,8 +8103,11 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( if(basic_istream_char_sentry_create(istream, TRUE)) { MSVCP_basic_string_char_clear(str); - for(c = basic_istream_char_get(istream); c!=delim && c!=EOF; - c = basic_istream_char_get(istream)) { + c = basic_istream_char_get(istream); + if(c != EOF) + state = IOSTATE_goodbit; + + for(; c!=delim && c!=EOF; c = basic_istream_char_get(istream)) { state = IOSTATE_goodbit; MSVCP_basic_string_char_append_ch(str, c); } @@ -9523,8 +9526,11 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( if(basic_istream_wchar_sentry_create(istream, TRUE)) { MSVCP_basic_string_wchar_clear(str); - for(c = basic_istream_wchar_get(istream); c!=delim && c!=WEOF; - c = basic_istream_wchar_get(istream)) { + c = basic_istream_wchar_get(istream); + if(c != WEOF) + state = IOSTATE_goodbit; + + for(; c!=delim && c!=WEOF; c = basic_istream_wchar_get(istream)) { state = IOSTATE_goodbit; MSVCP_basic_string_wchar_append_ch(str, c); }

1 0

Michael Stefaniuc : shlwapi: Remove gratuitous "stub" from TRACE messages.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: c637cbc397598cf0eeae7368cdab14bee378cc75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c637cbc397598cf0eeae7368c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 11 12:13:19 2012 +0200 shlwapi: Remove gratuitous "stub" from TRACE messages. --- dlls/shlwapi/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index a919d8a..b123036 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -1425,7 +1425,7 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, U * It was duplicated because not every version of Shlwapi.dll exports * StrRetToBufA. If you change one routine, change them both. */ - TRACE("dest=%p len=0x%x strret=%p pidl=%p stub\n",dest,len,src,pidl); + TRACE("dest=%p len=0x%x strret=%p pidl=%p\n", dest, len, src, pidl); if (!src) { @@ -1469,7 +1469,7 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, U */ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, UINT len) { - TRACE("dest=%p len=0x%x strret=%p pidl=%p stub\n",dest,len,src,pidl); + TRACE("dest=%p len=0x%x strret=%p pidl=%p\n", dest, len, src, pidl); if (!src) {

1 0

Michael Stefaniuc : comdlg32: Remove gratuitous "stub" from a TRACE message .
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: c34baac0cbb9e5fb86898cbf015c6183b70cf90a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34baac0cbb9e5fb86898cbf0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 11 12:11:18 2012 +0200 comdlg32: Remove gratuitous "stub" from a TRACE message. --- dlls/comdlg32/filedlgbrowser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 1dda9a8..ffe65c9 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -150,7 +150,7 @@ static void COMDLG32_UpdateCurrentDir(const FileOpenDlgInfos *fodInfos) /* copied from shell32 to avoid linking to it */ static BOOL COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPCITEMIDLIST pidl) { - TRACE("dest=%p len=0x%x strret=%p pidl=%p stub\n",dest,len,src,pidl); + TRACE("dest=%p len=0x%x strret=%p pidl=%p\n", dest , len, src, pidl); switch (src->uType) {

1 0

Henri Verbeet : user32: Add rawinput mouse support.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: faaf3d388eb6db8c2594cb11f76a2b1bce77edf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faaf3d388eb6db8c2594cb11f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 11 00:27:04 2012 +0200 user32: Add rawinput mouse support. --- dlls/user32/input.c | 37 ++++++++++++++-- dlls/user32/message.c | 91 ++++++++++++++++++++++++++++++++++++++-- dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 3 +- include/wine/server_protocol.h | 13 +++++- server/process.c | 1 + server/process.h | 1 + server/protocol.def | 11 +++++ server/queue.c | 60 +++++++++++++++++++++++--- 9 files changed, 201 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=faaf3d388eb6db8c2594c…

1 0

Henri Verbeet : wined3d: wined3d_device_get_render_state() never fails.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: d601a0dede8be827bc41d167ae8e360818da9ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d601a0dede8be827bc41d167a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 11 00:27:03 2012 +0200 wined3d: wined3d_device_get_render_state() never fails. --- dlls/d3d8/device.c | 7 +++---- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 6 ++++-- dlls/ddraw/vertexbuffer.c | 2 +- dlls/wined3d/device.c | 9 +++------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 +-- 7 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2cf957e..25f7534 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1475,7 +1475,6 @@ static HRESULT WINAPI d3d8_device_GetRenderState(IDirect3DDevice8 *iface, D3DRENDERSTATETYPE state, DWORD *value) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, state %#x, value %p.\n", iface, state, value); @@ -1483,15 +1482,15 @@ static HRESULT WINAPI d3d8_device_GetRenderState(IDirect3DDevice8 *iface, switch (state) { case D3DRS_ZBIAS: - hr = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); + *value = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS); break; default: - hr = wined3d_device_get_render_state(device->wined3d_device, state, value); + *value = wined3d_device_get_render_state(device->wined3d_device, state); } wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_BeginStateBlock(IDirect3DDevice8 *iface) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 63a611d..e10b698 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1533,15 +1533,14 @@ static HRESULT WINAPI d3d9_device_GetRenderState(IDirect3DDevice9Ex *iface, D3DRENDERSTATETYPE state, DWORD *value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, state %#x, value %p.\n", iface, state, value); wined3d_mutex_lock(); - hr = wined3d_device_get_render_state(device->wined3d_device, state, value); + *value = wined3d_device_get_render_state(device->wined3d_device, state); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_CreateStateBlock(IDirect3DDevice9Ex *iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a81fa31..f51222b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2331,7 +2331,8 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, break; case D3DRENDERSTATE_ZBIAS: - hr = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); + *value = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS); + hr = D3D_OK; break; default: @@ -2342,7 +2343,8 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, hr = E_NOTIMPL; break; } - hr = wined3d_device_get_render_state(device->wined3d_device, state, value); + *value = wined3d_device_get_render_state(device->wined3d_device, state); + hr = D3D_OK; } wined3d_mutex_unlock(); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 29feb87..39a977f 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -339,7 +339,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 * the vertex ops */ doClip = !!(vertex_op & D3DVOP_CLIP); - wined3d_device_get_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING, (DWORD *)&oldClip); + oldClip = wined3d_device_get_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING); if (doClip != oldClip) wined3d_device_set_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING, doClip); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3998408..2cf3028 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2341,14 +2341,11 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, device_invalidate_state(device, STATE_RENDER(state)); } -HRESULT CDECL wined3d_device_get_render_state(const struct wined3d_device *device, - enum wined3d_render_state state, DWORD *value) +DWORD CDECL wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state) { - TRACE("device %p, state %s (%#x), value %p.\n", device, debug_d3drenderstate(state), state, value); + TRACE("device %p, state %s (%#x).\n", device, debug_d3drenderstate(state), state); - *value = device->stateBlock->state.render_states[state]; - - return WINED3D_OK; + return device->stateBlock->state.render_states[state]; } HRESULT CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c211e4a..7aea714 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -75,7 +75,7 @@ @ cdecl wined3d_device_get_ps_consts_f(ptr long ptr long) @ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long) @ cdecl wined3d_device_get_raster_status(ptr long ptr) -@ cdecl wined3d_device_get_render_state(ptr long ptr) +@ cdecl wined3d_device_get_render_state(ptr long) @ cdecl wined3d_device_get_render_target(ptr long ptr) @ cdecl wined3d_device_get_sampler_state(ptr long long ptr) @ cdecl wined3d_device_get_scissor_rect(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d2a2811..d581097 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2142,8 +2142,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *devi UINT start_register, int *constants, UINT vector4i_count); HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_raster_status *raster_status); -HRESULT __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, - enum wined3d_render_state state, DWORD *value); +DWORD __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state); HRESULT __cdecl wined3d_device_get_render_target(const struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface **render_target); HRESULT __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: wined3d_device_set_render_state() never fails.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 75cec973d5ba6aa7d65b8dabb76617457af1d94b URL: http://source.winehq.org/git/wine.git/?a=commit;h=75cec973d5ba6aa7d65b8dabb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 11 00:27:02 2012 +0200 wined3d: wined3d_device_set_render_state() never fails. --- dlls/d3d8/device.c | 16 +++++----------- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 6 ++++-- dlls/wined3d/device.c | 6 ++---- include/wine/wined3d.h | 2 +- 5 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5a029f2..2cf957e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -600,7 +600,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback))) { - hr = wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); device->lost = FALSE; } else @@ -1453,7 +1453,6 @@ static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, D3DRENDERSTATETYPE state, DWORD value) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); @@ -1461,15 +1460,15 @@ static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, switch (state) { case D3DRS_ZBIAS: - hr = wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); break; default: - hr = wined3d_device_set_render_state(device->wined3d_device, state, value); + wined3d_device_set_render_state(device->wined3d_device, state, value); } wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetRenderState(IDirect3DDevice8 *iface, @@ -3038,13 +3037,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine return hr; } - hr = wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_mutex_unlock(); - if (FAILED(hr)) - { - ERR("Failed to set minimum pointsize, hr %#x.\n", hr); - goto err; - } present_parameters_from_wined3d_swapchain_desc(parameters, &swapchain_desc); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2e33c9f..63a611d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1519,15 +1519,14 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi D3DRENDERSTATETYPE state, DWORD value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); wined3d_mutex_lock(); - hr = wined3d_device_set_render_state(device->wined3d_device, state, value); + wined3d_device_set_render_state(device->wined3d_device, state, value); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetRenderState(IDirect3DDevice9Ex *iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7848b0d..a81fa31 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2627,7 +2627,8 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, break; case D3DRENDERSTATE_ZBIAS: - hr = wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); + hr = D3D_OK; break; default: @@ -2639,7 +2640,8 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, break; } - hr = wined3d_device_set_render_state(device->wined3d_device, state, value); + wined3d_device_set_render_state(device->wined3d_device, state, value); + hr = D3D_OK; break; } wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e0849ce..3998408 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2317,7 +2317,7 @@ void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, stru *viewport = device->stateBlock->state.viewport; } -HRESULT CDECL wined3d_device_set_render_state(struct wined3d_device *device, +void CDECL wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value) { DWORD old_value = device->stateBlock->state.render_states[state]; @@ -2331,7 +2331,7 @@ HRESULT CDECL wined3d_device_set_render_state(struct wined3d_device *device, if (device->isRecordingState) { TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; + return; } /* Compared here and not before the assignment to allow proper stateblock recording. */ @@ -2339,8 +2339,6 @@ HRESULT CDECL wined3d_device_set_render_state(struct wined3d_device *device, TRACE("Application is setting the old value over, nothing to do.\n"); else device_invalidate_state(device, STATE_RENDER(state)); - - return WINED3D_OK; } HRESULT CDECL wined3d_device_get_render_state(const struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1fa1342..d2a2811 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2220,7 +2220,7 @@ HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device, UINT start_register, const float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_set_ps_consts_i(struct wined3d_device *device, UINT start_register, const int *constants, UINT vector4i_count); -HRESULT __cdecl wined3d_device_set_render_state(struct wined3d_device *device, +void __cdecl wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value); HRESULT __cdecl wined3d_device_set_render_target(struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface *render_target, BOOL set_viewport);

1 0

Henri Verbeet : d3d10core: Implement d3d10_depthstencil_view_GetResource().
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: d2fdeaa4fef907dbc2d2134f90ab335363760fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fdeaa4fef907dbc2d2134f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 11 00:27:01 2012 +0200 d3d10core: Implement d3d10_depthstencil_view_GetResource(). --- dlls/d3d10core/d3d10core_private.h | 5 ++++- dlls/d3d10core/device.c | 3 +-- dlls/d3d10core/view.c | 14 ++++++++++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 153c5cc..95d929a 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -128,9 +128,12 @@ struct d3d10_depthstencil_view { ID3D10DepthStencilView ID3D10DepthStencilView_iface; LONG refcount; + + ID3D10Resource *resource; }; -HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view) DECLSPEC_HIDDEN; +HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, + ID3D10Resource *resource) DECLSPEC_HIDDEN; /* ID3D10RenderTargetView */ struct d3d10_rendertarget_view diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 2d1db4e..6cd7737 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -804,8 +804,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Devic return E_OUTOFMEMORY; } - hr = d3d10_depthstencil_view_init(object); - if (FAILED(hr)) + if (FAILED(hr = d3d10_depthstencil_view_init(object, resource))) { WARN("Failed to initialize depthstencil view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index a542e63..792e79b 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -211,6 +211,7 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_view_Release(ID3D10DepthStenci if (!refcount) { + ID3D10Resource_Release(This->resource); HeapFree(GetProcessHeap(), 0, This); } @@ -255,7 +256,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateDataInterface static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetResource(ID3D10DepthStencilView *iface, ID3D10Resource **resource) { - FIXME("iface %p, resource %p stub!\n", iface, resource); + struct d3d10_depthstencil_view *view = impl_from_ID3D10DepthStencilView(iface); + + TRACE("iface %p, resource %p.\n", iface, resource); + + *resource = view->resource; + ID3D10Resource_AddRef(*resource); } /* ID3D10DepthStencilView methods */ @@ -283,11 +289,15 @@ static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = d3d10_depthstencil_view_GetDesc, }; -HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view) +HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, + ID3D10Resource *resource) { view->ID3D10DepthStencilView_iface.lpVtbl = &d3d10_depthstencil_view_vtbl; view->refcount = 1; + view->resource = resource; + ID3D10Resource_AddRef(resource); + return S_OK; }

1 0

Qian Hong : gdi32: Fixed get_name_table_entry for symbol fonts.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: de5972081eb734366aa02d3685c27cfa13144b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5972081eb734366aa02d368… Author: Qian Hong <fracting(a)gmail.com> Date: Tue Sep 11 01:06:39 2012 +0800 gdi32: Fixed get_name_table_entry for symbol fonts. --- dlls/gdi32/freetype.c | 3 +-- dlls/gdi32/tests/font.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index efb12a4..9412df2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1146,7 +1146,7 @@ static BOOL get_name_table_entry(FT_Face ft_face, FT_SfntName *req) if(!pFT_Get_Sfnt_Name(ft_face, name_index, &name)) { if((name.platform_id == req->platform_id) && - (name.encoding_id == req->encoding_id) && + ((name.encoding_id == TT_MS_ID_UNICODE_CS) || (name.encoding_id == TT_MS_ID_SYMBOL_CS)) && (name.language_id == req->language_id) && (name.name_id == req->name_id)) { @@ -1168,7 +1168,6 @@ static WCHAR *get_face_name(FT_Face ft_face, FT_UShort name_id, FT_UShort langua FT_SfntName name; name.platform_id = TT_PLATFORM_MICROSOFT; - name.encoding_id = TT_MS_ID_UNICODE_CS; name.language_id = language_id; name.name_id = name_id; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ef4e51d..0c67fe7 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4151,9 +4151,7 @@ static void test_fullname2_helper(const char *Family) ok(ret, "UNIQUE_ID (full name) could not be read\n"); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName; - if (efnd.elf[i].elfLogFont.lfCharSet == SYMBOL_CHARSET) - todo_wine ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); - else ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); + ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); SelectObject(hdc, of); DeleteObject(hfont);

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
83
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 September 2012