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

Paul Gofman : ntdll: Clear CONTEXT_XSTATE flag in RtlUnwindEx().
by Alexandre Julliard 31 Aug '20

31 Aug '20

Module: wine Branch: master Commit: 8aa370e9919f179feeece8dac9782f90f2e2b09c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8aa370e9919f179feeece8da… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 31 20:46:41 2020 +0300 ntdll: Clear CONTEXT_XSTATE flag in RtlUnwindEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49749 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ba91cc13df..6fbb612825 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1244,7 +1244,9 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec { ULONG64 frame; - *context = new_context = *dispatch.ContextRecord; + new_context = *dispatch.ContextRecord; + new_context.ContextFlags &= ~0x40; + *context = new_context; dispatch.ContextRecord = context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, @@ -1267,7 +1269,9 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec teb_frame = __wine_pop_frame( teb_frame ); - *context = new_context = *dispatch.ContextRecord; + new_context = *dispatch.ContextRecord; + new_context.ContextFlags &= ~0x40; + *context = new_context; dispatch.ContextRecord = context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry,

1 0

Carlos Rivera : kernel32/tests: Use debugstr_an to show contents of buffer.
by Alexandre Julliard 31 Aug '20

31 Aug '20

Module: wine Branch: master Commit: 13e81421b7f1c9cfe1d6a5a7738ac728c662788c URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e81421b7f1c9cfe1d6a5a7… Author: Carlos Rivera <carlos(a)superkaos.org> Date: Mon Aug 31 11:37:23 2020 +0200 kernel32/tests: Use debugstr_an to show contents of buffer. In the tests modified the buffer to show is expected to contain strings separated by \0. So that passing the buffer to the ok macro will only print the first string. Showing the whole returned buffer gives more information when the test fails. Signed-off-by: Carlos Rivera <carlos(a)superkaos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 2fba26542f..c077f8b35b 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -591,8 +591,10 @@ static void test_GetPrivateProfileString(const char *content, const char *descri buf, MAX_PATH, filename); ok(ret == 18, "Expected 18, got %d\n", ret); len = lstrlenA("section1") + sizeof(CHAR) + lstrlenA("section2") + 2 * sizeof(CHAR); - ok(!memcmp(buf, "section1\0section2\0\0", len), - "Expected \"section1\\0section2\\0\\0\", got \"%s\"\n", buf); + + ok(!memcmp(buf, "section1\0section2\0", len), + "Expected \"section1\\x00section2\\x00\\x00\", got %s\n", + debugstr_an(buf, (ret + 2 >= MAX_PATH ? MAX_PATH : ret + 1))); /* lpAppName is empty */ memset(buf, 0xc, sizeof(buf)); @@ -667,7 +669,8 @@ static void test_GetPrivateProfileString(const char *content, const char *descri buf, MAX_PATH, filename); ok(ret == 18, "Expected 18, got %d\n", ret); ok(!memcmp(buf, "name1\0name2\0name4\0", ret + 1), - "Expected \"name1\\0name2\\0name4\\0\", got \"%s\"\n", buf); + "Expected \"name1\\x00name2\\x00name4\\x00\\x00\", got %s\n", + debugstr_an(buf, (ret + 2 >= MAX_PATH ? MAX_PATH : ret + 1))); /* lpKeyName is empty */ memset(buf, 0xc,sizeof(buf)); @@ -794,8 +797,9 @@ static void test_GetPrivateProfileString(const char *content, const char *descri ok(ret == 14, "Expected 14, got %d\n", ret); len = lstrlenA("section1") + 2 * sizeof(CHAR); todo_wine - ok(!memcmp(buf, "section1\0secti\0\0", ret + 2), - "Expected \"section1\\0secti\\0\\0\", got \"%s\"\n", buf); + ok(!memcmp(buf, "section1\0secti\0", ret + 2), + "Expected \"section1\\x00secti\\x00\\x00\", got %s\n", + debugstr_an(buf, (ret + 2 >= 16 ? 16 : ret + 1))); /* lpKeyName is NULL, not enough room for final key name */ memset(buf, 0xc,sizeof(buf)); @@ -804,8 +808,9 @@ static void test_GetPrivateProfileString(const char *content, const char *descri buf, 16, filename); ok(ret == 14, "Expected 14, got %d\n", ret); todo_wine - ok(!memcmp(buf, "name1\0name2\0na\0\0", ret + 2), - "Expected \"name1\\0name2\\0na\\0\\0\", got \"%s\"\n", buf); + ok(!memcmp(buf, "name1\0name2\0na\0", ret + 2), + "Expected \"name1\\x00name2\\x00na\\x00\\x00\", got %s\n", + debugstr_an(buf, (ret + 2 >= 16 ? 16 : ret + 1))); /* key value has quotation marks which are stripped */ memset(buf, 0xc,sizeof(buf));

1 0

Carlos Rivera : kernel32/tests: Remove registry entry left out during test.
by Alexandre Julliard 31 Aug '20

31 Aug '20

Module: wine Branch: master Commit: c1c61bf2559509b33fc8bdd297032bc57e474229 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1c61bf2559509b33fc8bdd2… Author: Carlos Rivera <carlos(a)superkaos.org> Date: Mon Aug 31 11:38:16 2020 +0200 kernel32/tests: Remove registry entry left out during test. Signed-off-by: Carlos Rivera <carlos(a)superkaos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index c077f8b35b..5f1f4f0fe7 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -1567,6 +1567,8 @@ static void test_registry_mapping(void) ret = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\winetest_name2"); ok(!ret, "got error %u\n", ret); + ret = RegDeleteKeyA(HKEY_CURRENT_USER, "winetest_name1"); + ok(!ret, "got error %u\n", ret); ret = RegDeleteKeyA(mapped_key, ""); ok(!ret, "got error %u\n", ret); RegCloseKey(mapped_key);

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_FILL_OUTPUT.
by Alexandre Julliard 31 Aug '20

31 Aug '20

Module: wine Branch: master Commit: 2dbf14ee80583e7fa8da74cfaa85700cb82f4f70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dbf14ee80583e7fa8da74cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 31 15:10:50 2020 +0200 conhost: Implement IOCTL_CONDRV_FILL_OUTPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 4853a6d8b2..80f09e738a 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -623,6 +623,56 @@ static NTSTATUS read_output( struct screen_buffer *screen_buffer, const struct c return STATUS_SUCCESS; } +static NTSTATUS fill_output( struct screen_buffer *screen_buffer, const struct condrv_fill_output_params *params ) +{ + char_info_t *end, *dest; + DWORD i, count, *result; + + TRACE( "(%u %u) mode %u\n", params->x, params->y, params->mode ); + + dest = screen_buffer->data + params->y * screen_buffer->width + params->x; + + if (params->y >= screen_buffer->height) return STATUS_SUCCESS; + + if (params->wrap) + end = screen_buffer->data + screen_buffer->height * screen_buffer->width; + else + end = screen_buffer->data + (params->y + 1) * screen_buffer->width; + + count = params->count; + if (count > end - dest) count = end - dest; + + switch(params->mode) + { + case CHAR_INFO_MODE_TEXT: + for (i = 0; i < count; i++) dest[i].ch = params->ch; + break; + case CHAR_INFO_MODE_ATTR: + for (i = 0; i < count; i++) dest[i].attr = params->attr; + break; + case CHAR_INFO_MODE_TEXTATTR: + for (i = 0; i < count; i++) + { + dest[i].ch = params->ch; + dest[i].attr = params->attr; + } + break; + case CHAR_INFO_MODE_TEXTSTDATTR: + for (i = 0; i < count; i++) + { + dest[i].ch = params->ch; + dest[i].attr = screen_buffer->attr; + } + break; + default: + return STATUS_INVALID_PARAMETER; + } + + if (!(result = alloc_ioctl_buffer( sizeof(*result) ))) return STATUS_NO_MEMORY; + *result = count; + return STATUS_SUCCESS; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; @@ -689,6 +739,11 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign if (in_size < sizeof(struct condrv_output_info) || *out_size) return STATUS_INVALID_PARAMETER; return set_output_info( screen_buffer, in_data, in_size ); + case IOCTL_CONDRV_FILL_OUTPUT: + if (in_size != sizeof(struct condrv_fill_output_params) || *out_size != sizeof(DWORD)) + return STATUS_INVALID_PARAMETER; + return fill_output( screen_buffer, in_data ); + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_SCROLL.
by Alexandre Julliard 31 Aug '20

31 Aug '20

Module: wine Branch: master Commit: af47236499235349187c00a9be981a713fa5041c URL: https://source.winehq.org/git/wine.git/?a=commit;h=af47236499235349187c00a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 31 15:11:00 2020 +0200 conhost: Implement IOCTL_CONDRV_SCROLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 80f09e738a..0050f4d1ad 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -673,6 +673,102 @@ static NTSTATUS fill_output( struct screen_buffer *screen_buffer, const struct c return STATUS_SUCCESS; } +static NTSTATUS scroll_output( struct screen_buffer *screen_buffer, const struct condrv_scroll_params *params ) +{ + int x, y, xsrc, ysrc, w, h; + char_info_t *psrc, *pdst; + SMALL_RECT src, dst; + SMALL_RECT clip; + + xsrc = params->scroll.Left; + ysrc = params->scroll.Top; + w = params->scroll.Right - params->scroll.Left + 1; + h = params->scroll.Bottom - params->scroll.Top + 1; + + TRACE( "(%d %d) -> (%u %u) w %u h %u\n", xsrc, ysrc, params->origin.X, params->origin.Y, w, h ); + + clip.Left = max( params->clip.Left, 0 ); + clip.Top = max( params->clip.Top, 0 ); + clip.Right = min( params->clip.Right, screen_buffer->width - 1 ); + clip.Bottom = min( params->clip.Bottom, screen_buffer->height - 1 ); + if (clip.Left > clip.Right || clip.Top > clip.Bottom || params->scroll.Left < 0 || params->scroll.Top < 0 || + params->scroll.Right >= screen_buffer->width || params->scroll.Bottom >= screen_buffer->height || + params->scroll.Right < params->scroll.Left || params->scroll.Top > params->scroll.Bottom || + params->origin.X < 0 || params->origin.X >= screen_buffer->width || params->origin.Y < 0 || + params->origin.Y >= screen_buffer->height) + return STATUS_INVALID_PARAMETER; + + src.Left = max( xsrc, clip.Left ); + src.Top = max( ysrc, clip.Top ); + src.Right = min( xsrc + w - 1, clip.Right ); + src.Bottom = min( ysrc + h - 1, clip.Bottom ); + + dst.Left = params->origin.X; + dst.Top = params->origin.Y; + dst.Right = params->origin.X + w - 1; + dst.Bottom = params->origin.Y + h - 1; + + if (dst.Left < clip.Left) + { + xsrc += clip.Left - dst.Left; + w -= clip.Left - dst.Left; + dst.Left = clip.Left; + } + if (dst.Top < clip.Top) + { + ysrc += clip.Top - dst.Top; + h -= clip.Top - dst.Top; + dst.Top = clip.Top; + } + if (dst.Right > clip.Right) w -= dst.Right - clip.Right; + if (dst.Bottom > clip.Bottom) h -= dst.Bottom - clip.Bottom; + + if (w > 0 && h > 0) + { + if (ysrc < dst.Top) + { + psrc = &screen_buffer->data[(ysrc + h - 1) * screen_buffer->width + xsrc]; + pdst = &screen_buffer->data[(dst.Top + h - 1) * screen_buffer->width + dst.Left]; + + for (y = h; y > 0; y--) + { + memcpy( pdst, psrc, w * sizeof(*pdst) ); + pdst -= screen_buffer->width; + psrc -= screen_buffer->width; + } + } + else + { + psrc = &screen_buffer->data[ysrc * screen_buffer->width + xsrc]; + pdst = &screen_buffer->data[dst.Top * screen_buffer->width + dst.Left]; + + for (y = 0; y < h; y++) + { + /* we use memmove here because when psrc and pdst are the same, + * copies are done on the same row, so the dst and src blocks + * can overlap */ + memmove( pdst, psrc, w * sizeof(*pdst) ); + pdst += screen_buffer->width; + psrc += screen_buffer->width; + } + } + } + + for (y = src.Top; y <= src.Bottom; y++) + { + int left = src.Left; + int right = src.Right; + if (dst.Top <= y && y <= dst.Bottom) + { + if (dst.Left <= src.Left) left = max( left, dst.Right + 1 ); + if (dst.Left >= src.Left) right = min( right, dst.Left - 1 ); + } + for (x = left; x <= right; x++) screen_buffer->data[y * screen_buffer->width + x] = params->fill; + } + + return STATUS_SUCCESS; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; @@ -744,6 +840,11 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign return STATUS_INVALID_PARAMETER; return fill_output( screen_buffer, in_data ); + case IOCTL_CONDRV_SCROLL: + if (in_size != sizeof(struct condrv_scroll_params) || *out_size) + return STATUS_INVALID_PARAMETER; + return scroll_output( screen_buffer, in_data ); + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Jacek Caban : kernelbase: Move KERNEL32_CONSOLE_ALLOC handling to kernelbase.
by Alexandre Julliard 31 Aug '20

31 Aug '20

Module: wine Branch: master Commit: 26e04d52fe466e44eb5ca383c94c2920c5e294ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=26e04d52fe466e44eb5ca383… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 31 15:11:23 2020 +0200 kernelbase: Move KERNEL32_CONSOLE_ALLOC handling to kernelbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 6 +++--- dlls/kernel32/kernel_main.c | 13 ------------- dlls/kernel32/kernel_private.h | 1 - dlls/kernelbase/console.c | 10 ++++++++++ include/wine/condrv.h | 3 +++ 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index afbf9a91da..5b5722847f 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1129,7 +1129,7 @@ BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) */ if (!params->hStdInput || params->hStdInput == INVALID_HANDLE_VALUE) params->hStdInput = 0; - else if (VerifyConsoleIoHandle(params->hStdInput)) + else if (!is_console_handle(params->hStdInput) && VerifyConsoleIoHandle(params->hStdInput)) { params->hStdInput = console_handle_map(params->hStdInput); save_console_mode(params->hStdInput); @@ -1137,12 +1137,12 @@ BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) if (!params->hStdOutput || params->hStdOutput == INVALID_HANDLE_VALUE) params->hStdOutput = 0; - else if (VerifyConsoleIoHandle(params->hStdOutput)) + 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 (VerifyConsoleIoHandle(params->hStdError)) + else if (!is_console_handle(params->hStdError) && VerifyConsoleIoHandle(params->hStdError)) params->hStdError = console_handle_map(params->hStdError); return TRUE; diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index e856cc3af4..450a10e93b 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -147,19 +147,6 @@ static BOOL process_attach( HMODULE module ) LoadLibraryA( "krnl386.exe16" ); } - if (params->ConsoleHandle == KERNEL32_CONSOLE_ALLOC) - { - HMODULE mod = GetModuleHandleA(0); - params->ConsoleHandle = NULL; - if (RtlImageNtHeader(mod)->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) - AllocConsole(); - } - /* else TODO for DETACHED_PROCESS: - * 1/ inherit console + handles - * 2/ create std handles, if handles are not inherited - * TBD when not using wineserver handles for console handles - */ - return TRUE; } diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 2a0e524748..ce893d7bc4 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -51,7 +51,6 @@ static inline BOOL set_ntstatus( NTSTATUS status ) } /* Some Wine specific values for Console inheritance (params->ConsoleHandle) */ -#define KERNEL32_CONSOLE_ALLOC ((HANDLE)1) #define KERNEL32_CONSOLE_SHELL ((HANDLE)2) extern HMODULE kernel32_handle DECLSPEC_HIDDEN; diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 42dc971227..7589f305b5 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1729,5 +1729,15 @@ HRESULT WINAPI ResizePseudoConsole( HPCON handle, COORD size ) void init_console( void ) { + RTL_USER_PROCESS_PARAMETERS *params = RtlGetCurrentPeb()->ProcessParameters; + + if (params->ConsoleHandle == CONSOLE_HANDLE_ALLOC) + { + HMODULE mod = GetModuleHandleW( NULL ); + params->ConsoleHandle = NULL; + if (RtlImageNtHeader( mod )->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) + AllocConsole(); + } + RtlAddVectoredExceptionHandler( FALSE, handle_ctrl_c ); } diff --git a/include/wine/condrv.h b/include/wine/condrv.h index eb6439684a..14177a5e19 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -226,4 +226,7 @@ enum condrv_renderer_event_type CONSOLE_RENDERER_EXIT_EVENT, }; +/* Wine specific values for console inheritance (params->ConsoleHandle) */ +#define CONSOLE_HANDLE_ALLOC ((HANDLE)1) + #endif /* _INC_CONDRV */

1 0

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 31 Aug '20

31 Aug '20

Module: wine Branch: master Commit: 09e683ca97a40d3f692cf587cab7281840c8d0dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=09e683ca97a40d3f692cf587… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Mon Aug 31 10:37:39 2020 -0300 po: Update Brazilian Portuguese translation. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 234 ++++++++++++++++++++---------------------------------------- 1 file changed, 77 insertions(+), 157 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09e683ca97a40d3f692c…

1 0

Aaro Altonen : ws2_32: Improve WSCGetProviderPath() stub.
by Alexandre Julliard 31 Aug '20

31 Aug '20

Module: wine Branch: master Commit: 652f1f9642b35a2a1d1c5b67e4326af7d45363b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=652f1f9642b35a2a1d1c5b67… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Tue Aug 25 20:27:28 2020 +0200 ws2_32: Improve WSCGetProviderPath() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45801 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 17 ++++++++++--- dlls/ws2_32/tests/sock.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4d2afa946b..b7a570043c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -8940,10 +8940,21 @@ INT WINAPI WSCGetProviderPath( LPGUID provider, LPWSTR path, LPINT len, LPINT er { FIXME( "(%s %p %p %p) Stub!\n", debugstr_guid(provider), path, len, errcode ); - if (!errcode || !provider || !len) return WSAEFAULT; + if (!provider || !len) + { + if (errcode) + *errcode = WSAEFAULT; + return SOCKET_ERROR; + } - *errcode = WSAEINVAL; - return SOCKET_ERROR; + if (*len <= 0) + { + if (errcode) + *errcode = WSAEINVAL; + return SOCKET_ERROR; + } + + return 0; } /*********************************************************************** diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b523c326d6..c7f88d6f3b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -86,6 +86,7 @@ static int (WINAPI *pWSAEnumNameSpaceProvidersA)(LPDWORD,LPWSANAMESPACE_INFOA) static int (WINAPI *pWSAEnumNameSpaceProvidersW)(LPDWORD,LPWSANAMESPACE_INFOW); static int (WINAPI *pWSAPoll)(WSAPOLLFD *,ULONG,INT); static int (WINAPI *pWSCGetProviderInfo)(LPGUID,WSC_PROVIDER_INFO_TYPE,PBYTE,size_t*,DWORD,LPINT); +static int (WINAPI *pWSCGetProviderPath)(LPGUID, LPWSTR, LPINT, LPINT); /* Function pointers from iphlpapi */ static DWORD (WINAPI *pGetAdaptersInfo)(PIP_ADAPTER_INFO,PULONG); @@ -1303,6 +1304,7 @@ static void Init (void) pWSAEnumNameSpaceProvidersW = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersW"); pWSAPoll = (void *)GetProcAddress(hws2_32, "WSAPoll"); pWSCGetProviderInfo = (void *)GetProcAddress(hws2_32, "WSCGetProviderInfo"); + pWSCGetProviderPath = (void *)GetProcAddress(hws2_32, "WSCGetProviderPath"); hiphlpapi = LoadLibraryA("iphlpapi.dll"); if (hiphlpapi) @@ -11351,6 +11353,65 @@ static void test_WSCGetProviderInfo(void) ok(errcode == WSANO_RECOVERY, "got %d, expected WSANO_RECOVERY\n", errcode); } +static void test_WSCGetProviderPath(void) +{ + GUID provider = {}; + WCHAR buffer[256]; + INT ret, err, len; + + if (!pWSCGetProviderPath) + { + skip("WSCGetProviderPath is not available.\n"); + return; + } + + ret = pWSCGetProviderPath(NULL, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + + ret = pWSCGetProviderPath(&provider, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + + ret = pWSCGetProviderPath(NULL, buffer, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + + len = -1; + ret = pWSCGetProviderPath(NULL, NULL, &len, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(len == -1, "Got unexpected len %d.\n", len); + + err = 0; + ret = pWSCGetProviderPath(NULL, NULL, NULL, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEFAULT, "Got unexpected error %d.\n", err); + + err = 0; + ret = pWSCGetProviderPath(&provider, NULL, NULL, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEFAULT, "Got unexpected error %d.\n", err); + + err = 0; + len = -1; + ret = pWSCGetProviderPath(&provider, NULL, &len, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEINVAL, "Got unexpected error %d.\n", err); + ok(len == -1, "Got unexpected len %d.\n", len); + + err = 0; + len = 256; + ret = pWSCGetProviderPath(&provider, NULL, &len, &err); + todo_wine ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + todo_wine ok(err == WSAEINVAL, "Got unexpected error %d.\n", err); + ok(len == 256, "Got unexpected len %d.\n", len); + + /* Valid pointers and length but invalid GUID */ + err = 0; + len = 256; + ret = pWSCGetProviderPath(&provider, buffer, &len, &err); + todo_wine ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + todo_wine ok(err == WSAEINVAL, "Got unexpected error %d.\n", err); + ok(len == 256, "Got unexpected len %d.\n", len); +} + START_TEST( sock ) { int i; @@ -11432,6 +11493,7 @@ START_TEST( sock ) test_address_list_query(); test_WSCGetProviderInfo(); + test_WSCGetProviderPath(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

Biswapriyo Nath : include/d3dcommon.idl: Add D3DDestructionNotifier interface.
by Alexandre Julliard 31 Aug '20

31 Aug '20

Module: wine Branch: master Commit: fbabb7c77e61f47130cf0e80435620b9b51a77aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbabb7c77e61f47130cf0e80… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Aug 28 00:14:25 2020 +0530 include/d3dcommon.idl: Add D3DDestructionNotifier interface. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dcommon.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 7d1c0d25cf..586dec29ed 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -43,6 +43,26 @@ typedef ID3D10Blob ID3DBlob; typedef ID3DBlob* LPD3DBLOB; cpp_quote("#define IID_ID3DBlob IID_ID3D10Blob") +typedef void(__stdcall *PFN_DESTRUCTION_CALLBACK)(void *data); + +[ + object, + local, + uuid(a06eb39a-50da-425b-8c31-4eecd6c270f3), + pointer_default(unique) +] +interface ID3DDestructionNotifier : IUnknown +{ + HRESULT RegisterDestructionCallback( + [in] PFN_DESTRUCTION_CALLBACK callback_func, + [in] void *data, + [out] UINT *callback_id + ); + HRESULT UnregisterDestructionCallback( + [in] UINT callback_id + ); +} + typedef enum _D3D_INCLUDE_TYPE { D3D_INCLUDE_LOCAL = 0,

1 0

Biswapriyo Nath : include/d3dcommon.idl: Add missing names in D3D_SHADER_VARIABLE_TYPE enum.
by Alexandre Julliard 31 Aug '20

31 Aug '20

Module: wine Branch: master Commit: 9702ee8d76f7b3233a43a9aa7c78917f26fdbdfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=9702ee8d76f7b3233a43a9aa… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Aug 28 00:14:25 2020 +0530 include/d3dcommon.idl: Add missing names in D3D_SHADER_VARIABLE_TYPE enum. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dcommon.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 586dec29ed..90243ebc2c 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -215,6 +215,12 @@ typedef enum _D3D_SHADER_VARIABLE_TYPE D3D_SVT_RWSTRUCTURED_BUFFER, D3D_SVT_APPEND_STRUCTURED_BUFFER, D3D_SVT_CONSUME_STRUCTURED_BUFFER, + D3D_SVT_MIN8FLOAT, + D3D_SVT_MIN10FLOAT, + D3D_SVT_MIN16FLOAT, + D3D_SVT_MIN12INT, + D3D_SVT_MIN16INT, + D3D_SVT_MIN16UINT, D3D10_SVT_VOID = 0, D3D10_SVT_BOOL, D3D10_SVT_INT,

1 0