April 2013 - Wine-commits - list.winehq.org

Michael Stefaniuc : dsound/tests: Skip tests if there is no default device.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 7f652810562fc3e0158b35ab29e17e5a82bb76b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f652810562fc3e0158b35ab2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 22 00:19:47 2013 +0200 dsound/tests: Skip tests if there is no default device. --- dlls/dsound/tests/dsound8.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 664ba0c..e22265b 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1095,6 +1095,10 @@ static void test_first_device(void) hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eRender, eMultimedia, &defdev); + if (hr == E_NOTFOUND) { + win_skip("No default device found\n"); + return; + } ok(hr == S_OK, "GetDefaultAudioEndpoint failed: %08x\n", hr); hr = IMMDevice_OpenPropertyStore(defdev, STGM_READ, &ps);

1 0

Alistair Leslie-Hughes : oledb32: Implement GetConversionSize DBTYPE_WSTR-> DBTYPE_WSTR.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: dd104f6735960656c3174942a1d9d4528821d583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd104f6735960656c3174942a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 19 14:22:10 2013 +1000 oledb32: Implement GetConversionSize DBTYPE_WSTR->DBTYPE_WSTR. --- dlls/oledb32/convert.c | 16 ++++++++++++++++ dlls/oledb32/tests/convert.c | 19 +++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 3b3f9df..b55c0d9 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1095,6 +1095,22 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, } } break; + case DBTYPE_WSTR: + { + switch (src_type) + { + case DBTYPE_WSTR: + if(src_len) + *dst_len = (*src_len) + sizeof(WCHAR); + else + *dst_len = (lstrlenW(src) + 1) * sizeof(WCHAR); + break; + default: + FIXME("unimplemented for %04x -> DBTYPE_WSTR\n", src_type); + return E_NOTIMPL; + } + } + break; default: FIXME("unimplemented for conversion %d->%d\n", src_type, dst_type); return E_NOTIMPL; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 4f50a77..65bd075 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2480,8 +2480,10 @@ static void test_getconversionsize(void) { IDataConvert *convert; DBLENGTH dst_len; + DBLENGTH src_len; HRESULT hr; BSTR str; + static WCHAR strW[] = {'t','e','s','t',0}; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); if(FAILED(hr)) @@ -2511,6 +2513,23 @@ static void test_getconversionsize(void) ok(dst_len == sizeof(VARIANT), "%ld\n", dst_len); SysFreeString(str); + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_WSTR, DBTYPE_WSTR, NULL, &dst_len, strW); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 10, "%ld\n", dst_len); + + dst_len = 0; + src_len = 2; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_WSTR, DBTYPE_WSTR, &src_len, &dst_len, strW); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 4, "%ld\n", dst_len); + + dst_len = 0; + src_len = 20; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_WSTR, DBTYPE_WSTR, &src_len, &dst_len, strW); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 22, "%ld\n", dst_len); + IDataConvert_Release(convert); }

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_I8-> DBTYPE_VARIANT.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 01c282550b900e345b80bba04562c290722cd352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c282550b900e345b80bba04… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 18 09:54:09 2013 +1000 oledb32: Implement DataConvert DBTYPE_I8->DBTYPE_VARIANT. --- dlls/oledb32/convert.c | 4 ++++ dlls/oledb32/tests/convert.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index b55c0d9..37ae25e 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -757,6 +757,10 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, V_I4(v) = *(signed int*)src; hr = S_OK; break; + case DBTYPE_I8: + V_VT(v) = VT_DECIMAL; + hr = VarDecFromI8( *(LONGLONG*)src, &V_DECIMAL(v)); + break; case DBTYPE_BSTR: { BSTR s = *(WCHAR**)src; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 65bd075..2a4caf2 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2544,6 +2544,7 @@ static void test_converttovar(void) CY cy, cy2; DATE date; INT i4; + LARGE_INTEGER i8; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); if(FAILED(hr)) @@ -2574,6 +2575,19 @@ static void test_converttovar(void) V_VT(&dst) = VT_EMPTY; dst_len = 0; dst_status = DBSTATUS_S_DEFAULT; + i8.QuadPart = 12345; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_I8, DBTYPE_VARIANT, sizeof(i8), &dst_len, &i8, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_DECIMAL, "got %d\n", V_VT(&dst)); + ok(S(U(V_DECIMAL(&dst))).scale == 0 && S(U(V_DECIMAL(&dst))).sign == 0 && + V_DECIMAL(&dst).Hi32 == 0 && U1(V_DECIMAL(&dst)).Lo64 == 12345, "Not Equal\n"); + + V_VT(&dst) = VT_EMPTY; + dst_len = 0; + dst_status = DBSTATUS_S_DEFAULT; i4 = 123; hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_VARIANT, sizeof(i4), &dst_len, &i4, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr);

1 0

Henri Verbeet : wined3d: Get rid of the unused TRACE_STRIDED macro.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 82a06a0a366ff618787e47d00538680efec9f9a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a06a0a366ff618787e47d00… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 22 15:18:42 2013 +0200 wined3d: Get rid of the unused TRACE_STRIDED macro. --- dlls/wined3d/wined3d_private.h | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 17f3a68..39995a0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -863,12 +863,6 @@ do { \ #define checkGLcall(A) do {} while(0) #endif -/* Trace vector and strided data information */ -#define TRACE_STRIDED(si, name) do { if (si->use_map & (1 << name)) \ - TRACE( #name " = (data {%#x:%p}, stride %d, format %s, stream %u)\n", \ - si->elements[name].data.buffer_object, si->elements[name].data.addr, si->elements[name].stride, \ - debug_d3dformat(si->elements[name].format->id), si->elements[name].stream_idx); } while(0) - /* Global variables */ extern const struct wined3d_matrix identity DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Rename the device "strided_streams" field to " stream_info".
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: c756496326b23bc61dc1d8e2bebf6f12ee98752c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c756496326b23bc61dc1d8e2b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 22 15:18:43 2013 +0200 wined3d: Rename the device "strided_streams" field to "stream_info". The "strided" in there is mostly historic, it hasn't really been accurate for a while now. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 12 +++--------- dlls/wined3d/state.c | 22 +++++++++++----------- dlls/wined3d/wined3d_private.h | 2 +- 9 files changed, 22 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c756496326b23bc61dc1d…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMFRAME3.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 65f9ddc2ca8ab0591e038f7d2ae470375db531fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f9ddc2ca8ab0591e038f7d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 22 15:18:44 2013 +0200 d3drm: Avoid LPDIRECT3DRMFRAME3. --- dlls/d3drm/d3drm.c | 59 ++++++++++++++------------------ dlls/d3drm/frame.c | 83 +++++++++++++++------------------------------ dlls/d3drm/meshbuilder.c | 7 +--- dlls/d3drm/viewport.c | 21 +++-------- include/d3drm.h | 14 ++++--- include/d3drmobj.h | 46 +++++++++++++------------ 6 files changed, 94 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65f9ddc2ca8ab0591e038…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMVISUAL.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: c179bee49416b0403a8d6f1a86617704c0913d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c179bee49416b0403a8d6f1a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 22 15:18:45 2013 +0200 d3drm: Avoid LPDIRECT3DRMVISUAL. --- dlls/d3drm/d3drm.c | 32 +++++++++++++------------------- dlls/d3drm/frame.c | 26 ++++++++++++-------------- dlls/d3drm/tests/d3drm.c | 18 +++++++++--------- include/d3drm.h | 12 +++++++----- include/d3drmobj.h | 24 +++++++++++++----------- 5 files changed, 54 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c179bee49416b0403a8d6…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMMESH.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: cbf3ade4b933f4594ce17e9da803ed9bb3cdfba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf3ade4b933f4594ce17e9da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 22 15:18:46 2013 +0200 d3drm: Avoid LPDIRECT3DRMMESH. --- dlls/d3drm/d3drm.c | 24 +++++++++++------------- dlls/d3drm/meshbuilder.c | 26 +++++++++----------------- dlls/d3drm/tests/d3drm.c | 16 ++++++++-------- include/d3drm.h | 6 +++--- include/d3drmobj.h | 14 +++++++------- 5 files changed, 38 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbf3ade4b933f4594ce17…

1 0

Jacek Caban : mshtml: Clean up OleCommandTarget_Exec.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: f359360228e3ed62e63853eddd5a2da8e0429196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f359360228e3ed62e63853edd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 22 16:19:57 2013 +0200 mshtml: Clean up OleCommandTarget_Exec. --- dlls/mshtml/tests/htmldoc.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index ae8af82..de003f1 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2733,12 +2733,9 @@ static void test_save_history(IUnknown *unk) static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - if((!pguidCmdGroup || !IsEqualGUID(pguidCmdGroup, &CGID_Explorer)) - && (!pguidCmdGroup || !IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup) - || (nCmdID != 63 && (!is_refresh || nCmdID != 37)))) + if(!pguidCmdGroup) { test_readyState(NULL); - if(!pguidCmdGroup) { switch(nCmdID) { case OLECMDID_SETPROGRESSMAX: CHECK_EXPECT2(Exec_SETPROGRESSMAX); @@ -2825,6 +2822,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { + if(nCmdID != 63 && (!is_refresh || nCmdID != 37)) + test_readyState(NULL); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); switch(nCmdID) { @@ -2938,6 +2937,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { + test_readyState(NULL); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); switch(nCmdID) { @@ -2955,6 +2955,9 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID switch(nCmdID) { case DOCHOST_DOCCANNAVIGATE: CHECK_EXPECT(Exec_DOCCANNAVIGATE); + + test_readyState(NULL); + ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(pvaOut == NULL, "pvaOut != NULL\n"); ok(V_VT(pvaIn) == VT_UNKNOWN, "V_VT(pvaIn) != VT_UNKNOWN\n"); @@ -2967,6 +2970,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID VARIANT var; HRESULT hres; + test_readyState(NULL); + ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(pvaOut != NULL || broken(!pvaOut), "pvaOut != NULL\n"); ok(V_VT(pvaIn) == VT_ARRAY, "V_VT(pvaIn) = %d\n", V_VT(pvaIn)); @@ -3018,6 +3023,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_Explorer, pguidCmdGroup)) { + test_readyState(NULL); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); switch(nCmdID) { @@ -3047,6 +3053,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup)) { + test_readyState(NULL); + switch (nCmdID) { case OLECMDID_PAGEACTIONBLOCKED: /* win2k3 */ SET_EXPECT(SetStatusText);

1 0

Matteo Bruni : wined3d: Add ARB_internalformat_query2 GL extension.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 1d17176a0d1a09aff6b681428217ff4f70ae9f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d17176a0d1a09aff6b681428… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 19 19:06:12 2013 +0200 wined3d: Add ARB_internalformat_query2 GL extension. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_gl.h | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9b3ff1f..68016e0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -108,6 +108,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_half_float_pixel", ARB_HALF_FLOAT_PIXEL }, {"GL_ARB_half_float_vertex", ARB_HALF_FLOAT_VERTEX }, {"GL_ARB_instanced_arrays", ARB_INSTANCED_ARRAYS, }, + {"GL_ARB_internalformat_query2", ARB_INTERNALFORMAT_QUERY2, }, {"GL_ARB_map_buffer_alignment", ARB_MAP_BUFFER_ALIGNMENT }, {"GL_ARB_map_buffer_range", ARB_MAP_BUFFER_RANGE }, {"GL_ARB_multisample", ARB_MULTISAMPLE }, /* needs GLX_ARB_MULTISAMPLE as well */ diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 85756cb..f68fdc7 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -59,6 +59,7 @@ enum wined3d_gl_extension ARB_HALF_FLOAT_PIXEL, ARB_HALF_FLOAT_VERTEX, ARB_INSTANCED_ARRAYS, + ARB_INTERNALFORMAT_QUERY2, ARB_MAP_BUFFER_ALIGNMENT, ARB_MAP_BUFFER_RANGE, ARB_MULTISAMPLE, @@ -223,6 +224,10 @@ enum wined3d_gl_extension USE_GL_FUNC(glProgramParameteriARB) \ /* GL_ARB_instanced_arrays */ \ USE_GL_FUNC(glVertexAttribDivisorARB) \ + /* GL_ARB_internalformat_query */ \ + USE_GL_FUNC(glGetInternalformativ) \ + /* GL_ARB_internalformat_query2 */ \ + USE_GL_FUNC(glGetInternalformati64v) \ /* GL_ARB_map_buffer_range */ \ USE_GL_FUNC(glFlushMappedBufferRange) \ USE_GL_FUNC(glMapBufferRange) \

1 0