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

Jacek Caban : taskmgr: Removed no longer needed psapi import.
by Alexandre Julliard March 3, 2017

March 3, 2017

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

Józef Kucia : wined3d: Implement SM5 imm_atomic_consume instruction.
by Alexandre Julliard March 3, 2017

March 3, 2017

Module: wine Branch: master Commit: 35de12fcd56a1b4d58508bd9dd79d0af140e7c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35de12fcd56a1b4d58508bd9d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:31 2017 +0100 wined3d: Implement SM5 imm_atomic_consume instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 11 ++++++++--- dlls/wined3d/shader.c | 6 ++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8948e67..8e54a68 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5152,10 +5152,15 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) static void shader_glsl_uav_counter(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); + const char *op; + + if (ins->handler_idx == WINED3DSIH_IMM_ATOMIC_ALLOC) + op = "atomicCounterIncrement"; + else + op = "atomicCounterDecrement"; shader_glsl_append_dst(ins->ctx->buffer, ins); - shader_addline(ins->ctx->buffer, "atomicCounterIncrement(%s_counter%u));\n", - prefix, ins->src[0].reg.idx[0].offset); + shader_addline(ins->ctx->buffer, "%s(%s_counter%u));\n", op, prefix, ins->src[0].reg.idx[0].offset); } static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) @@ -9653,7 +9658,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_ALLOC */ shader_glsl_uav_counter, /* WINED3DSIH_IMM_ATOMIC_AND */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_CMP_EXCH */ shader_glsl_atomic, - /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, + /* WINED3DSIH_IMM_ATOMIC_CONSUME */ shader_glsl_uav_counter, /* WINED3DSIH_IMM_ATOMIC_EXCH */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_IMAX */ shader_glsl_atomic, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 10018ed..b07131d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1370,7 +1370,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } } - if (ins.handler_idx == WINED3DSIH_IMM_ATOMIC_ALLOC) + if (ins.handler_idx == WINED3DSIH_IMM_ATOMIC_ALLOC || ins.handler_idx == WINED3DSIH_IMM_ATOMIC_CONSUME) { unsigned int reg_idx = ins.src[0].reg.idx[0].offset; if (reg_idx >= MAX_UNORDERED_ACCESS_VIEWS) @@ -1381,9 +1381,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st reg_maps->uav_counter_mask |= (1u << reg_idx); } else if ((WINED3DSIH_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_ATOMIC_XOR) - || (WINED3DSIH_IMM_ATOMIC_AND <= ins.handler_idx - && ins.handler_idx <= WINED3DSIH_IMM_ATOMIC_XOR - && ins.handler_idx != WINED3DSIH_IMM_ATOMIC_CONSUME) + || (WINED3DSIH_IMM_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_IMM_ATOMIC_XOR) || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED || (ins.handler_idx == WINED3DSIH_LD_RAW && ins.src[1].reg.type == WINED3DSPR_UAV) || (ins.handler_idx == WINED3DSIH_LD_STRUCTURED && ins.src[2].reg.type == WINED3DSPR_UAV))

1 0

Józef Kucia : wined3d: Add FIXME() for unhandled UAV flags.
by Alexandre Julliard March 3, 2017

March 3, 2017

Module: wine Branch: master Commit: 7da88d00664d24f3eb13d595229898736f7f27cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da88d00664d24f3eb13d5952… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:28 2017 +0100 wined3d: Add FIXME() for unhandled UAV flags. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a8e69fc..d0d90b2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -784,6 +784,9 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces return E_INVALIDARG; view->desc = *desc; + if (desc->flags & (WINED3D_VIEW_BUFFER_APPEND | WINED3D_VIEW_BUFFER_COUNTER)) + FIXME("Unhandled view flags %#x.\n", desc->flags); + wined3d_resource_incref(view->resource = resource); wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_cs_init, view);

1 0

Guillaume Charifi : wined3d: Recognize SM5 vJoinInstanceId register.
by Alexandre Julliard March 3, 2017

March 3, 2017

Module: wine Branch: master Commit: 00460565271b2a56e8f08cdaa77008f94e2248c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00460565271b2a56e8f08cdaa… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Thu Mar 2 15:11:48 2017 +0100 wined3d: Recognize SM5 vJoinInstanceId register. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e337f0b..0e88486 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2021,6 +2021,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vForkInstanceId"); break; + case WINED3DSPR_JOININSTID: + shader_addline(buffer, "vJoinInstanceId"); + break; + case WINED3DSPR_INCONTROLPOINT: shader_addline(buffer, "vicp"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f305665..050f656 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -311,6 +311,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_FUNCTION_POINTER = 0x13, WINED3D_SM5_RT_OUTPUT_CONTROL_POINT_ID = 0x16, WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17, + WINED3D_SM5_RT_JOIN_INSTANCE_ID = 0x18, WINED3D_SM5_RT_INPUT_CONTROL_POINT = 0x19, WINED3D_SM5_RT_OUTPUT_CONTROL_POINT = 0x1a, WINED3D_SM5_RT_PATCH_CONSTANT_DATA = 0x1b, @@ -1056,7 +1057,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_OUTPUT_CONTROL_POINT_ID */ WINED3DSPR_OUTPOINTID, /* WINED3D_SM5_RT_FORK_INSTANCE_ID */ WINED3DSPR_FORKINSTID, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_JOIN_INSTANCE_ID */ WINED3DSPR_JOININSTID, /* WINED3D_SM5_RT_INPUT_CONTROL_POINT */ WINED3DSPR_INCONTROLPOINT, /* WINED3D_SM5_RT_OUTPUT_CONTROL_POINT */ WINED3DSPR_OUTCONTROLPOINT, /* WINED3D_SM5_RT_PATCH_CONSTANT_DATA */ WINED3DSPR_PATCHCONST, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5d106df..a6e6f3e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -382,6 +382,7 @@ enum wined3d_shader_register_type WINED3DSPR_UAV, WINED3DSPR_OUTPOINTID, WINED3DSPR_FORKINSTID, + WINED3DSPR_JOININSTID, WINED3DSPR_INCONTROLPOINT, WINED3DSPR_OUTCONTROLPOINT, WINED3DSPR_PATCHCONST,

1 0

Nikolay Sivov : xmllite/reader: Fix writing back resolved character reference value.
by Alexandre Julliard March 3, 2017

March 3, 2017

Module: wine Branch: master Commit: 107615da7f07cfbc69c8f23c3c416c60fc27a9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=107615da7f07cfbc69c8f23c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 3 00:11:28 2017 +0300 xmllite/reader: Fix writing back resolved character reference value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9bb0d56..a880bee 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2054,8 +2054,12 @@ static HRESULT reader_parse_reference(xmlreader *reader) /* normalize */ if (is_wchar_space(ch)) ch = ' '; - len = buffer->written - ((char*)ptr - buffer->data) - sizeof(WCHAR); - memmove(start+1, ptr+1, len); + ptr = reader_get_ptr(reader); + start = reader_get_ptr2(reader, cur); + len = buffer->written - ((char *)ptr - buffer->data); + memmove(start + 1, ptr + 1, len); + + buffer->written -= (reader_get_cur(reader) - cur) * sizeof(WCHAR); buffer->cur = cur + 1; *start = ch;

1 0

Huw Davies : riched20: Add linefeeds after the colortbl and generator groups.
by Alexandre Julliard March 3, 2017

March 3, 2017

Module: wine Branch: master Commit: 6bcf4d60371fba3fa357943a985236047e18f1d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bcf4d60371fba3fa357943a9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 3 10:10:43 2017 +0000 riched20: Add linefeeds after the colortbl and generator groups. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index fe768fa..d579084 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -390,7 +390,7 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, (pStream->colortbl[i] >> 8) & 0xFF, (pStream->colortbl[i] >> 16) & 0xFF)) return FALSE; } - if (!ME_StreamOutPrint(pStream, "}")) return FALSE; + if (!ME_StreamOutPrint(pStream, "}\r\n")) return FALSE; return TRUE; } @@ -1017,7 +1017,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, /* TODO: stylesheet table */ - if (!ME_StreamOutPrint(pStream, "{\\*\\generator Wine Riched20 2.0;}")) + if (!ME_StreamOutPrint(pStream, "{\\*\\generator Wine Riched20 2.0;}\r\n")) return FALSE; /* TODO: information group */

1 0

Bruno Jesus : ws2_32: Turn SIO_GET_EXTENSION_FUNCTION_POINTER into a table.
by Alexandre Julliard March 2, 2017

March 2, 2017

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

Paul Gofman : ntdll: NtFlushBuffersFile should fail if the file handle has no write access.
by Alexandre Julliard March 2, 2017

March 2, 2017

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

Paul Gofman : ntdll/tests: Add test for NtFlushBuffersFile error conditions.
by Alexandre Julliard March 2, 2017

March 2, 2017

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

Marcin Mikołajczak : po: Updated Polish translation.
by Alexandre Julliard March 2, 2017

March 2, 2017

Module: wine Branch: master Commit: e918c6fd8b426e8298eca5951d917960e4236d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e918c6fd8b426e8298eca5951… Author: Marcin Mikołajczak <marcin123407(a)vivaldi.net> Date: Sun Feb 26 14:20:18 2017 +0100 po: Updated Polish translation. Signed-off-by: Marcin Mikołajczak <marcin123407(a)vivaldi.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 360 ++++++++++++++++++++++++--------------------------------------- 1 file changed, 135 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e918c6fd8b426e8298eca…

1 0