March 2014 - Wine-Commits - list.winehq.org

Stefan Dösinger : d3d9: Make ResetEx and PresentEx hookable.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: 7f675174c8a25cc04ad09702dfb6a7d649d74576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f675174c8a25cc04ad09702d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 3 10:15:38 2014 +0100 d3d9: Make ResetEx and PresentEx hookable. --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 73ac97f..66bee95 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3066,7 +3066,7 @@ static HRESULT WINAPI d3d9_device_ComposeRects(IDirect3DDevice9Ex *iface, return E_NOTIMPL; } -static HRESULT WINAPI d3d9_device_PresentEx(IDirect3DDevice9Ex *iface, +static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_PresentEx(IDirect3DDevice9Ex *iface, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) { @@ -3185,7 +3185,7 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex return E_NOTIMPL; } -static HRESULT WINAPI d3d9_device_ResetEx(IDirect3DDevice9Ex *iface, +static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_ResetEx(IDirect3DDevice9Ex *iface, D3DPRESENT_PARAMETERS *present_parameters, D3DDISPLAYMODEEX *mode) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);

1 0

Matteo Bruni : d3dx9: Allow loading DDS volume textures into 2D textures.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: df3c573f63211f9bcafaed2d591f4c64dd9b59e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3c573f63211f9bcafaed2d5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 3 17:48:14 2014 +0100 d3dx9: Allow loading DDS volume textures into 2D textures. --- dlls/d3dx9_36/d3dx9_36_private.h | 3 ++- dlls/d3dx9_36/surface.c | 17 ++++++++++++--- dlls/d3dx9_36/tests/texture.c | 43 +++++++++++++++++++++++++++++++++++--- dlls/d3dx9_36/texture.c | 11 ++++++++-- 4 files changed, 65 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 0aef8cd..492b665 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -88,7 +88,8 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette) DECLSPEC_HIDDEN; HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const PALETTEENTRY *palette, - DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; + DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info, + unsigned int *loaded_miplevels) DECLSPEC_HIDDEN; HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const void *src_data, const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette, diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 5e87d94..97c71bf 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -539,7 +539,8 @@ HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *d } HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const PALETTEENTRY *palette, - DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) + DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info, + unsigned int *loaded_miplevels) { HRESULT hr; @@ -553,13 +554,21 @@ HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const struct dds_header *header = src_data; const BYTE *pixels = (BYTE *)(header + 1); - /* Loading a cube texture as a simple texture is also supported (only first face texture is taken) */ - if ((src_info->ResourceType != D3DRTYPE_TEXTURE) && (src_info->ResourceType != D3DRTYPE_CUBETEXTURE)) + /* Loading a cube texture as a simple texture is also supported + * (only first face texture is taken). Same with volume textures. */ + if ((src_info->ResourceType != D3DRTYPE_TEXTURE) + && (src_info->ResourceType != D3DRTYPE_CUBETEXTURE) + && (src_info->ResourceType != D3DRTYPE_VOLUMETEXTURE)) + { + WARN("Trying to load a %u resource as a 2D texture, returning failure.\n", src_info->ResourceType); return D3DXERR_INVALIDDATA; + } width = src_info->Width; height = src_info->Height; mip_levels = min(src_info->MipLevels, IDirect3DTexture9_GetLevelCount(texture)); + if (src_info->ResourceType == D3DRTYPE_VOLUMETEXTURE) + mip_levels = 1; for (mip_level = 0; mip_level < mip_levels; mip_level++) { hr = calculate_dds_surface_size(src_info->Format, width, height, &src_pitch, &mip_level_size); @@ -578,6 +587,8 @@ HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, height = max(1, height / 2); } + *loaded_miplevels = mip_levels; + return D3D_OK; } diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 4a93ac6..a2fc551 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -25,7 +25,7 @@ #include "d3dx9tex.h" #include "resources.h" -static int has_2d_dxt5, has_cube_dxt5; +static int has_2d_dxt3, has_2d_dxt5, has_cube_dxt5; /* 2x2 16-bit dds, no mipmaps */ static const unsigned char dds_16bit[] = { @@ -1433,6 +1433,7 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) D3DSURFACE_DESC desc; D3DLOCKED_RECT lock_rect; int i; + DWORD level_count; hr = D3DXCreateTextureFromFileInMemory(device, dds_16bit, sizeof(dds_16bit), &texture); ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); @@ -1464,12 +1465,46 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) { for (i = 0; i < 16; i++) - ok(((BYTE*)lock_rect.pBits)[i] == dds_cube_map[128+i], "Byte at index %u is 0x%02x, expected 0x%02x\n", i, ((BYTE*)lock_rect.pBits)[i], dds_cube_map[144+i]); + ok(((BYTE *)lock_rect.pBits)[i] == dds_cube_map[128 + i], + "Byte at index %u is 0x%02x, expected 0x%02x.\n", + i, ((BYTE *)lock_rect.pBits)[i], dds_cube_map[128 + i]); IDirect3DTexture9_UnlockRect(texture, 0); } IDirect3DTexture9_Release(texture); } + + /* Volume textures work too. */ + hr = D3DXCreateTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), &texture); + if (has_2d_dxt3) + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x.\n", hr, D3D_OK); + else + todo_wine ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x.\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + type = IDirect3DTexture9_GetType(texture); + ok(type == D3DRTYPE_TEXTURE, "IDirect3DTexture9_GetType returned %u, expected %u.\n", type, D3DRTYPE_TEXTURE); + level_count = IDirect3DBaseTexture9_GetLevelCount((IDirect3DBaseTexture9 *)texture); + todo_wine ok(level_count == 3, "Texture has %u mip levels, 3 expected.\n", level_count); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "IDirect3DTexture9_GetLevelDesc returned %#x, expected %#x.\n", hr, D3D_OK); + ok(desc.Width == 4, "Width is %u, expected 4.\n", desc.Width); + ok(desc.Height == 4, "Height is %u, expected 4.\n", desc.Height); + + hr = IDirect3DTexture9_LockRect(texture, 0, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "IDirect3DTexture9_LockRect returned %#x, expected %#x.\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + for (i = 0; i < 16; ++i) + ok(((BYTE *)lock_rect.pBits)[i] == dds_volume_map[128 + i], + "Byte at index %u is 0x%02x, expected 0x%02x.\n", + i, ((BYTE *)lock_rect.pBits)[i], dds_volume_map[128 + i]); + IDirect3DTexture9_UnlockRect(texture, 0); + } + /* The lower texture levels are apparently generated by filtering the level 0 surface + * I.e. following levels from the file are ignored. */ + IDirect3DTexture9_Release(texture); + } } static void test_D3DXCreateTextureFromFileInMemoryEx(IDirect3DDevice9 *device) @@ -1821,7 +1856,9 @@ START_TEST(texture) return; } - /* Check whether DXT5 textures are supported */ + /* Check whether DXTn textures are supported. */ + has_2d_dxt3 = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_DXT3)); hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_DXT5); has_2d_dxt5 = SUCCEEDED(hr); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index be86347..f5f754d 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -602,6 +602,12 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi FIXME("Generation of mipmaps for compressed pixel formats is not implemented yet\n"); miplevels = imginfo.MipLevels; } + if (imginfo.ResourceType == D3DRTYPE_VOLUMETEXTURE + && D3DFMT_DXT1 <= imginfo.Format && imginfo.Format <= D3DFMT_DXT5 && miplevels > 1) + { + FIXME("Generation of mipmaps for compressed pixel formats is not implemented yet.\n"); + miplevels = 1; + } if (((file_width) && (width != imginfo.Width)) || ((file_height) && (height != imginfo.Height)) || @@ -640,10 +646,12 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi IDirect3DTexture9_GetSurfaceLevel(*texptr, 0, &surface); hr = D3DXLoadSurfaceFromFileInMemory(surface, palette, NULL, srcdata, srcdatasize, NULL, filter, colorkey, NULL); IDirect3DSurface9_Release(surface); + loaded_miplevels = min(IDirect3DTexture9_GetLevelCount(*texptr), imginfo.MipLevels); } else { - hr = load_texture_from_dds(*texptr, srcdata, palette, filter, colorkey, &imginfo); + hr = load_texture_from_dds(*texptr, srcdata, palette, filter, colorkey, &imginfo, + &loaded_miplevels); } if (FAILED(hr)) @@ -654,7 +662,6 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi return hr; } - loaded_miplevels = min(IDirect3DTexture9_GetLevelCount(*texptr), imginfo.MipLevels); hr = D3DXFilterTexture((IDirect3DBaseTexture9*) *texptr, palette, loaded_miplevels - 1, mipfilter); if (FAILED(hr)) {

1 0

Matteo Bruni : d3dx9/tests: Replace a test giving inconsistent results on Windows.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: e32672f2d7d7969cf4f4f4239b0daea265b5c9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e32672f2d7d7969cf4f4f4239… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 3 17:48:15 2014 +0100 d3dx9/tests: Replace a test giving inconsistent results on Windows. --- dlls/d3dx9_36/tests/mesh.c | 54 +++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 3fd5d9d..24bcb82 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -6449,11 +6449,6 @@ static void test_weld_vertices(void) D3DXVECTOR3 position; SHORT normal[4]; }; - struct vertex_color_float4 - { - D3DXVECTOR3 position; - D3DXVECTOR4 color; - }; struct vertex_texcoord_float16_2 { D3DXVECTOR3 position; @@ -6481,7 +6476,6 @@ static void test_weld_vertices(void) UINT vertex_size_color_ubyte4 = sizeof(struct vertex_color_ubyte4); UINT vertex_size_texcoord_short2 = sizeof(struct vertex_texcoord_short2); UINT vertex_size_normal_short4 = sizeof(struct vertex_normal_short4); - UINT vertex_size_color_float4 = sizeof(struct vertex_color_float4); UINT vertex_size_texcoord_float16_2 = sizeof(struct vertex_texcoord_float16_2); UINT vertex_size_texcoord_float16_4 = sizeof(struct vertex_texcoord_float16_4); UINT vertex_size_normal_udec3 = sizeof(struct vertex_normal_udec3); @@ -6576,10 +6570,10 @@ static void test_weld_vertices(void) {0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 2}, D3DDECL_END() }; - D3DVERTEXELEMENT9 declaration_color2_float4[] = + D3DVERTEXELEMENT9 declaration_color1[] = { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - {0, 12, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 2}, + {0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 1}, D3DDECL_END() }; D3DVERTEXELEMENT9 declaration_texcoord_float16_2[] = @@ -7443,34 +7437,38 @@ static void test_weld_vertices(void) const DWORD exp_face_remap26[] = {0, 1}; const DWORD exp_vertex_remap26[] = {0, 1, 2, 3, 4, 5}; const DWORD exp_new_num_vertices26 = ARRAY_SIZE(exp_vertices26); - /* Test 27. Weld color with usage index larger than 1. Check that the - * default epsilon of 1e-6f is used. */ - D3DXVECTOR4 zero_float4 = {0.0f, 0.0f, 0.0f, 0.0f}; - D3DXVECTOR4 almost_zero_float4 = {0.0f + FLT_EPSILON, 0.0f + FLT_EPSILON, 0.0f + FLT_EPSILON, 0.0f + FLT_EPSILON}; - const struct vertex_color_float4 vertices27[] = + /* Test 27. Weld color with usage index 1 (specular). */ + /* Previously this test used float color values and index > 1 but that case + * appears to be effectively unhandled in native so the test gave + * inconsistent results. */ + const struct vertex_color vertices27[] = { - {{ 0.0f, 3.0f, 0.f}, zero_float4}, - {{ 2.0f, 3.0f, 0.f}, zero_float4}, - {{ 0.0f, 0.0f, 0.f}, zero_float4}, + {{ 0.0f, 3.0f, 0.0f}, 0x00000000}, + {{ 2.0f, 3.0f, 0.0f}, 0x10203040}, + {{ 0.0f, 0.0f, 0.0f}, 0x50607080}, - {{ 3.0f, 3.0f, 0.f}, almost_zero_float4}, - {{ 3.0f, 0.0f, 0.f}, zero_float4}, - {{ 1.0f, 0.0f, 0.f}, almost_zero_float4}, + {{ 3.0f, 3.0f, 0.0f}, 0x11213141}, + {{ 3.0f, 0.0f, 0.0f}, 0xffffffff}, + {{ 1.0f, 0.0f, 0.0f}, 0x51617181}, }; const DWORD indices27[] = {0, 1, 2, 3, 4, 5}; const DWORD attributes27[] = {0, 0}; const UINT num_vertices27 = ARRAY_SIZE(vertices27); const UINT num_faces27 = ARRAY_SIZE(indices27) / VERTS_PER_FACE; DWORD flags27 = D3DXWELDEPSILONS_WELDPARTIALMATCHES; - const D3DXWELDEPSILONS epsilons27 = {1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, 0.0f, 0.0f, 0.0f}; + const D3DXWELDEPSILONS epsilons27 = + { + 1.1f, 0.0f, 0.0f, 0.0f, 2.0f / 255.0f, 0.0f, + {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, 0.0f, 0.0f, 0.0f + }; const DWORD adjacency27[] = {-1, 1, -1, -1, -1, 0}; - const struct vertex_color_float4 exp_vertices27[] = + const struct vertex_color exp_vertices27[] = { - {{ 0.0f, 3.0f, 0.f}, zero_float4}, - {{ 2.0f, 3.0f, 0.f}, zero_float4}, - {{ 0.0f, 0.0f, 0.f}, zero_float4}, + {{ 0.0f, 3.0f, 0.0f}, 0x00000000}, + {{ 2.0f, 3.0f, 0.0f}, 0x10203040}, + {{ 0.0f, 0.0f, 0.0f}, 0x50607080}, - {{ 3.0f, 0.0f, 0.f}, zero_float4}, + {{ 3.0f, 0.0f, 0.0f}, 0xffffffff}, }; const DWORD exp_indices27[] = {0, 1, 2, 1, 3, 2}; const DWORD exp_face_remap27[] = {0, 1}; @@ -8064,8 +8062,8 @@ static void test_weld_vertices(void) num_vertices27, num_faces27, options, - declaration_color2_float4, - vertex_size_color_float4, + declaration_color1, + vertex_size_color, flags27, &epsilons27, adjacency27, @@ -8144,7 +8142,7 @@ static void test_weld_vertices(void) goto cleanup; } face_remap = HeapAlloc(GetProcessHeap(), 0, tc[i].num_faces * sizeof(*face_remap)); - if (!adjacency_out) + if (!face_remap) { skip("Couldn't allocate face_remap array.\n"); goto cleanup;

1 0

Stefan Dösinger : user32: Make SetWindowTextA/ W hookable.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: ece57889d6de006ffaa24569dac6fe0090182d41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece57889d6de006ffaa24569d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 3 10:15:37 2014 +0100 user32: Make SetWindowTextA/W hookable. --- dlls/user32/win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 29f2365..9e30321 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2739,7 +2739,7 @@ INT WINAPI GetWindowTextW( HWND hwnd, LPWSTR lpString, INT nMaxCount ) * SetWindowTextA (USER32.@) * SetWindowText (USER32.@) */ -BOOL WINAPI SetWindowTextA( HWND hwnd, LPCSTR lpString ) +BOOL WINAPI DECLSPEC_HOTPATCH SetWindowTextA( HWND hwnd, LPCSTR lpString ) { if (is_broadcast(hwnd)) { @@ -2756,7 +2756,7 @@ BOOL WINAPI SetWindowTextA( HWND hwnd, LPCSTR lpString ) /******************************************************************* * SetWindowTextW (USER32.@) */ -BOOL WINAPI SetWindowTextW( HWND hwnd, LPCWSTR lpString ) +BOOL WINAPI DECLSPEC_HOTPATCH SetWindowTextW( HWND hwnd, LPCWSTR lpString ) { if (is_broadcast(hwnd)) {

1 0

Stefan Dösinger : wined3d: surface_load_ds_location can handle WINED3D_LOCATION_DISCARDED.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: dfbff712f414e5ff8903802e56f379e63be081e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfbff712f414e5ff8903802e5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 3 10:15:35 2014 +0100 wined3d: surface_load_ds_location can handle WINED3D_LOCATION_DISCARDED. --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6af6158..7c5f053 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5123,7 +5123,8 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { - if (location == WINED3D_LOCATION_TEXTURE_RGB && surface->locations & WINED3D_LOCATION_DRAWABLE) + if (location == WINED3D_LOCATION_TEXTURE_RGB + && surface->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_DISCARDED)) { struct wined3d_context *context = context_acquire(device, NULL); surface_load_ds_location(surface, context, location);

1 0

Gediminas Jakutis : d3dx9/tests: Add a mesh test for D3DXCreateBox().
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: 6749bdf66bd83f6e5680d0bc17b6f60468932711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6749bdf66bd83f6e5680d0bc1… Author: Gediminas Jakutis <gediminas(a)varciai.lt> Date: Thu Feb 27 21:03:03 2014 +0200 d3dx9/tests: Add a mesh test for D3DXCreateBox(). --- dlls/d3dx9_36/tests/mesh.c | 81 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index d32f159..3fd5d9d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2424,6 +2424,85 @@ cleanup: if (wnd) DestroyWindow(wnd); } +static BOOL compute_box(struct mesh *mesh, float width, float height, float depth) +{ + unsigned int i, face; + static const D3DXVECTOR3 unit_box[] = + { + {-1.0f, -1.0f, -1.0f}, {-1.0f, -1.0f, 1.0f}, {-1.0f, 1.0f, 1.0f}, {-1.0f, 1.0f, -1.0f}, + {-1.0f, 1.0f, -1.0f}, {-1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, -1.0f}, + { 1.0f, 1.0f, -1.0f}, { 1.0f, 1.0f, 1.0f}, { 1.0f, -1.0f, 1.0f}, { 1.0f, -1.0f, -1.0f}, + {-1.0f, -1.0f, 1.0f}, {-1.0f, -1.0f, -1.0f}, { 1.0f, -1.0f, -1.0f}, { 1.0f, -1.0f, 1.0f}, + {-1.0f, -1.0f, 1.0f}, { 1.0f, -1.0f, 1.0f}, { 1.0f, 1.0f, 1.0f}, {-1.0f, 1.0f, 1.0f}, + {-1.0f, -1.0f, -1.0f}, {-1.0f, 1.0f, -1.0f}, { 1.0f, 1.0f, -1.0f}, { 1.0f, -1.0f, -1.0f} + }; + static const D3DXVECTOR3 normals[] = + { + {-1.0f, 0.0f, 0.0f}, { 0.0f, 1.0f, 0.0f}, { 1.0f, 0.0f, 0.0f}, + { 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 1.0f}, { 0.0f, 0.0f, -1.0f} + }; + + if (!new_mesh(mesh, 24, 12)) + { + return FALSE; + } + + width /= 2.0f; + height /= 2.0f; + depth /= 2.0f; + + for (i = 0; i < 24; i++) + { + mesh->vertices[i].position.x = width * unit_box[i].x; + mesh->vertices[i].position.y = height * unit_box[i].y; + mesh->vertices[i].position.z = depth * unit_box[i].z; + mesh->vertices[i].normal.x = normals[i / 4].x; + mesh->vertices[i].normal.y = normals[i / 4].y; + mesh->vertices[i].normal.z = normals[i / 4].z; + } + + face = 0; + for (i = 0; i < 12; i++) + { + mesh->faces[i][0] = face++; + mesh->faces[i][1] = face++; + mesh->faces[i][2] = (i % 2) ? face - 4 : face; + } + + return TRUE; +} + +static void test_box(IDirect3DDevice9 *device, float width, float height, float depth) +{ + HRESULT hr; + ID3DXMesh *box; + struct mesh mesh; + char name[256]; + + hr = D3DXCreateBox(device, width, height, depth, &box, NULL); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + if (hr != D3D_OK) + { + skip("Couldn't create box\n"); + return; + } + + if (!compute_box(&mesh, width, height, depth)) + { + skip("Couldn't create mesh\n"); + box->lpVtbl->Release(box); + return; + } + + mesh.fvf = D3DFVF_XYZ | D3DFVF_NORMAL; + + sprintf(name, "box (%g, %g, %g)", width, height, depth); + compare_mesh(name, box, &mesh); + + free_mesh(&mesh); + + box->lpVtbl->Release(box); +} static void D3DXCreateBoxTest(void) { HRESULT hr; @@ -2512,6 +2591,8 @@ static void D3DXCreateBoxTest(void) box->lpVtbl->Release(box); + test_box(device, 10.9f, 20.0f, 4.9f); + end: IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d);

1 0

Jacek Caban : secur32/tests: Fixed tests with new winehq.org setup.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: 29a409b222d865c16cc7d21c3af63396137e82a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a409b222d865c16cc7d21c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 3 13:55:11 2014 +0100 secur32/tests: Fixed tests with new winehq.org setup. --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 8cfa4f8..fa61f4a 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -518,7 +518,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

1 0

Jacek Caban : qcap: Added AVICompressorIn_Disconnect implementation.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: 955ce003aec2ac6f1bcdc3cef5b5c08484fac9cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=955ce003aec2ac6f1bcdc3cef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 3 15:43:19 2014 +0100 qcap: Added AVICompressorIn_Disconnect implementation. --- dlls/qcap/avico.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index aedcf27..caef183 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -416,8 +416,17 @@ static HRESULT WINAPI AVICompressorIn_ReceiveConnection(IPin *iface, static HRESULT WINAPI AVICompressorIn_Disconnect(IPin *iface) { AVICompressor *This = impl_from_IPin(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)\n", This); + + hres = BasePinImpl_Disconnect(iface); + if(FAILED(hres)) + return hres; + + heap_free(This->videoinfo); + This->videoinfo = NULL; + return S_OK; } static const IPinVtbl AVICompressorInputPinVtbl = {

1 0

Grazvydas Ignotas : winegcc: Define __stdcall and similar attributes to nothing on ARM.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: f5e28fff8ea36b553cc30fe54887ace873e64e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e28fff8ea36b553cc30fe54… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sun Mar 2 04:13:54 2014 +0200 winegcc: Define __stdcall and similar attributes to nothing on ARM. --- tools/winegcc/winegcc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 8afe5af..e051d61 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -564,6 +564,16 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-D_stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D_cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); } + else if (opts->target_cpu == CPU_ARM || opts->target_cpu == CPU_ARM64) + { + strarray_add(comp_args, "-D__stdcall="); + strarray_add(comp_args, "-D__cdecl="); + strarray_add(comp_args, "-D_stdcall="); + strarray_add(comp_args, "-D_cdecl="); + strarray_add(comp_args, "-D__fastcall="); + strarray_add(comp_args, "-D_fastcall="); + fastcall_done = 1; + } else { strarray_add(comp_args, "-D__stdcall=__attribute__((__stdcall__))");

1 0

Nikolay Sivov : msxml3: Support VT_BSTR|VT_BYREF as reader input.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: 2b4f20b8c3b6c98a2c3f2452d6498f94a47b7839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4f20b8c3b6c98a2c3f2452d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 3 08:54:52 2014 +0400 msxml3: Support VT_BSTR|VT_BYREF as reader input. --- dlls/msxml3/saxreader.c | 7 +++++-- dlls/msxml3/tests/saxreader.c | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index baabdd4..ea2b15f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2472,9 +2472,12 @@ static HRESULT internal_parse( switch(V_VT(&varInput)) { case VT_BSTR: - hr = internal_parseBuffer(This, (const char*)V_BSTR(&varInput), - strlenW(V_BSTR(&varInput))*sizeof(WCHAR), vbInterface); + case VT_BSTR|VT_BYREF: + { + BSTR str = V_ISBYREF(&varInput) ? *V_BSTRREF(&varInput) : V_BSTR(&varInput); + hr = internal_parseBuffer(This, (const char*)str, strlenW(str)*sizeof(WCHAR), vbInterface); break; + } case VT_ARRAY|VT_UI1: { void *pSAData; LONG lBound, uBound; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 05f6b91..bb3ea2a 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2512,6 +2512,7 @@ static void test_saxreader_properties(void) ISAXXMLReader *reader; HRESULT hr; VARIANT v; + BSTR str; hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (void**)&reader); @@ -2659,6 +2660,13 @@ static void test_saxreader_properties(void) hr = ISAXXMLReader_parse(reader, v); EXPECT_HR(hr, S_OK); + /* VT_BSTR|VT_BYREF input type */ + str = _bstr_("<?xml version=\"1.0\"?><element></element>"); + V_VT(&v) = VT_BSTR|VT_BYREF; + V_BSTRREF(&v) = &str; + hr = ISAXXMLReader_parse(reader, v); + EXPECT_HR(hr, S_OK); + V_VT(&v) = VT_EMPTY; V_BSTR(&v) = (void*)0xdeadbeef; hr = ISAXXMLReader_getProperty(reader, _bstr_("xmldecl-version"), &v);

1 0