January 2022 - Wine-Commits

Henri Verbeet : wined3d: Use wined3d_bit_scan() in shader_glsl_generate_fragment_shader().
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 4946471bec0e2ae93f2e552f33095a48ed3f11f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4946471bec0e2ae93f2e552f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 15:47:22 2022 +0100 wined3d: Use wined3d_bit_scan() in shader_glsl_generate_fragment_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5a2111e46a7..d10b84a9e05 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7643,7 +7643,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ unsigned int i, extra_constants_needed = 0; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; - DWORD map; + uint32_t map; memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.gl_info = gl_info; @@ -7762,11 +7762,10 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); } - for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) + map = reg_maps->bumpmat; + while (map) { - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); shader_addline(buffer, "uniform mat2 bumpenv_mat%u;\n", i); if (reg_maps->luminanceparams & (1u << i)) @@ -7903,7 +7902,6 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ if (reg_maps->shader_version.major < 3 || args->vp_mode != WINED3D_VP_MODE_SHADER) { unsigned int i; - WORD map = reg_maps->texcoord; if (legacy_syntax) { @@ -7913,19 +7911,18 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ shader_addline(buffer, "ffp_varying_specular = gl_SecondaryColor;\n"); } - for (i = 0; map; map >>= 1, ++i) + map = reg_maps->texcoord; + while (map) { - if (map & 1) - { - if (args->pointsprite) - shader_addline(buffer, "ffp_texcoord[%u] = vec4(gl_PointCoord.xy, 0.0, 0.0);\n", i); - else if (args->texcoords_initialized & (1u << i)) - shader_addline(buffer, "ffp_texcoord[%u] = %s[%u];\n", i, - legacy_syntax ? "gl_TexCoord" : "ffp_varying_texcoord", i); - else - shader_addline(buffer, "ffp_texcoord[%u] = vec4(0.0);\n", i); - shader_addline(buffer, "vec4 T%u = ffp_texcoord[%u];\n", i, i); - } + i = wined3d_bit_scan(&map); + if (args->pointsprite) + shader_addline(buffer, "ffp_texcoord[%u] = vec4(gl_PointCoord.xy, 0.0, 0.0);\n", i); + else if (args->texcoords_initialized & (1u << i)) + shader_addline(buffer, "ffp_texcoord[%u] = %s[%u];\n", i, + legacy_syntax ? "gl_TexCoord" : "ffp_varying_texcoord", i); + else + shader_addline(buffer, "ffp_texcoord[%u] = vec4(0.0);\n", i); + shader_addline(buffer, "vec4 T%u = ffp_texcoord[%u];\n", i, i); } if (legacy_syntax)

1 0

Daniel Lehman : msvcp140_atomic_wait: Implement __std_wait_for_threadpool_work_callbacks.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 61a5fe51addd146c34f0dd4e034b38312c28dad0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61a5fe51addd146c34f0dd4e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 28 16:19:03 2022 +0100 msvcp140_atomic_wait: Implement __std_wait_for_threadpool_work_callbacks. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index 1f5440b248a..28e86b93d7d 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -43,3 +43,9 @@ void __stdcall __std_submit_threadpool_work(PTP_WORK work) TRACE("(%p)\n", work); return SubmitThreadpoolWork(work); } + +void __stdcall __std_wait_for_threadpool_work_callbacks(PTP_WORK work, BOOL cancel) +{ + TRACE("(%p %d)\n", work, cancel); + return WaitForThreadpoolWorkCallbacks(work, cancel); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index d5c9b45a119..cc8bc0e404e 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -29,4 +29,4 @@ @ stub __std_tzdb_get_leap_seconds @ stub __std_tzdb_get_sys_info @ stub __std_tzdb_get_time_zones -@ stub __std_wait_for_threadpool_work_callbacks +@ stdcall __std_wait_for_threadpool_work_callbacks(ptr long) diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index 0e707e9be44..a7ba1dc76ea 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -26,6 +26,7 @@ static unsigned int (__stdcall *p___std_parallel_algorithms_hw_threads)(void); static PTP_WORK (__stdcall *p___std_create_threadpool_work)(PTP_WORK_CALLBACK, void*, PTP_CALLBACK_ENVIRON); static void (__stdcall *p___std_submit_threadpool_work)(PTP_WORK); +static void (__stdcall *p___std_wait_for_threadpool_work_callbacks)(PTP_WORK, BOOL); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -40,6 +41,7 @@ static HMODULE init(void) SET(p___std_create_threadpool_work, "__std_create_threadpool_work"); SET(p___std_submit_threadpool_work, "__std_submit_threadpool_work"); + SET(p___std_wait_for_threadpool_work_callbacks, "__std_wait_for_threadpool_work_callbacks"); return msvcp; } @@ -84,6 +86,7 @@ static void test_threadpool_work(void) { p___std_create_threadpool_work(NULL, NULL, NULL); p___std_submit_threadpool_work(NULL); + p___std_wait_for_threadpool_work_callbacks(NULL, FALSE); } /* simple test */ @@ -91,7 +94,7 @@ static void test_threadpool_work(void) work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, NULL); ok(!!work, "failed to create threadpool_work\n"); p___std_submit_threadpool_work(work); - WaitForThreadpoolWorkCallbacks(work, FALSE); + p___std_wait_for_threadpool_work_callbacks(work, FALSE); CloseThreadpoolWork(work); ok(workcalled == 1, "expected work to be called once, got %d\n", workcalled); ok(cb_work == work, "expected %p, got %p\n", work, cb_work); @@ -106,7 +109,7 @@ static void test_threadpool_work(void) work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, &environment); ok(!!work, "failed to create threadpool_work\n"); p___std_submit_threadpool_work(work); - WaitForThreadpoolWorkCallbacks(work, FALSE); + p___std_wait_for_threadpool_work_callbacks(work, FALSE); CloseThreadpoolWork(work); ret = WaitForSingleObject(cb_event, 1000); ok(ret == WAIT_OBJECT_0, "expected finalization callback to be called\n");

1 0

Zebediah Figura : wined3d: Use wined3d_buffer_load_location() in wined3d_buffer_get_memory().
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 287bfc775828762e4b8212157cabf05d38b3f237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=287bfc775828762e4b821215… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 28 15:47:24 2022 +0100 wined3d: Use wined3d_buffer_load_location() in wined3d_buffer_get_memory(). wined3d_buffer_load_location() can handle loading from WINED3D_LOCATION_DISCARDED just fine, so use it instead of duplicating the functionality here. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b42c7bd919a..3d66af3e5e6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -653,14 +653,12 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_co if (locations & WINED3D_LOCATION_DISCARDED) { locations = ((buffer->flags & WINED3D_BUFFER_USE_BO) ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM); - if (!wined3d_buffer_prepare_location(buffer, context, locations)) + if (!wined3d_buffer_load_location(buffer, context, locations)) { data->buffer_object = 0; data->addr = NULL; return 0; } - wined3d_buffer_validate_location(buffer, locations); - wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_DISCARDED); } if (locations & WINED3D_LOCATION_BUFFER) {

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in shader_glsl_load_constants_i().
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 6f150854e7b2fad37c9140be16d9952d493ac14e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f150854e7b2fad37c9140be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 15:47:19 2022 +0100 wined3d: Use wined3d_bit_scan() in shader_glsl_load_constants_i(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c812b2d8b08..1ebd067ae56 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1211,16 +1211,15 @@ static void shader_glsl_load_constants_f(const struct wined3d_shader *shader, co /* Context activation is done by the caller. */ static void shader_glsl_load_constants_i(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, - const struct wined3d_ivec4 *constants, const GLint locations[WINED3D_MAX_CONSTS_I], WORD constants_set) + const struct wined3d_ivec4 *constants, const GLint locations[WINED3D_MAX_CONSTS_I], uint32_t constants_set) { unsigned int i; struct list* ptr; - for (i = 0; constants_set; constants_set >>= 1, ++i) + while (constants_set) { - if (!(constants_set & 1)) continue; - /* We found this uniform name in the program - go ahead and send the data */ + i = wined3d_bit_scan(&constants_set); GL_EXTCALL(glUniform4iv(locations[i], 1, &constants[i].x)); }

1 0

Daniel Lehman : msvcp140_atomic_wait/tests: Add test for threadpool_work functions.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 2b6a1c003c08cc1ff58106c2acf777f5c2e17daf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b6a1c003c08cc1ff58106c2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 28 16:18:44 2022 +0100 msvcp140_atomic_wait/tests: Add test for threadpool_work functions. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../tests/msvcp140_atomic_wait.c | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index aee852afd98..e0dfef3222d 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -47,6 +47,83 @@ static void test___std_parallel_algorithms_hw_threads(void) ok(nthr == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, nthr); } +static PTP_WORK cb_work; +static void *cb_context; +static void WINAPI threadpool_workcallback(PTP_CALLBACK_INSTANCE instance, void *context, PTP_WORK work) { + LONG *workcalled = context; + cb_work = work; + cb_context = context; + + InterlockedIncrement(workcalled); +} + +static HANDLE cb_event; +static void CALLBACK threadpool_workfinalization(TP_CALLBACK_INSTANCE *instance, void *context) +{ + LONG *workcalled = context; + + InterlockedIncrement(workcalled); + SetEvent(cb_event); +} + +static void test_threadpool_work(void) +{ + PTP_WORK work; + DWORD gle, ret; + LONG workcalled; + TP_CALLBACK_ENVIRON environment; + TP_CALLBACK_ENVIRON_V3 environment3; + + /* simple test */ + workcalled = 0; + work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, NULL); + ok(!!work, "failed to create threadpool_work\n"); + SubmitThreadpoolWork(work); + WaitForThreadpoolWorkCallbacks(work, FALSE); + CloseThreadpoolWork(work); + ok(workcalled == 1, "expected work to be called once, got %d\n", workcalled); + ok(cb_work == work, "expected %p, got %p\n", work, cb_work); + ok(cb_context == &workcalled, "expected %p, got %p\n", &workcalled, cb_context); + + /* test with environment */ + cb_event = CreateEventW(NULL, TRUE, FALSE, NULL); + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.FinalizationCallback = threadpool_workfinalization; + workcalled = 0; + work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, &environment); + ok(!!work, "failed to create threadpool_work\n"); + SubmitThreadpoolWork(work); + WaitForThreadpoolWorkCallbacks(work, FALSE); + CloseThreadpoolWork(work); + ret = WaitForSingleObject(cb_event, 1000); + ok(ret == WAIT_OBJECT_0, "expected finalization callback to be called\n"); + ok(workcalled == 2, "expected work to be called twice, got %d\n", workcalled); + CloseHandle(cb_event); + + /* test with environment version 3 */ + memset(&environment3, 0, sizeof(environment3)); + environment3.Version = 3; + environment3.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; + SetLastError(0xdeadbeef); + work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, + (TP_CALLBACK_ENVIRON *)&environment3); + gle = GetLastError(); + ok(gle == 0xdeadbeef, "expected 0xdeadbeef, got %x\n", gle); + ok(!!work, "failed to create threadpool_work\n"); + CloseThreadpoolWork(work); + + memset(&environment3, 0, sizeof(environment3)); + environment3.Version = 3; + environment3.CallbackPriority = TP_CALLBACK_PRIORITY_INVALID; + SetLastError(0xdeadbeef); + work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, + (TP_CALLBACK_ENVIRON *)&environment3); + gle = GetLastError(); + ok(gle == ERROR_INVALID_PARAMETER, "expected %d, got %d\n", ERROR_INVALID_PARAMETER, gle); + ok(!work, "expected failure\n"); +} + START_TEST(msvcp140_atomic_wait) { HMODULE msvcp; @@ -56,5 +133,6 @@ START_TEST(msvcp140_atomic_wait) return; } test___std_parallel_algorithms_hw_threads(); + test_threadpool_work(); FreeLibrary(msvcp); }

1 0

Alex Henrie : user32: Send EVENT_OBJECT_FOCUS when the focus changes.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: ddfb6d518ee1e1bbd72e2effd10bc4850c225821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddfb6d518ee1e1bbd72e2eff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 27 22:56:24 2022 -0700 user32: Send EVENT_OBJECT_FOCUS when the focus changes. The NVDA screen reader needs this. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/focus.c | 3 ++ dlls/user32/tests/msg.c | 104 ++++++++++++++++++++++++------------------------ 2 files changed, 55 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddfb6d518ee1e1bbd72e…

1 0

Daniel Lehman : msvcp140_atomic_wait: Implement __std_create_threadpool_work.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: f1e995f020c3cee99fc11bebde8892637ca9b3a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1e995f020c3cee99fc11beb… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 28 16:18:51 2022 +0100 msvcp140_atomic_wait: Implement __std_create_threadpool_work. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_atomic_wait/main.c | 7 +++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 17 +++++++++++++---- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index 5c430ffd959..bdc46412771 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -30,3 +30,10 @@ unsigned int __stdcall __std_parallel_algorithms_hw_threads(void) TRACE("()\n"); return _Thrd_hardware_concurrency(); } + +PTP_WORK __stdcall __std_create_threadpool_work(PTP_WORK_CALLBACK callback, void *context, + PTP_CALLBACK_ENVIRON environ) +{ + TRACE("(%p %p %p)\n", callback, context, environ); + return CreateThreadpoolWork(callback, context, environ); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index 1e5d1a5128b..3b4fd48dc7f 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -14,7 +14,7 @@ @ stub __std_bulk_submit_threadpool_work @ stub __std_calloc_crt @ stub __std_close_threadpool_work -@ stub __std_create_threadpool_work +@ stdcall __std_create_threadpool_work(ptr ptr ptr) @ stub __std_execution_wait_on_uchar @ stub __std_execution_wake_by_address_all @ stub __std_free_crt diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index e0dfef3222d..097a81e5029 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -24,6 +24,8 @@ static unsigned int (__stdcall *p___std_parallel_algorithms_hw_threads)(void); +static PTP_WORK (__stdcall *p___std_create_threadpool_work)(PTP_WORK_CALLBACK, void*, PTP_CALLBACK_ENVIRON); + #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static HMODULE init(void) @@ -34,6 +36,8 @@ static HMODULE init(void) return NULL; SET(p___std_parallel_algorithms_hw_threads, "__std_parallel_algorithms_hw_threads"); + + SET(p___std_create_threadpool_work, "__std_create_threadpool_work"); return msvcp; } @@ -74,9 +78,14 @@ static void test_threadpool_work(void) TP_CALLBACK_ENVIRON environment; TP_CALLBACK_ENVIRON_V3 environment3; + if (0) /* crash on windows */ + { + p___std_create_threadpool_work(NULL, NULL, NULL); + } + /* simple test */ workcalled = 0; - work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, NULL); + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, NULL); ok(!!work, "failed to create threadpool_work\n"); SubmitThreadpoolWork(work); WaitForThreadpoolWorkCallbacks(work, FALSE); @@ -91,7 +100,7 @@ static void test_threadpool_work(void) environment.Version = 1; environment.FinalizationCallback = threadpool_workfinalization; workcalled = 0; - work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, &environment); + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, &environment); ok(!!work, "failed to create threadpool_work\n"); SubmitThreadpoolWork(work); WaitForThreadpoolWorkCallbacks(work, FALSE); @@ -106,7 +115,7 @@ static void test_threadpool_work(void) environment3.Version = 3; environment3.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; SetLastError(0xdeadbeef); - work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, (TP_CALLBACK_ENVIRON *)&environment3); gle = GetLastError(); ok(gle == 0xdeadbeef, "expected 0xdeadbeef, got %x\n", gle); @@ -117,7 +126,7 @@ static void test_threadpool_work(void) environment3.Version = 3; environment3.CallbackPriority = TP_CALLBACK_PRIORITY_INVALID; SetLastError(0xdeadbeef); - work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, (TP_CALLBACK_ENVIRON *)&environment3); gle = GetLastError(); ok(gle == ERROR_INVALID_PARAMETER, "expected %d, got %d\n", ERROR_INVALID_PARAMETER, gle);

1 0

Zebediah Figura : wined3d: Prefer mapping a BO if the buffer has WINED3D_BUFFER_USE_BO set.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 6b96021a1cfa1680482a99123f594fe5b87a0c88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b96021a1cfa1680482a9912… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 27 20:22:50 2022 -0600 wined3d: Prefer mapping a BO if the buffer has WINED3D_BUFFER_USE_BO set. Instead of checking whether a BO already exists. This will end up allocating a BO earlier in some cases. This is not particularly impactful by itself, since we already would have sysmem available and thus could use it without a performance penalty. However, we would like to avoid ever allocating sysmem where not necessary, in particular by deferring allocation of any location at all until the resource is written to. This also has the side effect of fixing test_map_synchronization() on 64-bit architectures, broken since 194b47b4fd92dda8ebf24e88ca7a14fc926c84ab. The test creates a buffer, maps it once, then maps it again with NOOVERWRITE while the GPU is still drawing, expecting the new data to be read by the GPU during the draw. On 32-bit machines, and 64-bit machines before the offending commit, we do the following: First map: uses SYSMEM since the BO is not created yet Draw: upload to VBO Second map: map the existing VBO with GL_MAP_UNSYNCHRONIZED_BIT After 194b47b4fd9, we don't use GL_MAP_UNSYNCHRONIZED_BIT since the buffer has READ access, which means that the second map will be synchronized and wait for the draw to complete. After this patch, we do the following: First map: create and map a VBO (not unsynchronized, but coherent and persistently mapped) Draw: use mapped VBO Second map: write to existing (coherent) VBO, which is unsynchronized Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 139 ++++++++++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 67 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3d66af3e5e6..abbef0fac41 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -911,105 +911,110 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc void **map_ptr, const struct wined3d_box *box, uint32_t flags) { struct wined3d_buffer *buffer = buffer_from_resource(resource); + unsigned int offset, size, dirty_offset, dirty_size; struct wined3d_device *device = resource->device; struct wined3d_context *context; - unsigned int offset, size; + struct wined3d_bo_address addr; uint8_t *base; LONG count; TRACE("resource %p, sub_resource_idx %u, map_ptr %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_ptr, debug_box(box), flags); - offset = box->left; - size = box->right - box->left; + dirty_offset = offset = box->left; + dirty_size = size = box->right - box->left; count = ++resource->map_count; - if (buffer->buffer_object) + /* DISCARD invalidates the entire buffer, regardless of the specified + * offset and size. Some applications also depend on the entire buffer + * being uploaded in that case. Two such applications are Port Royale + * and Darkstar One. */ + if (flags & WINED3D_MAP_DISCARD) { - unsigned int dirty_offset = offset, dirty_size = size; - struct wined3d_bo_address addr; + dirty_offset = 0; + dirty_size = 0; + } - /* DISCARD invalidates the entire buffer, regardless of the specified - * offset and size. Some applications also depend on the entire buffer - * being uploaded in that case. Two such applications are Port Royale - * and Darkstar One. */ - if (flags & WINED3D_MAP_DISCARD) + if (((flags & WINED3D_MAP_WRITE) && !(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD))) + || (!(flags & WINED3D_MAP_WRITE) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) + || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM + || !(buffer->flags & WINED3D_BUFFER_USE_BO)) + { + if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) { - dirty_offset = 0; - dirty_size = 0; + context = context_acquire(device, NULL, 0); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + context_release(context); } - if (((flags & WINED3D_MAP_WRITE) && !(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD))) - || (!(flags & WINED3D_MAP_WRITE) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) - || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) + if (flags & WINED3D_MAP_WRITE) + wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); + } + else + { + context = context_acquire(device, NULL, 0); + + if (flags & WINED3D_MAP_DISCARD) { - if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) + if (!wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER)) { - context = context_acquire(device, NULL, 0); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); context_release(context); + return E_OUTOFMEMORY; } - - if (flags & WINED3D_MAP_WRITE) - wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); } else { - context = context_acquire(device, NULL, 0); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + } - if (flags & WINED3D_MAP_DISCARD) - wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); - else - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + if (flags & WINED3D_MAP_WRITE) + { + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_SYSMEM); + buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); + } - if (flags & WINED3D_MAP_WRITE) + if ((flags & WINED3D_MAP_DISCARD) && resource->heap_memory) + wined3d_buffer_evict_sysmem(buffer); + + if (count == 1) + { + addr.buffer_object = buffer->buffer_object; + addr.addr = 0; + buffer->map_ptr = wined3d_context_map_bo_address(context, &addr, resource->size, flags); + /* We are accessing buffer->resource.client from the CS thread, + * but it's safe because the client thread will wait for the + * map to return, thus completely serializing this call with + * other client code. */ + buffer->resource.client.addr = addr; + + if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) { - wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_SYSMEM); - buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); - } + WARN("Pointer %p is not %u byte aligned.\n", buffer->map_ptr, RESOURCE_ALIGNMENT); - if ((flags & WINED3D_MAP_DISCARD) && resource->heap_memory) - wined3d_buffer_evict_sysmem(buffer); + wined3d_context_unmap_bo_address(context, &addr, 0, NULL); + buffer->map_ptr = NULL; - if (count == 1) - { - addr.buffer_object = buffer->buffer_object; - addr.addr = 0; - buffer->map_ptr = wined3d_context_map_bo_address(context, &addr, resource->size, flags); - /* We are accessing buffer->resource.client from the CS thread, - * but it's safe because the client thread will wait for the - * map to return, thus completely serializing this call with - * other client code. */ - buffer->resource.client.addr = addr; - - if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) + if (resource->usage & WINED3DUSAGE_DYNAMIC) + { + /* The extra copy is more expensive than not using VBOs + * at all on the NVIDIA Linux driver, which is the + * only driver that returns unaligned pointers. */ + TRACE("Dynamic buffer, dropping VBO.\n"); + wined3d_buffer_drop_bo(buffer); + } + else { - WARN("Pointer %p is not %u byte aligned.\n", buffer->map_ptr, RESOURCE_ALIGNMENT); - - wined3d_context_unmap_bo_address(context, &addr, 0, NULL); - buffer->map_ptr = NULL; - - if (resource->usage & WINED3DUSAGE_DYNAMIC) - { - /* The extra copy is more expensive than not using VBOs - * at all on the NVIDIA Linux driver, which is the - * only driver that returns unaligned pointers. */ - TRACE("Dynamic buffer, dropping VBO.\n"); - wined3d_buffer_drop_bo(buffer); - } - else - { - TRACE("Falling back to doublebuffered operation.\n"); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; - } - TRACE("New pointer is %p.\n", resource->heap_memory); + TRACE("Falling back to doublebuffered operation.\n"); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; } + TRACE("New pointer is %p.\n", resource->heap_memory); } - - context_release(context); } + + context_release(context); } base = buffer->map_ptr ? buffer->map_ptr : resource->heap_memory;

1 0

Rémi Bernon : xinput1_3: Fix printf format warnings with long types.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: c0af406c36acd36c117d03a9c74d8366e07bbb5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0af406c36acd36c117d03a9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 28 10:46:45 2022 +0100 xinput1_3: Fix printf format warnings with long types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_1/Makefile.in | 1 - dlls/xinput1_2/Makefile.in | 1 - dlls/xinput1_3/Makefile.in | 1 - dlls/xinput1_3/main.c | 85 +++++++++++++++++++++++--------------------- dlls/xinput1_4/Makefile.in | 1 - dlls/xinput9_1_0/Makefile.in | 1 - 6 files changed, 44 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0af406c36acd36c117d…

1 0

Paul Gofman : winhttp: Don't mind socket state in WinHttpWebSocketQueryCloseStatus().
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 673a01a442c1a6b23fadde70783ea68db1cf71b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=673a01a442c1a6b23fadde70… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jan 28 02:06:27 2022 +0300 winhttp: Don't mind socket state in WinHttpWebSocketQueryCloseStatus(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 5 ----- dlls/winhttp/tests/notification.c | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 10c1beb0d2b..8e13e678e22 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3991,11 +3991,6 @@ DWORD WINAPI WinHttpWebSocketQueryCloseStatus( HINTERNET hsocket, USHORT *status release_object( &socket->hdr ); return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; } - if (socket->state < SOCKET_STATE_CLOSED) - { - release_object( &socket->hdr ); - return ERROR_INVALID_OPERATION; - } if (!socket->close_frame_received || socket->close_frame_receive_err) { diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 6545a1d92fe..1ae1bb537b0 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1126,9 +1126,9 @@ static void test_websocket(BOOL secure) close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - todo_wine ok( err == ERROR_SUCCESS, "got %u\n", err ); - todo_wine ok( close_status == 1000, "got %u\n", close_status ); - todo_wine ok( size <= sizeof(buffer), "got %u\n", size ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( close_status == 1000, "got %u\n", close_status ); + ok( size <= sizeof(buffer), "got %u\n", size ); setup_test( &info, winhttp_close_handle, __LINE__ );

1 0