December 2020 - Wine-commits

Matteo Bruni : d3d11: Don't explicitly check for cube map support.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 54d4c905ba96c8610c968d66acee8d04784a91ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=54d4c905ba96c8610c968d66… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Dec 1 19:11:29 2020 +0100 d3d11: Don't explicitly check for cube map support. 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/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2a08d2b1e65..50e8cd58fe2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3315,7 +3315,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE1D}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE2D}, {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE3D}, - {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_LEGACY_CUBEMAP, D3D11_FORMAT_SUPPORT_TEXTURECUBE}, {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, 0, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, {WINED3D_RTYPE_NONE, WINED3D_BIND_DEPTH_STENCIL, 0, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL}, {WINED3D_RTYPE_NONE, WINED3D_BIND_UNORDERED_ACCESS, 0, D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW}, @@ -3364,6 +3363,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * { *format_support |= D3D11_FORMAT_SUPPORT_SHADER_LOAD; *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE; + *format_support |= D3D11_FORMAT_SUPPORT_TEXTURECUBE; if (feature_level >= D3D_FEATURE_LEVEL_10_1) *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER;

1 0

Jacek Caban : kernel32: Remove no longer used variables.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 90911216699ccbf11848af79b2f7ecb206d9d289 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90911216699ccbf11848af79… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 2 17:43:42 2020 +0100 kernel32: Remove no longer used variables. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_main.c | 1 - dlls/kernel32/kernel_private.h | 4 ---- dlls/kernel32/path.c | 8 +++++--- dlls/kernel32/process.c | 4 ---- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index e312a202db6..89394e16430 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -120,7 +120,6 @@ static void copy_startup_info(void) */ static BOOL process_attach( HMODULE module ) { - kernel32_handle = module; RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 7602c3b00c4..633511d6140 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -29,12 +29,8 @@ static inline BOOL set_ntstatus( NTSTATUS status ) return !status; } -extern HMODULE kernel32_handle DECLSPEC_HIDDEN; extern SYSTEM_BASIC_INFORMATION system_info DECLSPEC_HIDDEN; -extern const WCHAR DIR_Windows[] DECLSPEC_HIDDEN; -extern const WCHAR DIR_System[] DECLSPEC_HIDDEN; - extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN; extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 8b4158b29d6..023dff826d6 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -40,6 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); #define MAX_PATHNAME_LEN 1024 +static const WCHAR system_dir[] = L"C:\\windows\\system32"; + /*********************************************************************** * copy_filename_WtoA * @@ -232,10 +234,10 @@ BOOL WINAPI CreateDirectoryExA( LPCSTR template, LPCSTR path, LPSECURITY_ATTRIBU */ UINT WINAPI GetSystemDirectoryW( LPWSTR path, UINT count ) { - UINT len = lstrlenW( DIR_System ) + 1; + UINT len = ARRAY_SIZE(system_dir); if (path && count >= len) { - lstrcpyW( path, DIR_System ); + lstrcpyW( path, system_dir ); len--; } return len; @@ -249,7 +251,7 @@ UINT WINAPI GetSystemDirectoryW( LPWSTR path, UINT count ) */ UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count ) { - return copy_filename_WtoA( DIR_System, path, count ); + return copy_filename_WtoA( system_dir, path, count ); } diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index c2df0ccd658..92582ae31de 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -49,12 +49,8 @@ typedef struct DWORD dwReserved; } LOADPARMS32; -HMODULE kernel32_handle = 0; SYSTEM_BASIC_INFORMATION system_info = { 0 }; -const WCHAR DIR_Windows[] = L"C:\\windows"; -const WCHAR DIR_System[] = L"C:\\windows\\system32"; - /* Process flags */ #define PDB32_DEBUGGED 0x0001 /* Process is being debugged */ #define PDB32_WIN16_PROC 0x0008 /* Win16 process */

1 0

Jacek Caban : kernel32: Remove outdated comments.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: e710aa081f8a98a288478551f203398422ec16fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e710aa081f8a98a288478551… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 2 17:43:49 2020 +0100 kernel32: Remove outdated comments. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index f2aa3fa6dd4..7b3a07f0de5 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -266,7 +266,6 @@ DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount) } /* Undocumented, called by native doskey.exe */ -/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ DWORD WINAPI GetConsoleCommandHistoryA(DWORD unknown1, DWORD unknown2, DWORD unknown3) { FIXME(": (0x%x, 0x%x, 0x%x) stub!\n", unknown1, unknown2, unknown3); @@ -275,7 +274,6 @@ DWORD WINAPI GetConsoleCommandHistoryA(DWORD unknown1, DWORD unknown2, DWORD unk } /* Undocumented, called by native doskey.exe */ -/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ DWORD WINAPI GetConsoleCommandHistoryW(DWORD unknown1, DWORD unknown2, DWORD unknown3) { FIXME(": (0x%x, 0x%x, 0x%x) stub!\n", unknown1, unknown2, unknown3); @@ -284,7 +282,6 @@ DWORD WINAPI GetConsoleCommandHistoryW(DWORD unknown1, DWORD unknown2, DWORD unk } /* Undocumented, called by native doskey.exe */ -/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ DWORD WINAPI GetConsoleCommandHistoryLengthA(LPCSTR unknown) { FIXME(": (%s) stub!\n", debugstr_a(unknown)); @@ -293,7 +290,6 @@ DWORD WINAPI GetConsoleCommandHistoryLengthA(LPCSTR unknown) } /* Undocumented, called by native doskey.exe */ -/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ DWORD WINAPI GetConsoleCommandHistoryLengthW(LPCWSTR unknown) { FIXME(": (%s) stub!\n", debugstr_w(unknown));

1 0

Jacek Caban : conhost: Allow events with left alt pressed in edit_line_insert.
by Alexandre Julliard 02 Dec '20

02 Dec '20

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

Henri Verbeet : wined3d: Reference the UAV bo in context_load_unordered_access_resources().
by Alexandre Julliard 02 Dec '20

02 Dec '20

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 SRV bo in context_load_shader_resources().
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: e29877ee42688f155deb9bd09700b853345f3a52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e29877ee42688f155deb9bd0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 2 20:17:58 2020 +0330 wined3d: Reference the SRV bo in context_load_shader_resources(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 37 -------------------------------- dlls/wined3d/context_gl.c | 48 ++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 46 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ddff9f1e014..118ac2aad8a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -383,40 +383,3 @@ void context_preload_textures(struct wined3d_context *context, const struct wine } } } - -void context_load_shader_resources(struct wined3d_context *context, - const struct wined3d_state *state, unsigned int shader_mask) -{ - struct wined3d_shader_sampler_map_entry *entry; - struct wined3d_shader_resource_view *view; - struct wined3d_shader *shader; - unsigned int i, j; - - for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) - { - if (!(shader_mask & (1u << i))) - continue; - - if (!(shader = state->shader[i])) - continue; - - for (j = 0; j < WINED3D_MAX_CBS; ++j) - { - if (state->cb[i][j]) - wined3d_buffer_load(state->cb[i][j], context, state); - } - - for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) - { - entry = &shader->reg_maps.sampler_map.entries[j]; - - if (!(view = state->shader_resource_view[i][entry->resource_idx])) - continue; - - if (view->resource->type == WINED3D_RTYPE_BUFFER) - wined3d_buffer_load(buffer_from_resource(view->resource), context, state); - else - wined3d_texture_load(texture_from_resource(view->resource), context, FALSE); - } - } -} diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9faff43f003..beb418ba960 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3684,6 +3684,50 @@ static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_contex checkGLcall("Bind unordered access views"); } +static void context_gl_load_shader_resources(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state, unsigned int shader_mask) +{ + struct wined3d_shader_sampler_map_entry *entry; + struct wined3d_shader_resource_view *view; + struct wined3d_buffer_gl *buffer_gl; + struct wined3d_shader *shader; + unsigned int i, j; + + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + if (!(shader_mask & (1u << i))) + continue; + + if (!(shader = state->shader[i])) + continue; + + for (j = 0; j < WINED3D_MAX_CBS; ++j) + { + if (state->cb[i][j]) + wined3d_buffer_load(state->cb[i][j], &context_gl->c, state); + } + + for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) + { + entry = &shader->reg_maps.sampler_map.entries[j]; + + if (!(view = state->shader_resource_view[i][entry->resource_idx])) + continue; + + if (view->resource->type == WINED3D_RTYPE_BUFFER) + { + buffer_gl = wined3d_buffer_gl(buffer_from_resource(view->resource)); + wined3d_buffer_load(&buffer_gl->b, &context_gl->c, state); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + } + else + { + wined3d_texture_load(texture_from_resource(view->resource), &context_gl->c, FALSE); + } + } + } +} + 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) { @@ -3768,7 +3812,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, * updating a resource location. */ 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_gl_load_shader_resources(context_gl, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); 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); @@ -3873,7 +3917,7 @@ static void wined3d_context_gl_apply_compute_state(struct wined3d_context_gl *co const struct wined3d_gl_info *gl_info = context_gl->gl_info; unsigned int state_id, i; - context_load_shader_resources(&context_gl->c, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + context_gl_load_shader_resources(context_gl, state, 1u << 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]); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 95abd2217a0..b756c80ad8a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2149,8 +2149,6 @@ struct wined3d_context 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_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 constant buffer bo in context_gl_load_shader_resources().
by Alexandre Julliard 02 Dec '20

02 Dec '20

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

Henri Verbeet : wined3d: Reference the bo (if any) in texture2d_read_from_framebuffer().
by Alexandre Julliard 02 Dec '20

02 Dec '20

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 02 Dec '20

02 Dec '20

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

Jacek Caban : server: Fix handling of STATUS_ALERTED in get_next_console_request.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 574ced0dc6f019d11c7c0c67d4b655985b1c24e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=574ced0dc6f019d11c7c0c67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 2 20:06:11 2020 +0100 server: Fix handling of STATUS_ALERTED in get_next_console_request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 14 ++++++++++++++ server/console.c | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index cab036243dc..918ecac8ac4 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -268,6 +268,8 @@ static void testWriteSimple(HANDLE hCon) const char* mytest = "abcdefg"; int mylen = strlen(mytest); COORD c = {0, 0}; + DWORD len; + BOOL ret; simple_write_console(hCon, mytest); @@ -278,6 +280,18 @@ static void testWriteSimple(HANDLE hCon) okCURSOR(hCon, c); okCHAR(hCon, c, ' ', DEFAULT_ATTRIB); + + ret = WriteFile(hCon, mytest, mylen, &len, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + ok(len == mylen, "unexpected len = %u\n", len); + + for (c.X = 0; c.X < 2 * mylen; c.X++) + { + okCHAR(hCon, c, mytest[c.X % mylen], TEST_ATTRIB); + } + + okCURSOR(hCon, c); + okCHAR(hCon, c, ' ', DEFAULT_ATTRIB); } static void testWriteNotWrappedNotProcessed(HANDLE hCon, COORD sbSize) diff --git a/server/console.c b/server/console.c index dc3785e8726..d1f948b23a6 100644 --- a/server/console.c +++ b/server/console.c @@ -1520,7 +1520,6 @@ DECL_HANDLER(get_next_console_request) if ((iosb->out_data = memdup( get_req_data(), iosb->out_size ))) { iosb->result = iosb->out_size; - status = STATUS_ALERTED; } else if (!status) { @@ -1528,6 +1527,7 @@ DECL_HANDLER(get_next_console_request) iosb->out_size = 0; } } + if (iosb->result) status = STATUS_ALERTED; } else {

1 0