March 2017 - Wine-commits - list.winehq.org

Jacek Caban : dxdiagn: Removed no longer needed psapi import.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: f4d9c3c9942d830c499c85aebe6b02f10f025207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d9c3c9942d830c499c85aeb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 3 13:11:45 2017 +0100 dxdiagn: Removed no longer needed psapi import. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index df3fc77..3a1017e 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -1,5 +1,5 @@ MODULE = dxdiagn.dll -IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 psapi user32 advapi32 +IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32 C_SRCS = \ container.c \

1 0

Jacek Caban : taskkill: Removed no longer needed psapi import.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: e1379973998b8edfa4ca25647d6cd40fa1cf93ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1379973998b8edfa4ca25647… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 3 13:11:52 2017 +0100 taskkill: Removed no longer needed psapi import. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskkill/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index 20ce1cc..ec53cdb 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -1,6 +1,6 @@ MODULE = taskkill.exe APPMODE = -mconsole -municode -IMPORTS = psapi user32 +IMPORTS = user32 C_SRCS = taskkill.c

1 0

Jacek Caban : taskmgr: Removed no longer needed psapi import.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 35faa0e7ed3efe31d77f15afa74a575bb922960c URL: http://source.winehq.org/git/wine.git/?a=commit;h=35faa0e7ed3efe31d77f15afa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 3 13:12:00 2017 +0100 taskmgr: Removed no longer needed psapi import. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index 1743024..48313e9 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -1,6 +1,6 @@ MODULE = taskmgr.exe APPMODE = -mwindows -mno-cygwin -IMPORTS = psapi shell32 comctl32 user32 gdi32 advapi32 +IMPORTS = shell32 comctl32 user32 gdi32 advapi32 C_SRCS = \ about.c \

1 0

Jacek Caban : winedbg: Removed no longer needed psapi import.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: de002161feb2a415f13c3ce17e2360a3a1d98b6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=de002161feb2a415f13c3ce17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 3 13:12:06 2017 +0100 winedbg: Removed no longer needed psapi import. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 739c4eb..ff75874 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -1,6 +1,6 @@ MODULE = winedbg.exe APPMODE = -mconsole -IMPORTS = psapi dbghelp advapi32 +IMPORTS = dbghelp advapi32 DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32 EXTRALIBS = $(POLL_LIBS)

1 0

Hugh McMaster : reg/tests: Add some line concatenation tests.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 58f289b58fb0cb5284afc716bcc951e5ba805049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f289b58fb0cb5284afc716b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Mar 3 09:42:34 2017 +0000 reg/tests: Add some line concatenation tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 7c79b31..f6d623f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1162,6 +1162,34 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line3\"=hex(7):4c,69,6e,65,20\\\n" + ",63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line3"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line4\"=hex(7):4c,69,6e,65,20\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line4"); + + test_import_str("Windows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line5\"=hex(7):4c,69,6e,65,20\\\n" + ",63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line5"); + + test_import_str("Windows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line6\"=hex(7):4c,69,6e,65,20\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line6"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -1547,6 +1575,34 @@ static void test_import(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + test_import_wstr("\xef\xbb\xbfREGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line3\"=hex(7):4c,69,6e,65,20\\\n" + ",63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line3"); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line4\"=hex(7):4c,69,6e,65,20\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line4"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line5\"=hex(7):4c,69,6e,65,20\\\n" + ",63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line5"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line6\"=hex(7):4c,69,6e,65,20\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line6"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n"

1 0

Nikolay Sivov : xmllite/writer: Fix Release() trace.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 5b78cc992cd183a5ad8b2e50384529a3c1da59ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b78cc992cd183a5ad8b2e503… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 3 15:53:03 2017 +0300 xmllite/writer: Fix Release() trace. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 55a53a6..3a0bd29 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -473,7 +473,7 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) xmlwriter *This = impl_from_IXmlWriter(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->>(%u)\n", This, ref); + TRACE("(%p)->(%u)\n", This, ref); if (ref == 0) { struct element *element, *element2;

1 0

Paul Gofman : ntdll/tests: Add test for NtFlushBuffersFile error conditions.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 85aa2067b0d0b555e265267c9364858e334eaba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85aa2067b0d0b555e265267c9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 1 14:05:53 2017 +0300 ntdll/tests: Add test for NtFlushBuffersFile error conditions. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 18c3f63..bc1afdf 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -80,6 +80,7 @@ static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PV PVOID,ULONG,FILE_INFORMATION_CLASS,BOOLEAN,PUNICODE_STRING,BOOLEAN); static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); static NTSTATUS (WINAPI *pNtQueryFullAttributesFile)(const OBJECT_ATTRIBUTES*, FILE_NETWORK_OPEN_INFORMATION*); +static NTSTATUS (WINAPI *pNtFlushBuffersFile)(HANDLE, IO_STATUS_BLOCK*); static inline BOOL is_signaled( HANDLE obj ) { @@ -4399,6 +4400,46 @@ static void test_ioctl(void) CloseHandle(file); } +static void test_flush_buffers_file(void) +{ + char path[MAX_PATH], buffer[MAX_PATH]; + HANDLE hfile, hfileread; + NTSTATUS status; + IO_STATUS_BLOCK io_status_block; + + GetTempPathA(MAX_PATH, path); + GetTempFileNameA(path, "foo", 0, buffer); + hfile = CreateFileA(buffer, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create temp file.\n" ); + + hfileread = CreateFileA(buffer, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(hfileread != INVALID_HANDLE_VALUE, "could not open temp file, error %d.\n", GetLastError()); + + status = pNtFlushBuffersFile(hfile, NULL); + todo_wine + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + + status = pNtFlushBuffersFile(hfile, (IO_STATUS_BLOCK *)0xdeadbeaf); + todo_wine + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + + status = pNtFlushBuffersFile(hfile, &io_status_block); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + + status = pNtFlushBuffersFile(hfileread, &io_status_block); + todo_wine + ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#x.\n", status); + + status = pNtFlushBuffersFile(NULL, &io_status_block); + ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#x.\n", status); + + CloseHandle(hfileread); + CloseHandle(hfile); + DeleteFileA(buffer); +} + START_TEST(file) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -4436,6 +4477,7 @@ START_TEST(file) pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile"); pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile"); pNtQueryFullAttributesFile = (void *)GetProcAddress(hntdll, "NtQueryFullAttributesFile"); + pNtFlushBuffersFile = (void *)GetProcAddress(hntdll, "NtFlushBuffersFile"); test_read_write(); test_NtCreateFile(); @@ -4460,4 +4502,5 @@ START_TEST(file) test_query_volume_information_file(); test_query_attribute_information_file(); test_ioctl(); + test_flush_buffers_file(); }

1 0

Paul Gofman : ntdll: NtFlushBuffersFile should fail if the file handle has no write access.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: f7d40d45da7a1bc0accd58bca6d6da4e34861937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7d40d45da7a1bc0accd58bca… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 1 14:05:54 2017 +0300 ntdll: NtFlushBuffersFile should fail if the file handle has no write access. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 +- dlls/ntdll/tests/file.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index fd7f3dd..3f38c6f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3423,7 +3423,7 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock { ret = COMM_FlushBuffersFile( fd ); } - else + else if (ret != STATUS_ACCESS_DENIED) { SERVER_START_REQ( flush ) { diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index bc1afdf..3d91cb1 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4429,7 +4429,6 @@ static void test_flush_buffers_file(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); status = pNtFlushBuffersFile(hfileread, &io_status_block); - todo_wine ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#x.\n", status); status = pNtFlushBuffersFile(NULL, &io_status_block);

1 0

Bruno Jesus : ws2_32: Turn SIO_GET_EXTENSION_FUNCTION_POINTER into a table.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 914e401aa9d5401893c3807d51e3f19fc7a7ab38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=914e401aa9d5401893c3807d5… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Thu Mar 2 02:38:15 2017 -0300 ws2_32: Turn SIO_GET_EXTENSION_FUNCTION_POINTER into a table. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 94 ++++++++++++++++++++++------------------------------ 1 file changed, 40 insertions(+), 54 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 32f187a..451c505 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4908,68 +4908,54 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID break; } - case WS_SIO_FLUSH: - FIXME("SIO_FLUSH: stub.\n"); - break; + case WS_SIO_FLUSH: + FIXME("SIO_FLUSH: stub.\n"); + break; - case WS_SIO_GET_EXTENSION_FUNCTION_POINTER: - { - static const GUID connectex_guid = WSAID_CONNECTEX; - static const GUID disconnectex_guid = WSAID_DISCONNECTEX; - static const GUID acceptex_guid = WSAID_ACCEPTEX; - static const GUID getaccepexsockaddrs_guid = WSAID_GETACCEPTEXSOCKADDRS; - static const GUID transmitfile_guid = WSAID_TRANSMITFILE; - static const GUID transmitpackets_guid = WSAID_TRANSMITPACKETS; - static const GUID wsarecvmsg_guid = WSAID_WSARECVMSG; - static const GUID wsasendmsg_guid = WSAID_WSASENDMSG; - - if ( IsEqualGUID(&connectex_guid, in_buff) ) - { - *(LPFN_CONNECTEX *)out_buff = WS2_ConnectEx; - break; - } - else if ( IsEqualGUID(&disconnectex_guid, in_buff) ) - { - *(LPFN_DISCONNECTEX *)out_buff = WS2_DisconnectEx; - break; - } - else if ( IsEqualGUID(&acceptex_guid, in_buff) ) - { - *(LPFN_ACCEPTEX *)out_buff = WS2_AcceptEx; - break; - } - else if ( IsEqualGUID(&getaccepexsockaddrs_guid, in_buff) ) - { - *(LPFN_GETACCEPTEXSOCKADDRS *)out_buff = WS2_GetAcceptExSockaddrs; - break; - } - else if ( IsEqualGUID(&transmitfile_guid, in_buff) ) - { - *(LPFN_TRANSMITFILE *)out_buff = WS2_TransmitFile; - break; - } - else if ( IsEqualGUID(&transmitpackets_guid, in_buff) ) - { - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented TransmitPackets\n"); - } - else if ( IsEqualGUID(&wsarecvmsg_guid, in_buff) ) - { - *(LPFN_WSARECVMSG *)out_buff = WS2_WSARecvMsg; - break; + case WS_SIO_GET_EXTENSION_FUNCTION_POINTER: + { +#define EXTENSION_FUNCTION(x, y) { x, y, #y }, + static const struct + { + GUID guid; + void *func_ptr; + const char *name; + } guid_funcs[] = { + EXTENSION_FUNCTION(WSAID_CONNECTEX, WS2_ConnectEx) + EXTENSION_FUNCTION(WSAID_DISCONNECTEX, WS2_DisconnectEx) + EXTENSION_FUNCTION(WSAID_ACCEPTEX, WS2_AcceptEx) + EXTENSION_FUNCTION(WSAID_GETACCEPTEXSOCKADDRS, WS2_GetAcceptExSockaddrs) + EXTENSION_FUNCTION(WSAID_TRANSMITFILE, WS2_TransmitFile) + /* EXTENSION_FUNCTION(WSAID_TRANSMITPACKETS, WS2_TransmitPackets) */ + EXTENSION_FUNCTION(WSAID_WSARECVMSG, WS2_WSARecvMsg) + EXTENSION_FUNCTION(WSAID_WSASENDMSG, WSASendMsg) + }; +#undef EXTENSION_FUNCTION + BOOL found = FALSE; + unsigned int i; + + for (i = 0; i < sizeof(guid_funcs) / sizeof(guid_funcs[0]); i++) + { + if (IsEqualGUID(&guid_funcs[i].guid, in_buff)) + { + found = TRUE; + break; + } } - else if ( IsEqualGUID(&wsasendmsg_guid, in_buff) ) + + if (found) { - *(LPFN_WSASENDMSG *)out_buff = WSASendMsg; + TRACE("-> got %s\n", guid_funcs[i].name); + *(void **)out_buff = guid_funcs[i].func_ptr; break; } - else - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(in_buff)); + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(in_buff)); status = WSAEOPNOTSUPP; break; - } - case WS_SIO_KEEPALIVE_VALS: - { + } + case WS_SIO_KEEPALIVE_VALS: + { struct tcp_keepalive *k; int keepalive, keepidle, keepintvl;

1 0

Hans Leidekker : riched20/tests: Add a test to show that empty paragraphs get a font size declaration.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 5ac4766476161a01524ea86b507c6c8646a3a160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac4766476161a01524ea86b5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 2 11:46:53 2017 +0100 riched20/tests: Add a test to show that empty paragraphs get a font size declaration. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index bfc61ea..5e71e51 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3936,6 +3936,25 @@ static void test_EM_STREAMOUT_FONTTBL(void) DestroyWindow(hwndRichEdit); } +static void test_EM_STREAMOUT_empty_para(void) +{ + HWND hwnd = new_richedit(NULL); + char buf[1024], *p = buf; + EDITSTREAM es; + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)""); + + memset(buf, 0, sizeof(buf)); + es.dwCookie = (DWORD_PTR)&p; + es.dwError = 0; + es.pfnCallback = test_WM_SETTEXT_esCallback; + + SendMessageA(hwnd, EM_STREAMOUT, SF_RTF, (LPARAM)&es); + ok((p = strstr(buf, "\\pard")) != NULL, "missing \\pard\n"); + todo_wine ok(((p = strstr(p, "\\fs")) && isdigit(p[3])), "missing \\fs\n"); + + DestroyWindow(hwnd); +} static void test_EM_SETTEXTEX(void) { @@ -8720,6 +8739,7 @@ START_TEST( editor ) test_EM_STREAMIN(); test_EM_STREAMOUT(); test_EM_STREAMOUT_FONTTBL(); + test_EM_STREAMOUT_empty_para(); test_EM_StreamIn_Undo(); test_EM_FORMATRANGE(); test_unicode_conversions();

1 0