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

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

March 21, 2014

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

Frédéric Delanoy : qcap: Use BOOL type where appropriate.
by Alexandre Julliard March 21, 2014

March 21, 2014

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

Piotr Caban : msvcp110: Add _Xtime_get_ticks implementation.
by Alexandre Julliard March 21, 2014

March 21, 2014

Module: wine Branch: master Commit: 9183e5847d53994e78067e01fbf3d26d1e71033c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9183e5847d53994e78067e01f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 21 14:27:47 2014 +0100 msvcp110: Add _Xtime_get_ticks implementation. --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp90/misc.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index b9d520d..3bdff79 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3891,7 +3891,7 @@ @ stub _Xp_subx @ stub _Xtime_diff_to_millis @ stub _Xtime_diff_to_millis2 -@ stub _Xtime_get_ticks +@ cdecl _Xtime_get_ticks() @ stub __Wcrtomb_lk # extern _Zero @ cdecl towctrans(long long) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 185d452..f2ae32f 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -28,6 +28,12 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp); +#define SECSPERDAY 86400 +/* 1601 to 1970 is 369 years plus 89 leap days */ +#define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) +#define TICKSPERSEC 10000000 +#define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) + struct __Container_proxy; typedef struct { @@ -343,3 +349,14 @@ void __thiscall _Container_base12__Swap_all( if(that->proxy) that->proxy->cont = that; } + +/* _Xtime_get_ticks */ +LONGLONG __cdecl _Xtime_get_ticks(void) +{ + FILETIME ft; + + TRACE("\n"); + + GetSystemTimeAsFileTime(&ft); + return ((LONGLONG)ft.dwHighDateTime<<32) + ft.dwLowDateTime - TICKS_1601_TO_1970; +}

1 0

Jacek Caban : vbscript: Moved Error object implementation to global.c.
by Alexandre Julliard March 21, 2014

March 21, 2014

Module: wine Branch: master Commit: ce75124a741b709f7cf533b11600f5b03c1ca8d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce75124a741b709f7cf533b11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 21 14:36:45 2014 +0100 vbscript: Moved Error object implementation to global.c. --- dlls/vbscript/Makefile.in | 1 - dlls/vbscript/error.c | 91 --------------------------------------------- dlls/vbscript/global.c | 62 +++++++++++++++++++++++++++++- 3 files changed, 61 insertions(+), 93 deletions(-) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index dd0c6d7..5ad0600 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -3,7 +3,6 @@ IMPORTS = oleaut32 ole32 user32 C_SRCS = \ compile.c \ - error.c \ global.c \ interp.c \ lex.c \ diff --git a/dlls/vbscript/error.c b/dlls/vbscript/error.c deleted file mode 100644 index 9739ba7..0000000 --- a/dlls/vbscript/error.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 2011 Jacek Caban for CodeWeavers - * - * 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 - */ - -#include "vbscript.h" -#include "vbscript_defs.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); - -static HRESULT Err_Description(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_HelpContext(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_HelpFile(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_Source(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_Clear(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_Raise(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static const builtin_prop_t err_props[] = { - {DISPID_ERR_DESCRIPTION, Err_Description, BP_GETPUT}, - {DISPID_ERR_HELPCONTEXT, Err_HelpContext, BP_GETPUT}, - {DISPID_ERR_HELPFILE, Err_HelpFile, BP_GETPUT}, - {DISPID_ERR_NUMBER, Err_Number, BP_GETPUT}, - {DISPID_ERR_SOURCE, Err_Source, BP_GETPUT}, - {DISPID_ERR_CLEAR, Err_Clear}, - {DISPID_ERR_RAISE, Err_Raise, 0, 5}, -}; - -HRESULT init_err(script_ctx_t *ctx) -{ - HRESULT hres; - - ctx->err_desc.ctx = ctx; - ctx->err_desc.builtin_prop_cnt = sizeof(err_props)/sizeof(*err_props); - ctx->err_desc.builtin_props = err_props; - - hres = get_typeinfo(ErrObj_tid, &ctx->err_desc.typeinfo); - if(FAILED(hres)) - return hres; - - return create_vbdisp(&ctx->err_desc, &ctx->err_obj); -} diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9d8f021..7846bc0 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1866,6 +1866,58 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBMSGBOXRTLREADING, NULL, BP_GET, VT_I4, MB_RTLREADING} }; +static HRESULT Err_Description(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_HelpContext(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_HelpFile(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Source(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Clear(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Raise(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const builtin_prop_t err_props[] = { + {DISPID_ERR_DESCRIPTION, Err_Description, BP_GETPUT}, + {DISPID_ERR_HELPCONTEXT, Err_HelpContext, BP_GETPUT}, + {DISPID_ERR_HELPFILE, Err_HelpFile, BP_GETPUT}, + {DISPID_ERR_NUMBER, Err_Number, BP_GETPUT}, + {DISPID_ERR_SOURCE, Err_Source, BP_GETPUT}, + {DISPID_ERR_CLEAR, Err_Clear}, + {DISPID_ERR_RAISE, Err_Raise, 0, 5}, +}; + HRESULT init_global(script_ctx_t *ctx) { HRESULT hres; @@ -1886,5 +1938,13 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - return init_err(ctx); + ctx->err_desc.ctx = ctx; + ctx->err_desc.builtin_prop_cnt = sizeof(err_props)/sizeof(*err_props); + ctx->err_desc.builtin_props = err_props; + + hres = get_typeinfo(ErrObj_tid, &ctx->err_desc.typeinfo); + if(FAILED(hres)) + return hres; + + return create_vbdisp(&ctx->err_desc, &ctx->err_obj); }

1 0

Jacek Caban : vbscript: Added Err.Clear implementation.
by Alexandre Julliard March 21, 2014

March 21, 2014

Module: wine Branch: master Commit: 171ddf5c57d41decdbee219122700d099345d4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=171ddf5c57d41decdbee21912… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 21 14:38:33 2014 +0100 vbscript: Added Err.Clear implementation. --- dlls/vbscript/global.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index c2b16e2..9b6ca48 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1907,8 +1907,13 @@ static HRESULT Err_Source(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARI static HRESULT Err_Clear(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!This->desc) + return E_UNEXPECTED; + + This->desc->ctx->err_number = S_OK; + return S_OK; } static HRESULT Err_Raise(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res)

1 0

Henri Verbeet : d3d9/tests: Use a separate device for cnd_test().
by Alexandre Julliard March 21, 2014

March 21, 2014

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

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

March 21, 2014

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: Fix wglSwapBuffers() to operate on the HDC, not the current GL context.
by Alexandre Julliard March 21, 2014

March 21, 2014

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 March 20, 2014

March 20, 2014

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

Stefan Dösinger : wined3d: Remove the version parameter.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: wine Branch: master Commit: 938529e1f91d4b3dce1f4526f2a68e4243926f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=938529e1f91d4b3dce1f4526f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 20 15:51:45 2014 +0100 wined3d: Remove the version parameter. --- dlls/d3d8/directx.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/ddraw/ddraw.c | 4 ++-- dlls/ddraw/main.c | 4 ++-- dlls/dxgi/factory.c | 2 +- dlls/wined3d/directx.c | 3 +-- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 3 +-- include/wine/wined3d.h | 2 +- 10 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 4aac722..7270881 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -410,7 +410,7 @@ BOOL d3d8_init(struct d3d8 *d3d8) d3d8->refcount = 1; wined3d_mutex_lock(); - d3d8->wined3d = wined3d_create(8, flags); + d3d8->wined3d = wined3d_create(flags); wined3d_mutex_unlock(); if (!d3d8->wined3d) return FALSE; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 79e9eb5..6280d12 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -644,7 +644,7 @@ BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) d3d9->refcount = 1; wined3d_mutex_lock(); - d3d9->wined3d = wined3d_create(9, flags); + d3d9->wined3d = wined3d_create(flags); wined3d_mutex_unlock(); if (!d3d9->wined3d) return FALSE; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index ed0606f..aa74a1e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4871,9 +4871,9 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->ref7 = 1; flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING; - if (!(ddraw->wined3d = wined3d_create(7, flags))) + if (!(ddraw->wined3d = wined3d_create(flags))) { - if (!(ddraw->wined3d = wined3d_create(7, flags | WINED3D_NO3D))) + if (!(ddraw->wined3d = wined3d_create(flags | WINED3D_NO3D))) { WARN("Failed to create a wined3d object.\n"); return E_FAIL; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 3bcd9b8..68bf3e3 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -408,9 +408,9 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex FIXME("flags 0x%08x not handled\n", flags & ~DDENUM_ATTACHEDSECONDARYDEVICES); TRACE("Enumerating ddraw interfaces\n"); - if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS))) + if (!(wined3d = wined3d_create(WINED3D_LEGACY_DEPTH_BIAS))) { - if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D))) + if (!(wined3d = wined3d_create(WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D))) { WARN("Failed to create a wined3d object.\n"); return E_FAIL; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index ac2450e..98d036e 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -329,7 +329,7 @@ static HRESULT dxgi_factory_init(struct dxgi_factory *factory, BOOL extended) factory->refcount = 1; EnterCriticalSection(&dxgi_cs); - factory->wined3d = wined3d_create(10, 0); + factory->wined3d = wined3d_create(0); if (!factory->wined3d) { LeaveCriticalSection(&dxgi_cs); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eaf2427..ef81278 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5204,9 +5204,8 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = wined3d_null_wined3d_object_destroyed, }; -HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags) +HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) { - wined3d->dxVersion = version; wined3d->ref = 1; wined3d->flags = flags; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3a6dd33..3243f77 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -6,7 +6,7 @@ @ cdecl wined3d_check_device_format_conversion(ptr long long long long) @ cdecl wined3d_check_device_multisample_type(ptr long long long long long ptr) @ cdecl wined3d_check_device_type(ptr long long long long long) -@ cdecl wined3d_create(long long) +@ cdecl wined3d_create(long) @ cdecl wined3d_decref(ptr) @ cdecl wined3d_enum_adapter_modes(ptr long long long long ptr) @ cdecl wined3d_get_adapter_count(ptr) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index a0ecfa7..7ab2448 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -87,7 +87,7 @@ struct wined3d_settings wined3d_settings = FALSE, /* 3D support enabled by default. */ }; -struct wined3d * CDECL wined3d_create(UINT version, DWORD flags) +struct wined3d * CDECL wined3d_create(DWORD flags) { struct wined3d *object; HRESULT hr; @@ -99,10 +99,10 @@ struct wined3d * CDECL wined3d_create(UINT version, DWORD flags) return NULL; } - if (version == 7 && wined3d_settings.no_3d) + if (wined3d_settings.no_3d) flags |= WINED3D_NO3D; - hr = wined3d_init(object, version, flags); + hr = wined3d_init(object, flags); if (FAILED(hr)) { WARN("Failed to initialize wined3d object, hr %#x.\n", hr); @@ -110,7 +110,7 @@ struct wined3d * CDECL wined3d_create(UINT version, DWORD flags) return NULL; } - TRACE("Created wined3d object %p for d3d%d support.\n", object, version); + TRACE("Created wined3d object %p.\n", object); return object; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ff31ebc..0199ef8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1785,12 +1785,11 @@ struct wined3d { LONG ref; DWORD flags; - UINT dxVersion; UINT adapter_count; struct wined3d_adapter adapters[1]; }; -HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags) DECLSPEC_HIDDEN; +HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) DECLSPEC_HIDDEN; BOOL wined3d_register_window(HWND window, struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7bb37d6..e6fa2d1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2024,7 +2024,7 @@ HRESULT __cdecl wined3d_check_device_multisample_type(const struct wined3d *wine HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, enum wined3d_format_id display_format_id, enum wined3d_format_id backbuffer_format_id, BOOL windowed); -struct wined3d * __cdecl wined3d_create(UINT version, DWORD flags); +struct wined3d * __cdecl wined3d_create(DWORD flags); ULONG __cdecl wined3d_decref(struct wined3d *wined3d); HRESULT __cdecl wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering,

1 0