December 2020 - Wine-commits

Jacek Caban : kernelbase: Remove no longer needed console handle mapping.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 826a9615e45847f20d916be548795cad7da67aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=826a9615e45847f20d916be5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 1 17:25:33 2020 +0100 kernelbase: Remove no longer needed console handle mapping. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 6 +++--- dlls/kernelbase/file.c | 6 ------ dlls/kernelbase/kernelbase.h | 11 ----------- dlls/kernelbase/process.c | 10 ---------- 4 files changed, 3 insertions(+), 30 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 04cbb82505e..8d440c89296 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -244,7 +244,7 @@ static BOOL init_console_std_handles( BOOL override_all ) FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); if (!set_ntstatus( status )) return FALSE; console_flags |= CONSOLE_INPUT_HANDLE; - SetStdHandle( STD_INPUT_HANDLE, console_handle_map( handle )); + SetStdHandle( STD_INPUT_HANDLE, handle ); } if (!override_all) @@ -263,7 +263,7 @@ static BOOL init_console_std_handles( BOOL override_all ) if (!std_out) { console_flags |= CONSOLE_OUTPUT_HANDLE; - SetStdHandle( STD_OUTPUT_HANDLE, console_handle_map( handle )); + SetStdHandle( STD_OUTPUT_HANDLE, handle ); } if (!std_err) @@ -272,7 +272,7 @@ static BOOL init_console_std_handles( BOOL override_all ) &handle, 0, TRUE, DUPLICATE_SAME_ACCESS )) return FALSE; console_flags |= CONSOLE_ERROR_HANDLE; - SetStdHandle( STD_ERROR_HANDLE, console_handle_map( handle )); + SetStdHandle( STD_ERROR_HANDLE, handle ); } return TRUE; diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 7d0c4d63aa8..44d4c1c6b5a 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -854,12 +854,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO } else { - if (dosdev && - ((LOWORD(dosdev) == 3 * sizeof(WCHAR) && !wcsnicmp( filename + HIWORD(dosdev)/sizeof(WCHAR), L"CON", 3 )) || - (LOWORD(dosdev) == 6 * sizeof(WCHAR) && !wcsnicmp( filename + HIWORD(dosdev)/sizeof(WCHAR), L"CONIN$", 6 )) || - (LOWORD(dosdev) == 7 * sizeof(WCHAR) && !wcsnicmp( filename + HIWORD(dosdev)/sizeof(WCHAR), L"CONOUT$", 7 )))) - ret = console_handle_map( ret ); - if ((creation == CREATE_ALWAYS && io.Information == FILE_OVERWRITTEN) || (creation == OPEN_ALWAYS && io.Information == FILE_OPENED)) SetLastError( ERROR_ALREADY_EXISTS ); diff --git a/dlls/kernelbase/kernelbase.h b/dlls/kernelbase/kernelbase.h index 836d636b47b..82502059b66 100644 --- a/dlls/kernelbase/kernelbase.h +++ b/dlls/kernelbase/kernelbase.h @@ -43,17 +43,6 @@ extern const WCHAR system_dir[] DECLSPEC_HIDDEN; static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); extern BOOL is_wow64 DECLSPEC_HIDDEN; -static inline BOOL is_console_handle(HANDLE h) -{ - return h != INVALID_HANDLE_VALUE && ((UINT_PTR)h & 3) == 3; -} - -/* map between ntdll handle and kernel32 console handle */ -static inline HANDLE console_handle_map( HANDLE h ) -{ - return h != INVALID_HANDLE_VALUE ? (HANDLE)((UINT_PTR)h ^ 3) : INVALID_HANDLE_VALUE; -} - static inline BOOL set_ntstatus( NTSTATUS status ) { if (status) SetLastError( RtlNtStatusToDosError( status )); diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 7689e1adf28..992d50af0bc 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -396,7 +396,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH CloseHandle( HANDLE handle ) else if (handle == (HANDLE)STD_ERROR_HANDLE) handle = InterlockedExchangePointer( &NtCurrentTeb()->Peb->ProcessParameters->hStdError, 0 ); - if (is_console_handle( handle )) handle = console_handle_map( handle ); return set_ntstatus( NtClose( handle )); } @@ -658,15 +657,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH DuplicateHandle( HANDLE source_process, HANDLE sou HANDLE dest_process, HANDLE *dest, DWORD access, BOOL inherit, DWORD options ) { - if (is_console_handle( source )) - { - source = console_handle_map( source ); - if (!set_ntstatus( NtDuplicateObject( source_process, source, dest_process, dest, - access, inherit ? OBJ_INHERIT : 0, options ))) - return FALSE; - *dest = console_handle_map( *dest ); - return TRUE; - } return set_ntstatus( NtDuplicateObject( source_process, source, dest_process, dest, access, inherit ? OBJ_INHERIT : 0, options )); }

1 0

Jacek Caban : kernel32: Remove no longer needed CONSOLE_Init.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 141e53bacc7d8227f1f03192eab1b3a115f3bff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=141e53bacc7d8227f1f03192… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 1 17:25:41 2020 +0100 kernel32: Remove no longer needed CONSOLE_Init. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 25 ------------------------- dlls/kernel32/kernel_main.c | 4 ---- dlls/kernel32/kernel_private.h | 12 ------------ 3 files changed, 41 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 3171dcd8e7a..f2aa3fa6dd4 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -265,31 +265,6 @@ DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount) return 0; } -BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) -{ - /* convert value from server: - * + INVALID_HANDLE_VALUE => TEB: 0, STARTUPINFO: INVALID_HANDLE_VALUE - * + 0 => TEB: 0, STARTUPINFO: INVALID_HANDLE_VALUE - * + console handle needs to be mapped - */ - if (!params->hStdInput || params->hStdInput == INVALID_HANDLE_VALUE) - params->hStdInput = 0; - else if (!is_console_handle(params->hStdInput) && VerifyConsoleIoHandle(params->hStdInput)) - params->hStdInput = console_handle_map(params->hStdInput); - - if (!params->hStdOutput || params->hStdOutput == INVALID_HANDLE_VALUE) - params->hStdOutput = 0; - else if (!is_console_handle(params->hStdOutput) && VerifyConsoleIoHandle(params->hStdOutput)) - params->hStdOutput = console_handle_map(params->hStdOutput); - - if (!params->hStdError || params->hStdError == INVALID_HANDLE_VALUE) - params->hStdError = 0; - else if (!is_console_handle(params->hStdError) && VerifyConsoleIoHandle(params->hStdError)) - params->hStdError = console_handle_map(params->hStdError); - - return TRUE; -} - /* Undocumented, called by native doskey.exe */ /* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ DWORD WINAPI GetConsoleCommandHistoryA(DWORD unknown1, DWORD unknown2, DWORD unknown3) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 91230fc6607..e312a202db6 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -120,15 +120,11 @@ static void copy_startup_info(void) */ static BOOL process_attach( HMODULE module ) { - RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; - kernel32_handle = module; RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); - CONSOLE_Init(params); - copy_startup_info(); #ifdef __i386__ diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index fa1dd79d0c0..7602c3b00c4 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -22,18 +22,6 @@ #define __WINE_KERNEL_PRIVATE_H NTSTATUS WINAPI BaseGetNamedObjectDirectory( HANDLE *dir ); -BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) DECLSPEC_HIDDEN; - -static inline BOOL is_console_handle(HANDLE h) -{ - return h != INVALID_HANDLE_VALUE && ((UINT_PTR)h & 3) == 3; -} - -/* map a real wineserver handle onto a kernel32 console handle */ -static inline HANDLE console_handle_map(HANDLE h) -{ - return h != INVALID_HANDLE_VALUE ? (HANDLE)((UINT_PTR)h ^ 3) : INVALID_HANDLE_VALUE; -} static inline BOOL set_ntstatus( NTSTATUS status ) {

1 0

Jacek Caban : kernelbase: Simplify CreateFileW.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 60f11d2929629f0da257b810936f0239ad895596 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60f11d2929629f0da257b810… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 1 17:25:49 2020 +0100 kernelbase: Simplify CreateFileW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 44d4c1c6b5a..7b122e263b0 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -738,7 +738,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO UNICODE_STRING nameW; IO_STATUS_BLOCK io; HANDLE ret; - DWORD dosdev; const WCHAR *vxd_name = NULL; SECURITY_QUALITY_OF_SERVICE qos; @@ -770,25 +769,14 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO (sharing & FILE_SHARE_DELETE) ? "FILE_SHARE_DELETE " : "", creation, attributes); - if (!wcsncmp( filename, L"\\\\.\\", 4 )) + if ((GetVersion() & 0x80000000) && !wcsncmp( filename, L"\\\\.\\", 4 ) && + !RtlIsDosDeviceName_U( filename + 4 ) && + wcsnicmp( filename + 4, L"PIPE\\", 5 ) && + wcsnicmp( filename + 4, L"MAILSLOT\\", 9 )) { - if ((filename[4] && filename[5] == ':' && !filename[6]) || - !wcsnicmp( filename + 4, L"PIPE\\", 5 ) || - !wcsnicmp( filename + 4, L"MAILSLOT\\", 9 )) - { - dosdev = 0; - } - else if ((dosdev = RtlIsDosDeviceName_U( filename + 4 ))) - { - dosdev += MAKELONG( 0, 4*sizeof(WCHAR) ); /* adjust position to start of filename */ - } - else if (GetVersion() & 0x80000000) - { - vxd_name = filename + 4; - if (!creation) creation = OPEN_EXISTING; - } + vxd_name = filename + 4; + if (!creation) creation = OPEN_EXISTING; } - else dosdev = RtlIsDosDeviceName_U( filename ); if (creation < CREATE_NEW || creation > TRUNCATE_EXISTING) {

1 0

Jacek Caban : server: Block console write until conhost processes ioctl.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 09b6efd685c585e9bcac9a42d9882ead4f84ce92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09b6efd685c585e9bcac9a42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 1 19:21:58 2020 +0100 server: Block console write until conhost processes ioctl. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50236 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/console.c b/server/console.c index a2171b3c1b4..dc3785e8726 100644 --- a/server/console.c +++ b/server/console.c @@ -992,9 +992,7 @@ static int screen_buffer_write( struct fd *fd, struct async *async, file_pos_t p /* we can't use default async handling, because write result is not * compatible with ioctl result */ iosb = async_get_iosb( async ); - iosb->status = STATUS_SUCCESS; iosb->result = iosb->in_size; - async_terminate( async, iosb->result ? STATUS_ALERTED : STATUS_SUCCESS ); release_object( iosb ); return 1; }

1 0

Henri Verbeet : wined3d: Reference the source/destination bo in wined3d_context_gl_copy_bo_address().
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 20c828bdc5faf5786192a48dddcb8e9e6313d284 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20c828bdc5faf5786192a48d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 1 20:56:01 2020 +0330 wined3d: Reference the source/destination bo in wined3d_context_gl_copy_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index ee1adfcf559..4aaf50434a6 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2728,6 +2728,9 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, GL_EXTCALL(glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, (GLintptr)src->addr, (GLintptr)dst->addr, size)); checkGLcall("direct buffer copy"); + + wined3d_context_gl_reference_bo(context_gl, src_bo); + wined3d_context_gl_reference_bo(context_gl, dst_bo); } else { @@ -2747,12 +2750,16 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, wined3d_context_gl_bind_bo(context_gl, src_bo->binding, src_bo->id); GL_EXTCALL(glGetBufferSubData(src_bo->binding, (GLintptr)src->addr, size, dst->addr)); checkGLcall("buffer download"); + + wined3d_context_gl_reference_bo(context_gl, src_bo); } else if (dst_bo && !src_bo) { wined3d_context_gl_bind_bo(context_gl, dst_bo->binding, dst_bo->id); GL_EXTCALL(glBufferSubData(dst_bo->binding, (GLintptr)dst->addr, size, src->addr)); checkGLcall("buffer upload"); + + wined3d_context_gl_reference_bo(context_gl, dst_bo); } else {

1 0

Henri Verbeet : wined3d: Reference the bo in wined3d_unordered_access_view_gl_clear_uint().
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 14ed6b1ce30479f7326046fad5b4255faa6d5437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14ed6b1ce30479f7326046fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 1 20:56:02 2020 +0330 wined3d: Reference the bo in wined3d_unordered_access_view_gl_clear_uint(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4c85e2fefe4..4db3746d8de 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1348,6 +1348,7 @@ void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access wined3d_context_gl_bind_bo(context_gl, buffer_gl->bo.binding, buffer_gl->bo.id); GL_EXTCALL(glClearBufferSubData(buffer_gl->bo.binding, format->internal, offset, size, format->format, format->type, clear_value)); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); checkGLcall("clear unordered access view"); }

1 0

Henri Verbeet : wined3d: Reference the indirect buffer bo in wined3d_context_gl_draw_indirect().
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: a381f0cae875ba74ab82c1a45dd18cd4025eef47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a381f0cae875ba74ab82c1a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 1 20:56:03 2020 +0330 wined3d: Reference the indirect buffer bo in wined3d_context_gl_draw_indirect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 4aaf50434a6..419fc4923bd 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4488,8 +4488,8 @@ static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_ const struct wined3d_indirect_draw_parameters *parameters, unsigned int idx_size) { GLenum gl_primitive_type = gl_primitive_type_from_d3d(state->primitive_type); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(parameters->buffer); const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_buffer *buffer = parameters->buffer; const void *offset; if (!gl_info->supported[ARB_DRAW_INDIRECT]) @@ -4498,7 +4498,7 @@ static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_ return; } - GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, wined3d_buffer_gl(buffer)->bo.id)); + GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer_gl->bo.id)); offset = (void *)(GLintptr)parameters->offset; if (idx_size) @@ -4514,6 +4514,7 @@ static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_ } GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0)); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); checkGLcall("draw indirect"); }

1 0

Henri Verbeet : wined3d: Reference the indirect buffer bo in dispatch_compute().
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 587174be8bed12951e27db91de22761baf331149 URL: https://source.winehq.org/git/wine.git/?a=commit;h=587174be8bed12951e27db91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 1 20:56:04 2020 +0330 wined3d: Reference the indirect buffer bo in dispatch_compute(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 419fc4923bd..d0c2f707ed0 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4107,6 +4107,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, buffer_gl->bo.id)); GL_EXTCALL(glDispatchComputeIndirect((GLintptr)indirect->offset)); GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0)); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); } else {

1 0

Henri Verbeet : wined3d: Reference the stream output bo in context_load_stream_output_buffers().
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 56f1ce6be67ecb66f066e363b6612f6b7649fb57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56f1ce6be67ecb66f066e363… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 1 20:56:05 2020 +0330 wined3d: Reference the stream output bo in context_load_stream_output_buffers(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 15 --------------- dlls/wined3d/context_gl.c | 21 ++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b52df0bd11e..2dd4780b8ad 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -455,18 +455,3 @@ void context_load_unordered_access_resources(struct wined3d_context *context, context->uses_uavs = 1; } } - -void context_load_stream_output_buffers(struct wined3d_context *context, const struct wined3d_state *state) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) - { - struct wined3d_buffer *buffer; - if (!(buffer = state->stream_output[i].buffer)) - continue; - - wined3d_buffer_load(buffer, context, state); - wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); - } -} diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index d0c2f707ed0..13e4fa69ea7 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3684,6 +3684,25 @@ static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_contex checkGLcall("Bind unordered access views"); } +static void context_gl_load_stream_output_buffers(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) + { + struct wined3d_buffer_gl *buffer_gl; + + if (!state->stream_output[i].buffer) + continue; + + buffer_gl = wined3d_buffer_gl(state->stream_output[i].buffer); + wined3d_buffer_load(&buffer_gl->b, &context_gl->c, state); + wined3d_buffer_invalidate_location(&buffer_gl->b, ~WINED3D_LOCATION_BUFFER); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + } +} + /* Context activation is done by the caller. */ static BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state, BOOL indexed) @@ -3716,7 +3735,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, context_load_shader_resources(context, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); - context_load_stream_output_buffers(context, state); + context_gl_load_stream_output_buffers(context_gl, state); /* TODO: Right now the dependency on the vertex shader is necessary * since wined3d_stream_info_from_declaration() depends on the reg_maps of * the current VS but maybe it's possible to relax the coupling in some diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 52efe685d71..f2dedf45a68 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_stream_output_buffers(struct wined3d_context *context, - const struct wined3d_state *state) 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;

1 0

Michael Stefaniuc : shdocvw: Use wide-char string literals.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 447924a6d68f7919bd451661314a52aa99cab709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=447924a6d68f7919bd451661… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 29 23:30:31 2020 +0100 shdocvw: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/shdocvw_main.c | 7 ++----- dlls/shdocvw/shlinstobj.c | 11 +++-------- dlls/shdocvw/tests/shortcut.c | 4 +--- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index ac3913dd239..8c5dd8279c7 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -43,10 +43,8 @@ static HINSTANCE ieframe_instance; static HINSTANCE get_ieframe_instance(void) { - static const WCHAR ieframe_dllW[] = {'i','e','f','r','a','m','e','.','d','l','l',0}; - if(!ieframe_instance) - ieframe_instance = LoadLibraryW(ieframe_dllW); + ieframe_instance = LoadLibraryW(L"ieframe.dll"); return ieframe_instance; } @@ -276,10 +274,9 @@ DWORD WINAPI SetQueryNetSessionCount(DWORD arg) static void* fetch_shlwapi_ordinal(UINT_PTR ord) { - static const WCHAR shlwapiW[] = {'s','h','l','w','a','p','i','.','d','l','l','\0'}; static HANDLE h; - if (!h && !(h = GetModuleHandleW(shlwapiW))) return NULL; + if (!h && !(h = GetModuleHandleW(L"shlwapi.dll"))) return NULL; return (void*)GetProcAddress(h, (const char*)ord); } diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index 189c27cad58..f148a27619e 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -357,12 +357,7 @@ static HRESULT InstanceObjectFactory_Constructor(REFCLSID rclsid, IPropertyBag * HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppvClassObj) { - WCHAR wszInstanceKey[] = { 'C','L','S','I','D','\\','{','0','0','0','0','0','0','0','0','-', - '0','0','0','0','-','0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0', - '0','0','0','0','}','\\','I','n','s','t','a','n','c','e', 0 }; - static const WCHAR wszCLSID[] = { 'C','L','S','I','D',0 }; - static const WCHAR wszInitPropertyBag[] = - { 'I','n','i','t','P','r','o','p','e','r','t','y','B','a','g',0 }; + WCHAR wszInstanceKey[] = L"CLSID\\{00000000-0000-0000-0000-000000000000}\\Instance"; WCHAR wszCLSIDInstance[CHARS_IN_GUID]; CLSID clsidInstance; HKEY hInstanceKey, hInitPropertyBagKey; @@ -382,7 +377,7 @@ HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, REFIID riid, /* If there is no 'Instance' subkey, then it's not a Shell Instance Object. */ return CLASS_E_CLASSNOTAVAILABLE; - if (ERROR_SUCCESS != RegQueryValueExW(hInstanceKey, wszCLSID, NULL, &dwType, (LPBYTE)wszCLSIDInstance, &cbBytes) || + if (ERROR_SUCCESS != RegQueryValueExW(hInstanceKey, L"CLSID", NULL, &dwType, (BYTE *)wszCLSIDInstance, &cbBytes) || FAILED(CLSIDFromString(wszCLSIDInstance, &clsidInstance))) { /* 'Instance' should have a 'CLSID' value with a well-formed clsid-string. */ @@ -392,7 +387,7 @@ HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, REFIID riid, } /* Try to open the 'InitPropertyBag' subkey. */ - res = RegOpenKeyExW(hInstanceKey, wszInitPropertyBag, 0, KEY_READ, &hInitPropertyBagKey); + res = RegOpenKeyExW(hInstanceKey, L"InitPropertyBag", 0, KEY_READ, &hInitPropertyBagKey); RegCloseKey(hInstanceKey); if (res != ERROR_SUCCESS) { /* Besides 'InitPropertyBag's, shell instance objects might be initialized by streams. diff --git a/dlls/shdocvw/tests/shortcut.c b/dlls/shdocvw/tests/shortcut.c index cb62c25892a..5cf1c4bad7f 100644 --- a/dlls/shdocvw/tests/shortcut.c +++ b/dlls/shdocvw/tests/shortcut.c @@ -165,9 +165,7 @@ static void test_ShortcutFolder(void) { CLSID clsid; const CLSID CLSID_WineTest = { 0x9b352ebf, 0x2765, 0x45c1, { 0xb4, 0xc6, 0x85, 0xcc, 0x7f, 0x7a, 0xbc, 0x64 } }; - WCHAR wszWineTestFolder[] = { - ':',':','{','9','B','3','5','2','E','B','F','-','2','7','6','5','-','4','5','C','1','-', - 'B','4','C','6','-','8','5','C','C','7','F','7','A','B','C','6','4','}',0 }; + static WCHAR wszWineTestFolder[] = L"::{9B352EBF-2765-45C1-B4C6-85CC7F7ABC64}"; /* First, we register all the necessary registry keys/values for our 'WineTest' * shell object. */

1 0