March 2016 - Wine-commits - list.winehq.org

Michael Stefaniuc : d3dx9/tests: Avoid a TRUE: FALSE conditional expression.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 020b86b0be6f819ddafa9f8baa779610bcf7fc4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=020b86b0be6f819ddafa9f8ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 29 15:53:25 2016 +0100 d3dx9/tests: Avoid a TRUE:FALSE conditional expression. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 482f064..1b895da 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1953,7 +1953,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) hr = effect->lpVtbl->SetBool(effect, parameter, bvalue); if (!res_desc->Elements && res_desc->Rows == 1 && res_desc->Columns == 1) { - bvalue = bvalue ? TRUE : FALSE; + bvalue = TRUE; set_number(expected_value, res_desc->Type, &bvalue, D3DXPT_BOOL); ok(hr == D3D_OK, "%u - %s: SetBool failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); }

1 0

Juan Jose Gonzalez : include: Add HidD_GetSerialNumberString to ddk/ hidsdi.h.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 4eddd5dba343d541fa79564ffbc7ad6d5cbe8e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eddd5dba343d541fa79564ff… Author: Juan Jose Gonzalez <juanj.gh(a)gmail.com> Date: Mon Feb 29 20:22:09 2016 +0100 include: Add HidD_GetSerialNumberString to ddk/hidsdi.h. Signed-off-by: Juan Jose Gonzalez <juanj.gh(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/hidsdi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 566d030..c8a0d73 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -39,6 +39,7 @@ void WINAPI HidD_GetHidGuid(LPGUID guid); BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); +BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetPreparsedData( HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData); BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData);

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_device_SetRenderTarget().
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 5c27fef77a7dd9fa847a23c945700d3204b7bde4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c27fef77a7dd9fa847a23c94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 18:19:23 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_device_SetRenderTarget(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0c19b3f..c1875bc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1173,9 +1173,8 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, if (ds_impl) { + struct wined3d_sub_resource_desc ds_desc, rt_desc; struct wined3d_rendertarget_view *original_rtv; - struct wined3d_resource_desc ds_desc, rt_desc; - struct wined3d_resource *wined3d_resource; struct d3d8_surface *original_surface; /* If no render target is passed in check the size against the current RT */ @@ -1188,14 +1187,14 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, return D3DERR_NOTFOUND; } original_surface = wined3d_rendertarget_view_get_sub_resource_parent(original_rtv); - wined3d_resource = wined3d_texture_get_sub_resource(original_surface->wined3d_texture, original_surface->sub_resource_idx); + wined3d_texture_get_sub_resource_desc(original_surface->wined3d_texture, + original_surface->sub_resource_idx, &rt_desc); } else - wined3d_resource = wined3d_texture_get_sub_resource(rt_impl->wined3d_texture, rt_impl->sub_resource_idx); - wined3d_resource_get_desc(wined3d_resource, &rt_desc); + wined3d_texture_get_sub_resource_desc(rt_impl->wined3d_texture, + rt_impl->sub_resource_idx, &rt_desc); - wined3d_resource = wined3d_texture_get_sub_resource(ds_impl->wined3d_texture, ds_impl->sub_resource_idx); - wined3d_resource_get_desc(wined3d_resource, &ds_desc); + wined3d_texture_get_sub_resource_desc(ds_impl->wined3d_texture, ds_impl->sub_resource_idx, &ds_desc); if (ds_desc.width < rt_desc.width || ds_desc.height < rt_desc.height) {

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_surface_GetDesc().
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 9a6ee515ed263cf6f14cb12b33cc3e3f71d46963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a6ee515ed263cf6f14cb12b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 18:19:24 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_surface_GetDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/surface.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index ec263b1..565f642 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -175,18 +175,16 @@ static HRESULT WINAPI d3d8_surface_GetContainer(IDirect3DSurface8 *iface, REFIID static HRESULT WINAPI d3d8_surface_GetDesc(IDirect3DSurface8 *iface, D3DSURFACE_DESC *desc) { struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface); - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *sub_resource; + struct wined3d_sub_resource_desc wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - sub_resource = wined3d_texture_get_sub_resource(surface->wined3d_texture, surface->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_SURFACE; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_volume_GetDesc().
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: f2fdb1685665c20f98f18428c3bc3096ad4126c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2fdb1685665c20f98f18428c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 18:19:25 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_volume_GetDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/volume.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index f26e424..f3a30a8 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -115,18 +115,16 @@ static HRESULT WINAPI d3d8_volume_GetContainer(IDirect3DVolume8 *iface, REFIID r static HRESULT WINAPI d3d8_volume_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DESC *desc) { struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface); - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *sub_resource; + struct wined3d_sub_resource_desc wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - sub_resource = wined3d_texture_get_sub_resource(volume->wined3d_texture, volume->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(volume->wined3d_texture, volume->sub_resource_idx, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_VOLUME; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_texture_2d_GetLevelDesc().
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 704a11e6d69cce67ce855ef2a8fa66725826eaf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704a11e6d69cce67ce855ef2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 18:19:26 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_texture_2d_GetLevelDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index bef099a..a1bf0ab 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -243,21 +243,16 @@ static DWORD WINAPI d3d8_texture_2d_GetLevelCount(IDirect3DTexture8 *iface) static HRESULT WINAPI d3d8_texture_2d_GetLevelDesc(IDirect3DTexture8 *iface, UINT level, D3DSURFACE_DESC *desc) { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); - struct wined3d_resource *sub_resource; - HRESULT hr = D3D_OK; + struct wined3d_sub_resource_desc wined3d_desc; + HRESULT hr; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) - hr = D3DERR_INVALIDCALL; - else + if (SUCCEEDED(hr = wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, level, &wined3d_desc))) { - struct wined3d_resource_desc wined3d_desc; - - wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_SURFACE; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_texture_cube_GetLevelDesc().
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 9136f9f9c432987b82d5e2682fc77fe21a8e299b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9136f9f9c432987b82d5e2682… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 18:19:27 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_texture_cube_GetLevelDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index a1bf0ab..78f40c7 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -589,8 +589,8 @@ static DWORD WINAPI d3d8_texture_cube_GetLevelCount(IDirect3DCubeTexture8 *iface static HRESULT WINAPI d3d8_texture_cube_GetLevelDesc(IDirect3DCubeTexture8 *iface, UINT level, D3DSURFACE_DESC *desc) { struct d3d8_texture *texture = impl_from_IDirect3DCubeTexture8(iface); - struct wined3d_resource *sub_resource; - HRESULT hr = D3D_OK; + struct wined3d_sub_resource_desc wined3d_desc; + HRESULT hr; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); @@ -601,15 +601,10 @@ static HRESULT WINAPI d3d8_texture_cube_GetLevelDesc(IDirect3DCubeTexture8 *ifac return D3DERR_INVALIDCALL; } - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) - hr = D3DERR_INVALIDCALL; - else + if (SUCCEEDED(hr = wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, level, &wined3d_desc))) { - struct wined3d_resource_desc wined3d_desc; - - wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_SURFACE; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_texture_3d_GetLevelDesc().
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: cd25ecffa7b7f5a8e5e65d5433b14d3876e5bba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd25ecffa7b7f5a8e5e65d543… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 18:19:28 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_texture_3d_GetLevelDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 78f40c7..7ed79a5 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -945,21 +945,16 @@ static DWORD WINAPI d3d8_texture_3d_GetLevelCount(IDirect3DVolumeTexture8 *iface static HRESULT WINAPI d3d8_texture_3d_GetLevelDesc(IDirect3DVolumeTexture8 *iface, UINT level, D3DVOLUME_DESC *desc) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - struct wined3d_resource *sub_resource; - HRESULT hr = D3D_OK; + struct wined3d_sub_resource_desc wined3d_desc; + HRESULT hr; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) - hr = D3DERR_INVALIDCALL; - else + if (SUCCEEDED(hr = wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, level, &wined3d_desc))) { - struct wined3d_resource_desc wined3d_desc; - - wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_VOLUME; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_GetRenderTargetData().
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: f4c8d81489a4904ba1b0577da5ab73a9b8e8fc08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c8d81489a4904ba1b0577da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 18:19:29 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_GetRenderTargetData(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bac44b6..bd94712 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1281,23 +1281,20 @@ static HRESULT WINAPI d3d9_device_GetRenderTargetData(IDirect3DDevice9Ex *iface, { struct d3d9_surface *rt_impl = unsafe_impl_from_IDirect3DSurface9(render_target); struct d3d9_surface *dst_impl = unsafe_impl_from_IDirect3DSurface9(dst_surface); - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *sub_resource; + struct wined3d_sub_resource_desc wined3d_desc; RECT dst_rect, src_rect; HRESULT hr; TRACE("iface %p, render_target %p, dst_surface %p.\n", iface, render_target, dst_surface); wined3d_mutex_lock(); - sub_resource = wined3d_texture_get_sub_resource(dst_impl->wined3d_texture, dst_impl->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, &wined3d_desc); dst_rect.left = 0; dst_rect.top = 0; dst_rect.right = wined3d_desc.width; dst_rect.bottom = wined3d_desc.height; - sub_resource = wined3d_texture_get_sub_resource(rt_impl->wined3d_texture, rt_impl->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(rt_impl->wined3d_texture, rt_impl->sub_resource_idx, &wined3d_desc); src_rect.left = 0; src_rect.top = 0; src_rect.right = wined3d_desc.width;

1 0

Stefan Dösinger : wined3d: Get rid of the offscreenBuffer field in struct wined3d_device.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 9dc89561027f32b08978b9fb75da5a0d0966f999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dc89561027f32b08978b9fb7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 29 18:19:30 2016 +0100 wined3d: Get rid of the offscreenBuffer field in struct wined3d_device. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 37 +++++++++++++++++++++++++------------ dlls/wined3d/device.c | 21 --------------------- dlls/wined3d/surface.c | 13 ++++++++----- dlls/wined3d/wined3d_private.h | 4 +--- 4 files changed, 34 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9dc89561027f32b08978b…

1 0