December 2019 - Wine-Commits

Nikolay Sivov : ole32/tests: Add a trivial test for IMoniker::Enum().
by Alexandre Julliard Dec. 20, 2019

Dec. 20, 2019

Module: wine Branch: master Commit: 7caa9d0bc833ad5f50ca4bbe067e8862811eb1b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7caa9d0bc833ad5f50ca4bbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 20 14:45:23 2019 +0300 ole32/tests: Add a trivial test for IMoniker::Enum(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 92 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index e4d693b442..42bc094522 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1532,6 +1532,7 @@ todo_wine_if(moniker_type == MKSYS_GENERICCOMPOSITE) static void test_class_moniker(void) { IMoniker *moniker, *inverse, *reduced; + IEnumMoniker *enummoniker; HRESULT hr; DWORD moniker_type; DWORD hash; @@ -1609,6 +1610,21 @@ todo_wine ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); @@ -1617,6 +1633,7 @@ todo_wine static void test_file_moniker(WCHAR* path) { IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse, *reduced; + IEnumMoniker *enummoniker; DWORD moniker_type; IBindCtx *bind_ctx; IStream *stream; @@ -1673,6 +1690,21 @@ todo_wine ok(reduced == moniker1, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker1, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker1, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker1, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bind_ctx); IStream_Release(stream); @@ -1792,6 +1824,7 @@ static void test_item_moniker(void) static const WCHAR wszDelimiter[] = {'!',0}; static const WCHAR wszObjectName[] = {'T','e','s','t',0}; static const WCHAR expected_display_name[] = { '!','T','e','s','t',0 }; + IEnumMoniker *enummoniker; WCHAR *display_name; LARGE_INTEGER pos; IStream *stream; @@ -1946,6 +1979,21 @@ todo_wine ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); /* IsEqual */ @@ -1996,6 +2044,7 @@ static void test_anti_moniker(void) FILETIME filetime; IUnknown *unknown; static const WCHAR expected_display_name[] = { '\\','.','.',0 }; + IEnumMoniker *enummoniker; IStream *stream; WCHAR *name; @@ -2169,11 +2218,27 @@ todo_wine IStream_Release(stream); + /* Reduce() */ hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); IMoniker_Release(moniker2); @@ -2181,6 +2246,7 @@ todo_wine static void test_generic_composite_moniker(void) { + IEnumMoniker *enummoniker; HRESULT hr; IMoniker *moniker; IMoniker *moniker1; @@ -2265,18 +2331,31 @@ todo_wine ok(moniker_type == MKSYS_GENERICCOMPOSITE, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Enum() */ + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); + IEnumMoniker_Release(enummoniker); + + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); + IEnumMoniker_Release(enummoniker); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); } static void test_pointer_moniker(void) { + IMoniker *moniker, *inverse; + IEnumMoniker *enummoniker; HRESULT hr; - IMoniker *moniker; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; FILETIME filetime; - IMoniker *inverse; IUnknown *unknown; IStream *stream; IROTData *rotdata; @@ -2383,6 +2462,15 @@ todo_wine IBindCtx_Release(bindctx); + /* Enum() */ + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); +todo_wine + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); +todo_wine + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); }

1 0

Nikolay Sivov : dwrite/tests: Improve coverage of IsSymbolFont() tests.
by Alexandre Julliard Dec. 20, 2019

Dec. 20, 2019

Module: wine Branch: master Commit: b9a5ab67f1df116937b1b359c7425f783c7a70c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9a5ab67f1df116937b1b359… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 20 14:32:55 2019 +0300 dwrite/tests: Improve coverage of IsSymbolFont() tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 123 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 99 insertions(+), 24 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3dff4a6191..da75a7b70c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -446,6 +446,7 @@ enum opentype_cmap_table_platform enum opentype_cmap_table_encoding { + OPENTYPE_CMAP_TABLE_ENCODING_SYMBOL = 0, OPENTYPE_CMAP_TABLE_ENCODING_UNICODE_BMP = 1, OPENTYPE_CMAP_TABLE_ENCODING_UNICODE_FULL = 10, }; @@ -7198,48 +7199,122 @@ static void test_CreateAlphaTexture(void) ok(ref == 0, "factory not released, %u\n", ref); } +static BOOL get_expected_is_symbol(IDWriteFontFace *fontface) +{ + BOOL exists, is_symbol = FALSE; + struct dwrite_fonttable cmap; + const TT_OS2_V2 *tt_os2; + const BYTE *tables; + void *os2_context; + WORD num_tables; + unsigned int i; + UINT32 size; + HRESULT hr; + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); + ok(hr == S_OK, "Failed to get OS/2 table, hr %#x.\n", hr); + + if (tt_os2) + { + if (tt_os2->version) + is_symbol = !!(GET_BE_DWORD(tt_os2->ulCodePageRange1) & FS_SYMBOL); + if (!is_symbol) + is_symbol = tt_os2->panose.bFamilyType == PAN_FAMILY_PICTORIAL; + IDWriteFontFace_ReleaseFontTable(fontface, os2_context); + } + + if (is_symbol) + return is_symbol; + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_CMAP_TAG, (const void **)&cmap.data, + &cmap.size, &cmap.context, &exists); + if (FAILED(hr) || !exists) + return is_symbol; + + num_tables = table_read_be_word(&cmap, 0, FIELD_OFFSET(struct cmap_header, numTables)); + tables = cmap.data + FIELD_OFFSET(struct cmap_header, tables); + + for (i = 0; i < num_tables; ++i) + { + struct cmap_encoding_record *record = (struct cmap_encoding_record *)(tables + i * sizeof(*record)); + WORD platform, encoding; + + platform = table_read_be_word(&cmap, record, FIELD_OFFSET(struct cmap_encoding_record, platformID)); + encoding = table_read_be_word(&cmap, record, FIELD_OFFSET(struct cmap_encoding_record, encodingID)); + + if (platform == OPENTYPE_CMAP_TABLE_PLATFORM_WIN && encoding == OPENTYPE_CMAP_TABLE_ENCODING_SYMBOL) + { + is_symbol = TRUE; + break; + } + } + + IDWriteFontFace_ReleaseFontTable(fontface, cmap.context); + + return is_symbol; +} + static void test_IsSymbolFont(void) { - static const WCHAR symbolW[] = {'S','y','m','b','o','l',0}; IDWriteFontCollection *collection; IDWriteFontFace *fontface; IDWriteFactory *factory; IDWriteFont *font; + UINT32 count, i; HRESULT hr; ULONG ref; - BOOL ret; factory = create_factory(); - /* Tahoma */ - fontface = create_fontface(factory); - ret = IDWriteFontFace_IsSymbolFont(fontface); - ok(!ret, "got %d\n", ret); - hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font); - ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection_GetFontFamilyCount(collection); + for (i = 0; i < count; ++i) + { + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 font_count, j; + WCHAR nameW[256]; - ret = IDWriteFont_IsSymbolFont(font); - ok(!ret, "got %d\n", ret); + hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); - IDWriteFontCollection_Release(collection); - IDWriteFont_Release(font); - IDWriteFontFace_Release(fontface); + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Failed to get names, hr %#x.\n", hr); + get_enus_string(names, nameW, ARRAY_SIZE(nameW)); + IDWriteLocalizedStrings_Release(names); - /* Symbol */ - font = get_font(factory, symbolW, DWRITE_FONT_STYLE_NORMAL); - ret = IDWriteFont_IsSymbolFont(font); - ok(ret, "got %d\n", ret); + font_count = IDWriteFontFamily_GetFontCount(family); - hr = IDWriteFont_CreateFontFace(font, &fontface); - ok(hr == S_OK, "got 0x%08x\n", hr); - ret = IDWriteFontFace_IsSymbolFont(fontface); - ok(ret, "got %d\n", ret); - IDWriteFontFace_Release(fontface); - IDWriteFont_Release(font); + for (j = 0; j < font_count; ++j) + { + BOOL is_symbol_font, is_symbol_face, is_symbol_expected; + + hr = IDWriteFontFamily_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + + is_symbol_font = IDWriteFont_IsSymbolFont(font); + is_symbol_face = IDWriteFontFace_IsSymbolFont(fontface); + ok(is_symbol_font == is_symbol_face, "Unexpected symbol flag.\n"); + + /* FIXME: failures disabled on Wine for now */ + is_symbol_expected = get_expected_is_symbol(fontface); + todo_wine_if(is_symbol_expected != is_symbol_face) + ok(is_symbol_expected == is_symbol_face, "Unexpected is_symbol flag %d for %s, font %d.\n", + is_symbol_face, wine_dbgstr_w(nameW), j); + + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); + } + + IDWriteFontFamily_Release(family); + } + + IDWriteFontCollection_Release(collection); ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref);

1 0

Nikolay Sivov : po: Update some Russian strings.
by Alexandre Julliard Dec. 20, 2019

Dec. 20, 2019

Module: wine Branch: master Commit: 48f1623af9e385da09183c5469191bb3a6ff4817 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48f1623af9e385da09183c54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 20 15:35:27 2019 +0300 po: Update some Russian strings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 94 +++++++++++++++++----------------------------------------------- 1 file changed, 25 insertions(+), 69 deletions(-) diff --git a/po/ru.po b/po/ru.po index 3292c450d0..aa5cd6b0c1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-03-28 11:30+0300\n" +"PO-Revision-Date: 2019-12-20 15:34+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Poedit 2.2.4\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -6829,10 +6829,8 @@ msgid "Begin request has already been made.\n" msgstr "Запрос уже был инициирован.\n" #: mferror.mc:599 -#, fuzzy -#| msgid "Object is not initialized.\n" msgid "Sink has not been finalized.\n" -msgstr "Объект не инициализирован.\n" +msgstr "Приёмник данных не был завершён.\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7055,132 +7053,96 @@ msgid "No events available.\n" msgstr "Нет доступных событий.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Unsupported state transition.\n" msgid "Invalid media source state transition.\n" -msgstr "Данный смена состояний не поддерживается.\n" +msgstr "Некорректная смена состояний источника данных.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "Реестр был восстановлен.\n" +msgstr "Достигнут конец потока данных.\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" msgstr "Был вызван метод Shutdown().\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "Реестр был восстановлен.\n" +msgstr "Длительность медиапотока не задана.\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" msgstr "" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "Набор свойств не найден.\n" +msgstr "Свойство не найдено.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Property is empty.\n" msgid "Property is read-only.\n" -msgstr "Пустое свойство\n" +msgstr "Свойство доступно только для чтения.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Property type is not allowed.\n" msgid "Property is not allowed.\n" -msgstr "Некорректный тип свойства.\n" +msgstr "Недопустимое свойство.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "Ресурс занят.\n" +msgstr "Источник данных остановлен.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media format.\n" -msgstr "Данный формат времени не поддерживается.\n" +msgstr "Данный формат не поддерживается.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "Ресурс занят.\n" +msgstr "Некорректное состояние источника данных.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "Данные не обнаружены.\n" +msgstr "Не выбрано ни одного потока.\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media source characteristics.\n" -msgstr "Данный формат времени не поддерживается.\n" +msgstr "Характеристики данного источника данных не поддерживаются.\n" #: mferror.mc:536 msgid "Stream sink was removed.\n" -msgstr "" +msgstr "Приёмник данных был удалён.\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" msgstr "" #: mferror.mc:550 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "Реестр был восстановлен.\n" +msgstr "Набор потоков данного приёмника данных фиксирован.\n" #: mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "Домен уже существует.\n" +msgstr "Поток приёмника данных уже существует.\n" #: mferror.mc:564 -#, fuzzy -#| msgid "Operation was cancelled.\n" msgid "Sample allocation was canceled.\n" -msgstr "Операция была отменена.\n" +msgstr "Создание сэмпла было отменено.\n" #: mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "Каталог не пуст.\n" +msgstr "Аллокатор сэмплов пуст.\n" #: mferror.mc:578 -#, fuzzy -#| msgid "Clock state was already set.\n" msgid "Sink was already stopped.\n" -msgstr "Состояние часов уже установлено.\n" +msgstr "Приёмник данных уже был остановлен.\n" #: mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" msgstr "" #: mferror.mc:592 -#, fuzzy -#| msgid "No data detected.\n" msgid "No streams were selected for the sink.\n" -msgstr "Данные не обнаружены.\n" +msgstr "Потоки приёмника не выбраны.\n" #: mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "Слишком длинное имя файла.\n" +msgstr "Превышена длина метаданных.\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" @@ -8338,22 +8300,16 @@ msgid "Off" msgstr "Выключено" #: version.rc:42 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "видео" +msgstr "Провайдер" #: version.rc:45 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Выберите формат для экспорта:" +msgstr "Выберите формат для подключения:" #: version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Сво&йства" +msgstr "Свойства подключения" #: version.rc:37 msgid "OLE DB Provider(s)"

1 0

Alexandre Julliard : Release 5.0-rc2.
by Alexandre Julliard Dec. 20, 2019

Dec. 20, 2019

Module: wine Branch: master Commit: 6dd84c53b55ecfa2e2735a914cb126fa0c4b23a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dd84c53b55ecfa2e2735a91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 20 21:05:28 2019 +0100 Release 5.0-rc2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 742 ++++++++++++-------------------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 144 insertions(+), 618 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6dd84c53b55ecfa2e273…

1 0

Tag wine-5.0-rc2 : Alexandre Julliard : Release 5.0-rc2
by Alexandre Julliard Dec. 20, 2019

Dec. 20, 2019

Module: wine Branch: refs/tags/wine-5.0-rc2 Tag: 7fd490935a0e215d3047d1aec5fcc71456b09c33 URL: https://source.winehq.org/git/wine.git/?a=tag;h=7fd490935a0e215d3047d1aec5f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 20 21:05:28 2019 +0100 Release 5.0-rc2

1 0

Jacek Caban : configure: Allow setting CROSSLDFLAGS by configure.
by Alexandre Julliard Dec. 20, 2019

Dec. 20, 2019

Module: wine Branch: master Commit: d6625bd1297e38efe6da405d4d6ebaea2078600d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6625bd1297e38efe6da405d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 20 12:49:41 2019 +0100 configure: Allow setting CROSSLDFLAGS by configure. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 2 ++ configure.ac | 1 + 3 files changed, 4 insertions(+) diff --git a/Makefile.in b/Makefile.in index dfe1c56c06..fb67236b68 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,6 +40,7 @@ CROSSCC = @CROSSCC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ CROSSCFLAGS = @CROSSCFLAGS@ +CROSSLDFLAGS = @CROSSLDFLAGS@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRACROSSCFLAGS= @EXTRACROSSCFLAGS@ MSVCRTFLAGS = @MSVCRTFLAGS@ diff --git a/configure b/configure index f8e2f69801..6abae6ae16 100755 --- a/configure +++ b/configure @@ -707,6 +707,7 @@ X_CFLAGS XMKMF PTHREAD_LIBS DELAYLOADFLAG +CROSSLDFLAGS EXTRACROSSCFLAGS CROSSCFLAGS CROSSCC @@ -9772,6 +9773,7 @@ test -n "$CROSSCC" || CROSSCC="false" EXTRACROSSCFLAGS="-DWINE_CROSS_PE -Wall" + CC="$CROSSCC" CFLAGS=$CROSSCFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CROSSCC works" >&5 diff --git a/configure.ac b/configure.ac index e347738961..88965115d7 100644 --- a/configure.ac +++ b/configure.ac @@ -1032,6 +1032,7 @@ then saved_CFLAGS=$CFLAGS AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-"-g -O2"}) AC_SUBST(EXTRACROSSCFLAGS,"-DWINE_CROSS_PE -Wall") + AC_SUBST(CROSSLDFLAGS) CC="$CROSSCC" CFLAGS=$CROSSCFLAGS

1 0

Alexandre Julliard : winecrt0: Preserve last error when loading debug functions.
by Alexandre Julliard Dec. 20, 2019

Dec. 20, 2019

Module: wine Branch: master Commit: a812374a529f553da0f4c0b9c2d67b9178f644ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=a812374a529f553da0f4c0b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 20 10:34:07 2019 +0100 winecrt0: Preserve last error when loading debug functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/debug.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 01bfd4c3e1..cb07c7835d 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -50,9 +50,11 @@ static void load_func( void **func, const char *name, void *def ) { if (!*func) { + DWORD err = GetLastError(); HMODULE module = GetModuleHandleA( "ntdll.dll" ); void *proc = GetProcAddress( module, name ); InterlockedExchangePointer( func, proc ? proc : def ); + SetLastError( err ); } } #define LOAD_FUNC(name) load_func( (void **)&p ## name, #name, fallback ## name )

1 0

Erich E. Hoover : msvcrt: Implement wcstod without using 'long double'.
by Alexandre Julliard Dec. 20, 2019

Dec. 20, 2019

Module: wine Branch: master Commit: a6734f549fc6f5d0a93364d159519a5d6d0b5f38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6734f549fc6f5d0a93364d1… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Dec 19 10:37:13 2019 -0700 msvcrt: Implement wcstod without using 'long double'. Fix for the wide equivalent of strtod (see commit c22af971c287933a137c9fbecc81823812e12b7a). Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 65 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 8b240e97c0..855e3d8593 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -381,20 +381,30 @@ int CDECL MSVCRT__wcsncoll(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str return MSVCRT__wcsncoll_l(str1, str2, count, NULL); } +static double MSVCRT_mul_pow10(double x, int exp) +{ + BOOL negexp = (exp < 0); + double ret; + + if(negexp) + exp = -exp; + ret = pow(10.0, exp); + return (negexp ? x/ret : x*ret); +} + /********************************************************************* * _wcstod_l (MSVCRT.@) */ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, MSVCRT__locale_t locale) { + BOOL found_digit = FALSE, overflow, underflow; + int exp1=0, exp2=0, exp3=0, sign=1; MSVCRT_pthreadlocinfo locinfo; unsigned __int64 d=0, hlp; unsigned fpcontrol; - int exp=0, sign=1; const MSVCRT_wchar_t *p; double ret; - long double lret=1, expcnt = 10; - BOOL found_digit = FALSE, negexp; if (!MSVCRT_CHECK_PMT(str != NULL)) return 0; @@ -417,13 +427,13 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, found_digit = TRUE; hlp = d*10+*(p++)-'0'; if(d>MSVCRT_UI64_MAX/10 || hlp<d) { - exp++; + exp1++; break; } else d = hlp; } while(*p>='0' && *p<='9') { - exp++; + exp1++; p++; } if(*p == *locinfo->lconv->decimal_point) @@ -436,7 +446,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, break; d = hlp; - exp--; + exp1--; } while(*p>='0' && *p<='9') p++; @@ -465,9 +475,9 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, } e *= s; - if(exp<0 && e<0 && exp+e>=0) exp = INT_MIN; - else if(exp>0 && e>0 && exp+e<0) exp = INT_MAX; - else exp += e; + if(exp1<0 && e<0 && exp1+e>=0) exp1 = INT_MIN; + else if(exp1>0 && e>0 && exp1+e<0) exp1 = INT_MAX; + else exp3 += e; } else { if(*p=='-' || *p=='+') p--; @@ -477,20 +487,31 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, fpcontrol = _control87(0, 0); _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE - |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff); - - negexp = (exp < 0); - if(negexp) - exp = -exp; - while(exp) { - if(exp & 1) - lret *= expcnt; - exp /= 2; - expcnt = expcnt*expcnt; + |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT|MSVCRT__PC_64, + MSVCRT__MCW_EM | MSVCRT__MCW_PC ); + + /* if we have a simple case then just calculate the result directly */ + overflow = (exp3-exp1 > MSVCRT_DBL_MAX_10_EXP); + underflow = (exp3-exp1 < MSVCRT_DBL_MIN_10_EXP); + if(!overflow && !underflow) { + exp1 += exp3; + exp3 = 0; } - ret = (long double)sign * (negexp ? d/lret : d*lret); - - _control87(fpcontrol, 0xffffffff); + /* take the number without exponent and convert it into a double */ + ret = MSVCRT_mul_pow10(d, exp1); + /* shift the number to the representation where the first non-zero digit is in the ones place */ + if(overflow || underflow) + exp2 = (ret != 0.0 ? (int)log10(ret) : 0); + /* incorporate an additional shift to deal with floating point denormal values (if necessary) */ + if(exp3-exp2 < MSVCRT_DBL_MIN_10_EXP) + exp2 += exp3-exp2-MSVCRT_DBL_MIN_10_EXP; + ret = MSVCRT_mul_pow10(ret, exp2); + /* apply the exponent (and undo any shift) */ + ret = MSVCRT_mul_pow10(ret, exp3-exp2); + /* apply the sign bit */ + ret *= sign; + + _control87( fpcontrol, MSVCRT__MCW_EM | MSVCRT__MCW_PC ); if((d && ret==0.0) || isinf(ret)) *MSVCRT__errno() = MSVCRT_ERANGE;

1 0

Michael Stefaniuc : dmime/tests: Add PChannel tests.
by Alexandre Julliard Dec. 20, 2019

Dec. 20, 2019

Module: wine Branch: master Commit: 296a1eb77bc9e10deb9a8a8cbee3990f650f48f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=296a1eb77bc9e10deb9a8a8c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 19 23:20:19 2019 +0100 dmime/tests: Add PChannel tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/performance.c | 126 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 1d17e5200e..4c340252aa 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -100,10 +100,18 @@ static HRESULT test_InitAudio(void) return hr; port = NULL; + hr = IDirectMusicPerformance8_PChannelInfo(performance, 128, &port, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(performance, 127, &port, NULL, NULL); + ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); - ok(hr == S_OK, "Failed to call PChannelInfo (%x)\n", hr); + ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); ok(port != NULL, "IDirectMusicPort not set\n"); - if (hr == S_OK && port != NULL) + hr = IDirectMusicPerformance8_AssignPChannel(performance, 0, port, 0, 0); + todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannel failed (%08x)\n", hr); + hr = IDirectMusicPerformance8_AssignPChannelBlock(performance, 0, port, 0); + todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannelBlock failed (%08x)\n", hr); + if (port) IDirectMusicPort_Release(port); hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &path); @@ -120,6 +128,8 @@ static HRESULT test_InitAudio(void) create_performance(&performance, NULL, NULL, FALSE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); destroy_performance(performance, NULL, NULL); /* Refcounts for auto generated dmusic and dsound */ @@ -322,6 +332,117 @@ static void test_createport(void) IDirectMusicPerformance_Release(perf); } +static void test_pchannel(void) +{ + IDirectMusicPerformance8 *perf; + IDirectMusicPort *port = NULL, *port2; + DWORD channel, group; + unsigned int i; + HRESULT hr; + + create_performance(&perf, NULL, NULL, FALSE); + hr = IDirectMusicPerformance8_Init(perf, NULL, NULL, NULL); + ok(hr == S_OK, "Init failed: %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %08x, %p\n", hr, port); + + /* Add default port. Sets PChannels 0-15 to the corresponding channels in group 1 */ + hr = IDirectMusicPerformance8_AddPort(perf, NULL); + ok(hr == S_OK, "AddPort of default port failed: %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, NULL, NULL, NULL); + ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); + ok(hr == S_OK && port, "PChannelInfo failed, got %08x, %p\n", hr, port); + for (i = 1; i < 16; i++) { + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port == port2 && group == 1 && channel == i, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* Unset PChannels fail to retrieve */ + todo_wine { + hr = IDirectMusicPerformance8_PChannelInfo(perf, 16, &port2, NULL, NULL); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); + hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD - 16, &port2, NULL, NULL); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); + } + + /* Channel group 0 can be set just fine */ + hr = IDirectMusicPerformance8_AssignPChannel(perf, 0, port, 0, 0); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, 0, port, 0); + ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = 1; i < 16; i++) { + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port == port2 && group == 0 && channel == i, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* Last PChannel Block can be set only individually but not read */ + hr = IDirectMusicPerformance8_AssignPChannel(perf, MAXDWORD, port, 0, 3); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + port2 = (IDirectMusicPort *)0xdeadbeef; + hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD, &port2, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG && port2 == (IDirectMusicPort *)0xdeadbeef, + "PChannelInfo failed, got %08x, %p\n", hr, port2); + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD, port, 0); + ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16, port, 1); + todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = MAXDWORD - 15; i < MAXDWORD; i++) { + hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 0, 0); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG && port2 == (IDirectMusicPort *)0xdeadbeef, + "PChannelInfo failed, got %08x, %p\n", hr, port2); + } + + /* Second to last PChannel Block can be set only individually and read */ + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16 - 1, port, 1); + todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = MAXDWORD - 31; i < MAXDWORD - 15; i++) { + hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 1, 7); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 7, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* Third to last PChannel Block behaves normal */ + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16 - 2, port, 0); + ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = MAXDWORD - 47; i < MAXDWORD - 31; i++) { + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == i % 16, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* One PChannel set in a Block, rest is initialized too */ + hr = IDirectMusicPerformance8_AssignPChannel(perf, 4711, port, 1, 13); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 4711, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 13, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + group = channel = 0xdeadbeef; + hr = IDirectMusicPerformance8_PChannelInfo(perf, 4712, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 8, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + group = channel = 0xdeadbeef; + hr = IDirectMusicPerformance8_PChannelInfo(perf, 4719, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 15, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + + IDirectMusicPort_Release(port); + destroy_performance(perf, NULL, NULL); +} + static void test_COM(void) { IDirectMusicPerformance *dmp = (IDirectMusicPerformance*)0xdeadbeef; @@ -504,6 +625,7 @@ START_TEST( performance ) test_COM(); test_createport(); + test_pchannel(); test_notification_type(); CoUninitialize();

1 0

Michael Stefaniuc : dmime: Use a rbtree to store the PChannels of a performance.
by Alexandre Julliard Dec. 20, 2019

Dec. 20, 2019

Module: wine Branch: master Commit: 9b6a45638194fe63241dc7ff81aed3fcea3a6c81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b6a45638194fe63241dc7ff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 19 23:20:18 2019 +0100 dmime: Use a rbtree to store the PChannels of a performance. The PChannel id is a 32bit, potentially random identifier and not an array index. Fixes also the handling of channel group "dwGroup" 0. As it is invalid it is used to mark uninitialized PChannels. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=17766 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24740 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31562 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 109 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 75 insertions(+), 34 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 615a3f8b14..2124c1fe35 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -19,10 +19,18 @@ */ #include "dmime_private.h" +#include "wine/heap.h" +#include "wine/rbtree.h" #include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); +struct pchannel_block { + DWORD block_num; /* Block 0 is PChannels 0-15, Block 1 is PChannels 16-31, etc */ + DMUSIC_PRIVATE_PCHANNEL pchannel[16]; + struct wine_rb_entry entry; +}; + typedef struct IDirectMusicPerformance8Impl { IDirectMusicPerformance8 IDirectMusicPerformance8_iface; LONG ref; @@ -35,7 +43,7 @@ typedef struct IDirectMusicPerformance8Impl { float fMasterTempo; long lMasterVolume; /* performance channels */ - DMUSIC_PRIVATE_PCHANNEL PChannel[32]; + struct wine_rb_tree pchannels; /* IDirectMusicPerformance8Impl fields */ IDirectMusicAudioPath *pDefaultPath; HANDLE hNotification; @@ -192,6 +200,49 @@ static BOOL PostMessageToProcessMsgThread(IDirectMusicPerformance8Impl* This, UI return PostThreadMessageA(This->procThreadId, iMsg, 0, 0); } +static int pchannel_block_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct pchannel_block *b = WINE_RB_ENTRY_VALUE(entry, const struct pchannel_block, entry); + + return *(DWORD *)key - b->block_num; +} + +static void pchannel_block_free(struct wine_rb_entry *entry, void *context) +{ + struct pchannel_block *b = WINE_RB_ENTRY_VALUE(entry, struct pchannel_block, entry); + + heap_free(b); +} + +static struct pchannel_block *pchannel_block_set(struct wine_rb_tree *tree, DWORD block_num, + IDirectMusicPort *port, DWORD group, BOOL only_set_new) +{ + struct pchannel_block *block; + struct wine_rb_entry *entry; + unsigned int i; + + entry = wine_rb_get(tree, &block_num); + if (entry) { + block = WINE_RB_ENTRY_VALUE(entry, struct pchannel_block, entry); + if (only_set_new) + return block; + } else { + if (!(block = heap_alloc(sizeof(*block)))) + return NULL; + block->block_num = block_num; + } + + for (i = 0; i < 16; ++i) { + block->pchannel[i].port = port; + block->pchannel[i].group = group; + block->pchannel[i].channel = i; + } + if (!entry) + wine_rb_put(tree, &block->block_num, &block->entry); + + return block; +} + static inline IDirectMusicPerformance8Impl *impl_from_IDirectMusicPerformance8(IDirectMusicPerformance8 *iface) { return CONTAINING_RECORD(iface, IDirectMusicPerformance8Impl, IDirectMusicPerformance8_iface); @@ -236,6 +287,7 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_Release(IDirectMusicPerformance TRACE("(%p): ReleaseRef to %d\n", This, ref); if (ref == 0) { + wine_rb_destroy(&This->pchannels, pchannel_block_free, NULL); This->safe.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->safe); HeapFree(GetProcessHeap(), 0, This); @@ -579,7 +631,6 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort(IDirectMusicPerforman GUID port_guid; IDirectMusicPort* pDefaultPort = NULL; DMUS_PORTPARAMS params; - int i, j; hr = IDirectMusic8_GetDefaultPort(This->dmusic, &port_guid); if (FAILED(hr)) return hr; ZeroMemory(&params, sizeof(params)); @@ -591,15 +642,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort(IDirectMusicPerforman if (FAILED(hr)) return hr; hr = IDirectMusicPort_Activate(pDefaultPort, TRUE); if (FAILED(hr)) { IDirectMusicPort_Release(pDefaultPort); return hr; } - j = 0; - for (i = 0; i < 16; ++i) { - if (NULL == This->PChannel[i].port) { - This->PChannel[i].port = pPort; - This->PChannel[i].group = 0; - This->PChannel[i].channel = j; /* FIXME: should this be assigned? */ - j++; - } - } + IDirectMusicPerformance8_AssignPChannelBlock(iface, 0, pDefaultPort, 1); } else { IDirectMusicPort_AddRef(pPort); } @@ -621,41 +664,38 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_RemovePort(IDirectMusicPerfor } static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannelBlock(IDirectMusicPerformance8 *iface, - DWORD dwBlockNum, IDirectMusicPort *pPort, DWORD dwGroup) + DWORD block_num, IDirectMusicPort *port, DWORD group) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - int i, j, range /* min value in range */; - - FIXME("(%p, %d, %p, %d): semi-stub\n", This, dwBlockNum, pPort, dwGroup-1); - if (NULL == pPort) return E_POINTER; - - range = 16 * dwBlockNum; - j = 0; - for (i = range; i < range+16; i++) { - /*TRACE("Setting PChannel[%i] to port %p, group %ld, MIDI port %i\n", i, pPort, dwGroup-1, j); */ - This->PChannel[i].port = pPort; - This->PChannel[i].group = dwGroup - 1; /* first index is always zero */ - This->PChannel[i].channel = j; /* FIXME: should this be assigned? */ - j++; - } - /*if (dwGroup > 2) return S_FALSE;*/ + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - return S_OK; + FIXME("(%p, %d, %p, %d): semi-stub\n", This, block_num, port, group); + + if (!port) + return E_POINTER; + if (block_num > MAXDWORD / 16) + return E_INVALIDARG; + + pchannel_block_set(&This->pchannels, block_num, port, group, FALSE); + + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel(IDirectMusicPerformance8 *iface, - DWORD PChannel, IDirectMusicPort *port, DWORD group, DWORD MChannel) + DWORD pchannel, IDirectMusicPort *port, DWORD group, DWORD channel) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + struct pchannel_block *block; - TRACE("(%p)->(%d, %p, %d, %d)\n", This, PChannel, port, group, MChannel); + FIXME("(%p)->(%d, %p, %d, %d) semi-stub\n", This, pchannel, port, group, channel); if (!port) return E_POINTER; - This->PChannel[PChannel].port = port; - This->PChannel[PChannel].group = group; - This->PChannel[PChannel].channel = MChannel; + block = pchannel_block_set(&This->pchannels, pchannel / 16, port, 0, TRUE); + if (block) { + block->pchannel[pchannel % 16].group = group; + block->pchannel[pchannel % 16].channel = channel; + } return S_OK; } @@ -1211,6 +1251,7 @@ HRESULT WINAPI create_dmperformance(REFIID lpcGUID, void **ppobj) obj->pDefaultPath = NULL; InitializeCriticalSection(&obj->safe); obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectMusicPerformance8Impl*->safe"); + wine_rb_init(&obj->pchannels, pchannel_block_compare); obj->rtLatencyTime = 100; /* 100 ms TO FIX */ obj->dwBumperLength = 50; /* 50 ms default */

1 0