wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Jacek Caban : vbscript: Added support for DISPATCH_PROPERTYGET in invoke_variant_prop.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: 24f4c09bb6a4b460623084af34c5bf85a88d5fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24f4c09bb6a4b460623084af3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 10 10:34:38 2012 +0200 vbscript: Added support for DISPATCH_PROPERTYGET in invoke_variant_prop. --- dlls/vbscript/tests/run.c | 6 ++++++ dlls/vbscript/vbdisp.c | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 6a2b72a..0e292af 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -300,6 +300,12 @@ static void test_disp(IDispatch *disp) ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); ok(V_BOOL(&v), "V_BOOL(v) = %x\n", V_BOOL(&v)); + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BOOL(&v), "V_BOOL(v) = %x\n", V_BOOL(&v)); + dp.cArgs = 1; hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL); ok(hres == DISP_E_MEMBERNOTFOUND, "InvokeEx failed: %08x, expected DISP_E_MEMBERNOTFOUND\n", hres); diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index a76660e..1b2b8fe 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -103,6 +103,7 @@ static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIA switch(flags) { case DISPATCH_PROPERTYGET|DISPATCH_METHOD: + case DISPATCH_PROPERTYGET: if(dp->cArgs) { WARN("called with arguments\n"); return DISP_E_MEMBERNOTFOUND; /* That's what tests show */

1 0

Marcus Meissner : winecfg: Remove incorrect HeapFree (Coverity).
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: 73d00515fe8354b2549feb1ee157c82cc3197d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d00515fe8354b2549feb1ee… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Sep 10 09:38:32 2012 +0200 winecfg: Remove incorrect HeapFree (Coverity). --- programs/winecfg/winecfg.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index fa18e9b..ea116e8 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -503,7 +503,6 @@ static WCHAR **enumerate_valuesW(HKEY root, WCHAR *path) if (removed) /* this value was deleted by the user, so don't include it */ { - HeapFree(GetProcessHeap(), 0, name); i++; continue; }

1 0

Rico Schüller : winex11.drv: Remove unneeded variable definition.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: c67e48b9fa2bdb5e040aecaa4d0bf62b52ca15f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c67e48b9fa2bdb5e040aecaa4… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Sep 9 11:37:29 2012 +0200 winex11.drv: Remove unneeded variable definition. --- dlls/winex11.drv/xrandr.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e17150b..968ff76 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -61,8 +61,6 @@ static RRMode *xrandr12_modes; #undef MAKE_FUNCPTR -extern int usexrandr; - static struct x11drv_mode_info *dd_modes; static SizeID *xrandr10_modes; static unsigned int xrandr_mode_count;

1 0

Dan Kegel : vcomp: Better stub for _vcomp_set_num_threads.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: e45b5f556a68e00d2ba4eb8269708c3cb9be3309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45b5f556a68e00d2ba4eb826… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Sep 5 19:05:54 2012 -0700 vcomp: Better stub for _vcomp_set_num_threads. --- dlls/vcomp/main.c | 5 +++++ dlls/vcomp/vcomp.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 82c8c94..1e51eef 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -41,6 +41,11 @@ double CDECL omp_get_wtime(void) return GetTickCount() / 1000.0; } +void CDECL _vcomp_set_num_threads(int num_threads) +{ + TRACE("(%d): stub\n", num_threads); +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 7a701ef..3e02bea 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -85,7 +85,7 @@ @ stub _vcomp_reduction_u8 @ stub _vcomp_sections_init @ stub _vcomp_sections_next -@ stub _vcomp_set_num_threads +@ cdecl _vcomp_set_num_threads(long) @ stub _vcomp_single_begin @ stub _vcomp_single_end @ stub omp_destroy_lock

1 0

Dan Kegel : msvcp90: Handle npos as length in more places.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: 8e9e82f41eb0470de154d6b6a583fa15ea4ed176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9e82f41eb0470de154d6b6a… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 8 07:59:44 2012 -0700 msvcp90: Handle npos as length in more places. --- dlls/msvcp90/string.c | 12 ++++++------ dlls/msvcp90/tests/string.c | 8 +++++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index fb2ba1a..740681f 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1331,7 +1331,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, @@ -1378,7 +1378,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, @@ -2017,7 +2017,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, @@ -3265,7 +3265,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, @@ -3318,7 +3318,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, @@ -3980,7 +3980,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/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 1e3ccec..511d846 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -17,6 +17,7 @@ */ #include <stdio.h> +#include <limits.h> #include <windef.h> #include <winbase.h> @@ -450,11 +451,12 @@ static void test_basic_string_char_append(void) { } static void test_basic_string_char_compare(void) { - basic_string_char str1, str2; + basic_string_char str1, str2, str3; int ret; call_func2(p_basic_string_char_ctor_cstr, &str1, "str1str"); call_func2(p_basic_string_char_ctor_cstr, &str2, "str9str"); + call_func2(p_basic_string_char_ctor_cstr, &str3, "splash.png"); ret = (int)call_func6(p_basic_string_char_compare_substr_substr, &str1, 0, 3, &str2, 0, 3); @@ -470,6 +472,9 @@ static void test_basic_string_char_compare(void) { &str1, 0, 1000, "str1str", 7); ok(ret == 0, "ret = %d\n", ret); ret = (int)call_func5(p_basic_string_char_compare_substr_cstr_len, + &str3, 6, UINT_MAX, ".png", 4); + ok(ret == 0, "ret = %d\n", ret); + ret = (int)call_func5(p_basic_string_char_compare_substr_cstr_len, &str1, 1, 2, "tr", 2); ok(ret == 0, "ret = %d\n", ret); ret = (int)call_func5(p_basic_string_char_compare_substr_cstr_len, @@ -481,6 +486,7 @@ static void test_basic_string_char_compare(void) { call_func1(p_basic_string_char_dtor, &str1); call_func1(p_basic_string_char_dtor, &str2); + call_func1(p_basic_string_char_dtor, &str3); } static void test_basic_string_char_concatenate(void) {

1 0

Henri Verbeet : user32: Implement RegisterRawInputDevices().
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: 5befb959dd6f6e3567f0cd4fabd28b3b3b92966d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5befb959dd6f6e3567f0cd4fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 8 11:26:26 2012 +0200 user32: Implement RegisterRawInputDevices(). --- dlls/user32/input.c | 41 +++++++++++++++++++++++++++++++++-- include/wine/server_protocol.h | 26 +++++++++++++++++++++- server/process.c | 7 ++++++ server/process.h | 7 ++++++ server/protocol.def | 14 ++++++++++++ server/queue.c | 46 ++++++++++++++++++++++++++++++++++++++++ server/request.h | 3 ++ server/trace.c | 26 ++++++++++++++++++++++ 8 files changed, 166 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5befb959dd6f6e3567f0c…

1 0

Henri Verbeet : wined3d: wined3d_device_get_viewport() never fails.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: 3569b6ccd24e329c30693eba7af08f4fd06d7dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3569b6ccd24e329c30693eba7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 8 11:26:25 2012 +0200 wined3d: wined3d_device_get_viewport() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 5 ++--- dlls/wined3d/device.c | 4 +--- include/wine/wined3d.h | 2 +- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b4179eb..5a029f2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1322,16 +1322,15 @@ static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3D static HRESULT WINAPI d3d8_device_GetViewport(IDirect3DDevice8 *iface, D3DVIEWPORT8 *viewport) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, viewport %p.\n", iface, viewport); /* Note: D3DVIEWPORT8 is compatible with struct wined3d_viewport. */ wined3d_mutex_lock(); - hr = wined3d_device_get_viewport(device->wined3d_device, (struct wined3d_viewport *)viewport); + wined3d_device_get_viewport(device->wined3d_device, (struct wined3d_viewport *)viewport); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_SetMaterial(IDirect3DDevice8 *iface, const D3DMATERIAL8 *material) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6922e81..2e33c9f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1388,16 +1388,15 @@ static HRESULT WINAPI d3d9_device_SetViewport(IDirect3DDevice9Ex *iface, const D static HRESULT WINAPI d3d9_device_GetViewport(IDirect3DDevice9Ex *iface, D3DVIEWPORT9 *viewport) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, viewport %p.\n", iface, viewport); /* Note: D3DVIEWPORT9 is compatible with struct wined3d_viewport. */ wined3d_mutex_lock(); - hr = wined3d_device_get_viewport(device->wined3d_device, (struct wined3d_viewport *)viewport); + wined3d_device_get_viewport(device->wined3d_device, (struct wined3d_viewport *)viewport); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetMaterial(IDirect3DDevice9Ex *iface, const D3DMATERIAL9 *material) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index aec30de..7848b0d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5042,7 +5042,6 @@ static HRESULT WINAPI d3d_device7_SetViewport_FPUPreserve(IDirect3DDevice7 *ifac static HRESULT d3d_device7_GetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *viewport) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT hr; TRACE("iface %p, viewport %p.\n", iface, viewport); @@ -5051,10 +5050,10 @@ static HRESULT d3d_device7_GetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi /* Note: D3DVIEWPORT7 is compatible with struct wined3d_viewport. */ wined3d_mutex_lock(); - hr = wined3d_device_get_viewport(device->wined3d_device, (struct wined3d_viewport *)viewport); + wined3d_device_get_viewport(device->wined3d_device, (struct wined3d_viewport *)viewport); wined3d_mutex_unlock(); - return hr_ddraw_from_wined3d(hr); + return D3D_OK; } static HRESULT WINAPI d3d_device7_GetViewport_FPUSetup(IDirect3DDevice7 *iface, D3DVIEWPORT7 *viewport) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7753ae4..e0849ce 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2310,13 +2310,11 @@ void CDECL wined3d_device_set_viewport(struct wined3d_device *device, const stru device_invalidate_state(device, STATE_VIEWPORT); } -HRESULT CDECL wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport) +void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport) { TRACE("device %p, viewport %p.\n", device, viewport); *viewport = device->stateBlock->state.viewport; - - return WINED3D_OK; } HRESULT CDECL wined3d_device_set_render_state(struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fa8b417..1fa1342 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2168,7 +2168,7 @@ HRESULT __cdecl wined3d_device_get_transform(const struct wined3d_device *device HRESULT __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device, struct wined3d_vertex_declaration **declaration); struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device); -HRESULT __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport); +void __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport); HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: wined3d_device_set_viewport() never fails.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: 64aae8cf02d5620d3b78fb9c8d4d9f295d9afe18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64aae8cf02d5620d3b78fb9c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 8 11:26:24 2012 +0200 wined3d: wined3d_device_set_viewport() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 5 ++--- dlls/wined3d/device.c | 6 ++---- include/wine/wined3d.h | 2 +- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 36b8a7e..b4179eb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1308,16 +1308,15 @@ static HRESULT WINAPI d3d8_device_MultiplyTransform(IDirect3DDevice8 *iface, static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3DVIEWPORT8 *viewport) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, viewport %p.\n", iface, viewport); /* Note: D3DVIEWPORT8 is compatible with struct wined3d_viewport. */ wined3d_mutex_lock(); - hr = wined3d_device_set_viewport(device->wined3d_device, (const struct wined3d_viewport *)viewport); + wined3d_device_set_viewport(device->wined3d_device, (const struct wined3d_viewport *)viewport); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetViewport(IDirect3DDevice8 *iface, D3DVIEWPORT8 *viewport) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0399ba3..6922e81 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1374,16 +1374,15 @@ static HRESULT WINAPI d3d9_device_MultiplyTransform(IDirect3DDevice9Ex *iface, static HRESULT WINAPI d3d9_device_SetViewport(IDirect3DDevice9Ex *iface, const D3DVIEWPORT9 *viewport) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, viewport %p.\n", iface, viewport); /* Note: D3DVIEWPORT9 is compatible with struct wined3d_viewport. */ wined3d_mutex_lock(); - hr = wined3d_device_set_viewport(device->wined3d_device, (const struct wined3d_viewport *)viewport); + wined3d_device_set_viewport(device->wined3d_device, (const struct wined3d_viewport *)viewport); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetViewport(IDirect3DDevice9Ex *iface, D3DVIEWPORT9 *viewport) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 24bd993..aec30de 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4992,7 +4992,6 @@ static HRESULT WINAPI d3d_device7_Clear_FPUPreserve(IDirect3DDevice7 *iface, DWO static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *viewport) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT hr; TRACE("iface %p, viewport %p.\n", iface, viewport); @@ -5001,10 +5000,10 @@ static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi /* Note: D3DVIEWPORT7 is compatible with struct wined3d_viewport. */ wined3d_mutex_lock(); - hr = wined3d_device_set_viewport(device->wined3d_device, (struct wined3d_viewport *)viewport); + wined3d_device_set_viewport(device->wined3d_device, (struct wined3d_viewport *)viewport); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d_device7_SetViewport_FPUSetup(IDirect3DDevice7 *iface, D3DVIEWPORT7 *viewport) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7a57195..7753ae4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2291,7 +2291,7 @@ INT CDECL wined3d_device_get_base_vertex_index(const struct wined3d_device *devi return device->stateBlock->state.base_vertex_index; } -HRESULT CDECL wined3d_device_set_viewport(struct wined3d_device *device, const struct wined3d_viewport *viewport) +void CDECL wined3d_device_set_viewport(struct wined3d_device *device, const struct wined3d_viewport *viewport) { TRACE("device %p, viewport %p.\n", device, viewport); TRACE("x %u, y %u, w %u, h %u, min_z %.8e, max_z %.8e.\n", @@ -2304,12 +2304,10 @@ HRESULT CDECL wined3d_device_set_viewport(struct wined3d_device *device, const s if (device->isRecordingState) { TRACE("Recording... not performing anything\n"); - return WINED3D_OK; + return; } device_invalidate_state(device, STATE_VIEWPORT); - - return WINED3D_OK; } HRESULT CDECL wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index afb007c..fa8b417 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2239,7 +2239,7 @@ HRESULT __cdecl wined3d_device_set_transform(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_vertex_declaration(struct wined3d_device *device, struct wined3d_vertex_declaration *declaration); HRESULT __cdecl wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader); -HRESULT __cdecl wined3d_device_set_viewport(struct wined3d_device *device, const struct wined3d_viewport *viewport); +void __cdecl wined3d_device_set_viewport(struct wined3d_device *device, const struct wined3d_viewport *viewport); HRESULT __cdecl wined3d_device_set_vs_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_set_vs_consts_f(struct wined3d_device *device,

1 0

Henri Verbeet : d3d10core: Store the resource in the d3d10core rendertarget view.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: 739e302e6f0934b77c40f1cf439806167178feb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=739e302e6f0934b77c40f1cf4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 8 11:26:23 2012 +0200 d3d10core: Store the resource in the d3d10core rendertarget view. --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/view.c | 27 +++++++-------------------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 885a2ef..153c5cc 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -140,6 +140,7 @@ struct d3d10_rendertarget_view struct wined3d_rendertarget_view *wined3d_view; D3D10_RENDER_TARGET_VIEW_DESC desc; + ID3D10Resource *resource; }; HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index d038faa..a542e63 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -339,6 +339,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTarge if (!refcount) { wined3d_rendertarget_view_decref(This->wined3d_view); + ID3D10Resource_Release(This->resource); HeapFree(GetProcessHeap(), 0, This); } @@ -383,29 +384,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateDataInterface static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetResource(ID3D10RenderTargetView *iface, ID3D10Resource **resource) { - struct d3d10_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); - struct wined3d_resource *wined3d_resource; - IUnknown *parent; - HRESULT hr; + struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); TRACE("iface %p, resource %p\n", iface, resource); - wined3d_resource = wined3d_rendertarget_view_get_resource(This->wined3d_view); - if (!wined3d_resource) - { - ERR("Failed to get wined3d resource.\n"); - *resource = NULL; - return; - } - - parent = wined3d_resource_get_parent(wined3d_resource); - hr = IUnknown_QueryInterface(parent, &IID_ID3D10Resource, (void **)&resource); - if (FAILED(hr)) - { - ERR("Resource parent isn't a d3d10 resource, hr %#x\n", hr); - *resource = NULL; - return; - } + *resource = view->resource; + ID3D10Resource_AddRef(*resource); } /* ID3D10RenderTargetView methods */ @@ -470,6 +454,9 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, return hr; } + view->resource = resource; + ID3D10Resource_AddRef(resource); + return S_OK; }

1 0

Marcus Meissner : gdi32: Fixed passed buffer size.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: f5c5a30724a87b544ee933e198b3e1e07c3a4538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c5a30724a87b544ee933e19… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Sep 7 20:34:33 2012 +0200 gdi32: Fixed passed buffer size. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 26d88ae..3f7af21 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4037,7 +4037,7 @@ static void test_fullname(void) bufA[0] = 0; ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, sizeof(bufW), TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "face full name could not be read\n"); - WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, sizeof(bufW), NULL, FALSE); + WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, sizeof(bufA), NULL, FALSE); ok(!lstrcmpA(bufA, TestName[i]), "font full names don't match: %s != %s\n", TestName[i], bufA); SelectObject(hdc, of); DeleteObject(hfont);

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
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