December 2017 - Wine-Devel - list.winehq.org

[PATCH 3/6] mshtml: Don't store dispatch mode in DOMEvent object.
by Jacek Caban Dec. 4, 2017

Dec. 4, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 33 +++++++++++++++++++++------------ dlls/mshtml/htmlevent.h | 1 - 2 files changed, 21 insertions(+), 13 deletions(-)

1 0

[PATCH 2/6] mshtml: Don't call preventDefault in stopPropagation.
by Jacek Caban Dec. 4, 2017

Dec. 4, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 1 - 1 file changed, 1 deletion(-)

1 0

[PATCH 1/6] mshtml: Added IDOMEvent::initEvent implementation.
by Jacek Caban Dec. 4, 2017

Dec. 4, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 33 ++++++++++++++++++++++++++++++--- dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/nsembed.c | 1 - 3 files changed, 34 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] readme: Update Swedish translation.
by Lauri Kenttä Dec. 4, 2017

Dec. 4, 2017

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- documentation/README.sv | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/documentation/README.sv b/documentation/README.sv index eb7260efcb..b68e6997d9 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -4,7 +4,7 @@ Wine är ett program som gör det möjligt att köra Windows-program (inkluderat DOS, Windows 3.x, Win32 och Win64) i Unix. Det består av en programstartare som startar och kör Windows-programfiler, samt ett bibliotek (kallat Winelib) som implementerar Windows API-anrop med hjälp -av deras Unix- eller X11-motsvarigheter. Biblioteket kan också användas +av motsvarande Unix-, X11- eller Mac-anrop. Biblioteket kan också användas till att porta Windows-kod till vanliga Unix-program. Wine är fri programvara, utgett under villkoren i GNU LGPL; se @@ -18,8 +18,16 @@ Kör följande kommandon i rotkatalogen för Wines källkod: ./configure make +Efteråt antingen installera Wine: + +make install + +Eller kör Wine direkt från dess rotkatalog: + +./wine notepad + Kör program med "wine [val] program". Se resten av denna fil, -Wines man-sidor samt sist men inte minst http://www.winehq.org/ för mer +Wines man-sidor samt sist men inte minst https://www.winehq.org/ för mer information och tips om hur problem kan lösas. @@ -39,7 +47,7 @@ stöder kerneltrådar kommer eventuellt att stödjas i framtiden. Information för FreeBSD: Wine kommer i regel inte att fungera på FreeBSD-versioner äldre än 8.0. - Se http://wiki.freebsd.org/Wine för mer information. + Se https://wiki.freebsd.org/Wine för mer information. Information för Solaris: Wine måste antagligen byggas med GNU toolchain (gcc, gas etc.). @@ -71,14 +79,10 @@ Grundläggande krav: Valfria stödbibliotek: configure-skriptet visar varningar när valfria bibliotek inte hittats. - Se http://wiki.winehq.org/Recommended_Packages för information om - vilka paket du bör installera. + Se https://wiki.winehq.org/Recommended_Packages för information om vilka + paket du bör installera. På 64-bitars system måste du säkerställa att du + installerar 32-bitars versionerna av dessa bibliotek. - På 64 bit-system måste du säkerställa att 32 bit-versionerna av - ovannämnda bibliotek installerats; se http://wiki.winehq.org/WineOn64bit - för närmare detaljer. Om du vill ha ett sant 64-bit Wine (eller en mixad - 32- och 64-bit Wine-installation), se http://wiki.winehq.org/Wine64 för - detaljer. 4. KOMPILERING @@ -96,6 +100,7 @@ Kör './configure --help' för att se inställningar och val vid kompilering. För mer information se https://wiki.winehq.org/Building_Wine + 5. INSTALLATION När Wine är byggt kan du köra "make install" för att installera det; @@ -105,7 +110,7 @@ Glöm inte att först avinstallera gamla Wine-versioner. Pröva antingen "dpkg -r wine", "rpm -e wine" eller "make uninstall" före installationen. När Wine är installerat kan du använda inställningsprogrammet "winecfg". -Se hjälpavdelningen på http://www.winehq.org/ för tips om inställningar. +Se hjälpavdelningen på https://www.winehq.org/ för tips om inställningar. 6. KÖRNING AV PROGRAM @@ -132,18 +137,18 @@ rapporterar ett fel. 7. MER INFORMATION Internet: Mycket information om Wine finns samlat på WineHQ på - http://www.winehq.org/ : diverse guider, en programdatabas samt + https://www.winehq.org/ : diverse guider, en programdatabas samt felspårning. Detta är antagligen det bästa stället att börja. -Frågor: Frågor och svar om Wine finns samlade på http://www.winehq.org/FAQ +Frågor: Frågor och svar om Wine finns samlade på https://www.winehq.org/FAQ -Wiki: Wines Wiki finns på http://wiki.winehq.org +Wiki: Wines Wiki finns på https://wiki.winehq.org E-postlistor: Det finns flera e-postlistor för Wine-användare och -utvecklare; se - http://www.winehq.org/forums för mer information. + https://www.winehq.org/forums för mer information. -Fel: Rapportera fel till Wines Bugzilla på http://bugs.winehq.org +Fel: Rapportera fel till Wines Bugzilla på https://bugs.winehq.org Sök i Bugzilla-databasen för att se om problemet redan finns rapporterat innan du sänder en felrapport. @@ -151,7 +156,7 @@ IRC: Hjälp finns tillgänglig online på kanalen #WineHQ på irc.freenode.net. Git: Wines nuvarande utvecklingsversion finns tillgänglig genom Git. - Gå till http://www.winehq.org/git för mer information. + Gå till https://www.winehq.org/git för mer information. Om du lägger till något eller fixar ett fel, är det bra om du sänder en patch (förslagsvis med git-format-patch) till listan wine-devel(a)winehq.org @@ -165,3 +170,6 @@ julliard(a)winehq.org Översatt till svenska av Anders Jonsson anders.jonsson(a)norsjonet.se +och +Lauri Kenttä +lauri.kentta(a)gmail.com -- 2.15.1

1 0

[PATCH] krnl386.exe16: Check for pending DPMI events in call16_handler().
by Zebediah Figura Dec. 4, 2017

Dec. 4, 2017

If a #GP fault is generated in 16-bit code while (V)IF is clear, we insert a pending event check. However, a #GP can be generated by simply accessing invalid memory, and if this occurs winedbg will report the address of DPMI_PendingEventCheck() rather than the address of the #GP fault. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/krnl386.exe16/wowthunk.c | 2 +- tools/winebuild/relay.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index 539bc74..9a54170 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -243,7 +243,7 @@ static DWORD call16_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RE * emulated because the instruction emulation requires * original CS:IP and the emulation may change TEB.dpmi_vif. */ - if(get_vm86_teb_info()->dpmi_vif) + if (get_vm86_teb_info()->dpmi_vif && get_vm86_teb_info()->vm86_pending) insert_event_check( context ); if (ret != ExceptionContinueSearch) return ret; diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 4b78f68..94fd756 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -36,9 +36,6 @@ /* fix this if the x86_thread_data structure is changed */ #define GS_OFFSET 0x1d8 /* FIELD_OFFSET(TEB,SystemReserved2) + FIELD_OFFSET(struct x86_thread_data,gs) */ -#define DPMI_VIF_OFFSET (0x1fc + 0) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,dpmi_vif) */ -#define VM86_PENDING_OFFSET (0x1fc + 4) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,vm86_pending) */ - static void function_header( const char *name ) { output( "\n\t.align %d\n", get_alignment(4) ); @@ -770,13 +767,6 @@ static void BuildPendingEventCheck(void) function_header( "DPMI_PendingEventCheck" ); - /* Check for pending events. */ - - output( "\t.byte 0x64\n\ttestl $0xffffffff,(%d)\n", VM86_PENDING_OFFSET ); - output( "\tje %s\n", asm_name("DPMI_PendingEventCheck_Cleanup") ); - output( "\t.byte 0x64\n\ttestl $0xffffffff,(%d)\n", DPMI_VIF_OFFSET ); - output( "\tje %s\n", asm_name("DPMI_PendingEventCheck_Cleanup") ); - /* Process pending events. */ output( "\tsti\n" ); -- 2.7.4

2 3

[PATCH 1/3] ntdll: NtReadFileScatter results are reported asynchronously
by Andrew Eikum Dec. 4, 2017

Dec. 4, 2017

This patch sequence fixes Wolfenstein II, Bug 43935. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 53 +++++++++++++++++++++++++++++++++++++++------- dlls/ntdll/file.c | 2 +- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0b8cef23f8..8f5f392822 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,8 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID buf = NULL; + LPVOID wbuf = NULL, rbuf1; + BOOL br; ret = GetTempPathA( MAX_PATH, temp_path ); ok( ret != 0, "GetTempPathA error %d\n", GetLastError() ); @@ -4371,12 +4372,16 @@ static void test_WriteFileGather(void) ok( hiocp2 != 0, "CreateIoCompletionPort failed err %u\n", GetLastError() ); GetSystemInfo( &si ); - buf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); - ok( buf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + wbuf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( wbuf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + + rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; + memset( wbuf, 0x42, si.dwPageSize ); + fse[0].Buffer = wbuf; if (!WriteFileGather( hfile, fse, si.dwPageSize, NULL, &ovl )) ok( GetLastError() == ERROR_IO_PENDING, "WriteFileGather failed err %u\n", GetLastError() ); @@ -4384,20 +4389,52 @@ static void test_WriteFileGather(void) ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + /* read exact size */ memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; - if (!ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl )) - ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + + /* start read at EOF */ + memset( &ovl, 0, sizeof(ovl) ); + S(U(ovl)).OffsetHigh = 0; + S(U(ovl)).Offset = si.dwPageSize; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should have failed\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF || + GetLastError() == ERROR_IO_PENDING, "ReadFileScatter gave wrong error %u\n", GetLastError() ); + if (GetLastError() == ERROR_IO_PENDING) + { + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( !ret, "GetQueuedCompletionStatus should have returned failure\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF, "Got wrong error: %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + } + else + { + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 100 ); + ok( !ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( GetLastError() == WAIT_TIMEOUT, "GetQueuedCompletionStatus gave wrong error %u\n", GetLastError() ); + ok( povl == NULL, "wrong ovl %p\n", povl ); + } + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); - VirtualFree( buf, 0, MEM_RELEASE ); + VirtualFree( wbuf, 0, MEM_RELEASE ); + VirtualFree( rbuf1, 0, MEM_RELEASE ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ca2afa0e89..12b1d0f6c5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1105,7 +1105,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap if (send_completion) NTDLL_AddCompletion( file, cvalue, status, total ); - return status; + return STATUS_PENDING; } -- 2.15.0

3 5

[PATCH v6] msvcrt: Don't crash if _vsnwprintf gets NULL as format string and add test
by Fabian Maurer Dec. 4, 2017

Dec. 4, 2017

v2 Fix crash on older test machines v3 Check for dll function instead of OS version Add test for errno Moved test to msvcrt90 to be able to use _set_invalid_parameter_handler v4 proper patch name v5 use MSVCRT_CHECK_PMT remove unneeded XP check v6 Fix 64bit compilation issue Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msvcr90/tests/msvcr90.c | 31 +++++++++++++++++++++++++++++++ dlls/msvcrt/printf.h | 3 +++ 2 files changed, 34 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 0975d00331..85dd80b80c 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -133,6 +133,7 @@ static char* (__cdecl *p_setlocale)(int, const char*); static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *handler)(_FPIEEE_RECORD*)); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); +static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); /* make sure we use the correct errno */ #undef errno @@ -401,6 +402,7 @@ static BOOL init(void) SET(p__fpieee_flt, "_fpieee_flt"); SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); + SET(p__vsnwprintf, "_vsnwprintf"); if (sizeof(void *) == 8) { @@ -1864,6 +1866,34 @@ static void test__memicmp_l(void) ok(ret == -1, "got %d\n", ret); } +static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vsnwprintf(str, len, format, valist); + __ms_va_end(valist); + return ret; +} + +void test__vsnwprintf(void) +{ + int ret; + WCHAR str[2] = {0}; + + _invalid_parameter_handler old_handler = p_set_invalid_parameter_handler(test_invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + str[0] = 'x'; + ret = _vsnwprintf_wrapper(str, 0, NULL); + ok(ret == -1, "got %d, expected -1\n", ret); + ok(str[0] == 'x', "Expected string to be unchanged.\n"); + CHECK_CALLED(invalid_parameter_handler, EINVAL); + + ok(p_set_invalid_parameter_handler(old_handler) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); +} + START_TEST(msvcr90) { if(!init()) @@ -1897,6 +1927,7 @@ START_TEST(msvcr90) test__mbstok_s(); test__memicmp(); test__memicmp_l(); + test__vsnwprintf(); #ifdef __i386__ test__fpieee_flt(); #endif diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 4ba02bafdb..ee8120e149 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -376,6 +376,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API TRACE("Format is: %s\n", FUNC_NAME(debugstr)(fmt)); + if (!MSVCRT_CHECK_PMT(fmt != NULL)) + return -1; + if(!locale) locinfo = get_locinfo(); else -- 2.15.1

2 1

[PATCH 2/2] wined3d: Really remove an outdated comment.
by Henri Verbeet Dec. 4, 2017

Dec. 4, 2017

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 04ab66b..5d08c00 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2713,10 +2713,6 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } } -/***************************************************************************** - * Functions to generate GLSL strings from DirectX Shader bytecode begin here. - ****************************************************************************/ - /* Prototypes */ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src); -- 2.1.4

1 0

[PATCH 1/2] wined3d: Unbind currently bound FBOs before dispatching compute shaders.
by Henri Verbeet Dec. 4, 2017

Dec. 4, 2017

From: Fabian Maurer <dark.shadow4(a)web.de> Many thanks to Matias N. Goldberg and Philip Rebohle for investigating and solving the bug! Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8af9e4b..23f63aa 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4013,6 +4013,16 @@ void context_apply_compute_state(struct wined3d_context *context, context->update_unordered_access_view_bindings = 1; } + /* Updates to currently bound render targets aren't necessarily coherent + * between the graphics and compute pipelines. Unbind any currently bound + * FBO here to ensure preceding updates to its attachments by the graphics + * pipeline are visible to the compute pipeline. + * + * Without this, the bloom effect in Nier:Automata is too bright on the + * Mesa radeonsi driver, and presumably on other Mesa based drivers. */ + context_bind_fbo(context, GL_FRAMEBUFFER, 0); + context_invalidate_state(context, STATE_FRAMEBUFFER); + context->last_was_blit = FALSE; } -- 2.1.4

1 0

[PATCH] wininet/tests: Fix some leaks (Coverity)
by Nikolay Sivov Dec. 4, 2017

Dec. 4, 2017

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wininet/tests/ftp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 567545d2b9..d2118faded 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -112,6 +112,7 @@ static void test_connect(HINTERNET hInternet) ok ( hFtp != NULL, "InternetConnect failed : %d\n", GetLastError()); ok ( GetLastError() == ERROR_SUCCESS, "ERROR_SUCCESS, got %d\n", GetLastError()); + InternetCloseHandle(hFtp); SetLastError(0xdeadbeef); hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "", NULL, @@ -125,6 +126,7 @@ static void test_connect(HINTERNET hInternet) { ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + InternetCloseHandle(hFtp); } } -- 2.15.0

1 0