July 2014 - Wine-commits - list.winehq.org

Henri Verbeet : d3d8/tests: Get rid of struct vertex.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: ab1a53c1b9091a14454226b309b6aa8f0ebe5f3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab1a53c1b9091a14454226b30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 15 08:43:56 2014 +0200 d3d8/tests: Get rid of struct vertex. --- dlls/d3d8/tests/visual.c | 191 +++++++++++++++++++++++++++-------------------- 1 file changed, 110 insertions(+), 81 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index e975e58..5521066 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -133,12 +133,6 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND return NULL; } -struct vertex -{ - float x, y, z; - DWORD diffuse; -}; - struct tvertex { float x, y, z, w; @@ -205,19 +199,24 @@ static void lighting_test(void) HWND window; HRESULT hr; - static const struct vertex unlitquad[] = + static const struct { - {-1.0f, -1.0f, 0.1f, 0xffff0000}, - {-1.0f, 0.0f, 0.1f, 0xffff0000}, - { 0.0f, 0.0f, 0.1f, 0xffff0000}, - { 0.0f, -1.0f, 0.1f, 0xffff0000}, - }; - static const struct vertex litquad[] = + struct vec3 position; + DWORD diffuse; + } + unlitquad[] = { - {-1.0f, 0.0f, 0.1f, 0xff00ff00}, - {-1.0f, 1.0f, 0.1f, 0xff00ff00}, - { 0.0f, 1.0f, 0.1f, 0xff00ff00}, - { 0.0f, 0.0f, 0.1f, 0xff00ff00}, + {{-1.0f, -1.0f, 0.1f}, 0xffff0000}, + {{-1.0f, 0.0f, 0.1f}, 0xffff0000}, + {{ 0.0f, 0.0f, 0.1f}, 0xffff0000}, + {{ 0.0f, -1.0f, 0.1f}, 0xffff0000}, + }, + litquad[] = + { + {{-1.0f, 0.0f, 0.1f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.1f}, 0xff00ff00}, + {{ 0.0f, 1.0f, 0.1f}, 0xff00ff00}, + {{ 0.0f, 0.0f, 0.1f}, 0xff00ff00}, }; static const struct nvertex unlitnquad[] = { @@ -754,12 +753,17 @@ static void fog_with_shader_test(void) 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ 0x0000ffff }; - static struct vertex quad[] = + static struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = { - {-1.0f, -1.0f, 0.0f, 0xffff0000}, - {-1.0f, 1.0f, 0.0f, 0xffff0000}, - { 1.0f, -1.0f, 0.0f, 0xffff0000}, - { 1.0f, 1.0f, 0.0f, 0xffff0000}, + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.0f}, 0xffff0000}, }; static const DWORD decl[] = { @@ -980,10 +984,10 @@ static void fog_with_shader_test(void) for(j = 0; j < 11; ++j) { /* Don't use the whole zrange to prevent rounding errors */ - quad[0].z = 0.001f + j / 10.02f; - quad[1].z = 0.001f + j / 10.02f; - quad[2].z = 0.001f + j / 10.02f; - quad[3].z = 0.001f + j / 10.02f; + quad[0].position.z = 0.001f + j / 10.02f; + quad[1].position.z = 0.001f + j / 10.02f; + quad[2].position.z = 0.001f + j / 10.02f; + quad[3].position.z = 0.001f + j / 10.02f; hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff00ff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed (%08x)\n", hr); @@ -1580,19 +1584,24 @@ static void z_range_test(void) HWND window; HRESULT hr; - static const struct vertex quad[] = + static const struct { - {-1.0f, 0.0f, 1.1f, 0xffff0000}, - {-1.0f, 1.0f, 1.1f, 0xffff0000}, - { 1.0f, 0.0f, -1.1f, 0xffff0000}, - { 1.0f, 1.0f, -1.1f, 0xffff0000}, - }; - static const struct vertex quad2[] = + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, 0.0f, 1.1f}, 0xffff0000}, + {{-1.0f, 1.0f, 1.1f}, 0xffff0000}, + {{ 1.0f, 0.0f, -1.1f}, 0xffff0000}, + {{ 1.0f, 1.0f, -1.1f}, 0xffff0000}, + }, + quad2[] = { - {-1.0f, 0.0f, 1.1f, 0xff0000ff}, - {-1.0f, 1.0f, 1.1f, 0xff0000ff}, - { 1.0f, 0.0f, -1.1f, 0xff0000ff}, - { 1.0f, 1.0f, -1.1f, 0xff0000ff}, + {{-1.0f, 0.0f, 1.1f}, 0xff0000ff}, + {{-1.0f, 1.0f, 1.1f}, 0xff0000ff}, + {{ 1.0f, 0.0f, -1.1f}, 0xff0000ff}, + {{ 1.0f, 1.0f, -1.1f}, 0xff0000ff}, }; static const struct tvertex quad3[] = { @@ -2108,19 +2117,24 @@ static void alpha_test(void) HWND window; HRESULT hr; - static const struct vertex quad1[] = + static const struct { - {-1.0f, -1.0f, 0.1f, 0x4000ff00}, - {-1.0f, 0.0f, 0.1f, 0x4000ff00}, - { 1.0f, -1.0f, 0.1f, 0x4000ff00}, - { 1.0f, 0.0f, 0.1f, 0x4000ff00}, - }; - static const struct vertex quad2[] = + struct vec3 position; + DWORD diffuse; + } + quad1[] = + { + {{-1.0f, -1.0f, 0.1f}, 0x4000ff00}, + {{-1.0f, 0.0f, 0.1f}, 0x4000ff00}, + {{ 1.0f, -1.0f, 0.1f}, 0x4000ff00}, + {{ 1.0f, 0.0f, 0.1f}, 0x4000ff00}, + }, + quad2[] = { - {-1.0f, 0.0f, 0.1f, 0xc00000ff}, - {-1.0f, 1.0f, 0.1f, 0xc00000ff}, - { 1.0f, 0.0f, 0.1f, 0xc00000ff}, - { 1.0f, 1.0f, 0.1f, 0xc00000ff}, + {{-1.0f, 0.0f, 0.1f}, 0xc00000ff}, + {{-1.0f, 1.0f, 0.1f}, 0xc00000ff}, + {{ 1.0f, 0.0f, 0.1f}, 0xc00000ff}, + {{ 1.0f, 1.0f, 0.1f}, 0xc00000ff}, }; static const float composite_quad[][5] = { @@ -2667,19 +2681,24 @@ static void depth_clamp_test(void) { 42.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, {112.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, }; - static const struct vertex quad5[] = + static const struct { - { -0.5f, 0.5f, 10.0f, 0xff14f914}, - { 0.5f, 0.5f, 10.0f, 0xff14f914}, - { -0.5f, -0.5f, 10.0f, 0xff14f914}, - { 0.5f, -0.5f, 10.0f, 0xff14f914}, - }; - static const struct vertex quad6[] = + struct vec3 position; + DWORD diffuse; + } + quad5[] = + { + {{-0.5f, 0.5f, 10.0f}, 0xff14f914}, + {{ 0.5f, 0.5f, 10.0f}, 0xff14f914}, + {{-0.5f, -0.5f, 10.0f}, 0xff14f914}, + {{ 0.5f, -0.5f, 10.0f}, 0xff14f914}, + }, + quad6[] = { - { -1.0f, 0.5f, 10.0f, 0xfff91414}, - { 1.0f, 0.5f, 10.0f, 0xfff91414}, - { -1.0f, 0.25f, 10.0f, 0xfff91414}, - { 1.0f, 0.25f, 10.0f, 0xfff91414}, + {{-1.0f, 0.5f, 10.0f}, 0xfff91414}, + {{ 1.0f, 0.5f, 10.0f}, 0xfff91414}, + {{-1.0f, 0.25f, 10.0f}, 0xfff91414}, + {{ 1.0f, 0.25f, 10.0f}, 0xfff91414}, }; window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -2803,26 +2822,31 @@ static void depth_buffer_test(void) HWND window; HRESULT hr; - static const struct vertex quad1[] = + static const struct { - { -1.0, 1.0, 0.33f, 0xff00ff00}, - { 1.0, 1.0, 0.33f, 0xff00ff00}, - { -1.0, -1.0, 0.33f, 0xff00ff00}, - { 1.0, -1.0, 0.33f, 0xff00ff00}, - }; - static const struct vertex quad2[] = + struct vec3 position; + DWORD diffuse; + } + quad1[] = { - { -1.0, 1.0, 0.50f, 0xffff00ff}, - { 1.0, 1.0, 0.50f, 0xffff00ff}, - { -1.0, -1.0, 0.50f, 0xffff00ff}, - { 1.0, -1.0, 0.50f, 0xffff00ff}, - }; - static const struct vertex quad3[] = + {{-1.0f, 1.0f, 0.33f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.33f}, 0xff00ff00}, + {{-1.0f, -1.0f, 0.33f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.33f}, 0xff00ff00}, + }, + quad2[] = + { + {{-1.0f, 1.0f, 0.50f}, 0xffff00ff}, + {{ 1.0f, 1.0f, 0.50f}, 0xffff00ff}, + {{-1.0f, -1.0f, 0.50f}, 0xffff00ff}, + {{ 1.0f, -1.0f, 0.50f}, 0xffff00ff}, + }, + quad3[] = { - { -1.0, 1.0, 0.66f, 0xffff0000}, - { 1.0, 1.0, 0.66f, 0xffff0000}, - { -1.0, -1.0, 0.66f, 0xffff0000}, - { 1.0, -1.0, 0.66f, 0xffff0000}, + {{-1.0f, 1.0f, 0.66f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.66f}, 0xffff0000}, + {{-1.0f, -1.0f, 0.66f}, 0xffff0000}, + {{ 1.0f, -1.0f, 0.66f}, 0xffff0000}, }; static const DWORD expected_colors[4][4] = { @@ -2959,12 +2983,17 @@ static void depth_buffer2_test(void) HWND window; HRESULT hr; - static const struct vertex quad[] = + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = { - { -1.0, 1.0, 0.66f, 0xffff0000}, - { 1.0, 1.0, 0.66f, 0xffff0000}, - { -1.0, -1.0, 0.66f, 0xffff0000}, - { 1.0, -1.0, 0.66f, 0xffff0000}, + {{-1.0f, 1.0f, 0.66f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.66f}, 0xffff0000}, + {{-1.0f, -1.0f, 0.66f}, 0xffff0000}, + {{ 1.0f, -1.0f, 0.66f}, 0xffff0000}, }; window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE,

1 0

Henri Verbeet : d3d8/tests: Get rid of struct tvertex.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: 59208edffee7737313928b89775d9cb776dfe2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59208edffee7737313928b897… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 15 08:43:57 2014 +0200 d3d8/tests: Get rid of struct tvertex. --- dlls/d3d8/tests/visual.c | 84 +++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 5521066..1bf2e0a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -133,12 +133,6 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND return NULL; } -struct tvertex -{ - float x, y, z, w; - DWORD diffuse; -}; - struct nvertex { float x, y, z; @@ -1603,19 +1597,24 @@ static void z_range_test(void) {{ 1.0f, 0.0f, -1.1f}, 0xff0000ff}, {{ 1.0f, 1.0f, -1.1f}, 0xff0000ff}, }; - static const struct tvertex quad3[] = + static const struct { - {640.0f, 240.0f, -1.1f, 1.0f, 0xffffff00}, - {640.0f, 480.0f, -1.1f, 1.0f, 0xffffff00}, - { 0.0f, 240.0f, 1.1f, 1.0f, 0xffffff00}, - { 0.0f, 480.0f, 1.1f, 1.0f, 0xffffff00}, - }; - static const struct tvertex quad4[] = + struct vec4 position; + DWORD diffuse; + } + quad3[] = { - {640.0f, 240.0f, -1.1f, 1.0f, 0xff00ff00}, - {640.0f, 480.0f, -1.1f, 1.0f, 0xff00ff00}, - { 0.0f, 240.0f, 1.1f, 1.0f, 0xff00ff00}, - { 0.0f, 480.0f, 1.1f, 1.0f, 0xff00ff00}, + {{640.0f, 240.0f, -1.1f, 1.0f}, 0xffffff00}, + {{640.0f, 480.0f, -1.1f, 1.0f}, 0xffffff00}, + {{ 0.0f, 240.0f, 1.1f, 1.0f}, 0xffffff00}, + {{ 0.0f, 480.0f, 1.1f, 1.0f}, 0xffffff00}, + }, + quad4[] = + { + {{640.0f, 240.0f, -1.1f, 1.0f}, 0xff00ff00}, + {{640.0f, 480.0f, -1.1f, 1.0f}, 0xff00ff00}, + {{ 0.0f, 240.0f, 1.1f, 1.0f}, 0xff00ff00}, + {{ 0.0f, 480.0f, 1.1f, 1.0f}, 0xff00ff00}, }; static const DWORD shader_code[] = { @@ -2653,33 +2652,38 @@ static void depth_clamp_test(void) HWND window; HRESULT hr; - static const struct tvertex quad1[] = + static const struct { - { 0.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, - {640.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, - { 0.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, - {640.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, - }; - static const struct tvertex quad2[] = + struct vec4 position; + DWORD diffuse; + } + quad1[] = { - { 0.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, - {640.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, - { 0.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, - {640.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, - }; - static const struct tvertex quad3[] = + {{ 0.0f, 0.0f, 5.0f, 1.0f}, 0xff002b7f}, + {{640.0f, 0.0f, 5.0f, 1.0f}, 0xff002b7f}, + {{ 0.0f, 480.0f, 5.0f, 1.0f}, 0xff002b7f}, + {{640.0f, 480.0f, 5.0f, 1.0f}, 0xff002b7f}, + }, + quad2[] = { - {112.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, - {208.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, - {112.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, - {208.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, - }; - static const struct tvertex quad4[] = + {{ 0.0f, 300.0f, 10.0f, 1.0f}, 0xfff9e814}, + {{640.0f, 300.0f, 10.0f, 1.0f}, 0xfff9e814}, + {{ 0.0f, 360.0f, 10.0f, 1.0f}, 0xfff9e814}, + {{640.0f, 360.0f, 10.0f, 1.0f}, 0xfff9e814}, + }, + quad3[] = + { + {{112.0f, 108.0f, 5.0f, 1.0f}, 0xffffffff}, + {{208.0f, 108.0f, 5.0f, 1.0f}, 0xffffffff}, + {{112.0f, 204.0f, 5.0f, 1.0f}, 0xffffffff}, + {{208.0f, 204.0f, 5.0f, 1.0f}, 0xffffffff}, + }, + quad4[] = { - { 42.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, - {112.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, - { 42.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, - {112.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, + {{ 42.0f, 41.0f, 10.0f, 1.0f}, 0xffffffff}, + {{112.0f, 41.0f, 10.0f, 1.0f}, 0xffffffff}, + {{ 42.0f, 108.0f, 10.0f, 1.0f}, 0xffffffff}, + {{112.0f, 108.0f, 10.0f, 1.0f}, 0xffffffff}, }; static const struct {

1 0

Henri Verbeet : d3d8/tests: Get rid of struct nvertex.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: 4cb91a69b008dabc69a1250b4bf9840ceb7360ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cb91a69b008dabc69a1250b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 15 08:43:58 2014 +0200 d3d8/tests: Get rid of struct nvertex. --- dlls/d3d8/tests/device.c | 17 +++++++++-------- dlls/d3d8/tests/visual.c | 35 +++++++++++++++++------------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f6fa169..a92ca81 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1919,17 +1919,18 @@ static void test_render_zero_triangles(void) HWND window; HRESULT hr; - struct nvertex + static const struct { - float x, y, z; - float nx, ny, nz; + struct vec3 position; + struct vec3 normal; DWORD diffuse; - } quad[] = + } + quad[] = { - { 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + {{0.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{0.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{1.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{1.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, }; window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 1bf2e0a..ba73bb6 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -133,13 +133,6 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND return NULL; } -struct nvertex -{ - float x, y, z; - float nx, ny, nz; - DWORD diffuse; -}; - static void test_sanity(void) { IDirect3DDevice8 *device; @@ -212,19 +205,25 @@ static void lighting_test(void) {{ 0.0f, 1.0f, 0.1f}, 0xff00ff00}, {{ 0.0f, 0.0f, 0.1f}, 0xff00ff00}, }; - static const struct nvertex unlitnquad[] = + static const struct { - { 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - }; - static const struct nvertex litnquad[] = + struct vec3 position; + struct vec3 normal; + DWORD diffuse; + } + unlitnquad[] = + { + {{0.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{0.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{1.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{1.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + }, + litnquad[] = { - { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + {{0.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + {{0.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + {{1.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + {{1.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, }; static const WORD Indices[] = {0, 1, 2, 2, 3, 0}; static const D3DMATRIX mat =

1 0

Marcus Meissner : rpcrt4: Fixed memory leak on error exit (Coverity).
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: 906c341781c327f4ad67d9c49366c7b99fdb19fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=906c341781c327f4ad67d9c49… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 15 10:00:43 2014 +0200 rpcrt4: Fixed memory leak on error exit (Coverity). --- dlls/rpcrt4/rpc_transport.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index b283301..c5ed04d 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -942,6 +942,7 @@ static size_t rpcrt4_ip_tcp_get_top_of_tower(unsigned char *tower_data, else { ERR("unexpected protocol family %d\n", ai->ai_family); + freeaddrinfo(ai); return 0; }

1 0

Zhenbo Li : mshtml: Added support for IHTMLTable[23] interfaces in HTMLTable.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: e80a3435a1c2cade0ebb9f9869f7899d9e3bf1a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e80a3435a1c2cade0ebb9f986… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Jul 15 21:05:47 2014 +0800 mshtml: Added support for IHTMLTable[23] interfaces in HTMLTable. --- dlls/mshtml/htmltable.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index de12537..0f64330 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -914,10 +914,10 @@ static HRESULT HTMLTable_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IHTMLTable_iface; }else if(IsEqualGUID(&IID_IHTMLTable2, riid)) { TRACE("(%p)->(IID_IHTMLTable2 %p)\n", This, ppv); - *ppv = &This->IHTMLTable_iface; + *ppv = &This->IHTMLTable2_iface; }else if(IsEqualGUID(&IID_IHTMLTable3, riid)) { TRACE("(%p)->(IID_IHTMLTable3 %p)\n", This, ppv); - *ppv = &This->IHTMLTable_iface; + *ppv = &This->IHTMLTable3_iface; } if(*ppv) { @@ -969,6 +969,8 @@ HRESULT HTMLTable_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLE ret->element.node.vtbl = &HTMLTableImplVtbl; ret->IHTMLTable_iface.lpVtbl = &HTMLTableVtbl; + ret->IHTMLTable2_iface.lpVtbl = &HTMLTable2Vtbl; + ret->IHTMLTable3_iface.lpVtbl = &HTMLTable3Vtbl; HTMLElement_Init(&ret->element, doc, nselem, &HTMLTable_dispex);

1 0

Zhenbo Li : mshtml: Added IHTMLTable::summary property implementation.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: 720207ad4630b8cfb591c68bd3a27bba9ed9cfbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=720207ad4630b8cfb591c68bd… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Jul 15 21:06:41 2014 +0800 mshtml: Added IHTMLTable::summary property implementation. --- dlls/mshtml/htmltable.c | 28 ++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 0f64330..e7991da 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -869,15 +869,35 @@ static HRESULT WINAPI HTMLTable3_Invoke(IHTMLTable3 *iface, DISPID dispIdMember, static HRESULT WINAPI HTMLTable3_put_summary(IHTMLTable3 *iface, BSTR v) { HTMLTable *This = impl_from_IHTMLTable3(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&str, v); + + nsres = nsIDOMHTMLTableElement_SetSummary(This->nstable, &str); + + nsAString_Finish(&str); + if (NS_FAILED(nsres)) { + ERR("Set summary(%s) failed: %08x\n", debugstr_w(v), nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLTable3_get_summary(IHTMLTable3 *iface, BSTR * p) { HTMLTable *This = impl_from_IHTMLTable3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&str, NULL); + nsres = nsIDOMHTMLTableElement_GetSummary(This->nstable, &str); + + return return_nsstr(nsres, &str, p); } static const IHTMLTable3Vtbl HTMLTable3Vtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 941e87b..532bbfb 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5930,6 +5930,7 @@ static void test_table_elem(IHTMLElement *elem) { IHTMLElementCollection *col; IHTMLTable *table; + IHTMLTable3 *table3; IHTMLDOMNode *node; VARIANT v; HRESULT hres; @@ -5945,6 +5946,11 @@ static void test_table_elem(IHTMLElement *elem) if(FAILED(hres)) return; + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTable3, (void**)&table3); + ok(hres == S_OK, "Could not get IHTMLTable3 iface: %08x\n", hres); + if(FAILED(hres)) + return; + col = NULL; hres = IHTMLTable_get_rows(table, &col); ok(hres == S_OK, "get_rows failed: %08x\n", hres); @@ -6082,6 +6088,17 @@ static void test_table_elem(IHTMLElement *elem) ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + bstr = a2bstr("summary"); + hres = IHTMLTable3_put_summary(table3, bstr); + ok(hres == S_OK, "put_summary = %08x\n", hres); + SysFreeString(bstr); + + hres = IHTMLTable3_get_summary(table3, &bstr); + ok(hres == S_OK, "get_summary = %08x\n", hres); + ok(!strcmp_wa(bstr, "summary"), "Expected summary, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + IHTMLTable3_Release(table3); IHTMLTable_Release(table); }

1 0

Akihiro Sagawa : ole32/tests: Add CoGetPSClsid WOW64 registry tests.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: fae8d9db5f3dcbec198d1a4cde6c9cfe8684b5cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae8d9db5f3dcbec198d1a4cd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jul 15 19:34:38 2014 +0900 ole32/tests: Add CoGetPSClsid WOW64 registry tests. --- dlls/ole32/tests/compobj.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 6d5e811..b789794 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -43,11 +43,13 @@ static HRESULT (WINAPI * pCoSwitchCallContext)(IUnknown *pObject, IUnknown **ppO static HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNew); static HRESULT (WINAPI * pCoTreatAsClass)(REFCLSID clsidOld, REFCLSID pClsidNew); static HRESULT (WINAPI * pCoGetContextToken)(ULONG_PTR *token); +static LONG (WINAPI * pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); +static BOOL (WINAPI *pIsWow64Process)(HANDLE, LPBOOL); static void (WINAPI *pReleaseActCtx)(HANDLE); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -1049,6 +1051,8 @@ static void test_CoGetPSClsid(void) CLSID clsid; HKEY hkey; LONG res; + const BOOL is_win64 = (sizeof(void*) != sizeof(int)); + BOOL is_wow64 = FALSE; hr = CoGetPSClsid(&IID_IClassFactory, &clsid); ok(hr == CO_E_NOTINITIALIZED, @@ -1132,6 +1136,43 @@ static void test_CoGetPSClsid(void) pReleaseActCtx(handle); } + if (pRegDeleteKeyExA && + (is_win64 || + (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) + { + static GUID IID_DeadBeef = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; + static const char clsidDeadBeef[] = "{deadbeef-dead-beef-dead-beefdeadbeef}"; + static const char clsidA[] = "{66666666-8888-7777-6666-555555555555}"; + HKEY hkey_iface, hkey_psclsid; + REGSAM opposite = is_win64 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + + hr = CoGetPSClsid(&IID_DeadBeef, &clsid); + ok(hr == REGDB_E_IIDNOTREG, "got 0x%08x\n", hr); + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, "Interface", + 0, NULL, 0, KEY_ALL_ACCESS | opposite, NULL, &hkey_iface, NULL); + ok(!res, "RegCreateKeyEx returned %d\n", res); + res = RegCreateKeyExA(hkey_iface, clsidDeadBeef, + 0, NULL, 0, KEY_ALL_ACCESS | opposite, NULL, &hkey, NULL); + ok(!res, "RegCreateKeyEx returned %d\n", res); + res = RegCreateKeyExA(hkey, "ProxyStubClsid32", + 0, NULL, 0, KEY_ALL_ACCESS | opposite, NULL, &hkey_psclsid, NULL); + res = RegSetValueExA(hkey_psclsid, NULL, 0, REG_SZ, (const BYTE *)clsidA, strlen(clsidA)+1); + ok(!res, "RegSetValueEx returned %d\n", res); + RegCloseKey(hkey_psclsid); + + hr = CoGetPSClsid(&IID_DeadBeef, &clsid); + todo_wine ok_ole_success(hr, "CoGetPSClsid"); + todo_wine ok(IsEqualGUID(&clsid, &IID_TestPS), "got clsid %s\n", wine_dbgstr_guid(&clsid)); + + res = pRegDeleteKeyExA(hkey, "ProxyStubClsid32", opposite, 0); + ok(!res, "RegDeleteKeyEx returned %d\n", res); + RegCloseKey(hkey); + res = pRegDeleteKeyExA(hkey_iface, clsidDeadBeef, opposite, 0); + ok(!res, "RegDeleteKeyEx returned %d\n", res); + RegCloseKey(hkey_iface); + } + CoUninitialize(); } @@ -2058,12 +2099,14 @@ static void init_funcs(void) pCoGetTreatAsClass = (void*)GetProcAddress(hOle32,"CoGetTreatAsClass"); pCoTreatAsClass = (void*)GetProcAddress(hOle32,"CoTreatAsClass"); pCoGetContextToken = (void*)GetProcAddress(hOle32, "CoGetContextToken"); + pRegDeleteKeyExA = (void*)GetProcAddress(hAdvapi32, "RegDeleteKeyExA"); pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); pActivateActCtx = (void*)GetProcAddress(hkernel32, "ActivateActCtx"); pCreateActCtxW = (void*)GetProcAddress(hkernel32, "CreateActCtxW"); pDeactivateActCtx = (void*)GetProcAddress(hkernel32, "DeactivateActCtx"); + pIsWow64Process = (void*)GetProcAddress(hkernel32, "IsWow64Process"); pReleaseActCtx = (void*)GetProcAddress(hkernel32, "ReleaseActCtx"); }

1 0

Thomas Faber : gdi32: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 07ca1afbd38b9f863c090dd0fd920469387e57fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ca1afbd38b9f863c090dd0f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:35:15 2014 +0200 gdi32: Do not omit mandatory argument to WriteFile. --- dlls/gdi32/enhmfdrv/init.c | 6 ++++-- dlls/gdi32/mfdrv/init.c | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 18f9eae..682f412 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -193,6 +193,7 @@ static BOOL EMFDRV_DeleteDC( PHYSDEV dev ) BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr ) { DWORD len; + DWORD bytes_written; ENHMETAHEADER *emh; EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE *)dev; @@ -205,7 +206,7 @@ BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr ) physDev->emh->nRecords++; if(physDev->hFile) { - if (!WriteFile(physDev->hFile, emr, emr->nSize, NULL, NULL)) + if (!WriteFile(physDev->hFile, emr, emr->nSize, &bytes_written, NULL)) return FALSE; } else { DWORD nEmfSize = HeapSize(GetProcessHeap(), 0, physDev->emh); @@ -316,6 +317,7 @@ HDC WINAPI CreateEnhMetaFileW( EMFDRV_PDEVICE *physDev; HANDLE hFile; DWORD size = 0, length = 0; + DWORD bytes_written; TRACE("%s\n", debugstr_w(filename) ); @@ -407,7 +409,7 @@ HDC WINAPI CreateEnhMetaFileW( free_dc_ptr( dc ); return 0; } - if (!WriteFile( hFile, physDev->emh, size, NULL, NULL )) { + if (!WriteFile( hFile, physDev->emh, size, &bytes_written, NULL )) { free_dc_ptr( dc ); CloseHandle( hFile ); return 0; diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 8f312a1..7b53244 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -321,6 +321,7 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) DC *dc; METAFILEDRV_PDEVICE *physDev; HANDLE hFile; + DWORD bytes_written; TRACE("%s\n", debugstr_w(filename) ); @@ -335,8 +336,8 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) free_dc_ptr( dc ); return 0; } - if (!WriteFile( hFile, physDev->mh, sizeof(*physDev->mh), NULL, - NULL )) { + if (!WriteFile( hFile, physDev->mh, sizeof(*physDev->mh), + &bytes_written, NULL )) { free_dc_ptr( dc ); CloseHandle (hFile ); return 0; @@ -387,6 +388,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) { DC *dc; METAFILEDRV_PDEVICE *physDev; + DWORD bytes_written; TRACE("(%p)\n", hdc ); @@ -423,7 +425,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) physDev->mh->mtType = METAFILE_MEMORY; /* This is what windows does */ if (!WriteFile(physDev->hFile, physDev->mh, sizeof(*physDev->mh), - NULL, NULL)) { + &bytes_written, NULL)) { free_dc_ptr( dc ); return 0; }

1 0

Thomas Faber : cmd: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: d4c4f0ab95871201ff120b6382bfbe722293d539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c4f0ab95871201ff120b638… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:39:13 2014 +0200 cmd: Do not omit mandatory argument to WriteFile. --- programs/cmd/builtins.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 4c95b43..cb7dfef 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -436,6 +436,7 @@ void WCMD_choice (const WCHAR * args) { static BOOL WCMD_AppendEOF(WCHAR *filename) { HANDLE h; + DWORD bytes_written; char eof = '\x1a'; @@ -448,7 +449,7 @@ static BOOL WCMD_AppendEOF(WCHAR *filename) return FALSE; } else { SetFilePointer (h, 0, NULL, FILE_END); - if (!WriteFile(h, &eof, 1, NULL, NULL)) { + if (!WriteFile(h, &eof, 1, &bytes_written, NULL)) { WINE_ERR("Failed to append EOF to %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); CloseHandle(h); return FALSE;

1 0

Thomas Faber : dxdiag: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: f325bf745872cfeec383f33ea2b19dcaa67361c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f325bf745872cfeec383f33ea… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:40:12 2014 +0200 dxdiag: Do not omit mandatory argument to WriteFile. --- programs/dxdiag/output.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index 7fb9a4c..c18c75d 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -72,6 +72,7 @@ static BOOL output_text_header(HANDLE hFile, const char *caption) DWORD len = strlen(caption); DWORD total_len = 3 * (len + sizeof(crlf)); char *ptr = output_buffer; + DWORD bytes_written; assert(total_len <= sizeof(output_buffer)); @@ -92,7 +93,7 @@ static BOOL output_text_header(HANDLE hFile, const char *caption) memcpy(ptr, crlf, sizeof(crlf)); - return WriteFile(hFile, output_buffer, total_len, NULL, NULL); + return WriteFile(hFile, output_buffer, total_len, &bytes_written, NULL); } static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_width, const WCHAR *value) @@ -102,6 +103,7 @@ static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_ DWORD total_len = field_width + sizeof(": ") - 1 + value_lenA + sizeof(crlf); char sprintf_fmt[1 + 10 + 3 + 1]; char *ptr = output_buffer; + DWORD bytes_written; assert(total_len <= sizeof(output_buffer)); @@ -111,12 +113,13 @@ static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_ ptr += WideCharToMultiByte(CP_ACP, 0, value, value_lenW, ptr, value_lenA, NULL, NULL); memcpy(ptr, crlf, sizeof(crlf)); - return WriteFile(hFile, output_buffer, total_len, NULL, NULL); + return WriteFile(hFile, output_buffer, total_len, &bytes_written, NULL); } static BOOL output_crlf(HANDLE hFile) { - return WriteFile(hFile, crlf, sizeof(crlf), NULL, NULL); + DWORD bytes_written; + return WriteFile(hFile, crlf, sizeof(crlf), &bytes_written, NULL); } static inline void fill_system_text_output_table(struct dxdiag_information *dxdiag_info, struct text_information_field *fields)

1 0