December 2020 - Wine-Commits

Henri Verbeet : wined3d: Reference the constant buffer bo in context_gl_load_shader_resources().
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 5a9c2f2de14e4e3baeee99dff2d0265a418d9011 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a9c2f2de14e4e3baeee99df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 2 20:17:59 2020 +0330 wined3d: Reference the constant buffer bo in context_gl_load_shader_resources(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index beb418ba960..83c61834f5a 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3703,8 +3703,12 @@ static void context_gl_load_shader_resources(struct wined3d_context_gl *context_ for (j = 0; j < WINED3D_MAX_CBS; ++j) { - if (state->cb[i][j]) - wined3d_buffer_load(state->cb[i][j], &context_gl->c, state); + if (!state->cb[i][j]) + continue; + + buffer_gl = wined3d_buffer_gl(state->cb[i][j]); + wined3d_buffer_load(&buffer_gl->b, &context_gl->c, state); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); } for (j = 0; j < shader->reg_maps.sampler_map.count; ++j)

1 0

Jacek Caban : conhost: Allow events with left alt pressed in edit_line_insert.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 90cdea1b65f9f3787b71395a41d30556c688a24f URL: https://source.winehq.org/git/wine.git/?a=commit;h=90cdea1b65f9f3787b71395a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 2 18:20:41 2020 +0100 conhost: Allow events with left alt pressed in edit_line_insert. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50197 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index f864bbb5a1c..dbf0e1459d1 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1277,7 +1277,7 @@ static NTSTATUS process_console_input( struct console *console ) ^ ctx->insert_key; if (func) func( console ); - else if (ir.Event.KeyEvent.uChar.UnicodeChar && !(ir.Event.KeyEvent.dwControlKeyState & LEFT_ALT_PRESSED)) + else if (ir.Event.KeyEvent.uChar.UnicodeChar) edit_line_insert( console, &ir.Event.KeyEvent.uChar.UnicodeChar, 1 ); if (!(console->mode & ENABLE_LINE_INPUT) && ctx->status == STATUS_PENDING)

1 0

Matteo Bruni : d3d9/tests: Make a variable static const.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 1b439c1def3f559b163444198755654d648922b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b439c1def3f559b16344419… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Dec 1 19:11:28 2020 +0100 d3d9/tests: Make a variable static const. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7c0a0157389..504d276d6c5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16799,7 +16799,7 @@ static void fp_special_test(void) 0x0000ffff, /* end */ }; - struct + static const struct { float x, y, z; float s;

1 0

Francois Gouget : fsutils/tests: Fsutils requires elevated privileges on Windows <= 7.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: fe719e16a4d3a8fbaebd8c6ed6919a4af63cde3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe719e16a4d3a8fbaebd8c6e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 2 06:34:04 2020 +0100 fsutils/tests: Fsutils requires elevated privileges on Windows <= 7. So skip the tests if the first fsutils run fails and we don't have elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/fsutil/tests/Makefile.in | 2 +- programs/fsutil/tests/fsutil.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/programs/fsutil/tests/Makefile.in b/programs/fsutil/tests/Makefile.in index 5a69e47dc61..f0490b3b660 100644 --- a/programs/fsutil/tests/Makefile.in +++ b/programs/fsutil/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = fsutil.exe -IMPORTS = user32 +IMPORTS = advapi32 user32 C_SRCS = \ fsutil.c diff --git a/programs/fsutil/tests/fsutil.c b/programs/fsutil/tests/fsutil.c index 1111b5b2fed..eff47a4f8ec 100644 --- a/programs/fsutil/tests/fsutil.c +++ b/programs/fsutil/tests/fsutil.c @@ -21,6 +21,22 @@ #include "wine/test.h" +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + static DWORD runcmd(const char* cmd) { STARTUPINFOA si = { sizeof(STARTUPINFOA) }; @@ -64,6 +80,11 @@ static void test_hardlink(void) CloseHandle(hfile); rc = runcmd("fsutil"); + if (rc == 1 && !is_process_elevated()) + { + win_skip("Cannot run fsutil without elevated privileges on Windows <= 7\n"); + return; + } ok(rc == 0, "failed to run fsutil\n"); rc = runcmd("fsutil hardlink");

1 0

Nikolay Sivov : dwrite: Use consistent trace format for strings object.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 3112144223b8bddf0aea9cab0107f4d7441c6f59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3112144223b8bddf0aea9cab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 2 14:44:03 2020 +0300 dwrite: Use consistent trace format for strings object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 54 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index a96874b2c2c..cfb2e9f6a56 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -258,9 +258,7 @@ static inline struct localizedstrings *impl_from_IDWriteLocalizedStrings(IDWrite static HRESULT WINAPI localizedstrings_QueryInterface(IDWriteLocalizedStrings *iface, REFIID riid, void **obj) { - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteLocalizedStrings)) { @@ -358,60 +356,66 @@ static HRESULT WINAPI localizedstrings_GetLocaleNameLength(IDWriteLocalizedStrin static HRESULT WINAPI localizedstrings_GetLocaleName(IDWriteLocalizedStrings *iface, UINT32 index, WCHAR *buffer, UINT32 size) { - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); - TRACE("(%p)->(%u %p %u)\n", This, index, buffer, size); + TRACE("%p, %u, %p, %u.\n", iface, index, buffer, size); - if (index >= This->count) { + if (index >= strings->count) + { if (buffer) *buffer = 0; return E_FAIL; } - if (size < strlenW(This->data[index].locale)+1) { + if (size < strlenW(strings->data[index].locale) + 1) + { if (buffer) *buffer = 0; return E_NOT_SUFFICIENT_BUFFER; } - strcpyW(buffer, This->data[index].locale); + strcpyW(buffer, strings->data[index].locale); return S_OK; } static HRESULT WINAPI localizedstrings_GetStringLength(IDWriteLocalizedStrings *iface, UINT32 index, UINT32 *length) { - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); - TRACE("(%p)->(%u %p)\n", This, index, length); + TRACE("%p, %u, %p.\n", iface, index, length); - if (index >= This->count) { - *length = (UINT32)-1; + if (index >= strings->count) + { + *length = ~0u; return E_FAIL; } - *length = strlenW(This->data[index].string); + *length = strlenW(strings->data[index].string); return S_OK; } static HRESULT WINAPI localizedstrings_GetString(IDWriteLocalizedStrings *iface, UINT32 index, WCHAR *buffer, UINT32 size) { - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); - TRACE("(%p)->(%u %p %u)\n", This, index, buffer, size); + TRACE("%p, %u, %p, %u.\n", iface, index, buffer, size); - if (index >= This->count) { + if (index >= strings->count) + { if (buffer) *buffer = 0; return E_FAIL; } - if (size < strlenW(This->data[index].string)+1) { + if (size < strlenW(strings->data[index].string) + 1) + { if (buffer) *buffer = 0; return E_NOT_SUFFICIENT_BUFFER; } - strcpyW(buffer, This->data[index].string); + strcpyW(buffer, strings->data[index].string); return S_OK; } -static const IDWriteLocalizedStringsVtbl localizedstringsvtbl = { +static const IDWriteLocalizedStringsVtbl localizedstringsvtbl = +{ localizedstrings_QueryInterface, localizedstrings_AddRef, localizedstrings_Release, @@ -511,13 +515,15 @@ HRESULT clone_localizedstrings(IDWriteLocalizedStrings *iface, IDWriteLocalizedS void set_en_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *string) { static const WCHAR enusW[] = {'e','n','-','U','S',0}; - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); UINT32 i; - for (i = 0; i < This->count; i++) { - if (!strcmpiW(This->data[i].locale, enusW)) { - heap_free(This->data[i].string); - This->data[i].string = heap_strdupW(string); + for (i = 0; i < strings->count; i++) + { + if (!strcmpiW(strings->data[i].locale, enusW)) + { + heap_free(strings->data[i].string); + strings->data[i].string = heap_strdupW(string); break; } }

1 0

Gabriel Ivăncescu : conhost: Respect the StartupInfo's wShowWindow.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 7b2b4e0329371ad6efd5ded735ea0ada92b8bf49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b2b4e0329371ad6efd5ded7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 1 15:49:53 2020 +0200 conhost: Respect the StartupInfo's wShowWindow. Since 859b526c81a2af841b5b7b28d06f3d782bccdab5, console windows are always shown even if they're supposed to start in some other state, e.g. minimized. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index e3a9a25eac3..f864bbb5a1c 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2756,7 +2756,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (!init_window( &console )) return 1; GetStartupInfoW( &si ); set_console_title( &console, si.lpTitle, wcslen( si.lpTitle ) * sizeof(WCHAR) ); - ShowWindow( console.win, SW_SHOW ); + ShowWindow( console.win, (si.dwFlags & STARTF_USESHOWWINDOW) ? si.wShowWindow : SW_SHOW ); } return main_loop( &console, signal );

1 0

Henri Verbeet : wined3d: Reference the UAV bo in context_load_unordered_access_resources().
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: a0abc66566d682f736ae89fce1a979940a8353a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0abc66566d682f736ae89fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 2 20:17:57 2020 +0330 wined3d: Reference the UAV bo in context_load_unordered_access_resources(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 35 ----------------------------------- dlls/wined3d/context_gl.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2dd4780b8ad..ddff9f1e014 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -420,38 +420,3 @@ void context_load_shader_resources(struct wined3d_context *context, } } } - -void context_load_unordered_access_resources(struct wined3d_context *context, - const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) -{ - struct wined3d_unordered_access_view *view; - struct wined3d_texture *texture; - struct wined3d_buffer *buffer; - unsigned int i; - - context->uses_uavs = 0; - - if (!shader) - return; - - for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) - { - if (!(view = views[i])) - continue; - - if (view->resource->type == WINED3D_RTYPE_BUFFER) - { - buffer = buffer_from_resource(view->resource); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); - wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); - } - else - { - texture = texture_from_resource(view->resource); - wined3d_texture_load(texture, context, FALSE); - wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); - } - - context->uses_uavs = 1; - } -} diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 13e4fa69ea7..9faff43f003 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3684,6 +3684,42 @@ static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_contex checkGLcall("Bind unordered access views"); } +static void context_gl_load_unordered_access_resources(struct wined3d_context_gl *context_gl, + const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) +{ + struct wined3d_unordered_access_view *view; + struct wined3d_buffer_gl *buffer_gl; + struct wined3d_texture *texture; + unsigned int i; + + context_gl->c.uses_uavs = 0; + + if (!shader) + return; + + for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) + { + if (!(view = views[i])) + continue; + + if (view->resource->type == WINED3D_RTYPE_BUFFER) + { + buffer_gl = wined3d_buffer_gl(buffer_from_resource(view->resource)); + wined3d_buffer_load_location(&buffer_gl->b, &context_gl->c, WINED3D_LOCATION_BUFFER); + wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + } + else + { + texture = texture_from_resource(view->resource); + wined3d_texture_load(texture, &context_gl->c, FALSE); + wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); + } + + context_gl->c.uses_uavs = 1; + } +} + static void context_gl_load_stream_output_buffers(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { @@ -3733,7 +3769,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, wined3d_context_gl_update_tex_unit_map(context_gl, state); context_preload_textures(context, state); context_load_shader_resources(context, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); - context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_PIXEL], + context_gl_load_unordered_access_resources(context_gl, state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); context_gl_load_stream_output_buffers(context_gl, state); /* TODO: Right now the dependency on the vertex shader is necessary @@ -3838,7 +3874,7 @@ static void wined3d_context_gl_apply_compute_state(struct wined3d_context_gl *co unsigned int state_id, i; context_load_shader_resources(&context_gl->c, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); - context_load_unordered_access_resources(&context_gl->c, state->shader[WINED3D_SHADER_TYPE_COMPUTE], + context_gl_load_unordered_access_resources(context_gl, state->shader[WINED3D_SHADER_TYPE_COMPUTE], state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context_gl->c.dirty_compute_states); ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f2dedf45a68..95abd2217a0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2151,8 +2151,6 @@ void wined3d_context_cleanup(struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void context_load_shader_resources(struct wined3d_context *context, const struct wined3d_state *state, unsigned int shader_mask) DECLSPEC_HIDDEN; -void context_load_unordered_access_resources(struct wined3d_context *context, - const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) DECLSPEC_HIDDEN; void context_preload_textures(struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; void context_update_stream_info(struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Reference the bo (if any) in texture2d_read_from_framebuffer().
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: c123ff8881493c3614fb471c25062db95966769e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c123ff8881493c3614fb471c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 2 20:18:00 2020 +0330 wined3d: Reference the bo (if any) in texture2d_read_from_framebuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index af2ab36d273..d5d07d8c401 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -527,6 +527,7 @@ error: if (data.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + wined3d_context_gl_reference_bo(context_gl, (struct wined3d_bo_gl *)data.buffer_object); checkGLcall("glBindBuffer"); }

1 0

Henri Verbeet : wined3d: Reference the source/destination bo in wined3d_texture_copy_sysmem_location().
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 42f90354ba7b9453f2706d5a0873559f0cf10ba1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42f90354ba7b9453f2706d5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 2 20:18:01 2020 +0330 wined3d: Reference the source/destination bo in wined3d_texture_copy_sysmem_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b84b68c592b..1e410930a8b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -636,6 +636,7 @@ static BOOL wined3d_texture_copy_sysmem_location(struct wined3d_texture *texture GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, dst_bo->id)); GL_EXTCALL(glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, size, src.addr)); GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + wined3d_context_gl_reference_bo(wined3d_context_gl(context), dst_bo); checkGLcall("PBO upload"); context_release(context); return TRUE; @@ -648,6 +649,7 @@ static BOOL wined3d_texture_copy_sysmem_location(struct wined3d_texture *texture GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, src_bo->id)); GL_EXTCALL(glGetBufferSubData(GL_PIXEL_PACK_BUFFER, 0, size, dst.addr)); GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + wined3d_context_gl_reference_bo(wined3d_context_gl(context), src_bo); checkGLcall("PBO download"); context_release(context); return TRUE;

1 0

Nikolay Sivov : dwrite: Use consistent trace format for rendering parameters object.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 87d6e45514228cf9704b54f97ac951cb7baa4851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87d6e45514228cf9704b54f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 2 14:44:04 2020 +0300 dwrite: Use consistent trace format for rendering parameters object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 140 +++++++++++++++++++++++++++++------------------------ 1 file changed, 78 insertions(+), 62 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index cfb2e9f6a56..dd9bd4dc6a3 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -54,14 +54,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) return TRUE; } -struct renderingparams { +struct renderingparams +{ IDWriteRenderingParams3 IDWriteRenderingParams3_iface; - LONG ref; + LONG refcount; - FLOAT gamma; - FLOAT contrast; - FLOAT grayscalecontrast; - FLOAT cleartype_level; + float gamma; + float contrast; + float grayscalecontrast; + float cleartype_level; DWRITE_PIXEL_GEOMETRY geometry; DWRITE_RENDERING_MODE1 mode; DWRITE_GRID_FIT_MODE gridfit; @@ -74,9 +75,7 @@ static inline struct renderingparams *impl_from_IDWriteRenderingParams3(IDWriteR static HRESULT WINAPI renderingparams_QueryInterface(IDWriteRenderingParams3 *iface, REFIID riid, void **obj) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IDWriteRenderingParams3) || IsEqualIID(riid, &IID_IDWriteRenderingParams2) || @@ -96,51 +95,61 @@ static HRESULT WINAPI renderingparams_QueryInterface(IDWriteRenderingParams3 *if static ULONG WINAPI renderingparams_AddRef(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); - return ref; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + ULONG refcount = InterlockedIncrement(&params->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + return refcount; } static ULONG WINAPI renderingparams_Release(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + ULONG refcount = InterlockedDecrement(&params->refcount); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %d.\n", iface, refcount); - if (!ref) - heap_free(This); + if (!refcount) + heap_free(params); - return ref; + return refcount; } -static FLOAT WINAPI renderingparams_GetGamma(IDWriteRenderingParams3 *iface) +static float WINAPI renderingparams_GetGamma(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); - return This->gamma; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + + TRACE("%p.\n", iface); + + return params->gamma; } -static FLOAT WINAPI renderingparams_GetEnhancedContrast(IDWriteRenderingParams3 *iface) +static float WINAPI renderingparams_GetEnhancedContrast(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); - return This->contrast; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + + TRACE("%p.\n", iface); + + return params->contrast; } -static FLOAT WINAPI renderingparams_GetClearTypeLevel(IDWriteRenderingParams3 *iface) +static float WINAPI renderingparams_GetClearTypeLevel(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); - return This->cleartype_level; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + + TRACE("%p.\n", iface); + + return params->cleartype_level; } static DWRITE_PIXEL_GEOMETRY WINAPI renderingparams_GetPixelGeometry(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); - return This->geometry; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + + TRACE("%p.\n", iface); + + return params->geometry; } static DWRITE_RENDERING_MODE rendering_mode_from_mode1(DWRITE_RENDERING_MODE1 mode) @@ -161,35 +170,42 @@ static DWRITE_RENDERING_MODE rendering_mode_from_mode1(DWRITE_RENDERING_MODE1 mo static DWRITE_RENDERING_MODE WINAPI renderingparams_GetRenderingMode(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); + TRACE("%p.\n", iface); - return rendering_mode_from_mode1(This->mode); + return rendering_mode_from_mode1(params->mode); } -static FLOAT WINAPI renderingparams1_GetGrayscaleEnhancedContrast(IDWriteRenderingParams3 *iface) +static float WINAPI renderingparams1_GetGrayscaleEnhancedContrast(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); - return This->grayscalecontrast; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + + TRACE("%p.\n", iface); + + return params->grayscalecontrast; } static DWRITE_GRID_FIT_MODE WINAPI renderingparams2_GetGridFitMode(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); - return This->gridfit; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + + TRACE("%p.\n", iface); + + return params->gridfit; } static DWRITE_RENDERING_MODE1 WINAPI renderingparams3_GetRenderingMode1(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); - return This->mode; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + + TRACE("%p.\n", iface); + + return params->mode; } -static const struct IDWriteRenderingParams3Vtbl renderingparamsvtbl = { +static const struct IDWriteRenderingParams3Vtbl renderingparamsvtbl = +{ renderingparams_QueryInterface, renderingparams_AddRef, renderingparams_Release, @@ -203,11 +219,11 @@ static const struct IDWriteRenderingParams3Vtbl renderingparamsvtbl = { renderingparams3_GetRenderingMode1 }; -static HRESULT create_renderingparams(FLOAT gamma, FLOAT contrast, FLOAT grayscalecontrast, FLOAT cleartype_level, +static HRESULT create_renderingparams(float gamma, float contrast, float grayscalecontrast, float cleartype_level, DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE1 mode, DWRITE_GRID_FIT_MODE gridfit, IDWriteRenderingParams3 **params) { - struct renderingparams *This; + struct renderingparams *object; *params = NULL; @@ -217,21 +233,21 @@ static HRESULT create_renderingparams(FLOAT gamma, FLOAT contrast, FLOAT graysca if ((UINT32)gridfit > DWRITE_GRID_FIT_MODE_ENABLED || (UINT32)geometry > DWRITE_PIXEL_GEOMETRY_BGR) return E_INVALIDARG; - This = heap_alloc(sizeof(struct renderingparams)); - if (!This) return E_OUTOFMEMORY; + if (!(object = heap_alloc(sizeof(*object)))) + return E_OUTOFMEMORY; - This->IDWriteRenderingParams3_iface.lpVtbl = &renderingparamsvtbl; - This->ref = 1; + object->IDWriteRenderingParams3_iface.lpVtbl = &renderingparamsvtbl; + object->refcount = 1; - This->gamma = gamma; - This->contrast = contrast; - This->grayscalecontrast = grayscalecontrast; - This->cleartype_level = cleartype_level; - This->geometry = geometry; - This->mode = mode; - This->gridfit = gridfit; + object->gamma = gamma; + object->contrast = contrast; + object->grayscalecontrast = grayscalecontrast; + object->cleartype_level = cleartype_level; + object->geometry = geometry; + object->mode = mode; + object->gridfit = gridfit; - *params = &This->IDWriteRenderingParams3_iface; + *params = &object->IDWriteRenderingParams3_iface; return S_OK; }

1 0