October 2019 - Wine-devel - list.winehq.org

[PATCH v2] comctl32/tests: Prevent some test failures by moving the cursor away from the window.
by Sven Baars 07 Oct '19

07 Oct '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- v2: Restore the original cursor position after the test. dlls/comctl32/tests/edit.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index f454434a0c..6013cafb59 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3315,6 +3315,9 @@ static void test_change_focus(void) HWND hwnd, parent_wnd; WNDPROC oldproc; MSG msg; + POINT orig_pos; + + GetCursorPos(&orig_pos); parent_wnd = CreateWindowA("ParentWnd", "", WS_OVERLAPPEDWINDOW, 0, 0, 200, 200, NULL, NULL, GetModuleHandleA(NULL), NULL); @@ -3329,6 +3332,8 @@ static void test_change_focus(void) oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)edit_subclass_proc); SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); + SetCursorPos(400, 400); + SetFocus(parent_wnd); flush_sequences(sequences, NUM_MSG_SEQUENCES); SetFocus(hwnd); @@ -3340,6 +3345,8 @@ static void test_change_focus(void) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(sequences, COMBINED_SEQ_INDEX, killfocus_combined_seq, "Kill focus", TRUE); + SetCursorPos(orig_pos.x, orig_pos.y); + DestroyWindow(hwnd); } -- 2.17.1

1 0

[PATCH] comctl32/tests: Prevent some test failures by moving the cursor away from the window.
by Sven Baars 07 Oct '19

07 Oct '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/comctl32/tests/edit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index f454434a0c..e01d19b2ac 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3329,6 +3329,8 @@ static void test_change_focus(void) oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)edit_subclass_proc); SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); + SetCursorPos(400, 400); + SetFocus(parent_wnd); flush_sequences(sequences, NUM_MSG_SEQUENCES); SetFocus(hwnd); -- 2.17.1

2 1

[PATCH] wbemprox: Fix a string leak (Valgrind).
by Sven Baars 07 Oct '19

07 Oct '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/wbemprox/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 0f43412473..0f7eada9af 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -632,6 +632,7 @@ done: if (query) release_query( query ); free_path( path ); SysFreeString( antecedent ); + heap_free( str ); return hr; } -- 2.17.1

3 11

[PATCH] wshom.ocx: Actually wait for process termination in IWshShell3::Run().
by Dmitry Timoshkov 07 Oct '19

07 Oct '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wshom.ocx/shell.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 5d58ac74ed..d423856ce7 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1297,6 +1297,7 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, { if (waitforprocess) { + WaitForSingleObject(info.hProcess, INFINITE); GetExitCodeProcess(info.hProcess, exit_code); CloseHandle(info.hProcess); } -- 2.20.1

1 0

[Patch] Update Korean translation
by 김건우 07 Oct '19

07 Oct '19

<html><body>Signed-off-by: Kim Geonwoo (김건우)<rlarjsdn122(a)naver.com>

2 2

[PATCH] ntdll: on Solaris sysinfo() and 'struct sysinfo' differ from Linux
by Evgeny Litvinenko 07 Oct '19

07 Oct '19

Signed-off-by: Evgeny Litvinenko <evgeny.v.litvinenko(a)gmail.com> diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d15b49f6fd..14a58d67cb 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1894,15 +1894,23 @@ void virtual_init_threading(void) */ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) { +#ifdef __sun + LONG64 phys_pages; +#else #ifdef HAVE_SYSINFO struct sysinfo sinfo; #endif +#endif /* __sun */ info->unknown = 0; info->KeMaximumIncrement = 0; /* FIXME */ info->PageSize = page_size; info->MmLowestPhysicalPage = 1; info->MmHighestPhysicalPage = 0x7fffffff / page_size; +#ifdef __sun + phys_pages = sysconf( _SC_PHYS_PAGES ); + info->MmHighestPhysicalPage = max(1, phys_pages); +#else #ifdef HAVE_SYSINFO if (!sysinfo(&sinfo)) { @@ -1910,6 +1918,7 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) info->MmHighestPhysicalPage = max(1, total / page_size); } #endif +#endif /* __sun */ info->MmNumberOfPhysicalPages = info->MmHighestPhysicalPage - info->MmLowestPhysicalPage; info->AllocationGranularity = get_mask(0) + 1; info->LowestUserAddress = (void *)0x10000; -- 2.23.0

2 1

[PATCH] Solaris requires -fPIC flag for shared libraries.
by Evgeny Litvinenko 06 Oct '19

06 Oct '19

Signed-off-by: Evgeny Litvinenko <evgeny.v.litvinenko(a)gmail.com> diff --git a/configure.ac b/configure.ac index b9339b90aa..9c3b09eb64 100644 --- a/configure.ac +++ b/configure.ac @@ -941,13 +941,19 @@ case $host_os in ;; *) - case $host_cpu in - *i[[3456789]]86*) - DLLFLAGS="$DLLFLAGS -fno-PIC" - LDDLLFLAGS="-fno-PIC" ;; - *) + case $host_os in + solaris2*) DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-fPIC" ;; + *) + case $host_cpu in + *i[[3456789]]86*) + DLLFLAGS="$DLLFLAGS -fno-PIC" + LDDLLFLAGS="-fno-PIC" ;; + *) + DLLFLAGS="$DLLFLAGS -fPIC" + LDDLLFLAGS="-fPIC" ;; + esac ;; esac AC_CACHE_CHECK([whether we can build a GNU style ELF dll], ac_cv_c_dll_gnuelf, [WINE_TRY_SHLIB_FLAGS([-fPIC -shared -Wl,-Bsymbolic], -- 2.23.0

2 1

[PATCH] winebuild: no '-m emulation' flag for Solaris' linkers
by Evgeny Litvinenko 06 Oct '19

06 Oct '19

Signed-off-by: Evgeny Litvinenko <evgeny.v.litvinenko(a)gmail.com> diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index a73f520ccc..a61bfdd534 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -464,6 +464,8 @@ struct strarray get_ld_command(void) case PLATFORM_WINDOWS: strarray_add( &args, "-m", (force_pointer_size == 8) ? "i386pep" : "i386pe", NULL ); break; + case PLATFORM_SOLARIS: + break; default: switch(target_cpu) { -- 2.23.0

1 0

[PATCH] ntdll: Solaris requires sys/regset.h
by Evgeny Litvinenko 06 Oct '19

06 Oct '19

Signed-off-by: Evgeny Litvinenko <evgeny.v.litvinenko(a)gmail.com> diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 534b05c717..fd761246c5 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -272,8 +272,11 @@ typedef struct trapframe ucontext_t; #elif defined(__svr4__) || defined(_SCO_DS) || defined(__sun) -#ifdef _SCO_DS +#if defined(_SCO_DS) || defined(__sun) #include <sys/regset.h> +#endif + +#ifdef _SCO_DS #define gregs regs #endif -- 2.23.0

1 0

[PATCH] config.h must be the very first included file.
by Evgeny Litvinenko 06 Oct '19

06 Oct '19

Signed-off-by: Evgeny Litvinenko <evgeny.v.litvinenko(a)gmail.com> diff --git a/dlls/msxml3/xslpattern.l b/dlls/msxml3/xslpattern.l index 58df30909d..d3d449d038 100644 --- a/dlls/msxml3/xslpattern.l +++ b/dlls/msxml3/xslpattern.l @@ -18,9 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -%{ +%top{ #include "config.h" #include "wine/port.h" +} + +%{ #ifdef HAVE_LIBXML2 diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index ef7a2eb42b..9f9c404d92 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -21,8 +21,11 @@ %option noinput nounput always-interactive 8bit prefix="dbg_" -%{ +%top{ #include "config.h" +} + +%{ #include <stdlib.h> #include <string.h> #include <stdarg.h> diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 3cbf4ff2d2..211ff4e2a5 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -40,11 +40,12 @@ double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* %x PP_PRAGMA %x SQUOTE -%{ - +%top{ #include "config.h" #include "wine/port.h" +} +%{ #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index f456c626d1..614c1a4c29 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -91,12 +91,14 @@ /* Some shortcut definitions */ ws [ \f\t\r] +%top{ +#include "config.h" +} + %{ /*#define LEX_DEBUG*/ -#include "config.h" - #include <stdio.h> #include <stdlib.h> #include <string.h> -- 2.23.0

1 0