April 2016 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Skip headers problematic for cache.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: 80893bcf5236c5f0097ddd3aeda59b900b7edf80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80893bcf5236c5f0097ddd3ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:33:27 2016 +0200 mshtml: Skip headers problematic for cache. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 7e75b79..e1c2ef1 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -386,7 +386,6 @@ static void pump_msgs(BOOL *b) struct HEADER_TYPE { const char *key; const char *value; - BOOL skip_all_headers; }; static void create_xmlhttprequest(IHTMLDocument2 *doc) @@ -451,9 +450,6 @@ static void test_header(const struct HEADER_TYPE expect[], int num) SysFreeString(key); SysFreeString(text); - if(expect[i].skip_all_headers) - continue; - strcpy(buf, expect[i].key); strcat(buf, ": "); strcat(buf, expect[i].value); @@ -585,7 +581,6 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Accept-Ranges", "bytes", TRUE}, {"Content-Length", "51"}, {"Content-Type", "application/xml"} };

1 0

Sebastian Lackner : ntdll: Do not update iosb.Status after FSCTL_PIPE_LISTEN call.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: 9acff7550de83767438f83207827e1154a0e9c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9acff7550de83767438f83207… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 7 10:02:42 2016 +0200 ntdll: Do not update iosb.Status after FSCTL_PIPE_LISTEN call. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 +- dlls/ntdll/file.c | 6 +++++- dlls/ntdll/tests/pipe.c | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 77381f2..a896843 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2141,7 +2141,7 @@ static void test_overlapped_error(void) err = GetLastError(); ok(ret == FALSE, "ConnectNamedPipe succeeded\n"); ok(err == ERROR_PIPE_CONNECTED, "expected ERROR_PIPE_CONNECTED, got %u\n", err); - todo_wine ok(overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", overlapped.Internal); + ok(overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", overlapped.Internal); CloseHandle(file); CloseHandle(pipe); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 46fea51..7e5da59 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1757,6 +1757,11 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc } break; + case FSCTL_PIPE_LISTEN: + status = server_ioctl_file( handle, event, apc, apc_context, io, code, + in_buffer, in_size, out_buffer, out_size ); + return status; + case FSCTL_PIPE_IMPERSONATE: FIXME("FSCTL_PIPE_IMPERSONATE: impersonating self\n"); status = RtlImpersonateSelf( SecurityImpersonation ); @@ -1797,7 +1802,6 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc io->Information = 0; status = STATUS_SUCCESS; break; - case FSCTL_PIPE_LISTEN: case FSCTL_PIPE_WAIT: default: status = server_ioctl_file( handle, event, apc, apc_context, io, code, diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 0551d23..90ba950 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -308,7 +308,7 @@ static void test_overlapped(void) memset(&iosb, 0x55, sizeof(iosb)); res = listen_pipe(hPipe, hEvent, &iosb, TRUE); ok(res == STATUS_PIPE_CONNECTED, "NtFsControlFile returned %x\n", res); - todo_wine ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status); + ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status); CloseHandle(hClient); } @@ -392,7 +392,7 @@ static void test_alertable(void) todo_wine ok(res == STATUS_CANCELLED, "NtFsControlFile returned %x\n", res); ok(userapc_called, "user apc didn't run\n"); - todo_wine ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status); + ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status); ok(WaitForSingleObjectEx(hEvent, 0, TRUE) == WAIT_TIMEOUT, "hEvent signaled\n"); ok(!ioapc_called, "IOAPC ran\n");

1 0

Sebastian Lackner : ntdll/tests: Add tests for iosb.Status value after pending FSCTL_PIPE_LISTEN call.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: f4a5b4561d1e047484c88f266779d1b1966835a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a5b4561d1e047484c88f266… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 7 08:45:06 2016 +0200 ntdll/tests: Add tests for iosb.Status value after pending FSCTL_PIPE_LISTEN call. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 0862f1c..0551d23 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -277,10 +277,9 @@ static void test_overlapped(void) ok(!res, "NtCreateNamedPipeFile returned %x\n", res); memset(&iosb, 0x55, sizeof(iosb)); - -/* try with event and apc */ res = listen_pipe(hPipe, hEvent, &iosb, TRUE); ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res); + ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status); hClient = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0); ok(hClient != INVALID_HANDLE_VALUE, "can't open pipe, GetLastError: %x\n", GetLastError()); @@ -294,9 +293,28 @@ static void test_overlapped(void) ok(ioapc_called, "IOAPC didn't run\n"); - CloseHandle(hEvent); CloseHandle(hPipe); CloseHandle(hClient); + + res = create_pipe(&hPipe, FILE_SHARE_READ | FILE_SHARE_WRITE, 0 /* OVERLAPPED */); + ok(!res, "NtCreateNamedPipeFile returned %x\n", res); + + hClient = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0); + ok(hClient != INVALID_HANDLE_VALUE || broken(GetLastError() == ERROR_PIPE_BUSY) /* > Win 8 */, + "can't open pipe, GetLastError: %x\n", GetLastError()); + + if (hClient != INVALID_HANDLE_VALUE) + { + memset(&iosb, 0x55, sizeof(iosb)); + res = listen_pipe(hPipe, hEvent, &iosb, TRUE); + ok(res == STATUS_PIPE_CONNECTED, "NtFsControlFile returned %x\n", res); + todo_wine ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status); + + CloseHandle(hClient); + } + + CloseHandle(hPipe); + CloseHandle(hEvent); } static BOOL userapc_called;

1 0

Sebastian Lackner : msi: Fix stack alignment in CUSTOMPROC_wrapper.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: 92aa91d2de61a303fe0928cd97687c9504adcfc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92aa91d2de61a303fe0928cd9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 7 07:55:59 2016 +0200 msi: Fix stack alignment in CUSTOMPROC_wrapper. Spotted by Dmitry Timoshkov. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 4e934bd..35a1b5c 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -539,6 +539,7 @@ __ASM_GLOBAL_FUNC( CUSTOMPROC_wrapper, __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "subl $4,%esp\n\t" "pushl 12(%ebp)\n\t" "movl 8(%ebp),%eax\n\t" "call *%eax\n\t"

1 0

Dmitry Timoshkov : windowscodecs: Fix a copy/paste mistake.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: aaddf1365a3371263827206eedf1464a83562c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaddf1365a3371263827206ee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 7 09:00:32 2016 +0200 windowscodecs: Fix a copy/paste mistake. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 4f5cb94..cd9165b 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -532,7 +532,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p } This->end_info = ppng_create_info_struct(This->png_ptr); - if (!This->info_ptr) + if (!This->end_info) { ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, NULL); This->png_ptr = NULL;

1 0

Jactry Zeng : gdi32: Load system fonts on Android.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: 5bf43458240e07a31d7034dd064fcaaae08193a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf43458240e07a31d7034dd0… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Apr 7 16:59:48 2016 +0900 gdi32: Load system fonts on Android. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a7ac1bb..f8b4235 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4238,6 +4238,8 @@ static void init_font_list(void) load_fontconfig_fonts(); #elif defined(HAVE_CARBON_CARBON_H) load_mac_fonts(); +#elif defined(__ANDROID__) + ReadFontDir("/system/fonts", TRUE); #endif /* then look in any directories that we've specified in the config file */

1 0

Michael Müller : kernel32/tests: Add additional tests for overlapped handling of CreateNamedPipe.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: 96aca1ad02a129f8bae5f0b9ad02cd59f6f74942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96aca1ad02a129f8bae5f0b9a… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 7 08:45:53 2016 +0200 kernel32/tests: Add additional tests for overlapped handling of CreateNamedPipe. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 60336f8..77381f2 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2091,6 +2091,64 @@ static void test_overlapped(void) CloseHandle(thread); } +static void test_overlapped_error(void) +{ + HANDLE pipe, file, event; + DWORD err, numbytes; + OVERLAPPED overlapped; + BOOL ret; + + event = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(event != NULL, "CreateEventA failed with %u\n", GetLastError()); + + pipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_WAIT_FOREVER, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %u\n", GetLastError()); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = event; + ret = ConnectNamedPipe(pipe, &overlapped); + err = GetLastError(); + ok(ret == FALSE, "ConnectNamedPipe succeeded\n"); + ok(err == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", err); + + file = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed with %u\n", GetLastError()); + + numbytes = 0xdeadbeef; + ret = GetOverlappedResult(pipe, &overlapped, &numbytes, TRUE); + ok(ret == TRUE, "GetOverlappedResult failed\n"); + ok(numbytes == 0, "expected 0, got %u\n", numbytes); + ok(overlapped.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", overlapped.Internal); + + CloseHandle(file); + CloseHandle(pipe); + + pipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_WAIT_FOREVER, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %u\n", GetLastError()); + + file = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed with %u\n", GetLastError()); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = event; + ret = ConnectNamedPipe(pipe, &overlapped); + err = GetLastError(); + ok(ret == FALSE, "ConnectNamedPipe succeeded\n"); + ok(err == ERROR_PIPE_CONNECTED, "expected ERROR_PIPE_CONNECTED, got %u\n", err); + todo_wine ok(overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", overlapped.Internal); + + CloseHandle(file); + CloseHandle(pipe); + + CloseHandle(event); +} + static void test_NamedPipeHandleState(void) { HANDLE server, client; @@ -2372,6 +2430,7 @@ START_TEST(pipe) test_CloseHandle(); test_impersonation(); test_overlapped(); + test_overlapped_error(); test_NamedPipeHandleState(); test_readfileex_pending(); }

1 0

Michael Müller : kernelbase: Add missing forwards to advapi32 and user32 functions.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: 52cf9236ed101c86a33a9656f54ef2d15e019848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52cf9236ed101c86a33a9656f… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 7 08:04:26 2016 +0200 kernelbase: Add missing forwards to advapi32 and user32 functions. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 182 ++++++++++++++++++++-------------------- tools/make_specfiles | 7 +- 2 files changed, 97 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52cf9236ed101c86a33a9…

1 0

Michael Müller : winex11: Add 320x240 as supported resolution in desktop mode.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: b49601b5cef28a14f1bf5f5dbb56ae3bfa79f1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49601b5cef28a14f1bf5f5db… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 7 07:47:49 2016 +0200 winex11: Add 320x240 as supported resolution in desktop mode. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 72916c8..034d7f3 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -37,8 +37,8 @@ static unsigned int dd_mode_count; static unsigned int max_width; static unsigned int max_height; -static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; -static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200}; +static const unsigned int widths[] = {320, 320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; +static const unsigned int heights[] = {200, 240, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200}; #define NUM_DESKTOP_MODES (sizeof(widths) / sizeof(widths[0])) #define _NET_WM_STATE_REMOVE 0

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 7, 2016

April 7, 2016

Module: wine Branch: master Commit: 264aeb6570c538d3a50178879f5e3782c2957d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=264aeb6570c538d3a50178879… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Apr 6 22:15:00 2016 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 0086d6a..6041789 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-04-04 22:30+0300\n" +"PO-Revision-Date: 2016-04-06 22:14+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11646,15 +11646,10 @@ msgstr "" "reg: Nepavyko pašalinti visų „%1“ registro reikšmių. Įvyko netikėta klaida.\n" #: reg.rc:54 -#, fuzzy -#| msgid "" -#| "reg: Unable to delete all registry values in '%1'. An unexpected error " -#| "occurred.\n" msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" -msgstr "" -"reg: Nepavyko pašalinti visų „%1“ registro reikšmių. Įvyko netikėta klaida.\n" +msgstr "reg: Nepavyko užbaigti nurodytos operacijos. Įvyko netikėta klaida.\n" #: regedit.rc:34 msgid "&Registry"

1 0