February 2015 - Wine-Commits

Alex Henrie : cryptui: Fix grammar in warning message.
by Alexandre Julliard Feb. 20, 2015

Feb. 20, 2015

1 0

Nikolay Sivov : wshom.ocx: Silence class factory QI fixme.
by Alexandre Julliard Feb. 20, 2015

Feb. 20, 2015

Module: wine Branch: master Commit: d91ba373b71bf425204281fad1f8b53b5a689023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d91ba373b71bf425204281fad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 19 19:54:25 2015 +0300 wshom.ocx: Silence class factory QI fixme. --- dlls/wshom.ocx/wshom_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 8400f83..118b6c9 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -114,7 +114,7 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r return S_OK; } - FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + WARN("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); return E_NOINTERFACE; }

1 0

Tag wine-1.7.37 : Alexandre Julliard : Release 1.7.37
by Alexandre Julliard Feb. 20, 2015

Feb. 20, 2015

Module: wine Branch: refs/tags/wine-1.7.37 Tag: 3ffe76280d4aff71c6e58cb84f6c5b76d8c2a806 URL: http://source.winehq.org/git/wine.git/?a=tag;h=3ffe76280d4aff71c6e58cb84f6c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 20 23:23:03 2015 +0900 Release 1.7.37

1 0

Mark Harmstone : winecfg: Draw colour button using theme.
by Alexandre Julliard Feb. 20, 2015

Feb. 20, 2015

Module: wine Branch: master Commit: b467908ea4a7d1f731265a08dead57a894f7b989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b467908ea4a7d1f731265a08d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Fri Feb 20 00:03:58 2015 +0000 winecfg: Draw colour button using theme. --- programs/winecfg/theme.c | 58 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 0618974..79c8b7c 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1070,14 +1070,52 @@ static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) if (draw_info->CtlID == IDC_SYSPARAM_COLOR) { - UINT state = DFCS_ADJUSTRECT | DFCS_BUTTONPUSH; + UINT state; + HTHEME theme; + RECT buttonrect; - if (draw_info->itemState & ODS_DISABLED) - state |= DFCS_INACTIVE; - else - state |= draw_info->itemState & ODS_SELECTED ? DFCS_PUSHED : 0; + theme = OpenThemeData(draw_info->hwndItem, WC_BUTTONW); - DrawFrameControl(draw_info->hDC, &draw_info->rcItem, DFC_BUTTON, state); + if (theme) { + MARGINS margins; + + if (draw_info->itemState & ODS_DISABLED) + state = PBS_DISABLED; + else if (draw_info->itemState & ODS_SELECTED) + state = PBS_PRESSED; + else + state = PBS_NORMAL; + + if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) + DrawThemeParentBackground(draw_info->hwndItem, draw_info->hDC, NULL); + + DrawThemeBackground(theme, draw_info->hDC, BP_PUSHBUTTON, state, &draw_info->rcItem, NULL); + + buttonrect = draw_info->rcItem; + + GetThemeMargins(theme, draw_info->hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, &draw_info->rcItem, &margins); + + buttonrect.left += margins.cxLeftWidth; + buttonrect.top += margins.cyTopHeight; + buttonrect.right -= margins.cxRightWidth; + buttonrect.bottom -= margins.cyBottomHeight; + + if (draw_info->itemState & ODS_FOCUS) + DrawFocusRect(draw_info->hDC, &buttonrect); + + CloseThemeData(theme); + } else { + state = DFCS_ADJUSTRECT | DFCS_BUTTONPUSH; + + if (draw_info->itemState & ODS_DISABLED) + state |= DFCS_INACTIVE; + else + state |= draw_info->itemState & ODS_SELECTED ? DFCS_PUSHED : 0; + + DrawFrameControl(draw_info->hDC, &draw_info->rcItem, DFC_BUTTON, state); + + buttonrect = draw_info->rcItem; + } if (!(draw_info->itemState & ODS_DISABLED)) { @@ -1087,10 +1125,10 @@ static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETITEMDATA, index, 0); brush = CreateSolidBrush(metrics[index].color); - InflateRect(&draw_info->rcItem, -1, -1); - FrameRect(draw_info->hDC, &draw_info->rcItem, black_brush); - InflateRect(&draw_info->rcItem, -1, -1); - FillRect(draw_info->hDC, &draw_info->rcItem, brush); + InflateRect(&buttonrect, -1, -1); + FrameRect(draw_info->hDC, &buttonrect, black_brush); + InflateRect(&buttonrect, -1, -1); + FillRect(draw_info->hDC, &buttonrect, brush); DeleteObject(brush); } }

1 0

Austin English : po: Use English names for Programs Files in Lithuanian translation.
by Alexandre Julliard Feb. 20, 2015

Feb. 20, 2015

Module: wine Branch: master Commit: 6cf6c4c596d6bbf5ceb7b7035625aedafa869e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf6c4c596d6bbf5ceb7b7035… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 19 15:25:10 2015 -0600 po: Use English names for Programs Files in Lithuanian translation. --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index d1c03fe..854c896 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8161,7 +8161,7 @@ msgstr "Istorija" #: shell32.rc:215 msgid "Program Files" -msgstr "Programų failai" +msgstr "Program Files" #: shell32.rc:217 msgid "My Pictures" @@ -8193,7 +8193,7 @@ msgstr "Vaizdai" #: shell32.rc:216 msgid "Program Files (x86)" -msgstr "Programų failai (x86)" +msgstr "Program Files (x86)" #: shell32.rc:224 msgid "Contacts"

1 0

Matteo Bruni : d3d8/tests: Allow more alternative results in the ATI1N test.
by Alexandre Julliard Feb. 19, 2015

Feb. 19, 2015

Module: wine Branch: master Commit: d49d2a5d470e6a3c0bb2ba0dd1c1bcab798be6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49d2a5d470e6a3c0bb2ba0dd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 18 14:20:46 2015 +0100 d3d8/tests: Allow more alternative results in the ATI1N test. --- dlls/d3d8/tests/visual.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c095463..85b3fad 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5130,15 +5130,17 @@ static void test_3dc_formats(void) static const struct { struct vec2 position; - D3DCOLOR amd; - D3DCOLOR nvidia; + D3DCOLOR amd_r500; + D3DCOLOR amd_r600; + D3DCOLOR nvidia_old; + D3DCOLOR nvidia_new; } expected_colors[] = { - {{ 80, 240}, 0x003f3f3f, 0x007f0000}, - {{240, 240}, 0x003f3f3f, 0x007f0000}, - {{400, 240}, 0x00007fff, 0x00007fff}, - {{560, 240}, 0x007f00ff, 0x007f00ff}, + {{ 80, 240}, 0x007fffff, 0x003f3f3f, 0x007f7f7f, 0x007f0000}, + {{240, 240}, 0x007fffff, 0x003f3f3f, 0x007f7f7f, 0x007f0000}, + {{400, 240}, 0x00007fff, 0x00007fff, 0x00007fff, 0x00007fff}, + {{560, 240}, 0x007f00ff, 0x007f00ff, 0x007f00ff, 0x007f00ff}, }; IDirect3D8 *d3d; IDirect3DDevice8 *device; @@ -5236,9 +5238,11 @@ static void test_3dc_formats(void) for (i = 0; i < 4; ++i) { color = getPixelColor(device, expected_colors[i].position.x, expected_colors[i].position.y); - ok (color_match(color, expected_colors[i].amd, 1) || color_match(color, expected_colors[i].nvidia, 1), - "Expected color 0x%08x or 0x%08x, got 0x%08x, case %u.\n", - expected_colors[i].amd, expected_colors[i].nvidia, color, i); + ok (color_match(color, expected_colors[i].amd_r500, 1) + || color_match(color, expected_colors[i].amd_r600, 1) + || color_match(color, expected_colors[i].nvidia_old, 1) + || color_match(color, expected_colors[i].nvidia_new, 1), + "Got unexpected color 0x%08x, case %u.\n", color, i); } hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);

1 0

Austin English : xapofx1_4: Add stub dll.
by Alexandre Julliard Feb. 19, 2015

Feb. 19, 2015

Module: wine Branch: master Commit: 0135a59658848dc85af1797cef8679e3c75ec5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0135a59658848dc85af1797ce… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 18 14:02:33 2015 -0600 xapofx1_4: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/xapofx1_4/Makefile.in | 4 ++++ dlls/xapofx1_4/main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/xapofx1_4/xapofx1_4.spec | 1 + 5 files changed, 45 insertions(+) diff --git a/configure b/configure index 0deacd1..fd639fc 100755 --- a/configure +++ b/configure @@ -1325,6 +1325,7 @@ enable_wuapi enable_wuaueng enable_x3daudio1_7 enable_xapofx1_1 +enable_xapofx1_4 enable_xapofx1_5 enable_xaudio2_7 enable_xinput1_1 @@ -17676,6 +17677,7 @@ wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 +wine_fn_config_dll xapofx1_4 enable_xapofx1_4 wine_fn_config_dll xapofx1_5 enable_xapofx1_5 wine_fn_config_dll xaudio2_7 enable_xaudio2_7 wine_fn_config_dll xinput1_1 enable_xinput1_1 diff --git a/configure.ac b/configure.ac index 11a3b78..97ae4e2 100644 --- a/configure.ac +++ b/configure.ac @@ -3386,6 +3386,7 @@ WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) +WINE_CONFIG_DLL(xapofx1_4) WINE_CONFIG_DLL(xapofx1_5) WINE_CONFIG_DLL(xaudio2_7) WINE_CONFIG_DLL(xinput1_1) diff --git a/dlls/xapofx1_4/Makefile.in b/dlls/xapofx1_4/Makefile.in new file mode 100644 index 0000000..12978d8 --- /dev/null +++ b/dlls/xapofx1_4/Makefile.in @@ -0,0 +1,4 @@ +MODULE = xapofx1_4.dll + +C_SRCS = \ + main.c diff --git a/dlls/xapofx1_4/main.c b/dlls/xapofx1_4/main.c new file mode 100644 index 0000000..1b223ad --- /dev/null +++ b/dlls/xapofx1_4/main.c @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2015 Austin English + * + * 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/xapofx1_4/xapofx1_4.spec b/dlls/xapofx1_4/xapofx1_4.spec new file mode 100644 index 0000000..33269e3 --- /dev/null +++ b/dlls/xapofx1_4/xapofx1_4.spec @@ -0,0 +1 @@ +@ stub CreateFX

1 0

Matteo Bruni : wined3d: Make sure the correct texture is bound in device_update_volume.
by Alexandre Julliard Feb. 19, 2015

Feb. 19, 2015

Module: wine Branch: master Commit: 7c4d512fee752876b4ce95f1f97308f6a291b010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c4d512fee752876b4ce95f1f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 18 14:20:49 2015 +0100 wined3d: Make sure the correct texture is bound in device_update_volume. --- dlls/wined3d/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 649f324..8cab927 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3501,6 +3501,7 @@ static HRESULT device_update_volume(struct wined3d_device *device, /* Only a prepare, since we're uploading the entire volume. */ wined3d_texture_prepare_texture(dst_volume->container, context, FALSE); + wined3d_texture_bind(dst_volume->container, context, FALSE); data.buffer_object = 0; data.addr = src.data;

1 0

Nikolay Sivov : dwrite: Fix error code returned by GetFontFromFontFace().
by Alexandre Julliard Feb. 19, 2015

Feb. 19, 2015

Module: wine Branch: master Commit: 5196be7706ae4189edb3b67cf441d7a1077539ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=5196be7706ae4189edb3b67cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 18 22:46:10 2015 +0300 dwrite: Fix error code returned by GetFontFromFontFace(). --- dlls/dwrite/font.c | 2 +- dlls/dwrite/tests/font.c | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e3480ec..527fa5d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1514,7 +1514,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec } if (!found_font) - return E_INVALIDARG; + return DWRITE_E_NOFONT; hr = create_fontfamily(found_family, iface, &family); if (FAILED(hr)) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ca31f29..e00e788 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2028,6 +2028,7 @@ static void test_GetFontFromFontFace(void) IDWriteFont *font, *font2, *font3; IDWriteFontFamily *family; IDWriteFactory *factory; + IDWriteFontFile *file; HRESULT hr; factory = create_factory(); @@ -2064,14 +2065,32 @@ static void test_GetFontFromFontFace(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(fontface2 == fontface, "got %p, %p\n", fontface2, fontface); IDWriteFontFace_Release(fontface2); + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font3); + IDWriteFactory_Release(factory); + + /* fontface that wasn't created from this collection */ + factory = create_factory(); + create_testfontfile(test_fontfile); + + hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n",hr); + + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Release(file); + + hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font3); + ok(hr == DWRITE_E_NOFONT, "got 0x%08x\n", hr); + ok(font3 == NULL, "got %p\n", font3); + IDWriteFontFace_Release(fontface); IDWriteFont_Release(font); IDWriteFont_Release(font2); - IDWriteFont_Release(font3); - IDWriteFontFace_Release(fontface); IDWriteFontFamily_Release(family); IDWriteFontCollection_Release(collection); IDWriteFactory_Release(factory); + DeleteFileW(test_fontfile); } static IDWriteFont *get_tahoma_instance(IDWriteFactory *factory, DWRITE_FONT_STYLE style)

1 0

Alex Henrie : dpvoice/tests: Add GetCompressionTypes tests.
by Alexandre Julliard Feb. 19, 2015

Feb. 19, 2015

Module: wine Branch: master Commit: d3c87e50008b696b0089ce652cd8b5ba60ae3fc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c87e50008b696b0089ce652… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 19 00:00:34 2015 -0700 dpvoice/tests: Add GetCompressionTypes tests. --- dlls/dpvoice/tests/voice.c | 207 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 205 insertions(+), 2 deletions(-) diff --git a/dlls/dpvoice/tests/voice.c b/dlls/dpvoice/tests/voice.c index 8048280..fe2db94 100644 --- a/dlls/dpvoice/tests/voice.c +++ b/dlls/dpvoice/tests/voice.c @@ -21,6 +21,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <stdio.h> +#include <assert.h> #include <initguid.h> #include <dplay8.h> @@ -343,6 +344,195 @@ static void create_voicetest(void) } } +static void test_GetCompressionTypes(IDirectPlayVoiceClient *client_iface, IDirectPlayVoiceServer *server_iface) +{ + const char *name = client_iface ? "client" : "server"; + HRESULT ret; + DVCOMPRESSIONINFO data[32]; + DWORD data_size = 0, num_elements, i, j; + WCHAR *string_loc; + BOOL found_pcm; + + /* some variables are initialized to 99 just to check that they are not overwritten with 0 */ + static struct + { + /* inputs */ + DWORD data_size; + DWORD num_elements; + DWORD flags; + /* expected output */ + HRESULT ret; + /* test flags */ + enum + { + NULL_DATA = 1, + NULL_DATA_SIZE = 2, + NULL_NUM_ELEMENTS = 4, + SHARED_VARIABLE = 8 + } + test_flags; + } + tests[] = + { + /* tests NULL data with an insufficient data_size */ + { 10, 0, 0, DVERR_BUFFERTOOSMALL, NULL_DATA }, + + /* tests NULL data with an ample data_size */ + { sizeof(data) - 1, 0, 0, DVERR_INVALIDPOINTER, NULL_DATA }, + + /* tests NULL data_size */ + { 0, 99, 0, DVERR_INVALIDPOINTER, NULL_DATA_SIZE }, + + /* tests NULL num_elements */ + { 99, 0, 0, DVERR_INVALIDPOINTER, NULL_NUM_ELEMENTS }, + + /* tests NULL everything */ + { 99, 99, 0, DVERR_INVALIDPOINTER, NULL_DATA | NULL_DATA_SIZE | NULL_NUM_ELEMENTS }, + + /* tests passing the same pointer for data_size and num_elements */ + { 10, 0, 0, DVERR_BUFFERTOOSMALL, SHARED_VARIABLE }, + + /* tests passing the same pointer but with an ample data_size */ + { sizeof(data) - 1, 0, 0, DVERR_BUFFERTOOSMALL, SHARED_VARIABLE }, + + /* tests flags!=0 */ + { 99, 99, 1, DVERR_INVALIDFLAGS }, + + /* tests data_size=0 */ + { 0, 0, 0, DVERR_BUFFERTOOSMALL }, + + /* tests data_size=1 */ + { 1, 0, 0, DVERR_BUFFERTOOSMALL }, + + /* tests data_size = sizeof(DVCOMPRESSIONINFO) */ + { sizeof(DVCOMPRESSIONINFO), 0, 0, DVERR_BUFFERTOOSMALL }, + + /* tests data_size = returned data_size - 1 */ + { 0 /* initialized later */, 0, 0, DVERR_BUFFERTOOSMALL }, + + /* tests data_size = returned data_size */ + { 0 /* initialized later */, 0, 0, DV_OK }, + + /* tests data_size = returned data_size + 1 */ + { 0 /* initialized later */, 0, 0, DV_OK } + }; + + /* either client_iface or server_iface must be given, but not both */ + assert(!client_iface ^ !server_iface); + + if(client_iface) + ret = IDirectPlayVoiceClient_GetCompressionTypes(client_iface, NULL, NULL, NULL, 0); + else + ret = IDirectPlayVoiceServer_GetCompressionTypes(server_iface, NULL, NULL, NULL, 0); + if(ret == E_NOTIMPL) + { + skip("%s: GetCompressionTypes not implemented\n", name); + return; + } + + if (client_iface) + ret = IDirectPlayVoiceClient_GetCompressionTypes(client_iface, NULL, &data_size, &num_elements, 0); + else + ret = IDirectPlayVoiceServer_GetCompressionTypes(server_iface, NULL, &data_size, &num_elements, 0); + ok(ret == DVERR_BUFFERTOOSMALL, + "%s: expected ret=%x got ret=%x\n", name, DVERR_BUFFERTOOSMALL, ret); + ok(data_size > sizeof(DVCOMPRESSIONINFO) && data_size < sizeof(data) - 1, + "%s: got data_size=%u\n", name, data_size); + tests[sizeof(tests) / sizeof(tests[0]) - 3].data_size = data_size - 1; + tests[sizeof(tests) / sizeof(tests[0]) - 2].data_size = data_size; + tests[sizeof(tests) / sizeof(tests[0]) - 1].data_size = data_size + 1; + + for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + memset(data, 0x23, sizeof(data)); + + data_size = tests[i].data_size; + num_elements = tests[i].num_elements; + + if(client_iface) + ret = IDirectPlayVoiceClient_GetCompressionTypes( + client_iface, + tests[i].test_flags & NULL_DATA ? NULL : data, + tests[i].test_flags & NULL_DATA_SIZE ? NULL : &data_size, + tests[i].test_flags & NULL_NUM_ELEMENTS ? NULL : + tests[i].test_flags & SHARED_VARIABLE ? &data_size : &num_elements, + tests[i].flags + ); + else + ret = IDirectPlayVoiceServer_GetCompressionTypes( + server_iface, + tests[i].test_flags & NULL_DATA ? NULL : data, + tests[i].test_flags & NULL_DATA_SIZE ? NULL : &data_size, + tests[i].test_flags & NULL_NUM_ELEMENTS ? NULL : + tests[i].test_flags & SHARED_VARIABLE ? &data_size : &num_elements, + tests[i].flags + ); + + ok(ret == tests[i].ret, + "%s: tests[%u]: expected ret=%x got ret=%x\n", name, i, tests[i].ret, ret); + + if(ret == DV_OK || ret == DVERR_BUFFERTOOSMALL || tests[i].test_flags == NULL_DATA) + { + ok(data_size > sizeof(DVCOMPRESSIONINFO) && data_size < sizeof(data) - 1, + "%s: tests[%u]: got data_size=%u\n", name, i, data_size); + if(!(tests[i].test_flags & SHARED_VARIABLE)) + ok(num_elements > 0 && num_elements < data_size / sizeof(DVCOMPRESSIONINFO) + 1, + "%s: tests[%u]: got num_elements=%u\n", name, i, num_elements); + } + else + { + ok(data_size == tests[i].data_size, + "%s: tests[%u]: expected data_size=%u got data_size=%u\n", + name, i, tests[i].data_size, data_size); + ok(num_elements == tests[i].num_elements, + "%s: tests[%u]: expected num_elements=%u got num_elements=%u\n", + name, i, tests[i].num_elements, num_elements); + } + + if(ret == DV_OK) + { + string_loc = (WCHAR*)(data + num_elements); + found_pcm = FALSE; + for(j = 0; j < num_elements; j++) + { + if(memcmp(&data[j].guidType, &DPVCTGUID_NONE, sizeof(GUID)) == 0) + { + ok(data[j].dwMaxBitsPerSecond == 64000, + "%s: tests[%u]: data[%u]: expected dwMaxBitsPerSecond=64000 got dwMaxBitsPerSecond=%u\n", + name, i, j, data[j].dwMaxBitsPerSecond); + found_pcm = TRUE; + } + ok(data[j].dwSize == 80, + "%s: tests[%u]: data[%u]: expected dwSize=80 got dwSize=%u\n", + name, i, j, data[j].dwSize); + ok(data[j].lpszName == string_loc, + "%s: tests[%u]: data[%u]: expected lpszName=%p got lpszName=%p\n", + name, i, j, string_loc, data[j].lpszName); + ok(!data[j].lpszDescription, + "%s: tests[%u]: data[%u]: expected lpszDescription=NULL got lpszDescription=%s\n", + name, i, j, wine_dbgstr_w(data[j].lpszDescription)); + ok(!data[j].dwFlags, + "%s: tests[%u]: data[%u]: expected dwFlags=0 got dwFlags=%u\n", + name, i, j, data[j].dwFlags); + string_loc += lstrlenW(data[j].lpszName) + 1; + } + ok((char*)string_loc == (char*)data + data_size, + "%s: tests[%u]: expected string_loc=%p got string_loc=%p\n", + name, i, (char*)data + data_size, string_loc); + ok(*(char*)string_loc == 0x23, + "%s: tests[%u]: expected *(char*)string_loc=0x23 got *(char*)string_loc=0x%x\n", + name, i, *(char*)string_loc); + ok(found_pcm, "%s: tests[%u]: MS-PCM codec not found\n", name, i); + } + else + { + ok(*(char*)data == 0x23, + "%s: tests[%u]: expected *(char*)data=0x23 got *(char*)data=0x%x\n", + name, i, *(char*)data); + } + } +} + START_TEST(voice) { HRESULT hr; @@ -354,9 +544,22 @@ START_TEST(voice) create_voicetest(); - if(test_init_dpvoice_server() && test_init_dpvoice_client()) + if(test_init_dpvoice_server()) + { + test_GetCompressionTypes(NULL, vserver); + + if(test_init_dpvoice_client()) + { + test_GetCompressionTypes(vclient, NULL); + } + else + { + skip("client failed to initialize\n"); + } + } + else { - /* TODO */ + skip("server failed to initialize\n"); } test_cleanup_dpvoice();

1 0