November 2017 - Wine-Commits

Rafał Harabień : riched20: Protect against pasting multi-line text in single-line control.
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: 585dfa1409ece5bfe626a9b290a3854ad7aa7aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=585dfa1409ece5bfe626a9b29… Author: Rafał Harabień <rafalh1992(a)o2.pl> Date: Wed Nov 15 02:18:53 2017 +0100 riched20: Protect against pasting multi-line text in single-line control. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 4 +++ dlls/riched20/editor.c | 18 ++--------- dlls/riched20/tests/editor.c | 72 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 76 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 26af743..8a99394 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -551,6 +551,10 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, ME_DisplayItem *tp, *end_run, *run, *prev; int eol_len = 0; + /* Check if new line is allowed for this control */ + if (!(editor->styleFlags & ES_MULTILINE)) + break; + /* Find number of CR and LF in end of paragraph run */ if (*pos =='\r') { diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 88e3d8e..daafe80 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -176,7 +176,7 @@ + ES_DISABLENOSCROLL (scrollbar is always visible) - ES_EX_NOCALLOLEINIT + ES_LEFT - - ES_MULTILINE (currently single line controls aren't supported) + + ES_MULTILINE - ES_NOIME - ES_READONLY (I'm not sure if beeping is the proper behaviour) + ES_RIGHT @@ -3421,21 +3421,7 @@ static void ME_SetText(ME_TextEditor *editor, void *text, BOOL unicode) int textLen; LPWSTR wszText = ME_ToUnicode(codepage, text, &textLen); - - if (textLen > 0) - { - int len = -1; - - /* uses default style! */ - if (!(editor->styleFlags & ES_MULTILINE)) - { - WCHAR *p = wszText; - - while (*p != '\0' && *p != '\r' && *p != '\n') p++; - len = p - wszText; - } - ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); - } + ME_InsertTextFromCursor(editor, 0, wszText, textLen, editor->pBuffer->pDefaultStyle); ME_EndToUnicode(codepage, wszText); } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index a19ec85..9bfbf45 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -70,6 +70,10 @@ static HWND new_richedit(HWND parent) { return new_window(RICHEDIT_CLASS20A, ES_MULTILINE, parent); } +static HWND new_richedit_with_style(HWND parent, DWORD style) { + return new_window(RICHEDIT_CLASS20A, style, parent); +} + static HWND new_richeditW(HWND parent) { return new_windowW(RICHEDIT_CLASS20W, ES_MULTILINE, parent); } @@ -3748,6 +3752,20 @@ static void test_WM_SETTEXT(void) TEST_SETTEXTW(urtftextW, urtftextW) /* interpreted as ascii text */ DestroyWindow(hwndRichEdit); #undef TEST_SETTEXTW + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"line1\r\nline2"); + ok(result == 1, "WM_SETTEXT returned %ld, expected 12\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); + ok(result == 5, "WM_GETTEXT returned %ld, expected 5\n", result); + ok(!strcmp(buf, "line1"), "WM_GETTEXT returned incorrect string '%s'\n", buf); + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"{\\rtf1 ABC\\rtlpar\\par DEF\\par HIJ\\pard\\par}"); + ok(result == 1, "WM_SETTEXT returned %ld, expected 1\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); + ok(result == 3, "WM_GETTEXT returned %ld, expected 3\n", result); + ok(!strcmp(buf, "ABC"), "WM_GETTEXT returned incorrect string '%s'\n", buf); + DestroyWindow(hwndRichEdit); } /* Set *pcb to one to show that the remaining cb-1 bytes are not @@ -4406,6 +4424,17 @@ static void test_EM_SETTEXTEX(void) } DestroyWindow(hwndRichEdit); + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + setText.flags = ST_DEFAULT; + setText.codepage = CP_ACP; + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"line1\r\nline2"); + ok(result == 1, "EM_SETTEXTEX incorrectly returned %d, expected 1\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + ok(result == 5, "WM_GETTEXT incorrectly returned %d, expected 5\n", result); + ok(!strcmp(bufACP, "line1"), "EM_SETTEXTEX: Test single-line text: Result: %s\n", bufACP); + DestroyWindow(hwndRichEdit); } static void test_EM_LIMITTEXT(void) @@ -5351,6 +5380,15 @@ static void test_EM_REPLACESEL(int redraw) SendMessageA(hwndRichEdit, WM_SETREDRAW, TRUE, 0); DestroyWindow(hwndRichEdit); + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"line1\r\nline2"); + ok(r == 12, "EM_REPLACESEL returned %d, expected 12\n", r); + r = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok(r == 5, "WM_GETTEXT returned %d, expected 5\n", r); + ok(!strcmp(buffer, "line1"), "WM_GETTEXT returned incorrect string '%s'\n", buffer); + DestroyWindow(hwndRichEdit); } /* Native riched20 inspects the keyboard state (e.g. GetKeyState) @@ -5498,21 +5536,39 @@ static void test_WM_PASTE(void) "test paste: strcmp = %i, actual = '%s'\n", result, buffer); release_key(VK_CONTROL); + /* Copy multiline text to clipboard for future use */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessageA(hwndRichEdit, WM_COPY, 0, 0); + SendMessageA(hwndRichEdit, EM_SETSEL, 0, 0); + /* Paste into read-only control */ result = SendMessageA(hwndRichEdit, EM_SETREADONLY, TRUE, 0); SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer,"cut\r\n"); + result = strcmp(buffer, text3); ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); /* Cut from read-only control */ SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); SendMessageA(hwndRichEdit, WM_CUT, 0, 0); - result = strcmp(buffer,"cut\r\n"); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + result = strcmp(buffer, text3); ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + /* FIXME: Wine doesn't flush Ole clipboard when window is destroyed so do it manually */ + OleFlushClipboard(); + DestroyWindow(hwndRichEdit); + + /* Paste multi-line text into single-line control */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + result = strcmp(buffer, "testing paste"); + ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); DestroyWindow(hwndRichEdit); } @@ -5973,6 +6029,18 @@ static void test_EM_STREAMIN(void) ok(es.dwError == 0, "EM_STREAMIN: Test 5 set error %d, expected %d\n", es.dwError, 0); DestroyWindow(hwndRichEdit); + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + ptr = "line1\r\nline2"; + es.dwCookie = (DWORD_PTR)&ptr; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); + ok(result == 12, "got %ld, expected %d\n", result, 12); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok (!strcmp(buffer, "line1"), + "EM_STREAMIN: Unexpected text '%s'\n", buffer); } static void test_EM_StreamIn_Undo(void)

1 0

Piotr Caban : msvcrt: Fix write() behaviour on "no console" file descriptors.
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: 7aa4b6d17023061feff50ca33c440b9590511e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa4b6d17023061feff50ca33… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 15 09:47:37 2017 +0100 msvcrt: Fix write() behaviour on "no console" file descriptors. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 11 ++++++----- dlls/msvcrt/tests/file.c | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7fcba06..5eaee2b 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3423,7 +3423,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) if (count > 32) TRACE(":fd (%d) handle (%d) buf (%p) len (%d)\n",fd,hand,buf,count); #endif - if (hand == INVALID_HANDLE_VALUE) + if (hand == INVALID_HANDLE_VALUE || fd == MSVCRT_NO_CONSOLE_FD) { *MSVCRT__errno() = MSVCRT_EBADF; release_ioinfo(info); @@ -3451,14 +3451,14 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) } TRACE("WriteFile (fd %d, hand %p) failed-last error (%d)\n", fd, hand, GetLastError()); - *MSVCRT__errno() = MSVCRT_ENOSPC; + msvcrt_set_errno(GetLastError()); } else { unsigned int i, j, nr_lf, size; char *p = NULL; const char *q; - const char *s = buf, *buf_start = buf; + const char *s = buf; if (!(info->exflag & (EF_UTF8|EF_UTF16))) { @@ -3577,8 +3577,8 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) { TRACE("WriteFile (fd %d, hand %p) failed-last error (%d), num_written %d\n", fd, hand, GetLastError(), num_written); - *MSVCRT__errno() = MSVCRT_ENOSPC; - return s - buf_start; + msvcrt_set_errno(GetLastError()); + return -1; } return count; } @@ -3927,6 +3927,7 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) if(!(file->_flag & MSVCRT__IOWRT)) { if(!(file->_flag & MSVCRT__IORW)) { file->_flag |= MSVCRT__IOERR; + *MSVCRT__errno() = MSVCRT_EBADF; return MSVCRT_EOF; } file->_flag |= MSVCRT__IOWRT; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index f118ef3..99ceb97 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1557,6 +1557,26 @@ static void test_invalid_stdin_child( void ) ok(errno == EBADF, "errno = %d\n", errno); errno = 0xdeadbeef; + ret = _flsbuf('a', stdin); + ok(ret == EOF, "_flsbuf(stdin) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = fwrite(&c, 1, 1, stdin); + ok(!ret, "fwrite(stdin) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = write(-2, &c, 1); + ok(ret == -1, "write(-2) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = write(STDIN_FILENO, &c, 1); + ok(ret == -1, "write(STDIN_FILENO) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; ret = fclose(stdin); ok(ret == -1, "fclose(stdin) returned %d\n", ret); ok(errno == EBADF, "errno = %d\n", errno);

1 0

Marcus Meissner : mshtml: Fixed a crash due to missing typelib marshalling on 64bit.
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: ac7768bfcee02f6e88475aca3e5237cb8f9c195b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac7768bfcee02f6e88475aca3… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Nov 14 15:50:02 2017 +0100 mshtml: Fixed a crash due to missing typelib marshalling on 64bit. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 7ec3f60..a03d010 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6301,6 +6301,10 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) CHECK_CALLED(EvaluateNewWindow); ok(hres == S_OK, "open failed: %08x\n", hres); + if (hres != S_OK) { + IHTMLWindow2_Release(window); + return; + } if(do_block) { ok(!new_window, "new_window != NULL\n");

1 0

Piotr Caban : msvcrt: Fix IO initialization when invalid handles are passed.
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: 31bf13e92b1c6a7092a44240b763605ae315c328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31bf13e92b1c6a7092a44240b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 15 09:47:23 2017 +0100 msvcrt: Fix IO initialization when invalid handles are passed. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 42 +++++++++++++++++++++++++----- dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/tests/Makefile.in | 1 + dlls/msvcrt/tests/file.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b22cbeb..2516570 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -581,30 +581,57 @@ void msvcrt_init_io(void) fdinfo = get_ioinfo_alloc_fd(MSVCRT_STDIN_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { HANDLE h = GetStdHandle(STD_INPUT_HANDLE); + DWORD flags = WX_OPEN | WX_TEXT; DWORD type = GetFileType(h); - msvcrt_set_fd(fdinfo, h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) - |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0)); + if (type == FILE_TYPE_UNKNOWN) { + h = MSVCRT_NO_CONSOLE; + flags |= WX_TTY; + } else if ((type & 0xf) == FILE_TYPE_CHAR) { + flags |= WX_TTY; + } else if ((type & 0xf) == FILE_TYPE_PIPE) { + flags |= WX_PIPE; + } + + msvcrt_set_fd(fdinfo, h, flags); } release_ioinfo(fdinfo); fdinfo = get_ioinfo_alloc_fd(MSVCRT_STDOUT_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE); + DWORD flags = WX_OPEN | WX_TEXT; DWORD type = GetFileType(h); - msvcrt_set_fd(fdinfo, h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) - |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0)); + if (type == FILE_TYPE_UNKNOWN) { + h = MSVCRT_NO_CONSOLE; + flags |= WX_TTY; + } else if ((type & 0xf) == FILE_TYPE_CHAR) { + flags |= WX_TTY; + } else if ((type & 0xf) == FILE_TYPE_PIPE) { + flags |= WX_PIPE; + } + + msvcrt_set_fd(fdinfo, h, flags); } release_ioinfo(fdinfo); fdinfo = get_ioinfo_alloc_fd(MSVCRT_STDERR_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { HANDLE h = GetStdHandle(STD_ERROR_HANDLE); + DWORD flags = WX_OPEN | WX_TEXT; DWORD type = GetFileType(h); - msvcrt_set_fd(fdinfo, h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) - |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0)); + if (type == FILE_TYPE_UNKNOWN) { + h = MSVCRT_NO_CONSOLE; + flags |= WX_TTY; + } else if ((type & 0xf) == FILE_TYPE_CHAR) { + flags |= WX_TTY; + } else if ((type & 0xf) == FILE_TYPE_PIPE) { + flags |= WX_PIPE; + } + + msvcrt_set_fd(fdinfo, h, flags); } release_ioinfo(fdinfo); @@ -616,7 +643,8 @@ void msvcrt_init_io(void) for (i = 0; i < 3; i++) { /* FILE structs for stdin/out/err are static and never deleted */ - MSVCRT__iob[i]._file = i; + MSVCRT__iob[i]._file = get_ioinfo_nolock(i)->handle == MSVCRT_NO_CONSOLE ? + MSVCRT_NO_CONSOLE_FD : i; MSVCRT__iob[i]._tmpfname = NULL; MSVCRT__iob[i]._flag = (i == 0) ? MSVCRT__IOREAD : MSVCRT__IOWRT; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 1b117c8..a380613 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -742,6 +742,9 @@ struct MSVCRT__stat64 { #define MSVCRT_SEEK_CUR 1 #define MSVCRT_SEEK_END 2 +#define MSVCRT_NO_CONSOLE_FD (-2) +#define MSVCRT_NO_CONSOLE ((HANDLE)MSVCRT_NO_CONSOLE_FD) + #define MSVCRT_STDIN_FILENO 0 #define MSVCRT_STDOUT_FILENO 1 #define MSVCRT_STDERR_FILENO 2 diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in index 2db553d..0867ac0 100644 --- a/dlls/msvcrt/tests/Makefile.in +++ b/dlls/msvcrt/tests/Makefile.in @@ -1,6 +1,7 @@ TESTDLL = msvcrt.dll APPMODE = -mno-cygwin EXTRAINCL = -I$(srcdir)/.. +IMPORTS = advapi32 C_SRCS = \ cpp.c \ diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index d92a6e4..e0b94cf 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -31,6 +31,7 @@ #include <windef.h> #include <winbase.h> #include <winnls.h> +#include <winreg.h> #include <process.h> #include <errno.h> #include <locale.h> @@ -1522,6 +1523,61 @@ static void test_file_inherit( const char* selfname ) DeleteFileA("fdopen.tst"); } +static void test_invalid_stdin_child( void ) +{ + HANDLE handle; + ioinfo *info; + + errno = 0xdeadbeef; + handle = (HANDLE)_get_osfhandle(STDIN_FILENO); + ok(handle == (HANDLE)-2, "handle = %p\n", handle); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + info = &__pioinfo[STDIN_FILENO/MSVCRT_FD_BLOCK_SIZE][STDIN_FILENO%MSVCRT_FD_BLOCK_SIZE]; + ok(info->handle == (HANDLE)-2, "info->handle = %p\n", info->handle); + ok(info->wxflag == 0xc1, "info->wxflag = %x\n", info->wxflag); + + ok(stdin->_file == -2, "stdin->_file = %d\n", stdin->_file); +} + +static void test_invalid_stdin( const char* selfname ) +{ + char cmdline[MAX_PATH]; + PROCESS_INFORMATION proc; + SECURITY_ATTRIBUTES sa; + STARTUPINFOA startup; + HKEY key; + LONG ret; + + if(!p_fopen_s) { + /* Behaviour of the dll has changed in newer version */ + win_skip("skipping invalid stdin tests\n"); + return; + } + + ret = RegOpenCurrentUser(KEY_READ, &key); + ok(!ret, "RegOpenCurrentUser failed: %x\n", ret); + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = TRUE; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESTDHANDLES; + startup.hStdInput = key; + startup.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + startup.hStdError = GetStdHandle(STD_ERROR_HANDLE); + + sprintf(cmdline, "%s file stdin", selfname); + CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, + CREATE_DEFAULT_ERROR_MODE|NORMAL_PRIORITY_CLASS, NULL, NULL, &startup, &proc); + winetest_wait_child_process(proc.hProcess); + + ret = RegCloseKey(key); + ok(!ret, "RegCloseKey failed: %x\n", ret); +} + static void test_tmpnam( void ) { char name[MAX_PATH] = "abc"; @@ -2461,12 +2517,15 @@ START_TEST(file) test_file_inherit_child_no(arg_v[3]); else if (strcmp(arg_v[2], "pipes") == 0) test_pipes_child(arg_c, arg_v); + else if (strcmp(arg_v[2], "stdin") == 0) + test_invalid_stdin_child(); else ok(0, "invalid argument '%s'\n", arg_v[2]); return; } test_dup2(); test_file_inherit(arg_v[0]); + test_invalid_stdin(arg_v[0]); test_file_write_read(); test_chsize(); test_stat();

1 0

Piotr Caban : msvcrt: Fix close() behaviour on "no console" file descriptors.
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: 677301a29cffa9474fcad4c284661171092510d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=677301a29cffa9474fcad4c28… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 15 09:47:29 2017 +0100 msvcrt: Fix close() behaviour on "no console" file descriptors. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 6 +++++- dlls/msvcrt/tests/file.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2516570..422e95d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1047,7 +1047,11 @@ int CDECL MSVCRT__close(int fd) int ret; TRACE(":fd (%d) handle (%p)\n", fd, info->handle); - if (!(info->wxflag & WX_OPEN)) { + + if (fd == MSVCRT_NO_CONSOLE_FD) { + *MSVCRT__errno() = MSVCRT_EBADF; + ret = -1; + } else if (!(info->wxflag & WX_OPEN)) { ret = -1; } else if (fd == MSVCRT_STDOUT_FILENO && info->handle == get_ioinfo_nolock(MSVCRT_STDERR_FILENO)->handle) { diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index e0b94cf..543eb3f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1527,6 +1527,7 @@ static void test_invalid_stdin_child( void ) { HANDLE handle; ioinfo *info; + int ret; errno = 0xdeadbeef; handle = (HANDLE)_get_osfhandle(STDIN_FILENO); @@ -1538,6 +1539,21 @@ static void test_invalid_stdin_child( void ) ok(info->wxflag == 0xc1, "info->wxflag = %x\n", info->wxflag); ok(stdin->_file == -2, "stdin->_file = %d\n", stdin->_file); + + errno = 0xdeadbeef; + ret = fclose(stdin); + ok(ret == -1, "fclose(stdin) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = close(-2); + ok(ret == -1, "close(-2) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = close(STDIN_FILENO); + ok(ret==-1 || !ret, "close(STDIN_FILENO) returned %d\n", ret); + ok((ret==-1 && errno==EBADF) || (!ret && errno==0xdeadbeef), "errno = %d\n", errno); } static void test_invalid_stdin( const char* selfname )

1 0

Alexandre Julliard : testbot: Add In-Reply-To header on the TestBot replies.
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: tools Branch: master Commit: ad353ded45601dd3b42d8ccab2358f11e0deddea URL: http://source.winehq.org/git/tools.git/?a=commit;h=ad353ded45601dd3b42d8cca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 15 12:01:53 2017 +0100 testbot: Add In-Reply-To header on the TestBot replies. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 10 ++++++++++ testbot/ddl/update27.sql | 5 +++++ testbot/ddl/winetestbot.sql | 1 + testbot/lib/WineTestBot/Patches.pm | 6 ++++++ 4 files changed, 22 insertions(+) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 922811d..e00c276 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -189,6 +189,11 @@ sub SendLog($) $Subject .= ": " . $Description; } print SENDMAIL "Subject: $Subject\n"; + if ($Job->Patch->MessageId) + { + print SENDMAIL "In-Reply-To: ", $Job->Patch->MessageId, "\n"; + print SENDMAIL "References: ", $Job->Patch->MessageId, "\n"; + } print SENDMAIL <<"EOF"; MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="==13F70BD1-BA1B-449A-9CCB-B6A8E90CED47==" @@ -424,6 +429,11 @@ EOF print SENDMAIL "To: $To\n"; print SENDMAIL "Cc: $WinePatchCc\n"; print SENDMAIL "Subject: Re: ", $Job->Patch->Subject, "\n"; + if ($Job->Patch->MessageId) + { + print SENDMAIL "In-Reply-To: ", $Job->Patch->MessageId, "\n"; + print SENDMAIL "References: ", $Job->Patch->MessageId, "\n"; + } print SENDMAIL <<"EOF"; Hi, diff --git a/testbot/ddl/update27.sql b/testbot/ddl/update27.sql new file mode 100644 index 0000000..0dc2b89 --- /dev/null +++ b/testbot/ddl/update27.sql @@ -0,0 +1,5 @@ +USE winetestbot; + +ALTER TABLE Patches + ADD MessageId VARCHAR(256) NULL + AFTER Subject; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 5e79bd3..f8d590f 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -70,6 +70,7 @@ CREATE TABLE Patches FromName VARCHAR(40) NULL, FromEMail VARCHAR(40) NULL, Subject VARCHAR(120) NULL, + MessageId VARCHAR(256) NULL, PRIMARY KEY (Id), INDEX PatchesWebPatchId (WebPatchId) ) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d5de05e..b5320dc 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -100,6 +100,11 @@ sub FromSubmission($$) my $PropertyDescriptor = $self->GetPropertyDescriptorByName("Subject"); $self->Subject(substr($Subject, 0, $PropertyDescriptor->GetMaxLength())); + my $MessageId = $Head->get("Message-Id"); + $MessageId =~ s/\s*\n\s*/ /gs; + $PropertyDescriptor = $self->GetPropertyDescriptorByName("MessageId"); + $self->MessageId(substr($MessageId, 0, $PropertyDescriptor->GetMaxLength())); + $self->Disposition("Processing"); } @@ -371,6 +376,7 @@ BEGIN CreateBasicPropertyDescriptor("FromName", "Author", !1, !1, "A", 40), CreateBasicPropertyDescriptor("FromEMail", "Author's email address", !1, !1, "A", 40), CreateBasicPropertyDescriptor("Subject", "Subject", !1, !1, "A", 120), + CreateBasicPropertyDescriptor("MessageId", "Message id", !1, !1, "A", 256), CreateBasicPropertyDescriptor("Disposition", "Disposition", !1, 1, "A", 40), ); }

1 0

Alistair Leslie-Hughes : cmd: Implement builtin mklink command.
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: wine Branch: master Commit: 21ade8538de0a92ef4903f9b2ed0867bc266e30c URL: http://source.winehq.org/git/wine.git/?a=commit;h=21ade8538de0a92ef4903f9b2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 7 23:26:42 2017 +0000 cmd: Implement builtin mklink command. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 148 +++++++++++++++++++++++++++++++++--------------- po/bg.po | 107 +++++++++++++++++++--------------- po/ca.po | 148 +++++++++++++++++++++++++++++++++--------------- po/cs.po | 107 +++++++++++++++++++--------------- po/da.po | 148 +++++++++++++++++++++++++++++++++--------------- po/de.po | 148 +++++++++++++++++++++++++++++++++--------------- po/el.po | 107 +++++++++++++++++++--------------- po/en.po | 118 +++++++++++++++++++++++--------------- po/en_US.po | 118 +++++++++++++++++++++++--------------- po/eo.po | 107 +++++++++++++++++++--------------- po/es.po | 148 +++++++++++++++++++++++++++++++++--------------- po/fa.po | 107 +++++++++++++++++++--------------- po/fi.po | 148 +++++++++++++++++++++++++++++++++--------------- po/fr.po | 148 +++++++++++++++++++++++++++++++++--------------- po/he.po | 107 +++++++++++++++++++--------------- po/hi.po | 107 +++++++++++++++++++--------------- po/hr.po | 107 +++++++++++++++++++--------------- po/hu.po | 148 +++++++++++++++++++++++++++++++++--------------- po/it.po | 148 +++++++++++++++++++++++++++++++++--------------- po/ja.po | 148 +++++++++++++++++++++++++++++++++--------------- po/ko.po | 148 +++++++++++++++++++++++++++++++++--------------- po/lt.po | 148 +++++++++++++++++++++++++++++++++--------------- po/ml.po | 107 +++++++++++++++++++--------------- po/nb_NO.po | 148 +++++++++++++++++++++++++++++++++--------------- po/nl.po | 107 +++++++++++++++++++--------------- po/or.po | 107 +++++++++++++++++++--------------- po/pa.po | 107 +++++++++++++++++++--------------- po/pl.po | 148 +++++++++++++++++++++++++++++++++--------------- po/pt_BR.po | 148 +++++++++++++++++++++++++++++++++--------------- po/pt_PT.po | 148 +++++++++++++++++++++++++++++++++--------------- po/rm.po | 107 +++++++++++++++++++--------------- po/ro.po | 148 +++++++++++++++++++++++++++++++++--------------- po/ru.po | 148 +++++++++++++++++++++++++++++++++--------------- po/sk.po | 107 +++++++++++++++++++--------------- po/sl.po | 148 +++++++++++++++++++++++++++++++++--------------- po/sr_RS(a)cyrillic.po | 107 +++++++++++++++++++--------------- po/sr_RS(a)latin.po | 107 +++++++++++++++++++--------------- po/sv.po | 148 +++++++++++++++++++++++++++++++++--------------- po/te.po | 107 +++++++++++++++++++--------------- po/th.po | 107 +++++++++++++++++++--------------- po/tr.po | 148 +++++++++++++++++++++++++++++++++--------------- po/uk.po | 148 +++++++++++++++++++++++++++++++++--------------- po/wa.po | 107 +++++++++++++++++++--------------- po/wine.pot | 107 +++++++++++++++++++--------------- po/zh_CN.po | 148 +++++++++++++++++++++++++++++++++--------------- po/zh_TW.po | 148 +++++++++++++++++++++++++++++++++--------------- programs/cmd/builtins.c | 58 +++++++++++++++++++ programs/cmd/cmd.rc | 14 ++++- programs/cmd/wcmd.h | 4 +- programs/cmd/wcmdmain.c | 3 + 50 files changed, 3889 insertions(+), 2118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21ade8538de0a92ef4903…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: wine Branch: master Commit: 206162365df629f1fce5ffc3e30161dc6f6430f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=206162365df629f1fce5ffc3e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Nov 14 22:10:18 2017 +0200 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 396f9f1..e7dd526 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: 2017-11-08 09:01+0300\n" +"PO-Revision-Date: 2017-11-14 22:09+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" @@ -14997,7 +14997,7 @@ msgstr "Minos" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Visi rezultatai bus prarasti. Ar tikrai?" #: winemine.rc:30 msgid "WineMine"

1 0

Vincent Povirk : sane.ds: Send events to applications through the DSM.
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: wine Branch: master Commit: 870c4f3e99e373063978ba833fa201e78d7bd73e URL: http://source.winehq.org/git/wine.git/?a=commit;h=870c4f3e99e373063978ba833… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 14 15:14:11 2017 -0600 sane.ds: Send events to applications through the DSM. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/ds_ctrl.c | 19 ++++--------------- dlls/sane.ds/sane_i.h | 5 +++-- dlls/sane.ds/sane_main.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/sane.ds/ui.c | 6 ++---- include/twain.h | 24 ++++++++++++++++++++++++ 5 files changed, 81 insertions(+), 22 deletions(-) diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c index 713f311..b7d2837 100644 --- a/dlls/sane.ds/ds_ctrl.c +++ b/dlls/sane.ds/ds_ctrl.c @@ -184,13 +184,7 @@ TW_UINT16 SANE_ProcessEvent (pTW_IDENTITY pOrigin, TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT msg 0x%x, wParam 0x%lx\n", pMsg->message, pMsg->wParam); activeDS.twCC = TWCC_SUCCESS; - if (pMsg->message == activeDS.windowMessage && activeDS.windowMessage) - { - twRC = TWRC_DSEVENT; - pEvent->TWMessage = pMsg->wParam; - } - else - pEvent->TWMessage = MSG_NULL; /* no message to the application */ + pEvent->TWMessage = MSG_NULL; /* no message to the application */ if (activeDS.currentState < 5 || activeDS.currentState > 7) { @@ -232,8 +226,7 @@ TW_UINT16 SANE_PendingXfersEndXfer (pTW_IDENTITY pOrigin, pPendingXfers->Count = 0; activeDS.currentState = 5; /* Notify the application that it can close the data source */ - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); + SANE_Notify(MSG_CLOSEDSREQ); } else activeDS.sane_started = TRUE; @@ -403,8 +396,6 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, else { activeDS.hwndOwner = pUserInterface->hParent; - if (! activeDS.windowMessage) - activeDS.windowMessage = RegisterWindowMessageA("SANE.DS ACTIVITY MESSAGE"); if (pUserInterface->ShowUI) { BOOL rc; @@ -413,8 +404,7 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, pUserInterface->ModalUI = TRUE; if (!rc) { - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); + SANE_Notify(MSG_CLOSEDSREQ); } #ifdef SONAME_LIBSANE else @@ -428,8 +418,7 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, { /* no UI will be displayed, so source is ready to transfer data */ activeDS.currentState = 6; /* Transitions to state 6 directly */ - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_XFERREADY, 0); + SANE_Notify(MSG_XFERREADY); } twRC = TWRC_SUCCESS; diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index ae58159..941e8b9 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -62,10 +62,10 @@ extern HINSTANCE SANE_instance DECLSPEC_HIDDEN; struct tagActiveDS { struct tagActiveDS *next; /* next active DS */ - TW_IDENTITY identity; /* identity */ + TW_IDENTITY identity; /* identity of the DS */ TW_UINT16 currentState; /* current state */ - UINT windowMessage; /* message to use to send status */ TW_UINT16 twCC; /* condition code */ + TW_IDENTITY appIdentity; /* identity of the app */ HWND hwndOwner; /* window handle of the app */ HWND progressWnd; /* window handle of the scanning window */ #ifdef SONAME_LIBSANE @@ -89,6 +89,7 @@ struct tagActiveDS /* Helper functions */ extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; extern TW_UINT16 SANE_SaneSetDefaults (void) DECLSPEC_HIDDEN; +extern void SANE_Notify (TW_UINT16 message) DECLSPEC_HIDDEN; /* Implementation of operation triplets * From Application to Source (Control Information) */ diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 5c0f56f..7af0a23 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +DSMENTRYPROC SANE_dsmentry; + #ifdef SONAME_LIBSANE HINSTANCE SANE_instance; @@ -113,6 +115,8 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY, pTW_IDENTITY); #endif /* SONAME_LIBSANE */ +static TW_UINT16 SANE_SetEntryPoint (pTW_IDENTITY pOrigin, TW_MEMREF pData); + static TW_UINT16 SANE_SourceControlHandler ( pTW_IDENTITY pOrigin, TW_UINT16 DAT, @@ -181,6 +185,17 @@ static TW_UINT16 SANE_SourceControlHandler ( } break; + case DAT_ENTRYPOINT: + if (MSG == MSG_SET) + twRC = SANE_SetEntryPoint (pOrigin, pData); + else + { + twRC = TWRC_FAILURE; + activeDS.twCC = TWCC_CAPBADOPERATION; + FIXME("unrecognized operation triplet\n"); + } + break; + case DAT_EVENT: if (MSG == MSG_PROCESSEVENT) twRC = SANE_ProcessEvent (pOrigin, pData); @@ -380,6 +395,21 @@ DS_Entry ( pTW_IDENTITY pOrigin, return twRC; } +void SANE_Notify (TW_UINT16 message) +{ + SANE_dsmentry (&activeDS.identity, &activeDS.appIdentity, DG_CONTROL, DAT_NULL, message, NULL); +} + +/* DG_CONTROL/DAT_ENTRYPOINT/MSG_SET */ +TW_UINT16 SANE_SetEntryPoint (pTW_IDENTITY pOrigin, TW_MEMREF pData) +{ + TW_ENTRYPOINT *entry = (TW_ENTRYPOINT*)pData; + + SANE_dsmentry = entry->DSM_Entry; + + return TWRC_SUCCESS; +} + #ifdef SONAME_LIBSANE /* Sane returns device names that are longer than the 32 bytes allowed by TWAIN. However, it colon separates them, and the last bit is @@ -432,7 +462,7 @@ SANE_GetIdentity( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { return TWRC_FAILURE; self->ProtocolMajor = TWON_PROTOCOLMAJOR; self->ProtocolMinor = TWON_PROTOCOLMINOR; - self->SupportedGroups = DG_CONTROL | DG_IMAGE; + self->SupportedGroups = DG_CONTROL | DG_IMAGE | DF_DS2; copy_sane_short_name(sane_devlist[cursanedev]->name, self->ProductName, sizeof(self->ProductName) - 1); lstrcpynA (self->Manufacturer, sane_devlist[cursanedev]->vendor, sizeof(self->Manufacturer) - 1); lstrcpynA (self->ProductFamily, sane_devlist[cursanedev]->model, sizeof(self->ProductFamily) - 1); @@ -451,6 +481,21 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { SANE_Status status; int i; + if (SANE_dsmentry == NULL) + { + static const WCHAR twain32W[] = {'t','w','a','i','n','_','3','2',0}; + HMODULE moddsm = GetModuleHandleW(twain32W); + + if (moddsm) + SANE_dsmentry = (void*)GetProcAddress(moddsm, "DSM_Entry"); + + if (!SANE_dsmentry) + { + ERR("can't find DSM entry point\n"); + return TWRC_FAILURE; + } + } + detect_sane_devices(); if (!sane_devlist[0]) { ERR("No scanners? We should not get to OpenDS?\n"); @@ -481,6 +526,8 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { activeDS.twCC = SANE_SaneSetDefaults(); if (activeDS.twCC == TWCC_SUCCESS) { activeDS.currentState = 4; + activeDS.identity.Id = self->Id; + activeDS.appIdentity = *pOrigin; return TWRC_SUCCESS; } else diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 9a9bcb0..fe1988a 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -1034,13 +1034,11 @@ static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM if (psn->lParam) { activeDS.currentState = 6; - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_XFERREADY, 0); + SANE_Notify(MSG_XFERREADY); } break; case PSN_QUERYCANCEL: - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); + SANE_Notify(MSG_CLOSEDSREQ); break; case PSN_SETACTIVE: InitializeDialog(hwndDlg); diff --git a/include/twain.h b/include/twain.h index bdbda47..28eaddf 100644 --- a/include/twain.h +++ b/include/twain.h @@ -1843,6 +1843,30 @@ typedef TW_UINT16 (*DSENTRYPROC)(pTW_IDENTITY, } #endif /* cplusplus */ +/* Definitions from TWAIN 2.x used by our builtin data sources */ +#define DAT_ENTRYPOINT 0x0403 +#define DF_DS2 0x40000000 + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ +typedef TW_HANDLE (PASCAL *DSM_MEMALLOCATE)(TW_UINT32 _size); +typedef void (PASCAL *DSM_MEMFREE)(TW_HANDLE _handle); +typedef TW_MEMREF (PASCAL *DSM_MEMLOCK)(TW_HANDLE _handle); +typedef void (PASCAL *DSM_MEMUNLOCK)(TW_HANDLE _handle); +#ifdef __cplusplus +} +#endif /* cplusplus */ + +typedef struct { + TW_UINT32 Size; + DSMENTRYPROC DSM_Entry; + DSM_MEMALLOCATE DSM_MemAllocate; + DSM_MEMFREE DSM_MemFree; + DSM_MEMLOCK DSM_MemLock; + DSM_MEMUNLOCK DSM_MemUnlock; +} TW_ENTRYPOINT; + /* The Twain structures must be packed on 2 byte alignment */ #include "poppack.h"

1 0

Akihiro Sagawa : winex11: Keep the result string in the IME UI window procedure.
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: wine Branch: master Commit: b8dc1e7cde64c212882958c0806b50911a360fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8dc1e7cde64c212882958c08… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 15 00:18:51 2017 +0900 winex11: Keep the result string in the IME UI window procedure. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 1 - dlls/winex11.drv/ime.c | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index bf0f4b2..12e8f99 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -380,7 +380,6 @@ static LRESULT WINAPI test_ime_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPAR imc = ImmGetContext(hWnd); size = ImmGetCompositionStringW(imc, GCS_RESULTSTR, wstring, sizeof(wstring)); - todo_wine ok(size > 0, "ImmGetCompositionString(GCS_RESULTSTR) is %d\n", size); ImmReleaseContext(hwnd, imc); diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 0f4d2b2..d0746c5 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -906,6 +906,11 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, myPrivate->bInComposition = TRUE; } + /* clear existing result */ + newCompStr = updateResultStr(lpIMC->hCompStr, NULL, 0); + ImmDestroyIMCC(lpIMC->hCompStr); + lpIMC->hCompStr = newCompStr; + flags = GCS_COMPSTR; if (dwCompLen && lpComp) @@ -1256,7 +1261,6 @@ static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam) LPCOMPOSITIONSTRING compstr; LPBYTE compdata; LPWSTR ResultStr; - HIMCC newCompStr; LPINPUTCONTEXT lpIMC; lpIMC = LockRealIMC(hIMC); @@ -1269,11 +1273,6 @@ static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam) ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); GenerateIMECHARMessages(hIMC, ResultStr, compstr->dwResultStrLen); ImmUnlockIMCC(lpIMC->hCompStr); - - /* clear the buffer */ - newCompStr = updateResultStr(lpIMC->hCompStr, NULL, 0); - ImmDestroyIMCC(lpIMC->hCompStr); - lpIMC->hCompStr = newCompStr; UnlockRealIMC(hIMC); } else

1 0

Jacek Caban : ieproxy: Added IPersistHistory proxy/stub.
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: wine Branch: master Commit: 00eba519dc7c841e7e4de1976ed3a83cb2f5a536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00eba519dc7c841e7e4de1976… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 14 17:39:36 2017 +0100 ieproxy: Added IPersistHistory proxy/stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieproxy/Makefile.in | 7 ++++--- dlls/ieproxy/ieproxy_perhist.idl | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/ieproxy/Makefile.in b/dlls/ieproxy/Makefile.in index c36a7f6..00c5fd1 100644 --- a/dlls/ieproxy/Makefile.in +++ b/dlls/ieproxy/Makefile.in @@ -1,7 +1,8 @@ MODULE = ieproxy.dll -IMPORTS = uuid rpcrt4 +IMPORTS = uuid ole32 rpcrt4 IDL_SRCS = \ - ieproxy_ieautomation.idl + ieproxy_ieautomation.idl \ + ieproxy_perhist.idl -dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer +dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION -DPROXY_CLSID=CLSID_PSFactoryBuffer diff --git a/dlls/ieproxy/ieproxy_perhist.idl b/dlls/ieproxy/ieproxy_perhist.idl new file mode 100644 index 0000000..12268f5 --- /dev/null +++ b/dlls/ieproxy/ieproxy_perhist.idl @@ -0,0 +1,30 @@ +/* + * Copyright 2017 Jacek Caban 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 + */ + +/* just a wrapper for perhist.idl */ + +#pragma makedep proxy +#pragma makedep register + +#include "perhist.idl" + +[ + threading(both), + uuid(a4a1a128-768f-41e0-bf75-e4fddd701cba) /* IInternetExplorerManager */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; }

1 0

Jacek Caban : urlmon/tests: Added IBindStatusCallback marshaling tests.
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: wine Branch: master Commit: 05826d5a6837dfb208b773639bd4f8ac8c4e0820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05826d5a6837dfb208b773639… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 13 21:41:48 2017 +0100 urlmon/tests: Added IBindStatusCallback marshaling tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 723 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 723 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05826d5a6837dfb208b77…

1 0

Jacek Caban : urlmon: Added user marshaling implementation for GetBindInfo [Ex].
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: wine Branch: master Commit: 907224188a9636357e2ea44ad4d0ee32e7adc7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=907224188a9636357e2ea44ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 13 21:41:45 2017 +0100 urlmon: Added user marshaling implementation for GetBindInfo[Ex]. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/usrmarshal.c | 113 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 99 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/usrmarshal.c b/dlls/urlmon/usrmarshal.c index f196883..9ddb130 100644 --- a/dlls/urlmon/usrmarshal.c +++ b/dlls/urlmon/usrmarshal.c @@ -195,35 +195,120 @@ static HRESULT unmarshal_stgmed(RemSTGMEDIUM *rem_stgmed, STGMEDIUM *stgmed) return hres; } +static void proxy_marshal_bindinfo(BINDINFO *bindinfo, RemBINDINFO *rem_bindinfo) +{ + rem_bindinfo->szExtraInfo = bindinfo->szExtraInfo; + rem_bindinfo->grfBindInfoF = bindinfo->grfBindInfoF; + rem_bindinfo->dwBindVerb = bindinfo->dwBindVerb; + rem_bindinfo->szCustomVerb = bindinfo->szCustomVerb; + rem_bindinfo->cbstgmedData = bindinfo->cbstgmedData; +} + +static void proxy_unmarshal_bindinfo(RemBINDINFO *rem_bindinfo, BINDINFO *bindinfo) +{ + bindinfo->szExtraInfo = rem_bindinfo->szExtraInfo; + bindinfo->grfBindInfoF = rem_bindinfo->grfBindInfoF; + bindinfo->dwBindVerb = rem_bindinfo->dwBindVerb; + bindinfo->szCustomVerb = rem_bindinfo->szCustomVerb; + bindinfo->cbstgmedData = rem_bindinfo->cbstgmedData; + bindinfo->dwOptions = rem_bindinfo->dwOptions; + bindinfo->dwOptionsFlags = rem_bindinfo->dwOptionsFlags; + bindinfo->dwCodePage = rem_bindinfo->dwCodePage; + bindinfo->iid = IID_NULL; + bindinfo->pUnk = NULL; +} + +static void stub_unmarshal_bindinfo(RemBINDINFO *rem_bindinfo, BINDINFO *bindinfo) +{ + bindinfo->szExtraInfo = rem_bindinfo->szExtraInfo; + bindinfo->grfBindInfoF = rem_bindinfo->grfBindInfoF; + bindinfo->dwBindVerb = rem_bindinfo->dwBindVerb; + bindinfo->szCustomVerb = rem_bindinfo->szCustomVerb; + bindinfo->cbstgmedData = rem_bindinfo->cbstgmedData; + + if(bindinfo->stgmedData.tymed != TYMED_NULL) + WARN("stgmed data (tymed %u) will be lost!\n", bindinfo->stgmedData.tymed); +} + +static void stub_marshal_bindinfo(BINDINFO *bindinfo, RemBINDINFO *rem_bindinfo) +{ + rem_bindinfo->cbSize = sizeof(*rem_bindinfo); + rem_bindinfo->szExtraInfo = bindinfo->szExtraInfo; + rem_bindinfo->grfBindInfoF = bindinfo->grfBindInfoF; + rem_bindinfo->dwBindVerb = bindinfo->dwBindVerb; + rem_bindinfo->szCustomVerb = bindinfo->szCustomVerb; + rem_bindinfo->cbstgmedData = bindinfo->cbstgmedData; + rem_bindinfo->dwOptions = bindinfo->dwOptions; + rem_bindinfo->dwOptionsFlags = bindinfo->dwOptionsFlags; + rem_bindinfo->dwCodePage = bindinfo->dwCodePage; + rem_bindinfo->pUnk = NULL; + rem_bindinfo->dwReserved = bindinfo->dwReserved; +} + + HRESULT CALLBACK IBindStatusCallbackEx_GetBindInfoEx_Proxy( - IBindStatusCallbackEx* This, DWORD *grfBINDF, BINDINFO *pbindinfo, + IBindStatusCallbackEx* This, DWORD *grfBINDF, BINDINFO *bindinfo, DWORD *grfBINDF2, DWORD *pdwReserved) { - FIXME("stub\n"); - return E_NOTIMPL; + RemBINDINFO rem_bindinfo = {sizeof(rem_bindinfo)}; + RemSTGMEDIUM rem_stgmed = {0}; + HRESULT hres; + + TRACE("(%p)->(%p %p %p %p)\n", This, grfBINDF, bindinfo, grfBINDF2, pdwReserved); + + proxy_marshal_bindinfo(bindinfo, &rem_bindinfo); + hres = IBindStatusCallbackEx_RemoteGetBindInfoEx_Proxy(This, grfBINDF, &rem_bindinfo, + &rem_stgmed, grfBINDF2, pdwReserved); + proxy_unmarshal_bindinfo(&rem_bindinfo, bindinfo); + return hres; } HRESULT __RPC_STUB IBindStatusCallbackEx_GetBindInfoEx_Stub( - IBindStatusCallbackEx* This, DWORD *grfBINDF, RemBINDINFO *pbindinfo, - RemSTGMEDIUM *pstgmed, DWORD *grfBINDF2, DWORD *pdwReserved) + IBindStatusCallbackEx* This, DWORD *grfBINDF, RemBINDINFO *rem_bindinfo, + RemSTGMEDIUM *rem_stgmed, DWORD *grfBINDF2, DWORD *pdwReserved) { - FIXME("stub\n"); - return E_NOTIMPL; -} + BINDINFO bindinfo = {sizeof(bindinfo)}; + HRESULT hres; + + TRACE("(%p)->(%p %p %p %p %p)\n", This, grfBINDF, rem_bindinfo, rem_stgmed, grfBINDF2, pdwReserved); + /* + * Although arguments suggest support for STGMEDIUM from BINDINFO, tests show + * that it's not supported and returned data is lost. + */ + stub_unmarshal_bindinfo(rem_bindinfo, &bindinfo); + hres = IBindStatusCallbackEx_GetBindInfoEx(This, grfBINDF, &bindinfo, grfBINDF2, pdwReserved); + stub_marshal_bindinfo(&bindinfo, rem_bindinfo); + return hres; +} HRESULT CALLBACK IBindStatusCallback_GetBindInfo_Proxy( - IBindStatusCallback* This, DWORD *grfBINDF, BINDINFO *pbindinfo) + IBindStatusCallback* This, DWORD *grfBINDF, BINDINFO *bindinfo) { - FIXME("stub\n"); - return E_NOTIMPL; + RemBINDINFO rem_bindinfo = {sizeof(rem_bindinfo)}; + RemSTGMEDIUM rem_stgmed = {0}; + HRESULT hres; + + TRACE("(%p)->(%p %p)\n", This, grfBINDF, bindinfo); + + proxy_marshal_bindinfo(bindinfo, &rem_bindinfo); + hres = IBindStatusCallback_RemoteGetBindInfo_Proxy(This, grfBINDF, &rem_bindinfo, &rem_stgmed); + proxy_unmarshal_bindinfo(&rem_bindinfo, bindinfo); + return hres; } HRESULT __RPC_STUB IBindStatusCallback_GetBindInfo_Stub( IBindStatusCallback* This, DWORD *grfBINDF, - RemBINDINFO *pbindinfo, RemSTGMEDIUM *pstgmed) + RemBINDINFO *rem_bindinfo, RemSTGMEDIUM *rem_stgmed) { - FIXME("stub\n"); - return E_NOTIMPL; + BINDINFO bindinfo = {sizeof(bindinfo)}; + HRESULT hres; + + TRACE("(%p)->(%p %p %p)\n", This, grfBINDF, rem_bindinfo, rem_stgmed); + + stub_unmarshal_bindinfo(rem_bindinfo, &bindinfo); + hres = IBindStatusCallback_GetBindInfo(This, grfBINDF, &bindinfo); + stub_marshal_bindinfo(&bindinfo, rem_bindinfo); + return hres; } HRESULT CALLBACK IBindStatusCallback_OnDataAvailable_Proxy(

1 0

Akihiro Sagawa : imm32/tests: Add more composition string tests.
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: wine Branch: master Commit: 3955ce1e0a882cce7237920ad06d176a14da7a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3955ce1e0a882cce7237920ad… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 15 00:18:49 2017 +0900 imm32/tests: Add more composition string tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 99d95c1..bf0f4b2 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -355,6 +355,63 @@ static void test_ImmNotifyIME(void) { } +static struct { + WNDPROC old_wnd_proc; + BOOL catch_result_str; + BOOL catch_ime_char; + DWORD start; + DWORD timer_id; +} ime_composition_test; + +static LRESULT WINAPI test_ime_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_IME_COMPOSITION: + if ((lParam & GCS_RESULTSTR) && !ime_composition_test.catch_result_str) { + WCHAR wstring[20]; + HIMC imc; + LONG size; + LRESULT ret; + + ret = CallWindowProcA(ime_composition_test.old_wnd_proc, + hWnd, msg, wParam, lParam); + + imc = ImmGetContext(hWnd); + size = ImmGetCompositionStringW(imc, GCS_RESULTSTR, + wstring, sizeof(wstring)); + todo_wine + ok(size > 0, "ImmGetCompositionString(GCS_RESULTSTR) is %d\n", size); + ImmReleaseContext(hwnd, imc); + + ime_composition_test.catch_result_str = TRUE; + return ret; + } + break; + case WM_IME_CHAR: + if (!ime_composition_test.catch_ime_char) + ime_composition_test.catch_ime_char = TRUE; + break; + case WM_TIMER: + if (wParam == ime_composition_test.timer_id) { + HWND parent = GetParent(hWnd); + char title[64]; + int left = 20 - (GetTickCount() - ime_composition_test.start) / 1000; + wsprintfA(title, "%sLeft %d sec. - IME composition test", + ime_composition_test.catch_result_str ? "[*] " : "", left); + SetWindowTextA(parent, title); + if (left <= 0) + DestroyWindow(parent); + else + SetTimer(hWnd, wParam, 100, NULL); + return TRUE; + } + break; + } + return CallWindowProcA(ime_composition_test.old_wnd_proc, + hWnd, msg, wParam, lParam); +} + static void test_ImmGetCompositionString(void) { HIMC imc; @@ -364,6 +421,7 @@ static void test_ImmGetCompositionString(void) LONG len; LONG alen,wlen; BOOL ret; + DWORD prop; imc = ImmGetContext(hwnd); ret = ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL,0); @@ -388,6 +446,89 @@ static void test_ImmGetCompositionString(void) win_skip("Composition string isn't available\n"); ImmReleaseContext(hwnd, imc); + + /* Test composition results input by IMM API */ + prop = ImmGetProperty(GetKeyboardLayout(0), IGP_SETCOMPSTR); + if (!(prop & SCS_CAP_COMPSTR)) { + /* Wine's IME doesn't support SCS_SETSTR in ImmSetCompositionString */ + skip("This IME doesn't support SCS_SETSTR\n"); + } + else { + ime_composition_test.old_wnd_proc = + (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, + (LONG_PTR)test_ime_wnd_proc); + imc = ImmGetContext(hwnd); + msg_spy_flush_msgs(); + + ret = ImmSetCompositionStringW(imc, SCS_SETSTR, + string, sizeof(string), NULL,0); + ok(ret, "ImmSetCompositionStringW failed\n"); + wlen = ImmGetCompositionStringW(imc, GCS_COMPSTR, + wstring, sizeof(wstring)); + if (wlen > 0) { + ret = ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + ok(ret, "ImmNotifyIME(CPS_COMPLETE) failed\n"); + msg_spy_flush_msgs(); + ok(ime_composition_test.catch_result_str, + "WM_IME_COMPOSITION(GCS_RESULTSTR) isn't sent\n"); + ok(ime_composition_test.catch_ime_char, + "WM_IME_CHAR isn't sent\n"); + } + else + win_skip("Composition string isn't available\n"); + ImmReleaseContext(hwnd, imc); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, + (LONG_PTR)ime_composition_test.old_wnd_proc); + msg_spy_flush_msgs(); + } + + /* Test composition results input by hand */ + memset(&ime_composition_test, 0, sizeof(ime_composition_test)); + if (winetest_interactive) { + HWND hwndMain, hwndChild; + MSG msg; + const DWORD MY_TIMER = 0xcaffe; + + hwndMain = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, + "IME composition test", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 320, 160, + NULL, NULL, GetModuleHandleA(NULL), NULL); + hwndChild = CreateWindowExA(0, "static", + "Input a DBCS character here using IME.", + WS_CHILD | WS_VISIBLE | 0 + /* ES_AUTOHSCROLL | ES_MULTILINE */, + 0, 0, 320, 100, hwndMain, NULL, + GetModuleHandleA(NULL), NULL); + + ime_composition_test.old_wnd_proc = + (WNDPROC)SetWindowLongPtrA(hwndChild, GWLP_WNDPROC, + (LONG_PTR)test_ime_wnd_proc); + + SetFocus(hwndChild); + + /* FIXME: In wine, IME UI window is created in ImmSetOpenStatus(). + So, we prepare it here to generate WM_IME_CHAR messages. */ + imc = ImmGetContext(hwndChild); + ImmSetOpenStatus(imc, FALSE); + ImmReleaseContext(hwndChild, imc); + + ime_composition_test.timer_id = MY_TIMER; + ime_composition_test.start = GetTickCount(); + SetTimer(hwndChild, ime_composition_test.timer_id, 100, NULL); + while (GetMessageA(&msg, NULL, 0, 0)) { + TranslateMessage(&msg); + DispatchMessageA(&msg); + if (!IsWindow(hwndMain)) + break; + } + if (!ime_composition_test.catch_result_str) + skip("WM_IME_COMPOSITION(GCS_RESULTSTR) isn't tested\n"); + else + ok(ime_composition_test.catch_ime_char, + "WM_IME_CHAR isn't sent\n"); + msg_spy_flush_msgs(); + } } static void test_ImmSetCompositionString(void)

1 0

Huw Davies : comctl32: Simplify handling of the marquee highlight.
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: wine Branch: master Commit: da419d80b7789d537508a2c97e092fd917a562f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da419d80b7789d537508a2c97… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 14 10:56:06 2017 +0000 comctl32: Simplify handling of the marquee highlight. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 82 ++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 51 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3587797..4cb1f0d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3843,33 +3843,44 @@ static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, INT x, INT y) * None. */ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coords_orig, - const POINT *coords_offs, const POINT *offset, INT scroll) { BOOL controlDown = FALSE; LVITEMW item; ITERATOR old_elems, new_elems; RECT rect; + POINT coords_offs, offset; - if (coords_offs->x > infoPtr->marqueeOrigin.x) + /* Ensure coordinates are within client bounds */ + coords_offs.x = max(min(coords_orig->x, infoPtr->rcList.right), 0); + coords_offs.y = max(min(coords_orig->y, infoPtr->rcList.bottom), 0); + + /* Get offset */ + LISTVIEW_GetOrigin(infoPtr, &offset); + + /* Offset coordinates by the appropriate amount */ + coords_offs.x -= offset.x; + coords_offs.y -= offset.y; + + if (coords_offs.x > infoPtr->marqueeOrigin.x) { rect.left = infoPtr->marqueeOrigin.x; - rect.right = coords_offs->x; + rect.right = coords_offs.x; } else { - rect.left = coords_offs->x; + rect.left = coords_offs.x; rect.right = infoPtr->marqueeOrigin.x; } - if (coords_offs->y > infoPtr->marqueeOrigin.y) + if (coords_offs.y > infoPtr->marqueeOrigin.y) { rect.top = infoPtr->marqueeOrigin.y; - rect.bottom = coords_offs->y; + rect.bottom = coords_offs.y; } else { - rect.top = coords_offs->y; + rect.top = coords_offs.y; rect.bottom = infoPtr->marqueeOrigin.y; } @@ -3895,7 +3906,7 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coord infoPtr->marqueeRect = rect; infoPtr->marqueeDrawRect = rect; - OffsetRect(&infoPtr->marqueeDrawRect, offset->x, offset->y); + OffsetRect(&infoPtr->marqueeDrawRect, offset.x, offset.y); iterator_frameditems_absolute(&new_elems, infoPtr, &infoPtr->marqueeRect); iterator_remove_common_items(&old_elems, &new_elems); @@ -3960,9 +3971,7 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent { LISTVIEW_INFO *infoPtr; SCROLLINFO scrollInfo; - POINT coords_orig; - POINT coords_offs; - POINT offset; + POINT coords; INT scroll = 0; infoPtr = (LISTVIEW_INFO *) idEvent; @@ -3971,19 +3980,8 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent return; /* Get the current cursor position and convert to client coordinates */ - GetCursorPos(&coords_orig); - ScreenToClient(hWnd, &coords_orig); - - /* Ensure coordinates are within client bounds */ - coords_offs.x = max(min(coords_orig.x, infoPtr->rcList.right), 0); - coords_offs.y = max(min(coords_orig.y, infoPtr->rcList.bottom), 0); - - /* Get offset */ - LISTVIEW_GetOrigin(infoPtr, &offset); - - /* Offset coordinates by the appropriate amount */ - coords_offs.x -= offset.x; - coords_offs.y -= offset.y; + GetCursorPos(&coords); + ScreenToClient(hWnd, &coords); scrollInfo.cbSize = sizeof(SCROLLINFO); scrollInfo.fMask = SIF_ALL; @@ -4007,12 +4005,12 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent scroll |= SCROLL_RIGHT; } - if (((coords_orig.x <= 0) && (scroll & SCROLL_LEFT)) || - ((coords_orig.y <= 0) && (scroll & SCROLL_UP)) || - ((coords_orig.x >= infoPtr->rcList.right) && (scroll & SCROLL_RIGHT)) || - ((coords_orig.y >= infoPtr->rcList.bottom) && (scroll & SCROLL_DOWN))) + if (((coords.x <= 0) && (scroll & SCROLL_LEFT)) || + ((coords.y <= 0) && (scroll & SCROLL_UP)) || + ((coords.x >= infoPtr->rcList.right) && (scroll & SCROLL_RIGHT)) || + ((coords.y >= infoPtr->rcList.bottom) && (scroll & SCROLL_DOWN))) { - LISTVIEW_MarqueeHighlight(infoPtr, &coords_orig, &coords_offs, &offset, scroll); + LISTVIEW_MarqueeHighlight(infoPtr, &coords, scroll); } } @@ -4034,6 +4032,9 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN RECT rect; POINT pt; + pt.x = x; + pt.y = y; + if (!(fwKeys & MK_LBUTTON)) infoPtr->bLButtonDown = FALSE; @@ -4046,24 +4047,6 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN if (infoPtr->bMarqueeSelect) { - POINT coords_orig; - POINT coords_offs; - POINT offset; - - coords_orig.x = x; - coords_orig.y = y; - - /* Get offset */ - LISTVIEW_GetOrigin(infoPtr, &offset); - - /* Ensure coordinates are within client bounds */ - coords_offs.x = max(min(x, infoPtr->rcList.right), 0); - coords_offs.y = max(min(y, infoPtr->rcList.bottom), 0); - - /* Offset coordinates by the appropriate amount */ - coords_offs.x -= offset.x; - coords_offs.y -= offset.y; - /* Enable the timer if we're going outside our bounds, in case the user doesn't move the mouse again */ @@ -4082,13 +4065,10 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN KillTimer(infoPtr->hwndSelf, (UINT_PTR) infoPtr); } - LISTVIEW_MarqueeHighlight(infoPtr, &coords_orig, &coords_offs, &offset, 0); + LISTVIEW_MarqueeHighlight(infoPtr, &pt, 0); return 0; } - pt.x = x; - pt.y = y; - ht.pt = pt; LISTVIEW_HitTest(infoPtr, &ht, TRUE, TRUE);

1 0

Jacek Caban : urlmon: Added user marshaling implementation for OnDataAvailable.
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: wine Branch: master Commit: 185b235d2f60747be61afa6a79cd2daf05dcbd09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=185b235d2f60747be61afa6a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 13 23:30:05 2017 +0100 urlmon: Added user marshaling implementation for OnDataAvailable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/usrmarshal.c | 155 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 151 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/usrmarshal.c b/dlls/urlmon/usrmarshal.c index e15c91b..f196883 100644 --- a/dlls/urlmon/usrmarshal.c +++ b/dlls/urlmon/usrmarshal.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "urlmon_main.h" #include "wine/debug.h" @@ -84,6 +86,115 @@ HRESULT __RPC_STUB IBindHost_MonikerBindToObject_Stub(IBindHost* This, return IBindHost_MonikerBindToObject(This, moniker, bc, bsc, riid, (void**)obj); } +static HRESULT marshal_stgmed(STGMEDIUM *stgmed, RemSTGMEDIUM **ret) +{ + RemSTGMEDIUM *rem_stgmed; + IStream *stream = NULL; + ULONG size = 0; + HRESULT hres = S_OK; + + if((stgmed->tymed == TYMED_ISTREAM && stgmed->u.pstm) || stgmed->pUnkForRelease) { + hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); + if(FAILED(hres)) + return hres; + } + + switch(stgmed->tymed) { + case TYMED_NULL: + break; + case TYMED_ISTREAM: + if(stgmed->u.pstm) + hres = CoMarshalInterface(stream, &IID_IStream, (IUnknown*)stgmed->u.pstm, + MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL); + break; + default: + FIXME("unsupported tymed %u\n", stgmed->tymed); + break; + } + + if(SUCCEEDED(hres) && stgmed->pUnkForRelease) + hres = CoMarshalInterface(stream, &IID_IUnknown, stgmed->pUnkForRelease, + MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL); + if(FAILED(hres)) { + if(stream) + IStream_Release(stream); + return hres; + } + + if(stream) { + LARGE_INTEGER zero; + ULARGE_INTEGER off; + + zero.QuadPart = 0; + IStream_Seek(stream, zero, STREAM_SEEK_CUR, &off); + size = off.QuadPart; + IStream_Seek(stream, zero, STREAM_SEEK_SET, &off); + } + + rem_stgmed = heap_alloc_zero(FIELD_OFFSET(RemSTGMEDIUM, data[size])); + if(!rem_stgmed) { + if(stream) + IStream_Release(stream); + return E_OUTOFMEMORY; + } + + rem_stgmed->tymed = stgmed->tymed; + rem_stgmed->dwHandleType = 0; + rem_stgmed->pData = stgmed->u.pstm != NULL; + rem_stgmed->pUnkForRelease = stgmed->pUnkForRelease != NULL; + rem_stgmed->cbData = size; + if(stream) { + IStream_Read(stream, rem_stgmed->data, size, &size); + IStream_Release(stream); + } + + *ret = rem_stgmed; + return S_OK; +} + +static HRESULT unmarshal_stgmed(RemSTGMEDIUM *rem_stgmed, STGMEDIUM *stgmed) +{ + IStream *stream = NULL; + HRESULT hres = S_OK; + + stgmed->tymed = rem_stgmed->tymed; + + if((stgmed->tymed == TYMED_ISTREAM && rem_stgmed->pData) || rem_stgmed->pUnkForRelease) { + LARGE_INTEGER zero; + + hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); + if(FAILED(hres)) + return hres; + + hres = IStream_Write(stream, rem_stgmed->data, rem_stgmed->cbData, NULL); + if(FAILED(hres)) { + IStream_Release(stream); + return hres; + } + + zero.QuadPart = 0; + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + } + + switch(stgmed->tymed) { + case TYMED_NULL: + break; + case TYMED_ISTREAM: + if(rem_stgmed->pData) + hres = CoUnmarshalInterface(stream, &IID_IStream, (void**)&stgmed->u.pstm); + break; + default: + FIXME("unsupported tymed %u\n", stgmed->tymed); + break; + } + + if(SUCCEEDED(hres) && rem_stgmed->pUnkForRelease) + hres = CoUnmarshalInterface(stream, &IID_IUnknown, (void**)&stgmed->pUnkForRelease); + if(stream) + IStream_Release(stream); + return hres; +} + HRESULT CALLBACK IBindStatusCallbackEx_GetBindInfoEx_Proxy( IBindStatusCallbackEx* This, DWORD *grfBINDF, BINDINFO *pbindinfo, DWORD *grfBINDF2, DWORD *pdwReserved) @@ -119,16 +230,52 @@ HRESULT CALLBACK IBindStatusCallback_OnDataAvailable_Proxy( IBindStatusCallback* This, DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed) { - FIXME("stub\n"); - return E_NOTIMPL; + RemFORMATETC rem_formatetc; + RemSTGMEDIUM *rem_stgmed; + HRESULT hres; + + TRACE("(%p)->(%x %u %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); + + hres = marshal_stgmed(pstgmed, &rem_stgmed); + if(FAILED(hres)) + return hres; + + rem_formatetc.cfFormat = pformatetc->cfFormat; + rem_formatetc.ptd = 0; + rem_formatetc.dwAspect = pformatetc->dwAspect; + rem_formatetc.lindex = pformatetc->lindex; + rem_formatetc.tymed = pformatetc->tymed; + + hres = IBindStatusCallback_RemoteOnDataAvailable_Proxy(This, grfBSCF, dwSize, &rem_formatetc, rem_stgmed); + + heap_free(rem_stgmed); + return hres; } HRESULT __RPC_STUB IBindStatusCallback_OnDataAvailable_Stub( IBindStatusCallback* This, DWORD grfBSCF, DWORD dwSize, RemFORMATETC *pformatetc, RemSTGMEDIUM *pstgmed) { - FIXME("stub\n"); - return E_NOTIMPL; + STGMEDIUM stgmed = { TYMED_NULL }; + FORMATETC formatetc; + HRESULT hres; + + TRACE("(%p)->(%x %u %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); + + hres = unmarshal_stgmed(pstgmed, &stgmed); + if(FAILED(hres)) + return hres; + + formatetc.cfFormat = pformatetc->cfFormat; + formatetc.ptd = NULL; + formatetc.dwAspect = pformatetc->dwAspect; + formatetc.lindex = pformatetc->lindex; + formatetc.tymed = pformatetc->tymed; + + hres = IBindStatusCallback_OnDataAvailable(This, grfBSCF, dwSize, &formatetc, &stgmed); + + ReleaseStgMedium(&stgmed); + return hres; } HRESULT CALLBACK IBinding_GetBindResult_Proxy(IBinding* This,

1 0

Akihiro Sagawa : imm32/tests: Add a skip message when composition string isn't available.
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: wine Branch: master Commit: c1dac18c6ae9b19b1549242867e7707807041f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1dac18c6ae9b19b154924286… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 15 00:18:47 2017 +0900 imm32/tests: Add a skip message when composition string isn't available. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index b02f85d..99d95c1 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -361,11 +361,19 @@ static void test_ImmGetCompositionString(void) static const WCHAR string[] = {'w','i','n','e',0x65e5,0x672c,0x8a9e}; char cstring[20]; WCHAR wstring[20]; - DWORD len; - DWORD alen,wlen; + LONG len; + LONG alen,wlen; + BOOL ret; imc = ImmGetContext(hwnd); - ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL,0); + ret = ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL,0); + if (!ret) { + win_skip("Composition isn't supported\n"); + ImmReleaseContext(hwnd, imc); + return; + } + msg_spy_flush_msgs(); + alen = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, 20); wlen = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, 20); /* windows machines without any IME installed just return 0 above */ @@ -376,6 +384,9 @@ static void test_ImmGetCompositionString(void) len = ImmGetCompositionStringA(imc, GCS_COMPATTR, NULL, 0); ok(len==alen,"GCS_COMPATTR(A) not returning correct count\n"); } + else + win_skip("Composition string isn't available\n"); + ImmReleaseContext(hwnd, imc); }

1 0

Nikolay Sivov : msxml3/httpreq: Return S_OK from setTimeouts().
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: wine Branch: master Commit: 418c1d32bbc14933492220eac321a665091178b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=418c1d32bbc14933492220eac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 14 08:32:29 2017 +0300 msxml3/httpreq: Return S_OK from setTimeouts(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 72234ee..e3b521c 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -1978,7 +1978,7 @@ static HRESULT WINAPI ServerXMLHTTPRequest_setTimeouts(IServerXMLHTTPRequest *if { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); FIXME("(%p)->(%d %d %d %d): stub\n", This, resolveTimeout, connectTimeout, sendTimeout, receiveTimeout); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI ServerXMLHTTPRequest_waitForResponse(IServerXMLHTTPRequest *iface, VARIANT timeout, VARIANT_BOOL *isSuccessful)

1 0

Francois Gouget : testbot/web: Document that the Redirect() calls don' t return.
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: tools Branch: master Commit: df073fba12bcea28c39970a1c25ff3d43148b8fe URL: http://source.winehq.org/git/tools.git/?a=commit;h=df073fba12bcea28c39970a1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 13 17:07:06 2017 +0100 testbot/web: Document that the Redirect() calls don't return. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 6 +++--- testbot/web/Login.pl | 2 +- testbot/web/Submit.pl | 6 +++--- testbot/web/admin/UserDetails.pl | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index a4ed994..a9bb231 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -44,7 +44,7 @@ sub _initialize($$$) $self->{Job} = CreateJobs()->GetItem($JobId); if (!defined $self->{Job}) { - $self->Redirect("/index.pl"); + $self->Redirect("/index.pl"); # does not return } $self->{JobId} = $JobId; @@ -168,7 +168,7 @@ sub OnCancel($) return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); + $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); # does not return exit; } @@ -190,7 +190,7 @@ sub OnRestart($) return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); + $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); # does not return exit; } diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 95c2286..99757c5 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -138,7 +138,7 @@ sub OnLogIn($) { $Target = "/index.pl"; } - $self->Redirect(MakeSecureURL($Target)); + $self->Redirect(MakeSecureURL($Target)); # does not return exit; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 4f682a9..00d3a92 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -921,7 +921,7 @@ sub OnSubmit($) return !1; } - $self->Redirect("/JobDetails.pl?Key=$JobKey"); + $self->Redirect("/JobDetails.pl?Key=$JobKey"); # does not return exit; } @@ -949,11 +949,11 @@ sub OnOK($) if (defined($self->GetParam("JobKey"))) { - $self->Redirect("/JobDetails.pl?Key=" . $self->GetParam("JobKey")); + $self->Redirect("/JobDetails.pl?Key=" . $self->GetParam("JobKey")); # does not return } else { - $self->Redirect("/index.pl"); + $self->Redirect("/index.pl"); # does not return } } diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 022a4a0..d24e675 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -73,7 +73,7 @@ sub OnApprove($) return !1 if (!$self->Save()); $self->{ErrMessage} = $self->{Item}->Approve(); return !1 if (defined $self->{ErrMessage}); - $self->RedirectToList(); + $self->RedirectToList(); # does not return exit; } @@ -86,7 +86,7 @@ sub OnReject($) return !1 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); - $self->RedirectToList(); + $self->RedirectToList(); # does not return exit; } @@ -100,7 +100,7 @@ sub OnOK($) # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); } - $self->RedirectToList(); + $self->RedirectToList(); # does not return exit; }

1 0

Francois Gouget : Revert "Add retrieve of test data files".
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: tools Branch: master Commit: 149fa941475070ab88119ecd12462bf4741d1b71 URL: http://source.winehq.org/git/tools.git/?a=commit;h=149fa941475070ab88119ecd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 13 17:06:56 2017 +0100 Revert "Add retrieve of test data files". The TestBot never creates a TestFiles.zip file in the Task directory so this is dead code. Also there is no plan to make use of that functionality so the code can be removed. This reverts commit 04a67fce26fb2fed64777239594c9c20ef56e6d7. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/GetFile.pl | 40 +++++++--------------------------------- testbot/web/JobDetails.pl | 11 ----------- 2 files changed, 7 insertions(+), 44 deletions(-) diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index 4c6e1e2..54d4c4b 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -28,7 +28,7 @@ use WineTestBot::Steps; sub GetFile($$$$) { - my ($Request, $JobKey, $StepKey, $TaskKey) = @_; + my ($Request, $JobKey, $StepKey) = @_; # Validate and untaint if (! ($JobKey =~ m/^(\d+)$/)) @@ -41,18 +41,6 @@ sub GetFile($$$$) return !1; } $StepKey = $1; - if (! defined($TaskKey)) - { - $TaskKey = undef; - } - elsif ($TaskKey =~ m/^(\d+)$/) - { - $TaskKey = $1; - } - else - { - return !1; - } my $Job = CreateJobs()->GetItem($JobKey); if (! defined($Job)) @@ -65,9 +53,7 @@ sub GetFile($$$$) return !1; } - my $FileName = "$DataDir/jobs/$JobKey/$StepKey/" . - (defined($TaskKey) ? "$TaskKey/TestFiles.zip" : - $Step->FileName); + my $FileName = "$DataDir/jobs/$JobKey/$StepKey/" . $Step->FileName; if (! sysopen(FILE, $FileName, O_RDONLY)) { return !1; @@ -100,21 +86,10 @@ sub GetFile($$$$) # HTTP/1.0 $Request->headers_out->add("Pragma", "no-cache"); - if (defined($TaskKey)) - { - # Zip file - $Request->content_type("application/zip"); - $Request->headers_out->add("Content-Disposition", - 'attachment; filename="TestFiles.zip"'); - } - else - { - # Binary file - $Request->content_type("application/octet-stream"); - $Request->headers_out->add("Content-Disposition", - 'attachment; filename="' . $Step->FileName . - '"'); - } + # Binary file + $Request->content_type("application/octet-stream"); + $Request->headers_out->add("Content-Disposition", + 'attachment; filename="' . $Step->FileName . '"'); print $ImageBytes; @@ -126,8 +101,7 @@ my $Request = shift; my $CGIObj = CGI->new($Request); my $JobKey = $CGIObj->param("JobKey"); my $StepKey = $CGIObj->param("StepKey"); -my $TaskKey = $CGIObj->param("TaskKey"); -if (! GetFile($Request, $JobKey, $StepKey, $TaskKey)) +if (! GetFile($Request, $JobKey, $StepKey)) { $Request->headers_out->set("Location", "/"); $Request->status(Apache2::Const::REDIRECT); diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index c5803ed..a4ed994 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -322,17 +322,6 @@ sub GenerateBody($) "'>Show full log</a></div>\n"; } } - my $TestFilesName = "$TaskDir/TestFiles.zip"; - if (-r $TestFilesName) - { - my $URI = "/GetFile.pl?JobKey=" . uri_escape($self->{JobId}) . - "&StepKey=" . uri_escape($Item->StepNo) . - "&TaskKey=" . uri_escape($Item->TaskNo); - print "<div class='TaskMoreInfoLink'><a href='" . - $self->CGI->escapeHTML($URI) . - "'>Retrieve test files</a></div>\n"; - } - print "</div>\n"; if (open LOGFILE, "<$LogName") {

1 0

Francois Gouget : testbot: CompareTaskStatus() is not really needed. Remove it.
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: tools Branch: master Commit: da850add297378c3b21e354894873e10e7a1c953 URL: http://source.winehq.org/git/tools.git/?a=commit;h=da850add297378c3b21e3548… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 13 17:06:24 2017 +0100 testbot: CompareTaskStatus() is not really needed. Remove it. The scheduler only cares about queued Tasks so there is no need to compare their Status fields. So the comparison code can easily be inlined like for Steps. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index c787e8a..c6eb290 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -404,11 +404,6 @@ sub CompareJobPriority return $a->Priority <=> $b->Priority || $a->Id <=> $b->Id; } -sub CompareTaskStatus -{ - return $b->Status cmp $a->Status || $a->No <=> $b->No; -} - sub min(@) { my $m = shift @_; @@ -543,7 +538,7 @@ sub ScheduleOnHost($$$) my $PrepareNextStep; my $Tasks = $Step->Tasks; $Tasks->AddFilter("Status", ["queued"]); - my @SortedTasks = sort CompareTaskStatus @{$Tasks->GetItems()}; + my @SortedTasks = sort { $a->No <=> $b->No } @{$Tasks->GetItems()}; foreach my $Task (@SortedTasks) { my $VM = $Task->VM; @@ -591,7 +586,7 @@ sub ScheduleOnHost($$$) my $Step = $SortedSteps[1]; $Tasks = $Step->Tasks; $Tasks->AddFilter("Status", ["queued"]); - @SortedTasks = sort CompareTaskStatus @{$Tasks->GetItems()}; + @SortedTasks = sort { $a->No <=> $b->No } @{$Tasks->GetItems()}; foreach my $Task (@SortedTasks) { my $VM = $Task->VM;

1 0

Alexandre Julliard : patches: Also use References: header to find parent patch for expiration.
by Alexandre Julliard Nov. 14, 2017

Nov. 14, 2017

Module: tools Branch: master Commit: 2edc6a46c48e80abc64f4e50021b7f9afc8334ec URL: http://source.winehq.org/git/tools.git/?a=commit;h=2edc6a46c48e80abc64f4e50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 13 11:46:09 2017 +0100 patches: Also use References: header to find parent patch for expiration. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 89 +++++++++++++++++++++++++++------------------------------- 1 file changed, 41 insertions(+), 48 deletions(-) diff --git a/patches/expire b/patches/expire index 513a5b1..759f6c8 100755 --- a/patches/expire +++ b/patches/expire @@ -150,6 +150,7 @@ my $now = time(); my $email_from = "Marvin <testbot\(a)winehq.org>"; my $base_url = "https://source.winehq.org/patches/data"; my %reviews; +my %patches; foreach my $arg (@ARGV) { @@ -159,54 +160,37 @@ foreach my $arg (@ARGV) else { $dir = $arg; } } -sub get_patch_subject($) -{ - my $file = shift; - my $ret; - - return undef unless open PATCH, "<$dir/$file"; - while (<PATCH>) - { - if (/^Subject: (.*)$/) - { - $ret = $1; - last; - } - } - close PATCH; - return $ret; -} - sub get_patch_state($) { my $file = shift; - my $status = "nil"; - my $mtime = 0; - my ($subject, $msgid, $reply); + my %patch; return undef unless open PATCH, "<$dir/$file"; while (<PATCH>) { - if (/^Subject: (.*)$/) { $subject = $1; } - elsif (/^Message-Id: (.*)$/) { $msgid = $1; } - elsif (/^In-Reply-To: (.*)$/) { $reply = $1; } + if (/^Subject: (.*)$/) { $patch{subject} = $1; } + elsif (/^Message-Id: (.*)$/) { $patch{msgid} = $1; } + elsif (/^In-Reply-To: (.*)$/) { push @{$patch{reply}}, $1; } + elsif (/^References: (.*)$/) { push @{$patch{reply}}, split(/\s+/, $1); } last if (/^$/); } while (<PATCH>) { - if (/^diff --git a\//) { $reply = undef; last; } + if (/^diff --git a\//) { delete $patch{reply}; last; } } close PATCH; if (open STATUS, "<$dir/$file.status") { - $status = <STATUS>; - chomp $status; - $mtime = (stat STATUS)[9] unless $status eq "nil"; + $patch{status} = <STATUS>; + chomp $patch{status}; + $patch{mtime} = (stat STATUS)[9] unless $patch{status} eq "nil"; close STATUS; } - $mtime ||= (stat "$dir/$file")[9]; - return ($subject, $msgid, $reply, $status, $mtime); + $patch{file} = $file; + $patch{status} ||= "nil"; + $patch{mtime} ||= (stat "$dir/$file")[9]; + return %patch; } sub get_previous_state($) @@ -363,40 +347,49 @@ EOF } } -# expire current patches +sub assign_expire($); +sub assign_expire($) +{ + my $patch = shift; -my %patches; + return $patch->{expire} if defined $patch->{expire}; + + foreach my $p (@{$patch->{reply}}) + { + next unless defined $patches{$p}; + $patch->{expire} = assign_expire( $patches{$p} ); + return $patch->{expire} if defined $patch->{expire}; + } + + my $limit = $status_expiry{$patch->{status}} || 7; + $patch->{expire} = (($now - $patch->{mtime} - 12*60*60) / (24*60*60) > $limit); + return $patch->{expire}; +} + +# expire current patches opendir DIR, $dir or die "cannot open '$dir': $!\n"; foreach my $file (sort readdir DIR) { next unless $file =~ /^[0-9]+$/; - my ($subject, $msgid, $reply, $status, $mtime) = get_patch_state( $file ); + my %patch = get_patch_state( $file ); my $prev_status = get_previous_state( $file ); - my $limit = $status_expiry{$status} || 7; - my $expire = (($now - $mtime - 12*60*60) / (24*60*60) > $limit); - notify_state_change( $file, $prev_status, $status ); + notify_state_change( $file, $prev_status, $patch{status} ); - $patches{$msgid} = [ $file, $subject, $reply, $status, $expire ]; + $patches{$patch{msgid}} = \%patch; } closedir DIR; foreach my $p (keys %patches) { - my ($file, $subject, $reply, $status, $expire) = @{$patches{$p}}; - my $orig_status = $status; - - # for replies, inherit expire flag from top parent - while ($reply && $status eq "reply") - { - last unless defined $patches{$reply}; - (undef, undef, $reply, $status, $expire) = @{$patches{$reply}}; - } + my $patch = $patches{$p}; + my $orig_status = $patch->{status}; + my $file = $patch->{file}; - if ($expire) + if (assign_expire( $patch )) { - printf "unlink $file %s %s\n", $orig_status, $subject unless $quiet; + printf "unlink $file %s %s\n", $orig_status, $patch->{subject} unless $quiet; unless ($dry_run) { unlink "$dir/$file";

1 0

Alex Henrie : libport: Fix typo in rintf.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: ef104c3a336661b72a7485adb3d98477e755f6c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef104c3a336661b72a7485adb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 13 14:16:48 2017 -0700 libport: Fix typo in rintf. Spotted by Joris Huizer. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/rint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/port/rint.c b/libs/port/rint.c index a99c00b..2c0d222 100644 --- a/libs/port/rint.c +++ b/libs/port/rint.c @@ -33,7 +33,7 @@ double rint(double x) #ifndef HAVE_RINTF float rintf(float x) { - return rintf(x); + return rint(x); } #endif

1 0

Nikolay Sivov : quartz/tests: Add a couple of tests for return values ( Coverity).
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: b356673d01c29b9cd283b42e86b78588e5ea4ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b356673d01c29b9cd283b42e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 13 21:56:39 2017 +0300 quartz/tests: Add a couple of tests for return values (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplitter.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 23167b5..8bafb14 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -422,8 +422,10 @@ static void test_filter_graph(void) } ok(hr == S_OK, "Could not create null renderer: %08x\n", hr); - IBaseFilter_EnumPins(pnull, &nullenum); - IEnumPins_Next(nullenum, 1, &nullpin, NULL); + hr = IBaseFilter_EnumPins(pnull, &nullenum); + ok(hr == S_OK, "Failed to enum pins, hr %#x.\n", hr); + hr = IEnumPins_Next(nullenum, 1, &nullpin, NULL); + ok(hr == S_OK, "Failed to get next pin, hr %#x.\n", hr); IEnumPins_Release(nullenum); IPin_QueryDirection(nullpin, &dir); @@ -489,7 +491,9 @@ fail2: if (dir == PINDIR_OUTPUT) { PIN_INFO info; - IPin_QueryPinInfo(to, &info); + + hr = IPin_QueryPinInfo(to, &info); + ok(hr == S_OK, "Failed to query pin info, hr %#x.\n", hr); /* Release twice: Once normal, second from the * previous while loop

1 0

Dmitry Timoshkov : server: Make it possible to deliver an APC to any thread alive in the process.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 288814a4d84d139f37a486964f2a599664e37618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288814a4d84d139f37a486964… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 7 11:10:02 2017 +0800 server: Make it possible to deliver an APC to any thread alive in the process. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 4 ++-- server/thread.c | 7 +++++-- server/thread.h | 2 +- server/timer.c | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/server/async.c b/server/async.c index cf7a434..4e89e1e 100644 --- a/server/async.c +++ b/server/async.c @@ -167,7 +167,7 @@ void async_terminate( struct async *async, unsigned int status ) data.async_io.user = async->data.user; data.async_io.sb = async->data.iosb; data.async_io.status = status; - thread_queue_apc( async->thread, &async->obj, &data ); + thread_queue_apc( NULL, async->thread, &async->obj, &data ); } else async_set_result( &async->obj, STATUS_SUCCESS, 0 ); } @@ -373,7 +373,7 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota data.user.args[0] = async->data.apc_context; data.user.args[1] = async->data.iosb; data.user.args[2] = 0; - thread_queue_apc( async->thread, NULL, &data ); + thread_queue_apc( NULL, async->thread, NULL, &data ); } else if (async->data.apc_context) add_async_completion( async, async->data.apc_context, status, total ); diff --git a/server/thread.c b/server/thread.c index 2c864a6..858b450 100644 --- a/server/thread.c +++ b/server/thread.c @@ -926,6 +926,9 @@ static int queue_apc( struct process *process, struct thread *thread, struct thr { struct list *queue; + if (thread && thread->state == TERMINATED && process) + thread = NULL; + if (!thread) /* find a suitable thread inside the process */ { struct thread *candidate; @@ -977,14 +980,14 @@ static int queue_apc( struct process *process, struct thread *thread, struct thr } /* queue an async procedure call */ -int thread_queue_apc( struct thread *thread, struct object *owner, const apc_call_t *call_data ) +int thread_queue_apc( struct process *process, struct thread *thread, struct object *owner, const apc_call_t *call_data ) { struct thread_apc *apc; int ret = 0; if ((apc = create_apc( owner, call_data ))) { - ret = queue_apc( NULL, thread, apc ); + ret = queue_apc( process, thread, apc ); release_object( apc ); } return ret; diff --git a/server/thread.h b/server/thread.h index 1d81d61..09d8260 100644 --- a/server/thread.h +++ b/server/thread.h @@ -120,7 +120,7 @@ extern void remove_queue( struct object *obj, struct wait_queue_entry *entry ); extern void kill_thread( struct thread *thread, int violent_death ); extern void break_thread( struct thread *thread ); extern void wake_up( struct object *obj, int max ); -extern int thread_queue_apc( struct thread *thread, struct object *owner, const apc_call_t *call_data ); +extern int thread_queue_apc( struct process *process, struct thread *thread, struct object *owner, const apc_call_t *call_data ); extern void thread_cancel_apc( struct thread *thread, struct object *owner, enum apc_type type ); extern int thread_add_inflight_fd( struct thread *thread, int client, int server ); extern int thread_get_inflight_fd( struct thread *thread, int client ); diff --git a/server/timer.c b/server/timer.c index c8b4fa8..3a786fb 100644 --- a/server/timer.c +++ b/server/timer.c @@ -122,7 +122,7 @@ static void timer_callback( void *private ) } else data.type = APC_NONE; /* wake up only */ - if (!thread_queue_apc( timer->thread, &timer->obj, &data )) + if (!thread_queue_apc( NULL, timer->thread, &timer->obj, &data )) { release_object( timer->thread ); timer->thread = NULL;

1 0