wine-commits December 2016

wine-commits@winehq.org

2 participants
342 discussions

Hans Leidekker : setupapi/tests: Skip SetupGetInfInformation tests if the user doesn't have admin rights.
by Alexandre Julliard 20 Dec '16

20 Dec '16

Module: wine Branch: master Commit: 0e3a0e13ef64f52e569e162ab8a76d488ed08707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e3a0e13ef64f52e569e162ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 20 12:08:34 2016 +0100 setupapi/tests: Skip SetupGetInfInformation tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/query.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 17c24bf..6b6d1bd 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -99,13 +99,16 @@ static const char inf_data6[] = "[CopyAlways.Windir.Files]\n" "WindowsCodecs.dll\n"; -static void create_inf_file(LPSTR filename, const char *data, DWORD size) +static BOOL create_inf_file(LPSTR filename, const char *data, DWORD size) { + BOOL ret; DWORD dwNumberOfBytesWritten; HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - WriteFile(hf, data, size, &dwNumberOfBytesWritten, NULL); + if (hf == INVALID_HANDLE_VALUE) return FALSE; + ret = WriteFile(hf, data, size, &dwNumberOfBytesWritten, NULL); CloseHandle(hf); + return ret; } static BOOL check_info_filename(PSP_INF_INFORMATION info, LPSTR test) @@ -258,7 +261,13 @@ static void test_SetupGetInfInformation(void) lstrcpyA(inf_two, WIN_DIR); lstrcatA(inf_two, "\\system32\\"); lstrcatA(inf_two, "test.inf"); - create_inf_file(inf_two, inf_data1, sizeof(inf_data1) - 1); + ret = create_inf_file(inf_two, inf_data1, sizeof(inf_data1) - 1); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("need admin rights\n"); + goto done; + } + ok(ret, "can't create inf file %u\n", GetLastError()); HeapFree(GetProcessHeap(), 0, info); info = alloc_inf_info("test.inf", INFINFO_DEFAULT_SEARCH, &size); @@ -291,8 +300,8 @@ static void test_SetupGetInfInformation(void) ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); ok(check_info_filename(info, revfile), "Expected returned filename to be equal\n"); +done: HeapFree(GetProcessHeap(), 0, info); - DeleteFileA(inf_filename); DeleteFileA(inf_one); DeleteFileA(inf_two);

1 0

Hugh McMaster : reg/tests: Add tests for line concatenation when importing.
by Alexandre Julliard 20 Dec '16

20 Dec '16

Module: wine Branch: master Commit: d4be360b01dcf1ebb53342e21fdd36120f92a849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4be360b01dcf1ebb53342e21… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 20 11:08:28 2016 +0000 reg/tests: Add tests for line concatenation when importing. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e8a9d80..edc3b08 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1064,6 +1064,24 @@ static void test_import(void) dword = 0x00000004; todo_wine verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line1\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,\\;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line1", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line2\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -1322,6 +1340,24 @@ static void test_import(void) dword = 0x00000004; todo_wine verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line1\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,\\;comment\n" + " 63,00,61,00,74,00,\\;comment\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line1", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line2\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,\\;comment\n" + " 63,00,61,00,74,00,;comment\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : regedit/tests: Add tests for line concatenation when importing.
by Alexandre Julliard 20 Dec '16

20 Dec '16

Module: wine Branch: master Commit: e7d5503347de95441525bd8277d57b442b861584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d5503347de95441525bd827… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 20 11:08:17 2016 +0000 regedit/tests: Add tests for line concatenation when importing. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index e09d188..445efb7 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -427,6 +427,22 @@ static void test_comments(void) dword = 0x00000004; todo_wine verify_reg(hkey, "Wine24", REG_DWORD, &dword, sizeof(dword), 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line1\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,\\;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Multi-Line1", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line2\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hans Leidekker : shell32/tests: Skip SHFileOperation tests if the user doesn't have admin rights.
by Alexandre Julliard 20 Dec '16

20 Dec '16

Module: wine Branch: master Commit: a2556760ec6995932e883e11fa93563b271a3951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2556760ec6995932e883e11f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 20 12:07:52 2016 +0100 shell32/tests: Skip SHFileOperation tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfileop.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index d74c59a..4ae93ff 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -820,7 +820,7 @@ static void test_rename(void) retval == DE_FILEDESTISFLD || /* Vista, running from c: */ broken(retval == DE_OPCANCELLED) || /* Win9x */ broken(retval == 65652), /* NT4 */ - "Expected ERROR_CANCELLED or DE_DIFFDIR\n"); + "Expected ERROR_CANCELLED or DE_DIFFDIR, got %u\n", retval); ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); /* pFrom is empty */ @@ -2517,6 +2517,11 @@ static void test_unicode(void) skip("Unicode tests skipped on non-unicode system\n"); return; } + if (GetLastError()==ERROR_ACCESS_DENIED) + { + skip("test needs admin rights\n"); + return; + } CloseHandle(file); /* Try to delete a file with unicode filename */ @@ -2575,6 +2580,7 @@ static void test_unicode(void) ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_INVALID_HANDLE), /* WinXp, win2k3 */ "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + DeleteFileW(UNICODE_PATH_TO); /* Check last error after a failed file operation. */ DeleteFileW(UNICODE_PATH);

1 0

Hans Leidekker : shell32/tests: Accept another error from SHFileOperationA.
by Alexandre Julliard 20 Dec '16

20 Dec '16

Module: wine Branch: master Commit: 748f7e26cbab9d91993d555d124bd193c4cafcfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=748f7e26cbab9d91993d555d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 20 12:07:51 2016 +0100 shell32/tests: Accept another error from SHFileOperationA. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfileop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 0e502fc..d74c59a 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -817,6 +817,7 @@ static void test_rename(void) retval = SHFileOperationA(&shfo); ok(retval == ERROR_CANCELLED || retval == DE_DIFFDIR || /* Vista */ + retval == DE_FILEDESTISFLD || /* Vista, running from c: */ broken(retval == DE_OPCANCELLED) || /* Win9x */ broken(retval == 65652), /* NT4 */ "Expected ERROR_CANCELLED or DE_DIFFDIR\n");

1 0

Nikolay Sivov : dwrite: Improve strikethrough and underline thickness extraction logic.
by Alexandre Julliard 20 Dec '16

20 Dec '16

Module: wine Branch: master Commit: 6e356742e3a7758182b722b73dcf432573ebc4d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e356742e3a7758182b722b73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 20 12:37:03 2016 +0300 dwrite: Improve strikethrough and underline thickness extraction logic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 13 +++---------- dlls/dwrite/tests/font.c | 12 +++--------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c666275..c829813 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1243,17 +1243,10 @@ void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness); } - /* use any of thickness values if another one is zero, if both are zero use estimate */ - if (metrics->strikethroughThickness || metrics->underlineThickness) { - if (!metrics->strikethroughThickness) - metrics->strikethroughThickness = metrics->underlineThickness; - if (!metrics->underlineThickness) - metrics->underlineThickness = metrics->strikethroughThickness; - } - else { - metrics->strikethroughThickness = metrics->designUnitsPerEm / 14; + if (metrics->underlineThickness == 0) metrics->underlineThickness = metrics->designUnitsPerEm / 14; - } + if (metrics->strikethroughThickness == 0) + metrics->strikethroughThickness = metrics->underlineThickness; /* estimate missing metrics */ if (metrics->xHeight == 0) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index eb47a05..ba9866a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1725,16 +1725,10 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness); } - if (metrics->strikethroughThickness || metrics->underlineThickness) { - if (!metrics->strikethroughThickness) - metrics->strikethroughThickness = metrics->underlineThickness; - if (!metrics->underlineThickness) - metrics->underlineThickness = metrics->strikethroughThickness; - } - else { - metrics->strikethroughThickness = metrics->designUnitsPerEm / 14; + if (metrics->underlineThickness == 0) metrics->underlineThickness = metrics->designUnitsPerEm / 14; - } + if (metrics->strikethroughThickness == 0) + metrics->strikethroughThickness = metrics->underlineThickness; if (tt_os2) IDWriteFontFace_ReleaseFontTable(fontface, os2_context);

1 0

Nikolay Sivov : dwrite: Fully initialize shared factory vtable.
by Alexandre Julliard 20 Dec '16

20 Dec '16

Module: wine Branch: master Commit: 6d0fa4cebce4b5711fdd291c7ef54f27e14abe6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0fa4cebce4b5711fdd291c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 20 02:09:27 2016 +0300 dwrite: Fully initialize shared factory vtable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 9d5b1be..50a4c1c 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1536,7 +1536,10 @@ static const struct IDWriteFactory4Vtbl shareddwritefactoryvtbl = { dwritefactory3_CreateFontSetBuilder, dwritefactory3_CreateFontCollectionFromFontSet, dwritefactory3_GetSystemFontCollection, - dwritefactory3_GetFontDownloadQueue + dwritefactory3_GetFontDownloadQueue, + dwritefactory4_TranslateColorGlyphRun, + dwritefactory4_ComputeGlyphOrigins_, + dwritefactory4_ComputeGlyphOrigins }; static void init_dwritefactory(struct dwritefactory *factory, DWRITE_FACTORY_TYPE type)

1 0

Lauri Kenttä : cmd: Fix memory leak in WCMD_reduce.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: master Commit: 21dd04670c1e2fa06bfc5bbb5b0c6f4537cde9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21dd04670c1e2fa06bfc5bbb5… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Dec 17 10:33:27 2016 +0200 cmd: Fix memory leak in WCMD_reduce. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index cd319f8..f3dbe3a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3689,7 +3689,7 @@ static WCHAR WCMD_popoperator(OPSTACK **opstack) { * Returns non-zero on error. */ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { - OPSTACK *thisop; + WCHAR thisop; int var1,var2; int rc = 0; @@ -3699,13 +3699,12 @@ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { } /* Remove the top operator */ - thisop = *opstack; - *opstack = (*opstack)->next; - WINE_TRACE("Reducing the stacks - processing operator %c\n", thisop->op); + thisop = WCMD_popoperator(opstack); + WINE_TRACE("Reducing the stacks - processing operator %c\n", thisop); /* One variable operators */ var1 = WCMD_popnumber(varstack); - switch (thisop->op) { + switch (thisop) { case '!': WCMD_pushnumber(NULL, !var1, varstack); break; case '~': WCMD_pushnumber(NULL, ~var1, varstack); @@ -3721,7 +3720,7 @@ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { WINE_TRACE("No operands left for the reduce?\n"); return WCMD_NOOPERAND; } - switch (thisop->op) { + switch (thisop) { case '!': case '~': case OP_POSITIVE: @@ -3792,11 +3791,11 @@ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { /* Make the operand stack grow by pushing the assign operator plus the operator to perform */ while (calcassignments[i].op != ' ' && - calcassignments[i].calculatedop != thisop->op) { + calcassignments[i].calculatedop != thisop) { i++; } if (calcassignments[i].calculatedop == ' ') { - WINE_ERR("Unexpected operator %c\n", thisop->op); + WINE_ERR("Unexpected operator %c\n", thisop); return WCMD_NOOPERATOR; } WCMD_pushoperator('=', WCMD_getprecedence('='), opstack); @@ -3820,10 +3819,9 @@ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { break; } - default: WINE_ERR("Unrecognized operator %c\n", thisop->op); + default: WINE_ERR("Unrecognized operator %c\n", thisop); } - heap_free(thisop); return rc; }

1 0

Andrew Eikum : mscoree: Leave the last backslash on application base path.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: master Commit: 0ea8893e1c3dd9097df083b57c0d7442c3fb4f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea8893e1c3dd9097df083b57… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 16 14:50:30 2016 -0600 mscoree: Leave the last backslash on application base path. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 94eca7f..86eb759 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -170,7 +170,7 @@ static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *conf slash = strrchr(base_dirA, '\\'); if (slash) - *slash = 0; + *(slash + 1) = 0; TRACE("setting base_dir: %s, config_path: %s\n", base_dirA, config_pathA); mono_domain_set_config(This->default_domain, base_dirA, config_pathA);

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: master Commit: 7aedfe0e9fa761c23dd82fab6485d2f39f2030f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aedfe0e9fa761c23dd82fab6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 19 08:43:04 2016 -0700 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 321 ++++++++++++++++++++++++++------------------------------------- 1 file changed, 131 insertions(+), 190 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7aedfe0e9fa761c23dd82…

1 0

← Newer
1
2
3
4
5
6
7
...
35
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 December 2016