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

[PATCH 5/9] user32/tests: Tests default margin size with various font face.
by Akihiro Sagawa 07 Mar '19

07 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 49 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-)

2 1

[PATCH 4/9] user32/tests: Add Unicode version tests for Edit control margins.
by Akihiro Sagawa 07 Mar '19

07 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)

2 1

[PATCH 2/9] user32: Fix minimum control size conditions when using EC_USEFONTINFO.
by Akihiro Sagawa 07 Mar '19

07 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 47 +++++++++++++---------------------------------- dlls/user32/tests/edit.c | 1 - 2 files changed, 13 insertions(+), 35 deletions(-)

2 1

[PATCH 3/9] user32/tests: Move the default margin size tests into a separate function.
by Akihiro Sagawa 07 Mar '19

07 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 100 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 74 insertions(+), 26 deletions(-)

1 0

[PATCH 1/9] user32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins.
by Akihiro Sagawa 07 Mar '19

07 Mar '19

Tests assume that WM_SETFONT margins are equal to EM_SETMARGINS with EC_USEFONTINFO ones. This isn't true in the CJK charset font. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-)

1 0

Re: TestBot job 48888 results: [PATCH] kernel32: Remove some duplicate code.
by Ken Thomases 07 Mar '19

07 Mar '19

My change was trivial, only affects a code path dealing with Mach-O files, and could not have caused these failures. > On Mar 6, 2019, at 7:22 PM, Marvin <testbot(a)winehq.org> wrote: > > VM Status Failures Command > debian9 failed 2 > debian9 failed 2 > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=48888 > > > === debian9 (32 bit report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x7eb6885d). > > Report errors: > kernel32:virtual prints too much data (90431 bytes) > > === debian9 (32 bit Chinese:China report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x7e9b385d). > > Report errors: > kernel32:virtual prints too much data (90431 bytes) > > === debian9 (32 bit WoW report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x7eb6885d). > > Report errors: > kernel32:virtual prints too much data (90502 bytes) > > === debian9 (64 bit WoW report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 64-bit code (0x00007f8786bbe8a1). > > Report errors: > kernel32:virtual prints too much data (87157 bytes) > <debian9_win32.report><debian9_win32_zh_CN.report><debian9_log.txt><debian9_wow32.report><debian9_wow64.report><debian9_log.txt>

1 0

[PATCH 2/2] amsi: Add stub implementations for a couple of functions.
by Hans Leidekker 07 Mar '19

07 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/amsi/Makefile.in | 3 ++ dlls/amsi/amsi.spec | 12 ++++---- dlls/amsi/main.c | 65 +++++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/amsi.idl | 36 ++++++++++++++++++++++++ 5 files changed, 111 insertions(+), 6 deletions(-) create mode 100644 dlls/amsi/main.c create mode 100644 include/amsi.idl diff --git a/dlls/amsi/Makefile.in b/dlls/amsi/Makefile.in index dfaec30d39..213d3e06ce 100644 --- a/dlls/amsi/Makefile.in +++ b/dlls/amsi/Makefile.in @@ -1 +1,4 @@ MODULE = amsi.dll + +C_SRCS = \ + main.c diff --git a/dlls/amsi/amsi.spec b/dlls/amsi/amsi.spec index 6c2b4ae60b..27e6b3dbda 100644 --- a/dlls/amsi/amsi.spec +++ b/dlls/amsi/amsi.spec @@ -1,12 +1,12 @@ -@ stub AmsiCloseSession -@ stub AmsiInitialize -@ stub AmsiOpenSession -@ stub AmsiScanBuffer -@ stub AmsiScanString +@ stdcall AmsiCloseSession(ptr ptr) +@ stdcall AmsiInitialize(wstr ptr) +@ stdcall AmsiOpenSession(ptr ptr) +@ stdcall AmsiScanBuffer(ptr ptr long wstr ptr ptr) +@ stdcall AmsiScanString(ptr wstr wstr ptr ptr) @ stub AmsiUacInitialize @ stub AmsiUacScan @ stub AmsiUacUninitialize -@ stub AmsiUninitialize +@ stdcall AmsiUninitialize(ptr) @ stub DllCanUnloadNow @ stub DllGetClassObject @ stub DllRegisterServer diff --git a/dlls/amsi/main.c b/dlls/amsi/main.c new file mode 100644 index 0000000000..f56e699c35 --- /dev/null +++ b/dlls/amsi/main.c @@ -0,0 +1,65 @@ +/* + * Copyright 2019 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "amsi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(amsi); + +HRESULT WINAPI AmsiInitialize( const WCHAR *appname, HAMSICONTEXT *context ) +{ + FIXME( "%s, %p\n", debugstr_w(appname), context ); + *context = (HAMSICONTEXT)0xdeadbeef; + return S_OK; +} + +HRESULT WINAPI AmsiOpenSession( HAMSICONTEXT context, HAMSISESSION *session ) +{ + FIXME( "%p, %p\n", context, session ); + *session = (HAMSISESSION)0xdeadbeef; + return S_OK; +} + +void WINAPI AmsiCloseSession( HAMSICONTEXT context, HAMSISESSION session ) +{ + FIXME( "%p, %p\n", context, session ); +} + +HRESULT WINAPI AmsiScanBuffer( HAMSICONTEXT context, void *buffer, ULONG length, const WCHAR *name, + HAMSISESSION session, AMSI_RESULT *result ) +{ + FIXME( "%p, %p, %u, %s, %p, %p\n", context, buffer, length, debugstr_w(name), session, result ); + *result = AMSI_RESULT_NOT_DETECTED; + return S_OK; +} + +HRESULT WINAPI AmsiScanString( HAMSICONTEXT context, const WCHAR *string, const WCHAR *name, + HAMSISESSION session, AMSI_RESULT *result ) +{ + FIXME( "%p, %s, %s, %p, %p\n", context, debugstr_w(string), debugstr_w(name), session, result ); + *result = AMSI_RESULT_NOT_DETECTED; + return S_OK; +} + +void WINAPI AmsiUninitialize( HAMSICONTEXT context ) +{ + FIXME( "%p\n", context ); +} diff --git a/include/Makefile.in b/include/Makefile.in index c9f5be9791..2817c10d17 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -11,6 +11,7 @@ SOURCES = \ advpub.h \ af_irda.h \ amaudio.h \ + amsi.idl \ amstream.idl \ amvideo.idl \ appcompatapi.h \ diff --git a/include/amsi.idl b/include/amsi.idl new file mode 100644 index 0000000000..31303a3629 --- /dev/null +++ b/include/amsi.idl @@ -0,0 +1,36 @@ +/* + * Copyright 2019 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +cpp_quote("DECLARE_HANDLE(HAMSICONTEXT);") +cpp_quote("DECLARE_HANDLE(HAMSISESSION);") + +typedef [v1_enum] enum AMSI_RESULT +{ + AMSI_RESULT_CLEAN = 0x00, + AMSI_RESULT_NOT_DETECTED = 0x01, + AMSI_RESULT_BLOCKED_BY_ADMIN_START = 0x4000, + AMSI_RESULT_BLOCKED_BY_ADMIN_END = 0x4fff, + AMSI_RESULT_DETECTED = 0x8000, +} AMSI_RESULT; + +cpp_quote("void WINAPI AmsiCloseSession(HAMSICONTEXT,HAMSISESSION);") +cpp_quote("HRESULT WINAPI AmsiInitialize(const WCHAR*,HAMSICONTEXT*);") +cpp_quote("HRESULT WINAPI AmsiOpenSession(HAMSICONTEXT,HAMSISESSION*);") +cpp_quote("HRESULT WINAPI AmsiScanBuffer(HAMSICONTEXT,void*,ULONG,const WCHAR*,HAMSISESSION,AMSI_RESULT*);") +cpp_quote("HRESULT WINAPI AmsiScanString(HAMSICONTEXT,const WCHAR*,const WCHAR *,HAMSISESSION,AMSI_RESULT*);") +cpp_quote("void WINAPI AmsiUninitialize(HAMSICONTEXT);") -- 2.20.1

1 0

[PATCH 1/2] amsi: New dll.
by Hans Leidekker 07 Mar '19

07 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- configure.ac | 1 + dlls/amsi/Makefile.in | 1 + dlls/amsi/amsi.spec | 13 +++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 dlls/amsi/Makefile.in create mode 100644 dlls/amsi/amsi.spec diff --git a/configure.ac b/configure.ac index a55d2f825a..71e8606e7c 100644 --- a/configure.ac +++ b/configure.ac @@ -2869,6 +2869,7 @@ WINE_CONFIG_MAKEFILE(dlls/advapi32) WINE_CONFIG_MAKEFILE(dlls/advapi32/tests) WINE_CONFIG_MAKEFILE(dlls/advpack) WINE_CONFIG_MAKEFILE(dlls/advpack/tests) +WINE_CONFIG_MAKEFILE(dlls/amsi) WINE_CONFIG_MAKEFILE(dlls/amstream) WINE_CONFIG_MAKEFILE(dlls/amstream/tests) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-appmodel-identity-l1-1-0) diff --git a/dlls/amsi/Makefile.in b/dlls/amsi/Makefile.in new file mode 100644 index 0000000000..dfaec30d39 --- /dev/null +++ b/dlls/amsi/Makefile.in @@ -0,0 +1 @@ +MODULE = amsi.dll diff --git a/dlls/amsi/amsi.spec b/dlls/amsi/amsi.spec new file mode 100644 index 0000000000..6c2b4ae60b --- /dev/null +++ b/dlls/amsi/amsi.spec @@ -0,0 +1,13 @@ +@ stub AmsiCloseSession +@ stub AmsiInitialize +@ stub AmsiOpenSession +@ stub AmsiScanBuffer +@ stub AmsiScanString +@ stub AmsiUacInitialize +@ stub AmsiUacScan +@ stub AmsiUacUninitialize +@ stub AmsiUninitialize +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer -- 2.20.1

1 0

[PATCH 1/2] ntdll/tests: Mark sync NtReadFile() result for async regular file as broken.
by Paul Gofman 07 Mar '19

07 Mar '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ntdll/tests/file.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index a23c3edbb1..5058439953 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -635,9 +635,9 @@ static void read_file_test(void) offset.QuadPart = 0; ResetEvent( event ); status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, strlen(text) + 10, &offset, NULL ); - ok( status == STATUS_SUCCESS || - status == STATUS_PENDING, /* vista */ - "wrong status %x\n", status ); + todo_wine ok(status == STATUS_PENDING + || broken(status == STATUS_SUCCESS) /* before Vista */, + "wrong status %x.\n", status); if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); @@ -4450,9 +4450,8 @@ static void test_read_write(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, 0, &bytes, &ovl); - /* ReadFile return value depends on Windows version and testing it is not practical */ - if (!ret) - ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, + "Unexpected result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); ret = GetLastError(); ok(bytes == 0, "bytes %u\n", bytes); @@ -4480,9 +4479,8 @@ static void test_read_write(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(hfile, NULL, 0, &bytes, &ovl); - /* ReadFile return value depends on Windows version and testing it is not practical */ - if (!ret) - ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, + "Unexpected result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); ret = GetLastError(); ok(bytes == 0, "bytes %u\n", bytes); @@ -4526,6 +4524,8 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = sizeof(contents); status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); + todo_wine ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + "expected STATUS_PENDING, got %#x.\n", status); if (status == STATUS_PENDING) { ret = WaitForSingleObject(hfile, 3000); @@ -4535,7 +4535,6 @@ static void test_read_write(void) } else { - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", status); ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); } @@ -4551,13 +4550,12 @@ static void test_read_write(void) bytes = 0; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); - /* ReadFile return value depends on Windows version and testing it is not practical */ + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, + "Unexpected result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); if (!ret) - { - ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); - } - else ok(bytes == 14, "bytes %u\n", bytes); + else + ok(bytes == 14, "bytes %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); @@ -4600,7 +4598,8 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = 0; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); - ok(status == STATUS_PENDING || status == STATUS_SUCCESS, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); + todo_wine ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + "expected STATUS_PENDING, got %#x.\n", status); if (status == STATUS_PENDING) { ret = WaitForSingleObject(hfile, 3000); @@ -4659,10 +4658,10 @@ static void test_read_write(void) bytes = 0; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); - /* ReadFile return value depends on Windows version and testing it is not practical */ + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, + "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (!ret) { - ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); ret = WaitForSingleObject(hfile, 3000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); -- 2.20.1

2 3

[PATCH] rpcrt4/tests: Avoid fnprintf redefinition.
by Jacek Caban 07 Mar '19

07 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46680 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/tests/server.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 2