Signed-off-by: Matteo Bruni mbruni@codeweavers.com --- dlls/d3dx9_36/d3dx9_private.h | 2 +- dlls/d3dx9_36/surface.c | 16 ++++++++-------- dlls/d3dx9_36/texture.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index c1a279283d8..9497343f422 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -123,7 +123,7 @@ HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, co const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, IDirect3DSurface9 **temp_surface, BOOL write) DECLSPEC_HIDDEN; -HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, +HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, IDirect3DSurface9 *temp_surface, BOOL update) DECLSPEC_HIDDEN;
unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 44e19ec09b6..8e9b834d882 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -256,7 +256,7 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO return hr; }
-HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, +HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, IDirect3DSurface9 *temp_surface, BOOL update) { IDirect3DDevice9 *device; @@ -608,7 +608,7 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur copy_pixels(locked_rect.pBits, locked_rect.Pitch, 0, pixels, dst_pitch, 0, &volume, pixel_format);
- unlock_surface(src_surface, NULL, &locked_rect, temp_surface, FALSE); + unlock_surface(src_surface, NULL, temp_surface, FALSE);
*dst_buffer = buffer; return D3D_OK; @@ -1912,7 +1912,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, && src_size.height != surfdesc.Height)) { WARN("Source rect %s is misaligned.\n", wine_dbgstr_rect(src_rect)); - unlock_surface(dst_surface, dst_rect, &lockrect, surface, FALSE); + unlock_surface(dst_surface, dst_rect, surface, FALSE); return D3DXERR_INVALIDDATA; }
@@ -1925,7 +1925,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, || !is_conversion_to_supported(destformatdesc)) { FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format); - unlock_surface(dst_surface, dst_rect, &lockrect, surface, FALSE); + unlock_surface(dst_surface, dst_rect, surface, FALSE); return E_NOTIMPL; }
@@ -1946,7 +1946,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } }
- return unlock_surface(dst_surface, dst_rect, &lockrect, surface, TRUE); + return unlock_surface(dst_surface, dst_rect, surface, TRUE); }
/************************************************************ @@ -2036,7 +2036,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, hr = D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, lock.pBits, src_desc.Format, lock.Pitch, src_palette, src_rect, filter, color_key);
- if (FAILED(unlock_surface(src_surface, NULL, &lock, temp_surface, FALSE))) + if (FAILED(unlock_surface(src_surface, NULL, temp_surface, FALSE))) return D3DXERR_INVALIDDATA;
return hr; @@ -2217,7 +2217,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
IWICBitmapFrameEncode_WritePixels(frame, height, locked_rect.Pitch, height * locked_rect.Pitch, locked_rect.pBits); - unlock_surface(src_surface, src_rect, &locked_rect, temp_surface, FALSE); + unlock_surface(src_surface, src_rect, temp_surface, FALSE); } else /* Pixel format conversion */ { @@ -2254,7 +2254,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE } convert_argb_pixels(locked_rect.pBits, locked_rect.Pitch, 0, &size, src_format_desc, dst_data, dst_pitch, 0, &size, dst_format_desc, 0, NULL); - unlock_surface(src_surface, src_rect, &locked_rect, temp_surface, FALSE); + unlock_surface(src_surface, src_rect, temp_surface, FALSE);
IWICBitmapFrameEncode_WritePixels(frame, height, dst_pitch, dst_pitch * height, dst_data); HeapFree(GetProcessHeap(), 0, dst_data); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 74a32b46be1..26d07ca9f66 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1379,7 +1379,7 @@ HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D f fill_texture(format, data + y * lock_rect.Pitch + x * format->bytes_per_pixel, &value); } } - if (FAILED(hr = unlock_surface(surface, NULL, &lock_rect, temp_surface, TRUE))) + if (FAILED(hr = unlock_surface(surface, NULL, temp_surface, TRUE))) { IDirect3DSurface9_Release(surface); return hr;
Signed-off-by: Matteo Bruni mbruni@codeweavers.com --- dlls/d3dx9_36/tests/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index a43072ff1f4..4a10492a08f 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1403,7 +1403,7 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device)
static void test_D3DXSaveSurfaceToFile(IDirect3DDevice9 *device) { - const BYTE pixels[] = + static const BYTE pixels[] = {0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff,}; DWORD pitch = sizeof(pixels) / 2;
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55161
Your paranoid android.
=== build (build log) ===
error: patch failed: dlls/d3dx9_36/d3dx9_private.h:123 error: patch failed: dlls/d3dx9_36/surface.c:256 error: patch failed: dlls/d3dx9_36/texture.c:1379 error: patch failed: dlls/d3dx9_36/tests/surface.c:1403 Task: Patch failed to apply
=== debian10 (build log) ===
error: patch failed: dlls/d3dx9_36/d3dx9_private.h:123 error: patch failed: dlls/d3dx9_36/surface.c:256 error: patch failed: dlls/d3dx9_36/texture.c:1379 error: patch failed: dlls/d3dx9_36/tests/surface.c:1403 Task: Patch failed to apply
=== debian10 (build log) ===
error: patch failed: dlls/d3dx9_36/d3dx9_private.h:123 error: patch failed: dlls/d3dx9_36/surface.c:256 error: patch failed: dlls/d3dx9_36/texture.c:1379 error: patch failed: dlls/d3dx9_36/tests/surface.c:1403 Task: Patch failed to apply
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55160
Your paranoid android.
=== debian10 (build log) ===
error: patch failed: dlls/d3dx9_36/d3dx9_private.h:123 error: patch failed: dlls/d3dx9_36/surface.c:256 error: patch failed: dlls/d3dx9_36/texture.c:1379 Task: Patch failed to apply
=== debian10 (build log) ===
error: patch failed: dlls/d3dx9_36/d3dx9_private.h:123 error: patch failed: dlls/d3dx9_36/surface.c:256 error: patch failed: dlls/d3dx9_36/texture.c:1379 Task: Patch failed to apply
-
Marvin -
Matteo Bruni