August 2018 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : user32/listbox: Fix scrolling for multi-column listboxes.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: f025570c801d72f8355a988d58a28bfe75390a8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f025570c801d72f8355a988d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 16 18:03:49 2018 +0300 user32/listbox: Fix scrolling for multi-column listboxes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38565 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 991ab87..3f1396d 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -300,28 +300,27 @@ static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, BOOL scroll ) if (descr->top_item == index) return LB_OKAY; if (scroll) { - INT diff; + INT dx = 0, dy = 0; if (descr->style & LBS_MULTICOLUMN) - diff = (descr->top_item - index) / descr->page_size * descr->column_width; + dx = (descr->top_item - index) / descr->page_size * descr->column_width; else if (descr->style & LBS_OWNERDRAWVARIABLE) { INT i; - diff = 0; if (index > descr->top_item) { for (i = index - 1; i >= descr->top_item; i--) - diff -= descr->items[i].height; + dy -= descr->items[i].height; } else { for (i = index; i < descr->top_item; i++) - diff += descr->items[i].height; + dy += descr->items[i].height; } } else - diff = (descr->top_item - index) * descr->item_height; + dy = (descr->top_item - index) * descr->item_height; - ScrollWindowEx( descr->self, 0, diff, NULL, NULL, 0, NULL, + ScrollWindowEx( descr->self, dx, dy, NULL, NULL, 0, NULL, SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); } else

1 0

Józef Kucia : wined3d: Simplify shader_arb_destroy().
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 2f917d79beb60e2fd97218b1a853e8162fa28bfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f917d79beb60e2fd97218b1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 21 10:24:26 2018 +0200 wined3d: Simplify shader_arb_destroy(). 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/arb_program_shader.c | 54 +++++++++++++++------------------------ 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 00b326f..7cd7d2d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4733,56 +4733,42 @@ static void shader_arb_disable(void *shader_priv, struct wined3d_context *contex static void shader_arb_destroy(struct wined3d_shader *shader) { struct wined3d_device *device = shader->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + unsigned int i; + + /* This can happen if a shader was never compiled */ + if (!shader->backend_data) + return; + + context = context_acquire(device, NULL, 0); + gl_info = context->gl_info; if (shader_is_pshader_version(shader->reg_maps.shader_version.type)) { struct arb_pshader_private *shader_data = shader->backend_data; - UINT i; - - if(!shader_data) return; /* This can happen if a shader was never compiled */ - - if (shader_data->num_gl_shaders) - { - struct wined3d_context *context = context_acquire(device, NULL, 0); - for (i = 0; i < shader_data->num_gl_shaders; ++i) - { - GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); - checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId))"); - } - - context_release(context); - } + for (i = 0; i < shader_data->num_gl_shaders; ++i) + GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); heap_free(shader_data->gl_shaders); - heap_free(shader_data); - shader->backend_data = NULL; } else { struct arb_vshader_private *shader_data = shader->backend_data; - UINT i; - if(!shader_data) return; /* This can happen if a shader was never compiled */ + for (i = 0; i < shader_data->num_gl_shaders; ++i) + GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); - if (shader_data->num_gl_shaders) - { - struct wined3d_context *context = context_acquire(device, NULL, 0); + heap_free(shader_data->gl_shaders); + } - for (i = 0; i < shader_data->num_gl_shaders; ++i) - { - GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); - checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId))"); - } + checkGLcall("delete programs"); - context_release(context); - } + context_release(context); - heap_free(shader_data->gl_shaders); - heap_free(shader_data); - shader->backend_data = NULL; - } + heap_free(shader->backend_data); + shader->backend_data = NULL; } static int sig_tree_compare(const void *key, const struct wine_rb_entry *entry)

1 0

Józef Kucia : wined3d: Pass context to find_arb_pshader().
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: aa955a80e6a1534d730c823cf6f93540db76d633 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa955a80e6a1534d730c823c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 21 10:24:27 2018 +0200 wined3d: Pass context to find_arb_pshader(). 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/arb_program_shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7cd7d2d..67fd193 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4230,12 +4230,12 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, } /* Context activation is done by the caller. */ -static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_shader *shader, - const struct arb_ps_compile_args *args) +static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_context *context, + struct wined3d_shader *shader, const struct arb_ps_compile_args *args) { + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_device *device = shader->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; UINT i; DWORD new_size; struct arb_ps_compiled_shader *new_array; @@ -4566,7 +4566,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context TRACE("Using pixel shader %p.\n", ps); find_arb_ps_compile_args(state, context, ps, &compile_args); - compiled = find_arb_pshader(ps, &compile_args); + compiled = find_arb_pshader(context, ps, &compile_args); priv->current_fprogram_id = compiled->prgId; priv->compiled_fprog = compiled;

1 0

Józef Kucia : wined3d: Get D3D and GL info from context in create_dummy_textures().
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 5546f2914a2ae4a65dc11cfb41f22d1408176176 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5546f2914a2ae4a65dc11cfb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 21 10:24:28 2018 +0200 wined3d: Get D3D and GL info from context in create_dummy_textures(). 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/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0f7ef67..e6e788b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -610,9 +610,9 @@ out: /* Context activation is done by the caller. */ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) { - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_dummy_textures *textures = &device->dummy_textures; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; DWORD color;

1 0

Alex Henrie : shell32: Add run icon.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: df48fd9a27d43eeb1ceb036fae042bcff1afd1df URL: https://source.winehq.org/git/wine.git/?a=commit;h=df48fd9a27d43eeb1ceb036f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:35 2018 -0600 shell32: Add run icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 47e1c17..c7e69d7 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -498,6 +498,9 @@ IDI_SHELL_SEARCH ICON resources/search.ico /* @makedep: resources/help.ico */ IDI_SHELL_HELP ICON resources/help.ico +/* @makedep: resources/window.ico */ +IDI_SHELL_RUN ICON resources/window.ico + /* @makedep: resources/shortcut.ico */ IDI_SHELL_SHORTCUT ICON resources/shortcut.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index d352d7c..0759551 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -193,6 +193,7 @@ #define IDI_SHELL_SETTINGS 22 #define IDI_SHELL_SEARCH 23 #define IDI_SHELL_HELP 24 +#define IDI_SHELL_RUN 25 #define IDI_SHELL_FOLDER_OPEN_LARGE 29 #define IDI_SHELL_SHORTCUT 30 #define IDI_SHELL_FOLDER_OPEN_SMALL 31

1 0

Alex Henrie : shell32: Add sleep icon.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 09cca8fed75fae2dc8dd30e8b1ee5fdd429296d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09cca8fed75fae2dc8dd30e8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:36 2018 -0600 shell32: Add sleep icon. Adapted from preferences-desktop-screensaver in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/sleep.ico | Bin 0 -> 65140 bytes dlls/shell32/resources/sleep.svg | 1594 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 1599 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09cca8fed75fae2dc8dd…

1 0

Jacek Caban : ntdll: Allow FileAccessInformation to be queried on files without fds.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 8db78eccab18c90474e9f625e5aecf6daa10be44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8db78eccab18c90474e9f625… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 20 19:29:16 2018 +0200 ntdll: Allow FileAccessInformation to be queried on files without fds. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/file.c | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 3c7fcd1..209a0c0 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -144,6 +144,20 @@ static void _test_pipe_info(unsigned line, HANDLE pipe, DWORD ex_flags, DWORD ex ok_(__FILE__,line)(max_instances == ex_max_instances, "max_instances = %x, expected %u\n", max_instances, ex_max_instances); } +#define test_file_access(a,b) _test_file_access(__LINE__,a,b) +static void _test_file_access(unsigned line, HANDLE handle, DWORD expected_access) +{ + FILE_ACCESS_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + memset(&info, 0x11, sizeof(info)); + status = NtQueryInformationFile(handle, &io, &info, sizeof(info), FileAccessInformation); + ok_(__FILE__,line)(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok_(__FILE__,line)(info.AccessFlags == expected_access, "got access %08x expected %08x\n", + info.AccessFlags, expected_access); +} + static void test_CreateNamedPipe(int pipemode) { HANDLE hnp; @@ -213,6 +227,10 @@ static void test_CreateNamedPipe(int pipemode) ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); test_signaled(hnp); + test_file_access(hnp, SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES + | FILE_READ_ATTRIBUTES | FILE_WRITE_PROPERTIES | FILE_READ_PROPERTIES + | FILE_APPEND_DATA | FILE_WRITE_DATA | FILE_READ_DATA); + ret = PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL); ok(!ret && GetLastError() == ERROR_BAD_PIPE, "PeekNamedPipe returned %x (%u)\n", ret, GetLastError()); @@ -630,6 +648,26 @@ static void test_CreateNamedPipe(int pipemode) ok(CloseHandle(hnp), "CloseHandle\n"); + hnp = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_INBOUND, pipemode | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + test_signaled(hnp); + + test_file_access(hnp, SYNCHRONIZE | READ_CONTROL | FILE_READ_ATTRIBUTES | FILE_READ_PROPERTIES + | FILE_READ_DATA); + + CloseHandle(hnp); + + hnp = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_OUTBOUND, pipemode | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + test_signaled(hnp); + + test_file_access(hnp, SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES + | FILE_WRITE_PROPERTIES | FILE_APPEND_DATA | FILE_WRITE_DATA); + + CloseHandle(hnp); + if (winetest_debug > 1) trace("test_CreateNamedPipe returning\n"); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 932dc7e..b2749a6 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2310,7 +2310,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (len < info_sizes[class]) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; - if (class != FilePipeInformation && class != FilePipeLocalInformation) + if (class != FilePipeInformation && class != FilePipeLocalInformation && class != FileAccessInformation) { if ((io->u.Status = server_get_unix_fd( hFile, 0, &fd, &needs_close, NULL, NULL ))) {

1 0

Jacek Caban : kernel32: Use proper access flags in CreatePipe.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 8712db6f554349728663bff0ff2b03334aa905b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8712db6f554349728663bff0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 20 19:29:30 2018 +0200 kernel32: Use proper access flags in CreatePipe. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 6 +++--- dlls/kernel32/tests/pipe.c | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 6c7249c..a855e95 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2085,8 +2085,8 @@ BOOL WINAPI CreatePipe( PHANDLE hReadPipe, PHANDLE hWritePipe, snprintfW(name, ARRAY_SIZE(name), nameFmt, GetCurrentProcessId(), ++index); RtlInitUnicodeString(&nt_name, name); - status = NtCreateNamedPipeFile(&hr, GENERIC_READ | SYNCHRONIZE, &attr, &iosb, - FILE_SHARE_WRITE, FILE_OVERWRITE_IF, + status = NtCreateNamedPipeFile(&hr, GENERIC_READ | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, + &attr, &iosb, FILE_SHARE_WRITE, FILE_OVERWRITE_IF, FILE_SYNCHRONOUS_IO_NONALERT, FALSE, FALSE, FALSE, 1, size, size, &timeout); @@ -2099,7 +2099,7 @@ BOOL WINAPI CreatePipe( PHANDLE hReadPipe, PHANDLE hWritePipe, /* from completion sakeness, I think system resources might be exhausted before this happens !! */ if (hr == INVALID_HANDLE_VALUE) return FALSE; - status = NtOpenFile(&hw, GENERIC_WRITE | SYNCHRONIZE, &attr, &iosb, 0, + status = NtOpenFile(&hw, GENERIC_WRITE | FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, 0, FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); if (status) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 209a0c0..1e67f70 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1534,6 +1534,11 @@ static void test_CreatePipe(void) ok(CreatePipe(&piperead, &pipewrite, &pipe_attr, 0) != 0, "CreatePipe failed\n"); test_pipe_info(piperead, FILE_PIPE_SERVER_END, 4096, 4096, 1); test_pipe_info(pipewrite, 0, 4096, 4096, 1); + test_file_access(piperead, SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES + | FILE_READ_ATTRIBUTES | FILE_READ_PROPERTIES | FILE_READ_DATA); + test_file_access(pipewrite, SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES + | FILE_READ_ATTRIBUTES | FILE_WRITE_PROPERTIES | FILE_APPEND_DATA + | FILE_WRITE_DATA); ok(WriteFile(pipewrite,PIPENAME,sizeof(PIPENAME), &written, NULL), "Write to anonymous pipe failed\n"); ok(written == sizeof(PIPENAME), "Write to anonymous pipe wrote %d bytes\n", written);

1 0

Jacek Caban : kernel32: Always create file with FILE_READ_ATTRIBUTES access in CreateFile.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 58233b47e0117db1f4767ee5d54ba169976905b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58233b47e0117db1f4767ee5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 20 19:29:46 2018 +0200 kernel32: Always create file with FILE_READ_ATTRIBUTES access in CreateFile. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ---- dlls/kernel32/file.c | 4 ++-- dlls/kernel32/tests/pipe.c | 5 +++++ dlls/ntdll/tests/pipe.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 925e6fa..aebf3b8 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5620,7 +5620,6 @@ static void test_file_security(HANDLE token) ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); access = get_obj_access(file); -todo_wine ok(access == (FILE_READ_ATTRIBUTES | SYNCHRONIZE), "expected FILE_READ_ATTRIBUTES | SYNCHRONIZE, got %#x\n", access); bytes = 0xdeadbeef; @@ -5637,7 +5636,6 @@ todo_wine ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); access = get_obj_access(file); -todo_wine ok(access == (FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES), "expected FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES, got %#x\n", access); bytes = 0xdeadbeef; @@ -5678,7 +5676,6 @@ todo_wine ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); access = get_obj_access(file); -todo_wine ok(access == (FILE_READ_ATTRIBUTES | SYNCHRONIZE), "expected FILE_READ_ATTRIBUTES | SYNCHRONIZE, got %#x\n", access); CloseHandle(file); @@ -5688,7 +5685,6 @@ todo_wine ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); access = get_obj_access(file); -todo_wine ok(access == (FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES), "expected FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES, got %#x\n", access); CloseHandle(file); diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index b558f8e..081f076 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1582,8 +1582,8 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT; - status = NtCreateFile( &ret, access | SYNCHRONIZE, &attr, &io, NULL, attributes, - sharing, nt_disposition[creation - CREATE_NEW], + status = NtCreateFile( &ret, access | SYNCHRONIZE | FILE_READ_ATTRIBUTES, &attr, &io, + NULL, attributes, sharing, nt_disposition[creation - CREATE_NEW], options, NULL, 0 ); if (status) { diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 1e67f70..10c971b 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -666,6 +666,11 @@ static void test_CreateNamedPipe(int pipemode) test_file_access(hnp, SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES | FILE_WRITE_PROPERTIES | FILE_APPEND_DATA | FILE_WRITE_DATA); + hFile = CreateFileA(PIPENAME, 0, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + test_file_access(hFile, SYNCHRONIZE | FILE_READ_ATTRIBUTES); + CloseHandle(hFile); + CloseHandle(hnp); if (winetest_debug > 1) trace("test_CreateNamedPipe returning\n"); diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index d6a0d41..1d77d88 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -113,6 +113,20 @@ static inline BOOL is_signaled( HANDLE obj ) return WaitForSingleObject( obj, 0 ) == WAIT_OBJECT_0; } +#define test_file_access(a,b) _test_file_access(__LINE__,a,b) +static void _test_file_access(unsigned line, HANDLE handle, DWORD expected_access) +{ + FILE_ACCESS_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + memset(&info, 0x11, sizeof(info)); + status = NtQueryInformationFile(handle, &io, &info, sizeof(info), FileAccessInformation); + ok_(__FILE__,line)(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok_(__FILE__,line)(info.AccessFlags == expected_access, "got access %08x expected %08x\n", + info.AccessFlags, expected_access); +} + static const WCHAR testpipe[] = { '\\', '\\', '.', '\\', 'p', 'i', 'p', 'e', '\\', 't', 'e', 's', 't', 'p', 'i', 'p', 'e', 0 }; static const WCHAR testpipe_nt[] = { '\\', '?', '?', '\\', 'p', 'i', 'p', 'e', '\\', @@ -562,6 +576,7 @@ static void _check_pipe_handle_state(int line, HANDLE handle, ULONG read, ULONG static void test_filepipeinfo(void) { + FILE_PIPE_LOCAL_INFORMATION local_info; IO_STATUS_BLOCK iosb; OBJECT_ATTRIBUTES attr; UNICODE_STRING name; @@ -726,6 +741,33 @@ static void test_filepipeinfo(void) check_pipe_handle_state(hServer, 1, 0); CloseHandle(hServer); + + res = pNtCreateNamedPipeFile(&hServer, + FILE_READ_DATA | FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, + &attr, &iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, + 0, 1, 1, 0, 0xFFFFFFFF, 500, 500, &timeout); + ok(!res, "NtCreateNamedPipeFile returned %x\n", res); + + res = NtCreateFile(&hClient, SYNCHRONIZE, &attr, &iosb, NULL, 0, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); + ok(!res, "NtCreateFile returned %x\n", res); + + test_file_access(hClient, SYNCHRONIZE); + + res = pNtQueryInformationFile(hClient, &iosb, &local_info, sizeof(local_info), + FilePipeLocalInformation); + todo_wine + ok(res == STATUS_ACCESS_DENIED, + "NtQueryInformationFile(FilePipeLocalInformation) returned: %x\n", res); + + res = pNtQueryInformationFile(hClient, &iosb, &local_info, sizeof(local_info), + FilePipeInformation); + todo_wine + ok(res == STATUS_ACCESS_DENIED, + "NtQueryInformationFile(FilePipeInformation) returned: %x\n", res); + + CloseHandle(hClient); + CloseHandle(hServer); } static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved )

1 0

Jacek Caban : server: Require FILE_READ_ATTRIBUTES access in get_named_pipe_info.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: d4e0f0a12fdca62fea49a635418d19eb0c0d72af URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4e0f0a12fdca62fea49a635… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 20 19:29:56 2018 +0200 server: Require FILE_READ_ATTRIBUTES access in get_named_pipe_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 6 ++++-- server/named_pipe.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 1d77d88..ebf228d 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -756,16 +756,18 @@ static void test_filepipeinfo(void) res = pNtQueryInformationFile(hClient, &iosb, &local_info, sizeof(local_info), FilePipeLocalInformation); - todo_wine ok(res == STATUS_ACCESS_DENIED, "NtQueryInformationFile(FilePipeLocalInformation) returned: %x\n", res); res = pNtQueryInformationFile(hClient, &iosb, &local_info, sizeof(local_info), FilePipeInformation); - todo_wine ok(res == STATUS_ACCESS_DENIED, "NtQueryInformationFile(FilePipeInformation) returned: %x\n", res); + res = pNtQueryInformationFile(hClient, &iosb, &local_info, sizeof(local_info), + FileNameInformation); + ok(res == STATUS_SUCCESS, "NtQueryInformationFile(FileNameInformation) returned: %x\n", res); + CloseHandle(hClient); CloseHandle(hServer); } diff --git a/server/named_pipe.c b/server/named_pipe.c index ba6f507..c006acb 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1284,7 +1284,7 @@ DECL_HANDLER(get_named_pipe_info) clear_error(); pipe_end = (struct pipe_end *)get_handle_obj( current->process, req->handle, - 0, &pipe_client_ops ); + FILE_READ_ATTRIBUTES, &pipe_client_ops ); if (!pipe_end) return; }

1 0