wine-commits December 2016

wine-commits@winehq.org

2 participants
342 discussions

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard 22 Dec '16

22 Dec '16

Module: wine Branch: master Commit: a8511a3e1757eb986e9cbf33ea86b9ef03370dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8511a3e1757eb986e9cbf33e… Author: Can Taşan <betax34(a)hotmail.com> Date: Thu Dec 22 10:59:58 2016 +0100 po: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 734 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 336 insertions(+), 398 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8511a3e1757eb986e9cb…

1 0

Nikolay Sivov : shell32: Fix potential destination buffer overrun.
by Alexandre Julliard 21 Dec '16

21 Dec '16

Module: wine Branch: master Commit: f7cc41d7ae11e22163bd8b205bb30c43e2b6f7d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7cc41d7ae11e22163bd8b205… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 21 16:00:56 2016 +0300 shell32: Fix potential destination buffer overrun. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/folders.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 1674ad2..9307b08 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -323,7 +323,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN if (SUCCEEDED(hr)) { - hr = IShellLinkW_GetIconLocation(psl, szIconFile, MAX_PATH, piIndex); + hr = IShellLinkW_GetIconLocation(psl, szIconFile, cchMax, piIndex); if (SUCCEEDED(hr) && *szIconFile) found = TRUE;

1 0

Nikolay Sivov : shell32: Don't trace output string buffer contents.
by Alexandre Julliard 21 Dec '16

21 Dec '16

Module: wine Branch: master Commit: 490ffe7f4081f7bac874997ba432835eea6e1fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=490ffe7f4081f7bac874997ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 21 16:00:55 2016 +0300 shell32: Don't trace output string buffer contents. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/folders.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index cf26caf..1674ad2 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -198,7 +198,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN GUID const * riid; LPITEMIDLIST pSimplePidl = ILFindLastID(This->pidl); - TRACE("(%p) (flags=%u, %s, %u, %p, %p)\n", This, uFlags, debugstr_w(szIconFile), + TRACE("(%p) (flags=%u, %p, %u, %p, %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); if (pwFlags)

1 0

Hugh McMaster : appwiz.cpl: Do not overwrite application IDs when changing registry keys.
by Alexandre Julliard 21 Dec '16

21 Dec '16

Module: wine Branch: master Commit: c03ea1971b3a16291615cac25e169aeb78290c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03ea1971b3a16291615cac25… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 21 12:19:58 2016 +0000 appwiz.cpl: Do not overwrite application IDs when changing registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index dd84827..8119d07 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -152,7 +152,8 @@ static void FreeAppInfo(APPINFO *info) static BOOL ReadApplicationsFromRegistry(HKEY root) { HKEY hkeyApp; - int i, id = 0; + int i; + static int id = 0; DWORD sizeOfSubKeyName, displen, uninstlen; DWORD dwNoModify, dwType, value, size; WCHAR subKeyName[256];

1 0

Alexandre Julliard : msvcrt: Disable relay for the __libm_sse2 functions.
by Alexandre Julliard 21 Dec '16

21 Dec '16

Module: wine Branch: master Commit: cf51752d5f13ad24d9a4abea29d5aecba803adb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf51752d5f13ad24d9a4abea2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 17:11:09 2016 +0100 msvcrt: Disable relay for the __libm_sse2 functions. The relay code can use the SSE registers too. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-math-l1-1-0.spec | 64 +++++++++++----------- dlls/msvcr100/msvcr100.spec | 42 +++++++------- dlls/msvcr110/msvcr110.spec | 64 +++++++++++----------- dlls/msvcr120/msvcr120.spec | 64 +++++++++++----------- dlls/msvcr120_app/msvcr120_app.spec | 64 +++++++++++----------- dlls/msvcr80/msvcr80.spec | 42 +++++++------- dlls/msvcr90/msvcr90.spec | 42 +++++++------- dlls/msvcrt/msvcrt.spec | 42 +++++++------- dlls/ucrtbase/ucrtbase.spec | 64 +++++++++++----------- 9 files changed, 244 insertions(+), 244 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf51752d5f13ad24d9a4a…

1 0

Zebediah Figura : advapi32: Add tests for StartTrace().
by Alexandre Julliard 20 Dec '16

20 Dec '16

Module: wine Branch: master Commit: 1bcd38f788bb5165cc65a830ea912ff4eda50b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bcd38f788bb5165cc65a830e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Dec 18 15:25:59 2016 -0600 advapi32: Add tests for StartTrace(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 92 ++++++++++++++++++++++++++++++++++++++++++ include/evntrace.h | 1 + 2 files changed, 93 insertions(+) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 7daaeaf..d86a924 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -20,12 +20,15 @@ #include <stdarg.h> +#include "initguid.h" #include "windef.h" #include "winbase.h" #include "winerror.h" #include "winnt.h" #include "winreg.h" #include "sddl.h" +#include "wmistr.h" +#include "evntrace.h" #include "wine/test.h" @@ -1143,6 +1146,92 @@ static void cleanup_eventlog(void) ok(bret, "Expected MoveFileEx to succeed: %d\n", GetLastError()); } +static void test_start_trace(void) +{ + const char sessionname[] = "wine"; + const char filepath[] = "wine.etl"; + const char filepath2[] = "eniw.etl"; + EVENT_TRACE_PROPERTIES *properties; + TRACEHANDLE handle; + LONG buffersize; + LONG ret; + + buffersize = sizeof(EVENT_TRACE_PROPERTIES) + sizeof(sessionname) + sizeof(filepath); + properties = (EVENT_TRACE_PROPERTIES *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buffersize); + properties->Wnode.BufferSize = buffersize; + properties->Wnode.Flags = WNODE_FLAG_TRACED_GUID; + properties->LogFileMode = EVENT_TRACE_FILE_MODE_NONE; + properties->LoggerNameOffset = sizeof(EVENT_TRACE_PROPERTIES); + properties->LogFileNameOffset = sizeof(EVENT_TRACE_PROPERTIES) + sizeof(sessionname); + strcpy((char *)properties + properties->LogFileNameOffset, filepath); + + properties->Wnode.BufferSize = 0; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_BAD_LENGTH || + ret == ERROR_INVALID_PARAMETER, /* XP and 2k3 */ + "Expected ERROR_BAD_LENGTH, got %d\n", ret); + properties->Wnode.BufferSize = buffersize; + + ret = StartTraceA(&handle, "this name is too long", properties); + todo_wine + ok(ret == ERROR_BAD_LENGTH, "Expected ERROR_BAD_LENGTH, got %d\n", ret); + + ret = StartTraceA(&handle, sessionname, NULL); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + ret = StartTraceA(NULL, sessionname, properties); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + properties->LogFileNameOffset = 1; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + properties->LogFileNameOffset = sizeof(EVENT_TRACE_PROPERTIES) + sizeof(sessionname); + + properties->LoggerNameOffset = 1; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + properties->LoggerNameOffset = sizeof(EVENT_TRACE_PROPERTIES); + + properties->LogFileMode = EVENT_TRACE_FILE_MODE_SEQUENTIAL | EVENT_TRACE_FILE_MODE_CIRCULAR; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + properties->LogFileMode = EVENT_TRACE_FILE_MODE_NONE; + /* XP creates a file we can't delete, so change the filepath to something else */ + strcpy((char *)properties + properties->LogFileNameOffset, filepath2); + + properties->Wnode.Guid = SystemTraceControlGuid; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + properties->Wnode.Guid = (GUID){0}; + + properties->LogFileNameOffset = 0; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_BAD_PATHNAME, "Expected ERROR_BAD_PATHNAME, got %d\n", ret); + properties->LogFileNameOffset = sizeof(EVENT_TRACE_PROPERTIES) + sizeof(sessionname); + + ret = StartTraceA(&handle, sessionname, properties); + ok(ret == ERROR_SUCCESS, "Expected success, got %d\n", ret); + + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_ALREADY_EXISTS || + ret == ERROR_SHARING_VIOLATION, /* 2k3 */ + "Expected ERROR_ALREADY_EXISTS, got %d\n", ret); + + /* clean up */ + ControlTraceA(handle, sessionname, properties, EVENT_TRACE_CONTROL_STOP); + HeapFree(GetProcessHeap(), 0, properties); + DeleteFileA(filepath); +} + START_TEST(eventlog) { SetLastError(0xdeadbeef); @@ -1172,4 +1261,7 @@ START_TEST(eventlog) test_autocreation(); cleanup_eventlog(); } + + /* Trace tests */ + test_start_trace(); } diff --git a/include/evntrace.h b/include/evntrace.h index bb1ce03..5722b28 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -236,6 +236,7 @@ typedef struct _EVENT_TRACE_PROPERTIES ULONG MaximumFileSize; ULONG LogFileMode; ULONG FlushTimer; + ULONG EnableFlags; LONG AgeLimit; ULONG NumberOfBuffers; ULONG FreeBuffers;

1 0

Marcus Meissner : xmllite: Hr was uninitialized in error path (Coverity).
by Alexandre Julliard 20 Dec '16

20 Dec '16

Module: wine Branch: master Commit: f900879d9e86d9f0991be3357e1a3a455b39cc26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f900879d9e86d9f0991be3357… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Dec 17 12:37:10 2016 +0100 xmllite: Hr was uninitialized in error path (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 0fedd91..460eeab 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -547,8 +547,10 @@ static HRESULT reader_push_element(xmlreader *reader, strval *prefix, strval *lo } element = reader_alloc_zero(reader, sizeof(*element)); - if (!element) + if (!element) { + hr = E_OUTOFMEMORY; goto failed; + } if ((hr = reader_strvaldup(reader, prefix, &element->prefix)) != S_OK || (hr = reader_strvaldup(reader, localname, &element->localname)) != S_OK ||

1 0

Alexandre Julliard : winex11: Also ignore BadWindow errors caused by XSendEvent.
by Alexandre Julliard 20 Dec '16

20 Dec '16

Module: wine Branch: master Commit: adc349c38edd82902571fb7100014241205b3731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc349c38edd82902571fb710… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 20 17:08:28 2016 +0100 winex11: Also ignore BadWindow errors caused by XSendEvent. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 1c4ecfd..2127df4 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -196,8 +196,11 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = */ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) { - if ((event->request_code == X_SetInputFocus || event->request_code == X_ChangeWindowAttributes) && - (event->error_code == BadMatch || event->error_code == BadWindow)) return TRUE; + if ((event->request_code == X_SetInputFocus || + event->request_code == X_ChangeWindowAttributes || + event->request_code == X_SendEvent) && + (event->error_code == BadMatch || + event->error_code == BadWindow)) return TRUE; /* the clipboard display interacts with external windows, ignore all errors */ if (display == clipboard_display) return TRUE;

1 0

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

20 Dec '16

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

20 Dec '16

Module: wine Branch: master Commit: 53b7a36319895f929e3dcdc0433cc2e55020dd34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b7a36319895f929e3dcdc04… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 20 12:08:35 2016 +0100 setupapi/tests: Skip InstallHinfSection 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/install.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 5015e31..558453c 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -455,6 +455,14 @@ static void test_profile_items(void) goto cleanup; } + snprintf(path, MAX_PATH, "%s\\TestDir", commonprogs); + if (!CreateDirectoryA(path, NULL) && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("need admin rights\n"); + return; + } + RemoveDirectoryA(path); + create_inf_file(inffile, inf); sprintf(path, "%s\\%s", CURR_DIR, inffile); run_cmdline("DefaultInstall", 128, path);

1 0

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