wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Stefan Dösinger : port: Add isinf and isnan implementations for Visual Studio.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: a774152f1ad87db57787102620722384dcf9c329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a774152f1ad87db5778710262… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 24 21:05:28 2011 +0200 port: Add isinf and isnan implementations for Visual Studio. --- configure | 2 ++ configure.ac | 2 ++ include/config.h.in | 6 ++++++ libs/port/isinf.c | 8 ++++++++ libs/port/isnan.c | 8 ++++++++ 5 files changed, 26 insertions(+), 0 deletions(-) diff --git a/configure b/configure index efb2b1f..ea832b5 100755 --- a/configure +++ b/configure @@ -12803,6 +12803,8 @@ esac ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $BUILTINFLAG" for ac_func in \ + _finite \ + _isnan \ _pclose \ _popen \ _snprintf \ diff --git a/configure.ac b/configure.ac index ae44609..683bae9 100644 --- a/configure.ac +++ b/configure.ac @@ -1939,6 +1939,8 @@ dnl **** Check for functions **** ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $BUILTINFLAG" AC_CHECK_FUNCS(\ + _finite \ + _isnan \ _pclose \ _popen \ _snprintf \ diff --git a/include/config.h.in b/include/config.h.in index 4bdbc38..04507e0 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1151,6 +1151,12 @@ /* Define to 1 if you have the <zlib.h> header file. */ #undef HAVE_ZLIB_H +/* Define to 1 if you have the `_finite' function. */ +#undef HAVE__FINITE + +/* Define to 1 if you have the `_isnan' function. */ +#undef HAVE__ISNAN + /* Define to 1 if you have the `_pclose' function. */ #undef HAVE__PCLOSE diff --git a/libs/port/isinf.c b/libs/port/isinf.c index e0c35ad..fff24aa 100644 --- a/libs/port/isinf.c +++ b/libs/port/isinf.c @@ -31,6 +31,14 @@ int isinf(double x) return (!(finite(x) || isnand(x))); } +#elif defined(HAVE_FLOAT_H) && defined(HAVE__ISNAN) && defined(HAVE__FINITE) +#include <float.h> + +int isinf(double x) +{ + return (!(_finite(x) || _isnan(x))); +} + #else #error No isinf() implementation available. #endif diff --git a/libs/port/isnan.c b/libs/port/isnan.c index b2a1be6..c48dd41 100644 --- a/libs/port/isnan.c +++ b/libs/port/isnan.c @@ -31,6 +31,14 @@ int isnan(double x) return isnand(x); } +#elif defined(HAVE_FLOAT_H) && defined(HAVE__ISNAN) +#include <float.h> + +int isnan(double x) +{ + return _isnan(x); +} + #else #error No isnan() implementation available. #endif

1 0

Stefan Dösinger : d3d9: Use a pixel shader for the vs 3.0 input test.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: cf757a6361c87d4be76d8d82763a0d2f0a68643e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf757a6361c87d4be76d8d827… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 23 18:40:43 2011 +0200 d3d9: Use a pixel shader for the vs 3.0 input test. --- dlls/d3d9/tests/visual.c | 50 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index affd416..0f7e2ab 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5956,7 +5956,8 @@ static void test_compare_instructions(IDirect3DDevice9 *device) static void test_vshader_input(IDirect3DDevice9 *device) { - DWORD swapped_shader_code_3[] = { + static const DWORD swapped_shader_code_3[] = + { 0xfffe0300, /* vs_3_0 */ 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ 0x0200001f, 0x8000000a, 0xe00f0001, /* dcl_color o1 */ @@ -5968,7 +5969,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) 0x03000002, 0xe00f0001, 0x80e40001, 0x91e40002, /* sub o1, r1, v2 */ 0x0000ffff /* end */ }; - DWORD swapped_shader_code_1[] = { + static const DWORD swapped_shader_code_1[] = + { 0xfffe0101, /* vs_1_1 */ 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0000001f, 0x80000005, 0x900f0001, /* dcl_texcoord0 v1 */ @@ -5978,7 +5980,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) 0x00000002, 0xd00f0000, 0x80e40001, 0x91e40002, /* sub o1, r1, v2 */ 0x0000ffff /* end */ }; - DWORD swapped_shader_code_2[] = { + static const DWORD swapped_shader_code_2[] = + { 0xfffe0200, /* vs_2_0 */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000005, 0x900f0001, /* dcl_texcoord0 v1 */ @@ -5988,7 +5991,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) 0x03000002, 0xd00f0000, 0x80e40001, 0x91e40002, /* sub o1, r1, v2 */ 0x0000ffff /* end */ }; - DWORD texcoord_color_shader_code_3[] = { + static const DWORD texcoord_color_shader_code_3[] = + { 0xfffe0300, /* vs_3_0 */ 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ 0x0200001f, 0x8000000a, 0xe00f0001, /* dcl_color o1 */ @@ -5998,7 +6002,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) 0x02000001, 0xe00f0001, 0x90e40001, /* mov o1, v1 */ 0x0000ffff /* end */ }; - DWORD texcoord_color_shader_code_2[] = { + static const DWORD texcoord_color_shader_code_2[] = + { 0xfffe0200, /* vs_2_0 */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000005, 0x900f0001, /* dcl_texcoord v1 */ @@ -6006,7 +6011,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) 0x02000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ 0x0000ffff /* end */ }; - DWORD texcoord_color_shader_code_1[] = { + static const DWORD texcoord_color_shader_code_1[] = + { 0xfffe0101, /* vs_1_1 */ 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0000001f, 0x80000005, 0x900f0001, /* dcl_texcoord v1 */ @@ -6014,7 +6020,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ 0x0000ffff /* end */ }; - DWORD color_color_shader_code_3[] = { + static const DWORD color_color_shader_code_3[] = + { 0xfffe0300, /* vs_3_0 */ 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ 0x0200001f, 0x8000000a, 0xe00f0001, /* dcl_color o1 */ @@ -6024,23 +6031,33 @@ static void test_vshader_input(IDirect3DDevice9 *device) 0x03000005, 0xe00f0001, 0xa0e40000, 0x90e40001, /* mul o1, c0, v1 */ 0x0000ffff /* end */ }; - DWORD color_color_shader_code_2[] = { + static const DWORD color_color_shader_code_2[] = + { 0xfffe0200, /* vs_2_0 */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x8000000a, 0x900f0001, /* dcl_color v1 */ 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ - 0x03000005, 0xd00f0000, 0xa0e40000, 0x90e40001, /* mul oD0, c0, v1 */ + 0x03000005, 0xd00f0000, 0xa0e40000, 0x90e40001, /* mul oD0, c0, v1 */ 0x0000ffff /* end */ }; - DWORD color_color_shader_code_1[] = { + static const DWORD color_color_shader_code_1[] = + { 0xfffe0101, /* vs_1_1 */ 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0000001f, 0x8000000a, 0x900f0001, /* dcl_color v1 */ 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ - 0x00000005, 0xd00f0000, 0xa0e40000, 0x90e40001, /* mul oD0, c0, v1 */ + 0x00000005, 0xd00f0000, 0xa0e40000, 0x90e40001, /* mul oD0, c0, v1 */ + 0x0000ffff /* end */ + }; + static const DWORD ps3_code[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x8000000a, 0x900f0000, /* dcl_color0 v0 */ + 0x02000001, 0x800f0800, 0x90e40000, /* mov oC0, v0 */ 0x0000ffff /* end */ }; IDirect3DVertexShader9 *swapped_shader, *texcoord_color_shader, *color_color_shader; + IDirect3DPixelShader9 *ps; HRESULT hr; DWORD color; float quad1[] = { @@ -6159,12 +6176,17 @@ static void test_vshader_input(IDirect3DDevice9 *device) hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_color_float, &decl_color_float); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps3_code, &ps); + ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader returned %08x\n", hr); + for(i = 1; i <= 3; i++) { hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); ok(SUCCEEDED(hr), "IDirect3DDevice9_Clear returned %#x.\n", hr); if(i == 3) { hr = IDirect3DDevice9_CreateVertexShader(device, swapped_shader_code_3, &swapped_shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %08x\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); } else if(i == 2){ hr = IDirect3DDevice9_CreateVertexShader(device, swapped_shader_code_2, &swapped_shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %08x\n", hr); @@ -6309,6 +6331,7 @@ static void test_vshader_input(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); IDirect3DDevice9_SetVertexShader(device, NULL); + IDirect3DDevice9_SetPixelShader(device, NULL); IDirect3DDevice9_SetVertexDeclaration(device, NULL); IDirect3DVertexShader9_Release(swapped_shader); @@ -6322,6 +6345,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %08x\n", hr); hr = IDirect3DDevice9_CreateVertexShader(device, color_color_shader_code_3, &color_color_shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %08x\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); } else if(i == 2){ hr = IDirect3DDevice9_CreateVertexShader(device, texcoord_color_shader_code_2, &texcoord_color_shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %08x\n", hr); @@ -6372,6 +6397,7 @@ static void test_vshader_input(IDirect3DDevice9 *device) } IDirect3DDevice9_SetVertexShader(device, NULL); IDirect3DDevice9_SetVertexDeclaration(device, NULL); + IDirect3DDevice9_SetPixelShader(device, NULL); color = getPixelColor(device, 160, 360); ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0x80, 0x40), 1), @@ -6402,6 +6428,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) IDirect3DVertexDeclaration9_Release(decl_color_color); IDirect3DVertexDeclaration9_Release(decl_color_ubyte); IDirect3DVertexDeclaration9_Release(decl_color_float); + + IDirect3DPixelShader9_Release(ps); } static void srgbtexture_test(IDirect3DDevice9 *device)

1 0

Stefan Dösinger : d3d: Make the INTZ test more reliable.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: d8224118abba228b96d133a9c9c25878346272ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8224118abba228b96d133a9c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 23 22:45:50 2011 +0200 d3d: Make the INTZ test more reliable. --- dlls/d3d8/tests/visual.c | 24 ++++++++++++------------ dlls/d3d9/tests/visual.c | 26 +++++++++++++------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index d2ab518..1e48c03 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1706,10 +1706,10 @@ static void intz_test(IDirect3DDevice8 *device) } quad[] = { - { -1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f}, - { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f}, - { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}, - { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f}, + { -1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.5f}, + { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.5f}, + { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f}, + { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.5f}, }; struct { @@ -1718,14 +1718,14 @@ static void intz_test(IDirect3DDevice8 *device) } expected_colors[] = { - {400, 60, D3DCOLOR_ARGB(0x00, 0x9f, 0xff, 0x00)}, - {560, 180, D3DCOLOR_ARGB(0x00, 0xdf, 0x55, 0x00)}, - {560, 300, D3DCOLOR_ARGB(0x00, 0xdf, 0x66, 0x00)}, - {400, 420, D3DCOLOR_ARGB(0x00, 0x9f, 0xb6, 0x00)}, - {240, 420, D3DCOLOR_ARGB(0x00, 0x60, 0x6d, 0x00)}, - { 80, 300, D3DCOLOR_ARGB(0x00, 0x20, 0x33, 0x00)}, - { 80, 180, D3DCOLOR_ARGB(0x00, 0x20, 0x55, 0x00)}, - {240, 60, D3DCOLOR_ARGB(0x00, 0x60, 0xff, 0x00)}, + { 80, 100, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)}, + {240, 100, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)}, + {400, 100, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)}, + {560, 100, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, + { 80, 450, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)}, + {240, 450, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)}, + {400, 450, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)}, + {560, 450, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, }; IDirect3DSurface8 *original_ds, *original_rt, *rt; diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6b30f3e..affd416 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11099,7 +11099,7 @@ static void intz_test(IDirect3DDevice9 *device) 0x02000001, 0x80010001, 0x80e40000, /* mov r1.x, r0 */ 0x03010042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texldp r0, t0, s0 */ 0x02000001, 0x80020001, 0x80000000, /* mov r1.y, r0.x */ - 0x02000001, 0x800f0800, 0x80e40001, /* mov 0C0, r1 */ + 0x02000001, 0x800f0800, 0x80e40001, /* mov oC0, r1 */ 0x0000ffff, /* end */ }; struct @@ -11109,10 +11109,10 @@ static void intz_test(IDirect3DDevice9 *device) } quad[] = { - { -1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f}, - { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f}, - { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}, - { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f}, + { -1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.5f}, + { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.5f}, + { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f}, + { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.5f}, }; struct { @@ -11121,14 +11121,14 @@ static void intz_test(IDirect3DDevice9 *device) } expected_colors[] = { - {400, 60, D3DCOLOR_ARGB(0x00, 0x9f, 0xff, 0x00)}, - {560, 180, D3DCOLOR_ARGB(0x00, 0xdf, 0x55, 0x00)}, - {560, 300, D3DCOLOR_ARGB(0x00, 0xdf, 0x66, 0x00)}, - {400, 420, D3DCOLOR_ARGB(0x00, 0x9f, 0xb6, 0x00)}, - {240, 420, D3DCOLOR_ARGB(0x00, 0x60, 0x6d, 0x00)}, - { 80, 300, D3DCOLOR_ARGB(0x00, 0x20, 0x33, 0x00)}, - { 80, 180, D3DCOLOR_ARGB(0x00, 0x20, 0x55, 0x00)}, - {240, 60, D3DCOLOR_ARGB(0x00, 0x60, 0xff, 0x00)}, + { 80, 100, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)}, + {240, 100, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)}, + {400, 100, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)}, + {560, 100, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, + { 80, 450, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)}, + {240, 450, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)}, + {400, 450, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)}, + {560, 450, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, }; IDirect3DSurface9 *original_ds, *original_rt, *rt;

1 0

Andrew Eikum : winealsa.drv: Implement device enumeration.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 934a64cb3804e458da37b0f490b82633010293f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=934a64cb3804e458da37b0f49… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 24 13:59:36 2011 -0500 winealsa.drv: Implement device enumeration. --- dlls/winealsa.drv/mmdevdrv.c | 177 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 162 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 854f7b9..20958bf 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -134,6 +134,7 @@ static CRITICAL_SECTION g_sessions_lock; static struct list g_sessions = LIST_INIT(g_sessions); static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; +static const char defname[] = "default"; static const IAudioClientVtbl AudioClient_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; @@ -206,40 +207,186 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, +static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, + UINT *num, snd_ctl_t *ctl, int card, const WCHAR *cardnameW) +{ + static const WCHAR dashW[] = {' ','-',' ',0}; + int err, device; + snd_pcm_info_t *info; + + info = HeapAlloc(GetProcessHeap(), 0, snd_pcm_info_sizeof()); + if(!info) + return E_OUTOFMEMORY; + + snd_pcm_info_set_subdevice(info, 0); + snd_pcm_info_set_stream(info, + flow == eRender ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE); + + device = -1; + for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; + err = snd_ctl_pcm_next_device(ctl, &device)){ + const char *devname; + + snd_pcm_info_set_device(info, device); + + if((err = snd_ctl_pcm_info(ctl, info)) < 0){ + if(err == -ENOENT) + /* This device doesn't have the right stream direction */ + continue; + + WARN("Failed to get info for card %d, device %d: %d (%s)\n", + card, device, err, snd_strerror(err)); + continue; + } + + if(ids && keys){ + DWORD len, cardlen; + + devname = snd_pcm_info_get_name(info); + if(!devname){ + WARN("Unable to get device name for card %d, device %d\n", card, + device); + continue; + } + + cardlen = lstrlenW(cardnameW); + len = MultiByteToWideChar(CP_UNIXCP, 0, devname, -1, NULL, 0); + len += lstrlenW(dashW); + len += cardlen; + ids[*num] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if(!ids[*num]){ + HeapFree(GetProcessHeap(), 0, info); + return E_OUTOFMEMORY; + } + memcpy(ids[*num], cardnameW, cardlen * sizeof(WCHAR)); + memcpy(ids[*num] + cardlen, dashW, lstrlenW(dashW) * sizeof(WCHAR)); + cardlen += lstrlenW(dashW); + MultiByteToWideChar(CP_UNIXCP, 0, devname, -1, ids[*num] + cardlen, + len - cardlen); + + keys[*num] = HeapAlloc(GetProcessHeap(), 0, 32); + if(!keys[*num]){ + HeapFree(GetProcessHeap(), 0, info); + HeapFree(GetProcessHeap(), 0, ids[*num]); + return E_OUTOFMEMORY; + } + sprintf(keys[*num], "hw:%d,%d", card, device); + } + + ++(*num); + } + + HeapFree(GetProcessHeap(), 0, info); + + if(err != 0) + WARN("Got a failure during device enumeration on card %d: %d (%s)\n", + card, err, snd_strerror(err)); + + return S_OK; +} + +static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, + UINT *num) +{ + int err, card; + + card = -1; + *num = 0; + for(err = snd_card_next(&card); card != -1 && err >= 0; + err = snd_card_next(&card)){ + char cardpath[64]; + const char *cardname; + WCHAR *cardnameW; + snd_ctl_t *ctl; + DWORD len; + + sprintf(cardpath, "hw:%u", card); + + if((err = snd_ctl_open(&ctl, cardpath, 0)) < 0){ + WARN("Unable to open ctl for ALSA device %s: %d (%s)\n", cardpath, + err, snd_strerror(err)); + continue; + } + + if((err = snd_card_get_name(card, (char **)&cardname)) < 0){ + WARN("Unable to get card name for ALSA device %s: %d (%s)\n", + cardpath, err, snd_strerror(err)); + /* FIXME: Should be localized */ + cardname = "Unknown soundcard"; + } + + len = MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, NULL, 0); + cardnameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if(!cardnameW){ + snd_ctl_close(ctl); + return E_OUTOFMEMORY; + } + MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); + + alsa_get_card_devices(flow, ids, keys, num, ctl, card, cardnameW); + + HeapFree(GetProcessHeap(), 0, cardnameW); + + snd_ctl_close(ctl); + } + + if(err != 0) + WARN("Got a failure during card enumeration: %d (%s)\n", + err, snd_strerror(err)); + + return S_OK; +} + +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, UINT *num, UINT *def_index) { - TRACE("%d %p %p %p\n", flow, ids, num, def_index); + HRESULT hr; - *num = 1; - *def_index = 0; + TRACE("%d %p %p %p %p\n", flow, ids, keys, num, def_index); + + hr = alsa_enum_devices(flow, NULL, NULL, num); + if(FAILED(hr)) + return hr; - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); - if(!*ids) + *ids = HeapAlloc(GetProcessHeap(), 0, (*num + 1) * sizeof(WCHAR *)); + *keys = HeapAlloc(GetProcessHeap(), 0, (*num + 1) * sizeof(char *)); + if(!*ids || !*keys){ + HeapFree(GetProcessHeap(), 0, *ids); + HeapFree(GetProcessHeap(), 0, *keys); return E_OUTOFMEMORY; + } (*ids)[0] = HeapAlloc(GetProcessHeap(), 0, sizeof(defaultW)); - if(!(*ids)[0]){ + memcpy((*ids)[0], defaultW, sizeof(defaultW)); + (*keys)[0] = HeapAlloc(GetProcessHeap(), 0, sizeof(defname)); + memcpy((*keys)[0], defname, sizeof(defname)); + *def_index = 0; + + hr = alsa_enum_devices(flow, (*ids) + 1, (*keys) + 1, num); + if(FAILED(hr)){ + int i; + for(i = 0; i < *num; ++i){ + HeapFree(GetProcessHeap(), 0, (*ids)[i]); + HeapFree(GetProcessHeap(), 0, (*keys)[i]); + } HeapFree(GetProcessHeap(), 0, *ids); + HeapFree(GetProcessHeap(), 0, *keys); return E_OUTOFMEMORY; } - lstrcpyW((*ids)[0], defaultW); - - *keys = HeapAlloc(GetProcessHeap(), 0, sizeof(void *)); - (*keys)[0] = NULL; + ++(*num); /* for default device */ return S_OK; } -HRESULT WINAPI AUDDRV_GetAudioEndpoint(void *key, IMMDevice *dev, +HRESULT WINAPI AUDDRV_GetAudioEndpoint(const char *key, IMMDevice *dev, EDataFlow dataflow, IAudioClient **out) { ACImpl *This; int err; snd_pcm_stream_t stream; - TRACE("%p %p %d %p\n", key, dev, dataflow, out); + TRACE("\"%s\" %p %d %p\n", key, dev, dataflow, out); This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) @@ -262,10 +409,10 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(void *key, IMMDevice *dev, } This->dataflow = dataflow; - if((err = snd_pcm_open(&This->pcm_handle, "default", stream, + if((err = snd_pcm_open(&This->pcm_handle, key, stream, SND_PCM_NONBLOCK)) < 0){ HeapFree(GetProcessHeap(), 0, This); - WARN("Unable to open PCM \"default\": %d (%s)\n", err, + WARN("Unable to open PCM \"%s\": %d (%s)\n", key, err, snd_strerror(err)); return E_FAIL; }

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 32d7f32c9734defac31d592fcbd505cba16ee0e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d7f32c9734defac31d592fc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue May 24 20:20:32 2011 +0200 po: Update French translation. --- po/fr.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 6ac96d9..80ca780 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8480,18 +8480,19 @@ msgstr "La ligne d'entrée est trop longue.\n" #: hostname.rc:27 msgid "Usage: hostname\n" -msgstr "" +msgstr "Usage : hostname\n" #: hostname.rc:28 -#, fuzzy msgid "Error: Invalid option '%c'.\n" -msgstr "Erreur : nom de clé invalide\n" +msgstr "Erreur : option « %c » invalide.\n" #: hostname.rc:29 msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" msgstr "" +"Erreur : impossible de spécifier le nom d'hôte système avec l'utilitaire " +"hostname.\n" #: ipconfig.rc:27 msgid "Usage: ipconfig [ /? | /all ]\n"

1 0

Stefan Dösinger : wined3d: CMP supports _SAT.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: dbd878639424071e1d4c6cfc9bcc75906a4b2b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd878639424071e1d4c6cfc9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 22 13:54:57 2011 +0200 wined3d: CMP supports _SAT. This is a partial revert of c9ef1ed28c861bc862c92ff68aa37b4ddf01cc39. I don't know where I got the idea that CMP does not support _SAT, but I suspect that my driver at the time was broken. --- dlls/wined3d/arb_program_shader.c | 28 +++++++--------------------- 1 files changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cefb6e5..55435d4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1588,7 +1588,6 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) char src_name[3][50]; DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); - BOOL is_color; shader_arb_get_dst_param(ins, dst, dst_name); shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); @@ -1597,7 +1596,9 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) if (shader_version <= WINED3D_SHADER_VERSION(1, 3) && ins->coissue) { shader_addline(buffer, "MOV%s %s, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name[1]); - } else { + } + else + { struct wined3d_shader_src_param src0_copy = ins->src[0]; char extra_neg; @@ -1607,15 +1608,8 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &src0_copy, 0, src_name[0]); shader_arb_get_src_param(ins, &ins->src[2], 2, src_name[2]); shader_addline(buffer, "ADD TA, %c%s, coefdiv.x;\n", extra_neg, src_name[0]); - /* No modifiers supported on CMP */ - shader_addline(buffer, "CMP %s, TA, %s, %s;\n", dst_name, src_name[1], src_name[2]); - - /* _SAT on CMP doesn't make much sense, but it is not a pure NOP */ - if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) - { - shader_arb_get_register_name(ins, &dst->reg, src_name[0], &is_color); - shader_addline(buffer, "MOV_SAT %s, %s;\n", dst_name, dst_name); - } + shader_addline(buffer, "CMP%s %s, TA, %s, %s;\n", shader_arb_get_modifier(ins), + dst_name, src_name[1], src_name[2]); } } @@ -1625,7 +1619,6 @@ static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) struct wined3d_shader_buffer *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[3][50]; - BOOL is_color; shader_arb_get_dst_param(ins, dst, dst_name); @@ -1634,15 +1627,8 @@ static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); shader_arb_get_src_param(ins, &ins->src[2], 2, src_name[2]); - /* No modifiers are supported on CMP */ - shader_addline(buffer, "CMP %s, %s, %s, %s;\n", dst_name, - src_name[0], src_name[2], src_name[1]); - - if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) - { - shader_arb_get_register_name(ins, &dst->reg, src_name[0], &is_color); - shader_addline(buffer, "MOV_SAT %s, %s;\n", dst_name, src_name[0]); - } + shader_addline(buffer, "CMP%s %s, %s, %s, %s;\n", shader_arb_get_modifier(ins), + dst_name, src_name[0], src_name[2], src_name[1]); } /** Process the WINED3DSIO_DP2ADD instruction in ARB.

1 0

Aric Stewart : usp10/test: Add Tibetan shaping test.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: c5f2ac3eeaf778a1396295f6302f40af667c4920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f2ac3eeaf778a1396295f63… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 14:40:56 2011 -0500 usp10/test: Add Tibetan shaping test. --- dlls/usp10/tests/usp10.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 742dbec..b9e4ed5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -633,6 +633,28 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + /* Tibetan */ + static const WCHAR test_tibetan[] = {0x0f04, 0x0f05, 0x0f0e, 0x0020, 0x0f51, 0x0f7c, 0x0f53, 0x0f0b, 0x0f5a, 0x0f53, 0x0f0b, 0x0f51, 0x0f44, 0x0f0b, 0x0f54, 0x0f7c, 0x0f0d}; + static const shapeTest_char tibetan_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}},{3,{1,0}},{4,{0,0}},{4,{0,0}},{6,{0,0}},{7,{0,0}},{8,{0,0}},{9,{0,0}},{10,{0,0}},{11,{0,0}},{12,{0,0}},{13,{0,0}},{14,{0,0}},{14,{0,0}},{16,{0,0}}}; + static const shapeTest_glyph tibetan_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_BLANK,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -721,6 +743,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Microsoft Himalaya", 70, test_tibetan[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_tibetan, 17, &Control, &State, 0, 17, tibetan_c, tibetan_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10: Determine glyph properties after shaping for Tibetan script.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 2b3da5389cb0ceb182070a14a2a6f8ba6df2f4de URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b3da5389cb0ceb182070a14a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 14:40:50 2011 -0500 usp10: Determine glyph properties after shaping for Tibetan script. --- dlls/usp10/shape.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 047acc5..24e91f8 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -51,6 +51,7 @@ static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYS static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); +static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); extern const unsigned short wine_shaping_table[]; extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4]; @@ -399,8 +400,8 @@ static const ScriptShapeData ShapingData[] = {{ standard_features, 2}, NULL, "armn", NULL, NULL}, {{ standard_features, 2}, NULL, "geor", NULL, NULL}, {{ sinhala_features, 7}, NULL, "sinh", NULL, NULL}, - {{ tibetan_features, 2}, NULL, "tibt", NULL, ShapeCharGlyphProp_None}, - {{ tibetan_features, 2}, NULL, "tibt", NULL, ShapeCharGlyphProp_None}, + {{ tibetan_features, 2}, NULL, "tibt", NULL, ShapeCharGlyphProp_Tibet}, + {{ tibetan_features, 2}, NULL, "tibt", NULL, ShapeCharGlyphProp_Tibet}, {{ tibetan_features, 2}, NULL, "phag", ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, "thai", NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, "thai", NULL, ShapeCharGlyphProp_Thai}, @@ -1740,6 +1741,52 @@ static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); } +static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD* pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP* pGlyphProp) +{ + int i,k; + + for (i = 0; i < cGlyphs; i++) + { + int char_index[20]; + int char_count = 0; + + for (k = 0; k < cChars; k++) + { + if (pwLogClust[k] == i) + { + char_index[char_count] = k; + char_count++; + } + } + + if (char_count == 0) + { + FIXME("No chars in this glyph? Must be an error\n"); + continue; + } + + if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */ + { + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_BLANK; + pCharProp[char_index[0]].fCanGlyphAlone = 1; + } + else + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; + } + GDEF_UpdateGlyphProps(hdc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); + + /* Tibeten script does not set sva.fDiacritic or sva.fZeroWidth */ + for (i = 0; i < cGlyphs; i++) + { + if (!pGlyphProp[i].sva.fClusterStart) + { + pGlyphProp[i].sva.fDiacritic = 0; + pGlyphProp[i].sva.fZeroWidth = 0; + } + } +} + void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp) { if (ShapingData[psa->eScript].charGlyphPropProc)

1 0

Aric Stewart : usp10/test: Make sure to only trace on _test_shape_ok number of glyphs if font is not valid .
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 850336d936dd50231247e395b0dd200340f9745f URL: http://source.winehq.org/git/wine.git/?a=commit;h=850336d936dd50231247e395b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 14:40:28 2011 -0500 usp10/test: Make sure to only trace on _test_shape_ok number of glyphs if font is not valid. --- dlls/usp10/tests/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index ac78514..742dbec 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -367,7 +367,7 @@ static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, winetest_trace("%i: invalid fCanGlyphAlone\n",x); } - if(valid) + if (valid > 0) winetest_ok(nGlyphs == outnGlyphs, "got incorrect number of glyphs (%i)\n",outnGlyphs); else if (nGlyphs != outnGlyphs) winetest_trace("got incorrect number of glyphs (%i)\n",outnGlyphs);

1 0

Nikolay Sivov : comctl32/treeview: TVM_EXPAND with TVE_TOGGLE action shouldn' t always notify as it does on user input.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: bcb98d11ba6702165bf80e0fbc2b3aaef7b43c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb98d11ba6702165bf80e0fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 24 13:25:47 2011 +0400 comctl32/treeview: TVM_EXPAND with TVE_TOGGLE action shouldn't always notify as it does on user input. --- dlls/comctl32/tests/treeview.c | 33 +++++++++++++++++++++++++-------- dlls/comctl32/treeview.c | 10 +++++----- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 0437d65..5fd26a0 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1302,12 +1302,12 @@ static void test_expandnotify(void) item.state = TVIS_EXPANDED; ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); ok((item.state & TVIS_EXPANDED) == 0, "expected collapsed\n"); /* preselect root node here */ ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); g_get_from_expand = TRUE; /* expand */ @@ -1315,7 +1315,7 @@ static void test_expandnotify(void) g_item_expanding.state = 0xdeadbeef; g_item_expanded.state = 0xdeadbeef; ret = SendMessageA(hTree, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); ok(g_item_expanding.state == TVIS_SELECTED, "got state on TVN_ITEMEXPANDING 0x%08x\n", g_item_expanding.state); ok(g_item_expanded.state == (TVIS_SELECTED|TVIS_EXPANDED), "got state on TVN_ITEMEXPANDED 0x%08x\n", @@ -1326,16 +1326,16 @@ static void test_expandnotify(void) /* check that it's expanded */ item.state = TVIS_EXPANDED; ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); ok((item.state & TVIS_EXPANDED) == TVIS_EXPANDED, "expected expanded\n"); /* collapse */ flush_sequences(sequences, NUM_MSG_SEQUENCES); ret = SendMessageA(hTree, TVM_EXPAND, TVE_COLLAPSE, (LPARAM)hRoot); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); item.state = TVIS_EXPANDED; ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); ok((item.state & TVIS_EXPANDED) == 0, "expected collapsed\n"); /* all next collapse/expand attempts won't produce any notifications, the only way is to reset with all children removed */ @@ -1345,7 +1345,7 @@ static void test_expandnotify(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); ret = SendMessageA(hTree, TVM_EXPAND, TVE_TOGGLE, (LPARAM)hChild); expect(FALSE, ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "toggle node without children", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "toggle node without children", FALSE); DestroyWindow(hTree); @@ -1354,8 +1354,25 @@ static void test_expandnotify(void) fill_tree(hTree); g_get_rect_in_expand = TRUE; ret = TreeView_Select(hTree, hChild, TVGN_CARET); + expect(TRUE, ret); g_get_rect_in_expand = FALSE; - ok(ret, "got %d\n", ret); + + DestroyWindow(hTree); + + /* TVE_TOGGLE acts as any other TVM_EXPAND */ + hTree = create_treeview_control(0); + fill_tree(hTree); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, TVM_EXPAND, TVE_TOGGLE, (LPARAM)hRoot); + expect(TRUE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_seq, "toggle node (expand)", FALSE); + + /* toggle again - no notifications */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, TVM_EXPAND, TVE_TOGGLE, (LPARAM)hRoot); + expect(TRUE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "toggle node (collapse)", FALSE); DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 2388d3c..bd65fca 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3489,14 +3489,14 @@ static void TREEVIEW_SingleExpand(TREEVIEW_INFO *infoPtr, } static BOOL -TREEVIEW_Toggle(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, BOOL bUser) +TREEVIEW_Toggle(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, BOOL user) { - TRACE("\n"); + TRACE("item=%p, user=%d\n", item, user); if (item->state & TVIS_EXPANDED) - return TREEVIEW_Collapse(infoPtr, item, FALSE, bUser); + return TREEVIEW_Collapse(infoPtr, item, FALSE, user); else - return TREEVIEW_Expand(infoPtr, item, FALSE, bUser); + return TREEVIEW_Expand(infoPtr, item, FALSE, user); } static VOID @@ -3538,7 +3538,7 @@ TREEVIEW_ExpandMsg(TREEVIEW_INFO *infoPtr, UINT flag, HTREEITEM item) FALSE); case TVE_TOGGLE: - return TREEVIEW_Toggle(infoPtr, item, TRUE); + return TREEVIEW_Toggle(infoPtr, item, FALSE); default: return 0;

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
95
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 May 2011