July 2020 - Wine-commits - list.winehq.org

Matteo Bruni : wined3d: Add GPU information for AMD Raven Ridge.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 435f7fb2f2c511068b1e64c373fb0f1900ddd669 URL: https://source.winehq.org/git/wine.git/?a=commit;h=435f7fb2f2c511068b1e64c3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 16 18:50:05 2020 +0200 wined3d: Add GPU information for AMD Raven Ridge. 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/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1f892a9d48..533d99f026 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -507,6 +507,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_10, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_12, "Radeon Pro Vega 20", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RAVEN, "AMD Radeon(TM) Vega 10 Mobile Graphics", DRIVER_AMD_RX, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb79173c38..82dfd50775 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2814,6 +2814,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_480 = 0x67df, CARD_AMD_RADEON_RX_VEGA_10 = 0x687f, CARD_AMD_RADEON_RX_VEGA_12 = 0x69af, + CARD_AMD_RADEON_RAVEN = 0x15dd, CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_AMD_RADEON_RX_NAVI_10 = 0x731f,

1 0

Matteo Bruni : wined3d: Update comment about sample_c_lz translation in GLSL.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 86459002f15b6b1fc2785a6511f6833adf334d46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86459002f15b6b1fc2785a65… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 16 18:50:06 2020 +0200 wined3d: Update comment about sample_c_lz translation in GLSL. 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/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 66e90b1768..a14682c95a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6053,10 +6053,9 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) shader_glsl_release_sample_function(ins->ctx, &sample_function); } -/* GLSL doesn't provide a function to sample from level zero with depth - * comparison for array textures and cube textures. We use textureGrad*() - * to implement sample_c_lz. - */ +/* Unless EXT_texture_shadow_lod is available, GLSL doesn't provide a function + * to sample from level zero with depth comparison for array textures and cube + * textures. We use textureGrad*() to implement sample_c_lz in that case. */ static void shader_glsl_gen_sample_c_lz_emulation(const struct wined3d_shader_instruction *ins, unsigned int sampler_bind_idx, const struct glsl_sample_function *sample_function, unsigned int coord_size, const char *coord_param, const char *ref_param)

1 0

Francois Gouget : kernel32: FILE_SetDosError() is not used anymore so remove it.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 500131b2f5fcdc09eb15bb5db740b6ae5dfd9390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=500131b2f5fcdc09eb15bb5d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 17 13:22:30 2020 +0200 kernel32: FILE_SetDosError() is not used anymore so remove it. The last user, RemoveDirectoryA/W(), has been moved to kernelbase. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 67 ------------------------------------------ dlls/kernel32/kernel_private.h | 1 - 2 files changed, 68 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 29dd5791af..949be6c303 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -92,73 +92,6 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) } -/*********************************************************************** - * FILE_SetDosError - * - * Set the DOS error code from errno. - */ -void FILE_SetDosError(void) -{ - int save_errno = errno; /* errno gets overwritten by printf */ - - TRACE("errno = %d %s\n", errno, strerror(errno)); - switch (save_errno) - { - case EAGAIN: - SetLastError( ERROR_SHARING_VIOLATION ); - break; - case EBADF: - SetLastError( ERROR_INVALID_HANDLE ); - break; - case ENOSPC: - SetLastError( ERROR_HANDLE_DISK_FULL ); - break; - case EACCES: - case EPERM: - case EROFS: - SetLastError( ERROR_ACCESS_DENIED ); - break; - case EBUSY: - SetLastError( ERROR_LOCK_VIOLATION ); - break; - case ENOENT: - SetLastError( ERROR_FILE_NOT_FOUND ); - break; - case EISDIR: - SetLastError( ERROR_CANNOT_MAKE ); - break; - case ENFILE: - case EMFILE: - SetLastError( ERROR_TOO_MANY_OPEN_FILES ); - break; - case EEXIST: - SetLastError( ERROR_FILE_EXISTS ); - break; - case EINVAL: - case ESPIPE: - SetLastError( ERROR_SEEK ); - break; - case ENOTEMPTY: - SetLastError( ERROR_DIR_NOT_EMPTY ); - break; - case ENOEXEC: - SetLastError( ERROR_BAD_FORMAT ); - break; - case ENOTDIR: - SetLastError( ERROR_PATH_NOT_FOUND ); - break; - case EXDEV: - SetLastError( ERROR_NOT_SAME_DEVICE ); - break; - default: - WARN("unknown file error: %s\n", strerror(save_errno) ); - SetLastError( ERROR_GEN_FAILURE ); - break; - } - errno = save_errno; -} - - /*********************************************************************** * FILE_name_AtoW * diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index bcf2ee9a52..2a0e524748 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -60,7 +60,6 @@ extern SYSTEM_BASIC_INFORMATION system_info DECLSPEC_HIDDEN; extern const WCHAR DIR_Windows[] DECLSPEC_HIDDEN; extern const WCHAR DIR_System[] DECLSPEC_HIDDEN; -extern void FILE_SetDosError(void) 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;

1 0

Francois Gouget : mshtml: Fix the spelling of a MoveUnitBounded() parameter.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: a029551e7c533df2485a636596ce9b0ce99084b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a029551e7c533df2485a6365… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 17 13:22:45 2020 +0200 mshtml: Fix the spelling of a MoveUnitBounded() parameter. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/range.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index c15470c4ff..7db62f49a1 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -2343,10 +2343,10 @@ static HRESULT WINAPI MarkupPointer2_MoveToMarkupPosition(IMarkupPointer2 *iface return E_NOTIMPL; } -static HRESULT WINAPI MarkupPointer2_MoveUnitBounded(IMarkupPointer2 *iface, MOVEUNIT_ACTION action, IMarkupPointer *boundry) +static HRESULT WINAPI MarkupPointer2_MoveUnitBounded(IMarkupPointer2 *iface, MOVEUNIT_ACTION action, IMarkupPointer *boundary) { MarkupPointer *This = impl_from_IMarkupPointer2(iface); - FIXME("(%p)->(%u %p)\n", This, action, boundry); + FIXME("(%p)->(%u %p)\n", This, action, boundary); return E_NOTIMPL; }

1 0

Francois Gouget : msvcrt: Fix the spelling of a TRACE() message.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: f16a631c2a4fb8c156834f36e772cd4b87b7fa3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f16a631c2a4fb8c156834f36… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 17 13:22:39 2020 +0200 msvcrt: Fix the spelling of a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 46df340839..f776a1fa4b 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -585,7 +585,7 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu ULONGLONG m; DWORD l; - TRACE("floting point argument: %.16le\n", v); + TRACE("floating point argument: %.16le\n", v); if(flags->Precision == -1) flags->Precision = 6;

1 0

Jacek Caban : kernelbase: Avoid unneeded GetConsoleOutputCP calls.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 6039b785947088d379672c709c227b96ce3be1e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6039b785947088d379672c70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 13:55:20 2020 +0200 kernelbase: Avoid unneeded GetConsoleOutputCP calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 27918d8370..1aeb45d89c 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -133,9 +133,8 @@ static void input_records_AtoW( INPUT_RECORD *buffer, int count ) } /* map char infos to ASCII */ -static void char_info_WtoA( CHAR_INFO *buffer, int count ) +static void char_info_WtoA( UINT cp, CHAR_INFO *buffer, int count ) { - UINT cp = GetConsoleOutputCP(); char ch; while (count-- > 0) @@ -889,8 +888,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReadConsoleOutputA( HANDLE handle, CHAR_INFO *buff ret = ReadConsoleOutputW( handle, buffer, size, coord, region ); if (ret && region->Right >= region->Left) { + UINT cp = GetConsoleOutputCP(); for (y = 0; y <= region->Bottom - region->Top; y++) - char_info_WtoA( &buffer[(coord.Y + y) * size.X + coord.X], region->Right - region->Left + 1 ); + char_info_WtoA( cp, &buffer[(coord.Y + y) * size.X + coord.X], region->Right - region->Left + 1 ); } return ret; } @@ -1583,19 +1583,20 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterA( HANDLE handle, LPCST if (length > 0) { + UINT cp = GetConsoleOutputCP(); if (!str) { SetLastError( ERROR_INVALID_ACCESS ); return FALSE; } - lenW = MultiByteToWideChar( GetConsoleOutputCP(), 0, str, length, NULL, 0 ); + lenW = MultiByteToWideChar( cp, 0, str, length, NULL, 0 ); if (!(strW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; } - MultiByteToWideChar( GetConsoleOutputCP(), 0, str, length, strW, lenW ); + MultiByteToWideChar( cp, 0, str, length, strW, lenW ); } ret = WriteConsoleOutputCharacterW( handle, strW, lenW, coord, written ); HeapFree( GetProcessHeap(), 0, strW );

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_ACTIVATE ioctl.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: b68138a62e849036b75954f7a406c64be5d86e21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b68138a62e849036b75954f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 13:55:40 2020 +0200 server: Introduce IOCTL_CONDRV_ACTIVATE ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 1 + server/console.c | 15 +++++++++++++++ server/trace.c | 1 + 3 files changed, 17 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index bf00262d70..fedf3f308c 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -37,6 +37,7 @@ /* console output ioctls */ #define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) #define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) +#define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_WRITE_DATA) #define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_DATA) /* console renderer ioctls */ diff --git a/server/console.c b/server/console.c index 2785669deb..149a31dd57 100644 --- a/server/console.c +++ b/server/console.c @@ -1694,6 +1694,21 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return set_output_info( screen_buffer, params, get_req_data_size() - sizeof(*params) ); } + case IOCTL_CONDRV_ACTIVATE: + if (!screen_buffer->input) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + + if (screen_buffer != screen_buffer->input->active) + { + if (screen_buffer->input->active) release_object( screen_buffer->input->active ); + screen_buffer->input->active = (struct screen_buffer *)grab_object( screen_buffer ); + generate_sb_initial_events( screen_buffer->input ); + } + return 1; + case IOCTL_CONDRV_FILL_OUTPUT: { const struct condrv_fill_output_params *params = get_req_data(); diff --git a/server/trace.c b/server/trace.c index a2ee9c10b7..c3cfd7de12 100644 --- a/server/trace.c +++ b/server/trace.c @@ -114,6 +114,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) switch(*code) { #define CASE(c) case c: fprintf( stderr, "%s%s", prefix, #c ); break + CASE(IOCTL_CONDRV_ACTIVATE); CASE(IOCTL_CONDRV_ATTACH_RENDERER); CASE(IOCTL_CONDRV_FILL_OUTPUT); CASE(IOCTL_CONDRV_GET_INPUT_INFO);

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_ACTIVATE in SetConsoleActiveScreenBuffer.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: f4d7d8955098a0255733ae304349415fa373049c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4d7d8955098a0255733ae30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 13:55:52 2020 +0200 kernelbase: Use IOCTL_CONDRV_ACTIVATE in SetConsoleActiveScreenBuffer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 1aeb45d89c..d1fc8a4de1 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1063,19 +1063,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH ScrollConsoleScreenBufferW( HANDLE handle, SMALL_R */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleActiveScreenBuffer( HANDLE handle ) { - BOOL ret; - TRACE( "(%p)\n", handle ); - - SERVER_START_REQ( set_console_input_info ) - { - req->handle = 0; - req->mask = SET_CONSOLE_INPUT_INFO_ACTIVE_SB; - req->active_sb = wine_server_obj_handle( handle ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + return console_ioctl( handle, IOCTL_CONDRV_ACTIVATE, NULL, 0, NULL, 0, NULL ); }

1 0

Jacek Caban : server: Remove support for SET_CONSOLE_INPUT_INFO_ACTIVE_SB.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: d2b0c10000ad53dbc0aa717b31f18f9078f35c7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2b0c10000ad53dbc0aa717b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 13:56:09 2020 +0200 server: Remove support for SET_CONSOLE_INPUT_INFO_ACTIVE_SB. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 5 ++--- server/console.c | 26 +------------------------- server/protocol.def | 2 -- server/request.h | 1 - server/trace.c | 1 - 5 files changed, 3 insertions(+), 32 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1176d9cbea..f50e6a213c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1833,7 +1833,7 @@ struct alloc_console_reply { struct reply_header __header; obj_handle_t handle_in; - obj_handle_t event; + char __pad_12[4]; }; @@ -1916,7 +1916,6 @@ struct set_console_input_info_reply { struct reply_header __header; }; -#define SET_CONSOLE_INPUT_INFO_ACTIVE_SB 0x01 #define SET_CONSOLE_INPUT_INFO_TITLE 0x02 #define SET_CONSOLE_INPUT_INFO_HISTORY_MODE 0x04 #define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE 0x08 @@ -6452,7 +6451,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 628 +#define SERVER_PROTOCOL_VERSION 629 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 149a31dd57..3c562cb507 100644 --- a/server/console.c +++ b/server/console.c @@ -830,37 +830,13 @@ static int set_console_input_info( const struct set_console_input_info_request * struct condrv_renderer_event evt; if (!(console = console_input_get( req->handle, FILE_WRITE_PROPERTIES ))) goto error; - if (console_input_is_bare(console) && - (req->mask & (SET_CONSOLE_INPUT_INFO_ACTIVE_SB| - SET_CONSOLE_INPUT_INFO_WIN))) + if (console_input_is_bare(console) && (req->mask & SET_CONSOLE_INPUT_INFO_WIN)) { set_error( STATUS_UNSUCCESSFUL ); goto error; } memset(&evt.u, 0, sizeof(evt.u)); - if (req->mask & SET_CONSOLE_INPUT_INFO_ACTIVE_SB) - { - struct screen_buffer *screen_buffer; - - screen_buffer = (struct screen_buffer *)get_handle_obj( current->process, req->active_sb, - FILE_WRITE_PROPERTIES, &screen_buffer_ops ); - if (!screen_buffer || screen_buffer->input != console) - { - set_error( STATUS_INVALID_HANDLE ); - if (screen_buffer) release_object( screen_buffer ); - goto error; - } - - if (screen_buffer != console->active) - { - if (console->active) release_object( console->active ); - console->active = screen_buffer; - generate_sb_initial_events( console ); - } - else - release_object( screen_buffer ); - } if (req->mask & SET_CONSOLE_INPUT_INFO_TITLE) { WCHAR *new_title = NULL; diff --git a/server/protocol.def b/server/protocol.def index 4a59c32728..a121c371c1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1464,7 +1464,6 @@ enum server_fd_type int input_fd; /* if pid=-1 (bare console to current process), fd for input */ @REPLY obj_handle_t handle_in; /* handle to console input */ - obj_handle_t event; /* handle to renderer events change notification */ @END @@ -1515,7 +1514,6 @@ enum server_fd_type user_handle_t win; /* console window if backend supports it */ VARARG(title,unicode_str); /* console title */ @END -#define SET_CONSOLE_INPUT_INFO_ACTIVE_SB 0x01 #define SET_CONSOLE_INPUT_INFO_TITLE 0x02 #define SET_CONSOLE_INPUT_INFO_HISTORY_MODE 0x04 #define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE 0x08 diff --git a/server/request.h b/server/request.h index 31ca632669..1ddf21496b 100644 --- a/server/request.h +++ b/server/request.h @@ -1116,7 +1116,6 @@ C_ASSERT( FIELD_OFFSET(struct alloc_console_request, pid) == 20 ); C_ASSERT( FIELD_OFFSET(struct alloc_console_request, input_fd) == 24 ); C_ASSERT( sizeof(struct alloc_console_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct alloc_console_reply, handle_in) == 8 ); -C_ASSERT( FIELD_OFFSET(struct alloc_console_reply, event) == 12 ); C_ASSERT( sizeof(struct alloc_console_reply) == 16 ); C_ASSERT( sizeof(struct free_console_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_console_request, from) == 12 ); diff --git a/server/trace.c b/server/trace.c index c3cfd7de12..21468abd73 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2033,7 +2033,6 @@ static void dump_alloc_console_request( const struct alloc_console_request *req static void dump_alloc_console_reply( const struct alloc_console_reply *req ) { fprintf( stderr, " handle_in=%04x", req->handle_in ); - fprintf( stderr, ", event=%04x", req->event ); } static void dump_free_console_request( const struct free_console_request *req )

1 0

Alex Henrie : ws2_32: Avoid depending on system getprotoby(name|number) functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: a16f91ae366b9f3f8e371598e13f4ef242f50af3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a16f91ae366b9f3f8e371598… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 15 01:19:04 2020 -0600 ws2_32: Avoid depending on system getprotoby(name|number) functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 - configure.ac | 2 - dlls/ws2_32/socket.c | 79 ++++++---------------------------- dlls/ws2_32/tests/protocol.c | 100 +++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 6 --- 5 files changed, 114 insertions(+), 75 deletions(-) diff --git a/configure b/configure index 24d0a1d8b4..35f8b63ae0 100755 --- a/configure +++ b/configure @@ -18332,8 +18332,6 @@ for ac_func in \ getaddrinfo \ getnameinfo \ getnetbyname \ - getprotobyname \ - getprotobynumber \ getservbyport \ do : diff --git a/configure.ac b/configure.ac index d914e3eca8..928f8ebd1b 100644 --- a/configure.ac +++ b/configure.ac @@ -2245,8 +2245,6 @@ AC_CHECK_FUNCS(\ getaddrinfo \ getnameinfo \ getnetbyname \ - getprotobyname \ - getprotobynumber \ getservbyport \ ) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d7eddde44d..12126372d5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6509,56 +6509,23 @@ static const struct { int prot; const char *names[3]; } protocols[] = { { 0, { "ip", "IP" }}, { 1, { "icmp", "ICMP" }}, - { 2, { "igmp", "IGMP" }}, { 3, { "ggp", "GGP" }}, { 6, { "tcp", "TCP" }}, { 8, { "egp", "EGP" }}, - { 9, { "igp", "IGP" }}, { 12, { "pup", "PUP" }}, { 17, { "udp", "UDP" }}, { 20, { "hmp", "HMP" }}, { 22, { "xns-idp", "XNS-IDP" }}, { 27, { "rdp", "RDP" }}, - { 29, { "iso-tp4", "ISO-TP4" }}, - { 33, { "dccp", "DCCP" }}, - { 36, { "xtp", "XTP" }}, - { 37, { "ddp", "DDP" }}, - { 38, { "idpr-cmtp", "IDPR-CMTP" }}, { 41, { "ipv6", "IPv6" }}, { 43, { "ipv6-route", "IPv6-Route" }}, { 44, { "ipv6-frag", "IPv6-Frag" }}, - { 45, { "idrp", "IDRP" }}, - { 46, { "rsvp", "RSVP" }}, - { 47, { "gre", "GRE" }}, { 50, { "esp", "ESP" }}, { 51, { "ah", "AH" }}, - { 57, { "skip", "SKIP" }}, { 58, { "ipv6-icmp", "IPv6-ICMP" }}, { 59, { "ipv6-nonxt", "IPv6-NoNxt" }}, { 60, { "ipv6-opts", "IPv6-Opts" }}, { 66, { "rvd", "RVD" }}, - { 73, { "rspf", "RSPF" }}, - { 81, { "vmtp", "VMTP" }}, - { 88, { "eigrp", "EIGRP" }}, - { 89, { "ospf", "OSPFIGP" }}, - { 93, { "ax.25", "AX.25" }}, - { 94, { "ipip", "IPIP" }}, - { 97, { "etherip", "ETHERIP" }}, - { 98, { "encap", "ENCAP" }}, - { 103, { "pim", "PIM" }}, - { 108, { "ipcomp", "IPCOMP" }}, - { 112, { "vrrp", "VRRP" }}, - { 115, { "l2tp", "L2TP" }}, - { 124, { "isis", "ISIS" }}, - { 132, { "sctp", "SCTP" }}, - { 133, { "fc", "FC" }}, - { 135, { "mobility-header", "Mobility-Header" }}, - { 136, { "udplite", "UDPLite" }}, - { 137, { "mpls-in-ip", "MPLS-in-IP" }}, - { 139, { "hip", "HIP" }}, - { 140, { "shim6", "Shim6" }}, - { 141, { "wesp", "WESP" }}, - { 142, { "rohc", "ROHC" }}, }; /*********************************************************************** @@ -6567,23 +6534,14 @@ static const struct { int prot; const char *names[3]; } protocols[] = struct WS_protoent* WINAPI WS_getprotobyname(const char* name) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNAME - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobyname(name)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) - { - if (_strnicmp( protocols[i].names[0], name, -1 )) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } + if (_strnicmp( protocols[i].names[0], name, -1 )) continue; + retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, + protocols[i].prot ); + break; } if (!retval) { @@ -6601,23 +6559,14 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) struct WS_protoent* WINAPI WS_getprotobynumber(int number) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNUMBER - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobynumber(number)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) - { - if (protocols[i].prot != number) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } + if (protocols[i].prot != number) continue; + retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, + protocols[i].prot ); + break; } if (!retval) { diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 99bd1373a9..de5fe36d45 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -192,6 +192,104 @@ static void test_WSAEnumProtocolsW(void) } } +struct protocol +{ + int prot; + const char *names[2]; + BOOL missing_from_xp; +}; + +static const struct protocol protocols[] = +{ + { 0, { "ip", "IP" }}, + { 1, { "icmp", "ICMP" }}, + { 3, { "ggp", "GGP" }}, + { 6, { "tcp", "TCP" }}, + { 8, { "egp", "EGP" }}, + { 12, { "pup", "PUP" }}, + { 17, { "udp", "UDP" }}, + { 20, { "hmp", "HMP" }}, + { 22, { "xns-idp", "XNS-IDP" }}, + { 27, { "rdp", "RDP" }}, + { 41, { "ipv6", "IPv6" }, TRUE}, + { 43, { "ipv6-route", "IPv6-Route" }, TRUE}, + { 44, { "ipv6-frag", "IPv6-Frag" }, TRUE}, + { 50, { "esp", "ESP" }}, + { 51, { "ah", "AH" }}, + { 58, { "ipv6-icmp", "IPv6-ICMP" }, TRUE}, + { 59, { "ipv6-nonxt", "IPv6-NoNxt" }, TRUE}, + { 60, { "ipv6-opts", "IPv6-Opts" }, TRUE}, + { 66, { "rvd", "RVD" }}, +}; + +static const struct protocol *find_protocol(int number) +{ + int i; + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + if (protocols[i].prot == number) + return &protocols[i]; + } + return NULL; +} + +static void test_getprotobyname(void) +{ + struct protoent *ent; + char all_caps_name[16]; + int i, j; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + for (j = 0; j < ARRAY_SIZE(protocols[0].names); j++) + { + ent = getprotobyname(protocols[i].names[j]); + ok((ent && ent->p_proto == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(protocols[i].names[j]), protocols[i].prot, ent ? ent->p_proto : -1); + } + + for (j = 0; protocols[i].names[0][j]; j++) + all_caps_name[j] = toupper(protocols[i].names[0][j]); + all_caps_name[j] = 0; + ent = getprotobyname(all_caps_name); + ok((ent && ent->p_proto == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(all_caps_name), protocols[i].prot, ent ? ent->p_proto : -1); + } +} + +static void test_getprotobynumber(void) +{ + struct protoent *ent; + const struct protocol *ref; + int i; + + for (i = -1; i <= 256; i++) + { + ent = getprotobynumber(i); + ref = find_protocol(i); + + if (!ref) + { + ok(!ent, "Expected protocol number %d to be undefined, got %s\n", + i, wine_dbgstr_a(ent ? ent->p_name : NULL)); + continue; + } + + ok((ent && ent->p_name && strcmp(ent->p_name, ref->names[0]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d to be %s, got %s\n", + i, ref->names[0], wine_dbgstr_a(ent ? ent->p_name : NULL)); + + ok((ent && ent->p_aliases && ent->p_aliases[0] && + strcmp(ent->p_aliases[0], ref->names[1]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d alias 0 to be %s, got %s\n", + i, ref->names[0], wine_dbgstr_a(ent && ent->p_aliases ? ent->p_aliases[0] : NULL)); + } +} + START_TEST( protocol ) { WSADATA data; @@ -201,4 +299,6 @@ START_TEST( protocol ) test_WSAEnumProtocolsA(); test_WSAEnumProtocolsW(); + test_getprotobyname(); + test_getprotobynumber(); } diff --git a/include/config.h.in b/include/config.h.in index 720cbd4a5d..3a3277e613 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -245,12 +245,6 @@ /* Define to 1 if you have the `getopt_long_only' function. */ #undef HAVE_GETOPT_LONG_ONLY -/* Define to 1 if you have the `getprotobyname' function. */ -#undef HAVE_GETPROTOBYNAME - -/* Define to 1 if you have the `getprotobynumber' function. */ -#undef HAVE_GETPROTOBYNUMBER - /* Define to 1 if you have the `getservbyport' function. */ #undef HAVE_GETSERVBYPORT

1 0