July 2012 - Wine-Commits - list.winehq.org

Rico Schüller : d3dx9/tests: Add effect parameter value GetMatrixPointerArray() test.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: a7f1d93f01bd8a314169b3a050adf1dd7983f9b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f1d93f01bd8a314169b3a05… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 9 22:12:00 2012 +0200 d3dx9/tests: Add effect parameter value GetMatrixPointerArray() test. --- dlls/d3dx9_36/tests/effect.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 7627649..960c7f2 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1414,6 +1414,83 @@ static void test_effect_parameter_value_GetMatrixArray(const struct test_effect_ } } +static void test_effect_parameter_value_GetMatrixPointerArray(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + HRESULT hr; + DWORD cmp = 0xabababab; + FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/sizeof(D3DXMATRIX)]; + UINT l, k, m, element; + + for (element = 0; element <= res_desc->Elements + 1; ++element) + { + memset(fvalue, 0xab, sizeof(fvalue)); + for (l = 0; l < element; ++l) + { + matrix_pointer_array[l] = (D3DXMATRIX *)&fvalue[l * sizeof(**matrix_pointer_array) / sizeof(FLOAT)]; + } + hr = effect->lpVtbl->GetMatrixPointerArray(effect, parameter, matrix_pointer_array, element); + if (!element) + { + ok(hr == D3D_OK, "%u - %s: GetMatrixPointerArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixPointerArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else if (element <= res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) + { + ok(hr == D3D_OK, "%u - %s: GetMatrixPointerArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (m = 0; m < element; ++m) + { + for (k = 0; k < 4; ++k) + { + for (l = 0; l < 4; ++l) + { + if (k < res_desc->Columns && l < res_desc->Rows) + { + ok(compare_float(fvalue[m * 16 + l * 4 + k], get_float(res_desc->Type, + &res_value[m * res_desc->Columns * res_desc->Rows + l * res_desc->Columns + k]), 512), + "%u - %s: GetMatrixPointerArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, m * 16 + l * 4 + k, fvalue[m * 16 + l * 4 + k], + get_float(res_desc->Type, &res_value[m * res_desc->Columns * res_desc->Rows + + l * res_desc->Columns + k])); + } + else + { + ok(fvalue[m * 16 + l * 4 + k] == 0.0f, "%u - %s: GetMatrixPointerArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, m * 16 + l * 4 + k, fvalue[m * 16 + l * 4 + k], 0.0f); + } + } + } + } + + for (l = element * 16; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixPointerArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixPointerArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + } +} + static void test_effect_parameter_value_GetMatrixTranspose(const struct test_effect_parameter_value_result *res, ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) { @@ -1568,6 +1645,7 @@ static void test_effect_parameter_value_GetTestGroup(const struct test_effect_pa test_effect_parameter_value_GetVectorArray(res, effect, res_value, parameter, i); test_effect_parameter_value_GetMatrix(res, effect, res_value, parameter, i); test_effect_parameter_value_GetMatrixArray(res, effect, res_value, parameter, i); + test_effect_parameter_value_GetMatrixPointerArray(res, effect, res_value, parameter, i); test_effect_parameter_value_GetMatrixTranspose(res, effect, res_value, parameter, i); test_effect_parameter_value_GetMatrixTransposeArray(res, effect, res_value, parameter, i); } @@ -1826,6 +1904,18 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixPointerArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->GetMatrixPointerArray(effect, NULL, NULL, 0); + ok(hr == D3D_OK, "%u - %s: GetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3D_OK); + + hr = effect->lpVtbl->GetMatrixPointerArray(effect, NULL, NULL, res_desc->Elements ? res_desc->Elements : 1); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + hr = effect->lpVtbl->GetMatrixPointerArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetMatrixTranspose(effect, NULL, (D3DXMATRIX *)input_value); ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTranspose failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL);

1 0

Henri Verbeet : wined3d: Get rid of the "lockable" parameter to device_parent_create_rendertarget().
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: 9b74ebd79404c867aadb723ffa2ab34b3bf741cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b74ebd79404c867aadb723ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 9 23:16:37 2012 +0200 wined3d: Get rid of the "lockable" parameter to device_parent_create_rendertarget(). --- dlls/d3d10core/device.c | 6 +++--- dlls/d3d8/device.c | 8 ++++---- dlls/d3d9/device.c | 8 ++++---- dlls/ddraw/ddraw.c | 12 ++++-------- dlls/wined3d/swapchain.c | 12 ++++-------- include/wine/wined3d.h | 2 +- 6 files changed, 20 insertions(+), 28 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 637109f..60849a3 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1400,7 +1400,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d10_device *device = device_from_wined3d_device_parent(device_parent); @@ -1409,9 +1409,9 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par HRESULT hr; FIXME("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p partial stub!\n", + "\tmultisample_quality %u, surface %p partial stub!\n", device_parent, container_parent, width, height, format, multisample_type, - multisample_quality, lockable, surface); + multisample_quality, surface); FIXME("Implement DXGI<->wined3d usage conversion\n"); diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c135012..31f0eb2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2856,7 +2856,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d8_device *device = device_from_device_parent(device_parent); @@ -2864,12 +2864,12 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p.\n", + "\tmultisample_quality %u, surface %p.\n", device_parent, container_parent, width, height, format, - multisample_type, multisample_quality, lockable, surface); + multisample_type, multisample_quality, surface); hr = IDirect3DDevice8_CreateRenderTarget(&device->IDirect3DDevice8_iface, width, height, - d3dformat_from_wined3dformat(format), multisample_type, lockable, (IDirect3DSurface8 **)&d3d_surface); + d3dformat_from_wined3dformat(format), multisample_type, TRUE, (IDirect3DSurface8 **)&d3d_surface); if (FAILED(hr)) { WARN("Failed to create rendertarget, hr %#x.\n", hr); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 04a073d..ef5aa46 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3210,7 +3210,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d9_device *device = device_from_device_parent(device_parent); @@ -3218,12 +3218,12 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p.\n", + "\tmultisample_quality %u, surface %p.\n", device_parent, container_parent, width, height, format, multisample_type, - multisample_quality, lockable, surface); + multisample_quality, surface); hr = d3d9_device_CreateRenderTarget(&device->IDirect3DDevice9Ex_iface, width, height, - d3dformat_from_wined3dformat(format), multisample_type, multisample_quality, lockable, + d3dformat_from_wined3dformat(format), multisample_type, multisample_quality, TRUE, (IDirect3DSurface9 **)&d3d_surface, NULL); if (FAILED(hr)) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d628629..d613d17 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5444,17 +5444,16 @@ static const struct wined3d_parent_ops ddraw_frontbuffer_parent_ops = static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - DWORD flags = 0; HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p.\n", + "\tmultisample_quality %u, surface %p.\n", device_parent, container_parent, width, height, format, multisample_type, - multisample_quality, lockable, surface); + multisample_quality, surface); if (ddraw->wined3d_frontbuffer) { @@ -5462,12 +5461,9 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par return E_FAIL; } - if (lockable) - flags |= WINED3D_SURFACE_MAPPABLE; - hr = wined3d_surface_create(ddraw->wined3d_device, width, height, format, 0, WINED3DUSAGE_RENDERTARGET, WINED3D_POOL_DEFAULT, multisample_type, multisample_quality, - DefaultSurfaceType, flags, ddraw, &ddraw_frontbuffer_parent_ops, surface); + DefaultSurfaceType, WINED3D_SURFACE_MAPPABLE, ddraw, &ddraw_frontbuffer_parent_ops, surface); if (SUCCEEDED(hr)) ddraw->wined3d_frontbuffer = *surface; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8c69fad..4aeabfb 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -943,12 +943,10 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ swapchain_update_render_to_fbo(swapchain); TRACE("Creating front buffer.\n"); - hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, + if (FAILED(hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, swapchain->desc.backbuffer_format, swapchain->desc.multisample_type, - swapchain->desc.multisample_quality, TRUE /* Lockable */, - &swapchain->front_buffer); - if (FAILED(hr)) + swapchain->desc.multisample_quality, &swapchain->front_buffer))) { WARN("Failed to create front buffer, hr %#x.\n", hr); goto err; @@ -1053,12 +1051,10 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { TRACE("Creating back buffer %u.\n", i); - hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, + if (FAILED(hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, swapchain->desc.backbuffer_format, swapchain->desc.multisample_type, - swapchain->desc.multisample_quality, TRUE /* Lockable */, - &swapchain->back_buffers[i]); - if (FAILED(hr)) + swapchain->desc.multisample_quality, &swapchain->back_buffers[i]))) { WARN("Failed to create back buffer %u, hr %#x.\n", i, hr); goto err; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4576937..6709d28 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2002,7 +2002,7 @@ struct wined3d_device_parent_ops UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface); HRESULT (__cdecl *create_rendertarget)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, - DWORD multisample_quality, BOOL lockable, struct wined3d_surface **surface); + DWORD multisample_quality, struct wined3d_surface **surface); HRESULT (__cdecl *create_depth_stencil)(struct wined3d_device_parent *device_parent, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface);

1 0

Matteo Bruni : d3dcompiler: Initialize and fix compilation messages generation.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: 110249d6645cde5bef02c4c4b84d294fd949cd06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=110249d6645cde5bef02c4c4b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 10 15:39:45 2012 +0200 d3dcompiler: Initialize and fix compilation messages generation. --- dlls/d3dcompiler_43/hlsl.y | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 183f436..b4c9b25 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -926,6 +926,8 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino struct hlsl_type *hlsl_type, *next_type; struct hlsl_ir_var *var, *next_var; + hlsl_ctx.status = PARSE_SUCCESS; + hlsl_ctx.messages.size = hlsl_ctx.messages.capacity = 0; hlsl_ctx.line_no = 1; hlsl_ctx.source_file = d3dcompiler_strdup(""); hlsl_ctx.cur_scope = NULL; @@ -951,6 +953,20 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino } } + TRACE("Compilation status = %d\n", hlsl_ctx.status); + if (messages) + { + if (hlsl_ctx.messages.size) + *messages = hlsl_ctx.messages.string; + else + *messages = NULL; + } + else + { + if (hlsl_ctx.messages.capacity) + d3dcompiler_free(hlsl_ctx.messages.string); + } + d3dcompiler_free(hlsl_ctx.source_file); TRACE("Freeing functions IR.\n"); LIST_FOR_EACH_ENTRY(function, &hlsl_ctx.functions, struct hlsl_ir_function_decl, node.entry)

1 0

Rico Schüller : d3dx9/tests: Fix array increment in SetMatrix*PointerArray() test.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: e0d5c35054a55721b186f12be9b5e989f14a7a38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d5c35054a55721b186f12be… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 9 22:12:30 2012 +0200 d3dx9/tests: Fix array increment in SetMatrix*PointerArray() test. --- dlls/d3dx9_36/tests/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 712cf8c..d416213 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2352,7 +2352,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); for (l = 0; l < element; ++l) { - matrix_pointer_array[l] = (D3DXMATRIX *)&input_value[l * sizeof(**matrix_pointer_array) / sizeof(*matrix_pointer_array)]; + matrix_pointer_array[l] = (D3DXMATRIX *)&input_value[l * sizeof(**matrix_pointer_array) / sizeof(FLOAT)]; } hr = effect->lpVtbl->SetMatrixPointerArray(effect, parameter, matrix_pointer_array, element); if (res_desc->Class == D3DXPC_MATRIX_ROWS && res_desc->Elements >= element) @@ -2462,7 +2462,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); for (l = 0; l < element; ++l) { - matrix_pointer_array[l] = (D3DXMATRIX *)&input_value[l * sizeof(**matrix_pointer_array) / sizeof(*matrix_pointer_array)]; + matrix_pointer_array[l] = (D3DXMATRIX *)&input_value[l * sizeof(**matrix_pointer_array) / sizeof(FLOAT)]; } hr = effect->lpVtbl->SetMatrixTransposePointerArray(effect, parameter, matrix_pointer_array, element); if (res_desc->Class == D3DXPC_MATRIX_ROWS && res_desc->Elements >= element)

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetMatrixTransposePointerArray() test.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: 617a2ccee60ad391ef0f00826a5c314e95a58c0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=617a2ccee60ad391ef0f00826… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 9 22:12:15 2012 +0200 d3dx9/tests: Add effect parameter value GetMatrixTransposePointerArray() test. --- dlls/d3dx9_36/tests/effect.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 960c7f2..712cf8c 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1631,6 +1631,83 @@ static void test_effect_parameter_value_GetMatrixTransposeArray(const struct tes } } +static void test_effect_parameter_value_GetMatrixTransposePointerArray(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + HRESULT hr; + DWORD cmp = 0xabababab; + FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/sizeof(D3DXMATRIX)]; + UINT l, k, m, element; + + for (element = 0; element <= res_desc->Elements + 1; ++element) + { + memset(fvalue, 0xab, sizeof(fvalue)); + for (l = 0; l < element; ++l) + { + matrix_pointer_array[l] = (D3DXMATRIX *)&fvalue[l * sizeof(**matrix_pointer_array) / sizeof(FLOAT)]; + } + hr = effect->lpVtbl->GetMatrixTransposePointerArray(effect, parameter, matrix_pointer_array, element); + if (!element) + { + ok(hr == D3D_OK, "%u - %s: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixTransposePointerArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else if (element <= res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) + { + ok(hr == D3D_OK, "%u - %s: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (m = 0; m < element; ++m) + { + for (k = 0; k < 4; ++k) + { + for (l = 0; l < 4; ++l) + { + if (k < res_desc->Columns && l < res_desc->Rows) + { + ok(compare_float(fvalue[m * 16 + l + k * 4], get_float(res_desc->Type, + &res_value[m * res_desc->Columns * res_desc->Rows + l * res_desc->Columns + k]), 512), + "%u - %s: GetMatrixTransposePointerArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, m * 16 + l + k * 4, fvalue[m * 16 + l + k * 4], + get_float(res_desc->Type, &res_value[m * res_desc->Columns * res_desc->Rows + + l * res_desc->Columns + k])); + } + else + { + ok(fvalue[m * 16 + l + k * 4] == 0.0f, "%u - %s: GetMatrixTransposePointerArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, m * 16 + l + k * 4, fvalue[m * 16 + l + k * 4], 0.0f); + } + } + } + } + + for (l = element * 16; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixTransposePointerArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixTransposePointerArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + } +} + static void test_effect_parameter_value_GetTestGroup(const struct test_effect_parameter_value_result *res, ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) { @@ -1648,6 +1725,7 @@ static void test_effect_parameter_value_GetTestGroup(const struct test_effect_pa test_effect_parameter_value_GetMatrixPointerArray(res, effect, res_value, parameter, i); test_effect_parameter_value_GetMatrixTranspose(res, effect, res_value, parameter, i); test_effect_parameter_value_GetMatrixTransposeArray(res, effect, res_value, parameter, i); + test_effect_parameter_value_GetMatrixTransposePointerArray(res, effect, res_value, parameter, i); } static void test_effect_parameter_value_ResetValue(const struct test_effect_parameter_value_result *res, @@ -1948,6 +2026,18 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTransposePointerArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->GetMatrixTransposePointerArray(effect, NULL, NULL, 0); + ok(hr == D3D_OK, "%u - %s: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3D_OK); + + hr = effect->lpVtbl->GetMatrixTransposePointerArray(effect, NULL, NULL, res_desc->Elements ? res_desc->Elements : 1); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + hr = effect->lpVtbl->GetMatrixTransposePointerArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetValue(effect, NULL, input_value, res_desc->Bytes); ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetValue failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL);

1 0

Henri Verbeet : wined3d: Print a more obvious message if a format doesn' t have a corresponding GL internal format.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: 2907913fad3118800b675a8b52ae9dcaea191fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2907913fad3118800b675a8b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 9 23:16:39 2012 +0200 wined3d: Print a more obvious message if a format doesn't have a corresponding GL internal format. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 95a5072..2d37cdf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2661,6 +2661,9 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru internal = format->glInternal; } + if (!internal) + FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); + if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) { height *= format->height_scale.numerator;

1 0

Lucas Zawacki : Portuguese translation for 1.5.8 release
by Jeremy Newman July 10, 2012

July 10, 2012

Module: website Branch: master Commit: d4d3b2a47348225ef0db53775892de1c5b8a2df5 URL: http://source.winehq.org/git/website.git/?a=commit;h=d4d3b2a47348225ef0db53… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Jul 9 13:53:16 2012 -0300 Portuguese translation for 1.5.8 release --- news/pt/2012070301.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pt/2012070301.xml b/news/pt/2012070301.xml new file mode 100644 index 0000000..69dd6a6 --- /dev/null +++ b/news/pt/2012070301.xml @@ -0,0 +1,18 @@ +<news> +<date>3 de Julho de 2012</date> +<title>Wine 1.5.8 lançado</title> +<body> + A versão de desenvolvmento 1.5.8 já está disponível. + <a href="{$root}/announce/1.5.8">Novidades</a> desta versão: +<ul> + <li>Mais funcionalidades de stream no runtime C++.</li> + <li>Uma série de melhorias dos Windows Codecs.</li> + <li>Mais classes e propriedades WBEM.</li> + <li>Algumas correções no HTML Help.</li> + <li>Suporte a impressão de fontes com falso itálico.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.8.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads.</a>. +</body></news> +

1 0

Jeremy Newman : forums and mailing list are seperate. misc html cleanup
by Jeremy Newman July 10, 2012

July 10, 2012

Module: website Branch: master Commit: 6f63d9ca396655fb060dc958f76c4643624e8e83 URL: http://source.winehq.org/git/website.git/?a=commit;h=6f63d9ca396655fb060dc9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 10 09:15:41 2012 -0500 forums and mailing list are seperate. misc html cleanup --- templates/en/forums.template | 48 +++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 21 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index 6ce73ec..6b00e99 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -7,24 +7,23 @@ Here are the most useful ones for users: <ul> - <li>The <a href="http://www.winehq.org/mailman/listinfo/wine-users">Wine-Users Mailing List</a> (and <a href="http://www.winehq.org/pipermail/wine-users/">web archive</a>) - best place for Wine user support</li> + <li>The <a href="http://forum.winehq.org">WineHQ Forums</a></li> - <li>The <a href="http://forum.winehq.org">WineHQ Forums</a> - for those of you that prefer a forum interface over mailing lists. The mailing lists and forum are interlinked. Messages sent to one automatically propagate to the other.</li> + <li>The <a href="http://www.winehq.org/mailman/listinfo/wine-users">Wine-Users Mailing List</a> (and <a href="http://www.winehq.org/pipermail/wine-users/">web archive</a>)</li> <li>Ubuntu users may also want to visit the <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Wine area at Ubuntu Forums</a> <li>Users might also want to visit the <a href="http://www.linuxforums.org/forum/wine/">Wine area at Linux Forums</a> <li>If you want to be notified about new releases, subscribe to the <a href="http://www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce mailing list</a></li> - </ul> -Please don't create another English language Wine forum (except perhaps -a Wine area in a popular distro's main forum). - -If you know of another active Wine forum - especially a non-English one -- please let us know so we can add it to the list. -(Email to dank(a)kegel.com would do.) +Please don't create another English language Wine forum (except perhaps +a Wine area in a popular distro's main forum). + +If you know of another active Wine forum - especially a non-English one +- please let us know so we can add it to the list. +(Email to dank(a)kegel.com would do.) <h2>All WineHQ Mailing Lists</h2> @@ -40,7 +39,7 @@ or just use <a href="http://www.winehq.org/mailman/listinfo">the Mailman web int to them, otherwise your posting will be treated as possible spam by the mailing list software. -<ul> +<ul class="roomy"> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-announce">(Un-)Subscribe</a>] [<a href="http://www.winehq.org/pipermail/wine-announce/">Archive 1</a>] @@ -48,16 +47,17 @@ mailing list software. [<a href="news://news.gmane.org/gmane.comp.emulators.wine.announce">via newsreader</a>] <a href="mailto:wine-announce(a)winehq.org">wine-announce(a)winehq.org</a> A low traffic (2/month) read-only list for announcing releases - and other major Wine or WineHQ news. + and other major Wine or WineHQ news. + </li> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-users">(Un-)Subscribe</a>] [<a href="http://www.winehq.org/pipermail/wine-users/">Archive 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.user">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.user">via newsreader</a>] - [<a href="http://forum.winehq.org">via web forums</a>] <a href="mailto:wine-users(a)winehq.org">wine-users(a)winehq.org</a> - A medium traffic (50/day) open list for end-user discussions. + A medium traffic (50/day) open list for end-user discussions. + </li> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-devel">(Un-)Subscribe</a>] @@ -66,7 +66,8 @@ mailing list software. [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via newsreader</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> A medium traffic (25/day) open list for discussing Wine development, - WineHQ, patches or anything else of interest to Wine developers. + WineHQ, patches or anything else of interest to Wine developers. + </li> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-patches">(Un-)Subscribe</a>] @@ -74,7 +75,8 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - A medium traffic (45/day) open list for submitting patches only. + A medium traffic (45/day) open list for submitting patches only. + </li> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-cvs">(Un-)Subscribe</a>] @@ -83,21 +85,24 @@ mailing list software. [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> A medium traffic (35/day) read only list which tracks commits to the Git - tree. + tree. + </li> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-releases">(Un-)Subscribe</a>] [<a href="http://www.winehq.org/pipermail/wine-releases/">Archive 1</a>] <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> A low traffic (2/month) read only list for receiving a large diff file - at every Wine official release. + at every Wine official release. + </li> <li> [<a href="http://news.gmane.org/gmane.comp.emulators.wine.license">Archive 1</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.license">via newsreader</a>] Closed list that was for discussing legal issues - related to Wine, including license issues. (Closed 2004-12-16) + related to Wine, including license issues. (Closed 2004-12-16) + </li> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-bugs">(Un-)Subscribe</a>] @@ -106,13 +111,14 @@ mailing list software. [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> A high traffic (150/day) read-only list for monitoring activity on the - <a href="http://bugs.winehq.org/">Bug Tracking Database</a>. + <a href="http://bugs.winehq.org/">Bug Tracking Database</a>. + </li> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-tests-results">(Un-)Subscribe</a>] [<a href="http://www.winehq.org/pipermail/wine-tests-results/">Archive</a>] <a href="mailto:wine-tests-results(a)winehq.org">wine-tests-results(a)winehq.org</a> A medium traffic (10/day) open list for submitting test results. -</ul> + </li> -  +</ul>

1 0

Jeremy Newman : add a roomy list define
by Jeremy Newman July 10, 2012

July 10, 2012

Module: website Branch: master Commit: a48ce0e5c39da482a9a371032e30100f4b1013b1 URL: http://source.winehq.org/git/website.git/?a=commit;h=a48ce0e5c39da482a9a371… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 10 09:14:50 2012 -0500 add a roomy list define --- styles.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/styles.css b/styles.css index cc61d3e..da0d476 100644 --- a/styles.css +++ b/styles.css @@ -188,6 +188,7 @@ DIV.newsblock { margin: 0 5px 25px 10px; padding: 0; } /* stuff */ img { border: 0; } +UL.roomy LI { padding-bottom: 10px; } /* Link Colors */ A { color: #A50D0D; }

1 0

Jacek Caban : ieframe: Added init_test helper.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: c3e4a901c08fa5a8066cd3fa762d295f82203239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e4a901c08fa5a8066cd3fa7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 9 17:46:23 2012 +0200 ieframe: Added init_test helper. --- dlls/ieframe/tests/webbrowser.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 6711c77..7faf25a 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3304,6 +3304,18 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) IOleObject_Release(oo); } +#define TEST_DOWNLOAD 0x0001 +#define TEST_NOOLECMD 0x0002 +#define TEST_NODOCHOST 0x0004 + +static void init_test(DWORD flags) +{ + is_downloading = (flags & TEST_DOWNLOAD) != 0; + is_first_load = TRUE; + use_container_olecmd = !(flags & TEST_NOOLECMD); + use_container_dochostui = !(flags & TEST_NODOCHOST); +} + static void test_WebBrowser(BOOL do_download, BOOL do_close) { IUnknown *unk = NULL; @@ -3313,10 +3325,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) if (FAILED(create_WebBrowser(&unk))) return; - is_downloading = FALSE; - is_first_load = TRUE; - use_container_olecmd = TRUE; - use_container_dochostui = TRUE; + init_test(do_download ? TEST_DOWNLOAD : 0); hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get IWebBrowser2 iface: %08x\n", hres); @@ -3426,10 +3435,7 @@ static void test_WebBrowser_slim_container(void) HRESULT hres; ULONG ref; - is_downloading = FALSE; - is_first_load = TRUE; - use_container_olecmd = FALSE; - use_container_dochostui = FALSE; + init_test(TEST_NOOLECMD|TEST_NODOCHOST); /* Setup stage */ if (FAILED(create_WebBrowser(&unk))) @@ -3465,9 +3471,7 @@ static void test_WebBrowser_DoVerb(void) ULONG ref; BOOL res; - is_downloading = FALSE; - is_first_load = TRUE; - use_container_olecmd = FALSE; + init_test(0); if (FAILED(create_WebBrowser(&unk))) return;

1 0