wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Nikolay Sivov : dwrite/tests: Some bidi resolution tests.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 98a8989908bd9eca06fed22368e4e61049c65e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a8989908bd9eca06fed2236… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 5 11:56:05 2017 +0300 dwrite/tests: Some bidi resolution tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 141 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 135 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 21809ee..7af19d7 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -34,6 +34,16 @@ static IDWriteFactory *factory; static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; +#define LRE 0x202a +#define RLE 0x202b +#define PDF 0x202c +#define LRO 0x202d +#define RLO 0x202e +#define LRI 0x2066 +#define RLI 0x2067 +#define FSI 0x2068 +#define PDI 0x2069 + enum analysis_kind { ScriptAnalysis, LastKind @@ -894,14 +904,14 @@ static struct sa_test sa_tests[] = { }, { /* LRE/PDF */ - {0x202a,0x202c,'a','b','c','\r',0}, 3, + {LRE,PDF,'a','b','c','\r',0}, 3, { { 0, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL }, { 2, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }, { 5, 1, DWRITE_SCRIPT_SHAPES_NO_VISUAL } } }, { /* LRE/PDF and other visual and non-visual codes from Common script range */ - {0x202a,0x202c,'r','!',0x200b,'\r',0}, 3, + {LRE,PDF,'r','!',0x200b,'\r',0}, 3, { { 0, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL }, { 2, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }, { 4, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL } } @@ -2227,6 +2237,7 @@ struct bidi_test DWRITE_READING_DIRECTION direction; UINT8 explicit[BIDI_LEVELS_COUNT]; UINT8 resolved[BIDI_LEVELS_COUNT]; + BOOL todo; }; static const struct bidi_test bidi_tests[] = { @@ -2267,14 +2278,132 @@ static const struct bidi_test bidi_tests[] = { { 0, 0, 0 } }, { + { LRE, PDF, 'a', 'b', 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 2, 2, 0, 0 }, + { 0, 0, 0, 0 }, + TRUE + }, + { + { 'a', LRE, PDF, 'b', 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 0, 2, 2, 0 }, + { 0, 0, 0, 0 }, + TRUE + }, + { + { RLE, PDF, 'a', 'b', 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 1, 1, 0, 0 }, + { 0, 0, 0, 0 }, + TRUE + }, + { + { 'a', RLE, PDF, 'b', 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 0, 1, 1, 0 }, + { 0, 0, 0, 0 }, + TRUE + }, + { + { 'a', RLE, PDF, 'b', 0 }, + DWRITE_READING_DIRECTION_RIGHT_TO_LEFT, + { 1, 3, 3, 1 }, + { 2, 2, 2, 2 }, + TRUE + }, + { + { LRE, PDF, 'a', 'b', 0 }, + DWRITE_READING_DIRECTION_RIGHT_TO_LEFT, + { 2, 2, 1, 1 }, + { 1, 1, 2, 2 }, + TRUE + }, + { + { PDF, 'a', 'b', 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 } + }, + { + { LRE, 'a', 'b', PDF, 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 2, 2, 2, 2 }, + { 0, 2, 2, 2 }, + TRUE + }, + { + { LRI, 'a', 'b', PDI, 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + TRUE + }, + { + { RLI, 'a', 'b', PDI, 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + TRUE + }, + { { 0 } } }; -static void compare_bidi_levels(const struct bidi_test *test, UINT32 len, UINT8 *explicit, UINT8 *resolved) +static void compare_bidi_levels(unsigned int seq, const struct bidi_test *test, UINT32 len, UINT8 *explicit, UINT8 *resolved) { - ok(!memcmp(explicit, test->explicit, len), "wrong explicit levels\n"); - ok(!memcmp(resolved, test->resolved, len), "wrong resolved levels\n"); + unsigned int i, failcount = 0; + BOOL match; + + match = !memcmp(explicit, test->explicit, len); + if (!match) { + if (test->todo) { + failcount++; + todo_wine + ok(0, "test %u: %s wrong explicit levels:\n", seq, wine_dbgstr_w(test->text)); + } + else + ok(0, "test %u: %s wrong explicit levels:\n", seq, wine_dbgstr_w(test->text)); + + for (i = 0; i < len; i++) { + if (test->explicit[i] != explicit[i]) { + if (test->todo) { + failcount++; + todo_wine + ok(0, "\tat %u, explicit level %u, expected %u\n", i, explicit[i], test->explicit[i]); + } + else + ok(0, "\tat %u, explicit level %u, expected %u\n", i, explicit[i], test->explicit[i]); + } + } + } + + match = !memcmp(resolved, test->resolved, len); + if (!match) { + if (test->todo) { + failcount++; + todo_wine + ok(0, "test %u: %s wrong resolved levels:\n", seq, wine_dbgstr_w(test->text)); + } + else + ok(0, "test %u: %s wrong resolved levels:\n", seq, wine_dbgstr_w(test->text)); + + for (i = 0; i < len; i++) { + if (test->resolved[i] != resolved[i]) { + if (test->todo) { + failcount++; + todo_wine + ok(0, "\tat %u, resolved level %u, expected %u\n", i, resolved[i], test->resolved[i]); + } + else + ok(0, "\tat %u, resolved level %u, expected %u\n", i, resolved[i], test->resolved[i]); + } + } + } + + todo_wine_if(test->todo && failcount == 0) + ok(1, "test %u: marked as \"todo_wine\" but succeeds\n", seq); } static void test_AnalyzeBidi(void) @@ -2307,7 +2436,7 @@ static void test_AnalyzeBidi(void) hr = IDWriteTextAnalyzer_AnalyzeBidi(analyzer, &analysissource.IDWriteTextAnalysisSource_iface, 0, len, &analysissink); ok(hr == S_OK, "%u: got 0x%08x\n", i, hr); - compare_bidi_levels(ptr, len, g_explicit_levels, g_resolved_levels); + compare_bidi_levels(i, ptr, len, g_explicit_levels, g_resolved_levels); i++; ptr++;

1 0

Nikolay Sivov : dwrite/tests: Test number of lines for a failing drawing test.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 862503df704c7033e9fda2480df3973f0ec57382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=862503df704c7033e9fda2480… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 5 11:56:04 2017 +0300 dwrite/tests: Test number of lines for a failing drawing test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index daffd81..ecc57df 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1636,6 +1636,10 @@ static void test_Draw(void) hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); ok_sequence(sequences, RENDERER_ID, draw_seq2, "draw test 2", TRUE); + hr = IDWriteTextLayout_GetMetrics(layout, &tm); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(tm.lineCount == 6, "got %u\n", tm.lineCount); IDWriteTextLayout_Release(layout); /* string with control characters */

1 0

Nikolay Sivov : dwrite: Classify direction control characters as complex.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: a42a9940cf310a9f083e80b0dcc671733b4e0f21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42a9940cf310a9f083e80b0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 5 11:56:03 2017 +0300 dwrite: Classify direction control characters as complex. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 4 +++- dlls/dwrite/tests/analyzer.c | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 14a93e8..27a11f9 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1524,7 +1524,9 @@ static HRESULT WINAPI dwritetextanalyzer1_GetScriptProperties(IDWriteTextAnalyze static inline BOOL is_char_from_simple_script(WCHAR c) { - if (IS_HIGH_SURROGATE(c) || IS_LOW_SURROGATE(c)) + if (IS_HIGH_SURROGATE(c) || IS_LOW_SURROGATE(c) || + /* LRM, RLM, LRE, RLE, PDF, LRO, RLO */ + c == 0x200e || c == 0x200f || (c >= 0x202a && c <= 0x202e)) return FALSE; else { UINT16 script = get_char_script(c); diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index a0dbb186..21809ee 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1197,7 +1197,13 @@ static const struct textcomplexity_test textcomplexity_tests[] = { { {0x610,0x610,'C','D',0}, 2, FALSE, 2 }, { {0xd800,'A','B',0}, 1, FALSE, 1 }, { {0xd800,'A','B',0}, 2, FALSE, 1 }, - { {0xdc00,'A','B',0}, 2, FALSE, 1 } + { {0xdc00,'A','B',0}, 2, FALSE, 1 }, + { {0x202a,'A',0x202c,0}, 3, FALSE, 1 }, + { {0x200e,'A',0}, 2, FALSE, 1 }, + { {0x200f,'A',0}, 2, FALSE, 1 }, + { {0x202d,'A',0}, 2, FALSE, 1 }, + { {0x202e,'A',0}, 2, FALSE, 1 }, + }; static void test_GetTextComplexity(void)

1 0

Nikolay Sivov : comctl32/tests: Some tests for TVM_SORTCHILDREN.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 7fae248552070ab3bb94a6687199a7bf4147bd6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fae248552070ab3bb94a6687… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 5 11:39:02 2017 +0300 comctl32/tests: Some tests for TVM_SORTCHILDREN. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 190 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 8180a4f..19a5ac0 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2396,6 +2396,195 @@ static void test_TVS_FULLROWSELECT(void) DestroyWindow(hwnd); } +static void get_item_names_string(HWND hwnd, HTREEITEM item, char *str) +{ + TVITEMA tvitem = { 0 }; + HTREEITEM child; + char name[16]; + + if (!item) + { + item = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); + str[0] = 0; + } + + child = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)item); + + tvitem.mask = TVIF_TEXT; + tvitem.hItem = item; + tvitem.pszText = name; + tvitem.cchTextMax = sizeof(name); + SendMessageA(hwnd, TVM_GETITEMA, 0, (LPARAM)&tvitem); + strcat(str, tvitem.pszText); + + while (child != NULL) + { + get_item_names_string(hwnd, child, str); + child = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)child); + } +} + +static void fill_treeview_sort_test(HWND hwnd) +{ + static const char *itemnames[] = + { + "root", "Wasp", "Caribou", "Vacuum", + "Ocelot", "Newspaper", "Litter bin" + }; + + HTREEITEM root, children[2]; + TVINSERTSTRUCTA ins; + unsigned i = 0; + + SendMessageA(hwnd, TVM_DELETEITEM, 0, 0); + + /* root, two children, with two children each */ + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char *)itemnames[i++]; + root = (HTREEITEM)SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + ins.hParent = root; + ins.hInsertAfter = TVI_LAST; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char *)itemnames[i++]; + children[0] = (HTREEITEM)SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + U(ins).item.pszText = (char *)itemnames[i++]; + children[1] = (HTREEITEM)SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + ins.hParent = children[0]; + U(ins).item.pszText = (char *)itemnames[i++]; + SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + U(ins).item.pszText = (char *)itemnames[i++]; + SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + ins.hParent = children[1]; + U(ins).item.pszText = (char *)itemnames[i++]; + SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + U(ins).item.pszText = (char *)itemnames[i++]; + SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); +} + +static void test_TVM_SORTCHILDREN(void) +{ + static const char *initial_order = "rootWaspVacuumOcelotCaribouNewspaperLitter bin"; + static const char *sorted_order = "rootCaribouNewspaperLitter binWaspVacuumOcelot"; + TVINSERTSTRUCTA ins; + char buff[256]; + HTREEITEM root; + HWND hwnd; + BOOL ret; + + hwnd = create_treeview_control(0); + + /* call on empty tree */ + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, 0, 0); + ok(!ret, "Unexpected ret value %d\n", ret); + + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, 0, (LPARAM)TVI_ROOT); + ok(!ret, "Unexpected ret value %d\n", ret); + + /* add only root, sort from it */ + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char *)"root"; + root = (HTREEITEM)SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + ok(root != NULL, "Expected root node\n"); + + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, 0, (LPARAM)root); + ok(!ret, "Unexpected ret value %d\n", ret); + + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, TRUE, (LPARAM)root); + ok(!ret, "Unexpected ret value %d\n", ret); + + /* root, two children, with two children each */ + fill_treeview_sort_test(hwnd); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, initial_order), "Wrong initial order %s, expected %s\n", buff, initial_order); + + /* with NULL item nothing is sorted */ + fill_treeview_sort_test(hwnd); + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, 0, 0); +todo_wine + ok(ret, "Unexpected ret value %d\n", ret); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, initial_order), "Wrong sorted order %s, expected %s\n", buff, initial_order); + + /* TVI_ROOT as item */ + fill_treeview_sort_test(hwnd); + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, 0, (LPARAM)TVI_ROOT); +todo_wine + ok(ret, "Unexpected ret value %d\n", ret); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, initial_order), "Wrong sorted order %s, expected %s\n", buff, initial_order); + + /* zero WPARAM, item is specified */ + fill_treeview_sort_test(hwnd); + root = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); + ok(root != NULL, "Failed to get root item\n"); + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, 0, (LPARAM)root); + ok(ret, "Unexpected ret value %d\n", ret); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, sorted_order), "Wrong sorted order %s, expected %s\n", buff, sorted_order); + + /* non-zero WPARAM, NULL item */ + fill_treeview_sort_test(hwnd); + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, TRUE, 0); +todo_wine + ok(ret, "Unexpected ret value %d\n", ret); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, initial_order), "Wrong sorted order %s, expected %s\n", buff, sorted_order); + + /* TVI_ROOT as item */ + fill_treeview_sort_test(hwnd); + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, TRUE, (LPARAM)TVI_ROOT); +todo_wine + ok(ret, "Unexpected ret value %d\n", ret); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, initial_order), "Wrong sorted order %s, expected %s\n", buff, sorted_order); + + /* non-zero WPARAM, item is specified */ + fill_treeview_sort_test(hwnd); + root = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); + ok(root != NULL, "Failed to get root item\n"); + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, TRUE, (LPARAM)root); + ok(ret, "Unexpected ret value %d\n", ret); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, sorted_order), "Wrong sorted order %s, expected %s\n", buff, sorted_order); + + /* case insensitive comparison */ + SendMessageA(hwnd, TVM_DELETEITEM, 0, 0); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char *)"root"; + root = (HTREEITEM)SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + ok(root != NULL, "Expected root node\n"); + + ins.hParent = root; + ins.hInsertAfter = TVI_LAST; + U(ins).item.pszText = (char *)"I1"; + SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + ins.hParent = root; + ins.hInsertAfter = TVI_LAST; + U(ins).item.pszText = (char *)"i1"; + SendMessageA(hwnd, TVM_INSERTITEMA, 0, (LPARAM)&ins); + + ret = SendMessageA(hwnd, TVM_SORTCHILDREN, TRUE, (LPARAM)root); + ok(ret, "Unexpected ret value %d\n", ret); + get_item_names_string(hwnd, NULL, buff); + ok(!strcmp(buff, "rootI1i1"), "Wrong sorted order %s\n", buff); + + DestroyWindow(hwnd); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -2472,6 +2661,7 @@ START_TEST(treeview) test_customdraw(); test_WM_KEYDOWN(); test_TVS_FULLROWSELECT(); + test_TVM_SORTCHILDREN(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Alistair Leslie-Hughes : odbccp32: Implement SQLInstallTranslator.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: d687fc8f34b8cc20677c8082ca0b82a74dae2f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d687fc8f34b8cc20677c8082c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 5 01:29:09 2017 +0000 odbccp32: Implement SQLInstallTranslator. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 13 ++++----- dlls/odbccp32/tests/misc.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 6 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 6a2c484..7b2f020 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -41,6 +41,7 @@ static const WCHAR drivers_key[] = {'S','o','f','t','w','a','r','e','\\','O','D' static const WCHAR odbcW[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C',0}; static const WCHAR odbcini[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','I','N','S','T','.','I','N','I','\\',0}; static const WCHAR odbcdrivers[] = {'O','D','B','C',' ','D','r','i','v','e','r','s',0}; +static const WCHAR odbctranslators[] = {'O','D','B','C',' ','T','r','a','n','s','l','a','t','o','r','s',0}; /* This config mode is known to be process-wide. * MSDN documentation suggests that the value is hidden somewhere in the registry but I haven't found it yet. @@ -636,6 +637,7 @@ static void write_registry_values(const WCHAR *regkey, const WCHAR *driver, cons static const WCHAR slash[] = {'\\', 0}; static const WCHAR driverW[] = {'D','r','i','v','e','r',0}; static const WCHAR setupW[] = {'S','e','t','u','p',0}; + static const WCHAR translator[] = {'T','r','a','n','s','l','a','t','o','r',0}; HKEY hkey, hkeydriver; if (RegCreateKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey) == ERROR_SUCCESS) @@ -684,8 +686,9 @@ static void write_registry_values(const WCHAR *regkey, const WCHAR *driver, cons divider++; TRACE("Writing pair %s,%s\n", debugstr_w(entry), debugstr_w(divider)); - /* Driver and Setup entries use the system path unless a path is specified. */ - if(lstrcmpiW(driverW, entry) == 0 || lstrcmpiW(setupW, entry) == 0) + /* Driver, Setup, Translator entries use the system path unless a path is specified. */ + if(lstrcmpiW(driverW, entry) == 0 || lstrcmpiW(setupW, entry) == 0 || + lstrcmpiW(translator, entry) == 0) { len = lstrlenW(path) + lstrlenW(slash) + lstrlenW(divider) + 1; value = heap_alloc(len * sizeof(WCHAR)); @@ -976,7 +979,6 @@ BOOL WINAPI SQLInstallTranslatorExW(LPCWSTR lpszTranslator, LPCWSTR lpszPathIn, WORD fRequest, LPDWORD lpdwUsageCount) { UINT len; - LPCWSTR p; WCHAR path[MAX_PATH]; clear_errors(); @@ -984,10 +986,9 @@ BOOL WINAPI SQLInstallTranslatorExW(LPCWSTR lpszTranslator, LPCWSTR lpszPathIn, debugstr_w(lpszPathIn), lpszPathOut, cbPathOutMax, pcbPathOut, fRequest, lpdwUsageCount); - for (p = lpszTranslator; *p; p += lstrlenW(p) + 1) - TRACE("%s\n", debugstr_w(p)); + write_registry_values(odbctranslators, lpszTranslator, lpszPathIn, path, lpdwUsageCount); - len = GetSystemDirectoryW(path, MAX_PATH); + len = lstrlenW(path); if (pcbPathOut) *pcbPathOut = len; diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 35b9f35..7a6e8db 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -473,6 +473,72 @@ static void test_SQLInstallDriverEx(void) ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); } +void test_SQLInstallTranslatorEx(void) +{ + char path[MAX_PATH]; + char syspath[MAX_PATH]; + WORD size = 0; + BOOL ret, sql_ret; + DWORD cnt, error_code = 0; + HKEY hkey; + LONG res; + + GetSystemDirectoryA(syspath, MAX_PATH); + + ret = SQLInstallTranslatorEx("WINE ODBC Translator\0Translator=sample.dll\0Setup=sample.dll\0", + NULL, path, MAX_PATH, &size, ODBC_INSTALL_COMPLETE, NULL); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + if (sql_ret && error_code == ODBC_ERROR_WRITING_SYSINFO_FAILED) + { + win_skip("not enough privileges\n"); + return; + } + ok(sql_ret && error_code == SQL_SUCCESS, "SQLInstallDriverEx failed %d, %u\n", sql_ret, error_code); + ok(!strcmp(path, syspath), "invalid path %s\n", path); + ok(size == strlen(path), "invalid length %d\n", size); + + ret = SQLInstallTranslatorEx("WINE ODBC Translator Path\0Translator=sample.dll\0Setup=sample.dll\0", + "c:\\temp", path, MAX_PATH, &size, ODBC_INSTALL_COMPLETE, NULL); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(sql_ret && error_code == SQL_SUCCESS, "SQLInstallTranslatorEx failed %d, %u\n", sql_ret, error_code); + ok(!strcmp(path, "c:\\temp"), "invalid path %s\n", path); + ok(size == strlen(path), "invalid length %d\n", size); + + if(ret) + { + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBCINST.INI\\WINE ODBC Translator", 0, + KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + DWORD type = 0xdeadbeef, size = MAX_PATH; + char driverpath[MAX_PATH]; + + strcpy(driverpath, syspath); + strcat(driverpath, "\\sample.dll"); + + memset(path, 0, sizeof(path)); + res = RegQueryValueExA(hkey, "Translator", NULL, &type, (BYTE *)path, &size); + ok(res == ERROR_SUCCESS, "RegGetValueA failed\n"); + ok(type == REG_SZ, "got %u\n", type); + ok(size == strlen(driverpath) + 1, "got %u\n", size); + ok(!strcmp(path, driverpath), "invalid path %s\n", path); + + RegCloseKey(hkey); + } + } + + cnt = 100; + ret = SQLRemoveTranslator("WINE ODBC Translator", &cnt); + todo_wine ok(ret, "SQLRemoveTranslator failed\n"); + todo_wine ok(cnt == 0, "SQLRemoveTranslator failed %d\n", cnt); + + cnt = 100; + ret = SQLRemoveTranslator("WINE ODBC Translator Path", &cnt); + todo_wine ok(ret, "SQLRemoveTranslator failed\n"); + todo_wine ok(cnt == 0, "SQLRemoveTranslator failed %d\n", cnt); +} + START_TEST(misc) { test_SQLConfigMode(); @@ -482,4 +548,5 @@ START_TEST(misc) test_SQLGetPrivateProfileString(); test_SQLGetPrivateProfileStringW(); test_SQLInstallDriverEx(); + test_SQLInstallTranslatorEx(); }

1 0

Huw Davies : gdi32/tests: Prevent a crash if the shell dlg font is not found.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 8dc039a7d150cc9f2f815ffe19542195dcb5ea03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc039a7d150cc9f2f815ffe1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 5 09:35:07 2017 +0100 gdi32/tests: Prevent a crash if the shell dlg font is not found. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index fb27f8e..0b8cfd5 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5305,10 +5305,13 @@ static void test_EnumFonts_subst(void) ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg_proc, (LPARAM)&efnd, 0); ok(!ret, "MS Shell Dlg should be enumerated\n"); ok(efnd.total > 0, "MS Shell Dlg should be enumerated\n"); - ret = strcmp((const char *)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg"); - ok(!ret, "expected MS Shell Dlg, got %s\n", efnd.elf[0].elfLogFont.lfFaceName); - ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg"); - ok(ret, "did not expect MS Shell Dlg\n"); + if (efnd.total) + { + ret = strcmp((const char *)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg"); + ok(!ret, "expected MS Shell Dlg, got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg"); + ok(ret, "did not expect MS Shell Dlg\n"); + } efnd.total = 0; ret = EnumFontFamiliesExA(hdc, NULL, enum_ms_shell_dlg2_proc, (LPARAM)&efnd, 0); @@ -5320,10 +5323,13 @@ static void test_EnumFonts_subst(void) ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg2_proc, (LPARAM)&efnd, 0); ok(!ret, "MS Shell Dlg 2 should be enumerated\n"); ok(efnd.total > 0, "MS Shell Dlg 2 should be enumerated\n"); - ret = strcmp((const char *)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg 2"); - ok(!ret, "expected MS Shell Dlg 2, got %s\n", efnd.elf[0].elfLogFont.lfFaceName); - ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); - ok(ret, "did not expect MS Shell Dlg 2\n"); + if (efnd.total) + { + ret = strcmp((const char *)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg 2"); + ok(!ret, "expected MS Shell Dlg 2, got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); + ok(ret, "did not expect MS Shell Dlg 2\n"); + } heap_free(efnd.elf); DeleteDC(hdc);

1 0

Jacek Caban : xmllite/tests: Use reader_value helper in one more place ( Coverity).
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: afaec19469ca072b9abd69b187d441dfdde1fad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afaec19469ca072b9abd69b18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 3 12:31:32 2017 +0200 xmllite/tests: Use reader_value helper in one more place (Coverity). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 819f812..72c1fb7 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2580,8 +2580,7 @@ static void test_string_pointers(void) read_node(reader, XmlNodeType_Element); next_attribute(reader); read_value_char(reader, 'm'); - IXmlReader_GetValue(reader, &p, NULL); - ok(!strcmp_wa(p, "yns"), "value = %s\n", wine_dbgstr_w(p)); + p = reader_value(reader, "yns"); read_node(reader, XmlNodeType_Element); ns = reader_namespace(reader, "myns");

1 0

Michael Stefaniuc : kernel32/tests: Test HeapReAlloc with size 0.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: 14e7febc52a2dc33e65ec85862867149aea0d5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e7febc52a2dc33e65ec8586… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Apr 4 14:52:14 2017 +0200 kernel32/tests: Test HeapReAlloc with size 0. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 2f7edc8..0acf109 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -118,6 +118,13 @@ static void test_heap(void) HeapFree(GetProcessHeap(), 0, mem); mem = HeapAlloc(GetProcessHeap(), 0, ~(SIZE_T)0); ok(mem == NULL, "memory allocated for size ~0\n"); + mem = HeapAlloc(GetProcessHeap(), 0, 17); + msecond = HeapReAlloc(GetProcessHeap(), 0, mem, 0); + ok(msecond != NULL, "HeapReAlloc(0) should have succeeded\n"); + size = HeapSize(GetProcessHeap(), 0, msecond); + ok(size == 0 || broken(size == 1) /* some vista and win7 */, + "HeapSize should have returned 0 instead of %lu\n", size); + HeapFree(GetProcessHeap(), 0, msecond); /* large blocks must be 16-byte aligned */ mem = HeapAlloc(GetProcessHeap(), 0, 512 * 1024);

1 0

Jactry Zeng : quartz/tests: Test IFilterGraph2:: RenderFile with multithread.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: b709998f8534023b146461fe5505b80c101240af URL: http://source.winehq.org/git/wine.git/?a=commit;h=b709998f8534023b146461fe5… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Mar 29 21:14:54 2017 +0800 quartz/tests: Test IFilterGraph2::RenderFile with multithread. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 75 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 1089de7..eed7872 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -376,6 +376,80 @@ static void test_render_run(const WCHAR *file) CloseHandle(h); } +static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) +{ + IFilterGraph2 *filter_graph = lParam; + HRESULT hr; + WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; + HANDLE handle; + + handle = CreateFileW(mp3file, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + if (handle == INVALID_HANDLE_VALUE) + { + skip("Could not read test file %s, skipping test\n", wine_dbgstr_w(mp3file)); + return 1; + } + CloseHandle(handle); + + hr = IFilterGraph2_RenderFile(filter_graph, mp3file, NULL); + todo_wine ok(hr == VFW_E_CANNOT_RENDER || /* xp or older */ + hr == VFW_E_NO_TRANSPORT, /* win7 or newer */ + "Expected 0x%08x or 0x%08x, returned 0x%08x\n", VFW_E_CANNOT_RENDER, VFW_E_NO_TRANSPORT, hr); + + DeleteFileW(mp3file); + return 0; +} + +static void test_render_with_multithread(void) +{ + HRESULT hr; + HMODULE hmod; + static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out); + IClassFactory *classfactory = NULL; + static IGraphBuilder *graph_builder; + static IFilterGraph2 *filter_graph; + HANDLE thread; + + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hmod = LoadLibraryA("quartz.dll"); + if (!hmod) + { + skip("Fail to load quartz.dll.\n"); + return; + } + + pDllGetClassObject = (void*)GetProcAddress(hmod, "DllGetClassObject"); + if (!pDllGetClassObject) + { + skip("Fail to get DllGetClassObject.\n"); + return; + } + + hr = pDllGetClassObject(&CLSID_FilterGraph, &IID_IClassFactory, (void **)&classfactory); + ok(hr == S_OK, "DllGetClassObject failed 0x%08x\n", hr); + if (FAILED(hr)) + { + skip("Can't create IClassFactory 0x%08x.\n", hr); + return; + } + + hr = IClassFactory_CreateInstance(classfactory, NULL, &IID_IUnknown, (LPVOID*)&graph_builder); + ok(hr == S_OK, "IClassFactory_CreateInstance failed 0x%08x\n", hr); + + hr = IGraphBuilder_QueryInterface(graph_builder, &IID_IFilterGraph2, (void**)&filter_graph); + ok(hr == S_OK, "IGraphBuilder_QueryInterface failed 0x%08x\n", hr); + + thread = CreateThread(NULL, 0, call_RenderFile_multithread, filter_graph, 0, NULL); + + WaitForSingleObject(thread, 1000); + IFilterGraph2_Release(filter_graph); + IGraphBuilder_Release(graph_builder); + IClassFactory_Release(classfactory); + CoUninitialize(); + return; +} + static void test_graph_builder(void) { HRESULT hr; @@ -2235,4 +2309,5 @@ START_TEST(filtergraph) test_render_filter_priority(); test_aggregate_filter_graph(); CoUninitialize(); + test_render_with_multithread(); }

1 0

Józef Kucia : d3d10core/tests: Port stream output tests from d3d11.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: efdf17e7d5834d2158315f730d3c5437d61f5dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=efdf17e7d5834d2158315f730… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 4 12:35:58 2017 +0200 d3d10core/tests: Port stream output tests from d3d11. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 367 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 367 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efdf17e7d5834d2158315…

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
76
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 April 2017