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

Ken Thomases : winex11: Remove unused "parent" parameter from create_gl_drawable().
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: eb235b6b98f2823545c84c4a9d5317a297696b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb235b6b98f2823545c84c4a9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Mar 21 00:19:02 2014 -0500 winex11: Remove unused "parent" parameter from create_gl_drawable(). --- dlls/winex11.drv/opengl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 759e51f..b3bd45b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1250,7 +1250,7 @@ static void free_gl_drawable( struct gl_drawable *gl ) /*********************************************************************** * create_gl_drawable */ -static BOOL create_gl_drawable( HWND hwnd, HWND parent, struct gl_drawable *gl ) +static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) { gl->drawable = 0; @@ -1323,7 +1323,6 @@ static BOOL create_gl_drawable( HWND hwnd, HWND parent, struct gl_drawable *gl ) */ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) { - HWND parent = GetAncestor( hwnd, GA_PARENT ); struct gl_drawable *gl, *prev; gl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*gl) ); @@ -1343,7 +1342,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) gl->rect.right = min( max( 1, gl->rect.right ), 65535 ); gl->rect.bottom = min( max( 1, gl->rect.bottom ), 65535 ); - if (!create_gl_drawable( hwnd, parent, gl )) + if (!create_gl_drawable( hwnd, gl )) { XFree( gl->visual ); HeapFree( GetProcessHeap(), 0, gl ); @@ -1450,7 +1449,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) goto done; } - if (!create_gl_drawable( hwnd, parent, gl )) + if (!create_gl_drawable( hwnd, gl )) { XDeleteContext( gdi_display, (XID)hwnd, gl_hwnd_context ); release_gl_drawable( gl );

1 0

Nikolay Sivov : xmllite: Implement CreateXmlWriterOutputWithEncodingName() .
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: ac8a24aa269950b9a299d5ef5e592e67020fa50f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8a24aa269950b9a299d5ef5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 21 09:56:23 2014 +0400 xmllite: Implement CreateXmlWriterOutputWithEncodingName(). --- dlls/xmllite/reader.c | 25 +------- dlls/xmllite/tests/writer.c | 61 ++++++++++++++++++-- dlls/xmllite/writer.c | 125 ++++++++++++++++++++++++++++++++++++++-- dlls/xmllite/xmllite.spec | 2 +- dlls/xmllite/xmllite_private.h | 25 ++++++++ include/xmllite.idl | 7 +++ 6 files changed, 212 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac8a24aa269950b9a299d…

1 0

Frédéric Delanoy : qcap: Use BOOL type where appropriate.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 7715684ff726cf3ca8c892f7e4897279f359efea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7715684ff726cf3ca8c892f7e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Mar 21 10:21:01 2014 +0100 qcap: Use BOOL type where appropriate. --- dlls/qcap/v4l.c | 19 +++++++++++-------- dlls/qcap/yuv.c | 5 +++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 0880499..4e19b71 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -110,7 +110,7 @@ struct _Capture IPin *pOut; int fd, mmap; - int iscommitted, stopped; + BOOL iscommitted, stopped; struct video_picture pict; int dbrightness, dhue, dcolour, dcontrast; @@ -661,7 +661,8 @@ cfail: LeaveCriticalSection(&capBox->CritSect); fail: - capBox->thread = 0; capBox->stopped = 1; + capBox->thread = 0; + capBox->stopped = TRUE; FIXME("Stop IFilterGraph\n"); return 0; } @@ -677,16 +678,18 @@ HRESULT qcap_driver_run(Capture *capBox, FILTER_STATE *state) EnterCriticalSection(&capBox->CritSect); - capBox->stopped = 0; + capBox->stopped = FALSE; if (*state == State_Stopped) { *state = State_Running; - if (!capBox->iscommitted++) + if (!capBox->iscommitted) { ALLOCATOR_PROPERTIES ap, actual; BaseOutputPin *out; + capBox->iscommitted = TRUE; + ap.cBuffers = 3; if (!capBox->swresize) ap.cbBuffer = capBox->width * capBox->height; @@ -755,14 +758,14 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) { if (*state == State_Paused) ResumeThread(capBox->thread); - capBox->stopped = 1; + capBox->stopped = TRUE; capBox->thread = 0; if (capBox->iscommitted) { BaseOutputPin *out; HRESULT hr; - capBox->iscommitted = 0; + capBox->iscommitted = FALSE; out = (BaseOutputPin*)capBox->pOut; @@ -894,9 +897,9 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) capBox->bitDepth = 24; capBox->pOut = pOut; capBox->fps = 3; - capBox->stopped = 0; + capBox->stopped = FALSE; capBox->curframe = 0; - capBox->iscommitted = 0; + capBox->iscommitted = FALSE; TRACE("format: %d bits - %d x %d\n", capBox->bitDepth, capBox->width, capBox->height); diff --git a/dlls/qcap/yuv.c b/dlls/qcap/yuv.c index 6b8ff29..7e17add 100644 --- a/dlls/qcap/yuv.c +++ b/dlls/qcap/yuv.c @@ -41,7 +41,7 @@ static int yuv_gu[256]; /* Green U */ static int yuv_bu[256]; /* Blue U */ static int yuv_rv[256]; /* Red V */ static int yuv_gv[256]; /* Green V */ -static int initialised = 0; +static BOOL initialised = FALSE; static inline int ValidRange(int in) { if (in > 255) in = 255; @@ -67,7 +67,8 @@ void YUV_Init(void) { float y, u, v; int y_, cb, cr; - if (initialised++) return; + if (initialised) return; + initialised = TRUE; for (y_ = 0; y_ <= 255; y_++) {

1 0

Henri Verbeet : d3d9/tests: Use a separate device for cnd_test().
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 7f302ac4c48e8d6fac0106bc0568b727c0fe61bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f302ac4c48e8d6fac0106bc0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 21 10:31:14 2014 +0100 d3d9/tests: Use a separate device for cnd_test(). --- dlls/d3d9/tests/visual.c | 97 ++++++++++++++++++++++++++++++---------------- 1 file changed, 64 insertions(+), 33 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index bee4b8e..9b57f05 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5709,13 +5709,19 @@ done: DestroyWindow(window); } -static void cnd_test(IDirect3DDevice9 *device) +static void cnd_test(void) { - IDirect3DPixelShader9 *shader_11, *shader_12, *shader_13, *shader_14; - IDirect3DPixelShader9 *shader_11_coissue, *shader_12_coissue, *shader_13_coissue, *shader_14_coissue; IDirect3DPixelShader9 *shader_11_coissue_2, *shader_12_coissue_2, *shader_13_coissue_2, *shader_14_coissue_2; - HRESULT hr; + IDirect3DPixelShader9 *shader_11_coissue, *shader_12_coissue, *shader_13_coissue, *shader_14_coissue; + IDirect3DPixelShader9 *shader_11, *shader_12, *shader_13, *shader_14; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + HWND window; DWORD color; + HRESULT hr; + /* ps 1.x shaders are rather picky with writemasks and source swizzles. * The dp3 is used to copy r0.r to all components of r1, then copy r1.a to * r0.a. Essentially it does a mov r0.a, r0.r, which isn't allowed as-is @@ -5888,36 +5894,59 @@ static void cnd_test(IDirect3DDevice9 *device) 0x00000001, 0x80080000, 0xa0ff0000, /* mov r0.a, c0.a */ 0x0000ffff /* end */ }; - float quad1[] = { - -1.0, -1.0, 0.1, 0.0, 0.0, 1.0, - 0.0, -1.0, 0.1, 1.0, 0.0, 1.0, - -1.0, 0.0, 0.1, 0.0, 1.0, 0.0, - 0.0, 0.0, 0.1, 1.0, 1.0, 0.0 + static const float quad1[] = + { + -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, 1.0f, + -1.0f, 0.0f, 0.1f, 0.0f, 1.0f, 0.0f, + 0.0f, -1.0f, 0.1f, 1.0f, 0.0f, 1.0f, + 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 0.0f, }; - float quad2[] = { - 0.0, -1.0, 0.1, 0.0, 0.0, 1.0, - 1.0, -1.0, 0.1, 1.0, 0.0, 1.0, - 0.0, 0.0, 0.1, 0.0, 1.0, 0.0, - 1.0, 0.0, 0.1, 1.0, 1.0, 0.0 + static const float quad2[] = + { + 0.0f, -1.0f, 0.1f, 0.0f, 0.0f, 1.0f, + 0.0f, 0.0f, 0.1f, 0.0f, 1.0f, 0.0f, + 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, 1.0f, + 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 0.0f, }; - float quad3[] = { - 0.0, 0.0, 0.1, 0.0, 0.0, 1.0, - 1.0, 0.0, 0.1, 1.0, 0.0, 1.0, - 0.0, 1.0, 0.1, 0.0, 1.0, 0.0, - 1.0, 1.0, 0.1, 1.0, 1.0, 0.0 + static const float quad3[] = + { + 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 1.0f, + 0.0f, 1.0f, 0.1f, 0.0f, 1.0f, 0.0f, + 1.0f, 0.0f, 0.1f, 1.0f, 0.0f, 1.0f, + 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 0.0f, }; - float quad4[] = { - -1.0, 0.0, 0.1, 0.0, 0.0, 1.0, - 0.0, 0.0, 0.1, 1.0, 0.0, 1.0, - -1.0, 1.0, 0.1, 0.0, 1.0, 0.0, - 0.0, 1.0, 0.1, 1.0, 1.0, 0.0 + static const float quad4[] = + { + -1.0f, 0.0f, 0.1f, 0.0f, 0.0f, 1.0f, + -1.0f, 1.0f, 0.1f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.1f, 1.0f, 0.0f, 1.0f, + 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, 0.0f, }; - float test_data_c1[4] = { 0.0, 0.0, 0.0, 0.0}; - float test_data_c2[4] = { 1.0, 1.0, 1.0, 1.0}; - float test_data_c1_coi[4] = { 0.0, 1.0, 0.0, 0.0}; - float test_data_c2_coi[4] = { 1.0, 0.0, 1.0, 1.0}; + static const float test_data_c1[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + static const float test_data_c2[4] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const float test_data_c1_coi[4] = {0.0f, 1.0f, 0.0f, 0.0f}; + static const float test_data_c2_coi[4] = {1.0f, 0.0f, 1.0f, 1.0f}; - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0, 0); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 4)) + { + skip("No ps_1_4 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ffff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, shader_code_11, &shader_11); @@ -6155,9 +6184,6 @@ static void cnd_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); } - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); - /* 1.4 shader */ color = getPixelColor(device, 158, 118); ok(color == 0x00ffffff, "pixel 158, 118 has color %08x, expected 0x00ffffff\n", color); @@ -6225,6 +6251,11 @@ static void cnd_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(shader_13); IDirect3DPixelShader9_Release(shader_12); IDirect3DPixelShader9_Release(shader_11); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void nested_loop_test(void) @@ -15915,7 +15946,6 @@ START_TEST(visual) volume_v16u16_test(device_ptr); if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 4)) { constant_clamp_ps_test(device_ptr); - cnd_test(device_ptr); } } else skip("No ps_1_1 support\n"); @@ -15923,6 +15953,7 @@ START_TEST(visual) cleanup_device(device_ptr); device_ptr = NULL; + cnd_test(); dp2add_ps_test(); unbound_sampler_test(); nested_loop_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for constant_clamp_ps_test().
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 4a2e38953e032b61a399068b8eb233d3f053fafc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a2e38953e032b61a399068b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 21 10:31:15 2014 +0100 d3d9/tests: Use a separate device for constant_clamp_ps_test(). --- dlls/d3d9/tests/visual.c | 90 ++++++++++++++++++++++++++++++---------------- 1 file changed, 60 insertions(+), 30 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9b57f05..9208981 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5442,11 +5442,17 @@ static void test_constant_clamp_vs(IDirect3DDevice9 *device) IDirect3DVertexShader9_Release(shader_11); } -static void constant_clamp_ps_test(IDirect3DDevice9 *device) +static void constant_clamp_ps_test(void) { IDirect3DPixelShader9 *shader_11, *shader_12, *shader_14, *shader_20; - HRESULT hr; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; DWORD color; + HWND window; + HRESULT hr; + static const DWORD shader_code_11[] = { 0xffff0101, /* ps_1_1 */ @@ -5483,34 +5489,57 @@ static void constant_clamp_ps_test(IDirect3DDevice9 *device) 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff /* end */ }; - float quad1[] = { - -1.0, -1.0, 0.1, - 0.0, -1.0, 0.1, - -1.0, 0.0, 0.1, - 0.0, 0.0, 0.1 + static const float quad1[] = + { + -1.0f, -1.0f, 0.1f, + -1.0f, 0.0f, 0.1f, + 0.0f, -1.0f, 0.1f, + 0.0f, 0.0f, 0.1f, }; - float quad2[] = { - 0.0, -1.0, 0.1, - 1.0, -1.0, 0.1, - 0.0, 0.0, 0.1, - 1.0, 0.0, 0.1 + static const float quad2[] = + { + 0.0f, -1.0f, 0.1f, + 0.0f, 0.0f, 0.1f, + 1.0f, -1.0f, 0.1f, + 1.0f, 0.0f, 0.1f, }; - float quad3[] = { - 0.0, 0.0, 0.1, - 1.0, 0.0, 0.1, - 0.0, 1.0, 0.1, - 1.0, 1.0, 0.1 + static const float quad3[] = + { + 0.0f, 0.0f, 0.1f, + 0.0f, 1.0f, 0.1f, + 1.0f, 0.0f, 0.1f, + 1.0f, 1.0f, 0.1f, }; - float quad4[] = { - -1.0, 0.0, 0.1, - 0.0, 0.0, 0.1, - -1.0, 1.0, 0.1, - 0.0, 1.0, 0.1 + static const float quad4[] = + { + -1.0f, 0.0f, 0.1f, + -1.0f, 1.0f, 0.1f, + 0.0f, 0.0f, 0.1f, + 0.0f, 1.0f, 0.1f, }; - float test_data_c1[4] = { 1.25, -0.50, -1.50, 1.0}; - float test_data_c2[4] = { -0.50, 1.25, 2.00, 1.0}; + static const float test_data_c1[4] = { 1.25f, -0.50f, -1.50f, 1.0f}; + static const float test_data_c2[4] = {-0.50f, 1.25f, 2.00f, 1.0f}; - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0, 0); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 4)) + { + skip("No ps_1_4 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ffff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, shader_code_11, &shader_11); @@ -5558,8 +5587,6 @@ static void constant_clamp_ps_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); } - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %08x\n", hr); color = getPixelColor(device, 160, 360); ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x00), 1), @@ -5582,6 +5609,11 @@ static void constant_clamp_ps_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(shader_14); IDirect3DPixelShader9_Release(shader_12); IDirect3DPixelShader9_Release(shader_11); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void dp2add_ps_test(void) @@ -15944,15 +15976,13 @@ START_TEST(visual) texkill_test(device_ptr); x8l8v8u8_test(device_ptr); volume_v16u16_test(device_ptr); - if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 4)) { - constant_clamp_ps_test(device_ptr); - } } else skip("No ps_1_1 support\n"); cleanup_device(device_ptr); device_ptr = NULL; + constant_clamp_ps_test(); cnd_test(); dp2add_ps_test(); unbound_sampler_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for volume_v16u16_test() .
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: d1d40bfa555c3c7d355006929a0d335ec13d22d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d40bfa555c3c7d355006929… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 21 10:31:16 2014 +0100 d3d9/tests: Use a separate device for volume_v16u16_test(). --- dlls/d3d9/tests/visual.c | 59 +++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9208981..da9b20d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15358,16 +15358,21 @@ done: DestroyWindow(window); } -static void volume_v16u16_test(IDirect3DDevice9 *device) +static void volume_v16u16_test(void) { - HRESULT hr; - IDirect3D9 *d3d9; IDirect3DVolumeTexture9 *texture; IDirect3DPixelShader9 *shader; + IDirect3DDevice9 *device; D3DLOCKED_BOX box; + IDirect3D9 *d3d; unsigned int i; - DWORD color; + ULONG refcount; + D3DCAPS9 caps; SHORT *texel; + DWORD color; + HWND window; + HRESULT hr; + static const struct { struct vec3 position; @@ -15376,13 +15381,13 @@ static void volume_v16u16_test(IDirect3DDevice9 *device) quads[] = { {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, - {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, - {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, }; static const DWORD shader_code[] = @@ -15395,15 +15400,30 @@ static void volume_v16u16_test(IDirect3DDevice9 *device) 0x0000ffff /* end */ }; - hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); - ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); - hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_V16U16); - IDirect3D9_Release(d3d9); - if (FAILED(hr)) + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) + { + skip("No ps_1_1 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_V16U16))) { skip("Volume V16U16 textures are not supported, skipping test.\n"); - return; + IDirect3DDevice9_Release(device); + goto done; } hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); @@ -15466,7 +15486,7 @@ static void volume_v16u16_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); @@ -15496,11 +15516,12 @@ static void volume_v16u16_test(IDirect3DDevice9 *device) IDirect3DVolumeTexture9_Release(texture); } - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); IDirect3DPixelShader9_Release(shader); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void add_dirty_rect_test_draw(IDirect3DDevice9 *device) @@ -15975,13 +15996,13 @@ START_TEST(visual) texdepth_test(device_ptr); texkill_test(device_ptr); x8l8v8u8_test(device_ptr); - volume_v16u16_test(device_ptr); } else skip("No ps_1_1 support\n"); cleanup_device(device_ptr); device_ptr = NULL; + volume_v16u16_test(); constant_clamp_ps_test(); cnd_test(); dp2add_ps_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for x8l8v8u8_test().
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 3cc2d639bbc582b1710ef0beaae90153230d7b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc2d639bbc582b1710ef0bea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 21 10:31:17 2014 +0100 d3d9/tests: Use a separate device for x8l8v8u8_test(). --- dlls/d3d9/tests/visual.c | 75 ++++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 26 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index da9b20d..3fff799 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5066,15 +5066,20 @@ static void texkill_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(shader); } -static void x8l8v8u8_test(IDirect3DDevice9 *device) +static void x8l8v8u8_test(void) { - IDirect3D9 *d3d9; - HRESULT hr; - IDirect3DTexture9 *texture; - IDirect3DPixelShader9 *shader; IDirect3DPixelShader9 *shader2; + IDirect3DPixelShader9 *shader; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; D3DLOCKED_RECT lr; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; DWORD color; + HWND window; + HRESULT hr; + static const DWORD shader_code[] = { 0xffff0101, /* ps_1_1 */ @@ -5089,29 +5094,46 @@ static void x8l8v8u8_test(IDirect3DDevice9 *device) 0x00000001, 0x800f0000, 0xb0ff0000, /* mov r0, t0.w */ 0x0000ffff /* end */ }; - - float quad[] = { - -1.0, -1.0, 0.1, 0.5, 0.5, - 1.0, -1.0, 0.1, 0.5, 0.5, - -1.0, 1.0, 0.1, 0.5, 0.5, - 1.0, 1.0, 0.1, 0.5, 0.5, + static const float quad[] = + { + -1.0f, -1.0f, 0.1f, 0.5f, 0.5f, + -1.0f, 1.0f, 0.1f, 0.5f, 0.5f, + 1.0f, -1.0f, 0.1f, 0.5f, 0.5f, + 1.0f, 1.0f, 0.1f, 0.5f, 0.5f, }; - memset(&lr, 0, sizeof(lr)); - IDirect3DDevice9_GetDirect3D(device, &d3d9); - hr = IDirect3D9_CheckDeviceFormat(d3d9, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - 0, D3DRTYPE_TEXTURE, D3DFMT_X8L8V8U8); - IDirect3D9_Release(d3d9); - if(FAILED(hr)) { - skip("No D3DFMT_X8L8V8U8 support\n"); - return; - }; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) + { + skip("No ps_1_1 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_X8L8V8U8))) + { + skip("No D3DFMT_X8L8V8U8 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 1, 1, 1, 0, D3DFMT_X8L8V8U8, D3DPOOL_MANAGED, &texture, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed (%08x)\n", hr); + memset(&lr, 0, sizeof(lr)); hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, 0); ok(hr == D3D_OK, "IDirect3DTexture9_LockRect failed (%08x)\n", hr); *((DWORD *) lr.pBits) = 0x11ca3141; @@ -5163,13 +5185,14 @@ static void x8l8v8u8_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed (%08x)\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed (%08x)\n", hr); IDirect3DPixelShader9_Release(shader); IDirect3DPixelShader9_Release(shader2); IDirect3DTexture9_Release(texture); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void autogen_mipmap_test(IDirect3DDevice9 *device) @@ -15995,13 +16018,13 @@ START_TEST(visual) texbem_test(device_ptr); texdepth_test(device_ptr); texkill_test(device_ptr); - x8l8v8u8_test(device_ptr); } else skip("No ps_1_1 support\n"); cleanup_device(device_ptr); device_ptr = NULL; + x8l8v8u8_test(); volume_v16u16_test(); constant_clamp_ps_test(); cnd_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for texkill_test().
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: b1758911829baf54865f5615c836ac426e10b0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1758911829baf54865f5615c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 21 10:31:18 2014 +0100 d3d9/tests: Use a separate device for texkill_test(). --- dlls/d3d9/tests/visual.c | 63 +++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3fff799..9d3d201 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4908,20 +4908,25 @@ static void texdepth_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); } -static void texkill_test(IDirect3DDevice9 *device) +static void texkill_test(void) { IDirect3DPixelShader9 *shader; - HRESULT hr; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; DWORD color; + HWND window; + HRESULT hr; - const float vertex[] = { - /* bottom top right left */ - -1.0, -1.0, 1.0, -0.1, 0.9, 0.9, -0.1, - 1.0, -1.0, 0.0, 0.9, -0.1, 0.9, -0.1, - -1.0, 1.0, 1.0, -0.1, 0.9, -0.1, 0.9, - 1.0, 1.0, 0.0, 0.9, -0.1, -0.1, 0.9, + static const float vertex[] = + { + /* bottom top right left */ + -1.0f, -1.0f, 1.0f, -0.1f, 0.9f, 0.9f, -0.1f, + -1.0f, 1.0f, 1.0f, -0.1f, 0.9f, -0.1f, 0.9f, + 1.0f, -1.0f, 0.0f, 0.9f, -0.1f, 0.9f, -0.1f, + 1.0f, 1.0f, 0.0f, 0.9f, -0.1f, -0.1f, 0.9f, }; - static const DWORD shader_code_11[] = { 0xffff0101, /* ps_1_1 */ @@ -4940,7 +4945,26 @@ static void texkill_test(IDirect3DDevice9 *device) 0x0000ffff /* end */ }; - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) + { + skip("No ps_1_1 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ff00, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader returned %08x\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, shader_code_11, &shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader returned %08x\n", hr); @@ -5003,10 +5027,11 @@ static void texkill_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader returned %08x\n", hr); - hr = IDirect3DDevice9_CreatePixelShader(device, shader_code_20, &shader); - if(FAILED(hr)) { - skip("Failed to create 2.0 test shader, most likely not supported\n"); - return; + if (FAILED(IDirect3DDevice9_CreatePixelShader(device, shader_code_20, &shader))) + { + skip("Failed to create 2.0 test shader, most likely not supported.\n"); + IDirect3DDevice9_Release(device); + goto done; } hr = IDirect3DDevice9_SetPixelShader(device, shader); @@ -5060,10 +5085,12 @@ static void texkill_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - /* Cleanup */ - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(SUCCEEDED(hr), "SetPixelShader failed (%08x)\n", hr); IDirect3DPixelShader9_Release(shader); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void x8l8v8u8_test(void) @@ -16017,13 +16044,13 @@ START_TEST(visual) { texbem_test(device_ptr); texdepth_test(device_ptr); - texkill_test(device_ptr); } else skip("No ps_1_1 support\n"); cleanup_device(device_ptr); device_ptr = NULL; + texkill_test(); x8l8v8u8_test(); volume_v16u16_test(); constant_clamp_ps_test();

1 0

Qian Hong : netapi32: Add stub for NetScheduleJobDel.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 8c60161148aabab9655ff43f7739a54c1f3f88d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c60161148aabab9655ff43f7… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Mar 21 18:06:42 2014 +0800 netapi32: Add stub for NetScheduleJobDel. --- dlls/netapi32/netapi32.c | 6 ++++++ dlls/netapi32/netapi32.spec | 2 +- include/lmat.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 6be912c..d2a61fa 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -1098,6 +1098,12 @@ NET_API_STATUS WINAPI NetScheduleJobAdd(LPCWSTR server, LPBYTE bufptr, LPDWORD j return NERR_Success; } +NET_API_STATUS WINAPI NetScheduleJobDel(LPCWSTR server, DWORD minjobid, DWORD maxjobid) +{ + FIXME("stub (%s, %d, %d)\n", debugstr_w(server), minjobid, maxjobid); + return NERR_Success; +} + NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR server, LPBYTE* bufptr, DWORD prefmaxsize, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resumehandle) { diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 8e0f3ea..9d5ac28 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -167,7 +167,7 @@ @ stub NetRplWkstaGetInfo @ stub NetRplWkstaSetInfo @ stdcall NetScheduleJobAdd(wstr ptr ptr) -@ stub NetScheduleJobDel +@ stdcall NetScheduleJobDel(wstr long long) @ stdcall NetScheduleJobEnum(wstr ptr long ptr ptr ptr) @ stub NetScheduleJobGetInfo @ stub NetServerComputerNameAdd diff --git a/include/lmat.h b/include/lmat.h index fe8a9c0..da9691a 100644 --- a/include/lmat.h +++ b/include/lmat.h @@ -26,6 +26,7 @@ extern "C" { #endif NET_API_STATUS WINAPI NetScheduleJobAdd(LPCWSTR,LPBYTE,LPDWORD); +NET_API_STATUS WINAPI NetScheduleJobDel(LPCWSTR,DWORD,DWORD); NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); #ifdef __cplusplus

1 0

Zhenbo Li : mshtml: Added IHTMLTable::align property implementation.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 911adfbb2346831368b6f36d2e5e0d0f9ab3208d URL: http://source.winehq.org/git/wine.git/?a=commit;h=911adfbb2346831368b6f36d2… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Mar 21 20:29:00 2014 +0800 mshtml: Added IHTMLTable::align property implementation. --- dlls/mshtml/htmltable.c | 27 +++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 13 +++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 64157e7..e3a1264 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -302,15 +302,34 @@ static HRESULT WINAPI HTMLTable_get_borderColorDark(IHTMLTable *iface, VARIANT * static HRESULT WINAPI HTMLTable_put_align(IHTMLTable *iface, BSTR v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&val, v); + + nsres = nsIDOMHTMLTableElement_SetAlign(This->nstable, &val); + nsAString_Finish(&val); + if (NS_FAILED(nsres)){ + ERR("Set Align(%s) failed!\n", debugstr_w(v)); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLTable_get_align(IHTMLTable *iface, BSTR *p) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&val, NULL); + nsres = nsIDOMHTMLTableElement_GetAlign(This->nstable, &val); + + return return_nsstr(nsres, &val, p); } static HRESULT WINAPI HTMLTable_refresh(IHTMLTable *iface) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2a96ad8..2cb0087 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5693,6 +5693,7 @@ static void test_table_elem(IHTMLElement *elem) IHTMLDOMNode *node; VARIANT v; HRESULT hres; + BSTR bstr; static const elem_type_t row_types[] = {ET_TR,ET_TR}; static const elem_type_t all_types[] = {ET_TBODY,ET_TR,ET_TR,ET_TD,ET_TD}; @@ -5746,6 +5747,18 @@ static void test_table_elem(IHTMLElement *elem) test_table_cell_spacing(table, "11"); VariantClear(&v); + bstr = a2bstr("left"); + hres = IHTMLTable_put_align(table, bstr); + ok(hres == S_OK, "set_align failed: %08x\n", hres); + SysFreeString(bstr); + + bstr = NULL; + hres = IHTMLTable_get_align(table, &bstr); + ok(hres == S_OK, "get_align failed: %08x\n", hres); + ok(bstr != NULL, "get_align returned NULL\n"); + ok(!strcmp_wa(bstr, "left"), "get_align returned %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + IHTMLTable_Release(table); }

1 0