wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

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 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

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

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

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

Ken Thomases : winex11: Don' t reset OpenGL swap interval of window on SetParent().
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 6696e7d9e1b59c22b8842803670ed917ebb2a3d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6696e7d9e1b59c22b88428036… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Mar 21 00:18:58 2014 -0500 winex11: Don't reset OpenGL swap interval of window on SetParent(). --- dlls/opengl32/tests/opengl.c | 16 +++++++++++++--- dlls/winex11.drv/opengl.c | 8 ++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 4303d1c..7384cb4 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1509,7 +1509,7 @@ static void test_swap_control(HDC oldhdc) 0, 0, 0 /* layer masks */ }; int pixel_format; - HWND window1, window2; + HWND window1, window2, old_parent; HGLRC ctx1, ctx2, oldctx; BOOL ret; HDC dc1, dc2; @@ -1550,7 +1550,7 @@ static void test_swap_control(HDC oldhdc) ok(ret, "Failed to set swap interval to 0, last error %#x.\n", GetLastError()); interval = pwglGetSwapIntervalEXT(); - ok(interval == 0, "Expected default swap interval 0, got %d\n", interval); + ok(interval == 0, "Expected swap interval 0, got %d\n", interval); /* Check what interval we get on a second context on the same drawable.*/ ctx2 = wglCreateContext(dc1); @@ -1582,7 +1582,17 @@ static void test_swap_control(HDC oldhdc) * is not global or shared among contexts. */ interval = pwglGetSwapIntervalEXT(); - ok(interval == 1, "Expected swap interval 1, got %d\n", interval); + ok(interval == 1, "Expected default swap interval 1, got %d\n", interval); + + /* Test if setting the parent of a window resets the swap interval. */ + ret = wglMakeCurrent(dc1, ctx1); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + old_parent = SetParent(window1, window2); + ok(!!old_parent, "Failed to make window1 a child of window2, last error %#x.\n", GetLastError()); + + interval = pwglGetSwapIntervalEXT(); + ok(interval == 0, "Expected swap interval 0, got %d\n", interval); ret = wglDeleteContext(ctx1); ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d06565a..759e51f 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1253,10 +1253,6 @@ static void free_gl_drawable( struct gl_drawable *gl ) static BOOL create_gl_drawable( HWND hwnd, HWND parent, struct gl_drawable *gl ) { gl->drawable = 0; - /* Default GLX and WGL swap interval is 1, but in case of glXSwapIntervalSGI - * there is no way to query it, so we have to store it here. - */ - gl->swap_interval = 1; if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ { @@ -1331,6 +1327,10 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) struct gl_drawable *gl, *prev; gl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*gl) ); + /* Default GLX and WGL swap interval is 1, but in case of glXSwapIntervalSGI + * there is no way to query it, so we have to store it here. + */ + gl->swap_interval = 1; gl->format = format; gl->visual = pglXGetVisualFromFBConfig( gdi_display, format->fbconfig ); if (!gl->visual)

1 0

Ken Thomases : winemac: Make the swap interval a property of the window, not the context.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 15612dd762e1948d7bb0bd4b061ecd7d180553a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15612dd762e1948d7bb0bd4b0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Mar 21 00:15:37 2014 -0500 winemac: Make the swap interval a property of the window, not the context. --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/opengl.c | 198 +++++++++++++++++++++++++++++++++++---------- dlls/winemac.drv/window.c | 1 + 3 files changed, 156 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15612dd762e1948d7bb0b…

1 0

Ken Thomases : winemac: Fix wglSwapBuffers() to operate on the HDC, not the current GL context.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 5943c58094b2118a3ede32f407a443164883846f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5943c58094b2118a3ede32f40… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Mar 21 00:15:32 2014 -0500 winemac: Fix wglSwapBuffers() to operate on the HDC, not the current GL context. --- dlls/winemac.drv/opengl.c | 49 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 48fe4b7..f1a3a79 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -3553,17 +3553,58 @@ static BOOL macdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de static BOOL macdrv_wglSwapBuffers(HDC hdc) { struct wgl_context *context = NtCurrentTeb()->glContext; + BOOL match = FALSE; + HWND hwnd; TRACE("hdc %p context %p/%p/%p\n", hdc, context, (context ? context->context : NULL), (context ? context->cglcontext : NULL)); - if (!context) + if ((hwnd = WindowFromDC(hdc))) { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + struct macdrv_win_data *data; + + if (!(data = get_win_data(hwnd))) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (context && context->draw_view == data->gl_view) + match = TRUE; + + release_win_data(data); + } + else + { + struct wgl_pbuffer *pbuffer; + + EnterCriticalSection(&dc_pbuffers_section); + pbuffer = (struct wgl_pbuffer*)CFDictionaryGetValue(dc_pbuffers, hdc); + LeaveCriticalSection(&dc_pbuffers_section); + + if (!pbuffer) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (context && context->draw_pbuffer == pbuffer) + match = TRUE; + } + + if (match) + macdrv_flush_opengl_context(context->context); + else + { + FIXME("current context %p doesn't match hdc %p; can't swap\n", context, hdc); + + /* If there is a current context, then wglSwapBuffers should do an implicit + glFlush(). That would be taken care of by macdrv_flush_opengl_context() + in the other branch, but we have to do it explicitly here. */ + if (context) + pglFlush(); } - macdrv_flush_opengl_context(context->context); return TRUE; }

1 0

Eriks Dobelis : wintab32: Fix pkSerialNumber typo.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: 819943063d0c48b610af8ced9e81dd8dd4867eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=819943063d0c48b610af8ced9… Author: Eriks Dobelis <eriks.dobelis(a)biti.lv> Date: Thu Mar 20 09:16:22 2014 +0200 wintab32: Fix pkSerialNumber typo. --- dlls/wintab32/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 7278373..9bc29a4 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -313,7 +313,7 @@ static LPVOID TABLET_CopyPacketData(LPOPENCONTEXT context, LPVOID lpPkt, if (context->context.lcPktData & PK_CHANGED) ptr+=CopyTabletData(ptr,&wtp->pkChanged,sizeof(WTPKT)); if (context->context.lcPktData & PK_SERIAL_NUMBER) - ptr+=CopyTabletData(ptr,&wtp->pkChanged,sizeof(UINT)); + ptr+=CopyTabletData(ptr,&wtp->pkSerialNumber,sizeof(UINT)); if (context->context.lcPktData & PK_CURSOR) ptr+=CopyTabletData(ptr,&wtp->pkCursor,sizeof(UINT)); if (context->context.lcPktData & PK_BUTTONS)

1 0

Alistair Leslie-Hughes : netcfgx: Register interfaces.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: 06cbe44c45bd9c0fa4f1ad1713df478c828928f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06cbe44c45bd9c0fa4f1ad171… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 20 10:19:14 2014 +1100 netcfgx: Register interfaces. --- configure | 2 +- configure.ac | 2 +- dlls/netcfgx/Makefile.in | 2 ++ dlls/netcfgx/netcfgx_classes.idl | 21 +++++++++++++++++++++ include/netcfgx.idl | 1 + 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 847dbee..0c83270 100755 --- a/configure +++ b/configure @@ -17023,7 +17023,7 @@ wine_fn_config_dll msxml6 enable_msxml6 clean wine_fn_config_dll nddeapi enable_nddeapi implib wine_fn_config_dll netapi32 enable_netapi32 implib wine_fn_config_test dlls/netapi32/tests netapi32_test -wine_fn_config_dll netcfgx enable_netcfgx +wine_fn_config_dll netcfgx enable_netcfgx clean wine_fn_config_dll newdev enable_newdev implib wine_fn_config_dll normaliz enable_normaliz implib wine_fn_config_dll npmshtml enable_npmshtml diff --git a/configure.ac b/configure.ac index 4a7bca2..09c7e5a 100644 --- a/configure.ac +++ b/configure.ac @@ -3027,7 +3027,7 @@ WINE_CONFIG_DLL(msxml6,,[clean]) WINE_CONFIG_DLL(nddeapi,,[implib]) WINE_CONFIG_DLL(netapi32,,[implib]) WINE_CONFIG_TEST(dlls/netapi32/tests) -WINE_CONFIG_DLL(netcfgx) +WINE_CONFIG_DLL(netcfgx,,[clean]) WINE_CONFIG_DLL(newdev,,[implib]) WINE_CONFIG_DLL(normaliz,,[implib]) WINE_CONFIG_DLL(npmshtml) diff --git a/dlls/netcfgx/Makefile.in b/dlls/netcfgx/Makefile.in index 22b10ae..29277db 100644 --- a/dlls/netcfgx/Makefile.in +++ b/dlls/netcfgx/Makefile.in @@ -2,3 +2,5 @@ MODULE = netcfgx.dll C_SRCS = \ main.c + +IDL_SRCS = netcfgx_classes.idl diff --git a/dlls/netcfgx/netcfgx_classes.idl b/dlls/netcfgx/netcfgx_classes.idl new file mode 100644 index 0000000..3dd64bb --- /dev/null +++ b/dlls/netcfgx/netcfgx_classes.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2014 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +#include "netcfgx.idl" diff --git a/include/netcfgx.idl b/include/netcfgx.idl index c465410..75c0a94 100644 --- a/include/netcfgx.idl +++ b/include/netcfgx.idl @@ -106,6 +106,7 @@ interface INetCfg : IUnknown }; [ + helpstring("Network Configuration Component Object"), threading(both), uuid(5b035261-40f9-11d1-aaec-00805fc1270e) ]

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2014