December 2016 - Wine-Commits

Hans Leidekker : user32/tests: Disable automatic shell restart during SetShellWindow tests.
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: ef743e41eec277341dcf5a323c8c5422d8a7dfbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef743e41eec277341dcf5a323… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 20 12:09:05 2016 +0100 user32/tests: Disable automatic shell restart during SetShellWindow tests. This test kills the desktop shell process so it can set a different shell window. Modern Windows will automatically restart the desktop shell when it dies, and if that happens soon enough it will interfere with the remaining tests. Disabling automatic restart requires admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 375d387..ca99de4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -32,6 +32,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winreg.h" #include "wine/test.h" @@ -1239,10 +1240,42 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) return CallNextHookEx(hhook, nCode, wParam, lParam); } +static const WCHAR winlogonW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'W','i','n','l','o','g','o','n',0}; +static const WCHAR autorestartshellW[] = + {'A','u','t','o','R','e','s','t','a','r','t','S','h','e','l','l',0}; + +static DWORD get_autorestart(void) +{ + DWORD type, val, len = sizeof(val); + REGSAM access = KEY_ALL_ACCESS|KEY_WOW64_64KEY; + HKEY hkey; + LONG res; + + if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, winlogonW, 0, 0, 0, access, NULL, &hkey, 0 )) return 0; + res = RegQueryValueExW( hkey, autorestartshellW, NULL, &type, (BYTE *)&val, &len ); + RegCloseKey( hkey ); + return (!res && type == REG_DWORD) ? val : 0; +} + +static BOOL set_autorestart( DWORD val ) +{ + REGSAM access = KEY_ALL_ACCESS|KEY_WOW64_64KEY; + HKEY hkey; + LONG res; + + if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, winlogonW, 0, 0, 0, access, NULL, &hkey, 0 )) return FALSE; + res = RegSetValueExW( hkey, autorestartshellW, 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + RegCloseKey( hkey ); + return !res; +} + static void test_shell_window(void) { BOOL ret; - DWORD error; + DWORD error, restart = get_autorestart(); HMODULE hinst, hUser32; BOOL (WINAPI*SetShellWindow)(HWND); HWND hwnd1, hwnd2, hwnd3, hwnd4, hwnd5; @@ -1254,6 +1287,12 @@ static void test_shell_window(void) return; } + if (restart && !set_autorestart(0)) + { + skip("cannot disable automatic shell restart (needs admin rights\n"); + return; + } + shellWindow = GetShellWindow(); hinst = GetModuleHandleA(NULL); hUser32 = GetModuleHandleA("user32"); @@ -1271,6 +1310,7 @@ static void test_shell_window(void) if (!hProcess) { skip( "cannot get access to shell process\n" ); + set_autorestart(restart); return; } @@ -1367,6 +1407,7 @@ static void test_shell_window(void) DestroyWindow(hwnd3); DestroyWindow(hwnd4); DestroyWindow(hwnd5); + set_autorestart(restart); } /************** MDI test ****************/

1 0

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

Dec. 20, 2016

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 Dec. 20, 2016

Dec. 20, 2016

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

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

Dec. 20, 2016

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 Dec. 20, 2016

Dec. 20, 2016

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 : setupapi/tests: Skip SetupGetInfInformation tests if the user doesn't have admin rights.
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

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

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

Dec. 20, 2016

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

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

Dec. 19, 2016

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

Nikolay Sivov : gdiplus/tests: Test for initial properties of adjustable arrow caps.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 134cb70fed15e55b3461808fb5244371bb54dce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=134cb70fed15e55b3461808fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 16 15:21:12 2016 +0300 gdiplus/tests: Test for initial properties of adjustable arrow caps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/customlinecap.c | 51 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index f70c134..c2a1dab 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -217,6 +217,56 @@ static void test_scale(void) GdipDeletePath(path); } +static void test_create_adjustable_cap(void) +{ + GpAdjustableArrowCap *cap; + REAL inset, scale; + GpLineJoin join; + GpStatus stat; + GpLineCap base; + + stat = GdipCreateAdjustableArrowCap(10.0, 10.0, TRUE, NULL); +todo_wine + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + + stat = GdipCreateAdjustableArrowCap(17.0, 15.0, TRUE, &cap); +todo_wine + ok(stat == Ok, "Failed to create adjustable cap, %d\n", stat); + if (stat != Ok) + return; + + stat = GdipGetAdjustableArrowCapMiddleInset(cap, NULL); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + + stat = GdipGetAdjustableArrowCapMiddleInset(cap, &inset); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(inset == 0.0f, "Unexpected middle inset %f\n", inset); + + stat = GdipGetCustomLineCapBaseCap((GpCustomLineCap*)cap, &base); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(base == LineCapTriangle, "Unexpected base cap %d\n", base); + + stat = GdipSetCustomLineCapBaseCap((GpCustomLineCap*)cap, LineCapSquare); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + + stat = GdipGetCustomLineCapBaseCap((GpCustomLineCap*)cap, &base); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(base == LineCapSquare, "Unexpected base cap %d\n", base); + + stat = GdipGetCustomLineCapBaseInset((GpCustomLineCap*)cap, &inset); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + + stat = GdipGetCustomLineCapWidthScale((GpCustomLineCap*)cap, &scale); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(scale == 1.0f, "Unexpected width scale %f\n", scale); + + stat = GdipGetCustomLineCapStrokeJoin((GpCustomLineCap*)cap, &join); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(join == LineJoinMiter, "Unexpected stroke join %d\n", join); + + GdipDeleteCustomLineCap((GpCustomLineCap*)cap); +} + START_TEST(customlinecap) { struct GdiplusStartupInput gdiplusStartupInput; @@ -233,6 +283,7 @@ START_TEST(customlinecap) test_linejoin(); test_inset(); test_scale(); + test_create_adjustable_cap(); GdiplusShutdown(gdiplusToken); }

1 0

Hugh McMaster : regedit: Load Binary editor from context menu.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: dc6e2eaf09be532daaee68582744c27dca52e7dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc6e2eaf09be532daaee68582… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Dec 19 10:10:55 2016 +0000 regedit: Load Binary editor from context menu. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 0a56f94..b1611cf 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -730,6 +730,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) break; } case ID_EDIT_MODIFY: + case ID_EDIT_MODIFY_BIN: { LPCWSTR valueName = GetValueName(g_pChildWnd->hListWnd); WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot);

1 0