wine-commits September 2018

2 participants
670 discussions

by Alexandre Julliard

Module: website Branch: master Commit: ccf2510a6fa12c15554d439fedd9126b21306c5e URL: https://source.winehq.org/git/website.git/?a=commit;h=ccf2510a6fa12c15554d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 28 21:18:19 2018 +0200 Wine release 3.17 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018092801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2018092801.xml b/news/en/2018092801.xml new file mode 100644 index 0000000..9339b4f --- /dev/null +++ b/news/en/2018092801.xml @@ -0,0 +1,15 @@ +<news> +<date>September 28, 2018</date> +<title>Wine 3.17 Released</title> +<body> + The Wine development release 3.17 is now available. + <a href="{$root}/announce/3.17">What's new</a> in this release: +<ul> + <li>Improved Shell Autocomplete support.</li> + <li>More implementation of OPC Services.</li> + <li>Improvements to the Pager common control.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.17.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

5 years, 6 months

Tag wine-3.17 : Alexandre Julliard : Release 3.17

by Alexandre Julliard

Module: wine Branch: refs/tags/wine-3.17 Tag: 2ba0cf72dc4f0dfa343465429e535ea4cca0f06a URL: https://source.winehq.org/git/wine.git/?a=tag;h=2ba0cf72dc4f0dfa343465429e5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 28 21:16:16 2018 +0200 Release 3.17

5 years, 6 months

Alexandre Julliard : Release 3.17.

by Alexandre Julliard

Module: wine Branch: master Commit: f11563c65fa50e2f8b7e39cade34bb7a998b26f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f11563c65fa50e2f8b7e39ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 28 21:16:16 2018 +0200 Release 3.17. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 708 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 401 insertions(+), 329 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f11563c65fa50e2f8b7e…

5 years, 6 months

Andrew Wesie : wined3d: Use query buffer objects for occlusion queries.

by Alexandre Julliard

Module: wine Branch: master Commit: 580ea44bc65472c0304d74b7e873acfb7f680b85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=580ea44bc65472c0304d74b7… Author: Andrew Wesie <awesie(a)gmail.com> Date: Fri Sep 28 22:06:29 2018 +0330 wined3d: Use query buffer objects for occlusion queries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45723 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 6 +++ dlls/wined3d/cs.c | 5 +- dlls/wined3d/query.c | 106 +++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_gl.h | 2 + dlls/wined3d/wined3d_private.h | 3 ++ 5 files changed, 116 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 80ba614..b794415 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -58,6 +58,7 @@ static const struct wined3d_extension_map gl_extension_map[] = /* ARB */ {"GL_ARB_base_instance", ARB_BASE_INSTANCE }, {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, + {"GL_ARB_buffer_storage", ARB_BUFFER_STORAGE }, {"GL_ARB_clear_buffer_object", ARB_CLEAR_BUFFER_OBJECT }, {"GL_ARB_clear_texture", ARB_CLEAR_TEXTURE }, {"GL_ARB_clip_control", ARB_CLIP_CONTROL }, @@ -103,6 +104,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_point_parameters", ARB_POINT_PARAMETERS }, {"GL_ARB_point_sprite", ARB_POINT_SPRITE }, {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX }, + {"GL_ARB_query_buffer_object", ARB_QUERY_BUFFER_OBJECT }, {"GL_ARB_sample_shading", ARB_SAMPLE_SHADING }, {"GL_ARB_sampler_objects", ARB_SAMPLER_OBJECTS }, {"GL_ARB_seamless_cube_map", ARB_SEAMLESS_CUBE_MAP }, @@ -2061,6 +2063,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_ARB_blend_func_extended */ USE_GL_FUNC(glBindFragDataLocationIndexed) USE_GL_FUNC(glGetFragDataIndex) + /* GL_ARB_buffer_storage */ + USE_GL_FUNC(glBufferStorage) /* GL_ARB_clear_buffer_object */ USE_GL_FUNC(glClearBufferData) USE_GL_FUNC(glClearBufferSubData) @@ -3301,7 +3305,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_TEXTURE_STORAGE_MULTISAMPLE, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, + {ARB_BUFFER_STORAGE, MAKEDWORD_VERSION(4, 4)}, {ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)}, + {ARB_QUERY_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 4)}, {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)}, diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ff4d562..2aae559 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1986,7 +1986,10 @@ static void wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) if (poll && list_empty(&query->poll_list_entry)) { - list_add_tail(&cs->query_poll_list, &query->poll_list_entry); + if (query->buffer_object) + InterlockedIncrement(&query->counter_retrieved); + else + list_add_tail(&cs->query_poll_list, &query->poll_list_entry); return; } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 01e6bcb..26c32b1 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -25,6 +25,88 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +static void wined3d_query_buffer_invalidate(struct wined3d_query *query) +{ + /* map[0] != map[1]: exact values do not have any significance. */ + query->map_ptr[0] = 0; + query->map_ptr[1] = ~(UINT64)0; +} + +static BOOL wined3d_query_buffer_is_valid(struct wined3d_query *query) +{ + return query->map_ptr[0] == query->map_ptr[1]; +} + +static void wined3d_query_create_buffer_object(struct wined3d_context *context, struct wined3d_query *query) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + const GLuint map_flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + GLuint buffer_object; + + GL_EXTCALL(glGenBuffers(1, &buffer_object)); + GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, buffer_object)); + GL_EXTCALL(glBufferStorage(GL_QUERY_BUFFER, sizeof(query->map_ptr[0]) * 2, NULL, map_flags)); + query->map_ptr = GL_EXTCALL(glMapBufferRange(GL_QUERY_BUFFER, 0, sizeof(query->map_ptr[0]) * 2, map_flags)); + GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, 0)); + checkGLcall("query buffer object creation"); + + wined3d_query_buffer_invalidate(query); + query->buffer_object = buffer_object; +} + +static void wined3d_query_destroy_buffer_object(struct wined3d_context *context, struct wined3d_query *query) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + GL_EXTCALL(glDeleteBuffers(1, &query->buffer_object)); + checkGLcall("query buffer object destruction"); + + query->buffer_object = 0; + query->map_ptr = NULL; +} + +/* From ARB_occlusion_query: "Querying the state for a given occlusion query + * forces that occlusion query to complete within a finite amount of time." + * In practice, that means drivers flush when retrieving + * GL_QUERY_RESULT_AVAILABLE, which can be undesirable when applications use a + * significant number of queries. Using a persistently mapped query buffer + * object allows us to avoid these implicit flushes. An additional benefit is + * that it allows us to poll the query status from the application-thread + * instead of from the csmt-thread. */ +static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, struct wined3d_query *query, GLuint id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (!gl_info->supported[ARB_QUERY_BUFFER_OBJECT] || !gl_info->supported[ARB_BUFFER_STORAGE]) + return FALSE; + /* Don't use query buffers without CSMT, mainly for simplicity. */ + if (!context->device->cs->thread) + return FALSE; + + if (query->buffer_object) + { + /* If there's still a query result in-flight for the existing buffer + * object (i.e., the query was restarted before we received its + * result), we can't reuse the existing buffer object. */ + if (wined3d_query_buffer_is_valid(query)) + wined3d_query_buffer_invalidate(query); + else + wined3d_query_destroy_buffer_object(context, query); + } + + if (!query->buffer_object) + wined3d_query_create_buffer_object(context, query); + + GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, query->buffer_object)); + /* Read the same value twice. We know we have the result if map_ptr[0] == map_ptr[1]. */ + GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, (void *)0)); + GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, (void *)sizeof(query->map_ptr[0]))); + GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, 0)); + checkGLcall("queue query result"); + + return TRUE; +} + static UINT64 get_query_result64(GLuint id, const struct wined3d_gl_info *gl_info) { if (gl_info->supported[ARB_TIMER_QUERY]) @@ -339,6 +421,14 @@ static void wined3d_query_destroy_object(void *object) if (!list_empty(&query->poll_list_entry)) list_remove(&query->poll_list_entry); + if (query->buffer_object) + { + struct wined3d_context *context; + context = context_acquire(query->device, NULL, 0); + wined3d_query_destroy_buffer_object(context, query); + context_release(context); + } + /* Queries are specific to the GL context that created them. Not * deleting the query will obviously leak it, but that's still better * than potentially deleting a different query with the same id in this @@ -382,15 +472,20 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, return WINED3DERR_INVALIDCALL; } - if (!query->device->cs->thread) + if (query->device->cs->thread) { - if (!query->query_ops->query_poll(query, flags)) + if (query->counter_main != query->counter_retrieved + || (query->buffer_object && !wined3d_query_buffer_is_valid(query))) + { + if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) + wined3d_cs_emit_flush(query->device->cs); return S_FALSE; + } + if (query->buffer_object) + query->data = query->map_ptr; } - else if (query->counter_main != query->counter_retrieved) + else if (!query->query_ops->query_poll(query, flags)) { - if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) - wined3d_cs_emit_flush(query->device->cs); return S_FALSE; } @@ -579,6 +674,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD gl_info = context->gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); + wined3d_query_buffer_queue_result(context, query, oq->id); context_release(context); poll = TRUE; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 06aa21c..2a985da 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -44,6 +44,7 @@ enum wined3d_gl_extension /* ARB */ ARB_BASE_INSTANCE, ARB_BLEND_FUNC_EXTENDED, + ARB_BUFFER_STORAGE, ARB_CLEAR_BUFFER_OBJECT, ARB_CLEAR_TEXTURE, ARB_CLIP_CONTROL, @@ -89,6 +90,7 @@ enum wined3d_gl_extension ARB_POINT_PARAMETERS, ARB_POINT_SPRITE, ARB_PROVOKING_VERTEX, + ARB_QUERY_BUFFER_OBJECT, ARB_SAMPLE_SHADING, ARB_SAMPLER_OBJECTS, ARB_SEAMLESS_CUBE_MAP, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 941bfa6..8cfa4c3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1730,6 +1730,9 @@ struct wined3d_query LONG counter_main, counter_retrieved; struct list poll_list_entry; + + GLuint buffer_object; + UINT64 *map_ptr; }; struct wined3d_event_query

5 years, 6 months

Alexandre Julliard : kernel32: Create a fresh PE info structure when running winevdm.

by Alexandre Julliard

Module: wine Branch: master Commit: dc0ec5502d81446d7e1d70a79c062725772b295f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc0ec5502d81446d7e1d70a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 28 19:22:44 2018 +0200 kernel32: Create a fresh PE info structure when running winevdm. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 98ea09b..f7808af 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2425,14 +2425,14 @@ error: static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, LPCWSTR cur_dir, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa, BOOL inherit, DWORD flags, LPSTARTUPINFOW startup, - LPPROCESS_INFORMATION info, LPCSTR unixdir, - const pe_image_info_t *pe_info, int exec_only ) + LPPROCESS_INFORMATION info, LPCSTR unixdir, int exec_only ) { static const WCHAR argsW[] = {'%','s',' ','-','-','a','p','p','-','n','a','m','e',' ','"','%','s','"',' ','%','s',0}; BOOL ret; WCHAR buffer[MAX_PATH]; LPWSTR new_cmd_line; + pe_image_info_t pe_info; if (!(ret = GetFullPathNameW(filename, MAX_PATH, buffer, NULL))) return FALSE; @@ -2446,8 +2446,10 @@ static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, L return FALSE; } sprintfW(new_cmd_line, argsW, winevdmW, buffer, cmd_line); + memset( &pe_info, 0, sizeof(pe_info) ); + pe_info.machine = IMAGE_FILE_MACHINE_I386; ret = create_process( 0, winevdmW, new_cmd_line, env, cur_dir, psa, tsa, inherit, - flags, startup, info, unixdir, pe_info, exec_only ); + flags, startup, info, unixdir, &pe_info, exec_only ); HeapFree( GetProcessHeap(), 0, new_cmd_line ); return ret; } @@ -2678,7 +2680,7 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A case BINARY_WIN16: TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) ); retv = create_vdm_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, - inherit, flags, startup_info, info, unixdir, &pe_info, FALSE ); + inherit, flags, startup_info, info, unixdir, FALSE ); break; case BINARY_UNIX_LIB: TRACE( "starting %s as %d-bit Winelib app\n", @@ -2693,9 +2695,8 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A if (!strcmpiW( p, comW ) || !strcmpiW( p, pifW )) { TRACE( "starting %s as DOS binary\n", debugstr_w(name) ); - pe_info.machine = IMAGE_FILE_MACHINE_I386; retv = create_vdm_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, - inherit, flags, startup_info, info, unixdir, &pe_info, FALSE ); + inherit, flags, startup_info, info, unixdir, FALSE ); break; } if (!strcmpiW( p, batW ) || !strcmpiW( p, cmdW ) ) @@ -2829,12 +2830,11 @@ static void exec_process( LPCWSTR name ) /* check for .com or .pif extension */ if (!(p = strrchrW( name, '.' ))) break; if (strcmpiW( p, comW ) && strcmpiW( p, pifW )) break; - pe_info.machine = IMAGE_FILE_MACHINE_I386; /* fall through */ case BINARY_WIN16: TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) ); create_vdm_process( name, GetCommandLineW(), NULL, NULL, NULL, NULL, - FALSE, 0, &startup_info, &info, NULL, &pe_info, TRUE ); + FALSE, 0, &startup_info, &info, NULL, TRUE ); break; default: break;

5 years, 6 months

Francois Gouget : wined3d: Modernize the macOS spelling.

by Alexandre Julliard

Module: wine Branch: master Commit: a659194ebdca74fcae477cbbb96259fd127546b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a659194ebdca74fcae477cbb… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 27 09:25:04 2018 +0200 wined3d: Modernize the macOS spelling. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 87418e1..80ba614 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -433,11 +433,11 @@ static BOOL match_apple(const struct wined3d_gl_info *gl_info, struct wined3d_ca * * Detecting this isn't really easy. The vendor string doesn't mention * Apple. Compile-time checks aren't sufficient either because a Linux - * binary may display on a MacOS X server via remote X11. So try to detect + * binary may display on a macOS X server via remote X11. So try to detect * the OpenGL implementation by looking at certain Apple extensions. Some * extensions like client storage might be supported on other * implementations too, but GL_APPLE_flush_render is specific to the - * MacOS X window management, and GL_APPLE_ycbcr_422 is QuickTime + * macOS X window management, and GL_APPLE_ycbcr_422 is QuickTime * specific. So the chance that other implementations support them is * rather small since Win32 QuickTime uses DirectDraw, not OpenGL. * @@ -893,11 +893,11 @@ static void quirk_no_np2(struct wined3d_gl_info *gl_info) static void quirk_texcoord_w(struct wined3d_gl_info *gl_info) { - /* The Intel GPUs on MacOS set the .w register of texcoords to 0.0 by + /* The Intel GPUs on macOS set the .w register of texcoords to 0.0 by * default, which causes problems with fixed-function fragment processing. * Ideally this flag should be detected with a test shader and OpenGL - * feedback mode, but some OpenGL implementations (MacOS ATI at least, - * probably all MacOS ones) do not like vertex shaders in feedback mode + * feedback mode, but some OpenGL implementations (macOS ATI at least, + * probably all macOS ones) do not like vertex shaders in feedback mode * and return an error, even though it should be valid according to the * spec. * @@ -906,8 +906,8 @@ static void quirk_texcoord_w(struct wined3d_gl_info *gl_info) * instruction slots which should be available to the Direct3D * application. * - * ATI Radeon HD 2xxx cards on MacOS have the issue. Instead of checking - * for the buggy cards, blacklist all Radeon cards on MacOS and whitelist + * ATI Radeon HD 2xxx cards on macOS have the issue. Instead of checking + * for the buggy cards, blacklist all Radeon cards on macOS and whitelist * the good ones. That way we're prepared for the future. If this * workaround is activated on cards that do not need it, it won't break * things, just affect performance negatively. */

5 years, 6 months

Dmitry Timoshkov : ntdll/tests: Add more file disposition tests.

by Alexandre Julliard

Module: wine Branch: master Commit: a4d5a919de30db1252735f2ec0dbad0fd1af6ff9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4d5a919de30db1252735f2e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 27 16:30:52 2018 +0800 ntdll/tests: Add more file disposition tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 198 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 195 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4d5a919de30db125273…

5 years, 6 months

Dmitry Timoshkov : ntdll/tests: Clarify some file disposition test results , remove useless tests.

by Alexandre Julliard

Module: wine Branch: master Commit: feb73b2af9d959a87794b6d8194efbff549b4da8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=feb73b2af9d959a87794b6d8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 27 16:30:49 2018 +0800 ntdll/tests: Clarify some file disposition test results, remove useless tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 87c3339..b9b6591 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2679,7 +2679,7 @@ static void test_file_disposition_information(void) ok( !fileDeleted, "File shouldn't have been deleted\n" ); DeleteFileA( buffer ); - /* Delete-on-close flag doesn't change file disposition until a handle is closed */ + /* can't reset disposition if delete-on-close flag is specified */ GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); @@ -2689,14 +2689,15 @@ static void test_file_disposition_information(void) CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "File should have been deleted\n" ); - DeleteFileA( buffer ); - /* Delete-on-close flag sets disposition when a handle is closed and then it could be changed back */ + /* can't reset disposition on duplicated handle if delete-on-close flag is specified */ GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); ok( DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle2, 0, FALSE, DUPLICATE_SAME_ACCESS ), "DuplicateHandle failed\n" ); CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); fdi.DoDeleteFile = FALSE; res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation ); ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); @@ -2719,16 +2720,15 @@ static void test_file_disposition_information(void) ok( fileDeleted, "Directory should have been deleted\n" ); RemoveDirectoryA( buffer ); - /* RemoveDirectory sets directory disposition and it can be undone */ + /* RemoveDirectory fails for wrong sharing mode */ GetTempFileNameA( tmp_path, "dis", 0, buffer ); DeleteFileA( buffer ); ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" ); handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); - RemoveDirectoryA( buffer ); - fdi.DoDeleteFile = FALSE; - res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + fileDeleted = RemoveDirectoryA( buffer ); + ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); + ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %u\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "Directory shouldn't have been deleted\n" );

5 years, 6 months

Dmitry Timoshkov : ntdll/tests: Fix compilation with PSDK.

by Alexandre Julliard

Module: wine Branch: master Commit: 4fd82271eb2dbf9acc34e923fdfd134b9d51e0e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fd82271eb2dbf9acc34e923… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 27 16:30:46 2018 +0800 ntdll/tests: Fix compilation with PSDK. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d9d029b..87c3339 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1044,7 +1044,7 @@ static void test_iocp_fileio(HANDLE h) ok( !count, "Unexpected msg count: %ld\n", count ); /* using APCs on handle with associated completion port is not allowed */ - res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); + res = pNtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); } @@ -1070,7 +1070,7 @@ static void test_iocp_fileio(HANDLE h) count = get_pending_msgs(h); ok( !count, "Unexpected msg count: %ld\n", count ); - res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); + res = pNtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); ok(res == STATUS_PENDING, "NtReadFile returned %x\n", res); U(iosb).Status = 0xdeadbeef; @@ -1092,7 +1092,7 @@ static void test_iocp_fileio(HANDLE h) ok( !count, "Unexpected msg count: %ld\n", count ); /* using APCs on handle with associated completion port is not allowed */ - res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); + res = pNtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); } @@ -4197,7 +4197,7 @@ static void test_ioctl(void) ok(status == STATUS_INVALID_HANDLE, "NtFsControlFile returned %x\n", status); memset(&iosb, 0x55, sizeof(iosb)); - status = NtFsControlFile(file, NULL, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, + status = pNtFsControlFile(file, NULL, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, &peek_buf, sizeof(peek_buf)); todo_wine ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtFsControlFile failed: %x\n", status);

5 years, 6 months

Zhiyi Zhang : comctl32/pager: Support tree view notification conversion.

by Alexandre Julliard

Module: wine Branch: master Commit: daf3e907079880dba5689f6aadb5ea48ae840908 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daf3e907079880dba5689f6a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Sep 28 11:06:45 2018 +0800 comctl32/pager: Support tree view notification conversion. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 73 ++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/pager.c | 91 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 163 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=daf3e907079880dba568…

5 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2018